@snowtop/ent 0.1.0-alpha155 → 0.1.0-alpha157

package/core/clause.d.ts

@@ -11,10 +11,12 @@ export interface SensitiveValue {
     value(): any;
     logValue(): any;
 }
+type InClauseOperator = "IN" | "NOT IN";
 export declare class inClause<T extends Data, K = keyof T> implements Clause<T, K> {
     private col;
     private value;
     private type;
+    protected op: InClauseOperator;
     static getPostgresInClauseValuesThreshold(): number;
     constructor(col: K, value: any[], type?: string);
     clause(idx: number): string;
@@ -23,6 +25,9 @@ export declare class inClause<T extends Data, K = keyof T> implements Clause<T,
     logValues(): any[];
     instanceKey(): string;
 }
+export declare class notInClause<T extends Data, K = keyof T> extends inClause<T, K> {
+    protected op: InClauseOperator;
+}
 /**
  * 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
@@ -89,6 +94,10 @@ export declare function UuidIn<T extends Data, K = keyof T>(col: K, values: ID[]
 export declare function IntegerIn<T extends Data, K = keyof T>(col: K, values: number[]): Clause<T, K>;
 export declare function TextIn<T extends Data, K = keyof T>(col: K, values: any[]): Clause<T, K>;
 export declare function DBTypeIn<T extends Data, K = keyof T>(col: K, values: any[], typ: string): Clause<T, K>;
+export declare function UuidNotIn<T extends Data, K = keyof T>(col: K, values: ID[]): Clause<T, K>;
+export declare function IntegerNotIn<T extends Data, K = keyof T>(col: K, values: number[]): Clause<T, K>;
+export declare function TextNotIn<T extends Data, K = keyof T>(col: K, values: any[]): Clause<T, K>;
+export declare function DBTypeNotIn<T extends Data, K = keyof T>(col: K, values: any[], typ: string): Clause<T, K>;
 interface TsQuery {
     language: "english" | "french" | "german" | "simple";
     value: string;

package/core/clause.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCombinedClause = exports.Modulo = exports.Divide = exports.Multiply = exports.Subtract = exports.Add = exports.PaginationMultipleColsSubQuery = exports.JSONPathValuePredicate = exports.JSONObjectFieldKeyAsText = exports.JSONObjectFieldKeyASJSON = exports.sensitiveValue = exports.TsVectorWebsearchToTsQuery = exports.TsVectorPhraseToTsQuery = exports.TsVectorPlainToTsQuery = exports.TsVectorColTsQuery = exports.WebsearchToTsQuery = exports.PhraseToTsQuery = exports.PlainToTsQuery = exports.TsQuery = exports.DBTypeIn = exports.TextIn = exports.IntegerIn = exports.UuidIn = exports.In = exports.OrOptional = 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 = exports.inClause = void 0;
+exports.getCombinedClause = exports.Modulo = exports.Divide = exports.Multiply = exports.Subtract = exports.Add = exports.PaginationMultipleColsSubQuery = exports.JSONPathValuePredicate = exports.JSONObjectFieldKeyAsText = exports.JSONObjectFieldKeyASJSON = exports.sensitiveValue = exports.TsVectorWebsearchToTsQuery = exports.TsVectorPhraseToTsQuery = exports.TsVectorPlainToTsQuery = exports.TsVectorColTsQuery = exports.WebsearchToTsQuery = exports.PhraseToTsQuery = exports.PlainToTsQuery = exports.TsQuery = exports.DBTypeNotIn = exports.TextNotIn = exports.IntegerNotIn = exports.UuidNotIn = exports.DBTypeIn = exports.TextIn = exports.IntegerIn = exports.UuidIn = exports.In = exports.OrOptional = 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 = exports.notInClause = exports.inClause = void 0;
 const db_1 = __importStar(require("./db"));
 function isSensitive(val) {
     return (val !== null &&
@@ -236,11 +236,17 @@ class inClause {
         this.col = col;
         this.value = value;
         this.type = type;
+        this.op = "IN";
     }
     clause(idx) {
         // do a simple = when only one item
         if (this.value.length === 1) {
-            return new simpleClause(this.col, this.value[0], "=").clause(idx);
+            if (this.op === "IN") {
+                return new simpleClause(this.col, this.value[0], "=").clause(idx);
+            }
+            else {
+                return new simpleClause(this.col, this.value[0], "!=").clause(idx);
+            }
         }
         const postgres = db_1.default.getDialect() === db_1.Dialect.Postgres;
         const postgresValuesList = postgres &&
@@ -272,7 +278,7 @@ class inClause {
         if (postgresValuesList) {
             inValue = `VALUES${inValue}`;
         }
-        return `${this.col} IN (${inValue})`;
+        return `${this.col} ${this.op} (${inValue})`;
         // TODO we need to return idx at end to query builder...
         // or anything that's doing a composite query so next clause knows where to start
         // or change to a sqlx.Rebind format
@@ -296,10 +302,17 @@ class inClause {
         return result;
     }
     instanceKey() {
-        return `in:${this.col}:${this.values().join(",")}`;
+        return `${this.op.toLowerCase()}:${this.col}:${this.values().join(",")}`;
     }
 }
 exports.inClause = inClause;
+class notInClause extends inClause {
+    constructor() {
+        super(...arguments);
+        this.op = "NOT IN";
+    }
+}
+exports.notInClause = notInClause;
 class compositeClause {
     constructor(clauses, sep) {
         this.clauses = clauses;
@@ -570,6 +583,26 @@ function DBTypeIn(col, values, typ) {
     return new inClause(col, values, typ);
 }
 exports.DBTypeIn = DBTypeIn;
+function UuidNotIn(col, values) {
+    return new notInClause(col, values, "uuid");
+}
+exports.UuidNotIn = UuidNotIn;
+function IntegerNotIn(col, values) {
+    return new notInClause(col, values, "integer");
+}
+exports.IntegerNotIn = IntegerNotIn;
+function TextNotIn(col, values) {
+    return new notInClause(col, values, "text");
+}
+exports.TextNotIn = TextNotIn;
+/*
+ * if not uuid or text, pass the db type that can be used to cast this query
+ * if we end up with a large list of ids
+ */
+function DBTypeNotIn(col, values, typ) {
+    return new notInClause(col, values, typ);
+}
+exports.DBTypeNotIn = DBTypeNotIn;
 // if string defaults to english
 // https://www.postgresql.org/docs/current/textsearch-controls.html#TEXTSEARCH-PARSING-QUERIES
 // to_tsquery

package/index.d.ts

@@ -23,6 +23,10 @@ declare const query: {
     IntegerIn: typeof q.IntegerIn;
     TextIn: typeof q.TextIn;
     DBTypeIn: typeof q.DBTypeIn;
+    UuidNotIn: typeof q.UuidNotIn;
+    IntegerNotIn: typeof q.IntegerNotIn;
+    TextNotIn: typeof q.TextNotIn;
+    DBTypeNotIn: typeof q.DBTypeNotIn;
     Greater: typeof q.Greater;
     Less: typeof q.Less;
     GreaterEq: typeof q.GreaterEq;

package/index.js

@@ -126,6 +126,10 @@ const query = {
     IntegerIn: q.IntegerIn,
     TextIn: q.TextIn,
     DBTypeIn: q.DBTypeIn,
+    UuidNotIn: q.UuidNotIn,
+    IntegerNotIn: q.IntegerNotIn,
+    TextNotIn: q.TextNotIn,
+    DBTypeNotIn: q.DBTypeNotIn,
     Greater: q.Greater,
     Less: q.Less,
     GreaterEq: q.GreaterEq,

package/package.json

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