@vesk/vesk-cli 0.2.35 → 0.2.36

package/dist/cli.js

@@ -18230,115 +18230,12 @@ var init_tokens = __esm({
   }
 });
 
-// ../compiler/src/vsk-imports.ts
-import { dirname as dirname2, resolve } from "node:path";
-import { existsSync as existsSync2 } from "node:fs";
-import { print as print2 } from "esrap";
-import ts2 from "esrap/languages/ts";
-function vskImportTarget(importText) {
-  const spec = importModuleTarget(importText);
-  if (spec === null || !spec.endsWith(".vsk")) return null;
-  const tokens = tokenizeCode(importText);
-  if (tokens === null) return null;
-  const hasFrom = tokens.some((t) => t.label === "name" && t.value === "from");
-  if (!hasFrom) return null;
-  return spec;
-}
-function extractImportStatements(source) {
-  try {
-    const ast = parse4(source, { filename: "imports.vsk" });
-    const out = [];
-    for (const stmt of ast.body) {
-      if (stmt.type === "ImportDeclaration") {
-        out.push(source.slice(stmt.start, stmt.end));
-      }
-    }
-    return out;
-  } catch {
-    return tokenExtractImportStatements(source);
-  }
-}
-function tokenExtractImportStatements(source) {
-  const tokens = tokenizeCode(source);
-  if (tokens === null) return [];
-  const out = [];
-  for (let i = 0; i < tokens.length; i++) {
-    if (tokens[i].label !== "import") continue;
-    const start = tokens[i].start;
-    let lastStringEnd = -1;
-    let end = -1;
-    let j = i + 1;
-    while (j < tokens.length) {
-      if (tokens[j].label === ";") {
-        end = tokens[j].end;
-        break;
-      }
-      if (tokens[j].label === "import") break;
-      if (tokens[j].label === "string") lastStringEnd = tokens[j].end;
-      j++;
-    }
-    if (end === -1) end = lastStringEnd !== -1 ? lastStringEnd : tokens[i].end;
-    const stmt = source.slice(start, end).trim();
-    if (stmt) out.push(stmt);
-    if (tokens[j] && tokens[j].label === ";") i = j;
-  }
-  return out;
-}
-function collectVskImportPaths(imports, sourcePath2) {
-  const out = [];
-  for (const imp of imports) {
-    if (stripTypeImport(imp) === null) continue;
-    const target = vskImportTarget(imp);
-    if (!target || !target.startsWith(".")) continue;
-    const full = resolve(dirname2(sourcePath2), target);
-    if (existsSync2(full)) out.push(full);
-  }
-  return out;
-}
-function vskImportLines(source) {
-  return extractImportStatements(source).filter((imp) => vskImportTarget(imp) !== null && stripTypeImport(imp) !== null);
-}
-function isTypeOnlyImport(stmt) {
-  if (!stmt || stmt.type !== "ImportDeclaration") return false;
-  if (stmt.importKind === "type") return true;
-  const specs = stmt.specifiers || [];
-  return specs.length > 0 && specs.every((s) => s.importKind === "type");
-}
-function stripTypeImport(importSrc) {
-  let ast;
-  try {
-    ast = parse4(importSrc, { filename: "import.mjs" });
-  } catch {
-    return importSrc;
-  }
-  const stmt = (ast.body || []).find((n) => n.type === "ImportDeclaration");
-  if (!stmt) return importSrc;
-  if (isTypeOnlyImport(stmt)) return null;
-  const specs = stmt.specifiers || [];
-  const kept = specs.filter((s) => s.importKind !== "type");
-  if (specs.length > 0 && kept.length === 0) return null;
-  if (kept.length === specs.length) return importSrc;
-  try {
-    const rewritten = { ...stmt, specifiers: kept };
-    return print2({ type: "Program", body: [rewritten], sourceType: "module" }, ts2()).code.trim();
-  } catch {
-    return importSrc;
-  }
-}
-var init_vsk_imports = __esm({
-  "../compiler/src/vsk-imports.ts"() {
-    "use strict";
-    init_parser();
-    init_tokens();
-  }
-});
-
 // ../compiler/src/module-imports.ts
