@sanity/cli 3.86.2-experimental.0 → 3.87.1-canary.4

package/lib/workers/typegenGenerate.d.ts

@@ -1,111 +1,43 @@
-import {GeneratedQueries} from '@sanity/codegen'
-import {GeneratedSchema} from '@sanity/codegen'
-import {GeneratedTypemap} from '@sanity/codegen'
-
 export declare interface TypegenGenerateTypesWorkerData {
   workDir: string
-  schemas: {
-    projectId: string | 'default'
-    dataset: string | 'default'
-    schemaPath: string
-  }[]
+  workspaceName?: string
+  schemaPath: string
   searchPath: string | string[]
-  overloadClientMethods: boolean
-  augmentGroqModule: boolean
-}
-
-/** @internal */
-export declare type TypegenWorkerChannel = WorkerChannel<{
-  schema: WorkerChannelEvent<GeneratedSchema>
-  queries: WorkerChannelStream<GeneratedQueries>
-  typemap: WorkerChannelEvent<GeneratedTypemap>
-}>
-
-/**
- * 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
+  overloadClientMethods?: boolean
 }
 
-/** @internal */
-declare type WorkerChannelStream<TPayload = void> = {
-  type: 'stream'
-  payload: TPayload
-}
+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
+      }[]
+    }
+  | {
+      type: 'schema'
+      filename: string
+      schema: string
+      length: number
+    }
+  | {
+      type: 'typemap'
+      typeMap: string
+    }
+  | {
+      type: 'complete'
+    }
 
 export {}

package/lib/workers/typegenGenerate.js

@@ -1,37 +1,124 @@
 "use strict";
-var node_worker_threads = require("node:worker_threads"), codegen = require("@sanity/codegen"), debugIt = require("debug"), workerChannel = require("../_chunks-cjs/workerChannel.js");
+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 debugIt__default = /* @__PURE__ */ _interopDefaultCompat(debugIt);
-const $info = debugIt__default.default("sanity:codegen:generate:info");
+var createDebug__default = /* @__PURE__ */ _interopDefaultCompat(createDebug);
+const $info = createDebug__default.default("sanity:codegen:generate:info");
+createDebug__default.default("sanity:codegen:generate:warn");
 if (node_worker_threads.isMainThread || !node_worker_threads.parentPort)
   throw new Error("This module must be run as a worker thread");
-const report = workerChannel.createReporter(node_worker_threads.parentPort), opts = node_worker_threads.workerData;
+const opts = node_worker_threads.workerData;
+codegen.registerBabel();
 async function main() {
-  const schemas = [];
-  for (const schemaConfig of opts.schemas) {
-    $info(`Reading schema from ${schemaConfig.schemaPath}...`);
-    const schema = await codegen.readSchema(schemaConfig.schemaPath);
-    schemas.push({
-      schema,
-      projectId: schemaConfig.projectId,
-      dataset: schemaConfig.dataset,
-      filename: schemaConfig.schemaPath
+  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;
+    }
+    $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
     });
   }
