@snowtop/ent 0.1.0-alpha150 → 0.1.0-alpha152

package/core/base.d.ts

@@ -72,6 +72,7 @@ export interface SelectBaseDataOptions extends DataOptions {
 }
 export interface SelectDataOptions extends SelectBaseDataOptions {
     key: string;
+    keyType?: string;
     clause?: clause.Clause | (() => clause.Clause | undefined);
 }
 export interface QueryableDataOptions extends SelectBaseDataOptions, QueryDataOptions {

package/core/clause.d.ts

@@ -1,4 +1,4 @@
-import { Data, SelectDataOptions } from "./base";
+import { Data, ID, SelectDataOptions } from "./base";
 export interface Clause<T extends Data = Data, K = keyof T> {
     clause(idx: number): string;
     columns(): K[];
@@ -77,8 +77,18 @@ export declare function And<T extends Data, K = keyof T>(...args: 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>[]): Clause<T, K>;
 export declare function OrOptional<T extends Data, K = keyof T>(...args: (Clause<T, K> | undefined)[]): Clause<T, K>;
+/**
+ * @deprecated use UUidIn, TextIn, IntegerIn, or TypeIn
+ */
 export declare function In<T extends Data, K = keyof T>(col: K, ...values: any): Clause<T, K>;
+/**
+ * @deprecated use UUidIn, TextIn, IntegerIn, or TypeIn
+ */
 export declare function In<T extends Data, K = keyof T>(col: K, values: any[], type?: string): Clause<T, K>;
+export declare function UuidIn<T extends Data, K = keyof T>(col: K, values: ID[]): Clause<T, K>;
+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>;
 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.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.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;
 const db_1 = __importStar(require("./db"));
 function isSensitive(val) {
     return (val !== null &&
@@ -550,6 +550,26 @@ function In(...args) {
     return new inClause(args[0], args.slice(1));
 }
 exports.In = In;
+function UuidIn(col, values) {
+    return new inClause(col, values, "uuid");
+}
+exports.UuidIn = UuidIn;
+function IntegerIn(col, values) {
+    return new inClause(col, values, "integer");
+}
+exports.IntegerIn = IntegerIn;
+function TextIn(col, values) {
+    return new inClause(col, values, "text");
+}
+exports.TextIn = TextIn;
+/*
+ * 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 DBTypeIn(col, values, typ) {
+    return new inClause(col, values, typ);
+}
+exports.DBTypeIn = DBTypeIn;
 // if string defaults to english
 // https://www.postgresql.org/docs/current/textsearch-controls.html#TEXTSEARCH-PARSING-QUERIES
 // to_tsquery

package/core/ent.js

@@ -99,9 +99,11 @@ function createDataLoader(options) {
             return [];
         }
         let col = options.key;
+        // defaults to uuid
+        let typ = options.keyType || "uuid";
         const rowOptions = {
             ...options,
-            clause: clause.In(col, ...ids),
+            clause: clause.DBTypeIn(col, ids, typ),
         };
         // TODO is there a better way of doing this?
         // context not needed because we're creating a loader which has its own cache which is being used here
@@ -1162,7 +1164,7 @@ async function getEdgeTypeInGroup(viewer, id1, id2, m) {
     tableToEdgeEnumMap.forEach((edgeEnums, tableName) => {
         promises.push((async () => {
             const edgeTypes = edgeEnums.map((edgeEnum) => m.get(edgeEnum));
-            const { cls, fields } = getEdgeClauseAndFields(clause.And(clause.Eq("id1", id1), clause.In("edge_type", edgeTypes), clause.Eq("id2", id2)), {});
+            const { cls, fields } = getEdgeClauseAndFields(clause.And(clause.Eq("id1", id1), clause.UuidIn("edge_type", edgeTypes), clause.Eq("id2", id2)), {});
             const rows = await loadRows({
                 tableName,
                 fields,

package/core/loaders/object_loader.js

@@ -36,7 +36,7 @@ const loader_1 = require("./loader");
 const memoizee_1 = __importDefault(require("memoizee"));
 async function loadRowsForIDLoader(options, ids, context) {
     let col = options.key;
-    const cls = (0, clause_1.getCombinedClause)(options, clause.In(col, ...ids));
+    const cls = (0, clause_1.getCombinedClause)(options, clause.DBTypeIn(col, ids, options.keyType || "uuid"));
     const rowOptions = {
         ...options,
         clause: cls,

package/core/loaders/raw_count_loader.d.ts

@@ -4,6 +4,7 @@ import * as clause from "../clause";
 interface QueryCountOptions {
     tableName: string;
     groupCol?: string;
+    groupColType?: string;
     clause?: clause.Clause;
 }
 export declare function createCountDataLoader<K extends any>(options: QueryCountOptions): DataLoader<K, number, K>;

package/core/loaders/raw_count_loader.js

@@ -69,7 +69,8 @@ function createCountDataLoader(options) {
         if (keys.length == 1 || !options.groupCol) {
             return simpleCase(options, keys[0]);
         }
-        let cls = clause.In(options.groupCol, ...keys);
+        let typ = options.groupColType || "uuid";
+        let cls = clause.DBTypeIn(options.groupCol, keys, typ);
         if (options.clause) {
             cls = clause.And(cls, options.clause);
         }

package/core/query/query.js

@@ -120,7 +120,7 @@ class FirstFilter {
             }
         }
         else {
-            options.orderby = `${this.sortCol}${nullsPlacement} ${orderby}`;
+            options.orderby = `${this.sortCol} ${orderby}${nullsPlacement}`;
             if (this.offset) {
                 let clauseFn = less ? clause.Less : clause.Greater;
                 let val = this.options.sortColTime

package/index.d.ts

@@ -18,6 +18,10 @@ declare const query: {
     Or: typeof q.Or;
     OrOptional: typeof q.OrOptional;
     In: typeof q.In;
+    UuidIn: typeof q.UuidIn;
+    IntegerIn: typeof q.IntegerIn;
+    TextIn: typeof q.TextIn;
+    DBTypeIn: typeof q.DBTypeIn;
     Greater: typeof q.Greater;
     Less: typeof q.Less;
     GreaterEq: typeof q.GreaterEq;

package/index.js

@@ -121,6 +121,10 @@ const query = {
     Or: q.Or,
     OrOptional: q.OrOptional,
     In: q.In,
+    UuidIn: q.UuidIn,
+    IntegerIn: q.IntegerIn,
+    TextIn: q.TextIn,
+    DBTypeIn: q.DBTypeIn,
     Greater: q.Greater,
     Less: q.Less,
     GreaterEq: q.GreaterEq,

package/package.json

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