@juit/pgproxy-persister 1.3.7 → 1.4.0

package/dist/search.d.ts

@@ -0,0 +1,211 @@
+import type { ColumnDefinition, InferSelectType } from './model';
+import type { Persister } from './persister';
+/**
+ * Definition for a simple (straight) join in a {@link Search}
+ */
+export interface SearchJoin<Schema> {
+    /**
+     * The column in _the search table_ (passed to the constructor of
+     * {@link Search}) referencing the specified `refTable` (defined here).
+     *
+     * ```sql
+     * ... LEFT JOIN "refTable" ON "table"."column" = "refTable"."refColumn"
+     *                                      ^^^^^^
+     * ```
+     */
+    column: string;
+    /**
+     * The name of the table to _left join_.
+     *
+     * ```sql
+     * ... LEFT JOIN "refTable" ON "table"."column" = "refTable"."refColumn"
+     *                ^^^^^^^^                         ^^^^^^^^
+     * ```
+     */
+    refTable: string & keyof Schema;
+    /**
+     * The column in the `refTable` referenced by the _the search table_.
+     *
+     * ```sql
+     * ... LEFT JOIN "refTable" ON "table"."column" = "refTable"."refColumn"
+     *                                                            ^^^^^^^^^
+     * ```
+     */
+    refColumn: string;
+    /**
+     * The column in the referenced table to use as default sort column, when
+     * sorting by this join.
+     */
+    sortColumn?: string;
+}
+/**
+ * Definition for joins in a {@link Search}
+ *
+ * Each key is the name of the join as it will appear in the results, and the
+ * value defines how to perform the join.
+ *
+ * See {@link StraightJoin} and {@link LinkedJoin} for details on the fields.
+ */
+export interface SearchJoins<Schema> {
+    [key: string]: SearchJoin<Schema>;
+}
+/** Internal interface defining operators available to *single values* */
+interface ValueSearchFilter<Schema, Table extends string & keyof Schema> {
+    name: string & keyof Schema[Table];
+    field?: string;
+    op?: '=' | '!=' | '>' | '>=' | '<' | '<=' | '~' | 'like' | 'ilike';
+    value: string | number | Date | boolean | null;
+}
+/** Internal interface defining operators available to *array values* */
+interface ArraySearchFilter<Schema, Table extends string & keyof Schema> {
+    name: string & keyof Schema[Table];
+    field?: string;
+    op: 'in' | 'not in';
+    value: (string | number | Date | boolean | null)[];
+}
+/** Internal interface defining operators available to *json values* */
+interface JsonSearchFilter<Schema, Table extends string & keyof Schema> {
+    name: string & keyof Schema[Table];
+    field?: never;
+    op: '@>' | '<@';
+    value: any;
+}
+/**
+ * A filter for a search that matches a single value
+ *
+ * - `name` is the column name to filter on
+ * - `field` is a field to filter on when the column is a complex type (JSONB)
+ * - `op` is the operator to use for the filter (default: `=`)
+ * - `value` is the value to filter for
+ *
+ * All operators are defined as per PostgreSQL documentation, with few notable
+ * exceptions:
+ *
+ * - `~` is an alias to the `ilike` operator
+ * - `in` and `not in` are used to match a value against an array of possible
+ *   values using the `... = ANY(...)`  or `... != ALL(...)` constructs
+ * - `@>` and `<@` will accept single values as well as arrays.
+ * - `!=` and `=` will use the PostgreSQL `IS (NOT) DISTINCT FROM` semantics
+ *   to properly handle `NULL` comparisons.
+ */
+export type SearchFilter<Schema, Table extends string & keyof Schema> = ValueSearchFilter<Schema, Table> | ArraySearchFilter<Schema, Table> | JsonSearchFilter<Schema, Table>;
+/**
+ * Base interface for querying results via our {@link Search}.
+ */
+export interface SearchQuery<Schema, Table extends string & keyof Schema, Joins extends SearchJoins<Schema> = {}> {
+    /** An optional set of filters to apply */
+    filters?: SearchFilter<Schema, Table>[];
+    /** An optional column to sort by */
+    sort?: string & (keyof Schema[Table] | keyof Joins);
+    /** The order to sort by (if `sort` is specified, default: 'asc') */
+    order?: 'asc' | 'desc';
+    /** An optional full-text search query, available for full-text search */
+    q?: string;
+}
+/**
+ * Full options for querying a limited set of results via our {@link Search}.
+ */
+export interface SearchOptions<Schema, Table extends string & keyof Schema, Joins extends SearchJoins<Schema> = {}> extends SearchQuery<Schema, Table, Joins> {
+    /** Offset to start returning rows from (default: 0) */
+    offset?: number;
+    /** Maximum number of rows to return (default: 20, unlimited if 0) */
+    limit?: number;
+}
+/**
+ * Extra (manual) SQL to further customize our {@link Search} queries.
+ */
+export interface SearchExtra {
+    /** Extra `WHERE` clause to add to our search */
+    where: string;
+    /** Parameters for the extra `WHERE` clause */
+    params: any[];
+}
+/** A single search result row (with joins) */
+export type SearchResult<Schema, Table extends string & keyof Schema, Joins extends SearchJoins<Schema> = {}> = Schema[Table] extends Record<string, ColumnDefinition> ? InferSelectType<Schema[Table]> & {
+    [key in keyof Joins]: Joins[key]['refTable'] extends keyof Schema ? Schema[Joins[key]['refTable']] extends Record<string, ColumnDefinition> ? Schema[Table][Joins[key]['column']]['isNullable'] extends true ? InferSelectType<Schema[Joins[key]['refTable']]> | null : InferSelectType<Schema[Joins[key]['refTable']]> : unknown : unknown;
+} : never;
+/** What's being returned by our `search` */
+export interface SearchResults<Schema, Table extends string & keyof Schema, Joins extends SearchJoins<Schema> = {}> {
+    /** The total length of all available results (without offset or limit) */
+    total: number;
+    /** The lines queried (truncated by offset and limit) */
+    rows: SearchResult<Schema, Table, Joins>[];
+}
+/**
+ * An object to perform searches on a given table in our {@link Persister}
+ */
+export interface Search<Schema, Table extends string & keyof Schema, Joins extends SearchJoins<Schema>> {
+    /**
+     * Return the first result (if any) matching the specified query.
+     *
+     * This will intrinsically limit the search to 1 result.
+     *
+     * @param query The query to filter results by
+     * @param extra Optional extra SQL to customize the search
+     * @returns The first matching result, or `undefined` if no results matched
+     */
+    find(query: SearchQuery<Schema, Table, Joins>, extra?: SearchExtra): Promise<SearchResult<Schema, Table, Joins> | undefined>;
+    /**
+     * Return the raw SQL query and parameters for the specified options.
+     *
+     * @param options The search options to generate SQL for
+     * @param extra Optional extra SQL to customize the search
+     * @returns A tuple containing the SQL string and its parameters
+     */
+    query(options: SearchOptions<Schema, Table, Joins>, extra?: SearchExtra): [sql: string, params: any[]];
+    /**
+     * Perform a search with the specified options.
+     *
+     * @param options The search options to use
+     * @param extra Optional extra SQL to customize the search
+     * @returns The search results
+     */
+    search(options: SearchOptions<Schema, Table, Joins>, extra?: SearchExtra): Promise<SearchResults<Schema, Table, Joins>>;
+}
+/**
+ * A constructor for our {@link Search} object
+ */
+export interface SearchConstructor {
+    /**
+     * Construct a {@link Search} object using the specified {@link Persister},
+     * operating on the specified table.
+     *
+     * @param persister The {@link Persister} instance to use
+     * @param table The table to perform searches on
+     */
+    new <P extends Persister, T extends string & (P extends Persister<infer S> ? keyof S : never)>(persister: P, table: T): Search<P extends Persister<infer S> ? S : never, T, {}>;
+    /**
+     * Construct a {@link Search} object using the specified {@link Persister},
+     * operating on the specified table, and using the specified full-text search
+     * column (TSVECTOR) to perform `q` searches.
+     *
+     * @param persister The {@link Persister} instance to use
+     * @param table The table to perform searches on
+     * @param fullTextSearchColumn The column to use for full-text searches
+     */
+    new <P extends Persister, T extends string & (P extends Persister<infer S> ? keyof S : never)>(persister: P, table: T, fullTextSearchColumn: string): Search<P extends Persister<infer S> ? S : never, T, {}>;
+    /**
+     * Construct a {@link Search} object using the specified {@link Persister},
+     * operating on the specified table, joining external tables.
+     *
+     * @param persister The {@link Persister} instance to use
+     * @param table The table to perform searches on
+     * @param joins The joins to perform
+     */
+    new <P extends Persister, T extends string & (P extends Persister<infer S> ? keyof S : never), J extends SearchJoins<P extends Persister<infer S> ? S : never>>(persister: P, table: T, joins: J): Search<P extends Persister<infer S> ? S : never, T, J>;
+    /**
+     * Construct a {@link Search} object using the specified {@link Persister},
+     * operating on the specified table, joining external tables, and using the
+     * specified full-text search column (TSVECTOR) to perform `q` searches.
+     *
+     * @param persister The {@link Persister} instance to use
+     * @param table The table to perform searches on
+     * @param joins The joins to perform
+     * @param fullTextSearchColumn The column to use for full-text searches
+     */
+    new <P extends Persister, T extends string & (P extends Persister<infer S> ? keyof S : never), J extends SearchJoins<P extends Persister<infer S> ? S : never>>(persister: P, table: T, joins: J, fullTextSearchColumn: string): Search<P extends Persister<infer S> ? S : never, T, J>;
+}
+/** Revive a JSON, parsing ISO dates as {@link Date} objects */
+export declare function reviver(_key: string, data: any): any;
+export declare const Search: SearchConstructor;
+export {};

