style: cleanup

package.json

@@ -12,7 +12,7 @@
  },
  "scripts": {
  "dev": "npx nodemon --ignore playground/generator-output/ --exec ts-node -- src/cli/main generate --config ./playground/sanity-generator.config.ts",
- "dev:test": "npx nodemon --ignore test/generator-output/ --exec ts-node -- src/cli/main generate --config ./test/ressources/generator-config.ts",
+ "dev:test": "npx nodemon --ignore test/generator-output/ --exec ts-node -- src/cli/main generate --config ./test/ressources/generator-config-external-resolver-and-trim.ts",
  "dev:sanity": "yarn dev & cd playground && yarn dev",
  "preview": "npx ts-node src/cli/main generate --config ./client/sanity-generator.config.ts --watch ",
  "build": "rimraf ./build && tsc && cp -r src/static build/static",

playground/generator-output/queries/get-page-by-slug.ts

@@ -1,5 +1,10 @@
-import { inlineResolver0, localeString, inlineResolver1 } from "../resolver";
+import {
+ inlineResolver0,
+ inlineResolver1,
+ localeString,
+ inlineResolver2,
+} from "../resolver";
 
 // prettier-ignore
 export const getPageBySlug = /* groq */`
-*[_type == "page" && slug.current == $slug] { ..., ${inlineResolver0("seoTitle")}, gallery { ..., ${localeString("sectionTitle")}, slides[] { ..., slide { ..., ${inlineResolver1("title")} } } }, sections[] { ..., gallerySection { ..., ${localeString("sectionTitle")}, slides[] { ..., slide { ..., ${localeString("title")} } } }, textSection { ..., ${localeString("title")} }, featuresSection { ..., ${localeString("title")}, ${localeString("subtitle")} } } }[0] `
+*[_type == "page" && slug.current == $slug] { ..., ${inlineResolver0("seoTitle")}, ${inlineResolver1("pageHeader")}, gallery { ..., ${localeString("sectionTitle")}, slides[] { ..., slide { ..., ${inlineResolver2("title")} } } }, sections[] { ..., gallerySection { ..., ${localeString("sectionTitle")}, slides[] { ..., slide { ..., ${localeString("title")} } } }, textSection { ..., ${localeString("title")} }, featuresSection { ..., ${localeString("title")}, ${localeString("subtitle")} } } }[0] `

playground/generator-output/queries/get-pages.ts

@@ -1,5 +1,10 @@
-import { inlineResolver0, localeString, inlineResolver1 } from "../resolver";
+import {
+ inlineResolver0,
+ inlineResolver1,
+ localeString,
+ inlineResolver2,
+} from "../resolver";
 
 // prettier-ignore
 export const getPages = /* groq */`
-*[_type == "page"] { ..., ${inlineResolver0("seoTitle")}, gallery { ..., ${localeString("sectionTitle")}, slides[] { ..., slide { ..., ${inlineResolver1("title")} } } }, sections[] { ..., gallerySection { ..., ${localeString("sectionTitle")}, slides[] { ..., slide { ..., ${localeString("title")} } } }, textSection { ..., ${localeString("title")} }, featuresSection { ..., ${localeString("title")}, ${localeString("subtitle")} } } }[0] `
+*[_type == "page"] { ..., ${inlineResolver0("seoTitle")}, ${inlineResolver1("pageHeader")}, gallery { ..., ${localeString("sectionTitle")}, slides[] { ..., slide { ..., ${inlineResolver2("title")} } } }, sections[] { ..., gallerySection { ..., ${localeString("sectionTitle")}, slides[] { ..., slide { ..., ${localeString("title")} } } }, textSection { ..., ${localeString("title")} }, featuresSection { ..., ${localeString("title")}, ${localeString("subtitle")} } } }[0] `

playground/generator-output/resolver/index.ts

@@ -1,3 +1,4 @@
 export * from "./inline-resolver0";
 export * from "./inline-resolver1";
+export * from "./inline-resolver2";
 export * from "./locale-string";

playground/generator-output/resolver/inline-resolver1.ts

@@ -1,4 +1,4 @@
 import { type Resolver } from "sanity-generator/types";
 
 // prettier-ignore
-export const inlineResolver1: Resolver = (name) => ( /* groq */ `"${name}": {"super": "cool"}` )
+export const inlineResolver1: Resolver = (name2) => ( /* groq */ ` "${name2}-wrapped": { "title": ${name2}.title, "subtitle": ${name2}.subtitle } ` )

playground/generator-output/resolver/inline-resolver2.ts

@@ -0,0 +1,4 @@
+import { type Resolver } from "sanity-generator/types";
+
+// prettier-ignore
+export const inlineResolver2: Resolver = (name) => ( /* groq */ `"${name}": {"super": "cool"}` )

playground/schemas/documents/page.ts

@@ -1,9 +1,6 @@
-import { GeneratorSchemaDefinition} from './../../../src/types/index'
 import {defineArrayMember, defineField, defineType} from 'sanity'
-
-declare module 'sanity' {
- interface BaseSchemaDefinition extends GeneratorSchemaDefinition {}
-}
+import {header} from '../factories'
+import {title} from 'process'
 
 type Page = any
 export const pageSchema: Page = defineType({
@@ -24,29 +21,27 @@ export const pageSchema: Page = defineType({
  defineField({
  type: 'localeString',
  title: 'Title (Open Graph)',
- group: 'seo',
  name: 'seoTitle',
  description: 'Used for Open Graph previews implemented by facebook, twitter, google etc.',
  generator: {
- resolver: (name) => /* groq */`
+ resolver: (name) => /* groq */ `
  "${name}": {
  "germanTitle": ${name}.de,
  "englishTitle": ${name}.en
  }
- `
+ `,
  },
  }),
+ header('pageHeader', 'content'),
  defineField({
  type: 'object',
  name: 'gallery',
-
-
+ group: 'content',
 
  fields: [
  defineField({
  type: 'localeString',
  name: 'sectionTitle',
-
  }),
  defineField({
  type: 'array',
@@ -56,14 +51,30 @@ export const pageSchema: Page = defineType({
  type: 'object',
  name: 'slide',
  fields: [
+ defineField({
+ name: 'image',
+ type: 'image',
+ }),
  {
  type: 'string',
  name: 'title',
  generator: {
- resolver: (name) => /* groq */`"${name}": {"super": "cool"}`,
+ resolver: (name) => /* groq */ `"${name}": {"super": "cool"}`,
  },
  },
  ],
+ preview: {
+ select: {
+ title: 'title',
+ image: "image"
+ },
+ prepare(props) {
+ return {
+ title: props.title,
+ media: props.image
+ }
+ },
+ },
  }),
  ],
  }),

playground/schemas/factories/header.ts

@@ -0,0 +1,20 @@
+import {defineField} from 'sanity'
+
+export const header = (name: string, group = "") =>
+ defineField({
+ type: 'object',
+ name,
+ group,
+ fields: [
+ {name: 'title', type: 'string'},
+ {name: 'subtitle', type: 'string'},
+ ],
+ generator: {
+ resolver: (name: string) => /* groq */ `
+ "${name}-wrapped": {
+ "title": ${name}.title,
+ "subtitle": ${name}.subtitle
+ }
+ `,
+ },
+ })

playground/schemas/factories/index.ts

@@ -0,0 +1 @@
+export * from './header'

playground/tsconfig.json

@@ -14,6 +14,7 @@
  "isolatedModules": true,
  "jsx": "preserve",
  "incremental": true,
+ "rootDir": ".",
  "paths": {
  "sanity-generator/*": ["../src/*"]
  }

playground/types/global.d.ts

@@ -0,0 +1,6 @@
+import {GeneratorSchemaDefinition} from 'sanity-generator/types'
+export {}
+
+declare module 'sanity' {
+ interface FieldDefinitionBase extends GeneratorSchemaDefinition {}
+}

test/generator-output/resolver/index.ts

@@ -0,0 +1,4 @@
+export * from "./inline-resolver0";
+export * from "./inline-resolver1";
+export * from "./locale-string";
+export * from "./special-number";

test/generator-output/resolver/locale-string.ts

@@ -0,0 +1,4 @@
+import { type Resolver } from "sanity-generator/types";
+
+// prettier-ignore
+export const localeString: Resolver = (name) => ( /* groq */ ` "${name}": coalesce(${name}[$lang], ${name}.en) ` )

test/generator-output/resolver/special-number.ts

@@ -0,0 +1,4 @@
+import { type Resolver } from "sanity-generator/types";
+
+// prettier-ignore
+export const specialNumber: Resolver = (name) => ( /* groq */ ` "${name}-special-number": ${name} ` )