@sanity/cli 6.0.0-alpha.19 → 6.0.0-alpha.21

package/dist/actions/graphql/extractGraphQLAPIs.js

@@ -0,0 +1,150 @@
+import { isMainThread } from 'node:worker_threads';
+import { findStudioConfigPath, getCliConfig, studioWorkerTask, subdebug } from '@sanity/cli-core';
+import { isSchemaError } from '../../util/isSchemaError.js';
+import { extractFromSanitySchema } from './extractFromSanitySchema.js';
+import { resolveGraphQLApis } from './resolveGraphQLApisFromWorkspaces.js';
+import { SchemaError } from './SchemaError.js';
+// ---------------------------------------------------------------------------
+// Main-thread orchestrator
+// ---------------------------------------------------------------------------
+export async function extractGraphQLAPIs(workDir, options) {
+    if (!isMainThread) {
+        throw new Error('extractGraphQLAPIs() must be called from the main thread');
+    }
+    const [cliConfig, configPath] = await Promise.all([
+        getCliConfig(workDir),
+        findStudioConfigPath(workDir)
+    ]);
+    const result = await studioWorkerTask(new URL('extractGraphQLAPIs.worker.js', import.meta.url), {
+        name: 'extractGraphQLAPIs',
+        studioRootPath: workDir,
+        workerData: {
+            cliConfig: extractGraphQLConfig(cliConfig),
+            configPath,
+            nonNullDocumentFieldsFlag: options.nonNullDocumentFieldsFlag,
+            withUnionCache: options.withUnionCache,
+            workDir
+        }
+    });
+    if (result.configErrors?.length) {
+        throw new SchemaError(result.configErrors);
+    }
+    return result.apis;
+}
+function extractGraphQLConfig(config) {
+    return {
+        graphql: config.graphql
+    };
+}
+const debug = subdebug('graphql:extractGraphQLAPIs:worker');
+export async function extractGraphQLAPIsWorker(port, data, deps) {
+    const { cliConfig, configPath, nonNullDocumentFieldsFlag, withUnionCache, workDir } = data;
+    // Load workspaces — this loads sanity.config.ts through Vite, caching `sanity` in the process
+    let workspaces;
+    try {
+        workspaces = await deps.getStudioWorkspaces(configPath);
+    } catch (err) {
+        if (isSchemaError(err)) {
+            const validation = err.schema._validation ?? [];
+            const configErrors = validation.map((g)=>({
+                    ...g,
+                    problems: g.problems.filter((p)=>p.severity === 'error')
+                })).filter((g)=>g.problems.length > 0);
+            // Only treat error-severity problems as schema errors. If the validation
+            // only contains warnings, re-throw the original error so it isn't silently
+            // swallowed — warnings alone should not block deployment.
+            if (configErrors.length === 0) {
+                throw err;
+            }
+            port.postMessage({
+                apis: [],
+                configErrors
+            });
+            return;
+        }
+        throw err;
+    }
+    // Resolve which GraphQL APIs to deploy from workspace + CLI config
+    const resolvedApis = resolveGraphQLApis({
+        cliConfig,
+        workspaces
+    });
+    // Get createSchema from sanity (0ms — already cached by ViteNodeRunner)
+    const { createSchema } = await deps.resolveLocalPackage('sanity', workDir);
+    // Build default schema to identify built-in types that should be filtered out
+    const defaultSchema = createSchema({
+        name: 'default',
+        types: []
+    });
+    const defaultTypes = defaultSchema.getTypeNames();
+    const isCustomType = (type)=>!defaultTypes.includes(type.name);
+    // For each API: create compiled schema, extract GraphQL spec, catch SchemaError
+    const results = [];
+    for (const api of resolvedApis){
+        const apiBase = {
+            dataset: api.dataset,
+            filterSuffix: api.filterSuffix,
+            generation: api.generation,
+            id: api.id,
+            nonNullDocumentFields: api.nonNullDocumentFields,
+            playground: api.playground,
+            projectId: api.projectId,
+            tag: api.tag
+        };
+        try {
+            const schema = createSchema({
+                name: 'default',
+                types: api.schemaTypes.filter((type)=>isCustomType(type))
+            });
+            const extracted = extractFromSanitySchema(schema, {
+                nonNullDocumentFields: nonNullDocumentFieldsFlag === undefined ? api.nonNullDocumentFields : nonNullDocumentFieldsFlag,
+                withUnionCache
+            });
+            results.push({
+                ...apiBase,
+                extracted
+            });
+        } catch (err) {
+            if (err instanceof SchemaError) {
+                results.push({
+                    ...apiBase,
+                    schemaErrors: err.problemGroups
+                });
+            } else if (isSchemaError(err)) {
+                // Sanity's internal schema error from createSchema() — different class from our
+                // SchemaError, but carries structured validation data on err.schema._validation.
+                // This is low-probability since getStudioWorkspaces() above already validated,
+                // but createSchema() on filtered types could still surface issues.
+                const validation = err.schema._validation ?? [];
+                const errorGroups = validation.map((g)=>({
+                        ...g,
+                        problems: g.problems.filter((p)=>p.severity === 'error')
+                    })).filter((g)=>g.problems.length > 0);
+                if (errorGroups.length > 0) {
+                    results.push({
+                        ...apiBase,
+                        schemaErrors: errorGroups
+                    });
+                } else {
+                    // Warning-only or empty _validation — fall through to generic error with the
+                    // message, matching the global path which re-throws warning-only errors.
+                    results.push({
+                        ...apiBase,
+                        extractionError: err instanceof Error ? err.message : String(err)
+                    });
+                }
+            } else {
+                debug('Schema extraction failed for %s/%s: %O', apiBase.dataset, apiBase.tag ?? 'default', err);
+                results.push({
+                    ...apiBase,
+                    extractionError: err instanceof Error ? err.message : String(err)
+                });
+            }
+        }
+    }
+    port.postMessage({
+        apis: results
+    });
+}
+
+//# sourceMappingURL=extractGraphQLAPIs.js.map

