@stacksjs/stx 0.2.163 → 0.2.165

package/dist/stx-virtual-ts.d.ts

@@ -103,7 +103,7 @@ export declare const UNWRAP_HELPER: '__StxTemplateValue';
  * Mirrors what `serve.ts` puts in scope. Declaring these is what lets the
  * checker report a genuine typo instead of suppressing every unresolved name.
  */
-export declare const STX_SERVER_CONTEXT: readonly ['params', 'query', 'cookies', 'host', 'ip', 'setResponseStatus', 'setResponseHeader', 'request', 'url', 'definePageMeta'];
+export declare const STX_SERVER_CONTEXT: readonly ['params', 'query', 'cookies', 'host', 'ip', 'setResponseStatus', 'setResponseHeader', 'notFound', 'request', 'url', 'definePageMeta'];
 /**
  * Names the template engine puts in scope for every page.
  *

package/dist/stx-virtual-ts.js

@@ -226,6 +226,7 @@ export const STX_SERVER_CONTEXT = [
   "ip",
   "setResponseStatus",
   "setResponseHeader",
+  "notFound",
   "request",
   "url",
   "definePageMeta"

package/dist/variable-extractor.js

@@ -587,6 +587,7 @@ export function isCompleteImport(statement) {
   }
   return quote === null && braces === 0 && closedSpecifier;
 }
+const UNINITIALIZED_DECLARATION = /^(?:export\s+)?(?:const|let|var)\s+[A-Za-z_$][\w$]*(?:\s*,\s*[A-Za-z_$][\w$]*)*\s*;?$/;
 export function convertToCommonJS(scriptContent, filePath) {
   const templateDir = filePath ? path.dirname(filePath) : process.cwd(), projectRoot = process.cwd(), lines = scriptContent.split(`
 `), convertedLines = [];
@@ -714,7 +715,7 @@ export function convertToCommonJS(scriptContent, filePath) {
       i++;
       continue;
     }
-    if ((line.startsWith("const ") || line.startsWith("let ") || line.startsWith("var ") || line.startsWith("export const ") || line.startsWith("export let ") || line.startsWith("export var ")) && !line.includes("=")) {
+    if (UNINITIALIZED_DECLARATION.test(line)) {
       convertedLines.push(lines[i]);
       i++;
     } else if (line.startsWith("export const ") || line.startsWith("export let ") || line.startsWith("export var ")) {
@@ -937,17 +938,14 @@ function extractDestructuredNames(pattern) {
   while (i < inner.length) {
     const char = inner[i];
     if (char === "{" || char === "[") {
-      depth++;
-      if (depth === 1) {
-        const nested = extractDestructuringPattern(inner, i);
-        if (nested) {
-          const nestedNames = extractDestructuredNames(nested.pattern);
-          names.push(...nestedNames);
-          i = nested.endPos;
-          currentName = "";
-          continue;
-        }
+      const nested = depth === 0 ? extractDestructuringPattern(inner, i) : null;
+      if (nested) {
+        names.push(...extractDestructuredNames(nested.pattern));
+        i = nested.endPos;
+        currentName = "";
+        continue;
       }
+      depth++;
     } else if (char === "}" || char === "]")
       depth--;
     if (depth > 0) {
@@ -1041,20 +1039,50 @@ export function splitDeclaration(line) {
     value: line.slice(index + 1).trim()
   };
 }
+function countPatternDepth(text, openChar, closeChar, depth) {
+  let quote = null, escaped = !1;
+  for (const character of text) {
+    if (escaped) {
+      escaped = !1;
+      continue;
+    }
+    if (character === "\\") {
+      escaped = !0;
+      continue;
+    }
+    if (quote) {
+      if (character === quote)
+        quote = null;
+      continue;
+    }
+    if (character === "'" || character === '"' || character === "`") {
+      quote = character;
+      continue;
+    }
+    if (character === openChar)
+      depth++;
+    else if (character === closeChar)
+      depth--;
+  }
+  return depth;
+}
 function parseVariableDeclaration(lines, startIndex) {
   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) {
       let afterKeyword = firstLine.slice(destructuringPrefix[0].length), joinedEndIndex = startIndex;
-      if ((afterKeyword.startsWith("{") || afterKeyword.startsWith("[")) && !afterKeyword.includes(afterKeyword.startsWith("{") ? "}" : "]")) {
-        const closeChar = afterKeyword.startsWith("{") ? "}" : "]";
-        let joined = afterKeyword;
-        for (let j = startIndex + 1;j < lines.length; j++) {
-          joined += " " + lines[j].trim();
+      if (afterKeyword.startsWith("{") || afterKeyword.startsWith("[")) {
+        const openChar = afterKeyword[0], closeChar = openChar === "{" ? "}" : "]";
+        let depth = countPatternDepth(afterKeyword, openChar, closeChar, 0), joined = afterKeyword;
+        for (let j = startIndex + 1;j < lines.length && depth > 0; j++) {
+          joined += ` ${lines[j].trim()}`;
           joinedEndIndex = j;
-          if (lines[j].includes(closeChar))
-            break;
+          depth = countPatternDepth(lines[j], openChar, closeChar, depth);
+        }
+        if (depth > 0) {
+          joined = afterKeyword;
+          joinedEndIndex = startIndex;
         }
         afterKeyword = joined;
       }

package/package.json

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