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

package/lib/_chunks-cjs/cli.js

@@ -53468,7 +53468,7 @@ ${err.message}`);
   const isAppTemplate = cliFlags.template ? determineAppTemplate(cliFlags.template) : !1;
   let introMessage = "Fetching existing projects";
   cliFlags.quickstart && (introMessage = "Eject your existing project's Sanity configuration"), isAppTemplate || (success(introMessage), print(""));
-  const flags = await prepareFlags(), { projectId, displayName, isFirstProject, datasetName, schemaUrl, organizationId } = await getProjectDetails(), sluggedName = lodashExports.deburr(displayName.toLowerCase()).replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, "");
+  const isNextJs = detectedFramework?.slug === "nextjs", flags = await prepareFlags(), { projectId, displayName, isFirstProject, datasetName, schemaUrl, organizationId } = await getProjectDetails(), sluggedName = lodashExports.deburr(displayName.toLowerCase()).replace(/\s+/g, "-").replace(/[^a-z0-9-]/g, "");
   if (bareOutput) {
     success("Below are your project details"), print(""), print(`Project ID: ${chalk2.cyan(projectId)}`), print(`Dataset: ${chalk2.cyan(datasetName)}`), print(
       `
@@ -53478,8 +53478,7 @@ You can find your project on Sanity Manage \u2014 https://www.sanity.io/manage/p
     return;
   }
   let initNext = !1;
