@snowtop/ent 0.0.24 → 0.0.28

package/action/executor.d.ts

@@ -1,4 +1,4 @@
-import { ID, Ent, Viewer, EntConstructor, Context } from "../core/base";
+import { ID, Data, Ent, Viewer, EntConstructor, Context } from "../core/base";
 import { DataOperation } from "../core/ent";
 import { Changeset, Executor } from "../action";
 import { Builder } from "../action";
@@ -11,7 +11,7 @@ export declare class ListBasedExecutor<T extends Ent> implements Executor {
     private operations;
     private options?;
     private idx;
-    constructor(viewer: Viewer, placeholderID: ID, ent: EntConstructor<T>, operations: DataOperation[], options?: OrchestratorOptions<T> | undefined);
+    constructor(viewer: Viewer, placeholderID: ID, ent: EntConstructor<T>, operations: DataOperation[], options?: OrchestratorOptions<T, Data> | undefined);
     private lastOp;
     private createdEnt;
     resolveValue(val: ID): Ent | null;
@@ -34,7 +34,7 @@ export declare class ComplexExecutor<T extends Ent> implements Executor {
     private changesetMap;
     private nodeOpMap;
     private executors;
-    constructor(viewer: Viewer, placeholderID: ID, ent: EntConstructor<T>, operations: DataOperation[], dependencies: Map<ID, Builder<T>>, changesets: Changeset<T>[], options?: OrchestratorOptions<T> | undefined);
+    constructor(viewer: Viewer, placeholderID: ID, ent: EntConstructor<T>, operations: DataOperation[], dependencies: Map<ID, Builder<T>>, changesets: Changeset<T>[], options?: OrchestratorOptions<T, Data> | undefined);
     [Symbol.iterator](): this;
     private handleCreatedEnt;
     next(): IteratorResult<DataOperation>;

package/action/orchestrator.d.ts

@@ -3,7 +3,7 @@ import { AssocEdgeInputOptions, DataOperation } from "../core/ent";
 import { SchemaInputType } from "../schema/schema";
 import { Changeset, Executor } from "../action";
 import { WriteOperation, Builder, Action } from "../action";
-export interface OrchestratorOptions<T extends Ent> {
+export interface OrchestratorOptions<T extends Ent, TData extends Data> {
     viewer: Viewer;
     operation: WriteOperation;
     tableName: string;
@@ -13,6 +13,7 @@ export interface OrchestratorOptions<T extends Ent> {
     action?: Action<T>;
     schema: SchemaInputType;
     editedFields(): Map<string, any>;
+    updateInput?: (data: TData) => void;
 }
 interface edgeInputDataOpts {
     edgeType: string;
@@ -38,7 +39,9 @@ export declare class Orchestrator<T extends Ent> {
     private fieldsToResolve;
     private mainOp;
     viewer: Viewer;
-    constructor(options: OrchestratorOptions<T>);
+    private defaultFieldsByFieldName;
+    private defaultFieldsByTSName;
+    constructor(options: OrchestratorOptions<T, Data>);
     private addEdge;
     addInboundEdge<T2 extends Ent>(id1: ID | Builder<T2>, edgeType: string, nodeType: string, options?: AssocEdgeInputOptions): void;
     addOutboundEdge<T2 extends Ent>(id2: ID | Builder<T2>, edgeType: string, nodeType: string, options?: AssocEdgeInputOptions): void;
@@ -50,11 +53,13 @@ export declare class Orchestrator<T extends Ent> {
     private getEdgeOperation;
     private buildEdgeOps;
     private throwError;
+    private getEntForPrivacyPolicy;
     private validate;
     private triggers;
     private validators;
     private isBuilder;
-    private validateFields;
+    private getFieldsWithDefaultValues;
+    private formatAndValidateFields;
     valid(): Promise<boolean>;
     validX(): Promise<void>;
     build(): Promise<EntChangeset<T>>;
@@ -71,7 +76,7 @@ export declare class EntChangeset<T extends Ent> implements Changeset<T> {
     dependencies?: Map<ID, Builder<T>> | undefined;
     changesets?: Changeset<Ent>[] | undefined;
     private options?;
-    constructor(viewer: Viewer, placeholderID: ID, ent: EntConstructor<T>, operations: DataOperation[], dependencies?: Map<ID, Builder<T>> | undefined, changesets?: Changeset<Ent>[] | undefined, options?: OrchestratorOptions<T> | undefined);
+    constructor(viewer: Viewer, placeholderID: ID, ent: EntConstructor<T>, operations: DataOperation[], dependencies?: Map<ID, Builder<T>> | undefined, changesets?: Changeset<Ent>[] | undefined, options?: OrchestratorOptions<T, Data> | undefined);
     executor(): Executor;
 }
 export {};

package/action/orchestrator.js

@@ -5,6 +5,7 @@ const ent_1 = require("../core/ent");
 const schema_1 = require("../schema/schema");
 const action_1 = require("../action");
 const snake_case_1 = require("snake-case");
+const camel_case_1 = require("camel-case");
 const privacy_1 = require("../core/privacy");
 const executor_1 = require("./executor");
 const logger_1 = require("../core/logger");
@@ -58,6 +59,8 @@ class Orchestrator {
         this.changesets = [];
         this.dependencies = new Map();
         this.fieldsToResolve = [];
+        this.defaultFieldsByFieldName = {};
+        this.defaultFieldsByTSName = {};
         this.viewer = options.viewer;
     }
     addEdge(edge, op) {
@@ -222,16 +225,35 @@ class Orchestrator {
         }
         return new EntCannotDeleteEntError(privacyPolicy, action, this.options.builder.existingEnt);
     }
+    getEntForPrivacyPolicy(editedData) {
+        if (this.options.operation !== action_1.WriteOperation.Insert) {
+            return this.options.builder.existingEnt;
+        }
+        // we create an unsafe ent to be used for privacy policies
+        return new this.options.builder.ent(this.options.builder.viewer, editedData);
+    }
     async validate() {
+        // existing ent required for edit or delete operations
+        switch (this.options.operation) {
+            case action_1.WriteOperation.Delete:
+            case action_1.WriteOperation.Edit:
+                if (!this.options.builder.existingEnt) {
+                    throw new Error("existing ent required with operation");
+                }
+        }
         const action = this.options.action;
         const builder = this.options.builder;
-        // this runs in 3 phases:
-        // * privacy policy
+        // future optimization: can get schemaFields to memoize based on different values
+        const schemaFields = (0, schema_1.getFields)(this.options.schema);
+        let editedData = this.getFieldsWithDefaultValues(builder, schemaFields, action);
+        // this runs in following phases:
+        // * set default fields and pass to builder so the value can be checked by triggers/observers/validators
+        // * privacy policy (use unsafe ent if we have it)
         // * triggers
         // * validators
         let privacyPolicy = action?.getPrivacyPolicy();
         if (privacyPolicy) {
-            await (0, privacy_1.applyPrivacyPolicyX)(this.options.viewer, privacyPolicy, builder.existingEnt, this.throwError.bind(this));
+            await (0, privacy_1.applyPrivacyPolicyX)(this.options.viewer, privacyPolicy, this.getEntForPrivacyPolicy(editedData), this.throwError.bind(this));
         }
         // have to run triggers which update fields first before field and other validators
         // so running this first to build things up
@@ -241,7 +263,7 @@ class Orchestrator {
         }
         let validators = action?.validators || [];
         await Promise.all([
-            this.validateFields(builder, action),
+            this.formatAndValidateFields(schemaFields),
             this.validators(validators, action, builder),
         ]);
     }
@@ -276,29 +298,14 @@ class Orchestrator {
     isBuilder(val) {
         return val.placeholderID !== undefined;
     }
-    async validateFields(builder, action) {
-        // existing ent required for edit or delete operations
-        switch (this.options.operation) {
-            case action_1.WriteOperation.Delete:
-            case action_1.WriteOperation.Edit:
-                if (!this.options.builder.existingEnt) {
-                    throw new Error("existing ent required with operation");
-                }
-        }
-        if (this.options.operation == action_1.WriteOperation.Delete) {
-            return;
-        }
+    getFieldsWithDefaultValues(builder, schemaFields, action) {
         const editedFields = this.options.editedFields();
-        // build up data to be saved...
         let data = {};
-        let logValues = {};
-        const schemaFields = (0, schema_1.getFields)(this.options.schema);
-        let input = {};
-        if (action !== undefined) {
-            input = action.getInput();
-        }
+        let input = action?.getInput() || {};
+        let updateInput = false;
         for (const [fieldName, field] of schemaFields) {
             let value = editedFields.get(fieldName);
+            let defaultValue = undefined;
             let dbKey = field.storageKey || (0, snake_case_1.snakeCase)(field.name);
             if (value === undefined) {
                 if (this.options.operation === action_1.WriteOperation.Insert) {
@@ -306,21 +313,52 @@ class Orchestrator {
                         throw new Error(`cannot set both defaultToViewerOnCreate and defaultValueOnCreate`);
                     }
                     if (field.defaultToViewerOnCreate) {
-                        value = builder.viewer.viewerID;
+                        defaultValue = builder.viewer.viewerID;
                     }
                     if (field.defaultValueOnCreate) {
-                        value = field.defaultValueOnCreate(builder, input);
-                        if (value === undefined) {
+                        defaultValue = field.defaultValueOnCreate(builder, input);
+                        if (defaultValue === undefined) {
                             throw new Error(`defaultValueOnCreate() returned undefined for field ${field.name}`);
                         }
                     }
                 }
                 if (field.defaultValueOnEdit &&
                     this.options.operation === action_1.WriteOperation.Edit) {
-                    value = field.defaultValueOnEdit(builder, input);
-                    // TODO special case this if this is the onlything changing and don't do the write.
+                    defaultValue = field.defaultValueOnEdit(builder, input);
+                    // TODO special case this if this is the only thing changing and don't do the write.
                 }
             }
+            data[dbKey] = value;
+            if (defaultValue !== undefined) {
+                updateInput = true;
+                data[dbKey] = defaultValue;
+                this.defaultFieldsByFieldName[fieldName] = defaultValue;
+                // TODO related to #510. we need this logic to be consistent so do this all in TypeScript or get it from go somehow
+                this.defaultFieldsByTSName[(0, camel_case_1.camelCase)(fieldName)] = defaultValue;
+            }
+        }
+        if (updateInput && this.options.updateInput) {
+            // this basically fixes #605. just needs to be exposed correctly
+            this.options.updateInput(this.defaultFieldsByTSName);
+        }
+        return data;
+    }
+    async formatAndValidateFields(schemaFields) {
+        if (this.options.operation == action_1.WriteOperation.Delete) {
+            return;
+        }
+        const editedFields = this.options.editedFields();
+        // build up data to be saved...
+        let data = {};
+        let logValues = {};
+        for (const [fieldName, field] of schemaFields) {
+            let value = editedFields.get(fieldName);
+            if (value === undefined) {
+                // null allowed
+                value = this.defaultFieldsByFieldName[fieldName];
+            }
+            let dbKey = field.storageKey || (0, snake_case_1.snakeCase)(field.name);
+            // now format and validate...
             if (value === null) {
                 if (!field.nullable) {
                     throw new Error(`field ${field.name} set to null for non-nullable field`);
@@ -364,7 +402,6 @@ class Orchestrator {
         }
         this.validatedFields = data;
         this.logValues = logValues;
-        //    console.log(this.validatedFields);
     }
     async valid() {
         try {

package/core/base.js

@@ -9,22 +9,25 @@ var privacyResult;
     privacyResult[privacyResult["Deny"] = 401] = "Deny";
     privacyResult[privacyResult["Skip"] = 307] = "Skip";
 })(privacyResult || (privacyResult = {}));
+const allow = {
+    result: privacyResult.Allow,
+};
 function Allow() {
-    return {
-        result: privacyResult.Allow,
-    };
+    return allow;
 }
 exports.Allow = Allow;
+const skip = {
+    result: privacyResult.Skip,
+};
 function Skip() {
-    return {
-        result: privacyResult.Skip,
-    };
+    return skip;
 }
 exports.Skip = Skip;
+const deny = {
+    result: privacyResult.Deny,
+};
 function Deny() {
-    return {
-        result: privacyResult.Deny,
-    };
+    return deny;
 }
 exports.Deny = Deny;
 function DenyWithReason(e) {

package/core/convert.js

@@ -59,7 +59,8 @@ function convertList(val, conv) {
 }
 exports.convertList = convertList;
 function convertNullableList(val, conv) {
-    if (val === null) {
+    // undefined can happen with unsafe ents
+    if (val === null || val === undefined) {
         return null;
     }
     return convertList(val, conv);

package/core/privacy.d.ts

@@ -59,6 +59,18 @@ export declare class AllowIfViewerIsEntPropertyRule<T extends Ent> implements Pr
     constructor(property: keyof T);
     apply(v: Viewer, ent?: T): Promise<PrivacyResult>;
 }
+export declare class AllowIfEntPropertyIsRule<T extends Ent> implements PrivacyPolicyRule {
+    private property;
+    private val;
+    constructor(property: keyof T, val: any);
+    apply(v: Viewer, ent?: T): Promise<PrivacyResult>;
+}
+export declare class DenyIfEntPropertyIsRule<T extends Ent> implements PrivacyPolicyRule {
+    private property;
+    private val;
+    constructor(property: keyof T, val: any);
+    apply(v: Viewer, ent?: T): Promise<PrivacyResult>;
+}
 export declare class AllowIfEntIsVisibleRule<T extends Ent> implements PrivacyPolicyRule {
     private id;
     private options;

package/core/privacy.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AllowIfViewerHasIdentityPrivacyPolicy = exports.AllowIfViewerPrivacyPolicy = exports.AlwaysDenyPrivacyPolicy = exports.AlwaysAllowPrivacyPolicy = exports.applyPrivacyPolicyX = exports.applyPrivacyPolicy = exports.AllowIfSubPolicyAllowsRule = exports.DelayedResultRule = exports.AllowIfConditionAppliesRule = exports.DenyIfViewerOutboundEdgeDoesNotExistRule = exports.DenyIfViewerInboundEdgeDoesNotExistRule = exports.DenyIfEdgeDoesNotExistRule = exports.DenyIfViewerOutboundEdgeExistsRule = exports.DenyIfViewerInboundEdgeExistsRule = exports.DenyIfEdgeExistsRule = exports.AllowIfViewerOutboundEdgeExistsRule = exports.AllowIfViewerInboundEdgeExistsRule = exports.AllowIfEdgeExistsRule = exports.DenyIfEntIsNotVisibleRule = exports.DenyIfEntIsVisibleRule = exports.DenyIfEntIsVisiblePolicy = exports.AllowIfEntIsVisiblePolicy = exports.AllowIfEntIsNotVisibleRule = exports.AllowIfEntIsVisibleRule = exports.AllowIfViewerIsEntPropertyRule = exports.AllowIfViewerIsRule = exports.DenyIfFuncRule = exports.AllowIfFuncRule = exports.DenyIfViewerEqualsRule = exports.AllowIfViewerEqualsRule = exports.AllowIfViewerRule = exports.AllowIfHasIdentity = exports.DenyIfLoggedInRule = exports.DenyIfLoggedOutRule = exports.AlwaysDenyRule = exports.AlwaysAllowRule = exports.EntPrivacyError = void 0;
+exports.AllowIfViewerHasIdentityPrivacyPolicy = exports.AllowIfViewerPrivacyPolicy = exports.AlwaysDenyPrivacyPolicy = exports.AlwaysAllowPrivacyPolicy = exports.applyPrivacyPolicyX = exports.applyPrivacyPolicy = exports.AllowIfSubPolicyAllowsRule = exports.DelayedResultRule = exports.AllowIfConditionAppliesRule = exports.DenyIfViewerOutboundEdgeDoesNotExistRule = exports.DenyIfViewerInboundEdgeDoesNotExistRule = exports.DenyIfEdgeDoesNotExistRule = exports.DenyIfViewerOutboundEdgeExistsRule = exports.DenyIfViewerInboundEdgeExistsRule = exports.DenyIfEdgeExistsRule = exports.AllowIfViewerOutboundEdgeExistsRule = exports.AllowIfViewerInboundEdgeExistsRule = exports.AllowIfEdgeExistsRule = exports.DenyIfEntIsNotVisibleRule = exports.DenyIfEntIsVisibleRule = exports.DenyIfEntIsVisiblePolicy = exports.AllowIfEntIsVisiblePolicy = exports.AllowIfEntIsNotVisibleRule = exports.AllowIfEntIsVisibleRule = exports.DenyIfEntPropertyIsRule = exports.AllowIfEntPropertyIsRule = exports.AllowIfViewerIsEntPropertyRule = exports.AllowIfViewerIsRule = exports.DenyIfFuncRule = exports.AllowIfFuncRule = exports.DenyIfViewerEqualsRule = exports.AllowIfViewerEqualsRule = exports.AllowIfViewerRule = exports.AllowIfHasIdentity = exports.DenyIfLoggedInRule = exports.DenyIfLoggedOutRule = exports.AlwaysDenyRule = exports.AlwaysAllowRule = exports.EntPrivacyError = void 0;
 const base_1 = require("./base");
 const ent_1 = require("./ent");
 const logger_1 = require("./logger");
@@ -156,6 +156,34 @@ class AllowIfViewerIsEntPropertyRule {
     }
 }
 exports.AllowIfViewerIsEntPropertyRule = AllowIfViewerIsEntPropertyRule;
+class AllowIfEntPropertyIsRule {
+    constructor(property, val) {
+        this.property = property;
+        this.val = val;
+    }
+    async apply(v, ent) {
+        const result = ent && ent[this.property];
+        if (result === this.val) {
+            return (0, base_1.Allow)();
+        }
+        return (0, base_1.Skip)();
+    }
+}
+exports.AllowIfEntPropertyIsRule = AllowIfEntPropertyIsRule;
+class DenyIfEntPropertyIsRule {
+    constructor(property, val) {
+        this.property = property;
+        this.val = val;
+    }
+    async apply(v, ent) {
+        const result = ent && ent[this.property];
+        if (result === this.val) {
+            return (0, base_1.Deny)();
+        }
+        return (0, base_1.Skip)();
+    }
+}
+exports.DenyIfEntPropertyIsRule = DenyIfEntPropertyIsRule;
 class AllowIfEntIsVisibleRule {
     constructor(id, options) {
         this.id = id;

package/core/query/assoc_query.d.ts

@@ -3,16 +3,17 @@ import { AssocEdge } from "../ent";
 import { AssocEdgeCountLoaderFactory } from "../loaders/assoc_count_loader";
 import { AssocEdgeLoaderFactory } from "../loaders/assoc_edge_loader";
 import { EdgeQuery, BaseEdgeQuery, IDInfo } from "./query";
-export declare type EdgeQuerySource<T extends Ent> = T | T[] | ID | ID[] | EdgeQuery<T, Ent, AssocEdge>;
+export declare type EdgeQuerySource<TSource extends Ent, TDest extends Ent = Ent> = TSource | TSource[] | ID | ID[] | EdgeQuery<TDest, Ent, AssocEdge>;
 declare type loaderOptionsFunc = (type: string) => LoadEntOptions<Ent>;
-export declare class AssocEdgeQueryBase<TSource extends Ent, TDest extends Ent, TEdge extends AssocEdge> extends BaseEdgeQuery<TSource, TDest, TEdge> {
+export declare abstract class AssocEdgeQueryBase<TSource extends Ent, TDest extends Ent, TEdge extends AssocEdge> extends BaseEdgeQuery<TSource, TDest, TEdge> implements EdgeQuery<TSource, TDest, TEdge> {
     viewer: Viewer;
-    src: EdgeQuerySource<TSource>;
+    src: EdgeQuerySource<TSource, TDest>;
     private countLoaderFactory;
     private dataLoaderFactory;
     private options;
-    constructor(viewer: Viewer, src: EdgeQuerySource<TSource>, countLoaderFactory: AssocEdgeCountLoaderFactory, dataLoaderFactory: AssocEdgeLoaderFactory<TEdge>, options: LoadEntOptions<TDest> | loaderOptionsFunc);
+    constructor(viewer: Viewer, src: EdgeQuerySource<TSource, TDest>, countLoaderFactory: AssocEdgeCountLoaderFactory, dataLoaderFactory: AssocEdgeLoaderFactory<TEdge>, options: LoadEntOptions<TDest> | loaderOptionsFunc);
     private isEdgeQuery;
+    abstract sourceEnt(id: ID): Promise<Ent | null>;
     private getSingleID;
     queryRawCount(): Promise<number>;
     queryAllRawCount(): Promise<Map<ID, number>>;

package/core/query/custom_query.d.ts

@@ -1,5 +1,5 @@
 import { Data, Ent, ID, EdgeQueryableDataOptions, LoadEntOptions, Viewer, LoaderFactory, ConfigurableLoaderFactory } from "../base";
-import { BaseEdgeQuery, IDInfo } from "./query";
+import { BaseEdgeQuery, IDInfo, EdgeQuery } from "./query";
 export interface CustomEdgeQueryOptions<TSource extends Ent, TDest extends Ent> {
     src: TSource | ID;
     countLoaderFactory: LoaderFactory<ID, number>;
@@ -7,11 +7,12 @@ export interface CustomEdgeQueryOptions<TSource extends Ent, TDest extends Ent>
     options: LoadEntOptions<TDest>;
     sortColumn?: string;
 }
-export declare class CustomEdgeQueryBase<TSource extends Ent, TDest extends Ent> extends BaseEdgeQuery<TSource, TDest, Data> {
+export declare abstract class CustomEdgeQueryBase<TSource extends Ent, TDest extends Ent> extends BaseEdgeQuery<TSource, TDest, Data> implements EdgeQuery<TSource, TDest, Data> {
     viewer: Viewer;
     private options;
     private id;
     constructor(viewer: Viewer, options: CustomEdgeQueryOptions<TSource, TDest>);
+    abstract sourceEnt(id: ID): Promise<Ent | null>;
     private idVisible;
     queryRawCount(): Promise<number>;
     queryAllRawCount(): Promise<Map<ID, number>>;

package/core/query/query.d.ts

@@ -16,7 +16,7 @@ export interface EdgeQuery<TSource extends Ent, TDest extends Ent, TEdge extends
     getCursor(row: TEdge): string;
     dataToID(edge: TEdge): ID;
     getPrivacyPolicy(): PrivacyPolicy;
-    entForPrivacy?(id: ID): Promise<TSource | null>;
+    sourceEnt(id: ID): Promise<Ent | null>;
 }
 export interface EdgeQueryFilter<T extends Data> {
     filter?(id: ID, edges: T[]): T[];
@@ -42,6 +42,7 @@ export declare abstract class BaseEdgeQuery<TSource extends Ent, TDest extends E
     private idsToFetch;
     constructor(viewer: Viewer, sortCol: string);
     getPrivacyPolicy(): PrivacyPolicy;
+    abstract sourceEnt(id: ID): Promise<Ent | null>;
     first(n: number, after?: string): this;
     last(n: number, before?: string): this;
     private querySingleEdge;

package/core/query/query.js

@@ -350,8 +350,8 @@ async function applyPrivacyPolicyForEdgeQ(viewer, edgeQ, ids, map) {
     const result = [];
     await Promise.all(ids.map(async (id) => {
         let ent = map.get(id);
-        if (!ent && edgeQ.entForPrivacy) {
-            ent = await edgeQ.entForPrivacy(id);
+        if (!ent) {
+            ent = await edgeQ.sourceEnt(id);
         }
         const r = await (0, privacy_1.applyPrivacyPolicy)(viewer, edgeQ.getPrivacyPolicy(), ent || undefined);
         result.push({

package/graphql/builtins/connection.js

@@ -5,6 +5,7 @@ const graphql_1 = require("graphql");
 const node_1 = require("./node");
 const edge_1 = require("./edge");
 const page_info_1 = require("../query/page_info");
+// NB: if this changes, need to update renderer.go also
 exports.GraphQLConnectionInterface = new graphql_1.GraphQLInterfaceType({
     name: "Connection",
     description: "connection interface",

package/graphql/builtins/edge.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GraphQLEdgeInterface = void 0;
 const graphql_1 = require("graphql");
 const node_1 = require("./node");
+// NB: if this changes, need to update renderer.go also
 exports.GraphQLEdgeInterface = new graphql_1.GraphQLInterfaceType({
     name: "Edge",
     description: "edge interface",

package/graphql/builtins/node.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GraphQLNodeInterface = void 0;
 const graphql_1 = require("graphql");
+// NB: if this changes, need to update renderer.go also
 exports.GraphQLNodeInterface = new graphql_1.GraphQLInterfaceType({
     name: "Node",
     description: "node interface",

package/graphql/graphql.d.ts

@@ -8,6 +8,7 @@ export interface CustomType {
     importPath: string;
     tsType?: string;
     tsImportPath?: string;
+    [x: string]: any;
 }
 declare type Type = GraphQLScalarType | ClassType | string | CustomType;
 export declare type GraphQLConnection<T> = {
@@ -81,6 +82,7 @@ declare enum NullableResult {
     CONTENTS_AND_LIST = "contentsAndList",
     ITEM = "true"
 }
+export declare const addCustomType: (type: CustomType) => void;
 export declare class GQLCapture {
     private static enabled;
     static enable(enabled: boolean): void;

package/graphql/graphql.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gqlFileUpload = exports.gqlConnection = exports.gqlContextType = exports.gqlMutation = exports.gqlQuery = exports.gqlObjectType = exports.gqlInputObjectType = exports.gqlArgType = exports.gqlArg = exports.gqlField = exports.GQLCapture = exports.CustomFieldType = void 0;
+exports.gqlFileUpload = exports.gqlConnection = exports.gqlContextType = exports.gqlMutation = exports.gqlQuery = exports.gqlObjectType = exports.gqlInputObjectType = exports.gqlArgType = exports.gqlArg = exports.gqlField = exports.GQLCapture = exports.addCustomType = exports.CustomFieldType = void 0;
 require("reflect-metadata");
 // export interface gqlTopLevelOptions
 //   name?: string;
@@ -20,6 +20,88 @@ var NullableResult;
     NullableResult["CONTENTS_AND_LIST"] = "contentsAndList";
     NullableResult["ITEM"] = "true";
 })(NullableResult || (NullableResult = {}));
+const isArray = (type) => {
+    if (typeof type === "function") {
+        return false;
+    }
+    return type.push !== undefined;
+};
+const isConnection = (type) => {
+    if (typeof type !== "object") {
+        return false;
+    }
+    return type.node !== undefined;
+};
+const isString = (type) => {
+    if (type.lastIndexOf !== undefined) {
+        return true;
+    }
+    return false;
+};
+const isCustomType = (type) => {
+    return type.importPath !== undefined;
+};
+const isGraphQLScalarType = (type) => {
+    return type.serialize !== undefined;
+};
+const addCustomType = (type) => {
+    // TODO these should return ReadOnly objects...
+    const customType = GQLCapture.getCustomTypes().get(type.type);
+    if (customType && customType !== type) {
+        throw new Error(`cannot add multiple custom types of name ${type.type}`);
+    }
+    if (customType) {
+        return;
+    }
+    try {
+        const r = require(type.importPath);
+        const ct = r[type.type];
+        // this gets us the information needed for scalars
+        if (ct && isGraphQLScalarType(ct)) {
+            type.scalarInfo = {
+                description: ct.description,
+                name: ct.name,
+            };
+            if (ct.specifiedByUrl) {
+                type.scalarInfo.specifiedByUrl = ct.specifiedByUrl;
+            }
+        }
+    }
+    catch (e) {
+        return;
+    }
+    GQLCapture.getCustomTypes().set(type.type, type);
+};
+exports.addCustomType = addCustomType;
+const getType = (typ, result) => {
+    if (isConnection(typ)) {
+        result.connection = true;
+        return getType(typ.node, result);
+    }
+    if (isArray(typ)) {
+        result.list = true;
+        return getType(typ[0], result);
+    }
+    if (isString(typ)) {
+        if (typ.lastIndexOf("]") !== -1) {
+            result.list = true;
+            result.type = typ.substr(1, typ.length - 2);
+        }
+        else {
+            result.type = typ;
+        }
+        return;
+    }
+    if (isCustomType(typ)) {
+        result.type = typ.type;
+        (0, exports.addCustomType)(typ);
+        return;
+    }
+    // GraphQLScalarType or ClassType
+    result.scalarType = isGraphQLScalarType(typ);
+    result.type = typ.name;
+    return;
+};
 class GQLCapture {
     static enable(enabled) {
         this.enabled = enabled;
@@ -104,66 +186,6 @@ class GQLCapture {
         if ((type === "Number" || type === "Object") && !options?.type) {
             throw new Error(`type is required when accessor/function/property returns a ${type}`);
         }
-        const isArray = (type) => {
-            if (typeof type === "function") {
-                return false;
-            }
-            return type.push !== undefined;
-        };
-        const isConnection = (type) => {
-            if (typeof type !== "object") {
-                return false;
-            }
-            return type.node !== undefined;
-        };
-        const isString = (type) => {
-            if (type.lastIndexOf !== undefined) {
-                return true;
-            }
-            return false;
-        };
-        const isCustomType = (type) => {
-            return type.importPath !== undefined;
-        };
-        const isGraphQLScalarType = (type) => {
-            return type.serialize !== undefined;
-        };
-        const addCustomType = (type) => {
-            const customType = this.customTypes.get(type.type);
-            if (customType && customType !== type) {
-                throw new Error(`cannot add multiple custom types of name ${type.type}`);
-            }
-            this.customTypes.set(type.type, type);
-        };
-        const getType = (typ, result) => {
-            if (isConnection(typ)) {
-                result.connection = true;
-                return getType(typ.node, result);
-            }
-            if (isArray(typ)) {
-                result.list = true;
-                return getType(typ[0], result);
-            }
-            if (isString(typ)) {
-                if (typ.lastIndexOf("]") !== -1) {
-                    result.list = true;
-                    result.type = typ.substr(1, typ.length - 2);
-                }
-                else {
-                    result.type = typ;
-                }
-                return;
-            }
-            if (isCustomType(typ)) {
-                result.type = typ.type;
-                addCustomType(typ);
-                return;
-            }
-            // GraphQLScalarType or ClassType
-            result.scalarType = isGraphQLScalarType(typ);
-            result.type = typ.name;
-            return;
-        };
         let list;
         let scalarType = false;
         let connection;

package/graphql/query/page_info.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GraphQLPageInfo = void 0;
 const graphql_1 = require("graphql");
+// NB: if this changes, need to update renderer.go also
 exports.GraphQLPageInfo = new graphql_1.GraphQLObjectType({
     name: "PageInfo",
     fields: () => ({

package/imports/index.d.ts

@@ -10,7 +10,7 @@ interface classResult {
     class: classInfo;
     file: file;
 }
-export declare function parseCustomInput(filePath: string, opts?: Options): PathResult;
+export declare function parseCustomImports(filePath: string, opts?: Options): PathResult;
 export declare function findTSConfigFile(filePath: string): string | null;
 export interface importInfo {
     name: string;

package/imports/index.js

@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findTSConfigFile = exports.parseCustomInput = void 0;
+exports.findTSConfigFile = exports.parseCustomImports = void 0;
 const glob_1 = __importDefault(require("glob"));
 const typescript_1 = __importDefault(require("typescript"));
 const json5_1 = __importDefault(require("json5"));
@@ -42,10 +42,9 @@ function getFiles(filePath, opts) {
     }
     return files;
 }
-function parseCustomInput(filePath, opts) {
+function parseCustomImports(filePath, opts) {
     const files = getFiles(filePath, opts);
     const options = readCompilerOptions(filePath);
-    // classMap
     let classMap = new Map();
     files.forEach((file) => {
         const sourceFile = typescript_1.default.createSourceFile(file, fs.readFileSync(file).toString(), options.target || typescript_1.default.ScriptTarget.ES2015);
@@ -77,7 +76,7 @@ function parseCustomInput(filePath, opts) {
         },
     };
 }
-exports.parseCustomInput = parseCustomInput;
+exports.parseCustomImports = parseCustomImports;
 function findTSConfigFile(filePath) {
     while (filePath != "/") {
         let configPath = `${filePath}/tsconfig.json`;
@@ -95,7 +94,6 @@ function readCompilerOptions(filePath) {
     if (!configPath) {
         return {};
     }
-    const root = path.join(filePath, "..");
     let json = {};
     try {
         json = json5_1.default.parse(fs.readFileSync(configPath, {

package/index.d.ts

@@ -3,7 +3,7 @@ export { loadEnt, loadCustomData, loadCustomEnts, loadEntX, loadEnts, CustomQuer
 import DB from "./core/db";
 export * from "./core/loaders";
 export { DB };
-export { EntPrivacyError, AlwaysAllowRule, AlwaysDenyRule, DenyIfLoggedInRule, DenyIfLoggedOutRule, AllowIfHasIdentity, AllowIfViewerRule, AllowIfFuncRule, AllowIfViewerIsRule, AllowIfViewerIsEntPropertyRule, AllowIfViewerEqualsRule, DenyIfViewerEqualsRule, AllowIfEdgeExistsRule, AllowIfViewerInboundEdgeExistsRule, AllowIfViewerOutboundEdgeExistsRule, DenyIfEdgeExistsRule, DenyIfViewerInboundEdgeExistsRule, DenyIfViewerOutboundEdgeExistsRule, DenyIfEdgeDoesNotExistRule, DenyIfViewerInboundEdgeDoesNotExistRule, DenyIfViewerOutboundEdgeDoesNotExistRule, AllowIfEntIsVisibleRule, AllowIfEntIsNotVisibleRule, DenyIfEntIsVisibleRule, DenyIfEntIsNotVisibleRule, AllowIfEntIsVisiblePolicy, DenyIfEntIsVisiblePolicy, DelayedResultRule, applyPrivacyPolicy, applyPrivacyPolicyX, AlwaysAllowPrivacyPolicy, AlwaysDenyPrivacyPolicy, AllowIfConditionAppliesRule, AllowIfSubPolicyAllowsRule, AllowIfViewerPrivacyPolicy, AllowIfViewerHasIdentityPrivacyPolicy, } from "./core/privacy";
+export { EntPrivacyError, AlwaysAllowRule, AlwaysDenyRule, DenyIfLoggedInRule, DenyIfLoggedOutRule, AllowIfHasIdentity, AllowIfViewerRule, AllowIfFuncRule, AllowIfViewerIsRule, AllowIfViewerIsEntPropertyRule, AllowIfEntPropertyIsRule, DenyIfEntPropertyIsRule, AllowIfViewerEqualsRule, DenyIfViewerEqualsRule, AllowIfEdgeExistsRule, AllowIfViewerInboundEdgeExistsRule, AllowIfViewerOutboundEdgeExistsRule, DenyIfEdgeExistsRule, DenyIfViewerInboundEdgeExistsRule, DenyIfViewerOutboundEdgeExistsRule, DenyIfEdgeDoesNotExistRule, DenyIfViewerInboundEdgeDoesNotExistRule, DenyIfViewerOutboundEdgeDoesNotExistRule, AllowIfEntIsVisibleRule, AllowIfEntIsNotVisibleRule, DenyIfEntIsVisibleRule, DenyIfEntIsNotVisibleRule, AllowIfEntIsVisiblePolicy, DenyIfEntIsVisiblePolicy, DelayedResultRule, applyPrivacyPolicy, applyPrivacyPolicyX, AlwaysAllowPrivacyPolicy, AlwaysDenyPrivacyPolicy, AllowIfConditionAppliesRule, AllowIfSubPolicyAllowsRule, AllowIfViewerPrivacyPolicy, AllowIfViewerHasIdentityPrivacyPolicy, } from "./core/privacy";
 export * from "./core/query";
 export * from "./schema/";
 import * as q from "./core/clause";

package/index.js

@@ -25,8 +25,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DenyIfViewerInboundEdgeDoesNotExistRule = exports.DenyIfEdgeDoesNotExistRule = exports.DenyIfViewerOutboundEdgeExistsRule = exports.DenyIfViewerInboundEdgeExistsRule = exports.DenyIfEdgeExistsRule = exports.AllowIfViewerOutboundEdgeExistsRule = exports.AllowIfViewerInboundEdgeExistsRule = exports.AllowIfEdgeExistsRule = exports.DenyIfViewerEqualsRule = exports.AllowIfViewerEqualsRule = exports.AllowIfViewerIsEntPropertyRule = exports.AllowIfViewerIsRule = exports.AllowIfFuncRule = exports.AllowIfViewerRule = exports.AllowIfHasIdentity = exports.DenyIfLoggedOutRule = exports.DenyIfLoggedInRule = exports.AlwaysDenyRule = exports.AlwaysAllowRule = exports.EntPrivacyError = exports.DB = exports.getEdgeTypeInGroup = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadEdges = exports.loadEdgeDatas = exports.loadEdgeData = exports.AssocEdgeData = exports.AssocEdge = exports.DeleteNodeOperation = exports.EdgeOperation = exports.EditNodeOperation = exports.loadRows = exports.loadRow = exports.loadRowX = exports.performRawQuery = exports.applyPrivacyPolicyForEntX = exports.applyPrivacyPolicyForEnt = exports.loadEntXViaKey = exports.loadEntViaKey = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadEnts = exports.loadEntX = exports.loadCustomEnts = exports.loadCustomData = exports.loadEnt = void 0;
-exports.setLogLevels = exports.loadConfig = exports.LoggedOutViewer = exports.IDViewer = exports.ContextCache = exports.query = exports.AllowIfViewerHasIdentityPrivacyPolicy = exports.AllowIfViewerPrivacyPolicy = exports.AllowIfSubPolicyAllowsRule = exports.AllowIfConditionAppliesRule = exports.AlwaysDenyPrivacyPolicy = exports.AlwaysAllowPrivacyPolicy = exports.applyPrivacyPolicyX = exports.applyPrivacyPolicy = exports.DelayedResultRule = exports.DenyIfEntIsVisiblePolicy = exports.AllowIfEntIsVisiblePolicy = exports.DenyIfEntIsNotVisibleRule = exports.DenyIfEntIsVisibleRule = exports.AllowIfEntIsNotVisibleRule = exports.AllowIfEntIsVisibleRule = exports.DenyIfViewerOutboundEdgeDoesNotExistRule = void 0;
+exports.DenyIfViewerOutboundEdgeExistsRule = exports.DenyIfViewerInboundEdgeExistsRule = exports.DenyIfEdgeExistsRule = exports.AllowIfViewerOutboundEdgeExistsRule = exports.AllowIfViewerInboundEdgeExistsRule = exports.AllowIfEdgeExistsRule = exports.DenyIfViewerEqualsRule = exports.AllowIfViewerEqualsRule = exports.DenyIfEntPropertyIsRule = exports.AllowIfEntPropertyIsRule = exports.AllowIfViewerIsEntPropertyRule = exports.AllowIfViewerIsRule = exports.AllowIfFuncRule = exports.AllowIfViewerRule = exports.AllowIfHasIdentity = exports.DenyIfLoggedOutRule = exports.DenyIfLoggedInRule = exports.AlwaysDenyRule = exports.AlwaysAllowRule = exports.EntPrivacyError = exports.DB = exports.getEdgeTypeInGroup = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadEdges = exports.loadEdgeDatas = exports.loadEdgeData = exports.AssocEdgeData = exports.AssocEdge = exports.DeleteNodeOperation = exports.EdgeOperation = exports.EditNodeOperation = exports.loadRows = exports.loadRow = exports.loadRowX = exports.performRawQuery = exports.applyPrivacyPolicyForEntX = exports.applyPrivacyPolicyForEnt = exports.loadEntXViaKey = exports.loadEntViaKey = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadEnts = exports.loadEntX = exports.loadCustomEnts = exports.loadCustomData = exports.loadEnt = void 0;
+exports.setLogLevels = exports.loadConfig = exports.LoggedOutViewer = exports.IDViewer = exports.ContextCache = exports.query = exports.AllowIfViewerHasIdentityPrivacyPolicy = exports.AllowIfViewerPrivacyPolicy = exports.AllowIfSubPolicyAllowsRule = exports.AllowIfConditionAppliesRule = exports.AlwaysDenyPrivacyPolicy = exports.AlwaysAllowPrivacyPolicy = exports.applyPrivacyPolicyX = exports.applyPrivacyPolicy = exports.DelayedResultRule = exports.DenyIfEntIsVisiblePolicy = exports.AllowIfEntIsVisiblePolicy = exports.DenyIfEntIsNotVisibleRule = exports.DenyIfEntIsVisibleRule = exports.AllowIfEntIsNotVisibleRule = exports.AllowIfEntIsVisibleRule = exports.DenyIfViewerOutboundEdgeDoesNotExistRule = exports.DenyIfViewerInboundEdgeDoesNotExistRule = exports.DenyIfEdgeDoesNotExistRule = void 0;
 __exportStar(require("./core/base"), exports);
 var ent_1 = require("./core/ent");
 Object.defineProperty(exports, "loadEnt", { enumerable: true, get: function () { return ent_1.loadEnt; } });
@@ -74,6 +74,8 @@ Object.defineProperty(exports, "AllowIfViewerRule", { enumerable: true, get: fun
 Object.defineProperty(exports, "AllowIfFuncRule", { enumerable: true, get: function () { return privacy_1.AllowIfFuncRule; } });
 Object.defineProperty(exports, "AllowIfViewerIsRule", { enumerable: true, get: function () { return privacy_1.AllowIfViewerIsRule; } });
 Object.defineProperty(exports, "AllowIfViewerIsEntPropertyRule", { enumerable: true, get: function () { return privacy_1.AllowIfViewerIsEntPropertyRule; } });
+Object.defineProperty(exports, "AllowIfEntPropertyIsRule", { enumerable: true, get: function () { return privacy_1.AllowIfEntPropertyIsRule; } });
+Object.defineProperty(exports, "DenyIfEntPropertyIsRule", { enumerable: true, get: function () { return privacy_1.DenyIfEntPropertyIsRule; } });
 Object.defineProperty(exports, "AllowIfViewerEqualsRule", { enumerable: true, get: function () { return privacy_1.AllowIfViewerEqualsRule; } });
 Object.defineProperty(exports, "DenyIfViewerEqualsRule", { enumerable: true, get: function () { return privacy_1.DenyIfViewerEqualsRule; } });
 Object.defineProperty(exports, "AllowIfEdgeExistsRule", { enumerable: true, get: function () { return privacy_1.AllowIfEdgeExistsRule; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.0.24",
+  "version": "0.0.28",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,6 +9,7 @@
   },
   "dependencies": {
     "@types/node": "^15.0.2",
+    "camel-case": "^4.1.2",
     "dataloader": "^2.0.0",
     "glob": "^7.1.6",
     "graph-data-structure": "^1.12.0",
@@ -38,7 +39,7 @@
     }
   },
   "engines": {
-    "node": "^16.1.0"
+    "node": ">=14.0"
   },
   "devDependencies": {},
   "scripts": {},

package/schema/field.d.ts

@@ -32,10 +32,10 @@ export declare class IntegerField extends BaseField implements Field {
     constructor(options?: IntegerOptions);
     getOptions(): IntegerOptions;
     private handleOptions;
-    min(l: number): IntegerField;
-    max(l: number): IntegerField;
+    min(l: number): this;
+    max(l: number): this;
     valid(val: any): boolean;
-    validate(validator: (str: number) => boolean): IntegerField;
+    validate(validator: (str: number) => boolean): this;
 }
 export declare function IntegerType(options: IntegerOptions): IntegerField;
 export declare class BigIntegerField extends BaseField implements Field {
@@ -70,20 +70,20 @@ export declare class StringField extends BaseField implements Field {
     constructor(options?: StringOptions);
     getOptions(): StringOptions;
     private handleOptions;
-    minLen(l: number): StringField;
-    maxLen(l: number): StringField;
-    length(l: number): StringField;
+    minLen(l: number): this;
+    maxLen(l: number): this;
+    length(l: number): this;
     valid(val: any): boolean;
     format(val: any): any;
-    validate(validator: (str: string) => boolean): StringField;
-    formatter(formatter: (str: string) => string): StringField;
-    match(pattern: string | RegExp): StringField;
-    doesNotMatch(pattern: string | RegExp): StringField;
-    toLowerCase(): StringField;
-    toUpperCase(): StringField;
-    trim(): StringField;
-    trimLeft(): StringField;
-    trimRight(): StringField;
+    validate(validator: (str: string) => boolean): this;
+    formatter(formatter: (str: string) => string): this;
+    match(pattern: string | RegExp): this;
+    doesNotMatch(pattern: string | RegExp): this;
+    toLowerCase(): this;
+    toUpperCase(): this;
+    trim(): this;
+    trimLeft(): this;
+    trimRight(): this;
 }
 export declare function StringType(options: StringOptions): StringField;
 export interface TimestampOptions extends FieldOptions {

package/scripts/custom_graphql.js

@@ -25,6 +25,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const glob_1 = __importDefault(require("glob"));
 const minimist_1 = __importDefault(require("minimist"));
+const graphql_1 = require("../graphql/graphql");
 const readline = __importStar(require("readline"));
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
@@ -52,7 +53,17 @@ async function readInputs() {
         });
     });
 }
-async function captureCustom(filePath) {
+async function captureCustom(filePath, filesCsv) {
+    if (filesCsv !== undefined) {
+        let files = filesCsv.split(",");
+        for (let i = 0; i < files.length; i++) {
+            // TODO fix. we have "src" in the path we get here
+            files[i] = path.join(filePath, "..", files[i]);
+        }
+        await requireFiles(files);
+        return;
+    }
+    // TODO delete all of this eventually
     // TODO configurable paths eventually
     // for now only files that are in the include path of the roots are allowed
     const rootFiles = [
@@ -81,18 +92,28 @@ async function captureCustom(filePath) {
         ignore: ignore,
     });
     const files = rootFiles.concat(customGQLResolvers, customGQLMutations);
-    //console.log(files);
-    let promises = [];
-    files.forEach((file) => {
+    await requireFiles(files);
+}
+async function requireFiles(files) {
+    await Promise.all(files.map(async (file) => {
         if (fs.existsSync(file)) {
-            promises.push(require(file));
+            try {
+                await require(file);
+            }
+            catch (e) {
+                throw new Error(`${e.message} loading ${file}`);
+            }
+        }
+        else {
+            throw new Error(`file ${file} doesn't exist`);
         }
+    })).catch((err) => {
+        throw new Error(err);
     });
-    await Promise.all(promises);
 }
 async function parseImports(filePath) {
     // only do graphql files...
-    return (0, imports_1.parseCustomInput)(path.join(filePath, "graphql"), {
+    return (0, imports_1.parseCustomImports)(path.join(filePath, "graphql"), {
         ignore: ["**/generated/**", "**/tests/**"],
     });
 }
@@ -110,6 +131,20 @@ function findGraphQLPath(filePath) {
     return undefined;
 }
 async function main() {
+    // known custom types that are not required
+    // if not in the schema, will be ignored
+    // something like GraphQLUpload gotten via gqlArg({type: gqlFileUpload})
+    // these 2 need this because they're added by the schema
+    // if this list grows too long, need to build this into golang types and passed here
+    // TODO foreign non-scalars eventually
+    (0, graphql_1.addCustomType)({
+        importPath: "../graphql/scalars/time",
+        type: "GraphQLTime",
+    });
+    (0, graphql_1.addCustomType)({
+        importPath: "graphql-type-json",
+        type: "GraphQLJSON",
+    });
     const options = (0, minimist_1.default)(process.argv.slice(2));
     if (!options.path) {
         throw new Error("path required");
@@ -126,7 +161,7 @@ async function main() {
     GQLCapture.enable(true);
     const [inputsRead, _, imports] = await Promise.all([
         readInputs(),
-        captureCustom(options.path),
+        captureCustom(options.path, options.files),
         parseImports(options.path),
     ]);
     const { nodes, nodesMap } = inputsRead;

package/testutils/builder.d.ts

@@ -9,6 +9,7 @@ export declare class User implements Ent {
     accountID: string;
     nodeType: string;
     privacyPolicy: import("../core/base").PrivacyPolicy;
+    firstName: string;
     constructor(viewer: Viewer, data: Data);
 }
 export declare class Event implements Ent {

package/testutils/builder.js

@@ -23,6 +23,7 @@ class User {
         this.data.created_at = (0, convert_1.convertDate)(data.created_at);
         this.data.updated_at = (0, convert_1.convertDate)(data.updated_at);
         this.id = data.id;
+        this.firstName = data.first_name;
     }
 }
 exports.User = User;

package/testutils/fake_data/events_query.d.ts

@@ -1,25 +1,30 @@
-import { Viewer } from "../../core/base";
+import { ID, Viewer } from "../../core/base";
 import { AssocEdge } from "../../core/ent";
 import { AssocEdgeQueryBase, EdgeQuerySource } from "../../core/query/assoc_query";
 import { FakeUser } from "./fake_user";
 import { FakeEvent } from "./internal";
 export declare class EventToAttendeesQuery extends AssocEdgeQueryBase<FakeEvent, FakeUser, AssocEdge> {
-    constructor(viewer: Viewer, src: EdgeQuerySource<FakeEvent>);
-    static query(viewer: Viewer, src: EdgeQuerySource<FakeEvent>): EventToAttendeesQuery;
+    constructor(viewer: Viewer, src: EdgeQuerySource<FakeEvent, FakeUser>);
+    static query(viewer: Viewer, src: EdgeQuerySource<FakeEvent, FakeUser>): EventToAttendeesQuery;
+    sourceEnt(id: ID): Promise<FakeEvent | null>;
 }
 export declare class EventToInvitedQuery extends AssocEdgeQueryBase<FakeEvent, FakeUser, AssocEdge> {
-    constructor(viewer: Viewer, src: EdgeQuerySource<FakeEvent>);
-    static query(viewer: Viewer, src: EdgeQuerySource<FakeEvent>): EventToInvitedQuery;
+    constructor(viewer: Viewer, src: EdgeQuerySource<FakeEvent, FakeUser>);
+    static query(viewer: Viewer, src: EdgeQuerySource<FakeEvent, FakeUser>): EventToInvitedQuery;
+    sourceEnt(id: ID): Promise<FakeEvent | null>;
 }
 export declare class EventToDeclinedQuery extends AssocEdgeQueryBase<FakeEvent, FakeUser, AssocEdge> {
-    constructor(viewer: Viewer, src: EdgeQuerySource<FakeEvent>);
-    static query(viewer: Viewer, src: EdgeQuerySource<FakeEvent>): EventToDeclinedQuery;
+    constructor(viewer: Viewer, src: EdgeQuerySource<FakeEvent, FakeUser>);
+    static query(viewer: Viewer, src: EdgeQuerySource<FakeEvent, FakeUser>): EventToDeclinedQuery;
+    sourceEnt(id: ID): Promise<FakeEvent | null>;
 }
 export declare class EventToMaybeQuery extends AssocEdgeQueryBase<FakeEvent, FakeUser, AssocEdge> {
-    constructor(viewer: Viewer, src: EdgeQuerySource<FakeEvent>);
-    static query(viewer: Viewer, src: EdgeQuerySource<FakeEvent>): EventToMaybeQuery;
+    constructor(viewer: Viewer, src: EdgeQuerySource<FakeEvent, FakeUser>);
+    static query(viewer: Viewer, src: EdgeQuerySource<FakeEvent, FakeUser>): EventToMaybeQuery;
+    sourceEnt(id: ID): Promise<FakeEvent | null>;
 }
 export declare class EventToHostsQuery extends AssocEdgeQueryBase<FakeEvent, FakeUser, AssocEdge> {
-    constructor(viewer: Viewer, src: EdgeQuerySource<FakeEvent>);
-    static query(viewer: Viewer, src: EdgeQuerySource<FakeEvent>): EventToHostsQuery;
+    constructor(viewer: Viewer, src: EdgeQuerySource<FakeEvent, FakeUser>);
+    static query(viewer: Viewer, src: EdgeQuerySource<FakeEvent, FakeUser>): EventToHostsQuery;
+    sourceEnt(id: ID): Promise<FakeEvent | null>;
 }

package/testutils/fake_data/events_query.js

@@ -14,6 +14,9 @@ class EventToAttendeesQuery extends assoc_query_1.AssocEdgeQueryBase {
     static query(viewer, src) {
         return new EventToAttendeesQuery(viewer, src);
     }
+    sourceEnt(id) {
+        return internal_1.FakeEvent.load(this.viewer, id);
+    }
 }
 exports.EventToAttendeesQuery = EventToAttendeesQuery;
 class EventToInvitedQuery extends assoc_query_1.AssocEdgeQueryBase {
@@ -23,6 +26,9 @@ class EventToInvitedQuery extends assoc_query_1.AssocEdgeQueryBase {
     static query(viewer, src) {
         return new EventToInvitedQuery(viewer, src);
     }
+    sourceEnt(id) {
+        return internal_1.FakeEvent.load(this.viewer, id);
+    }
 }
 exports.EventToInvitedQuery = EventToInvitedQuery;
 class EventToDeclinedQuery extends assoc_query_1.AssocEdgeQueryBase {
@@ -32,6 +38,9 @@ class EventToDeclinedQuery extends assoc_query_1.AssocEdgeQueryBase {
     static query(viewer, src) {
         return new EventToDeclinedQuery(viewer, src);
     }
+    sourceEnt(id) {
+        return internal_1.FakeEvent.load(this.viewer, id);
+    }
 }
 exports.EventToDeclinedQuery = EventToDeclinedQuery;
 class EventToMaybeQuery extends assoc_query_1.AssocEdgeQueryBase {
@@ -41,6 +50,9 @@ class EventToMaybeQuery extends assoc_query_1.AssocEdgeQueryBase {
     static query(viewer, src) {
         return new EventToMaybeQuery(viewer, src);
     }
+    sourceEnt(id) {
+        return internal_1.FakeEvent.load(this.viewer, id);
+    }
 }
 exports.EventToMaybeQuery = EventToMaybeQuery;
 class EventToHostsQuery extends assoc_query_1.AssocEdgeQueryBase {
@@ -50,5 +62,8 @@ class EventToHostsQuery extends assoc_query_1.AssocEdgeQueryBase {
     static query(viewer, src) {
         return new EventToHostsQuery(viewer, src);
     }
+    sourceEnt(id) {
+        return internal_1.FakeEvent.load(this.viewer, id);
+    }
 }
 exports.EventToHostsQuery = EventToHostsQuery;

package/testutils/fake_data/user_query.d.ts

@@ -10,16 +10,19 @@ import { QueryLoaderFactory } from "../../core/loaders/query_loader";
 export declare class UserToContactsQuery extends AssocEdgeQueryBase<FakeUser, FakeContact, AssocEdge> {
     constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser>);
     static query(viewer: Viewer, src: EdgeQuerySource<FakeUser>): UserToContactsQuery;
+    sourceEnt(id: ID): Promise<FakeUser | null>;
 }
 export declare const userToContactsCountLoaderFactory: RawCountLoaderFactory;
 export declare const userToContactsDataLoaderFactory: IndexLoaderFactory;
 export declare class UserToContactsFkeyQuery extends CustomEdgeQueryBase<FakeUser, FakeContact> {
     constructor(viewer: Viewer, src: ID | FakeUser);
     static query(viewer: Viewer, src: FakeUser | ID): UserToContactsFkeyQuery;
+    sourceEnt(id: ID): Promise<FakeUser | null>;
 }
 export declare class UserToFriendsQuery extends AssocEdgeQueryBase<FakeUser, FakeUser, AssocEdge> {
     constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser>);
     static query(viewer: Viewer, src: EdgeQuerySource<FakeUser>): UserToFriendsQuery;
+    sourceEnt(id: ID): Promise<FakeUser | null>;
     queryContacts(): UserToContactsQuery;
     queryFriends(): UserToFriendsQuery;
     queryHostedEvents(): UserToHostedEventsQuery;
@@ -32,6 +35,7 @@ export declare class CustomEdge extends AssocEdge {
 export declare class UserToCustomEdgeQuery extends AssocEdgeQueryBase<FakeUser, FakeUser, CustomEdge> {
     constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser>);
     static query(viewer: Viewer, src: EdgeQuerySource<FakeUser>): UserToCustomEdgeQuery;
+    sourceEnt(id: ID): Promise<FakeUser | null>;
     queryContacts(): UserToContactsQuery;
     queryFriends(): UserToFriendsQuery;
     queryHostedEvents(): UserToHostedEventsQuery;
@@ -40,6 +44,7 @@ export declare class UserToCustomEdgeQuery extends AssocEdgeQueryBase<FakeUser,
 export declare class UserToFriendRequestsQuery extends AssocEdgeQueryBase<FakeUser, FakeUser, AssocEdge> {
     constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser>);
     static query(viewer: Viewer, src: EdgeQuerySource<FakeUser>): UserToFriendRequestsQuery;
+    sourceEnt(id: ID): Promise<FakeUser | null>;
     queryContacts(): UserToContactsQuery;
     queryFriends(): UserToFriendsQuery;
     queryHostedEvents(): UserToHostedEventsQuery;
@@ -47,10 +52,10 @@ export declare class UserToFriendRequestsQuery extends AssocEdgeQueryBase<FakeUs
     queryCustomEdge(): UserToCustomEdgeQuery;
 }
 export declare class UserToIncomingFriendRequestsQuery extends AssocEdgeQueryBase<FakeUser, FakeUser, AssocEdge> {
-    constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser>);
+    constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser, FakeUser>);
     getPrivacyPolicy(): import("../../core/base").PrivacyPolicy;
-    entForPrivacy(id: ID): Promise<FakeUser | null>;
-    static query(viewer: Viewer, src: EdgeQuerySource<FakeUser>): UserToIncomingFriendRequestsQuery;
+    sourceEnt(id: ID): Promise<FakeUser | null>;
+    static query(viewer: Viewer, src: EdgeQuerySource<FakeUser, FakeUser>): UserToIncomingFriendRequestsQuery;
     queryContacts(): UserToContactsQuery;
     queryFriends(): UserToFriendsQuery;
     queryHostedEvents(): UserToHostedEventsQuery;
@@ -58,8 +63,9 @@ export declare class UserToIncomingFriendRequestsQuery extends AssocEdgeQueryBas
     queryCustomEdge(): UserToCustomEdgeQuery;
 }
 export declare class UserToEventsAttendingQuery extends AssocEdgeQueryBase<FakeUser, FakeEvent, AssocEdge> {
-    constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser>);
-    static query(viewer: Viewer, src: EdgeQuerySource<FakeUser>): UserToEventsAttendingQuery;
+    constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser, FakeEvent>);
+    static query(viewer: Viewer, src: EdgeQuerySource<FakeUser, FakeEvent>): UserToEventsAttendingQuery;
+    sourceEnt(id: ID): Promise<FakeUser | null>;
     queryHosts(): EventToHostsQuery;
     queryAttendees(): EventToAttendeesQuery;
     queryInvited(): EventToInvitedQuery;
@@ -67,8 +73,9 @@ export declare class UserToEventsAttendingQuery extends AssocEdgeQueryBase<FakeU
     queryMaybe(): EventToMaybeQuery;
 }
 export declare class UserToHostedEventsQuery extends AssocEdgeQueryBase<FakeUser, FakeEvent, AssocEdge> {
-    constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser>);
-    static query(viewer: Viewer, src: EdgeQuerySource<FakeUser>): UserToHostedEventsQuery;
+    constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser, FakeEvent>);
+    static query(viewer: Viewer, src: EdgeQuerySource<FakeUser, FakeEvent>): UserToHostedEventsQuery;
+    sourceEnt(id: ID): Promise<FakeUser | null>;
     queryHosts(): EventToHostsQuery;
     queryAttendees(): EventToAttendeesQuery;
     queryInvited(): EventToInvitedQuery;
@@ -82,10 +89,11 @@ export declare const userToEventsInNextWeekDataLoaderFactory: QueryLoaderFactory
 export declare class UserToEventsInNextWeekQuery extends CustomEdgeQueryBase<FakeUser, FakeEvent> {
     constructor(viewer: Viewer, src: ID | FakeUser);
     static query(viewer: Viewer, src: FakeUser | ID): UserToEventsInNextWeekQuery;
+    sourceEnt(id: ID): Promise<FakeUser | null>;
     getPrivacyPolicy(): import("../../core/base").PrivacyPolicy;
-    entForPrivacy(id: ID): Promise<FakeUser | null>;
 }
 export declare class UserToFollowingQuery extends AssocEdgeQueryBase<FakeUser, Ent, AssocEdge> {
-    constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser>);
-    static query(viewer: Viewer, src: EdgeQuerySource<FakeUser>): UserToFollowingQuery;
+    constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser, FakeUser>);
+    static query(viewer: Viewer, src: EdgeQuerySource<FakeUser, FakeUser>): UserToFollowingQuery;
+    sourceEnt(id: ID): Promise<FakeUser | null>;
 }

package/testutils/fake_data/user_query.js

@@ -43,6 +43,9 @@ class UserToContactsQuery extends assoc_query_1.AssocEdgeQueryBase {
     static query(viewer, src) {
         return new UserToContactsQuery(viewer, src);
     }
+    sourceEnt(id) {
+        return internal_1.FakeUser.load(this.viewer, id);
+    }
 }
 exports.UserToContactsQuery = UserToContactsQuery;
 exports.userToContactsCountLoaderFactory = new raw_count_loader_1.RawCountLoaderFactory({
@@ -65,6 +68,9 @@ class UserToContactsFkeyQuery extends custom_query_1.CustomEdgeQueryBase {
     static query(viewer, src) {
         return new UserToContactsFkeyQuery(viewer, src);
     }
+    sourceEnt(id) {
+        return internal_1.FakeUser.load(this.viewer, id);
+    }
 }
 exports.UserToContactsFkeyQuery = UserToContactsFkeyQuery;
 class UserToFriendsQuery extends assoc_query_1.AssocEdgeQueryBase {
@@ -74,6 +80,9 @@ class UserToFriendsQuery extends assoc_query_1.AssocEdgeQueryBase {
     static query(viewer, src) {
         return new UserToFriendsQuery(viewer, src);
     }
+    sourceEnt(id) {
+        return internal_1.FakeUser.load(this.viewer, id);
+    }
     queryContacts() {
         return UserToContactsQuery.query(this.viewer, this);
     }
@@ -105,6 +114,9 @@ class UserToCustomEdgeQuery extends assoc_query_1.AssocEdgeQueryBase {
     static query(viewer, src) {
         return new UserToCustomEdgeQuery(viewer, src);
     }
+    sourceEnt(id) {
+        return internal_1.FakeUser.load(this.viewer, id);
+    }
     queryContacts() {
         return UserToContactsQuery.query(this.viewer, this);
     }
@@ -126,6 +138,9 @@ class UserToFriendRequestsQuery extends assoc_query_1.AssocEdgeQueryBase {
     static query(viewer, src) {
         return new UserToFriendRequestsQuery(viewer, src);
     }
+    sourceEnt(id) {
+        return internal_1.FakeUser.load(this.viewer, id);
+    }
     queryContacts() {
         return UserToContactsQuery.query(this.viewer, this);
     }
@@ -150,7 +165,7 @@ class UserToIncomingFriendRequestsQuery extends assoc_query_1.AssocEdgeQueryBase
     getPrivacyPolicy() {
         return privacy_1.AllowIfViewerPrivacyPolicy;
     }
-    entForPrivacy(id) {
+    sourceEnt(id) {
         return internal_1.FakeUser.load(this.viewer, id);
     }
     static query(viewer, src) {
@@ -180,6 +195,9 @@ class UserToEventsAttendingQuery extends assoc_query_1.AssocEdgeQueryBase {
     static query(viewer, src) {
         return new UserToEventsAttendingQuery(viewer, src);
     }
+    sourceEnt(id) {
+        return internal_1.FakeUser.load(this.viewer, id);
+    }
     queryHosts() {
         return internal_1.EventToHostsQuery.query(this.viewer, this);
     }
@@ -204,6 +222,9 @@ class UserToHostedEventsQuery extends assoc_query_1.AssocEdgeQueryBase {
     static query(viewer, src) {
         return new UserToHostedEventsQuery(viewer, src);
     }
+    sourceEnt(id) {
+        return internal_1.FakeUser.load(this.viewer, id);
+    }
     queryHosts() {
         return internal_1.EventToHostsQuery.query(this.viewer, this);
     }
@@ -263,12 +284,12 @@ class UserToEventsInNextWeekQuery extends custom_query_1.CustomEdgeQueryBase {
     static query(viewer, src) {
         return new UserToEventsInNextWeekQuery(viewer, src);
     }
+    sourceEnt(id) {
+        return internal_1.FakeUser.load(this.viewer, id);
+    }
     getPrivacyPolicy() {
         return privacy_1.AllowIfViewerPrivacyPolicy;
     }
-    async entForPrivacy(id) {
-        return internal_1.FakeUser.load(this.viewer, id);
-    }
 }
 exports.UserToEventsInNextWeekQuery = UserToEventsInNextWeekQuery;
 class UserToFollowingQuery extends assoc_query_1.AssocEdgeQueryBase {
@@ -278,5 +299,8 @@ class UserToFollowingQuery extends assoc_query_1.AssocEdgeQueryBase {
     static query(viewer, src) {
         return new UserToFollowingQuery(viewer, src);
     }
+    sourceEnt(id) {
+        return internal_1.FakeUser.load(this.viewer, id);
+    }
 }
 exports.UserToFollowingQuery = UserToFollowingQuery;