@sanity/cli 6.1.4 → 6.1.6

package/dist/actions/debug/gatherDebugInfo.js

@@ -8,7 +8,7 @@ export async function gatherDebugInfo(options) {
     const [auth, globalConfig, projectConfigResult, versions] = await Promise.all([
         gatherAuthInfo(includeSecrets),
         gatherGlobalConfig(),
-        gatherProjectConfig(cliConfig),
+        cliConfig ? gatherProjectConfig(cliConfig) : undefined,
         gatherVersionsInfo(projectRoot)
     ]);
     // Gather user and project info that depend on auth
@@ -35,18 +35,16 @@ async function gatherAuthInfo(includeSecrets) {
 function gatherGlobalConfig() {
     return getUserConfig().all;
 }
-async function gatherProjectConfig(cliConfig) {
-    try {
-        const config = cliConfig;
-        if (!config.api?.projectId) {
-            return new Error('Missing required "api.projectId" key');
-        }
-        return config;
-    } catch (error) {
-        return error instanceof Error ? error : new Error('Failed to load project config');
+function gatherProjectConfig(cliConfig) {
+    if (!cliConfig.api?.projectId) {
+        return new Error('Missing required "api.projectId" key');
     }
+    return cliConfig;
 }
 async function gatherVersionsInfo(projectRoot) {
+    if (!projectRoot) {
+        return undefined;
+    }
     try {
         return await findSanityModulesVersions({
             cwd: projectRoot.directory
@@ -63,7 +61,7 @@ async function gatherUserInfo(projectConfig, hasToken) {
         /**
      * If the project config has a project ID, get the user for the project
      * Otherwise, get the user for the global client
-     */ const userInfo = projectConfig instanceof Error || !projectConfig.api?.projectId ? await getCliUser() : await getProjectUser(projectConfig.api.projectId);
+     */ const userInfo = !projectConfig || projectConfig instanceof Error || !projectConfig.api?.projectId ? await getCliUser() : await getProjectUser(projectConfig.api.projectId);
         return {
             email: userInfo.email,
             id: userInfo.id,
@@ -74,7 +72,7 @@ async function gatherUserInfo(projectConfig, hasToken) {
     }
 }
 async function gatherProjectInfo(projectConfig, hasToken, user) {
-    if (!hasToken || projectConfig instanceof Error) {
+    if (!hasToken || !projectConfig || projectConfig instanceof Error) {
         return null;
     }
     const projectId = projectConfig.api?.projectId;

package/dist/actions/debug/gatherDebugInfo.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/debug/gatherDebugInfo.ts"],"sourcesContent":["import {type CliConfig, getCliToken, getUserConfig, type ProjectRootResult} from '@sanity/cli-core'\n\nimport {getProjectById} from '../../services/projects.js'\nimport {getCliUser, getProjectUser} from '../../services/user.js'\nimport {findSanityModulesVersions} from '../versions/findSanityModulesVersions.js'\nimport {type ModuleVersionResult} from '../versions/types.js'\nimport {\n  type AuthInfo,\n  type DebugInfo,\n  type DebugInfoOptions,\n  type ProjectInfo,\n  type UserInfo,\n} from './types.js'\n\nexport async function gatherDebugInfo(options: DebugInfoOptions): Promise<DebugInfo> {\n  const {cliConfig, includeSecrets, projectRoot} = options\n\n  // Gather all info in parallel where possible\n  const [auth, globalConfig, projectConfigResult, versions] = await Promise.all([\n    gatherAuthInfo(includeSecrets),\n    gatherGlobalConfig(),\n    gatherProjectConfig(cliConfig),\n    gatherVersionsInfo(projectRoot),\n  ])\n\n  // Gather user and project info that depend on auth\n  const user = await gatherUserInfo(projectConfigResult, auth.hasToken)\n  const project = await gatherProjectInfo(projectConfigResult, auth.hasToken, user)\n\n  return {\n    auth,\n    globalConfig,\n    project,\n    projectConfig: projectConfigResult,\n    user,\n    versions,\n  }\n}\n\nasync function gatherAuthInfo(includeSecrets: boolean): Promise<AuthInfo> {\n  const token = await getCliToken()\n  const hasToken = Boolean(token)\n\n  return {\n    authToken: includeSecrets && token ? token : '<redacted>',\n    hasToken,\n    userType: 'normal',\n  }\n}\n\nfunction gatherGlobalConfig(): Record<string, unknown> {\n  return getUserConfig().all\n}\n\nasync function gatherProjectConfig(cliConfig: CliConfig): Promise<CliConfig | Error> {\n  try {\n    const config = cliConfig\n\n    if (!config.api?.projectId) {\n      return new Error('Missing required \"api.projectId\" key')\n    }\n\n    return config\n  } catch (error) {\n    return error instanceof Error ? error : new Error('Failed to load project config')\n  }\n}\n\nasync function gatherVersionsInfo(projectRoot: ProjectRootResult): Promise<ModuleVersionResult[]> {\n  try {\n    return await findSanityModulesVersions({cwd: projectRoot.directory})\n  } catch {\n    return []\n  }\n}\n\nasync function gatherUserInfo(\n  projectConfig: CliConfig | Error,\n  hasToken: boolean,\n): Promise<Error | UserInfo | null> {\n  if (!hasToken) {\n    return new Error('Not logged in')\n  }\n\n  try {\n    /**\n     * If the project config has a project ID, get the user for the project\n     * Otherwise, get the user for the global client\n     */\n    const userInfo =\n      projectConfig instanceof Error || !projectConfig.api?.projectId\n        ? await getCliUser()\n        : await getProjectUser(projectConfig.api.projectId)\n\n    return {\n      email: userInfo.email,\n      id: userInfo.id,\n      name: userInfo.name,\n    }\n  } catch (error) {\n    return error instanceof Error ? error : new Error('Failed to fetch user info')\n  }\n}\n\nasync function gatherProjectInfo(\n  projectConfig: CliConfig | Error,\n  hasToken: boolean,\n  user: Error | UserInfo | null,\n): Promise<Error | ProjectInfo | null> {\n  if (!hasToken || projectConfig instanceof Error) {\n    return null\n  }\n\n  const projectId = projectConfig.api?.projectId\n  if (!projectId) {\n    return null\n  }\n\n  try {\n    const projectInfo = await getProjectById(projectId)\n\n    if (!projectInfo) {\n      return new Error(`Project specified in configuration (${projectId}) does not exist in API`)\n    }\n\n    const userId = user instanceof Error || !user ? null : user.id\n    const member = (projectInfo.members || []).find((member) => member.id === userId)\n\n    return {\n      displayName: projectInfo.displayName,\n      id: projectId,\n      // @ts-expect-error - Incorrect type definition in @sanity/client\n      userRoles: member && member.roles ? member.roles.map((role) => role.name) : ['<none>'],\n    }\n  } catch (error) {\n    return error instanceof Error ? error : new Error('Failed to fetch project info')\n  }\n}\n"],"names":["getCliToken","getUserConfig","getProjectById","getCliUser","getProjectUser","findSanityModulesVersions","gatherDebugInfo","options","cliConfig","includeSecrets","projectRoot","auth","globalConfig","projectConfigResult","versions","Promise","all","gatherAuthInfo","gatherGlobalConfig","gatherProjectConfig","gatherVersionsInfo","user","gatherUserInfo","hasToken","project","gatherProjectInfo","projectConfig","token","Boolean","authToken","userType","config","api","projectId","Error","error","cwd","directory","userInfo","email","id","name","projectInfo","userId","member","members","find","displayName","userRoles","roles","map","role"],"mappings":"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"}
+{"version":3,"sources":["../../../src/actions/debug/gatherDebugInfo.ts"],"sourcesContent":["import {type CliConfig, getCliToken, getUserConfig, type ProjectRootResult} from '@sanity/cli-core'\n\nimport {getProjectById} from '../../services/projects.js'\nimport {getCliUser, getProjectUser} from '../../services/user.js'\nimport {findSanityModulesVersions} from '../versions/findSanityModulesVersions.js'\nimport {type ModuleVersionResult} from '../versions/types.js'\nimport {\n  type AuthInfo,\n  type DebugInfo,\n  type DebugInfoOptions,\n  type ProjectInfo,\n  type UserInfo,\n} from './types.js'\n\nexport async function gatherDebugInfo(options: DebugInfoOptions): Promise<DebugInfo> {\n  const {cliConfig, includeSecrets, projectRoot} = options\n\n  // Gather all info in parallel where possible\n  const [auth, globalConfig, projectConfigResult, versions] = await Promise.all([\n    gatherAuthInfo(includeSecrets),\n    gatherGlobalConfig(),\n    cliConfig ? gatherProjectConfig(cliConfig) : undefined,\n    gatherVersionsInfo(projectRoot),\n  ])\n\n  // Gather user and project info that depend on auth\n  const user = await gatherUserInfo(projectConfigResult, auth.hasToken)\n  const project = await gatherProjectInfo(projectConfigResult, auth.hasToken, user)\n\n  return {\n    auth,\n    globalConfig,\n    project,\n    projectConfig: projectConfigResult,\n    user,\n    versions,\n  }\n}\n\nasync function gatherAuthInfo(includeSecrets: boolean): Promise<AuthInfo> {\n  const token = await getCliToken()\n  const hasToken = Boolean(token)\n\n  return {\n    authToken: includeSecrets && token ? token : '<redacted>',\n    hasToken,\n    userType: 'normal',\n  }\n}\n\nfunction gatherGlobalConfig(): Record<string, unknown> {\n  return getUserConfig().all\n}\n\nfunction gatherProjectConfig(cliConfig: CliConfig): CliConfig | Error {\n  if (!cliConfig.api?.projectId) {\n    return new Error('Missing required \"api.projectId\" key')\n  }\n\n  return cliConfig\n}\n\nasync function gatherVersionsInfo(\n  projectRoot: ProjectRootResult | undefined,\n): Promise<ModuleVersionResult[] | undefined> {\n  if (!projectRoot) {\n    return undefined\n  }\n\n  try {\n    return await findSanityModulesVersions({cwd: projectRoot.directory})\n  } catch {\n    return []\n  }\n}\n\nasync function gatherUserInfo(\n  projectConfig: CliConfig | Error | undefined,\n  hasToken: boolean,\n): Promise<Error | UserInfo | null> {\n  if (!hasToken) {\n    return new Error('Not logged in')\n  }\n\n  try {\n    /**\n     * If the project config has a project ID, get the user for the project\n     * Otherwise, get the user for the global client\n     */\n    const userInfo =\n      !projectConfig || projectConfig instanceof Error || !projectConfig.api?.projectId\n        ? await getCliUser()\n        : await getProjectUser(projectConfig.api.projectId)\n\n    return {\n      email: userInfo.email,\n      id: userInfo.id,\n      name: userInfo.name,\n    }\n  } catch (error) {\n    return error instanceof Error ? error : new Error('Failed to fetch user info')\n  }\n}\n\nasync function gatherProjectInfo(\n  projectConfig: CliConfig | Error | undefined,\n  hasToken: boolean,\n  user: Error | UserInfo | null,\n): Promise<Error | ProjectInfo | null> {\n  if (!hasToken || !projectConfig || projectConfig instanceof Error) {\n    return null\n  }\n\n  const projectId = projectConfig.api?.projectId\n  if (!projectId) {\n    return null\n  }\n\n  try {\n    const projectInfo = await getProjectById(projectId)\n\n    if (!projectInfo) {\n      return new Error(`Project specified in configuration (${projectId}) does not exist in API`)\n    }\n\n    const userId = user instanceof Error || !user ? null : user.id\n    const member = (projectInfo.members || []).find((member) => member.id === userId)\n\n    return {\n      displayName: projectInfo.displayName,\n      id: projectId,\n      // @ts-expect-error - Incorrect type definition in @sanity/client\n      userRoles: member && member.roles ? member.roles.map((role) => role.name) : ['<none>'],\n    }\n  } catch (error) {\n    return error instanceof Error ? error : new Error('Failed to fetch project info')\n  }\n}\n"],"names":["getCliToken","getUserConfig","getProjectById","getCliUser","getProjectUser","findSanityModulesVersions","gatherDebugInfo","options","cliConfig","includeSecrets","projectRoot","auth","globalConfig","projectConfigResult","versions","Promise","all","gatherAuthInfo","gatherGlobalConfig","gatherProjectConfig","undefined","gatherVersionsInfo","user","gatherUserInfo","hasToken","project","gatherProjectInfo","projectConfig","token","Boolean","authToken","userType","api","projectId","Error","cwd","directory","userInfo","email","id","name","error","projectInfo","userId","member","members","find","displayName","userRoles","roles","map","role"],"mappings":"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"}

package/dist/actions/debug/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/debug/types.ts"],"sourcesContent":["import {type CliConfig, type ProjectRootResult} from '@sanity/cli-core'\n\nimport {type ModuleVersionResult} from '../versions/types.js'\n\nexport interface DebugInfoOptions {\n  cliConfig: CliConfig\n  includeSecrets: boolean\n  projectRoot: ProjectRootResult\n}\n\nexport interface UserInfo {\n  email: string\n  id: string\n  name: string\n}\n\nexport interface ProjectInfo {\n  displayName: string\n  id: string\n  userRoles: string[]\n}\n\nexport interface AuthInfo {\n  authToken: string\n  hasToken: boolean\n  userType: string\n}\n\nexport interface DebugInfo {\n  auth: AuthInfo\n  globalConfig: Record<string, unknown>\n  project: Error | ProjectInfo | null\n  projectConfig: CliConfig | Error\n  user: Error | UserInfo | null\n  versions: ModuleVersionResult[]\n}\n"],"names":[],"mappings":"AA4BA,WAOC"}
+{"version":3,"sources":["../../../src/actions/debug/types.ts"],"sourcesContent":["import {type CliConfig, type ProjectRootResult} from '@sanity/cli-core'\n\nimport {type ModuleVersionResult} from '../versions/types.js'\n\nexport interface DebugInfoOptions {\n  cliConfig: CliConfig | undefined\n  includeSecrets: boolean\n  projectRoot: ProjectRootResult | undefined\n}\n\nexport interface UserInfo {\n  email: string\n  id: string\n  name: string\n}\n\nexport interface ProjectInfo {\n  displayName: string\n  id: string\n  userRoles: string[]\n}\n\nexport interface AuthInfo {\n  authToken: string\n  hasToken: boolean\n  userType: string\n}\n\nexport interface DebugInfo {\n  auth: AuthInfo\n  globalConfig: Record<string, unknown>\n  project: Error | ProjectInfo | null\n  projectConfig: CliConfig | Error | undefined\n  user: Error | UserInfo | null\n  versions: ModuleVersionResult[] | undefined\n}\n"],"names":[],"mappings":"AA4BA,WAOC"}

package/dist/actions/deploy/deployStudioSchemasAndManifests.worker.js

@@ -19,12 +19,23 @@ async function main() {
         if (workspaces.length === 0) {
             throw new Error('No workspaces found');
         }
+        // Extract manifest data (including ManifestSchemaType[]) once, while Schema objects are
+        // still live. Both writeWorkspaceToDist and updateWorkspacesSchemas consume the result.
+        const workspaceManifests = await extractWorkspaceManifest(workspaces, workDir);
+        const schemaInputs = workspaceManifests.map((manifest)=>({
+                dataset: manifest.dataset,
+                manifestSchema: manifest.schema,
+                name: manifest.name,
+                projectId: manifest.projectId,
+                title: manifest.title
+            }));
         debug('Handling deployment for %s', isExternal ? 'external' : 'internal');
         let studioManifest = null;
         if (isExternal) {
             ;
             [studioManifest] = await handleExternalDeployment({
                 projectId,
+                schemaInputs,
                 schemaRequired,
                 verbose,
                 workDir,
@@ -35,8 +46,10 @@ async function main() {
             [studioManifest] = await handleInternalDeployment({
                 outPath,
                 projectId,
+                schemaInputs,
                 verbose,
                 workDir,
+                workspaceManifests,
                 workspaces
             });
         }
@@ -54,20 +67,11 @@ async function main() {
         });
     }
 }
-async function writeWorkspaceToDist({ outPath, workDir, workspaces }) {
-    // Get the create manifest workspace
-    const workspaceManifests = await extractWorkspaceManifest(workspaces, workDir);
-    await writeManifestFile({
-        outPath,
-        workDir,
-        workspaceManifests
-    });
-}
 /**
  * External deployments:
  * 1. Update the workspace schemas to the /schemas endpoint IF --schema-required is passed
  * 2. Update server-side schemas
- */ async function handleExternalDeployment({ projectId, schemaRequired, verbose, workDir, workspaces }) {
+ */ async function handleExternalDeployment({ projectId, schemaInputs, schemaRequired, verbose, workDir, workspaces }) {
     const [studioManifest] = await Promise.all([
         uploadSchemaToLexicon({
             projectId,
@@ -77,7 +81,7 @@ async function writeWorkspaceToDist({ outPath, workDir, workspaces }) {
         }),
         schemaRequired ? updateWorkspacesSchemas({
             verbose,
-            workspaces
+            workspaces: schemaInputs
         }) : undefined
     ]);
     return [
@@ -92,7 +96,7 @@ async function writeWorkspaceToDist({ outPath, workDir, workspaces }) {
  * 3. Update server-side schemas
  *
  * @param workspaces - The workspaces to deploy
- */ async function handleInternalDeployment({ outPath, projectId, verbose, workDir, workspaces }) {
+ */ async function handleInternalDeployment({ outPath, projectId, schemaInputs, verbose, workDir, workspaceManifests, workspaces }) {
     const [studioManifest] = await Promise.all([
         uploadSchemaToLexicon({
             projectId,
@@ -100,15 +104,15 @@ async function writeWorkspaceToDist({ outPath, workDir, workspaces }) {
             workDir,
             workspaces
         }),
-        writeWorkspaceToDist({
+        writeManifestFile({
             outPath,
             workDir,
-            workspaces
+            workspaceManifests
         }),
         // Updates the workspaces schemas to /schemas endpoint
         updateWorkspacesSchemas({
             verbose,
-            workspaces
+            workspaces: schemaInputs
         })
     ]);
     return [

package/dist/actions/deploy/deployStudioSchemasAndManifests.worker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/deploy/deployStudioSchemasAndManifests.worker.ts"],"sourcesContent":["import {isMainThread, parentPort, workerData} from 'node:worker_threads'\n\nimport {getStudioWorkspaces, subdebug} from '@sanity/cli-core'\nimport {type StudioManifest, type Workspace} from 'sanity'\n\nimport {extractWorkspaceManifest} from '../manifest/extractWorkspaceManifest.js'\nimport {writeManifestFile} from '../manifest/writeManifestFile.js'\nimport {updateWorkspacesSchemas} from '../schema/updateWorkspaceSchema.js'\nimport {uploadSchemaToLexicon} from '../schema/uploadSchemaToLexicon.js'\nimport {extractValidationFromSchemaError} from '../schema/utils/extractValidationFromSchemaError.js'\nimport {deployStudioSchemasAndManifestsWorkerData} from './types.js'\n\nconst debug = subdebug('deployStudioSchemasAndManifests.worker')\n\nasync function main() {\n  if (isMainThread || !parentPort) {\n    throw new Error('Should only be run in a worker!')\n  }\n\n  const {configPath, isExternal, outPath, projectId, schemaRequired, verbose, workDir} =\n    deployStudioSchemasAndManifestsWorkerData.parse(workerData)\n\n  try {\n    debug('Deploying studio schemas and manifests from config path %s', configPath)\n    const workspaces = await getStudioWorkspaces(configPath)\n    debug('Workspaces %o', workspaces)\n\n    if (workspaces.length === 0) {\n      throw new Error('No workspaces found')\n    }\n\n    debug('Handling deployment for %s', isExternal ? 'external' : 'internal')\n\n    let studioManifest: StudioManifest | null = null\n\n    if (isExternal) {\n      ;[studioManifest] = await handleExternalDeployment({\n        projectId,\n        schemaRequired,\n        verbose,\n        workDir,\n        workspaces,\n      })\n    } else {\n      ;[studioManifest] = await handleInternalDeployment({\n        outPath,\n        projectId,\n        verbose,\n        workDir,\n        workspaces,\n      })\n    }\n\n    parentPort.postMessage({\n      studioManifest,\n      type: 'success',\n    })\n  } catch (error) {\n    debug('Error deploying studio schemas and manifests', error)\n    const validation = await extractValidationFromSchemaError(error, workDir)\n    parentPort.postMessage({\n      error: error instanceof Error ? error.message : String(error),\n      type: 'error',\n      validation,\n    })\n  }\n}\n\nasync function writeWorkspaceToDist({\n  outPath,\n  workDir,\n  workspaces,\n}: {\n  outPath: string\n  workDir: string\n  workspaces: Workspace[]\n}) {\n  // Get the create manifest workspace\n  const workspaceManifests = await extractWorkspaceManifest(workspaces, workDir)\n\n  await writeManifestFile({\n    outPath,\n    workDir,\n    workspaceManifests,\n  })\n}\n\n/**\n * External deployments:\n * 1. Update the workspace schemas to the /schemas endpoint IF --schema-required is passed\n * 2. Update server-side schemas\n */\nasync function handleExternalDeployment({\n  projectId,\n  schemaRequired,\n  verbose,\n  workDir,\n  workspaces,\n}: {\n  projectId: string\n  schemaRequired: boolean\n  verbose: boolean\n  workDir: string\n  workspaces: Workspace[]\n}): Promise<[StudioManifest | null]> {\n  const [studioManifest] = await Promise.all([\n    uploadSchemaToLexicon({\n      projectId,\n      verbose,\n      workDir,\n      workspaces,\n    }),\n    schemaRequired ? updateWorkspacesSchemas({verbose, workspaces}) : undefined,\n  ])\n\n  return [studioManifest]\n}\n\n/**\n *\n * Internal deployments:\n * 1. Write the workspace manifests to the dist directory\n * 2. Update the workspaces schemas to the /schemas endpoint\n * 3. Update server-side schemas\n *\n * @param workspaces - The workspaces to deploy\n */\nasync function handleInternalDeployment({\n  outPath,\n  projectId,\n  verbose,\n  workDir,\n  workspaces,\n}: {\n  outPath: string\n  projectId: string\n  verbose: boolean\n  workDir: string\n  workspaces: Workspace[]\n}): Promise<[StudioManifest | null]> {\n  const [studioManifest] = await Promise.all([\n    uploadSchemaToLexicon({\n      projectId,\n      verbose,\n      workDir,\n      workspaces,\n    }),\n    writeWorkspaceToDist({outPath, workDir, workspaces}),\n    // Updates the workspaces schemas to /schemas endpoint\n    updateWorkspacesSchemas({\n      verbose,\n      workspaces,\n    }),\n  ])\n\n  return [studioManifest]\n}\n\nawait main()\n"],"names":["isMainThread","parentPort","workerData","getStudioWorkspaces","subdebug","extractWorkspaceManifest","writeManifestFile","updateWorkspacesSchemas","uploadSchemaToLexicon","extractValidationFromSchemaError","deployStudioSchemasAndManifestsWorkerData","debug","main","Error","configPath","isExternal","outPath","projectId","schemaRequired","verbose","workDir","parse","workspaces","length","studioManifest","handleExternalDeployment","handleInternalDeployment","postMessage","type","error","validation","message","String","writeWorkspaceToDist","workspaceManifests","Promise","all","undefined"],"mappings":"AAAA,SAAQA,YAAY,EAAEC,UAAU,EAAEC,UAAU,QAAO,sBAAqB;AAExE,SAAQC,mBAAmB,EAAEC,QAAQ,QAAO,mBAAkB;AAG9D,SAAQC,wBAAwB,QAAO,0CAAyC;AAChF,SAAQC,iBAAiB,QAAO,mCAAkC;AAClE,SAAQC,uBAAuB,QAAO,qCAAoC;AAC1E,SAAQC,qBAAqB,QAAO,qCAAoC;AACxE,SAAQC,gCAAgC,QAAO,sDAAqD;AACpG,SAAQC,yCAAyC,QAAO,aAAY;AAEpE,MAAMC,QAAQP,SAAS;AAEvB,eAAeQ;IACb,IAAIZ,gBAAgB,CAACC,YAAY;QAC/B,MAAM,IAAIY,MAAM;IAClB;IAEA,MAAM,EAACC,UAAU,EAAEC,UAAU,EAAEC,OAAO,EAAEC,SAAS,EAAEC,cAAc,EAAEC,OAAO,EAAEC,OAAO,EAAC,GAClFV,0CAA0CW,KAAK,CAACnB;IAElD,IAAI;QACFS,MAAM,8DAA8DG;QACpE,MAAMQ,aAAa,MAAMnB,oBAAoBW;QAC7CH,MAAM,iBAAiBW;QAEvB,IAAIA,WAAWC,MAAM,KAAK,GAAG;YAC3B,MAAM,IAAIV,MAAM;QAClB;QAEAF,MAAM,8BAA8BI,aAAa,aAAa;QAE9D,IAAIS,iBAAwC;QAE5C,IAAIT,YAAY;;YACb,CAACS,eAAe,GAAG,MAAMC,yBAAyB;gBACjDR;gBACAC;gBACAC;gBACAC;gBACAE;YACF;QACF,OAAO;;YACJ,CAACE,eAAe,GAAG,MAAME,yBAAyB;gBACjDV;gBACAC;gBACAE;gBACAC;gBACAE;YACF;QACF;QAEArB,WAAW0B,WAAW,CAAC;YACrBH;YACAI,MAAM;QACR;IACF,EAAE,OAAOC,OAAO;QACdlB,MAAM,gDAAgDkB;QACtD,MAAMC,aAAa,MAAMrB,iCAAiCoB,OAAOT;QACjEnB,WAAW0B,WAAW,CAAC;YACrBE,OAAOA,iBAAiBhB,QAAQgB,MAAME,OAAO,GAAGC,OAAOH;YACvDD,MAAM;YACNE;QACF;IACF;AACF;AAEA,eAAeG,qBAAqB,EAClCjB,OAAO,EACPI,OAAO,EACPE,UAAU,EAKX;IACC,oCAAoC;IACpC,MAAMY,qBAAqB,MAAM7B,yBAAyBiB,YAAYF;IAEtE,MAAMd,kBAAkB;QACtBU;QACAI;QACAc;IACF;AACF;AAEA;;;;CAIC,GACD,eAAeT,yBAAyB,EACtCR,SAAS,EACTC,cAAc,EACdC,OAAO,EACPC,OAAO,EACPE,UAAU,EAOX;IACC,MAAM,CAACE,eAAe,GAAG,MAAMW,QAAQC,GAAG,CAAC;QACzC5B,sBAAsB;YACpBS;YACAE;YACAC;YACAE;QACF;QACAJ,iBAAiBX,wBAAwB;YAACY;YAASG;QAAU,KAAKe;KACnE;IAED,OAAO;QAACb;KAAe;AACzB;AAEA;;;;;;;;CAQC,GACD,eAAeE,yBAAyB,EACtCV,OAAO,EACPC,SAAS,EACTE,OAAO,EACPC,OAAO,EACPE,UAAU,EAOX;IACC,MAAM,CAACE,eAAe,GAAG,MAAMW,QAAQC,GAAG,CAAC;QACzC5B,sBAAsB;YACpBS;YACAE;YACAC;YACAE;QACF;QACAW,qBAAqB;YAACjB;YAASI;YAASE;QAAU;QAClD,sDAAsD;QACtDf,wBAAwB;YACtBY;YACAG;QACF;KACD;IAED,OAAO;QAACE;KAAe;AACzB;AAEA,MAAMZ"}
+{"version":3,"sources":["../../../src/actions/deploy/deployStudioSchemasAndManifests.worker.ts"],"sourcesContent":["import {isMainThread, parentPort, workerData} from 'node:worker_threads'\n\nimport {getStudioWorkspaces, subdebug} from '@sanity/cli-core'\nimport {type StudioManifest, type Workspace} from 'sanity'\n\nimport {extractWorkspaceManifest} from '../manifest/extractWorkspaceManifest.js'\nimport {type CreateWorkspaceManifest} from '../manifest/types.js'\nimport {writeManifestFile} from '../manifest/writeManifestFile.js'\nimport {\n  updateWorkspacesSchemas,\n  type WorkspaceSchemaInput,\n} from '../schema/updateWorkspaceSchema.js'\nimport {uploadSchemaToLexicon} from '../schema/uploadSchemaToLexicon.js'\nimport {extractValidationFromSchemaError} from '../schema/utils/extractValidationFromSchemaError.js'\nimport {deployStudioSchemasAndManifestsWorkerData} from './types.js'\n\nconst debug = subdebug('deployStudioSchemasAndManifests.worker')\n\nasync function main() {\n  if (isMainThread || !parentPort) {\n    throw new Error('Should only be run in a worker!')\n  }\n\n  const {configPath, isExternal, outPath, projectId, schemaRequired, verbose, workDir} =\n    deployStudioSchemasAndManifestsWorkerData.parse(workerData)\n\n  try {\n    debug('Deploying studio schemas and manifests from config path %s', configPath)\n    const workspaces = await getStudioWorkspaces(configPath)\n    debug('Workspaces %o', workspaces)\n\n    if (workspaces.length === 0) {\n      throw new Error('No workspaces found')\n    }\n\n    // Extract manifest data (including ManifestSchemaType[]) once, while Schema objects are\n    // still live. Both writeWorkspaceToDist and updateWorkspacesSchemas consume the result.\n    const workspaceManifests = await extractWorkspaceManifest(workspaces, workDir)\n\n    const schemaInputs: WorkspaceSchemaInput[] = workspaceManifests.map((manifest) => ({\n      dataset: manifest.dataset,\n      manifestSchema: manifest.schema,\n      name: manifest.name,\n      projectId: manifest.projectId,\n      title: manifest.title,\n    }))\n\n    debug('Handling deployment for %s', isExternal ? 'external' : 'internal')\n\n    let studioManifest: StudioManifest | null = null\n\n    if (isExternal) {\n      ;[studioManifest] = await handleExternalDeployment({\n        projectId,\n        schemaInputs,\n        schemaRequired,\n        verbose,\n        workDir,\n        workspaces,\n      })\n    } else {\n      ;[studioManifest] = await handleInternalDeployment({\n        outPath,\n        projectId,\n        schemaInputs,\n        verbose,\n        workDir,\n        workspaceManifests,\n        workspaces,\n      })\n    }\n\n    parentPort.postMessage({\n      studioManifest,\n      type: 'success',\n    })\n  } catch (error) {\n    debug('Error deploying studio schemas and manifests', error)\n    const validation = await extractValidationFromSchemaError(error, workDir)\n    parentPort.postMessage({\n      error: error instanceof Error ? error.message : String(error),\n      type: 'error',\n      validation,\n    })\n  }\n}\n\n/**\n * External deployments:\n * 1. Update the workspace schemas to the /schemas endpoint IF --schema-required is passed\n * 2. Update server-side schemas\n */\nasync function handleExternalDeployment({\n  projectId,\n  schemaInputs,\n  schemaRequired,\n  verbose,\n  workDir,\n  workspaces,\n}: {\n  projectId: string\n  schemaInputs: WorkspaceSchemaInput[]\n  schemaRequired: boolean\n  verbose: boolean\n  workDir: string\n  workspaces: Workspace[]\n}): Promise<[StudioManifest | null]> {\n  const [studioManifest] = await Promise.all([\n    uploadSchemaToLexicon({\n      projectId,\n      verbose,\n      workDir,\n      workspaces,\n    }),\n    schemaRequired ? updateWorkspacesSchemas({verbose, workspaces: schemaInputs}) : undefined,\n  ])\n\n  return [studioManifest]\n}\n\n/**\n *\n * Internal deployments:\n * 1. Write the workspace manifests to the dist directory\n * 2. Update the workspaces schemas to the /schemas endpoint\n * 3. Update server-side schemas\n *\n * @param workspaces - The workspaces to deploy\n */\nasync function handleInternalDeployment({\n  outPath,\n  projectId,\n  schemaInputs,\n  verbose,\n  workDir,\n  workspaceManifests,\n  workspaces,\n}: {\n  outPath: string\n  projectId: string\n  schemaInputs: WorkspaceSchemaInput[]\n  verbose: boolean\n  workDir: string\n  workspaceManifests: CreateWorkspaceManifest[]\n  workspaces: Workspace[]\n}): Promise<[StudioManifest | null]> {\n  const [studioManifest] = await Promise.all([\n    uploadSchemaToLexicon({\n      projectId,\n      verbose,\n      workDir,\n      workspaces,\n    }),\n    writeManifestFile({outPath, workDir, workspaceManifests}),\n    // Updates the workspaces schemas to /schemas endpoint\n    updateWorkspacesSchemas({\n      verbose,\n      workspaces: schemaInputs,\n    }),\n  ])\n\n  return [studioManifest]\n}\n\nawait main()\n"],"names":["isMainThread","parentPort","workerData","getStudioWorkspaces","subdebug","extractWorkspaceManifest","writeManifestFile","updateWorkspacesSchemas","uploadSchemaToLexicon","extractValidationFromSchemaError","deployStudioSchemasAndManifestsWorkerData","debug","main","Error","configPath","isExternal","outPath","projectId","schemaRequired","verbose","workDir","parse","workspaces","length","workspaceManifests","schemaInputs","map","manifest","dataset","manifestSchema","schema","name","title","studioManifest","handleExternalDeployment","handleInternalDeployment","postMessage","type","error","validation","message","String","Promise","all","undefined"],"mappings":"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"}

package/dist/actions/exec/execScript.js

@@ -1,12 +1,13 @@
 import { spawn } from 'node:child_process';
 import path from 'node:path';
+import { CLIError } from '@oclif/core/errors';
+import { getCliToken } from '@sanity/cli-core';
 export async function execScript(options) {
     const { extraArguments, flags, scriptPath, workDir } = options;
     const mockBrowserEnv = flags['mock-browser-env'];
     const withUserToken = flags['with-user-token'];
     const resolvedScriptPath = path.resolve(scriptPath);
     const browserEnvPath = new URL('registerBrowserEnv.worker.js', import.meta.url).href;
-    const configClientPath = new URL('configClient.worker.js', import.meta.url).href;
     // Use tsx loader for TypeScript support in the spawned child process
     // We need to resolve the tsx loader path from the CLI's node_modules since the child
     // process will run from the user's script directory where tsx may not be installed.
@@ -15,6 +16,21 @@ export async function execScript(options) {
     if (!tsxLoaderPath) {
         throw new Error('@sanity/cli not able to resolve tsx loader');
     }
+    // When --with-user-token is specified, resolve the token in the parent process
+    // and pass it via environment variable. This avoids a module-instance mismatch where
+    // the worker's `getCliClient` import resolves to a different module than the script's
+    // `import {getCliClient} from 'sanity/cli'`, causing the __internal__getToken mutation
+    // to not propagate.
+    let tokenEnv = {};
+    if (withUserToken) {
+        const token = await getCliToken();
+        if (!token) {
+            throw new CLIError('--with-user-token specified, but no auth token could be found. Run `sanity login`');
+        }
+        tokenEnv = {
+            SANITY_AUTH_TOKEN: token
+        };
+    }
     const baseArgs = mockBrowserEnv ? [
         '--import',
         tsxLoaderPath,
@@ -24,20 +40,16 @@ export async function execScript(options) {
         '--import',
         tsxLoaderPath
     ];
-    const tokenArgs = withUserToken ? [
-        '--import',
-        configClientPath
-    ] : [];
     const nodeArgs = [
         ...baseArgs,
-        ...tokenArgs,
         resolvedScriptPath,
         ...extraArguments
     ];
     const proc = spawn(process.argv[0], nodeArgs, {
         env: {
             ...process.env,
-            SANITY_BASE_PATH: workDir
+            SANITY_BASE_PATH: workDir,
+            ...tokenEnv
         },
         stdio: 'inherit'
     });

package/dist/actions/exec/execScript.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/exec/execScript.ts"],"sourcesContent":["import {spawn} from 'node:child_process'\nimport path from 'node:path'\n\ninterface ExecScriptOptions {\n  extraArguments: string[]\n  flags: {\n    'mock-browser-env': boolean\n    'with-user-token': boolean\n  }\n  scriptPath: string\n  workDir: string\n}\n\nexport async function execScript(options: ExecScriptOptions): Promise<void> {\n  const {extraArguments, flags, scriptPath, workDir} = options\n  const mockBrowserEnv = flags['mock-browser-env']\n  const withUserToken = flags['with-user-token']\n\n  const resolvedScriptPath = path.resolve(scriptPath)\n\n  const browserEnvPath = new URL('registerBrowserEnv.worker.js', import.meta.url).href\n  const configClientPath = new URL('configClient.worker.js', import.meta.url).href\n\n  // Use tsx loader for TypeScript support in the spawned child process\n  // We need to resolve the tsx loader path from the CLI's node_modules since the child\n  // process will run from the user's script directory where tsx may not be installed.\n  // Resolve the tsx loader using Node's module resolution relative to package.json\n  const tsxLoaderPath: string = import.meta.resolve('tsx', import.meta.url)\n  if (!tsxLoaderPath) {\n    throw new Error('@sanity/cli not able to resolve tsx loader')\n  }\n\n  const baseArgs = mockBrowserEnv\n    ? ['--import', tsxLoaderPath, '--import', browserEnvPath]\n    : ['--import', tsxLoaderPath]\n  const tokenArgs = withUserToken ? ['--import', configClientPath] : []\n\n  const nodeArgs = [...baseArgs, ...tokenArgs, resolvedScriptPath, ...extraArguments]\n\n  const proc = spawn(process.argv[0], nodeArgs, {\n    env: {\n      ...process.env,\n      SANITY_BASE_PATH: workDir,\n    },\n    stdio: 'inherit',\n  })\n\n  // Signal handlers to forward signals to child process\n  const handleExit = (): void => {\n    proc.kill()\n  }\n  const handleSigInt = (): void => {\n    proc.kill('SIGINT')\n  }\n  const handleSigTerm = (): void => {\n    proc.kill('SIGTERM')\n  }\n\n  process.on('exit', handleExit)\n  process.on('SIGINT', handleSigInt)\n  process.on('SIGTERM', handleSigTerm)\n\n  return new Promise<void>((resolve, reject) => {\n    proc.on('exit', (code, signal) => {\n      // Clean up listeners when child process exits\n      process.removeListener('exit', handleExit)\n      process.removeListener('SIGINT', handleSigInt)\n      process.removeListener('SIGTERM', handleSigTerm)\n\n      if (signal) reject(new Error(`Script terminated by signal: ${signal}`))\n      else if (code && code !== 0) reject(new Error(`Script exited with code: ${code}`))\n      else resolve()\n    })\n    proc.on('error', (err) => {\n      // Clean up listeners on error too\n      process.removeListener('exit', handleExit)\n      process.removeListener('SIGINT', handleSigInt)\n      process.removeListener('SIGTERM', handleSigTerm)\n      reject(err)\n    })\n  })\n}\n"],"names":["spawn","path","execScript","options","extraArguments","flags","scriptPath","workDir","mockBrowserEnv","withUserToken","resolvedScriptPath","resolve","browserEnvPath","URL","url","href","configClientPath","tsxLoaderPath","Error","baseArgs","tokenArgs","nodeArgs","proc","process","argv","env","SANITY_BASE_PATH","stdio","handleExit","kill","handleSigInt","handleSigTerm","on","Promise","reject","code","signal","removeListener","err"],"mappings":"AAAA,SAAQA,KAAK,QAAO,qBAAoB;AACxC,OAAOC,UAAU,YAAW;AAY5B,OAAO,eAAeC,WAAWC,OAA0B;IACzD,MAAM,EAACC,cAAc,EAAEC,KAAK,EAAEC,UAAU,EAAEC,OAAO,EAAC,GAAGJ;IACrD,MAAMK,iBAAiBH,KAAK,CAAC,mBAAmB;IAChD,MAAMI,gBAAgBJ,KAAK,CAAC,kBAAkB;IAE9C,MAAMK,qBAAqBT,KAAKU,OAAO,CAACL;IAExC,MAAMM,iBAAiB,IAAIC,IAAI,gCAAgC,YAAYC,GAAG,EAAEC,IAAI;IACpF,MAAMC,mBAAmB,IAAIH,IAAI,0BAA0B,YAAYC,GAAG,EAAEC,IAAI;IAEhF,qEAAqE;IACrE,qFAAqF;IACrF,oFAAoF;IACpF,iFAAiF;IACjF,MAAME,gBAAwB,YAAYN,OAAO,CAAC,OAAO,YAAYG,GAAG;IACxE,IAAI,CAACG,eAAe;QAClB,MAAM,IAAIC,MAAM;IAClB;IAEA,MAAMC,WAAWX,iBACb;QAAC;QAAYS;QAAe;QAAYL;KAAe,GACvD;QAAC;QAAYK;KAAc;IAC/B,MAAMG,YAAYX,gBAAgB;QAAC;QAAYO;KAAiB,GAAG,EAAE;IAErE,MAAMK,WAAW;WAAIF;WAAaC;QAAWV;WAAuBN;KAAe;IAEnF,MAAMkB,OAAOtB,MAAMuB,QAAQC,IAAI,CAAC,EAAE,EAAEH,UAAU;QAC5CI,KAAK;YACH,GAAGF,QAAQE,GAAG;YACdC,kBAAkBnB;QACpB;QACAoB,OAAO;IACT;IAEA,sDAAsD;IACtD,MAAMC,aAAa;QACjBN,KAAKO,IAAI;IACX;IACA,MAAMC,eAAe;QACnBR,KAAKO,IAAI,CAAC;IACZ;IACA,MAAME,gBAAgB;QACpBT,KAAKO,IAAI,CAAC;IACZ;IAEAN,QAAQS,EAAE,CAAC,QAAQJ;IACnBL,QAAQS,EAAE,CAAC,UAAUF;IACrBP,QAAQS,EAAE,CAAC,WAAWD;IAEtB,OAAO,IAAIE,QAAc,CAACtB,SAASuB;QACjCZ,KAAKU,EAAE,CAAC,QAAQ,CAACG,MAAMC;YACrB,8CAA8C;YAC9Cb,QAAQc,cAAc,CAAC,QAAQT;YAC/BL,QAAQc,cAAc,CAAC,UAAUP;YACjCP,QAAQc,cAAc,CAAC,WAAWN;YAElC,IAAIK,QAAQF,OAAO,IAAIhB,MAAM,CAAC,6BAA6B,EAAEkB,QAAQ;iBAChE,IAAID,QAAQA,SAAS,GAAGD,OAAO,IAAIhB,MAAM,CAAC,yBAAyB,EAAEiB,MAAM;iBAC3ExB;QACP;QACAW,KAAKU,EAAE,CAAC,SAAS,CAACM;YAChB,kCAAkC;YAClCf,QAAQc,cAAc,CAAC,QAAQT;YAC/BL,QAAQc,cAAc,CAAC,UAAUP;YACjCP,QAAQc,cAAc,CAAC,WAAWN;YAClCG,OAAOI;QACT;IACF;AACF"}
+{"version":3,"sources":["../../../src/actions/exec/execScript.ts"],"sourcesContent":["import {spawn} from 'node:child_process'\nimport path from 'node:path'\n\nimport {CLIError} from '@oclif/core/errors'\nimport {getCliToken} from '@sanity/cli-core'\n\ninterface ExecScriptOptions {\n  extraArguments: string[]\n  flags: {\n    'mock-browser-env': boolean\n    'with-user-token': boolean\n  }\n  scriptPath: string\n  workDir: string\n}\n\nexport async function execScript(options: ExecScriptOptions): Promise<void> {\n  const {extraArguments, flags, scriptPath, workDir} = options\n  const mockBrowserEnv = flags['mock-browser-env']\n  const withUserToken = flags['with-user-token']\n\n  const resolvedScriptPath = path.resolve(scriptPath)\n\n  const browserEnvPath = new URL('registerBrowserEnv.worker.js', import.meta.url).href\n\n  // Use tsx loader for TypeScript support in the spawned child process\n  // We need to resolve the tsx loader path from the CLI's node_modules since the child\n  // process will run from the user's script directory where tsx may not be installed.\n  // Resolve the tsx loader using Node's module resolution relative to package.json\n  const tsxLoaderPath: string = import.meta.resolve('tsx', import.meta.url)\n  if (!tsxLoaderPath) {\n    throw new Error('@sanity/cli not able to resolve tsx loader')\n  }\n\n  // When --with-user-token is specified, resolve the token in the parent process\n  // and pass it via environment variable. This avoids a module-instance mismatch where\n  // the worker's `getCliClient` import resolves to a different module than the script's\n  // `import {getCliClient} from 'sanity/cli'`, causing the __internal__getToken mutation\n  // to not propagate.\n  let tokenEnv: Record<string, string> = {}\n  if (withUserToken) {\n    const token = await getCliToken()\n    if (!token) {\n      throw new CLIError(\n        '--with-user-token specified, but no auth token could be found. Run `sanity login`',\n      )\n    }\n    tokenEnv = {SANITY_AUTH_TOKEN: token}\n  }\n\n  const baseArgs = mockBrowserEnv\n    ? ['--import', tsxLoaderPath, '--import', browserEnvPath]\n    : ['--import', tsxLoaderPath]\n\n  const nodeArgs = [...baseArgs, resolvedScriptPath, ...extraArguments]\n\n  const proc = spawn(process.argv[0], nodeArgs, {\n    env: {\n      ...process.env,\n      SANITY_BASE_PATH: workDir,\n      ...tokenEnv,\n    },\n    stdio: 'inherit',\n  })\n\n  // Signal handlers to forward signals to child process\n  const handleExit = (): void => {\n    proc.kill()\n  }\n  const handleSigInt = (): void => {\n    proc.kill('SIGINT')\n  }\n  const handleSigTerm = (): void => {\n    proc.kill('SIGTERM')\n  }\n\n  process.on('exit', handleExit)\n  process.on('SIGINT', handleSigInt)\n  process.on('SIGTERM', handleSigTerm)\n\n  return new Promise<void>((resolve, reject) => {\n    proc.on('exit', (code, signal) => {\n      // Clean up listeners when child process exits\n      process.removeListener('exit', handleExit)\n      process.removeListener('SIGINT', handleSigInt)\n      process.removeListener('SIGTERM', handleSigTerm)\n\n      if (signal) reject(new Error(`Script terminated by signal: ${signal}`))\n      else if (code && code !== 0) reject(new Error(`Script exited with code: ${code}`))\n      else resolve()\n    })\n    proc.on('error', (err) => {\n      // Clean up listeners on error too\n      process.removeListener('exit', handleExit)\n      process.removeListener('SIGINT', handleSigInt)\n      process.removeListener('SIGTERM', handleSigTerm)\n      reject(err)\n    })\n  })\n}\n"],"names":["spawn","path","CLIError","getCliToken","execScript","options","extraArguments","flags","scriptPath","workDir","mockBrowserEnv","withUserToken","resolvedScriptPath","resolve","browserEnvPath","URL","url","href","tsxLoaderPath","Error","tokenEnv","token","SANITY_AUTH_TOKEN","baseArgs","nodeArgs","proc","process","argv","env","SANITY_BASE_PATH","stdio","handleExit","kill","handleSigInt","handleSigTerm","on","Promise","reject","code","signal","removeListener","err"],"mappings":"AAAA,SAAQA,KAAK,QAAO,qBAAoB;AACxC,OAAOC,UAAU,YAAW;AAE5B,SAAQC,QAAQ,QAAO,qBAAoB;AAC3C,SAAQC,WAAW,QAAO,mBAAkB;AAY5C,OAAO,eAAeC,WAAWC,OAA0B;IACzD,MAAM,EAACC,cAAc,EAAEC,KAAK,EAAEC,UAAU,EAAEC,OAAO,EAAC,GAAGJ;IACrD,MAAMK,iBAAiBH,KAAK,CAAC,mBAAmB;IAChD,MAAMI,gBAAgBJ,KAAK,CAAC,kBAAkB;IAE9C,MAAMK,qBAAqBX,KAAKY,OAAO,CAACL;IAExC,MAAMM,iBAAiB,IAAIC,IAAI,gCAAgC,YAAYC,GAAG,EAAEC,IAAI;IAEpF,qEAAqE;IACrE,qFAAqF;IACrF,oFAAoF;IACpF,iFAAiF;IACjF,MAAMC,gBAAwB,YAAYL,OAAO,CAAC,OAAO,YAAYG,GAAG;IACxE,IAAI,CAACE,eAAe;QAClB,MAAM,IAAIC,MAAM;IAClB;IAEA,+EAA+E;IAC/E,qFAAqF;IACrF,sFAAsF;IACtF,uFAAuF;IACvF,oBAAoB;IACpB,IAAIC,WAAmC,CAAC;IACxC,IAAIT,eAAe;QACjB,MAAMU,QAAQ,MAAMlB;QACpB,IAAI,CAACkB,OAAO;YACV,MAAM,IAAInB,SACR;QAEJ;QACAkB,WAAW;YAACE,mBAAmBD;QAAK;IACtC;IAEA,MAAME,WAAWb,iBACb;QAAC;QAAYQ;QAAe;QAAYJ;KAAe,GACvD;QAAC;QAAYI;KAAc;IAE/B,MAAMM,WAAW;WAAID;QAAUX;WAAuBN;KAAe;IAErE,MAAMmB,OAAOzB,MAAM0B,QAAQC,IAAI,CAAC,EAAE,EAAEH,UAAU;QAC5CI,KAAK;YACH,GAAGF,QAAQE,GAAG;YACdC,kBAAkBpB;YAClB,GAAGW,QAAQ;QACb;QACAU,OAAO;IACT;IAEA,sDAAsD;IACtD,MAAMC,aAAa;QACjBN,KAAKO,IAAI;IACX;IACA,MAAMC,eAAe;QACnBR,KAAKO,IAAI,CAAC;IACZ;IACA,MAAME,gBAAgB;QACpBT,KAAKO,IAAI,CAAC;IACZ;IAEAN,QAAQS,EAAE,CAAC,QAAQJ;IACnBL,QAAQS,EAAE,CAAC,UAAUF;IACrBP,QAAQS,EAAE,CAAC,WAAWD;IAEtB,OAAO,IAAIE,QAAc,CAACvB,SAASwB;QACjCZ,KAAKU,EAAE,CAAC,QAAQ,CAACG,MAAMC;YACrB,8CAA8C;YAC9Cb,QAAQc,cAAc,CAAC,QAAQT;YAC/BL,QAAQc,cAAc,CAAC,UAAUP;YACjCP,QAAQc,cAAc,CAAC,WAAWN;YAElC,IAAIK,QAAQF,OAAO,IAAIlB,MAAM,CAAC,6BAA6B,EAAEoB,QAAQ;iBAChE,IAAID,QAAQA,SAAS,GAAGD,OAAO,IAAIlB,MAAM,CAAC,yBAAyB,EAAEmB,MAAM;iBAC3EzB;QACP;QACAY,KAAKU,EAAE,CAAC,SAAS,CAACM;YAChB,kCAAkC;YAClCf,QAAQc,cAAc,CAAC,QAAQT;YAC/BL,QAAQc,cAAc,CAAC,UAAUP;YACjCP,QAAQc,cAAc,CAAC,WAAWN;YAClCG,OAAOI;QACT;IACF;AACF"}

package/dist/actions/manifest/types.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/manifest/types.ts"],"sourcesContent":["import {type SanityDocumentLike} from '@sanity/types'\nimport {type MediaLibraryConfig, type Workspace} from 'sanity'\nimport {z} from 'zod'\n\nexport const SANITY_WORKSPACE_SCHEMA_ID_PREFIX = '_.schemas'\nexport const SANITY_WORKSPACE_SCHEMA_TYPE = 'system.schema'\nexport const CURRENT_WORKSPACE_SCHEMA_VERSION = '2025-05-01'\n\nexport type ManifestSerializable =\n  | boolean\n  | ManifestSerializable[]\n  | number\n  | string\n  | {[k: string]: ManifestSerializable}\n\nexport interface CreateManifest {\n  createdAt: string\n  studioVersion: string | null\n  version: number\n  workspaces: ManifestWorkspaceFile[]\n}\n\nexport interface AppManifest {\n  version: '1'\n\n  icon?: string\n  title?: string\n}\n\nexport interface ManifestWorkspaceFile extends Omit<CreateWorkspaceManifest, 'schema' | 'tools'> {\n  schema: string // filename\n  tools: string // filename\n}\n\nexport interface CreateWorkspaceManifest {\n  basePath: string\n  dataset: string\n  /**\n   * returns null in the case of the icon not being able to be stringified\n   */\n  icon: string | null\n  name: string\n  projectId: string\n  schema: ManifestSchemaType[]\n  tools: ManifestTool[]\n\n  mediaLibrary?: MediaLibraryConfig\n  subtitle?: string\n  title?: string\n}\n\nexport interface ManifestSchemaType {\n  name: string\n  type: string\n\n  deprecated?: {\n    reason: string\n  }\n  fields?: ManifestField[]\n  fieldsets?: ManifestFieldset[]\n  hidden?: 'conditional' | boolean\n  lists?: ManifestTitledValue[]\n  //portable text\n  marks?: {\n    annotations?: ManifestArrayMember[]\n    decorators?: ManifestTitledValue[]\n  }\n  of?: ManifestArrayMember[]\n  options?: Record<string, ManifestSerializable>\n  preview?: {\n    select: Record<string, string>\n  }\n  readOnly?: 'conditional' | boolean\n  styles?: ManifestTitledValue[]\n  title?: string\n  to?: ManifestReferenceMember[]\n  validation?: ManifestValidationGroup[]\n\n  // userland (assignable to ManifestSerializable | undefined)\n  // not included to add some typesafty to extractManifest\n  // [index: string]: unknown\n}\n\nexport interface ManifestFieldset {\n  [index: string]: ManifestSerializable | undefined\n  name: string\n\n  title?: string\n}\n\nexport interface ManifestTitledValue {\n  value: string\n\n  title?: string\n}\n\ntype ManifestArrayMember = Omit<ManifestSchemaType, 'name'> & {name?: string}\ntype ManifestReferenceMember = Omit<ManifestSchemaType, 'name'> & {name?: string}\nexport type ManifestField = ManifestSchemaType & {fieldset?: string}\n\nexport interface ManifestValidationGroup {\n  rules: ManifestValidationRule[]\n\n  level?: 'error' | 'info' | 'warning'\n  message?: string\n}\n\nexport type ManifestValidationRule = {\n  [index: string]: ManifestSerializable | undefined\n  constraint?: ManifestSerializable\n  flag: string\n}\n\nexport interface ManifestTool {\n  /**\n   * returns null in the case of the icon not being able to be stringified\n   */\n  icon: string | null\n  name: string\n  title: string\n  type: string | null\n}\n\nexport type DefaultWorkspaceSchemaId = `${typeof SANITY_WORKSPACE_SCHEMA_ID_PREFIX}.${string}`\ntype PrefixedWorkspaceSchemaId = `${DefaultWorkspaceSchemaId}.${string}`\nexport type WorkspaceSchemaId = DefaultWorkspaceSchemaId | PrefixedWorkspaceSchemaId\n\nexport interface StoredWorkspaceSchema extends SanityDocumentLike {\n  _id: WorkspaceSchemaId\n  _type: typeof SANITY_WORKSPACE_SCHEMA_TYPE\n  /**\n   * The API expects JSON coming in, but will store a string to save on attribute paths.\n   * Consumers must use JSON.parse on the value, put we deploy to the API using ManifestSchemaType[]\n   */\n  schema: string | Workspace['schema']\n  /* api-like version string: date at which the format had a meaningful change */\n  version: typeof CURRENT_WORKSPACE_SCHEMA_VERSION | undefined\n  workspace: {\n    name: string\n    title?: string\n  }\n\n  tag?: string\n}\n\nexport const extractManifestWorkerData = z.object({configPath: z.string(), workDir: z.string()})\n\nexport type ExtractManifestWorkerData = z.infer<typeof extractManifestWorkerData>\n"],"names":["z","SANITY_WORKSPACE_SCHEMA_ID_PREFIX","SANITY_WORKSPACE_SCHEMA_TYPE","CURRENT_WORKSPACE_SCHEMA_VERSION","extractManifestWorkerData","object","configPath","string","workDir"],"mappings":"AAEA,SAAQA,CAAC,QAAO,MAAK;AAErB,OAAO,MAAMC,oCAAoC,YAAW;AAC5D,OAAO,MAAMC,+BAA+B,gBAAe;AAC3D,OAAO,MAAMC,mCAAmC,aAAY;AA2I5D,OAAO,MAAMC,4BAA4BJ,EAAEK,MAAM,CAAC;IAACC,YAAYN,EAAEO,MAAM;IAAIC,SAASR,EAAEO,MAAM;AAAE,GAAE"}
+{"version":3,"sources":["../../../src/actions/manifest/types.ts"],"sourcesContent":["import {type SanityDocumentLike} from '@sanity/types'\nimport {type MediaLibraryConfig} from 'sanity'\nimport {z} from 'zod'\n\nexport const SANITY_WORKSPACE_SCHEMA_ID_PREFIX = '_.schemas'\nexport const SANITY_WORKSPACE_SCHEMA_TYPE = 'system.schema'\nexport const CURRENT_WORKSPACE_SCHEMA_VERSION = '2025-05-01'\n\nexport type ManifestSerializable =\n  | boolean\n  | ManifestSerializable[]\n  | number\n  | string\n  | {[k: string]: ManifestSerializable}\n\nexport interface CreateManifest {\n  createdAt: string\n  studioVersion: string | null\n  version: number\n  workspaces: ManifestWorkspaceFile[]\n}\n\nexport interface AppManifest {\n  version: '1'\n\n  icon?: string\n  title?: string\n}\n\nexport interface ManifestWorkspaceFile extends Omit<CreateWorkspaceManifest, 'schema' | 'tools'> {\n  schema: string // filename\n  tools: string // filename\n}\n\nexport interface CreateWorkspaceManifest {\n  basePath: string\n  dataset: string\n  /**\n   * returns null in the case of the icon not being able to be stringified\n   */\n  icon: string | null\n  name: string\n  projectId: string\n  schema: ManifestSchemaType[]\n  tools: ManifestTool[]\n\n  mediaLibrary?: MediaLibraryConfig\n  subtitle?: string\n  title?: string\n}\n\nexport interface ManifestSchemaType {\n  name: string\n  type: string\n\n  deprecated?: {\n    reason: string\n  }\n  fields?: ManifestField[]\n  fieldsets?: ManifestFieldset[]\n  hidden?: 'conditional' | boolean\n  lists?: ManifestTitledValue[]\n  //portable text\n  marks?: {\n    annotations?: ManifestArrayMember[]\n    decorators?: ManifestTitledValue[]\n  }\n  of?: ManifestArrayMember[]\n  options?: Record<string, ManifestSerializable>\n  preview?: {\n    select: Record<string, string>\n  }\n  readOnly?: 'conditional' | boolean\n  styles?: ManifestTitledValue[]\n  title?: string\n  to?: ManifestReferenceMember[]\n  validation?: ManifestValidationGroup[]\n\n  // userland (assignable to ManifestSerializable | undefined)\n  // not included to add some typesafty to extractManifest\n  // [index: string]: unknown\n}\n\nexport interface ManifestFieldset {\n  [index: string]: ManifestSerializable | undefined\n  name: string\n\n  title?: string\n}\n\nexport interface ManifestTitledValue {\n  value: string\n\n  title?: string\n}\n\ntype ManifestArrayMember = Omit<ManifestSchemaType, 'name'> & {name?: string}\ntype ManifestReferenceMember = Omit<ManifestSchemaType, 'name'> & {name?: string}\nexport type ManifestField = ManifestSchemaType & {fieldset?: string}\n\nexport interface ManifestValidationGroup {\n  rules: ManifestValidationRule[]\n\n  level?: 'error' | 'info' | 'warning'\n  message?: string\n}\n\nexport type ManifestValidationRule = {\n  [index: string]: ManifestSerializable | undefined\n  constraint?: ManifestSerializable\n  flag: string\n}\n\nexport interface ManifestTool {\n  /**\n   * returns null in the case of the icon not being able to be stringified\n   */\n  icon: string | null\n  name: string\n  title: string\n  type: string | null\n}\n\nexport type DefaultWorkspaceSchemaId = `${typeof SANITY_WORKSPACE_SCHEMA_ID_PREFIX}.${string}`\ntype PrefixedWorkspaceSchemaId = `${DefaultWorkspaceSchemaId}.${string}`\nexport type WorkspaceSchemaId = DefaultWorkspaceSchemaId | PrefixedWorkspaceSchemaId\n\nexport interface StoredWorkspaceSchema extends SanityDocumentLike {\n  _id: WorkspaceSchemaId\n  _type: typeof SANITY_WORKSPACE_SCHEMA_TYPE\n  /**\n   * The API expects JSON coming in, but will store a string to save on attribute paths.\n   * Consumers must use JSON.parse on the value, but we deploy to the API using ManifestSchemaType[]\n   */\n  schema: ManifestSchemaType[] | string\n  /* api-like version string: date at which the format had a meaningful change */\n  version: typeof CURRENT_WORKSPACE_SCHEMA_VERSION | undefined\n  workspace: {\n    name: string\n    title?: string\n  }\n\n  tag?: string\n}\n\nexport const extractManifestWorkerData = z.object({configPath: z.string(), workDir: z.string()})\n\nexport type ExtractManifestWorkerData = z.infer<typeof extractManifestWorkerData>\n"],"names":["z","SANITY_WORKSPACE_SCHEMA_ID_PREFIX","SANITY_WORKSPACE_SCHEMA_TYPE","CURRENT_WORKSPACE_SCHEMA_VERSION","extractManifestWorkerData","object","configPath","string","workDir"],"mappings":"AAEA,SAAQA,CAAC,QAAO,MAAK;AAErB,OAAO,MAAMC,oCAAoC,YAAW;AAC5D,OAAO,MAAMC,+BAA+B,gBAAe;AAC3D,OAAO,MAAMC,mCAAmC,aAAY;AA2I5D,OAAO,MAAMC,4BAA4BJ,EAAEK,MAAM,CAAC;IAACC,YAAYN,EAAEO,MAAM;IAAIC,SAASR,EAAEO,MAAM;AAAE,GAAE"}

package/dist/actions/schema/deploySchemas.js

@@ -14,7 +14,13 @@ export async function deploySchemas(options) {
     if (result.type === 'error') {
         throw new SchemaExtractionError(result.error, result.validation);
     }
-    const workspaces = result.workspaces.filter((workspace)=>!workspaceName || workspace.name === workspaceName);
+    const workspaces = result.workspaces.filter((workspace)=>!workspaceName || workspace.name === workspaceName).map((workspace)=>({
+            dataset: workspace.dataset,
+            manifestSchema: workspace.manifestSchema,
+            name: workspace.name,
+            projectId: workspace.projectId,
+            title: workspace.title
+        }));
     if (workspaces.length === 0) {
         const error = workspaceName ? new Error(`Found no workspaces named "${workspaceName}"`) : new Error('No workspaces found');
         throw error;

package/dist/actions/schema/deploySchemas.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/schema/deploySchemas.ts"],"sourcesContent":["import {studioWorkerTask} from '@sanity/cli-core'\nimport {type SchemaValidationProblemGroup} from '@sanity/types'\nimport {type Workspace} from 'sanity'\n\nimport {type ExtractWorkspaceWorkerData} from './types.js'\nimport {updateWorkspacesSchemas} from './updateWorkspaceSchema.js'\nimport {SchemaExtractionError} from './utils/SchemaExtractionError.js'\n\ninterface DeploySchemasOptions {\n  verbose: boolean\n  workDir: string\n\n  tag?: string\n  workspaceName?: string\n}\n\ntype ExtractWorkspaceWorkerMessage =\n  | {\n      error: string\n      type: 'error'\n      validation?: SchemaValidationProblemGroup[]\n    }\n  | {\n      type: 'success'\n      workspaces: Workspace[]\n    }\n\nexport async function deploySchemas(options: DeploySchemasOptions): Promise<void> {\n  const {tag, verbose, workDir, workspaceName} = options\n\n  const result = await studioWorkerTask<ExtractWorkspaceWorkerMessage>(\n    new URL('extractSanityWorkspace.worker.js', import.meta.url),\n    {\n      name: 'extractSanityWorkspace',\n      studioRootPath: workDir,\n      workerData: {\n        configPath: workDir,\n        workDir,\n      } satisfies ExtractWorkspaceWorkerData,\n    },\n  )\n\n  if (result.type === 'error') {\n    throw new SchemaExtractionError(result.error, result.validation)\n  }\n\n  const workspaces = result.workspaces.filter(\n    (workspace) => !workspaceName || workspace.name === workspaceName,\n  )\n  if (workspaces.length === 0) {\n    const error = workspaceName\n      ? new Error(`Found no workspaces named \"${workspaceName}\"`)\n      : new Error('No workspaces found')\n    throw error\n  }\n\n  await updateWorkspacesSchemas({\n    tag,\n    verbose,\n    workspaces,\n  })\n}\n"],"names":["studioWorkerTask","updateWorkspacesSchemas","SchemaExtractionError","deploySchemas","options","tag","verbose","workDir","workspaceName","result","URL","url","name","studioRootPath","workerData","configPath","type","error","validation","workspaces","filter","workspace","length","Error"],"mappings":"AAAA,SAAQA,gBAAgB,QAAO,mBAAkB;AAKjD,SAAQC,uBAAuB,QAAO,6BAA4B;AAClE,SAAQC,qBAAqB,QAAO,mCAAkC;AAqBtE,OAAO,eAAeC,cAAcC,OAA6B;IAC/D,MAAM,EAACC,GAAG,EAAEC,OAAO,EAAEC,OAAO,EAAEC,aAAa,EAAC,GAAGJ;IAE/C,MAAMK,SAAS,MAAMT,iBACnB,IAAIU,IAAI,oCAAoC,YAAYC,GAAG,GAC3D;QACEC,MAAM;QACNC,gBAAgBN;QAChBO,YAAY;YACVC,YAAYR;YACZA;QACF;IACF;IAGF,IAAIE,OAAOO,IAAI,KAAK,SAAS;QAC3B,MAAM,IAAId,sBAAsBO,OAAOQ,KAAK,EAAER,OAAOS,UAAU;IACjE;IAEA,MAAMC,aAAaV,OAAOU,UAAU,CAACC,MAAM,CACzC,CAACC,YAAc,CAACb,iBAAiBa,UAAUT,IAAI,KAAKJ;IAEtD,IAAIW,WAAWG,MAAM,KAAK,GAAG;QAC3B,MAAML,QAAQT,gBACV,IAAIe,MAAM,CAAC,2BAA2B,EAAEf,cAAc,CAAC,CAAC,IACxD,IAAIe,MAAM;QACd,MAAMN;IACR;IAEA,MAAMhB,wBAAwB;QAC5BI;QACAC;QACAa;IACF;AACF"}
+{"version":3,"sources":["../../../src/actions/schema/deploySchemas.ts"],"sourcesContent":["import {studioWorkerTask} from '@sanity/cli-core'\nimport {type SchemaValidationProblemGroup} from '@sanity/types'\nimport {type Workspace} from 'sanity'\n\nimport {type ManifestSchemaType} from '../manifest/types.js'\nimport {type ExtractWorkspaceWorkerData} from './types.js'\nimport {updateWorkspacesSchemas, type WorkspaceSchemaInput} from './updateWorkspaceSchema.js'\nimport {SchemaExtractionError} from './utils/SchemaExtractionError.js'\n\ninterface DeploySchemasOptions {\n  verbose: boolean\n  workDir: string\n\n  tag?: string\n  workspaceName?: string\n}\n\ntype WorkspaceWithManifest = Workspace & {manifestSchema: ManifestSchemaType[]}\n\ntype ExtractWorkspaceWorkerMessage =\n  | {\n      error: string\n      type: 'error'\n      validation?: SchemaValidationProblemGroup[]\n    }\n  | {\n      type: 'success'\n      workspaces: WorkspaceWithManifest[]\n    }\n\nexport async function deploySchemas(options: DeploySchemasOptions): Promise<void> {\n  const {tag, verbose, workDir, workspaceName} = options\n\n  const result = await studioWorkerTask<ExtractWorkspaceWorkerMessage>(\n    new URL('extractSanityWorkspace.worker.js', import.meta.url),\n    {\n      name: 'extractSanityWorkspace',\n      studioRootPath: workDir,\n      workerData: {\n        configPath: workDir,\n        workDir,\n      } satisfies ExtractWorkspaceWorkerData,\n    },\n  )\n\n  if (result.type === 'error') {\n    throw new SchemaExtractionError(result.error, result.validation)\n  }\n\n  const workspaces: WorkspaceSchemaInput[] = result.workspaces\n    .filter((workspace) => !workspaceName || workspace.name === workspaceName)\n    .map((workspace) => ({\n      dataset: workspace.dataset,\n      manifestSchema: workspace.manifestSchema,\n      name: workspace.name,\n      projectId: workspace.projectId,\n      title: workspace.title,\n    }))\n\n  if (workspaces.length === 0) {\n    const error = workspaceName\n      ? new Error(`Found no workspaces named \"${workspaceName}\"`)\n      : new Error('No workspaces found')\n    throw error\n  }\n\n  await updateWorkspacesSchemas({\n    tag,\n    verbose,\n    workspaces,\n  })\n}\n"],"names":["studioWorkerTask","updateWorkspacesSchemas","SchemaExtractionError","deploySchemas","options","tag","verbose","workDir","workspaceName","result","URL","url","name","studioRootPath","workerData","configPath","type","error","validation","workspaces","filter","workspace","map","dataset","manifestSchema","projectId","title","length","Error"],"mappings":"AAAA,SAAQA,gBAAgB,QAAO,mBAAkB;AAMjD,SAAQC,uBAAuB,QAAkC,6BAA4B;AAC7F,SAAQC,qBAAqB,QAAO,mCAAkC;AAuBtE,OAAO,eAAeC,cAAcC,OAA6B;IAC/D,MAAM,EAACC,GAAG,EAAEC,OAAO,EAAEC,OAAO,EAAEC,aAAa,EAAC,GAAGJ;IAE/C,MAAMK,SAAS,MAAMT,iBACnB,IAAIU,IAAI,oCAAoC,YAAYC,GAAG,GAC3D;QACEC,MAAM;QACNC,gBAAgBN;QAChBO,YAAY;YACVC,YAAYR;YACZA;QACF;IACF;IAGF,IAAIE,OAAOO,IAAI,KAAK,SAAS;QAC3B,MAAM,IAAId,sBAAsBO,OAAOQ,KAAK,EAAER,OAAOS,UAAU;IACjE;IAEA,MAAMC,aAAqCV,OAAOU,UAAU,CACzDC,MAAM,CAAC,CAACC,YAAc,CAACb,iBAAiBa,UAAUT,IAAI,KAAKJ,eAC3Dc,GAAG,CAAC,CAACD,YAAe,CAAA;YACnBE,SAASF,UAAUE,OAAO;YAC1BC,gBAAgBH,UAAUG,cAAc;YACxCZ,MAAMS,UAAUT,IAAI;YACpBa,WAAWJ,UAAUI,SAAS;YAC9BC,OAAOL,UAAUK,KAAK;QACxB,CAAA;IAEF,IAAIP,WAAWQ,MAAM,KAAK,GAAG;QAC3B,MAAMV,QAAQT,gBACV,IAAIoB,MAAM,CAAC,2BAA2B,EAAEpB,cAAc,CAAC,CAAC,IACxD,IAAIoB,MAAM;QACd,MAAMX;IACR;IAEA,MAAMhB,wBAAwB;QAC5BI;QACAC;QACAa;IACF;AACF"}

package/dist/actions/schema/extractSanityWorkspace.worker.js

@@ -1,5 +1,6 @@
 import { isMainThread, parentPort, workerData } from 'node:worker_threads';
 import { getStudioWorkspaces, safeStructuredClone } from '@sanity/cli-core';
+import { extractManifestSchemaTypes } from '../manifest/extractWorkspaceManifest.js';
 import { extractWorkspaceWorkerData } from './types.js';
 import { extractValidationFromSchemaError } from './utils/extractValidationFromSchemaError.js';
 if (isMainThread || !parentPort) {
@@ -8,9 +9,16 @@ if (isMainThread || !parentPort) {
 const { configPath, workDir } = extractWorkspaceWorkerData.parse(workerData);
 try {
     const workspaces = await getStudioWorkspaces(configPath);
+    // Extract manifest schemas while Schema objects are still live (before structured clone
+    // strips class methods like getTypeNames/get). The API expects ManifestSchemaType[], not
+    // the runtime Schema class instance.
+    const workspacesWithManifest = await Promise.all(workspaces.map(async (workspace)=>({
+            ...safeStructuredClone(workspace),
+            manifestSchema: await extractManifestSchemaTypes(workspace.schema, workDir)
+        })));
     parentPort.postMessage({
         type: 'success',
-        workspaces: safeStructuredClone(workspaces)
+        workspaces: workspacesWithManifest
     });
 } catch (error) {
     const validation = await extractValidationFromSchemaError(error, workDir);

package/dist/actions/schema/extractSanityWorkspace.worker.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/schema/extractSanityWorkspace.worker.ts"],"sourcesContent":["import {isMainThread, parentPort, workerData} from 'node:worker_threads'\n\nimport {getStudioWorkspaces, safeStructuredClone} from '@sanity/cli-core'\n\nimport {extractWorkspaceWorkerData} from './types.js'\nimport {extractValidationFromSchemaError} from './utils/extractValidationFromSchemaError.js'\n\nif (isMainThread || !parentPort) {\n  throw new Error('Should only be run in a worker!')\n}\n\nconst {configPath, workDir} = extractWorkspaceWorkerData.parse(workerData)\n\ntry {\n  const workspaces = await getStudioWorkspaces(configPath)\n\n  parentPort.postMessage({\n    type: 'success',\n    workspaces: safeStructuredClone(workspaces),\n  })\n} catch (error) {\n  const validation = await extractValidationFromSchemaError(error, workDir)\n  parentPort.postMessage({\n    error: error instanceof Error ? error.message : String(error),\n    type: 'error',\n    validation,\n  })\n}\n"],"names":["isMainThread","parentPort","workerData","getStudioWorkspaces","safeStructuredClone","extractWorkspaceWorkerData","extractValidationFromSchemaError","Error","configPath","workDir","parse","workspaces","postMessage","type","error","validation","message","String"],"mappings":"AAAA,SAAQA,YAAY,EAAEC,UAAU,EAAEC,UAAU,QAAO,sBAAqB;AAExE,SAAQC,mBAAmB,EAAEC,mBAAmB,QAAO,mBAAkB;AAEzE,SAAQC,0BAA0B,QAAO,aAAY;AACrD,SAAQC,gCAAgC,QAAO,8CAA6C;AAE5F,IAAIN,gBAAgB,CAACC,YAAY;IAC/B,MAAM,IAAIM,MAAM;AAClB;AAEA,MAAM,EAACC,UAAU,EAAEC,OAAO,EAAC,GAAGJ,2BAA2BK,KAAK,CAACR;AAE/D,IAAI;IACF,MAAMS,aAAa,MAAMR,oBAAoBK;IAE7CP,WAAWW,WAAW,CAAC;QACrBC,MAAM;QACNF,YAAYP,oBAAoBO;IAClC;AACF,EAAE,OAAOG,OAAO;IACd,MAAMC,aAAa,MAAMT,iCAAiCQ,OAAOL;IACjER,WAAWW,WAAW,CAAC;QACrBE,OAAOA,iBAAiBP,QAAQO,MAAME,OAAO,GAAGC,OAAOH;QACvDD,MAAM;QACNE;IACF;AACF"}
+{"version":3,"sources":["../../../src/actions/schema/extractSanityWorkspace.worker.ts"],"sourcesContent":["import {isMainThread, parentPort, workerData} from 'node:worker_threads'\n\nimport {getStudioWorkspaces, safeStructuredClone} from '@sanity/cli-core'\nimport {type Schema} from '@sanity/types'\n\nimport {extractManifestSchemaTypes} from '../manifest/extractWorkspaceManifest.js'\nimport {extractWorkspaceWorkerData} from './types.js'\nimport {extractValidationFromSchemaError} from './utils/extractValidationFromSchemaError.js'\n\nif (isMainThread || !parentPort) {\n  throw new Error('Should only be run in a worker!')\n}\n\nconst {configPath, workDir} = extractWorkspaceWorkerData.parse(workerData)\n\ntry {\n  const workspaces = await getStudioWorkspaces(configPath)\n\n  // Extract manifest schemas while Schema objects are still live (before structured clone\n  // strips class methods like getTypeNames/get). The API expects ManifestSchemaType[], not\n  // the runtime Schema class instance.\n  const workspacesWithManifest = await Promise.all(\n    workspaces.map(async (workspace) => ({\n      ...safeStructuredClone(workspace),\n      manifestSchema: await extractManifestSchemaTypes(workspace.schema as Schema, workDir),\n    })),\n  )\n\n  parentPort.postMessage({\n    type: 'success',\n    workspaces: workspacesWithManifest,\n  })\n} catch (error) {\n  const validation = await extractValidationFromSchemaError(error, workDir)\n  parentPort.postMessage({\n    error: error instanceof Error ? error.message : String(error),\n    type: 'error',\n    validation,\n  })\n}\n"],"names":["isMainThread","parentPort","workerData","getStudioWorkspaces","safeStructuredClone","extractManifestSchemaTypes","extractWorkspaceWorkerData","extractValidationFromSchemaError","Error","configPath","workDir","parse","workspaces","workspacesWithManifest","Promise","all","map","workspace","manifestSchema","schema","postMessage","type","error","validation","message","String"],"mappings":"AAAA,SAAQA,YAAY,EAAEC,UAAU,EAAEC,UAAU,QAAO,sBAAqB;AAExE,SAAQC,mBAAmB,EAAEC,mBAAmB,QAAO,mBAAkB;AAGzE,SAAQC,0BAA0B,QAAO,0CAAyC;AAClF,SAAQC,0BAA0B,QAAO,aAAY;AACrD,SAAQC,gCAAgC,QAAO,8CAA6C;AAE5F,IAAIP,gBAAgB,CAACC,YAAY;IAC/B,MAAM,IAAIO,MAAM;AAClB;AAEA,MAAM,EAACC,UAAU,EAAEC,OAAO,EAAC,GAAGJ,2BAA2BK,KAAK,CAACT;AAE/D,IAAI;IACF,MAAMU,aAAa,MAAMT,oBAAoBM;IAE7C,wFAAwF;IACxF,yFAAyF;IACzF,qCAAqC;IACrC,MAAMI,yBAAyB,MAAMC,QAAQC,GAAG,CAC9CH,WAAWI,GAAG,CAAC,OAAOC,YAAe,CAAA;YACnC,GAAGb,oBAAoBa,UAAU;YACjCC,gBAAgB,MAAMb,2BAA2BY,UAAUE,MAAM,EAAYT;QAC/E,CAAA;IAGFT,WAAWmB,WAAW,CAAC;QACrBC,MAAM;QACNT,YAAYC;IACd;AACF,EAAE,OAAOS,OAAO;IACd,MAAMC,aAAa,MAAMhB,iCAAiCe,OAAOZ;IACjET,WAAWmB,WAAW,CAAC;QACrBE,OAAOA,iBAAiBd,QAAQc,MAAME,OAAO,GAAGC,OAAOH;QACvDD,MAAM;QACNE;IACF;AACF"}

package/dist/actions/schema/getExtractOptions.js

@@ -1,8 +1,19 @@
-import { join, resolve } from 'node:path';
+import { existsSync, statSync } from 'node:fs';
+import { extname, join, resolve } from 'node:path';
 export function getExtractOptions({ flags, projectRoot, schemaExtraction }) {
     const pathFlag = flags.path ?? schemaExtraction?.path;
-    const outputDir = pathFlag ? resolve(join(projectRoot.directory, pathFlag)) : projectRoot.directory;
-    const outputPath = join(outputDir, 'schema.json');
+    let outputPath;
+    if (pathFlag) {
+        const resolved = resolve(join(projectRoot.directory, pathFlag));
+        const isExistingDirectory = existsSync(resolved) && statSync(resolved).isDirectory();
+        if (isExistingDirectory || !extname(resolved)) {
+            outputPath = join(resolved, 'schema.json');
+        } else {
+            outputPath = resolved;
+        }
+    } else {
+        outputPath = resolve(join(projectRoot.directory, 'schema.json'));
+    }
     return {
         configPath: projectRoot.path,
         enforceRequiredFields: flags['enforce-required-fields'] ?? schemaExtraction?.enforceRequiredFields ?? false,

package/dist/actions/schema/getExtractOptions.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/schema/getExtractOptions.ts"],"sourcesContent":["import {join, resolve} from 'node:path'\n\nimport {type CliConfig, ProjectRootResult} from '@sanity/cli-core'\n\nimport {type ExtractSchemaCommand} from '../../commands/schema/extract.js'\n\nexport interface ExtractOptions {\n  configPath: string\n  enforceRequiredFields: boolean\n  format: string\n  outputPath: string\n  watchPatterns: string[]\n  workspace: string | undefined\n}\n\ninterface GetExtractionOptions {\n  flags: ExtractSchemaCommand['flags']\n  projectRoot: ProjectRootResult\n  schemaExtraction: CliConfig['schemaExtraction']\n}\n\nexport function getExtractOptions({\n  flags,\n  projectRoot,\n  schemaExtraction,\n}: GetExtractionOptions): ExtractOptions {\n  const pathFlag = flags.path ?? schemaExtraction?.path\n  const outputDir = pathFlag\n    ? resolve(join(projectRoot.directory, pathFlag))\n    : projectRoot.directory\n  const outputPath = join(outputDir, 'schema.json')\n\n  return {\n    configPath: projectRoot.path,\n    enforceRequiredFields:\n      flags['enforce-required-fields'] ?? schemaExtraction?.enforceRequiredFields ?? false,\n    format: flags.format ?? 'groq-type-nodes',\n    outputPath,\n    watchPatterns: flags['watch-patterns'] ?? schemaExtraction?.watchPatterns ?? [],\n    workspace: flags.workspace ?? schemaExtraction?.workspace,\n  }\n}\n"],"names":["join","resolve","getExtractOptions","flags","projectRoot","schemaExtraction","pathFlag","path","outputDir","directory","outputPath","configPath","enforceRequiredFields","format","watchPatterns","workspace"],"mappings":"AAAA,SAAQA,IAAI,EAAEC,OAAO,QAAO,YAAW;AAqBvC,OAAO,SAASC,kBAAkB,EAChCC,KAAK,EACLC,WAAW,EACXC,gBAAgB,EACK;IACrB,MAAMC,WAAWH,MAAMI,IAAI,IAAIF,kBAAkBE;IACjD,MAAMC,YAAYF,WACdL,QAAQD,KAAKI,YAAYK,SAAS,EAAEH,aACpCF,YAAYK,SAAS;IACzB,MAAMC,aAAaV,KAAKQ,WAAW;IAEnC,OAAO;QACLG,YAAYP,YAAYG,IAAI;QAC5BK,uBACET,KAAK,CAAC,0BAA0B,IAAIE,kBAAkBO,yBAAyB;QACjFC,QAAQV,MAAMU,MAAM,IAAI;QACxBH;QACAI,eAAeX,KAAK,CAAC,iBAAiB,IAAIE,kBAAkBS,iBAAiB,EAAE;QAC/EC,WAAWZ,MAAMY,SAAS,IAAIV,kBAAkBU;IAClD;AACF"}
+{"version":3,"sources":["../../../src/actions/schema/getExtractOptions.ts"],"sourcesContent":["import {existsSync, statSync} from 'node:fs'\nimport {extname, join, resolve} from 'node:path'\n\nimport {type CliConfig, ProjectRootResult} from '@sanity/cli-core'\n\nimport {type ExtractSchemaCommand} from '../../commands/schema/extract.js'\n\nexport interface ExtractOptions {\n  configPath: string\n  enforceRequiredFields: boolean\n  format: string\n  outputPath: string\n  watchPatterns: string[]\n  workspace: string | undefined\n}\n\ninterface GetExtractionOptions {\n  flags: ExtractSchemaCommand['flags']\n  projectRoot: ProjectRootResult\n  schemaExtraction: CliConfig['schemaExtraction']\n}\n\nexport function getExtractOptions({\n  flags,\n  projectRoot,\n  schemaExtraction,\n}: GetExtractionOptions): ExtractOptions {\n  const pathFlag = flags.path ?? schemaExtraction?.path\n  let outputPath: string\n  if (pathFlag) {\n    const resolved = resolve(join(projectRoot.directory, pathFlag))\n    const isExistingDirectory = existsSync(resolved) && statSync(resolved).isDirectory()\n\n    if (isExistingDirectory || !extname(resolved)) {\n      outputPath = join(resolved, 'schema.json')\n    } else {\n      outputPath = resolved\n    }\n  } else {\n    outputPath = resolve(join(projectRoot.directory, 'schema.json'))\n  }\n\n  return {\n    configPath: projectRoot.path,\n    enforceRequiredFields:\n      flags['enforce-required-fields'] ?? schemaExtraction?.enforceRequiredFields ?? false,\n    format: flags.format ?? 'groq-type-nodes',\n    outputPath,\n    watchPatterns: flags['watch-patterns'] ?? schemaExtraction?.watchPatterns ?? [],\n    workspace: flags.workspace ?? schemaExtraction?.workspace,\n  }\n}\n"],"names":["existsSync","statSync","extname","join","resolve","getExtractOptions","flags","projectRoot","schemaExtraction","pathFlag","path","outputPath","resolved","directory","isExistingDirectory","isDirectory","configPath","enforceRequiredFields","format","watchPatterns","workspace"],"mappings":"AAAA,SAAQA,UAAU,EAAEC,QAAQ,QAAO,UAAS;AAC5C,SAAQC,OAAO,EAAEC,IAAI,EAAEC,OAAO,QAAO,YAAW;AAqBhD,OAAO,SAASC,kBAAkB,EAChCC,KAAK,EACLC,WAAW,EACXC,gBAAgB,EACK;IACrB,MAAMC,WAAWH,MAAMI,IAAI,IAAIF,kBAAkBE;IACjD,IAAIC;IACJ,IAAIF,UAAU;QACZ,MAAMG,WAAWR,QAAQD,KAAKI,YAAYM,SAAS,EAAEJ;QACrD,MAAMK,sBAAsBd,WAAWY,aAAaX,SAASW,UAAUG,WAAW;QAElF,IAAID,uBAAuB,CAACZ,QAAQU,WAAW;YAC7CD,aAAaR,KAAKS,UAAU;QAC9B,OAAO;YACLD,aAAaC;QACf;IACF,OAAO;QACLD,aAAaP,QAAQD,KAAKI,YAAYM,SAAS,EAAE;IACnD;IAEA,OAAO;QACLG,YAAYT,YAAYG,IAAI;QAC5BO,uBACEX,KAAK,CAAC,0BAA0B,IAAIE,kBAAkBS,yBAAyB;QACjFC,QAAQZ,MAAMY,MAAM,IAAI;QACxBP;QACAQ,eAAeb,KAAK,CAAC,iBAAiB,IAAIE,kBAAkBW,iBAAiB,EAAE;QAC/EC,WAAWd,MAAMc,SAAS,IAAIZ,kBAAkBY;IAClD;AACF"}

package/dist/actions/schema/updateWorkspaceSchema.js

@@ -27,7 +27,7 @@ import { getWorkspaceSchemaId } from './utils/workspaceSchemaId.js';
  * Updates a workspace schema in the dataset.
  */ async function updateWorkspaceSchema(args) {
     const { tag, verbose, workspace } = args;
-    const { dataset, projectId } = workspace;
+    const { dataset, manifestSchema, projectId } = workspace;
     const { idWarning, safeBaseId: id } = getWorkspaceSchemaId({
         tag,
         workspaceName: workspace.name
@@ -37,7 +37,7 @@ import { getWorkspaceSchemaId } from './utils/workspaceSchemaId.js';
         await updateSchemas(dataset, projectId, [
             {
                 // the API will stringify the schema – we send as JSON
-                schema: workspace.schema,
+                schema: manifestSchema,
                 tag,
                 version: CURRENT_WORKSPACE_SCHEMA_VERSION,
                 workspace: {

package/dist/actions/schema/updateWorkspaceSchema.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/schema/updateWorkspaceSchema.ts"],"sourcesContent":["import {styleText} from 'node:util'\n\nimport {ux} from '@oclif/core/ux'\nimport {spinner} from '@sanity/cli-core/ux'\nimport partition from 'lodash-es/partition.js'\nimport {type Workspace} from 'sanity'\n\nimport {updateSchemas} from '../../services/schemas.js'\nimport {CURRENT_WORKSPACE_SCHEMA_VERSION, type StoredWorkspaceSchema} from '../manifest/types.js'\nimport {SCHEMA_PERMISSION_HELP_TEXT} from './utils/schemaStoreValidation.js'\nimport {getWorkspaceSchemaId} from './utils/workspaceSchemaId.js'\n\n/**\n * Updates the schemas for a list of workspaces.\n */\nexport async function updateWorkspacesSchemas(args: {\n  tag?: string\n  verbose: boolean\n  workspaces: Workspace[]\n}) {\n  const {tag, verbose, workspaces} = args\n\n  /* Known caveat: we _don't_ rollback failed operations or partial success */\n  const results = await Promise.allSettled(\n    workspaces.map(async (workspace): Promise<void> => {\n      await updateWorkspaceSchema({\n        tag,\n        verbose,\n        workspace,\n      })\n    }),\n  )\n\n  const [fulfilledUpdates, rejectedUpdates] = partition(\n    results,\n    (result) => result.status === 'fulfilled',\n  )\n\n  if (rejectedUpdates.length > 0) {\n    throw new Error(\n      `Failed to deploy ${rejectedUpdates.length}/${workspaces.length} schemas. Successfully deployed ${fulfilledUpdates.length}/${workspaces.length} schemas.`,\n    )\n  }\n\n  spinner(`Deployed ${fulfilledUpdates.length}/${workspaces.length} schemas`).succeed()\n}\n\n/**\n * Updates a workspace schema in the dataset.\n */\nasync function updateWorkspaceSchema(args: {tag?: string; verbose: boolean; workspace: Workspace}) {\n  const {tag, verbose, workspace} = args\n\n  const {dataset, projectId} = workspace\n\n  const {idWarning, safeBaseId: id} = getWorkspaceSchemaId({\n    tag,\n    workspaceName: workspace.name,\n  })\n\n  if (idWarning) ux.warn(idWarning)\n\n  try {\n    await updateSchemas<Omit<StoredWorkspaceSchema, '_id' | '_type'>[]>(dataset, projectId, [\n      {\n        // the API will stringify the schema – we send as JSON\n        schema: workspace.schema,\n        tag,\n        version: CURRENT_WORKSPACE_SCHEMA_VERSION,\n        workspace: {\n          name: workspace.name,\n          title: workspace.title,\n        },\n      },\n    ])\n\n    if (verbose) {\n      ux.stdout(\n        styleText('gray', `↳ schemaId: ${id}, projectId: ${projectId}, dataset: ${dataset}`),\n      )\n    }\n  } catch (err) {\n    const message = err instanceof Error ? err.message : String(err)\n    if (\n      err instanceof Error &&\n      'statusCode' in err &&\n      (err as {statusCode: unknown}).statusCode === 401\n    ) {\n      ux.warn(\n        `↳ No permissions to write schema for workspace \"${workspace.name}\" in dataset \"${workspace.dataset}\". ${\n          SCHEMA_PERMISSION_HELP_TEXT\n        }:\\n  ${styleText('red', message)}`,\n      )\n    } else {\n      ux.stdout(\n        styleText(\n          'red',\n          `↳ Error deploying schema for workspace \"${workspace.name}\":\\n  ${styleText('red', message)}`,\n        ),\n      )\n    }\n\n    throw err\n  }\n}\n"],"names":["styleText","ux","spinner","partition","updateSchemas","CURRENT_WORKSPACE_SCHEMA_VERSION","SCHEMA_PERMISSION_HELP_TEXT","getWorkspaceSchemaId","updateWorkspacesSchemas","args","tag","verbose","workspaces","results","Promise","allSettled","map","workspace","updateWorkspaceSchema","fulfilledUpdates","rejectedUpdates","result","status","length","Error","succeed","dataset","projectId","idWarning","safeBaseId","id","workspaceName","name","warn","schema","version","title","stdout","err","message","String","statusCode"],"mappings":"AAAA,SAAQA,SAAS,QAAO,YAAW;AAEnC,SAAQC,EAAE,QAAO,iBAAgB;AACjC,SAAQC,OAAO,QAAO,sBAAqB;AAC3C,OAAOC,eAAe,yBAAwB;AAG9C,SAAQC,aAAa,QAAO,4BAA2B;AACvD,SAAQC,gCAAgC,QAAmC,uBAAsB;AACjG,SAAQC,2BAA2B,QAAO,mCAAkC;AAC5E,SAAQC,oBAAoB,QAAO,+BAA8B;AAEjE;;CAEC,GACD,OAAO,eAAeC,wBAAwBC,IAI7C;IACC,MAAM,EAACC,GAAG,EAAEC,OAAO,EAAEC,UAAU,EAAC,GAAGH;IAEnC,0EAA0E,GAC1E,MAAMI,UAAU,MAAMC,QAAQC,UAAU,CACtCH,WAAWI,GAAG,CAAC,OAAOC;QACpB,MAAMC,sBAAsB;YAC1BR;YACAC;YACAM;QACF;IACF;IAGF,MAAM,CAACE,kBAAkBC,gBAAgB,GAAGjB,UAC1CU,SACA,CAACQ,SAAWA,OAAOC,MAAM,KAAK;IAGhC,IAAIF,gBAAgBG,MAAM,GAAG,GAAG;QAC9B,MAAM,IAAIC,MACR,CAAC,iBAAiB,EAAEJ,gBAAgBG,MAAM,CAAC,CAAC,EAAEX,WAAWW,MAAM,CAAC,gCAAgC,EAAEJ,iBAAiBI,MAAM,CAAC,CAAC,EAAEX,WAAWW,MAAM,CAAC,SAAS,CAAC;IAE7J;IAEArB,QAAQ,CAAC,SAAS,EAAEiB,iBAAiBI,MAAM,CAAC,CAAC,EAAEX,WAAWW,MAAM,CAAC,QAAQ,CAAC,EAAEE,OAAO;AACrF;AAEA;;CAEC,GACD,eAAeP,sBAAsBT,IAA4D;IAC/F,MAAM,EAACC,GAAG,EAAEC,OAAO,EAAEM,SAAS,EAAC,GAAGR;IAElC,MAAM,EAACiB,OAAO,EAAEC,SAAS,EAAC,GAAGV;IAE7B,MAAM,EAACW,SAAS,EAAEC,YAAYC,EAAE,EAAC,GAAGvB,qBAAqB;QACvDG;QACAqB,eAAed,UAAUe,IAAI;IAC/B;IAEA,IAAIJ,WAAW3B,GAAGgC,IAAI,CAACL;IAEvB,IAAI;QACF,MAAMxB,cAA8DsB,SAASC,WAAW;YACtF;gBACE,sDAAsD;gBACtDO,QAAQjB,UAAUiB,MAAM;gBACxBxB;gBACAyB,SAAS9B;gBACTY,WAAW;oBACTe,MAAMf,UAAUe,IAAI;oBACpBI,OAAOnB,UAAUmB,KAAK;gBACxB;YACF;SACD;QAED,IAAIzB,SAAS;YACXV,GAAGoC,MAAM,CACPrC,UAAU,QAAQ,CAAC,YAAY,EAAE8B,GAAG,aAAa,EAAEH,UAAU,WAAW,EAAED,SAAS;QAEvF;IACF,EAAE,OAAOY,KAAK;QACZ,MAAMC,UAAUD,eAAed,QAAQc,IAAIC,OAAO,GAAGC,OAAOF;QAC5D,IACEA,eAAed,SACf,gBAAgBc,OAChB,AAACA,IAA8BG,UAAU,KAAK,KAC9C;YACAxC,GAAGgC,IAAI,CACL,CAAC,gDAAgD,EAAEhB,UAAUe,IAAI,CAAC,cAAc,EAAEf,UAAUS,OAAO,CAAC,GAAG,EACrGpB,4BACD,KAAK,EAAEN,UAAU,OAAOuC,UAAU;QAEvC,OAAO;YACLtC,GAAGoC,MAAM,CACPrC,UACE,OACA,CAAC,wCAAwC,EAAEiB,UAAUe,IAAI,CAAC,MAAM,EAAEhC,UAAU,OAAOuC,UAAU;QAGnG;QAEA,MAAMD;IACR;AACF"}
+{"version":3,"sources":["../../../src/actions/schema/updateWorkspaceSchema.ts"],"sourcesContent":["import {styleText} from 'node:util'\n\nimport {ux} from '@oclif/core/ux'\nimport {spinner} from '@sanity/cli-core/ux'\nimport partition from 'lodash-es/partition.js'\n\nimport {updateSchemas} from '../../services/schemas.js'\nimport {\n  CURRENT_WORKSPACE_SCHEMA_VERSION,\n  type ManifestSchemaType,\n  type StoredWorkspaceSchema,\n} from '../manifest/types.js'\nimport {SCHEMA_PERMISSION_HELP_TEXT} from './utils/schemaStoreValidation.js'\nimport {getWorkspaceSchemaId} from './utils/workspaceSchemaId.js'\n\n/**\n * Workspace metadata + pre-extracted manifest schema for deployment.\n * The schema must already be in ManifestSchemaType[] format (extracted from\n * the live Schema object before any structured clone boundary).\n */\nexport interface WorkspaceSchemaInput {\n  dataset: string\n  manifestSchema: ManifestSchemaType[]\n  name: string\n  projectId: string\n\n  title?: string\n}\n\n/**\n * Updates the schemas for a list of workspaces.\n */\nexport async function updateWorkspacesSchemas(args: {\n  tag?: string\n  verbose: boolean\n  workspaces: WorkspaceSchemaInput[]\n}) {\n  const {tag, verbose, workspaces} = args\n\n  /* Known caveat: we _don't_ rollback failed operations or partial success */\n  const results = await Promise.allSettled(\n    workspaces.map(async (workspace): Promise<void> => {\n      await updateWorkspaceSchema({\n        tag,\n        verbose,\n        workspace,\n      })\n    }),\n  )\n\n  const [fulfilledUpdates, rejectedUpdates] = partition(\n    results,\n    (result) => result.status === 'fulfilled',\n  )\n\n  if (rejectedUpdates.length > 0) {\n    throw new Error(\n      `Failed to deploy ${rejectedUpdates.length}/${workspaces.length} schemas. Successfully deployed ${fulfilledUpdates.length}/${workspaces.length} schemas.`,\n    )\n  }\n\n  spinner(`Deployed ${fulfilledUpdates.length}/${workspaces.length} schemas`).succeed()\n}\n\n/**\n * Updates a workspace schema in the dataset.\n */\nasync function updateWorkspaceSchema(args: {\n  tag?: string\n  verbose: boolean\n  workspace: WorkspaceSchemaInput\n}) {\n  const {tag, verbose, workspace} = args\n\n  const {dataset, manifestSchema, projectId} = workspace\n\n  const {idWarning, safeBaseId: id} = getWorkspaceSchemaId({\n    tag,\n    workspaceName: workspace.name,\n  })\n\n  if (idWarning) ux.warn(idWarning)\n\n  try {\n    await updateSchemas<Omit<StoredWorkspaceSchema, '_id' | '_type'>[]>(dataset, projectId, [\n      {\n        // the API will stringify the schema – we send as JSON\n        schema: manifestSchema,\n        tag,\n        version: CURRENT_WORKSPACE_SCHEMA_VERSION,\n        workspace: {\n          name: workspace.name,\n          title: workspace.title,\n        },\n      },\n    ])\n\n    if (verbose) {\n      ux.stdout(\n        styleText('gray', `↳ schemaId: ${id}, projectId: ${projectId}, dataset: ${dataset}`),\n      )\n    }\n  } catch (err) {\n    const message = err instanceof Error ? err.message : String(err)\n    if (\n      err instanceof Error &&\n      'statusCode' in err &&\n      (err as {statusCode: unknown}).statusCode === 401\n    ) {\n      ux.warn(\n        `↳ No permissions to write schema for workspace \"${workspace.name}\" in dataset \"${workspace.dataset}\". ${\n          SCHEMA_PERMISSION_HELP_TEXT\n        }:\\n  ${styleText('red', message)}`,\n      )\n    } else {\n      ux.stdout(\n        styleText(\n          'red',\n          `↳ Error deploying schema for workspace \"${workspace.name}\":\\n  ${styleText('red', message)}`,\n        ),\n      )\n    }\n\n    throw err\n  }\n}\n"],"names":["styleText","ux","spinner","partition","updateSchemas","CURRENT_WORKSPACE_SCHEMA_VERSION","SCHEMA_PERMISSION_HELP_TEXT","getWorkspaceSchemaId","updateWorkspacesSchemas","args","tag","verbose","workspaces","results","Promise","allSettled","map","workspace","updateWorkspaceSchema","fulfilledUpdates","rejectedUpdates","result","status","length","Error","succeed","dataset","manifestSchema","projectId","idWarning","safeBaseId","id","workspaceName","name","warn","schema","version","title","stdout","err","message","String","statusCode"],"mappings":"AAAA,SAAQA,SAAS,QAAO,YAAW;AAEnC,SAAQC,EAAE,QAAO,iBAAgB;AACjC,SAAQC,OAAO,QAAO,sBAAqB;AAC3C,OAAOC,eAAe,yBAAwB;AAE9C,SAAQC,aAAa,QAAO,4BAA2B;AACvD,SACEC,gCAAgC,QAG3B,uBAAsB;AAC7B,SAAQC,2BAA2B,QAAO,mCAAkC;AAC5E,SAAQC,oBAAoB,QAAO,+BAA8B;AAgBjE;;CAEC,GACD,OAAO,eAAeC,wBAAwBC,IAI7C;IACC,MAAM,EAACC,GAAG,EAAEC,OAAO,EAAEC,UAAU,EAAC,GAAGH;IAEnC,0EAA0E,GAC1E,MAAMI,UAAU,MAAMC,QAAQC,UAAU,CACtCH,WAAWI,GAAG,CAAC,OAAOC;QACpB,MAAMC,sBAAsB;YAC1BR;YACAC;YACAM;QACF;IACF;IAGF,MAAM,CAACE,kBAAkBC,gBAAgB,GAAGjB,UAC1CU,SACA,CAACQ,SAAWA,OAAOC,MAAM,KAAK;IAGhC,IAAIF,gBAAgBG,MAAM,GAAG,GAAG;QAC9B,MAAM,IAAIC,MACR,CAAC,iBAAiB,EAAEJ,gBAAgBG,MAAM,CAAC,CAAC,EAAEX,WAAWW,MAAM,CAAC,gCAAgC,EAAEJ,iBAAiBI,MAAM,CAAC,CAAC,EAAEX,WAAWW,MAAM,CAAC,SAAS,CAAC;IAE7J;IAEArB,QAAQ,CAAC,SAAS,EAAEiB,iBAAiBI,MAAM,CAAC,CAAC,EAAEX,WAAWW,MAAM,CAAC,QAAQ,CAAC,EAAEE,OAAO;AACrF;AAEA;;CAEC,GACD,eAAeP,sBAAsBT,IAIpC;IACC,MAAM,EAACC,GAAG,EAAEC,OAAO,EAAEM,SAAS,EAAC,GAAGR;IAElC,MAAM,EAACiB,OAAO,EAAEC,cAAc,EAAEC,SAAS,EAAC,GAAGX;IAE7C,MAAM,EAACY,SAAS,EAAEC,YAAYC,EAAE,EAAC,GAAGxB,qBAAqB;QACvDG;QACAsB,eAAef,UAAUgB,IAAI;IAC/B;IAEA,IAAIJ,WAAW5B,GAAGiC,IAAI,CAACL;IAEvB,IAAI;QACF,MAAMzB,cAA8DsB,SAASE,WAAW;YACtF;gBACE,sDAAsD;gBACtDO,QAAQR;gBACRjB;gBACA0B,SAAS/B;gBACTY,WAAW;oBACTgB,MAAMhB,UAAUgB,IAAI;oBACpBI,OAAOpB,UAAUoB,KAAK;gBACxB;YACF;SACD;QAED,IAAI1B,SAAS;YACXV,GAAGqC,MAAM,CACPtC,UAAU,QAAQ,CAAC,YAAY,EAAE+B,GAAG,aAAa,EAAEH,UAAU,WAAW,EAAEF,SAAS;QAEvF;IACF,EAAE,OAAOa,KAAK;QACZ,MAAMC,UAAUD,eAAef,QAAQe,IAAIC,OAAO,GAAGC,OAAOF;QAC5D,IACEA,eAAef,SACf,gBAAgBe,OAChB,AAACA,IAA8BG,UAAU,KAAK,KAC9C;YACAzC,GAAGiC,IAAI,CACL,CAAC,gDAAgD,EAAEjB,UAAUgB,IAAI,CAAC,cAAc,EAAEhB,UAAUS,OAAO,CAAC,GAAG,EACrGpB,4BACD,KAAK,EAAEN,UAAU,OAAOwC,UAAU;QAEvC,OAAO;YACLvC,GAAGqC,MAAM,CACPtC,UACE,OACA,CAAC,wCAAwC,EAAEiB,UAAUgB,IAAI,CAAC,MAAM,EAAEjC,UAAU,OAAOwC,UAAU;QAGnG;QAEA,MAAMD;IACR;AACF"}

package/dist/commands/debug.js

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import { styleText } from 'node:util';
 import { Flags } from '@oclif/core';
-import { SanityCommand } from '@sanity/cli-core';
+import { ProjectRootNotFoundError, SanityCommand } from '@sanity/cli-core';
 import omit from 'lodash-es/omit.js';
 import padStart from 'lodash-es/padStart.js';
 import { formatObject, printKeyValue } from '../actions/debug/formatters.js';
@@ -23,8 +23,13 @@ export class Debug extends SanityCommand {
     async run() {
         const { flags } = this;
         try {
-            const projectRoot = await this.getProjectRoot();
-            const cliConfig = await this.getCliConfig();
+            let projectRoot;
+            try {
+                projectRoot = await this.getProjectRoot();
+            } catch (err) {
+                if (!(err instanceof ProjectRootNotFoundError)) throw err;
+            }
+            const cliConfig = projectRoot ? await this.getCliConfig() : undefined;
             const { auth, globalConfig, project, projectConfig, user, versions } = await gatherDebugInfo({
                 cliConfig,
                 includeSecrets: flags.secrets,
@@ -69,11 +74,17 @@ export class Debug extends SanityCommand {
                 'authToken'
             ]);
             this.log(`  ${formatObject(globalCfg).replaceAll('\n', '\n  ')}\n`);
-            // Project configuration (projectDir/sanity.json)
-            if (projectConfig) {
-                const configLocation = projectConfig ? ` (${styleText('yellow', path.relative(process.cwd(), projectRoot.path))})` : '';
+            // Project configuration (projectDir/sanity.cli.ts)
+            if (!projectRoot) {
+                this.log('No project found\n');
+            } else if (projectConfig instanceof Error) {
+                this.log(`CLI configuration error: ${styleText('red', projectConfig.message)}\n`);
+            } else if (projectConfig) {
+                const configLocation = ` (${styleText('yellow', path.relative(process.cwd(), projectRoot.path))})`;
                 this.log(`Project config${configLocation}:`);
                 this.log(`  ${formatObject(projectConfig).replaceAll('\n', '\n  ')}`);
+            } else {
+                this.log('No CLI configuration file found\n');
             }
             // Print installed package versions
             if (versions) {