@carbonorm/carbonnode 2.0.13 → 2.0.14

package/package.json

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

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

@@ -38,7 +38,11 @@ const Get = restRequest<GetCustomAndRequiredFields, i{{TABLE_NAME_SHORT_PASCAL_C
     },{{#if REACT_IMPORT}}
     responseCallback: (response, _request) => {
         const responseData = response?.data?.rest;
-        {{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}})[])
+        {{CARBON_REACT_INSTANCE}}.updateRestfulObjectArrays<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>({
+            dataOrCallback: Array.isArray(responseData) ? responseData : [responseData],
+            stateKey: "{{TABLE_NAME_SHORT}}",
+            uniqueObjectId: C6.{{TABLE_NAME_SHORT}}.PRIMARY_SHORT as (keyof i{{TABLE_NAME_SHORT_PASCAL_CASE}})[])
+        })
     }{{/if}}
 });
 
@@ -47,14 +51,19 @@ type PutCustomAndRequiredFields = {}
 type PutRequestTableOverrides = {}
 
 {{#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) {
-    {{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}})[])
-}{{/if}}
+export function putState(response: AxiosResponse<iPutC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>>, request: iAPI<Modify<i{{TABLE_NAME_SHORT_PASCAL_CASE}}, PutRequestTableOverrides>> & PutCustomAndRequiredFields) {
+    {{CARBON_REACT_INSTANCE}}.updateRestfulObjectArrays<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>({
+        dataOrCallback: [
+            removeInvalidKeys<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>({
+                ...request,
+                ...response?.data?.rest,
+            }, C6.TABLES)
+        ],
+        stateKey: "{{TABLE_NAME_SHORT}}",
+        uniqueObjectId: {{TABLE_NAME_SHORT}}.PRIMARY_SHORT as (keyof i{{TABLE_NAME_SHORT_PASCAL_CASE}})[])
+    })
+}
+{{/if}}
 
 const Put = restRequest<PutCustomAndRequiredFields, i{{TABLE_NAME_SHORT_PASCAL_CASE}}, PutRequestTableOverrides, iPutC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>, RestTableNames>({
     C6: C6,
@@ -73,16 +82,16 @@ type PostCustomAndRequiredFields = {}
 
 type PostRequestTableOverrides = {}
 
-{{#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 REACT_IMPORT}}export function postState(response: AxiosResponse<iPostC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>>, request: iAPI<Modify<i{{CARBON_REACT_INSTANCE}}, PostRequestTableOverrides>> & PostCustomAndRequiredFields, id: string | number | boolean) {
     if ('number' === typeof id || 'string' === typeof id) {
-        if (1 !== {{TABLE_NAME_SHORT}}.PRIMARY_SHORT.length) {
+        if (1 !== caller_requests.PRIMARY_SHORT.length) {
             console.error("C6 received unexpected result's given the primary key length");
         } else {
-            request[{{TABLE_NAME_SHORT}}.PRIMARY_SHORT[0]] = id
+            request[caller_requests.PRIMARY_SHORT[0]] = id
         }
     }
-    {{CARBON_REACT_INSTANCE}}.updateRestfulObjectArrays<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>(
-        undefined !== request.dataInsertMultipleRows
+    {{CARBON_REACT_INSTANCE}}.updateRestfulObjectArrays<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>({
+        dataOrCallback: undefined !== request.dataInsertMultipleRows
             ? request.dataInsertMultipleRows.map((request, index) => {
                 return removeInvalidKeys<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>({
                     ...request,
@@ -93,11 +102,11 @@ type PostRequestTableOverrides = {}
                 removeInvalidKeys<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>({
                     ...request,
                     ...response?.data?.rest,
-                    }, C6.TABLES)
+                }, C6.TABLES)
             ],
-        "{{TABLE_NAME_SHORT}}",
-        {{TABLE_NAME_SHORT}}.PRIMARY_SHORT as (keyof i{{TABLE_NAME_SHORT_PASCAL_CASE}})[]
-    )
+        stateKey: "{{TABLE_NAME_SHORT}}",
+        uniqueObjectId: {{TABLE_NAME_SHORT}}.PRIMARY_SHORT as (keyof i{{TABLE_NAME_SHORT_PASCAL_CASE}})[]
+    })
 }{{/if}}
 
 const Post = restRequest<PostCustomAndRequiredFields, i{{TABLE_NAME_SHORT_PASCAL_CASE}}, PostRequestTableOverrides, iPostC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>, RestTableNames>({
@@ -117,11 +126,17 @@ type DeleteCustomAndRequiredFields = {}
 
 type DeleteRequestTableOverrides = {}
 
-{{#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}})[])
-}{{/if}}
+{{#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}}>({
+        dataOrCallback: [
+            request
+        ],
+        stateKey: "{{TABLE_NAME_SHORT}}",
+        uniqueObjectId: {{TABLE_NAME_SHORT}}.PRIMARY_SHORT as (keyof i{{TABLE_NAME_SHORT_PASCAL_CASE}})[])
+    })
+}
+{{/if}}
 
 const Delete = restRequest<DeleteCustomAndRequiredFields, i{{TABLE_NAME_SHORT_PASCAL_CASE}}, DeleteRequestTableOverrides, iDeleteC6RestResponse<i{{TABLE_NAME_SHORT_PASCAL_CASE}}>, RestTableNames>({
     C6: C6,

package/scripts/generateRestBindings.cjs

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

package/scripts/generateRestBindings.ts

@@ -274,7 +274,7 @@ const parseSQLToTypeScript = (sql: string) => {
             const 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'");
+                console.error("React requires two arguments, the import and the carbon react instance statement. Example: --react 'import CustomCarbonReactApplication from \"src/CustomCarbonReactApplication.tsx\"; CustomCarbonReactApplication.instance'");
                 process.exit(1);
             }