-  $info(`Read ${schemas.length} schema definition${schemas.length === 1 ? "" : "s"} successfully.`);
-  const resolver = codegen.getResolver(), result = codegen.generateTypes({
-    schemas,
-    queriesByFile: codegen.findQueriesInPath({ path: opts.searchPath, resolver }),
-    augmentGroqModule: opts.augmentGroqModule,
-    overloadClientMethods: opts.overloadClientMethods
+  node_worker_threads.parentPort?.postMessage({
+    type: "complete"
   });
-  report.event.schema(await result.generatedSchema());
-  for await (const { filename, results } of result.generatedQueries())
-    report.stream.queries.emit({ filename, results });
-  report.stream.queries.end(), report.event.typemap(await result.generatedTypemap());
 }
-codegen.registerBabel();
+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;
+    }
+    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);
+    }
+    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 };
+  }
+}
 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  type GeneratedQueries,\n  type GeneratedSchema,\n  type GeneratedTypemap,\n  generateTypes,\n  getResolver,\n  readSchema,\n  registerBabel,\n} from '@sanity/codegen'\nimport createDebug from 'debug'\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 $info = createDebug('sanity:codegen:generate:info')\n\nexport interface TypegenGenerateTypesWorkerData {\n  workDir: string\n  schemas: {\n    projectId: string | 'default'\n    dataset: string | 'default'\n    schemaPath: string\n  }[]\n  searchPath: string | string[]\n  overloadClientMethods: boolean\n  augmentGroqModule: boolean\n}\n\n/** @internal */\nexport type TypegenWorkerChannel = WorkerChannel<{\n  schema: WorkerChannelEvent<GeneratedSchema>\n  queries: WorkerChannelStream<GeneratedQueries>\n  typemap: WorkerChannelEvent<GeneratedTypemap>\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: {\n    schema: SchemaType\n    projectId: string | 'default'\n    dataset: string | 'default'\n    filename: string\n  }[] = []\n\n  for (const schemaConfig of opts.schemas) {\n    $info(`Reading schema from ${schemaConfig.schemaPath}...`)\n    const schema = await readSchema(schemaConfig.schemaPath)\n    schemas.push({\n      schema,\n      projectId: schemaConfig.projectId,\n      dataset: schemaConfig.dataset,\n      filename: schemaConfig.schemaPath,\n    })\n  }\n  $info(`Read ${schemas.length} schema definition${schemas.length === 1 ? '' : 's'} successfully.`)\n\n  const resolver = getResolver()\n\n  const result = generateTypes({\n    schemas,\n    queriesByFile: findQueriesInPath({path: opts.searchPath, resolver}),\n    augmentGroqModule: opts.augmentGroqModule,\n    overloadClientMethods: opts.overloadClientMethods,\n  })\n\n  report.event.schema(await result.generatedSchema())\n\n  for await (const {filename, results} of result.generatedQueries()) {\n    report.stream.queries.emit({filename, results})\n  }\n  report.stream.queries.end()\n\n  report.event.typemap(await result.generatedTypemap())\n}\n\nregisterBabel()\nmain()\n"],"names":["createDebug","isMainThread","parentPort","createReporter","_workerData","readSchema","getResolver","generateTypes","findQueriesInPath","registerBabel"],"mappings":";;;;;;AAsBA,MAAM,QAAQA,yBAAY,8BAA8B;AAqBxD,IAAIC,oBAAAA,gBAAgB,CAACC,oBAAA;AACb,QAAA,IAAI,MAAM,4CAA4C;AAG9D,MAAM,SAASC,cAAA,eAAqCD,8BAAU,GACxD,OAAOE,oBAAA;AAEb,eAAe,OAAO;AACpB,QAAM,UAKA,CAAC;AAEI,aAAA,gBAAgB,KAAK,SAAS;AACjC,UAAA,uBAAuB,aAAa,UAAU,KAAK;AACzD,UAAM,SAAS,MAAMC,mBAAW,aAAa,UAAU;AACvD,YAAQ,KAAK;AAAA,MACX;AAAA,MACA,WAAW,aAAa;AAAA,MACxB,SAAS,aAAa;AAAA,MACtB,UAAU,aAAa;AAAA,IAAA,CACxB;AAAA,EAAA;AAEG,QAAA,QAAQ,QAAQ,MAAM,qBAAqB,QAAQ,WAAW,IAAI,KAAK,GAAG,gBAAgB;AAEhG,QAAM,WAAWC,QAAAA,eAEX,SAASC,QAAAA,cAAc;AAAA,IAC3B;AAAA,IACA,eAAeC,QAAkB,kBAAA,EAAC,MAAM,KAAK,YAAY,UAAS;AAAA,IAClE,mBAAmB,KAAK;AAAA,IACxB,uBAAuB,KAAK;AAAA,EAAA,CAC7B;AAED,SAAO,MAAM,OAAO,MAAM,OAAO,iBAAiB;AAElD,mBAAiB,EAAC,UAAU,QAAO,KAAK,OAAO,iBAAiB;AAC9D,WAAO,OAAO,QAAQ,KAAK,EAAC,UAAU,SAAQ;AAEzC,SAAA,OAAO,QAAQ,OAEtB,OAAO,MAAM,QAAQ,MAAM,OAAO,kBAAkB;AACtD;AAEAC,QAAAA,cAAc;AACd,KAAK;"}
