@carbonorm/carbonnode 1.2.4 → 1.2.6

package/dist/api/interfaces/ormInterfaces.d.ts

@@ -26,6 +26,11 @@ export type tC6Tables = {
         [key: string]: any;
     });
 };
+export type tWsLiveUpdate = {
+    PUT: Function;
+    POST: Function;
+    DELETE: Function;
+};
 export interface C6RestfulModel<RestShortTableNames extends string = string> {
     TABLE_NAME: RestShortTableNames;
     PRIMARY: string[];
@@ -41,9 +46,4 @@ export interface C6RestfulModel<RestShortTableNames extends string = string> {
     TABLE_REFERENCED_BY: {
         [columnName: string]: iConstraint[];
     };
-    REST_STATE_OPERATIONS: {
-        PUT: Function;
-        POST: Function;
-        DELETE: Function;
-    };
 }

package/package.json

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

package/scripts/assets/handlebars/Table.test.tsx.handlebars

@@ -14,9 +14,9 @@ const fillString = 'string' + randomString + randomInt;
 **/
 
 const Test_Data: i{{TABLE_NAME_SHORT_PASCAL_CASE}} = {
-{{#each TYPE_VALIDATION}}
-    {{#SKIP_COLUMN_IN_POST}}{{COLUMN_NAME}}: {{#TYPESCRIPT_TYPE_IS_STRING}}fillString.substring(0, {{MAX_LENGTH}}){{/TYPESCRIPT_TYPE_IS_STRING}}{{#TYPESCRIPT_TYPE_IS_NUMBER}}randomInt,{{/TYPESCRIPT_TYPE_IS_NUMBER}}{{/SKIP_COLUMN_IN_POST}}
-{{/each}}
+{{#each TYPE_VALIDATION}}{{#SKIP_COLUMN_IN_POST}}
+    {{COLUMN_NAME}}: {{#TYPESCRIPT_TYPE_IS_STRING}}fillString{{#MAX_LENGTH}}.substring(0, {{MAX_LENGTH}}){{/MAX_LENGTH}}{{/TYPESCRIPT_TYPE_IS_STRING}}{{#TYPESCRIPT_TYPE_IS_NUMBER}}randomInt{{/TYPESCRIPT_TYPE_IS_NUMBER}},
+{{/SKIP_COLUMN_IN_POST}}{{/each}}
 }
 
 export default Test_Data;

package/scripts/assets/handlebars/WsLiveUpdates.tsx.handlebars

@@ -0,0 +1,22 @@
+import {
+    tWsLiveUpdate
+} from "@carbonorm/carbonnode";
+
+{{#TABLES}}
+import { putState{{TABLE_NAME_SHORT_PASCAL_CASE}}, postState{{TABLE_NAME_SHORT_PASCAL_CASE}}, deleteState{{TABLE_NAME_SHORT_PASCAL_CASE}} } from "./{{TABLE_NAME_SHORT_PASCAL_CASE}}";
+{{/TABLES}}
+
+const wsLiveUpdates: tWsLiveUpdate = {
+{{#TABLES}}
+    {{TABLE_NAME_SHORT}}: {
+        PUT: putState{{TABLE_NAME_SHORT_PASCAL_CASE}},
+        POST: postState{{TABLE_NAME_SHORT_PASCAL_CASE}},
+        DELETE: deleteState{{TABLE_NAME_SHORT_PASCAL_CASE}},
+    },
+{{/TABLES}}
+};
+
+
+export default wsLiveUpdates;
+
+

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
@@ -284,6 +290,8 @@ fs.writeFileSync(path.join(process.cwd(), 'C6MySqlDump.json'), JSON.stringify(ta
 // import this file  src/assets/handlebars/C6.tsx.handlebars for a mustache template
 var c6Template = fs.readFileSync(path.resolve(__dirname, 'assets/handlebars/C6.tsx.handlebars'), 'utf-8');
 fs.writeFileSync(path.join(MySQLDump.OUTPUT_DIR, 'C6.tsx'), Handlebars.compile(c6Template)(tableData));
+var wsLiveUpdatesTemplate = fs.readFileSync(path.resolve(__dirname, 'assets/handlebars/WsLiveUpdates.tsx.handlebars'), 'utf-8');
+fs.writeFileSync(path.join(MySQLDump.OUTPUT_DIR, 'WsLiveUpdates.tsx'), Handlebars.compile(wsLiveUpdatesTemplate)(tableData));
 var template = fs.readFileSync(path.resolve(__dirname, 'assets/handlebars/Table.tsx.handlebars'), 'utf-8');
 var testTemplate = fs.readFileSync(path.resolve(__dirname, 'assets/handlebars/Table.test.tsx.handlebars'), 'utf-8');
 Object.values(tableData.TABLES).map(function (tableData, key) {

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];
@@ -369,6 +381,10 @@ const c6Template = fs.readFileSync(path.resolve(__dirname, 'assets/handlebars/C6
 
 fs.writeFileSync(path.join(MySQLDump.OUTPUT_DIR, 'C6.tsx'), Handlebars.compile(c6Template)(tableData));
 
+const wsLiveUpdatesTemplate = fs.readFileSync(path.resolve(__dirname, 'assets/handlebars/WsLiveUpdates.tsx.handlebars'), 'utf-8');
+
+fs.writeFileSync(path.join(MySQLDump.OUTPUT_DIR, 'WsLiveUpdates.tsx'), Handlebars.compile(wsLiveUpdatesTemplate)(tableData));
+
 const template = fs.readFileSync(path.resolve(__dirname, 'assets/handlebars/Table.tsx.handlebars'), 'utf-8');
 
 const testTemplate = fs.readFileSync(path.resolve(__dirname, 'assets/handlebars/Table.test.tsx.handlebars'), 'utf-8');

package/src/api/interfaces/ormInterfaces.ts

@@ -30,6 +30,8 @@ export interface iConstraint {
 
 export type tC6Tables = { [key: string]: (C6RestfulModel & { [key: string]: any }) }
 
+export type tWsLiveUpdate = { PUT: Function, POST: Function, DELETE: Function };
+
 export interface C6RestfulModel<RestShortTableNames extends string = string> {
     TABLE_NAME: RestShortTableNames,
     PRIMARY: string[],
@@ -39,5 +41,4 @@ export interface C6RestfulModel<RestShortTableNames extends string = string> {
     TYPE_VALIDATION: {[key: string]: iTypeValidation},
     TABLE_REFERENCES: {[columnName: string]: iConstraint[]},
     TABLE_REFERENCED_BY: {[columnName: string]: iConstraint[]},
-    REST_STATE_OPERATIONS: { PUT: Function, POST: Function, DELETE: Function },
 }