@carbonorm/carbonnode 1.2.4 → 1.2.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carbonorm/carbonnode",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",
   "browser": "dist/index.umd.js",

package/scripts/generateRestBindings.cjs

@@ -140,17 +140,23 @@ var parseSQLToTypeScript = function (sql) {
         var tableName = tableMatch[1];
         var columnDefinitions = tableMatch[2];
         var columns = {};
-        var columnRegex = /^\s*`(\w+)` (\w+)(?:\((\d+)\))?( NOT NULL)?( AUTO_INCREMENT)?(?: DEFAULT '(\w+)')?/g;
-        var columnMatch = void 0;
-        while ((columnMatch = columnRegex.exec(columnDefinitions))) {
-            columns[columnMatch[1]] = {
-                type: columnMatch[2],
-                length: columnMatch[3] || '',
-                notNull: !!columnMatch[4],
-                autoIncrement: !!columnMatch[5],
-                defaultValue: columnMatch[6] || '',
-            };
-        }
+        // Improved regular expression to match column definitions
+        var columnRegex = /\s*`([^`]*)`\s+(\w+)(?:\(([^)]+)\))?\s*(NOT NULL)?\s*(AUTO_INCREMENT)?\s*(DEFAULT\s+'.*?'|DEFAULT\s+\S+)?/gm;
+        var columnMatch;
+        var columnDefinitionsLines = columnDefinitions.split('\n');
+        columnDefinitionsLines.forEach(function (line) {
+            if (!line.match(/(PRIMARY KEY|UNIQUE KEY|CONSTRAINT)/)) {
+                while ((columnMatch = columnRegex.exec(line))) {
+                    columns[columnMatch[1]] = {
+                        type: columnMatch[2],
+                        length: columnMatch[3] || '',
+                        notNull: !!columnMatch[4],
+                        autoIncrement: !!columnMatch[5],
+                        defaultValue: columnMatch[6] ? columnMatch[6].replace(/^DEFAULT\s+/i, '') : ''
+                    };
+                }
+            }
+        });
         // Extract primary keys
         var primaryKeyMatch = columnDefinitions.match(/PRIMARY KEY \(([^)]+)\)/i);
         var primaryKeys = primaryKeyMatch

package/scripts/generateRestBindings.ts

@@ -211,19 +211,30 @@ const parseSQLToTypeScript = (sql: string) => {
         const tableName = tableMatch[1];
         const columnDefinitions = tableMatch[2];
 
-        let columns: any = {};
-        const columnRegex: RegExp = /^\s*`(\w+)` (\w+)(?:\((\d+)\))?( NOT NULL)?( AUTO_INCREMENT)?(?: DEFAULT '(\w+)')?/g;
-        let columnMatch: RegExpExecArray | null;
-
-        while ((columnMatch = columnRegex.exec(columnDefinitions))) {
-            columns[columnMatch[1]] = {
-                type: columnMatch[2],
-                length: columnMatch[3] || '',
-                notNull: !!columnMatch[4],
-                autoIncrement: !!columnMatch[5],
-                defaultValue: columnMatch[6] || '',
-            };
-        }
+        let columns = {};
+
+        // Improved regular expression to match column definitions
+        const columnRegex = /\s*`([^`]*)`\s+(\w+)(?:\(([^)]+)\))?\s*(NOT NULL)?\s*(AUTO_INCREMENT)?\s*(DEFAULT\s+'.*?'|DEFAULT\s+\S+)?/gm;
+
+        let columnMatch;
+
+
+
+        const columnDefinitionsLines = columnDefinitions.split('\n');
+
+        columnDefinitionsLines.forEach(line => {
+            if (!line.match(/(PRIMARY KEY|UNIQUE KEY|CONSTRAINT)/)) {
+                while ((columnMatch = columnRegex.exec(line))) {
+                    columns[columnMatch[1]] = {
+                        type: columnMatch[2],
+                        length: columnMatch[3] || '',
+                        notNull: !!columnMatch[4],
+                        autoIncrement: !!columnMatch[5],
+                        defaultValue: columnMatch[6] ? columnMatch[6].replace(/^DEFAULT\s+/i, '') : ''
+                    };
+                }
+            }
+        });
 
         // Extract primary keys
         const primaryKeyMatch = columnDefinitions.match(/PRIMARY KEY \(([^)]+)\)/i);
@@ -235,6 +246,7 @@ const parseSQLToTypeScript = (sql: string) => {
         const foreignKeyRegex: RegExp = /CONSTRAINT `([^`]+)` FOREIGN KEY \(`([^`]+)`\) REFERENCES `([^`]+)` \(`([^`]+)`\)( ON DELETE (\w+))?( ON UPDATE (\w+))?/g;
         let foreignKeyMatch: RegExpExecArray | null;
 
+
         while ((foreignKeyMatch = foreignKeyRegex.exec(columnDefinitions))) {
             const constraintName = foreignKeyMatch[1];
             const localColumn = foreignKeyMatch[2];