prostgles-types 4.0.280 → 4.0.282

package/dist/insertTypes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"insertTypes.d.ts","sourceRoot":"","sources":["../lib/insertTypes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAE7F,MAAM,MAAM,2BAA2B,CACrC,EAAE,SAAS,SAAS,EACpB,CAAC,SAAS,QAAQ,GAAG,IAAI,EACzB,KAAK,SAAS,WAAW,IAEzB;IAAC,KAAK;CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,kBAAkB,CAAC,EAAE,CAAC,GAC9C,gBAAgB,CAAC,CAAC,EAAE,KAAK,CAAC,SAAS,MAAM,IAAI,GAC7C;IAAC,IAAI;CAAC,SAAS,CAAC,KAAK,CAAC,GACpB,kBAAkB,CAAC,EAAE,CAAC,GACtB;KACG,CAAC,IAAI,MAAM,EAAE,GACV,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GACzB,CAAC,IAAI,SAAS;QAAE,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;QAAC,IAAI,EAAE,MAAM,IAAI,CAAA;KAAE,GAC5D,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,GAC/B,IAAI,GACJ,KAAK,GACP,KAAK,CAAC;CACb,GACH,KAAK,CAAC;AAEV,KAAK,gBAAgB,CAAC,CAAC,SAAS,QAAQ,GAAG,IAAI,EAAE,KAAK,SAAS,WAAW,IAAI;KAC3E,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAC3B;QACE,OAAO,EAAE,MAAM,IAAI,SAAS,SAAS,CAAC;QACtC,YAAY,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,OAAO,CAAC,CAAC;KAC5C,CACF,GACC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,oBAAoB,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;KAAE,GAC5D,KAAK;CACR,CAAC,MAAM,CAAC,CAAC,CAAC"}

package/dist/insertTypes.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=insertTypes.js.map

package/dist/insertTypes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"insertTypes.js","sourceRoot":"","sources":["../lib/insertTypes.ts"],"names":[],"mappings":""}

package/dist/joinHelpers.d.ts

@@ -1,4 +1,6 @@
-import type { JoinMaker } from "./index";
+import type { DetailedJoinSelect, JoinMaker } from "./index";
+/** Preserve literal table names and selections for joined return type inference. */
+export declare const defineJoin: <const J extends DetailedJoinSelect>(join: J) => J;
 export declare const innerJoin: JoinMaker;
 export declare const leftJoin: JoinMaker;
 //# sourceMappingURL=joinHelpers.d.ts.map

