pqb 0.43.3 → 0.43.5

package/dist/index.d.ts

@@ -1667,8 +1667,18 @@ interface OperatorsJson extends Base<unknown> {
 }
 type OperatorsAny = Base<any>;
 type OperatorsDate = Ord<Date | string>;
-type OperatorsArray = Base<any>;
 type OperatorsTime = Ord<string>;
+interface OperatorsArray<T> extends Base<T[]> {
+    has: Operator<T | IsQuery | Expression, BooleanQueryColumn>;
+    hasEvery: Operator<T[] | IsQuery | Expression, BooleanQueryColumn>;
+    hasSome: Operator<T[] | IsQuery | Expression, BooleanQueryColumn>;
+    containedIn: Operator<T[] | IsQuery | Expression, BooleanQueryColumn>;
+    length: {
+        _opType: number | {
+            [K in keyof OperatorsNumber]?: OperatorsNumber[K]['_opType'];
+        };
+    };
+}
 declare const Operators: {
     any: OperatorsAny;
     boolean: OperatorsBoolean;
@@ -1677,7 +1687,7 @@ declare const Operators: {
     time: OperatorsTime;
     text: OperatorsText;
     json: OperatorsJson;
-    array: OperatorsArray;
+    array: OperatorsArray<unknown>;
 };
 
 declare class ColumnRefExpression<T extends QueryColumn> extends Expression<T> {
@@ -2675,9 +2685,9 @@ interface ArrayData<Item extends ArrayColumnValue> extends ColumnData, ArrayMeth
     item: Item;
     arrayDims: number;
 }
-declare class ArrayColumn<Schema extends ColumnTypeSchemaArg, Item extends ArrayColumnValue, InputType, OutputType, QueryType> extends ColumnType<Schema, Item['type'][], InputType, OperatorsArray, Item['inputType'][], Item['outputType'][], OutputType, Item['queryType'][], QueryType> {
+declare class ArrayColumn<Schema extends ColumnTypeSchemaArg, Item extends ArrayColumnValue, InputType, OutputType, QueryType> extends ColumnType<Schema, Item['type'][], InputType, OperatorsArray<Item['queryType']>, Item['inputType'][], Item['outputType'][], OutputType, Item['queryType'][], QueryType> {
     dataType: "array";
-    operators: OperatorsArray;
+    operators: OperatorsArray<Item["queryType"]>;
     data: ArrayData<Item>;
     constructor(schema: Schema, item: Item, inputType: InputType, outputType?: OutputType, queryType?: QueryType);
     toSQL(): string;
@@ -3748,8 +3758,8 @@ type NullableJSONAggReturn<T extends PickQueryMeta, Arg extends SelectableOrExpr
     type: (ExpressionOutput<T, Arg>['type'] | null)[] | null;
     outputType: (ExpressionOutput<T, Arg>['outputType'] | null)[] | null;
     queryType: (ExpressionOutput<T, Arg>['queryType'] | null)[] | null;
-    operators: OperatorsArray;
-}> & OperatorsArray;
+    operators: OperatorsArray<never>;
+}> & OperatorsArray<never>;
 interface RecordSelectableOrExpression<T extends PickQueryMeta> {
     [K: string]: SelectableOrExpression<T>;
 }

package/dist/index.js

@@ -1003,9 +1003,9 @@ const makeVarArg = (_op) => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   );
 };