package/dist/actions/graphql/extractGraphQLAPIs.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/actions/graphql/extractGraphQLAPIs.ts"],"sourcesContent":["import {isMainThread, type MessagePort} from 'node:worker_threads'\n\nimport {\n  type CliConfig,\n  findStudioConfigPath,\n  getCliConfig,\n  studioWorkerTask,\n  subdebug,\n} from '@sanity/cli-core'\n\nimport {isSchemaError} from '../../util/isSchemaError.js'\nimport {extractFromSanitySchema} from './extractFromSanitySchema.js'\nimport {resolveGraphQLApis, type Workspace} from './resolveGraphQLApisFromWorkspaces.js'\nimport {SchemaError} from './SchemaError.js'\nimport {\n  type ExtractedGraphQLAPI,\n  type GraphQLAPIConfig,\n  type GraphQLWorkerResult,\n  type SchemaDefinitionish,\n} from './types.js'\n\n// ---------------------------------------------------------------------------\n// Main-thread orchestrator\n// ---------------------------------------------------------------------------\n\nexport async function extractGraphQLAPIs(\n  workDir: string,\n  options: {nonNullDocumentFieldsFlag?: boolean; withUnionCache?: boolean},\n): Promise<ExtractedGraphQLAPI[]> {\n  if (!isMainThread) {\n    throw new Error('extractGraphQLAPIs() must be called from the main thread')\n  }\n\n  const [cliConfig, configPath] = await Promise.all([\n    getCliConfig(workDir),\n    findStudioConfigPath(workDir),\n  ])\n\n  const result = await studioWorkerTask<GraphQLWorkerResult>(\n    new URL('extractGraphQLAPIs.worker.js', import.meta.url),\n    {\n      name: 'extractGraphQLAPIs',\n      studioRootPath: workDir,\n      workerData: {\n        cliConfig: extractGraphQLConfig(cliConfig),\n        configPath,\n        nonNullDocumentFieldsFlag: options.nonNullDocumentFieldsFlag,\n        withUnionCache: options.withUnionCache,\n        workDir,\n      },\n    },\n  )\n\n  if (result.configErrors?.length) {\n    throw new SchemaError(result.configErrors)\n  }\n\n  return result.apis\n}\n\nfunction extractGraphQLConfig(config: CliConfig) {\n  return {\n    graphql: config.graphql,\n  }\n}\n\n// ---------------------------------------------------------------------------\n// Worker logic (runs inside the worker thread)\n// ---------------------------------------------------------------------------\n\nexport interface ExtractWorkerData {\n  configPath: string\n  workDir: string\n\n  cliConfig?: {graphql?: GraphQLAPIConfig[]}\n  nonNullDocumentFieldsFlag?: boolean\n  withUnionCache?: boolean\n}\n\nexport interface ExtractWorkerDeps {\n  getStudioWorkspaces: (configPath: string) => Promise<unknown[]>\n  resolveLocalPackage: <T>(name: string, workDir: string) => Promise<T>\n}\n\nconst debug = subdebug('graphql:extractGraphQLAPIs:worker')\n\nexport async function extractGraphQLAPIsWorker(\n  port: MessagePort,\n  data: ExtractWorkerData,\n  deps: ExtractWorkerDeps,\n): Promise<void> {\n  const {cliConfig, configPath, nonNullDocumentFieldsFlag, withUnionCache, workDir} = data\n\n  // Load workspaces — this loads sanity.config.ts through Vite, caching `sanity` in the process\n  let workspaces: Workspace[]\n  try {\n    workspaces = (await deps.getStudioWorkspaces(configPath)) as Workspace[]\n  } catch (err) {\n    if (isSchemaError(err)) {\n      const validation = err.schema._validation ?? []\n      const configErrors = validation\n        .map((g) => ({...g, problems: g.problems.filter((p) => p.severity === 'error')}))\n        .filter((g) => g.problems.length > 0)\n\n      // Only treat error-severity problems as schema errors. If the validation\n      // only contains warnings, re-throw the original error so it isn't silently\n      // swallowed — warnings alone should not block deployment.\n      if (configErrors.length === 0) {\n        throw err\n      }\n\n      port.postMessage({apis: [], configErrors} satisfies GraphQLWorkerResult)\n      return\n    }\n    throw err\n  }\n\n  // Resolve which GraphQL APIs to deploy from workspace + CLI config\n  const resolvedApis = resolveGraphQLApis({cliConfig, workspaces})\n\n  // Get createSchema from sanity (0ms — already cached by ViteNodeRunner)\n  const {createSchema} = await deps.resolveLocalPackage<typeof import('sanity')>('sanity', workDir)\n\n  // Build default schema to identify built-in types that should be filtered out\n  const defaultSchema = createSchema({name: 'default', types: []})\n  const defaultTypes = defaultSchema.getTypeNames()\n  const isCustomType = (type: SchemaDefinitionish) => !defaultTypes.includes(type.name)\n\n  // For each API: create compiled schema, extract GraphQL spec, catch SchemaError\n  const results: ExtractedGraphQLAPI[] = []\n\n  for (const api of resolvedApis) {\n    const apiBase: Omit<ExtractedGraphQLAPI, 'extracted' | 'extractionError' | 'schemaErrors'> = {\n      dataset: api.dataset,\n      filterSuffix: api.filterSuffix,\n      generation: api.generation,\n      id: api.id,\n      nonNullDocumentFields: api.nonNullDocumentFields,\n      playground: api.playground,\n      projectId: api.projectId,\n      tag: api.tag,\n    }\n\n    try {\n      const schema = createSchema({\n        name: 'default',\n        types: api.schemaTypes.filter((type) => isCustomType(type)),\n      })\n\n      const extracted = extractFromSanitySchema(schema, {\n        nonNullDocumentFields:\n          nonNullDocumentFieldsFlag === undefined\n            ? api.nonNullDocumentFields\n            : nonNullDocumentFieldsFlag,\n        withUnionCache,\n      })\n\n      results.push({...apiBase, extracted})\n    } catch (err) {\n      if (err instanceof SchemaError) {\n        results.push({...apiBase, schemaErrors: err.problemGroups})\n      } else if (isSchemaError(err)) {\n        // Sanity's internal schema error from createSchema() — different class from our\n        // SchemaError, but carries structured validation data on err.schema._validation.\n        // This is low-probability since getStudioWorkspaces() above already validated,\n        // but createSchema() on filtered types could still surface issues.\n        const validation = err.schema._validation ?? []\n        const errorGroups = validation\n          .map((g) => ({...g, problems: g.problems.filter((p) => p.severity === 'error')}))\n          .filter((g) => g.problems.length > 0)\n        if (errorGroups.length > 0) {\n          results.push({...apiBase, schemaErrors: errorGroups})\n        } else {\n          // Warning-only or empty _validation — fall through to generic error with the\n          // message, matching the global path which re-throws warning-only errors.\n          results.push({\n            ...apiBase,\n            extractionError: err instanceof Error ? err.message : String(err),\n          })\n        }\n      } else {\n        debug(\n          'Schema extraction failed for %s/%s: %O',\n          apiBase.dataset,\n          apiBase.tag ?? 'default',\n          err,\n        )\n        results.push({\n          ...apiBase,\n          extractionError: err instanceof Error ? err.message : String(err),\n        })\n      }\n    }\n  }\n\n  port.postMessage({apis: results} satisfies GraphQLWorkerResult)\n}\n"],"names":["isMainThread","findStudioConfigPath","getCliConfig","studioWorkerTask","subdebug","isSchemaError","extractFromSanitySchema","resolveGraphQLApis","SchemaError","extractGraphQLAPIs","workDir","options","Error","cliConfig","configPath","Promise","all","result","URL","url","name","studioRootPath","workerData","extractGraphQLConfig","nonNullDocumentFieldsFlag","withUnionCache","configErrors","length","apis","config","graphql","debug","extractGraphQLAPIsWorker","port","data","deps","workspaces","getStudioWorkspaces","err","validation","schema","_validation","map","g","problems","filter","p","severity","postMessage","resolvedApis","createSchema","resolveLocalPackage","defaultSchema","types","defaultTypes","getTypeNames","isCustomType","type","includes","results","api","apiBase","dataset","filterSuffix","generation","id","nonNullDocumentFields","playground","projectId","tag","schemaTypes","extracted","undefined","push","schemaErrors","problemGroups","errorGroups","extractionError","message","String"],"mappings":"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"}

