@snowtop/ent 0.1.0-alpha122 → 0.1.0-alpha124

package/core/base.d.ts

@@ -1,4 +1,5 @@
 import * as clause from "./clause";
+import { ObjectLoaderFactory } from "./loaders";
 export interface Loader<K, V> {
     context?: Context;
     load(key: K): Promise<V>;
@@ -95,21 +96,21 @@ export interface EditRowOptions extends CreateRowOptions {
     whereClause: clause.Clause;
     expressions?: Map<string, clause.Clause>;
 }
-interface LoadableEntOptions<TEnt extends Ent, TViewer extends Viewer = Viewer> {
-    loaderFactory: LoaderFactoryWithOptions;
+interface LoadableEntOptions<TEnt extends Ent, TViewer extends Viewer = Viewer, TData extends Data = Data> {
+    loaderFactory: ObjectLoaderFactory<TData>;
     ent: EntConstructor<TEnt, TViewer>;
 }
-export interface LoaderFactoryWithOptions extends LoaderFactoryWithLoaderMany<any, Data | null> {
+export interface LoaderFactoryWithOptions<T extends Data = Data> extends LoaderFactoryWithLoaderMany<any, T | null> {
     options?: SelectDataOptions;
 }
-export interface LoadEntOptions<TEnt extends Ent, TViewer extends Viewer = Viewer> extends LoadableEntOptions<TEnt, TViewer>, SelectBaseDataOptions {
+export interface LoadEntOptions<TEnt extends Ent, TViewer extends Viewer = Viewer, TData extends Data = Data> extends LoadableEntOptions<TEnt, TViewer, TData>, SelectBaseDataOptions {
     fieldPrivacy?: Map<string, PrivacyPolicy>;
 }
-export interface SelectCustomDataOptions extends SelectBaseDataOptions {
-    loaderFactory: LoaderFactoryWithOptions;
+export interface SelectCustomDataOptions<T extends Data = Data> extends SelectBaseDataOptions {
+    loaderFactory: ObjectLoaderFactory<T>;
     prime?: boolean;
 }
-export interface LoadCustomEntOptions<TEnt extends Ent, TViewer extends Viewer = Viewer> extends SelectCustomDataOptions {
+export interface LoadCustomEntOptions<TEnt extends Ent, TViewer extends Viewer = Viewer, TData extends Data = Data> extends SelectCustomDataOptions<TData> {
     ent: EntConstructor<TEnt, TViewer>;
     fieldPrivacy?: Map<string, PrivacyPolicy>;
 }

package/core/clause.d.ts

@@ -1,4 +1,4 @@
-import { Data } from "./base";
+import { Data, SelectDataOptions } from "./base";
 export interface Clause<T extends Data = Data, K = keyof T> {
     clause(idx: number): string;
     columns(): K[];
@@ -102,4 +102,5 @@ export declare function Subtract<T extends Data, K = keyof T>(col: K, value: any
 export declare function Multiply<T extends Data, K = keyof T>(col: K, value: any): Clause<T, K>;
 export declare function Divide<T extends Data, K = keyof T>(col: K, value: any): Clause<T, K>;
 export declare function Modulo<T extends Data, K = keyof T>(col: K, value: any): Clause<T, K>;
+export declare function getCombinedClause<V extends Data = Data, K = keyof V>(options: Omit<SelectDataOptions, "key">, cls: Clause<V, K>): Clause<V, K>;
 export {};

package/core/clause.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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.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 &&
@@ -731,3 +731,20 @@ function Modulo(col, value) {
     return new simpleClause(col, value, "%", new isNullClause(col));
 }
 exports.Modulo = Modulo;
+function getCombinedClause(options, cls) {
+    if (options.clause) {
+        let optionClause;
+        if (typeof options.clause === "function") {
+            optionClause = options.clause();
+        }
+        else {
+            optionClause = options.clause;
+        }
+        if (optionClause) {
+            // @ts-expect-error different types
+            cls = And(cls, optionClause);
+        }
+    }
+    return cls;
+}
+exports.getCombinedClause = getCombinedClause;

package/core/ent.d.ts

@@ -23,13 +23,13 @@ export declare function loadEntsList<TEnt extends Ent<TViewer>, TViewer extends
  * @deperecated use loadCustomEnts
  */
 export declare function loadEntsFromClause<TEnt extends Ent<TViewer>, TViewer extends Viewer>(viewer: TViewer, clause: clause.Clause, options: LoadEntOptions<TEnt, TViewer>): Promise<Map<ID, TEnt>>;
-export declare function loadCustomEnts<TEnt extends Ent<TViewer>, TViewer extends Viewer, TQueryData extends Data = Data, TResultData extends Data = TQueryData, TKey = keyof TQueryData>(viewer: TViewer, options: LoadCustomEntOptions<TEnt, TViewer>, query: CustomQuery<TQueryData, TKey>): Promise<TEnt[]>;
+export declare function loadCustomEnts<TEnt extends Ent<TViewer>, TViewer extends Viewer, TQueryData extends Data = Data, TResultData extends Data = TQueryData, TKey = keyof TQueryData>(viewer: TViewer, options: LoadCustomEntOptions<TEnt, TViewer, TResultData>, query: CustomQuery<TQueryData, TKey>): Promise<TEnt[]>;
 interface parameterizedQueryOptions {
     query: string;
     values?: any[];
     logValues?: any[];
 }
-export type CustomQuery<T extends Data = Data, K = keyof T> = string | parameterizedQueryOptions | clause.Clause<T, K> | QueryDataOptions;
+export type CustomQuery<T extends Data = Data, K = keyof T> = string | parameterizedQueryOptions | clause.Clause<T, K> | QueryDataOptions<T, K>;
 /**
  * Note that if there's default read transformations (e.g. soft delete) and a clause is passed in
  * either as Clause or QueryDataOptions without {disableTransformations: true}, the default transformation
@@ -53,11 +53,15 @@ export type CustomQuery<T extends Data = Data, K = keyof T> = string | parameter
  *   orderby: 'time',
  *   disableTransformations: false
  *  }) // doesn't change the query
+ *
+ * For queries that pass in a clause, we batch them with an underlying dataloader so that multiple queries with the same clause
+ * or parallel queries with the same clause are batched together.
+ *
+ * If a raw or parameterized query is passed in, we don't attempt to batch them together and they're executed as is.
+ * If you end up with a scenario where you may need to coalesce or batch (non-clause) queries here, you should use some kind of memoization here.
  */
-export declare function loadCustomData<TQueryData extends Data = Data, TResultData extends Data = TQueryData, K = keyof TQueryData>(options: SelectCustomDataOptions, query: CustomQuery<TQueryData, K>, context: Context | undefined): Promise<TResultData[]>;
-interface CustomCountOptions extends DataOptions {
-}
-export declare function loadCustomCount<T extends Data = Data, K = keyof T>(options: CustomCountOptions, query: CustomQuery<T, K>, context: Context | undefined): Promise<number>;
+export declare function loadCustomData<TQueryData extends Data = Data, TResultData extends Data = TQueryData, K = keyof TQueryData>(options: SelectCustomDataOptions<TResultData>, query: CustomQuery<TQueryData, K>, context: Context | undefined): Promise<TResultData[]>;
+export declare function loadCustomCount<T extends Data = Data, K = keyof T>(options: SelectCustomDataOptions<T>, query: CustomQuery<T, K>, context: Context | undefined): Promise<number>;
 export declare function loadDerivedEnt<TEnt extends Ent<TViewer>, TViewer extends Viewer>(viewer: TViewer, data: Data, loader: new (viewer: TViewer, data: Data) => TEnt): Promise<TEnt | null>;
 export declare function loadDerivedEntX<TEnt extends Ent<TViewer>, TViewer extends Viewer>(viewer: TViewer, data: Data, loader: new (viewer: TViewer, data: Data) => TEnt): Promise<TEnt>;
 export declare function logQuery(query: string, logValues: any[]): void;

package/core/ent.js

@@ -397,6 +397,12 @@ function isParameterizedQuery(opts) {
  *   orderby: 'time',
  *   disableTransformations: false
  *  }) // doesn't change the query
+ *
+ * For queries that pass in a clause, we batch them with an underlying dataloader so that multiple queries with the same clause
+ * or parallel queries with the same clause are batched together.
+ *
+ * If a raw or parameterized query is passed in, we don't attempt to batch them together and they're executed as is.
+ * If you end up with a scenario where you may need to coalesce or batch (non-clause) queries here, you should use some kind of memoization here.
  */
 async function loadCustomData(options, query, context) {
     const rows = await loadCustomDataImpl(options, query, context);
@@ -415,7 +421,10 @@ exports.loadCustomData = loadCustomData;
 // NOTE: if you use a raw query or paramterized query with this,
 // you should use `SELECT count(*) as count...`
 async function loadCustomCount(options, query, context) {
-    // TODO also need to loaderify this in case we're querying for this a lot...
+    // if clause, we'll use the loader and strong typing/coalescing it provides
+    if (typeof query !== "string" && isClause(query)) {
+        return options.loaderFactory.createCountLoader(context).load(query);
+    }
     const rows = await loadCustomDataImpl({
         ...options,
         fields: ["count(1) as count"],
@@ -430,50 +439,31 @@ function isPrimableLoader(loader) {
     return loader != undefined;
 }
 async function loadCustomDataImpl(options, query, context) {
-    function getClause(cls) {
-        let optClause = options.loaderFactory?.options?.clause;
-        if (typeof optClause === "function") {
-            optClause = optClause();
-        }
-        if (!optClause) {
-            return cls;
-        }
-        // @ts-expect-error string|ID mismatch
-        return clause.And(cls, optClause);
-    }
     if (typeof query === "string") {
         // no caching, perform raw query
         return performRawQuery(query, [], []);
-        // @ts-ignore
     }
     else if (isClause(query)) {
-        // if a Clause is passed in and we have a default clause
-        // associated with the query, pass that in
-        // if we want to disableTransformations, need to indicate that with
-        // disableTransformations option
-        // this will have rudimentary caching but nothing crazy
-        return loadRows({
-            ...options,
-            // @ts-ignore
-            clause: getClause(query),
-            context: context,
-        });
+        const r = await options.loaderFactory
+            .createTypedLoader(context)
+            .load(query);
+        return r;
     }
     else if (isParameterizedQuery(query)) {
         // no caching, perform raw query
         return performRawQuery(query.query, query.values || [], query.logValues);
     }
     else {
+        // this will have rudimentary caching but nothing crazy
         let cls = query.clause;
         if (!query.disableTransformations) {
-            // @ts-ignore
-            cls = getClause(cls);
+            cls = clause.getCombinedClause(options.loaderFactory.options, query.clause);
         }
-        // this will have rudimentary caching but nothing crazy
         return loadRows({
             ...query,
             ...options,
             context: context,
+            // @ts-expect-error
             clause: cls,
         });
     }

package/core/loaders/assoc_edge_loader.d.ts

@@ -21,7 +21,7 @@ export declare class AssocDirectEdgeLoader<T extends AssocEdge> implements Loade
     private edgeCtr;
     private options?;
     context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined;
-    constructor(edgeType: string, edgeCtr: AssocEdgeConstructor<T>, options?: Partial<Pick<import("../base").QueryableDataOptions, "limit" | "orderby" | "clause">> | undefined, context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined);
+    constructor(edgeType: string, edgeCtr: AssocEdgeConstructor<T>, options?: Partial<Pick<import("../base").QueryableDataOptions, "clause" | "limit" | "orderby">> | undefined, context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined);
     load(id: ID): Promise<T[]>;
     loadEdgeForID2(id: ID, id2: ID): Promise<T | undefined>;
     clearAll(): void;

package/core/loaders/object_loader.d.ts

@@ -1,29 +1,49 @@
 import { ID, Data, SelectDataOptions, Context, Loader, LoaderFactory } from "../base";
-export declare class ObjectLoader<V = Data> implements Loader<ID, V | null> {
+import * as clause from "../clause";
+export declare class ObjectLoader<TQueryData extends Data = Data, TResultData extends Data = TQueryData, K = keyof TQueryData> implements Loader<ID, TResultData | null>, Loader<clause.Clause<TQueryData, K>, TResultData[] | null> {
     private options;
     context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined;
     private toPrime?;
-    private loader;
+    private idLoader;
+    private clauseLoader;
     private primedLoaders;
     private memoizedInitPrime;
-    constructor(options: SelectDataOptions, context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined, toPrime?: ObjectLoaderFactory<V>[] | undefined);
+    constructor(options: SelectDataOptions, context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined, toPrime?: ObjectLoaderFactory<TResultData>[] | undefined);
     getOptions(): SelectDataOptions;
     private initPrime;
-    load(key: ID): Promise<V | null>;
+    load(key: ID): Promise<TResultData | null>;
+    load(key: clause.Clause<TQueryData, K>): Promise<TResultData[] | null>;
+    private loadID;
+    private loadClause;
+    clearAll(): void;
+    loadMany(keys: ID[]): Promise<Array<TResultData | null>>;
+    loadMany(keys: clause.Clause<TQueryData, K>[]): Promise<Array<TResultData[] | null>>;
+    private loadIDMany;
+    private loadClauseMany;
+    prime(data: TResultData): void;
+    primeAll(data: TResultData): void;
+}
+export declare class ObjectCountLoader<V extends Data = Data, K = keyof V> implements Loader<clause.Clause<V, K>, number> {
+    private options;
+    context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined;
+    private loader;
+    constructor(options: SelectDataOptions, context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined);
+    getOptions(): SelectDataOptions;
+    load(key: clause.Clause<V, K>): Promise<number>;
     clearAll(): void;
-    loadMany(keys: ID[]): Promise<Array<V | null>>;
-    prime(data: V): void;
-    primeAll(data: V): void;
+    loadMany(keys: clause.Clause<V, K>[]): Promise<Array<number>>;
 }
 interface ObjectLoaderOptions extends SelectDataOptions {
     instanceKey?: string;
 }
-export declare class ObjectLoaderFactory<V = Data> implements LoaderFactory<ID, V | null> {
+export declare class ObjectLoaderFactory<V extends Data = Data> implements LoaderFactory<ID, V | null>, LoaderFactory<clause.Clause<V>, V[] | null> {
     options: ObjectLoaderOptions;
     name: string;
     private toPrime;
     constructor(options: ObjectLoaderOptions);
     createLoader(context?: Context): ObjectLoader<V>;
+    createTypedLoader<TQueryData extends Data = Data, TResultData extends Data = Data, K = keyof TQueryData>(context?: Context): ObjectLoader<TQueryData, TResultData, K>;
+    createCountLoader<K = keyof V>(context?: Context): ObjectCountLoader<V, K>;
     addToPrime(factory: ObjectLoaderFactory<V>): this;
 }
 export {};

package/core/loaders/object_loader.js

@@ -26,29 +26,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ObjectLoaderFactory = exports.ObjectLoader = void 0;
+exports.ObjectLoaderFactory = exports.ObjectCountLoader = exports.ObjectLoader = void 0;
 const dataloader_1 = __importDefault(require("dataloader"));
 const ent_1 = require("../ent");
 const clause = __importStar(require("../clause"));
 const logger_1 = require("../logger");
+const clause_1 = require("../clause");
 const loader_1 = require("./loader");
 const memoizee_1 = __importDefault(require("memoizee"));
-async function loadRowsForLoader(options, ids, context) {
+async function loadRowsForIDLoader(options, ids, context) {
     let col = options.key;
-    let cls = clause.In(col, ...ids);
-    if (options.clause) {
-        let optionClause;
-        if (typeof options.clause === "function") {
-            optionClause = options.clause();
-        }
-        else {
-            optionClause = options.clause;
-        }
-        if (optionClause) {
-            // @ts-expect-error id/string mismatch
-            cls = clause.And(cls, optionClause);
-        }
-    }
+    const cls = (0, clause_1.getCombinedClause)(options, clause.In(col, ...ids));
     const rowOptions = {
         ...options,
         clause: cls,
@@ -75,6 +63,29 @@ async function loadRowsForLoader(options, ids, context) {
     }
     return result;
 }
+async function loadRowsForClauseLoader(options, clause) {
+    const rowOptions = {
+        ...options,
+        // @ts-expect-error clause in LoadRowOptions doesn't take templatized version of Clause
+        clause: (0, clause_1.getCombinedClause)(options, clause),
+    };
+    return (await (0, ent_1.loadRows)(rowOptions));
+}
+async function loadCountForClauseLoader(options, clause) {
+    const rowOptions = {
+        ...options,
+        // @ts-expect-error clause in LoadRowOptions doesn't take templatized version of Clause
+        clause: (0, clause_1.getCombinedClause)(options, clause),
+    };
+    const row = await (0, ent_1.loadRow)({
+        ...rowOptions,
+        fields: ["count(*) as count"],
+    });
+    if (!row) {
+        return 0;
+    }
+    return parseInt(row.count, 10);
+}
 // optional clause...
 // so ObjectLoaderFactory and createDataLoader need to take a new optional field which is a clause that's always added here
 // and we need a disableTransform which skips loader completely and uses loadRow...
@@ -89,9 +100,66 @@ function createDataLoader(options) {
             return [];
         }
         // context not needed because we're creating a loader which has its own cache which is being used here
-        return loadRowsForLoader(options, ids);
+        return loadRowsForIDLoader(options, ids);
     }, loaderOptions);
 }
+class clauseCacheMap {
+    constructor(options, count) {
+        this.options = options;
+        this.count = count;
+        this.m = new Map();
+    }
+    get(key) {
+        const key2 = key.instanceKey();
+        const ret = this.m.get(key2);
+        if (ret) {
+            (0, logger_1.log)("cache", {
+                "dataloader-cache-hit": key2 + (this.count ? ":count" : ""),
+                "tableName": this.options.tableName,
+            });
+        }
+        return ret;
+    }
+    set(key, value) {
+        return this.m.set(key.instanceKey(), value);
+    }
+    delete(key) {
+        return this.m.delete(key.instanceKey());
+    }
+    clear() {
+        return this.m.clear();
+    }
+}
+function createClauseDataLoder(options) {
+    return new dataloader_1.default(async (clauses) => {
+        if (!clauses.length) {
+            return [];
+        }
+        const ret = [];
+        for await (const clause of clauses) {
+            const data = await loadRowsForClauseLoader(options, clause);
+            ret.push(data);
+        }
+        return ret;
+    }, {
+        cacheMap: new clauseCacheMap(options),
+    });
+}
+function createClauseCountDataLoader(options) {
+    return new dataloader_1.default(async (clauses) => {
+        if (!clauses.length) {
+            return [];
+        }
+        const ret = [];
+        for await (const clause of clauses) {
+            const data = await loadCountForClauseLoader(options, clause);
+            ret.push(data);
+        }
+        return ret;
+    }, {
+        cacheMap: new clauseCacheMap(options, true),
+    });
+}
 class ObjectLoader {
     constructor(options, context, toPrime) {
         this.options = options;
@@ -101,7 +169,8 @@ class ObjectLoader {
             console.trace();
         }
         if (context) {
-            this.loader = createDataLoader(options);
+            this.idLoader = createDataLoader(options);
+            this.clauseLoader = createClauseDataLoder(options);
         }
         this.memoizedInitPrime = (0, memoizee_1.default)(this.initPrime.bind(this));
     }
@@ -123,11 +192,17 @@ class ObjectLoader {
         this.primedLoaders = primedLoaders;
     }
     async load(key) {
+        if (typeof key === "string" || typeof key === "number") {
+            return this.loadID(key);
+        }
+        return this.loadClause(key);
+    }
+    async loadID(key) {
         // simple case. we get parallelization etc
-        if (this.loader) {
+        if (this.idLoader) {
             this.memoizedInitPrime();
             // prime the result if we got primable loaders
-            const result = await this.loader.load(key);
+            const result = await this.idLoader.load(key);
             if (result && this.primedLoaders) {
                 for (const [key, loader] of this.primedLoaders) {
                     const value = result[key];
@@ -138,19 +213,7 @@ class ObjectLoader {
             }
             return result;
         }
-        let cls = clause.Eq(this.options.key, key);
-        if (this.options.clause) {
-            let optionClause;
-            if (typeof this.options.clause === "function") {
-                optionClause = this.options.clause();
-            }
-            else {
-                optionClause = this.options.clause;
-            }
-            if (optionClause) {
-                cls = clause.And(cls, optionClause);
-            }
-        }
+        const cls = (0, clause_1.getCombinedClause)(this.options, clause.Eq(this.options.key, key));
         const rowOptions = {
             ...this.options,
             clause: cls,
@@ -158,22 +221,50 @@ class ObjectLoader {
         };
         return (0, ent_1.loadRow)(rowOptions);
     }
+    async loadClause(key) {
+        if (this.clauseLoader) {
+            return this.clauseLoader.load(key);
+        }
+        return loadRowsForClauseLoader(this.options, key);
+    }
     clearAll() {
-        this.loader && this.loader.clearAll();
+        this.idLoader && this.idLoader.clearAll();
+        this.clauseLoader && this.clauseLoader.clearAll();
     }
     async loadMany(keys) {
-        if (this.loader) {
+        if (!keys.length) {
+            return [];
+        }
+        if (typeof keys[0] === "string" || typeof keys[0] === "number") {
+            return this.loadIDMany(keys);
+        }
+        return this.loadClauseMany(keys);
+    }
+    loadIDMany(keys) {
+        if (this.idLoader) {
             // @ts-expect-error TODO?
-            return this.loader.loadMany(keys);
+            return this.idLoader.loadMany(keys);
+        }
+        return loadRowsForIDLoader(this.options, keys, this.context);
+    }
+    async loadClauseMany(keys) {
+        if (this.clauseLoader) {
+            // @ts-expect-error TODO?
+            return this.clauseLoader.loadMany(keys);
+        }
+        const res = [];
+        for await (const key of keys) {
+            const rows = await loadRowsForClauseLoader(this.options, key);
+            res.push(rows);
         }
-        return loadRowsForLoader(this.options, keys, this.context);
+        return res;
     }
     prime(data) {
         // we have this data from somewhere else, prime it in the c
-        if (this.loader) {
+        if (this.idLoader) {
             const col = this.options.key;
             const key = data[col];
-            this.loader.prime(key, data);
+            this.idLoader.prime(key, data);
         }
     }
     // prime this loader and any other loaders it's aware of
@@ -190,6 +281,43 @@ class ObjectLoader {
     }
 }
 exports.ObjectLoader = ObjectLoader;
+class ObjectCountLoader {
+    constructor(options, context) {
+        this.options = options;
+        this.context = context;
+        if (context) {
+            this.loader = createClauseCountDataLoader(options);
+        }
+    }
+    getOptions() {
+        return this.options;
+    }
+    async load(key) {
+        if (this.loader) {
+            return this.loader.load(key);
+        }
+        return loadCountForClauseLoader(this.options, key);
+    }
+    clearAll() {
+        this.loader && this.loader.clearAll();
+    }
+    async loadMany(keys) {
+        if (!keys.length) {
+            return [];
+        }
+        if (this.loader) {
+            // @ts-expect-error
+            return this.loader.loadMany(keys);
+        }
+        const res = [];
+        for await (const key of keys) {
+            const r = await loadCountForClauseLoader(this.options, key);
+            res.push(r);
+        }
+        return res;
+    }
+}
+exports.ObjectCountLoader = ObjectCountLoader;
 // NOTE: if not querying for all columns
 // have to query for the id field as one of the fields
 // because it's used to maintain sort order of the queried ids
@@ -213,6 +341,15 @@ class ObjectLoaderFactory {
             return new ObjectLoader(this.options, context, this.toPrime);
         }, context);
     }
+    createTypedLoader(context) {
+        const loader = this.createLoader(context);
+        return loader;
+    }
+    createCountLoader(context) {
+        return (0, loader_1.getCustomLoader)(`${this.name}:count_loader`, () => {
+            return new ObjectCountLoader(this.options, context);
+        }, context);
+    }
     // keep track of loaders to prime. needs to be done not in the constructor
     // because there's usually self references here
     addToPrime(factory) {

package/core/loaders/query_loader.d.ts

@@ -8,7 +8,7 @@ declare class QueryDirectLoader<K extends any> implements Loader<K, Data[]> {
     context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined;
     private memoizedInitPrime;
     private primedLoaders;
-    constructor(options: QueryOptions, queryOptions?: Partial<Pick<import("../base").QueryableDataOptions, "limit" | "orderby" | "clause">> | undefined, context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined);
+    constructor(options: QueryOptions, queryOptions?: Partial<Pick<import("../base").QueryableDataOptions, "clause" | "limit" | "orderby">> | undefined, context?: Context<import("../base").Viewer<import("../base").Ent<any> | null, ID | null>> | undefined);
     private initPrime;
     load(id: K): Promise<Data[]>;
     clearAll(): void;

package/package.json

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

package/parse_schema/parse.d.ts

@@ -83,7 +83,7 @@ interface RomeConfig {
 interface ProcessedGlobalSchema {
     globalEdges: ProcessedAssocEdge[];
     extraEdgeFields: ProcessedField[];
-    initForEdges?: boolean;
+    init?: boolean;
     globalFields?: ProcessedField[];
 }
 export {};

package/parse_schema/parse.js

@@ -358,9 +358,10 @@ async function parseGlobalSchema(s) {
     const ret = {
         globalEdges: [],
         extraEdgeFields: [],
-        initForEdges: !!s.extraEdgeFields ||
+        init: !!s.extraEdgeFields ||
             s.transformEdgeRead !== undefined ||
-            s.transformEdgeWrite !== undefined,
+            s.transformEdgeWrite !== undefined ||
+            s.fields !== undefined,
     };
     if (s.extraEdgeFields) {
         ret.extraEdgeFields = await processFields(s.extraEdgeFields);

package/schema/field.js

@@ -32,6 +32,7 @@ const base_1 = require("../core/base");
 const db_1 = __importStar(require("../core/db"));
 const schema_1 = require("./schema");
 const global_schema_1 = require("../core/global_schema");
+const logger_1 = require("../core/logger");
 class BaseField {
     logValue(val) {
         if (this.sensitive) {
@@ -568,10 +569,16 @@ class EnumField extends BaseField {
     async valid(val) {
         if (this.type.globalType) {
             const f = (0, global_schema_1.__getGlobalSchemaField)(this.type.globalType);
-            if (f && f.valid) {
-                return f.valid(val);
+            if (f) {
+                if (f.valid) {
+                    return f.valid(val);
+                }
+                return true;
+            }
+            else {
+                (0, logger_1.log)("error", `globalType ${this.type.globalType} not found in global schema`);
+                return false;
             }
-            return false;
         }
         // lookup table enum and indicated via presence of foreignKey
         if (!this.values && !this.map) {
@@ -648,10 +655,16 @@ class IntegerEnumField extends BaseField {
     async valid(val) {
         if (this.type?.globalType) {
             const f = (0, global_schema_1.__getGlobalSchemaField)(this.type.globalType);
-            if (f && f.valid) {
-                return f.valid(val);
+            if (f) {
+                if (f.valid) {
+                    return f.valid(val);
+                }
+                return true;
+            }
+            else {
+                (0, logger_1.log)("error", `globalType ${this.type.globalType} not found in global schema`);
+                return false;
             }
-            return false;
         }
         // lookup table enum and indicated via presence of foreignKey
         for (const k in this.map) {

package/schema/struct_field.js

@@ -5,6 +5,7 @@ const camel_case_1 = require("camel-case");
 const field_1 = require("./field");
 const schema_1 = require("./schema");
 const global_schema_1 = require("../core/global_schema");
+const logger_1 = require("../core/logger");
 class StructField extends field_1.BaseField {
     constructor(options, jsonAsList) {
         super();
@@ -137,26 +138,31 @@ class StructField extends field_1.BaseField {
     async valid(obj) {
         if (this.type.globalType) {
             const f = (0, global_schema_1.__getGlobalSchemaField)(this.type.globalType);
-            // list and global type is not valid. todo
-            if (f && f.valid) {
-                if (JSON.stringify(this.type.listElemType) !==
-                    JSON.stringify(f?.type.listElemType)) {
-                    if (this.jsonAsList) {
-                        if (!Array.isArray(obj)) {
-                            return false;
+            // list and global type is not valid.
+            if (f) {
+                if (f.valid) {
+                    if (JSON.stringify(this.type.listElemType) !==
+                        JSON.stringify(f?.type.listElemType)) {
+                        if (this.jsonAsList) {
+                            if (!Array.isArray(obj)) {
+                                return false;
+                            }
+                            // @ts-ignore
+                            const valid = await Promise.all(obj.map((v) => f.valid(v)));
+                            return valid.every((b) => b);
+                        }
+                        else {
+                            return f.valid([obj]);
                         }
-                        // @ts-ignore
-                        const valid = await Promise.all(obj.map((v) => f.valid(v)));
-                        return valid.every((b) => b);
-                    }
-                    else {
-                        // TODO handle test
-                        return f.valid([obj]);
                     }
+                    return f.valid(obj);
                 }
-                return f.valid(obj);
+                return true;
+            }
+            else {
+                (0, logger_1.log)("error", `globalType ${this.type.globalType} not found in global schema`);
+                return false;
             }
-            return false;
         }
         if (this.jsonAsList) {
             if (!Array.isArray(obj)) {