@sanity/cli 3.88.0 → 3.88.1-typegen-experimental.0

package/lib/workers/typegenGenerate.d.ts

@@ -1,43 +1,154 @@
+declare interface QueryProgress {
+  queriesCount: number
+  projectionsCount: number
+  filesCount: number
+}
+
 export declare interface TypegenGenerateTypesWorkerData {
   workDir: string
-  workspaceName?: string
-  schemaPath: string
+  schemas: {
+    schemaPath: string
+    schemaId: string
+  }[]
   searchPath: string | string[]
-  overloadClientMethods?: boolean
+  overloadClientMethods: boolean
+  augmentGroqModule: boolean
 }
 
-export declare type TypegenGenerateTypesWorkerMessage =
-  | {
-      type: 'error'
-      error: Error
-      fatal: boolean
-      query?: string
-      filename?: string
-    }
-  | {
-      type: 'types'
-      filename: string
-      types: {
-        queryName: string
-        query: string
-        type: string
-        unknownTypeNodesGenerated: number
-        typeNodesGenerated: number
-        emptyUnionTypeNodesGenerated: number
-      }[]
+/** @internal */
+export declare type TypegenWorkerChannel = WorkerChannel<{
+  loadedSchemas: WorkerChannelEvent
+  generatedSchemaDeclarations: WorkerChannelEvent<{
+    code: string
+    schemaStats: {
+      schemaTypesCount: number
+      schemaCount: number
     }
-  | {
-      type: 'schema'
-      filename: string
-      schema: string
-      length: number
+  }>
+  fileCount: WorkerChannelEvent<{
+    fileCount: number
+  }>
+  generatedQueryResultDeclaration: WorkerChannelStream<
+    | {
+        type: 'progress'
+        progress: QueryProgress
+      }
+    | {
+        type: 'declaration'
+        code: string
+        progress: QueryProgress
+      }
+    | {
+        type: 'error'
+        message: string
+        progress: QueryProgress
+      }
+  >
+  generationComplete: WorkerChannelEvent<{
+    augmentedQueryResultDeclarations: {
+      code: string
     }
-  | {
-      type: 'typemap'
-      typeMap: string
-    }
-  | {
-      type: 'complete'
+    queryStats: {
+      queriesCount: number
+      projectionsCount: number
+      totalScannedFilesCount: number
+      queryFilesCount: number
+      projectionFilesCount: number
+      filesWithErrors: number
+      errorCount: number
+      typeNodesGenerated: number
+      unknownTypeNodesGenerated: number
+      unknownTypeNodesRatio: number
+      emptyUnionTypeNodesGenerated: number
     }
+  }>
+}>
+
+/**
+ * Represents the definition of a "worker channel" to report progress from the
+ * worker to the parent. Worker channels can define named events or streams and
+ * the worker will report events and streams while the parent will await them.
+ * This allows the control flow of the parent to follow the control flow of the
+ * worker 1-to-1.
+ *
+ * @example
+ *
+ * ```ts
+ * // Define the channel interface (shared between parent and worker)
+ * type MyWorkerChannel = WorkerChannel<{
+ *   compileStart: WorkerChannelEvent<void>
+ *   compileProgress: WorkerChannelStream<{ file: string; progress: number }>
+ *   compileEnd: WorkerChannelEvent<{ duration: number }>
+ * }>;
+ *
+ * // --- In the worker file (e.g., worker.ts) ---
+ * import { parentPort } from 'node:worker_threads';
+ * import { createReporter } from './workerChannels';
+ *
+ * const report = createReporter<MyWorkerChannel>(parentPort);
+ *
+ * async function runCompilation() {
+ *   report.event.compileStart(); // Signal start
+ *
+ *   const files = ['a.js', 'b.js', 'c.js'];
+ *   for (const file of files) {
+ *     // Simulate work and report progress
+ *     await new Promise(resolve => setTimeout(resolve, 100));
+ *     report.stream.compileProgress.emit({ file, progress: 100 });
+ *   }
+ *   report.stream.compileProgress.end(); // Signal end of progress stream
+ *
+ *   report.event.compileEnd({ duration: 300 }); // Signal end with result
+ * }
+ *
+ * runCompilation();
+ *
+ * // --- In the parent file (e.g., main.ts) ---
+ * import { Worker } from 'node:worker_threads';
+ * import { createReceiver } from './workerChannels';
+ *
+ * const worker = new Worker('./worker.js');
+ * const receiver = createReceiver<MyWorkerChannel>(worker);
+ *
+ * async function monitorCompilation() {
+ *   console.log('Waiting for compilation to start...');
+ *   await receiver.event.compileStart();
+ *   console.log('Compilation started.');
+ *
+ *   console.log('Receiving progress:');
+ *   for await (const progress of receiver.stream.compileProgress()) {
+ *     console.log(`  - ${progress.file}: ${progress.progress}%`);
+ *   }
+ *
+ *   console.log('Waiting for compilation to end...');
+ *   const { duration } = await receiver.event.compileEnd();
+ *   console.log(`Compilation finished in ${duration}ms.`);
+ *
+ *   await receiver.dispose(); // Clean up listeners and terminate worker
+ * }
+ *
+ * monitorCompilation();
+ * ```
+ *
+ * @internal
+ */
+declare type WorkerChannel<
+  TWorkerChannel extends Record<
+    string,
+    WorkerChannelEvent<unknown> | WorkerChannelStream<unknown>
+  > = Record<string, WorkerChannelEvent<unknown> | WorkerChannelStream<unknown>>,
+> = TWorkerChannel
+
+/** @internal */
+declare type WorkerChannelEvent<TPayload = void> = {
+  type: 'event'
+  payload: TPayload
+}
+
+/** @internal */
+declare type WorkerChannelStream<TPayload = void> = {
+  type: 'stream'
+  payload: TPayload
+}
 
 export {}

package/lib/workers/typegenGenerate.js

@@ -1,124 +1,95 @@
 "use strict";
-var node_worker_threads = require("node:worker_threads"), codegen = require("@sanity/codegen"), createDebug = require("debug"), groqJs = require("groq-js");
-function _interopDefaultCompat(e) {
-  return e && typeof e == "object" && "default" in e ? e : { default: e };
-}
-var createDebug__default = /* @__PURE__ */ _interopDefaultCompat(createDebug);
-const $info = createDebug__default.default("sanity:codegen:generate:info");
-createDebug__default.default("sanity:codegen:generate:warn");
+var fs = require("node:fs/promises"), node_worker_threads = require("node:worker_threads"), codegen = require("@sanity/codegen"), workerChannel = require("../_chunks-cjs/workerChannel.js");
+const DEFAULT_SCHEMA_PATH = codegen.DEFAULT_CONFIG.schemas[0].schemaPath;
 if (node_worker_threads.isMainThread || !node_worker_threads.parentPort)
   throw new Error("This module must be run as a worker thread");
-const opts = node_worker_threads.workerData;
-codegen.registerBabel();
+const report = workerChannel.createReporter(node_worker_threads.parentPort), opts = node_worker_threads.workerData;
 async function main() {
-  const schema = await codegen.readSchema(opts.schemaPath), typeGenerator = new codegen.TypeGenerator(schema), schemaTypes = [typeGenerator.generateSchemaTypes(), codegen.TypeGenerator.generateKnownTypes()].join(`
-`).trim(), resolver = codegen.getResolver();
-  node_worker_threads.parentPort?.postMessage({
-    type: "schema",
-    schema: `${schemaTypes.trim()}
-`,
-    filename: "schema.json",
-    length: schema.length
-  });
-  const queries = codegen.findQueriesInPath({
-    path: opts.searchPath,
-    resolver
-  }), allQueries = [];
-  for await (const result of queries) {
-    if (result.type === "error") {
-      node_worker_threads.parentPort?.postMessage({
-        type: "error",
-        error: result.error,
-        fatal: !1,
-        filename: result.filename
-      });
-      continue;
+  const schemas = [];
+  for (const { schemaId, schemaPath } of opts.schemas)
+    try {
+      if (!(await fs.stat(schemaPath)).isFile())
+        throw new Error(
+          `Failed to load schema "${schemaId}". Schema path is not a file: ${schemaPath}`
+        );
+      const schema = await codegen.readSchema(schemaPath);
+      schemas.push({ schema, schemaId, filename: schemaPath });
+    } catch (err) {
+      if (err.code === "ENOENT") {
+        const hint = schemaPath === DEFAULT_SCHEMA_PATH ? ' - did you run "sanity schema extract"?' : "";
+        throw new Error(`Schema file not found for schema "${schemaId}": ${schemaPath}${hint}`);
+      } else
+        throw err;
     }
-    $info(`Processing ${result.queries.length} queries in "${result.filename}"...`);
-    const fileQueryTypes = [];
-    for (const { name: queryName, result: query } of result.queries)
-      try {
-        const ast = codegen.safeParseQuery(query), queryTypes = groqJs.typeEvaluate(ast, schema), typeName = `${queryName}Result`, type = typeGenerator.generateTypeNodeTypes(typeName, queryTypes), queryTypeStats = walkAndCountQueryTypeNodeStats(queryTypes);
-        fileQueryTypes.push({
-          queryName,
-          query,
-          typeName,
-          typeNode: queryTypes,
-          type: `${type.trim()}
-`,
-          unknownTypeNodesGenerated: queryTypeStats.unknownTypes,
-          typeNodesGenerated: queryTypeStats.allTypes,
-          emptyUnionTypeNodesGenerated: queryTypeStats.emptyUnions
-        });
-      } catch (err) {
-        node_worker_threads.parentPort?.postMessage({
-          type: "error",
-          error: new Error(
-            `Error generating types for query "${queryName}" in "${result.filename}": ${err.message}`,
-            { cause: err }
-          ),
-          fatal: !1,
-          query
-        });
-      }
-    fileQueryTypes.length > 0 && ($info(`Generated types for ${fileQueryTypes.length} queries in "${result.filename}"
-`), node_worker_threads.parentPort?.postMessage({
-      type: "types",
-      types: fileQueryTypes,
-      filename: result.filename
-    })), fileQueryTypes.length > 0 && allQueries.push(...fileQueryTypes);
-  }
-  if (opts.overloadClientMethods && allQueries.length > 0) {
-    const typeMap = `${typeGenerator.generateQueryMap(allQueries).trim()}
-`;
-    node_worker_threads.parentPort?.postMessage({
-      type: "typemap",
-      typeMap
-    });
-  }
-  node_worker_threads.parentPort?.postMessage({
-    type: "complete"
+  report.event.loadedSchemas();
+  const generator = new codegen.TypeGenerator({
+    schemas,
+    queriesByFile: codegen.findQueriesInPath({ path: opts.searchPath, resolver: codegen.getResolver() }),
+    augmentGroqModule: opts.augmentGroqModule,
+    overloadClientMethods: opts.overloadClientMethods
   });
-}
-function walkAndCountQueryTypeNodeStats(typeNode) {
-  switch (typeNode.type) {
-    case "unknown":
-      return { allTypes: 1, unknownTypes: 1, emptyUnions: 0 };
-    case "array": {
-      const acc = walkAndCountQueryTypeNodeStats(typeNode.of);
-      return acc.allTypes += 1, acc;
+  report.event.generatedSchemaDeclarations({
+    code: [
+      generator.getKnownTypes().code,
+      ...generator.getSchemaTypeDeclarations().map((i) => i.code),
+      generator.getAllSanitySchemaTypesDeclaration().code,
+      ...generator.getSchemaDeclarations().map((i) => i.code),
+      generator.getAugmentedSchemasDeclarations().code
+    ].join(`
+`),
+    schemaStats: {
+      schemaTypesCount: generator.getSchemaTypeDeclarations().length,
+      schemaCount: schemas.length
     }
-    case "object": {
-      if (typeNode.rest && typeNode.rest.type === "unknown")
-        return { allTypes: 2, unknownTypes: 1, emptyUnions: 0 };
-      const restStats = typeNode.rest ? walkAndCountQueryTypeNodeStats(typeNode.rest) : { allTypes: 1, unknownTypes: 0, emptyUnions: 0 };
-      return Object.values(typeNode.attributes).reduce((acc, attribute) => {
-        const { allTypes, unknownTypes, emptyUnions } = walkAndCountQueryTypeNodeStats(
-          attribute.value
-        );
-        return {
-          allTypes: acc.allTypes + allTypes,
-          unknownTypes: acc.unknownTypes + unknownTypes,
-          emptyUnions: acc.emptyUnions + emptyUnions
-        };
-      }, restStats);
+  });
+  const allFilenames = /* @__PURE__ */ new Set(), errorFilenames = /* @__PURE__ */ new Set(), queryFilenames = /* @__PURE__ */ new Set(), projectionFilenames = /* @__PURE__ */ new Set();
+  let errorCount = 0, queriesCount = 0, projectionsCount = 0, typeNodesGenerated = 0, unknownTypeNodesGenerated = 0, emptyUnionTypeNodesGenerated = 0;
+  const { fileCount } = await generator.getQueryFileCount();
+  report.event.fileCount({ fileCount });
+  for await (const { filename, ...result } of generator.getQueryResultDeclarations()) {
+    allFilenames.add(filename);
+    const progress = {
+      queriesCount,
+      projectionsCount,
+      filesCount: allFilenames.size
+    };
+    switch (result.type) {
+      case "error": {
+        errorCount += 1, errorFilenames.add(filename);
+        const errorMessage = typeof result.error == "object" && result.error !== null && "message" in result.error ? String(result.error.message) : "Unknown Error", message = `Error generating types in "${filename}": ${errorMessage}`;
+        report.stream.generatedQueryResultDeclaration.emit({ type: "error", message, progress });
+        continue;
+      }
+      case "queries": {
+        if (!result.queryResultDeclarations.length) {
+          report.stream.generatedQueryResultDeclaration.emit({ type: "progress", progress });
+          continue;
+        }
+        for (const { code, type, stats } of result.queryResultDeclarations)
+          queriesCount += type === "query" ? 1 : 0, projectionsCount += type === "projection" ? 1 : 0, typeNodesGenerated += stats.allTypes, unknownTypeNodesGenerated += stats.unknownTypes, emptyUnionTypeNodesGenerated += stats.emptyUnions, type === "projection" ? projectionFilenames.add(filename) : queryFilenames.add(filename), report.stream.generatedQueryResultDeclaration.emit({ type: "declaration", code, progress });
+        continue;
+      }
+      default:
+        continue;
     }
-    case "union":
-      return typeNode.of.length === 0 ? { allTypes: 1, unknownTypes: 0, emptyUnions: 1 } : typeNode.of.reduce(
-        (acc, type) => {
-          const { allTypes, unknownTypes, emptyUnions } = walkAndCountQueryTypeNodeStats(type);
-          return {
-            allTypes: acc.allTypes + allTypes,
-            unknownTypes: acc.unknownTypes + unknownTypes,
-            emptyUnions: acc.emptyUnions + emptyUnions
-          };
-        },
-        { allTypes: 1, unknownTypes: 0, emptyUnions: 0 }
-        // count the union type itself
-      );
-    default:
-      return { allTypes: 1, unknownTypes: 0, emptyUnions: 0 };
   }
+  report.stream.generatedQueryResultDeclaration.end(), report.event.generationComplete({
+    augmentedQueryResultDeclarations: await generator.getAugmentedQueryResultsDeclarations(),
+    queryStats: {
+      errorCount,
+      queriesCount,
+      projectionsCount,
+      typeNodesGenerated,
+      unknownTypeNodesGenerated,
+      emptyUnionTypeNodesGenerated,
+      totalScannedFilesCount: allFilenames.size,
+      filesWithErrors: errorFilenames.size,
+      queryFilesCount: queryFilenames.size,
+      projectionFilesCount: projectionFilenames.size,
+      unknownTypeNodesRatio: typeNodesGenerated > 0 ? unknownTypeNodesGenerated / typeNodesGenerated : 0
+    }
+  });
 }
+codegen.registerBabel();
 main();
 //# sourceMappingURL=typegenGenerate.js.map

package/lib/workers/typegenGenerate.js.map

@@ -1 +1 @@
-{"version":3,"file":"typegenGenerate.js","sources":["../../src/workers/typegenGenerate.ts"],"sourcesContent":["import {isMainThread, parentPort, workerData as _workerData} from 'node:worker_threads'\n\nimport {\n  findQueriesInPath,\n  getResolver,\n  readSchema,\n  registerBabel,\n  safeParseQuery,\n  TypeGenerator,\n} from '@sanity/codegen'\nimport createDebug from 'debug'\nimport {typeEvaluate, type TypeNode} from 'groq-js'\n\nconst $info = createDebug('sanity:codegen:generate:info')\nconst $warn = createDebug('sanity:codegen:generate:warn')\n\nexport interface TypegenGenerateTypesWorkerData {\n  workDir: string\n  workspaceName?: string\n  schemaPath: string\n  searchPath: string | string[]\n  overloadClientMethods?: boolean\n}\n\nexport type TypegenGenerateTypesWorkerMessage =\n  | {\n      type: 'error'\n      error: Error\n      fatal: boolean\n      query?: string\n      filename?: string\n    }\n  | {\n      type: 'types'\n      filename: string\n      types: {\n        queryName: string\n        query: string\n        type: string\n        unknownTypeNodesGenerated: number\n        typeNodesGenerated: number\n        emptyUnionTypeNodesGenerated: number\n      }[]\n    }\n  | {\n      type: 'schema'\n      filename: string\n      schema: string\n      length: number\n    }\n  | {\n      type: 'typemap'\n      typeMap: string\n    }\n  | {\n      type: 'complete'\n    }\n\nif (isMainThread || !parentPort) {\n  throw new Error('This module must be run as a worker thread')\n}\n\nconst opts = _workerData as TypegenGenerateTypesWorkerData\n\nregisterBabel()\n\nasync function main() {\n  const schema = await readSchema(opts.schemaPath)\n\n  const typeGenerator = new TypeGenerator(schema)\n  const schemaTypes = [typeGenerator.generateSchemaTypes(), TypeGenerator.generateKnownTypes()]\n    .join('\\n')\n    .trim()\n  const resolver = getResolver()\n\n  parentPort?.postMessage({\n    type: 'schema',\n    schema: `${schemaTypes.trim()}\\n`,\n    filename: 'schema.json',\n    length: schema.length,\n  } satisfies TypegenGenerateTypesWorkerMessage)\n\n  const queries = findQueriesInPath({\n    path: opts.searchPath,\n    resolver,\n  })\n\n  const allQueries = []\n\n  for await (const result of queries) {\n    if (result.type === 'error') {\n      parentPort?.postMessage({\n        type: 'error',\n        error: result.error,\n        fatal: false,\n        filename: result.filename,\n      } satisfies TypegenGenerateTypesWorkerMessage)\n      continue\n    }\n    $info(`Processing ${result.queries.length} queries in \"${result.filename}\"...`)\n\n    const fileQueryTypes: {\n      queryName: string\n      query: string\n      type: string\n      typeName: string\n      typeNode: TypeNode\n      unknownTypeNodesGenerated: number\n      typeNodesGenerated: number\n      emptyUnionTypeNodesGenerated: number\n    }[] = []\n    for (const {name: queryName, result: query} of result.queries) {\n      try {\n        const ast = safeParseQuery(query)\n        const queryTypes = typeEvaluate(ast, schema)\n\n        const typeName = `${queryName}Result`\n        const type = typeGenerator.generateTypeNodeTypes(typeName, queryTypes)\n\n        const queryTypeStats = walkAndCountQueryTypeNodeStats(queryTypes)\n        fileQueryTypes.push({\n          queryName,\n          query,\n          typeName,\n          typeNode: queryTypes,\n          type: `${type.trim()}\\n`,\n          unknownTypeNodesGenerated: queryTypeStats.unknownTypes,\n          typeNodesGenerated: queryTypeStats.allTypes,\n          emptyUnionTypeNodesGenerated: queryTypeStats.emptyUnions,\n        })\n      } catch (err) {\n        parentPort?.postMessage({\n          type: 'error',\n          error: new Error(\n            `Error generating types for query \"${queryName}\" in \"${result.filename}\": ${err.message}`,\n            {cause: err},\n          ),\n          fatal: false,\n          query,\n        } satisfies TypegenGenerateTypesWorkerMessage)\n      }\n    }\n\n    if (fileQueryTypes.length > 0) {\n      $info(`Generated types for ${fileQueryTypes.length} queries in \"${result.filename}\"\\n`)\n      parentPort?.postMessage({\n        type: 'types',\n        types: fileQueryTypes,\n        filename: result.filename,\n      } satisfies TypegenGenerateTypesWorkerMessage)\n    }\n\n    if (fileQueryTypes.length > 0) {\n      allQueries.push(...fileQueryTypes)\n    }\n  }\n\n  if (opts.overloadClientMethods && allQueries.length > 0) {\n    const typeMap = `${typeGenerator.generateQueryMap(allQueries).trim()}\\n`\n    parentPort?.postMessage({\n      type: 'typemap',\n      typeMap,\n    } satisfies TypegenGenerateTypesWorkerMessage)\n  }\n\n  parentPort?.postMessage({\n    type: 'complete',\n  } satisfies TypegenGenerateTypesWorkerMessage)\n}\n\nfunction walkAndCountQueryTypeNodeStats(typeNode: TypeNode): {\n  allTypes: number\n  unknownTypes: number\n  emptyUnions: number\n} {\n  switch (typeNode.type) {\n    case 'unknown': {\n      return {allTypes: 1, unknownTypes: 1, emptyUnions: 0}\n    }\n    case 'array': {\n      const acc = walkAndCountQueryTypeNodeStats(typeNode.of)\n      acc.allTypes += 1 // count the array type itself\n      return acc\n    }\n    case 'object': {\n      // if the rest is unknown, we count it as one unknown type\n      if (typeNode.rest && typeNode.rest.type === 'unknown') {\n        return {allTypes: 2, unknownTypes: 1, emptyUnions: 0} // count the object type itself as well\n      }\n\n      const restStats = typeNode.rest\n        ? walkAndCountQueryTypeNodeStats(typeNode.rest)\n        : {allTypes: 1, unknownTypes: 0, emptyUnions: 0} // count the object type itself\n\n      return Object.values(typeNode.attributes).reduce((acc, attribute) => {\n        const {allTypes, unknownTypes, emptyUnions} = walkAndCountQueryTypeNodeStats(\n          attribute.value,\n        )\n        return {\n          allTypes: acc.allTypes + allTypes,\n          unknownTypes: acc.unknownTypes + unknownTypes,\n          emptyUnions: acc.emptyUnions + emptyUnions,\n        }\n      }, restStats)\n    }\n    case 'union': {\n      if (typeNode.of.length === 0) {\n        return {allTypes: 1, unknownTypes: 0, emptyUnions: 1}\n      }\n\n      return typeNode.of.reduce(\n        (acc, type) => {\n          const {allTypes, unknownTypes, emptyUnions} = walkAndCountQueryTypeNodeStats(type)\n          return {\n            allTypes: acc.allTypes + allTypes,\n            unknownTypes: acc.unknownTypes + unknownTypes,\n            emptyUnions: acc.emptyUnions + emptyUnions,\n          }\n        },\n        {allTypes: 1, unknownTypes: 0, emptyUnions: 0}, // count the union type itself\n      )\n    }\n    default: {\n      return {allTypes: 1, unknownTypes: 0, emptyUnions: 0}\n    }\n  }\n}\n\nmain()\n"],"names":["createDebug","isMainThread","parentPort","_workerData","registerBabel","readSchema","TypeGenerator","getResolver","findQueriesInPath","safeParseQuery","typeEvaluate"],"mappings":"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"}
+{"version":3,"file":"typegenGenerate.js","sources":["../../src/workers/typegenGenerate.ts"],"sourcesContent":["/* eslint-disable max-statements */\nimport {stat} from 'node:fs/promises'\nimport {isMainThread, parentPort, workerData as _workerData} from 'node:worker_threads'\n\nimport {\n  DEFAULT_CONFIG,\n  findQueriesInPath,\n  getResolver,\n  readSchema,\n  registerBabel,\n  TypeGenerator,\n} from '@sanity/codegen'\nimport {type SchemaType} from 'groq-js'\n\nimport {\n  createReporter,\n  type WorkerChannel,\n  type WorkerChannelEvent,\n  type WorkerChannelStream,\n} from '../util/workerChannel'\n\nconst DEFAULT_SCHEMA_PATH = DEFAULT_CONFIG.schemas[0].schemaPath\n\nexport interface TypegenGenerateTypesWorkerData {\n  workDir: string\n  schemas: {schemaPath: string; schemaId: string}[]\n  searchPath: string | string[]\n  overloadClientMethods: boolean\n  augmentGroqModule: boolean\n}\n\ninterface QueryProgress {\n  queriesCount: number\n  projectionsCount: number\n  filesCount: number\n}\n\n/** @internal */\nexport type TypegenWorkerChannel = WorkerChannel<{\n  loadedSchemas: WorkerChannelEvent\n  generatedSchemaDeclarations: WorkerChannelEvent<{\n    code: string\n    schemaStats: {\n      schemaTypesCount: number\n      schemaCount: number\n    }\n  }>\n  fileCount: WorkerChannelEvent<{fileCount: number}>\n  generatedQueryResultDeclaration: WorkerChannelStream<\n    | {\n        type: 'progress'\n        progress: QueryProgress\n      }\n    | {\n        type: 'declaration'\n        code: string\n        progress: QueryProgress\n      }\n    | {\n        type: 'error'\n        message: string\n        progress: QueryProgress\n      }\n  >\n  generationComplete: WorkerChannelEvent<{\n    augmentedQueryResultDeclarations: {code: string}\n    queryStats: {\n      queriesCount: number\n      projectionsCount: number\n      totalScannedFilesCount: number\n      queryFilesCount: number\n      projectionFilesCount: number\n      filesWithErrors: number\n      errorCount: number\n      typeNodesGenerated: number\n      unknownTypeNodesGenerated: number\n      unknownTypeNodesRatio: number\n      emptyUnionTypeNodesGenerated: number\n    }\n  }>\n}>\n\nif (isMainThread || !parentPort) {\n  throw new Error('This module must be run as a worker thread')\n}\n\nconst report = createReporter<TypegenWorkerChannel>(parentPort)\nconst opts = _workerData as TypegenGenerateTypesWorkerData\n\nasync function main() {\n  const schemas: {schema: SchemaType; schemaId: string; filename: string}[] = []\n\n  for (const {schemaId, schemaPath} of opts.schemas) {\n    try {\n      const schemaStats = await stat(schemaPath)\n      if (!schemaStats.isFile()) {\n        throw new Error(\n          `Failed to load schema \"${schemaId}\". Schema path is not a file: ${schemaPath}`,\n        )\n      }\n\n      const schema = await readSchema(schemaPath)\n      schemas.push({schema, schemaId, filename: schemaPath})\n    } catch (err) {\n      if (err.code === 'ENOENT') {\n        // If the user has not provided a specific schema path (eg we're using the default), give some help\n        const hint =\n          schemaPath === DEFAULT_SCHEMA_PATH ? ` - did you run \"sanity schema extract\"?` : ''\n        throw new Error(`Schema file not found for schema \"${schemaId}\": ${schemaPath}${hint}`)\n      } else {\n        throw err\n      }\n    }\n  }\n  report.event.loadedSchemas()\n\n  const generator = new TypeGenerator({\n    schemas,\n    queriesByFile: findQueriesInPath({path: opts.searchPath, resolver: getResolver()}),\n    augmentGroqModule: opts.augmentGroqModule,\n    overloadClientMethods: opts.overloadClientMethods,\n  })\n\n  report.event.generatedSchemaDeclarations({\n    code: [\n      generator.getKnownTypes().code,\n      ...generator.getSchemaTypeDeclarations().map((i) => i.code),\n      generator.getAllSanitySchemaTypesDeclaration().code,\n      ...generator.getSchemaDeclarations().map((i) => i.code),\n      generator.getAugmentedSchemasDeclarations().code,\n    ].join('\\n'),\n    schemaStats: {\n      schemaTypesCount: generator.getSchemaTypeDeclarations().length,\n      schemaCount: schemas.length,\n    },\n  })\n\n  const allFilenames = new Set<string>()\n  const errorFilenames = new Set<string>()\n  const queryFilenames = new Set<string>()\n  const projectionFilenames = new Set<string>()\n\n  let errorCount = 0\n  let queriesCount = 0\n  let projectionsCount = 0\n  let typeNodesGenerated = 0\n  let unknownTypeNodesGenerated = 0\n  let emptyUnionTypeNodesGenerated = 0\n\n  const {fileCount} = await generator.getQueryFileCount()\n  report.event.fileCount({fileCount})\n\n  for await (const {filename, ...result} of generator.getQueryResultDeclarations()) {\n    allFilenames.add(filename)\n    const progress = {\n      queriesCount,\n      projectionsCount,\n      filesCount: allFilenames.size,\n    }\n\n    switch (result.type) {\n      case 'error': {\n        errorCount += 1\n        errorFilenames.add(filename)\n\n        const errorMessage =\n          typeof result.error === 'object' && result.error !== null && 'message' in result.error\n            ? String(result.error.message)\n            : 'Unknown Error'\n\n        const message = `Error generating types in \"${filename}\": ${errorMessage}`\n        report.stream.generatedQueryResultDeclaration.emit({type: 'error', message, progress})\n        continue\n      }\n\n      case 'queries': {\n        if (!result.queryResultDeclarations.length) {\n          report.stream.generatedQueryResultDeclaration.emit({type: 'progress', progress})\n          continue\n        }\n\n        for (const {code, type, stats} of result.queryResultDeclarations) {\n          queriesCount += type === 'query' ? 1 : 0\n          projectionsCount += type === 'projection' ? 1 : 0\n          typeNodesGenerated += stats.allTypes\n          unknownTypeNodesGenerated += stats.unknownTypes\n          emptyUnionTypeNodesGenerated += stats.emptyUnions\n\n          if (type === 'projection') {\n            projectionFilenames.add(filename)\n          } else {\n            queryFilenames.add(filename)\n          }\n\n          report.stream.generatedQueryResultDeclaration.emit({type: 'declaration', code, progress})\n        }\n        continue\n      }\n\n      default: {\n        continue\n      }\n    }\n  }\n  report.stream.generatedQueryResultDeclaration.end()\n\n  report.event.generationComplete({\n    augmentedQueryResultDeclarations: await generator.getAugmentedQueryResultsDeclarations(),\n    queryStats: {\n      errorCount,\n      queriesCount,\n      projectionsCount,\n      typeNodesGenerated,\n      unknownTypeNodesGenerated,\n      emptyUnionTypeNodesGenerated,\n      totalScannedFilesCount: allFilenames.size,\n      filesWithErrors: errorFilenames.size,\n      queryFilesCount: queryFilenames.size,\n      projectionFilesCount: projectionFilenames.size,\n      unknownTypeNodesRatio:\n        typeNodesGenerated > 0 ? unknownTypeNodesGenerated / typeNodesGenerated : 0,\n    },\n  })\n}\n\nregisterBabel()\nmain()\n"],"names":["DEFAULT_CONFIG","isMainThread","parentPort","createReporter","_workerData","stat","readSchema","TypeGenerator","findQueriesInPath","getResolver","registerBabel"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/cli",
-  "version": "3.88.0",
+  "version": "3.88.1-typegen-experimental.0",
   "description": "Sanity CLI tool for managing Sanity installations, managing plugins, schemas and datasets",
   "keywords": [
     "sanity",
@@ -46,24 +46,13 @@
     "src",
     "templates"
   ],
-  "scripts": {
-    "build": "pkg-utils build --strict --check --clean",
-    "check:types": "tsc --project tsconfig.lib.json",
-    "clean": "rimraf lib",
-    "lint": "eslint --cache .",
-    "prepublishOnly": "turbo run build",
-    "test": "vitest",
-    "ts": "node -r esbuild-register",
-    "watch": "pkg-utils watch"
-  },
   "dependencies": {
     "@babel/traverse": "^7.23.5",
     "@sanity/client": "^7.1.0",
-    "@sanity/codegen": "3.88.0",
-    "@sanity/runtime-cli": "^3.0.0",
+    "@sanity/runtime-cli": "^6.1.1",
     "@sanity/telemetry": "^0.8.0",
     "@sanity/template-validator": "^2.4.3",
-    "@sanity/util": "3.88.0",
+    "@sanity/util": "3.88.1",
     "chalk": "^4.1.2",
     "debug": "^4.3.4",
     "decompress": "^4.2.0",
@@ -74,16 +63,14 @@
     "pkg-dir": "^5.0.0",
     "prettier": "^3.3.0",
     "semver": "^7.3.5",
-    "validate-npm-package-name": "^3.0.0"
+    "validate-npm-package-name": "^3.0.0",
+    "@sanity/codegen": "3.88.1-typegen-experimental.0"
   },
   "devDependencies": {
-    "@repo/package.config": "3.88.0",
-    "@repo/test-config": "3.88.0",
     "@rexxars/gitconfiglocal": "^3.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@sanity/eslint-config-studio": "^4.0.0",
     "@sanity/generate-help-url": "^3.0.0",
-    "@sanity/types": "3.88.0",
     "@types/babel__traverse": "^7.20.5",
     "@types/configstore": "^5.0.1",
     "@types/cpx": "^1.5.2",
@@ -130,10 +117,21 @@
     "vite": "^6.2.4",
     "vitest": "^3.1.1",
     "which": "^2.0.2",
-    "xdg-basedir": "^4.0.0"
+    "xdg-basedir": "^4.0.0",
+    "@repo/package.config": "3.88.1",
+    "@repo/test-config": "3.88.1",
+    "@sanity/types": "3.88.1"
   },
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "0e6a13c8ff235c14612a8a0f6cf0cd227a96c275"
-}
+  "scripts": {
+    "build": "pkg-utils build --strict --check --clean",
+    "check:types": "tsc --project tsconfig.lib.json",
+    "clean": "rimraf lib",
+    "lint": "eslint --cache .",
+    "test": "vitest",
+    "ts": "node -r esbuild-register",
+    "watch": "pkg-utils watch"
+  }
+}

package/src/actions/typegen/generate.telemetry.ts

@@ -1,20 +1,26 @@
 import {defineTrace} from '@sanity/telemetry'
 
-interface TypesGeneratedTraceAttrubutes {
+interface TypesGeneratedTraceAttributes {
   outputSize: number
   queriesCount: number
+  projectionsCount: number
   schemaTypesCount: number
+  schemaCount: number
+  totalScannedFilesCount: number
   queryFilesCount: number
+  projectionFilesCount: number
   filesWithErrors: number
+  errorCount: number
   typeNodesGenerated: number
   unknownTypeNodesGenerated: number
   unknownTypeNodesRatio: number
   emptyUnionTypeNodesGenerated: number
   configOverloadClientMethods: boolean
+  configAugmentGroqModule: boolean
 }
 
-export const TypesGeneratedTrace = defineTrace<TypesGeneratedTraceAttrubutes>({
+export const TypesGeneratedTrace = defineTrace<TypesGeneratedTraceAttributes>({
   name: 'Types Generated',
-  version: 0,
+  version: 1,
   description: 'Trace emitted when generating TypeScript types for queries',
 })