prostgles-server 4.2.641 → 4.2.642

package/dist/TableConfig/TableRowFromColumnDefinitions.d.ts

@@ -7,21 +7,34 @@ type ColumnDefinition = string | {
     nullable?: boolean;
 };
 /** Row types for the column definitions used by managed tables. */
-export type TableRowFromColumnDefinitions<T extends Record<string, ColumnDefinition>> = Omit<TableRow<T>, GeneratedColumnNames<T>> & Partial<Pick<TableRow<T>, GeneratedColumnNames<T>>>;
+export type TableRowFromColumnDefinitions<T extends Record<string, ColumnDefinition>> = InsertRow<{
+    [K in keyof T]: T[K] extends string ? NormalizeSQL<Uppercase<T[K]>> : T[K];
+}>;
+type InsertRow<T extends Record<string, ColumnDefinition>> = Omit<TableRow<T>, GeneratedColumnNames<T>> & Partial<Pick<TableRow<T>, GeneratedColumnNames<T>>>;
 type TableRow<T extends Record<string, ColumnDefinition>> = {
-    [K in keyof T]: T[K] extends {
+    [K in keyof T]: T[K] extends ({
         jsonbSchema: infer S extends JSONB.JSONBSchema;
-    } ? JSONB.GetType<S> | (T[K] extends {
+    }) ? JSONB.GetType<S> | (T[K] extends {
         nullable: true;
     } ? null : never) : T[K] extends {
         enum: readonly (infer V)[];
     } ? V | (T[K] extends {
         nullable: true;
-    } ? null : never) : ColumnValue<T[K]> | (T[K] extends `${string} NOT NULL${string}` | `${string}PRIMARY KEY${string}` ? never : null);
+    } ? null : never) : ColumnValue<T[K]> | (T[K] extends string ? ColumnIsRequired<T[K]> extends true ? never : null : never);
 };
+type ColumnIsRequired<T extends string> = ReadType<T>[0] extends SerialType ? true : ` ${Unquoted<T>} ` extends (`${string} NOT NULL ${string}` | `${string} PRIMARY KEY ${string}` | `${string} GENERATED ${string} AS IDENTITY ${string}`) ? true : false;
 type GeneratedColumnNames<T extends Record<string, ColumnDefinition>> = {
-    [K in keyof T]: T[K] extends string ? T[K] extends `${string}DEFAULT${string}` | `${string}SERIAL${string}` | `${string}GENERATED${string}AS IDENTITY${string}` ? K : never : never;
+    [K in keyof T]: T[K] extends string ? ReadType<T[K]>[0] extends SerialType ? K : ` ${Unquoted<T[K]>} ` extends (`${string} DEFAULT ${string}` | `${string} GENERATED ${string}`) ? K : never : never;
 }[keyof T];
