@carbonorm/carbonnode 1.6.5 → 1.6.6

package/package.json

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

package/scripts/assets/handlebars/C6.ts.handlebars

@@ -7,7 +7,8 @@ import {
     iPostC6RestResponse,
     iDeleteC6RestResponse,
     iPutC6RestResponse,
-    iAPI
+    iAPI,
+    removePrefixIfExists
 } from "@carbonorm/carbonnode";
 import {AxiosResponse} from "axios";
 
@@ -108,7 +109,19 @@ async function dynamicRestImport(tableName: string) : Promise<{
 
     // if tableName is not a key in the TABLES object then throw an error
     if (!TABLES[tableName]) {
-        throw new Error('Table (' + tableName + ') does not exist in the TABLES object. Possible values include (' + Object.keys(TABLES).join(', ') + ')');
+
+        const modifiedTableName = removePrefixIfExists(tableName, RestTablePrefix);
+
+        if (!TABLES[modifiedTableName]) {
+
+            throw new Error('Table (' + tableName + ') does not exist in the TABLES object. Possible values include (' + Object.keys(TABLES).join(', ') + ')');
+
+        } else {
+
+            tableName = modifiedTableName;
+
+        }
+
     }
 
     const module = await import('./' + (tableName.split('_')

package/src/api/restRequest.ts

@@ -233,6 +233,14 @@ export function clearCache(props?: iClearCache) {
 
 }
 
+
+export function removePrefixIfExists(tableName: string, prefix: string): string {
+    if (tableName.startsWith(prefix.toLowerCase())) {
+        return tableName.slice(prefix.length);
+    }
+    return tableName;
+}
+
 /**
  * the first argument ....
  *
@@ -393,7 +401,7 @@ export default function restApi<
 
     const operatingTableFullName = fullTableList[0];
 
-    const operatingTable = operatingTableFullName.replace(C6.PREFIX, '');
+    const operatingTable = removePrefixIfExists(operatingTableFullName,C6.PREFIX);
 
     const tables = fullTableList.join(',')