+{"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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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/cli",
-  "version": "3.86.2-experimental.0",
+  "version": "3.87.1-canary.4+84c6362d84",
   "description": "Sanity CLI tool for managing Sanity installations, managing plugins, schemas and datasets",
   "keywords": [
     "sanity",
@@ -46,13 +46,24 @@
     "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": "^6.29.0",
+    "@sanity/client": "^7.0.0",
+    "@sanity/codegen": "3.87.1-canary.4+84c6362d84",
     "@sanity/runtime-cli": "^3.0.0",
     "@sanity/telemetry": "^0.8.0",
     "@sanity/template-validator": "^2.4.3",
-    "@sanity/util": "",
+    "@sanity/util": "3.87.1-canary.4+84c6362d84",
     "chalk": "^4.1.2",
     "debug": "^4.3.4",
     "decompress": "^4.2.0",
@@ -63,14 +74,16 @@
     "pkg-dir": "^5.0.0",
     "prettier": "^3.3.0",
     "semver": "^7.3.5",
-    "validate-npm-package-name": "^3.0.0",
-    "@sanity/codegen": "3.86.2-experimental.0"
+    "validate-npm-package-name": "^3.0.0"
   },
   "devDependencies": {
+    "@repo/package.config": "3.87.0",
+    "@repo/test-config": "3.87.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.87.1-canary.4+84c6362d84",
     "@types/babel__traverse": "^7.20.5",
     "@types/configstore": "^5.0.1",
     "@types/cpx": "^1.5.2",
@@ -117,21 +130,10 @@
     "vite": "^6.2.4",
     "vitest": "^3.1.1",
     "which": "^2.0.2",
-    "xdg-basedir": "^4.0.0",
-    "@repo/package.config": "0.0.0",
-    "@sanity/types": "3.86.1",
-    "@repo/test-config": "0.0.0"
+    "xdg-basedir": "^4.0.0"
   },
   "engines": {
     "node": ">=18"
   },
-  "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"
-  }
-}
+  "gitHead": "84c6362d849ed7a45de7126d3652f9f1e1d2ba03"
+}

package/src/actions/init-project/initProject.ts

@@ -290,6 +290,8 @@ export default async function initSanity(
     print('')
   }
 
+  const isNextJs = detectedFramework?.slug === 'nextjs'
+
   const flags = await prepareFlags()
 
   // We're authenticated, now lets select or create a project (for studios) or org (for core apps)
@@ -313,14 +315,16 @@ export default async function initSanity(
   }
 
   let initNext = false
