sanity 3.77.3-server-side-schemas.16 → 3.77.3-server-side-schemas.21

package/lib/_chunks-cjs/_internal.js

@@ -166,16 +166,24 @@ async function schemaListAction(args, context) {
     output.error("Project ID and dataset must be defined.");
     return;
   }
-  const manifestDir = flags["manifest-dir"], manifestPath = getManifestPath(context, manifestDir), manifest = await readManifest(manifestPath, context), schemas = (await Promise.allSettled(uniqBy__default.default(manifest.workspaces, "dataset").map(async (workspace) => (throwIfProjectIdMismatch(workspace, projectId), flags.id ? await client.withConfig({
-    dataset: workspace.dataset,
-    projectId: workspace.projectId
-  }).getDocument(flags.id) : await client.withConfig({
-    dataset: workspace.dataset,
-    projectId: workspace.projectId,
-    useCdn: !1
-  }).fetch("*[_type == $type]", {
-    type: SANITY_WORKSPACE_SCHEMA_TYPE
-  }))))).map((result, index) => {
+  const manifestDir = flags["manifest-dir"], manifestPath = getManifestPath(context, manifestDir), manifest = await readManifest(manifestPath, context), schemas = (await Promise.allSettled(uniqBy__default.default(manifest.workspaces, "dataset").map(async (workspace) => {
+    if (throwIfProjectIdMismatch(workspace, projectId), flags.id) {
+      const schemaRes = await client.withConfig({
+        dataset: workspace.dataset,
+        projectId: workspace.projectId
+      }).getDocument(flags.id);
+      if (!schemaRes)
+        throw new Error(`Schema "${flags.id}" not found in dataset "${workspace.dataset}"`);
+      return schemaRes;
+    }
+    return await client.withConfig({
+      dataset: workspace.dataset,
+      projectId: workspace.projectId,
+      useCdn: !1
+    }).fetch("*[_type == $type]", {
+      type: SANITY_WORKSPACE_SCHEMA_TYPE
+    });
+  }))).map((result, index) => {
     if (result.status === "rejected") {
       const workspace = manifest.workspaces[index];
       return output.error(chalk__default.default.red(`Failed to fetch schemas for workspace '${workspace.name}': ${result.reason.message}`)), [];
@@ -201,14 +209,13 @@ const FEATURE_ENABLED_ENV_NAME = "SANITY_CLI_SCHEMA_STORE_ENABLED", SCHEMA_STORE
   return path__default.default.resolve(process.cwd(), staticPath);
 }, readAndParseManifest = (manifestPath, context) => {
   const content = fs$1.readFileSync(manifestPath, "utf-8"), lastModified = fs$1.statSync(manifestPath).mtime.toISOString();
-  return context.output.print(chalk__default.default.gray(`
-\u21B3 Read manifest from ${manifestPath} (last modified: ${lastModified})`)), JSON.parse(content);
-}, readManifest = async (readPath, context, spinner) => {
+  return context.output.print(chalk__default.default.gray(`\u21B3 Read manifest from ${manifestPath} (last modified: ${lastModified})`)), JSON.parse(content);
+}, readManifest = async (readPath, context) => {
   const manifestPath = `${readPath}/${MANIFEST_FILENAME}`;
   try {
     return readAndParseManifest(manifestPath, context);
   } catch {
-    spinner.text = "Manifest not found, attempting to extract it...", await extractManifestSafe({
+    await extractManifestSafe({
       extOptions: {
         path: readPath
       },
@@ -221,7 +228,7 @@ const FEATURE_ENABLED_ENV_NAME = "SANITY_CLI_SCHEMA_STORE_ENABLED", SCHEMA_STORE
       return readAndParseManifest(manifestPath, context);
     } catch (retryError) {
       const errorMessage = `Failed to read manifest at ${manifestPath}`;
-      throw spinner?.fail(errorMessage), context.output.error(errorMessage), retryError;
+      throw context.output.error(errorMessage), retryError;
     }
   }
 }, throwIfProjectIdMismatch = (workspace, projectId) => {
@@ -238,7 +245,7 @@ async function storeSchemasAction(args, context) {
   const {
     output,
     apiClient
-  } = context, spinner = output.spinner({}).start("Storing schemas"), manifestPath = getManifestPath(context, manifestDir);
+  } = context, manifestPath = getManifestPath(context, manifestDir);
   try {
     const client = apiClient({
       requireUser: !0,
@@ -247,7 +254,7 @@ async function storeSchemasAction(args, context) {
       apiVersion: "v2024-08-01"
     }), projectId = client.config().projectId;
     if (!projectId) throw new Error("Project ID is not defined");
-    const manifest = await readManifest(manifestPath, context, spinner);
+    const manifest = await readManifest(manifestPath, context);
     let storedCount = 0, error;
     const saveSchema = async (workspace) => {
       const id = `${idPrefix ? `${idPrefix}.` : ""}${SANITY_WORKSPACE_SCHEMA_TYPE}.${workspace.name}`;
@@ -262,9 +269,9 @@ async function storeSchemasAction(args, context) {
           _id: id,
           workspace,
           schema
-        }).commit(), storedCount++, spinner.text = `Stored ${storedCount} schemas so far...`, verbose && spinner.succeed(`Schema stored for workspace '${workspace.name}'`);
+        }).commit(), storedCount++;
       } catch (err) {
-        if (error = err, spinner.fail(`Error storing schema for workspace '${workspace.name}':
+        if (error = err, output.error(`Error storing schema for workspace '${workspace.name}':
 ${chalk__default.default.red(`${err.message}`)}`), schemaRequired) throw err;
       } finally {
         verbose && output.print(chalk__default.default.gray(`\u21B3 schemaId: ${id}, projectId: ${projectId}, dataset: ${workspace.dataset}`));
@@ -273,12 +280,12 @@ ${chalk__default.default.red(`${err.message}`)}`), schemaRequired) throw err;
     if (workspaceName) {
       const workspaceToSave = manifest.workspaces.find((workspace) => workspace.name === workspaceName);
       if (!workspaceToSave)
-        throw spinner.fail(`Workspace ${workspaceName} not found in manifest`), new Error(`Workspace ${workspaceName} not found in manifest: projectID: ${projectId}`);
-      await saveSchema(workspaceToSave), spinner.succeed("Stored 1 schemas");
+        throw output.error(`Workspace ${workspaceName} not found in manifest`), new Error(`Workspace ${workspaceName} not found in manifest: projectID: ${projectId}`);
+      await saveSchema(workspaceToSave), output.success("Stored 1 schemas");
     } else
       await Promise.all(manifest.workspaces.map(async (workspace) => {
         await saveSchema(workspace);
-      })), spinner.succeed(`Stored ${storedCount}/${manifest.workspaces.length} schemas`);
+      })), output.success(`Stored ${storedCount}/${manifest.workspaces.length} schemas`);
     if (error) throw error;
     return;
   } catch (err) {