package/dist/actions/graphql/extractGraphQLAPIs.worker.js

@@ -0,0 +1,12 @@
+import { isMainThread, parentPort, workerData } from 'node:worker_threads';
+import { getStudioWorkspaces, resolveLocalPackage } from '@sanity/cli-core';
+import { extractGraphQLAPIsWorker } from './extractGraphQLAPIs.js';
+if (isMainThread || !parentPort) {
+    throw new Error('This module must be run as a worker thread');
+}
+await extractGraphQLAPIsWorker(parentPort, workerData, {
+    getStudioWorkspaces,
+    resolveLocalPackage
+});
+
+//# sourceMappingURL=extractGraphQLAPIs.worker.js.map

package/dist/actions/graphql/extractGraphQLAPIs.worker.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/actions/graphql/extractGraphQLAPIs.worker.ts"],"sourcesContent":["import {isMainThread, parentPort, workerData} from 'node:worker_threads'\n\nimport {getStudioWorkspaces, resolveLocalPackage} from '@sanity/cli-core'\n\nimport {extractGraphQLAPIsWorker, type ExtractWorkerData} from './extractGraphQLAPIs.js'\n\nif (isMainThread || !parentPort) {\n  throw new Error('This module must be run as a worker thread')\n}\n\nawait extractGraphQLAPIsWorker(parentPort, workerData as ExtractWorkerData, {\n  getStudioWorkspaces,\n  resolveLocalPackage,\n})\n"],"names":["isMainThread","parentPort","workerData","getStudioWorkspaces","resolveLocalPackage","extractGraphQLAPIsWorker","Error"],"mappings":"AAAA,SAAQA,YAAY,EAAEC,UAAU,EAAEC,UAAU,QAAO,sBAAqB;AAExE,SAAQC,mBAAmB,EAAEC,mBAAmB,QAAO,mBAAkB;AAEzE,SAAQC,wBAAwB,QAA+B,0BAAyB;AAExF,IAAIL,gBAAgB,CAACC,YAAY;IAC/B,MAAM,IAAIK,MAAM;AAClB;AAEA,MAAMD,yBAAyBJ,YAAYC,YAAiC;IAC1EC;IACAC;AACF"}

package/dist/actions/graphql/gen1/index.js

@@ -1,17 +1,17 @@
+import { stripInternalMeta } from '../helpers.js';
 import { generateTypeFilters } from './generateTypeFilters.js';
 import { generateTypeQueries } from './generateTypeQueries.js';
 const gen1 = (extracted)=>{
     const filters = generateTypeFilters(extracted.types);
     const queries = generateTypeQueries(extracted.types, filters);
-    const types = [
-        ...extracted.types,
-        ...filters
-    ];
     return {
         generation: 'gen1',
         interfaces: extracted.interfaces,
         queries,
-        types
+        types: [
+            ...stripInternalMeta(extracted.types),
+            ...filters
+        ]
     };
 };
 export default gen1;

package/dist/actions/graphql/gen1/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/actions/graphql/gen1/index.ts"],"sourcesContent":["import {type ApiSpecification, type GeneratedApiSpecification} from '../types.js'\nimport {generateTypeFilters} from './generateTypeFilters.js'\nimport {generateTypeQueries} from './generateTypeQueries.js'\n\nconst gen1 = (extracted: ApiSpecification): GeneratedApiSpecification => {\n  const filters = generateTypeFilters(extracted.types)\n  const queries = generateTypeQueries(extracted.types, filters)\n  const types = [...extracted.types, ...filters]\n  return {generation: 'gen1', interfaces: extracted.interfaces, queries, types}\n}\n\nexport default gen1\n"],"names":["generateTypeFilters","generateTypeQueries","gen1","extracted","filters","types","queries","generation","interfaces"],"mappings":"AACA,SAAQA,mBAAmB,QAAO,2BAA0B;AAC5D,SAAQC,mBAAmB,QAAO,2BAA0B;AAE5D,MAAMC,OAAO,CAACC;IACZ,MAAMC,UAAUJ,oBAAoBG,UAAUE,KAAK;IACnD,MAAMC,UAAUL,oBAAoBE,UAAUE,KAAK,EAAED;IACrD,MAAMC,QAAQ;WAAIF,UAAUE,KAAK;WAAKD;KAAQ;IAC9C,OAAO;QAACG,YAAY;QAAQC,YAAYL,UAAUK,UAAU;QAAEF;QAASD;IAAK;AAC9E;AAEA,eAAeH,KAAI"}
+{"version":3,"sources":["../../../../src/actions/graphql/gen1/index.ts"],"sourcesContent":["import {stripInternalMeta} from '../helpers.js'\nimport {type ApiSpecification, type GeneratedApiSpecification} from '../types.js'\nimport {generateTypeFilters} from './generateTypeFilters.js'\nimport {generateTypeQueries} from './generateTypeQueries.js'\n\nconst gen1 = (extracted: ApiSpecification): GeneratedApiSpecification => {\n  const filters = generateTypeFilters(extracted.types)\n  const queries = generateTypeQueries(extracted.types, filters)\n\n  return {\n    generation: 'gen1',\n    interfaces: extracted.interfaces,\n    queries,\n    types: [...stripInternalMeta(extracted.types), ...filters],\n  }\n}\n\nexport default gen1\n"],"names":["stripInternalMeta","generateTypeFilters","generateTypeQueries","gen1","extracted","filters","types","queries","generation","interfaces"],"mappings":"AAAA,SAAQA,iBAAiB,QAAO,gBAAe;AAE/C,SAAQC,mBAAmB,QAAO,2BAA0B;AAC5D,SAAQC,mBAAmB,QAAO,2BAA0B;AAE5D,MAAMC,OAAO,CAACC;IACZ,MAAMC,UAAUJ,oBAAoBG,UAAUE,KAAK;IACnD,MAAMC,UAAUL,oBAAoBE,UAAUE,KAAK,EAAED;IAErD,OAAO;QACLG,YAAY;QACZC,YAAYL,UAAUK,UAAU;QAChCF;QACAD,OAAO;eAAIN,kBAAkBI,UAAUE,KAAK;eAAMD;SAAQ;IAC5D;AACF;AAEA,eAAeF,KAAI"}

