@snowtop/ent 0.1.0-alpha154 → 0.1.0-alpha156

package/action/executor.d.ts

@@ -15,7 +15,7 @@ export declare class ListBasedExecutor<T extends Ent> implements Executor {
     constructor(viewer: Viewer, placeholderID: ID, operations: DataOperation<T>[], options?: OrchestratorOptions<T, Data, Viewer<Ent<any> | null, ID | null>, T | null> | undefined, complexOptions?: ComplexExecutorOptions | undefined);
     private lastOp;
     private createdEnt;
-    private updatedOps;
+    private changedOps;
     resolveValue(val: ID): Ent | null;
     builderOpChanged(builder: Builder<any>): boolean;
     [Symbol.iterator](): this;
@@ -38,7 +38,7 @@ export declare class ComplexExecutor<T extends Ent> implements Executor {
     private lastOp;
     private allOperations;
     private executors;
-    private updatedOps;
+    private changedOps;
     builder?: Builder<Ent> | undefined;
     constructor(viewer: Viewer, placeholderID: ID, operations: DataOperation[], dependencies: Map<ID, Builder<T>>, changesets: Changeset[], options?: OrchestratorOptions<T, Data, Viewer>, complexOptions?: ComplexExecutorOptions | undefined);
     [Symbol.iterator](): this;

package/action/executor.js

@@ -19,7 +19,7 @@ class ListBasedExecutor {
         this.complexOptions = complexOptions;
         this.idx = 0;
         this.createdEnt = null;
-        this.updatedOps = new Map();
+        this.changedOps = new Map();
         this.builder = options?.builder;
     }
     resolveValue(val) {
@@ -29,7 +29,7 @@ class ListBasedExecutor {
         return null;
     }
     builderOpChanged(builder) {
-        const v = this.updatedOps.get(builder.placeholderID);
+        const v = this.changedOps.get(builder.placeholderID);
         return v !== undefined && v !== builder.operation;
     }
     [Symbol.iterator]() {
@@ -41,19 +41,19 @@ class ListBasedExecutor {
         if (createdEnt) {
             this.createdEnt = createdEnt;
         }
-        maybeUpdateOperationForOp(this.lastOp, this.updatedOps);
-        const done = this.idx === this.operations.length;
-        const op = changeOp(this.operations[this.idx], this.complexOptions);
+        maybeFlagOpOperationAsChanged(this.lastOp, this.changedOps);
+        const done = this.idx >= this.operations.length;
+        const op = maybeChangeOp(this.operations[this.idx], this.complexOptions);
         this.idx++;
         this.lastOp = op;
-        // reset since this could be called multiple times. not needed if we have getSortedOps or something like that
-        if (done) {
-            // TODO need to figure this out
-            // this.idx = 0;
+        if (done || op === undefined) {
+            return {
+                value: op,
+                done: true,
+            };
         }
         return {
             value: op,
-            done: done,
         };
     }
     async executeObservers() {
@@ -101,7 +101,7 @@ function getCreatedEnt(viewer, op) {
     }
     return null;
 }
-function maybeUpdateOperationForOp(op, updatedOps) {
+function maybeFlagOpOperationAsChanged(op, changedOps) {
     if (!op || !op.updatedOperation) {
         return;
     }
@@ -109,8 +109,7 @@ function maybeUpdateOperationForOp(op, updatedOps) {
     if (!r || r.builder.operation === r.operation) {
         return;
     }
-    updatedOps.set(r.builder.placeholderID, r.operation);
-    // console.debug(updatedOps);
+    changedOps.set(r.builder.placeholderID, r.operation);
 }
 class ComplexExecutor {
     constructor(viewer, placeholderID, operations, dependencies, changesets, options, complexOptions) {
@@ -121,7 +120,7 @@ class ComplexExecutor {
         this.mapper = new Map();
         this.allOperations = [];
         this.executors = [];
-        this.updatedOps = new Map();
+        this.changedOps = new Map();
         this.builder = options?.builder;
         let graph = (0, graph_data_structure_1.Graph)();
         const changesetMap = new Map();
@@ -171,11 +170,6 @@ class ComplexExecutor {
             // get ordered list of ops
             let executor = c.executor();
             for (let op of executor) {
-                if (!op) {
-                    // TODO what is happening...
-                    // change in behavior in next() leading to needing to do this
-                    break;
-                }
                 if (op.createdEnt) {
                     nodeOps.add(op);
                 }
@@ -212,17 +206,18 @@ class ComplexExecutor {
     }
     next() {
         this.handleCreatedEnt();
-        maybeUpdateOperationForOp(this.lastOp, this.updatedOps);
-        const done = this.idx === this.allOperations.length;
-        const op = changeOp(this.allOperations[this.idx], this.complexOptions);
+        maybeFlagOpOperationAsChanged(this.lastOp, this.changedOps);
+        const done = this.idx >= this.allOperations.length;
+        const op = maybeChangeOp(this.allOperations[this.idx], this.complexOptions);
         this.idx++;
         this.lastOp = op;
-        // reset since this could be called multiple times. not needed if we have getSortedOps or something like that
-        if (done) {
-            // TODO need to figure this out
-            // this.idx = 0;
+        if (done || op === undefined) {
+            return {
+                value: op,
+                done: true,
+            };
         }
-        return { value: op, done };
+        return { value: op };
     }
     resolveValue(val) {
         let ent = this.mapper.get(val);
@@ -238,8 +233,7 @@ class ComplexExecutor {
         return null;
     }
     builderOpChanged(builder) {
-        const v = this.updatedOps.get(builder.placeholderID);
-        // console.debug(this.updatedOps, builder.placeholderID, v, builder.operation);
+        const v = this.changedOps.get(builder.placeholderID);
         return v !== undefined && v !== builder.operation;
     }
     async executeObservers() {
@@ -345,7 +339,7 @@ async function executeOperations(executor, context, trackOps) {
     return operations;
 }
 exports.executeOperations = executeOperations;
-function changeOp(op, complexOptions) {
+function maybeChangeOp(op, complexOptions) {
     if (!op ||
         !complexOptions?.conditionalOverride ||
         op instanceof operations_1.ConditionalNodeOperation) {

package/action/orchestrator.js

@@ -740,7 +740,10 @@ class Orchestrator {
         }
         else if (this.isBuilder(value)) {
             if (field.valid) {
-                const valid = await field.valid(value);
+                let valid = field.valid(value);
+                if (util_1.types.isPromise(valid)) {
+                    valid = await valid;
+                }
                 if (!valid) {
                     return new Error(`invalid field ${fieldName} with value ${value}`);
                 }
@@ -752,8 +755,10 @@ class Orchestrator {
         }
         else {
             if (field.valid) {
-                // TODO this could be async. handle this better
-                const valid = await field.valid(value);
+                let valid = field.valid(value);
+                if (util_1.types.isPromise(valid)) {
+                    valid = await valid;
+                }
                 if (!valid) {
                     return new Error(`invalid field ${fieldName} with value ${value}`);
                 }

package/core/clause.d.ts

@@ -15,6 +15,7 @@ export declare class inClause<T extends Data, K = keyof T> implements Clause<T,
     private col;
     private value;
     private type;
+    protected op: string;
     static getPostgresInClauseValuesThreshold(): number;
     constructor(col: K, value: any[], type?: string);
     clause(idx: number): string;
@@ -23,6 +24,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: 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
@@ -89,6 +93,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,6 +236,7 @@ class inClause {
         this.col = col;
         this.value = value;
         this.type = type;
+        this.op = "IN";
     }
     clause(idx) {
         // do a simple = when only one item
@@ -272,7 +273,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 +297,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 +578,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/core/config.d.ts

@@ -44,6 +44,7 @@ interface CodegenConfig {
     templatizedViewer?: importedObject;
     customAssocEdgePath?: importedObject;
     globalImportPath?: string;
+    userOveriddenFiles?: string[];
 }
 interface PrettierConfig {
     custom?: boolean;

package/core/ent.js

@@ -34,32 +34,7 @@ const logger_1 = require("./logger");
 const dataloader_1 = __importDefault(require("dataloader"));
 const global_schema_1 = require("./global_schema");
 const query_impl_1 = require("./query_impl");
-// TODO kill this and createDataLoader
-class cacheMap {
-    constructor(options) {
-        this.options = options;
-        this.m = new Map();
-    }
-    get(key) {
-        const ret = this.m.get(key);
-        if (ret) {
-            (0, logger_1.log)("cache", {
-                "dataloader-cache-hit": key,
-                "tableName": this.options.tableName,
-            });
-        }
-        return ret;
-    }
-    set(key, value) {
-        return this.m.set(key, value);
-    }
-    delete(key) {
-        return this.m.delete(key);
-    }
-    clear() {
-        return this.m.clear();
-    }
-}
+const loader_1 = require("./loaders/loader");
 class entCacheMap {
     constructor(viewer, options) {
         this.viewer = viewer;
@@ -88,11 +63,11 @@ class entCacheMap {
         return this.m.clear();
     }
 }
-function createDataLoader(options) {
+function createAssocEdgeConfigLoader(options) {
     const loaderOptions = {};
     // if query logging is enabled, we should log what's happening with loader
     if ((0, logger_1.logEnabled)("query")) {
-        loaderOptions.cacheMap = new cacheMap(options);
+        loaderOptions.cacheMap = new loader_1.CacheMap(options);
     }
     // something here brokwn with strict:true
     return new dataloader_1.default(async (ids) => {
@@ -918,10 +893,11 @@ const assocEdgeFields = [
     "inverse_edge_type",
     "edge_table",
 ];
-exports.assocEdgeLoader = createDataLoader({
+exports.assocEdgeLoader = createAssocEdgeConfigLoader({
     tableName: "assoc_edge_config",
     fields: assocEdgeFields,
     key: "edge_type",
+    keyType: "uuid",
 });
 // we don't expect assoc_edge_config information to change
 // so not using ContextCache but just caching it as needed once per server

package/core/loaders/assoc_edge_loader.js

@@ -36,7 +36,7 @@ const memoizee_1 = __importDefault(require("memoizee"));
 function createLoader(options, edgeType, edgeCtr, edgeData) {
     const loaderOptions = {};
     if ((0, logger_1.logEnabled)("query")) {
-        loaderOptions.cacheMap = new loader_1.cacheMap({
+        loaderOptions.cacheMap = new loader_1.CacheMap({
             tableName: edgeData.edgeTable,
         });
     }
@@ -145,7 +145,6 @@ class AssocDirectEdgeLoader {
             ctr: this.edgeCtr,
         });
     }
-    // TODO should this have a disableTransformations flag to get these rows
     async loadEdgeForID2(id, id2) {
         return (0, ent_1.loadEdgeForID2)({
             id1: id,

package/core/loaders/index.d.ts

@@ -2,5 +2,4 @@ export { ObjectLoader, ObjectLoaderFactory } from "./object_loader";
 export { RawCountLoader, RawCountLoaderFactory } from "./raw_count_loader";
 export { AssocEdgeCountLoader, AssocEdgeCountLoaderFactory, } from "./assoc_count_loader";
 export { AssocDirectEdgeLoader, AssocEdgeLoader, AssocEdgeLoaderFactory, } from "./assoc_edge_loader";
-export { IndexLoaderFactory } from "./index_loader";
 export { QueryLoaderFactory } from "./query_loader";

package/core/loaders/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryLoaderFactory = exports.IndexLoaderFactory = exports.AssocEdgeLoaderFactory = exports.AssocEdgeLoader = exports.AssocDirectEdgeLoader = exports.AssocEdgeCountLoaderFactory = exports.AssocEdgeCountLoader = exports.RawCountLoaderFactory = exports.RawCountLoader = exports.ObjectLoaderFactory = exports.ObjectLoader = void 0;
+exports.QueryLoaderFactory = exports.AssocEdgeLoaderFactory = exports.AssocEdgeLoader = exports.AssocDirectEdgeLoader = exports.AssocEdgeCountLoaderFactory = exports.AssocEdgeCountLoader = exports.RawCountLoaderFactory = exports.RawCountLoader = exports.ObjectLoaderFactory = exports.ObjectLoader = void 0;
 var object_loader_1 = require("./object_loader");
 Object.defineProperty(exports, "ObjectLoader", { enumerable: true, get: function () { return object_loader_1.ObjectLoader; } });
 Object.defineProperty(exports, "ObjectLoaderFactory", { enumerable: true, get: function () { return object_loader_1.ObjectLoaderFactory; } });
@@ -14,7 +14,5 @@ var assoc_edge_loader_1 = require("./assoc_edge_loader");
 Object.defineProperty(exports, "AssocDirectEdgeLoader", { enumerable: true, get: function () { return assoc_edge_loader_1.AssocDirectEdgeLoader; } });
 Object.defineProperty(exports, "AssocEdgeLoader", { enumerable: true, get: function () { return assoc_edge_loader_1.AssocEdgeLoader; } });
 Object.defineProperty(exports, "AssocEdgeLoaderFactory", { enumerable: true, get: function () { return assoc_edge_loader_1.AssocEdgeLoaderFactory; } });
-var index_loader_1 = require("./index_loader");
-Object.defineProperty(exports, "IndexLoaderFactory", { enumerable: true, get: function () { return index_loader_1.IndexLoaderFactory; } });
 var query_loader_1 = require("./query_loader");
 Object.defineProperty(exports, "QueryLoaderFactory", { enumerable: true, get: function () { return query_loader_1.QueryLoaderFactory; } });

package/core/loaders/loader.d.ts

@@ -1,7 +1,7 @@
 import { Loader, LoaderFactory, Context, DataOptions } from "../base";
 export declare function getLoader<K, V>(factory: LoaderFactory<K, V>, create: () => Loader<K, V>, context?: Context): Loader<K, V>;
 export declare function getCustomLoader<K, V>(key: string, create: () => Loader<K, V>, context?: Context): Loader<K, V>;
-export declare class cacheMap {
+export declare class CacheMap {
     private options;
     private m;
     constructor(options: DataOptions);

package/core/loaders/loader.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cacheMap = exports.getCustomLoader = exports.getLoader = void 0;
+exports.CacheMap = exports.getCustomLoader = exports.getLoader = void 0;
 const logger_1 = require("../logger");
 // this is like factory factory FML
 // helper function to handle context vs not
@@ -25,7 +25,7 @@ function getCustomLoader(key, create, context) {
     return context.cache.getLoader(key, create);
 }
 exports.getCustomLoader = getCustomLoader;
-class cacheMap {
+class CacheMap {
     constructor(options) {
         this.options = options;
         this.m = new Map();
@@ -41,34 +41,17 @@ class cacheMap {
                 "dataloader-cache-hit": key,
                 "tableName": this.options.tableName,
             });
-            // } else {
-            //   log("cache", {
-            //     "dataloader-cache-miss": key,
-            //     "tableName": options.tableName,
-            //   });
         }
         return ret;
     }
     set(key, value) {
-        // log("cache", {
-        //   "dataloader-cache-set": key,
-        //   "tableName": options.tableName,
-        // });
         return this.m.set(key, value);
     }
     delete(key) {
-        // log("cache", {
-        //   "dataloader-cache-delete": key,
-        //   "tableName": options.tableName,
-        // });
         return this.m.delete(key);
     }
     clear() {
-        // log("cache", {
-        //   "dataloader-cache-clear": true,
-        //   "tableName": options.tableName,
-        // });
         return this.m.clear();
     }
 }
-exports.cacheMap = cacheMap;
+exports.CacheMap = CacheMap;

package/core/loaders/object_loader.js

@@ -93,7 +93,7 @@ function createDataLoader(options) {
     const loaderOptions = {};
     // if query logging is enabled, we should log what's happening with loader
     if ((0, logger_1.logEnabled)("query")) {
-        loaderOptions.cacheMap = new loader_1.cacheMap(options);
+        loaderOptions.cacheMap = new loader_1.CacheMap(options);
     }
     return new dataloader_1.default(async (ids) => {
         if (!ids.length) {

package/core/loaders/query_loader.js

@@ -70,7 +70,7 @@ function createLoader(options, queryOptions) {
     const loaderOptions = {};
     // if query logging is enabled, we should log what's happening with loader
     if ((0, logger_1.logEnabled)("query")) {
-        loaderOptions.cacheMap = new loader_1.cacheMap(options);
+        loaderOptions.cacheMap = new loader_1.CacheMap(options);
     }
     return new dataloader_1.default(async (keys) => {
         if (!keys.length) {

package/core/loaders/raw_count_loader.js

@@ -59,7 +59,7 @@ function createCountDataLoader(options) {
     const loaderOptions = {};
     // if query logging is enabled, we should log what's happening with loader
     if ((0, logger_1.logEnabled)("query")) {
-        loaderOptions.cacheMap = new loader_1.cacheMap(options);
+        loaderOptions.cacheMap = new loader_1.CacheMap(options);
     }
     return new dataloader_1.default(async (keys) => {
         if (!keys.length) {

package/core/query/query.js

@@ -130,7 +130,6 @@ class FirstFilter {
         return this.pageMap.get(id);
     }
 }
-// TODO need some last tests to test all these cases. clearly don't have the tests
 class LastFilter {
     constructor(options) {
         this.options = options;
@@ -172,8 +171,6 @@ class LastFilter {
     async query(options) {
         const orderby = (0, query_impl_1.reverseOrderBy)(this.options.orderby);
         const greater = orderby[0].direction === "ASC";
-        // TODO verify that this greater still makes sense. tests pass
-        // but wanna confirm
         options.limit = this.options.limit + 1; // fetch an extra so we know if previous pag
         if (this.options.cursorCol !== this.sortCol) {
             const res = this.edgeQuery.getTableName();

package/graphql/graphql.d.ts

@@ -1,20 +1,26 @@
 import { GraphQLScalarType } from "graphql";
+import { FieldMap } from "src/schema";
+import { ProcessedField as ParsedProcessedField } from "../parse_schema/parse";
 interface ClassType<T = any> {
     new (...args: any[]): T;
 }
 declare type StringToStringMap = {
     [key: string]: string;
 };
-export interface CustomType {
+export interface CustomTypeInput {
     type: string;
     importPath: string;
     tsType?: string;
     tsImportPath?: string;
     enumMap?: StringToStringMap;
+    structFields?: FieldMap;
     inputType?: boolean;
     [x: string]: any;
 }
-type Type = GraphQLScalarType | ClassType | string | CustomType;
+export type CustomType = Omit<CustomTypeInput, "structFields"> & {
+    structFields?: ParsedProcessedField[];
+};
+type Type = GraphQLScalarType | ClassType | string | CustomTypeInput;
 export type GraphQLConnection<T> = {
     node: T;
 };
@@ -113,8 +119,8 @@ declare enum NullableResult {
 export declare const knownAllowedNames: Map<string, string>;
 export declare const knownDisAllowedNames: Map<string, boolean>;
 export declare const knownInterfaces: Map<string, boolean>;
-export declare const isCustomType: (type: Type) => type is CustomType;
-export declare const addCustomType: (type: CustomType, gqlCapture: typeof GQLCapture) => void;
+export declare const isCustomType: (type: Type) => type is CustomTypeInput;
+export declare const addCustomType: (type: CustomTypeInput, gqlCapture: typeof GQLCapture) => Promise<void>;
 export declare class GQLCapture {
     private static enabled;
     static enable(enabled: boolean): void;
@@ -168,5 +174,5 @@ export declare const gqlQuery: typeof GQLCapture.gqlQuery;
 export declare const gqlMutation: typeof GQLCapture.gqlMutation;
 export declare const gqlContextType: typeof GQLCapture.gqlContextType;
 export declare const gqlConnection: typeof GQLCapture.gqlConnection;
-declare const gqlFileUpload: CustomType;
+declare const gqlFileUpload: CustomTypeInput;
 export { gqlFileUpload };

package/graphql/graphql.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.gqlFileUpload = exports.gqlConnection = exports.gqlContextType = exports.gqlMutation = exports.gqlQuery = exports.gqlUnionType = exports.gqlInterfaceType = exports.gqlObjectType = exports.gqlInputObjectType = exports.gqlArgType = exports.gqlField = exports.GQLCapture = exports.addCustomType = exports.isCustomType = exports.knownInterfaces = exports.knownDisAllowedNames = exports.knownAllowedNames = exports.CustomFieldType = void 0;
+const parse_1 = require("../parse_schema/parse");
 var CustomFieldType;
 (function (CustomFieldType) {
     CustomFieldType["Accessor"] = "ACCESSOR";
@@ -62,16 +63,23 @@ exports.isCustomType = isCustomType;
 const isGraphQLScalarType = (type) => {
     return type.serialize !== undefined;
 };
-const addCustomType = (type, gqlCapture) => {
+const addCustomType = async (type, gqlCapture) => {
     // TODO these should return ReadOnly objects...
     const customTypes = gqlCapture.getCustomTypes();
     const customType = customTypes.get(type.type);
     if (customType && customType === type) {
         return;
     }
-    if (type.enumMap) {
-        customTypes.set(type.type, type);
-        return;
+    const addType = async (type) => {
+        // @ts-expect-error
+        const typ2 = { ...type };
+        if (type.structFields) {
+            typ2.structFields = await (0, parse_1.processFields)(type.structFields);
+        }
+        customTypes.set(type.type, typ2);
+    };
+    if (type.enumMap || type.structFields) {
+        await addType(type);
     }
     try {
         const r = require(type.importPath);
@@ -102,7 +110,7 @@ const addCustomType = (type, gqlCapture) => {
         }
         return;
     }
-    customTypes.set(type.type, type);
+    await addType(type);
 };
 exports.addCustomType = addCustomType;
 const getType = (typ, result) => {

package/graphql/graphql_field_helpers.d.ts

@@ -1,4 +1,4 @@
-import { CustomField, Field, CustomObject, CustomMutation, CustomQuery, CustomType } from "./graphql";
+import { CustomField, Field, CustomObject, CustomMutation, CustomQuery, CustomTypeInput } from "./graphql";
 export declare function validateOneCustomField(expected: CustomField): void;
 export declare function validateCustomFields(expected: CustomField[]): void;
 export declare function validateCustomMutations(expected: CustomMutation[]): void;
@@ -30,4 +30,4 @@ export declare enum CustomObjectTypes {
     Union = 256
 }
 export declare function validateNoCustom(...exceptions: number[]): void;
-export declare function validateCustomTypes(expected: CustomType[]): void;
+export declare function validateCustomTypes(expected: CustomTypeInput[]): void;

package/graphql/graphql_field_helpers.js

@@ -153,7 +153,7 @@ var CustomObjectTypes;
     CustomObjectTypes[CustomObjectTypes["Interface"] = 128] = "Interface";
     CustomObjectTypes[CustomObjectTypes["Union"] = 256] = "Union";
 })(CustomObjectTypes = exports.CustomObjectTypes || (exports.CustomObjectTypes = {}));
-// TODO what's a good name for this instead
+// what's a good name for this instead?
 function validateNoCustom(...exceptions) {
     let bit = 0;
     exceptions.forEach((exp) => (bit = bit | exp));

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-alpha154",
+  "version": "0.1.0-alpha156",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",

package/parse_schema/parse.d.ts

@@ -1,5 +1,6 @@
 import { Schema, Field, AssocEdge, AssocEdgeGroup, Action } from "../schema";
-import { ActionField, Type, GlobalSchema, TransformReadBetaResult, CanViewerDo } from "../schema/schema";
+import { ActionField, Type, FieldMap, GlobalSchema, TransformReadBetaResult, CanViewerDo } from "../schema/schema";
+export declare function processFields(src: FieldMap | Field[], patternName?: string): Promise<ProcessedField[]>;
 declare enum NullableResult {
     CONTENTS = "contents",
     CONTENTS_AND_LIST = "contentsAndList",
@@ -48,7 +49,7 @@ type ProcessedType = Omit<Type, "subFields" | "listElemType" | "unionFields"> &
     listElemType?: ProcessedType;
     unionFields?: ProcessedField[];
 };
-type ProcessedField = Omit<Field, "defaultValueOnEdit" | "defaultValueOnCreate" | "privacyPolicy" | "type" | "serverDefault"> & {
+export type ProcessedField = Omit<Field, "defaultValueOnEdit" | "defaultValueOnCreate" | "privacyPolicy" | "type" | "serverDefault"> & {
     name: string;
     hasDefaultValueOnCreate?: boolean;
     hasDefaultValueOnEdit?: boolean;

package/parse_schema/parse.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseSchema = void 0;
+exports.parseSchema = exports.processFields = void 0;
 const cosmiconfig_1 = require("cosmiconfig");
 const const_1 = require("../core/const");
 const global_schema_1 = require("../core/global_schema");
@@ -87,6 +87,7 @@ async function processFields(src, patternName) {
     }
     return ret;
 }
+exports.processFields = processFields;
 async function transformServerDefault(name, f, value) {
     if (f.valid) {
         if (!(await f.valid(value))) {

package/scripts/custom_graphql.js

@@ -182,51 +182,39 @@ async function captureDynamic(filePath, gqlCapture) {
                 return;
             }
             let json = json5_1.default.parse(datas.join(""));
-            for (const k in json) {
-                const v = json[k];
-                switch (k) {
-                    case "queries":
-                        processTopLevel(v, gqlCapture.getCustomQueries(), gqlCapture);
-                        break;
-                    case "mutations":
-                        processTopLevel(v, gqlCapture.getCustomMutations(), gqlCapture);
-                        break;
-                    case "customTypes":
-                        processCustomTypes(v, gqlCapture);
-                        break;
-                    default:
-                        reject(new Error(`key ${k} is unsupported in dynamic custom graphql. only queries and mutations are supported`));
-                }
-            }
+            processJSON(gqlCapture, json);
             resolve(undefined);
         });
     });
 }
+async function processJSON(gqlCapture, json) {
+    if (json.fields) {
+        for (const k in json.fields) {
+            processCustomFields(json.fields[k], gqlCapture, k);
+        }
+    }
+    if (json.inputs) {
+        processCustomObjects(json.inputs, gqlCapture, true);
+    }
+    if (json.objects) {
+        processCustomObjects(json.objects, gqlCapture);
+    }
+    if (json.queries) {
+        processTopLevel(json.queries, gqlCapture.getCustomQueries(), gqlCapture);
+    }
+    if (json.mutations) {
+        processTopLevel(json.mutations, gqlCapture.getCustomMutations(), gqlCapture);
+    }
+    if (json.customTypes) {
+        processCustomTypes(json.customTypes, gqlCapture);
+    }
+}
 async function captureCustom(filePath, filesCsv, jsonPath, gqlCapture) {
     if (jsonPath !== undefined) {
         let json = json5_1.default.parse(fs.readFileSync(jsonPath, {
             encoding: "utf8",
         }));
-        if (json.fields) {
-            for (const k in json.fields) {
-                processCustomFields(json.fields[k], gqlCapture, k);
-            }
-        }
-        if (json.inputs) {
-            processCustomObjects(json.inputs, gqlCapture, true);
-        }
-        if (json.objects) {
-            processCustomObjects(json.objects, gqlCapture);
-        }
-        if (json.queries) {
-            processTopLevel(json.queries, gqlCapture.getCustomQueries(), gqlCapture);
-        }
-        if (json.mutations) {
-            processTopLevel(json.mutations, gqlCapture.getCustomMutations(), gqlCapture);
-        }
-        if (json.customTypes) {
-            processCustomTypes(json.customTypes, gqlCapture);
-        }
+        processJSON(gqlCapture, json);
         return;
     }
     if (filesCsv !== undefined) {
@@ -431,9 +419,13 @@ async function main() {
     const buildClasses = (fields) => {
         fields.forEach((field) => {
             if (field.nodeName && !nodesMap.has(field.nodeName)) {
-                let info = imports.getInfoForClass(field.nodeName);
-                classes[field.nodeName] = { ...info.class, path: info.file.path };
-                buildFiles(info.file);
+                // TODO don't necessarily wanna do this
+                try {
+                    let info = imports.getInfoForClass(field.nodeName);
+                    classes[field.nodeName] = { ...info.class, path: info.file.path };
+                    buildFiles(info.file);
+                }
+                catch (err) { }
             }
             buildClasses2(field.args);
             buildClasses2(field.results);

package/core/loaders/index_loader.d.ts

@@ -1,15 +0,0 @@
-import { ID, SelectBaseDataOptions, Context, Data, LoaderFactory, EdgeQueryableDataOptions, Loader } from "../base";
-import * as clause from "../clause";
-import { OrderBy } from "../query_impl";
-import { ObjectLoaderFactory } from "./object_loader";
-export declare class IndexLoaderFactory implements LoaderFactory<ID, Data[]> {
-    name: string;
-    private factory;
-    constructor(options: SelectBaseDataOptions, col: string, opts?: {
-        extraClause?: clause.Clause;
-        orderby?: OrderBy;
-        toPrime?: ObjectLoaderFactory<Data>[];
-    });
-    createLoader(context?: Context): any;
-    createConfigurableLoader(options: EdgeQueryableDataOptions, context?: Context): Loader<ID, Data[]>;
-}

package/core/loaders/index_loader.js

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IndexLoaderFactory = void 0;
-const query_loader_1 = require("./query_loader");
-// we're keeping this for legacy reasons so as to not break existing callers
-// and to decouple the change here but all callers can safely be changed here to use QueryLoaderFactory
-// @deprecated use QueryLoaderFactory
-class IndexLoaderFactory {
-    constructor(options, col, opts) {
-        this.factory = new query_loader_1.QueryLoaderFactory({
-            fields: options.fields,
-            tableName: options.tableName,
-            groupCol: col,
-            clause: opts?.extraClause,
-            orderby: opts?.orderby,
-            toPrime: opts?.toPrime,
-        });
-        this.name = `indexLoader:${options.tableName}:${col}`;
-    }
-    createLoader(context) {
-        return this.factory.createLoader(context);
-    }
-    createConfigurableLoader(options, context) {
-        return this.factory.createConfigurableLoader(options, context);
-    }
-}
-exports.IndexLoaderFactory = IndexLoaderFactory;