npm - prostgles-server - Versions diffs - 4.2.624 → 4.2.626 - Mend

prostgles-server 4.2.624 → 4.2.626

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 (223) hide show

package/dist/DboBuilder/TableHandler/updateFile.d.ts CHANGED Viewed

@@ -1,51 +1,14 @@
 import { type LocalParams } from "../DboBuilder";
 import type { AnyObject } from "prostgles-types";
 import type { FileTableConfig } from "../../ProstglesTypes";
+import type { FileTableRow } from "../../StorageClient/getFileTableConfig";
 import type { TableHandler } from "./TableHandler";
 import { type UploadFileArgs } from "./uploadFile";
 type Args = Pick<UploadFileArgs, "localParams" | "data" | "original_name" | "original_last_modified" | "onCommit" | "onRollback"> & {
     filter: AnyObject;
 };
 export declare const updateFile: (tableHandler: TableHandler, config: FileTableConfig, { filter, data, original_name, original_last_modified, localParams, onCommit, onRollback }: Args) => Promise<{
-    newData: Omit<Omit<import("../../TableConfig/TableRowFromColumnDefinitions").TableRowFromColumnDefinitions<{
-        readonly id: "UUID PRIMARY KEY DEFAULT gen_random_uuid()";
-        readonly storage_key: "UUID UNIQUE";
-        readonly extension: "TEXT NOT NULL DEFAULT ''";
-        readonly content_type: "TEXT NOT NULL DEFAULT ''";
-        readonly content_length: "BIGINT NOT NULL DEFAULT 0";
-        readonly etag: "TEXT NOT NULL DEFAULT ''";
-        readonly original_name: "TEXT NOT NULL";
-        readonly original_last_modified: "TIMESTAMPTZ";
-        readonly description: "TEXT";
-        readonly url: "TEXT NOT NULL DEFAULT ''";
-        readonly cloud_url: "TEXT";
-        readonly signed_url: "TEXT";
-        readonly signed_url_expires: "BIGINT";
-        readonly added: "TIMESTAMP NOT NULL DEFAULT NOW()";
-        readonly updated: "TIMESTAMP NOT NULL DEFAULT NOW()";
-        readonly deleted: "TIMESTAMPTZ";
-        readonly deleted_from_storage: "TIMESTAMPTZ";
-        readonly data: "BYTEA NOT NULL CHECK (data = decode('01', 'hex'))";
-    }>, "added"> & Partial<Pick<import("../../TableConfig/TableRowFromColumnDefinitions").TableRowFromColumnDefinitions<{
-        readonly id: "UUID PRIMARY KEY DEFAULT gen_random_uuid()";
-        readonly storage_key: "UUID UNIQUE";
-        readonly extension: "TEXT NOT NULL DEFAULT ''";
-        readonly content_type: "TEXT NOT NULL DEFAULT ''";
-        readonly content_length: "BIGINT NOT NULL DEFAULT 0";
-        readonly etag: "TEXT NOT NULL DEFAULT ''";
-        readonly original_name: "TEXT NOT NULL";
-        readonly original_last_modified: "TIMESTAMPTZ";
-        readonly description: "TEXT";
-        readonly url: "TEXT NOT NULL DEFAULT ''";
-        readonly cloud_url: "TEXT";
-        readonly signed_url: "TEXT";
-        readonly signed_url_expires: "BIGINT";
-        readonly added: "TIMESTAMP NOT NULL DEFAULT NOW()";
-        readonly updated: "TIMESTAMP NOT NULL DEFAULT NOW()";
-        readonly deleted: "TIMESTAMPTZ";
-        readonly deleted_from_storage: "TIMESTAMPTZ";
-        readonly data: "BYTEA NOT NULL CHECK (data = decode('01', 'hex'))";
-    }>, "added">>, "id">;
+    newData: Omit<Omit<FileTableRow, "added"> & Partial<Pick<FileTableRow, "added">>, "id">;
 }>;
 export declare const lockFileForUpdate: (tableHandler: TableHandler, filter: AnyObject, where: string, localParams: LocalParams | undefined) => Promise<boolean>;
 export {};

package/dist/DboBuilder/TableHandler/updateFile.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"updateFile.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/updateFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;~~AAE5D~~,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AAI/D,KAAK,IAAI,GAAG,IAAI,CACd,cAAc,EACd,aAAa,GAAG,MAAM,GAAG,eAAe,GAAG,wBAAwB,GAAG,UAAU,GAAG,YAAY,CAChG,GAAG;IACF,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC;AACF,eAAO,MAAM,UAAU,GACrB,cAAc,YAAY,EAC1B,QAAQ,eAAe,EACvB,4FAA4F,IAAI~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAmBjG~~,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,cAAc,YAAY,EAC1B,QAAQ,SAAS,EACjB,OAAO,MAAM,EACb,aAAa,WAAW,GAAG,SAAS,qBAUrC,CAAC"}
1	+ {"version":3,"file":"updateFile.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/updateFile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAc,KAAK,cAAc,EAAE,MAAM,cAAc,CAAC;AAI/D,KAAK,IAAI,GAAG,IAAI,CACd,cAAc,EACd,aAAa,GAAG,MAAM,GAAG,eAAe,GAAG,wBAAwB,GAAG,UAAU,GAAG,YAAY,CAChG,GAAG;IACF,MAAM,EAAE,SAAS,CAAC;CACnB,CAAC;AACF,eAAO,MAAM,UAAU,GACrB,cAAc,YAAY,EAC1B,QAAQ,eAAe,EACvB,4FAA4F,IAAI;;EAoBjG,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,cAAc,YAAY,EAC1B,QAAQ,SAAS,EACjB,OAAO,MAAM,EACb,aAAa,WAAW,GAAG,SAAS,qBAUrC,CAAC"}

package/dist/DboBuilder/TableHandler/updateFile.js CHANGED Viewed

@@ -19,6 +19,7 @@ const updateFile = async (tableHandler, config, { filter, data, original_name, o
         data,
         localParams,
         mediaId: existingFile.id,
+        version: Number(existingFile.version ?? 1) + 1,
         original_last_modified,
     });
     return { newData: (0, prostgles_types_1.omitKeys)(newFile, ["id"]) };