-type ColumnValue<T> = T extends `BYTEA${string}` ? Buffer : T extends `JSONB${string}` ? Record<string, unknown> : T extends `${"SMALLINT" | "INTEGER" | "SERIAL"}${string}` ? number : T extends `${"BIGINT" | "BIGSERIAL" | "NUMERIC" | "DECIMAL"}${string}` ? string | number : T extends `${"REAL" | "DOUBLE PRECISION"}${string}` ? number : string;
+type SerialType = "SMALLSERIAL" | "SERIAL2" | "SERIAL" | "SERIAL4" | "BIGSERIAL" | "SERIAL8";
+type ColumnValue<T> = T extends string ? T extends `DOUBLE PRECISION${infer Rest}` ? ColumnValue<`FLOAT8${Rest}`> : ReadType<T> extends [infer Name extends string, infer Rest extends string] ? ArrayValue<ScalarValue<Name>, Trim<Rest>> : never : never;
+type ScalarValue<T> = T extends "BYTEA" ? Buffer : T extends "JSON" | "JSONB" ? Record<string, unknown> : T extends "BOOL" | "BOOLEAN" ? boolean : T extends ("SMALLINT" | "INT2" | "INT" | "INTEGER" | "INT4" | "SMALLSERIAL" | "SERIAL2" | "SERIAL" | "SERIAL4" | "REAL" | "FLOAT" | "FLOAT4" | "FLOAT8") ? number : T extends "BIGINT" | "INT8" | "BIGSERIAL" | "SERIAL8" | "NUMERIC" | "DECIMAL" | "DEC" ? string | number : string;
+/** Only consume modifiers/array dimensions immediately following the type. */
+type ArrayValue<Value, Rest extends string> = Rest extends `(${string})${infer Tail}` ? ArrayValue<Value, Trim<Tail>> : Rest extends `[${string}]${infer Tail}` ? ArrayValue<(Value | null)[], Trim<Tail>> : Rest extends "ARRAY" | `ARRAY ${string}` | `ARRAY[${string}` ? Rest extends `ARRAY${infer Tail}` ? Trim<Tail> extends `[${string}` ? ArrayValue<Value, Trim<Tail>> : (Value | null)[] : never : Value;
+type ReadType<T extends string, Name extends string = ""> = T extends `${" " | "(" | "["}${string}` ? [Name, T] : T extends `${infer Char}${infer Rest}` ? ReadType<Rest, `${Name}${Char}`> : [Name, ""];
+type Trim<T extends string> = T extends ` ${infer Rest}` ? Trim<Rest> : T extends `${infer Rest} ` ? Trim<Rest> : T;
+type NormalizeSQL<T extends string> = T extends `${infer Start}\n${infer End}` ? NormalizeSQL<`${Start} ${End}`> : T extends `${infer Start}\r${infer End}` ? NormalizeSQL<`${Start} ${End}`> : T extends `${infer Start}\t${infer End}` ? NormalizeSQL<`${Start} ${End}`> : T extends `${infer Start}  ${infer End}` ? NormalizeSQL<`${Start} ${End}`> : Trim<T>;
+/** Quoted values and identifiers do not declare defaults or constraints. */
+type Unquoted<T extends string> = T extends `${infer Start}'${string}'${infer End}` ? Unquoted<`${Start}${End}`> : T extends `${infer Start}"${string}"${infer End}` ? Unquoted<`${Start}${End}`> : T;
 export {};
 //# sourceMappingURL=TableRowFromColumnDefinitions.d.ts.map

package/dist/TableConfig/TableRowFromColumnDefinitions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TableRowFromColumnDefinitions.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/TableRowFromColumnDefinitions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAE7C,KAAK,gBAAgB,GACjB,MAAM,GACN;IAAE,IAAI,EAAE,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,GAC1D;IAAE,WAAW,EAAE,KAAK,CAAC,WAAW,CAAC;IAAC,QAAQ,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC;AAE3D,mEAAmE;AACnE,MAAM,MAAM,6BAA6B,CACvC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,IACxC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC,GAC5C,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAEtD,KAAK,QAAQ,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI;KACzD,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS;QAC3B,WAAW,EAAE,MAAM,CAAC,SAAS,KAAK,CAAC,WAAW,CAAC;KAChD,GACG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QAAE,QAAQ,EAAE,IAAI,CAAA;KAAE,GAAG,IAAI,GAAG,KAAK,CAAC,GACnE,CAAC,CAAC,CAAC,CAAC,SAAS;QAAE,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,EAAE,CAAA;KAAE,GACzC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QAAE,QAAQ,EAAE,IAAI,CAAA;KAAE,GAAG,IAAI,GAAG,KAAK,CAAC,GAClD,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACjB,CAAC,CAAC,CAAC,CAAC,CAAC,SACH,GAAG,MAAM,YAAY,MAAM,EAAE,GAAG,GAAG,MAAM,cAAc,MAAM,EAAE,GAC7D,KAAK,GACL,IAAI,CAAC;CAClB,CAAC;AAEF,KAAK,oBAAoB,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI;KACrE,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,GAC/B,CAAC,CAAC,CAAC,CAAC,SACA,GAAG,MAAM,UAAU,MAAM,EAAE,GAC3B,GAAG,MAAM,SAAS,MAAM,EAAE,GAC1B,GAAG,MAAM,YAAY,MAAM,cAAc,MAAM,EAAE,GACnD,CAAC,GACD,KAAK,GACP,KAAK;CACV,CAAC,MAAM,CAAC,CAAC,CAAC;AAEX,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,QAAQ,MAAM,EAAE,GAC5C,MAAM,GACN,CAAC,SAAS,QAAQ,MAAM,EAAE,GACxB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvB,CAAC,SAAS,GAAG,UAAU,GAAG,SAAS,GAAG,QAAQ,GAAG,MAAM,EAAE,GACvD,MAAM,GACN,CAAC,SAAS,GAAG,QAAQ,GAAG,WAAW,GAAG,SAAS,GAAG,SAAS,GAAG,MAAM,EAAE,GACpE,MAAM,GAAG,MAAM,GACf,CAAC,SAAS,GAAG,MAAM,GAAG,kBAAkB,GAAG,MAAM,EAAE,GACjD,MAAM,GACN,MAAM,CAAC"}
+{"version":3,"file":"TableRowFromColumnDefinitions.d.ts","sourceRoot":"","sources":["../../lib/TableConfig/TableRowFromColumnDefinitions.ts"],"names":[],"mappings":"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"}