package/dist/joinHelpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"joinHelpers.d.ts","sourceRoot":"","sources":["../lib/joinHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,SAAS,EAAE,MAAM,SAAS,CAAC;AAoBpD,eAAO,MAAM,SAAS,WAA4B,CAAC;AACnD,eAAO,MAAM,QAAQ,WAA2B,CAAC"}
+{"version":3,"file":"joinHelpers.d.ts","sourceRoot":"","sources":["../lib/joinHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,kBAAkB,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAGxE,oFAAoF;AACpF,eAAO,MAAM,UAAU,GAAI,KAAK,CAAC,CAAC,SAAS,kBAAkB,EAAE,MAAM,CAAC,KAAG,CAAS,CAAC;AAmBnF,eAAO,MAAM,SAAS,WAA4B,CAAC;AACnD,eAAO,MAAM,QAAQ,WAA2B,CAAC"}

package/dist/joinHelpers.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.leftJoin = exports.innerJoin = void 0;
+exports.leftJoin = exports.innerJoin = exports.defineJoin = void 0;
 const util_1 = require("./util");
+/** Preserve literal table names and selections for joined return type inference. */
+const defineJoin = (join) => join;
+exports.defineJoin = defineJoin;
 const getJoinFunc = (joinType = "$leftJoin") => {
     const joinMaker = (tableName, filter, select, options = {}) => {
         return {

package/dist/joinHelpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"joinHelpers.js","sourceRoot":"","sources":["../lib/joinHelpers.ts"],"names":[],"mappings":";;;AACA,iCAAkC;AAElC,MAAM,WAAW,GAAG,CAAC,WAAuC,WAAW,EAAE,EAAE;IACzE,MAAM,SAAS,GAAc,CAC3B,SAA8C,EAC9C,MAA2C,EAC3C,MAA2C,EAC3C,UAA+C,EAAE,EACjD,EAAE;QACF,OAAO;YACL,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,IAAI,IAAI,SAAS;YACrC,MAAM;YACN,GAAG,IAAA,eAAQ,EAAC,OAAO,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YACxC,MAAM;SACP,CAAC;IACJ,CAAC,CAAC;IACF,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEW,QAAA,SAAS,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC;AACtC,QAAA,QAAQ,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC"}
+{"version":3,"file":"joinHelpers.js","sourceRoot":"","sources":["../lib/joinHelpers.ts"],"names":[],"mappings":";;;AACA,iCAAkC;AAElC,oFAAoF;AAC7E,MAAM,UAAU,GAAG,CAAqC,IAAO,EAAK,EAAE,CAAC,IAAI,CAAC;AAAtE,QAAA,UAAU,cAA4D;AAEnF,MAAM,WAAW,GAAG,CAAC,WAAuC,WAAW,EAAE,EAAE;IACzE,MAAM,SAAS,GAAc,CAC3B,SAA8C,EAC9C,MAA2C,EAC3C,MAA2C,EAC3C,UAA+C,EAAE,EACjD,EAAE;QACF,OAAO;YACL,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,IAAI,IAAI,SAAS;YACrC,MAAM;YACN,GAAG,IAAA,eAAQ,EAAC,OAAO,EAAE,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YACxC,MAAM;SACP,CAAC;IACJ,CAAC,CAAC;IACF,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEW,QAAA,SAAS,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC;AACtC,QAAA,QAAQ,GAAG,WAAW,CAAC,WAAW,CAAC,CAAC"}

package/lib/files.ts

@@ -8,6 +8,7 @@ export const CONTENT_TYPE_TO_EXT = {
   "text/xml": ["xml"],
   "text/mathml": ["mml"],
   "text/plain": ["txt"],
+  "text/markdown": ["md", "markdown"],
   "text/vnd.sun.j2me.app-descriptor": ["jad"],
   "text/vnd.wap.wml": ["wml"],
   "text/x-component": ["htc"],
@@ -22,6 +23,8 @@ export const CONTENT_TYPE_TO_EXT = {
   "image/svg+xml": ["svg"],
   "image/webp": ["webp"],
   "application/sql": ["sql"],
+  "application/json": ["json"],
+  "application/geo+json": ["geojson"],
   "application/x-javascript": ["js"],
   "application/atom+xml": ["atom"],
   "application/rss+xml": ["rss"],

package/lib/index.ts

@@ -5,6 +5,7 @@ import { JSONB } from "./JSONBSchemaValidation/JSONBSchema";
 import { getKeys, isDefined } from "./util";
 import { includes } from "./utilFuncs/includes";
 import type { SyncTableInfo } from "./WAL";
+import type { InsertColumnsWithReferences } from "./insertTypes";
 export const _PG_strings = [
   "bpchar",
   "char",
@@ -581,7 +582,7 @@ type InclusiveSelect = true | 1 | FunctionSelect | JoinSelect;
 type SelectWithFunctions<T extends AnyObject = AnyObject, IsTyped = false> =
   | ({ [K in keyof Partial<T>]: InclusiveSelect } & Record<
       string,
-      IsTyped extends true ? FunctionFull : InclusiveSelect
+      IsTyped extends true ? FunctionFull | DetailedJoinSelect : InclusiveSelect
     >)
   | FunctionAliasedSelect
   | { [K in keyof Partial<T>]: true | 1 | string }
@@ -756,31 +757,61 @@ export type NormalizedRow<T extends Record<string, unknown>> = Required<{
   [K in keyof T]: CollapseNumberIfStringPresent<T[K]>;
 }>;
 
+type JoinTarget<P> =
+  P extends string ? P
+  : P extends readonly [...unknown[], infer Last] ?
+    Last extends string ? Last
+    : Last extends { table: infer T } ? T
+    : never
+  : never;
+
+type ExplicitJoinResult<J, S extends DBSchema | void, P> =
+  [JoinTarget<P>] extends [never] ? any[]
+  : S extends DBSchema ?
+    JoinTarget<P> extends infer T extends keyof S ?
+      J extends { select: infer Sel extends Select } ?
+        SelectDataType<S, { select: Sel }, S[T]["columns"]>[]
+      : any[]
+    : any[]
+  : any[];
+
 type JoinedSelect = Record<string, Select>;
 export type SelectFunction = Record<string, any[]>;
 type ParseSelect<
   Select extends SelectParams<TD>["select"],
   TD extends AnyObject,
+  S extends DBSchema | void,
 > = (Select extends { "*": 1 } ? NormalizedRow<TD> : {}) & {
-  [Key in keyof Omit<Select, "*"> & string]: Select[Key] extends 1 ? NormalizedRow<TD>[Key]
+  [Key in keyof Omit<Select, "*"> & string]: Select[Key] extends 1 | true ? NormalizedRow<TD>[Key]
+  : Select[Key] extends (
+    {
+      $leftJoin: infer P extends RawJoinPath;
+      select: unknown;
+    }
+  ) ?
+    ExplicitJoinResult<Select[Key], S, P>
+  : Select[Key] extends (
+    {
+      $innerJoin: infer P extends RawJoinPath;
+      select: unknown;
+    }
+  ) ?
+    ExplicitJoinResult<Select[Key], S, P>
   : Select[Key] extends SelectFunction ? any
   : Select[Key] extends JoinedSelect ? any[]
   : any;
 };
 
-type SelectDataType<
-  S extends DBSchema | void,
-  O extends SelectParams<TD, S>,
-  TD extends AnyObject,
-> =
+type SelectDataType<S extends DBSchema | void, O, TD extends AnyObject> =
   O extends { returnType: "value" } ? any
   : O extends { returnType: "values"; select: Record<string, 1> } ?
     ValueOf<Pick<NormalizedRow<TD>, keyof O["select"]>>
   : O extends { returnType: "values" } ? any
   : O extends { select: "*" } ? NormalizedRow<TD>
   : O extends { select: "" } ? Record<string, never>
-  : O extends { select: Record<string, 0> } ? Omit<NormalizedRow<TD>, keyof O["select"]>
-  : O extends { select: Record<string, any> } ? ParseSelect<O["select"], NormalizedRow<TD>>
+  : O extends { select: readonly (keyof TD)[] } ? Pick<NormalizedRow<TD>, O["select"][number]>
+  : O extends { select: Record<string, 0 | false> } ? Omit<NormalizedRow<TD>, keyof O["select"]>
+  : O extends { select: Record<string, any> } ? ParseSelect<O["select"], NormalizedRow<TD>, S>
   : NormalizedRow<TD>;
 
 export type SelectReturnType<
@@ -899,12 +930,13 @@ export type DeleteParams<T extends AnyObject | void = void, S extends DBSchema |
 export type InsertDataWithNested<
   TD extends AnyObject,
   S extends DBSchema | void,
-> = UpsertDataToPGCast<TD> &
+  TName extends PropertyKey = never,
+> = InsertColumnsWithReferences<TD, S, TName> &
   (S extends DBSchema ?
     string extends keyof S ?
       {} // collapse to void-like behavior for untyped/dynamic schema
     : {
-        [TableName in keyof S]?: Partial<InsertDataWithNested<S[TableName]["columns"], S>>[];
+        [TableName in keyof S]?: Partial<InsertDataWithNested<S[TableName]["columns"], S, TableName>>[];
       }
   : {});
 
@@ -915,7 +947,7 @@ export type InsertDataWithNested<
 export type TableHandler<
   TD extends AnyObject = AnyObject,
   S extends DBSchema | void = void,
-  TName extends (S extends DBSchema ? keyof S : never) = never,
+  TName extends PropertyKey = never,
 > = {
   /**
    * Retrieves the table/view info
@@ -1045,7 +1077,7 @@ export type TableHandler<
    * Inserts a new record into the table.
    */
   insert<P extends InsertParams<TD, S>>(
-    data: InsertDataWithNested<TD, S>,
+    data: InsertDataWithNested<TD, S, TName>,
     params?: P,
   ): Promise<GetReturningReturnType<P, TD, S>>;
 
@@ -1053,7 +1085,7 @@ export type TableHandler<
    * Inserts new records into the table.
    */
   insertMany<P extends InsertParams<TD, S>>(
-    data: InsertDataWithNested<TD, S>[],
+    data: InsertDataWithNested<TD, S, TName>[],
     params?: P,
   ): Promise<GetReturningReturnType<P, TD, S>[]>;
 
@@ -1213,7 +1245,7 @@ export type ValidatedMethods<T extends DBTableSchema> =
 export type DBHandler<S = void> =
   S extends DBSchema ?
     {
-      [k in keyof S]: Pick<TableHandler<S[k]["columns"], S>, ValidatedMethods<S[k]>>;
+      [k in keyof S]: Pick<TableHandler<S[k]["columns"], S, k>, ValidatedMethods<S[k]>>;
     }
   : {
       [key: string]: Partial<TableHandler>;

package/lib/insertTypes.ts

@@ -0,0 +1,32 @@
+import type { AnyObject, DBSchema, InsertDataWithNested, UpsertDataToPGCast } from "./index";
+
+export type InsertColumnsWithReferences<
+  TD extends AnyObject,
+  S extends DBSchema | void,
+  TName extends PropertyKey,
+> =
+  [TName] extends [never] ? UpsertDataToPGCast<TD>
+  : ColumnReferences<S, TName> extends infer Refs ?
+    [Refs] extends [never] ?
+      UpsertDataToPGCast<TD>
+    : {
+        [K in keyof TD]:
+          | UpsertDataToPGCast<TD>[K]
+          | (Refs extends { columns: readonly string[]; data: infer Data } ?
+              K extends Refs["columns"][number] ?
+                Data
+              : never
+            : never);
+      }
+  : never;
+
+type ColumnReferences<S extends DBSchema | void, TName extends PropertyKey> = {
+  [F in keyof S]: S[F] extends (
+    {
+      columns: infer Data extends AnyObject;
+      referencedBy: Record<TName, infer Columns>;
+    }
+  ) ?
+    { columns: Columns; data: InsertDataWithNested<Data, S, F> }
+  : never;
+}[keyof S];

package/lib/joinHelpers.ts

@@ -1,6 +1,9 @@
-import type { AnyObject, JoinMaker } from "./index";
+import type { AnyObject, DetailedJoinSelect, JoinMaker } from "./index";
 import { omitKeys } from "./util";
 
+/** Preserve literal table names and selections for joined return type inference. */
+export const defineJoin = <const J extends DetailedJoinSelect>(join: J): J => join;
+
 const getJoinFunc = (joinType: "$leftJoin" | "$innerJoin" = "$leftJoin") => {
   const joinMaker: JoinMaker = (
     tableName: Parameters<JoinMaker<AnyObject>>[0],

package/package.json

@@ -1,16 +1,22 @@
 {
   "name": "prostgles-types",
-  "version": "4.0.280",
+  "version": "4.0.282",
   "description": "",
   "main": "dist/index_umd.js",
   "types": "dist/index.d.ts",
+  "files": [
+    "dist",
+    "lib",
+    "!**/*.spec.*"
+  ],
   "directories": {},
   "scripts": {
     "start": "tsc --watch",
     "test": "npm run build && npm run test:type-instantiations && node --test dist/*.spec.js dist/**/*.spec.js",
     "test:type-instantiations": "node scripts/check-type-instantiations.mjs",
-    "build": "npm i && rm -rf ./dist/* && tsc && webpack --config webpack.prod.js",
+    "build": "rm -rf ./dist/* && tsc && webpack --config webpack.prod.js",
     "prebuild": "tsc --noEmit -p tsconfig.browser.json",
+    "prepack": "npm run build",
     "perf": "tsc --extendedDiagnostics 2>&1 | grep -E \"Instantiations|Check time\"",
     "pushpublish": "npm version patch --git-tag-version false && git push && npm publish"
   },

package/.vscode/settings.json

@@ -1,12 +0,0 @@
-{
-  "typescript.tsdk": "node_modules/typescript/lib",
-  "editor.formatOnSave": true,
-  "prettier.experimentalTernaries": true,
-  "[javascript]": {
-      "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "[typescript]": {
-      "editor.defaultFormatter": "esbenp.prettier-vscode"
-  },
-  "prettier.printWidth": 100
-}

package/scripts/check-type-instantiations.mjs

@@ -1,40 +0,0 @@
-import { spawnSync } from "node:child_process";
-import { fileURLToPath } from "node:url";
-
-// Baseline: 108,997. The small margin avoids hiding meaningful inference regressions.
-const MAX_INSTANTIATIONS = 105_000;
-const tscPath = fileURLToPath(new URL("../node_modules/typescript/bin/tsc", import.meta.url));
-const result = spawnSync(
-  process.execPath,
-  [tscPath, "--noEmit", "--extendedDiagnostics", "--pretty", "false"],
-  { encoding: "utf8" },
-);
-
-if (result.error) {
-  throw result.error;
-}
-
-if (result.status !== 0) {
-  process.stdout.write(result.stdout);
-  process.stderr.write(result.stderr);
-  process.exit(result.status ?? 1);
-}
-
-const output = result.stdout + result.stderr;
-const label = "Instantiations:";
-const line = output.split("\n").find((outputLine) => outputLine.startsWith(label));
-const instantiations = Number(line?.slice(label.length).trim());
-
-if (!Number.isFinite(instantiations)) {
-  throw new Error(`Could not read type instantiations from tsc output:\n${output}`);
-}
-
-if (instantiations > MAX_INSTANTIATIONS) {
-  throw new Error(
-    `Type instantiations increased to ${instantiations.toLocaleString()} (maximum: ${MAX_INSTANTIATIONS.toLocaleString()}).`,
-  );
-}
-
-console.log(
-  `Type instantiations: ${instantiations.toLocaleString()} / ${MAX_INSTANTIATIONS.toLocaleString()}`,
-);