@delance/builder 0.3.3 → 0.3.4

package/dist/index.js

@@ -2336,7 +2336,8 @@ function isReadonlyObject(binding, memberAccess) {
   if (!binding.constant && binding.constantViolations[0] !== binding.path)
     return false;
   function isPatternAssignment(member) {
-    return member.parentPath?.isArrayPattern() || member.parentPath?.isAssignmentPattern() || member.parentPath?.parentPath?.isObjectPattern() || member.parentPath?.isAssignmentPattern();
+    const { parentPath } = member;
+    return parentPath?.isArrayPattern() || parentPath?.parentPath?.isObjectPattern() && (parentPath.isObjectProperty({ value: member.node }) || parentPath.isRestElement()) || parentPath?.isAssignmentPattern({ left: member.node });
   }
   return binding.referencePaths.every((path) => memberAccess.match(path.parent) && !path.parentPath?.parentPath?.isAssignmentExpression({
     left: path.parent
@@ -2351,6 +2352,34 @@ function isTemporaryVariable(binding, references, kind = "var") {
   return binding !== undefined && binding.references === references && binding.constantViolations.length === 1 && (kind === "var" ? binding.path.isVariableDeclarator() && binding.path.node.init === null : binding.path.listKey === "params" && binding.path.isIdentifier());
 }
 
+class AnySubListMatcher extends Matcher {
+  matchers;
+  constructor(matchers2) {
+    super();
+    this.matchers = matchers2;
+  }
+  matchValue(array, keys) {
+    if (!Array.isArray(array))
+      return false;
+    if (this.matchers.length === 0 && array.length === 0)
+      return true;
+    let j = 0;
+    for (let i = 0;i < array.length; i++) {
+      const matches = this.matchers[j].matchValue(array[i], [...keys, i]);
+      if (matches) {
+        j++;
+        if (j === this.matchers.length) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+}
+function anySubList(...elements) {
+  return new AnySubListMatcher(elements);
+}
+
 // webcrack/ast-utils/inline.js
 function inlineVariable(binding, value = anyExpression(), unsafeAssignments = false) {
   const varDeclarator = binding.path.node;
@@ -2413,7 +2442,7 @@ function inlineObjectProperties(binding, property = objectProperty()) {
   });
   binding.path.remove();
 }
-function inlineFunction(fn, caller) {
+function inlineFunctionCall(fn, caller) {
   if (t14.isRestElement(fn.params[1])) {
     caller.replaceWith(t14.callExpression(caller.node.arguments[0], caller.node.arguments.slice(1)));
     return;
@@ -2424,7 +2453,7 @@ function inlineFunction(fn, caller) {
     Identifier(path) {
       const paramIndex = fn.params.findIndex((p) => p.name === path.node.name);
       if (paramIndex !== -1) {
-        path.replaceWith(caller.node.arguments[paramIndex]);
+        path.replaceWith(caller.node.arguments[paramIndex] ?? t14.unaryExpression("void", t14.numericLiteral(0)));
         path.skip();
       }
     },
@@ -2454,7 +2483,7 @@ function inlineFunctionAliases(binding) {
       refs.push(...fnRefs);
       const callRefs = fnRefs.filter((ref2) => t14.isCallExpression(ref2.parent) && t14.isIdentifier(ref2.parent.callee, { name: fnName.current })).map((ref2) => ref2.parentPath);
       for (const callRef of callRefs) {
-        inlineFunction(fn.node, callRef);
+        inlineFunctionCall(fn.node, callRef);
         state.changes++;
       }
       fn.remove();
@@ -3675,7 +3704,7 @@ var control_flow_object_default = {
           if (t27.isStringLiteral(value)) {
             memberPath.replaceWith(value);
           } else {
-            inlineFunction(value, memberPath.parentPath);
+            inlineFunctionCall(value, memberPath.parentPath);
           }
           changes++;
         });
@@ -3737,7 +3766,7 @@ var control_flow_object_default = {
           if (t27.isStringLiteral(value)) {
             path.replaceWith(value);
           } else if (path.parentPath.isCallExpression()) {
-            inlineFunction(value, path.parentPath);
+            inlineFunctionCall(value, path.parentPath);
           } else {
             path.replaceWith(value);
           }
@@ -3884,9 +3913,9 @@ function findDecoders(stringArray) {
   const decoders = [];
   const functionName = capture(anyString());
   const arrayIdentifier = capture(identifier());
-  const matcher2 = functionDeclaration(identifier(functionName), anything(), blockStatement(anyList(variableDeclaration(undefined, [
+  const matcher2 = functionDeclaration(identifier(functionName), anything(), blockStatement(anySubList(variableDeclaration(undefined, [
     variableDeclarator(arrayIdentifier, callExpression(identifier(stringArray.name)))
-  ]), zeroOrMore(), containerOf(memberExpression(fromCapture(arrayIdentifier), undefined, true)), zeroOrMore())));
+  ]), containerOf(memberExpression(fromCapture(arrayIdentifier), undefined, true)))));
   for (const ref of stringArray.references) {
     const decoderFn = findParent(ref, matcher2);
     if (decoderFn) {
@@ -4324,7 +4353,7 @@ var computed_properties_default = {
   name: "computed-properties",
   tags: ["safe"],
   visitor() {
-    const stringMatcher = capture(stringLiteral(predicate((value) => isIdentifierName(value))));
+    const stringMatcher = capture(stringLiteral(predicate(isIdentifierName)));
     const propertyMatcher = or(memberExpression(anything(), stringMatcher, true), optionalMemberExpression(anything(), stringMatcher, true));
     const keyMatcher = or(objectProperty(stringMatcher), classProperty(stringMatcher), objectMethod(undefined, stringMatcher), classMethod(undefined, stringMatcher));
     return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@delance/builder",
   "type": "module",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "A spear to the Python language server built with black magic",
   "author": "mochaaP <npm@mochaa.ws>",
   "license": "0BSD",
@@ -38,12 +38,12 @@
     "debug": "^4.4.0"
   },
   "dependencies": {
-    "@babel/core": "^7.26.7",
-    "@babel/generator": "^7.26.5",
-    "@babel/parser": "^7.26.7",
-    "@babel/template": "^7.25.9",
-    "@babel/traverse": "^7.26.7",
-    "@babel/types": "^7.26.7",
+    "@babel/core": "^7.26.9",
+    "@babel/generator": "^7.26.9",
+    "@babel/parser": "^7.26.9",
+    "@babel/template": "^7.26.9",
+    "@babel/traverse": "^7.26.9",
+    "@babel/types": "^7.26.9",
     "quickjs-emscripten": "^0.31.0"
   },
   "devDependencies": {
@@ -57,10 +57,10 @@
     "@types/babel__helper-validator-identifier": "^7.15.2",
     "@types/babel__template": "^7.4.4",
     "@types/babel__traverse": "^7.20.6",
-    "@types/bun": "^1.2.2",
+    "@types/bun": "^1.2.4",
     "@types/debug": "^4.1.12",
-    "eslint": "^9.19.0",
-    "typescript": "^5.7.3",
+    "eslint": "^9.21.0",
+    "typescript": "^5.8.2",
     "webcrack": "github:j4k0xb/webcrack"
   }
 }