@sanity/codegen 5.9.2 → 5.9.3

package/bin/run.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env node
 import {execute} from '@oclif/core'
+import {CLI_TELEMETRY_SYMBOL} from '@sanity/cli-core'
 
 const err = '\u001B[31m\u001B[1mERROR:\u001B[22m\u001B[39m '
 const nodeVersionParts = process.version.replace(/^v/i, '').split('.').map(Number)
@@ -21,11 +22,30 @@ function isSupportedNodeVersion(major, minor, patch) {
 }
 
 if (!isSupportedNodeVersion(majorVersion, minorVersion, patchVersion)) {
+  // eslint-disable-next-line no-console
   console.error(
     `${err}Node.js version >=20.19.1 <22 or >=22.12 required. You are running ${process.version}`,
   )
+  // eslint-disable-next-line no-console
   console.error('')
   process.exit(1)
 }
 
+if (process.env.NODE_ENV !== 'production') {
+  /**
+   * Telemetry is added via a plugin in the main CLI.
+   * This adds a mock implementation of the telemetry API to allow running this CLI for testing.
+   *
+   * We won't be exposing this API to the public, so it's ok to use a globalThis assignment.
+   */
+  globalThis[CLI_TELEMETRY_SYMBOL] = {
+    trace: () => ({
+      complete: () => {},
+      error: () => {},
+      log: () => {},
+      start: () => {},
+    }),
+  }
+}
+
 await execute({dir: import.meta.url})

package/dist/actions/typegenWatch.js

@@ -1,6 +1,6 @@
 import { error, log } from 'node:console';
 import { isAbsolute, join, relative } from 'node:path';
-import { chalk } from '@sanity/cli-core/ux';
+import { styleText } from 'node:util';
 import chokidar from 'chokidar';
 import { debounce, mean } from 'lodash-es';
 import { prepareConfig } from '../utils/config.js';
