@stacksjs/stx 0.2.124 → 0.2.126

package/dist/variable-extractor.d.ts

@@ -12,6 +12,19 @@ export declare function extractVariables(scriptContent: string, context: Record<
  * @param scriptContent - ES module style script content
  * @returns CommonJS compatible script
  */
+/**
+ * Whether an import statement is finished, or continues on the next line.
+ *
+ * Finished means the module specifier has been reached and its quotes are
+ * closed, with no unclosed brace left over. A side-effect import
+ * (`import './setup'`) is complete as soon as its string closes; a named
+ * import is not complete until both the brace list and the specifier are.
+ *
+ * Exported for the tests, because the failure it prevents is invisible from
+ * the outside: an unjoined import produces a syntax error in generated code,
+ * and the page then renders with every server variable undefined.
+ */
+export declare function isCompleteImport(statement: string): boolean;
 export declare function convertToCommonJS(scriptContent: string, filePath?: string): string;
 /**
  * Extract script content from an HTML template

package/dist/variable-extractor.js

@@ -484,6 +484,31 @@ export async function extractVariables(scriptContent, context, filePath, options
     }
   }
 }
+export function isCompleteImport(statement) {
+  let braces = 0, quote = null, sawFrom = !1, closedSpecifier = !1;
+  for (let index = 0;index < statement.length; index++) {
+    const character = statement[index];
+    if (quote) {
+      if (character === quote) {
+        quote = null;
+        if (sawFrom || braces === 0)
+          closedSpecifier = !0;
+      }
+      continue;
+    }
+    if (character === "'" || character === '"' || character === "`") {
+      quote = character;
+      continue;
+    }
+    if (character === "{")
+      braces++;
+    else if (character === "}")
+      braces--;
+    else if (statement.startsWith("from", index) && braces === 0)
+      sawFrom = !0;
+  }
+  return quote === null && braces === 0 && closedSpecifier;
+}
 export function convertToCommonJS(scriptContent, filePath) {
   const templateDir = filePath ? path.dirname(filePath) : process.cwd(), lines = scriptContent.split(`
 `), convertedLines = [];
@@ -546,8 +571,14 @@ export function convertToCommonJS(scriptContent, filePath) {
         i = lines.length;
       continue;
     }
-    if (line.startsWith("import ")) {
-      const defaultImportMatch = line.match(/^import\s+(\w+)\s+from\s+['"](.+)['"]/), namedImportMatch = line.match(/^import\s+\{([^}]+)\}\s+from\s+['"](.+)['"]/), sideEffectMatch = line.match(/^import\s+['"](.+)['"]/), resolveSource = (source) => {
+    if (line.startsWith("import ") || line === "import" || line.startsWith("import{")) {
+      let statement = line, consumed = 0;
+      while (!isCompleteImport(statement) && i + consumed + 1 < lines.length) {
+        consumed++;
+        statement = `${statement} ${lines[i + consumed].trim()}`;
+      }
+      i += consumed;
+      const defaultImportMatch = statement.match(/^import\s+(\w+)\s+from\s+['"](.+?)['"]/), namedImportMatch = statement.match(/^import\s+\{([^}]*)\}\s+from\s+['"](.+?)['"]/), sideEffectMatch = statement.match(/^import\s+['"](.+?)['"]/), line_ = statement, resolveSource = (source) => {
         if (source.startsWith("."))
           return path.resolve(templateDir, source);
         return source;
@@ -568,7 +599,7 @@ export function convertToCommonJS(scriptContent, filePath) {
         const resolved = resolveSource(sideEffectMatch[1]);
         convertedLines.push(`await import('${resolved}')`);
       } else
-        convertedLines.push(line);
+        convertedLines.push(line_);
       i++;
       continue;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/stx",
   "type": "module",
-  "version": "0.2.124",
+  "version": "0.2.126",
   "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.124",
-    "@stacksjs/sanitizer": "0.2.124",
+    "@stacksjs/desktop": "0.2.126",
+    "@stacksjs/sanitizer": "0.2.126",
     "@stacksjs/ts-i18n": "^0.1.11",
-    "bun-plugin-stx": "0.2.124",
+    "bun-plugin-stx": "0.2.126",
     "bunfig": "^0.15.15",
-    "stx-router": "0.2.124",
+    "stx-router": "0.2.126",
     "ts-broadcasting": "^0.0.9",
     "ts-images": "^0.1.9",
     "ts-syntax-highlighter": "^0.2.1"