package/dist/search.mjs

@@ -0,0 +1,189 @@
+// search.ts
+import { escape } from "@juit/pgproxy-client";
+import { assert, encodeSchemaAndName } from "./utils.mjs";
+var ISO_RE = /^(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z))|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z))|(\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d([+-][0-2]\d:[0-5]\d|Z))$/;
+function reviver(_key, data) {
+  if (typeof data === "string" && ISO_RE.test(data)) return new Date(data);
+  return data;
+}
+var SearchImpl = class {
+  /** Our persister instance */
+  #persister;
+  /** The escaped table name */
+  #eTable;
+  /** The escaped joins */
+  #eJoins;
+  /** The full-text search column (if any) */
+  #fullTextSearchColumn;
+  constructor(persister, table, joinsOrFullTextSearchColumn, maybeFullTextSearchColumn) {
+    this.#persister = persister;
+    this.#eTable = encodeSchemaAndName(table);
+    let joins = {};
+    let fullTextSearchColumn = void 0;
+    if (typeof joinsOrFullTextSearchColumn === "string") {
+      fullTextSearchColumn = joinsOrFullTextSearchColumn;
+    } else if (joinsOrFullTextSearchColumn) {
+      joins = joinsOrFullTextSearchColumn;
+      fullTextSearchColumn = maybeFullTextSearchColumn;
+    }
+    this.#fullTextSearchColumn = fullTextSearchColumn || void 0;
+    this.#eJoins = Object.fromEntries(Object.entries(joins).map(([key, def]) => {
+      return [key, {
+        column: escape(def.column),
+        refTable: encodeSchemaAndName(def.refTable),
+        refColumn: escape(def.refColumn),
+        sortColumn: def.sortColumn ? escape(def.sortColumn) : void 0
+      }];
+    }));
+  }
+  #query(count, options, extra) {
+    const {
+      offset = 0,
+      limit = 20,
+      filters = [],
+      sort,
+      order,
+      q
+    } = options;
+    const etable = this.#eTable;
+    const ejoins = this.#eJoins;
+    const fields = [];
+    const where = [];
+    const orderby = [];
+    const params = [];
+    if (extra) {
+      where.push(extra.where);
+      params.push(...extra.params);
+    }
+    let esearch = "";
+    if (count === "only") {
+      if (this.#fullTextSearchColumn) esearch = escape(this.#fullTextSearchColumn);
+    } else if (this.#fullTextSearchColumn) {
+      fields.push(`(TO_JSONB(${etable}.*) - $${params.push(this.#fullTextSearchColumn)})`);
+      esearch = escape(this.#fullTextSearchColumn);
+    } else {
+      fields.push(`TO_JSONB(${etable}.*)`);
+    }
+    const from = [etable];
+    let joinIndex = 0;
+    const joinedTables = {};
+    Object.entries(ejoins).forEach(([as, { column, refTable, refColumn }]) => {
+      const ealias = escape(`__$${(++joinIndex).toString(16).padStart(4, "0")}$__`);
+      joinedTables[as] ??= ealias;
+      if (count !== "only") {
+        const index = params.push(as);
+        fields.push(`JSONB_BUILD_OBJECT($${index}::TEXT, TO_JSONB(${ealias}))`);
+      }
+      from.push(`LEFT JOIN ${refTable} ${ealias} ON ${etable}.${column} = ${ealias}.${refColumn}`);
+    });
+    if (sort) {
+      const joinedOrder = order?.toLocaleLowerCase() === "desc" ? " DESC" : "";
+      if (ejoins[sort]) {
+        assert(ejoins[sort].sortColumn, `Sort column for joined field "${sort}" not defined`);
+        const joinedTableAlias = joinedTables[sort];
+        const joinedColumn = ejoins[sort].sortColumn;
+        orderby.push(`${joinedTableAlias}.${joinedColumn}${joinedOrder} NULLS LAST`);
+      } else {
+        orderby.push(`${etable}.${escape(sort)}${joinedOrder}`);
+      }
+    }
+    if (q) {
+      assert(esearch, "Full-text search column not defined");
+      if (q.match(/^[\w][-@\w]*$/)) {
+        from.push(`CROSS JOIN LATERAL CAST(LOWER($${params.push(q + ":*")}) AS tsquery) AS "__query"`);
+      } else {
+        from.push(`CROSS JOIN LATERAL websearch_to_tsquery($${params.push(q)}) AS "__query"`);
+      }
+      orderby.push(`ts_rank(${etable}.${esearch}, "__query") DESC`);
+      where.push(`"__query" @@ ${etable}.${esearch}`);
+    }
+    for (const { name, field, op = "=", value } of filters) {
+      const [ecolumn, evalue] = field && ["like", "ilike", "~"].includes(op) ? [`${escape(name)}->>$${params.push(field)}`, value] : field ? [`${escape(name)}->$${params.push(field)}`, JSON.stringify(value)] : [escape(name), value];
+      if (op === "in") {
+        const evalue2 = field && Array.isArray(value) ? value.map((v) => JSON.stringify(v)) : value;
+        where.push(`${etable}.${ecolumn} = ANY($${params.push(evalue2)})`);
+        continue;
+      } else if (op === "not in") {
+        const evalue2 = field && Array.isArray(value) ? value.map((v) => JSON.stringify(v)) : value;
+        where.push(`${etable}.${ecolumn} != ALL($${params.push(evalue2)})`);
+        continue;
+      } else if (op === "@>" || op === "<@") {
+        assert(!field, `Field "${field}" cannot be specified when using JSONB operator "${op}" for column "${name}"`);
+        where.push(`${etable}.${ecolumn} ${op} ($${params.push(JSON.stringify(value))})::JSONB`);
+        continue;
+      }
+      let operator;
+      switch (op) {
+        case ">":
+          operator = ">";
+          break;
+        case ">=":
+          operator = ">=";
+          break;
+        case "<":
+          operator = "<";
+          break;
+        case "<=":
+          operator = "<=";
+          break;
+        case "like":
+          operator = "LIKE";
+          break;
+        case "ilike":
+          operator = "ILIKE";
+          break;
+        case "~":
+          operator = "ILIKE";
+          break;
+        case "!=":
+          operator = "IS DISTINCT FROM";
+          break;
+        case "=":
+          operator = "IS NOT DISTINCT FROM";
+          break;
+        default:
+          throw new Error(`Unsupported operator "${op}" for column "${name}"`);
+      }
+      where.push(`${etable}.${ecolumn} ${operator} $${params.push(evalue)}`);
+    }
+    const result = `(${fields.join(" || ")})::TEXT AS "result"`;
+    const clauses = count === "only" ? 'COUNT(*) AS "total"' : count ? `COUNT(*) OVER() AS "total", ${result}` : result;
+    let sql = `SELECT ${clauses} FROM ${from.join(" ")}`;
+    if (where.length) sql += ` WHERE ${where.join(" AND ")}`;
+    if (orderby.length && count !== "only") sql += ` ORDER BY ${orderby.join(", ")}`;
+    if (offset) sql += ` OFFSET $${params.push(offset)}`;
+    if (limit) sql += ` LIMIT $${params.push(limit)}`;
+    return [sql, params];
+  }
+  query(options, extra) {
+    return this.#query(false, options, extra);
+  }
+  async find(options, extra) {
+    const [sql, params] = this.#query(false, { ...options, offset: 0, limit: 1 }, extra);
+    const result = await this.#persister.query(sql, params);
+    if (result.rows[0]) return JSON.parse(result.rows[0].result, reviver);
+    return void 0;
+  }
+  async search(options, extra) {
+    const [sql, params] = this.#query(true, options, extra);
+    const result = await this.#persister.query(sql, params).catch((error) => {
+      throw new Error(`Error executing search query: ${error.message}`, { cause: { sql, params, error } });
+    });
+    if (result.rows.length === 0 && (options.offset || 0) > 0) {
+      const [sql2, params2] = this.#query("only", { ...options, offset: 0, limit: void 0 }, extra);
+      const result2 = await this.#persister.query(sql2, params2);
+      assert(result2.rows[0], "Expected total row in count query");
+      const total2 = Number(result2.rows[0].total);
+      return { total: total2, rows: [] };
+    }
+    const rows = result.rows.map((row) => JSON.parse(row.result, reviver));
+    const total = Number(result.rows[0]?.total) || 0;
+    return { total, rows };
+  }
+};
+var Search = SearchImpl;
+export {
+  Search,
+  reviver
+};
+//# sourceMappingURL=search.mjs.map

