@stacksjs/stx 0.2.171 → 0.2.173

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

@@ -108,6 +108,19 @@ export declare function splitTopLevelImports(code: string): { imports: string, b
  * checked against the server block, or do not and they are `any`.
  */
 export declare function clientPayloadDeclarations(serverCode: string): string;
+/**
+ * Declarations at the TOP LEVEL of a block, ignoring anything nested.
+ *
+ * `collectBlockDeclarations` matches `^\s*const …` with leading whitespace
+ * allowed, so it also returns bindings local to a function. For most callers
+ * that is harmless. For the bridge warning it is not: a `const state` inside a
+ * helper never crosses to the client, and naming it told the author to declare
+ * a payload entry that would do nothing (stacksjs/stx#1908).
+ *
+ * Nested braces are blanked first, so only depth-zero declarations survive to
+ * be matched by the shared patterns.
+ */
+export declare function collectTopLevelDeclarations(code: string): string[];
 /**
  * Server bindings a client block reaches for without a declared payload.
  *

package/dist/stx-virtual-ts.js

@@ -1,18 +1,22 @@
 import { stripCommentsAndLiterals } from "./strip-literals.js";
 import { STX_RUNTIME_GLOBALS } from "./runtime-globals.js";
 const SCRIPT_RE = /<script(\s[^>]*)?>([\s\S]*?)<\/script>/gi;
+function blankCommentContents(source) {
+  const blank = (match) => match.replace(/[^\n]/g, " ");
+  return source.replace(/<!--[\s\S]*?-->/g, blank).replace(/\{\{--[\s\S]*?--\}\}/g, blank);
+}
 export function extractScriptBlocks(source) {
-  const blocks = [];
+  const blocks = [], scannable = blankCommentContents(source);
   SCRIPT_RE.lastIndex = 0;
   let match;
-  while ((match = SCRIPT_RE.exec(source)) !== null) {
-    const attrs = (match[1] || "").trim(), body = match[2] ?? "";
+  while ((match = SCRIPT_RE.exec(scannable)) !== null) {
+    const attrs = (match[1] || "").trim(), openLength = (match[0].match(/^<script(?:\s[^>]*)?>/i)?.[0] ?? "<script>").length, closeLength = (match[0].match(/<\/script\s*>$/i)?.[0] ?? "</script>").length, bodyStart = match.index + openLength, bodyEnd = match.index + match[0].length - closeLength, body = source.slice(bodyStart, bodyEnd);
     if (/\bsrc\s*=/.test(attrs))
       continue;
     const typeMatch = attrs.match(/\btype\s*=\s*["']([^"']+)["']/i);
     if (typeMatch && !/^(?:module|text\/(?:javascript|typescript))$/i.test(typeMatch[1]))
       continue;
-    const kind = /\bserver\b/.test(attrs) ? "server" : /\bclient\b/.test(attrs) ? "client" : "plain", openTag = match[0].match(/^<script[^>]*>/i)?.[0] ?? "<script>", startLine = lineAt(source, match.index + openTag.length);
+    const kind = /\bserver\b/.test(attrs) ? "server" : /\bclient\b/.test(attrs) ? "client" : "plain", startLine = lineAt(source, bodyStart);
     blocks.push({ kind, code: body, startLine, attrs });
   }
   return blocks;
@@ -108,7 +112,9 @@ const NON_EXPRESSION_ATTRS = new Set([
   "x-teleport",
   "v-slot",
   "x-hydrate",
-  ":key"
+  ":key",
+  "x-tooltip",
+  "x-tooltip-position"
 ]);
 export function extractTemplateExpressions(source) {
   const masked = maskNonTemplateRegions(source), found = [], interpolation = /(@?)\{\{([\s\S]*?)\}\}|(@?)\{!!([\s\S]*?)!!\}/g;
@@ -313,11 +319,34 @@ export function clientPayloadDeclarations(serverCode) {
   return parts.join(`
 `);
 }
+export function collectTopLevelDeclarations(code) {
+  const chars = stripCommentsAndLiterals(code).split("");
+  let depth = 0;
+  for (let i = 0;i < chars.length; i++) {
+    const c = chars[i];
+    if (c === "{" || c === "(" || c === "[") {
+      depth++;
+      continue;
+    }
+    if (c === "}" || c === ")" || c === "]") {
+      depth = Math.max(0, depth - 1);
+      continue;
+    }
+    if (depth > 0 && c !== `
+`)
+      chars[i] = " ";
+  }
+  return collectBlockDeclarations(chars.join(""));
+}
 export function scrapedBridgeNames(serverCode, clientCode) {
   if (extractClientPayloadNames(serverCode) !== null)
     return [];
-  const searchable = stripCommentsAndLiterals(clientCode);
-  return collectBlockDeclarations(serverCode).filter((name) => {
+  const searchable = stripCommentsAndLiterals(clientCode), provided = new Set(STX_RUNTIME_GLOBALS);
+  return collectTopLevelDeclarations(serverCode).filter((name) => {
+    if (provided.has(name))
+      return !1;
+    if (collectBlockDeclarations(clientCode).includes(name))
+      return !1;
     return new RegExp(`(?<![.#\\w$])${name}(?![\\w$])`).test(searchable);
   });
 }

package/dist/typecheck.d.ts

@@ -29,19 +29,6 @@ export declare function sourcePathFor(virtualPath: string): string;
  * than hand tsc a path to nothing.
  */
 export declare function findRuntimeTypeDeclarations(): string | null;
-/**
- * Type-check `.stx` files.
- *
- * Runs the `tsc` BINARY over generated virtual files rather than driving the
- * compiler API. TypeScript 7 ships as a Go port whose npm package exposes only
- * `version` — no `createProgram`, no `ScriptTarget` — so an API-based checker
- * would work on TS 5 and break on the version this repo actually resolves.
- * Shelling out works across both.
- *
- * TypeScript is not a declared dependency: anyone running a type-check already
- * has it, and making the package depend on a compiler to serve a page would be
- * the wrong trade.
- */
 export declare function typecheckStxFiles(files: string[], options?: TypecheckOptions): Promise<TypecheckResult>;
 /** Render diagnostics the way a CLI should: file:line:col, then the message. */
 export declare function formatTypecheckDiagnostics(diagnostics: TypecheckDiagnostic[]): string;
@@ -64,6 +51,7 @@ export declare interface TypecheckOptions {
 }
 export declare interface TypecheckResult {
   diagnostics: TypecheckDiagnostic[]
+  failure?: string
   checkedFiles: string[]
   blockCount: number
   expressionCount: number

package/dist/typecheck.js

@@ -1,4 +1,4 @@
-import { existsSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import path from "node:path";
 import { STX_RUNTIME_GLOBALS } from "./runtime-globals.js";
 import { stateDir } from "./state-dir.js";
@@ -39,6 +39,89 @@ export function findRuntimeTypeDeclarations() {
   return null;
 }
 const TSC_LINE_RE = /^(.*?)\((\d+),(\d+)\):\s+(error|warning)\s+TS(\d+):\s+(.*)$/;
+function readProjectPathAliases(startDir) {
+  let dir = path.resolve(startDir), configPath;
+  for (;; ) {
+    const candidate = path.join(dir, "tsconfig.json");
+    if (existsSync(candidate)) {
+      configPath = candidate;
+      break;
+    }
+    const parent = path.dirname(dir);
+    if (parent === dir)
+      break;
+    dir = parent;
+  }
+  if (!configPath)
+    return {};
+  const stripJsonc = (text) => {
+    let out = "", inString = !1, escaped = !1;
+    for (let i = 0;i < text.length; i++) {
+      const c = text[i];
+      if (inString) {
+        out += c;
+        if (escaped)
+          escaped = !1;
+        else if (c === "\\")
+          escaped = !0;
+        else if (c === '"')
+          inString = !1;
+        continue;
+      }
+      if (c === '"') {
+        inString = !0;
+        out += c;
+        continue;
+      }
+      if (c === "/" && text[i + 1] === "/") {
+        while (i < text.length && text[i] !== `
+`)
+          i++;
+        out += `
+`;
+        continue;
+      }
+      if (c === "/" && text[i + 1] === "*") {
+        i += 2;
+        while (i < text.length && !(text[i] === "*" && text[i + 1] === "/"))
+          i++;
+        i++;
+        continue;
+      }
+      out += c;
+    }
+    return out.replace(/,(\s*[}\]])/g, "$1");
+  }, seen = new Set;
+  let current = configPath, paths, baseUrl, owner = configPath;
+  while (current && !seen.has(current)) {
+    seen.add(current);
+    let parsed;
+    try {
+      parsed = JSON.parse(stripJsonc(readFileSync(current, "utf8")));
+    } catch {
+      break;
+    }
+    const co = parsed?.compilerOptions ?? {};
+    if (!paths && co.paths && typeof co.paths === "object") {
+      paths = co.paths;
+      owner = current;
+    }
+    if (!baseUrl && typeof co.baseUrl === "string")
+      baseUrl = path.resolve(path.dirname(current), co.baseUrl);
+    if (paths && baseUrl)
+      break;
+    current = typeof parsed?.extends === "string" ? path.resolve(path.dirname(current), parsed.extends.endsWith(".json") ? parsed.extends : `${parsed.extends}.json`) : void 0;
+  }
+  if (!paths)
+    return {};
+  const base = baseUrl ?? path.dirname(owner), absolute = {};
+  for (const [pattern, targets] of Object.entries(paths)) {
+    if (!Array.isArray(targets))
+      continue;
+    absolute[pattern] = targets.map((t) => typeof t === "string" && !path.isAbsolute(t) ? path.resolve(base, t) : t);
+  }
+  return { paths: absolute };
+}
 export async function typecheckStxFiles(files, options = {}) {
   const checkClient = options.client !== !1, checkServer = options.server !== !1, checkTemplates = options.templates !== !1, virtualFiles = new Map, scrapedByFile = new Map, checkedFiles = [];
   let blockCount = 0, expressionCount = 0;
@@ -80,7 +163,7 @@ export async function typecheckStxFiles(files, options = {}) {
   }
   if (virtualFiles.size === 0)
     return { diagnostics: [], checkedFiles, blockCount: 0, expressionCount: 0 };
-  const ambient = [...options.extraLibs ?? []];
+  const ambient = (options.extraLibs ?? []).map((lib) => path.resolve(lib));
   if (runtimeTypes)
     ambient.push(runtimeTypes);
   const globalsDts = `${stateDir()}/typecheck/__stx_globals.d.ts`, globalDecls = [
@@ -112,6 +195,7 @@ export async function typecheckStxFiles(files, options = {}) {
       resolveJsonModule: !0,
       lib: ["ESNext", "DOM", "DOM.Iterable"],
       types: [],
+      ...readProjectPathAliases(files.length > 0 ? path.dirname(path.resolve(files[0])) : process.cwd()),
       ...options.compilerOptions ?? {}
     },
     files: [...writtenToOrigin.keys()].map((name) => `${workDir}/${name}`).concat(globalsDts, ...ambient)
@@ -120,12 +204,18 @@ export async function typecheckStxFiles(files, options = {}) {
   const proc = Bun.spawnSync(["bun", "x", "tsc", "-p", tsconfigPath, "--pretty", "false"], {
     stdout: "pipe",
     stderr: "pipe"
-  }), output = new TextDecoder().decode(proc.stdout) + new TextDecoder().decode(proc.stderr), diagnostics = [];
+  }), output = new TextDecoder().decode(proc.stdout) + new TextDecoder().decode(proc.stderr), diagnostics = [], exitCode = proc.exitCode ?? 0;
+  let printedDiagnostics = 0;
+  const ambientBasenames = new Set(ambient.map((lib) => lib.split("/").pop()));
+  let ambientDiagnostics = 0;
   for (const rawLine of output.split(`
 `)) {
     const m = rawLine.match(TSC_LINE_RE);
     if (!m)
       continue;
+    printedDiagnostics++;
+    if (ambientBasenames.has(m[1].split("/").pop()))
+      ambientDiagnostics++;
     const [, filePart, lineStr, colStr, category, code, message] = m, entry = writtenToOrigin.get(filePart.split("/").pop());
     if (!entry)
       continue;
@@ -173,7 +263,11 @@ export async function typecheckStxFiles(files, options = {}) {
     return !0;
   });
   unique.sort((a, b) => a.file.localeCompare(b.file) || a.line - b.line || a.column - b.column);
-  return { diagnostics: unique, checkedFiles, blockCount, expressionCount };
+  const brokenLib = ambientDiagnostics > 0 && unique.length === 0, failure = brokenLib || exitCode !== 0 && printedDiagnostics === 0 ? `${brokenLib ? "a file passed with --lib has errors of its own, so nothing in your code was checked" : `tsc exited ${exitCode} without reporting any diagnostic, so nothing was checked`}. ` + "A syntax error in an ambient declaration file does this \u2014 skipLibCheck suppresses " + `SEMANTIC diagnostics only. tsc said:
+${output.trim().split(`
+`).slice(0, 12).join(`
+`) || "(no output)"}` : void 0;
+  return { diagnostics: unique, checkedFiles, blockCount, expressionCount, failure };
 }
 export function formatTypecheckDiagnostics(diagnostics) {
   return diagnostics.map((d) => {

package/dist/variable-extractor.js

@@ -676,7 +676,7 @@ export function convertToCommonJS(scriptContent, filePath) {
       };
       if (defaultImportMatch) {
         const [, name, source] = defaultImportMatch, resolved = resolveSource(source);
-        convertedLines.push(`const ${name} = await import('${resolved}')`);
+        convertedLines.push(`const ${name} = (await import('${resolved}')).default`);
         convertedLines.push(`module.exports.${name} = ${name};`);
       } else if (namedImportMatch) {
         const [, names, source] = namedImportMatch, resolved = resolveSource(source), specifiers = [], exported = [], isStxRuntime = STX_RUNTIME_SPECIFIERS.has(source);

package/package.json

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