package/dist/actions/graphql/gen2/index.js

@@ -1,3 +1,4 @@
+import { stripInternalMeta } from '../helpers.js';
 import { generateTypeFilters } from './generateTypeFilters.js';
 import { generateTypeQueries } from './generateTypeQueries.js';
 import { generateTypeSortings } from './generateTypeSortings.js';
@@ -5,16 +6,15 @@ const gen2 = (extracted)=>{
     const filters = generateTypeFilters(extracted.types);
     const sortings = generateTypeSortings(extracted.types);
     const queries = generateTypeQueries(extracted.types, sortings.filter((node)=>node.kind === 'InputObject'));
-    const types = [
-        ...extracted.types,
-        ...filters,
-        ...sortings
-    ];
     return {
         generation: 'gen2',
         interfaces: extracted.interfaces,
         queries,
-        types
+        types: [
+            ...stripInternalMeta(extracted.types),
+            ...filters,
+            ...sortings
+        ]
     };
 };
 export default gen2;

package/dist/actions/graphql/gen2/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/actions/graphql/gen2/index.ts"],"sourcesContent":["import {\n  type ApiSpecification,\n  type GeneratedApiSpecification,\n  type InputObjectType,\n} from '../types.js'\nimport {generateTypeFilters} from './generateTypeFilters.js'\nimport {generateTypeQueries} from './generateTypeQueries.js'\nimport {generateTypeSortings} from './generateTypeSortings.js'\n\nconst gen2 = (extracted: ApiSpecification): GeneratedApiSpecification => {\n  const filters = generateTypeFilters(extracted.types)\n  const sortings = generateTypeSortings(extracted.types)\n  const queries = generateTypeQueries(\n    extracted.types,\n    sortings.filter((node): node is InputObjectType => node.kind === 'InputObject'),\n  )\n  const types = [...extracted.types, ...filters, ...sortings]\n\n  return {generation: 'gen2', interfaces: extracted.interfaces, queries, types}\n}\n\nexport default gen2\n"],"names":["generateTypeFilters","generateTypeQueries","generateTypeSortings","gen2","extracted","filters","types","sortings","queries","filter","node","kind","generation","interfaces"],"mappings":"AAKA,SAAQA,mBAAmB,QAAO,2BAA0B;AAC5D,SAAQC,mBAAmB,QAAO,2BAA0B;AAC5D,SAAQC,oBAAoB,QAAO,4BAA2B;AAE9D,MAAMC,OAAO,CAACC;IACZ,MAAMC,UAAUL,oBAAoBI,UAAUE,KAAK;IACnD,MAAMC,WAAWL,qBAAqBE,UAAUE,KAAK;IACrD,MAAME,UAAUP,oBACdG,UAAUE,KAAK,EACfC,SAASE,MAAM,CAAC,CAACC,OAAkCA,KAAKC,IAAI,KAAK;IAEnE,MAAML,QAAQ;WAAIF,UAAUE,KAAK;WAAKD;WAAYE;KAAS;IAE3D,OAAO;QAACK,YAAY;QAAQC,YAAYT,UAAUS,UAAU;QAAEL;QAASF;IAAK;AAC9E;AAEA,eAAeH,KAAI"}
+{"version":3,"sources":["../../../../src/actions/graphql/gen2/index.ts"],"sourcesContent":["import {stripInternalMeta} from '../helpers.js'\nimport {\n  type ApiSpecification,\n  type GeneratedApiSpecification,\n  type InputObjectType,\n} from '../types.js'\nimport {generateTypeFilters} from './generateTypeFilters.js'\nimport {generateTypeQueries} from './generateTypeQueries.js'\nimport {generateTypeSortings} from './generateTypeSortings.js'\n\nconst gen2 = (extracted: ApiSpecification): GeneratedApiSpecification => {\n  const filters = generateTypeFilters(extracted.types)\n  const sortings = generateTypeSortings(extracted.types)\n  const queries = generateTypeQueries(\n    extracted.types,\n    sortings.filter((node): node is InputObjectType => node.kind === 'InputObject'),\n  )\n\n  return {\n    generation: 'gen2',\n    interfaces: extracted.interfaces,\n    queries,\n    types: [...stripInternalMeta(extracted.types), ...filters, ...sortings],\n  }\n}\n\nexport default gen2\n"],"names":["stripInternalMeta","generateTypeFilters","generateTypeQueries","generateTypeSortings","gen2","extracted","filters","types","sortings","queries","filter","node","kind","generation","interfaces"],"mappings":"AAAA,SAAQA,iBAAiB,QAAO,gBAAe;AAM/C,SAAQC,mBAAmB,QAAO,2BAA0B;AAC5D,SAAQC,mBAAmB,QAAO,2BAA0B;AAC5D,SAAQC,oBAAoB,QAAO,4BAA2B;AAE9D,MAAMC,OAAO,CAACC;IACZ,MAAMC,UAAUL,oBAAoBI,UAAUE,KAAK;IACnD,MAAMC,WAAWL,qBAAqBE,UAAUE,KAAK;IACrD,MAAME,UAAUP,oBACdG,UAAUE,KAAK,EACfC,SAASE,MAAM,CAAC,CAACC,OAAkCA,KAAKC,IAAI,KAAK;IAGnE,OAAO;QACLC,YAAY;QACZC,YAAYT,UAAUS,UAAU;QAChCL;QACAF,OAAO;eAAIP,kBAAkBK,UAAUE,KAAK;eAAMD;eAAYE;SAAS;IACzE;AACF;AAEA,eAAeJ,KAAI"}

package/dist/actions/graphql/gen3/generateTypeQueries.js

@@ -1,6 +1,5 @@
 import upperFirst from 'lodash-es/upperFirst.js';
 import { isDocumentType, isUnion } from '../helpers.js';