package/dist/search.mjs.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../src/search.ts"],
+  "mappings": "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",
+  "names": ["evalue", "sql", "params", "result", "total"]
+}

package/dist/utils.cjs

@@ -0,0 +1,53 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// utils.ts
+var utils_exports = {};
+__export(utils_exports, {
+  assert: () => assert,
+  assertArray: () => assertArray,
+  assertObject: () => assertObject,
+  encodeSchemaAndName: () => encodeSchemaAndName
+});
+module.exports = __toCommonJS(utils_exports);
+var import_pgproxy_client = require("@juit/pgproxy-client");
+function assert(assertion, message) {
+  if (!assertion) throw new Error(message);
+}
+function assertArray(value, message) {
+  assert(Array.isArray(value), message);
+}
+function assertObject(value, message) {
+  assert(value && typeof value === "object", message);
+}
+function encodeSchemaAndName(name) {
+  const [schemaOrTable, maybeTable, ...extra] = name.split(".");
+  assert(extra.length === 0, `Invalid table name "${name}"`);
+  const [schema, table] = maybeTable ? [schemaOrTable, maybeTable] : ["public", schemaOrTable];
+  assert(table, `Invalid table name "${name}"`);
+  return `${(0, import_pgproxy_client.escape)(schema || "public")}.${(0, import_pgproxy_client.escape)(table)}`;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  assert,
+  assertArray,
+  assertObject,
+  encodeSchemaAndName
+});
+//# sourceMappingURL=utils.cjs.map

