@snowtop/ent 0.1.0-alpha61 → 0.1.0-alpha63

package/core/clause.d.ts

@@ -56,6 +56,18 @@ export declare function PostgresArrayNotContainsValue(col: string, value: any):
  * https://www.postgresql.org/docs/current/indexes-types.html#INDEXES-TYPES-GIN
  */
 export declare function PostgresArrayNotContains(col: string, value: any[]): Clause;
+/**
+ * creates a clause to determine if the arrays overlap, that is, do they have any elements in common
+ * only works with postgres gin indexes
+ * https://www.postgresql.org/docs/current/indexes-types.html#INDEXES-TYPES-GIN
+ */
+export declare function PostgresArrayOverlaps(col: string, value: any[]): Clause;
+/**
+ * creates a clause to determine if the arrays do not overlap, that is, do they have any elements in common
+ * only works with postgres gin indexes
+ * https://www.postgresql.org/docs/current/indexes-types.html#INDEXES-TYPES-GIN
+ */
+export declare function PostgresArrayNotOverlaps(col: string, value: any[]): Clause;
 /**
  * @deprecated use PostgresArrayContainsValue
  */

package/core/clause.js

@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sensitiveValue = exports.TsVectorWebsearchToTsQuery = exports.TsVectorPhraseToTsQuery = exports.TsVectorPlainToTsQuery = exports.TsVectorColTsQuery = exports.WebsearchToTsQuery = exports.PhraseToTsQuery = exports.PlainToTsQuery = exports.TsQuery = exports.In = exports.Or = exports.AndOptional = exports.And = exports.LessEq = exports.GreaterEq = exports.Less = exports.Greater = exports.NotEq = exports.Eq = exports.ArrayNotEq = exports.ArrayEq = exports.PostgresArrayNotContains = exports.PostgresArrayNotContainsValue = exports.PostgresArrayContains = exports.PostgresArrayContainsValue = void 0;
+exports.sensitiveValue = exports.TsVectorWebsearchToTsQuery = exports.TsVectorPhraseToTsQuery = exports.TsVectorPlainToTsQuery = exports.TsVectorColTsQuery = exports.WebsearchToTsQuery = exports.PhraseToTsQuery = exports.PlainToTsQuery = exports.TsQuery = exports.In = exports.Or = exports.AndOptional = exports.And = exports.LessEq = exports.GreaterEq = exports.Less = exports.Greater = exports.NotEq = exports.Eq = exports.ArrayNotEq = exports.ArrayEq = exports.PostgresArrayNotOverlaps = exports.PostgresArrayOverlaps = exports.PostgresArrayNotContains = exports.PostgresArrayNotContainsValue = exports.PostgresArrayContains = exports.PostgresArrayContainsValue = void 0;
 const db_1 = __importStar(require("./db"));
 function isSensitive(val) {
     return (val !== null &&
@@ -157,18 +157,19 @@ class arraySimpleClause {
         return `${this.col}${this.op}${rawValue(this.value)}`;
     }
 }
-class postgresArrayContains {
-    constructor(col, value, not) {
+class postgresArrayOperator {
+    constructor(col, value, op, not) {
         this.col = col;
         this.value = value;
+        this.op = op;
         this.not = not;
     }
     clause(idx) {
         if (db_1.default.getDialect() === db_1.Dialect.Postgres) {
             if (this.not) {
-                return `NOT ${this.col} @> $${idx}`;
+                return `NOT ${this.col} ${this.op} $${idx}`;
             }
-            return `${this.col} @> $${idx}`;
+            return `${this.col} ${this.op} $${idx}`;
         }
         throw new Error(`not supported`);
     }
@@ -189,14 +190,14 @@ class postgresArrayContains {
     }
     instanceKey() {
         if (this.not) {
-            return `NOT:${this.col}@>${rawValue(this.value)}`;
+            return `NOT:${this.col}${this.op}${rawValue(this.value)}`;
         }
-        return `${this.col}@>${rawValue(this.value)}`;
+        return `${this.col}${this.op}${rawValue(this.value)}`;
     }
 }
-class postgresArrayContainsList extends postgresArrayContains {
-    constructor(col, value, not) {
-        super(col, value, not);
+class postgresArrayOperatorList extends postgresArrayOperator {
+    constructor(col, value, op, not) {
+        super(col, value, op, not);
     }
     values() {
         return [
@@ -374,13 +375,15 @@ class websearchTosQueryClause extends tsQueryClause {
         return "websearch_to_tsquery";
     }
 }
+// postgres array operators
+// https://www.postgresql.org/docs/current/functions-array.html
 /**
  * creates a clause to determine if the given value is contained in the array stored in the column in the db
  * only works with postgres gin indexes
  * https://www.postgresql.org/docs/current/indexes-types.html#INDEXES-TYPES-GIN
  */
 function PostgresArrayContainsValue(col, value) {
-    return new postgresArrayContains(col, value);
+    return new postgresArrayOperator(col, value, "@>");
 }
 exports.PostgresArrayContainsValue = PostgresArrayContainsValue;
 /**
@@ -389,7 +392,7 @@ exports.PostgresArrayContainsValue = PostgresArrayContainsValue;
  * https://www.postgresql.org/docs/current/indexes-types.html#INDEXES-TYPES-GIN
  */
 function PostgresArrayContains(col, value) {
-    return new postgresArrayContainsList(col, value);
+    return new postgresArrayOperatorList(col, value, "@>");
 }
 exports.PostgresArrayContains = PostgresArrayContains;
 /**
@@ -398,7 +401,7 @@ exports.PostgresArrayContains = PostgresArrayContains;
  * https://www.postgresql.org/docs/current/indexes-types.html#INDEXES-TYPES-GIN
  */
 function PostgresArrayNotContainsValue(col, value) {
-    return new postgresArrayContains(col, value, true);
+    return new postgresArrayOperator(col, value, "@>", true);
 }
 exports.PostgresArrayNotContainsValue = PostgresArrayNotContainsValue;
 /**
@@ -407,9 +410,27 @@ exports.PostgresArrayNotContainsValue = PostgresArrayNotContainsValue;
  * https://www.postgresql.org/docs/current/indexes-types.html#INDEXES-TYPES-GIN
  */
 function PostgresArrayNotContains(col, value) {
-    return new postgresArrayContainsList(col, value, true);
+    return new postgresArrayOperatorList(col, value, "@>", true);
 }
 exports.PostgresArrayNotContains = PostgresArrayNotContains;
+/**
+ * creates a clause to determine if the arrays overlap, that is, do they have any elements in common
+ * only works with postgres gin indexes
+ * https://www.postgresql.org/docs/current/indexes-types.html#INDEXES-TYPES-GIN
+ */
+function PostgresArrayOverlaps(col, value) {
+    return new postgresArrayOperatorList(col, value, "&&");
+}
+exports.PostgresArrayOverlaps = PostgresArrayOverlaps;
+/**
+ * creates a clause to determine if the arrays do not overlap, that is, do they have any elements in common
+ * only works with postgres gin indexes
+ * https://www.postgresql.org/docs/current/indexes-types.html#INDEXES-TYPES-GIN
+ */
+function PostgresArrayNotOverlaps(col, value) {
+    return new postgresArrayOperatorList(col, value, "&&", true);
+}
+exports.PostgresArrayNotOverlaps = PostgresArrayNotOverlaps;
 /**
  * @deprecated use PostgresArrayContainsValue
  */

package/index.d.ts

@@ -24,6 +24,8 @@ declare const query: {
     PostgresArrayContains: typeof q.PostgresArrayContains;
     PostgresArrayNotContainsValue: typeof q.PostgresArrayNotContainsValue;
     PostgresArrayNotContains: typeof q.PostgresArrayNotContains;
+    PostgresArrayOverlaps: typeof q.PostgresArrayOverlaps;
+    PostgresArrayNotOverlaps: typeof q.PostgresArrayNotOverlaps;
     TsQuery: typeof q.TsQuery;
     PlainToTsQuery: typeof q.PlainToTsQuery;
     PhraseToTsQuery: typeof q.PhraseToTsQuery;

package/index.js

@@ -121,6 +121,8 @@ const query = {
     PostgresArrayContains: q.PostgresArrayContains,
     PostgresArrayNotContainsValue: q.PostgresArrayNotContainsValue,
     PostgresArrayNotContains: q.PostgresArrayNotContains,
+    PostgresArrayOverlaps: q.PostgresArrayOverlaps,
+    PostgresArrayNotOverlaps: q.PostgresArrayNotOverlaps,
     TsQuery: q.TsQuery,
     PlainToTsQuery: q.PlainToTsQuery,
     PhraseToTsQuery: q.PhraseToTsQuery,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.0-alpha61",
+  "version": "0.1.0-alpha63",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",