@snowtop/ent 0.1.0-alpha117 → 0.1.0-alpha118

package/core/clause.d.ts

@@ -23,17 +23,6 @@ export declare class inClause<T extends Data, K = keyof T> implements Clause<T,
     logValues(): any[];
     instanceKey(): string;
 }
-declare class compositeClause<T extends Data, K = keyof T> implements Clause<T, K> {
-    private clauses;
-    private sep;
-    compositeOp: string;
-    constructor(clauses: Clause<T, K>[], sep: string);
-    clause(idx: number): string;
-    columns(): K[];
-    values(): any[];
-    logValues(): any[];
-    instanceKey(): string;
-}
 /**
  * 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
@@ -84,9 +73,9 @@ export declare function Greater<T extends Data, K = keyof T>(col: K, value: any)
 export declare function Less<T extends Data, K = keyof T>(col: K, value: any): Clause<T, K>;
 export declare function GreaterEq<T extends Data, K = keyof T>(col: K, value: any): Clause<T, K>;
 export declare function LessEq<T extends Data, K = keyof T>(col: K, value: any): Clause<T, K>;
-export declare function And<T extends Data, K = keyof T>(...args: Clause<T, K>[]): compositeClause<T, K>;
+export declare function And<T extends Data, K = keyof T>(...args: Clause<T, K>[]): Clause<T, K>;
 export declare function AndOptional<T extends Data, K = keyof T>(...args: (Clause<T, K> | undefined)[]): Clause<T, K>;
-export declare function Or<T extends Data, K = keyof T>(...args: Clause<T, K>[]): compositeClause<T, K>;
+export declare function Or<T extends Data, K = keyof T>(...args: Clause<T, K>[]): Clause<T, K>;
 export declare function OrOptional<T extends Data, K = keyof T>(...args: (Clause<T, K> | undefined)[]): Clause<T, K>;
 export declare function In<T extends Data, K = keyof T>(col: K, ...values: any): Clause<T, K>;
 export declare function In<T extends Data, K = keyof T>(col: K, values: any[], type?: string): Clause<T, K>;
@@ -103,25 +92,11 @@ export declare function TsVectorPlainToTsQuery<T extends Data, K = keyof T>(col:
 export declare function TsVectorPhraseToTsQuery<T extends Data, K = keyof T>(col: K, val: string | TsQuery): Clause<T, K>;
 export declare function TsVectorWebsearchToTsQuery<T extends Data, K = keyof T>(col: K, val: string | TsQuery): Clause<T, K>;
 export declare function sensitiveValue(val: any): SensitiveValue;
-export declare function JSONObjectFieldKeyASJSON<T extends Data, K = keyof T>(col: K, field: string): string;
-export declare function JSONObjectFieldKeyAsText<T extends Data, K = keyof T>(col: K, field: string): string;
+export declare function JSONObjectFieldKeyASJSON<T extends Data, K = keyof T>(col: K, field: string): keyof T;
+export declare function JSONObjectFieldKeyAsText<T extends Data, K = keyof T>(col: K, field: string): keyof T;
 type predicate = "==" | ">" | "<" | "!=" | ">=" | "<=";
 export declare function JSONPathValuePredicate<T extends Data, K = keyof T>(dbCol: K, path: string, val: any, pred: predicate): Clause<T, K>;
-declare class paginationMultipleColumnsSubQueryClause<T extends Data, K = keyof T> implements Clause<T, K> {
-    private col;
-    private op;
-    private tableName;
-    private uniqueCol;
-    private val;
-    constructor(col: K, op: string, tableName: string, uniqueCol: K, val: any);
-    private buildSimpleQuery;
-    clause(idx: number): string;
-    columns(): K[];
-    values(): any[];
-    logValues(): any[];
-    instanceKey(): string;
-}
-export declare function PaginationMultipleColsSubQuery<T extends Data, K = keyof T>(col: K, op: string, tableName: string, uniqueCol: K, val: any): paginationMultipleColumnsSubQueryClause<Data, K>;
+export declare function PaginationMultipleColsSubQuery<T extends Data, K = keyof T>(col: K, op: string, tableName: string, uniqueCol: K, val: any): Clause<T, K>;
 export declare function Add<T extends Data, K = keyof T>(col: K, value: any): Clause<T, K>;
 export declare function Subtract<T extends Data, K = keyof T>(col: K, value: any): Clause<T, K>;
 export declare function Multiply<T extends Data, K = keyof T>(col: K, value: any): Clause<T, K>;

package/core/clause.js

@@ -623,10 +623,12 @@ exports.sensitiveValue = sensitiveValue;
 // see test in db_clause.test.ts
 // unclear best time to use this...
 function JSONObjectFieldKeyASJSON(col, field) {
+    // type as keyof T to make it easier to use in other queries
     return `${col}->'${field}'`;
 }
 exports.JSONObjectFieldKeyASJSON = JSONObjectFieldKeyASJSON;
 function JSONObjectFieldKeyAsText(col, field) {
+    // type as keyof T to make it easier to use in other queries
     return `${col}->>'${field}'`;
 }
 exports.JSONObjectFieldKeyAsText = JSONObjectFieldKeyAsText;

package/package.json

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