@nudojs/parser 1.1.2 → 1.1.4

package/dist/index.js

@@ -343,37 +343,105 @@ function parseObjectLiteral(content) {
   }
   return absExact({ k: "obj", slots });
 }
+function scanWithStrings(s, onChar, onStructural) {
+  let depth = 0;
+  let inString = null;
+  for (let i = 0; i < s.length; i++) {
+    const ch = s[i];
+    if (inString) {
+      onChar(ch, i);
+      if (ch === "\\") {
+        i++;
+        if (i < s.length) onChar(s[i], i);
+        continue;
+      }
+      if (ch === inString) inString = null;
+      continue;
+    }
+    if (ch === '"' || ch === "'") {
+      inString = ch;
+      onChar(ch, i);
+      continue;
+    }
+    if (ch === "(" || ch === "[" || ch === "{") {
+      depth++;
+      onChar(ch, i);
+      onStructural(ch, i, depth);
+      continue;
+    }
+    if (ch === ")" || ch === "]" || ch === "}") {
+      depth--;
+      onChar(ch, i);
+      onStructural(ch, i, depth);
+      continue;
+    }
+    onChar(ch, i);
+    onStructural(ch, i, depth);
+  }
+}
 function splitTopLevelArgs(s) {
   const result = [];
-  let depth = 0;
   let current = "";
-  for (const ch of s) {
+  let depth = 0;
+  let inString = null;
+  for (let i = 0; i < s.length; i++) {
+    const ch = s[i];
+    if (inString) {
+      current += ch;
+      if (ch === "\\") {
+        i++;
+        if (i < s.length) current += s[i];
+        continue;
+      }
+      if (ch === inString) inString = null;
+      continue;
+    }
+    if (ch === '"' || ch === "'") {
+      inString = ch;
+      current += ch;
+      continue;
+    }
     if (ch === "(" || ch === "[" || ch === "{") depth++;
     if (ch === ")" || ch === "]" || ch === "}") depth--;
     if (ch === "," && depth === 0) {
       result.push(current.trim());
       current = "";
-    } else {
-      current += ch;
+      continue;
     }
+    current += ch;
   }
   if (current.trim()) result.push(current.trim());
   return result;
 }
 function findTopLevelColon(s) {
-  let depth = 0;
-  for (let i = 0; i < s.length; i++) {
-    const ch = s[i];
-    if (ch === "(" || ch === "[" || ch === "{") depth++;
-    if (ch === ")" || ch === "]" || ch === "}") depth--;
-    if (ch === ":" && depth === 0) return i;
-  }
-  return -1;
+  let found = -1;
+  scanWithStrings(
+    s,
+    () => {
+    },
+    (ch, i, depth) => {
+      if (found === -1 && ch === ":" && depth === 0) found = i;
+    }
+  );
+  return found;
 }
 function findTopLevelArrow(s) {
   let depth = 0;
+  let inString = null;
   for (let i = 0; i < s.length - 1; i++) {
     const ch = s[i];
+    if (inString) {
+      if (ch === "\\") {
+        i++;
+        continue;
+      }
+      if (ch === inString) inString = null;
+      continue;
+    }
+    if (ch === '"' || ch === "'") {
+      inString = ch;
+      continue;
+    }
     if (ch === "(" || ch === "[" || ch === "{") depth++;
     else if (ch === ")" || ch === "]" || ch === "}") depth--;
     else if (depth === 0 && ch === "=" && s[i + 1] === ">") return i;
@@ -383,9 +451,23 @@ function findTopLevelArrow(s) {
 function extractBalancedParens(text, startIdx) {
   if (text[startIdx] !== "(") return null;
   let depth = 0;
+  let inString = null;
   for (let i = startIdx; i < text.length; i++) {
-    if (text[i] === "(") depth++;
-    if (text[i] === ")") depth--;
+    const ch = text[i];
+    if (inString) {
+      if (ch === "\\") {
+        i++;
+        continue;
+      }
+      if (ch === inString) inString = null;
+      continue;
+    }
+    if (ch === '"' || ch === "'") {
+      inString = ch;
+      continue;
+    }
+    if (ch === "(") depth++;
+    if (ch === ")") depth--;
     if (depth === 0) return text.slice(startIdx + 1, i);
   }
   return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nudojs/parser",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "engines": {
     "node": ">=20"
   },
@@ -39,7 +39,7 @@
     "registry": "https://registry.npmjs.org"
   },
   "dependencies": {
-    "@nudojs/core": "1.1.2",
+    "@nudojs/core": "1.1.4",
     "@babel/types": "^8.0.6"
   },
   "scripts": {