package/lib/TableConfig/TableRowFromColumnDefinitions.ts

@@ -6,44 +6,121 @@ type ColumnDefinition =
   | { jsonbSchema: JSONB.JSONBSchema; nullable?: boolean };
 
 /** Row types for the column definitions used by managed tables. */
-export type TableRowFromColumnDefinitions<
-  T extends Record<string, ColumnDefinition>,
-> = Omit<TableRow<T>, GeneratedColumnNames<T>> &
+export type TableRowFromColumnDefinitions<T extends Record<string, ColumnDefinition>> = InsertRow<{
+  [K in keyof T]: T[K] extends string ? NormalizeSQL<Uppercase<T[K]>> : T[K];
+}>;
+
+type InsertRow<T extends Record<string, ColumnDefinition>> = Omit<
+  TableRow<T>,
+  GeneratedColumnNames<T>
+> &
   Partial<Pick<TableRow<T>, GeneratedColumnNames<T>>>;
 
 type TableRow<T extends Record<string, ColumnDefinition>> = {
-  [K in keyof T]: T[K] extends {
-    jsonbSchema: infer S extends JSONB.JSONBSchema;
-  }
-    ? JSONB.GetType<S> | (T[K] extends { nullable: true } ? null : never)
-    : T[K] extends { enum: readonly (infer V)[] }
-      ? V | (T[K] extends { nullable: true } ? null : never)
-      : | ColumnValue<T[K]>
-        | (T[K] extends
-            `${string} NOT NULL${string}` | `${string}PRIMARY KEY${string}`
-            ? never
-            : null);
+  [K in keyof T]: T[K] extends (
+    {
+      jsonbSchema: infer S extends JSONB.JSONBSchema;
+    }
+  ) ?
+    JSONB.GetType<S> | (T[K] extends { nullable: true } ? null : never)
+  : T[K] extends { enum: readonly (infer V)[] } ?
+    V | (T[K] extends { nullable: true } ? null : never)
+  : | ColumnValue<T[K]>
+    | (T[K] extends string ?
+        ColumnIsRequired<T[K]> extends true ?
+          never
+        : null
+      : never);
 };
 
+type ColumnIsRequired<T extends string> =
+  ReadType<T>[0] extends SerialType ? true
+  : ` ${Unquoted<T>} ` extends (
+
+      | `${string} NOT NULL ${string}`
+      | `${string} PRIMARY KEY ${string}`
+      | `${string} GENERATED ${string} AS IDENTITY ${string}`
+  ) ?
+    true
+  : false;
+
 type GeneratedColumnNames<T extends Record<string, ColumnDefinition>> = {
-  [K in keyof T]: T[K] extends string
-    ? T[K] extends
-        | `${string}DEFAULT${string}`
-        | `${string}SERIAL${string}`
-        | `${string}GENERATED${string}AS IDENTITY${string}`
-      ? K
-      : never
-    : never;
+  [K in keyof T]: T[K] extends string ?
+    ReadType<T[K]>[0] extends SerialType ? K
+    : ` ${Unquoted<T[K]>} ` extends (
+      `${string} DEFAULT ${string}` | `${string} GENERATED ${string}`
+    ) ?
+      K
+    : never
+  : never;
 }[keyof T];
 
