@sanity/cli 3.58.1-upgrade-vite-v5.8 → 3.58.1-upgrade-vite-v5.44

package/lib/_chunks-cjs/cli.js

@@ -1,5 +1,5 @@
 "use strict";
-var fs$r = require("node:fs"), os$6 = require("node:os"), path$t = require("node:path"), chalk$2 = require("chalk"), loadEnv = require("./loadEnv.js"), nodeMachineId = require("node-machine-id"), require$$0$4 = require("path"), require$$1$2 = require("module"), require$$0$5 = require("fs"), telemetry = require("@sanity/telemetry"), childProcess$2 = require("node:child_process"), fs$q = require("node:fs/promises"), util$b = require("node:util"), require$$0$6 = require("os"), require$$0$a = require("url"), require$$1$3 = require("get-it"), require$$2$1 = require("get-it/middleware"), require$$0$7 = require("constants"), require$$0$8 = require("stream"), require$$0$9 = require("util"), require$$5$1 = require("assert"), require$$3$1 = require("events"), require$$6$1 = require("http"), semver$2 = require("semver"), pkgDir = require("pkg-dir"), client$1 = require("@sanity/client"), require$$3$2 = require("crypto"), require$$0$b = require("child_process"), require$$0$c = require("fs/promises"), fs$s = require("@sanity/util/fs"), decompress = require("decompress"), validateNpmPackageName = require("validate-npm-package-name"), getCliConfig = require("./getCliConfig.js"), require$$0$d = require("buffer"), silverFleece = require("silver-fleece"), journeyConfig = require("./journeyConfig.js"), http$1 = require("node:http"), traverse = require("@babel/traverse"), process$2 = require("node:process"), require$$2$2 = require("readline"), require$$0$e = require("tty");
+var fs$r = require("node:fs"), os$6 = require("node:os"), path$t = require("node:path"), chalk$2 = require("chalk"), loadEnv = require("./loadEnv.js"), require$$0$4 = require("path"), require$$1$2 = require("module"), require$$0$5 = require("fs"), telemetry = require("@sanity/telemetry"), childProcess$2 = require("node:child_process"), fs$q = require("node:fs/promises"), util$b = require("node:util"), require$$0$6 = require("os"), require$$0$a = require("url"), require$$1$3 = require("get-it"), require$$2$1 = require("get-it/middleware"), require$$0$7 = require("constants"), require$$0$8 = require("stream"), require$$0$9 = require("util"), require$$5$1 = require("assert"), require$$3$1 = require("events"), require$$6$1 = require("http"), semver$2 = require("semver"), pkgDir = require("pkg-dir"), client$1 = require("@sanity/client"), require$$3$2 = require("crypto"), require$$0$b = require("child_process"), require$$0$c = require("fs/promises"), fs$s = require("@sanity/util/fs"), decompress = require("decompress"), validateNpmPackageName = require("validate-npm-package-name"), getCliConfig = require("./getCliConfig.js"), require$$0$d = require("buffer"), silverFleece = require("silver-fleece"), journeyConfig = require("./journeyConfig.js"), http$1 = require("node:http"), traverse = require("@babel/traverse"), process$2 = require("node:process"), require$$2$2 = require("readline"), require$$0$e = require("tty");
 function _interopDefaultCompat(e) {
   return e && typeof e == "object" && "default" in e ? e : { default: e };
 }
