@nitronjs/framework 0.2.27 → 0.3.0

package/lib/Build/propUtils.js

@@ -0,0 +1,70 @@
+import path from "path";
+import fs from "fs";
+
+const EXTENSIONS = [".tsx", ".ts", ".jsx", ".js"];
+
+/**
+ * Merges two usage trees (union of keys).
+ * true + anything → true (whole usage wins).
+ * @param {object|true} a
+ * @param {object|true} b
+ * @returns {object|true}
+ */
+export function mergeUsageTrees(a, b) {
+    if (a === true || b === true) return true;
+    if (!a || typeof a !== "object") return b;
+    if (!b || typeof b !== "object") return a;
+
+    const merged = Object.create(null);
+    Object.assign(merged, a);
+
+    for (const key of Object.keys(b)) {
+        if (key === "__proto__" || key === "constructor" || key === "prototype") continue;
+        if (merged[key] === true) continue;
+
+        if (!merged[key]) {
+            merged[key] = b[key];
+        }
+        else if (typeof merged[key] === "object" && typeof b[key] === "object") {
+            merged[key] = mergeUsageTrees(merged[key], b[key]);
+        }
+        else {
+            merged[key] = true;
+        }
+    }
+
+    return merged;
+}
+
+/**
+ * Resolves a relative import path to an absolute file path.
+ * Checks extensions (.tsx, .ts, .jsx, .js) and directory index files.
+ * @param {string} importPath - e.g. "./UserDropdown"
+ * @param {string} fromDir - Directory of the importing file.
+ * @returns {string|null}
+ */
+export function resolveComponentPath(importPath, fromDir) {
+    if (!importPath.startsWith(".")) return null;
+
+    const basePath = path.resolve(fromDir, importPath);
+
+    for (const ext of EXTENSIONS) {
+        const full = basePath + ext;
+        if (fs.existsSync(full)) return full;
+    }
+
+    if (fs.existsSync(basePath)) {
+        const stat = fs.statSync(basePath);
+
+        if (stat.isDirectory()) {
+            for (const ext of EXTENSIONS) {
+                const indexPath = path.join(basePath, "index" + ext);
+                if (fs.existsSync(indexPath)) return indexPath;
+            }
+        }
+
+        return basePath;
+    }
+
+    return null;
+}

package/lib/Console/Commands/DevCommand.js

@@ -7,6 +7,7 @@ import fs from "fs";
 import Paths from "../../Core/Paths.js";
 import Environment from "../../Core/Environment.js";
 import Builder from "../../Build/Manager.js";
+import Layout from "../../View/Layout.js";
 
 dotenv.config({ quiet: true });
 Environment.setDev(true);
@@ -35,6 +36,7 @@ class DevServer {
     #building = false;
     #builder = new Builder();
     #debounce = { build: null, restart: null };
+    #banner = null;
 
     #log(icon, msg, extra) {
         const time = new Date().toLocaleTimeString("en-US", { hour12: false, hour: "2-digit", minute: "2-digit", second: "2-digit" });
@@ -79,7 +81,11 @@ class DevServer {
                 if (code && code !== 0) this.#log("err", `Exit code ${code}`);
                 this.#proc = null;
             });
-            setTimeout(resolve, 500);
+            this.#proc.on("message", msg => {
+                if (msg?.type === "banner") this.#banner = msg.text;
+                if (msg?.type === "ready") resolve();
+            });
+            setTimeout(resolve, 5000);
         });
     }
 
@@ -133,7 +139,7 @@ class DevServer {
             clearTimeout(this.#debounce.build);
             this.#debounce.build = setTimeout(async () => {
                 const r = await this.#build("css");
-                if (r.success) this.#send("css", { filePath });
+                if (r.success) this.#send("change", { changeType: "css", file: rel });
             }, 100);
             return;
         }
@@ -144,8 +150,12 @@ class DevServer {
             this.#debounce.build = setTimeout(async () => {
                 const r = await this.#build();
                 if (r.success) {
-                    if (r.cssChanged) this.#send("css", {});
-                    this.#send("view", { filePath });
+                    const changeType = detectChangeType(filePath);
+                    this.#send("change", {
+                        changeType,
+                        cssChanged: r.cssChanged || false,
+                        file: rel
+                    });
                 }
             }, 100);
             return;
@@ -166,7 +176,7 @@ class DevServer {
         this.#log("info", `Unmatched: ${rel}`);
     }
 