@@ -16,7 +16,7 @@ const IGNORED_PATTERNS = [
  * Creates a typegen runner with concurrency control.
  * If generation is already running, queues one more generation to run after completion.
  * Multiple queued requests are coalesced into a single pending generation.
- */ export function createTypegenRunner(onGenerate) {
+ */ function createTypegenRunner(onGenerate) {
     const state = {
         isGenerating: false,
         pendingGeneration: false
@@ -64,7 +64,7 @@ const IGNORED_PATTERNS = [
             stats.successfulDurations.push(duration);
         } catch (err) {
             const errorMessage = err instanceof Error ? err.message : err;
-            error(` ${chalk.red('›')}   ${errorMessage}`);
+            error(` ${styleText('red', '›')}   ${errorMessage}`);
             stats.failedCount++;
         }
     });

package/dist/actions/typegenWatch.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/actions/typegenWatch.ts"],"sourcesContent":["import {error, log} from 'node:console'\nimport {isAbsolute, join, relative} from 'node:path'\n\nimport {chalk} from '@sanity/cli-core/ux'\nimport chokidar, {FSWatcher} from 'chokidar'\nimport {debounce, mean} from 'lodash-es'\n\nimport {TypegenWatchModeTraceAttributes} from '../typegen.telemetry.js'\nimport {prepareConfig} from '../utils/config.js'\nimport {runTypegenGenerate} from './typegenGenerate.js'\nimport {type RunTypegenOptions} from './types.js'\n\nconst IGNORED_PATTERNS = [\n  '**/node_modules/**',\n  '**/.git/**',\n  '**/dist/**',\n  '**/lib/**',\n  '**/.sanity/**',\n]\n\n/** State for tracking generation status */\nexport interface WatchState {\n  isGenerating: boolean\n  pendingGeneration: boolean\n}\n\n/** Return type for createTypegenRunner */\ninterface TypegenRunner {\n  runGeneration: () => Promise<void>\n  state: WatchState\n}\n\ntype WatcherStats = Omit<Extract<TypegenWatchModeTraceAttributes, {step: 'stopped'}>, 'step'>\n\n/**\n * Creates a typegen runner with concurrency control.\n * If generation is already running, queues one more generation to run after completion.\n * Multiple queued requests are coalesced into a single pending generation.\n */\nexport function createTypegenRunner(onGenerate: () => Promise<unknown>): TypegenRunner {\n  const state: WatchState = {\n    isGenerating: false,\n    pendingGeneration: false,\n  }\n\n  async function runGeneration(): Promise<void> {\n    if (state.isGenerating) {\n      state.pendingGeneration = true\n      return\n    }\n\n    state.isGenerating = true\n    state.pendingGeneration = false\n\n    try {\n      await onGenerate()\n    } finally {\n      state.isGenerating = false\n\n      // If a change came in during generation, run again\n      if (state.pendingGeneration) {\n        state.pendingGeneration = false\n        await runGeneration()\n      }\n    }\n  }\n\n  return {runGeneration, state}\n}\n\n/**\n * Starts a file watcher that triggers typegen on changes.\n * Watches both query files (via patterns) and the schema JSON file.\n * Implements debouncing and concurrency control to prevent multiple generations.\n */\nexport function runTypegenWatcher(options: RunTypegenOptions): {\n  getStats: () => WatcherStats\n  stop: () => Promise<void>\n  watcher: FSWatcher\n} {\n  const {config, workDir} = options\n  const {path, schema} = prepareConfig(config)\n\n  const stats = {\n    failedCount: 0,\n    startTime: Date.now(),\n    successfulDurations: [] as number[],\n  }\n\n  const {runGeneration} = createTypegenRunner(async () => {\n    try {\n      const {duration} = await runTypegenGenerate({...options})\n      stats.successfulDurations.push(duration)\n    } catch (err) {\n      const errorMessage = err instanceof Error ? err.message : err\n      error(` ${chalk.red('›')}   ${errorMessage}`)\n      stats.failedCount++\n    }\n  })\n\n  // Debounced generation trigger\n  const debouncedGenerate = debounce(runGeneration, 1000)\n\n  // Build absolute patterns for query files and schema file\n  const paths = Array.isArray(path) ? path : [path]\n  const absoluteQueryPatterns = paths.map((pattern) =>\n    isAbsolute(pattern) ? pattern : join(workDir, pattern),\n  )\n  const absoluteSchemaPath = isAbsolute(schema) ? schema : join(workDir, schema)\n  const watchTargets = [...absoluteQueryPatterns, absoluteSchemaPath]\n\n  // perform initial generation\n  debouncedGenerate()\n\n  // set up watcher\n  const watcher = chokidar.watch(watchTargets, {\n    cwd: workDir,\n    ignored: IGNORED_PATTERNS,\n    ignoreInitial: true,\n  })\n\n  watcher.on('all', (event: string, filePath: string) => {\n    const timestamp = new Date().toLocaleTimeString()\n    const relativePath = isAbsolute(filePath) ? relative(workDir, filePath) : filePath\n    log(`[${timestamp}] ${event}: ${relativePath}`)\n    debouncedGenerate()\n  })\n\n  watcher.on('error', (err: Error) => {\n    error(`Watcher error: ${err.message}`)\n  })\n\n  return {\n    getStats: () => ({\n      averageGenerationDuration: mean(stats.successfulDurations) || 0,\n      generationFailedCount: stats.failedCount,\n      generationSuccessfulCount: stats.successfulDurations.length,\n      watcherDuration: Date.now() - stats.startTime,\n    }),\n    stop: async () => {\n      await watcher.close()\n    },\n    watcher,\n  }\n}\n"],"names":["error","log","isAbsolute","join","relative","chalk","chokidar","debounce","mean","prepareConfig","runTypegenGenerate","IGNORED_PATTERNS","createTypegenRunner","onGenerate","state","isGenerating","pendingGeneration","runGeneration","runTypegenWatcher","options","config","workDir","path","schema","stats","failedCount","startTime","Date","now","successfulDurations","duration","push","err","errorMessage","Error","message","red","debouncedGenerate","paths","Array","isArray","absoluteQueryPatterns","map","pattern","absoluteSchemaPath","watchTargets","watcher","watch","cwd","ignored","ignoreInitial","on","event","filePath","timestamp","toLocaleTimeString","relativePath","getStats","averageGenerationDuration","generationFailedCount","generationSuccessfulCount","length","watcherDuration","stop","close"],"mappings":"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"}
+{"version":3,"sources":["../../src/actions/typegenWatch.ts"],"sourcesContent":["import {error, log} from 'node:console'\nimport {isAbsolute, join, relative} from 'node:path'\nimport {styleText} from 'node:util'\n\nimport chokidar, {FSWatcher} from 'chokidar'\nimport {debounce, mean} from 'lodash-es'\n\nimport {TypegenWatchModeTraceAttributes} from '../typegen.telemetry.js'\nimport {prepareConfig} from '../utils/config.js'\nimport {runTypegenGenerate} from './typegenGenerate.js'\nimport {type RunTypegenOptions} from './types.js'\n\nconst IGNORED_PATTERNS = [\n  '**/node_modules/**',\n  '**/.git/**',\n  '**/dist/**',\n  '**/lib/**',\n  '**/.sanity/**',\n]\n\n/** State for tracking generation status */\ninterface WatchState {\n  isGenerating: boolean\n  pendingGeneration: boolean\n}\n\n/** Return type for createTypegenRunner */\ninterface TypegenRunner {\n  runGeneration: () => Promise<void>\n  state: WatchState\n}\n\ntype WatcherStats = Omit<Extract<TypegenWatchModeTraceAttributes, {step: 'stopped'}>, 'step'>\n\n/**\n * Creates a typegen runner with concurrency control.\n * If generation is already running, queues one more generation to run after completion.\n * Multiple queued requests are coalesced into a single pending generation.\n */\nfunction createTypegenRunner(onGenerate: () => Promise<unknown>): TypegenRunner {\n  const state: WatchState = {\n    isGenerating: false,\n    pendingGeneration: false,\n  }\n\n  async function runGeneration(): Promise<void> {\n    if (state.isGenerating) {\n      state.pendingGeneration = true\n      return\n    }\n\n    state.isGenerating = true\n    state.pendingGeneration = false\n\n    try {\n      await onGenerate()\n    } finally {\n      state.isGenerating = false\n\n      // If a change came in during generation, run again\n      if (state.pendingGeneration) {\n        state.pendingGeneration = false\n        await runGeneration()\n      }\n    }\n  }\n\n  return {runGeneration, state}\n}\n\n/**\n * Starts a file watcher that triggers typegen on changes.\n * Watches both query files (via patterns) and the schema JSON file.\n * Implements debouncing and concurrency control to prevent multiple generations.\n */\nexport function runTypegenWatcher(options: RunTypegenOptions): {\n  getStats: () => WatcherStats\n  stop: () => Promise<void>\n  watcher: FSWatcher\n} {\n  const {config, workDir} = options\n  const {path, schema} = prepareConfig(config)\n\n  const stats = {\n    failedCount: 0,\n    startTime: Date.now(),\n    successfulDurations: [] as number[],\n  }\n\n  const {runGeneration} = createTypegenRunner(async () => {\n    try {\n      const {duration} = await runTypegenGenerate({...options})\n      stats.successfulDurations.push(duration)\n    } catch (err) {\n      const errorMessage = err instanceof Error ? err.message : err\n      error(` ${styleText('red', '›')}   ${errorMessage}`)\n      stats.failedCount++\n    }\n  })\n\n  // Debounced generation trigger\n  const debouncedGenerate = debounce(runGeneration, 1000)\n\n  // Build absolute patterns for query files and schema file\n  const paths = Array.isArray(path) ? path : [path]\n  const absoluteQueryPatterns = paths.map((pattern) =>\n    isAbsolute(pattern) ? pattern : join(workDir, pattern),\n  )\n  const absoluteSchemaPath = isAbsolute(schema) ? schema : join(workDir, schema)\n  const watchTargets = [...absoluteQueryPatterns, absoluteSchemaPath]\n\n  // perform initial generation\n  debouncedGenerate()\n\n  // set up watcher\n  const watcher = chokidar.watch(watchTargets, {\n    cwd: workDir,\n    ignored: IGNORED_PATTERNS,\n    ignoreInitial: true,\n  })\n\n  watcher.on('all', (event: string, filePath: string) => {\n    const timestamp = new Date().toLocaleTimeString()\n    const relativePath = isAbsolute(filePath) ? relative(workDir, filePath) : filePath\n    log(`[${timestamp}] ${event}: ${relativePath}`)\n    debouncedGenerate()\n  })\n\n  watcher.on('error', (err: Error) => {\n    error(`Watcher error: ${err.message}`)\n  })\n\n  return {\n    getStats: () => ({\n      averageGenerationDuration: mean(stats.successfulDurations) || 0,\n      generationFailedCount: stats.failedCount,\n      generationSuccessfulCount: stats.successfulDurations.length,\n      watcherDuration: Date.now() - stats.startTime,\n    }),\n    stop: async () => {\n      await watcher.close()\n    },\n    watcher,\n  }\n}\n"],"names":["error","log","isAbsolute","join","relative","styleText","chokidar","debounce","mean","prepareConfig","runTypegenGenerate","IGNORED_PATTERNS","createTypegenRunner","onGenerate","state","isGenerating","pendingGeneration","runGeneration","runTypegenWatcher","options","config","workDir","path","schema","stats","failedCount","startTime","Date","now","successfulDurations","duration","push","err","errorMessage","Error","message","debouncedGenerate","paths","Array","isArray","absoluteQueryPatterns","map","pattern","absoluteSchemaPath","watchTargets","watcher","watch","cwd","ignored","ignoreInitial","on","event","filePath","timestamp","toLocaleTimeString","relativePath","getStats","averageGenerationDuration","generationFailedCount","generationSuccessfulCount","length","watcherDuration","stop","close"],"mappings":"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"}

package/dist/actions/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/actions/types.ts"],"sourcesContent":["import {spinner} from '@sanity/cli-core/ux'\nimport {WorkerChannel} from '@sanity/worker-channels'\n\nimport {TypeGenConfig} from '../readConfig.js'\nimport {type TypegenWorkerChannel as CodegenTypegenWorkerChannel} from '../typescript/typeGenerator.js'\nimport {telemetry} from '../utils/telemetryLogger.js'\n\n/**\n * Data passed to the typegen worker thread.\n * @internal\n */\nexport interface TypegenGenerateTypesWorkerData {\n  /** Path to the schema JSON file */\n  schemaPath: string\n  /** Glob pattern(s) for finding query files */\n  searchPath: string | string[]\n  /** Working directory (project root) */\n  workDir: string\n\n  /** Whether to generate client method overloads */\n  overloadClientMethods?: boolean\n}\n\n/**\n * Worker channel definition for typegen worker communication.\n * Extends the base TypegenWorkerChannel with additional events for progress tracking.\n * @internal\n */\nexport type TypegenWorkerChannel = WorkerChannel.Definition<\n  CodegenTypegenWorkerChannel['__definition'] & {\n    loadedSchema: WorkerChannel.Event\n    typegenComplete: WorkerChannel.Event<{code: string}>\n    typegenStarted: WorkerChannel.Event<{expectedFileCount: number}>\n  }\n>\n\n/**\n * Options for running a single typegen generation.\n * This is the programmatic API for one-off generation without file watching.\n */\nexport interface RunTypegenOptions {\n  /** Working directory (usually project root) */\n  workDir: string\n\n  /** Typegen configuration */\n  config?: Partial<TypeGenConfig>\n\n  /** Optional spinner instance for progress display */\n  spin?: ReturnType<typeof spinner>\n\n  /** Optional telemetry instance for tracking usage */\n  telemetry?: typeof telemetry\n}\n\n/**\n * Result from a single generation run.\n * @internal\n */\nexport interface GenerationResult {\n  code: string\n  duration: number\n  emptyUnionTypeNodesGenerated: number\n  filesWithErrors: number\n  outputSize: number\n  queriesCount: number\n  queryFilesCount: number\n  schemaTypesCount: number\n  typeNodesGenerated: number\n  unknownTypeNodesGenerated: number\n  unknownTypeNodesRatio: number\n}\n"],"names":[],"mappings":"AAsDA;;;CAGC,GACD,WAYC"}
+{"version":3,"sources":["../../src/actions/types.ts"],"sourcesContent":["import {spinner} from '@sanity/cli-core/ux'\nimport {WorkerChannel} from '@sanity/worker-channels'\n\nimport {TypeGenConfig} from '../readConfig.js'\nimport {type TypegenWorkerChannel as CodegenTypegenWorkerChannel} from '../typescript/typeGenerator.js'\n\n/**\n * Data passed to the typegen worker thread.\n * @internal\n */\nexport interface TypegenGenerateTypesWorkerData {\n  /** Path to the schema JSON file */\n  schemaPath: string\n  /** Glob pattern(s) for finding query files */\n  searchPath: string | string[]\n  /** Working directory (project root) */\n  workDir: string\n\n  /** Whether to generate client method overloads */\n  overloadClientMethods?: boolean\n}\n\n/**\n * Worker channel definition for typegen worker communication.\n * Extends the base TypegenWorkerChannel with additional events for progress tracking.\n * @internal\n */\nexport type TypegenWorkerChannel = WorkerChannel.Definition<\n  CodegenTypegenWorkerChannel['__definition'] & {\n    loadedSchema: WorkerChannel.Event\n    typegenComplete: WorkerChannel.Event<{code: string}>\n    typegenStarted: WorkerChannel.Event<{expectedFileCount: number}>\n  }\n>\n\n/**\n * Options for running a single typegen generation.\n * This is the programmatic API for one-off generation without file watching.\n */\nexport interface RunTypegenOptions {\n  /** Working directory (usually project root) */\n  workDir: string\n\n  /** Typegen configuration */\n  config?: Partial<TypeGenConfig>\n\n  /** Optional spinner instance for progress display */\n  spin?: ReturnType<typeof spinner>\n}\n\n/**\n * Result from a single generation run.\n * @internal\n */\nexport interface GenerationResult {\n  code: string\n  duration: number\n  emptyUnionTypeNodesGenerated: number\n  filesWithErrors: number\n  outputSize: number\n  queriesCount: number\n  queryFilesCount: number\n  schemaTypesCount: number\n  typeNodesGenerated: number\n  unknownTypeNodesGenerated: number\n  unknownTypeNodesRatio: number\n}\n"],"names":[],"mappings":"AAkDA;;;CAGC,GACD,WAYC"}

package/dist/commands/typegen/generate.js

@@ -1,7 +1,8 @@
 import { stat } from 'node:fs/promises';
+import { styleText } from 'node:util';
 import { Flags } from '@oclif/core';
 import { SanityCommand } from '@sanity/cli-core';
-import { chalk, spinner } from '@sanity/cli-core/ux';
+import { spinner } from '@sanity/cli-core/ux';
 import { omit, once } from 'lodash-es';
 import { runTypegenGenerate } from '../../actions/typegenGenerate.js';
 import { runTypegenWatcher } from '../../actions/typegenWatch.js';
@@ -9,11 +10,10 @@ import { configDefinition, readConfig } from '../../readConfig.js';
 import { TypegenWatchModeTrace, TypesGeneratedTrace } from '../../typegen.telemetry.js';
 import { debug } from '../../utils/debug.js';
 import { promiseWithResolvers } from '../../utils/promiseWithResolvers.js';
-import { telemetry } from '../../utils/telemetryLogger.js';
 const description = `Sanity TypeGen (Beta)
 This command is currently in beta and may undergo significant changes. Feedback is welcome!
 
-${chalk.bold('Configuration:')}
+${styleText('bold', 'Configuration:')}
 This command can utilize configuration settings defined in a \`sanity-typegen.json\` file. These settings include:
 
 - "path": Specifies a glob pattern to locate your TypeScript or JavaScript files.
@@ -27,7 +27,7 @@ This command can utilize configuration settings defined in a \`sanity-typegen.js
 
 The 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.
 
-${chalk.bold('Note:')}
+${styleText('bold', 'Note:')}
 - 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.
 - 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();
 /**
@@ -87,7 +87,7 @@ ${chalk.bold('Note:')}
             }
             // we have both legacy and cli config with typegen
             if (config?.typegen && hasLegacyConfig) {
-                spin.warn(chalk.yellow(`You've specified typegen in your Sanity CLI config, but also have a typegen config.
+                spin.warn(styleText('yellow', `You've specified typegen in your Sanity CLI config, but also have a typegen config.
 
     The config from the Sanity CLI config is used.
     `));
@@ -100,7 +100,7 @@ ${chalk.bold('Note:')}
             }
             // we only have legacy typegen config
             if (hasLegacyConfig) {
-                spin.warn(chalk.yellow(`The separate typegen config has been deprecated. Use \`typegen\` in the sanity CLI config instead.
+                spin.warn(styleText('yellow', `The separate typegen config has been deprecated. Use \`typegen\` in the sanity CLI config instead.
 
     See: https://www.sanity.io/docs/help/configuring-typegen-in-sanity-cli-config`));
                 return {
@@ -126,7 +126,7 @@ ${chalk.bold('Note:')}
         }
     }
     async runSingle() {
-        const trace = telemetry.trace(TypesGeneratedTrace);
+        const trace = this.telemetry.trace(TypesGeneratedTrace);
         try {
             const { config: typegenConfig, type: typegenConfigMethod, workDir } = await this.getConfig();
             trace.start();
@@ -150,7 +150,7 @@ ${chalk.bold('Note:')}
         }
     }
     async runWatcher() {
-        const trace = telemetry.trace(TypegenWatchModeTrace);
+        const trace = this.telemetry.trace(TypegenWatchModeTrace);
         try {
             const { config: typegenConfig, workDir } = await this.getConfig();
             trace.start();

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 {debug} from '../../utils/debug.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      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    try {\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\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          spin.fail()\n          this.error(`Typegen config file not found: ${configPath}`, {exit: 1})\n        }\n\n        if (err instanceof Error && 'code' in err && err.code !== 'ENOENT') {\n          spin.fail()\n          this.error(`Error when checking if typegen config file exists: ${legacyConfigPath}`, {\n            exit: 1,\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    } catch (err) {\n      spin.fail()\n      this.error(`An error occured during config loading ${err}`, {exit: 1})\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","chalk","spinner","omit","once","runTypegenGenerate","runTypegenWatcher","configDefinition","readConfig","TypegenWatchModeTrace","TypesGeneratedTrace","debug","promiseWithResolvers","telemetry","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","fail","error","exit","typegen","warn","yellow","path","type","succeed","trace","typegenConfig","typegenConfigMethod","result","traceStats","log","configMethod","configOverloadClientMethods","overloadClientMethods","complete","message","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'\nimport {styleText} from 'node:util'\n\nimport {Flags} from '@oclif/core'\nimport {SanityCommand} from '@sanity/cli-core'\nimport {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 {debug} from '../../utils/debug.js'\nimport {promiseWithResolvers} from '../../utils/promiseWithResolvers.js'\n\nconst description = `Sanity TypeGen (Beta)\nThis command is currently in beta and may undergo significant changes. Feedback is welcome!\n\n${styleText('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${styleText('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    try {\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\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          spin.fail()\n          this.error(`Typegen config file not found: ${configPath}`, {exit: 1})\n        }\n\n        if (err instanceof Error && 'code' in err && err.code !== 'ENOENT') {\n          spin.fail()\n          this.error(`Error when checking if typegen config file exists: ${legacyConfigPath}`, {\n            exit: 1,\n          })\n        }\n      }\n\n      // we have both legacy and cli config with typegen\n      if (config?.typegen && hasLegacyConfig) {\n        spin.warn(\n          styleText(\n            '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          styleText(\n            '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    } catch (err) {\n      spin.fail()\n      this.error(`An error occured during config loading ${err}`, {exit: 1})\n    }\n  }\n\n  private async runSingle() {\n    const trace = this.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 = this.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","styleText","Flags","SanityCommand","spinner","omit","once","runTypegenGenerate","runTypegenWatcher","configDefinition","readConfig","TypegenWatchModeTrace","TypesGeneratedTrace","debug","promiseWithResolvers","description","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","fail","error","exit","typegen","warn","path","type","succeed","trace","telemetry","typegenConfig","typegenConfigMethod","result","traceStats","log","configMethod","configOverloadClientMethods","overloadClientMethods","complete","message","promise","resolve","typegenWatcher","stop","process","off","step","getStats","on"],"mappings":"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"}

package/dist/index.d.ts

@@ -8,7 +8,6 @@ import { SanityCommand } from '@sanity/cli-core';
 import { SchemaType } from 'groq-js';
 import { spinner } from '@sanity/cli-core/ux';
 import * as t from '@babel/types';
-import { TelemetryLogger } from '@sanity/telemetry';
 import { TransformOptions } from '@babel/core';
 import { WorkerChannel } from '@sanity/worker-channels';
 import { WorkerChannelReporter } from '@sanity/worker-channels';
@@ -423,8 +422,6 @@ export declare interface RunTypegenOptions {
     config?: Partial<TypeGenConfig>;
     /** Optional spinner instance for progress display */
     spin?: ReturnType<typeof spinner>;
-    /** Optional telemetry instance for tracking usage */
-    telemetry?: typeof telemetry;
 }
 
 /**
@@ -448,13 +445,6 @@ export declare function safeParseQuery(query: string): ExprNode;
 /** Builds a tuple from elements, stopping at the first `never`. */
 declare type TakeUntilNever<T extends unknown[]> = T extends [infer H, ...infer Rest] ? [H] extends [never] ? [] : [H, ...TakeUntilNever<Rest>] : [];
 
-/**
- * TODO: Remove once we have a proper telemetry logger through the `@sanity/cli-core`
- *
- * This logger does nothing, except provide the interface to interact with
- */
-declare const telemetry: TelemetryLogger<unknown>;
-
 /**
  * Statistics from the query type evaluation process.
  * @public

package/oclif.manifest.json

@@ -41,5 +41,5 @@
       ]
     }
   },
-  "version": "5.9.2"
+  "version": "5.9.3"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/codegen",
-  "version": "5.9.2",
+  "version": "5.9.3",
   "description": "Codegen toolkit for Sanity.io",
   "keywords": [
     "sanity",
@@ -53,8 +53,9 @@
     "@babel/types": "^7.28.6",
     "@oclif/core": "^4.8.0",
     "@oclif/plugin-help": "^6.2.36",
-    "@sanity/cli-core": "^0.1.0-alpha.8",
+    "@sanity/cli-core": "^0.1.0-alpha.10",
     "@sanity/worker-channels": "^1.1.0",
+    "chokidar": "^3.6.0",
     "debug": "^4.4.3",
     "globby": "^11.1.0",
     "groq": "^5.2.0",
@@ -64,16 +65,15 @@
     "prettier": "^3.7.4",
     "reselect": "^5.1.1",
     "tsconfig-paths": "^4.2.0",
-    "zod": "^4.3.6",
-    "chokidar": "^3.6.0"
+    "zod": "^4.3.6"
   },
   "devDependencies": {
     "@eslint/compat": "^2.0.1",
-    "@sanity/telemetry": "^0.8.0",
     "@microsoft/api-extractor": "^7.55.2",
     "@oclif/test": "^4.1.15",
-    "@sanity/cli-test": "^0.0.2-alpha.7",
-    "@sanity/eslint-config-cli": "0.0.0-alpha.1",
+    "@sanity/cli-test": "^0.0.2-alpha.9",
+    "@sanity/eslint-config-cli": "0.0.0-alpha.2",
+    "@sanity/telemetry": "^0.8.0",
     "@swc/cli": "^0.7.9",
     "@swc/core": "^1.15.8",
     "@types/babel__core": "^7.20.5",

package/dist/utils/telemetryLogger.js

@@ -1,17 +0,0 @@
-/**
- * TODO: Remove once we have a proper telemetry logger through the `@sanity/cli-core`
- *
- * This logger does nothing, except provide the interface to interact with
- */ import { createBatchedStore, createSessionId } from '@sanity/telemetry';
-const session = createSessionId();
-const store = createBatchedStore(session, {
-    async resolveConsent () {
-        return {
-            status: 'denied'
-        };
-    },
-    sendEvents: async ()=>{}
-});
-export const telemetry = store.logger;
-
-//# sourceMappingURL=telemetryLogger.js.map

package/dist/utils/telemetryLogger.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/utils/telemetryLogger.ts"],"sourcesContent":["/**\n * TODO: Remove once we have a proper telemetry logger through the `@sanity/cli-core`\n *\n * This logger does nothing, except provide the interface to interact with\n */\n\nimport {createBatchedStore, createSessionId} from '@sanity/telemetry'\n\nconst session = createSessionId()\nconst store = createBatchedStore(session, {\n  async resolveConsent() {\n    return {status: 'denied'}\n  },\n  sendEvents: async () => {},\n})\n\nexport const telemetry = store.logger\n"],"names":["createBatchedStore","createSessionId","session","store","resolveConsent","status","sendEvents","telemetry","logger"],"mappings":"AAAA;;;;CAIC,GAED,SAAQA,kBAAkB,EAAEC,eAAe,QAAO,oBAAmB;AAErE,MAAMC,UAAUD;AAChB,MAAME,QAAQH,mBAAmBE,SAAS;IACxC,MAAME;QACJ,OAAO;YAACC,QAAQ;QAAQ;IAC1B;IACAC,YAAY,WAAa;AAC3B;AAEA,OAAO,MAAMC,YAAYJ,MAAMK,MAAM,CAAA"}