fix record type

prostgles · Oct 12, 2023 · b0e5f91 · b0e5f91
1 parent a84fbf2
commit b0e5f91
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/lib/JSONBValidation/validation.ts b/lib/JSONBValidation/validation.ts
@@ -93,9 +93,9 @@ export function getJSONBSchemaTSTypes(schema: JSONB.JSONBSchema, colOpts: ColOpt
 
     } else if (fieldType?.record) {
       const { keysEnum, values, partial } = fieldType.record;
-      // TODO: ensure props with undefined values are not allowed in the TS type
+      // TODO: ensure props with undefined values are not allowed in the TS type (strict union)
       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)}`)}>>`
+      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.85",
+  "version": "4.1.86",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/tests/client/PID.txt b/tests/client/PID.txt
@@ -1 +1 @@
-1750441
+1754269
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 | 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