vorzelajs 0.0.4 → 0.0.6

package/dist/cli/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/cli/dev.ts"],"names":[],"mappings":"AA+DA,wBAAsB,MAAM,kBA4D3B"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/cli/dev.ts"],"names":[],"mappings":"AAgEA,wBAAsB,MAAM,kBAqE3B"}

package/dist/cli/dev.js

@@ -1,5 +1,7 @@
 import { createServer } from 'node:http';
 import { createServer as createNetServer } from 'node:net';
+import path from 'node:path';
+import url from 'node:url';
 import { getRequestListener } from '@hono/node-server';
 import { createVorzelaApp } from '../server/index.js';
 import { resolveVorzelaConfig } from '../vite/index.js';
@@ -48,6 +50,11 @@ export async function runDev() {
     const { vorzelaServerOnlyPlugin } = await import('../vite/server-only.js');
     const solidPlugin = await import('vite-plugin-solid').then((m) => m.default).catch(() => null);
     const baseConfig = await resolveVorzelaConfig(appRoot);
+    // Resolve the framework's internal entry-client file
+    const devThisFile = url.fileURLToPath(import.meta.url);
+    const frameworkDir = path.resolve(path.dirname(devThisFile), '..');
+    const internalExt = path.extname(devThisFile) === '.js' ? '.jsx' : '.tsx';
+    const entryClientPath = path.resolve(frameworkDir, `internal/entry-client${internalExt}`);
     const { createServer: createViteServer } = await import('vite');
     const resolvedHmrPort = await findAvailablePort(hmrPort);
     const vite = await createViteServer({
@@ -58,11 +65,14 @@ export async function runDev() {
                 port: resolvedHmrPort,
             },
             middlewareMode: true,
+            fs: {
+                allow: [appRoot, frameworkDir],
+            },
         },
     });
     const devAssets = {
         css: ['/src/styles.css'],
-        js: ['/src/entry-client.tsx'],
+        js: [`/@fs/${entryClientPath}`],
     };
     const loadEntry = async () => {
         return vite.ssrLoadModule('virtual:vorzela/entry-server');

package/dist/debug/error-stack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error-stack.d.ts","sourceRoot":"","sources":["../../src/debug/error-stack.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,eAAe;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,eAAe,EAAE,CAAA;IACzB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAaD,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,cAAc,GAAG,SAAS,CAiC1E;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,cAAc,GAAG,SAAS,EAAE,SAAS,SAAI,YAYjF"}
+{"version":3,"file":"error-stack.d.ts","sourceRoot":"","sources":["../../src/debug/error-stack.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,eAAe;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,eAAe,EAAE,CAAA;IACzB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AA4ED,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,GAAG,cAAc,GAAG,SAAS,CAa1E;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,cAAc,GAAG,SAAS,EAAE,SAAS,SAAI,YAYjF"}

package/dist/debug/error-stack.js

@@ -1,4 +1,3 @@
-import ErrorStackParser from 'error-stack-parser';
 function formatFrameSource(frame) {
     const fileName = frame.fileName ?? '<unknown>';
     const lineNumber = frame.lineNumber ?? 0;
@@ -8,36 +7,69 @@ function formatFrameSource(frame) {
         : '';
     return `${functionName}(${fileName}:${lineNumber}:${columnNumber})`;
 }
+function createFrame(source, parts = {}) {
+    return {
+        ...parts,
+        source,
+    };
+}
+function parseStackLine(line) {
+    const trimmed = line.trim();
+    if (trimmed === '' || trimmed.toLowerCase().startsWith('error')) {
+        return undefined;
+    }
+    const v8Named = /^at\s+(.*?)\s+\((.+):(\d+):(\d+)\)$/u.exec(trimmed);
+    if (v8Named) {
+        const [, functionName, fileName, lineNumber, columnNumber] = v8Named;
+        return createFrame(trimmed, {
+            columnNumber: Number(columnNumber),
+            fileName,
+            functionName,
+            lineNumber: Number(lineNumber),
+        });
+    }
+    const v8Anonymous = /^at\s+(.+):(\d+):(\d+)$/u.exec(trimmed);
+    if (v8Anonymous) {
+        const [, fileName, lineNumber, columnNumber] = v8Anonymous;
+        return createFrame(trimmed, {
+            columnNumber: Number(columnNumber),
+            fileName,
+            lineNumber: Number(lineNumber),
+        });
+    }
+    const firefoxNamed = /^(.*?)@(.+):(\d+):(\d+)$/u.exec(trimmed);
+    if (firefoxNamed) {
+        const [, functionName, fileName, lineNumber, columnNumber] = firefoxNamed;
+        return createFrame(trimmed, {
+            columnNumber: Number(columnNumber),
+            fileName,
+            functionName: functionName || undefined,
+            lineNumber: Number(lineNumber),
+        });
+    }
+    return createFrame(trimmed);
+}
+function parseStackFrames(stack) {
+    return stack
+        .split('\n')
+        .map(parseStackLine)
+        .filter((frame) => frame !== undefined)
+        .map((frame) => ({
+        ...frame,
+        source: frame.fileName || frame.functionName ? formatFrameSource(frame) : frame.source,
+    }));
+}
 export function parseErrorStack(error) {
     if (!(error instanceof Error)) {
         return undefined;
     }
-    try {
-        const frames = ErrorStackParser.parse(error).map((frame) => {
-            const normalizedFrame = {
-                columnNumber: frame.columnNumber,
-                fileName: frame.fileName,
-                functionName: frame.functionName,
-                lineNumber: frame.lineNumber,
-                source: '',
-            };
-            normalizedFrame.source = formatFrameSource(normalizedFrame);
-            return normalizedFrame;
-        });
-        return {
-            frames,
-            stack: error.stack,
-        };
-    }
-    catch {
-        if (!error.stack) {
-            return undefined;
-        }
-        return {
-            frames: [],
-            stack: error.stack,
-        };
+    if (!error.stack) {
+        return undefined;
     }
+    return {
+        frames: parseStackFrames(error.stack),
+        stack: error.stack,
+    };
 }
 export function formatParsedStack(stack, maxFrames = 8) {
     if (!stack) {

package/dist/vite/routes-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"routes-plugin.d.ts","sourceRoot":"","sources":["../../src/vite/routes-plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AA+VlC,wBAAsB,cAAc,CAAC,WAAW,SAAgB,iBA2B/D;AAED,wBAAgB,mBAAmB,IAAI,MAAM,CA2C5C"}
+{"version":3,"file":"routes-plugin.d.ts","sourceRoot":"","sources":["../../src/vite/routes-plugin.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAwWlC,wBAAsB,cAAc,CAAC,WAAW,SAAgB,iBA2B/D;AAED,wBAAgB,mBAAmB,IAAI,MAAM,CA2C5C"}

package/dist/vite/routes-plugin.js

@@ -1,6 +1,7 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 const ROUTES_DIR = path.join('src', 'routes');
+const SOURCE_DIR = 'src';
 const OUTPUT_FILE = path.join('src', 'routeTree.gen.ts');
 const OUTPUT_HYDRATION_FILE = path.join('src', 'routeHydration.gen.ts');
 const ROUTE_FILE_PATTERN = /\.(ts|tsx)$/u;
@@ -186,8 +187,11 @@ function detectRouteHydration(source) {
         ? 'client'
         : 'static';
 }
-function isLocalModuleSpecifier(specifier) {
-    return specifier.startsWith('./') || specifier.startsWith('../');
+function isHydrationTrackedSpecifier(specifier) {
+    return specifier.startsWith('./')
+        || specifier.startsWith('../')
+        || specifier === '~'
+        || specifier.startsWith('~/');
 }
 function extractLocalImportSpecifiers(source) {
     const specifiers = new Set();
@@ -195,7 +199,7 @@ function extractLocalImportSpecifiers(source) {
         pattern.lastIndex = 0;
         for (const match of source.matchAll(pattern)) {
             const specifier = match[1];
-            if (specifier && isLocalModuleSpecifier(specifier) && !isServerOnlyModuleSpecifier(specifier)) {
+            if (specifier && isHydrationTrackedSpecifier(specifier) && !isServerOnlyModuleSpecifier(specifier)) {
                 specifiers.add(specifier);
             }
         }
@@ -211,8 +215,12 @@ async function pathExists(filePath) {
         return false;
     }
 }
-async function resolveLocalModulePath(specifier, importerPath) {
-    const basePath = path.resolve(path.dirname(importerPath), specifier);
+async function resolveLocalModulePath(specifier, importerPath, projectRoot) {
+    const basePath = specifier === '~'
+        ? path.resolve(projectRoot, SOURCE_DIR)
+        : specifier.startsWith('~/')
+            ? path.resolve(projectRoot, SOURCE_DIR, specifier.slice(2))
+            : path.resolve(path.dirname(importerPath), specifier);
     const candidates = path.extname(basePath)
         ? [basePath]
         : [
@@ -226,7 +234,7 @@ async function resolveLocalModulePath(specifier, importerPath) {
     }
     return null;
 }
-async function detectRouteHydrationFromFile(filePath, cache) {
+async function detectRouteHydrationFromFile(filePath, cache, projectRoot) {
     const resolvedPath = path.resolve(filePath);
     const cached = cache.get(resolvedPath);
     if (cached) {
@@ -238,11 +246,11 @@ async function detectRouteHydrationFromFile(filePath, cache) {
             return 'client';
         }
         for (const specifier of extractLocalImportSpecifiers(source)) {
-            const dependencyPath = await resolveLocalModulePath(specifier, resolvedPath);
+            const dependencyPath = await resolveLocalModulePath(specifier, resolvedPath, projectRoot);
             if (!dependencyPath) {
                 continue;
             }
-            if (await detectRouteHydrationFromFile(dependencyPath, cache) === 'client') {
+            if (await detectRouteHydrationFromFile(dependencyPath, cache, projectRoot) === 'client') {
                 return 'client';
             }
         }
@@ -251,7 +259,7 @@ async function detectRouteHydrationFromFile(filePath, cache) {
     cache.set(resolvedPath, pending);
     return pending;
 }
-async function createGeneratedHydrationFile(routes) {
+async function createGeneratedHydrationFile(routes, projectRoot) {
     const sortedRoutes = [...routes].sort((left, right) => {
         if (left.id === '__root__')
             return -1;
@@ -261,7 +269,7 @@ async function createGeneratedHydrationFile(routes) {
     });
     const hydrationCache = new Map();
     const hydrationEntries = await Promise.all(sortedRoutes.map(async (route) => {
-        const detected = await detectRouteHydrationFromFile(route.filePath, hydrationCache);
+        const detected = await detectRouteHydrationFromFile(route.filePath, hydrationCache, projectRoot);
         return `  '${route.id}': { detected: '${detected}' }`;
     }));
     return `/* eslint-disable */
@@ -302,7 +310,7 @@ export async function generateRoutes(projectRoot = process.cwd()) {
     assertNoDuplicateMatchPaths(routesWithParents);
     await Promise.all([
         writeIfChanged(outputPath, createGeneratedFile(routesWithParents)),
-        writeIfChanged(hydrationOutputPath, await createGeneratedHydrationFile(routesWithParents)),
+        writeIfChanged(hydrationOutputPath, await createGeneratedHydrationFile(routesWithParents, projectRoot)),
     ]);
 }
 export function vorzelaRoutesPlugin() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vorzelajs",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "type": "module",
   "description": "Batteries-included SolidJS framework with file-based routing, streamed SSR, and server-only boundaries",
   "license": "MIT",