@nitronjs/framework 0.2.7 → 0.2.9

package/lib/Build/jsxRuntime.js

@@ -96,18 +96,28 @@ function getWrappedComponent(Component) {
     return componentCache.get(Component);
 }
 
+function extractKey(props, key) {
+    if (props == null || !('key' in props)) {
+        return [props, key];
+    }
+    const { key: propKey, ...rest } = props;
+    return [rest, key ?? propKey];
+}
+
 export function jsx(type, props, key) {
+    const [cleanProps, finalKey] = extractKey(props, key);
     if (typeof type === 'function' && type[MARK]) {
-        return OriginalJsx.jsx(getWrappedComponent(type), props, key);
+        return OriginalJsx.jsx(getWrappedComponent(type), cleanProps, finalKey);
     }
-    return OriginalJsx.jsx(type, props, key);
+    return OriginalJsx.jsx(type, cleanProps, finalKey);
 }
 
 export function jsxs(type, props, key) {
+    const [cleanProps, finalKey] = extractKey(props, key);
     if (typeof type === 'function' && type[MARK]) {
-        return OriginalJsx.jsx(getWrappedComponent(type), props, key);
+        return OriginalJsx.jsx(getWrappedComponent(type), cleanProps, finalKey);
     }
-    return OriginalJsx.jsxs(type, props, key);
+    return OriginalJsx.jsxs(type, cleanProps, finalKey);
 }
 
 export const Fragment = OriginalJsx.Fragment;

package/lib/Database/QueryBuilder.js

@@ -59,6 +59,20 @@ class QueryBuilder {
         return validateIdentifier(identifier);
     }
 
+    /**
+     * Quotes an identifier (table/column name) to handle reserved keywords.
+     * Uses backticks for MySQL compatibility.
+     * @param {string} identifier
+     * @returns {string}
+     */
+    #quoteIdentifier(identifier) {
+        // Handle table.column format
+        if (identifier.includes('.')) {
+            return identifier.split('.').map(part => `\`${part}\``).join('.');
+        }
+        return `\`${identifier}\``;
+    }
+
     #validateWhereOperator(operator) {
         return validateWhereOperator(operator);
     }
@@ -543,12 +557,12 @@ class QueryBuilder {
             }
 
             const columns = Object.keys(rows[0]);