-import { readFileSync as readFileSync2, existsSync as existsSync3, realpathSync, statSync } from "node:fs";
+import { readFileSync as readFileSync2, existsSync as existsSync2, realpathSync, statSync } from "node:fs";
 import { createRequire as createRequire2 } from "node:module";
-import { dirname as dirname3, extname, isAbsolute, join as join2, resolve as resolve2 } from "node:path";
-import { print as print3 } from "esrap";
-import ts3 from "esrap/languages/ts";
+import { dirname as dirname2, extname, isAbsolute, join as join2, resolve } from "node:path";
+import { print as print2 } from "esrap";
+import ts2 from "esrap/languages/ts";
 import { walk as walk2 } from "zimmerframe";
 function cacheModule(p, val) {
   MODULE_CACHE.delete(p);
@@ -18396,7 +18293,7 @@ function localValueImportNames(importStrs) {
 }
 function applyLocalModuleImports(__vesk, importStrs, sourcePath2) {
   if (!sourcePath2) return;
-  const fromDir = dirname3(sourcePath2);
+  const fromDir = dirname2(sourcePath2);
   for (const imp of importStrs) {
     const target = importModuleTarget(imp);
     if (!target || isCompilerOwnedTarget(target) || isValueLessTarget(target)) continue;
@@ -18458,7 +18355,7 @@ function loadSsrModule(absPath) {
       const src2 = readSsrSource(absPath);
       const body = src2?.ast?.body || [];
       if (src2 && isPureReexportBarrel(body)) {
-        exportsObj = createLazyBarrelExports(buildBarrelSpec(body), dirname3(absPath));
+        exportsObj = createLazyBarrelExports(buildBarrelSpec(body), dirname2(absPath));
       } else {
         exportsObj = {};
         EVALUATING.set(absPath, exportsObj);
@@ -18673,7 +18570,7 @@ function evaluateModuleFile(absPath, exportsObj, src2) {
   if (!ast) {
     try {
       const fn = new Function("require", "module", "exports", "__dirname", "__filename", raw2);
-      fn(createModuleRequire(dirname3(absPath)), { exports: exportsObj }, exportsObj, dirname3(absPath), absPath);
+      fn(createModuleRequire(dirname2(absPath)), { exports: exportsObj }, exportsObj, dirname2(absPath), absPath);
     } catch (err) {
       console.warn(`[vesk] SSR: failed to load ${absPath}: ${err?.message ?? String(err)}`);
       return false;
@@ -18695,7 +18592,7 @@ function evaluateModuleFile(absPath, exportsObj, src2) {
   const body = esmToCjs(stripped.body);
   try {
     const fn = new Function("require", "module", "exports", "__dirname", "__filename", "'use strict';\n" + body);
-    fn(createModuleRequire(dirname3(absPath)), { exports: exportsObj }, exportsObj, dirname3(absPath), absPath);
+    fn(createModuleRequire(dirname2(absPath)), { exports: exportsObj }, exportsObj, dirname2(absPath), absPath);
   } catch (err) {
     console.warn(`[vesk] SSR: failed to load ${absPath}: ${err?.message ?? String(err)}`);
     return false;
@@ -18789,7 +18686,7 @@ function findTsconfigPath(fromDir) {
   for (let depth = 0; depth < 64; depth++) {
     const st = statOrNull(join2(dir, "tsconfig.json"));
     if (st && st.isFile()) return join2(dir, "tsconfig.json");
-    const parent = dirname3(dir);
+    const parent = dirname2(dir);
     if (parent === dir) break;
     dir = parent;
   }
@@ -18810,13 +18707,13 @@ function buildAliases(tsconfig) {
   }
   const co = parsed?.compilerOptions;
   if (!co || typeof co.paths !== "object" || co.paths === null) return EMPTY_ALIASES;
-  const configDir = dirname3(tsconfig);
-  const baseUrl = typeof co.baseUrl === "string" && co.baseUrl.length > 0 ? resolve2(configDir, co.baseUrl) : configDir;
+  const configDir = dirname2(tsconfig);
+  const baseUrl = typeof co.baseUrl === "string" && co.baseUrl.length > 0 ? resolve(configDir, co.baseUrl) : configDir;
   const exact = /* @__PURE__ */ new Map();
   const wildcard = [];
   for (const [key, value] of Object.entries(co.paths)) {
     if (!Array.isArray(value)) continue;
-    const targets = value.filter((t) => typeof t === "string").map((t) => resolve2(baseUrl, t));
+    const targets = value.filter((t) => typeof t === "string").map((t) => resolve(baseUrl, t));
     if (targets.length === 0) continue;
     const star = key.indexOf("*");
     if (star === -1) exact.set(key, targets);
@@ -18857,12 +18754,12 @@ function resolveAliasModule(spec, fromDir) {
 }
 function resolveImportPath(spec, fromDir) {
   if (spec.startsWith("./") || spec.startsWith("../")) {
-    const base = resolve2(fromDir, spec);
+    const base = resolve(fromDir, spec);
     if (extname(base)) return base;
     for (const suffix of EXTENSIONS) {
-      if (existsSync3(base + suffix)) return base + suffix;
+      if (existsSync2(base + suffix)) return base + suffix;
     }
-    if (existsSync3(`${base}.vsk`)) return `${base}.vsk`;
+    if (existsSync2(`${base}.vsk`)) return `${base}.vsk`;
     return `${base}.ts`;
   }
   if (!isAbsolute(spec)) {
@@ -18874,11 +18771,11 @@ function resolveImportPath(spec, fromDir) {
 function resolveSsrModule(specifier, fromDir) {
   let resolved = null;
   if (specifier === "." || specifier === "..") {
-    resolved = probeFile(resolve2(fromDir, specifier));
+    resolved = probeFile(resolve(fromDir, specifier));
   } else if (isAbsolute(specifier)) {
-    resolved = probeFile(resolve2(specifier));
+    resolved = probeFile(resolve(specifier));
   } else if (specifier.startsWith("./") || specifier.startsWith("../")) {
-    resolved = probeFile(resolve2(fromDir, specifier));
+    resolved = probeFile(resolve(fromDir, specifier));
   } else {
     const aliased = resolveAliasModule(specifier, fromDir);
     if (aliased) return toRealPath(aliased);
@@ -18892,7 +18789,7 @@ function resolveSsrModule(specifier, fromDir) {
         resolved = found;
         break;
       }
-      const parent = dirname3(dir);
+      const parent = dirname2(dir);
       if (parent === dir) break;
       dir = parent;
     }
@@ -18955,7 +18852,7 @@ function probeFile(base) {
       try {
         const pkg = JSON.parse(readFileSync2(pkgPath, "utf-8"));
         if (typeof pkg.main === "string" && pkg.main.length > 0) {
-          const viaMain = probeFile(resolve2(base, pkg.main));
+          const viaMain = probeFile(resolve(base, pkg.main));
           if (viaMain) return viaMain;
         }
       } catch {
@@ -18980,7 +18877,7 @@ function astName(node) {
 }
 function printNode(node) {
   try {
-    return print3(node, ts3()).code.trim();
+    return print2(node, ts2()).code.trim();
   } catch {
     return "";
   }
@@ -19154,7 +19051,7 @@ function collectModuleBundled(absPath, collector) {
   if (existing) return existing;
   const key = `__veskMod${collector.keysByAbs.size}`;
   collector.keysByAbs.set(absPath, key);
-  const dir = dirname3(absPath);
+  const dir = dirname2(absPath);
   if (absPath.endsWith(".json")) {
     let raw2 = "";
     try {
@@ -19222,6 +19119,115 @@ var init_module_imports = __esm({
   }
 });
 
+// ../compiler/src/vsk-imports.ts
+import { dirname as dirname3, resolve as resolve2 } from "node:path";
+import { existsSync as existsSync3 } from "node:fs";
+import { print as print3 } from "esrap";
+import ts3 from "esrap/languages/ts";
+function vskImportTarget(importText) {
+  const spec = importModuleTarget(importText);
+  if (spec === null || !spec.endsWith(".vsk")) return null;
+  const tokens = tokenizeCode(importText);
+  if (tokens === null) return null;
+  const hasFrom = tokens.some((t) => t.label === "name" && t.value === "from");
+  if (!hasFrom) return null;
+  return spec;
+}
+function extractImportStatements(source) {
+  try {
+    const ast = parse4(source, { filename: "imports.vsk" });
+    const out = [];
+    for (const stmt of ast.body) {
+      if (stmt.type === "ImportDeclaration") {
+        out.push(source.slice(stmt.start, stmt.end));
+      }
+    }
+    return out;
+  } catch {
+    return tokenExtractImportStatements(source);
+  }
+}
+function tokenExtractImportStatements(source) {
+  const tokens = tokenizeCode(source);
+  if (tokens === null) return [];
+  const out = [];
+  for (let i = 0; i < tokens.length; i++) {
+    if (tokens[i].label !== "import") continue;
+    const start = tokens[i].start;
+    let lastStringEnd = -1;
+    let end = -1;
+    let j = i + 1;
+    while (j < tokens.length) {
+      if (tokens[j].label === ";") {
+        end = tokens[j].end;
+        break;
+      }
+      if (tokens[j].label === "import") break;
+      if (tokens[j].label === "string") lastStringEnd = tokens[j].end;
+      j++;
+    }
+    if (end === -1) end = lastStringEnd !== -1 ? lastStringEnd : tokens[i].end;
+    const stmt = source.slice(start, end).trim();
+    if (stmt) out.push(stmt);
+    if (tokens[j] && tokens[j].label === ";") i = j;
+  }
+  return out;
+}
+function collectVskImportPaths(imports, sourcePath2) {
+  const out = [];
+  for (const imp of imports) {
+    if (stripTypeImport(imp) === null) continue;
+    const target = vskImportTarget(imp);
+    if (!target) continue;
+    if (target.startsWith(".")) {
+      const full = resolve2(dirname3(sourcePath2), target);
+      if (existsSync3(full)) out.push(full);
+      continue;
+    }
+    const aliased = resolveImportPath(target, dirname3(sourcePath2));
+    if (aliased !== target && existsSync3(aliased)) out.push(aliased);
+  }
+  return out;
+}
+function vskImportLines(source) {
+  return extractImportStatements(source).filter((imp) => vskImportTarget(imp) !== null && stripTypeImport(imp) !== null);
+}
+function isTypeOnlyImport(stmt) {
+  if (!stmt || stmt.type !== "ImportDeclaration") return false;
+  if (stmt.importKind === "type") return true;
+  const specs = stmt.specifiers || [];
+  return specs.length > 0 && specs.every((s) => s.importKind === "type");
+}
+function stripTypeImport(importSrc) {
+  let ast;
+  try {
+    ast = parse4(importSrc, { filename: "import.mjs" });
+  } catch {
+    return importSrc;
+  }
+  const stmt = (ast.body || []).find((n) => n.type === "ImportDeclaration");
+  if (!stmt) return importSrc;
+  if (isTypeOnlyImport(stmt)) return null;
+  const specs = stmt.specifiers || [];
+  const kept = specs.filter((s) => s.importKind !== "type");
+  if (specs.length > 0 && kept.length === 0) return null;
+  if (kept.length === specs.length) return importSrc;
+  try {
+    const rewritten = { ...stmt, specifiers: kept };
+    return print3({ type: "Program", body: [rewritten], sourceType: "module" }, ts3()).code.trim();
+  } catch {
+    return importSrc;
+  }
+}
+var init_vsk_imports = __esm({
+  "../compiler/src/vsk-imports.ts"() {
+    "use strict";
+    init_parser();
+    init_module_imports();
+    init_tokens();
+  }
+});
+
 // ../compiler/src/ir-generator.ts
 function parseExprNode(text) {
   try {
@@ -39013,6 +39019,8 @@ import { readFileSync as readFileSync6, existsSync as existsSync7 } from "node:f
 import { resolve as resolve6 } from "node:path";
 var GLOBAL_CSS_URL = "/_vesk/static/global.css";
 function resolveUserCssPath(appDir) {
+  const appCssSrc = resolve6(appDir, "global.css");
+  if (existsSync7(appCssSrc)) return appCssSrc;
   const cssSrc = resolve6(appDir, "..", "src", "global.css");
   if (existsSync7(cssSrc)) return cssSrc;
   const altCssSrc = resolve6(appDir, "..", "src", "app.css");
@@ -39167,7 +39175,7 @@ ${layoutDecls.map((d) => "  " + d.compiled + ",").join("\n")}
     const plan = precompilePlan(compPath);
     compRegEntries.push(`  (() => {
     const _compiled = (() => { try { return hydratePrecompile(${plan}); } catch { return null; } })();
-    registry.set(${JSON.stringify(compName)}, async (props, __registry, __vesk) => {
+    __componentRegistry.set(${JSON.stringify(compName)}, async (props, __registry, __vesk) => {
       const result = await renderPage('', ${JSON.stringify(compName)}, props, __registry, { hydrate: true, cached: _compiled });
       return result.body;
     });
@@ -48242,7 +48250,7 @@ async function addPluginToConfig2(projectDir, pkg) {
   let source;
   if (!path) {
     const importName2 = importNameForPackage(pkg);
-    const entry2 = pkg === "@vesk/plugin-tailwind" ? `${importName2}({ entry: 'src/global.css', appDir: 'app' })` : `${importName2}()`;
+    const entry2 = pkg === "@vesk/plugin-tailwind" ? `${importName2}({ entry: 'app/global.css', appDir: 'app' })` : `${importName2}()`;
     source = `import { defineConfig } from '@vesk/compiler'
 import ${importName2} from '${pkg}'
 
@@ -48326,7 +48334,7 @@ export default defineConfig({
         source = importLine + source;
     }
   }
-  const entry = pkg === "@vesk/plugin-tailwind" ? `${importName}({ entry: 'src/global.css', appDir: 'app' })` : `${importName}()`;
+  const entry = pkg === "@vesk/plugin-tailwind" ? `${importName}({ entry: 'app/global.css', appDir: 'app' })` : `${importName}()`;
   const newSource = insertIntoPluginsArray(source, entry);
   if (newSource === source)
     return;
@@ -51178,6 +51186,9 @@ import { readFileSync as readFileSync33, existsSync as existsSync37 } from "node
 import { resolve as resolve33 } from "node:path";
 var GLOBAL_CSS_URL2 = "/_vesk/static/global.css";
 function resolveUserCssPath2(appDir) {
+  const appCssSrc = resolve33(appDir, "global.css");
+  if (existsSync37(appCssSrc))
+    return appCssSrc;
   const cssSrc = resolve33(appDir, "..", "src", "global.css");
   if (existsSync37(cssSrc))
     return cssSrc;
@@ -52793,13 +52804,20 @@ async function startDevServer(port, projectDir, config, host) {
   }
   let devGlobalCssContent = "";
   let lastServedCssGlobal = "";
+  const appCssPath = join24(appDirPath, "global.css");
   const srcDir = join24(projectDir, "src");
   const cssPath = join24(srcDir, "global.css");
   const altCssPath = join24(srcDir, "app.css");
   let rawCss = "";
-  if (existsSync42(cssPath)) {
+  let devCssSource = "";
+  if (existsSync42(appCssPath)) {
+    devCssSource = appCssPath;
+    rawCss = readFileSync38(appCssPath, "utf-8");
+  } else if (existsSync42(cssPath)) {
+    devCssSource = cssPath;
     rawCss = readFileSync38(cssPath, "utf-8");
   } else if (existsSync42(altCssPath)) {
+    devCssSource = altCssPath;
     rawCss = readFileSync38(altCssPath, "utf-8");
   }
   if (rawCss) {
@@ -52812,7 +52830,7 @@ async function startDevServer(port, projectDir, config, host) {
     devGlobalCssContent = rawCss;
     for (const plugin of activeAtStart) {
       if (typeof plugin.onCSS === "function") {
-        const result = await plugin.onCSS(rawCss, cssPath);
+        const result = await plugin.onCSS(rawCss, devCssSource);
         if (result !== null && typeof result === "string") {
           devGlobalCssContent = result;
         }
@@ -53016,7 +53034,7 @@ async function startDevServer(port, projectDir, config, host) {
       const active = getActiveDevPlugins();
       for (const plugin of active) {
         if (typeof plugin.onCSS === "function") {
-          const result = await plugin.onCSS(rawCss, cssPath);
+          const result = await plugin.onCSS(rawCss, devCssSource);
           if (result !== null && typeof result === "string") {
             nextGlobal = result;
           }
@@ -54220,7 +54238,7 @@ function usage(code = 0) {
   console.error("  vesk typecheck [--no-strict]  Typecheck .vsk/.ts files via tsc-in-.vsk (strict by default)");
   console.error("  vesk start [-p 3000]          Start production server");
   console.error("  vesk dev [-p 3000]            Start dev server with HMR");
-  console.error("  vesk init                     Create src/global.css (Tailwind entrypoint) if missing");
+  console.error("  vesk init                     Create app/global.css (Tailwind entrypoint) if missing");
   console.error("  vesk --help                   Show this help");
   console.error("");
   console.error("Scaffolding:  npx create-vesk@latest <project-name>");
@@ -54408,13 +54426,13 @@ if (cmd === "start") {
 }
 if (cmd === "init") {
   const projectDir = process.cwd();
-  const srcDir = join26(projectDir, "src");
-  const target = join26(srcDir, "global.css");
+  const appDirPath = join26(projectDir, "app");
+  const target = join26(appDirPath, "global.css");
   if (existsSync43(target)) {
     console.error(`vesk init: ${target} already exists \u2014 skipping`);
     process.exit(0);
   }
-  mkdirSync18(srcDir, { recursive: true });
+  mkdirSync18(appDirPath, { recursive: true });
   writeFileSync21(target, [
     `@import 'tailwindcss';`,
     ``,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/vesk-cli",
-  "version": "0.2.35",
+  "version": "0.2.36",
   "type": "module",
   "description": "Vesk — compiler-first framework for the post-VDOM web. vesk dev, vesk build.",
   "bin": {
@@ -8,10 +8,10 @@
   },
   "main": "./dist/cli.js",
   "dependencies": {
-    "@vesk/adapter": "^0.2.35",
-    "@vesk/compiler": "^0.2.35",
-    "@vesk/plugin-tailwind": "^0.2.35",
-    "@vesk/runtime": "^0.2.35",
+    "@vesk/adapter": "^0.2.36",
+    "@vesk/compiler": "^0.2.36",
+    "@vesk/plugin-tailwind": "^0.2.36",
+    "@vesk/runtime": "^0.2.36",
     "esrap": "^2.3.0",
     "typescript": "^5.8.0",
     "ws": "^8.18.0",