@sanity/codegen 5.7.2-watch-mode.2 → 5.7.2-watch-mode.4

package/dist/_exports/index.js

@@ -4,6 +4,7 @@ export { TypegenGenerateCommand } from '../commands/typegen/generate.js';
 export { configDefinition, readConfig } from '../readConfig.js';
 export { readSchema } from '../readSchema.js';
 export { safeParseQuery } from '../safeParseQuery.js';
+export { TypegenWatchModeTrace, TypesGeneratedTrace } from '../typegen.telemetry.js';
 export { findQueriesInPath } from '../typescript/findQueriesInPath.js';
 export { findQueriesInSource } from '../typescript/findQueriesInSource.js';
 export { getResolver } from '../typescript/moduleResolver.js';

package/dist/_exports/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/_exports/index.ts"],"sourcesContent":["export {runTypegenGenerate} from '../actions/typegenGenerate.js'\nexport {runTypegenWatcher} from '../actions/typegenWatch.js'\nexport {type GenerationResult, type RunTypegenOptions} from '../actions/types.js'\nexport {TypegenGenerateCommand} from '../commands/typegen/generate.js'\nexport {\n  type CodegenConfig,\n  configDefinition,\n  readConfig,\n  type TypeGenConfig,\n} from '../readConfig.js'\nexport {readSchema} from '../readSchema.js'\nexport {safeParseQuery} from '../safeParseQuery.js'\nexport {findQueriesInPath} from '../typescript/findQueriesInPath.js'\nexport {findQueriesInSource} from '../typescript/findQueriesInSource.js'\nexport {getResolver} from '../typescript/moduleResolver.js'\nexport {registerBabel} from '../typescript/registerBabel.js'\nexport {\n  type GenerateTypesOptions,\n  TypeGenerator,\n  type TypegenWorkerChannel,\n} from '../typescript/typeGenerator.js'\nexport {\n  type EvaluatedModule,\n  type EvaluatedQuery,\n  type ExtractedModule,\n  type ExtractedQuery,\n  QueryExtractionError,\n} from '../typescript/types.js'\nexport {type FilterByType, type Get} from '../typeUtils.js'\n"],"names":["runTypegenGenerate","runTypegenWatcher","TypegenGenerateCommand","configDefinition","readConfig","readSchema","safeParseQuery","findQueriesInPath","findQueriesInSource","getResolver","registerBabel","TypeGenerator","QueryExtractionError"],"mappings":"AAAA,SAAQA,kBAAkB,QAAO,gCAA+B;AAChE,SAAQC,iBAAiB,QAAO,6BAA4B;AAE5D,SAAQC,sBAAsB,QAAO,kCAAiC;AACtE,SAEEC,gBAAgB,EAChBC,UAAU,QAEL,mBAAkB;AACzB,SAAQC,UAAU,QAAO,mBAAkB;AAC3C,SAAQC,cAAc,QAAO,uBAAsB;AACnD,SAAQC,iBAAiB,QAAO,qCAAoC;AACpE,SAAQC,mBAAmB,QAAO,uCAAsC;AACxE,SAAQC,WAAW,QAAO,kCAAiC;AAC3D,SAAQC,aAAa,QAAO,iCAAgC;AAC5D,SAEEC,aAAa,QAER,iCAAgC;AACvC,SAKEC,oBAAoB,QACf,yBAAwB"}
+{"version":3,"sources":["../../src/_exports/index.ts"],"sourcesContent":["export {runTypegenGenerate} from '../actions/typegenGenerate.js'\nexport {runTypegenWatcher} from '../actions/typegenWatch.js'\nexport {type GenerationResult, type RunTypegenOptions} from '../actions/types.js'\nexport {TypegenGenerateCommand} from '../commands/typegen/generate.js'\nexport {\n  type CodegenConfig,\n  configDefinition,\n  readConfig,\n  type TypeGenConfig,\n} from '../readConfig.js'\nexport {readSchema} from '../readSchema.js'\nexport {safeParseQuery} from '../safeParseQuery.js'\nexport {TypegenWatchModeTrace, TypesGeneratedTrace} from '../typegen.telemetry.js'\nexport {findQueriesInPath} from '../typescript/findQueriesInPath.js'\nexport {findQueriesInSource} from '../typescript/findQueriesInSource.js'\nexport {getResolver} from '../typescript/moduleResolver.js'\nexport {registerBabel} from '../typescript/registerBabel.js'\nexport {\n  type GenerateTypesOptions,\n  TypeGenerator,\n  type TypegenWorkerChannel,\n} from '../typescript/typeGenerator.js'\nexport {\n  type EvaluatedModule,\n  type EvaluatedQuery,\n  type ExtractedModule,\n  type ExtractedQuery,\n  QueryExtractionError,\n} from '../typescript/types.js'\nexport {type FilterByType, type Get} from '../typeUtils.js'\n"],"names":["runTypegenGenerate","runTypegenWatcher","TypegenGenerateCommand","configDefinition","readConfig","readSchema","safeParseQuery","TypegenWatchModeTrace","TypesGeneratedTrace","findQueriesInPath","findQueriesInSource","getResolver","registerBabel","TypeGenerator","QueryExtractionError"],"mappings":"AAAA,SAAQA,kBAAkB,QAAO,gCAA+B;AAChE,SAAQC,iBAAiB,QAAO,6BAA4B;AAE5D,SAAQC,sBAAsB,QAAO,kCAAiC;AACtE,SAEEC,gBAAgB,EAChBC,UAAU,QAEL,mBAAkB;AACzB,SAAQC,UAAU,QAAO,mBAAkB;AAC3C,SAAQC,cAAc,QAAO,uBAAsB;AACnD,SAAQC,qBAAqB,EAAEC,mBAAmB,QAAO,0BAAyB;AAClF,SAAQC,iBAAiB,QAAO,qCAAoC;AACpE,SAAQC,mBAAmB,QAAO,uCAAsC;AACxE,SAAQC,WAAW,QAAO,kCAAiC;AAC3D,SAAQC,aAAa,QAAO,iCAAgC;AAC5D,SAEEC,aAAa,QAER,iCAAgC;AACvC,SAKEC,oBAAoB,QACf,yBAAwB"}

