round-core 0.0.4 → 0.0.6

package/dist/index.js

@@ -620,17 +620,21 @@ function createContext(defaultValue) {
     Provider: null
   };
   function Provider(props = {}) {
-    const value = props.value;
-    const child = Array.isArray(props.children) ? props.children[0] : props.children;
-    const childFn = typeof child === "function" ? child : () => child;
-    return createElement("span", { style: { display: "contents" } }, () => {
-      pushContext({ [ctx.id]: value });
-      try {
-        return childFn();
-      } finally {
-        popContext();
-      }
-    });
+    const children = props.children;
+    pushContext({ [ctx.id]: props.value });
+    try {
+      return createElement("span", { style: { display: "contents" } }, () => {
+        const val = typeof props.value === "function" && props.value.peek ? props.value() : props.value;
+        pushContext({ [ctx.id]: val });
+        try {
+          return children;
+        } finally {
+          popContext();
+        }
+      });
+    } finally {
+      popContext();
+    }
   }
   ctx.Provider = Provider;
   return ctx;
@@ -1120,6 +1124,7 @@ const pathEvalReady = signal(true);
 let defaultNotFoundComponent = null;
 let autoNotFoundMounted = false;
 let userProvidedNotFound = false;
+const RoutingContext = createContext("");
 function ensureListener() {
   if (!hasWindow$1 || listenerInitialized) return;
   listenerInitialized = true;
@@ -1163,12 +1168,14 @@ function useRouteReady() {
 }
 function getIsNotFound() {
   const pathname = normalizePathname(currentPath());
+  if (pathname === "/") return false;
   if (!(Boolean(pathEvalReady()) && lastPathEvaluated === pathname)) return false;
   return !Boolean(pathHasMatch());
 }
 function useIsNotFound() {
   return () => {
     const pathname = normalizePathname(currentPath());
+    if (pathname === "/") return false;
     if (!(Boolean(pathEvalReady()) && lastPathEvaluated === pathname)) return false;
     return !Boolean(pathHasMatch());
   };
@@ -1188,6 +1195,7 @@ function mountAutoNotFound() {
     if (!ready) return null;
     if (lastPathEvaluated !== pathname) return null;
     if (hasMatch) return null;
+    if (pathname === "/") return null;
     const Comp = defaultNotFoundComponent;
     if (typeof Comp === "function") {
       return createElement(Comp, { pathname });
@@ -1294,10 +1302,11 @@ function normalizeTo(to) {
   if (!path.startsWith("/")) return String(to ?? "");
   return normalizePathname(path) + suffix;
 }
-function matchRoute(route, pathname) {
+function matchRoute(route, pathname, exact = true) {
   const r = normalizePathname(route);
   const p = normalizePathname(pathname);
-  return r === p;
+  if (exact) return r === p;
+  return p === r || p.startsWith(r.endsWith("/") ? r : r + "/");
 }
 function beginPathEvaluation(pathname) {
   if (pathname !== lastPathEvaluated) {
@@ -1316,11 +1325,31 @@ function setNotFound(Component) {
 function Route(props = {}) {
   ensureListener();
   return createElement("span", { style: { display: "contents" } }, () => {
+    const parentPath = readContext(RoutingContext) || "";
     const pathname = normalizePathname(currentPath());
     beginPathEvaluation(pathname);
-    const route = props.route ?? "/";
-    if (!matchRoute(route, pathname)) return null;
-    pathHasMatch(true);
+    const routeProp = props.route ?? "/";
+    if (typeof routeProp === "string" && !routeProp.startsWith("/")) {
+      throw new Error(`Invalid route: "${routeProp}". All routes must start with a forward slash "/". (Nested under: "${parentPath || "root"}")`);
+    }
+    let fullRoute = "";
+    if (parentPath && parentPath !== "/") {
+      const cleanParent = parentPath.endsWith("/") ? parentPath.slice(0, -1) : parentPath;
+      const cleanChild = routeProp.startsWith("/") ? routeProp : "/" + routeProp;
+      if (cleanChild.startsWith(cleanParent + "/") || cleanChild === cleanParent) {
+        fullRoute = normalizePathname(cleanChild);
+      } else {
+        fullRoute = normalizePathname(cleanParent + cleanChild);
+      }
+    } else {
+      fullRoute = normalizePathname(routeProp);
+    }
+    const isRoot = fullRoute === "/";
+    const exact = props.exact !== void 0 ? Boolean(props.exact) : isRoot;
+    if (!matchRoute(fullRoute, pathname, exact)) return null;
+    if (matchRoute(fullRoute, pathname, true)) {
+      pathHasMatch(true);
+    }
     const mergedHead = props.head && typeof props.head === "object" ? props.head : {};
     const meta = props.description ? [{ name: "description", content: String(props.description) }].concat(mergedHead.meta ?? props.meta ?? []) : mergedHead.meta ?? props.meta;
     const links = mergedHead.links ?? props.links;
@@ -1328,17 +1357,37 @@ function Route(props = {}) {
     const icon = mergedHead.icon ?? props.icon;
     const favicon = mergedHead.favicon ?? props.favicon;
     applyHead({ title, meta, links, icon, favicon });
-    return props.children;
+    return createElement(RoutingContext.Provider, { value: fullRoute }, props.children);
   });
 }
 function Page(props = {}) {
   ensureListener();
   return createElement("span", { style: { display: "contents" } }, () => {
+    const parentPath = readContext(RoutingContext) || "";
     const pathname = normalizePathname(currentPath());
     beginPathEvaluation(pathname);
-    const route = props.route ?? "/";
-    if (!matchRoute(route, pathname)) return null;
-    pathHasMatch(true);
+    const routeProp = props.route ?? "/";
+    if (typeof routeProp === "string" && !routeProp.startsWith("/")) {
+      throw new Error(`Invalid route: "${routeProp}". All routes must start with a forward slash "/". (Nested under: "${parentPath || "root"}")`);
+    }
+    let fullRoute = "";
+    if (parentPath && parentPath !== "/") {
+      const cleanParent = parentPath.endsWith("/") ? parentPath.slice(0, -1) : parentPath;
+      const cleanChild = routeProp.startsWith("/") ? routeProp : "/" + routeProp;
+      if (cleanChild.startsWith(cleanParent + "/") || cleanChild === cleanParent) {
+        fullRoute = normalizePathname(cleanChild);
+      } else {
+        fullRoute = normalizePathname(cleanParent + cleanChild);
+      }
+    } else {
+      fullRoute = normalizePathname(routeProp);
+    }
+    const isRoot = fullRoute === "/";
+    const exact = props.exact !== void 0 ? Boolean(props.exact) : isRoot;
+    if (!matchRoute(fullRoute, pathname, exact)) return null;
+    if (matchRoute(fullRoute, pathname, true)) {
+      pathHasMatch(true);
+    }
     const mergedHead = props.head && typeof props.head === "object" ? props.head : {};
     const meta = props.description ? [{ name: "description", content: String(props.description) }].concat(mergedHead.meta ?? props.meta ?? []) : mergedHead.meta ?? props.meta;
     const links = mergedHead.links ?? props.links;
@@ -1346,7 +1395,7 @@ function Page(props = {}) {
     const icon = mergedHead.icon ?? props.icon;
     const favicon = mergedHead.favicon ?? props.favicon;
     applyHead({ title, meta, links, icon, favicon });
-    return props.children;
+    return createElement(RoutingContext.Provider, { value: fullRoute }, props.children);
   });
 }
 function NotFound(props = {}) {
@@ -1360,6 +1409,7 @@ function NotFound(props = {}) {
     if (!ready) return null;
     if (lastPathEvaluated !== pathname) return null;
     if (hasMatch) return null;
+    if (pathname === "/") return null;
     const Comp = props.component ?? defaultNotFoundComponent;
     if (typeof Comp === "function") {
       return createElement(Comp, { pathname });

package/dist/vite-plugin.js

@@ -427,6 +427,8 @@ function RoundPlugin(pluginOptions = {}) {
     configPathAbs: null,
     configDir: null,
     entryAbs: null,
+    entryRel: null,
+    name: "Round",
     startHead: null,
     startHeadHtml: null
   };
@@ -454,7 +456,9 @@ function RoundPlugin(pluginOptions = {}) {
     state.routingTrailingSlash = trailingSlash !== void 0 ? Boolean(trailingSlash) : true;
     const customTags = config?.htmlTags;
     state.customTags = Array.isArray(customTags) ? customTags : [];
+    state.name = config?.name ?? "Round";
     const entryRel = config?.entry;
+    state.entryRel = entryRel;
     state.entryAbs = entryRel ? resolveMaybeRelative(configDir, entryRel) : null;
     const include = pluginOptions.include ?? config?.include ?? [];
     const exclude = pluginOptions.exclude ?? config?.exclude ?? ["./node_modules", "./dist"];
@@ -609,6 +613,9 @@ ${head.raw}`;
         }
       };
     },
+    resolveId(id) {
+      return null;
+    },
     load(id) {
       if (!isMdRawRequest(id)) return;
       const fileAbs = stripQuery(id);

package/package.json

@@ -1,48 +1,48 @@
-{
-    "name": "round-core",
-    "version": "0.0.4",
-    "description": "A lightweight frontend framework for SPA with signals and fine grained reactivity",
-    "main": "./dist/index.js",
-    "exports": {
-        ".": "./dist/index.js",
-        "./vite-plugin": "./dist/vite-plugin.js"
-    },
-    "type": "module",
-    "icon": "round.png",
-    "repository": {
-        "url": "https://github.com/ZtaMDev/RoundJS.git"
-    },
-    "bin": {
-        "round": "./dist/cli.js"
-    },
-    "scripts": {
-        "dev": "node ./src/cli.js dev --config ./test/main/round.config.json",
-        "build": "node ./src/cli.js build --config ./test/main/round.config.json",
-        "build:core": "vite build -c vite.config.build.js",
-        "test": "vitest run",
-        "bench": "bun run --cwd benchmarks bench",
-        "bench:build": "bun run --cwd benchmarks bench:build",
-        "bench:runtime": "bun run --cwd benchmarks bench:runtime"
-    },
-    "keywords": [
-        "framework",
-        "spa",
-        "signals",
-        "vite"
-    ],
-    "author": "Round Framework Team",
-    "license": "MIT",
-    "dependencies": {
-        "marked": "^12.0.2",
-        "vite": "^5.0.0",
-        "vitest": "^1.6.0"
-    },
-    "devDependencies": {
-        "jsdom": "^24.0.0",
-        "bun-types": "latest",
-        "@types/node": "latest"
-    },
-    "peerDependencies": {
-        "bun": ">=1.0.0"
-    }
+{
+    "name": "round-core",
+    "version": "0.0.6",
+    "description": "A lightweight frontend framework for SPA with signals and fine grained reactivity",
+    "main": "./dist/index.js",
+    "types": "./dist/index.d.ts",
+    "exports": {
+        ".": "./dist/index.js",
+        "./vite-plugin": "./dist/vite-plugin.js"
+    },
+    "type": "module",
+    "icon": "round.png",
+    "repository": {
+        "url": "https://github.com/ZtaMDev/RoundJS.git"
+    },
+    "bin": {
+        "round": "./dist/cli.js"
+    },
+    "scripts": {
+        "dev": "node ./src/cli.js dev --config ./test/main/round.config.json",
+        "build": "node ./src/cli.js build --config ./test/main/round.config.json",
+        "build:core": "vite build -c vite.config.build.js",
+        "test": "vitest run",
+        "bench": "bun run --cwd benchmarks bench",
+        "bench:build": "bun run --cwd benchmarks bench:build",
+        "bench:runtime": "bun run --cwd benchmarks bench:runtime"
+    },
+    "keywords": [
+        "framework",
+        "spa",
+        "signals",
+        "vite"
+    ],
+    "author": "Round Framework Team",
+    "license": "MIT",
+    "dependencies": {
+        "marked": "^12.0.2",
+        "vite": "^5.0.0"
+    },
+    "devDependencies": {
+        "bun-types": "latest",
+        "@types/node": "latest",
+        "vitest": "^1.6.0"
+    },
+    "peerDependencies": {
+        "bun": ">=1.0.0"
+    }
 }

package/src/cli.js

@@ -12,6 +12,17 @@ function onSignal() {
 }
 process.on('SIGINT', onSignal);
 process.on('SIGTERM', onSignal);
+process.on('exit', () => {
+    cleanupTemporaryFiles();
+});
+
+const temporaryFiles = new Set();
+function cleanupTemporaryFiles() {
+    for (const f of temporaryFiles) {
+        try { if (fs.existsSync(f)) fs.unlinkSync(f); } catch { }
+    }
+    temporaryFiles.clear();
+}
 
 function normalizePath(p) {
     return p.replaceAll('\\', '/');
@@ -122,32 +133,6 @@ function resolveFrom(baseDir, p) {
     return path.resolve(baseDir, p);
 }
 
-function ensureIndexHtml(rootDir, entryRel, title = 'Round') {
-    const indexPath = path.join(rootDir, 'index.html');
-    if (fs.existsSync(indexPath)) return;
-
-    const entryPath = entryRel.startsWith('/') ? entryRel : `/${entryRel}`;
-    fs.writeFileSync(indexPath, [
-        '<!DOCTYPE html>',
-        '<html lang="en">',
-        '<head>',
-        '    <meta charset="UTF-8" />',
-        '    <meta name="viewport" content="width=device-width, initial-scale=1.0" />',
-        `    <title>${title}</title>`,
-        '</head>',
-        '<body>',
-        '    <div id="app"></div>',
-        '    <script type="module">',
-        "        import { render } from 'round-core';",
-        `        import App from '${entryPath}';`,
-        '',
-        '        render(App, document.getElementById("app"));',
-        '    </script>',
-        '</body>',
-        '</html>',
-        ''
-    ].join('\n'), 'utf8');
-}
 
 function parseArgs(argv) {
     const args = { _: [] };
@@ -231,7 +216,6 @@ async function runInit({ name }) {
     const pkgPath = path.join(projectDir, 'package.json');
     const configPath = path.join(projectDir, 'round.config.json');
     const viteConfigPath = path.join(projectDir, 'vite.config.js');
-    const indexHtmlPath = path.join(projectDir, 'index.html');
     const appRoundPath = path.join(srcDir, 'app.round');
     const counterRoundPath = path.join(srcDir, 'counter.round');
 
@@ -290,26 +274,6 @@ async function runInit({ name }) {
         ''
     ].join('\n'));
 
-    writeFileIfMissing(indexHtmlPath, [
-        '<!DOCTYPE html>',
-        '<html lang="en">',
-        '<head>',
-        '    <meta charset="UTF-8" />',
-        '    <meta name="viewport" content="width=device-width, initial-scale=1.0" />',
-        `    <title>${name}</title>`,
-        '</head>',
-        '<body>',
-        '    <div id="app"></div>',
-        '    <script type="module">',
-        "        import { render } from 'round-core';",
-        "        import App from '/src/app.round';",
-        '',
-        "        render(App, document.getElementById('app'));",
-        '    </script>',
-        '</body>',
-        '</html>',
-        ''
-    ].join('\n'));
 
     writeFileIfMissing(appRoundPath, [
         "import { Route } from 'round-core';",
@@ -377,6 +341,44 @@ function coerceNumber(v, fallback) {
     return Number.isFinite(n) ? n : fallback;
 }
 
+function generateIndexHtml(config) {
+    const name = config?.name ?? 'Round';
+    const rawEntry = config?.entry ?? './src/app.round';
+    let entry = rawEntry;
+    if (entry.startsWith('./')) entry = entry.slice(1);
+    if (!entry.startsWith('/')) entry = '/' + entry;
+
+    return [
+        '<!DOCTYPE html>',
+        '<html lang="en">',
+        '<head>',
+        '    <meta charset="UTF-8" />',
+        '    <meta name="viewport" content="width=device-width, initial-scale=1.0" />',
+        `    <title>${name}</title>`,
+        '</head>',
+        '<body>',
+        '    <div id="app"></div>',
+        '    <script type="module">',
+        "        import { render } from 'round-core';",
+        `        import App from '${entry}';`,
+        '',
+        "        render(App, document.getElementById('app'));",
+        '    </script>',
+        '</body>',
+        '</html>'
+    ].join('\n');
+}
+
+function writeTemporaryIndex(rootDir, config) {
+    const indexPath = path.resolve(rootDir, 'index.html');
+    if (fs.existsSync(indexPath)) return false;
+
+    const content = generateIndexHtml(config);
+    fs.writeFileSync(indexPath, content, 'utf8');
+    temporaryFiles.add(indexPath);
+    return true;
+}
+
 async function runDev({ rootDir, configPathAbs, config }) {
     const startedAt = Date.now();
     const configDir = path.dirname(configPathAbs);
@@ -386,7 +388,6 @@ async function runDev({ rootDir, configPathAbs, config }) {
         throw new Error(`Entry not found: ${entryAbs ?? '(missing entry)'} (config: ${configPathAbs})`);
     }
     const entryRel = normalizePath(path.relative(rootDir, entryAbs));
-    ensureIndexHtml(rootDir, entryRel, config?.name ?? 'Round');
 
     let viteServer = null;
     let restarting = false;
@@ -400,12 +401,13 @@ async function runDev({ rootDir, configPathAbs, config }) {
             throw new Error(`Entry not found: ${entryAbs2 ?? '(missing entry)'} (config: ${configPathAbs})`);
         }
         const entryRel2 = normalizePath(path.relative(rootDir, entryAbs2));
-        ensureIndexHtml(rootDir, entryRel2, nextConfig?.name ?? 'Round');
 
         const serverPort2 = coerceNumber(nextConfig?.dev?.port, 5173);
         const open2 = Boolean(nextConfig?.dev?.open);
         const base2 = nextConfig?.routing?.base ?? '/';
 
+        const isTemp = writeTemporaryIndex(rootDir, nextConfig);
+
         if (showBanner) {
             banner('Dev Server');
             process.stdout.write(`${c('  Config', 'gray')}  ${configPathAbs}\n`);
@@ -475,11 +477,12 @@ async function runBuild({ rootDir, configPathAbs, config }) {
         throw new Error(`Entry not found: ${entryAbs ?? '(missing entry)'} (config: ${configPathAbs})`);
     }
     const entryRel = normalizePath(path.relative(rootDir, entryAbs));
-    ensureIndexHtml(rootDir, entryRel, config?.name ?? 'Round');
 
     const outDir = config?.output ? resolveFrom(configDir, config.output) : resolveFrom(rootDir, './dist');
     const base = config?.routing?.base ?? '/';
 
+    const isTemp = writeTemporaryIndex(rootDir, config);
+
     banner('Build');
     process.stdout.write(`${c('  Config', 'gray')}  ${configPathAbs}\n`);
     process.stdout.write(`${c('  OutDir', 'gray')}  ${outDir}\n`);
@@ -513,8 +516,7 @@ async function runPreview({ rootDir, configPathAbs, config }) {
 
     const entryAbs = config?.entry ? resolveFrom(configDir, config.entry) : null;
     if (entryAbs && fs.existsSync(entryAbs)) {
-        const entryRel = normalizePath(path.relative(rootDir, entryAbs));
-        ensureIndexHtml(rootDir, entryRel, config?.name ?? 'Round');
+        // No physical index.html needed
     }
 
     banner('Preview');

package/src/compiler/vite-plugin.js

@@ -93,6 +93,8 @@ export default function RoundPlugin(pluginOptions = {}) {
         configPathAbs: null,
         configDir: null,
         entryAbs: null,
+        entryRel: null,
+        name: 'Round',
         startHead: null,
         startHeadHtml: null
     };
@@ -134,7 +136,10 @@ export default function RoundPlugin(pluginOptions = {}) {
         const customTags = config?.htmlTags;
         state.customTags = Array.isArray(customTags) ? customTags : [];
 
+        state.name = config?.name ?? 'Round';
+
         const entryRel = config?.entry;
+        state.entryRel = entryRel;
         state.entryAbs = entryRel ? resolveMaybeRelative(configDir, entryRel) : null;
 
         const include = pluginOptions.include ?? config?.include ?? [];
@@ -323,6 +328,9 @@ export default function RoundPlugin(pluginOptions = {}) {
             };
         },
 
+        resolveId(id) {
+            return null;
+        },
         load(id) {
             if (!isMdRawRequest(id)) return;