@vesk/vesk-cli 0.2.39 → 0.2.41

package/dist/cli.js

@@ -19926,7 +19926,7 @@ function containsJSX(node) {
   return false;
 }
 function slotReadPropName(expr) {
-  if (expr.type === "MemberExpression" && !expr.computed && expr.object.type === "Identifier" && expr.object.name === "props" && expr.property.type === "Identifier") {
+  if (expr.type === "MemberExpression" && !expr.computed && expr.object.type === "Identifier" && expr.object.name === (__propsParam || "props") && expr.property.type === "Identifier") {
     return expr.property.name;
   }
   return null;
@@ -20130,7 +20130,7 @@ function processJSXChildren(source, children) {
         i++;
         continue;
       }
-      if (expr.type === "MemberExpression" && !expr.computed && expr.object.type === "Identifier" && expr.object.name === "props" && expr.property.type === "Identifier" && expr.property.name === "children" || expr.type === "Identifier" && expr.name === "children") {
+      if (expr.type === "MemberExpression" && !expr.computed && expr.object.type === "Identifier" && expr.object.name === (__propsParam || "props") && expr.property.type === "Identifier" && expr.property.name === "children" || expr.type === "Identifier" && expr.name === "children") {
         result.push(new SlotNode());
         i++;
         continue;
@@ -20200,7 +20200,7 @@ function exprToIR(source, expr) {
     const consequent = exprToIR(source, expr.right);
     return [new OpaqueDynamicRegion(condExpr, consequent)];
   }
-  if (expr.type === "MemberExpression" && !expr.computed && expr.object.type === "Identifier" && expr.object.name === "props" && expr.property.type === "Identifier" && expr.property.name === "children" || expr.type === "Identifier" && expr.name === "children") {
+  if (expr.type === "MemberExpression" && !expr.computed && expr.object.type === "Identifier" && expr.object.name === (__propsParam || "props") && expr.property.type === "Identifier" && expr.property.name === "children" || expr.type === "Identifier" && expr.name === "children") {
     return [new SlotNode()];
   }
   const slotName = slotReadPropName(expr);
@@ -20728,6 +20728,7 @@ function generateIR(ast, source, filename) {
     const isClientComp = !!inner.client;
     const prevSlotProps = __slotProps;
     __slotProps = slotPropNamesFromType(propsType);
+    __propsParam = propsAlias || null;
     if (isStatementMode(bodyStmts)) {
       const raw2 = processStatementModeBody(source, bodyStmts, file);
       const { body, css } = extractStyle(raw2);
@@ -20771,7 +20772,7 @@ function generateIR(ast, source, filename) {
       const guardBody = buildGuardChain(source, guardClauses, mainReturn);
       const { body, css } = extractStyle([...preamble, ...guardBody]);
       validateBlocks(name, isClientComp, body, file, source);
-      const comp = new ComponentIR(name, paramNames, body, { exported, defaultExport, isClient: inner.client, isAsync: inner.async, ssrAwait: componentUsesFetch(body), propsType });
+      const comp = new ComponentIR(name, paramNames, body, { exported, defaultExport, isClient: inner.client, isAsync: inner.async, ssrAwait: componentUsesFetch(body), propsType, propsAlias });
       comp.style = css;
       components.push(comp);
       __slotProps = prevSlotProps;
@@ -20865,7 +20866,7 @@ function generateIR(ast, source, filename) {
   }
   return new IRRoot(components, imports, importedNames, staticProps, loadFn, topLevelCode);
 }
-var __vskAnnotations, __slotProps;
+var __vskAnnotations, __slotProps, __propsParam;
 var init_ir_generator = __esm({
   "../compiler/src/ir-generator.ts"() {
     "use strict";
@@ -20879,6 +20880,7 @@ var init_ir_generator = __esm({
     init_tokens();
     __vskAnnotations = [];
     __slotProps = null;
+    __propsParam = null;
   }
 });
 
@@ -32692,6 +32694,7 @@ __export(image_pipeline_exports, {
   optimizeImages: () => optimizeImages
 });
 import { mkdirSync as mkdirSync8, writeFileSync as writeFileSync9, readFileSync as readFileSync18, existsSync as existsSync18, readdirSync as readdirSync4, statSync as statSync9 } from "node:fs";
+import { spawnSync } from "node:child_process";
 import { resolve as resolve16, extname as extname5, dirname as dirname12 } from "node:path";
 async function processImage(srcPath, outDir, baseName) {
   const image = sharpFn ? sharpFn(srcPath) : null;
@@ -32806,8 +32809,17 @@ var init_image_pipeline = __esm({
     FORMATS = ["webp", "avif"];
     sharpFn = null;
     try {
-      const mod = await import("sharp");
-      sharpFn = mod.default;
+      const probe = spawnSync(process.execPath, [
+        "--input-type=module",
+        "-e",
+        "import sharp from 'sharp'; await sharp({ create: { width: 2, height: 2, channels: 3, background: 'red' } }).png().toBuffer();"
+      ], { stdio: "ignore" });
+      if (probe.status === 0) {
+        const mod = await import("sharp");
+        sharpFn = mod.default;
+      } else {
+        console.warn("vesk images: sharp native probe failed; using copy-only image pipeline");
+      }
     } catch {
     }
   }
@@ -37915,9 +37927,6 @@ function compileVskCodegen(source, opts = {}) {
   }
   return { code, mappings: g2.mappings, styleRegions: g2.styleRegions, errors: [] };
 }
-function vskToTsx(source) {
-  return compileVskCodegen(source).code;
-}
 function isTypeDecl(stmt) {
   return stmt.type === "TSInterfaceDeclaration" || stmt.type === "TSTypeAliasDeclaration" || stmt.type === "ExportNamedDeclaration" && (stmt.declaration?.type === "TSInterfaceDeclaration" || stmt.declaration?.type === "TSTypeAliasDeclaration");
 }
@@ -38118,7 +38127,7 @@ function createTypecheckHost(projectRoot, appDir, vskFiles) {
       } else if (file.endsWith(".css.d.ts")) {
         content = "";
       } else if (vskFiles.has(file)) {
-        content = vskToTsx(vskFiles.get(file));
+        content = compileVskCodegen(vskFiles.get(file)).code;
       } else if (ts8.sys.fileExists(file)) {
         content = ts8.sys.readFile(file);
       }
@@ -38159,7 +38168,7 @@ function createTypecheckHost(projectRoot, appDir, vskFiles) {
       if (file.endsWith(".css.d.ts"))
         return "";
       if (vskFiles.has(file))
-        return vskToTsx(vskFiles.get(file));
+        return compileVskCodegen(vskFiles.get(file)).code;
       return ts8.sys.readFile(file);
     },
     writeFile: () => {
@@ -38209,6 +38218,35 @@ function createTypecheckHost(projectRoot, appDir, vskFiles) {
   };
   return host;
 }
+function mapGeneratedOffset(mappings, generatedOffset) {
+  let nearest = null;
+  for (const mapping of mappings) {
+    for (let i = 0; i < mapping.generatedOffsets.length; i++) {
+      const generated = mapping.generatedOffsets[i];
+      const length = mapping.lengths[i] ?? 0;
+      const source = mapping.sourceOffsets[i];
+      if (generated <= generatedOffset && generated + length >= generatedOffset) {
+        return source + (generatedOffset - generated);
+      }
+      if (generated <= generatedOffset && (!nearest || generated > nearest.generated)) {
+        nearest = { source, generated, length };
+      }
+    }
+  }
+  return nearest ? nearest.source + Math.min(nearest.length, Math.max(0, generatedOffset - nearest.generated)) : null;
+}
+function sourcePosition(source, offset2) {
+  const bounded = Math.max(0, Math.min(offset2, source.length));
+  let line = 1;
+  let lineStart = 0;
+  for (let i = 0; i < bounded; i++) {
+    if (source.charCodeAt(i) === 10) {
+      line++;
+      lineStart = i + 1;
+    }
+  }
+  return { line, character: bounded - lineStart + 1 };
+}
 function typecheckProject(projectRoot, opts = {}) {
   const appDir = opts.appDir ?? join25(projectRoot, "app");
   const vskFiles = /* @__PURE__ */ new Map();
@@ -38289,12 +38327,28 @@ function typecheckProject(projectRoot, opts = {}) {
     }
     if (!rootSet.has(filePath) && !vskSet.has(filePath))
       continue;
-    const pos = file.getLineAndCharacterOfPosition(diag.start ?? 0);
+    let sourceOffset = diag.start ?? 0;
+    let line;
+    let column;
+    if (vskFiles.has(filePath)) {
+      const source = vskFiles.get(filePath);
+      const generated = compileVskCodegen(source);
+      const mapped = mapGeneratedOffset(generated.mappings, sourceOffset);
+      if (mapped !== null)
+        sourceOffset = mapped;
+      const pos = sourcePosition(source, sourceOffset);
+      line = pos.line;
+      column = pos.character;
+    } else {
+      const pos = file.getLineAndCharacterOfPosition(diag.start ?? 0);
+      line = pos.line + 1;
+      column = pos.character + 1;
+    }
     const code = typeof diag.code === "number" ? `TS${diag.code}` : String(diag.code);
     errors.push({
       file: relative8(projectRoot, filePath),
-      line: pos.line + 1,
-      column: pos.character + 1,
+      line,
+      column,
       code,
       message: ts8.flattenDiagnosticMessageText(diag.messageText, "\n")
     });
@@ -52837,7 +52891,7 @@ function renderDevErrorPage(payload, opts) {
 }
 
 // src/build-packages.ts
-import { spawnSync } from "node:child_process";
+import { spawnSync as spawnSync2 } from "node:child_process";
 import { cpSync as cpSync2, existsSync as existsSync40, mkdirSync as mkdirSync18, readFileSync as readFileSync36, readdirSync as readdirSync11, statSync as statSync20, writeFileSync as writeFileSync20 } from "node:fs";
 import { createRequire as createRequire6 } from "node:module";
 import { dirname as dirname25, join as join23, resolve as resolve36 } from "node:path";
@@ -52912,7 +52966,7 @@ function buildPackages(force = false) {
     if (!force && !distStale(pkgDir, cfg.entry)) continue;
     console.log(`[build] ${cfg.name} -> tsc`);
     const tscBin = require2.resolve("typescript/bin/tsc");
-    const result = spawnSync(process.execPath, [tscBin, "-p", join23(pkgDir, "tsconfig.build.json")], {
+    const result = spawnSync2(process.execPath, [tscBin, "-p", join23(pkgDir, "tsconfig.build.json")], {
       stdio: "inherit"
     });
     if (result.status !== 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vesk/vesk-cli",
-  "version": "0.2.39",
+  "version": "0.2.41",
   "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.39",
-    "@vesk/compiler": "^0.2.39",
-    "@vesk/plugin-tailwind": "^0.2.39",
-    "@vesk/runtime": "^0.2.39",
+    "@vesk/adapter": "^0.2.41",
+    "@vesk/compiler": "^0.2.41",
+    "@vesk/plugin-tailwind": "^0.2.41",
+    "@vesk/runtime": "^0.2.41",
     "esrap": "^2.3.0",
     "typescript": "^5.8.0",
     "ws": "^8.18.0",