@mlagie/sql-connector 2.1.0 → 2.1.2

package/index.d.ts

@@ -40,9 +40,7 @@ export interface SchemaDict {
 }
 
 type NormalizeSqlType<T> =
-    T extends { name: infer Name }
-        ? NormalizeSqlType<Name>
-        : T extends StringConstructor
+    T extends StringConstructor
             ? "String"
             : T extends NumberConstructor
                 ? "Number"
@@ -56,7 +54,9 @@ type NormalizeSqlType<T> =
                                 ? "Array"
                                 : T extends SqlType
                                     ? T
-                                    : never;
+                                    : T extends { name: SqlType }
+                                        ? T["name"]
+                                        : never;
 
 type InferSqlType<T> =
     NormalizeSqlType<T> extends "String" | "Text"
@@ -85,6 +85,8 @@ type InferFieldNullable<TField> =
             ? false
             : TField extends { auto_increment: true }
                 ? false
+                : TField extends { default: null }
+                    ? true
                 : HasKey<TField, "default"> extends true
                     ? false
                     : true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mlagie/sql-connector",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "The sql-connector module allows you to manage connections to a MySQL database, define table schemas, and interact with data in a simple and efficient way.",
   "main": "index.js",
   "exports": {

package/src/models/Model.js

@@ -26,7 +26,7 @@ function isSqlTemporalDefault(defaultValue) {
     if (typeof defaultValue !== "string") return false;
 
     const normalizedValue = defaultValue.trim().toUpperCase();
-    return ["CURRENT_TIMESTAMP", "CURRENT_TIMESTAMP()", "NOW()"].includes(normalizedValue);
+    return ["CURRENT_TIMESTAMP", "CURRENT_TIMESTAMP()", "NOW", "NOW()"].includes(normalizedValue);
 }
 
 function formatDefaultSql(defaultValue, fieldType) {
@@ -144,13 +144,17 @@ class Model {
 
         const sorted = [];
         const visited = {};
-        function visit(table) {
+        function visit(table, stack = []) {
             if (getSafe(visited, table) === true) return;
-            if (getSafe(visited, table) === 'temp') throw new Error('Cyclic foreign key dependency detected');
+            const cycleStartIndex = stack.indexOf(table);
+            if (cycleStartIndex !== -1) {
+                const cyclePath = [...stack.slice(cycleStartIndex), table];
+                throw new Error(`Cyclic foreign key dependency detected: ${cyclePath.join(' -> ')}`);
+            }
             setSafe(visited, table, 'temp');
             const deps = getSafe(dependencies, table)
             for (const dep of deps) {
-                if (getSafe(modelMap, dep)) visit(dep);
+                if (getSafe(modelMap, dep)) visit(dep, [...stack, table]);
             }
             setSafe(visited, table, true);
             sorted.push(table);