@carbonorm/carbonnode 1.2.3 → 1.2.5

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

@@ -21,6 +21,11 @@ export interface iConstraint {
     COLUMN: string;
     CONSTRAINT: string;
 }
+export type tC6Tables = {
+    [key: string]: (C6RestfulModel & {
+        [key: string]: any;
+    });
+};
 export interface C6RestfulModel<RestShortTableNames extends string = string> {
     TABLE_NAME: RestShortTableNames;
     PRIMARY: string[];

package/package.json

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

package/scripts/assets/handlebars/C6.tsx.handlebars

@@ -1,12 +1,12 @@
 import {
     C6RestfulModel,
-    C6Constants
+    C6Constants,
+    tC6Tables
 } 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}}
 
-
 export type RestTableNames = {{{RestTableNames}}};
 
 export type RestShortTableNames = {{{RestShortTableNames}}};
@@ -25,7 +25,7 @@ interface iDefine{{TABLE_NAME_SHORT_PASCAL_CASE}} {
 {{/each}}
 }
 
-export const {{TABLE_NAME_SHORT}}: C6RestfulModel & iDefine{{TABLE_NAME_SHORT_PASCAL_CASE}} = {
+export const {{TABLE_NAME_SHORT}}: C6RestfulModel<RestTableNames> & iDefine{{TABLE_NAME_SHORT_PASCAL_CASE}} = {
     TABLE_NAME: '{{TABLE_NAME}}',
     {{#each COLUMNS_UPPERCASE}}
     {{@key}}: '{{this}}',
@@ -75,20 +75,21 @@ export const {{TABLE_NAME_SHORT}}: C6RestfulModel & iDefine{{TABLE_NAME_SHORT_PA
         },{{/this}}],{{/each}}
     },
     REST_STATE_OPERATIONS: {
-        PUT: {{TABLE_NAME_SHORT_PASCAL_CASE}}.putState{{TABLE_NAME_SHORT_PASCAL_CASE}},
-        POST: {{TABLE_NAME_SHORT_PASCAL_CASE}}.postState{{TABLE_NAME_SHORT_PASCAL_CASE}},
-        DELETE: {{TABLE_NAME_SHORT_PASCAL_CASE}}.deleteState{{TABLE_NAME_SHORT_PASCAL_CASE}},
+        PUT: putState{{TABLE_NAME_SHORT_PASCAL_CASE}},
+        POST: postState{{TABLE_NAME_SHORT_PASCAL_CASE}},
+        DELETE: deleteState{{TABLE_NAME_SHORT_PASCAL_CASE}},
     },
 }
 {{/TABLES}}
 
-export const TABLES = {
+
+export const TABLES: tC6Tables = {
 {{#TABLES}}
     {{TABLE_NAME_SHORT}}: {{TABLE_NAME_SHORT}},
 {{/TABLES}}
 };
 
-export const C6 : { TABLES: { [key: string]: (C6RestfulModel & { [key: string]: any }) } }
+export const C6 : { TABLES: tC6Tables }
 & { [key: string]: any } = {
     ...C6Constants,
     TABLES: TABLES,

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

@@ -3,6 +3,7 @@ import {CarbonReact} from "@carbonorm/carbonreact";
 import {checkAllRequestsComplete} from "@carbonorm/carbonnode";
 import {act, waitFor} from '@testing-library/react';
 import {C6, iRestfulObjectArrayTypes, i{{TABLE_NAME_SHORT_PASCAL_CASE}}, {{TABLE_NAME_SHORT}} } from "{{RELATIVE_OUTPUT_DIR}}/C6";
+import {{TABLE_NAME_SHORT_PASCAL_CASE}} from "./{{TABLE_NAME_SHORT_PASCAL_CASE}}";
 
 const randomString = Math.random().toString(36).substring(7);
 const randomInt = Math.floor(Math.random() * 1000000);
@@ -28,7 +29,7 @@ xdescribe('REST {{TABLE_NAME_SHORT_PASCAL_CASE}} api', () => {
 
         await act(async () => {
 
-            let selectAllResponse = await {{TABLE_NAME_SHORT}}.Get({})
+            let selectAllResponse = await {{TABLE_NAME_SHORT_PASCAL_CASE}}.Get({})
 
             if ('function' === typeof selectAllResponse) {
                 throw Error('selectAllResponse is a promise, this typically means this specific get request has already run during test setup.');
@@ -37,7 +38,7 @@ xdescribe('REST {{TABLE_NAME_SHORT_PASCAL_CASE}} api', () => {
             // We don't care if it is filled or not, just that the request can be made.
             expect(selectAllResponse?.data?.rest).not.toBeUndefined();
 
-            const postResponse = await {{TABLE_NAME_SHORT}}.Post(testData);
+            const postResponse = await {{TABLE_NAME_SHORT_PASCAL_CASE}}.Post(testData);
 
             console.log('postResponse', postResponse?.data)
 
@@ -47,7 +48,7 @@ xdescribe('REST {{TABLE_NAME_SHORT_PASCAL_CASE}} api', () => {
 
             const postID = postResponse?.data?.created
 
-            const singleRowSelect = await {{TABLE_NAME_SHORT}}.Get({
+            const singleRowSelect = await {{TABLE_NAME_SHORT_PASCAL_CASE}}.Get({
                 [C6.WHERE]: {
                     [{{TABLE_NAME_SHORT}}[primaryKey.toUpperCase()]]: postID,
                 }
@@ -70,7 +71,7 @@ xdescribe('REST {{TABLE_NAME_SHORT_PASCAL_CASE}} api', () => {
 
             expect(selectedPostId).toEqual(postID);
 
-            const multipleRowSelect = await {{TABLE_NAME_SHORT}}.Get({
+            const multipleRowSelect = await {{TABLE_NAME_SHORT_PASCAL_CASE}}.Get({
                 [C6.WHERE]: {
                     [{{TABLE_NAME_SHORT}}[primaryKey.toUpperCase()]]: [C6.IN, [0, postID]],
                 }
@@ -91,17 +92,17 @@ xdescribe('REST {{TABLE_NAME_SHORT_PASCAL_CASE}} api', () => {
             testData[primaryKey] = postID
 
             {{#each TYPE_VALIDATION}}
-            testData.{{@key}} = {{#TYPESCRIPT_TYPE_IS_STRING}}fillString.substring(0, {{TYPE_VALIDATION.MAX_LENGTH}}){{/TYPESCRIPT_TYPE_IS_STRING}}{{#TYPESCRIPT_TYPE_IS_NUMBER}}randomInt{{/TYPESCRIPT_TYPE_IS_NUMBER}};
+            testData.{{COLUMN_NAME}} = {{#TYPESCRIPT_TYPE_IS_STRING}}fillString.substring(0, {{MAX_LENGTH}}){{/TYPESCRIPT_TYPE_IS_STRING}}{{#TYPESCRIPT_TYPE_IS_NUMBER}}randomInt{{/TYPESCRIPT_TYPE_IS_NUMBER}};
             {{/each}}
 
             // wait for the global state to be updated
             expect(CarbonReact.getState<iRestfulObjectArrayTypes>().{{TABLE_NAME_SHORT}}).not.toBeUndefined();
 
-            const updateResponse = await {{TABLE_NAME_SHORT}}.Put(testData)
+            const updateResponse = await {{TABLE_NAME_SHORT_PASCAL_CASE}}.Put(testData)
 
             expect(updateResponse?.data?.updated).not.toBeUndefined();
 
-            const deleteResponse = await {{TABLE_NAME_SHORT}}.Delete({
+            const deleteResponse = await {{TABLE_NAME_SHORT_PASCAL_CASE}}.Delete({
                 [primaryKey]: postID
             })
 

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

@@ -13,7 +13,7 @@ import {
 import {AxiosResponse} from "axios";
 import {iAPI, Modify} from "restRequest";
 import {deleteRestfulObjectArrays, updateRestfulObjectArrays} from "@carbonorm/carbonreact";
-import {C6, i{{TABLE_NAME_SHORT_PASCAL_CASE}}, {{TABLE_NAME_SHORT}}, RestShortTableNames} from "./C6";
+import {C6, i{{TABLE_NAME_SHORT_PASCAL_CASE}}, {{TABLE_NAME_SHORT}}, RestTableNames} from "./C6";
 
 /**
 {{{TABLE_DEFINITION}}}
@@ -24,7 +24,7 @@ type GetCustomAndRequiredFields = {}
 type GetRequestTableOverrides = {}
 
 // required parameters, optional parameters, parameter type overrides, response, and table names
-export const Get = restRequest<GetCustomAndRequiredFields, i{{TABLE_NAME_SHORT_PASCAL_CASE}}, GetRequestTableOverrides, iGetC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>, RestShortTableNames>({
+export const Get = restRequest<GetCustomAndRequiredFields, i{{TABLE_NAME_SHORT_PASCAL_CASE}}, GetRequestTableOverrides, iGetC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>, RestTableNames>({
     C6: C6,
     tableName: {{TABLE_NAME_SHORT}}.TABLE_NAME,
     requestMethod: GET,
@@ -51,7 +51,7 @@ export function putState{{TABLE_NAME_SHORT_PASCAL_CASE}}(response : AxiosRespons
     ], "{{TABLE_NAME_SHORT}}", {{TABLE_NAME_SHORT}}.PRIMARY_SHORT as (keyof i{{TABLE_NAME_SHORT_PASCAL_CASE}})[])
 }
 
-export const Put = restRequest<PutCustomAndRequiredFields, i{{TABLE_NAME_SHORT_PASCAL_CASE}}, PutRequestTableOverrides, iPutC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>, RestShortTableNames>({
+export const Put = restRequest<PutCustomAndRequiredFields, i{{TABLE_NAME_SHORT_PASCAL_CASE}}, PutRequestTableOverrides, iPutC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>, RestTableNames>({
     C6: C6,
     tableName: {{TABLE_NAME_SHORT}}.TABLE_NAME,
     requestMethod: PUT,
@@ -94,7 +94,7 @@ export function postState{{TABLE_NAME_SHORT_PASCAL_CASE}}(response : AxiosRespon
     )
 }
 
-export const Post = restRequest<PostCustomAndRequiredFields, i{{TABLE_NAME_SHORT_PASCAL_CASE}}, PostRequestTableOverrides, iPostC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>, RestShortTableNames>({
+export const Post = restRequest<PostCustomAndRequiredFields, i{{TABLE_NAME_SHORT_PASCAL_CASE}}, PostRequestTableOverrides, iPostC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>, RestTableNames>({
     C6: C6,
     tableName: {{TABLE_NAME_SHORT}}.TABLE_NAME,
     requestMethod: POST,
@@ -116,7 +116,7 @@ export function deleteState{{TABLE_NAME_SHORT_PASCAL_CASE}}(_response : AxiosRes
     ], "{{TABLE_NAME_SHORT}}", {{TABLE_NAME_SHORT}}.PRIMARY_SHORT as (keyof i{{TABLE_NAME_SHORT_PASCAL_CASE}})[])
 }
 
-export const Delete = restRequest<DeleteCustomAndRequiredFields, i{{TABLE_NAME_SHORT_PASCAL_CASE}}, DeleteRequestTableOverrides, iDeleteC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>, RestShortTableNames>({
+export const Delete = restRequest<DeleteCustomAndRequiredFields, i{{TABLE_NAME_SHORT_PASCAL_CASE}}, DeleteRequestTableOverrides, iDeleteC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>, RestTableNames>({
     C6: C6,
     tableName: {{TABLE_NAME_SHORT}}.TABLE_NAME,
     requestMethod: DELETE,

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];

package/src/api/interfaces/ormInterfaces.ts

@@ -28,6 +28,8 @@ export interface iConstraint {
     CONSTRAINT: string
 }
 
+export type tC6Tables = { [key: string]: (C6RestfulModel & { [key: string]: any }) }
+
 export interface C6RestfulModel<RestShortTableNames extends string = string> {
     TABLE_NAME: RestShortTableNames,
     PRIMARY: string[],