package/dist/utils.cjs.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../src/utils.ts"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,4BAAuB;AAMhB,SAAS,OAAO,WAAgB,SAAoC;AACzE,MAAI,CAAE,UAAW,OAAM,IAAI,MAAM,OAAO;AAC1C;AAEO,SAAS,YAAY,OAAY,SAAyC;AAC/E,SAAO,MAAM,QAAQ,KAAK,GAAG,OAAO;AACtC;AAEO,SAAS,aAAa,OAAY,SAA0C;AACjF,SAAO,SAAU,OAAO,UAAU,UAAW,OAAO;AACtD;AAMO,SAAS,oBAAoB,MAAsB;AACxD,QAAM,CAAE,eAAe,YAAY,GAAG,KAAM,IAAI,KAAK,MAAM,GAAG;AAC9D,SAAO,MAAM,WAAW,GAAG,uBAAuB,IAAI,GAAG;AAEzD,QAAM,CAAE,QAAQ,KAAM,IAAI,aACxB,CAAE,eAAe,UAAW,IAC5B,CAAE,UAAU,aAAc;AAC5B,SAAO,OAAO,uBAAuB,IAAI,GAAG;AAE5C,SAAO,OAAG,8BAAO,UAAU,QAAQ,CAAC,QAAI,8BAAO,KAAK,CAAC;AACvD;",
+  "names": []
+}

