@carbonorm/carbonnode 2.0.10 → 2.0.12

package/package.json

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

package/scripts/assets/handlebars/Table.ts.handlebars

@@ -13,9 +13,9 @@ import {
     Modify{{/REACT_IMPORT}}
 } from "@carbonorm/carbonnode";{{#REACT_IMPORT}}
 import {AxiosResponse} from "axios";{{/REACT_IMPORT}}
-import {C6, i{{TABLE_NAME_SHORT_PASCAL_CASE}}, {{TABLE_NAME_SHORT}}, RestTableNames} from "./C6";{{#REACT_IMPORT}}
+import {C6, i{{TABLE_NAME_SHORT_PASCAL_CASE}}, {{TABLE_NAME_SHORT}}, RestTableNames} from "./C6";{{#if REACT_IMPORT}}
 import {deleteRestfulObjectArrays, updateRestfulObjectArrays} from "@carbonorm/carbonreact";
-{{REACT_IMPORT}};{{/REACT_IMPORT}}
+{{REACT_IMPORT}};{{/if}}
 
 /**
 {{{TABLE_DEFINITION}}}
@@ -35,26 +35,26 @@ const Get = restRequest<GetCustomAndRequiredFields, i{{TABLE_NAME_SHORT_PASCAL_C
         request.success ??= 'Successfully received {{TABLE_NAME_SHORT}}!'
         request.error ??= 'An unknown issue occurred creating the {{TABLE_NAME_SHORT}}!'
         return request
-    },{{#REACT_IMPORT}}
+    },{{#if REACT_IMPORT}}
     responseCallback: (response, _request) => {
         const responseData = response?.data?.rest;
-        {{REACT_IMPORT}}.updateRestfulObjectArrays<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>({{CARBON_REACT_INSTANCE}},Array.isArray(responseData) ? responseData : [responseData], "{{TABLE_NAME_SHORT}}", C6.{{TABLE_NAME_SHORT}}.PRIMARY_SHORT as (keyof i{{TABLE_NAME_SHORT_PASCAL_CASE}})[])
-    }{{/REACT_IMPORT}}
+        {{CARBON_REACT_INSTANCE}}.updateRestfulObjectArrays<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>(Array.isArray(responseData) ? responseData : [responseData], "{{TABLE_NAME_SHORT}}", C6.{{TABLE_NAME_SHORT}}.PRIMARY_SHORT as (keyof i{{TABLE_NAME_SHORT_PASCAL_CASE}})[])
+    }{{/if}}
 });
 
 type PutCustomAndRequiredFields = {}
 
 type PutRequestTableOverrides = {}
 
-{{#REACT_IMPORT}}
+{{#if REACT_IMPORT}}
 export function putState(response : AxiosResponse<iPutC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>>, request : iAPI<Modify<i{{TABLE_NAME_SHORT_PASCAL_CASE}}, PutRequestTableOverrides>> & PutCustomAndRequiredFields) {
-    {{REACT_IMPORT}}.updateRestfulObjectArrays<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>({{CARBON_REACT_INSTANCE}}, [
-        removeInvalidKeys<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>({
+    {{CARBON_REACT_INSTANCE}}.updateRestfulObjectArrays<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>([
+    removeInvalidKeys<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>({
             ...request,
             ...response?.data?.rest,
         }, C6.TABLES)
     ], "{{TABLE_NAME_SHORT}}", {{TABLE_NAME_SHORT}}.PRIMARY_SHORT as (keyof i{{TABLE_NAME_SHORT_PASCAL_CASE}})[])
-}{{/REACT_IMPORT}}
+}{{/if}}
 
 const Put = restRequest<PutCustomAndRequiredFields, i{{TABLE_NAME_SHORT_PASCAL_CASE}}, PutRequestTableOverrides, iPutC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>, RestTableNames>({
     C6: C6,
@@ -65,15 +65,15 @@ const Put = restRequest<PutCustomAndRequiredFields, i{{TABLE_NAME_SHORT_PASCAL_C
         request.success ??= 'Successfully updated {{TABLE_NAME_SHORT}} data!'
         request.error ??= 'An unknown issue occurred updating the {{TABLE_NAME_SHORT}} data!'
         return request
-    },{{#REACT_IMPORT}}
-    responseCallback: putState{{TABLE_NAME_SHORT_PASCAL_CASE}}{{/REACT_IMPORT}}
+    },{{#if REACT_IMPORT}}
+    responseCallback: putState{{TABLE_NAME_SHORT_PASCAL_CASE}}{{/if}}
 });
 
 type PostCustomAndRequiredFields = {}
 
 type PostRequestTableOverrides = {}
 
-{{#REACT_IMPORT}}export function postState(response : AxiosResponse<iPostC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>>, request : iAPI<Modify<i{{TABLE_NAME_SHORT_PASCAL_CASE}}, PostRequestTableOverrides>> & PostCustomAndRequiredFields, id: string | number | boolean) {
+{{#if REACT_IMPORT}}export function postState(response : AxiosResponse<iPostC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>>, request : iAPI<Modify<i{{TABLE_NAME_SHORT_PASCAL_CASE}}, PostRequestTableOverrides>> & PostCustomAndRequiredFields, id: string | number | boolean) {
     if ('number' === typeof id || 'string' === typeof id) {
         if (1 !== {{TABLE_NAME_SHORT}}.PRIMARY_SHORT.length) {
             console.error("C6 received unexpected result's given the primary key length");
@@ -81,7 +81,7 @@ type PostRequestTableOverrides = {}
             request[{{TABLE_NAME_SHORT}}.PRIMARY_SHORT[0]] = id
         }
     }
-    {{REACT_IMPORT}}.updateRestfulObjectArrays<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>(
+    {{CARBON_REACT_INSTANCE}}.updateRestfulObjectArrays<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>(
         undefined !== request.dataInsertMultipleRows
             ? request.dataInsertMultipleRows.map((request, index) => {
                 return removeInvalidKeys<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>({
@@ -98,11 +98,10 @@ type PostRequestTableOverrides = {}
         "{{TABLE_NAME_SHORT}}",
         {{TABLE_NAME_SHORT}}.PRIMARY_SHORT as (keyof i{{TABLE_NAME_SHORT_PASCAL_CASE}})[]
     )
-}{{/REACT_IMPORT}}
+}{{/if}}
 
 const Post = restRequest<PostCustomAndRequiredFields, i{{TABLE_NAME_SHORT_PASCAL_CASE}}, PostRequestTableOverrides, iPostC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>, RestTableNames>({
-    C6: C6,{{#REACT_IMPORT}}
-    instance: {{CARBON_REACT_INSTANCE}}{{/REACT_IMPORT}}
+    C6: C6,
     restURL: {{{REST_URL_EXPRESSION}}},
     tableName: {{TABLE_NAME_SHORT}}.TABLE_NAME,
     requestMethod: POST,
@@ -110,23 +109,22 @@ const Post = restRequest<PostCustomAndRequiredFields, i{{TABLE_NAME_SHORT_PASCAL
         request.success ??= 'Successfully created the {{TABLE_NAME_SHORT}} data!'
         request.error ??= 'An unknown issue occurred creating the {{TABLE_NAME_SHORT}} data!'
         return request
-    },{{#REACT_IMPORT}}
-    responseCallback: postState{{TABLE_NAME_SHORT_PASCAL_CASE}}{{/REACT_IMPORT}}
+    },{{#if REACT_IMPORT}}
+    responseCallback: postState{{TABLE_NAME_SHORT_PASCAL_CASE}}{{/if}}
 });
 
 type DeleteCustomAndRequiredFields = {}
 
 type DeleteRequestTableOverrides = {}
 
-{{#REACT_IMPORT}}export function deleteState(_response : AxiosResponse<iDeleteC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>>, request : iAPI<Modify<i{{TABLE_NAME_SHORT_PASCAL_CASE}}, DeleteRequestTableOverrides>> & DeleteCustomAndRequiredFields) {
-    {{REACT_IMPORT}}.deleteRestfulObjectArrays<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>([
+{{#if REACT_IMPORT}}export function deleteState(_response : AxiosResponse<iDeleteC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>>, request : iAPI<Modify<i{{TABLE_NAME_SHORT_PASCAL_CASE}}, DeleteRequestTableOverrides>> & DeleteCustomAndRequiredFields) {
+    {{CARBON_REACT_INSTANCE}}.deleteRestfulObjectArrays<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>([
         request
     ], "{{TABLE_NAME_SHORT}}", {{TABLE_NAME_SHORT}}.PRIMARY_SHORT as (keyof i{{TABLE_NAME_SHORT_PASCAL_CASE}})[])
-}{{/REACT_IMPORT}}
+}{{/if}}
 
 const Delete = restRequest<DeleteCustomAndRequiredFields, i{{TABLE_NAME_SHORT_PASCAL_CASE}}, DeleteRequestTableOverrides, iDeleteC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>, RestTableNames>({
-    C6: C6,{{#REACT_IMPORT}}
-    instance: {{CARBON_REACT_INSTANCE}}{{/REACT_IMPORT}}
+    C6: C6,
     restURL: {{{REST_URL_EXPRESSION}}},
     tableName: {{TABLE_NAME_SHORT}}.TABLE_NAME,
     requestMethod: DELETE,
@@ -134,8 +132,8 @@ const Delete = restRequest<DeleteCustomAndRequiredFields, i{{TABLE_NAME_SHORT_PA
         request.success ??= 'Successfully removed the {{TABLE_NAME_SHORT}} data!'
         request.error ??= 'An unknown issue occurred removing the {{TABLE_NAME_SHORT}} data!'
         return request
-    },{{#REACT_IMPORT}}
-    responseCallback: deleteState{{TABLE_NAME_SHORT_PASCAL_CASE}}{{/REACT_IMPORT}}
+    },{{#if REACT_IMPORT}}
+    responseCallback: deleteState{{TABLE_NAME_SHORT_PASCAL_CASE}}{{/if}}
 });
 
 const {{TABLE_NAME_SHORT_PASCAL_CASE}} = {

package/scripts/generateRestBindings.cjs

@@ -203,9 +203,9 @@ var parseSQLToTypeScript = function (sql) {
         }
         var REACT_IMPORT = false, CARBON_REACT_INSTANCE = false;
         if (argMap['--react'] || false) {
-            var reactArgSplit = argMap['--react'];
-            if (reactArgSplit.length !== 2 || reactArgSplit[1].endsWith(',')) {
-                console.error("React requires two arguments, the import and the carbon react instance statement. Example: --react 'import CustomCarbonReactApplication from \"src/CustomCarbonReactApplication\"; CustomCarbonReactApplication,'");
+            var reactArgSplit = argMap['--react'].split(';');
+            if (reactArgSplit.length !== 2) {
+                console.error("React requires two arguments, the import and the carbon react instance statement. Example: --react 'import CustomCarbonReactApplication from \"src/CustomCarbonReactApplication.tsx\"; CustomCarbonReactApplication'");
                 process.exit(1);
             }
             _c = __read(reactArgSplit, 2), REACT_IMPORT = _c[0], CARBON_REACT_INSTANCE = _c[1];

package/scripts/generateRestBindings.ts

@@ -271,10 +271,10 @@ const parseSQLToTypeScript = (sql: string) => {
 
         if (argMap['--react'] || false) {
 
-            const reactArgSplit = argMap['--react'];
+            const reactArgSplit = argMap['--react'].split(';')
 
-            if (reactArgSplit.length !== 2 || reactArgSplit[1].endsWith(',')) {
-                console.error("React requires two arguments, the import and the carbon react instance statement. Example: --react 'import CustomCarbonReactApplication from \"src/CustomCarbonReactApplication\"; CustomCarbonReactApplication,'");
+            if (reactArgSplit.length !== 2) {
+                console.error("React requires two arguments, the import and the carbon react instance statement. Example: --react 'import CustomCarbonReactApplication from \"src/CustomCarbonReactApplication.tsx\"; CustomCarbonReactApplication'");
                 process.exit(1);
             }