-  const isNextJs = detectedFramework?.slug === "nextjs";
-  isNextJs && (initNext = await prompt2.single({
+  isNextJs && (initNext = unattended || await prompt2.single({
     type: "confirm",
     message: "Would you like to add configuration files for a Sanity project in this Next.js folder?",
     default: !0
@@ -53663,7 +53662,7 @@ ${chalk2.green("Success!")} Now, use this command to continue:
 `
   )) : (print(`
 ${chalk2.green("Success!")} Now, use these commands to continue:
-`), print(`First: ${chalk2.cyan(`cd ${outputPath}`)} - to enter project\u2019s directory`), print(
+`), print(`First: ${chalk2.cyan(`cd ${outputPath}`)} - to enter project's directory`), print(
     `Then: ${chalk2.cyan(devCommand)} -to run ${isAppTemplate ? "your Sanity application" : "Sanity Studio"}
 `
   )), print("Other helpful commands"), print("npx sanity docs - to open the documentation in a browser"), print("npx sanity manage - to open the project settings in a browser"), print("npx sanity help - to explore the CLI manual");
@@ -53692,13 +53691,19 @@ ${chalk2.green("Success!")} Now, use these commands to continue:
       }), data;
     }
     if (isAppTemplate) {
-      const organizations = await apiClient({ requireUser: !0, requireProject: !1 }).request({ uri: "/organizations" });
+      const organizations = await apiClient({ requireUser: !0, requireProject: !1 }).request({
+        uri: "/organizations",
+        query: {
+          includeMembers: "true",
+          includeImplicitMemberships: "true"
+        }
+      });
       return {
         projectId: "",
         displayName: "",
         datasetName: "",
         isFirstProject: !1,
-        organizationId: await getOrganizationId(organizations)
+        organizationId: await getOrganizationIdForAppTemplate(organizations)
       };
     }
     loadEnv.debug("Prompting user to select or create a project");
@@ -53985,13 +53990,16 @@ The default dataset configuration has a public dataset named "production".`;
       throw new Error("Please specify a project name (`--create-project <name>`)");
     if (typeof createProjectName == "string" && createProjectName.trim().length === 0)
       throw new Error("Please specify a project name (`--create-project <name>`)");
-    if (unattended && (loadEnv.debug("Unattended mode, validating required options"), ["dataset", "output-path"].forEach((flag) => {
-      if (!cliFlags[flag])
-        throw new Error(`\`--${flag}\` must be specified in unattended mode`);
-    }), !cliFlags.project && !createProjectName))
-      throw new Error(
-        "`--project <id>` or `--create-project <name>` must be specified in unattended mode"
-      );
+    if (unattended) {
+      if (loadEnv.debug("Unattended mode, validating required options"), !cliFlags.dataset)
+        throw new Error("`--dataset` must be specified in unattended mode");
+      if (!isNextJs && !cliFlags["output-path"])
+        throw new Error("`--output-path` must be specified in unattended mode");
+      if (!cliFlags.project && !createProjectName)
+        throw new Error(
+          "`--project <id>` or `--create-project <name>` must be specified in unattended mode"
+        );
+    }
     if (createProjectName) {
       loadEnv.debug("--create-project specified, creating a new project");
       const createdProject = await createProject(apiClient, {
@@ -54025,6 +54033,23 @@ The default dataset configuration has a public dataset named "production".`;
     });
     return spinner.succeed(), organization;
   }
+  async function getOrganizationIdForAppTemplate(organizations) {
+    const organizationChoices = [
+      ...organizations.map((organization) => ({
+        value: organization.id,
+        name: `${organization.name} [${organization.id}]`
+      })),
+      new prompt2.Separator(),
+      { value: "-new-", name: "Create new organization" },
+      new prompt2.Separator()
+    ], defaultOrganizationId = organizations.length === 1 ? organizations[0].id : organizations.find((org) => org.name === user?.name)?.id, chosenOrg = await prompt2.single({
+      message: "Select organization:",
+      type: "list",
+      default: defaultOrganizationId || void 0,
+      choices: organizationChoices
+    });
+    return chosenOrg === "-new-" ? createOrganization().then((org) => org.id) : chosenOrg || void 0;
+  }
   async function getOrganizationId(organizations) {
     if (unattended || flags.organization)
       return flags.organization || void 0;
@@ -54051,18 +54076,25 @@ The default dataset configuration has a public dataset named "production".`;
     return chosenOrg === "-new-" ? createOrganization().then((org) => org.id) : chosenOrg || void 0;
   }
   async function hasProjectAttachGrant(orgId) {
-    const requiredGrantGroup = "sanity.organization.projects", requiredGrant = "attach";
-    return ((await apiClient({ requireProject: !1, requireUser: !0 }).clone().config({ apiVersion: "v2021-06-07" }).request({ uri: `organizations/${orgId}/grants` }))[requiredGrantGroup] || []).some(
-      (resource) => resource.grants && resource.grants.some((grant) => grant.name === requiredGrant)
-    );
+    const requiredGrantGroup = "sanity.organization.projects", requiredGrant = "attach", client2 = apiClient({ requireProject: !1, requireUser: !0 }).clone().config({ apiVersion: "v2021-06-07" });
+    try {
+      return ((await client2.request({ uri: `organizations/${orgId}/grants` }))[requiredGrantGroup] || []).some(
+        (resource) => resource.grants && resource.grants.some((grant) => grant.name === requiredGrant)
+      );
+    } catch (err) {
+      return err.statusCode === 401 ? (loadEnv.debug("No access to organization %s (401)", orgId), !1) : (loadEnv.debug("Error checking grants for organization %s: %s", orgId, err.message), !1);
+    }
   }
   function getOrganizationsWithAttachGrantInfo(organizations) {
     return pMap(
       organizations,
-      async (organization) => ({
-        hasAttachGrant: await hasProjectAttachGrant(organization.id),
-        organization
-      }),
+      async (organization) => {
+        try {
+          return { hasAttachGrant: await hasProjectAttachGrant(organization.id), organization };
+        } catch (err) {
+          return loadEnv.debug("Error checking grants for organization %s: %s", organization.id, err.message), { hasAttachGrant: !1, organization };
+        }
+      },
       { concurrency: 3 }
     );
   }
@@ -79523,9 +79555,11 @@ async function runCli(cliRoot, { cliVersion }) {
   } catch (err) {
     console.error(chalk__default.default.red(err.message)), process.exit(1);
   }
-  loadAndSetEnvFromDotEnvFiles({ workDir, cmd: args.groupOrCommand }), maybeFixMissingWindowsEnvVar(), await runUpdateCheck({ pkg, cwd, workDir }).notify(), telemetryDisclosure(), loadEnv.debug(`Reading CLI config from "${workDir}"`);
-  const cliConfig = await getCliConfig.getCliConfig(workDir, { forked: !0 });
+  await runUpdateCheck({ pkg, cwd, workDir }).notify(), telemetryDisclosure(), loadEnv.debug(`Reading CLI config from "${workDir}"`);
+  let cliConfig = await getCliConfig.getCliConfig(workDir, { forked: !0 });
   cliConfig || loadEnv.debug("No CLI config found");
+  const isApp = !!(cliConfig && "app" in cliConfig);
+  loadAndSetEnvFromDotEnvFiles({ workDir, cmd: args.groupOrCommand, isApp }), maybeFixMissingWindowsEnvVar(), cliConfig = await getCliConfig.getCliConfig(workDir, { forked: !0 });
   const { logger: telemetry2, flush: flushTelemetry } = createTelemetryStore({
     projectId: cliConfig?.config?.api?.projectId,
     env: process.env
@@ -79649,7 +79683,11 @@ function warnOnNonProductionEnvironment() {
     )
   );
 }
-function loadAndSetEnvFromDotEnvFiles({ workDir, cmd }) {
+function loadAndSetEnvFromDotEnvFiles({
+  workDir,
+  cmd,
+  isApp
+}) {
   if (fs$1.existsSync(path__default.default.join(workDir, "sanity.json"))) {
     loadEnv.debug("sanity.json exists, assuming v2 project and loading .env files using old behavior");
     const env = process.env.SANITY_ACTIVE_ENV || process.env.NODE_ENV || "development";
@@ -79661,7 +79699,7 @@ function loadAndSetEnvFromDotEnvFiles({ workDir, cmd }) {
   let mode2 = process.env.SANITY_ACTIVE_ENV;
   !mode2 && (isProdCmd || process.env.NODE_ENV === "production") ? mode2 = "production" : mode2 || (mode2 = "development"), mode2 === "production" && !isProdCmd && console.warn(chalk__default.default.yellow(`[WARN] Running in ${sanityEnv} environment mode
 `)), loadEnv.debug("Loading environment files using %s mode", mode2);
-  const studioEnv = loadEnv.loadEnv(mode2, workDir, ["SANITY_STUDIO_"]);
+  const studioEnv = loadEnv.loadEnv(mode2, workDir, [isApp ? "SANITY_APP_" : "SANITY_STUDIO_"]);
   process.env = { ...process.env, ...studioEnv };
 }
 function maybeFixMissingWindowsEnvVar() {