-    #watch() {
+    async #watch() {
         const candidates = [
             path.join(Paths.project, "resources/views"),
             path.join(Paths.project, "resources/css"),
@@ -196,17 +206,21 @@ class DevServer {
         watcher.on("change", p => this.#onChange(p));
         watcher.on("add", p => this.#onChange(p));
         watcher.on("error", e => this.#log("err", `Watch error: ${e.message}`));
-        watcher.on("ready", () => {
-            this.#log("watch", `Watching ${watchPaths.length} directories`);
-        });
 
-        return watcher;
+        return new Promise(resolve => {
+            watcher.on("ready", () => {
+                this.#log("watch", `Watching ${watchPaths.length} directories`);
+                resolve(watcher);
+            });
+        });
     }
 
     async start() {
         await this.#build();
         await this.#start();
-        const watcher = this.#watch();
+        const watcher = await this.#watch();
+
+        if (this.#banner) console.log(this.#banner);
 
         const exit = async () => {
             console.log();
@@ -220,6 +234,12 @@ class DevServer {
     }
 }
 
+function detectChangeType(filePath) {
+    if (Layout.isLayout(filePath)) return "layout";
+
+    return "page";
+}
+
 export default async function Dev() {
     await new DevServer().start();
 }

package/lib/Console/Commands/MakeCommand.js

@@ -64,7 +64,14 @@ export default async function make(type, rawName) {
 
     const parts = rawName.split("/");
     const subDirs = parts.slice(0, -1).join("/");
-    const outputDir = path.join(Paths.project, baseDirs[type]);
+    const outputDir = path.resolve(Paths.project, baseDirs[type]);
+    const resolvedSubDir = path.resolve(outputDir, subDirs);
+
+    if (!resolvedSubDir.startsWith(outputDir)) {
+        Output.error("Invalid path: name cannot contain path traversal (e.g. '../').");
+
+        return false;
+    }
 
     let className = parts[parts.length - 1];
     let fileName = `${className}.js`;

package/lib/Console/Output.js

@@ -57,7 +57,6 @@ const step = (icon, color, action, target, suffix = "") => {
 const success = (msg) => log(`${C.green}${I.success}${C.reset} ${msg}`);
 const error = (msg) => log(`${C.red}${I.error}${C.reset} ${msg}`);
 const warn = (msg) => log(`${C.yellow}${I.warn}${C.reset} ${msg}`);
-const info = (msg) => log(`${C.blue}${I.info}${C.reset} ${msg}`);
 const dim = (msg) => log(`${C.dim}${msg}${C.reset}`);
 const newline = () => log();
 const errorDetail = (msg) => log(`  ${C.dim}${msg}${C.reset}`);
@@ -119,7 +118,6 @@ export default {
     success,
     error,
     warn,
-    info,
     dim,
     newline,
     errorDetail,

package/lib/Console/Stubs/rsc-consumer.tsx

@@ -0,0 +1,74 @@
+import React from "react";
+import { hydrateRoot } from "react-dom/client";
+// @ts-ignore — no type declarations for this package
+import { createFromReadableStream } from "react-server-dom-webpack/client.browser";
+
+declare global {
+    interface Window {
+        __NITRON_FLIGHT__?: string;
+        __NITRON_RSC__?: {
+            root: any;
+            navigate: (payload: string) => void;
+        };
+    }
+}
+
+// Convert Flight payload string to a ReadableStream
+function payloadToStream(payload: string): ReadableStream<Uint8Array> {
+    return new ReadableStream({
+        start(controller) {
+            controller.enqueue(new TextEncoder().encode(payload));
+            controller.close();
+        }
+    });
+}
+
+// Navigate to a new page using RSC payload (called by spa.js)
+function navigateWithPayload(payload: string) {
+    const rsc = window.__NITRON_RSC__;
+
+    if (!rsc || !rsc.root) return;
+
+    const stream = payloadToStream(payload);
+    const response = createFromReadableStream(stream);
+
+    function Root() {
+        return React.use(response);
+    }
+
+    rsc.root.render(React.createElement(Root));
+}
+
+function mount() {
+    const payload = window.__NITRON_FLIGHT__;
+
+    if (!payload) return;
+
+    const stream = payloadToStream(payload);
+    const rscResponse = createFromReadableStream(stream);
+
+    function Root(): React.ReactNode {
+        return React.use(rscResponse) as React.ReactNode;
+    }
+
+    const container = document.getElementById("app");
+
+    if (!container) return;
+
+    const root = hydrateRoot(container, React.createElement(Root));
+
+    // Expose RSC functions for SPA navigation
+    window.__NITRON_RSC__ = {
+        root,
+        navigate: navigateWithPayload
+    };
+
+    delete window.__NITRON_FLIGHT__;
+}
+
+if (document.readyState === "loading") {
+    document.addEventListener("DOMContentLoaded", mount);
+}
+else {
+    mount();
+}

package/lib/Console/Stubs/vendor-dev.tsx

@@ -2,15 +2,17 @@ import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import * as ReactDOMClient from 'react-dom/client';
 import * as OriginalJsx from 'react/jsx-runtime';
-import RefreshRuntime from 'react-refresh/runtime';
-
-// Filter React 19 key warnings from third-party libraries
+// Filter React 19 warnings that are false positives in RSC (Flight protocol)
+// - key-in-props: third-party libraries spreading key in JSX
+// - key-in-list: Flight wire format loses static/dynamic children distinction,
+//   causing React to warn about keys on children that were originally static
 const originalError = console.error;
 console.error = function(...args: any[]) {
     const msg = args[0];
     if (typeof msg === 'string' && (
         msg.includes('A props object containing a "key" prop is being spread into JSX') ||
-        msg.includes('`key` is not a prop')
+        msg.includes('`key` is not a prop') ||
+        msg.includes('Each child in a list should have a unique "key" prop')
     )) {
         return;
     }
@@ -53,47 +55,34 @@ const NitronJSXRuntime = {
     Fragment: OriginalJsx.Fragment
 };
 
-Object.assign(window, {
-    __NITRON_REACT__: React,
-    __NITRON_REACT_DOM__: ReactDOM,
-    __NITRON_REACT_DOM_CLIENT__: ReactDOMClient,
-    __NITRON_JSX_RUNTIME__: NitronJSXRuntime
-});
-
-RefreshRuntime.injectIntoGlobalHook(window);
+// Webpack shims for react-server-dom-webpack/client chunk loading.
+// The Flight client uses __webpack_chunk_load__ to load client component
+// JS files and __webpack_require__ to access their exports.
+const moduleRegistry: Record<string, any> = {};
 
-interface RefreshModule {
-    performReactRefresh: () => void;
-    register: (type: any, id: string) => void;
-    createSignatureFunctionForTransform: () => (type: any, key: string, forceReset?: boolean, getCustomHooks?: () => any[]) => any;
-    isLikelyComponentType: (type: any) => boolean;
-}
+const webpackRequire: any = function(moduleId: string) {
+    return moduleRegistry[moduleId];
+};
 
-const NitronRefresh: RefreshModule = {
-    performReactRefresh: () => {
-        if ((RefreshRuntime as any).hasUnrecoverableErrors?.()) {
-            window.location.reload();
-            return;
-        }
-        RefreshRuntime.performReactRefresh();
-    },
-    register: (type: any, id: string) => {
-        RefreshRuntime.register(type, id);
-    },
-    createSignatureFunctionForTransform: () => {
-        return RefreshRuntime.createSignatureFunctionForTransform();
-    },
-    isLikelyComponentType: (type: any) => {
-        return RefreshRuntime.isLikelyComponentType(type);
-    }
+webpackRequire.u = function(chunkId: string) {
+    return chunkId;
 };
 
-(window as any).__NITRON_REFRESH__ = NitronRefresh;
+const webpackChunkLoad = function(chunkId: string) {
+    const filename = webpackRequire.u(chunkId);
 
-(window as any).$RefreshReg$ = (type: any, id: string) => {
-    RefreshRuntime.register(type, id);
+    return import('/storage/' + filename).then((mod: any) => {
+        moduleRegistry[chunkId] = mod;
+    });
 };
 
-(window as any).$RefreshSig$ = () => {
-    return RefreshRuntime.createSignatureFunctionForTransform();
-};
+Object.assign(window, {
+    __NITRON_REACT__: React,
+    __NITRON_REACT_DOM__: ReactDOM,
+    __NITRON_REACT_DOM_CLIENT__: ReactDOMClient,
+    __NITRON_JSX_RUNTIME__: NitronJSXRuntime,
+    __webpack_require__: webpackRequire,
+    __webpack_chunk_load__: webpackChunkLoad,
+    __webpack_get_script_filename__: webpackRequire.u
+});
+

package/lib/Console/Stubs/vendor.tsx

@@ -38,9 +38,33 @@ const NitronJSXRuntime = {
     Fragment: OriginalJsx.Fragment
 };
 
+// Webpack shims for react-server-dom-webpack/client chunk loading.
+// The Flight client uses __webpack_chunk_load__ to load client component
+// JS files and __webpack_require__ to access their exports.
+const moduleRegistry: Record<string, any> = {};
+
+const webpackRequire: any = function(moduleId: string) {
+    return moduleRegistry[moduleId];
+};
+
+webpackRequire.u = function(chunkId: string) {
+    return chunkId;
+};
+
+const webpackChunkLoad = function(chunkId: string) {
+    const filename = webpackRequire.u(chunkId);
+
+    return import('/storage/' + filename).then((mod: any) => {
+        moduleRegistry[chunkId] = mod;
+    });
+};
+
 Object.assign(window, {
     __NITRON_REACT__: React,
     __NITRON_REACT_DOM__: ReactDOM,
     __NITRON_REACT_DOM_CLIENT__: ReactDOMClient,
-    __NITRON_JSX_RUNTIME__: NitronJSXRuntime
+    __NITRON_JSX_RUNTIME__: NitronJSXRuntime,
+    __webpack_require__: webpackRequire,
+    __webpack_chunk_load__: webpackChunkLoad,
+    __webpack_get_script_filename__: webpackRequire.u
 });

package/lib/Core/Config.js

@@ -76,12 +76,6 @@ class Config {
         return this.#configs[name] || {};
     }
 
-    /**
-     * Check if config system is initialized
-     */
-    static isInitialized() {
-        return this.#initialized;
-    }
 }
 
 export default Config;

package/lib/Core/Paths.js

@@ -64,10 +64,6 @@ class Paths {
         return path.join(this.#project, "app/Middlewares");
     }
 
-    static get models() {
-        return path.join(this.#project, "app/Models");
-    }
-
     static get routes() {
         return path.join(this.#project, "routes");
     }
@@ -172,14 +168,6 @@ class Paths {
         return pathToFileURL(path.join(this.#project, `routes/${name}.js`)).href;
     }
 
-    static migrationUrl(file) {
-        return pathToFileURL(path.join(this.migrations, file)).href;
-    }
-
-    static seederUrl(file) {
-        return pathToFileURL(path.join(this.seeders, file)).href;
-    }
-
     static kernelUrl() {
         return pathToFileURL(path.join(this.#project, "app/Kernel.js")).href;
     }
@@ -192,13 +180,6 @@ class Paths {
         return path.join(this.#project, ...segments);
     }
 
-    static frameworkJoin(...segments) {
-        return path.join(this.#framework, ...segments);
-    }
-
-    static resolve(...segments) {
-        return path.resolve(this.#project, ...segments);
-    }
 }
 
 export default Paths;

package/lib/Database/Migration/Checksum.js

@@ -10,9 +10,6 @@ class Checksum {
         return createHash('sha256').update(content.replace(/\r\n/g, '\n').trim(), 'utf8').digest('hex');
     }
 
-    static verify(filePath, expectedChecksum) {
-        return this.fromFile(filePath) === expectedChecksum;
-    }
 }
 
 export default Checksum;

package/lib/Database/Migration/MigrationRepository.js

@@ -29,10 +29,6 @@ class MigrationRepository {
         return await this.#getMaxBatch();
     }
 
-    static async getByBatch(batch) {
-        return await DB.table(this.table).where('batch', batch).orderBy('id', 'desc').get();
-    }
-
     static async getLastBatches(steps = 1) {
         const lastBatch = await this.getLastBatchNumber();
         if (lastBatch === 0) return [];
@@ -56,10 +52,6 @@ class MigrationRepository {
         return await DB.table(this.table).where('name', name).first();
     }
 
-    static async exists(name) {
-        return (await this.find(name)) !== null;
-    }
-
     static async getChecksum(name) {
         return (await this.find(name))?.checksum || null;
     }

package/lib/Database/Migration/MigrationRunner.js

@@ -156,8 +156,7 @@ class MigrationRunner {
                         }
 
                         await MigrationRepository.delete(file);
-                        Output.rollback("Rolled back", file);
-                        Output.newline();
+                        Output.done("Rolled back", file);
                     }
                     catch (rollbackError) {
                         Output.error(`Rollback failed for ${file}: ${rollbackError.message}`);

package/lib/Database/Model.js

@@ -27,7 +27,7 @@ class Model {
         Object.defineProperty(this, '_exists', { value: false, writable: true });
 
         Object.assign(this._attributes, attrs);
-        this._original = { ...this._attributes };
+        this._original = structuredClone(this._attributes);
 
         return new Proxy(this, {
             get: (target, prop) => {
@@ -60,6 +60,13 @@ class Model {
 
                 return true;
             },
+            has: (target, prop) => {
+                if (typeof prop === 'symbol' || prop.startsWith('_')) {
+                    return prop in target;
+                }
+
+                return prop in target._attributes || prop in target;
+            },
             ownKeys: (target) => {
                 return [...Object.keys(target._attributes), ...Object.getOwnPropertyNames(target)];
             },
@@ -125,10 +132,10 @@ class Model {
         ensureTable(this);
 
         if (arguments.length === 2) {
-            return DB.table(this.table, null, this).where(column, operator);
+            return DB.table(this.table, this).where(column, operator);
         }
 
-        return DB.table(this.table, null, this).where(column, operator, value);
+        return DB.table(this.table, this).where(column, operator, value);
     }
 
     /**
@@ -139,7 +146,7 @@ class Model {
     static select(...columns) {
         ensureTable(this);
 
-        return DB.table(this.table, null, this).select(...columns);
+        return DB.table(this.table, this).select(...columns);
     }
 
     /**
@@ -151,7 +158,7 @@ class Model {
     static orderBy(column, direction = 'ASC') {
         ensureTable(this);
 
-        return DB.table(this.table, null, this).orderBy(column, direction);
+        return DB.table(this.table, this).orderBy(column, direction);
     }
 
     /**
@@ -162,7 +169,7 @@ class Model {
     static limit(value) {
         ensureTable(this);
 
-        return DB.table(this.table, null, this).limit(value);
+        return DB.table(this.table, this).limit(value);
     }
 
     // ─────────────────────────────────────────────────────────────────────────────
@@ -204,7 +211,7 @@ class Model {
             this._exists = true;
         }
 
-        this._original = { ...this._attributes };
+        this._original = structuredClone(this._attributes);
 
         return this;
     }
@@ -226,10 +233,11 @@ class Model {
     }
 
     /**
-     * Convert model attributes to plain object.
+     * Serialize model to plain object.
+     * Called automatically by JSON.stringify() and RSC Flight serializer.
      * @returns {Object}
      */
-    toObject() {
+    toJSON() {
         return { ...this._attributes };
     }
 }
@@ -264,7 +272,7 @@ function hydrate(modelClass, row) {
     }
 
     instance._exists = true;
-    instance._original = { ...instance._attributes };
+    instance._original = structuredClone(instance._attributes);
 
     return instance;
 }
@@ -285,7 +293,7 @@ const QUERY_METHODS = [
 for (const method of QUERY_METHODS) {
     Model[method] = function(...args) {
         ensureTable(this);
-        return DB.table(this.table, null, this)[method](...args);
+        return DB.table(this.table, this)[method](...args);
     };
 }
 

package/lib/Database/QueryBuilder.js

@@ -378,14 +378,17 @@ class QueryBuilder {
             throw new Error('whereBetween requires array with exactly 2 values');
         }
 
+        const min = this.#validateWhereValue(values[0]);
+        const max = this.#validateWhereValue(values[1]);
+
         this.#wheres.push({
             type: 'between',
             column: this.#validateIdentifier(column),
-            values,
+            values: [min, max],
             boolean: 'AND'
         });
 
-        this.#bindings.push(...values);
+        this.#bindings.push(min, max);
 
         return this;
     }
@@ -636,6 +639,7 @@ class QueryBuilder {
                 const validatedCol = this.#validateIdentifier(col);
                 const val = data[col];
                 if (this.#isRawExpression(val)) {
+                    validateRawExpression(val.value);
                     sets.push(`${validatedCol} = ${val.value}`);
                 }
 
@@ -661,6 +665,10 @@ class QueryBuilder {
     }
 
     async delete() {
+        if (this.#wheres.length === 0) {
+            throw new Error("delete() requires at least one WHERE condition. Use truncate() to delete all records.");
+        }
+
         const connection = await this.#getConnection();
         try {
             const sql = `DELETE FROM ${this.#quoteIdentifier(this.#table)}${this.#compileWheres()}`;
@@ -678,6 +686,21 @@ class QueryBuilder {
         }
     }
 
+    async truncate() {
+        const connection = await this.#getConnection();
+        try {
+            await connection.query(`TRUNCATE TABLE ${this.#quoteIdentifier(this.#table)}`);
+        }
+
+        catch (error) {
+            throw this.#sanitizeError(error);
+        }
+
+        finally {
+            this.#reset();
+        }
+    }
+
     #toSql() {
         const distinct = this.#distinctFlag ? 'DISTINCT ' : '';
         const columns = this.#selectColumns.map(col => {
@@ -730,8 +753,6 @@ class QueryBuilder {
                     return `${boolean}${where.column} IS NOT NULL`;
                 case 'between':
                     return `${boolean}${where.column} BETWEEN ? AND ?`;
-                case 'raw':
-                    return `${boolean}${where.sql}`;
                 default:
                     return '';
             }