package/dist/DboBuilder/TableHandler/updateFile.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"updateFile.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/updateFile.ts"],"names":[],"mappings":";;;AAAA,8CAA8D;AAE9D,qDAAgF;AAIhF,6CAA+D;AAC/D,uFAAoF;AACpF,6EAA0E;AAQnE,MAAM,UAAU,GAAG,KAAK,EAC7B,YAA0B,EAC1B,MAAuB,EACvB,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,sBAAsB,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAQ,EAChG,EAAE;IACF,MAAM,YAAY,GAAG,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAA6B,CAAC;IAEtF,IAAI,CAAC,YAAY,EAAE,EAAE,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,QAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,IAAA,+CAAsB,EAAC,EAAE,EAAE,MAAM,EAAE,IAAA,qCAAiB,EAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAC1F,MAAM,OAAO,GAAG,MAAM,IAAA,uBAAU,EAAC,MAAM,EAAE;QACvC,QAAQ;QACR,UAAU;QACV,aAAa;QACb,IAAI;QACJ,WAAW;QACX,OAAO,EAAE,YAAY,CAAC,EAAE;QACxB,sBAAsB;KACvB,CAAC,CAAC;IACH,OAAO,EAAE,OAAO,EAAE,IAAA,0BAAQ,EAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;AAChD,CAAC,CAAC;~~AAtBW~~,QAAA,UAAU,~~cAsBrB~~;AAEK,MAAM,iBAAiB,GAAG,KAAK,EACpC,YAA0B,EAC1B,MAAiB,EACjB,KAAa,EACb,WAAoC,EACpC,EAAE;IACF,eAAe,CAAC,MAAM,CAAC,CAAC;IACxB,MAAM,WAAW,GAAG,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IAC7D,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxE,oEAAoE;IACpE,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,CAAC,CAAC,SAAS,CACvC,IAAA,wBAAW,EAAC,WAAW,EAAE,iBAAiB,YAAY,CAAC,WAAW,IAAI,KAAK,aAAa,EAAE,IAAI,CAAC,CAChG,CAAC;IACF,OAAO,CAAC,CAAC,GAAG,CAAC;AACf,CAAC,CAAC;AAdW,QAAA,iBAAiB,qBAc5B;AAEF,MAAM,eAAe,GAAG,CAAC,MAAiB,EAAU,EAAE;IACpD,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,IAAA,qDAAmC,EAC/D,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAC1C,MAAM,EACN,QAAQ,EACR,SAAS,EACT,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAChC,CAAC;IACF,MAAM,eAAe,GAAG,WAAW,EAAE,EAAE,CAAC;IACxC,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CACb,+IAA+I,CAChJ,CAAC;IACJ,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC"}
1	+ {"version":3,"file":"updateFile.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/updateFile.ts"],"names":[],"mappings":";;;AAAA,8CAA8D;AAE9D,qDAAgF;AAIhF,6CAA+D;AAC/D,uFAAoF;AACpF,6EAA0E;AAQnE,MAAM,UAAU,GAAG,KAAK,EAC7B,YAA0B,EAC1B,MAAuB,EACvB,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,sBAAsB,EAAE,WAAW,EAAE,QAAQ,EAAE,UAAU,EAAQ,EAChG,EAAE;IACF,MAAM,YAAY,GAAG,CAAC,MAAM,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAA6B,CAAC;IAEtF,IAAI,CAAC,YAAY,EAAE,EAAE,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,QAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,IAAA,+CAAsB,EAAC,EAAE,EAAE,MAAM,EAAE,IAAA,qCAAiB,EAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAC1F,MAAM,OAAO,GAAG,MAAM,IAAA,uBAAU,EAAC,MAAM,EAAE;QACvC,QAAQ;QACR,UAAU;QACV,aAAa;QACb,IAAI;QACJ,WAAW;QACX,OAAO,EAAE,YAAY,CAAC,EAAE;QACxB,OAAO,EAAE,MAAM,CAAC,YAAY,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC;QAC9C,sBAAsB;KACvB,CAAC,CAAC;IACH,OAAO,EAAE,OAAO,EAAE,IAAA,0BAAQ,EAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;AAChD,CAAC,CAAC;AAvBW,QAAA,UAAU,cAuBrB;AAEK,MAAM,iBAAiB,GAAG,KAAK,EACpC,YAA0B,EAC1B,MAAiB,EACjB,KAAa,EACb,WAAoC,EACpC,EAAE;IACF,eAAe,CAAC,MAAM,CAAC,CAAC;IACxB,MAAM,WAAW,GAAG,YAAY,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;IAC7D,IAAI,CAAC,WAAW;QAAE,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAC;IACxE,oEAAoE;IACpE,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,CAAC,CAAC,SAAS,CACvC,IAAA,wBAAW,EAAC,WAAW,EAAE,iBAAiB,YAAY,CAAC,WAAW,IAAI,KAAK,aAAa,EAAE,IAAI,CAAC,CAChG,CAAC;IACF,OAAO,CAAC,CAAC,GAAG,CAAC;AACf,CAAC,CAAC;AAdW,QAAA,iBAAiB,qBAc5B;AAEF,MAAM,eAAe,GAAG,CAAC,MAAiB,EAAU,EAAE;IACpD,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,IAAA,qDAAmC,EAC/D,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAC1C,MAAM,EACN,QAAQ,EACR,SAAS,EACT,EAAE,oBAAoB,EAAE,KAAK,EAAE,CAChC,CAAC;IACF,MAAM,eAAe,GAAG,WAAW,EAAE,EAAE,CAAC;IACxC,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CACb,+IAA+I,CAChJ,CAAC;IACJ,CAAC;IAED,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC"}

package/dist/DboBuilder/TableHandler/uploadFile.d.ts CHANGED Viewed

@@ -26,7 +26,8 @@ export type UploadFileArgs = TransactionCallbacks & {
      * Used to update an existing file
      */
     mediaId: string | undefined;
+    version?: number;
 };
-export declare const uploadFile: (config: FileTableConfig, { data, original_name, original_last_modified, localParams, mediaId, onCommit, onRollback, }: UploadFileArgs) => Promise<Omit<FileTableRow, "added"> & Partial<Pick<FileTableRow, "added">>>;
+export declare const uploadFile: (config: FileTableConfig, { data, original_name, original_last_modified, localParams, mediaId, version, onCommit, onRollback, }: UploadFileArgs) => Promise<Omit<FileTableRow, "added"> & Partial<Pick<FileTableRow, "added">>>;
 export {};
 //# sourceMappingURL=uploadFile.d.ts.map

package/dist/DboBuilder/TableHandler/uploadFile.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/uploadFile.ts"],"names":[],"mappings":"AACA,OAAO,EAAuC,KAAK,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAClF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAI3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAEV,oBAAoB,EACrB,MAAM,0CAA0C,CAAC;AAElD,QAAA,MAAM,WAAW;;;;;;;;;;;CAKP,CAAC;AAEX,KAAK,qBAAqB,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,IAAI,KAAK,CAAC,aAAa,CAAC,OAAO,WAAW,CAAC,CAAC;AAElG,eAAO,MAAM,qBAAqB,EAAE,qBAanC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,oBAAoB,GAAG;IAClD,IAAI,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC;;OAEG;IACH,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;~~CAC7B~~,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,QAAQ,eAAe,EACvB,~~8FAQG~~,cAAc,KAChB,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,~~CAoE5E~~,CAAC"}
1	+ {"version":3,"file":"uploadFile.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/uploadFile.ts"],"names":[],"mappings":"AACA,OAAO,EAAuC,KAAK,KAAK,EAAE,MAAM,iBAAiB,CAAC;AAClF,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wCAAwC,CAAC;AAI3E,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAEV,oBAAoB,EACrB,MAAM,0CAA0C,CAAC;AAElD,QAAA,MAAM,WAAW;;;;;;;;;;;CAKP,CAAC;AAEX,KAAK,qBAAqB,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,IAAI,KAAK,CAAC,aAAa,CAAC,OAAO,WAAW,CAAC,CAAC;AAElG,eAAO,MAAM,qBAAqB,EAAE,qBAanC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,oBAAoB,GAAG;IAClD,IAAI,EAAE,MAAM,CAAC,eAAe,CAAC,CAAC;IAC9B,aAAa,EAAE,MAAM,CAAC;IACtB,sBAAsB,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC;IACrC;;OAEG;IACH,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,QAAQ,eAAe,EACvB,uGASG,cAAc,KAChB,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAqE5E,CAAC"}

package/dist/DboBuilder/TableHandler/uploadFile.js CHANGED Viewed

@@ -21,7 +21,7 @@ const assertFileObjectValid = (row) => {
     }
 };
 exports.assertFileObjectValid = assertFileObjectValid;