-  const isNextJs = detectedFramework?.slug === 'nextjs'
   if (isNextJs) {
-    initNext = await prompt.single({
-      type: 'confirm',
-      message:
-        'Would you like to add configuration files for a Sanity project in this Next.js folder?',
-      default: true,
-    })
+    initNext =
+      unattended ||
+      (await prompt.single({
+        type: 'confirm',
+        message:
+          'Would you like to add configuration files for a Sanity project in this Next.js folder?',
+        default: true,
+      }))
+
     trace.log({
       step: 'useDetectedFramework',
       selectedOption: initNext ? 'yes' : 'no',
@@ -682,7 +686,7 @@ export default async function initSanity(
     )
   } else {
     print(`\n${chalk.green('Success!')} Now, use these commands to continue:\n`)
-    print(`First: ${chalk.cyan(`cd ${outputPath}`)} - to enter project’s directory`)
+    print(`First: ${chalk.cyan(`cd ${outputPath}`)} - to enter project's directory`)
     print(
       `Then: ${chalk.cyan(devCommand)} -to run ${isAppTemplate ? 'your Sanity application' : 'Sanity Studio'}\n`,
     )
@@ -750,9 +754,15 @@ export default async function initSanity(
 
     if (isAppTemplate) {
       const client = apiClient({requireUser: true, requireProject: false})
-      const organizations = await client.request({uri: '/organizations'})
+      const organizations = await client.request({
+        uri: '/organizations',
+        query: {
+          includeMembers: 'true',
+          includeImplicitMemberships: 'true',
+        },
+      })
 
-      const appOrganizationId = await getOrganizationId(organizations)
+      const appOrganizationId = await getOrganizationIdForAppTemplate(organizations)
 
       return {
         projectId: '',
@@ -1223,12 +1233,15 @@ export default async function initSanity(
 
     if (unattended) {
       debug('Unattended mode, validating required options')
-      const requiredForUnattended = ['dataset', 'output-path'] as const
-      requiredForUnattended.forEach((flag) => {
-        if (!cliFlags[flag]) {
-          throw new Error(`\`--${flag}\` must be specified in unattended mode`)
-        }
-      })
+
+      if (!cliFlags['dataset' as const]) {
+        throw new Error(`\`--dataset\` must be specified in unattended mode`)
+      }
+
+      // output-path is not used in unattended mode within nextjs
+      if (!isNextJs && !cliFlags['output-path' as const]) {
+        throw new Error(`\`--output-path\` must be specified in unattended mode`)
+      }
 
       if (!cliFlags.project && !createProjectName) {
         throw new Error(
@@ -1300,6 +1313,38 @@ export default async function initSanity(
     return organization
   }
 
+  async function getOrganizationIdForAppTemplate(organizations: ProjectOrganization[]) {
+    // If the user is using an app template, we don't need to check for attach access
+    const organizationChoices = [
+      ...organizations.map((organization) => ({
+        value: organization.id,
+        name: `${organization.name} [${organization.id}]`,
+      })),
+      new prompt.Separator(),
+      {value: '-new-', name: 'Create new organization'},
+      new prompt.Separator(),
+    ]
+
+    // If the user only has a single organization, we'll default to that one.
+    const defaultOrganizationId =
+      organizations.length === 1
+        ? organizations[0].id
+        : organizations.find((org) => org.name === user?.name)?.id
+
+    const chosenOrg = await prompt.single({
+      message: 'Select organization:',
+      type: 'list',
+      default: defaultOrganizationId || undefined,
+      choices: organizationChoices,
+    })
+
+    if (chosenOrg === '-new-') {
+      return createOrganization().then((org) => org.id)
+    }
+
+    return chosenOrg || undefined
+  }
+
   async function getOrganizationId(organizations: ProjectOrganization[]) {
     // In unattended mode, if the user hasn't specified an organization, sending null as
     // organization ID to the API will create a new organization for the user with their
@@ -1363,21 +1408,38 @@ export default async function initSanity(
       .clone()
       .config({apiVersion: 'v2021-06-07'})
 
-    const grants = await client.request({uri: `organizations/${orgId}/grants`})
-    const group: {grants: {name: string}[]}[] = grants[requiredGrantGroup] || []
-    return group.some(
-      (resource) =>
-        resource.grants && resource.grants.some((grant) => grant.name === requiredGrant),
-    )
+    try {
+      const grants = await client.request({uri: `organizations/${orgId}/grants`})
+      const group: {grants: {name: string}[]}[] = grants[requiredGrantGroup] || []
+      return group.some(
+        (resource) =>
+          resource.grants && resource.grants.some((grant) => grant.name === requiredGrant),
+      )
+    } catch (err) {
+      // If we get a 401, it means we don't have access to this organization
+      // probably because of implicit membership
+      if (err.statusCode === 401) {
+        debug('No access to organization %s (401)', orgId)
+        return false
+      }
+      // For other errors, log them but still return false to be safe
+      debug('Error checking grants for organization %s: %s', orgId, err.message)
+      return false
+    }
   }
 
   function getOrganizationsWithAttachGrantInfo(organizations: ProjectOrganization[]) {
     return pMap(
       organizations,
-      async (organization) => ({
-        hasAttachGrant: await hasProjectAttachGrant(organization.id),
-        organization,
-      }),
+      async (organization) => {
+        try {
+          const hasAttachGrant = await hasProjectAttachGrant(organization.id)
+          return {hasAttachGrant, organization}
+        } catch (err) {
+          debug('Error checking grants for organization %s: %s', organization.id, err.message)
+          return {hasAttachGrant: false, organization}
+        }
+      },
       {concurrency: 3},
     )
   }

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

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