@kuratchi/js 0.0.9 → 0.0.11

package/dist/compiler/parser.d.ts

@@ -4,7 +4,7 @@
  * Extracts the top-level compile-time <script> block (before the HTML document).
  * A top-level block containing reactive `$:` labels is preserved in template output
  * as client script.
- * Everything else is the template — full HTML with native JS flow control.
+ * Everything else is the template — full HTML with native JS flow control.
  * <style> inside the HTML is NOT extracted; it's part of the template.
  */
 export interface ParsedFile {
@@ -12,7 +12,7 @@ export interface ParsedFile {
     script: string | null;
     /** Explicit server-side load function exported from the route script */
     loadFunction: string | null;
-    /** Template — the full HTML document with inline JS flow control */
+    /** Template — the full HTML document with inline JS flow control */
     template: string;
     /** All imports from the script block */
     serverImports: string[];
@@ -22,7 +22,7 @@ export interface ParsedFile {
     actionFunctions: string[];
     /** Top-level variable names declared in the script (const/let/var) */
     dataVars: string[];
-    /** Component imports: import Name from '$lib/file.html' → { Name: 'file' } */
+    /** Component imports: import Name from '$lib/file.html' → { Name: 'file' } */
     componentImports: Record<string, string>;
     /** Poll functions referenced via data-poll={fn(args)} in the template */
     pollFunctions: string[];
@@ -47,6 +47,7 @@ interface ParseFileOptions {
     kind?: 'route' | 'layout' | 'component';
     filePath?: string;
 }
+export declare function stripTopLevelImports(source: string): string;
 /**
  * Parse a .html route file.
  *

package/dist/compiler/parser.js

@@ -1,12 +1,31 @@
-/**
- * HTML file parser.
- *
- * Extracts the top-level compile-time <script> block (before the HTML document).
- * A top-level block containing reactive `$:` labels is preserved in template output
- * as client script.
- * Everything else is the template — full HTML with native JS flow control.
- * <style> inside the HTML is NOT extracted; it's part of the template.
- */
+import ts from 'typescript';
+function getTopLevelImportStatements(source) {
+    const sourceFile = ts.createSourceFile('kuratchi-script.ts', source, ts.ScriptTarget.Latest, true, ts.ScriptKind.TS);
+    const imports = [];
+    for (const statement of sourceFile.statements) {
+        if (!ts.isImportDeclaration(statement))
+            continue;
+        imports.push({
+            text: source.slice(statement.getStart(sourceFile), statement.getEnd()),
+            start: statement.getStart(sourceFile),
+            end: statement.getEnd(),
+        });
+    }
+    return imports;
+}
+export function stripTopLevelImports(source) {
+    const imports = getTopLevelImportStatements(source);
+    if (imports.length === 0)
+        return source.trim();
+    let cursor = 0;
+    let output = '';
+    for (const statement of imports) {
+        output += source.slice(cursor, statement.start);
+        cursor = statement.end;
+    }
+    output += source.slice(cursor);
+    return output.trim();
+}
 function hasReactiveLabel(scriptBody) {
     return /\$\s*:/.test(scriptBody);
 }
@@ -670,11 +689,8 @@ export function parseFile(source, options = {}) {
     const workerEnvAliases = [];
     const devAliases = [];
     if (script) {
-        // Support both single-line and multiline static imports.
-        const importRegex = /^\s*import[\s\S]*?from\s+['"][^'"]+['"]\s*;?/gm;
-        let m;
-        while ((m = importRegex.exec(script)) !== null) {
-            const line = m[0].trim();
+        for (const statement of getTopLevelImportStatements(script)) {
+            const line = statement.text.trim();
             // Check for component imports: import Name from '$lib/file.html' or '@kuratchi/ui/file.html'
             const libMatch = line.match(/import\s+([A-Za-z_$][\w$]*)\s+from\s+['"]\$lib\/([^'"]+\.html)['"]/s);
             const pkgMatch = !libMatch ? line.match(/import\s+([A-Za-z_$][\w$]*)\s+from\s+['"](@[^/'"]+\/[^/'"]+)\/([^'"]+\.html)['"]/s) : null;
@@ -707,10 +723,8 @@ export function parseFile(source, options = {}) {
         }
     }
     if (clientScript) {
-        const importRegex = /^\s*import[\s\S]*?from\s+['"][^'"]+['"]\s*;?/gm;
-        let m;
-        while ((m = importRegex.exec(clientScript)) !== null) {
-            const line = m[0].trim();
+        for (const statement of getTopLevelImportStatements(clientScript)) {
+            const line = statement.text.trim();
             clientImports.push(line);
             if (extractKuratchiEnvironmentDevAliases(line).length > 0) {
                 throw new Error(`[kuratchi compiler] ${options.filePath || kind}\nClient <script> blocks cannot import from @kuratchi/js/environment.\nUse route server script code and pass values into the template explicitly.`);
@@ -729,8 +743,7 @@ export function parseFile(source, options = {}) {
     let scriptBody = '';
     let loadFunction = null;
     if (script) {
-        // Remove import lines to get the script body
-        const rawScriptBody = script.replace(/^\s*import[\s\S]*?from\s+['"][^'"]+['"]\s*;?/gm, '').trim();
+        const rawScriptBody = stripTopLevelImports(script);
         const explicitLoad = extractExplicitLoad(rawScriptBody);
         scriptBody = explicitLoad.remainingScript;
         loadFunction = explicitLoad.loadFunction;
@@ -773,7 +786,7 @@ export function parseFile(source, options = {}) {
         }
     }
     // Also collect onX={fnName(...)} candidates (e.g. onclick, onClick, onChange)
-    // — the compiler will filter these against actual imports to determine server actions.
+    // — the compiler will filter these against actual imports to determine server actions.
     const eventActionRegex = /on[A-Za-z]+\s*=\{(\w+)\s*\(/g;
     let em;
     while ((em = eventActionRegex.exec(templateWithoutComments)) !== null) {

package/dist/compiler/template.js

@@ -49,6 +49,8 @@ export function compileTemplate(template, componentNames, actionNames, rpcNameMa
     let inStyle = false;
     let inScript = false;
     let scriptBuffer = [];
+    let inHtmlTag = false;
+    let htmlAttrQuote = null;
     for (let i = 0; i < lines.length; i++) {
         const line = lines[i];
         const trimmed = line.trim();
@@ -87,6 +89,16 @@ export function compileTemplate(template, componentNames, actionNames, rpcNameMa
             }
             continue;
         }
+        const startedInsideQuotedAttr = !!htmlAttrQuote;
+        const nextHtmlState = advanceHtmlTagState(line, inHtmlTag, htmlAttrQuote);
+        if (startedInsideQuotedAttr) {
+            out.push(`__html += \`${escapeLiteral(line)}\n\`;`);
+            inHtmlTag = nextHtmlState.inTag;
+            htmlAttrQuote = nextHtmlState.quote;
+            continue;
+        }
+        inHtmlTag = nextHtmlState.inTag;
+        htmlAttrQuote = nextHtmlState.quote;
         // Skip empty lines
         if (!trimmed) {
             out.push('__html += "\\n";');
@@ -167,6 +179,36 @@ export function compileTemplate(template, componentNames, actionNames, rpcNameMa
     }
     return out.join('\n');
 }
+function advanceHtmlTagState(src, startInTag, startQuote) {
+    let inTag = startInTag;
+    let quote = startQuote;
+    for (let i = 0; i < src.length; i++) {
+        const ch = src[i];
+        if (quote) {
+            if (ch === '\\') {
+                i++;
+                continue;
+            }
+            if (ch === quote)
+                quote = null;
+            continue;
+        }
+        if (!inTag) {
+            if (ch === '<') {
+                inTag = true;
+            }
+            continue;
+        }
+        if (ch === '"' || ch === "'") {
+            quote = ch;
+            continue;
+        }
+        if (ch === '>') {
+            inTag = false;
+        }
+    }
+    return { inTag, quote };
+}
 function transformClientScriptBlock(block) {
     const match = block.match(/^([\s\S]*?<script\b[^>]*>)([\s\S]*?)(<\/script>\s*)$/i);
     if (!match)
@@ -566,7 +608,7 @@ function compileHtmlLine(line, actionNames, rpcNameMap) {
     let pos = 0;
     let hasExpr = false;
     while (pos < line.length) {
-        const braceIdx = line.indexOf('{', pos);
+        const braceIdx = findNextTemplateBrace(line, pos);
         if (braceIdx === -1) {
             // No more braces — rest is literal
             result += escapeLiteral(line.slice(pos));
@@ -777,13 +819,36 @@ function escapeLiteral(text) {
         .replace(/`/g, '\\`')
         .replace(/\$\{/g, '\\${');
 }
+function findNextTemplateBrace(src, startPos) {
+    return src.indexOf('{', startPos);
+}
 /** Find the matching closing `}` for an opening `{`, handling nesting. */
 function findClosingBrace(src, openPos) {
     let depth = 0;
+    let quote = null;
+    let escaped = false;
     for (let i = openPos; i < src.length; i++) {
-        if (src[i] === '{')
+        const ch = src[i];
+        if (quote) {
+            if (escaped) {
+                escaped = false;
+                continue;
+            }
+            if (ch === '\\') {
+                escaped = true;
+                continue;
+            }
+            if (ch === quote)
+                quote = null;
+            continue;
+        }
+        if (ch === '"' || ch === "'" || ch === '`') {
+            quote = ch;
+            continue;
+        }
+        if (ch === '{')
             depth++;
-        if (src[i] === '}') {
+        if (ch === '}') {
             depth--;
             if (depth === 0)
                 return i;
@@ -816,13 +881,13 @@ export function generateRenderFunction(template) {
   const __esc = (v) => {
     if (v == null) return '';
     return String(v)
-      .replace(/&/g, '&amp;')
-      .replace(/</g, '&lt;')
-      .replace(/>/g, '&gt;')
-      .replace(/"/g, '&quot;')
-      .replace(/'/g, '&#39;');
-  };
-  ${body}
+      .replace(/&/g, '&amp;')
+      .replace(/</g, '&lt;')
+      .replace(/>/g, '&gt;')
+      .replace(/"/g, '&quot;')
+      .replace(/'/g, '&#39;');
+  };
+  ${body}
 }`;
 }
 import { transpileTypeScript } from './transpile.js';

package/dist/create.js

@@ -633,7 +633,7 @@ ${types}
 function genItemsCrud() {
     return `import { env } from 'cloudflare:workers';
 import { kuratchiORM } from '@kuratchi/orm';
-import { getLocals } from '${FRAMEWORK_PACKAGE_NAME}';
+import { redirect } from '${FRAMEWORK_PACKAGE_NAME}';
 import type { Item } from './schemas/app';
 
 const db = kuratchiORM(() => (env as any).DB);
@@ -718,7 +718,7 @@ import {
   parseSessionCookie,
 } from '@kuratchi/auth';
 import { getAuth } from '@kuratchi/auth';
-import { getLocals } from '${FRAMEWORK_PACKAGE_NAME}';
+import { redirect } from '${FRAMEWORK_PACKAGE_NAME}';
 import type { User } from '../schemas/app';
 
 const db = kuratchiORM(() => (env as any).DB);
@@ -759,7 +759,7 @@ export async function signUp(formData: FormData): Promise<void> {
   }
 
   // Redirect to login after successful signup
-  getLocals().__redirectTo = '/auth/login';
+  redirect('/auth/login');
 }
 
 // ── Sign In ─────────────────────────────────────────────────
@@ -823,7 +823,7 @@ export async function signIn(formData: FormData): Promise<void> {
   locals.__setCookieHeaders.push(setCookieHeader);
 
   // Redirect to admin after successful login
-  locals.__redirectTo = '/admin';
+  redirect('/admin');
 }
 
 // ── Sign Out ────────────────────────────────────────────────
@@ -847,7 +847,7 @@ export async function signOut(formData: FormData): Promise<void> {
   locals.__setCookieHeaders.push(clearHeader);
 
   // Redirect to login after sign out
-  locals.__redirectTo = '/auth/login';
+  redirect('/auth/login');
 }
 
 // ── Get Current User ────────────────────────────────────────

package/dist/index.d.ts

@@ -6,10 +6,11 @@
 export { createApp } from './runtime/app.js';
 export { defineConfig } from './runtime/config.js';
 export { defineRuntime } from './runtime/runtime.js';
-export { getCtx, getEnv, getRequest, getLocals, getParams, getParam, redirect, goto, setBreadcrumbs, getBreadcrumbs, breadcrumbsHome, breadcrumbsPrev, breadcrumbsNext, breadcrumbsCurrent, buildDefaultBreadcrumbs, } from './runtime/context.js';
+export { getCtx, getEnv, getRequest, getLocals, getParams, getParam, RedirectError, redirect, goto, setBreadcrumbs, getBreadcrumbs, breadcrumbsHome, breadcrumbsPrev, breadcrumbsNext, breadcrumbsCurrent, buildDefaultBreadcrumbs, } from './runtime/context.js';
 export { kuratchiDO, doRpc, getDb } from './runtime/do.js';
 export { ActionError } from './runtime/action.js';
 export { PageError } from './runtime/page-error.js';
 export { extractSubdomainSlug, extractSlugFromPrefix, matchContainerViewPath, rewriteProxyLocationHeader, buildContainerRequest, createContainerEnvVars, startContainer, proxyToContainer, handleContainerRouting, forwardJsonPostToContainerDO, matchSiteViewPath, buildSiteContainerRequest, createWpContainerEnvVars, startSiteContainer, proxyToSiteContainer, } from './runtime/containers.js';
 export type { AppConfig, kuratchiConfig, DatabaseConfig, AuthConfig, RouteContext, RouteModule, RuntimeContext, RuntimeDefinition, RuntimeStep, RuntimeNext, RuntimeErrorResult, } from './runtime/types.js';
 export type { RpcOf } from './runtime/do.js';
+export { url, pathname, searchParams, headers, method, params, slug } from './runtime/request.js';

package/dist/index.js

@@ -7,10 +7,11 @@
 export { createApp } from './runtime/app.js';
 export { defineConfig } from './runtime/config.js';
 export { defineRuntime } from './runtime/runtime.js';
-export { getCtx, getEnv, getRequest, getLocals, getParams, getParam, redirect, goto, setBreadcrumbs, getBreadcrumbs, breadcrumbsHome, breadcrumbsPrev, breadcrumbsNext, breadcrumbsCurrent, buildDefaultBreadcrumbs, } from './runtime/context.js';
+export { getCtx, getEnv, getRequest, getLocals, getParams, getParam, RedirectError, redirect, goto, setBreadcrumbs, getBreadcrumbs, breadcrumbsHome, breadcrumbsPrev, breadcrumbsNext, breadcrumbsCurrent, buildDefaultBreadcrumbs, } from './runtime/context.js';
 export { kuratchiDO, doRpc, getDb } from './runtime/do.js';
 export { ActionError } from './runtime/action.js';
 export { PageError } from './runtime/page-error.js';
 export { extractSubdomainSlug, extractSlugFromPrefix, matchContainerViewPath, rewriteProxyLocationHeader, buildContainerRequest, createContainerEnvVars, startContainer, proxyToContainer, handleContainerRouting, forwardJsonPostToContainerDO, 
 // Compatibility aliases
 matchSiteViewPath, buildSiteContainerRequest, createWpContainerEnvVars, startSiteContainer, proxyToSiteContainer, } from './runtime/containers.js';
+export { url, pathname, searchParams, headers, method, params, slug } from './runtime/request.js';

package/dist/runtime/context.d.ts

@@ -12,6 +12,12 @@ export interface BreadcrumbItem {
     href?: string;
     current?: boolean;
 }
+export declare class RedirectError extends Error {
+    readonly isRedirectError = true;
+    readonly location: string;
+    readonly status: number;
+    constructor(path: string, status?: number);
+}
 /** Called by the framework at the start of each request */
 export declare function __setRequestContext(ctx: any, request: Request, env?: Record<string, any>): void;
 /** Get the execution context (Worker: ExecutionContext, DO: DurableObjectState) */
@@ -28,11 +34,11 @@ export declare function getParams<T = Record<string, string>>(): T;
 export declare function getParam(name: string): string | undefined;
 /**
  * Server-side redirect helper for actions/load logic.
- * Sets the post-action redirect target consumed by the framework's PRG flow.
+ * Throws a redirect signal consumed by the framework's PRG flow.
  */
-export declare function redirect(path: string, status?: number): void;
+export declare function redirect(path: string, status?: number): never;
 /** Backward-compatible alias for redirect() */
-export declare function goto(path: string, status?: number): void;
+export declare function goto(path: string, status?: number): never;
 export declare function setBreadcrumbs(items: BreadcrumbItem[]): void;
 export declare function getBreadcrumbs(): BreadcrumbItem[];
 export declare function breadcrumbsHome(label?: string, href?: string): BreadcrumbItem;

package/dist/runtime/context.js

@@ -8,16 +8,29 @@
  * variables are safe and require no Node.js compat flags.
  */
 import { __getDoSelf } from './do.js';
+import { __setRequestParams, __setRequestState } from './request.js';
 let __ctx = null;
 let __request = null;
 let __env = null;
 let __locals = {};
+export class RedirectError extends Error {
+    isRedirectError = true;
+    location;
+    status;
+    constructor(path, status = 303) {
+        super(`Redirect to ${path}`);
+        this.name = 'RedirectError';
+        this.location = path;
+        this.status = status;
+    }
+}
 /** Called by the framework at the start of each request */
 export function __setRequestContext(ctx, request, env) {
     __ctx = ctx;
     __request = request;
     __env = env ?? null;
     __locals = {};
+    __setRequestState(request);
     // Expose context on globalThis for @kuratchi/auth and other packages
     // Workers are single-threaded per request — this is safe
     globalThis.__kuratchi_context__ = {
@@ -63,11 +76,12 @@ export function getParam(name) {
 }
 /**
  * Server-side redirect helper for actions/load logic.
- * Sets the post-action redirect target consumed by the framework's PRG flow.
+ * Throws a redirect signal consumed by the framework's PRG flow.
  */
 export function redirect(path, status = 303) {
     __locals.__redirectTo = path;
     __locals.__redirectStatus = status;
+    throw new RedirectError(path, status);
 }
 /** Backward-compatible alias for redirect() */
 export function goto(path, status = 303) {
@@ -120,6 +134,8 @@ export function buildDefaultBreadcrumbs(pathname, _params = {}) {
 /** Set a value on request-scoped locals (used by framework internals) */
 export function __setLocal(key, value) {
     __locals[key] = value;
+    if (key === 'params')
+        __setRequestParams(value);
 }
 /** Get the full locals object reference (used by framework internals) */
 export function __getLocals() {

package/dist/runtime/index.d.ts

@@ -2,8 +2,9 @@ export { createApp } from './app.js';
 export { defineConfig } from './config.js';
 export { defineRuntime } from './runtime.js';
 export { Router, filePathToPattern } from './router.js';
-export { getCtx, getRequest, getLocals, getParams, getParam, redirect, goto, setBreadcrumbs, getBreadcrumbs, breadcrumbsHome, breadcrumbsPrev, breadcrumbsNext, breadcrumbsCurrent, buildDefaultBreadcrumbs, } from './context.js';
+export { getCtx, getRequest, getLocals, getParams, getParam, RedirectError, redirect, goto, setBreadcrumbs, getBreadcrumbs, breadcrumbsHome, breadcrumbsPrev, breadcrumbsNext, breadcrumbsCurrent, buildDefaultBreadcrumbs, } from './context.js';
 export { kuratchiDO, doRpc } from './do.js';
 export { extractSubdomainSlug, extractSlugFromPrefix, matchContainerViewPath, rewriteProxyLocationHeader, buildContainerRequest, createContainerEnvVars, startContainer, proxyToContainer, handleContainerRouting, forwardJsonPostToContainerDO, matchSiteViewPath, buildSiteContainerRequest, createWpContainerEnvVars, startSiteContainer, proxyToSiteContainer, } from './containers.js';
 export type { AppConfig, Env, AuthConfig, RouteContext, RouteModule, ApiRouteModule, HttpMethod, LayoutModule, RuntimeContext, RuntimeDefinition, RuntimeStep, RuntimeNext, RuntimeErrorResult, } from './types.js';
 export type { RpcOf } from './do.js';
+export { url, pathname, searchParams, headers, method, params, slug } from './request.js';

package/dist/runtime/index.js

@@ -2,8 +2,9 @@ export { createApp } from './app.js';
 export { defineConfig } from './config.js';
 export { defineRuntime } from './runtime.js';
 export { Router, filePathToPattern } from './router.js';
-export { getCtx, getRequest, getLocals, getParams, getParam, redirect, goto, setBreadcrumbs, getBreadcrumbs, breadcrumbsHome, breadcrumbsPrev, breadcrumbsNext, breadcrumbsCurrent, buildDefaultBreadcrumbs, } from './context.js';
+export { getCtx, getRequest, getLocals, getParams, getParam, RedirectError, redirect, goto, setBreadcrumbs, getBreadcrumbs, breadcrumbsHome, breadcrumbsPrev, breadcrumbsNext, breadcrumbsCurrent, buildDefaultBreadcrumbs, } from './context.js';
 export { kuratchiDO, doRpc } from './do.js';
 export { extractSubdomainSlug, extractSlugFromPrefix, matchContainerViewPath, rewriteProxyLocationHeader, buildContainerRequest, createContainerEnvVars, startContainer, proxyToContainer, handleContainerRouting, forwardJsonPostToContainerDO, 
 // Compatibility aliases
 matchSiteViewPath, buildSiteContainerRequest, createWpContainerEnvVars, startSiteContainer, proxyToSiteContainer, } from './containers.js';
+export { url, pathname, searchParams, headers, method, params, slug } from './request.js';

package/dist/runtime/request.d.ts

@@ -0,0 +1,9 @@
+export declare let url: URL;
+export declare let pathname: string;
+export declare let searchParams: URLSearchParams;
+export declare let headers: Headers;
+export declare let method: string;
+export declare let params: Record<string, string>;
+export declare let slug: string | undefined;
+export declare function __setRequestState(request: Request): void;
+export declare function __setRequestParams(nextParams: Record<string, string> | null | undefined): void;

package/dist/runtime/request.js

@@ -0,0 +1,23 @@
+export let url = new URL('http://localhost/');
+export let pathname = '/';
+export let searchParams = url.searchParams;
+export let headers = new Headers();
+export let method = 'GET';
+export let params = {};
+export let slug = undefined;
+function __syncDerivedState() {
+    pathname = url.pathname;
+    searchParams = url.searchParams;
+    slug = params.slug ?? Object.values(params)[0];
+}
+export function __setRequestState(request) {
+    url = new URL(request.url);
+    headers = request.headers;
+    method = request.method;
+    params = {};
+    __syncDerivedState();
+}
+export function __setRequestParams(nextParams) {
+    params = nextParams ?? {};
+    __syncDerivedState();
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kuratchi/js",
-    "version": "0.0.9",
+    "version": "0.0.11",
     "description": "A thin, Cloudflare Workers-native web framework with Svelte-inspired syntax",
     "type": "module",
     "main": "./dist/index.js",
@@ -28,6 +28,10 @@
             "types": "./dist/runtime/context.d.ts",
             "import": "./dist/runtime/context.js"
         },
+        "./request": {
+            "types": "./dist/runtime/request.d.ts",
+            "import": "./dist/runtime/request.js"
+        },
         "./runtime/do.js": {
             "types": "./dist/runtime/do.d.ts",
             "import": "./dist/runtime/do.js"