-const quoteValue = (arg, ctx, quotedAs, jsonArray) => {
+const quoteValue = (arg, ctx, quotedAs, IN) => {
   if (arg && typeof arg === "object") {
-    if (!jsonArray && Array.isArray(arg)) {
+    if (IN && Array.isArray(arg)) {
       return `(${arg.map((value) => orchidCore.addValue(ctx.values, value)).join(", ")})`;
     }
     if (orchidCore.isExpression(arg)) {
@@ -1041,10 +1041,10 @@ const base = {
     (key, value, ctx, quotedAs) => value === null ? `${key} IS NOT NULL` : `${key} <> ${quoteValue(value, ctx, quotedAs)}`
   ),
   in: make(
-    (key, value, ctx, quotedAs) => `${key} IN ${quoteValue(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => `${key} IN ${quoteValue(value, ctx, quotedAs, true)}`
   ),
   notIn: make(
-    (key, value, ctx, quotedAs) => `NOT ${key} IN ${quoteValue(value, ctx, quotedAs)}`
+    (key, value, ctx, quotedAs) => `NOT ${key} IN ${quoteValue(value, ctx, quotedAs, true)}`
   )
 };
 const boolean = {
@@ -1126,10 +1126,10 @@ const json = {
     { _op: jsonPathQueryOp }
   ),
   jsonSupersetOf: make(
-    (key, value, ctx, quotedAs) => `${key} @> ${quoteValue(value, ctx, quotedAs, true)}`
+    (key, value, ctx, quotedAs) => `${key} @> ${quoteValue(value, ctx, quotedAs)}`
   ),
   jsonSubsetOf: make(
-    (key, value, ctx, quotedAs) => `${key} <@ ${quoteValue(value, ctx, quotedAs, true)}`
+    (key, value, ctx, quotedAs) => `${key} <@ ${quoteValue(value, ctx, quotedAs)}`
   ),
   jsonSet: makeVarArg(
     (key, [path, value], ctx) => `jsonb_set(${key}, ${encodeJsonPath(ctx, path)}, ${orchidCore.addValue(
@@ -1153,6 +1153,30 @@ const json = {
     (key, [path], ctx) => `(${key} #- ${encodeJsonPath(ctx, path)})`
   )
 };
+const array = {
+  ...base,
+  has: make(
+    (key, value, ctx, quotedAs) => `${quoteValue(value, ctx, quotedAs)} = ANY(${key})`
+  ),
+  hasEvery: make(
+    (key, value, ctx, quotedAs) => `${key} @> ${quoteValue(value, ctx, quotedAs)}`
+  ),
+  hasSome: make(
+    (key, value, ctx, quotedAs) => `${key} && ${quoteValue(value, ctx, quotedAs)}`
+  ),
+  containedIn: make(
+    (key, value, ctx, quotedAs) => `${key} <@ ${quoteValue(value, ctx, quotedAs)}`
+  ),
+  length: make((key, value, ctx, quotedAs) => {
+    const expr = `COALESCE(array_length(${key}, 1), 0)`;
+    return typeof value === "number" ? `${expr} = ${quoteValue(value, ctx, quotedAs)}` : Object.keys(value).map(
+      (key2) => (
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        numeric[key2]._op(expr, value[key2], ctx, quotedAs)
+      )
+    ).join(" AND ");
+  })
+};
 const Operators = {
   any: base,
   boolean,
@@ -1161,7 +1185,7 @@ const Operators = {
   time: numeric,
   text,
   json,
-  array: base
+  array
 };
 
 class TextBaseColumn extends ColumnType {
@@ -2138,7 +2162,7 @@ const processWhere = (ands, ctx, table, query, data, quotedAs) => {
     } else if (key === "SEARCH") {
       const search = value;
       ands.push(`${search.vectorSQL} @@ "${search.as}"`);
-    } else if (typeof value === "object" && value && !(value instanceof Date)) {
+    } else if (typeof value === "object" && value && !(value instanceof Date) && !Array.isArray(value)) {
       if (orchidCore.isExpression(value)) {
         ands.push(
           `${columnToSql(
@@ -3685,6 +3709,7 @@ class ArrayColumn extends ColumnType {
   }
 }
 const parse = function(source) {
+  if (typeof source !== "string") return source;
   const entries = [];
   parsePostgresArray(source, entries, this.data.item.data.parseItem);
   return entries;
@@ -6634,7 +6659,14 @@ const pushCopySql = (ctx, table, query, quotedAs) => {
 
 const toSQLCacheKey = Symbol("toSQLCache");
 const toSQL = (table, options) => {
-  return !options?.clearCache && table.q[toSQLCacheKey] || (table.q[toSQLCacheKey] = makeSQL(table, options));
+  if (table.q[toSQLCacheKey] && !options?.clearCache) {
+    const cached = table.q[toSQLCacheKey];
+    if (options?.values && "values" in cached && cached.values && options.values !== cached.values) {
+      options.values.push(...cached.values);
+    }
+    return cached;
+  }
+  return table.q[toSQLCacheKey] = makeSQL(table, options);
 };
 const makeSQL = (table, options) => {
   const query = table.q;
@@ -7491,6 +7523,7 @@ function makeFnExpression(self, type, fn, args, options) {
     options,
     type
   );
+  q.q.transform = void 0;
   return q;
 }