npm - prostgles-types - Versions diffs - 4.0.302 → 4.0.304 - Mend

prostgles-types 4.0.302 → 4.0.304

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

package/dist/joinHelpers.d.ts CHANGED Viewed

@@ -1,6 +1,33 @@
 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;
+/** Schema for an explicit, persisted join path step. */
+export declare const parsedJoinPathSchema: {
+    readonly type: {
+        readonly table: "string";
+        readonly on: {
+            readonly oneOf: readonly [{
+                readonly type: "string";
+            }, {
+                readonly arrayOf: {
+                    readonly record: {
+                        readonly values: "string";
+                    };
+                };
+            }];
+        };
+        readonly params: {
+            readonly record: {
+                readonly values: "unknown";
+            };
+            readonly optional: true;
+        };
+        readonly reversed: {
+            readonly type: "boolean";
+            readonly optional: true;
+        };
+    };
+};
 export declare const innerJoin: JoinMaker;
 export declare const leftJoin: JoinMaker;
 //# sourceMappingURL=joinHelpers.d.ts.map

package/dist/joinHelpers.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"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"}
1	+ {"version":3,"file":"joinHelpers.d.ts","sourceRoot":"","sources":["../lib/joinHelpers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,kBAAkB,EAAE,SAAS,EAAS,MAAM,SAAS,CAAC;AAG/E,oFAAoF;AACpF,eAAO,MAAM,UAAU,GAAI,KAAK,CAAC,CAAC,SAAS,kBAAkB,EAAE,MAAM,CAAC,KAAG,CACnE,CAAC;AAEP,wDAAwD;AACxD,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;CAYK,CAAC;AAmBvC,eAAO,MAAM,SAAS,WAA4B,CAAC;AACnD,eAAO,MAAM,QAAQ,WAA2B,CAAC"}

package/dist/joinHelpers.js CHANGED Viewed

@@ -1,10 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.leftJoin = exports.innerJoin = exports.defineJoin = void 0;
+exports.leftJoin = exports.innerJoin = exports.parsedJoinPathSchema = 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;
+/** Schema for an explicit, persisted join path step. */
+exports.parsedJoinPathSchema = {
+    type: {
+        table: "string",
+        on: {
+            oneOf: [
+                { type: "string" },
+                { arrayOf: { record: { values: "string" } } },
+            ],
+        },
+        params: { record: { values: "unknown" }, optional: true },
+        reversed: { type: "boolean", optional: true },
+    },
+};
 const getJoinFunc = (joinType = "$leftJoin") => {
     const joinMaker = (tableName, filter, select, options = {}) => {
         return {

package/dist/joinHelpers.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"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"}
1	+ {"version":3,"file":"joinHelpers.js","sourceRoot":"","sources":["../lib/joinHelpers.ts"],"names":[],"mappings":";;;AACA,iCAAkC;AAElC,oFAAoF;AAC7E,MAAM,UAAU,GAAG,CAAqC,IAAO,EAAK,EAAE,CAC3E,IAAI,CAAC;AADM,QAAA,UAAU,cAChB;AAEP,wDAAwD;AAC3C,QAAA,oBAAoB,GAAG;IAClC,IAAI,EAAE;QACJ,KAAK,EAAE,QAAQ;QACf,EAAE,EAAE;YACF,KAAK,EAAE;gBACL,EAAE,IAAI,EAAE,QAAQ,EAAE;gBAClB,EAAE,OAAO,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE;aAC9C;SACF;QACD,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE;QACzD,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE;KAC9C;CACmC,CAAC;AAEvC,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/dist/util.d.ts CHANGED Viewed

@@ -51,22 +51,24 @@ export declare const tryCatch: <T extends AnyObject>(func: () => T | Promise<T>)
     error: unknown;
     duration: number;
 })>;
-export type ParsedJoinPath = Required<JoinPath>;
-export declare const reverseJoinOn: (on: ParsedJoinPath["on"]) => {
+export type ParsedJoinPath = JoinPath & {
+    on: NonNullable<JoinPath["on"]>;
+};
+export declare const reverseJoinOn: (on: Record<string, string>[]) => {
     [k: string]: string;
 }[];
-/**
- * result = [
- *  { table, on: parsedPath[0] }
- *  ...parsedPath.map(p => ({ table: p.table, on: reversedOn(parsedPath[i+1].on) }))
- * ]
- */
-export declare const reverseParsedPath: (parsedPath: ParsedJoinPath[], table: string) => {
+/** Reverse each join toward its source table, then reverse the path order. */
+export declare const reverseParsedPath: (parsedPath: ParsedJoinPath[], table: string) => ({
+    reversed?: boolean | undefined;
+    params?: Record<string, unknown> | undefined;
+    table: string;
+    on: string | (string & Record<string, string>[]) | (Record<string, string>[] & string);
+} | {
     table: string;
     on: {
         [k: string]: string;
     }[];
-}[];
+})[];
 type FilterMatch<T, U> = T extends U ? T : undefined;
 export declare const extractTypeUtil: <T extends AnyObject, U extends Partial<T>>(obj: T, objSubType: U) => FilterMatch<T, U>;
 export declare const safeStringify: (obj: AnyObject) => string;

package/dist/util.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../lib/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAwB,MAAM,GAAG,CAAC;AAG9D,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,UAKjC;AAED,eAAO,MAAM,QAAQ,GAAI,CAAC,SAAS,SAAS,EAAE,OAAO,SAAS,MAAM,CAAC,EACnE,KAAK,CAAC,EACN,OAAM,OAAO,EAAE,GAAG,SAAS,OAAO,EAAO,EACzC,uBAAoB,KACnB,IAAI,CAAC,CAAC,EAAE,OAAO,CAgBjB,CAAC;AAEF,wBAAgB,QAAQ,CAAC,CAAC,SAAS,SAAS,EAAE,OAAO,SAAS,MAAM,CAAC,EACnE,GAAG,EAAE,CAAC,EACN,OAAO,EAAE,OAAO,EAAE,GACjB,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,CAOlB;AAED,wBAAgB,MAAM,CAAC,CAAC,SAAS,SAAS,EAAE,SAAS,SAAS,OAAO,CAAC,CAAC,CAAC,EACtE,KAAK,EAAE,CAAC,EAAE,EACV,SAAS,EAAE,SAAS,GACnB,CAAC,EAAE,~~CAEL~~;AACD,wBAAgB,IAAI,CAAC,CAAC,SAAS,SAAS,EAAE,SAAS,SAAS,OAAO,CAAC,CAAC,CAAC,EACpE,KAAK,EAAE,CAAC,EAAE,EACV,SAAS,EAAE,SAAS,GACnB,CAAC,GAAG,SAAS,CAEf;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,SAAS,EACf,IAAI,GAAE,QAAQ,GAAG;IAAE,GAAG,CAAC,EAAE,QAAQ,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GACzD,MAAM,CA0DR;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,wBAAgB,YAAY,~~CAAC~~,MAAM,EAAE,MAAM,~~EAAE~~,MAAM,EAAE,MAAM,~~GAAG~~,SAAS,GAAG,MAAM,~~CAsC/E~~;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,~~CAU7E~~;AAED,wBAAgB,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,OAAO,CAG1C;AAED,eAAO,MAAM,UAAU,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC1D,MAAM,CAAC,GAAG,IAAI,GAAG,SAAS,KACzB,GAAG,IAAI,CAAkB,CAAC;AAG7B,wBAAgB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,GAAG,CAalE;AAED,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC5D,KAAK,CAAC,KACL,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAEvB,CAAC;AAEF,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,SAAS,GAAG,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAEzE;AACD,wBAAgB,SAAS,CAAC,CAAC,~~EAAE~~,CAAC,EAAE,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI,~~GAAG~~,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,~~CAEhF~~;AAED,wBAAgB,OAAO,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,~~EAAE~~,CAAC,EAAE,CAAC,~~GAAG~~,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,EAAE,~~CAEjF~~;AAED,MAAM,MAAM,OAAO,CAAC,CAAC,IACnB,MAAM,CAAC,SAAS,MAAM,CAAC,GACrB,CAAC,SAAS,OAAO,GACf;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK;CAAE,GAC9C,KAAK,GACP,KAAK,CAAC;AACV,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/C,MAAM,MAAM,UAAU,CAAC,CAAC,EAAE,CAAC,GAAG;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;CAAE,IAAI,OAAO,CAAC,CAAC,CAAC,~~GAAG~~,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;~~AACxF~~,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;AAEzD,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,GAAG,KAAK,CAAC;AAClD,KAAK,iBAAiB,CAAC,CAAC,EAAE,IAAI,IAC5B,CAAC,SAAS,GAAG,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,~~GAAG~~,KAAK,CAAC;~~AACxF~~,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAErD,MAAM,MAAM,aAAa,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,~~GAAG~~,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;~~AACnF~~,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,GAAG,EAAE,CAAC;AAExD;;;GAGG;AACH,eAAO,MAAM,QAAQ,GAAU,CAAC,SAAS,SAAS,EAChD,MAAM,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,KACzB,OAAO,CACN,CAAC,CAAC,GAAG;IAAE,QAAQ,CAAC,EAAE,KAAK,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,GAC/D,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,CAAC,GAAG;~~IAAE~~,QAAQ,EAAE,IAAI,CAAC;~~IAAC~~,KAAK,EAAE,OAAO,CAAC;~~IAAC~~,QAAQ,EAAE,MAAM,~~CAAA~~;~~CAAE~~,CAAC,~~CAgB/F~~,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;~~AAChD~~,eAAO,MAAM,aAAa,GAAI,IAAI,~~cAAc~~,CAAC,~~IAAI~~,CAAC;;~~GAIrD~~,CAAC;AAEF~~;;;;;GAKG~~;~~AACH~~,eAAO,MAAM,iBAAiB,~~GAAI~~,YAAY,cAAc,EAAE,~~EAAE~~,OAAO,MAAM~~;;;;;GAa5E~~,CAAC;AAEF,KAAK,WAAW,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;AAErD,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,SAAS,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,EACvE,KAAK,CAAC,EACN,YAAY,CAAC,KACZ,WAAW,CAAC,CAAC,EAAE,CAAC,CAKlB,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,KAAK,SAAS,WAW3C,CAAC;AACF,eAAO,MAAM,oBAAoB,GAC/B,UAAU,GAAG,EACb,sBAAoB,KACnB,SAAS,GAAG,GAAG,EAAE,GAAG,MAAM,GAAG,SAAS,GAAG,IA0C3C,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAC5D,KAAK,CAAC,EACN,KAAK,CAAC,GAAG,MAAM,KACd,CAAC,SAAS,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GACzB,CAAC,SAAS,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,GACzC,~~SAGD~~,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,CAAC,EAAE,SAAS,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,MAAM,KAAG,OAAO,CAAC,CAAC,CAKzE,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAI,CAAC,EACxC,UAAU,~~CAAC~~,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,~~EAAE~~,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,IAAI,~~KAAK~~,IAAI,~~EAChG~~,IAAI,MAAM,KACT,OAAO,CAAC,CAAC,CAMX,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,CAAC,SAAS,SAAS,EAAE,KAAK,CAAC,KAC7B,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;AAEjD,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC,EAC/D,SAAS,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KACpC,MAAM,CAAC,CAAC,EAAE,CAAC,CAEb,CAAC"}
1	+ {"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../lib/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAwB,MAAM,GAAG,CAAC;AAG9D,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,UAKjC;AAED,eAAO,MAAM,QAAQ,GAAI,CAAC,SAAS,SAAS,EAAE,OAAO,SAAS,MAAM,CAAC,EACnE,KAAK,CAAC,EACN,OAAM,OAAO,EAAE,GAAG,SAAS,OAAO,EAAO,EACzC,uBAAoB,KACnB,IAAI,CAAC,CAAC,EAAE,OAAO,CAgBjB,CAAC;AAEF,wBAAgB,QAAQ,CAAC,CAAC,SAAS,SAAS,EAAE,OAAO,SAAS,MAAM,CAAC,EACnE,GAAG,EAAE,CAAC,EACN,OAAO,EAAE,OAAO,EAAE,GACjB,IAAI,CAAC,CAAC,EAAE,OAAO,CAAC,CAOlB;AAED,wBAAgB,MAAM,CAAC,CAAC,SAAS,SAAS,EAAE,SAAS,SAAS,OAAO,CAAC,CAAC,CAAC,EACtE,KAAK,EAAE,CAAC,EAAE,EACV,SAAS,EAAE,SAAS,GACnB,CAAC,EAAE,CAIL;AACD,wBAAgB,IAAI,CAAC,CAAC,SAAS,SAAS,EAAE,SAAS,SAAS,OAAO,CAAC,CAAC,CAAC,EACpE,KAAK,EAAE,CAAC,EAAE,EACV,SAAS,EAAE,SAAS,GACnB,CAAC,GAAG,SAAS,CAEf;AAED,wBAAgB,eAAe,CAC7B,IAAI,EAAE,SAAS,EACf,IAAI,GAAE,QAAQ,GAAG;IAAE,GAAG,CAAC,EAAE,QAAQ,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GACzD,MAAM,CA0DR;AAED,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,wBAAgB,YAAY,CAC1B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACb,SAAS,GAAG,MAAM,CAuCpB;AAED,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,SAAS,GAAG,MAAM,CAa7E;AAED,wBAAgB,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,OAAO,CAG1C;AAED,eAAO,MAAM,UAAU,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC1D,MAAM,CAAC,GAAG,IAAI,GAAG,SAAS,KACzB,GAAG,IAAI,CAAkB,CAAC;AAG7B,wBAAgB,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,GAAG,CAalE;AAED,eAAO,MAAM,gBAAgB,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC5D,KAAK,CAAC,KACL,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAEvB,CAAC;AAEF,wBAAgB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,SAAS,GAAG,GAAG,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAEzE;AACD,wBAAgB,SAAS,CAAC,CAAC,EACzB,CAAC,EAAE,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,IAAI,GAC7B,CAAC,IAAI,WAAW,CAAC,CAAC,CAAC,CAErB;AAED,wBAAgB,OAAO,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACnD,CAAC,EAAE,CAAC,GACH,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,EAAE,CAEtB;AAED,MAAM,MAAM,OAAO,CAAC,CAAC,IACnB,MAAM,CAAC,SAAS,MAAM,CAAC,GACrB,CAAC,SAAS,OAAO,GACf;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK;CAAE,GAC9C,KAAK,GACP,KAAK,CAAC;AACV,MAAM,MAAM,SAAS,CAAC,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/C,MAAM,MAAM,UAAU,CAAC,CAAC,EAAE,CAAC,GAAG;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;CAAE,IAAI,OAAO,CAAC,CAAC,CAAC,GACxE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;AACb,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;AAEzD,KAAK,SAAS,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC,GAAG,KAAK,CAAC;AAClD,KAAK,iBAAiB,CAAC,CAAC,EAAE,IAAI,IAC5B,CAAC,SAAS,GAAG,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,GAC3E,KAAK,CAAC;AACV,MAAM,MAAM,WAAW,CAAC,CAAC,IAAI,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAErD,MAAM,MAAM,aAAa,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,GAC1D,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACtB,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI;KAAG,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAE,GAAG,EAAE,CAAC;AAExD;;;GAGG;AACH,eAAO,MAAM,QAAQ,GAAU,CAAC,SAAS,SAAS,EAChD,MAAM,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,KACzB,OAAO,CACN,CAAC,CAAC,GAAG;IAAE,QAAQ,CAAC,EAAE,KAAK,CAAC;IAAC,KAAK,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC,GAC/D,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,CAAC,GAAG;IACrC,QAAQ,EAAE,IAAI,CAAC;IACf,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC,CAgBL,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG;IAAE,EAAE,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAA;CAAE,CAAC;AAC5E,eAAO,MAAM,aAAa,GAAI,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE;;GAMzD,CAAC;AAEF,8EAA8E;AAC9E,eAAO,MAAM,iBAAiB,GAC5B,YAAY,cAAc,EAAE,EAC5B,OAAO,MAAM;;;;;;;;;;IAmBd,CAAC;AAEF,KAAK,WAAW,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;AAErD,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,SAAS,EAAE,CAAC,SAAS,OAAO,CAAC,CAAC,CAAC,EACvE,KAAK,CAAC,EACN,YAAY,CAAC,KACZ,WAAW,CAAC,CAAC,EAAE,CAAC,CAKlB,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,KAAK,SAAS,WAW3C,CAAC;AACF,eAAO,MAAM,oBAAoB,GAC/B,UAAU,GAAG,EACb,sBAAoB,KACnB,SAAS,GAAG,GAAG,EAAE,GAAG,MAAM,GAAG,SAAS,GAAG,IA0C3C,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,EAC5D,KAAK,CAAC,EACN,KAAK,CAAC,GAAG,MAAM,KACd,CAAC,SAAS,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GACzB,CAAC,SAAS,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,SAAS,GACzC,SAID,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,CAAC,EAAE,SAAS,OAAO,CAAC,CAAC,CAAC,EAAE,IAAI,MAAM,KAAG,OAAO,CAAC,CAAC,CAKzE,CAAC;AAEF,eAAO,MAAM,wBAAwB,GAAI,CAAC,EACxC,UAAU,CACR,OAAO,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,IAAI,EAC5C,MAAM,EAAE,CAAC,MAAM,CAAC,EAAE,GAAG,KAAK,IAAI,KAC3B,IAAI,EACT,IAAI,MAAM,KACT,OAAO,CAAC,CAAC,CAMX,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,CAAC,SAAS,SAAS,EAAE,KAAK,CAAC,KAC7B,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;AAEjD,eAAO,MAAM,WAAW,GAAI,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,EAAE,CAAC,EAC/D,SAAS,SAAS,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KACpC,MAAM,CAAC,CAAC,EAAE,CAAC,CAEb,CAAC"}

package/dist/util.js CHANGED Viewed

@@ -149,7 +149,10 @@ function unpatchText(original, patch) {
         return text;
     let res = original.slice(0, from) + text + original.slice(to);
     if (md5Hash && (0, md5_1.md5)(res) !== md5Hash)
-        throw ("Patch text error: Could not match md5 hash: (original/result) \n" + original + "\n" + res);
+        throw ("Patch text error: Could not match md5 hash: (original/result) \n" +
+            original +
+            "\n" +
+            res);
     return res;
 }
 function isEmpty(obj) {
@@ -214,25 +217,24 @@ const reverseJoinOn = (on) => {
     return on.map((constraint) => Object.fromEntries(Object.entries(constraint).map(([left, right]) => [right, left])));
 };
 exports.reverseJoinOn = reverseJoinOn;
-/**
- * result = [
- *  { table, on: parsedPath[0] }
- *  ...parsedPath.map(p => ({ table: p.table, on: reversedOn(parsedPath[i+1].on) }))
- * ]
- */
+/** Reverse each join toward its source table, then reverse the path order. */
 const reverseParsedPath = (parsedPath, table) => {
-    const newPPath = [{ table, on: [{}] }, ...(parsedPath ?? [])];
-    return newPPath
-        .map((pp, i) => {
-        const nextPath = newPPath[i + 1];
-        if (!nextPath)
-            return undefined;
+    return (parsedPath ?? [])
+        .map(({ table: targetTable, on, params, reversed }, index) => {
+        const sourceTable = parsedPath[index - 1]?.table ?? table;
+        if (typeof on === "string") {
+            return {
+                table: sourceTable,
+                on,
+                ...(params && { params }),
+                ...(targetTable === sourceTable && { reversed: !reversed }),
+            };
+        }
         return {
-            table: pp.table,
-            on: (0, exports.reverseJoinOn)(nextPath.on),
+            table: sourceTable,
+            on: (0, exports.reverseJoinOn)(on),
         };
     })
-        .filter(isDefined)
         .reverse();
 };
 exports.reverseParsedPath = reverseParsedPath;

package/dist/util.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"util.js","sourceRoot":"","sources":["../lib/util.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"util.js","sourceRoot":"","sources":["../lib/util.ts"],"names":[],"mappings":"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"}

package/lib/filters.ts CHANGED Viewed

@@ -1,4 +1,9 @@
-import { DBSchema, RawJoinPath, type AllowedTSType, type CastFromTSToPG } from ".";
+import {
+  DBSchema,
+  RawJoinPath,
+  type AllowedTSType,
+  type CastFromTSToPG,
+} from ".";
 import { ExactlyOne, getKeys } from "./util";
 export const CompareFilterKeys = [
@@ -38,7 +43,8 @@ export const JsonbOperands = {
   "?": {
     Operator: "?",
     "Right Operand Type": "text",
-    Description: "Does the string exist as a top-level key within the JSON value?",
+    Description:
+      "Does the string exist as a top-level key within the JSON value?",
     Example: "'{\"a\":1, \"b\":2}'::jsonb ? 'b'",
   },
   "?|": {
@@ -92,7 +98,13 @@ export const JsonbFilterKeys = getKeys(JsonbOperands);
 export const TextFilterKeys = ["$ilike", "$like", "$nilike", "$nlike"] as const;
-export const TextFilterFTSKeys = ["@@", "@>", "<@", "$contains", "$containedBy"] as const;
+export const TextFilterFTSKeys = [
+  "@@",
+  "@>",
+  "<@",
+  "$contains",
+  "$containedBy",
+] as const;
 export const TextFilter_FullTextSearchFilterKeys = [
   "to_tsquery",
@@ -186,7 +198,12 @@ export const GeomFilter_Funcs = [
 export type AnyObject = Record<string, any>;
-export const EXISTS_KEYS = ["$exists", "$notExists", "$existsJoined", "$notExistsJoined"] as const;
+export const EXISTS_KEYS = [
+  "$exists",
+  "$notExists",
+  "$existsJoined",
+  "$notExistsJoined",
+] as const;
 export type EXISTS_KEY = (typeof EXISTS_KEYS)[number];
 export const ComplexFilterComparisonKeys = [
@@ -211,7 +228,11 @@ export const COMPLEX_FILTER_KEY = "$filter" as const;
  */
 export type ComplexFilter = Record<
   typeof COMPLEX_FILTER_KEY,
-  [{ [funcName: string]: any[] }, (typeof ComplexFilterComparisonKeys)[number]?, any?]
+  [
+    { [funcName: string]: any[] },
+    (typeof ComplexFilterComparisonKeys)[number]?,
+    any?,
+  ]
 >;
 export type KeyofString<T> = keyof T & string;
@@ -221,24 +242,41 @@ export type KeyofString<T> = keyof T & string;
  */
 type BasicFilter<Field extends string, DataType extends any> =
   | Partial<{
-      [K in Extract<
-        (typeof CompareFilterKeys)[number],
-        string
-      > as `${Field}.${K}`]: CastFromTSToPG<DataType>;
+      [
+        K in Extract<
+          (typeof CompareFilterKeys)[number],
+          string
+        > as `${Field}.${K}`
+      ]: CastFromTSToPG<DataType>;
     }>
   | Partial<{
-      [K in Extract<
-        (typeof CompareInFilterKeys)[number],
-        string
-      > as `${Field}.${K}`]: CastFromTSToPG<DataType>[];
+      [
+        K in Extract<
+          (typeof CompareInFilterKeys)[number],
+          string
+        > as `${Field}.${K}`
+      ]: CastFromTSToPG<DataType>[];
     }>;
-type StringFilter<Field extends string, DataType extends any> = BasicFilter<Field, DataType> &
+type StringFilter<Field extends string, DataType extends any> = BasicFilter<
+  Field,
+  DataType
+> &
   (
     | Partial<{
-        [K in Extract<(typeof TextFilterKeys)[number], string> as `${Field}.${K}`]: DataType;
+        [
+          K in Extract<
+            (typeof TextFilterKeys)[number],
+            string
+          > as `${Field}.${K}`
+        ]: DataType;
       }>
     | Partial<{
-        [K in Extract<(typeof TextFilterFTSKeys)[number], string> as `${Field}.${K}`]: any;
+        [
+          K in Extract<
+            (typeof TextFilterFTSKeys)[number],
+            string
+          > as `${Field}.${K}`
+        ]: any;
       }>
   );
 export type ValueOf<T> = T[keyof T];
@@ -269,11 +307,15 @@ export type CompareFilter<T extends AllowedTSType> =
 export type TextFilter =
   | ExactlyOne<Record<(typeof TextFilterKeys)[number], string>>
-  | ExactlyOne<Record<(typeof TextFilterFTSKeys)[number], FullTextSearchFilter>>;
+  | ExactlyOne<
+      Record<(typeof TextFilterFTSKeys)[number], FullTextSearchFilter>
+    >;
 type Primitive = string | number | boolean | Date | null;
-export type JSONBFilter<T extends Record<string, unknown> | readonly Record<string, unknown>[]> =
+export type JSONBFilter<
+  T extends Record<string, unknown> | readonly Record<string, unknown>[],
+> =
   | {
       /**
        * Does the left JSON value contain the right JSON path/value entries at the top level?
@@ -302,7 +344,8 @@ export type FilterDataType<T extends AllowedTSType> =
   : T extends boolean ? CompareFilter<CastFromTSToPG<T>>
   : T extends Date ? CompareFilter<CastFromTSToPG<T>>
   : T extends Primitive[] ? ArrayFilter<T>
-  : T extends Record<string, unknown> | Record<string, unknown>[] ? JSONBFilter<T>
+  : T extends Record<string, unknown> | Record<string, unknown>[] ?
+    JSONBFilter<T>
   : CompareFilter<T> | TextFilter | GeomFilter;
 /**
@@ -319,14 +362,15 @@ export type FilterForObject<T extends AnyObject = AnyObject> = NormalFilter<T>;
 export type ExistsFilter<S = void> = Partial<{
   [key in EXISTS_KEY]: S extends DBSchema ?
-    ExactlyOne<{
-      [tname in KeyofString<S>]:
-        | FullFilter<S[tname]["columns"], S>
-        | {
-            path: RawJoinPath[];
-            filter: FullFilter<S[tname]["columns"], S>;
-          };
-    }>
+    | ExactlyOne<{
+        [TableName in KeyofString<S>]: FullFilter<S[TableName]["columns"], S>;
+      }>
+    | (key extends "$existsJoined" | "$notExistsJoined" ?
+        {
+          path: Exclude<RawJoinPath, string>;
+          filter: FullFilter<AnyObject, S>;
+        }
+      : never)
   : any;
   /** ExactlyOne does not for any type. This produces error */
   // ExactlyOne<{
@@ -339,7 +383,8 @@ export type ExistsFilter<S = void> = Partial<{
  */
 export type FilterItem<T extends AnyObject = AnyObject> = FilterForObject<T>;
-export type AnyObjIfVoid<T extends AnyObject | void> = T extends AnyObject ? T : AnyObject;
+export type AnyObjIfVoid<T extends AnyObject | void> =
+  T extends AnyObject ? T : AnyObject;
 /**
  * Data filter

package/lib/index.ts CHANGED Viewed

@@ -563,9 +563,30 @@ export type JoinPath = {
    * {
    *    leftColumn: "rightColumn"
    * }
+   * A string selects a named, server-defined computed join.
    */
-  on?: Record<string, string>[];
+  on?: Record<string, string>[] | string;
+  /** Parameters validated against the server-defined computed join schema. */
+  params?: Record<string, unknown>;
+  /** Reverse a computed self-join; omitted for the declared direction. */
+  reversed?: boolean;
 };
+/** Published direct relationships. SQL implementations remain on the server. */
+export type ClientJoin = {
+  tables: [string, string];
+} & (
+  | {
+      on: Record<string, string>[];
+      supportsMultiHop: boolean;
+      paramsSchema?: never;
+    }
+  | {
+      on: string;
+      supportsMultiHop: boolean;
+      paramsSchema?: JSONB.ObjectType["type"];
+    }
+);
 /**
  * Can be either the target table name, or the sequence of tables to join through with the target table at the end.
  */
@@ -1641,6 +1662,7 @@ export type TableSchemaErrors = {
 export type ClientSchema = {
   rawSQL: boolean;
   joinTables: string[][];
+  joins: ClientJoin[];
   auth: AuthTypes.AuthSocketSchema | undefined;
   version: any;
   err?: string;

package/lib/joinHelpers.ts CHANGED Viewed

@@ -1,8 +1,24 @@
-import type { AnyObject, DetailedJoinSelect, JoinMaker } from "./index";
+import type { AnyObject, DetailedJoinSelect, JoinMaker, JSONB } 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;
+export const defineJoin = <const J extends DetailedJoinSelect>(join: J): J =>
+  join;
+/** Schema for an explicit, persisted join path step. */
+export const parsedJoinPathSchema = {
+  type: {
+    table: "string",
+    on: {
+      oneOf: [
+        { type: "string" },
+        { arrayOf: { record: { values: "string" } } },
+      ],
+    },
+    params: { record: { values: "unknown" }, optional: true },
+    reversed: { type: "boolean", optional: true },
+  },
+} as const satisfies JSONB.JSONBSchema;
 const getJoinFunc = (joinType: "$leftJoin" | "$innerJoin" = "$leftJoin") => {
   const joinMaker: JoinMaker = (

package/lib/util.ts CHANGED Viewed

@@ -46,7 +46,9 @@ export function filter<T extends AnyObject, ArrFilter extends Partial<T>>(
   array: T[],
   arrFilter: ArrFilter,
 ): T[] {
-  return array.filter((d) => Object.entries(arrFilter).every(([k, v]) => d[k] === v));
+  return array.filter((d) =>
+    Object.entries(arrFilter).every(([k, v]) => d[k] === v),
+  );
 }
 export function find<T extends AnyObject, ArrFilter extends Partial<T>>(
   array: T[],
@@ -125,9 +127,13 @@ export type TextPatch = {
   md5: string;
 };
-export function getTextPatch(oldStr: string, newStr: string): TextPatch | string {
+export function getTextPatch(
+  oldStr: string,
+  newStr: string,
+): TextPatch | string {
   /* Big change, no point getting diff */
-  if (!oldStr || !newStr || !oldStr.trim().length || !newStr.trim().length) return newStr;
+  if (!oldStr || !newStr || !oldStr.trim().length || !newStr.trim().length)
+    return newStr;
   /* Return no change if matching */
   if (oldStr === newStr)
@@ -172,7 +178,10 @@ export function unpatchText(original: string | null, patch: TextPatch): string {
   let res = original.slice(0, from) + text + original.slice(to);
   if (md5Hash && md5(res) !== md5Hash)
     throw (
-      "Patch text error: Could not match md5 hash: (original/result) \n" + original + "\n" + res
+      "Patch text error: Could not match md5 hash: (original/result) \n" +
+      original +
+      "\n" +
+      res
     );
   return res;
 }
@@ -211,11 +220,15 @@ export const getObjectEntries = <T extends Record<string, any>>(
 export function isObject(obj: any | undefined): obj is Record<string, any> {
   return Boolean(obj && typeof obj === "object" && !Array.isArray(obj));
 }
-export function isDefined<T>(v: T | undefined | void | null): v is NonNullable<T> {
+export function isDefined<T>(
+  v: T | undefined | void | null,
+): v is NonNullable<T> {
   return v !== undefined && v !== null;
 }
-export function getKeys<T extends Record<string, any>>(o: T): (keyof T & string)[] {
+export function getKeys<T extends Record<string, any>>(
+  o: T,
+): (keyof T & string)[] {
   return Object.keys(o) as unknown as (keyof T & string)[];
 }
@@ -226,15 +239,18 @@ export type Explode<T> =
     : never
   : never;
 export type AtMostOne<T> = Explode<Partial<T>>;
-export type AtLeastOne<T, U = { [K in keyof T]: Pick<T, K> }> = Partial<T> & U[keyof U];
+export type AtLeastOne<T, U = { [K in keyof T]: Pick<T, K> }> = Partial<T> &
+  U[keyof U];
 export type ExactlyOne<T> = AtMostOne<T> & AtLeastOne<T>;
 type UnionKeys<T> = T extends T ? keyof T : never;
 type StrictUnionHelper<T, TAll> =
-  T extends any ? T & Partial<Record<Exclude<UnionKeys<TAll>, keyof T>, never>> : never;
+  T extends any ? T & Partial<Record<Exclude<UnionKeys<TAll>, keyof T>, never>>
+  : never;
 export type StrictUnion<T> = StrictUnionHelper<T, T>;
-export type PartialByKeys<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
+export type PartialByKeys<T, K extends keyof T> = Omit<T, K> &
+  Partial<Pick<T, K>>;
 export type Simplify<T> = { [K in keyof T]: T[K] } & {};
 /**
@@ -245,7 +261,11 @@ export const tryCatch = async <T extends AnyObject>(
   func: () => T | Promise<T>,
 ): Promise<
   | (T & { hasError?: false; error?: undefined; duration: number })
-  | (Partial<Record<keyof T, undefined>> & { hasError: true; error: unknown; duration: number })
+  | (Partial<Record<keyof T, undefined>> & {
+      hasError: true;
+      error: unknown;
+      duration: number;
+    })
 > => {
   const startTime = Date.now();
   try {
@@ -263,31 +283,36 @@ export const tryCatch = async <T extends AnyObject>(
   }
 };
-export type ParsedJoinPath = Required<JoinPath>;
-export const reverseJoinOn = (on: ParsedJoinPath["on"]) => {
+export type ParsedJoinPath = JoinPath & { on: NonNullable<JoinPath["on"]> };
+export const reverseJoinOn = (on: Record<string, string>[]) => {
   return on.map((constraint) =>
-    Object.fromEntries(Object.entries(constraint).map(([left, right]) => [right, left])),
+    Object.fromEntries(
+      Object.entries(constraint).map(([left, right]) => [right, left]),
+    ),
   );
 };
-/**
- * result = [
- *  { table, on: parsedPath[0] }
- *  ...parsedPath.map(p => ({ table: p.table, on: reversedOn(parsedPath[i+1].on) }))
- * ]
- */
-export const reverseParsedPath = (parsedPath: ParsedJoinPath[], table: string) => {
-  const newPPath: ParsedJoinPath[] = [{ table, on: [{}] }, ...(parsedPath ?? [])];
-  return newPPath
-    .map((pp, i) => {
-      const nextPath = newPPath[i + 1];
-      if (!nextPath) return undefined;
+/** Reverse each join toward its source table, then reverse the path order. */
+export const reverseParsedPath = (
+  parsedPath: ParsedJoinPath[],
+  table: string,
+) => {
+  return (parsedPath ?? [])
+    .map(({ table: targetTable, on, params, reversed }, index) => {
+      const sourceTable = parsedPath[index - 1]?.table ?? table;
+      if (typeof on === "string") {
+        return {
+          table: sourceTable,
+          on,
+          ...(params && { params }),
+          ...(targetTable === sourceTable && { reversed: !reversed }),
+        };
+      }
       return {
-        table: pp.table,
-        on: reverseJoinOn(nextPath.on),
+        table: sourceTable,
+        on: reverseJoinOn(on),
       };
     })
-    .filter(isDefined)
     .reverse();
 };
@@ -368,7 +393,8 @@ export const getProperty = <T extends object, K extends string>(
 ): K extends keyof T ? T[K]
 : K extends string ? T[keyof T] | undefined
 : undefined => {
-  if (!Object.keys(obj).includes(key)) return undefined as K extends keyof T ? T[K] : undefined;
+  if (!Object.keys(obj).includes(key))
+    return undefined as K extends keyof T ? T[K] : undefined;
   return obj[key as keyof T] as K extends keyof T ? T[K] : undefined;
 };
@@ -380,7 +406,10 @@ export const withTimeout = <T>(promise: Promise<T>, ms: number): Promise<T> => {
 };
 export const createPromiseWithTimeout = <T>(
-  executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void,
+  executor: (
+    resolve: (value: T | PromiseLike<T>) => void,
+    reject: (reason?: any) => void,
+  ) => void,
   ms: number,
 ): Promise<T> => {
   const timeout = new Promise<never>((_, reject) =>