@stacksjs/stx 0.2.170 → 0.2.172

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";
@@ -6,15 +6,20 @@ import {
   buildVirtualTypeScript,
   extractScriptBlocks,
   resolvePosition,
-  serverContextDeclarations
+  clientPayloadDeclarations,
+  scrapedBridgeNames,
+  serverContextDeclarations,
+  substituteInterpolationsInPlace
 } from "./stx-virtual-ts.js";
 export {
   extractScriptBlocks,
   extractTemplateExpressions
 } from "./stx-virtual-ts.js";
-export function buildVirtualSource(block) {
-  return `${(block.startLine > 1 ? `
-`.repeat(block.startLine - 1) : "") + block.code}
+export function buildVirtualSource(block, serverCode = "") {
+  const leadingNewlines = block.startLine > 1 ? `
+`.repeat(block.startLine - 1) : "", code = substituteInterpolationsInPlace(block.code), payload = block.kind === "client" || block.kind === "plain" ? clientPayloadDeclarations(serverCode) : "";
+  return `${leadingNewlines + code}
+${payload}
 export {}
 `;
 }
@@ -34,8 +39,91 @@ 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, checkedFiles = [];
+  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;
   const runtimeTypes = findRuntimeTypeDeclarations();
   for (const file of files) {
@@ -45,7 +133,14 @@ export async function typecheckStxFiles(files, options = {}) {
       if (b.kind === "client")
         return checkClient;
       return !1;
-    }), templateBuffer = checkTemplates ? buildVirtualTypeScript(source, { runtimeGlobals: !runtimeTypes }) : null, expressions = templateBuffer ? [...templateBuffer.lineMap.values()].filter((m) => m.expression).length : 0;
+    }), serverCode = extractScriptBlocks(source).filter((block) => block.kind === "server").map((block) => block.code).join(`
+`);
+    if (checkClient && serverCode) {
+      const clientBlocks = blocks.filter((block) => block.kind === "client"), names = [...new Set(clientBlocks.flatMap((block) => scrapedBridgeNames(serverCode, block.code)))];
+      if (names.length > 0)
+        scrapedByFile.set(file, { names, line: clientBlocks[0].startLine });
+    }
+    const templateBuffer = checkTemplates ? buildVirtualTypeScript(source, { runtimeGlobals: !runtimeTypes }) : null, expressions = templateBuffer ? [...templateBuffer.lineMap.values()].filter((m) => m.expression).length : 0;
     if (blocks.length === 0 && expressions === 0)
       continue;
     checkedFiles.push(file);
@@ -53,7 +148,7 @@ export async function typecheckStxFiles(files, options = {}) {
     expressionCount += expressions;
     blocks.forEach((block, i) => {
       virtualFiles.set(virtualPathFor(file, block.kind, i), {
-        source: buildVirtualSource(block),
+        source: buildVirtualSource(block, serverCode),
         origin: file,
         kind: block.kind
       });
@@ -68,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 = [
@@ -100,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)
@@ -108,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;
@@ -122,6 +224,8 @@ export async function typecheckStxFiles(files, options = {}) {
       const at = resolvePosition(entry.virtual, line, column);
       if (!at?.expression)
         continue;
+      if (Number(code) === 2774)
+        continue;
       line = at.line;
       column = at.column;
       expression = at.expression.code.trim();
@@ -137,6 +241,20 @@ export async function typecheckStxFiles(files, options = {}) {
       expression
     });
   }
+  if (checkClient)
+    for (const [file, scraped] of scrapedByFile) {
+      if (scraped.names.length === 0)
+        continue;
+      diagnostics.push({
+        file,
+        line: scraped.line,
+        column: 1,
+        code: 0,
+        message: `${scraped.names.length === 1 ? "1 value reaches" : `${scraped.names.length} values reach`} this block on the implicit bridge and ${scraped.names.length === 1 ? "is" : "are"} untyped: ${scraped.names.join(", ")}. Declare them with defineClientPayload({ ${scraped.names.join(", ")} }) in the server block to have them checked.`,
+        category: "warning",
+        blockKind: "client"
+      });
+    }
   const seen = new Set, unique = diagnostics.filter((d) => {
     const key = `${d.file}:${d.line}:${d.column}:${d.code}:${d.message}`;
     if (seen.has(key))
@@ -145,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/types/config-types.d.ts

@@ -344,6 +344,16 @@ export interface StrictModeConfig {
     failOnViolation?: boolean;
     /** Pattern strings to allow through validation (matched against message or regex source) */
     allowPatterns?: string[];
+    /**
+     * What to do when a `<script client>` block does not bundle.
+     *
+     * `'warn'` (default) ships the ORIGINAL, unbundled source so the page still
+     * renders — right for a dev server, and why the error overlay exists.
+     * `'error'` refuses instead, for anyone who would rather nothing rendered
+     * than a page whose bindings quietly do nothing. `stx build` fails on a
+     * bundle error either way. See #1884.
+     */
+    bundlerFallback?: 'warn' | 'error';
 }
 /**
  * Real-time broadcasting configuration.
@@ -655,9 +665,6 @@ export interface StxConfig {
      * rendered than a page whose bindings quietly do nothing. `stx build` fails on
      * a bundle error either way. See #1884.
      */
-    strict?: {
-        bundlerFallback?: 'warn' | 'error';
-    };
     /** Directory to store cached templates, defaults to `cache` inside `stateDir` */
     cachePath: string;
     /** Custom directives registered by the user */

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.170",
+  "version": "0.2.172",
   "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.170",
-    "@stacksjs/sanitizer": "0.2.170",
+    "@stacksjs/desktop": "0.2.172",
+    "@stacksjs/sanitizer": "0.2.172",
     "@stacksjs/ts-i18n": "^0.1.11",
-    "bun-plugin-stx": "0.2.170",
+    "bun-plugin-stx": "0.2.172",
     "bunfig": "^0.15.17",
-    "stx-router": "0.2.170",
+    "stx-router": "0.2.172",
     "ts-broadcasting": "^0.0.9",
     "ts-images": "^0.1.9",
     "ts-syntax-highlighter": "^0.2.1"