@stacksjs/stx 0.2.128 → 0.2.130

package/dist/variable-extractor.d.ts

@@ -26,6 +26,28 @@ export declare function extractVariables(scriptContent: string, context: Record<
  */
 export declare function isCompleteImport(statement: string): boolean;
 export declare function convertToCommonJS(scriptContent: string, filePath?: string): string;
+/**
+ * Parse variable declarations (including multi-line objects and arrays)
+ */
+/**
+ * Split `const name: Type = value` into its parts.
+ *
+ * The pattern this supports used to require the `=` to follow the name
+ * directly, so any TypeScript annotation made the declaration unparseable. That
+ * is not a small failure: an unparseable declaration throws out of
+ * `convertToCommonJS`, the whole server script falls back to static
+ * extraction, and the page renders with every variable undefined and no error.
+ * A single `const rows: any = await db...` was enough to blank a page.
+ *
+ * The annotation is erased at runtime, so it only has to be skipped. It is
+ * scanned rather than matched because it can contain almost anything: `=` in a
+ * generic default, braces in an object type, commas and angle brackets in a
+ * generic argument list.
+ *
+ * Returns null when the line is not a simple declaration, which leaves the
+ * destructuring and multi-line paths below to handle it as before.
+ */
+export declare function splitDeclaration(line: string): { type: string, name: string, value: string } | null;
 /**
  * Extract script content from an HTML template
  *

package/dist/variable-extractor.js

@@ -877,8 +877,61 @@ function extractDestructuredNames(pattern) {
     names.push(currentName.trim());
   return names;
 }
+export function splitDeclaration(line) {
+  const head = /^(?:export\s+)?(const|let|var)\s+([A-Za-z_$][\w$]*)/.exec(line);
+  if (!head)
+    return null;
+  let index = head[0].length;
+  const isSpace = (character) => character === " " || character === "\t";
+  while (index < line.length && isSpace(line[index]))
+    index++;
+  if (line[index] === ":") {
+    let depth = 0, quote = null;
+    index++;
+    for (;index < line.length; index++) {
+      const character = line[index];
+      if (quote) {
+        if (character === "\\") {
+          index++;
+          continue;
+        }
+        if (character === quote)
+          quote = null;
+        continue;
+      }
+      if (character === "'" || character === '"' || character === "`") {
+        quote = character;
+        continue;
+      }
+      if (character === "(" || character === "[" || character === "{" || character === "<") {
+        depth++;
+        continue;
+      }
+      if (character === ")" || character === "]" || character === "}" || character === ">") {
+        depth--;
+        continue;
+      }
+      if (character === "=" && depth <= 0) {
+        const next = line[index + 1], previous = line[index - 1];
+        if (next !== "=" && next !== ">" && previous !== "=" && previous !== "!" && previous !== "<" && previous !== ">")
+          break;
+      }
+    }
+    if (line[index] !== "=")
+      return null;
+  }
+  while (index < line.length && isSpace(line[index]))
+    index++;
+  if (line[index] !== "=")
+    return null;
+  return {
+    type: head[1],
+    name: head[2],
+    value: line.slice(index + 1).trim()
+  };
+}
 function parseVariableDeclaration(lines, startIndex) {
-  const firstLine = lines[startIndex].trim(), match = firstLine.match(/^(?:export\s+)?(const|let|var)\s+(\w+)\s*=\s*(.*)$/);
+  const firstLine = lines[startIndex].trim(), split = splitDeclaration(firstLine), match = split ? [firstLine, split.type, split.name, split.value] : null;
   if (!match) {
     const destructuringPrefix = firstLine.match(/^(?:export\s+)?(const|let|var)\s+/);
     if (destructuringPrefix) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/stx",
   "type": "module",
-  "version": "0.2.128",
+  "version": "0.2.130",
   "description": "A performant UI Framework. Powered by Bun.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",
@@ -117,12 +117,12 @@
   "dependencies": {
     "@cwcss/crosswind": "^0.2.12",
     "@stacksjs/clapp": "^0.2.0",
-    "@stacksjs/desktop": "0.2.128",
-    "@stacksjs/sanitizer": "0.2.128",
+    "@stacksjs/desktop": "0.2.130",
+    "@stacksjs/sanitizer": "0.2.130",
     "@stacksjs/ts-i18n": "^0.1.11",
-    "bun-plugin-stx": "0.2.128",
+    "bun-plugin-stx": "0.2.130",
     "bunfig": "^0.15.15",
-    "stx-router": "0.2.128",
+    "stx-router": "0.2.130",
     "ts-broadcasting": "^0.0.9",
     "ts-images": "^0.1.9",
     "ts-syntax-highlighter": "^0.2.1"