-type ColumnValue<T> = T extends `BYTEA${string}`
-  ? Buffer
-  : T extends `JSONB${string}`
-    ? Record<string, unknown>
-    : T extends `${"SMALLINT" | "INTEGER" | "SERIAL"}${string}`
-      ? number
-      : T extends `${"BIGINT" | "BIGSERIAL" | "NUMERIC" | "DECIMAL"}${string}`
-        ? string | number
-        : T extends `${"REAL" | "DOUBLE PRECISION"}${string}`
-          ? number
-          : string;
+type SerialType = "SMALLSERIAL" | "SERIAL2" | "SERIAL" | "SERIAL4" | "BIGSERIAL" | "SERIAL8";
+
+type ColumnValue<T> =
+  T extends string ?
+    T extends `DOUBLE PRECISION${infer Rest}` ? ColumnValue<`FLOAT8${Rest}`>
+    : ReadType<T> extends [infer Name extends string, infer Rest extends string] ?
+      ArrayValue<ScalarValue<Name>, Trim<Rest>>
+    : never
+  : never;
+
+type ScalarValue<T> =
+  T extends "BYTEA" ? Buffer
+  : T extends "JSON" | "JSONB" ? Record<string, unknown>
+  : T extends "BOOL" | "BOOLEAN" ? boolean
+  : T extends (
+
+      | "SMALLINT"
+      | "INT2"
+      | "INT"
+      | "INTEGER"
+      | "INT4"
+      | "SMALLSERIAL"
+      | "SERIAL2"
+      | "SERIAL"
+      | "SERIAL4"
+      | "REAL"
+      | "FLOAT"
+      | "FLOAT4"
+      | "FLOAT8"
+  ) ?
+    number
+  : T extends "BIGINT" | "INT8" | "BIGSERIAL" | "SERIAL8" | "NUMERIC" | "DECIMAL" | "DEC" ?
+    string | number
+  : string;
+
+/** Only consume modifiers/array dimensions immediately following the type. */
+type ArrayValue<Value, Rest extends string> =
+  Rest extends `(${string})${infer Tail}` ? ArrayValue<Value, Trim<Tail>>
+  : Rest extends `[${string}]${infer Tail}` ? ArrayValue<(Value | null)[], Trim<Tail>>
+  : Rest extends "ARRAY" | `ARRAY ${string}` | `ARRAY[${string}` ?
+    Rest extends `ARRAY${infer Tail}` ?
+      Trim<Tail> extends `[${string}` ?
+        ArrayValue<Value, Trim<Tail>>
+      : (Value | null)[]
+    : never
+  : Value;
+
+type ReadType<T extends string, Name extends string = ""> =
+  T extends `${" " | "(" | "["}${string}` ? [Name, T]
+  : T extends `${infer Char}${infer Rest}` ? ReadType<Rest, `${Name}${Char}`>
+  : [Name, ""];
+
+type Trim<T extends string> =
+  T extends ` ${infer Rest}` ? Trim<Rest>
+  : T extends `${infer Rest} ` ? Trim<Rest>
+  : T;
+
+type NormalizeSQL<T extends string> =
+  T extends `${infer Start}\n${infer End}` ? NormalizeSQL<`${Start} ${End}`>
+  : T extends `${infer Start}\r${infer End}` ? NormalizeSQL<`${Start} ${End}`>
+  : T extends `${infer Start}\t${infer End}` ? NormalizeSQL<`${Start} ${End}`>
+  : T extends `${infer Start}  ${infer End}` ? NormalizeSQL<`${Start} ${End}`>
+  : Trim<T>;
+
+/** Quoted values and identifiers do not declare defaults or constraints. */
+type Unquoted<T extends string> =
+  T extends `${infer Start}'${string}'${infer End}` ? Unquoted<`${Start}${End}`>
+  : T extends `${infer Start}"${string}"${infer End}` ? Unquoted<`${Start}${End}`>
+  : T;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prostgles-server",
-  "version": "4.2.641",
+  "version": "4.2.642",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",