-const uploadFile = async (config, { data, original_name, original_last_modified, localParams, mediaId, onCommit, onRollback, }) => {
+const uploadFile = async (config, { data, original_name, original_last_modified, localParams, mediaId, version, onCommit, onRollback, }) => {
     const storageClient = config.storageClient;
     const media_id = mediaId ?? (0, crypto_1.randomUUID)();
     const nestedInsert = localParams?.nestedInsert;
@@ -72,6 +72,7 @@ const uploadFile = async (config, { data, original_name, original_last_modified,
         url: [fileServeRoute, coreInfo.id].join("/"),
         content_length: String(contentLength),
         data: Buffer.from([0x01]),
+        ...(config.versioning ? { version: version ?? 1 } : {}),
     };
     const isInsert = !mediaId;
     return isInsert ?

package/dist/DboBuilder/TableHandler/uploadFile.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"uploadFile.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/uploadFile.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AACpC,qDAAkF;AAGlF,mFAAgF;AAChF,qFAA8E;AAC9E,uFAAoF;AAOpF,MAAM,WAAW,GAAG;IAClB,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;IACtC,aAAa,EAAE,QAAQ;IACvB,sBAAsB,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE;IAC1D,IAAI,EAAE,MAAM;CACJ,CAAC;AAIJ,MAAM,qBAAqB,GAA0B,CAAC,GAAG,EAAE,EAAE;IAClE,MAAM,UAAU,GAAG,IAAA,qDAAmC,EACpD,WAAW,EACX,GAAG,EACH,aAAa,EACb,SAAS,EACT;QACE,oBAAoB,EAAE,KAAK;KAC5B,CACF,CAAC;IACF,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;AACH,CAAC,CAAC;AAbW,QAAA,qBAAqB,yBAahC;~~AAaK~~,MAAM,UAAU,GAAG,KAAK,EAC7B,MAAuB,EACvB,EACE,IAAI,EACJ,aAAa,EACb,sBAAsB,EACtB,WAAW,EACX,OAAO,EACP,QAAQ,EACR,UAAU,GACK,EAC4D,EAAE;IAC/E,MAAM,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;IAE3C,MAAM,QAAQ,GAAG,OAAO,IAAI,IAAA,mBAAU,GAAE,CAAC;IACzC,MAAM,YAAY,GAAG,WAAW,EAAE,YAAY,CAAC;IAC/C,MAAM,IAAI,GAAG,MAAM,IAAA,2CAAoB,EAAC,MAAM,EAAE;QAC9C,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,aAAa;QACvB,SAAS,EAAE,YAAY,EAAE,aAAa;QACtC,OAAO,EAAE,YAAY,EAAE,iBAAiB;KACzC,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,CAAC,IAAI,EAAE,eAAe,EAAE,WAAW,EAAE,cAAc,CAAU,CAAC;IACvF,MAAM,QAAQ,GAAoE;QAChF,EAAE,EAAE,QAAQ;QACZ,aAAa;QACb,SAAS,EAAE,IAAI,CAAC,GAAG;QACnB,YAAY,EAAE,IAAI,CAAC,IAAI;KACxB,CAAC;IAEF,MAAM,UAAU,GAAG,IAAA,mBAAU,GAAE,CAAC;IAChC,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,CACtD,aAAa,CAAC,MAAM,CAAC;QACnB,IAAI,EAAE,IAAI;QACV,QAAQ,EAAE,UAAU;QACpB,WAAW,EAAE,QAAQ,CAAC,YAAY;KACnC,CAAC,CACH,CAAC;IACF,MAAM,OAAO,GAAqB,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;QACjD,2EAA2E;QAC3E,MAAM,aAAa,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACpC,MAAM,IAAA,+CAAsB,EAAC,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;IACvD,CAAC,CAAC;IACF,QAAQ,CAAC,OAAO,CAAC,CAAC;IAClB,UAAU,CAAC,OAAO,CAAC,CAAC;IACpB,MAAM,YAAY,GAAG,MAAM,aAAa,CAAC;IAEzC,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,YAAY,CAAC;IACpD,MAAM,EAAE,QAAQ,EAAE,GAAG,YAAY,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IACvE,MAAM,EAAE,GAAG,EAAE,GAAG,YAAY,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;IAElE,MAAM,cAAc,GAAG,IAAA,yCAAiB,EAAC,MAAM,CAAC,CAAC;IACjD,MAAM,QAAQ,GAAgC;QAC5C,WAAW,EAAE,UAAU;QACvB,UAAU,EAAE,IAAI;QAChB,kBAAkB,EAAE,IAAI;QACxB,OAAO,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACjC,OAAO,EAAE,IAAI;QACb,oBAAoB,EAAE,IAAI;QAC1B,WAAW,EAAE,EAAE;QACf,GAAG,QAAQ;QACX,sBAAsB;QACtB,SAAS,EAAE,GAAG,IAAI,EAAE;QACpB,IAAI,EAAE,WAAW;QACjB,SAAS,EAAE,IAAI,CAAC,GAAG;QACnB,GAAG,EAAE,CAAC,cAAc,EAAE,QAAQ,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;QAC5C,cAAc,EAAE,MAAM,CAAC,aAAa,CAAC;QACrC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;~~KAC1B~~,CAAC;IAEF,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC;IAE1B,OAAO,QAAQ,CAAC,CAAC;QACb;YACE,GAAG,QAAQ;YACX,KAAK,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;SAChC;QACH,CAAC,CAAC,QAAQ,CAAC;AACf,CAAC,CAAC;~~AA/EW~~,QAAA,UAAU,~~cA+ErB~~"}
1	+ {"version":3,"file":"uploadFile.js","sourceRoot":"","sources":["../../../lib/DboBuilder/TableHandler/uploadFile.ts"],"names":[],"mappings":"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"}

package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts CHANGED Viewed

@@ -4,14 +4,14 @@ import type { TableEvent } from "../../Logging";
 import type { DB } from "../../Prostgles";
 import type { Join } from "../../ProstglesTypes";
 import type { ParsedTableRule } from "../../PublishParser/PublishParser";
-import type { Graph } from "../joins/shortestPath";
+import type { VoidFunction } from "../../SchemaWatch/SchemaWatch";
+import type { TableDefinition } from "../../TableConfig/TableConfigTypes";
+import type { TableHooksDefinition } from "../../TableHooks/TableHooks";
 import type { DboBuilder, Filter, LocalParams, TableHandlers } from "../DboBuilder";
 import type { TableSchema } from "../DboBuilderTypes";
+import type { Graph } from "../joins/shortestPath";
 import { type Param3 } from "./find";
 import type { OnData } from "./subscribe";
-import type { TableDefinition } from "../../TableConfig/TableConfigTypes";
-import type { VoidFunction } from "../../SchemaWatch/SchemaWatch";
-import type { TableHooksDefinition } from "../../TableHooks/TableHooks";
 export type JoinPaths = {
     t1: string;
     t2: string;
@@ -55,8 +55,8 @@ export declare class ViewHandler {
     });
     getFinalDBtx: (localParams: LocalParams | undefined) => TableHandlers | undefined;
     getTransaction: (localParams: LocalParams | undefined) => {
-        dbTX: TableHandlers;
         t: pgPromise.ITask<{}>;
+        dbTX: TableHandlers;
     } | undefined;
     abortRemoteQuery: (abortSignalId: string, localParams: LocalParams) => void;
     activeQueries: Map<string, {
@@ -70,7 +70,7 @@ export declare class ViewHandler {
     getDbHandlerWithAbort: (localParams: LocalParams | undefined, params: {
         abortSignal: AbortSignal | undefined;
         abortSignalId: string | undefined;
-    }) => Pick<pgPromise.ITask<{}> | import("../..").DB, "any" | "one" | "many" | "manyOrNone" | "none" | "oneOrNone">;
+    }) => Pick<import("../..").DB | pgPromise.ITask<{}>, "any" | "none" | "one" | "oneOrNone" | "many" | "manyOrNone">;
     _log: ({ command, data, localParams, duration, error, }: Pick<TableEvent, "command" | "data" | "localParams"> & {
         duration: number;
         error?: any;
@@ -100,16 +100,6 @@ export declare class ViewHandler {
     count: (_filter?: Filter | undefined, selectParams?: SelectParams | undefined, param3?: Param3 | undefined, table_rules?: ParsedTableRule | undefined, localParams?: LocalParams | undefined) => Promise<number>;
     size: (_filter?: Filter | undefined, selectParams?: SelectParams | undefined, param3?: Param3 | undefined, table_rules?: ParsedTableRule | undefined, localParams?: LocalParams | undefined) => Promise<string>;
     getAllowedSelectFields(selectParams: FieldFilter | undefined, allowed_cols: FieldFilter, allow_empty?: boolean): string[];
-    /**
-     * Parses group or simple filter
-     */
-    prepareWhere: (params: import("./prepareWhere").PrepareWhereParams) => Promise<{
-        columnsUsed: string[];
-        condition: string;
-        where: string;
-        filter: AnyObject;
-        exists: import("../DboBuilderTypes").ExistsFilterConfig[];
-    }>;
     intersectColumns(allowedFields: FieldFilter, disallowedFields: FieldFilter, removeDisallowedFields?: boolean): string[];
     parseFieldFilter(fieldParams?: FieldFilter, allow_empty?: boolean, allowed_cols?: string[]): string[];
 }

package/dist/DboBuilder/ViewHandler/ViewHandler.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EACV,SAAS,EACT,UAAU,EACV,WAAW,EACX,YAAY,EACZ,eAAe,EACf,oBAAoB,EACpB,mBAAmB,EACpB,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,iBAAiB,CAAC;AAC1C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,~~KAAK~~,EAAE,MAAM,~~uBAAuB,~~CAAC;~~AACnD~~,OAAO,KAAK,EAAE,~~UAAU~~,EAAE,MAAM,~~EAAE~~,~~WAAW~~,EAAE,~~aAAa~~,EAAE,MAAM,~~eAAe~~,CAAC;~~AAEpF~~,OAAO,KAAK,EAAE,~~WAAW~~,EAAE,MAAM,~~oBAAoB~~,~~CAAC;AAItD~~,~~OAAO~~,~~EAAQ~~,~~KAAK,MAAM,~~EAAE,MAAM,~~QAAQ~~,CAAC;~~AAK3C~~,OAAO,KAAK,EAAE,~~MAAM~~,EAAE,MAAM,~~aAAa~~,CAAC;~~AAI1C~~,OAAO,KAAK,EAAE,~~eAAe~~,EAAE,MAAM,~~oCAAoC~~,CAAC;~~AAE1E~~,OAAO,KAAK,~~EAAE~~,~~YAAY,~~EAAE,MAAM~~,+BAA+B~~,CAAC;~~AAClE~~,OAAO,KAAK,EAAE,~~oBAAoB~~,EAAE,MAAM,~~6BAA6B~~,CAAC;~~AAExE~~,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB,EAAE,CAAC;AAEJ,qBAAa,WAAW;IACtB,EAAE,EAAE,EAAE,CAAC;IACP,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IAChC,eAAe,EAAE,UAAU,EAAE,CAAC;IAC9B,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IACvB,eAAe,EAAE,WAAW,CAAC;IAC7B,YAAY,EAAE,MAAM,EAAE,CAAM;IAC5B,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,SAAS,CAAC,EAAE,KAAK,CAAC;IAClB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,eAAe,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;IACzC,KAAK,EAAE,oBAAoB,CAAC,SAAS,EAAE,aAAa,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC;IAEvE,EAAE,CAAC,EAAE;QACH,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACvB,IAAI,EAAE,aAAa,CAAC;KACrB,CAAC;IACF,IAAI,SAAS,6BAEZ;IAED,IAAI,MAAM,YAET;IACD,SAAS,SAAM;IACf,QAAQ,UAAS;gBACL,EACV,EAAE,EACF,MAAM,EACN,UAAU,EACV,eAAe,EACf,EAAE,EACF,SAAS,EACT,KAAK,GACN,EAAE;QACD,EAAE,EAAE,EAAE,CAAC;QACP,eAAe,EAAE,WAAW,CAAC;QAC7B,UAAU,EAAE,UAAU,CAAC;QACvB,MAAM,EAAE,eAAe,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC;QACzC,KAAK,EAAE,oBAAoB,CAAC,SAAS,EAAE,aAAa,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC;QACvE,EAAE,CAAC,EAAE;YAAE,CAAC,EAAE,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YAAC,IAAI,EAAE,aAAa,CAAA;SAAE,CAAC;QACrD,SAAS,CAAC,EAAE,SAAS,CAAC;KACvB;IA2BD,YAAY,GAAI,aAAa,WAAW,GAAG,SAAS,+BAElD;IAEF,cAAc,GAAI,aAAa,WAAW,GAAG,SAAS~~;;;kBAEpD~~;IAEF,gBAAgB,GAAI,eAAe,MAAM,EAAE,aAAa,WAAW,UAejE;IAEF,aAAa;eAGF,YAAY;eACZ,MAAM;eACN,MAAM;aACR,MAAM,GAAG,SAAS;kBACb,MAAM,GAAG,SAAS;OAE5B;IACJ,aAAa,cAAqB;IAClC,qBAAqB;;;uHAAoC;IAEzD,IAAI,GAAI,kDAML,IAAI,CAAC,UAAU,EAAE,SAAS,GAAG,MAAM,GAAG,aAAa,CAAC,GAAG;QACxD,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,GAAG,CAAC;KACb,0BAoBC;IAEF,gBAAgB,CAAC,aAAa,EAAE,WAAW,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM;IAiBzF,iBAAiB;;;;;;;2BAAgC;IAEjD,WAAW,CAAC,MAAM,EAAE,GAAG;IAKvB,OAAO,6LAAsB;IAE7B,UAAU;;;qLAAyB;IAEnC,iBAAiB,wIAAqC;IAEtD,IAAI,yMAAmB;IAEjB,OAAO,CACX,MAAM,CAAC,EAAE,MAAM,EACf,YAAY,CAAC,EAAE,YAAY,EAC3B,MAAM,CAAC,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,eAAe,EAC7B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,GAAG,CAAC;IA+BT,SAAS,CACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,mBAAmB,CAAC;IAEzB,SAAS,CACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,CAAC,EAAE,MAAM,EACf,WAAW,CAAC,EAAE,eAAe,EAC7B,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,oBAAoB,CAAC;IAqBhC,YAAY,CACV,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,CAAC,IAAI,EAAE,SAAS,GAAG,SAAS,EAAE,KAAK,CAAC,EAAE,OAAO,KAAK,GAAG,GAC5D,OAAO,CAAC,mBAAmB,CAAC;IAC/B,YAAY,CACV,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,SAAS,EACjB,WAAW,EAAE,eAAe,EAC5B,WAAW,EAAE,WAAW,GACvB,OAAO,CAAC,oBAAoB,CAAC;IAehC,KAAK,4MAAoB;IACzB,IAAI,4MAAmB;IAEvB,sBAAsB,CACpB,YAAY,EAAE,WAAW,YAAM,EAC/B,YAAY,EAAE,WAAW,EACzB,WAAW,UAAO,GACjB,MAAM,EAAE;IAqBX~~;;OAEG;IACH~~,~~YAAY;;;;;;OAA2B;IAEvC,~~gBAAgB,CACd,aAAa,EAAE,WAAW,EAC1B,gBAAgB,EAAE,WAAW,EAC7B,sBAAsB,UAAQ,GAC7B,MAAM,EAAE;IAiBX,gBAAgB,CACd,WAAW,GAAE,WAAiB,EAC9B,WAAW,UAAO,EAClB,YAAY,CAAC,EAAE,MAAM,EAAE,GACtB,MAAM,EAAE;CAGZ;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,CAAC,EAAE,aAAa,MAAM,EAAE,SAQxF,CAAC"}
1	+ {"version":3,"file":"ViewHandler.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}

package/dist/DboBuilder/ViewHandler/ViewHandler.js CHANGED Viewed

@@ -2,19 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateKeys = exports.ViewHandler = void 0;
 const prostgles_types_1 = require("prostgles-types");
+const utils_1 = require("../../utils/utils");
 const DboBuilder_1 = require("../DboBuilder");
 const getValidatedTableRules_1 = require("../TableRules/getValidatedTableRules");
 const getColumns_1 = require("../getColumns");
 const count_1 = require("./count");
 const find_1 = require("./find");
+const getDbHandlerWithAbort_1 = require("./getDbHandlerWithAbort");
 const getInfo_1 = require("./getInfo");
 const parseFieldFilter_1 = require("./parseFieldFilter");
-const prepareWhere_1 = require("./prepareWhere");
 const size_1 = require("./size");
 const subscribe_1 = require("./subscribe");
 const validateViewRules_1 = require("./validateViewRules");
-const utils_1 = require("../../utils/utils");
-const getDbHandlerWithAbort_1 = require("./getDbHandlerWithAbort");
 class ViewHandler {
     db;
     name;
@@ -181,10 +180,6 @@ class ViewHandler {
         }
         return col_names;
     }
-    /**
-     * Parses group or simple filter
-     */
-    prepareWhere = prepareWhere_1.prepareWhere.bind(this);
     intersectColumns(allowedFields, disallowedFields, removeDisallowedFields = false) {
         let result = [];
         if (allowedFields) {

package/dist/DboBuilder/ViewHandler/ViewHandler.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ViewHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":";;;AAUA,qDAAqE;~~AAOrE~~,8CAAoE;AAEpE,iFAA8E;AAC9E,8CAA2C;~~AAC3C~~,mCAAgC;AAChC,iCAA2C;AAC3C,uCAAoC;AACpC,yDAAsD;AACtD,~~iDAA8C;AAC9C,~~iCAA8B;AAE9B,2CAAwC;AACxC,2DAAwD;~~AACxD~~,~~6CAAkD;AAElD,mEAAgE;AAUhE,~~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~~;;OAEG;IACH~~,~~YAAY,GAAG,2BAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEvC,~~gBAAgB,CACd,aAA0B,EAC1B,gBAA6B,EAC7B,sBAAsB,GAAG,KAAK;QAE9B,IAAI,MAAM,GAAa,EAAE,CAAC;QAC1B,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,GAAG,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;QAChD,CAAC;QACD,IAAI,gBAAgB,EAAE,CAAC;YACrB,MAAM,cAAc,GAAG,IAAI,CAAC,gBAAgB,CAAC,gBAAgB,CAAC,CAAC;YAE/D,IAAI,CAAC,sBAAsB,EAAE,CAAC;gBAC5B,MAAM,sCAAsC,IAAI,CAAC,IAAI,IAAI,CAAC;YAC5D,CAAC;YACD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QACjE,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,gBAAgB,CACd,cAA2B,GAAG,EAC9B,WAAW,GAAG,IAAI,EAClB,YAAuB;QAEvB,OAAO,IAAA,mCAAgB,EAAC,WAAW,EAAE,WAAW,EAAE,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAChG,CAAC;CACF;~~AA3UD~~,~~kCA2UC~~;AAED;;GAEG;AACI,MAAM,YAAY,GAAG,CAAgC,GAAM,EAAE,WAAqB,EAAE,EAAE;IAC3F,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC9B,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,IAAI,WAAW,CAAC,MAAM,EAAE,CAAC;YACvB,MAAM,gCAAgC,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;AACH,CAAC,CAAC;AARW,QAAA,YAAY,gBAQvB"}
1	+ {"version":3,"file":"ViewHandler.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/ViewHandler.ts"],"names":[],"mappings":"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"}

package/dist/DboBuilder/ViewHandler/find.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/find.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAUzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,MAAM,MAAM,GAAG;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,IAAI,GACf,MAAM,WAAW,EACjB,SAAQ,MAAW,EACnB,eAAe,YAAY,EAC3B,SAAS,MAAM,EACf,aAAa,eAAe,EAC5B,cAAc,WAAW,KACxB,OAAO,CAAC,GAAG,EAAE,~~CA8Jf~~,CAAC"}
1	+ {"version":3,"file":"find.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/find.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAUzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAEjD,MAAM,MAAM,MAAM,GAAG;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,IAAI,GACf,MAAM,WAAW,EACjB,SAAQ,MAAW,EACnB,eAAe,YAAY,EAC3B,SAAS,MAAM,EACf,aAAa,eAAe,EAC5B,cAAc,WAAW,KACxB,OAAO,CAAC,GAAG,EAAE,CA6Jf,CAAC"}

package/dist/DboBuilder/ViewHandler/find.js CHANGED Viewed

@@ -66,7 +66,7 @@ const find = async function (filter = {}, selectParams, param3, tableRules, loca
         const selectParamsLimitCheck = localParams?.bypassLimit && !Number.isFinite(_selectParams.limit) ?
             { ..._selectParams, limit: null }
             : { limit: 1000, ..._selectParams };
-        const newQuery = await (0, getNewQuery_1.getNewQuery)(this, filter, selectParamsLimitCheck, undefined, tableRules, localParams);
+        const newQuery = await (0, getNewQuery_1.getNewQuery)(this, filter, selectParamsLimitCheck, tableRules, localParams);
         const queryWithoutRLS = (0, getSelectQuery_1.getSelectQuery)(this, newQuery, undefined, !!selectParamsLimitCheck.groupBy);
         const queryWithRLS = (0, DboBuilder_1.withUserRLS)(localParams, queryWithoutRLS, !!this.getTransaction(localParams));
         const queryToReturn = await (0, getReturnTypeQuery_1.getReturnTypeQuery)({

package/dist/DboBuilder/ViewHandler/find.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"find.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/find.ts"],"names":[],"mappings":"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~~SAAS,EACT,~~UAAU,EACV,WAAW,CACZ,CAAC;QAEF,MAAM,eAAe,GAAG,IAAA,+BAAc,EACpC,IAAI,EACJ,QAAQ,EACR,SAAS,EACT,CAAC,CAAC,sBAAsB,CAAC,OAAO,CACjC,CAAC;QAEF,MAAM,YAAY,GAAG,IAAA,wBAAW,EAC9B,WAAW,EACX,eAAe,EACf,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,CACnC,CAAC;QAEF,MAAM,aAAa,GAAG,MAAM,IAAA,uCAAkB,EAAC;YAC7C,OAAO,EAAE,IAAI;YACb,WAAW;YACX,eAAe;YACf,YAAY;YACZ,UAAU;YACV,QAAQ;SACT,CAAC,CAAC;QACH,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,aAA0B,CAAC;QACpC,CAAC;QAED,MAAM,KAAK,GAAG,YAAY,CAAC;QAC3B,MAAM,WAAW,GAAG,UAAU,KAAK,KAAK,IAAI,UAAU,KAAK,OAAO,CAAC;QACnE,MAAM,SAAS,GAAG,IAAI,CAAC,qBAAqB,CAAC,WAAW,EAAE;YACxD,WAAW;YACX,aAAa,EAAE,MAAM,EAAE,aAAa;SACrC,CAAC,CAAC;QACH,MAAM,YAAY,GAChB,WAAW,CAAC,CAAC;YACX,SAAS,CAAC,SAAS,CAAY,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC5E,CAAC,CAAC,SAAS,CAAC,GAAG,CAAY,KAAK,CAAC,CAAC;QAEpC,MAAM,YAAY,GAAG,MAAM,YAAY;aACpC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,IAAI,UAAU,KAAK,QAAQ,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;gBACtD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CACb,IAAA,oCAAuB,EAAC,GAAG,EAAE;YAC3B,IAAI,EAAE,aAAa;YACnB,WAAW;YACX,IAAI,EAAE,IAAI;YACV,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS;SACrC,CAAC,CACH,CAAC;QAEJ,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,OAAO;YACP,WAAW;YACX,IAAI,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE;YAC9B,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;SAC7B,CAAC,CAAC;QAEH,OAAO,WAAW,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;IACtD,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,OAAO;YACP,WAAW;YACX,IAAI,EAAE,EAAE,MAAM,EAAE,YAAY,EAAE;YAC9B,QAAQ,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK;YAC5B,KAAK,EAAE,IAAA,6BAAgB,EAAC,CAAC,CAAC;SAC3B,CAAC,CAAC;QACH,MAAM,IAAA,gDAAmC,EAAC,CAAC,EAAE;YAC3C,IAAI,EAAE,aAAa;YACnB,WAAW;YACX,IAAI,EAAE,IAAI;YACV,SAAS,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS;SACrC,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;~~AArKW~~,QAAA,IAAI,~~QAqKf~~"}
1	+ {"version":3,"file":"find.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/find.ts"],"names":[],"mappings":"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"}

package/dist/DboBuilder/ViewHandler/getExistsCondition.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { LocalParams, ExistsFilterConfig } from "../DboBuilder";
+import type { ExistsFilterConfig, LocalParams } from "../DboBuilder";
 import type { ViewHandler } from "./ViewHandler";
 export declare function getExistsCondition(this: ViewHandler, eConfig: ExistsFilterConfig, rootTableAlias: string | undefined, localParams: LocalParams | undefined): Promise<string>;
 //# sourceMappingURL=getExistsCondition.d.ts.map

package/dist/DboBuilder/ViewHandler/getExistsCondition.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getExistsCondition.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsCondition.ts"],"names":[],"mappings":"~~AAEA~~,OAAO,KAAK,EAAE,~~WAAW~~,EAAE,~~kBAAkB~~,EAAE,MAAM,eAAe,CAAC;~~AACrE~~,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;~~AAKjD~~,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,WAAW,EAAE,WAAW,GAAG,SAAS,GACnC,OAAO,CAAC,MAAM,CAAC,~~CAoEjB~~"}
1	+ {"version":3,"file":"getExistsCondition.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsCondition.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGrE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,kBAAkB,EAC3B,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,WAAW,EAAE,WAAW,GAAG,SAAS,GACnC,OAAO,CAAC,MAAM,CAAC,CA0EjB"}

package/dist/DboBuilder/ViewHandler/getExistsCondition.js CHANGED Viewed

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getExistsCondition = getExistsCondition;
 const prostgles_types_1 = require("prostgles-types");
+const getQuerySource_1 = require("../QueryBuilder/getQuerySource");
 const getTableJoinQuery_1 = require("./getTableJoinQuery");
+const prepareWhere_1 = require("./prepareWhere");
 async function getExistsCondition(eConfig, rootTableAlias, localParams) {
     const rootTable = this.name;
     const isNotExists = ["$notExists", "$notExistsJoined"].includes(eConfig.existType);
@@ -14,36 +16,44 @@ async function getExistsCondition(eConfig, rootTableAlias, localParams) {
             message: "Nested exists disallowed",
         };
     }
-    let t2Rules = undefined, forcedFilter, filterFields;
     /* Check if allowed to view data - forcedFilters will bypass this check through isForcedFilterBypass */
     if (localParams?.isRemoteRequest && !localParams.clientReq) {
         throw "Unexpected: localParams isRemoteRequest and missing clientReq";
     }
+    let targetTableRules = undefined;
     const targetTable = eConfig.isJoined ? eConfig.parsedPath.at(-1).table : eConfig.targetTable;
-    if (localParams?.clientReq && this.dboBuilder.publishParser) {
-        t2Rules = await this.dboBuilder.publishParser.getValidatedRequestRuleWusr({
+    const tableHandler = this.dboBuilder.dboMap.get(targetTable);
+    if (!tableHandler) {
+        throw `Table handler for ${targetTable} not found`;
+    }
+    if (localParams?.clientReq) {
+        if (!this.dboBuilder.publishParser) {
+            throw "Unexpected: missing publishParser";
+        }
+        targetTableRules = await this.dboBuilder.publishParser.getValidatedRequestRuleWusr({
             tableName: targetTable,
             command: "find",
             clientReq: localParams.clientReq,
         }, localParams.scope);
-        if (!t2Rules.select)
+        if (!targetTableRules.select)
             throw "Disallowed";
-        ({ forcedFilter, filterFields } = t2Rules.select);
     }
-    const tableHandler = this.dboBuilder.dbo[targetTable];
-    const finalWhere = (await tableHandler.prepareWhere({
+    const targetAlias = eConfig.isJoined ? (0, getTableJoinQuery_1.getTableJoinAlias)(targetTable, eConfig.parsedPath.length - 1) : undefined;
+    const whereOpts = await (0, prepareWhere_1.prepareWhere)(tableHandler, {
         select: undefined,
+        selectParams: {},
         filter: targetTableFilter,
-        forcedFilter,
-        filterFields,
+        forcedFilter: targetTableRules?.select?.forcedFilter,
+        filterFields: targetTableRules?.select?.filterFields,
+        tableRule: targetTableRules,
         addWhere: false,
-        tableAlias: undefined,
+        tableAlias: targetAlias,
         localParams,
-        tableRule: t2Rules,
-    })).where;
+    });
+    const { source: targetSource, where: finalWhere } = whereOpts;
     let innerQuery = [
         `SELECT 1`,
-        `FROM ${(0, prostgles_types_1.asName)(targetTable)}`,
+        `FROM ${(0, getQuerySource_1.getQuerySourceSQL)(targetSource)}`,
         `${finalWhere ? `WHERE ${finalWhere}` : ""}`,
     ].join("\n");
     if (eConfig.isJoined) {
@@ -52,6 +62,7 @@ async function getExistsCondition(eConfig, rootTableAlias, localParams) {
             rootTableAlias: rootTableAlias ?? rootTable,
             type: "EXISTS",
             finalWhere,
+            finalTableExpression: targetSource.expression,
         });
         innerQuery = query;
     }

package/dist/DboBuilder/ViewHandler/getExistsCondition.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getExistsCondition.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsCondition.ts"],"names":[],"mappings":";;~~AAQA~~,~~gDAyEC~~;~~AAhFD~~,~~qDAAsD~~;~~AAKtD~~,~~2DAAwD~~;~~AAEjD~~,KAAK,UAAU,kBAAkB,CAEtC,OAA2B,EAC3B,cAAkC,EAClC,WAAoC;IAEpC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC;IAC5B,MAAM,WAAW,GAAG,CAAC,YAAY,EAAE,kBAAkB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAEnF,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC;IAEtC,mCAAmC;IACnC,IAAI,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,6BAAW,CAAC,QAAQ,CAAC,EAAgB,CAAC,CAAC,EAAE,CAAC;QACxF,MAAM;YACJ,KAAK,EAAE,CAAC,yBAAyB,CAAC;YAClC,OAAO,EAAE,0BAA0B;SACpC,CAAC;IACJ,CAAC;IAED,~~IAAI,OAAO,GAAgC,SAAS,EAClD,YAAmC,EACnC,YAAqC,CAAC;IAExC,~~uGAAuG;IACvG,IAAI,WAAW,EAAE,eAAe,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,CAAC;QAC3D,MAAM,+DAA+D,CAAC;IACxE,CAAC;~~IACD~~,MAAM,WAAW,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;IAC9F,IAAI,WAAW,EAAE,SAAS,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE,CAAC;~~QAC5D~~,~~OAAO~~,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,2BAA2B,~~CACvE~~;YACE,SAAS,EAAE,WAAW;YACtB,OAAO,EAAE,MAAM;YACf,SAAS,EAAE,WAAW,CAAC,SAAS;SACjC,EACD,WAAW,CAAC,KAAK,CAClB,CAAC;QAEF,IAAI,CAAC,~~OAAO~~,CAAC,MAAM;YAAE,MAAM,YAAY,CAAC;~~QACxC~~,CAAC,~~EAAE~~,~~YAAY~~,~~EAAE~~,~~YAAY,EAAE,GAAG,~~OAAO,CAAC,~~MAAM~~,CAAC,CAAC~~;IACpD~~,CAAC~~;IAED~~,~~MAAM~~,~~YAAY~~,~~GAAG~~,~~IAAI~~,CAAC,UAAU,CAAC,GAAG,CAAC,~~WAAW~~,~~CAAiB~~,CAAC;~~IACtE~~,MAAM,~~UAAU~~,GAAG,~~CACjB,~~MAAM,~~YAAY~~,~~CAAC~~,YAAY,~~CAAC~~;~~QAC9B~~,MAAM,EAAE,SAAS;QACjB,MAAM,EAAE,iBAAiB;QACzB,YAAY;~~QACZ~~,YAAY;~~QACZ~~,QAAQ,EAAE,KAAK;QACf,UAAU,EAAE,~~SAAS~~;~~QACrB~~,WAAW;~~QACX~~,~~SAAS~~,EAAE,~~OAAO;KACnB~~,~~CAAC~~,~~CACH~~,~~CAAC~~,KAAK,CAAC;~~IAER~~,IAAI,UAAU,GAAG;QACf,UAAU;QACV,QAAQ,IAAA,~~wBAAM~~,EAAC,~~WAAW~~,CAAC,EAAE;~~QAC7B~~,GAAG,UAAU,CAAC,CAAC,CAAC,SAAS,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE;KAC7C,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAEb,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,EAAE,KAAK,EAAE,GAAG,IAAA,qCAAiB,EAAC;YAClC,IAAI,EAAE,OAAO,CAAC,UAAU;YACxB,cAAc,EAAE,cAAc,IAAI,SAAS;YAC3C,IAAI,EAAE,QAAQ;YACd,UAAU;~~SACX~~,CAAC,CAAC;QACH,UAAU,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,eAAe,UAAU,OAAO,CAAC;AACxE,CAAC"}
1	+ {"version":3,"file":"getExistsCondition.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getExistsCondition.ts"],"names":[],"mappings":"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"}

package/dist/DboBuilder/ViewHandler/getRawInfo.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getRawInfo.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getRawInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,IAAI,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;~~AAEjD~~,yDAAyD;AACzD,wBAAgB,UAAU,CACxB,IAAI,EAAE,WAAW,EACjB,IAAI,CAAC,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,eAAe,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,KAAK,~~CAqDP~~"}
1	+ {"version":3,"file":"getRawInfo.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getRawInfo.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,IAAI,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAGjD,yDAAyD;AACzD,wBAAgB,UAAU,CACxB,IAAI,EAAE,WAAW,EACjB,IAAI,CAAC,EAAE,MAAM,EACb,UAAU,CAAC,EAAE,eAAe,EAC5B,WAAW,CAAC,EAAE,WAAW,GACxB,KAAK,CAwDP"}

package/dist/DboBuilder/ViewHandler/getRawInfo.js CHANGED Viewed

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRawInfo = getRawInfo;
+const fileVersionUtils_1 = require("../../StorageClient/fileVersionUtils");
 /** Table metadata before client schema customisation. */
 function getRawInfo(lang, tableRules, localParams) {
     const validatedTableRules = this.getValidatedRules(tableRules, localParams);
-    const fileTableName = this.dboBuilder.prostgles.opts.fileTable?.tableName;
+    const fileTableConfig = this.dboBuilder.prostgles.opts.fileTable;
+    const fileTableName = fileTableConfig?.tableName;
+    const isVersionTable = (0, fileVersionUtils_1.isFileVersionTable)(fileTableConfig, this.name);
     const allowedFieldsToSelect = this.parseFieldFilter(tableRules?.select?.fields);
     const { requiredNestedInserts, allowedNestedInserts } = tableRules?.insert ?? {};
     const label = this.dboBuilder.prostgles.tableConfigurator?.getTableLabel({
@@ -21,9 +24,10 @@ function getRawInfo(lang, tableRules, localParams) {
         }),
         isView: this.isView,
         hasFiles: Boolean(!this.is_media &&
+            !isVersionTable &&
             fileTableName &&
             this.columns.some((c) => c.references?.some((r) => r.ftable === fileTableName))),
-        fileTableName,
+        fileTableName: isVersionTable ? undefined : fileTableName,
         dynamicRules: {
             update: Boolean(tableRules?.update?.dynamicFields?.length),
         },

package/dist/DboBuilder/ViewHandler/getRawInfo.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getRawInfo.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getRawInfo.ts"],"names":[],"mappings":";;~~AAMA~~,~~gCA0DC~~;~~AA3DD~~,yDAAyD;AACzD,SAAgB,UAAU,CAExB,IAAa,EACb,UAA4B,EAC5B,WAAyB;IAEzB,MAAM,mBAAmB,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAC5E,MAAM,~~aAAa~~,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC;~~IAC1E~~,MAAM,qBAAqB,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAChF,MAAM,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,GAAG,UAAU,EAAE,MAAM,IAAI,EAAE,CAAC;IACjF,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,iBAAiB,EAAE,aAAa,CAAC;QACvE,SAAS,EAAE,IAAI,CAAC,IAAI;QACpB,IAAI;KACL,CAAC,CAAC;IACH,MAAM,SAAS,GAAU;QACvB,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG;QAC7B,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO;QACrC,kBAAkB,EAAE,IAAI,CAAC,eAAe,CAAC,kBAAkB;QAC3D,KAAK;QACL,WAAW,EACT,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAC3B;YACE,oBAAoB;SACrB,CACF;QACH,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ,EAAE,OAAO,CACf,CAAC,IAAI,CAAC,QAAQ;YACd,aAAa;YACb,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,aAAa,CAAC,CAAC,CAChF;QACD,aAAa;~~QACb~~,YAAY,EAAE;YACZ,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC;SAC3D;QACD;;WAEG;QACH,kBAAkB,EAAE,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,MAAM,CACjE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CACzE;QACD,WAAW,EAAE;YACX,MAAM,EAAE,mBAAmB,CAAC,MAAM,IAAI;gBACpC,eAAe,EAAE,mBAAmB,CAAC,MAAM,CAAC,cAAc;gBAC1D,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;aACvF;YACD,MAAM,EAAE,mBAAmB,CAAC,MAAM,IAAI;gBACpC,qBAAqB;gBACrB,oBAAoB,EAAE,oBAAoB,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;aAChE;YACD,MAAM,EAAE,mBAAmB,CAAC,MAAM,IAAI;gBACpC,eAAe,EAAE,UAAU,EAAE,MAAM,EAAE,cAAc;aACpD;YACD,MAAM,EAAE,mBAAmB,CAAC,MAAM,IAAI,EAAE;SACzC;KACF,CAAC;IAEF,OAAO,SAAS,CAAC;AACnB,CAAC"}
1	+ {"version":3,"file":"getRawInfo.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getRawInfo.ts"],"names":[],"mappings":";;AAOA,gCA6DC;AAhED,2EAA0E;AAE1E,yDAAyD;AACzD,SAAgB,UAAU,CAExB,IAAa,EACb,UAA4B,EAC5B,WAAyB;IAEzB,MAAM,mBAAmB,GAAG,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;IAC5E,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC;IACjE,MAAM,aAAa,GAAG,eAAe,EAAE,SAAS,CAAC;IACjD,MAAM,cAAc,GAAG,IAAA,qCAAkB,EAAC,eAAe,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACtE,MAAM,qBAAqB,GAAG,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAChF,MAAM,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,GAAG,UAAU,EAAE,MAAM,IAAI,EAAE,CAAC;IACjF,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,iBAAiB,EAAE,aAAa,CAAC;QACvE,SAAS,EAAE,IAAI,CAAC,IAAI;QACpB,IAAI;KACL,CAAC,CAAC;IACH,MAAM,SAAS,GAAU;QACvB,GAAG,EAAE,IAAI,CAAC,eAAe,CAAC,GAAG;QAC7B,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,OAAO;QACrC,kBAAkB,EAAE,IAAI,CAAC,eAAe,CAAC,kBAAkB;QAC3D,KAAK;QACL,WAAW,EACT,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAC3B;YACE,oBAAoB;SACrB,CACF;QACH,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ,EAAE,OAAO,CACf,CAAC,IAAI,CAAC,QAAQ;YACd,CAAC,cAAc;YACf,aAAa;YACb,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,aAAa,CAAC,CAAC,CAChF;QACD,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa;QACzD,YAAY,EAAE;YACZ,MAAM,EAAE,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,CAAC;SAC3D;QACD;;WAEG;QACH,kBAAkB,EAAE,IAAI,CAAC,eAAe,CAAC,kBAAkB,EAAE,MAAM,CACjE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CACzE;QACD,WAAW,EAAE;YACX,MAAM,EAAE,mBAAmB,CAAC,MAAM,IAAI;gBACpC,eAAe,EAAE,mBAAmB,CAAC,MAAM,CAAC,cAAc;gBAC1D,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;aACvF;YACD,MAAM,EAAE,mBAAmB,CAAC,MAAM,IAAI;gBACpC,qBAAqB;gBACrB,oBAAoB,EAAE,oBAAoB,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;aAChE;YACD,MAAM,EAAE,mBAAmB,CAAC,MAAM,IAAI;gBACpC,eAAe,EAAE,UAAU,EAAE,MAAM,EAAE,cAAc;aACpD;YACD,MAAM,EAAE,mBAAmB,CAAC,MAAM,IAAI,EAAE;SACzC;KACF,CAAC;IAEF,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/DboBuilder/ViewHandler/getTableJoinQuery.d.ts CHANGED Viewed

@@ -1,14 +1,17 @@
+import type { PGIdentifier } from "../DboBuilder";
 import type { ParsedJoinPath } from "./parseJoinPath";
 type getTableJoinsArgs = {
     rootTableAlias: string;
     type: "INNER" | "LEFT" | "EXISTS";
     finalWhere?: string;
+    finalTableExpression?: string;
     path: ParsedJoinPath[];
 };
-export declare const getTableJoinQuery: ({ path, type, rootTableAlias, finalWhere, }: getTableJoinsArgs) => {
+export declare const getTableJoinQuery: ({ path, type, rootTableAlias, finalWhere, finalTableExpression, }: getTableJoinsArgs) => {
     targetAlias: string;
     query: string;
 };
+export declare const getTableJoinAlias: (table: string, pathIndex: number) => PGIdentifier;
 type GetJoinOnConditionArgs = {
     on: Record<string, string>[];
     leftAlias: string;

package/dist/DboBuilder/ViewHandler/getTableJoinQuery.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getTableJoinQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getTableJoinQuery.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,KAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,QAAQ,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE,cAAc,EAAE,CAAC;CACxB,CAAC;AACF,eAAO,MAAM,iBAAiB,GAAI,~~6CAK~~/B,iBAAiB,KAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;~~CA8D1D~~,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;IACzC,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;CAC3C,CAAC;AACF,eAAO,MAAM,mBAAmB,GAAI,iEAMjC,sBAAsB,aAQxB,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,MAAM,sBAAsB,WAE9D,CAAC"}
1	+ {"version":3,"file":"getTableJoinQuery.d.ts","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getTableJoinQuery.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,KAAK,iBAAiB,GAAG;IACvB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,QAAQ,CAAC;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,IAAI,EAAE,cAAc,EAAE,CAAC;CACxB,CAAC;AACF,eAAO,MAAM,iBAAiB,GAAI,mEAM/B,iBAAiB,KAAG;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CA6D1D,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,OAAO,MAAM,EAAE,WAAW,MAAM,KAAG,YAIpE,CAAC;AAEF,KAAK,sBAAsB,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;IACzC,eAAe,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC;CAC3C,CAAC;AACF,eAAO,MAAM,mBAAmB,GAAI,iEAMjC,sBAAsB,aAQxB,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,MAAM,sBAAsB,WAE9D,CAAC"}

package/dist/DboBuilder/ViewHandler/getTableJoinQuery.js CHANGED Viewed

@@ -1,14 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getJoinOnCondition = exports.getJoinOnConditions = exports.getTableJoinQuery = void 0;
+exports.getJoinOnCondition = exports.getJoinOnConditions = exports.getTableJoinAlias = exports.getTableJoinQuery = void 0;
 const prostgles_types_1 = require("prostgles-types");
-const getTableJoinQuery = ({ path, type, rootTableAlias, finalWhere, }) => {
+const getTableJoinQuery = ({ path, type, rootTableAlias, finalWhere, finalTableExpression, }) => {
     const [firstPath] = path;
     if (!firstPath) {
         throw `Cannot create join query for empty path`;
     }
-    const aliasSufix = "jd";
-    const getTableAlias = (table, pathIndex) => (0, prostgles_types_1.asName)(`${aliasSufix}_${pathIndex}_${table}`);
+    const getTableAlias = (table, pathIndex) => (0, exports.getTableJoinAlias)(table, pathIndex).escaped;
     const query = path
         .map(({ table, on }, i) => {
         const tableName = table;
@@ -29,17 +28,18 @@ const getTableJoinQuery = ({ path, type, rootTableAlias, finalWhere, }) => {
          * first path joins to target table through inner joins
          */
         const whereJoinCondition = isLast && isExists ?
-            `WHERE (${(0, exports.getJoinOnCondition)({
-                on: firstPath.on,
-                leftAlias: rootTableAlias,
-                rightAlias: getTableAlias(firstPath.table, 0),
-            })})`
+            `WHERE (${[
+                (0, exports.getJoinOnCondition)({
+                    on: firstPath.on,
+                    leftAlias: rootTableAlias,
+                    rightAlias: getTableAlias(firstPath.table, 0),
+                }),
+                finalWhere,
+            ]
+                .filter(Boolean)
+                .join(") AND (")})`
             : "";
-        const tableSelect = isExists && isLast ?
-            [`(`, ` SELECT *`, ` FROM ${tableName}`, finalWhere ? `  WHERE ${finalWhere}` : "", `)`]
-                .filter((v) => v)
-                .join("\n")
-            : tableName;
+        const tableSelect = isLast ? (finalTableExpression ?? tableName) : tableName;
         if (isExists && isFirst) {
             return [`SELECT 1`, `FROM ${tableSelect} ${tableAlias}`, whereJoinCondition]
                 .filter((v) => v)
@@ -56,6 +56,12 @@ const getTableJoinQuery = ({ path, type, rootTableAlias, finalWhere, }) => {
     };
 };
 exports.getTableJoinQuery = getTableJoinQuery;
+const getTableJoinAlias = (table, pathIndex) => {
+    const prefix = "jd";
+    const raw = `${prefix}_${pathIndex}_${table}`;
+    return { raw, escaped: (0, prostgles_types_1.asName)(raw) };
+};
+exports.getTableJoinAlias = getTableJoinAlias;
 const getJoinOnConditions = ({ on, leftAlias, rightAlias, getLeftColName = prostgles_types_1.asName, getRightColName = prostgles_types_1.asName, }) => {
     return on.map((constraint) => Object.entries(constraint)
         .map(([leftCol, rightCol]) => {

package/dist/DboBuilder/ViewHandler/getTableJoinQuery.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"getTableJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getTableJoinQuery.ts"],"names":[],"mappings":";;;AAAA,qDAAyC;~~AASlC~~,MAAM,iBAAiB,GAAG,CAAC,EAChC,IAAI,EACJ,IAAI,EACJ,cAAc,EACd,UAAU,~~GACQ~~,EAA0C,EAAE;IAC9D,MAAM,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;IACzB,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,yCAAyC,CAAC;IAClD,CAAC;IACD,MAAM,~~UAAU,GAAG,IAAI,CAAC;IACxB,MAAM,~~aAAa,GAAG,CAAC,KAAa,EAAE,SAAiB,EAAE,EAAE,CACzD,IAAA,~~wBAAM~~,EAAC,~~GAAG~~,~~UAAU~~,~~IAAI,~~SAAS,~~IAAI~~,~~KAAK~~,~~EAAE~~,CAAC~~,CAAC~~;~~IAEhD~~,MAAM,KAAK,GAAG,IAAI;SACf,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE;QACxB,MAAM,SAAS,GAAG,KAAK,CAAC;QACxB,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC3C,MAAM,cAAc,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAE,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAE3F,MAAM,WAAW,GAAG,IAAA,0BAAkB,EAAC;YACrC,EAAE;YACF,SAAS,EAAE,cAAc;YACzB,UAAU,EAAE,UAAU;SACvB,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,IAAI,KAAK,QAAQ,CAAC;QACnC,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;QAC3C,MAAM,OAAO,GAAG,GAAG,QAAQ,OAAO,CAAC;QACnC,MAAM,MAAM,GAAG,CAAC,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QACrC,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC;QAEnB;;;WAGG;QACH,MAAM,kBAAkB,GACtB,MAAM,IAAI,QAAQ,CAAC,CAAC;YAClB,UAAU,IAAA,0BAAkB,EAAC;~~gBAC3B~~,EAAE,EAAE,SAAS,CAAC,EAAE;~~gBAChB~~,SAAS,EAAE,cAAc;~~gBACzB~~,UAAU,EAAE,aAAa,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC;~~aAC9C~~,CAAC,~~GAAG~~;~~YACP~~,~~CAAC~~,CAAC,~~EAAE~~,CAAC;~~QAEP~~,~~MAAM,WAAW,GACf,QAAQ,~~IAAI,~~MAAM,~~CAAC,~~CAAC;YAClB~~,CAAC,GAAG,~~EAAE,WAAW,EAAE,SAAS,SAAS,EAAE,EAAE,UAAU,~~CAAC,CAAC,~~CAAC,WAAW,UAAU,~~EAAE,CAAC,~~CAAC~~,~~CAAC~~,~~EAAE,EAAE,~~GAAG,~~CAAC;iBACrF,~~MAAM,CAAC,CAAC,CAAC,~~EAAE,EAAE,~~CAAC,~~CAAC~~,~~CAAC;iBAChB,~~IAAI,CAAC,~~IAAI,~~CAAC~~;YACf~~,CAAC,CAAC,SAAS,CAAC;~~QACd~~,IAAI,QAAQ,IAAI,OAAO,EAAE,CAAC;YACxB,OAAO,CAAC,UAAU,EAAE,QAAQ,WAAW,IAAI,UAAU,EAAE,EAAE,kBAAkB,CAAC;iBACzE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;iBAChB,IAAI,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC;QAED,OAAO,CAAC,GAAG,OAAO,IAAI,WAAW,IAAI,UAAU,EAAE,EAAE,OAAO,WAAW,EAAE,EAAE,kBAAkB,CAAC;aACzF,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;aAChB,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,OAAO;QACL,KAAK;QACL,WAAW,EAAE,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;KAChE,CAAC;AACJ,CAAC,CAAC;AAnEW,QAAA,iBAAiB,qBAmE5B;AASK,MAAM,mBAAmB,GAAG,CAAC,EAClC,EAAE,EACF,SAAS,EACT,UAAU,EACV,cAAc,GAAG,wBAAM,EACvB,eAAe,GAAG,wBAAM,GACD,EAAE,EAAE;IAC3B,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAC3B,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;SACvB,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,EAAE;QAC3B,OAAO,GAAG,SAAS,IAAI,cAAc,CAAC,OAAO,CAAC,MAAM,UAAU,IAAI,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC;IAChG,CAAC,CAAC;SACD,IAAI,CAAC,OAAO,CAAC,CACjB,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,mBAAmB,uBAc9B;AAEK,MAAM,kBAAkB,GAAG,CAAC,IAA4B,EAAE,EAAE;IACjE,OAAO,IAAA,2BAAmB,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAChD,CAAC,CAAC;AAFW,QAAA,kBAAkB,sBAE7B"}
1	+ {"version":3,"file":"getTableJoinQuery.js","sourceRoot":"","sources":["../../../lib/DboBuilder/ViewHandler/getTableJoinQuery.ts"],"names":[],"mappings":";;;AAAA,qDAAyC;AAWlC,MAAM,iBAAiB,GAAG,CAAC,EAChC,IAAI,EACJ,IAAI,EACJ,cAAc,EACd,UAAU,EACV,oBAAoB,GACF,EAA0C,EAAE;IAC9D,MAAM,CAAC,SAAS,CAAC,GAAG,IAAI,CAAC;IACzB,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,yCAAyC,CAAC;IAClD,CAAC;IACD,MAAM,aAAa,GAAG,CAAC,KAAa,EAAE,SAAiB,EAAE,EAAE,CACzD,IAAA,yBAAiB,EAAC,KAAK,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC;IAE9C,MAAM,KAAK,GAAG,IAAI;SACf,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE;QACxB,MAAM,SAAS,GAAG,KAAK,CAAC;QACxB,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;QAC3C,MAAM,cAAc,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAE,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;QAE3F,MAAM,WAAW,GAAG,IAAA,0BAAkB,EAAC;YACrC,EAAE;YACF,SAAS,EAAE,cAAc;YACzB,UAAU,EAAE,UAAU;SACvB,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAG,IAAI,KAAK,QAAQ,CAAC;QACnC,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;QAC3C,MAAM,OAAO,GAAG,GAAG,QAAQ,OAAO,CAAC;QACnC,MAAM,MAAM,GAAG,CAAC,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QACrC,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC;QAEnB;;;WAGG;QACH,MAAM,kBAAkB,GACtB,MAAM,IAAI,QAAQ,CAAC,CAAC;YAClB,UAAU;gBACR,IAAA,0BAAkB,EAAC;oBACjB,EAAE,EAAE,SAAS,CAAC,EAAE;oBAChB,SAAS,EAAE,cAAc;oBACzB,UAAU,EAAE,aAAa,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC,CAAC;iBAC9C,CAAC;gBACF,UAAU;aACX;iBACE,MAAM,CAAC,OAAO,CAAC;iBACf,IAAI,CAAC,SAAS,CAAC,GAAG;YACvB,CAAC,CAAC,EAAE,CAAC;QAEP,MAAM,WAAW,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC,oBAAoB,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC7E,IAAI,QAAQ,IAAI,OAAO,EAAE,CAAC;YACxB,OAAO,CAAC,UAAU,EAAE,QAAQ,WAAW,IAAI,UAAU,EAAE,EAAE,kBAAkB,CAAC;iBACzE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;iBAChB,IAAI,CAAC,IAAI,CAAC,CAAC;QAChB,CAAC;QAED,OAAO,CAAC,GAAG,OAAO,IAAI,WAAW,IAAI,UAAU,EAAE,EAAE,OAAO,WAAW,EAAE,EAAE,kBAAkB,CAAC;aACzF,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;aAChB,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC,CAAC;SACD,IAAI,CAAC,IAAI,CAAC,CAAC;IAEd,OAAO;QACL,KAAK;QACL,WAAW,EAAE,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;KAChE,CAAC;AACJ,CAAC,CAAC;AAnEW,QAAA,iBAAiB,qBAmE5B;AAEK,MAAM,iBAAiB,GAAG,CAAC,KAAa,EAAE,SAAiB,EAAgB,EAAE;IAClF,MAAM,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,GAAG,GAAG,GAAG,MAAM,IAAI,SAAS,IAAI,KAAK,EAAE,CAAC;IAC9C,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,IAAA,wBAAM,EAAC,GAAG,CAAC,EAAE,CAAC;AACvC,CAAC,CAAC;AAJW,QAAA,iBAAiB,qBAI5B;AASK,MAAM,mBAAmB,GAAG,CAAC,EAClC,EAAE,EACF,SAAS,EACT,UAAU,EACV,cAAc,GAAG,wBAAM,EACvB,eAAe,GAAG,wBAAM,GACD,EAAE,EAAE;IAC3B,OAAO,EAAE,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAC3B,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC;SACvB,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,EAAE;QAC3B,OAAO,GAAG,SAAS,IAAI,cAAc,CAAC,OAAO,CAAC,MAAM,UAAU,IAAI,eAAe,CAAC,QAAQ,CAAC,EAAE,CAAC;IAChG,CAAC,CAAC;SACD,IAAI,CAAC,OAAO,CAAC,CACjB,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,mBAAmB,uBAc9B;AAEK,MAAM,kBAAkB,GAAG,CAAC,IAA4B,EAAE,EAAE;IACjE,OAAO,IAAA,2BAAmB,EAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AAChD,CAAC,CAAC;AAFW,QAAA,kBAAkB,sBAE7B"}