-            columns.forEach(col => this.#validateIdentifier(col));
+            const validatedColumns = columns.map(col => this.#validateIdentifier(col));
 
             const placeholders = rows.map(() => `(${columns.map(() => '?').join(', ')})`).join(', ');
             const values = rows.flatMap(row => columns.map(col => row[col]));
 
-            const sql = `INSERT INTO ${this.#table} (${columns.join(', ')}) VALUES ${placeholders}`;
+            const sql = `INSERT INTO ${this.#quoteIdentifier(this.#table)} (${validatedColumns.join(', ')}) VALUES ${placeholders}`;
             const [result] = await connection.query(sql, values);
 
 
@@ -584,7 +598,7 @@ class QueryBuilder {
                 }
             }
 
-            const sql = `UPDATE ${this.#table} SET ${sets.join(', ')}${this.#compileWheres()}`;
+            const sql = `UPDATE ${this.#quoteIdentifier(this.#table)} SET ${sets.join(', ')}${this.#compileWheres()}`;
             const [result] = await connection.query(sql, [...values, ...this.#bindings]);
 
             return result.affectedRows;
@@ -602,7 +616,7 @@ class QueryBuilder {
     async delete() {
         const connection = await this.#getConnection();
         try {
-            const sql = `DELETE FROM ${this.#table}${this.#compileWheres()}`;
+            const sql = `DELETE FROM ${this.#quoteIdentifier(this.#table)}${this.#compileWheres()}`;
             const [result] = await connection.query(sql, this.#bindings);
 
             return result.affectedRows;
@@ -630,7 +644,7 @@ class QueryBuilder {
         const orders = this.#compileOrders();
         const limit = this.#compileLimit();
 
-        return `SELECT ${distinct}${columns} FROM ${this.#table}${joins}${wheres}${groups}${havings}${orders}${limit}`;
+        return `SELECT ${distinct}${columns} FROM ${this.#quoteIdentifier(this.#table)}${joins}${wheres}${groups}${havings}${orders}${limit}`;
     }
 
     #compileJoins() {

package/lib/HMR/Server.js

@@ -34,16 +34,13 @@ class HMRServer {
     registerRoutes(fastify) {
         this.#clientScript = this.#findSocketIoClient();
 
-        const handler = (req, reply) => {
+        fastify.get("/__nitron_client/socket.io.js", (req, reply) => {
             if (!this.#clientScript) {
                 return reply.code(503).send("// HMR disabled: socket.io client not found");
             }
 
             reply.type("application/javascript").send(fs.readFileSync(this.#clientScript, "utf-8"));
-        };
-
-        // Support both paths for cache compatibility
-        fastify.get("/__nitron_client/socket.io.js", handler);
+        });
     }
 
     /**
@@ -160,57 +157,33 @@ class HMRServer {
     // Private Methods
 
     /**
-     * Finds socket.io client script from multiple possible locations.
-     * Searches in order: createRequire resolution, cwd node_modules, 
-     * parent directories, and monorepo root.
+     * Finds socket.io client script.
+     * Searches framework node_modules and walks up directory tree for monorepo support.
      * @returns {string|null} Path to socket.io.min.js or null if not found
      */
     #findSocketIoClient() {
         const clientFile = "client-dist/socket.io.min.js";
-        const possiblePaths = [];
 
-        // 1. Try resolving from framework package location
+        // 1. Try resolving from framework package location (most common case)
         try {
             const frameworkRequire = createRequire(import.meta.url);
             const socketIoDir = path.dirname(frameworkRequire.resolve("socket.io/package.json"));
-            possiblePaths.push(path.join(socketIoDir, clientFile));
-        }
-        catch {}
-
-        // 2. Try resolving from project's node_modules
-        try {
-            const projectRequire = createRequire(path.join(process.cwd(), "package.json"));
-            const socketIoDir = path.dirname(projectRequire.resolve("socket.io/package.json"));
-            possiblePaths.push(path.join(socketIoDir, clientFile));
+            const clientPath = path.join(socketIoDir, clientFile);
+            if (fs.existsSync(clientPath)) return clientPath;
         }
         catch {}
 
-        // 3. Walk up from cwd looking for node_modules/socket.io
-        let currentDir = process.cwd();
+        // 2. Walk up from framework location for monorepo setups
+        let currentDir = __dirname;
         for (let i = 0; i < 5; i++) {
-            possiblePaths.push(path.join(currentDir, "node_modules", "socket.io", clientFile));
+            const clientPath = path.join(currentDir, "node_modules", "socket.io", clientFile);
+            if (fs.existsSync(clientPath)) return clientPath;
+            
             const parentDir = path.dirname(currentDir);
             if (parentDir === currentDir) break;
             currentDir = parentDir;
         }
 
-        // 4. Walk up from framework package location
-        currentDir = __dirname;
-        for (let i = 0; i < 5; i++) {
-            possiblePaths.push(path.join(currentDir, "node_modules", "socket.io", clientFile));
-            const parentDir = path.dirname(currentDir);
-            if (parentDir === currentDir) break;
-            currentDir = parentDir;
-        }
-
-        // Find first existing path
-        for (const p of possiblePaths) {
-            if (fs.existsSync(p)) {
-                return p;
-            }
-        }
-
-        console.warn("[HMR] socket.io client not found. Searched paths:", possiblePaths);
         return null;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nitronjs/framework",
-	"version": "0.2.7",
+	"version": "0.2.9",
 	"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"