-import { internal } from '../types.js';
 import { getFilterFieldName } from './utils.js';
 export function generateTypeQueries(types, sortings, options) {
     const { filterSuffix } = options || {};
@@ -96,8 +95,8 @@ export function generateTypeQueries(types, sortings, options) {
     return queries;
 }
 function getDeprecation(type) {
-    return type[internal]?.deprecationReason ? {
-        deprecationReason: type[internal].deprecationReason
+    return type._internal?.deprecationReason ? {
+        deprecationReason: type._internal.deprecationReason
     } : {};
 }
 

package/dist/actions/graphql/gen3/generateTypeQueries.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/actions/graphql/gen3/generateTypeQueries.ts"],"sourcesContent":["import upperFirst from 'lodash-es/upperFirst.js'\n\nimport {isDocumentType, isUnion} from '../helpers.js'\nimport {\n  type ApiCustomizationOptions,\n  type ConvertedType,\n  type ConvertedUnion,\n  type Deprecation,\n  type InputObjectType,\n  internal,\n  type QueryDefinition,\n} from '../types.js'\nimport {getFilterFieldName} from './utils.js'\n\nexport function generateTypeQueries(\n  types: (ConvertedType | ConvertedUnion)[],\n  sortings: InputObjectType[],\n  options?: ApiCustomizationOptions,\n): QueryDefinition[] {\n  const {filterSuffix} = options || {}\n  const queries: QueryDefinition[] = []\n  const documentTypes = types.filter((type) => isDocumentType(type))\n\n  const documentTypeNames = documentTypes.map((docType) =>\n    JSON.stringify(docType.originalName || docType.name),\n  )\n  const documentsFilter = `_type in [${documentTypeNames.join(', ')}]`\n\n  const documentInterface = types.find((type) => type.name === 'Document')\n  if (!documentInterface || isUnion(documentInterface)) {\n    throw new Error('Failed to find document interface')\n  }\n\n  const queryable = [...documentTypes, documentInterface]\n  const isSortable = (type: ConvertedType) =>\n    sortings.some((sorting) => sorting.name === `${type.name}Sorting`)\n\n  // Single ID-based result lookup queries\n  for (const type of queryable) {\n    queries.push({\n      args: [\n        {\n          description: `${type.name} document ID`,\n          isNullable: false,\n          name: 'id',\n          type: 'ID',\n        },\n      ],\n      constraints: [\n        {\n          comparator: 'eq',\n          field: '_id',\n          value: {argName: 'id', kind: 'argumentValue'},\n        },\n      ],\n      fieldName: type.name,\n      type: type.name,\n      ...getDeprecation(type),\n    })\n  }\n\n  // Fetch all of type\n  for (const type of queryable) {\n    const sorting: QueryDefinition['args'] = []\n    if (isSortable(type)) {\n      sorting.push({\n        name: 'sort',\n        type: {\n          children: {\n            isNullable: false,\n            type: `${type.name}Sorting`,\n          },\n          isNullable: true,\n          kind: 'List',\n        },\n      })\n    }\n\n    queries.push({\n      args: [\n        {\n          isFieldFilter: true,\n          name: 'where',\n          type: getFilterFieldName(type.name, filterSuffix),\n        },\n        ...sorting,\n        {\n          description: 'Max documents to return',\n          isFieldFilter: false,\n          name: 'limit',\n          type: 'Int',\n        },\n        {\n          description: 'Offset at which to start returning documents from',\n          isFieldFilter: false,\n          name: 'offset',\n          type: 'Int',\n        },\n      ],\n      fieldName: `all${upperFirst(type.name)}`,\n      filter:\n        type.name === 'Document' && type.kind === 'Interface'\n          ? documentsFilter\n          : `_type == ${JSON.stringify(type.originalName || type.name)}`,\n      type: {\n        children: {isNullable: false, type: type.name},\n        isNullable: false,\n        kind: 'List',\n      },\n      ...getDeprecation(type),\n    })\n  }\n\n  return queries\n}\n\nfunction getDeprecation(type: ConvertedType): Partial<Deprecation> {\n  return type[internal]?.deprecationReason\n    ? {\n        deprecationReason: type[internal].deprecationReason,\n      }\n    : {}\n}\n"],"names":["upperFirst","isDocumentType","isUnion","internal","getFilterFieldName","generateTypeQueries","types","sortings","options","filterSuffix","queries","documentTypes","filter","type","documentTypeNames","map","docType","JSON","stringify","originalName","name","documentsFilter","join","documentInterface","find","Error","queryable","isSortable","some","sorting","push","args","description","isNullable","constraints","comparator","field","value","argName","kind","fieldName","getDeprecation","children","isFieldFilter","deprecationReason"],"mappings":"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"}
+{"version":3,"sources":["../../../../src/actions/graphql/gen3/generateTypeQueries.ts"],"sourcesContent":["import upperFirst from 'lodash-es/upperFirst.js'\n\nimport {isDocumentType, isUnion} from '../helpers.js'\nimport {\n  type ApiCustomizationOptions,\n  type ConvertedType,\n  type ConvertedUnion,\n  type Deprecation,\n  type InputObjectType,\n  type QueryDefinition,\n} from '../types.js'\nimport {getFilterFieldName} from './utils.js'\n\nexport function generateTypeQueries(\n  types: (ConvertedType | ConvertedUnion)[],\n  sortings: InputObjectType[],\n  options?: ApiCustomizationOptions,\n): QueryDefinition[] {\n  const {filterSuffix} = options || {}\n  const queries: QueryDefinition[] = []\n  const documentTypes = types.filter((type) => isDocumentType(type))\n\n  const documentTypeNames = documentTypes.map((docType) =>\n    JSON.stringify(docType.originalName || docType.name),\n  )\n  const documentsFilter = `_type in [${documentTypeNames.join(', ')}]`\n\n  const documentInterface = types.find((type) => type.name === 'Document')\n  if (!documentInterface || isUnion(documentInterface)) {\n    throw new Error('Failed to find document interface')\n  }\n\n  const queryable = [...documentTypes, documentInterface]\n  const isSortable = (type: ConvertedType) =>\n    sortings.some((sorting) => sorting.name === `${type.name}Sorting`)\n\n  // Single ID-based result lookup queries\n  for (const type of queryable) {\n    queries.push({\n      args: [\n        {\n          description: `${type.name} document ID`,\n          isNullable: false,\n          name: 'id',\n          type: 'ID',\n        },\n      ],\n      constraints: [\n        {\n          comparator: 'eq',\n          field: '_id',\n          value: {argName: 'id', kind: 'argumentValue'},\n        },\n      ],\n      fieldName: type.name,\n      type: type.name,\n      ...getDeprecation(type),\n    })\n  }\n\n  // Fetch all of type\n  for (const type of queryable) {\n    const sorting: QueryDefinition['args'] = []\n    if (isSortable(type)) {\n      sorting.push({\n        name: 'sort',\n        type: {\n          children: {\n            isNullable: false,\n            type: `${type.name}Sorting`,\n          },\n          isNullable: true,\n          kind: 'List',\n        },\n      })\n    }\n\n    queries.push({\n      args: [\n        {\n          isFieldFilter: true,\n          name: 'where',\n          type: getFilterFieldName(type.name, filterSuffix),\n        },\n        ...sorting,\n        {\n          description: 'Max documents to return',\n          isFieldFilter: false,\n          name: 'limit',\n          type: 'Int',\n        },\n        {\n          description: 'Offset at which to start returning documents from',\n          isFieldFilter: false,\n          name: 'offset',\n          type: 'Int',\n        },\n      ],\n      fieldName: `all${upperFirst(type.name)}`,\n      filter:\n        type.name === 'Document' && type.kind === 'Interface'\n          ? documentsFilter\n          : `_type == ${JSON.stringify(type.originalName || type.name)}`,\n      type: {\n        children: {isNullable: false, type: type.name},\n        isNullable: false,\n        kind: 'List',\n      },\n      ...getDeprecation(type),\n    })\n  }\n\n  return queries\n}\n\nfunction getDeprecation(type: ConvertedType): Partial<Deprecation> {\n  return type._internal?.deprecationReason\n    ? {\n        deprecationReason: type._internal.deprecationReason,\n      }\n    : {}\n}\n"],"names":["upperFirst","isDocumentType","isUnion","getFilterFieldName","generateTypeQueries","types","sortings","options","filterSuffix","queries","documentTypes","filter","type","documentTypeNames","map","docType","JSON","stringify","originalName","name","documentsFilter","join","documentInterface","find","Error","queryable","isSortable","some","sorting","push","args","description","isNullable","constraints","comparator","field","value","argName","kind","fieldName","getDeprecation","children","isFieldFilter","_internal","deprecationReason"],"mappings":"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"}

package/dist/actions/graphql/gen3/index.js

@@ -1,4 +1,4 @@
-import { isUnion } from '../helpers.js';
+import { isUnion, stripInternalMeta } from '../helpers.js';
 import { generateTypeFilters } from './generateTypeFilters.js';
 import { generateTypeQueries } from './generateTypeQueries.js';
 import { generateTypeSortings } from './generateTypeSortings.js';
@@ -14,16 +14,15 @@ const gen3 = (extracted, options)=>{
     const filters = generateTypeFilters(types, options);
     const sortings = generateTypeSortings(types);
     const queries = generateTypeQueries(types, sortings.filter((node)=>node.kind === 'InputObject'), options);
-    const graphqlTypes = [
-        ...extracted.types,
-        ...filters,
-        ...sortings
-    ];
     return {
         generation: 'gen3',
         interfaces: extracted.interfaces,
         queries,
-        types: graphqlTypes
+        types: [
+            ...stripInternalMeta(extracted.types),
+            ...filters,
+            ...sortings
+        ]
     };
 };
 export default gen3;

package/dist/actions/graphql/gen3/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/actions/graphql/gen3/index.ts"],"sourcesContent":["import {isUnion} from '../helpers.js'\nimport {\n  type ApiCustomizationOptions,\n  type ApiSpecification,\n  type ConvertedType,\n  type GeneratedApiSpecification,\n  type InputObjectType,\n} from '../types.js'\nimport {generateTypeFilters} from './generateTypeFilters.js'\nimport {generateTypeQueries} from './generateTypeQueries.js'\nimport {generateTypeSortings} from './generateTypeSortings.js'\n\nconst gen3 = (\n  extracted: ApiSpecification,\n  options?: ApiCustomizationOptions,\n): GeneratedApiSpecification => {\n  const documentInterface = extracted.interfaces.find((iface) => iface.name === 'Document')\n  if (!documentInterface || isUnion(documentInterface)) {\n    throw new Error('Failed to find document interface')\n  }\n\n  const types = [...extracted.types, documentInterface as ConvertedType]\n\n  const filters = generateTypeFilters(types, options)\n  const sortings = generateTypeSortings(types)\n  const queries = generateTypeQueries(\n    types,\n    sortings.filter((node): node is InputObjectType => node.kind === 'InputObject'),\n    options,\n  )\n  const graphqlTypes = [...extracted.types, ...filters, ...sortings]\n\n  return {generation: 'gen3', interfaces: extracted.interfaces, queries, types: graphqlTypes}\n}\n\nexport default gen3\n"],"names":["isUnion","generateTypeFilters","generateTypeQueries","generateTypeSortings","gen3","extracted","options","documentInterface","interfaces","find","iface","name","Error","types","filters","sortings","queries","filter","node","kind","graphqlTypes","generation"],"mappings":"AAAA,SAAQA,OAAO,QAAO,gBAAe;AAQrC,SAAQC,mBAAmB,QAAO,2BAA0B;AAC5D,SAAQC,mBAAmB,QAAO,2BAA0B;AAC5D,SAAQC,oBAAoB,QAAO,4BAA2B;AAE9D,MAAMC,OAAO,CACXC,WACAC;IAEA,MAAMC,oBAAoBF,UAAUG,UAAU,CAACC,IAAI,CAAC,CAACC,QAAUA,MAAMC,IAAI,KAAK;IAC9E,IAAI,CAACJ,qBAAqBP,QAAQO,oBAAoB;QACpD,MAAM,IAAIK,MAAM;IAClB;IAEA,MAAMC,QAAQ;WAAIR,UAAUQ,KAAK;QAAEN;KAAmC;IAEtE,MAAMO,UAAUb,oBAAoBY,OAAOP;IAC3C,MAAMS,WAAWZ,qBAAqBU;IACtC,MAAMG,UAAUd,oBACdW,OACAE,SAASE,MAAM,CAAC,CAACC,OAAkCA,KAAKC,IAAI,KAAK,gBACjEb;IAEF,MAAMc,eAAe;WAAIf,UAAUQ,KAAK;WAAKC;WAAYC;KAAS;IAElE,OAAO;QAACM,YAAY;QAAQb,YAAYH,UAAUG,UAAU;QAAEQ;QAASH,OAAOO;IAAY;AAC5F;AAEA,eAAehB,KAAI"}
+{"version":3,"sources":["../../../../src/actions/graphql/gen3/index.ts"],"sourcesContent":["import {isUnion, stripInternalMeta} from '../helpers.js'\nimport {\n  type ApiCustomizationOptions,\n  type ApiSpecification,\n  type ConvertedType,\n  type GeneratedApiSpecification,\n  type InputObjectType,\n} from '../types.js'\nimport {generateTypeFilters} from './generateTypeFilters.js'\nimport {generateTypeQueries} from './generateTypeQueries.js'\nimport {generateTypeSortings} from './generateTypeSortings.js'\n\nconst gen3 = (\n  extracted: ApiSpecification,\n  options?: ApiCustomizationOptions,\n): GeneratedApiSpecification => {\n  const documentInterface = extracted.interfaces.find((iface) => iface.name === 'Document')\n  if (!documentInterface || isUnion(documentInterface)) {\n    throw new Error('Failed to find document interface')\n  }\n\n  const types = [...extracted.types, documentInterface as ConvertedType]\n\n  const filters = generateTypeFilters(types, options)\n  const sortings = generateTypeSortings(types)\n  const queries = generateTypeQueries(\n    types,\n    sortings.filter((node): node is InputObjectType => node.kind === 'InputObject'),\n    options,\n  )\n\n  return {\n    generation: 'gen3',\n    interfaces: extracted.interfaces,\n    queries,\n    types: [...stripInternalMeta(extracted.types), ...filters, ...sortings],\n  }\n}\n\nexport default gen3\n"],"names":["isUnion","stripInternalMeta","generateTypeFilters","generateTypeQueries","generateTypeSortings","gen3","extracted","options","documentInterface","interfaces","find","iface","name","Error","types","filters","sortings","queries","filter","node","kind","generation"],"mappings":"AAAA,SAAQA,OAAO,EAAEC,iBAAiB,QAAO,gBAAe;AAQxD,SAAQC,mBAAmB,QAAO,2BAA0B;AAC5D,SAAQC,mBAAmB,QAAO,2BAA0B;AAC5D,SAAQC,oBAAoB,QAAO,4BAA2B;AAE9D,MAAMC,OAAO,CACXC,WACAC;IAEA,MAAMC,oBAAoBF,UAAUG,UAAU,CAACC,IAAI,CAAC,CAACC,QAAUA,MAAMC,IAAI,KAAK;IAC9E,IAAI,CAACJ,qBAAqBR,QAAQQ,oBAAoB;QACpD,MAAM,IAAIK,MAAM;IAClB;IAEA,MAAMC,QAAQ;WAAIR,UAAUQ,KAAK;QAAEN;KAAmC;IAEtE,MAAMO,UAAUb,oBAAoBY,OAAOP;IAC3C,MAAMS,WAAWZ,qBAAqBU;IACtC,MAAMG,UAAUd,oBACdW,OACAE,SAASE,MAAM,CAAC,CAACC,OAAkCA,KAAKC,IAAI,KAAK,gBACjEb;IAGF,OAAO;QACLc,YAAY;QACZZ,YAAYH,UAAUG,UAAU;QAChCQ;QACAH,OAAO;eAAIb,kBAAkBK,UAAUQ,KAAK;eAAMC;eAAYC;SAAS;IACzE;AACF;AAEA,eAAeX,KAAI"}

package/dist/actions/graphql/getGraphQLAPIs.js

@@ -1,46 +1,23 @@
 import { isMainThread } from 'node:worker_threads';
-import { getCliConfig, getStudioConfig, promisifyWorker, resolveLocalPackage } from '@sanity/cli-core';
+import { findStudioConfigPath, getCliConfig, studioWorkerTask } from '@sanity/cli-core';
 export async function getGraphQLAPIs(workDir) {
     if (!isMainThread) {
         throw new Error('getGraphQLAPIs() must be called from the main thread');
     }
-    // Resolve `sanity` local to the project in order to avoid using incompatible versions, and to avoid circular dependencies
-    const { createSchema } = await resolveLocalPackage('sanity', workDir);
-    const defaultSchema = createSchema({
-        name: 'default',
-        types: []
-    });
-    const defaultTypes = defaultSchema.getTypeNames();
-    const isCustomType = (type)=>!defaultTypes.includes(type.name);
-    const apis = await getApisWithSchemaTypes(workDir);
-    const resolved = apis.map(({ schemaTypes, ...api })=>({
-            schema: createSchema({
-                name: 'default',
-                types: schemaTypes.filter((element)=>isCustomType(element))
-            }),
-            ...api
-        }));
-    return resolved;
-}
-async function getApisWithSchemaTypes(workDir) {
-    const cliConfig = await getCliConfig(workDir);
-    const workspaces = await getStudioConfig(workDir, {
-        resolvePlugins: true
-    });
-    return promisifyWorker(new URL('getGraphQLAPIs.worker.js', import.meta.url), {
-        env: process.env,
+    const [cliConfig, configPath] = await Promise.all([
+        getCliConfig(workDir),
+        findStudioConfigPath(workDir)
+    ]);
+    return studioWorkerTask(new URL('getGraphQLAPIs.worker.js', import.meta.url), {
+        name: 'getGraphQLAPIs',
+        studioRootPath: workDir,
         workerData: {
-            cliConfig: extractGraphQLConfig(cliConfig),
-            workDir,
-            workspaces
+            cliConfig: {
+                graphql: cliConfig.graphql
+            },
+            configPath
         }
     });
 }
-function extractGraphQLConfig(config) {
-    return structuredClone({
-        api: config.api,
-        graphql: config.graphql
-    });
-}
 
 //# sourceMappingURL=getGraphQLAPIs.js.map

package/dist/actions/graphql/getGraphQLAPIs.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/graphql/getGraphQLAPIs.ts"],"sourcesContent":["import {isMainThread} from 'node:worker_threads'\n\nimport {\n  type CliConfig,\n  getCliConfig,\n  getStudioConfig,\n  promisifyWorker,\n  resolveLocalPackage,\n} from '@sanity/cli-core'\n\nimport {\n  type ResolvedGraphQLAPI,\n  type ResolvedSourceProperties,\n  type SchemaDefinitionish,\n  type TypeResolvedGraphQLAPI,\n} from './types.js'\n\nexport async function getGraphQLAPIs(workDir: string): Promise<ResolvedGraphQLAPI[]> {\n  if (!isMainThread) {\n    throw new Error('getGraphQLAPIs() must be called from the main thread')\n  }\n\n  // Resolve `sanity` local to the project in order to avoid using incompatible versions, and to avoid circular dependencies\n  const {createSchema} = await resolveLocalPackage<typeof import('sanity')>('sanity', workDir)\n\n  const defaultSchema = createSchema({name: 'default', types: []})\n  const defaultTypes = defaultSchema.getTypeNames()\n  const isCustomType = (type: SchemaDefinitionish) => !defaultTypes.includes(type.name)\n\n  const apis = await getApisWithSchemaTypes(workDir)\n  const resolved = apis.map(\n    ({schemaTypes, ...api}): ResolvedSourceProperties => ({\n      schema: createSchema({\n        name: 'default',\n        types: schemaTypes.filter((element) => isCustomType(element)),\n      }),\n      ...api,\n    }),\n  )\n\n  return resolved\n}\n\nasync function getApisWithSchemaTypes(workDir: string): Promise<TypeResolvedGraphQLAPI[]> {\n  const cliConfig = await getCliConfig(workDir)\n  const workspaces = await getStudioConfig(workDir, {resolvePlugins: true})\n\n  return promisifyWorker<TypeResolvedGraphQLAPI[]>(\n    new URL('getGraphQLAPIs.worker.js', import.meta.url),\n    {\n      env: process.env,\n      workerData: {\n        cliConfig: extractGraphQLConfig(cliConfig),\n        workDir,\n        workspaces,\n      },\n    },\n  )\n}\n\nfunction extractGraphQLConfig(config: CliConfig) {\n  return structuredClone({\n    api: config.api,\n    graphql: config.graphql,\n  })\n}\n"],"names":["isMainThread","getCliConfig","getStudioConfig","promisifyWorker","resolveLocalPackage","getGraphQLAPIs","workDir","Error","createSchema","defaultSchema","name","types","defaultTypes","getTypeNames","isCustomType","type","includes","apis","getApisWithSchemaTypes","resolved","map","schemaTypes","api","schema","filter","element","cliConfig","workspaces","resolvePlugins","URL","url","env","process","workerData","extractGraphQLConfig","config","structuredClone","graphql"],"mappings":"AAAA,SAAQA,YAAY,QAAO,sBAAqB;AAEhD,SAEEC,YAAY,EACZC,eAAe,EACfC,eAAe,EACfC,mBAAmB,QACd,mBAAkB;AASzB,OAAO,eAAeC,eAAeC,OAAe;IAClD,IAAI,CAACN,cAAc;QACjB,MAAM,IAAIO,MAAM;IAClB;IAEA,0HAA0H;IAC1H,MAAM,EAACC,YAAY,EAAC,GAAG,MAAMJ,oBAA6C,UAAUE;IAEpF,MAAMG,gBAAgBD,aAAa;QAACE,MAAM;QAAWC,OAAO,EAAE;IAAA;IAC9D,MAAMC,eAAeH,cAAcI,YAAY;IAC/C,MAAMC,eAAe,CAACC,OAA8B,CAACH,aAAaI,QAAQ,CAACD,KAAKL,IAAI;IAEpF,MAAMO,OAAO,MAAMC,uBAAuBZ;IAC1C,MAAMa,WAAWF,KAAKG,GAAG,CACvB,CAAC,EAACC,WAAW,EAAE,GAAGC,KAAI,GAAgC,CAAA;YACpDC,QAAQf,aAAa;gBACnBE,MAAM;gBACNC,OAAOU,YAAYG,MAAM,CAAC,CAACC,UAAYX,aAAaW;YACtD;YACA,GAAGH,GAAG;QACR,CAAA;IAGF,OAAOH;AACT;AAEA,eAAeD,uBAAuBZ,OAAe;IACnD,MAAMoB,YAAY,MAAMzB,aAAaK;IACrC,MAAMqB,aAAa,MAAMzB,gBAAgBI,SAAS;QAACsB,gBAAgB;IAAI;IAEvE,OAAOzB,gBACL,IAAI0B,IAAI,4BAA4B,YAAYC,GAAG,GACnD;QACEC,KAAKC,QAAQD,GAAG;QAChBE,YAAY;YACVP,WAAWQ,qBAAqBR;YAChCpB;YACAqB;QACF;IACF;AAEJ;AAEA,SAASO,qBAAqBC,MAAiB;IAC7C,OAAOC,gBAAgB;QACrBd,KAAKa,OAAOb,GAAG;QACfe,SAASF,OAAOE,OAAO;IACzB;AACF"}
+{"version":3,"sources":["../../../src/actions/graphql/getGraphQLAPIs.ts"],"sourcesContent":["import {isMainThread} from 'node:worker_threads'\n\nimport {findStudioConfigPath, getCliConfig, studioWorkerTask} from '@sanity/cli-core'\n\nimport {type ExtractedGraphQLAPI} from './types.js'\n\nexport async function getGraphQLAPIs(workDir: string): Promise<ExtractedGraphQLAPI[]> {\n  if (!isMainThread) {\n    throw new Error('getGraphQLAPIs() must be called from the main thread')\n  }\n\n  const [cliConfig, configPath] = await Promise.all([\n    getCliConfig(workDir),\n    findStudioConfigPath(workDir),\n  ])\n\n  return studioWorkerTask<ExtractedGraphQLAPI[]>(\n    new URL('getGraphQLAPIs.worker.js', import.meta.url),\n    {\n      name: 'getGraphQLAPIs',\n      studioRootPath: workDir,\n      workerData: {\n        cliConfig: {graphql: cliConfig.graphql},\n        configPath,\n      },\n    },\n  )\n}\n"],"names":["isMainThread","findStudioConfigPath","getCliConfig","studioWorkerTask","getGraphQLAPIs","workDir","Error","cliConfig","configPath","Promise","all","URL","url","name","studioRootPath","workerData","graphql"],"mappings":"AAAA,SAAQA,YAAY,QAAO,sBAAqB;AAEhD,SAAQC,oBAAoB,EAAEC,YAAY,EAAEC,gBAAgB,QAAO,mBAAkB;AAIrF,OAAO,eAAeC,eAAeC,OAAe;IAClD,IAAI,CAACL,cAAc;QACjB,MAAM,IAAIM,MAAM;IAClB;IAEA,MAAM,CAACC,WAAWC,WAAW,GAAG,MAAMC,QAAQC,GAAG,CAAC;QAChDR,aAAaG;QACbJ,qBAAqBI;KACtB;IAED,OAAOF,iBACL,IAAIQ,IAAI,4BAA4B,YAAYC,GAAG,GACnD;QACEC,MAAM;QACNC,gBAAgBT;QAChBU,YAAY;YACVR,WAAW;gBAACS,SAAST,UAAUS,OAAO;YAAA;YACtCR;QACF;IACF;AAEJ"}