@batijs/core 0.0.11 → 0.0.12

package/dist/index.js

@@ -19684,9 +19684,9 @@ var require_main3 = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/@babel+parser@7.21.4/node_modules/@babel/parser/lib/index.js
+// ../../node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/lib/index.js
 var require_lib = __commonJS({
-  "../../node_modules/.pnpm/@babel+parser@7.21.4/node_modules/@babel/parser/lib/index.js"(exports) {
+  "../../node_modules/.pnpm/@babel+parser@7.21.8/node_modules/@babel/parser/lib/index.js"(exports) {
     "use strict";
     init_esm_shims();
     Object.defineProperty(exports, "__esModule", {
@@ -20390,7 +20390,6 @@ var require_lib = __commonJS({
       AwaitBindingIdentifier: "Can not use 'await' as identifier inside an async function.",
       AwaitBindingIdentifierInStaticBlock: "Can not use 'await' as identifier inside a static block.",
       AwaitExpressionFormalParameter: "'await' is not allowed in async function parameters.",
-      AwaitInUsingBinding: "'await' is not allowed to be used as a name in 'using' declarations.",
       AwaitNotInAsyncContext: "'await' is only allowed within async functions and at the top levels of modules.",
       AwaitNotInAsyncFunction: "'await' is only allowed within async functions.",
       BadGetterArity: "A 'get' accessor must not have any formal parameters.",
@@ -24032,14 +24031,14 @@ var require_lib = __commonJS({
           node.typeParameters = null;
         }
         node.extends = [];
-        node.implements = [];
-        node.mixins = [];
         if (this.eat(81)) {
           do {
             node.extends.push(this.flowParseInterfaceExtends());
           } while (!isClass && this.eat(12));
         }
         if (isClass) {
+          node.implements = [];
+          node.mixins = [];
           if (this.eatContextual(115)) {
             do {
               node.mixins.push(this.flowParseInterfaceExtends());
@@ -27768,15 +27767,19 @@ var require_lib = __commonJS({
         }
       }
       tsParseBindingListForSignature() {
-        return super.parseBindingList(11, 41, 2).map((pattern) => {
-          if (pattern.type !== "Identifier" && pattern.type !== "RestElement" && pattern.type !== "ObjectPattern" && pattern.type !== "ArrayPattern") {
+        const list = super.parseBindingList(11, 41, 2);
+        for (const pattern of list) {
+          const {
+            type
+          } = pattern;
+          if (type === "AssignmentPattern" || type === "TSParameterProperty") {
             this.raise(TSErrors.UnsupportedSignatureParameterKind, {
               at: pattern,
-              type: pattern.type
+              type
             });
           }
-          return pattern;
-        });
+        }
+        return list;
       }
       tsParseTypeMemberSemicolon() {
         if (!this.eat(12) && !this.isLineTerminator()) {
@@ -27798,7 +27801,7 @@ var require_lib = __commonJS({
       }
       tsTryParseIndexSignature(node) {
         if (!(this.match(0) && this.tsLookAhead(this.tsIsUnambiguouslyIndexSignature.bind(this)))) {
-          return void 0;
+          return;
         }
         this.expect(0);
         const id = this.parseIdentifier();
@@ -28101,18 +28104,17 @@ var require_lib = __commonJS({
       }
       tsParseLiteralTypeNode() {
         const node = this.startNode();
-        node.literal = (() => {
-          switch (this.state.type) {
-            case 132:
-            case 133:
-            case 131:
-            case 85:
-            case 86:
-              return super.parseExprAtom();
-            default:
-              this.unexpected();
-          }
-        })();
+        switch (this.state.type) {
+          case 132:
+          case 133:
+          case 131:
+          case 85:
+          case 86:
+            node.literal = super.parseExprAtom();
+            break;
+          default:
+            this.unexpected();
+        }
         return this.finishNode(node, "TSLiteralType");
       }
       tsParseTemplateLiteralType() {
@@ -28360,10 +28362,14 @@ var require_lib = __commonJS({
         });
       }
       tsTryParseTypeOrTypePredicateAnnotation() {
-        return this.match(14) ? this.tsParseTypeOrTypePredicateAnnotation(14) : void 0;
+        if (this.match(14)) {
+          return this.tsParseTypeOrTypePredicateAnnotation(14);
+        }
       }
       tsTryParseTypeAnnotation() {
-        return this.match(14) ? this.tsParseTypeAnnotation() : void 0;
+        if (this.match(14)) {
+          return this.tsParseTypeAnnotation();
+        }
       }
       tsTryParseType() {
         return this.tsEatThenParseType(14);
@@ -28539,17 +28545,19 @@ var require_lib = __commonJS({
         }
       }
       tsEatThenParseType(token) {
-        return !this.match(token) ? void 0 : this.tsNextThenParseType();
+        if (this.match(token)) {
+          return this.tsNextThenParseType();
+        }
       }
       tsExpectThenParseType(token) {
-        return this.tsDoThenParseType(() => this.expect(token));
+        return this.tsInType(() => {
+          this.expect(token);
+          return this.tsParseType();
+        });
       }
       tsNextThenParseType() {
-        return this.tsDoThenParseType(() => this.next());
-      }
-      tsDoThenParseType(cb) {
         return this.tsInType(() => {
-          cb();
+          this.next();
           return this.tsParseType();
         });
       }
@@ -28661,7 +28669,7 @@ var require_lib = __commonJS({
       tsTryParseAndCatch(f) {
         const result = this.tryParse((abort) => f() || abort());
         if (result.aborted || !result.node)
-          return void 0;
+          return;
         if (result.error)
           this.state = result.failState;
         return result.node;
@@ -28671,58 +28679,55 @@ var require_lib = __commonJS({
         const result = f();
         if (result !== void 0 && result !== false) {
           return result;
-        } else {
-          this.state = state;
-          return void 0;
         }
+        this.state = state;
       }
       tsTryParseDeclare(nany) {
         if (this.isLineTerminator()) {
           return;
         }
-        let starttype = this.state.type;
+        let startType = this.state.type;
         let kind;
         if (this.isContextual(99)) {
-          starttype = 74;
+          startType = 74;
           kind = "let";
         }
         return this.tsInAmbientContext(() => {
-          if (starttype === 68) {
-            nany.declare = true;
-            return super.parseFunctionStatement(nany, false, false);
-          }
-          if (starttype === 80) {
-            nany.declare = true;
-            return this.parseClass(nany, true, false);
-          }
-          if (starttype === 124) {
-            return this.tsParseEnumDeclaration(nany, {
-              declare: true
-            });
-          }
-          if (starttype === 110) {
-            return this.tsParseAmbientExternalModuleDeclaration(nany);
-          }
-          if (starttype === 75 || starttype === 74) {
-            if (!this.match(75) || !this.isLookaheadContextual("enum")) {
+          switch (startType) {
+            case 68:
+              nany.declare = true;
+              return super.parseFunctionStatement(nany, false, false);
+            case 80:
               nany.declare = true;
-              return this.parseVarStatement(nany, kind || this.state.value, true);
+              return this.parseClass(nany, true, false);
+            case 124:
+              return this.tsParseEnumDeclaration(nany, {
+                declare: true
+              });
+            case 110:
+              return this.tsParseAmbientExternalModuleDeclaration(nany);
+            case 75:
+            case 74:
+              if (!this.match(75) || !this.isLookaheadContextual("enum")) {
+                nany.declare = true;
+                return this.parseVarStatement(nany, kind || this.state.value, true);
+              }
+              this.expect(75);
+              return this.tsParseEnumDeclaration(nany, {
+                const: true,
+                declare: true
+              });
+            case 127: {
+              const result = this.tsParseInterfaceDeclaration(nany, {
+                declare: true
+              });
+              if (result)
+                return result;
             }
-            this.expect(75);
-            return this.tsParseEnumDeclaration(nany, {
-              const: true,
-              declare: true
-            });
-          }
-          if (starttype === 127) {
-            const result = this.tsParseInterfaceDeclaration(nany, {
-              declare: true
-            });
-            if (result)
-              return result;
-          }
-          if (tokenIsIdentifier(starttype)) {
-            return this.tsParseDeclaration(nany, this.state.value, true, null);
+            default:
+              if (tokenIsIdentifier(startType)) {
+                return this.tsParseDeclaration(nany, this.state.value, true, null);
+              }
           }
         });
       }
@@ -28735,9 +28740,8 @@ var require_lib = __commonJS({
             const declaration = this.tsTryParseDeclare(node);
             if (declaration) {
               declaration.declare = true;
-              return declaration;
             }
-            break;
+            return declaration;
           }
           case "global":
             if (this.match(5)) {
@@ -28794,9 +28798,8 @@ var require_lib = __commonJS({
         return !this.isLineTerminator();
       }
       tsTryParseGenericAsyncArrowFunction(startLoc) {
-        if (!this.match(47)) {
-          return void 0;
-        }
+        if (!this.match(47))
+          return;
         const oldMaybeInArrowParameters = this.state.maybeInArrowParameters;
         this.state.maybeInArrowParameters = true;
         const res = this.tsTryParseAndCatch(() => {
@@ -28808,15 +28811,13 @@ var require_lib = __commonJS({
           return node;
         });
         this.state.maybeInArrowParameters = oldMaybeInArrowParameters;
-        if (!res) {
-          return void 0;
-        }
+        if (!res)
+          return;
         return super.parseArrowExpression(res, null, true);
       }
       tsParseTypeArgumentsInExpression() {
-        if (this.reScan_lt() !== 47) {
-          return void 0;
-        }
+        if (this.reScan_lt() !== 47)
+          return;
         return this.tsParseTypeArguments();
       }
       tsParseTypeArguments() {
@@ -29476,7 +29477,7 @@ var require_lib = __commonJS({
         return super.parseAsyncArrowFromCallExpression(node, call);
       }
       parseMaybeAssign(refExpressionErrors, afterLeftParse) {
-        var _jsx, _jsx2, _typeCast, _jsx3, _typeCast2, _jsx4, _typeCast3;
+        var _jsx, _jsx2, _typeCast, _jsx3, _typeCast2;
         let state;
         let jsx2;
         let typeCast;
@@ -29537,13 +29538,7 @@ var require_lib = __commonJS({
           this.state = typeCast.failState;
           return typeCast.node;
         }
-        if ((_jsx3 = jsx2) != null && _jsx3.thrown)
-          throw jsx2.error;
-        if (arrow.thrown)
-          throw arrow.error;
-        if ((_typeCast2 = typeCast) != null && _typeCast2.thrown)
-          throw typeCast.error;
-        throw ((_jsx4 = jsx2) == null ? void 0 : _jsx4.error) || arrow.error || ((_typeCast3 = typeCast) == null ? void 0 : _typeCast3.error);
+        throw ((_jsx3 = jsx2) == null ? void 0 : _jsx3.error) || arrow.error || ((_typeCast2 = typeCast) == null ? void 0 : _typeCast2.error);
       }
       reportReservedArrowTypeParam(node) {
         var _node$extra;
@@ -29556,9 +29551,8 @@ var require_lib = __commonJS({
       parseMaybeUnary(refExpressionErrors, sawUnary) {
         if (!this.hasPlugin("jsx") && this.match(47)) {
           return this.tsParseTypeAssertion();
-        } else {
-          return super.parseMaybeUnary(refExpressionErrors, sawUnary);
         }
+        return super.parseMaybeUnary(refExpressionErrors, sawUnary);
       }
       parseArrow(node) {
         if (this.match(14)) {
@@ -29664,12 +29658,10 @@ var require_lib = __commonJS({
         }, type) || super.isValidLVal(type, isUnparenthesizedInAssign, binding);
       }
       parseBindingAtom() {
-        switch (this.state.type) {
-          case 78:
-            return this.parseIdentifier(true);
-          default:
-            return super.parseBindingAtom();
+        if (this.state.type === 78) {
+          return this.parseIdentifier(true);
         }
+        return super.parseBindingAtom();
       }
       parseMaybeDecoratorArguments(expr) {
         if (this.match(47) || this.match(51)) {
@@ -29687,9 +29679,8 @@ var require_lib = __commonJS({
         if (this.state.isAmbientContext && this.match(12) && this.lookaheadCharCode() === close) {
           this.next();
           return false;
-        } else {
-          return super.checkCommaAfterRest(close);
         }
+        return super.checkCommaAfterRest(close);
       }
       isClassMethod() {
         return this.match(47) || super.isClassMethod();
@@ -29984,9 +29975,8 @@ var require_lib = __commonJS({
     function isNumber(expression, estree2) {
       if (estree2) {
         return expression.type === "Literal" && (typeof expression.value === "number" || "bigint" in expression);
-      } else {
-        return expression.type === "NumericLiteral" || expression.type === "BigIntLiteral";
       }
+      return expression.type === "NumericLiteral" || expression.type === "BigIntLiteral";
     }
     function isNegativeNumber(expression, estree2) {
       if (expression.type === "UnaryExpression") {
@@ -30003,10 +29993,9 @@ var require_lib = __commonJS({
     function isUncomputedMemberExpressionChain(expression) {
       if (expression.type === "Identifier")
         return true;
-      if (expression.type !== "MemberExpression")
-        return false;
-      if (expression.computed)
+      if (expression.type !== "MemberExpression" || expression.computed) {
         return false;
+      }
       return isUncomputedMemberExpressionChain(expression.object);
     }
     var PlaceholderErrors = ParseErrorEnum`placeholders`({
@@ -33035,11 +33024,6 @@ var require_lib = __commonJS({
         return node;
       }
       parseVarId(decl, kind) {
-        if (kind === "using" && !this.inModule && this.match(96)) {
-          this.raise(Errors.AwaitInUsingBinding, {
-            at: this.state.startLoc
-          });
-        }
         const id = this.parseBindingAtom();
         this.checkLVal(id, {
           in: {
@@ -34404,10 +34388,10 @@ var flags = new Map(features.map((f) => [f.split(":").at(-1), f]));
 init_esm_shims();
 var import_ast_types = __toESM(require_main(), 1);
 
-// ../../node_modules/.pnpm/magicast@0.2.4/node_modules/magicast/dist/index.mjs
+// ../../node_modules/.pnpm/magicast@0.2.6/node_modules/magicast/dist/index.mjs
 init_esm_shims();
 
-// ../../node_modules/.pnpm/magicast@0.2.4/node_modules/magicast/dist/shared/magicast.91b07a20.mjs
+// ../../node_modules/.pnpm/magicast@0.2.6/node_modules/magicast/dist/shared/magicast.457bd4a4.mjs
 init_esm_shims();
 var recast = __toESM(require_main3(), 1);
 var import_recast = __toESM(require_main3(), 1);
@@ -35104,6 +35088,11 @@ function proxify(node, mod) {
       proxy = proxifyIdentifier(node);
       break;
     }
+    case "TSAsExpression":
+    case "TSSatisfiesExpression": {
+      proxy = proxify(node.expression, mod);
+      break;
+    }
     default:
       throw new MagicastError(`Casting "${node.type}" is not supported`, {
         ast: node,
@@ -35396,7 +35385,7 @@ var builders = {
   }
 };
 
-// ../../node_modules/.pnpm/magicast@0.2.4/node_modules/magicast/dist/index.mjs
+// ../../node_modules/.pnpm/magicast@0.2.6/node_modules/magicast/dist/index.mjs
 var import_recast2 = __toESM(require_main3(), 1);
 var import_parser = __toESM(require_lib(), 1);
 
@@ -35507,7 +35496,7 @@ async function loadRelativeFileAsMagicast(relativePath, meta) {
 // src/magicast.ts
 init_esm_shims();
 
-// ../../node_modules/.pnpm/magicast@0.2.4/node_modules/magicast/dist/helpers.mjs
+// ../../node_modules/.pnpm/magicast@0.2.6/node_modules/magicast/dist/helpers.mjs
 init_esm_shims();
 var import_recast3 = __toESM(require_main3(), 1);
 var import_parser2 = __toESM(require_lib(), 1);
@@ -35516,8 +35505,11 @@ function getDefaultExportOptions(magicast) {
 }
 function addVitePlugin(magicast, plugin) {
   const config = getDefaultExportOptions(magicast);
+  const insertionIndex = plugin.index ?? config.plugins?.length ?? 0;
   config.plugins || (config.plugins = []);
-  config.plugins.push(
+  config.plugins.splice(
+    insertionIndex,
+    0,
     plugin.options ? builders.functionCall(plugin.constructor, plugin.options) : builders.functionCall(plugin.constructor)
   );
   magicast.imports.$add({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@batijs/core",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "",
   "type": "module",
   "types": "./dist/index.d.ts",
@@ -8,16 +8,15 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
+    "@magne4000/import-fixer": "^0.8.2",
     "@types/eslint": "^8.37.0",
-    "@types/node": "^16.18.24",
+    "@types/node": "^16.18.27",
     "ast-types": "^0.14.2",
     "esbuild": "^0.17.18",
-    "@magne4000/import-fixer": "^0.8.2",
-    "magicast": "^0.2.4",
-    "tsx": "^3.12.6",
+    "magicast": "^0.2.6",
     "typescript": "^5.0.4",
-    "uvu": "^0.5.6",
-    "@batijs/tsup": "0.0.11"
+    "vitest": "^0.31.0",
+    "@batijs/tsup": "0.0.12"
   },
   "exports": {
     ".": "./dist/index.js"
@@ -36,7 +35,8 @@
     "dist/"
   ],
   "scripts": {
-    "test": "NODE_OPTIONS='--loader tsx' uvu",
+    "test": "vitest",
+    "test:ci": "vitest run",
     "build": "tsup"
   }
 }