@@ -33240,6 +33240,17 @@ function requireLib$1() {
     syntaxPlugin
   }) {
     const hasMissingPlugin = reasonCode === "MissingPlugin" || reasonCode === "MissingOneOfPlugins";
+    {
+      const oldReasonCodes = {
+        AccessorCannotDeclareThisParameter: "AccesorCannotDeclareThisParameter",
+        AccessorCannotHaveTypeParameters: "AccesorCannotHaveTypeParameters",
+        ConstInitializerMustBeStringOrNumericLiteralOrLiteralEnumReference: "ConstInitiailizerMustBeStringOrNumericLiteralOrLiteralEnumReference",
+        SetAccessorCannotHaveOptionalParameter: "SetAccesorCannotHaveOptionalParameter",
+        SetAccessorCannotHaveRestParameter: "SetAccesorCannotHaveRestParameter",
+        SetAccessorCannotHaveReturnType: "SetAccesorCannotHaveReturnType"
+      };
+      oldReasonCodes[reasonCode] && (reasonCode = oldReasonCodes[reasonCode]);
+    }
     return function constructor(loc, details) {
       const error2 = new SyntaxError();
       return error2.code = code2, error2.reasonCode = reasonCode, error2.loc = loc, error2.pos = loc.index, error2.syntaxPlugin = syntaxPlugin, hasMissingPlugin && (error2.missingPlugin = details.missingPlugin), defineHidden(error2, "clone", function(overrides = {}) {
@@ -38029,12 +38040,12 @@ function requireLib$1() {
     AbstractPropertyHasInitializer: ({
       propertyName
     }) => `Property '${propertyName}' cannot have an initializer because it is marked abstract.`,
-    AccesorCannotDeclareThisParameter: "'get' and 'set' accessors cannot declare 'this' parameters.",
-    AccesorCannotHaveTypeParameters: "An accessor cannot have type parameters.",
     AccessorCannotBeOptional: "An 'accessor' property cannot be declared optional.",
+    AccessorCannotDeclareThisParameter: "'get' and 'set' accessors cannot declare 'this' parameters.",
+    AccessorCannotHaveTypeParameters: "An accessor cannot have type parameters.",
     ClassMethodHasDeclare: "Class methods cannot have the 'declare' modifier.",
     ClassMethodHasReadonly: "Class methods cannot have the 'readonly' modifier.",
-    ConstInitiailizerMustBeStringOrNumericLiteralOrLiteralEnumReference: "A 'const' initializer in an ambient context must be a string or numeric literal or literal enum reference.",
+    ConstInitializerMustBeStringOrNumericLiteralOrLiteralEnumReference: "A 'const' initializer in an ambient context must be a string or numeric literal or literal enum reference.",
     ConstructorHasTypeParameters: "Type parameters cannot appear on a constructor declaration.",
     DeclareAccessor: ({
       kind
@@ -38093,9 +38104,9 @@ function requireLib$1() {
     ReadonlyForMethodSignature: "'readonly' modifier can only appear on a property declaration or index signature.",
     ReservedArrowTypeParam: "This syntax is reserved in files with the .mts or .cts extension. Add a trailing comma, as in `<T,>() => ...`.",
     ReservedTypeAssertion: "This syntax is reserved in files with the .mts or .cts extension. Use an `as` expression instead.",
-    SetAccesorCannotHaveOptionalParameter: "A 'set' accessor cannot have an optional parameter.",
-    SetAccesorCannotHaveRestParameter: "A 'set' accessor cannot have rest parameter.",
-    SetAccesorCannotHaveReturnType: "A 'set' accessor cannot have a return type annotation.",
+    SetAccessorCannotHaveOptionalParameter: "A 'set' accessor cannot have an optional parameter.",
+    SetAccessorCannotHaveRestParameter: "A 'set' accessor cannot have rest parameter.",
+    SetAccessorCannotHaveReturnType: "A 'set' accessor cannot have a return type annotation.",
     SingleTypeParameterWithoutTrailingComma: ({
       typeParameterName
     }) => `Single type parameter ${typeParameterName} should have a trailing comma. Example usage: <${typeParameterName},>.`,
@@ -38170,10 +38181,13 @@ function requireLib$1() {
       return tokenIsIdentifier(this.state.type);
     }
     tsTokenCanFollowModifier() {
-      return (this.match(0) || this.match(5) || this.match(55) || this.match(21) || this.match(138) || this.isLiteralPropertyName()) && !this.hasPrecedingLineBreak();
+      return this.match(0) || this.match(5) || this.match(55) || this.match(21) || this.match(138) || this.isLiteralPropertyName();
+    }
+    tsNextTokenOnSameLineAndCanFollowModifier() {
+      return this.next(), this.hasPrecedingLineBreak() ? !1 : this.tsTokenCanFollowModifier();
     }
     tsNextTokenCanFollowModifier() {
-      return this.next(), this.tsTokenCanFollowModifier();
+      return this.match(106) ? (this.next(), this.tsTokenCanFollowModifier()) : this.tsNextTokenOnSameLineAndCanFollowModifier();
     }
     tsParseModifier(allowedModifiers, stopOnStartOfClassStaticBlock) {
       if (!tokenIsIdentifier(this.state.type) && this.state.type !== 58 && this.state.type !== 75)
@@ -38348,18 +38362,18 @@ function requireLib$1() {
       if (this.match(10) || this.match(47)) {
         readonly && this.raise(TSErrors.ReadonlyForMethodSignature, node);
         const method = nodeAny;
-        method.kind && this.match(47) && this.raise(TSErrors.AccesorCannotHaveTypeParameters, this.state.curPosition()), this.tsFillSignature(14, method), this.tsParseTypeMemberSemicolon();
+        method.kind && this.match(47) && this.raise(TSErrors.AccessorCannotHaveTypeParameters, this.state.curPosition()), this.tsFillSignature(14, method), this.tsParseTypeMemberSemicolon();
         const paramsKey = "parameters", returnTypeKey = "typeAnnotation";
         if (method.kind === "get")
-          method[paramsKey].length > 0 && (this.raise(Errors.BadGetterArity, this.state.curPosition()), this.isThisParam(method[paramsKey][0]) && this.raise(TSErrors.AccesorCannotDeclareThisParameter, this.state.curPosition()));
+          method[paramsKey].length > 0 && (this.raise(Errors.BadGetterArity, this.state.curPosition()), this.isThisParam(method[paramsKey][0]) && this.raise(TSErrors.AccessorCannotDeclareThisParameter, this.state.curPosition()));
         else if (method.kind === "set") {
           if (method[paramsKey].length !== 1)
             this.raise(Errors.BadSetterArity, this.state.curPosition());
           else {
             const firstParameter = method[paramsKey][0];
-            this.isThisParam(firstParameter) && this.raise(TSErrors.AccesorCannotDeclareThisParameter, this.state.curPosition()), firstParameter.type === "Identifier" && firstParameter.optional && this.raise(TSErrors.SetAccesorCannotHaveOptionalParameter, this.state.curPosition()), firstParameter.type === "RestElement" && this.raise(TSErrors.SetAccesorCannotHaveRestParameter, this.state.curPosition());
+            this.isThisParam(firstParameter) && this.raise(TSErrors.AccessorCannotDeclareThisParameter, this.state.curPosition()), firstParameter.type === "Identifier" && firstParameter.optional && this.raise(TSErrors.SetAccessorCannotHaveOptionalParameter, this.state.curPosition()), firstParameter.type === "RestElement" && this.raise(TSErrors.SetAccessorCannotHaveRestParameter, this.state.curPosition());
           }
-          method[returnTypeKey] && this.raise(TSErrors.SetAccesorCannotHaveReturnType, method[returnTypeKey]);
+          method[returnTypeKey] && this.raise(TSErrors.SetAccessorCannotHaveReturnType, method[returnTypeKey]);
         } else
           method.kind = "method";
         return this.finishNode(method, "TSMethodSignature");
@@ -38397,13 +38411,14 @@ function requireLib$1() {
     tsIsStartOfMappedType() {
       return this.next(), this.eat(53) ? this.isContextual(122) : (this.isContextual(122) && this.next(), !this.match(0) || (this.next(), !this.tsIsIdentifier()) ? !1 : (this.next(), this.match(58)));
     }
-    tsParseMappedTypeParameter() {
-      const node = this.startNode();
-      return node.name = this.tsParseTypeParameterName(), node.constraint = this.tsExpectThenParseType(58), this.finishNode(node, "TSTypeParameter");
-    }
     tsParseMappedType() {
       const node = this.startNode();
-      return this.expect(5), this.match(53) ? (node.readonly = this.state.value, this.next(), this.expectContextual(122)) : this.eatContextual(122) && (node.readonly = !0), this.expect(0), node.typeParameter = this.tsParseMappedTypeParameter(), node.nameType = this.eatContextual(93) ? this.tsParseType() : null, this.expect(3), this.match(53) ? (node.optional = this.state.value, this.next(), this.expect(17)) : this.eat(17) && (node.optional = !0), node.typeAnnotation = this.tsTryParseType(), this.semicolon(), this.expect(8), this.finishNode(node, "TSMappedType");
+      this.expect(5), this.match(53) ? (node.readonly = this.state.value, this.next(), this.expectContextual(122)) : this.eatContextual(122) && (node.readonly = !0), this.expect(0);
+      {
+        const typeParameter = this.startNode();
+        typeParameter.name = this.tsParseTypeParameterName(), typeParameter.constraint = this.tsExpectThenParseType(58), node.typeParameter = this.finishNode(typeParameter, "TSTypeParameter");
+      }
+      return node.nameType = this.eatContextual(93) ? this.tsParseType() : null, this.expect(3), this.match(53) ? (node.optional = this.state.value, this.next(), this.expect(17)) : this.eat(17) && (node.optional = !0), node.typeAnnotation = this.tsTryParseType(), this.semicolon(), this.expect(8), this.finishNode(node, "TSMappedType");
     }
     tsParseTupleType() {
       const node = this.startNode();
@@ -39081,7 +39096,7 @@ function requireLib$1() {
         id,
         init
       } of declaration.declarations)
-        init && (kind !== "const" || id.typeAnnotation ? this.raise(TSErrors.InitializerNotAllowedInAmbientContext, init) : isValidAmbientConstInitializer(init, this.hasPlugin("estree")) || this.raise(TSErrors.ConstInitiailizerMustBeStringOrNumericLiteralOrLiteralEnumReference, init));
+        init && (kind !== "const" || id.typeAnnotation ? this.raise(TSErrors.InitializerNotAllowedInAmbientContext, init) : isValidAmbientConstInitializer(init, this.hasPlugin("estree")) || this.raise(TSErrors.ConstInitializerMustBeStringOrNumericLiteralOrLiteralEnumReference, init));
       return declaration;
     }
     parseStatementContent(flags, decorators) {
@@ -44409,13 +44424,21 @@ ${chalk2.green("Success!")} Your Sanity configuration files has been added to th
       projectName: displayName || answers.projectName
     }
   }, shouldImport = !unattended && template.datasetUrl && await promptForDatasetImport(template.importPrompt);
-  trace.log({ step: "importTemplateDataset", selectedOption: shouldImport ? "yes" : "no" }), await bootstrapTemplate(templateOptions, context), apiClient({ api: { projectId } }).request({ uri: `/projects/${projectId}` }).then((project) => project?.metadata?.cliInitializedAt ? Promise.resolve() : apiClient({ api: { projectId } }).request({
-    method: "PATCH",
-    uri: `/projects/${projectId}`,
-    body: { metadata: { cliInitializedAt: (/* @__PURE__ */ new Date()).toISOString() } }
-  })).catch(() => {
-    loadEnv.debug("Failed to update cliInitializedAt metadata");
-  });
+  trace.log({ step: "importTemplateDataset", selectedOption: shouldImport ? "yes" : "no" });
+  const [_2, bootstrapPromise] = await Promise.allSettled([
+    // record template files attempted to be created locally
+    apiClient({ api: { projectId } }).request({ uri: `/projects/${projectId}` }).then((project) => project?.metadata?.cliInitializedAt ? Promise.resolve() : apiClient({ api: { projectId } }).request({
+      method: "PATCH",
+      uri: `/projects/${projectId}`,
+      body: { metadata: { cliInitializedAt: (/* @__PURE__ */ new Date()).toISOString() } }
+    })).catch(() => {
+      loadEnv.debug("Failed to update cliInitializedAt metadata");
+    }),
+    // Bootstrap Sanity, creating required project files, manifests etc
+    bootstrapTemplate(templateOptions, context)
+  ]);
+  if (bootstrapPromise.status === "rejected" && bootstrapPromise.reason instanceof Error)
+    throw bootstrapPromise.reason;
   let pkgManager;
   if (packageManager && ALLOWED_PACKAGE_MANAGERS.includes(packageManager) ? pkgManager = packageManager : (pkgManager = (await getPackageManagerChoice(outputPath, {
     prompt: prompt2,
@@ -45080,9 +45103,9 @@ Examples
       requireUser: !0,
       requireProject: !1
     }).projects.list(), ordered = lodashExports.sortBy(
-      projects.map(({ displayName, id, members = [], studioHost = "", createdAt }) => {
-        const studio = studioHost ? `https://${studioHost}.sanity.studio` : "Not deployed";
-        return [id, members.length, displayName, studio, createdAt].map(String);
+      projects.map(({ displayName, id, members = [], createdAt }) => {
+        const manage = `https://www.sanity.io/manage/project/${id}`;
+        return [id, members.length, displayName, manage, createdAt].map(String);
       }),
       [headings.indexOf(flags.sort)]
     ), rows = flags.order === "asc" ? ordered : ordered.reverse(), maxWidths = rows.reduce(
@@ -70290,7 +70313,6 @@ async function runCli(cliRoot, { cliVersion }) {
       Promise.race([wait(2e3), flushTelemetry()])
     )
   ), telemetry2.updateUserProperties({
-    deviceId: await nodeMachineId.machineId(),
     runtimeVersion: process.version,
     runtime: detectRuntime(),
     cliVersion: pkg.version,