package/dist/actions/streamProcessor.js

@@ -1,6 +1,7 @@
 import { debug } from 'node:console';
 import { writeFile } from 'node:fs/promises';
 import { spinner } from '@sanity/cli-core/ux';
+import { format, resolveConfig as resolvePrettierConfig } from 'prettier';
 import { count } from '../utils/count.js';
 import { formatPath } from '../utils/formatPath.js';
 import { getMessage } from '../utils/getMessage.js';
@@ -60,9 +61,8 @@ import { generatedFileWarning } from './generatedFileWarning.js';
         if (formatGeneratedCode) {
             spin.text = `Formatting generated types with prettier…`;
             try {
-                const prettier = await import('prettier');
-                const prettierConfig = await prettier.resolveConfig(generates);
-                const formattedCode = await prettier.format(code, {
+                const prettierConfig = await resolvePrettierConfig(generates);
+                const formattedCode = await format(code, {
                     ...prettierConfig,
                     parser: 'typescript'
                 });

package/dist/actions/streamProcessor.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/actions/streamProcessor.ts"],"sourcesContent":["import {debug} from 'node:console'\nimport {writeFile} from 'node:fs/promises'\n\nimport {spinner} from '@sanity/cli-core/ux'\nimport {WorkerChannelReceiver} from '@sanity/worker-channels'\n\nimport {count} from '../utils/count.js'\nimport {formatPath} from '../utils/formatPath.js'\nimport {getMessage} from '../utils/getMessage.js'\nimport {percent} from '../utils/percent.js'\nimport {generatedFileWarning} from './generatedFileWarning.js'\nimport {type RunTypegenOptions, TypegenWorkerChannel} from './types.js'\n\n/**\n * Processes the event stream from a typegen worker thread.\n *\n * Listens to worker channel events, displays progress via CLI spinners,\n * writes the generated types to disk, and optionally formats with prettier.\n *\n * @param receiver - Worker channel receiver for typegen events\n * @param options - Typegen configuration options\n * @returns Generation result containing the generated code and statistics\n */\nexport async function processTypegenWorkerStream(\n  receiver: WorkerChannelReceiver<TypegenWorkerChannel>,\n  options: RunTypegenOptions['config'],\n) {\n  const start = Date.now()\n  const {formatGeneratedCode, generates, schema} = options\n  let code = ''\n\n  try {\n    const spin = spinner().start(`Loading schema…`)\n\n    await receiver.event.loadedSchema()\n    spin.succeed(`Schema loaded from ${formatPath(schema ?? '')}`)\n\n    spin.start('Generating schema types…')\n    const {expectedFileCount} = await receiver.event.typegenStarted()\n    const {schemaTypeDeclarations} = await receiver.event.generatedSchemaTypes()\n    const schemaTypesCount = schemaTypeDeclarations.length\n\n    spin.text = 'Generating query types…'\n    let queriesCount = 0\n    let evaluatedFiles = 0\n    let filesWithErrors = 0\n    let queryFilesCount = 0\n    let typeNodesGenerated = 0\n    let unknownTypeNodesGenerated = 0\n    let emptyUnionTypeNodesGenerated = 0\n\n    for await (const {errors, queries} of receiver.stream.evaluatedModules()) {\n      evaluatedFiles++\n      queriesCount += queries.length\n      queryFilesCount += queries.length > 0 ? 1 : 0\n      filesWithErrors += errors.length > 0 ? 1 : 0\n\n      for (const {stats} of queries) {\n        typeNodesGenerated += stats.allTypes\n        unknownTypeNodesGenerated += stats.unknownTypes\n        emptyUnionTypeNodesGenerated += stats.emptyUnions\n      }\n\n      for (const error of errors) {\n        spin.fail(getMessage(error))\n      }\n\n      if (!spin.isSpinning) {\n        spin.start()\n      }\n\n      spin.text =\n        `Generating query types… (${percent(evaluatedFiles / expectedFileCount)})\\n` +\n        `  └─ Processed ${count(evaluatedFiles)} of ${count(expectedFileCount, 'files')}. ` +\n        `Found ${count(queriesCount, 'queries', 'query')} from ${count(queryFilesCount, 'files')}.`\n    }\n\n    const result = await receiver.event.typegenComplete()\n    code = `${generatedFileWarning}${result.code}`\n    await writeFile(generates, code)\n\n    let formattingError = false\n    if (formatGeneratedCode) {\n      spin.text = `Formatting generated types with prettier…`\n\n      try {\n        const prettier = await import('prettier')\n        const prettierConfig = await prettier.resolveConfig(generates)\n        const formattedCode = await prettier.format(code, {\n          ...prettierConfig,\n          parser: 'typescript' as const,\n        })\n        await writeFile(generates, formattedCode)\n      } catch (err) {\n        formattingError = true\n        spin.warn(`Failed to format generated types with prettier: ${getMessage(err)}`)\n      }\n    }\n\n    if (filesWithErrors > 0) {\n      spin.warn(`Encountered errors in ${count(filesWithErrors, 'files')} while generating types`)\n    }\n\n    const stats = {\n      duration: Date.now() - start,\n      emptyUnionTypeNodesGenerated,\n      filesWithErrors,\n      outputSize: Buffer.byteLength(code),\n      queriesCount,\n      queryFilesCount,\n      schemaTypesCount,\n      typeNodesGenerated,\n      unknownTypeNodesGenerated,\n      unknownTypeNodesRatio:\n        typeNodesGenerated > 0 ? unknownTypeNodesGenerated / typeNodesGenerated : 0,\n    }\n\n    let successText =\n      `Successfully generated types to ${formatPath(generates)} in ${Number(stats.duration).toFixed(0)}ms` +\n      `\\n  └─ ${count(queriesCount, 'queries', 'query')} and ${count(schemaTypesCount, 'schema types', 'schema type')}` +\n      `\\n  └─ found queries in ${count(queryFilesCount, 'files', 'file')} after evaluating ${count(evaluatedFiles, 'files', 'file')}`\n\n    if (formatGeneratedCode) {\n      successText += `\\n  └─ ${formattingError ? 'an error occured during formatting' : 'formatted the generated code with prettier'}`\n    }\n\n    spin.succeed(successText)\n\n    return {\n      ...stats,\n      code,\n    }\n  } catch (err) {\n    debug('error generating types', err)\n    throw err\n  } finally {\n    receiver.unsubscribe()\n  }\n}\n"],"names":["debug","writeFile","spinner","count","formatPath","getMessage","percent","generatedFileWarning","processTypegenWorkerStream","receiver","options","start","Date","now","formatGeneratedCode","generates","schema","code","spin","event","loadedSchema","succeed","expectedFileCount","typegenStarted","schemaTypeDeclarations","generatedSchemaTypes","schemaTypesCount","length","text","queriesCount","evaluatedFiles","filesWithErrors","queryFilesCount","typeNodesGenerated","unknownTypeNodesGenerated","emptyUnionTypeNodesGenerated","errors","queries","stream","evaluatedModules","stats","allTypes","unknownTypes","emptyUnions","error","fail","isSpinning","result","typegenComplete","formattingError","prettier","prettierConfig","resolveConfig","formattedCode","format","parser","err","warn","duration","outputSize","Buffer","byteLength","unknownTypeNodesRatio","successText","Number","toFixed","unsubscribe"],"mappings":"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"}
+{"version":3,"sources":["../../src/actions/streamProcessor.ts"],"sourcesContent":["import {debug} from 'node:console'\nimport {writeFile} from 'node:fs/promises'\n\nimport {spinner} from '@sanity/cli-core/ux'\nimport {WorkerChannelReceiver} from '@sanity/worker-channels'\nimport {format, resolveConfig as resolvePrettierConfig} from 'prettier'\n\nimport {count} from '../utils/count.js'\nimport {formatPath} from '../utils/formatPath.js'\nimport {getMessage} from '../utils/getMessage.js'\nimport {percent} from '../utils/percent.js'\nimport {generatedFileWarning} from './generatedFileWarning.js'\nimport {type RunTypegenOptions, TypegenWorkerChannel} from './types.js'\n\n/**\n * Processes the event stream from a typegen worker thread.\n *\n * Listens to worker channel events, displays progress via CLI spinners,\n * writes the generated types to disk, and optionally formats with prettier.\n *\n * @param receiver - Worker channel receiver for typegen events\n * @param options - Typegen configuration options\n * @returns Generation result containing the generated code and statistics\n */\nexport async function processTypegenWorkerStream(\n  receiver: WorkerChannelReceiver<TypegenWorkerChannel>,\n  options: RunTypegenOptions['config'],\n) {\n  const start = Date.now()\n  const {formatGeneratedCode, generates, schema} = options\n  let code = ''\n\n  try {\n    const spin = spinner().start(`Loading schema…`)\n\n    await receiver.event.loadedSchema()\n    spin.succeed(`Schema loaded from ${formatPath(schema ?? '')}`)\n\n    spin.start('Generating schema types…')\n    const {expectedFileCount} = await receiver.event.typegenStarted()\n    const {schemaTypeDeclarations} = await receiver.event.generatedSchemaTypes()\n    const schemaTypesCount = schemaTypeDeclarations.length\n\n    spin.text = 'Generating query types…'\n    let queriesCount = 0\n    let evaluatedFiles = 0\n    let filesWithErrors = 0\n    let queryFilesCount = 0\n    let typeNodesGenerated = 0\n    let unknownTypeNodesGenerated = 0\n    let emptyUnionTypeNodesGenerated = 0\n\n    for await (const {errors, queries} of receiver.stream.evaluatedModules()) {\n      evaluatedFiles++\n      queriesCount += queries.length\n      queryFilesCount += queries.length > 0 ? 1 : 0\n      filesWithErrors += errors.length > 0 ? 1 : 0\n\n      for (const {stats} of queries) {\n        typeNodesGenerated += stats.allTypes\n        unknownTypeNodesGenerated += stats.unknownTypes\n        emptyUnionTypeNodesGenerated += stats.emptyUnions\n      }\n\n      for (const error of errors) {\n        spin.fail(getMessage(error))\n      }\n\n      if (!spin.isSpinning) {\n        spin.start()\n      }\n\n      spin.text =\n        `Generating query types… (${percent(evaluatedFiles / expectedFileCount)})\\n` +\n        `  └─ Processed ${count(evaluatedFiles)} of ${count(expectedFileCount, 'files')}. ` +\n        `Found ${count(queriesCount, 'queries', 'query')} from ${count(queryFilesCount, 'files')}.`\n    }\n\n    const result = await receiver.event.typegenComplete()\n    code = `${generatedFileWarning}${result.code}`\n    await writeFile(generates, code)\n\n    let formattingError = false\n    if (formatGeneratedCode) {\n      spin.text = `Formatting generated types with prettier…`\n\n      try {\n        const prettierConfig = await resolvePrettierConfig(generates)\n        const formattedCode = await format(code, {\n          ...prettierConfig,\n          parser: 'typescript' as const,\n        })\n        await writeFile(generates, formattedCode)\n      } catch (err) {\n        formattingError = true\n        spin.warn(`Failed to format generated types with prettier: ${getMessage(err)}`)\n      }\n    }\n\n    if (filesWithErrors > 0) {\n      spin.warn(`Encountered errors in ${count(filesWithErrors, 'files')} while generating types`)\n    }\n\n    const stats = {\n      duration: Date.now() - start,\n      emptyUnionTypeNodesGenerated,\n      filesWithErrors,\n      outputSize: Buffer.byteLength(code),\n      queriesCount,\n      queryFilesCount,\n      schemaTypesCount,\n      typeNodesGenerated,\n      unknownTypeNodesGenerated,\n      unknownTypeNodesRatio:\n        typeNodesGenerated > 0 ? unknownTypeNodesGenerated / typeNodesGenerated : 0,\n    }\n\n    let successText =\n      `Successfully generated types to ${formatPath(generates)} in ${Number(stats.duration).toFixed(0)}ms` +\n      `\\n  └─ ${count(queriesCount, 'queries', 'query')} and ${count(schemaTypesCount, 'schema types', 'schema type')}` +\n      `\\n  └─ found queries in ${count(queryFilesCount, 'files', 'file')} after evaluating ${count(evaluatedFiles, 'files', 'file')}`\n\n    if (formatGeneratedCode) {\n      successText += `\\n  └─ ${formattingError ? 'an error occured during formatting' : 'formatted the generated code with prettier'}`\n    }\n\n    spin.succeed(successText)\n\n    return {\n      ...stats,\n      code,\n    }\n  } catch (err) {\n    debug('error generating types', err)\n    throw err\n  } finally {\n    receiver.unsubscribe()\n  }\n}\n"],"names":["debug","writeFile","spinner","format","resolveConfig","resolvePrettierConfig","count","formatPath","getMessage","percent","generatedFileWarning","processTypegenWorkerStream","receiver","options","start","Date","now","formatGeneratedCode","generates","schema","code","spin","event","loadedSchema","succeed","expectedFileCount","typegenStarted","schemaTypeDeclarations","generatedSchemaTypes","schemaTypesCount","length","text","queriesCount","evaluatedFiles","filesWithErrors","queryFilesCount","typeNodesGenerated","unknownTypeNodesGenerated","emptyUnionTypeNodesGenerated","errors","queries","stream","evaluatedModules","stats","allTypes","unknownTypes","emptyUnions","error","fail","isSpinning","result","typegenComplete","formattingError","prettierConfig","formattedCode","parser","err","warn","duration","outputSize","Buffer","byteLength","unknownTypeNodesRatio","successText","Number","toFixed","unsubscribe"],"mappings":"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"}

package/dist/commands/typegen/generate.js

@@ -1,6 +1,6 @@
 import { stat } from 'node:fs/promises';
 import { Flags } from '@oclif/core';
-import { SanityCommand } from '@sanity/cli-core';
+import { SanityCommand, subdebug } from '@sanity/cli-core';
 import { chalk, spinner } from '@sanity/cli-core/ux';
 import { omit, once } from 'lodash-es';
 import { runTypegenGenerate } from '../../actions/typegenGenerate.js';
@@ -9,6 +9,7 @@ import { configDefinition, readConfig } from '../../readConfig.js';
 import { TypegenWatchModeTrace, TypesGeneratedTrace } from '../../typegen.telemetry.js';
 import { promiseWithResolvers } from '../../utils/promiseWithResolvers.js';
 import { telemetry } from '../../utils/telemetryLogger.js';
+const debug = subdebug('typegen:generate');
 const description = `Sanity TypeGen (Beta)
 This command is currently in beta and may undergo significant changes. Feedback is welcome!
 
@@ -44,6 +45,7 @@ ${chalk.bold('Note:')}
             description: '[Default: sanity-typegen.json] Specifies the path to the typegen configuration file. This file should be a JSON file that contains settings for the type generation process.'
         }),
         watch: Flags.boolean({
+            default: false,
             description: '[Default: false] Run the typegen in watch mode'
         })
     };
@@ -131,8 +133,8 @@ ${chalk.bold('Note:')}
             });
             trace.complete();
         } catch (error) {
+            debug(error);
             trace.error(error);
-            trace.complete();
             this.error(`${error instanceof Error ? error.message : 'Unknown error'}`, {
                 exit: 1
             });
@@ -155,6 +157,7 @@ ${chalk.bold('Note:')}
                     step: 'stopped',
                     ...typegenWatcher.getStats()
                 });
+                trace.complete();
                 await typegenWatcher.stop();
                 resolve();
             });
@@ -162,8 +165,8 @@ ${chalk.bold('Note:')}
             process.on('SIGTERM', stop);
             await promise;
         } catch (error) {
+            debug(error);
             trace.error(error);
-            trace.complete();
             this.error(`${error instanceof Error ? error.message : 'Unknown error'}`, {
                 exit: 1
             });

package/dist/commands/typegen/generate.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/commands/typegen/generate.ts"],"sourcesContent":["import {stat} from 'node:fs/promises'\n\nimport {Flags} from '@oclif/core'\nimport {SanityCommand} from '@sanity/cli-core'\nimport {chalk, spinner} from '@sanity/cli-core/ux'\nimport {omit, once} from 'lodash-es'\n\nimport {runTypegenGenerate} from '../../actions/typegenGenerate.js'\nimport {runTypegenWatcher} from '../../actions/typegenWatch.js'\nimport {configDefinition, readConfig, type TypeGenConfig} from '../../readConfig.js'\nimport {TypegenWatchModeTrace, TypesGeneratedTrace} from '../../typegen.telemetry.js'\nimport {promiseWithResolvers} from '../../utils/promiseWithResolvers.js'\nimport {telemetry} from '../../utils/telemetryLogger.js'\n\nconst description = `Sanity TypeGen (Beta)\nThis command is currently in beta and may undergo significant changes. Feedback is welcome!\n\n${chalk.bold('Configuration:')}\nThis command can utilize configuration settings defined in a \\`sanity-typegen.json\\` file. These settings include:\n\n- \"path\": Specifies a glob pattern to locate your TypeScript or JavaScript files.\n  Default: \"./src/**/*.{ts,tsx,js,jsx}\"\n\n- \"schema\": Defines the path to your Sanity schema file. This file should be generated using the \\`sanity schema extract\\` command.\n  Default: \"schema.json\"\n\n- \"generates\": Indicates the path where the generated TypeScript type definitions will be saved.\n  Default: \"./sanity.types.ts\"\n\nThe default configuration values listed above are used if not overridden in your \\`sanity-typegen.json\\` configuration file. To customize the behavior of the type generation, adjust these properties in the configuration file according to your project's needs.\n\n${chalk.bold('Note:')}\n- The \\`sanity schema extract\\` command is a prerequisite for extracting your Sanity Studio schema into a \\`schema.json\\` file, which is then used by the \\`sanity typegen generate\\` command to generate type definitions.\n- While this tool is in beta, we encourage you to experiment with these configurations and provide feedback to help improve its functionality and usability.`.trim()\n\n/**\n * @internal\n */\nexport class TypegenGenerateCommand extends SanityCommand<typeof TypegenGenerateCommand> {\n  static override description = description\n\n  static override examples = [\n    {\n      command: '<%= config.bin %> <%= command.id %>',\n      description: `Generate TypeScript type definitions from a Sanity Studio schema extracted using the \\`sanity schema extract\\` command.`,\n    },\n  ]\n\n  static override flags = {\n    'config-path': Flags.string({\n      description:\n        '[Default: sanity-typegen.json] Specifies the path to the typegen configuration file. This file should be a JSON file that contains settings for the type generation process.',\n    }),\n    watch: Flags.boolean({\n      description: '[Default: false] Run the typegen in watch mode',\n    }),\n  }\n\n  public async run() {\n    const {flags} = await this.parse(TypegenGenerateCommand)\n\n    if (flags.watch) {\n      await this.runWatcher()\n      return\n    }\n\n    await this.runSingle()\n  }\n\n  private async getConfig(): Promise<{\n    config: TypeGenConfig\n    path?: string\n    type: 'cli' | 'legacy'\n    workDir: string\n  }> {\n    const spin = spinner({}).start('Loading config…')\n\n    const {flags} = await this.parse(TypegenGenerateCommand)\n    const rootDir = await this.getProjectRoot()\n    const config = await this.getCliConfig()\n\n    const configPath = flags['config-path']\n    const workDir = rootDir.directory\n\n    // check if the legacy config exist\n    const legacyConfigPath = configPath || 'sanity-typegen.json'\n    let hasLegacyConfig = false\n    try {\n      const file = await stat(legacyConfigPath)\n      hasLegacyConfig = file.isFile()\n    } catch (err) {\n      if (err instanceof Error && 'code' in err && err.code === 'ENOENT' && configPath) {\n        throw new Error(`Typegen config file not found: ${configPath}`, {cause: err})\n      }\n\n      if (err instanceof Error && 'code' in err && err.code !== 'ENOENT') {\n        throw new Error(`Error when checking if typegen config file exists: ${legacyConfigPath}`, {\n          cause: err,\n        })\n      }\n    }\n\n    // we have both legacy and cli config with typegen\n    if (config?.typegen && hasLegacyConfig) {\n      spin.warn(\n        chalk.yellow(\n          `You've specified typegen in your Sanity CLI config, but also have a typegen config.\n\n  The config from the Sanity CLI config is used.\n  `,\n        ),\n      )\n\n      return {\n        config: configDefinition.parse(config.typegen || {}),\n        path: rootDir.path,\n        type: 'cli',\n        workDir,\n      }\n    }\n\n    // we only have legacy typegen config\n    if (hasLegacyConfig) {\n      spin.warn(\n        chalk.yellow(\n          `The separate typegen config has been deprecated. Use \\`typegen\\` in the sanity CLI config instead.\n\n  See: https://www.sanity.io/docs/help/configuring-typegen-in-sanity-cli-config`,\n        ),\n      )\n      return {\n        config: await readConfig(legacyConfigPath),\n        path: legacyConfigPath,\n        type: 'legacy',\n        workDir,\n      }\n    }\n\n    spin.succeed(`Config loaded from sanity.cli.ts`)\n\n    // we only have cli config\n    return {\n      config: configDefinition.parse(config.typegen || {}),\n      path: rootDir.path,\n      type: 'cli',\n      workDir,\n    }\n  }\n\n  private async runSingle() {\n    const trace = telemetry.trace(TypesGeneratedTrace)\n\n    try {\n      const {config: typegenConfig, type: typegenConfigMethod, workDir} = await this.getConfig()\n      trace.start()\n\n      const result = await runTypegenGenerate({\n        config: typegenConfig,\n        workDir,\n      })\n\n      const traceStats = omit(result, 'code', 'duration')\n\n      trace.log({\n        configMethod: typegenConfigMethod,\n        configOverloadClientMethods: typegenConfig.overloadClientMethods,\n        ...traceStats,\n      })\n      trace.complete()\n    } catch (error) {\n      trace.error(error as Error)\n      trace.complete()\n\n      this.error(`${error instanceof Error ? error.message : 'Unknown error'}`, {\n        exit: 1,\n      })\n    }\n  }\n\n  private async runWatcher() {\n    const trace = telemetry.trace(TypegenWatchModeTrace)\n\n    try {\n      const {config: typegenConfig, workDir} = await this.getConfig()\n      trace.start()\n\n      const {promise, resolve} = promiseWithResolvers()\n\n      const typegenWatcher = runTypegenWatcher({\n        config: typegenConfig,\n        workDir,\n      })\n\n      const stop = once(async () => {\n        process.off('SIGINT', stop)\n        process.off('SIGTERM', stop)\n\n        trace.log({\n          step: 'stopped',\n          ...typegenWatcher.getStats(),\n        })\n\n        await typegenWatcher.stop()\n        resolve()\n      })\n\n      process.on('SIGINT', stop)\n      process.on('SIGTERM', stop)\n\n      await promise\n    } catch (error) {\n      trace.error(error as Error)\n      trace.complete()\n\n      this.error(`${error instanceof Error ? error.message : 'Unknown error'}`, {\n        exit: 1,\n      })\n    }\n  }\n}\n"],"names":["stat","Flags","SanityCommand","chalk","spinner","omit","once","runTypegenGenerate","runTypegenWatcher","configDefinition","readConfig","TypegenWatchModeTrace","TypesGeneratedTrace","promiseWithResolvers","telemetry","description","bold","trim","TypegenGenerateCommand","examples","command","flags","string","watch","boolean","run","parse","runWatcher","runSingle","getConfig","spin","start","rootDir","getProjectRoot","config","getCliConfig","configPath","workDir","directory","legacyConfigPath","hasLegacyConfig","file","isFile","err","Error","code","cause","typegen","warn","yellow","path","type","succeed","trace","typegenConfig","typegenConfigMethod","result","traceStats","log","configMethod","configOverloadClientMethods","overloadClientMethods","complete","error","message","exit","promise","resolve","typegenWatcher","stop","process","off","step","getStats","on"],"mappings":"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"}
+{"version":3,"sources":["../../../src/commands/typegen/generate.ts"],"sourcesContent":["import {stat} from 'node:fs/promises'\n\nimport {Flags} from '@oclif/core'\nimport {SanityCommand, subdebug} from '@sanity/cli-core'\nimport {chalk, spinner} from '@sanity/cli-core/ux'\nimport {omit, once} from 'lodash-es'\n\nimport {runTypegenGenerate} from '../../actions/typegenGenerate.js'\nimport {runTypegenWatcher} from '../../actions/typegenWatch.js'\nimport {configDefinition, readConfig, type TypeGenConfig} from '../../readConfig.js'\nimport {TypegenWatchModeTrace, TypesGeneratedTrace} from '../../typegen.telemetry.js'\nimport {promiseWithResolvers} from '../../utils/promiseWithResolvers.js'\nimport {telemetry} from '../../utils/telemetryLogger.js'\n\nconst debug = subdebug('typegen:generate')\n\nconst description = `Sanity TypeGen (Beta)\nThis command is currently in beta and may undergo significant changes. Feedback is welcome!\n\n${chalk.bold('Configuration:')}\nThis command can utilize configuration settings defined in a \\`sanity-typegen.json\\` file. These settings include:\n\n- \"path\": Specifies a glob pattern to locate your TypeScript or JavaScript files.\n  Default: \"./src/**/*.{ts,tsx,js,jsx}\"\n\n- \"schema\": Defines the path to your Sanity schema file. This file should be generated using the \\`sanity schema extract\\` command.\n  Default: \"schema.json\"\n\n- \"generates\": Indicates the path where the generated TypeScript type definitions will be saved.\n  Default: \"./sanity.types.ts\"\n\nThe default configuration values listed above are used if not overridden in your \\`sanity-typegen.json\\` configuration file. To customize the behavior of the type generation, adjust these properties in the configuration file according to your project's needs.\n\n${chalk.bold('Note:')}\n- The \\`sanity schema extract\\` command is a prerequisite for extracting your Sanity Studio schema into a \\`schema.json\\` file, which is then used by the \\`sanity typegen generate\\` command to generate type definitions.\n- While this tool is in beta, we encourage you to experiment with these configurations and provide feedback to help improve its functionality and usability.`.trim()\n\n/**\n * @internal\n */\nexport class TypegenGenerateCommand extends SanityCommand<typeof TypegenGenerateCommand> {\n  static override description = description\n\n  static override examples = [\n    {\n      command: '<%= config.bin %> <%= command.id %>',\n      description: `Generate TypeScript type definitions from a Sanity Studio schema extracted using the \\`sanity schema extract\\` command.`,\n    },\n  ]\n\n  static override flags = {\n    'config-path': Flags.string({\n      description:\n        '[Default: sanity-typegen.json] Specifies the path to the typegen configuration file. This file should be a JSON file that contains settings for the type generation process.',\n    }),\n    watch: Flags.boolean({\n      default: false,\n      description: '[Default: false] Run the typegen in watch mode',\n    }),\n  }\n\n  public async run() {\n    const {flags} = await this.parse(TypegenGenerateCommand)\n\n    if (flags.watch) {\n      await this.runWatcher()\n      return\n    }\n\n    await this.runSingle()\n  }\n\n  private async getConfig(): Promise<{\n    config: TypeGenConfig\n    path?: string\n    type: 'cli' | 'legacy'\n    workDir: string\n  }> {\n    const spin = spinner({}).start('Loading config…')\n\n    const {flags} = await this.parse(TypegenGenerateCommand)\n    const rootDir = await this.getProjectRoot()\n    const config = await this.getCliConfig()\n\n    const configPath = flags['config-path']\n    const workDir = rootDir.directory\n\n    // check if the legacy config exist\n    const legacyConfigPath = configPath || 'sanity-typegen.json'\n    let hasLegacyConfig = false\n    try {\n      const file = await stat(legacyConfigPath)\n      hasLegacyConfig = file.isFile()\n    } catch (err) {\n      if (err instanceof Error && 'code' in err && err.code === 'ENOENT' && configPath) {\n        throw new Error(`Typegen config file not found: ${configPath}`, {cause: err})\n      }\n\n      if (err instanceof Error && 'code' in err && err.code !== 'ENOENT') {\n        throw new Error(`Error when checking if typegen config file exists: ${legacyConfigPath}`, {\n          cause: err,\n        })\n      }\n    }\n\n    // we have both legacy and cli config with typegen\n    if (config?.typegen && hasLegacyConfig) {\n      spin.warn(\n        chalk.yellow(\n          `You've specified typegen in your Sanity CLI config, but also have a typegen config.\n\n  The config from the Sanity CLI config is used.\n  `,\n        ),\n      )\n\n      return {\n        config: configDefinition.parse(config.typegen || {}),\n        path: rootDir.path,\n        type: 'cli',\n        workDir,\n      }\n    }\n\n    // we only have legacy typegen config\n    if (hasLegacyConfig) {\n      spin.warn(\n        chalk.yellow(\n          `The separate typegen config has been deprecated. Use \\`typegen\\` in the sanity CLI config instead.\n\n  See: https://www.sanity.io/docs/help/configuring-typegen-in-sanity-cli-config`,\n        ),\n      )\n      return {\n        config: await readConfig(legacyConfigPath),\n        path: legacyConfigPath,\n        type: 'legacy',\n        workDir,\n      }\n    }\n\n    spin.succeed(`Config loaded from sanity.cli.ts`)\n\n    // we only have cli config\n    return {\n      config: configDefinition.parse(config.typegen || {}),\n      path: rootDir.path,\n      type: 'cli',\n      workDir,\n    }\n  }\n\n  private async runSingle() {\n    const trace = telemetry.trace(TypesGeneratedTrace)\n\n    try {\n      const {config: typegenConfig, type: typegenConfigMethod, workDir} = await this.getConfig()\n      trace.start()\n\n      const result = await runTypegenGenerate({\n        config: typegenConfig,\n        workDir,\n      })\n\n      const traceStats = omit(result, 'code', 'duration')\n\n      trace.log({\n        configMethod: typegenConfigMethod,\n        configOverloadClientMethods: typegenConfig.overloadClientMethods,\n        ...traceStats,\n      })\n      trace.complete()\n    } catch (error) {\n      debug(error)\n      trace.error(error as Error)\n      this.error(`${error instanceof Error ? error.message : 'Unknown error'}`, {\n        exit: 1,\n      })\n    }\n  }\n\n  private async runWatcher() {\n    const trace = telemetry.trace(TypegenWatchModeTrace)\n\n    try {\n      const {config: typegenConfig, workDir} = await this.getConfig()\n      trace.start()\n\n      const {promise, resolve} = promiseWithResolvers()\n\n      const typegenWatcher = runTypegenWatcher({\n        config: typegenConfig,\n        workDir,\n      })\n\n      const stop = once(async () => {\n        process.off('SIGINT', stop)\n        process.off('SIGTERM', stop)\n\n        trace.log({\n          step: 'stopped',\n          ...typegenWatcher.getStats(),\n        })\n        trace.complete()\n\n        await typegenWatcher.stop()\n        resolve()\n      })\n\n      process.on('SIGINT', stop)\n      process.on('SIGTERM', stop)\n\n      await promise\n    } catch (error) {\n      debug(error)\n      trace.error(error as Error)\n      this.error(`${error instanceof Error ? error.message : 'Unknown error'}`, {\n        exit: 1,\n      })\n    }\n  }\n}\n"],"names":["stat","Flags","SanityCommand","subdebug","chalk","spinner","omit","once","runTypegenGenerate","runTypegenWatcher","configDefinition","readConfig","TypegenWatchModeTrace","TypesGeneratedTrace","promiseWithResolvers","telemetry","debug","description","bold","trim","TypegenGenerateCommand","examples","command","flags","string","watch","boolean","default","run","parse","runWatcher","runSingle","getConfig","spin","start","rootDir","getProjectRoot","config","getCliConfig","configPath","workDir","directory","legacyConfigPath","hasLegacyConfig","file","isFile","err","Error","code","cause","typegen","warn","yellow","path","type","succeed","trace","typegenConfig","typegenConfigMethod","result","traceStats","log","configMethod","configOverloadClientMethods","overloadClientMethods","complete","error","message","exit","promise","resolve","typegenWatcher","stop","process","off","step","getStats","on"],"mappings":"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"}

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import { BooleanFlag } from '@oclif/core/interfaces';
 import { CustomOptions } from '@oclif/core/interfaces';
+import { DefinedTelemetryTrace } from '@sanity/telemetry';
 import { ExprNode } from 'groq-js';
 import { FSWatcher } from 'chokidar';
 import { OptionFlag } from '@oclif/core/interfaces';
@@ -503,6 +504,8 @@ export declare class TypegenGenerateCommand extends SanityCommand<typeof Typegen
     private runWatcher;
 }
 
+export declare const TypegenWatchModeTrace: DefinedTelemetryTrace<TypegenWatchModeTraceAttributes, void>;
+
 /**
  * Attributes for typegen watch mode trace - tracks the start and stop of watch mode
  * sessions with statistics about generation runs.
@@ -546,6 +549,22 @@ export declare type TypegenWorkerChannel = WorkerChannel.Definition<{
     }>;
 }>;
 
+export declare const TypesGeneratedTrace: DefinedTelemetryTrace<TypesGeneratedTraceAttributes, void>;
+
+declare interface TypesGeneratedTraceAttributes {
+    configMethod: 'cli' | 'legacy';
+    configOverloadClientMethods: boolean;
+    emptyUnionTypeNodesGenerated: number;
+    filesWithErrors: number;
+    outputSize: number;
+    queriesCount: number;
+    queryFilesCount: number;
+    schemaTypesCount: number;
+    typeNodesGenerated: number;
+    unknownTypeNodesGenerated: number;
+    unknownTypeNodesRatio: number;
+}
+
 declare type WatcherStats = Omit<Extract<TypegenWatchModeTraceAttributes, {
     step: 'stopped';
 }>, 'step'>;

package/oclif.manifest.json

@@ -41,5 +41,5 @@
       ]
     }
   },
-  "version": "5.7.2-watch-mode.2"
+  "version": "5.7.2-watch-mode.4"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/codegen",
-  "version": "5.7.2-watch-mode.2",
+  "version": "5.7.2-watch-mode.4",
   "description": "Codegen toolkit for Sanity.io",
   "keywords": [
     "sanity",