@carbonorm/carbonnode 3.2.1 → 3.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carbonorm/carbonnode",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "browser": "dist/index.umd.js",
   "exports": {
     ".": {
@@ -75,7 +75,6 @@
     "build:index": "npx barrelsby -d ./src --delete --exclude '(jestHoc|\\.test|\\.d).(js|tsx?)$' --exportDefault --verbose",
     "build:generateRestBindings": "cd ./scripts/ && tsc --downlevelIteration --resolveJsonModule generateRestBindings.ts && mv generateRestBindings.js generateRestBindings.cjs",
     "generateRestBindings": "npm run build:generateRestBindings && node ./scripts/generateRestBindings.cjs",
-    "generateRestBindings:assessorly": "npm run build:generateRestBindings && node ./scripts/generateRestBindings.cjs --react 'import Assessorly from \"../../fed/src/Assessorly\"; Assessorly.instance'",
     "c6": "npm run generateRestBindings"
   },
   "bin": {

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

@@ -38,9 +38,13 @@ interface iDefine{{TABLE_NAME_SHORT_PASCAL_CASE}} {
 {{/each}}
 }
 
-export type {{TABLE_NAME_SHORT_PASCAL_CASE}}PrimaryKeys = {{#PRIMARY_SHORT}}
-    '{{this}}'{{#unless @last}} |{{else}};{{/unless}}
-{{/PRIMARY_SHORT}}
+export type {{TABLE_NAME_SHORT_PASCAL_CASE}}PrimaryKeys = {{#if PRIMARY_SHORT.length}}
+    {{#each PRIMARY_SHORT}}
+        '{{this}}'{{#unless @last}} |{{/unless}}
+    {{/each}};
+{{else}}
+    never;
+{{/if}}
 
 export const {{TABLE_NAME_SHORT}}:
     iC6RestfulModel<

package/scripts/generateRestBindings.cjs

@@ -246,6 +246,9 @@ var parseSQLToTypeScript = function (sql) {
         var primaryKeys = primaryKeyMatch
             ? primaryKeyMatch[1].split(',').map(function (key) { return key.trim().replace(/`/g, ''); })
             : [];
+        var primaryKeysType = primaryKeys.length > 0
+            ? primaryKeys.map(function (pk) { return "'".concat(pk, "'"); }).join(' | ')
+            : 'never';
         // Extract foreign keys
         var foreignKeyRegex = /CONSTRAINT `([^`]+)` FOREIGN KEY \(`([^`]+)`\) REFERENCES `([^`]+)` \(`([^`]+)`\)( ON DELETE (\w+))?( ON UPDATE (\w+))?/g;
         var foreignKeyMatch = void 0;
@@ -289,6 +292,7 @@ var parseSQLToTypeScript = function (sql) {
             TABLE_NAME_SHORT_PASCAL_CASE: tableName.replace(MySQLDump.DB_PREFIX, '').split('_').map(capitalizeFirstLetter).join('_'),
             PRIMARY: primaryKeys.map(function (pk) { return "".concat(tableName, ".").concat(pk); }),
             PRIMARY_SHORT: primaryKeys,
+            PRIMARY_KEYS_TYPE: primaryKeysType,
             COLUMNS: {},
             COLUMNS_UPPERCASE: {},
             TYPE_VALIDATION: {},

package/scripts/generateRestBindings.ts

@@ -315,6 +315,10 @@ const parseSQLToTypeScript = (sql: string) => {
             ? primaryKeyMatch[1].split(',').map(key => key.trim().replace(/`/g, ''))
             : [];
 
+        const primaryKeysType = primaryKeys.length > 0
+            ? primaryKeys.map(pk => `'${pk}'`).join(' | ')
+            : 'never';
+
         // Extract foreign keys
         const foreignKeyRegex: RegExp = /CONSTRAINT `([^`]+)` FOREIGN KEY \(`([^`]+)`\) REFERENCES `([^`]+)` \(`([^`]+)`\)( ON DELETE (\w+))?( ON UPDATE (\w+))?/g;
         let foreignKeyMatch: RegExpExecArray | null;
@@ -369,6 +373,7 @@ const parseSQLToTypeScript = (sql: string) => {
             TABLE_NAME_SHORT_PASCAL_CASE: tableName.replace(MySQLDump.DB_PREFIX, '').split('_').map(capitalizeFirstLetter).join('_'),
             PRIMARY: primaryKeys.map(pk => `${tableName}.${pk}`),
             PRIMARY_SHORT: primaryKeys,
+            PRIMARY_KEYS_TYPE: primaryKeysType,
             COLUMNS: {},
             COLUMNS_UPPERCASE: {},
             TYPE_VALIDATION: {},