package/dist/utils.d.ts

@@ -0,0 +1,4 @@
+export declare function assert(assertion: any, message: string): asserts assertion;
+export declare function assertArray(value: any, message: string): asserts value is any[];
+export declare function assertObject(value: any, message: string): asserts value is object;
+export declare function encodeSchemaAndName(name: string): string;

package/dist/utils.mjs

@@ -0,0 +1,25 @@
+// utils.ts
+import { escape } from "@juit/pgproxy-client";
+function assert(assertion, message) {
+  if (!assertion) throw new Error(message);
+}
+function assertArray(value, message) {
+  assert(Array.isArray(value), message);
+}
+function assertObject(value, message) {
+  assert(value && typeof value === "object", message);
+}
+function encodeSchemaAndName(name) {
+  const [schemaOrTable, maybeTable, ...extra] = name.split(".");
+  assert(extra.length === 0, `Invalid table name "${name}"`);
+  const [schema, table] = maybeTable ? [schemaOrTable, maybeTable] : ["public", schemaOrTable];
+  assert(table, `Invalid table name "${name}"`);
+  return `${escape(schema || "public")}.${escape(table)}`;
+}
+export {
+  assert,
+  assertArray,
+  assertObject,
+  encodeSchemaAndName
+};
+//# sourceMappingURL=utils.mjs.map

