fix jsonb_record type

prostgles · Oct 12, 2023 · 2f9978b · 2f9978b
1 parent da5688b
commit 2f9978b
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 34 deletions.
diff --git a/lib/JSONBValidation/validation.ts b/lib/JSONBValidation/validation.ts
@@ -92,9 +92,10 @@ export function getJSONBSchemaTSTypes(schema: JSONB.JSONBSchema, colOpts: ColOpt
       return `${fieldType.nullable ? `null | ` : ""} ( ${getFieldType(arrayOf, true, undefined, depth + 1)} )[]`;
 
     } else if (fieldType?.record) {
-      const { keysEnum, values } = fieldType.record;
+      const { keysEnum, values, partial } = fieldType.record;
       // TODO: ensure props with undefined values are not allowed in the TS type
-      return `${fieldType.nullable ? `null |` : ""} Partial<Record<${keysEnum?.map(v => asValue(v)).join(" | ") ?? "string"}, ${!values? "any" : getFieldType(values, true, undefined, depth + 1)}>>`
+      const getRecord = (v: string) => partial? `Partial<Record<${v}>>` : `Record<${v}>`;
+      return `${fieldType.nullable ? `null |` : ""} ${getRecord(`${keysEnum?.map(v => asValue(v)).join(" | ") ?? "string"}, ${!values? "any" : getFieldType(values, true, undefined, depth + 1)}`)}>>`
 
     } else if(fieldType?.lookup){
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.1.83",
+  "version": "4.1.84",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -41,7 +41,7 @@
     "check-disk-space": "^3.3.1",
     "file-type": "^17.1.4",
     "pg-promise": "^11.3.0",
-    "prostgles-types": "^4.0.41"
+    "prostgles-types": "^4.0.42"
   },
   "devDependencies": {
     "@types/bluebird": "^3.5.36",

diff --git a/tests/client/PID.txt b/tests/client/PID.txt
@@ -1 +1 @@
-1733501
+1745085
diff --git a/tests/client/package-lock.json b/tests/client/package-lock.json
diff --git a/tests/client/package.json b/tests/client/package.json
@@ -13,7 +13,7 @@
   "license": "ISC",
   "dependencies": {
     "@types/node": "^14.14.16",
-    "prostgles-client": "^4.0.25",
+    "prostgles-client": "^4.0.26",
     "socket.io-client": "^4.7.1"
   },
   "devDependencies": {

diff --git a/tests/server/DBoGenerated.d.ts b/tests/server/DBoGenerated.d.ts
@@ -485,7 +485,7 @@ export type DBSchemaGenerated = {
        |  {  ok: string; }
        |  {  err: string; }
        |  {  loading: {  loaded: number;  total: number; }; }
-      table_config?: null | {    referencedTables?: (  {  name: string;  minFiles: number; } )[];   recType?: null | Partial<Record<'a' | 'b',  {  bools: boolean[]; }>>;  };
+      table_config?: null | {    referencedTables?: (  {  name: string;  minFiles: number; } )[];   recType?: null | Record<'a' | 'b',  {  bools: boolean[]; }>>>;  };
     };
   };
   tr1: {

diff --git a/tests/server/package-lock.json b/tests/server/package-lock.json