@nitronjs/framework 0.2.11 → 0.2.13

package/lib/Build/FileAnalyzer.js

@@ -239,7 +239,7 @@ class FileAnalyzer {
         if (declaration?.type === "VariableDeclaration") {
             for (const decl of declaration.declarations) {
                 if (decl.id.type === "Identifier") {
-                    if (decl.id.name === "layout" &&
+                    if (decl.id.name === "Layout" &&
                         decl.init?.type === "BooleanLiteral" &&
                         decl.init.value === false) {
                         meta.layoutDisabled = true;

package/lib/Build/jsxRuntime.js

@@ -1,10 +1,31 @@
+/**
+ * Custom JSX Runtime for NitronJS
+ * 
+ * Handles React 19's strict key prop requirements and provides
+ * island architecture support for client components.
+ */
 const JSX_RUNTIME = `
 import * as React from 'react';
 import * as OriginalJsx from '__react_jsx_original__';
 
 const CTX = Symbol.for('__nitron_view_context__');
 const MARK = Symbol.for('__nitron_client_component__');
-const UNSAFE_KEYS = new Set(['__proto__', 'constructor', 'prototype']);
+const UNSAFE_KEYS = new Set(['__proto__', 'constructor', 'prototype', 'key', 'ref']);
+
+// Filter React 19 key warnings from third-party libraries
+if (typeof console !== 'undefined' && console.error) {
+    const originalError = console.error;
+    console.error = function(...args) {
+        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')
+        )) {
+            return;
+        }
+        return originalError.apply(console, args);
+    };
+}
 
 function getContext() {
     return globalThis[CTX]?.getStore?.();
@@ -20,6 +41,7 @@ globalThis.request = () => {
 const DepthContext = React.createContext(false);
 const componentCache = new WeakMap();
 
+// Sanitizes props for client-side hydration (removes functions, symbols, circular refs)
 function sanitizeProps(obj, seen = new WeakSet()) {
     if (obj == null) return obj;
 
@@ -62,6 +84,7 @@ function wrapWithDepth(children) {
     return OriginalJsx.jsx(DepthContext.Provider, { value: true, children });
 }
 
+// Creates an island wrapper for client components (hydrated independently)
 function createIsland(Component, name) {
     function IslandBoundary(props) {
         if (React.useContext(DepthContext)) {
@@ -96,12 +119,23 @@ function getWrappedComponent(Component) {
     return componentCache.get(Component);
 }
 
+// Extracts key from props without triggering React 19's getter warning
 function extractKey(props, key) {
-    if (props == null || !('key' in props)) {
-        return [props, key];
+    if (props == null) return [props, key];
+    if (!Object.prototype.hasOwnProperty.call(props, 'key')) return [props, key];
+
+    const cleanProps = {};
+    let extractedKey = key;
+
+    for (const k of Object.keys(props)) {
+        if (k === 'key') {
+            if (extractedKey == null) extractedKey = props[k];
+        } else {
+            cleanProps[k] = props[k];
+        }
     }
-    const { key: propKey, ...rest } = props;
-    return [rest, key ?? propKey];
+
+    return [cleanProps, extractedKey];
 }
 
 export function jsx(type, props, key) {

package/lib/Build/plugins.js

@@ -162,7 +162,8 @@ export function createServerModuleBlockerPlugin() {
 
 /**
  * Creates an esbuild plugin that transforms server functions for client use.
- * Replaces csrf() and route() calls with runtime lookups.
+ * Replaces csrf() calls with runtime lookups.
+ * Note: route() is now a global function defined in spa.js
  * @returns {import("esbuild").Plugin}
  */
 export function createServerFunctionsPlugin() {
@@ -176,7 +177,7 @@ export function createServerFunctionsPlugin() {
 
                 let source = await fs.promises.readFile(args.path, "utf8");
 
-                if (!source.includes("csrf(") && !source.includes("route(")) {
+                if (!source.includes("csrf(")) {
                     return null;
                 }
 
@@ -185,11 +186,6 @@ export function createServerFunctionsPlugin() {
                     "window.__NITRON_RUNTIME__.csrf"
                 );
 
-                source = source.replace(
-                    /\broute\s*\(\s*['"]([^'"]+)['"]\s*\)/g,
-                    (_, routeName) => `window.__NITRON_RUNTIME__.routes["${routeName}"]`
-                );
-
                 const ext = args.path.split(".").pop();
                 const loader = ext === "tsx" ? "tsx" : ext === "ts" ? "ts" : ext === "jsx" ? "jsx" : "js";
 

package/lib/Console/Commands/MigrateCommand.js

@@ -1,6 +1,7 @@
 import dotenv from 'dotenv';
 import DB from '../../Database/DB.js';
 import Config from '../../Core/Config.js';
+import Environment from '../../Core/Environment.js';
 import MigrationRunner from '../../Database/Migration/MigrationRunner.js';
 import seed from './SeedCommand.js';
 
@@ -8,6 +9,7 @@ export default async function migrate(options = {}) {
     const { seed: shouldSeed = false } = options;
 
     dotenv.config({ quiet: true });
+    Environment.setDev(true);
     await Config.initialize();
 
     try {

package/lib/Console/Commands/MigrateFreshCommand.js

@@ -1,6 +1,7 @@
 import dotenv from 'dotenv';
 import DB from '../../Database/DB.js';
 import Config from '../../Core/Config.js';
+import Environment from '../../Core/Environment.js';
 import MigrationRunner from '../../Database/Migration/MigrationRunner.js';
 import Output from '../../Console/Output.js';
 import seed from './SeedCommand.js';
@@ -9,6 +10,7 @@ export default async function migrateFresh(options = {}) {
     const { seed: shouldSeed = false } = options;
 
     dotenv.config({ quiet: true });
+    Environment.setDev(true);
     await Config.initialize();
 
     try {

package/lib/Console/Commands/MigrateRollbackCommand.js

@@ -1,6 +1,7 @@
 import dotenv from 'dotenv';
 import DB from '../../Database/DB.js';
 import Config from '../../Core/Config.js';
+import Environment from '../../Core/Environment.js';
 import MigrationRunner from '../../Database/Migration/MigrationRunner.js';
 import Output from '../../Console/Output.js';
 
@@ -8,6 +9,7 @@ export default async function rollback(options = {}) {
     const { step = 1, all = false } = options;
 
     dotenv.config({ quiet: true });
+    Environment.setDev(true);
     await Config.initialize();
 
     try {

package/lib/Console/Commands/MigrateStatusCommand.js

@@ -1,11 +1,13 @@
 import dotenv from 'dotenv';
 import DB from '../../Database/DB.js';
 import Config from '../../Core/Config.js';
+import Environment from '../../Core/Environment.js';
 import MigrationRunner from '../../Database/Migration/MigrationRunner.js';
 import Output from '../../Console/Output.js';
 
 export default async function status() {
     dotenv.config({ quiet: true });
+    Environment.setDev(true);
     await Config.initialize();
 
     try {

package/lib/Console/Commands/SeedCommand.js

@@ -1,10 +1,12 @@
 import dotenv from 'dotenv';
 import DB from '../../Database/DB.js';
 import Config from '../../Core/Config.js';
+import Environment from '../../Core/Environment.js';
 import SeederRunner from '../../Database/Seeder/SeederRunner.js';
 
 export default async function seed(seederName = null) {
     dotenv.config({ quiet: true });
+    Environment.setDev(true);
     await Config.initialize();
 
     try {

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

@@ -4,12 +4,37 @@ 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
+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')
+    )) {
+        return;
+    }
+    return originalError.apply(console, args);
+};
+
+// Extracts key from props without triggering React 19's getter warning
 function extractKey(props: any, key: any): [any, any] {
-    if (props == null || !('key' in props)) {
-        return [props, key];
+    if (props == null) return [props, key];
+    if (!Object.prototype.hasOwnProperty.call(props, 'key')) return [props, key];
+
+    const cleanProps: any = {};
+    let extractedKey = key;
+
+    for (const k of Object.keys(props)) {
+        if (k === 'key') {
+            if (extractedKey == null) extractedKey = props[k];
+        }
+        else {
+            cleanProps[k] = props[k];
+        }
     }
-    const { key: propKey, ...rest } = props;
-    return [rest, key ?? propKey];
+
+    return [cleanProps, extractedKey];
 }
 
 function jsx(type: any, props: any, key?: any) {

package/lib/Console/Stubs/vendor.tsx

@@ -3,12 +3,23 @@ import * as ReactDOM from 'react-dom';
 import * as ReactDOMClient from 'react-dom/client';
 import * as OriginalJsx from 'react/jsx-runtime';
 
+// Extracts key from props without triggering React 19's getter warning
 function extractKey(props: any, key: any): [any, any] {
-    if (props == null || !('key' in props)) {
-        return [props, key];
+    if (props == null) return [props, key];
+    if (!Object.prototype.hasOwnProperty.call(props, 'key')) return [props, key];
+
+    const cleanProps: any = {};
+    let extractedKey = key;
+
+    for (const k of Object.keys(props)) {
+        if (k === 'key') {
+            if (extractedKey == null) extractedKey = props[k];
+        } else {
+            cleanProps[k] = props[k];
+        }
     }
-    const { key: propKey, ...rest } = props;
-    return [rest, key ?? propKey];
+
+    return [cleanProps, extractedKey];
 }
 
 function jsx(type: any, props: any, key?: any) {

package/lib/Database/Drivers/MySQLDriver.js

@@ -154,13 +154,17 @@ class MySQLDriver {
     #handleError(error, sql, bindings = null) {
         if (Environment.isProd) {
             console.error("[MySQLDriver] Query failed", {
+                message: error.message,
                 code: error.code,
                 errno: error.errno,
-                sqlState: error.sqlState
+                sqlState: error.sqlState,
+                sql: sql?.substring(0, 200)
             });
 
             const sanitized = new Error("Database query failed");
             sanitized.code = error.code;
+            sanitized.errno = error.errno;
+            sanitized.sqlState = error.sqlState;
             sanitized.driver = "mysql";
 
             return sanitized;

package/lib/Database/Migration/MigrationRunner.js

@@ -50,6 +50,8 @@ class MigrationRunner {
             Output.frameworkMigration('done', file);
         }
 
+        Output.newline();
+
         return { success: true, ran };
     }
 

package/lib/Database/Model.js

@@ -247,4 +247,24 @@ function hydrate(modelClass, row) {
     return instance;
 }
 
+// ─────────────────────────────────────────────────────────────────────────────
+// QueryBuilder Method Forwarding
+// Automatically forward all QueryBuilder methods to Model for fluent chaining
+// ─────────────────────────────────────────────────────────────────────────────
+
+const QUERY_METHODS = [
+    // Chain methods (return QueryBuilder)
+    'distinct', 'orWhere', 'whereIn', 'whereNotIn',
+    'whereBetween', 'whereNot', 'join', 'groupBy', 'offset',
+    // Terminal methods (return results)
+    'count', 'max', 'min', 'sum', 'avg', 'delete'
+];
+
+for (const method of QUERY_METHODS) {
+    Model[method] = function(...args) {
+        ensureTable(this);
+        return DB.table(this.table, null, this)[method](...args);
+    };
+}
+
 export default Model;

package/lib/Database/QueryBuilder.js

@@ -135,8 +135,10 @@ class QueryBuilder {
                 message: error.message,
                 code: error.code,
                 errno: error.errno,
-                sql: error.sql?.substring(0, 100),
-                sqlState: error.sqlState
+                sqlState: error.sqlState,
+                sql: error.sql?.substring(0, 200),
+                bindings: error.bindings,
+                driver: error.driver
             });
 
             const sanitized = new Error('Database query failed. Please contact support if the problem persists.');
@@ -297,24 +299,14 @@ class QueryBuilder {
         return this;
     }
 
-    whereNull(column) {
-        this.#wheres.push({
-            type: 'null',
-            column: this.#validateIdentifier(column),
-            boolean: 'AND'
-        });
-
-        return this;
-    }
-
-    whereNotNull(column) {
-        this.#wheres.push({
-            type: 'notNull',
-            column: this.#validateIdentifier(column),
-            boolean: 'AND'
-        });
-
-        return this;
+    /**
+     * Add a WHERE NOT (!=) clause.
+     * @param {string} column - Column name
+     * @param {*} value - Value to compare
+     * @returns {QueryBuilder}
+     */
+    whereNot(column, value) {
+        return this.where(column, '!=', value);
     }
 
     whereBetween(column, values) {
@@ -334,22 +326,6 @@ class QueryBuilder {
         return this;
     }
 
-    whereRaw(sql, bindings = []) {
-        if (typeof sql !== 'string' || sql.length === 0) {
-            throw new Error('whereRaw requires non-empty SQL string');
-        }
-
-        this.#wheres.push({
-            type: 'raw',
-            sql,
-            boolean: 'AND'
-        });
-
-        this.#bindings.push(...bindings);
-
-        return this;
-    }
-
     join(table, first, operator, second, type = 'inner') {
         if (arguments.length === 3) {
             second = operator;
@@ -370,14 +346,6 @@ class QueryBuilder {
         return this;
     }
 
-    leftJoin(table, first, operator, second) {
-        return this.join(table, first, operator, second, 'left');
-    }
-
-    rightJoin(table, first, operator, second) {
-        return this.join(table, first, operator, second, 'right');
-    }
-
     orderBy(column, direction = 'ASC') {
         this.#orders.push({
             column: this.#validateIdentifier(column),
@@ -394,25 +362,6 @@ class QueryBuilder {
         return this;
     }
 
-    having(column, operator, value) {
-        if (arguments.length === 2) {
-            value = operator;
-            operator = '=';
-        }
-
-        operator = this.#validateWhereOperator(operator);
-
-        this.#havings.push({
-            column: this.#validateIdentifier(column),
-            operator,
-            value
-        });
-        this.#bindings.push(value);
-
-
-        return this;
-    }
-
     limit(value) {
         this.#limitValue = this.#validateInteger(value);
 
@@ -425,10 +374,6 @@ class QueryBuilder {
         return this;
     }
 
-    forPage(page, perPage = 15) {
-        return this.offset((page - 1) * perPage).limit(perPage);
-    }
-
     async get() {
         const connection = await this.#getConnection();
 
@@ -740,13 +685,6 @@ class QueryBuilder {
         return sql;
     }
 
-    toSql() {
-        return this.#toSql();
-    }
-
-    getBindings() {
-        return [...this.#bindings];
-    }
 }
 
 export class RawExpression {

package/lib/Filesystem/Storage.js

@@ -65,6 +65,25 @@ class Storage {
         await fs.promises.unlink(fullPath);
     }
 
+    /**
+     * Moves or renames a file in storage.
+     * @param {string} fromPath - Current relative path to the file
+     * @param {string} toPath - New relative path for the file
+     * @param {boolean} isPrivate - Whether to operate on private storage
+     * @returns {Promise<void>}
+     */
+    static async move(fromPath, toPath, isPrivate = false) {
+        const base = isPrivate ? this.#privateRoot : this.#publicRoot;
+        const fullFromPath = this.#validatePath(base, fromPath);
+        const fullToPath = this.#validatePath(base, toPath);
+
+        // Ensure target directory exists
+        const targetDir = path.dirname(fullToPath);
+        await fs.promises.mkdir(targetDir, { recursive: true });
+
+        await fs.promises.rename(fullFromPath, fullToPath);
+    }
+
     /**
      * Checks if a file exists in storage.
      * @param {string} filePath - Relative path to the file

package/lib/Http/Server.js

@@ -171,6 +171,8 @@ class Server {
             for (const [key, field] of Object.entries(req.body)) {
                 if (field?.toBuffer) {
                     if (field.filename) {
+                        const lastDot = field.filename.lastIndexOf(".");
+                        field.extension = lastDot > 0 ? field.filename.slice(lastDot + 1).toLowerCase() : "";
                         files[key] = field;
                     }
                 }

package/lib/View/Client/spa.js

@@ -6,6 +6,28 @@
     var layouts = [];
     var navigating = false;
 
+    // Route helper function for client-side
+    globalThis.route = function(name, params) {
+        var runtime = window.__NITRON_RUNTIME__;
+        if (!runtime || !runtime.routes) {
+            console.error("Route runtime not initialized");
+            return "";
+        }
+
+        var pattern = runtime.routes[name];
+        if (!pattern) {
+            console.error('Route "' + name + '" not found');
+            return "";
+        }
+
+        if (!params) return pattern;
+
+        // Replace :param tokens with actual values
+        return pattern.replace(/:(\w+)/g, function(match, key) {
+            return params[key] !== undefined ? params[key] : match;
+        });
+    };
+
     function init() {
         var rt = window.__NITRON_RUNTIME__;
         if (rt && rt.layouts) layouts = rt.layouts;

package/lib/View/View.js

@@ -371,7 +371,7 @@ class View {
             throw error;
         }
 
-        const mergedMeta = this.#mergeMeta(layoutModules, mod.Meta);
+        const mergedMeta = this.#mergeMeta(layoutModules, mod.Meta, params);
 
         return {
             html,
@@ -381,30 +381,36 @@ class View {
         };
     }
 
-    static #mergeMeta(layoutModules, viewMeta) {
+    static #mergeMeta(layoutModules, viewMeta, params = {}) {
         const result = {};
 
         for (const layoutMod of layoutModules) {
             if (layoutMod.Meta) {
-                for (const key of Object.keys(layoutMod.Meta)) {
+                const resolvedLayoutMeta = typeof layoutMod.Meta === "function" 
+                    ? layoutMod.Meta(params) 
+                    : layoutMod.Meta;
+                for (const key of Object.keys(resolvedLayoutMeta)) {
                     if (!(key in result)) {
-                        result[key] = layoutMod.Meta[key];
+                        result[key] = resolvedLayoutMeta[key];
                     }
                 }
             }
         }
 
         if (viewMeta) {
-            for (const key of Object.keys(viewMeta)) {
+            const resolvedViewMeta = typeof viewMeta === "function" 
+                ? viewMeta(params) 
+                : viewMeta;
+            for (const key of Object.keys(resolvedViewMeta)) {
                 if (key === "title" && result.title?.template) {
-                    const viewTitle = typeof viewMeta.title === "object"
-                        ? viewMeta.title.default
-                        : viewMeta.title;
+                    const viewTitle = typeof resolvedViewMeta.title === "object"
+                        ? resolvedViewMeta.title.default
+                        : resolvedViewMeta.title;
                     if (viewTitle) {
                         result.title = result.title.template.replace("%s", viewTitle);
                     }
                 } else {
-                    result[key] = viewMeta[key];
+                    result[key] = resolvedViewMeta[key];
                 }
             }
         }
@@ -648,8 +654,16 @@ class View {
                 }
 
                 const content = readFileSync(fullPath, "utf8");
-                const matches = [...content.matchAll(/routes\["([^"]+)"\]/g)];
-                const routes = matches.map(match => match[1]);
+                
+                // Match both old format (routes["name"]) and new format (route("name"))
+                const oldMatches = [...content.matchAll(/routes\["([^"]+)"\]/g)];
+                const newMatches = [...content.matchAll(/route\s*\(\s*['"]([^'"]+)['"]/g)];
+                
+                const routes = [
+                    ...oldMatches.map(match => match[1]),
+                    ...newMatches.map(match => match[1])
+                ];
+                
                 const relativePath = "/js/" + path.relative(jsDir, fullPath).replace(/\\/g, "/");
 
                 this.#routesCache.set(relativePath, [...new Set(routes)]);

package/lib/index.d.ts

@@ -1,15 +1,51 @@
 export class Storage {
-    static url(path: string): string;
-    static path(path: string): string;
-    static disk(name: string): Storage;
-    static get(path: string): Promise<Buffer>;
-    static put(path: string, contents: string | Buffer): Promise<void>;
-    static delete(path: string): Promise<boolean>;
-    static exists(path: string): Promise<boolean>;
-    static copy(from: string, to: string): Promise<void>;
-    static move(from: string, to: string): Promise<void>;
-    static files(directory: string): Promise<string[]>;
-    static directories(directory: string): Promise<string[]>;
+    /**
+     * Reads a file from storage.
+     * @param filePath - Relative path to the file
+     * @param isPrivate - Whether to read from private storage (default: false)
+     * @returns File contents or null if not found
+     */
+    static get(filePath: string, isPrivate?: boolean): Promise<Buffer | null>;
+
+    /**
+     * Saves a file to storage.
+     * @param file - File object from multipart upload
+     * @param dir - Directory path within storage
+     * @param fileName - Name for the saved file
+     * @param isPrivate - Whether to save to private storage (default: false)
+     * @returns True if save successful
+     */
+    static put(file: { _buf: Buffer }, dir: string, fileName: string, isPrivate?: boolean): Promise<boolean>;
+
+    /**
+     * Deletes a file from storage.
+     * @param filePath - Relative path to the file
+     * @param isPrivate - Whether to delete from private storage (default: false)
+     */
+    static delete(filePath: string, isPrivate?: boolean): Promise<void>;
+
+    /**
+     * Moves or renames a file in storage.
+     * @param fromPath - Current relative path to the file
+     * @param toPath - New relative path for the file
+     * @param isPrivate - Whether to operate on private storage (default: false)
+     */
+    static move(fromPath: string, toPath: string, isPrivate?: boolean): Promise<void>;
+
+    /**
+     * Checks if a file exists in storage.
+     * @param filePath - Relative path to the file
+     * @param isPrivate - Whether to check private storage (default: false)
+     * @returns True if file exists
+     */
+    static exists(filePath: string, isPrivate?: boolean): boolean;
+
+    /**
+     * Gets the public URL for a file in public storage.
+     * @param filePath - Relative path to the file
+     * @returns Public URL path
+     */
+    static url(filePath: string): string;
 }
 
 export class Model {
@@ -20,9 +56,8 @@ export class Model {
     static hidden: string[];
     static casts: Record<string, string>;
 
-    static all<T extends Model>(this: new () => T): Promise<T[]>;
+    static get<T extends Model>(this: new () => T): Promise<T[]>;
     static find<T extends Model>(this: new () => T, id: number | string): Promise<T | null>;
-    static findOrFail<T extends Model>(this: new () => T, id: number | string): Promise<T>;
     static first<T extends Model>(this: new () => T): Promise<T | null>;
     static where<T extends Model>(this: new () => T, column: string, operator?: any, value?: any): QueryBuilder<T>;
     static select<T extends Model>(this: new () => T, ...columns: string[]): QueryBuilder<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nitronjs/framework",
-	"version": "0.2.11",
+	"version": "0.2.13",
 	"description": "NitronJS is a modern and extensible Node.js MVC framework built on Fastify. It focuses on clean architecture, modular structure, and developer productivity, offering built-in routing, middleware, configuration management, CLI tooling, and native React integration for scalable full-stack applications.",
 	"bin": {
 		"njs": "./cli/njs.js"