@sanity/cli 3.92.1-next.41.f6367213ff → 3.92.1-next.42.40eccef023

package/codemods/partsTypeDirective.js

@@ -1,3 +1,4 @@
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 const path = require('node:path')
 
 partsTypeDirective.parser = 'tsx'
@@ -13,7 +14,6 @@ function partsTypeDirective(fileInfo, api) {
     return fileInfo.source
   }
   const partImports = root.find(api.jscodeshift.ImportDeclaration, (node) =>
-    // eslint-disable-next-line no-use-before-define
     isSanityPart(node.source.value),
   )
   if (partImports.length === 0) {
@@ -21,7 +21,6 @@ function partsTypeDirective(fileInfo, api) {
   }
 
   const existingDirectives = root.find(api.jscodeshift.Comment, (node) =>
-    // eslint-disable-next-line no-use-before-define
     isSanityTypesReferenceDirective(node),
   )
   if (existingDirectives.length > 0) {

package/lib/_chunks-cjs/cli.js

@@ -7516,8 +7516,8 @@ function getClientWrapper(cliApiConfig, configPath) {
   const requester = client$1.requester.clone();
   return requester.use(authErrors()), function(opts) {
     const sanityEnv2 = process.env.SANITY_INTERNAL_ENV || "production", { requireUser, requireProject, api } = { ...defaults$1, ...opts }, token2 = getCliToken(), apiHost = apiHosts[sanityEnv2], apiConfig = {
-      ...cliApiConfig || {},
-      ...api || {}
+      ...cliApiConfig,
+      ...api
     };
     if (apiHost && (apiConfig.apiHost = apiHost), requireUser && !token2)
       throw new Error('You must login first - run "sanity login"');
@@ -38175,9 +38175,6 @@ function requireLib$1() {
     }) => `\`${exportName}\` has already been exported. Exported identifiers must be unique.`,
     DuplicateProto: "Redefinition of __proto__ property.",
     DuplicateRegExpFlags: "Duplicate regular expression flag.",
-    DynamicImportPhaseRequiresImportExpressions: ({
-      phase
-    }) => `'import.${phase}(...)' can only be parsed when using the 'createImportExpressions' option.`,
     ElementAfterRest: "Rest element must be last element.",
     EscapedCharNotAnIdentifier: "Invalid Unicode escape.",
     ExportBindingIsString: ({
@@ -38328,7 +38325,7 @@ function requireLib$1() {
       unexpected
     }) => `Unexpected token${unexpected ? ` '${unexpected}'.` : ""}${expected ? `, expected "${expected}"` : ""}`,
     UnexpectedTokenUnaryExponentiation: "Illegal expression. Wrap left hand side or entire exponentiation in parentheses.",
-    UnexpectedUsingDeclaration: "Using declaration cannot appear in the top level when source type is `script`.",
+    UnexpectedUsingDeclaration: "Using declaration cannot appear in the top level when source type is `script` or in the bare case statement.",
     UnsupportedBind: "Binding should be performed on object property.",
     UnsupportedDecoratorExport: "A decorated export must export a class declaration.",
     UnsupportedDefaultExport: "Only expressions, functions or classes are allowed as the `default` export.",
@@ -38365,6 +38362,11 @@ function requireLib$1() {
     StrictNumericEscape: "The only valid numeric escape in strict mode is '\\0'.",
     StrictOctalLiteral: "Legacy octal literals are not allowed in strict mode.",
     StrictWith: "'with' in strict mode."
+  }, ParseExpressionErrors = {
+    ParseExpressionEmptyInput: "Unexpected parseExpression() input: The input is empty or contains only comments.",
+    ParseExpressionExpectsEOF: ({
+      unexpected
+    }) => `Unexpected parseExpression() input: The input should contain exactly one expression, but the first expression is followed by the unexpected character \`${String.fromCodePoint(unexpected)}\`.`
   };
   const UnparenthesizedPipeBodyDescriptions = /* @__PURE__ */ new Set(["ArrowFunctionExpression", "AssignmentExpression", "ConditionalExpression", "YieldExpression"]);
   var PipelineOperatorErrors = Object.assign({
@@ -38461,7 +38463,7 @@ function requireLib$1() {
     }
     return ParseErrorConstructors;
   }
-  const Errors = Object.assign({}, ParseErrorEnum(ModuleErrors), ParseErrorEnum(StandardErrors), ParseErrorEnum(StrictModeErrors), ParseErrorEnum`pipelineOperator`(PipelineOperatorErrors));
+  const Errors = Object.assign({}, ParseErrorEnum(ModuleErrors), ParseErrorEnum(StandardErrors), ParseErrorEnum(StrictModeErrors), ParseErrorEnum(ParseExpressionErrors), ParseErrorEnum`pipelineOperator`(PipelineOperatorErrors));
   function createDefaultOptions() {
     return {
       sourceType: "script",
@@ -39334,13 +39336,16 @@ function requireLib$1() {
         } = this.scopeStack[i];
         if (flags & 128)
           return !0;
-        if (flags & 451)
+        if (flags & 707)
           return !1;
       }
     }
     get inNonArrowFunction() {
       return (this.currentThisScopeFlags() & 2) > 0;
     }
+    get inBareCaseStatement() {
+      return (this.currentScope().flags & 256) > 0;
+    }
     get treatFunctionsAsVar() {
       return this.treatFunctionsAsVarInScope(this.currentScope());
     }
@@ -39363,7 +39368,7 @@ function requireLib$1() {
         let type2 = scope2.names.get(name) || 0;
         bindingType & 16 ? type2 = type2 | 4 : (scope2.firstLexicalName || (scope2.firstLexicalName = name), type2 = type2 | 2), scope2.names.set(name, type2), bindingType & 8 && this.maybeExportDefined(scope2, name);
       } else if (bindingType & 4)
-        for (let i = this.scopeStack.length - 1; i >= 0 && (scope2 = this.scopeStack[i], this.checkRedeclarationInScope(scope2, name, bindingType, loc), scope2.names.set(name, (scope2.names.get(name) || 0) | 1), this.maybeExportDefined(scope2, name), !(scope2.flags & 387)); --i)
+        for (let i = this.scopeStack.length - 1; i >= 0 && (scope2 = this.scopeStack[i], this.checkRedeclarationInScope(scope2, name, bindingType, loc), scope2.names.set(name, (scope2.names.get(name) || 0) | 1), this.maybeExportDefined(scope2, name), !(scope2.flags & 643)); --i)
           ;
       this.parser.inModule && scope2.flags & 1 && this.undefinedExports.delete(name);
     }
@@ -39396,7 +39401,7 @@ function requireLib$1() {
         const {
           flags
         } = this.scopeStack[i];
-        if (flags & 387)
+        if (flags & 643)
           return flags;
       }
     }
@@ -39405,7 +39410,7 @@ function requireLib$1() {
         const {
           flags
         } = this.scopeStack[i];
-        if (flags & 451 && !(flags & 4))
+        if (flags & 707 && !(flags & 4))
           return flags;
       }
     }
@@ -41408,11 +41413,11 @@ function requireLib$1() {
       return this.importsStack.push(/* @__PURE__ */ new Set()), new TypeScriptScope(flags);
     }
     enter(flags) {
-      flags === 256 && this.importsStack.push(/* @__PURE__ */ new Set()), super.enter(flags);
+      flags === 512 && this.importsStack.push(/* @__PURE__ */ new Set()), super.enter(flags);
     }
     exit() {
       const flags = super.exit();
-      return flags === 256 && this.importsStack.pop(), flags;
+      return flags === 512 && this.importsStack.pop(), flags;
     }
     hasImport(name, allowShadow) {
       const len = this.importsStack.length;
@@ -41567,6 +41572,7 @@ function requireLib$1() {
       }
     }
     finalizeComment(commentWS) {
+      var _node$options;
       const {
         comments: comments2
       } = commentWS;
@@ -41588,6 +41594,9 @@ function requireLib$1() {
             case "OptionalCallExpression":
               adjustInnerComments(node, node.arguments, commentWS);
               break;
+            case "ImportExpression":
+              adjustInnerComments(node, [node.source, (_node$options = node.options) != null ? _node$options : null], commentWS);
+              break;
             case "FunctionDeclaration":
             case "FunctionExpression":
             case "ArrowFunctionExpression":
@@ -41636,14 +41645,6 @@ function requireLib$1() {
       const commentWS = commentStack[length - 1];
       commentWS.leadingNode === node && (commentWS.leadingNode = null);
     }
-    resetPreviousIdentifierLeadingComments(node) {
-      const {
-        commentStack
-      } = this.state, {
-        length
-      } = commentStack;
-      length !== 0 && (commentStack[length - 1].trailingNode === node ? commentStack[length - 1].trailingNode = null : length >= 2 && commentStack[length - 2].trailingNode === node && (commentStack[length - 2].trailingNode = null));
-    }
     takeSurroundingComments(node, start, end) {
       const {
         commentStack
@@ -43337,7 +43338,7 @@ function requireLib$1() {
     DeclareFunctionHasImplementation: "An implementation cannot be declared in ambient contexts.",
     DuplicateAccessibilityModifier: ({
       modifier
-    }) => "Accessibility modifier already seen.",
+    }) => `Accessibility modifier already seen: '${modifier}'.`,
     DuplicateModifier: ({
       modifier
     }) => `Duplicate modifier: '${modifier}'.`,
@@ -43363,6 +43364,7 @@ function requireLib$1() {
     InvalidHeritageClauseType: ({
       token: token2
     }) => `'${token2}' list can only include identifiers or qualified-names with optional type arguments.`,
+    InvalidModifierOnAwaitUsingDeclaration: (modifier) => `'${modifier}' modifier cannot appear on an await using declaration.`,
     InvalidModifierOnTypeMember: ({
       modifier
     }) => `'${modifier}' modifier cannot appear on a type member.`,
@@ -43372,6 +43374,7 @@ function requireLib$1() {
     InvalidModifierOnTypeParameterPositions: ({
       modifier
     }) => `'${modifier}' modifier can only appear on a type parameter of a class, interface or type alias.`,
+    InvalidModifierOnUsingDeclaration: (modifier) => `'${modifier}' modifier cannot appear on a using declaration.`,
     InvalidModifiersOrder: ({
       orderedModifiers
     }) => `'${orderedModifiers[0]}' modifier must precede '${orderedModifiers[1]}' modifier.`,
@@ -43379,7 +43382,7 @@ function requireLib$1() {
     InvalidTupleMemberLabel: "Tuple members must be labeled with a simple identifier.",
     MissingInterfaceName: "'interface' declarations must be followed by an identifier.",
     NonAbstractClassHasAbstractMethod: "Abstract methods can only appear within an abstract class.",
-    NonClassMethodPropertyHasAbstractModifer: "'abstract' modifier can only appear on a class, method, or property declaration.",
+    NonClassMethodPropertyHasAbstractModifier: "'abstract' modifier can only appear on a class, method, or property declaration.",
     OptionalTypeBeforeRequired: "A required element cannot follow an optional element.",
     OverrideNotInSubClass: "This member cannot have an 'override' modifier because its containing class does not extend another class.",
     PatternIsOptional: "A binding pattern parameter cannot be optional in an implementation signature.",
@@ -43475,12 +43478,12 @@ function requireLib$1() {
     tsNextTokenCanFollowModifier() {
       return this.match(106) ? (this.next(), this.tsTokenCanFollowModifier()) : this.tsNextTokenOnSameLineAndCanFollowModifier();
     }
-    tsParseModifier(allowedModifiers, stopOnStartOfClassStaticBlock) {
+    tsParseModifier(allowedModifiers, stopOnStartOfClassStaticBlock, hasSeenStaticModifier) {
       if (!tokenIsIdentifier(this.state.type) && this.state.type !== 58 && this.state.type !== 75)
         return;
       const modifier = this.state.value;
       if (allowedModifiers.includes(modifier)) {
-        if (stopOnStartOfClassStaticBlock && this.tsIsStartOfStaticBlocks())
+        if (hasSeenStaticModifier && this.match(106) || stopOnStartOfClassStaticBlock && this.tsIsStartOfStaticBlocks())
           return;
         if (this.tsTryParse(this.tsNextTokenCanFollowModifier.bind(this)))
           return modifier;
@@ -43504,7 +43507,7 @@ function requireLib$1() {
       for (; ; ) {
         const {
           startLoc
-        } = this.state, modifier = this.tsParseModifier(allowedModifiers.concat(disallowedModifiers ?? []), stopOnStartOfClassStaticBlock);
+        } = this.state, modifier = this.tsParseModifier(allowedModifiers.concat(disallowedModifiers ?? []), stopOnStartOfClassStaticBlock, modified.static);
         if (!modifier) break;
         tsIsAccessModifier(modifier) ? modified.accessibility ? this.raise(TSErrors.DuplicateAccessibilityModifier, startLoc, {
           modifier
@@ -44094,11 +44097,11 @@ function requireLib$1() {
         const inner = this.startNode();
         this.tsParseModuleOrNamespaceDeclaration(inner, !0), node.body = inner;
       } else
-        this.scope.enter(256), this.prodParam.enter(0), node.body = this.tsParseModuleBlock(), this.prodParam.exit(), this.scope.exit();
+        this.scope.enter(512), this.prodParam.enter(0), node.body = this.tsParseModuleBlock(), this.prodParam.exit(), this.scope.exit();
       return this.finishNode(node, "TSModuleDeclaration");
     }
     tsParseAmbientExternalModuleDeclaration(node) {
-      return this.isContextual(112) ? (node.kind = "global", node.global = !0, node.id = this.parseIdentifier()) : this.match(134) ? (node.kind = "module", node.id = super.parseStringLiteral(this.state.value)) : this.unexpected(), this.match(5) ? (this.scope.enter(256), this.prodParam.enter(0), node.body = this.tsParseModuleBlock(), this.prodParam.exit(), this.scope.exit()) : this.semicolon(), this.finishNode(node, "TSModuleDeclaration");
+      return this.isContextual(112) ? (node.kind = "global", node.global = !0, node.id = this.parseIdentifier()) : this.match(134) ? (node.kind = "module", node.id = super.parseStringLiteral(this.state.value)) : this.unexpected(), this.match(5) ? (this.scope.enter(512), this.prodParam.enter(0), node.body = this.tsParseModuleBlock(), this.prodParam.exit(), this.scope.exit()) : this.semicolon(), this.finishNode(node, "TSModuleDeclaration");
     }
     tsParseImportEqualsDeclaration(node, maybeDefaultIdentifier, isExport) {
       node.isExport = isExport || !1, node.id = maybeDefaultIdentifier || this.parseIdentifier(), this.checkIdentifier(node.id, 4096), this.expect(29);
@@ -44130,37 +44133,48 @@ function requireLib$1() {
         return result;
       this.state = state;
     }
-    tsTryParseDeclare(nany) {
+    tsTryParseDeclare(node) {
       if (this.isLineTerminator())
         return;
-      let startType = this.state.type, kind;
-      return this.isContextual(100) && (startType = 74, kind = "let"), this.tsInAmbientContext(() => {
+      const startType = this.state.type;
+      return this.tsInAmbientContext(() => {
         switch (startType) {
           case 68:
-            return nany.declare = !0, super.parseFunctionStatement(nany, !1, !1);
+            return node.declare = !0, super.parseFunctionStatement(node, !1, !1);
           case 80:
-            return nany.declare = !0, this.parseClass(nany, !0, !1);
+            return node.declare = !0, this.parseClass(node, !0, !1);
           case 126:
-            return this.tsParseEnumDeclaration(nany, {
+            return this.tsParseEnumDeclaration(node, {
               declare: !0
             });
           case 112:
-            return this.tsParseAmbientExternalModuleDeclaration(nany);
+            return this.tsParseAmbientExternalModuleDeclaration(node);
+          case 100:
+            if (this.state.containsEsc)
+              return;
           case 75:
           case 74:
-            return !this.match(75) || !this.isLookaheadContextual("enum") ? (nany.declare = !0, this.parseVarStatement(nany, kind || this.state.value, !0)) : (this.expect(75), this.tsParseEnumDeclaration(nany, {
+            return !this.match(75) || !this.isLookaheadContextual("enum") ? (node.declare = !0, this.parseVarStatement(node, this.state.value, !0)) : (this.expect(75), this.tsParseEnumDeclaration(node, {
               const: !0,
               declare: !0
             }));
+          case 107:
+            if (this.hasPlugin("explicitResourceManagement") && this.isUsing())
+              return this.raise(TSErrors.InvalidModifierOnUsingDeclaration, this.state.startLoc, "declare"), node.declare = !0, this.parseVarStatement(node, "using", !0);
+            break;
+          case 96:
+            if (this.hasPlugin("explicitResourceManagement") && this.isAwaitUsing())
+              return this.raise(TSErrors.InvalidModifierOnAwaitUsingDeclaration, this.state.startLoc, "declare"), node.declare = !0, this.next(), this.parseVarStatement(node, "await using", !0);
+            break;
           case 129: {
-            const result = this.tsParseInterfaceDeclaration(nany, {
+            const result = this.tsParseInterfaceDeclaration(node, {
               declare: !0
             });
             if (result) return result;
           }
           default:
             if (tokenIsIdentifier(startType))
-              return this.tsParseDeclaration(nany, this.state.value, !0, null);
+              return this.tsParseDeclaration(node, this.state.value, !0, null);
         }
       });
     }
@@ -44175,7 +44189,7 @@ function requireLib$1() {
         }
         case "global":
           if (this.match(5)) {
-            this.scope.enter(256), this.prodParam.enter(0);
+            this.scope.enter(512), this.prodParam.enter(0);
             const mod = node;
             return mod.kind = "global", node.global = !0, mod.id = expr, mod.body = this.tsParseModuleBlock(), this.scope.exit(), this.prodParam.exit(), this.finishNode(mod, "TSModuleDeclaration");
           }
@@ -44417,7 +44431,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.ConstInitializerMustBeStringOrNumericLiteralOrLiteralEnumReference, init));
+        init && (kind === "var" || kind === "let" || id.typeAnnotation ? this.raise(TSErrors.InitializerNotAllowedInAmbientContext, init) : isValidAmbientConstInitializer(init, this.hasPlugin("estree")) || this.raise(TSErrors.ConstInitializerMustBeStringOrNumericLiteralOrLiteralEnumReference, init));
       return declaration;
     }
     parseStatementContent(flags, decorators) {
@@ -44802,7 +44816,7 @@ function requireLib$1() {
         return node.abstract = !0, this.maybeTakeDecorators(decorators, this.parseClass(node, !0, !1));
       if (this.isContextual(129)) {
         if (!this.hasFollowingLineBreak())
-          return node.abstract = !0, this.raise(TSErrors.NonClassMethodPropertyHasAbstractModifer, node), this.tsParseInterfaceDeclaration(node);
+          return node.abstract = !0, this.raise(TSErrors.NonClassMethodPropertyHasAbstractModifier, node), this.tsParseInterfaceDeclaration(node);
       } else
         this.unexpected(null, 80);
     }
@@ -45196,9 +45210,14 @@ function requireLib$1() {
       return expr.type === "ArrowFunctionExpression" && this.offsetToSourcePos(expr.start) === potentialArrowAt;
     }
     getExpression() {
-      this.enterInitialScopes(), this.nextToken();
+      if (this.enterInitialScopes(), this.nextToken(), this.match(140))
+        throw this.raise(Errors.ParseExpressionEmptyInput, this.state.startLoc);
       const expr = this.parseExpression();
-      return this.match(140) || this.unexpected(), this.finalizeRemainingComments(), expr.comments = this.comments, expr.errors = this.state.errors, this.optionFlags & 256 && (expr.tokens = this.tokens), expr;
+      if (!this.match(140))
+        throw this.raise(Errors.ParseExpressionExpectsEOF, this.state.startLoc, {
+          unexpected: this.input.codePointAt(this.state.start)
+        });
+      return this.finalizeRemainingComments(), expr.comments = this.comments, expr.errors = this.state.errors, this.optionFlags & 256 && (expr.tokens = this.tokens), expr;
     }
     parseExpression(disallowIn, refExpressionErrors) {
       return disallowIn ? this.disallowInAnd(() => this.parseExpressionBase(refExpressionErrors)) : this.allowInAnd(() => this.parseExpressionBase(refExpressionErrors));
@@ -45498,7 +45517,7 @@ function requireLib$1() {
         case 79:
           return this.parseSuper();
         case 83:
-          return node = this.startNode(), this.next(), this.match(16) ? this.parseImportMetaProperty(node) : this.match(10) ? this.optionFlags & 512 ? this.parseImportCall(node) : this.finishNode(node, "Import") : (this.raise(Errors.UnsupportedImport, this.state.lastTokStartLoc), this.finishNode(node, "Import"));
+          return node = this.startNode(), this.next(), this.match(16) ? this.parseImportMetaPropertyOrPhaseCall(node) : this.match(10) ? this.optionFlags & 512 ? this.parseImportCall(node) : this.finishNode(node, "Import") : (this.raise(Errors.UnsupportedImport, this.state.lastTokStartLoc), this.finishNode(node, "Import"));
         case 78:
           return node = this.startNode(), this.next(), this.finishNode(node, "ThisExpression");
         case 90:
@@ -45661,19 +45680,14 @@ function requireLib$1() {
         onlyValidPropertyName: propertyName
       }), this.finishNode(node, "MetaProperty");
     }
-    parseImportMetaProperty(node) {
-      const id = this.createIdentifier(this.startNodeAtNode(node), "import");
-      if (this.next(), this.isContextual(101))
-        this.inModule || this.raise(Errors.ImportMetaOutsideModule, id), this.sawUnambiguousESM = !0;
-      else if (this.isContextual(105) || this.isContextual(97)) {
+    parseImportMetaPropertyOrPhaseCall(node) {
+      if (this.next(), this.isContextual(105) || this.isContextual(97)) {
         const isSource = this.isContextual(105);
-        if (this.expectPlugin(isSource ? "sourcePhaseImports" : "deferredImportEvaluation"), !(this.optionFlags & 512))
-          throw this.raise(Errors.DynamicImportPhaseRequiresImportExpressions, this.state.startLoc, {
-            phase: this.state.value
-          });
-        return this.next(), node.phase = isSource ? "source" : "defer", this.parseImportCall(node);
+        return this.expectPlugin(isSource ? "sourcePhaseImports" : "deferredImportEvaluation"), this.next(), node.phase = isSource ? "source" : "defer", this.parseImportCall(node);
+      } else {
+        const id = this.createIdentifierAt(this.startNodeAtNode(node), "import", this.state.lastTokStartLoc);
+        return this.isContextual(101) && (this.inModule || this.raise(Errors.ImportMetaOutsideModule, id), this.sawUnambiguousESM = !0), this.parseMetaProperty(node, id, "meta");
       }
-      return this.parseMetaProperty(node, id, "meta");
     }
     parseLiteralAtNode(value, type2, node) {
       return this.addExtra(node, "rawValue", value), this.addExtra(node, "raw", this.input.slice(this.offsetToSourcePos(node.start), this.state.end)), node.value = value, this.next(), this.finishNode(node, type2);
@@ -46021,6 +46035,9 @@ function requireLib$1() {
     createIdentifier(node, name) {
       return node.name = name, node.loc.identifierName = name, this.finishNode(node, "Identifier");
     }
+    createIdentifierAt(node, name, endLoc) {
+      return node.name = name, node.loc.identifierName = name, this.finishNodeAt(node, "Identifier", endLoc);
+    }
     parseIdentifierName(liberal) {
       let name;
       const {
@@ -46101,11 +46118,15 @@ function requireLib$1() {
       return node.delegate = delegating, node.argument = argument, this.finishNode(node, "YieldExpression");
     }
     parseImportCall(node) {
-      if (this.next(), node.source = this.parseMaybeAssignAllowIn(), node.options = null, this.eat(12) && !this.match(11) && (node.options = this.parseMaybeAssignAllowIn(), this.eat(12) && !this.match(11))) {
-        do
-          this.parseMaybeAssignAllowIn();
-        while (this.eat(12) && !this.match(11));
-        this.raise(Errors.ImportCallArity, node);
+      if (this.next(), node.source = this.parseMaybeAssignAllowIn(), node.options = null, this.eat(12)) {
+        if (this.match(11))
+          this.addTrailingCommaExtraToNode(node.source);
+        else if (node.options = this.parseMaybeAssignAllowIn(), this.eat(12) && (this.addTrailingCommaExtraToNode(node.options), !this.match(11))) {
+          do
+            this.parseMaybeAssignAllowIn();
+          while (this.eat(12) && !this.match(11));
+          this.raise(Errors.ImportCallArity, node);
+        }
       }
       return this.expect(11), this.finishNode(node, "ImportExpression");
     }
@@ -46354,6 +46375,24 @@ function requireLib$1() {
     isLet() {
       return this.isContextual(100) ? this.hasFollowingBindingAtom() : !1;
     }
+    isUsing() {
+      if (!this.isContextual(107))
+        return !1;
+      const next = this.nextTokenInLineStart(), nextCh = this.codePointAtPos(next);
+      return this.chStartsBindingIdentifier(nextCh, next);
+    }
+    isAwaitUsing() {
+      if (!this.isContextual(96))
+        return !1;
+      let next = this.nextTokenInLineStart();
+      if (this.isUnparsedContextual(next, "using")) {
+        next = this.nextTokenInLineStartSince(next + 5);
+        const nextCh = this.codePointAtPos(next);
+        if (this.chStartsBindingIdentifier(nextCh, next))
+          return this.expectPlugin("explicitResourceManagement"), !0;
+      }
+      return !1;
+    }
     chStartsBindingIdentifier(ch, pos2) {
       if (isIdentifierStart(ch)) {
         if (keywordRelationalOperator.lastIndex = pos2, keywordRelationalOperator.test(this.input)) {
@@ -46388,15 +46427,8 @@ function requireLib$1() {
       }
       return tokenIsIdentifier(type2) && !this.hasFollowingLineBreak() ? (this.expectPlugin("explicitResourceManagement"), !0) : !1;
     }
-    startsAwaitUsing() {
-      let next = this.nextTokenInLineStart();
-      if (this.isUnparsedContextual(next, "using")) {
-        next = this.nextTokenInLineStartSince(next + 5);
-        const nextCh = this.codePointAtPos(next);
-        if (this.chStartsBindingIdentifier(nextCh, next))
-          return this.expectPlugin("explicitResourceManagement"), !0;
-      }
-      return !1;
+    allowsUsing() {
+      return (this.scope.inModule || !this.scope.inTopLevel) && !this.scope.inBareCaseStatement;
     }
     parseModuleItem() {
       return this.parseStatementLike(15);
@@ -46444,13 +46476,13 @@ function requireLib$1() {
         case 73:
           return this.parseTryStatement(node);
         case 96:
-          if (!this.state.containsEsc && this.startsAwaitUsing())
-            return this.recordAwaitIfAllowed() ? allowDeclaration || this.raise(Errors.UnexpectedLexicalDeclaration, node) : this.raise(Errors.AwaitUsingNotInAsyncContext, node), this.next(), this.parseVarStatement(node, "await using");
+          if (this.isAwaitUsing())
+            return this.allowsUsing() ? allowDeclaration ? this.recordAwaitIfAllowed() || this.raise(Errors.AwaitUsingNotInAsyncContext, node) : this.raise(Errors.UnexpectedLexicalDeclaration, node) : this.raise(Errors.UnexpectedUsingDeclaration, node), this.next(), this.parseVarStatement(node, "await using");
           break;
         case 107:
           if (this.state.containsEsc || !this.hasInLineFollowingBindingIdentifierOrBrace())
             break;
-          return this.expectPlugin("explicitResourceManagement"), !this.scope.inModule && this.scope.inTopLevel ? this.raise(Errors.UnexpectedUsingDeclaration, this.state.startLoc) : allowDeclaration || this.raise(Errors.UnexpectedLexicalDeclaration, this.state.startLoc), this.parseVarStatement(node, "using");
+          return this.expectPlugin("explicitResourceManagement"), this.allowsUsing() ? allowDeclaration || this.raise(Errors.UnexpectedLexicalDeclaration, this.state.startLoc) : this.raise(Errors.UnexpectedUsingDeclaration, this.state.startLoc), this.parseVarStatement(node, "using");
         case 100: {
           if (this.state.containsEsc)
             break;
@@ -46580,7 +46612,7 @@ function requireLib$1() {
         return awaitAt !== null && this.unexpected(awaitAt), this.parseFor(node, null);
       const startsWithLet = this.isContextual(100);
       {
-        const startsWithAwaitUsing = this.isContextual(96) && this.startsAwaitUsing(), starsWithUsingDeclaration = startsWithAwaitUsing || this.isContextual(107) && this.allowsForUsing(), isLetOrUsing = startsWithLet && this.hasFollowingBindingAtom() || starsWithUsingDeclaration;
+        const startsWithAwaitUsing = this.isAwaitUsing(), starsWithUsingDeclaration = startsWithAwaitUsing || this.isContextual(107) && this.allowsForUsing(), isLetOrUsing = startsWithLet && this.hasFollowingBindingAtom() || starsWithUsingDeclaration;
         if (this.match(74) || this.match(75) || isLetOrUsing) {
           const initNode = this.startNode();
           let kind;
@@ -46612,7 +46644,7 @@ function requireLib$1() {
     parseSwitchStatement(node) {
       this.next(), node.discriminant = this.parseHeaderExpression();
       const cases = node.cases = [];
-      this.expect(5), this.state.labels.push(switchLabel), this.scope.enter(0);
+      this.expect(5), this.state.labels.push(switchLabel), this.scope.enter(256);
       let cur;
       for (let sawDefault; !this.match(8); )
         if (this.match(61) || this.match(65)) {
@@ -46822,7 +46854,7 @@ function requireLib$1() {
       if (member.static = isStatic, this.parsePropertyNamePrefixOperator(member), this.eat(55)) {
         method.kind = "method";
         const isPrivateName = this.match(139);
-        if (this.parseClassElementName(method), isPrivateName) {
+        if (this.parseClassElementName(method), this.parsePostMemberNameModifiers(method), isPrivateName) {
           this.pushClassPrivateMethod(classBody, privateMethod, !0, !1);
           return;
         }
@@ -47007,7 +47039,7 @@ function requireLib$1() {
         return this.parseClass(expr, !0, !0);
       if (this.match(26))
         return this.hasPlugin("decorators") && this.getPluginOption("decorators", "decoratorsBeforeExport") === !0 && this.raise(Errors.DecoratorBeforeExport, this.state.startLoc), this.parseClass(this.maybeTakeDecorators(this.parseDecorators(!1), this.startNode()), !0, !0);
-      if (this.match(75) || this.match(74) || this.isLet())
+      if (this.match(75) || this.match(74) || this.isLet() || this.hasPlugin("explicitResourceManagement") && (this.isUsing() || this.isAwaitUsing()))
         throw this.raise(Errors.UnsupportedDefaultExport, this.state.startLoc);
       const res = this.parseMaybeAssignAllowIn();
       return this.semicolon(), res;
@@ -47047,7 +47079,15 @@ function requireLib$1() {
       const {
         type: type2
       } = this.state;
-      return type2 === 26 && (this.expectOnePlugin(["decorators", "decorators-legacy"]), this.hasPlugin("decorators")) ? (this.getPluginOption("decorators", "decoratorsBeforeExport") === !0 && this.raise(Errors.DecoratorBeforeExport, this.state.startLoc), !0) : this.isContextual(107) ? (this.raise(Errors.UsingDeclarationExport, this.state.startLoc), !0) : this.isContextual(96) && this.startsAwaitUsing() ? (this.raise(Errors.UsingDeclarationExport, this.state.startLoc), !0) : type2 === 74 || type2 === 75 || type2 === 68 || type2 === 80 || this.isLet() || this.isAsyncFunction();
+      if (type2 === 26 && (this.expectOnePlugin(["decorators", "decorators-legacy"]), this.hasPlugin("decorators")))
+        return this.getPluginOption("decorators", "decoratorsBeforeExport") === !0 && this.raise(Errors.DecoratorBeforeExport, this.state.startLoc), !0;
+      if (this.hasPlugin("explicitResourceManagement")) {
+        if (this.isUsing())
+          return this.raise(Errors.UsingDeclarationExport, this.state.startLoc), !0;
+        if (this.isAwaitUsing())
+          return this.raise(Errors.UsingDeclarationExport, this.state.startLoc), !0;
+      }
+      return type2 === 74 || type2 === 75 || type2 === 68 || type2 === 80 || this.isLet() || this.isAsyncFunction();
     }
     checkExport(node, checkNames, isDefault, isFrom) {
       if (checkNames) {
@@ -47170,10 +47210,10 @@ function requireLib$1() {
     parseMaybeImportPhase(node, isExport) {
       if (!this.isPotentialImportPhase(isExport))
         return this.applyImportPhase(node, isExport, null), null;
-      const phaseIdentifier = this.parseIdentifier(!0), {
+      const phaseIdentifier = this.startNode(), phaseIdentifierName = this.parseIdentifierName(!0), {
         type: type2
       } = this.state;
-      return (tokenIsKeywordOrIdentifier(type2) ? type2 !== 98 || this.lookaheadCharCode() === 102 : type2 !== 12) ? (this.resetPreviousIdentifierLeadingComments(phaseIdentifier), this.applyImportPhase(node, isExport, phaseIdentifier.name, phaseIdentifier.loc.start), null) : (this.applyImportPhase(node, isExport, null), phaseIdentifier);
+      return (tokenIsKeywordOrIdentifier(type2) ? type2 !== 98 || this.lookaheadCharCode() === 102 : type2 !== 12) ? (this.applyImportPhase(node, isExport, phaseIdentifierName, phaseIdentifier.loc.start), null) : (this.applyImportPhase(node, isExport, null), this.createIdentifier(phaseIdentifier, phaseIdentifierName));
     }
     isPrecedingIdImportPhase(phase) {
       const {
@@ -47884,8 +47924,8 @@ async function bootstrapLocalTemplate(opts, context) {
   const dependencyVersions = await resolveLatestVersions({
     ...isAppTemplate ? {} : studioDependencies.dependencies,
     ...isAppTemplate ? {} : studioDependencies.devDependencies,
-    ...template.dependencies || {},
-    ...template.devDependencies || {}
+    ...template.dependencies,
+    ...template.devDependencies
   });
   spinner.succeed();
   const dependencies = Object.keys({