package/dist/utils.mjs.map

@@ -0,0 +1,6 @@
+{
+  "version": 3,
+  "sources": ["../src/utils.ts"],
+  "mappings": ";AAAA,SAAS,cAAc;AAMhB,SAAS,OAAO,WAAgB,SAAoC;AACzE,MAAI,CAAE,UAAW,OAAM,IAAI,MAAM,OAAO;AAC1C;AAEO,SAAS,YAAY,OAAY,SAAyC;AAC/E,SAAO,MAAM,QAAQ,KAAK,GAAG,OAAO;AACtC;AAEO,SAAS,aAAa,OAAY,SAA0C;AACjF,SAAO,SAAU,OAAO,UAAU,UAAW,OAAO;AACtD;AAMO,SAAS,oBAAoB,MAAsB;AACxD,QAAM,CAAE,eAAe,YAAY,GAAG,KAAM,IAAI,KAAK,MAAM,GAAG;AAC9D,SAAO,MAAM,WAAW,GAAG,uBAAuB,IAAI,GAAG;AAEzD,QAAM,CAAE,QAAQ,KAAM,IAAI,aACxB,CAAE,eAAe,UAAW,IAC5B,CAAE,UAAU,aAAc;AAC5B,SAAO,OAAO,uBAAuB,IAAI,GAAG;AAE5C,SAAO,GAAG,OAAO,UAAU,QAAQ,CAAC,IAAI,OAAO,KAAK,CAAC;AACvD;",
+  "names": []
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@juit/pgproxy-persister",
-  "version": "1.3.7",
+  "version": "1.4.0",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -53,7 +53,7 @@
     "src/"
   ],
   "dependencies": {
-    "@juit/pgproxy-client": "1.3.7",
-    "@juit/pgproxy-types": "1.3.7"
+    "@juit/pgproxy-client": "1.4.0",
+    "@juit/pgproxy-types": "1.4.0"
   }
 }

package/src/index.ts

@@ -2,3 +2,4 @@
 export { escape, SQL } from '@juit/pgproxy-client'
 export * from './model'
 export * from './persister'
+export * from './search'