@snowtop/ent 0.0.40-alpha6 → 0.1.0-alpha10

package/action/action.d.ts

@@ -33,24 +33,24 @@ export interface Changeset<T extends Ent> {
     dependencies?: Map<ID, Builder<Ent>>;
 }
 export declare type TriggerReturn = void | Promise<Changeset<Ent> | void | (Changeset<Ent> | void)[]> | Promise<Changeset<Ent>>[];
-export interface Trigger<T extends Ent> {
-    changeset(builder: Builder<T>, input: Data): TriggerReturn;
+export interface Trigger<TBuilder extends Builder<Ent>, TData extends Data> {
+    changeset(builder: TBuilder, input: TData): TriggerReturn;
 }
-export interface Observer<T extends Ent> {
-    observe(builder: Builder<T>, input: Data): void | Promise<void>;
+export interface Observer<TBuilder extends Builder<Ent>, TData extends Data> {
+    observe(builder: TBuilder, input: TData): void | Promise<void>;
 }
-export interface Validator<T extends Ent> {
-    validate(builder: Builder<T>, input: Data): Promise<void> | void;
+export interface Validator<TBuilder extends Builder<Ent>, TData extends Data> {
+    validate(builder: TBuilder, input: TData): Promise<void> | void;
 }
-export interface Action<T extends Ent> {
+export interface Action<TEnt extends Ent, TBuilder extends Builder<TEnt>, TData extends Data> {
     readonly viewer: Viewer;
-    changeset(): Promise<Changeset<T>>;
-    builder: Builder<T>;
-    getPrivacyPolicy(): PrivacyPolicy;
-    triggers?: Trigger<T>[];
-    observers?: Observer<T>[];
-    validators?: Validator<T>[];
-    getInput(): Data;
+    changeset(): Promise<Changeset<TEnt>>;
+    builder: TBuilder;
+    getPrivacyPolicy(): PrivacyPolicy<TEnt>;
+    triggers?: Trigger<TBuilder, TData>[];
+    observers?: Observer<TBuilder, TData>[];
+    validators?: Validator<TBuilder, TData>[];
+    getInput(): TData;
     transformWrite?: <T2 extends Ent>(stmt: UpdateOperation<T2>) => Promise<TransformedUpdateOperation<T2>> | TransformedUpdateOperation<T2> | undefined;
     valid(): Promise<boolean>;
     validX(): Promise<void>;

package/action/executor.d.ts

@@ -1,4 +1,4 @@
-import { ID, Data, Ent, Viewer, Context } from "../core/base";
+import { ID, Ent, Viewer, Context, Data } from "../core/base";
 import { DataOperation } from "../core/ent";
 import { Changeset, Executor } from "../action/action";
 import { Builder } from "../action";

package/action/experimental_action.d.ts

@@ -1,8 +1,8 @@
 import { Viewer, Ent, Data } from "../core/base";
 import { Action, WriteOperation, Builder, Trigger, Observer, Changeset, Validator } from "./action";
-export interface ActionOptions<T extends Ent> {
+export interface ActionOptions<T extends Ent, TData extends Data> {
     existingEnt?: T | null;
-    input?: {};
+    input?: TData;
     operation?: WriteOperation;
 }
 interface EntBuilder<T extends Ent> extends Builder<T> {
@@ -13,28 +13,28 @@ interface EntBuilder<T extends Ent> extends Builder<T> {
     editedEnt(): Promise<T | null>;
     editedEntX(): Promise<T>;
 }
-export declare class BaseAction<T extends Ent> implements Action<T> {
+export declare class BaseAction<TEnt extends Ent, TData extends Data> implements Action<TEnt, EntBuilder<TEnt>, TData> {
     viewer: Viewer;
-    builderCtr: BuilderConstructor<T>;
-    builder: EntBuilder<T>;
+    builderCtr: BuilderConstructor<TEnt, TData>;
+    builder: EntBuilder<TEnt>;
     private input;
-    triggers: Trigger<Ent>[];
-    observers: Observer<Ent>[];
-    validators: Validator<Ent>[];
-    getPrivacyPolicy(): import("../core/base").PrivacyPolicy;
-    constructor(viewer: Viewer, builderCtr: BuilderConstructor<T>, options?: ActionOptions<T> | null);
-    static createBuilder<T extends Ent>(viewer: Viewer, builderCtr: BuilderConstructor<T>, options?: ActionOptions<T> | null): Builder<T>;
-    static bulkAction<T extends Ent>(ent: T, builderCtr: BuilderConstructor<T>, ...actions: Action<Ent>[]): BaseAction<T>;
-    changeset(): Promise<Changeset<T>>;
+    triggers: Trigger<EntBuilder<TEnt>, TData>[];
+    observers: Observer<EntBuilder<TEnt>, TData>[];
+    validators: Validator<EntBuilder<TEnt>, TData>[];
+    getPrivacyPolicy(): import("../core/base").PrivacyPolicy<Ent>;
+    constructor(viewer: Viewer, builderCtr: BuilderConstructor<TEnt, TData>, options?: ActionOptions<TEnt, TData> | null);
+    static createBuilder<TEnt extends Ent, TData extends Data>(viewer: Viewer, builderCtr: BuilderConstructor<TEnt, TData>, options?: ActionOptions<TEnt, TData> | null): Builder<TEnt>;
+    static bulkAction<TEnt extends Ent, TData extends Data>(ent: TEnt, builderCtr: BuilderConstructor<TEnt, TData>, ...actions: Action<Ent, Builder<Ent>, Data>[]): BaseAction<TEnt, TData>;
+    changeset(): Promise<Changeset<TEnt>>;
     valid(): Promise<boolean>;
     validX(): Promise<void>;
-    save(): Promise<T | null>;
-    saveX(): Promise<T>;
-    getInput(): {};
+    save(): Promise<TEnt | null>;
+    saveX(): Promise<TEnt>;
+    getInput(): TData;
 }
-interface BuilderConstructor<T extends Ent> {
-    new (viewer: Viewer, operation: WriteOperation, action: Action<T>, existingEnt?: T | undefined): EntBuilder<T>;
+interface BuilderConstructor<TEnt extends Ent, TData extends Data> {
+    new (viewer: Viewer, operation: WriteOperation, action: Action<TEnt, EntBuilder<TEnt>, TData>, existingEnt?: TEnt | undefined): EntBuilder<TEnt>;
 }
-export declare function updateRawObject<TEnt extends Ent, TInput extends Data>(viewer: Viewer, builderCtr: BuilderConstructor<TEnt>, existingEnt: TEnt, input: TInput): Promise<TEnt>;
-export declare function getSimpleEditAction<TEnt extends Ent, TInput extends Data>(viewer: Viewer, builderCtr: BuilderConstructor<TEnt>, existingEnt: TEnt, input: TInput): Action<TEnt>;
+export declare function updateRawObject<TEnt extends Ent, TInput extends Data>(viewer: Viewer, builderCtr: BuilderConstructor<TEnt, TInput>, existingEnt: TEnt, input: TInput): Promise<TEnt>;
+export declare function getSimpleEditAction<TEnt extends Ent, TInput extends Data>(viewer: Viewer, builderCtr: BuilderConstructor<TEnt, TInput>, existingEnt: TEnt, input: TInput): Action<TEnt, Builder<TEnt>, TInput>;
 export {};

package/action/experimental_action.js

@@ -37,7 +37,7 @@ class BaseAction {
         });
         action.triggers = [
             {
-                changeset: (builder, _input) => {
+                changeset: () => {
                     return actions.map((action) => action.changeset());
                 },
             },

package/action/orchestrator.d.ts

@@ -3,14 +3,14 @@ import { AssocEdgeInputOptions, DataOperation } from "../core/ent";
 import { SchemaInputType } from "../schema/schema";
 import { Changeset, Executor } from "../action/action";
 import { WriteOperation, Builder, Action } from "../action";
-export interface OrchestratorOptions<T extends Ent, TData extends Data> {
+export interface OrchestratorOptions<TEnt extends Ent, TData extends Data> {
     viewer: Viewer;
     operation: WriteOperation;
     tableName: string;
-    loaderOptions: LoadEntOptions<T>;
+    loaderOptions: LoadEntOptions<TEnt>;
     key: string;
-    builder: Builder<T>;
-    action?: Action<T>;
+    builder: Builder<TEnt>;
+    action?: Action<TEnt, Builder<TEnt>, TData>;
     schema: SchemaInputType;
     editedFields(): Map<string, any> | Promise<Map<string, any>>;
     updateInput?: (data: TData) => void;
@@ -28,7 +28,7 @@ export declare enum edgeDirection {
     inboundEdge = 0,
     outboundEdge = 1
 }
-export declare class Orchestrator<T extends Ent> {
+export declare class Orchestrator<TEnt extends Ent, TData extends Data> {
     private options;
     private edgeSet;
     private edges;
@@ -44,7 +44,7 @@ export declare class Orchestrator<T extends Ent> {
     private actualOperation;
     private existingEnt?;
     private disableTransformations;
-    constructor(options: OrchestratorOptions<T, Data>);
+    constructor(options: OrchestratorOptions<TEnt, TData>);
     private addEdge;
     setDisableTransformations(val: boolean): void;
     addInboundEdge<T2 extends Ent>(id1: ID | Builder<T2>, edgeType: string, nodeType: string, options?: AssocEdgeInputOptions): void;
@@ -60,7 +60,7 @@ export declare class Orchestrator<T extends Ent> {
     private getEntForPrivacyPolicyImpl;
     private getSQLStatementOperation;
     private getWriteOpForSQLStamentOp;
-    getPossibleUnsafeEntForPrivacy(): Promise<T | undefined>;
+    getPossibleUnsafeEntForPrivacy(): Promise<TEnt | undefined>;
     private getFieldsInfo;
     private validate;
     private triggers;
@@ -72,11 +72,11 @@ export declare class Orchestrator<T extends Ent> {
     private formatAndValidateFields;
     valid(): Promise<boolean>;
     validX(): Promise<void>;
-    build(): Promise<EntChangeset<T>>;
+    build(): Promise<EntChangeset<TEnt>>;
     private viewerForEntLoad;
     returnedRow(): Promise<Data | null>;
-    editedEnt(): Promise<T | null>;
-    editedEntX(): Promise<T>;
+    editedEnt(): Promise<TEnt | null>;
+    editedEntX(): Promise<TEnt>;
 }
 export declare class EntChangeset<T extends Ent> implements Changeset<T> {
     viewer: Viewer;

package/action/orchestrator.js

@@ -386,7 +386,7 @@ class Orchestrator {
                     if (field.format) {
                         val = field.format(transformed.data[k]);
                     }
-                    let dbKey = (0, schema_1.getStorageKey)(field);
+                    let dbKey = (0, schema_1.getStorageKey)(field, k);
                     data[dbKey] = val;
                     this.defaultFieldsByTSName[(0, camel_case_1.camelCase)(k)] = val;
                     // hmm do we need this?
@@ -404,7 +404,7 @@ class Orchestrator {
         for (const [fieldName, field] of schemaFields) {
             let value = editedFields.get(fieldName);
             let defaultValue = undefined;
-            let dbKey = (0, schema_1.getStorageKey)(field);
+            let dbKey = (0, schema_1.getStorageKey)(field, fieldName);
             if (value === undefined) {
                 if (this.actualOperation === action_1.WriteOperation.Insert) {
                     if (field.defaultToViewerOnCreate && field.defaultValueOnCreate) {
@@ -416,7 +416,7 @@ class Orchestrator {
                     if (field.defaultValueOnCreate) {
                         defaultValue = field.defaultValueOnCreate(builder, input);
                         if (defaultValue === undefined) {
-                            throw new Error(`defaultValueOnCreate() returned undefined for field ${field.name}`);
+                            throw new Error(`defaultValueOnCreate() returned undefined for field ${fieldName}`);
                         }
                     }
                 }
@@ -455,11 +455,11 @@ class Orchestrator {
         }
         return false;
     }
-    async transformFieldValue(field, dbKey, value) {
+    async transformFieldValue(fieldName, field, dbKey, value) {
         // now format and validate...
         if (value === null) {
             if (!field.nullable) {
-                throw new Error(`field ${field.name} set to null for non-nullable field`);
+                throw new Error(`field ${fieldName} set to null for non-nullable field`);
             }
         }
         else if (value === undefined) {
@@ -470,14 +470,14 @@ class Orchestrator {
                 // server default allowed
                 field.serverDefault === undefined &&
                 this.actualOperation === action_1.WriteOperation.Insert) {
-                throw new Error(`required field ${field.name} not set`);
+                throw new Error(`required field ${fieldName} not set`);
             }
         }
         else if (this.isBuilder(value)) {
             if (field.valid) {
-                const valid = await Promise.resolve(field.valid(value));
+                const valid = await field.valid(value);
                 if (!valid) {
-                    throw new Error(`invalid field ${field.name} with value ${value}`);
+                    throw new Error(`invalid field ${fieldName} with value ${value}`);
                 }
             }
             // keep track of dependencies to resolve
@@ -488,9 +488,9 @@ class Orchestrator {
         else {
             if (field.valid) {
                 // TODO this could be async. handle this better
-                const valid = await Promise.resolve(field.valid(value));
+                const valid = await field.valid(value);
                 if (!valid) {
-                    throw new Error(`invalid field ${field.name} with value ${value}`);
+                    throw new Error(`invalid field ${fieldName} with value ${value}`);
                 }
             }
             if (field.format) {
@@ -514,8 +514,8 @@ class Orchestrator {
                 // null allowed
                 value = this.defaultFieldsByFieldName[fieldName];
             }
-            let dbKey = (0, schema_1.getStorageKey)(field);
-            value = await this.transformFieldValue(field, dbKey, value);
+            let dbKey = (0, schema_1.getStorageKey)(field, fieldName);
+            value = await this.transformFieldValue(fieldName, field, dbKey, value);
             if (value !== undefined) {
                 data[dbKey] = value;
                 logValues[dbKey] = field.logValue(value);
@@ -527,10 +527,10 @@ class Orchestrator {
             for (const fieldName in this.defaultFieldsByFieldName) {
                 const defaultValue = this.defaultFieldsByFieldName[fieldName];
                 let field = schemaFields.get(fieldName);
-                let dbKey = (0, schema_1.getStorageKey)(field);
+                let dbKey = (0, schema_1.getStorageKey)(field, fieldName);
                 // no value, let's just default
                 if (data[dbKey] === undefined) {
-                    const value = await this.transformFieldValue(field, dbKey, defaultValue);
+                    const value = await this.transformFieldValue(fieldName, field, dbKey, defaultValue);
                     data[dbKey] = value;
                     logValues[dbKey] = field.logValue(value);
                 }

package/core/base.d.ts

@@ -43,7 +43,7 @@ export interface Viewer {
 export interface Ent {
     id: ID;
     viewer: Viewer;
-    privacyPolicy: PrivacyPolicy;
+    getPrivacyPolicy(): PrivacyPolicy<this>;
     nodeType: string;
 }
 export declare type Data = {
@@ -114,17 +114,17 @@ export interface PrivacyResult {
     getError?(policy: PrivacyPolicy, rule: PrivacyPolicyRule, ent?: Ent): PrivacyError;
 }
 export interface PrivacyError extends Error {
-    privacyPolicy: PrivacyPolicy;
+    privacyPolicy: PrivacyPolicy<Ent>;
     ent?: Ent;
 }
 export declare function Allow(): PrivacyResult;
 export declare function Skip(): PrivacyResult;
 export declare function Deny(): PrivacyResult;
 export declare function DenyWithReason(e: PrivacyError | string): PrivacyResult;
-export interface PrivacyPolicyRule {
-    apply(v: Viewer, ent?: Ent): Promise<PrivacyResult>;
+export interface PrivacyPolicyRule<TEnt extends Ent = Ent> {
+    apply(v: Viewer, ent?: TEnt): Promise<PrivacyResult>;
 }
-export interface PrivacyPolicy {
-    rules: PrivacyPolicyRule[];
+export interface PrivacyPolicy<TEnt extends Ent = Ent> {
+    rules: PrivacyPolicyRule<TEnt>[];
 }
 export {};

package/core/ent.d.ts

@@ -10,7 +10,8 @@ export declare function loadEntX<T extends Ent>(viewer: Viewer, id: ID, options:
 export declare function loadEntXViaKey<T extends Ent>(viewer: Viewer, key: any, options: LoadEntOptions<T>): Promise<T>;
 export declare function loadEntFromClause<T extends Ent>(viewer: Viewer, options: LoadEntOptions<T>, clause: clause.Clause): Promise<T | null>;
 export declare function loadEntXFromClause<T extends Ent>(viewer: Viewer, options: LoadEntOptions<T>, clause: clause.Clause): Promise<T>;
-export declare function loadEnts<T extends Ent>(viewer: Viewer, options: LoadEntOptions<T>, ...ids: ID[]): Promise<T[]>;
+export declare function loadEnts<T extends Ent>(viewer: Viewer, options: LoadEntOptions<T>, ...ids: ID[]): Promise<Map<ID, T>>;
+export declare function loadEntsList<T extends Ent>(viewer: Viewer, options: LoadEntOptions<T>, ...ids: ID[]): Promise<T[]>;
 export declare function loadEntsFromClause<T extends Ent>(viewer: Viewer, clause: clause.Clause, options: LoadEntOptions<T>): Promise<Map<ID, T>>;
 export declare function loadCustomEnts<T extends Ent>(viewer: Viewer, options: LoadCustomEntOptions<T>, query: CustomQuery): Promise<T[]>;
 interface rawQueryOptions {

package/core/ent.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.getEdgeTypeInGroup = exports.applyPrivacyPolicyForRows = exports.applyPrivacyPolicyForRowX = exports.applyPrivacyPolicyForRow = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadCustomEdges = exports.loadEdges = exports.defaultEdgeQueryOptions = exports.DefaultLimit = exports.loadEdgeDatas = exports.loadEdgeData = exports.assocEdgeLoader = exports.AssocEdgeData = exports.getCursor = exports.AssocEdge = exports.DeleteNodeOperation = exports.deleteRowsSync = exports.deleteRows = exports.editRowSync = exports.editRow = exports.buildUpdateQuery = exports.createRowSync = exports.createRow = exports.buildInsertQuery = exports.EdgeOperation = exports.EditNodeOperation = exports.buildGroupQuery = exports.buildQuery = exports.loadRows = exports.performRawQuery = exports.loadRow = exports.loadRowX = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadCustomData = exports.loadCustomEnts = exports.loadEntsFromClause = exports.loadEnts = exports.loadEntXFromClause = exports.loadEntFromClause = exports.loadEntXViaKey = exports.loadEntX = exports.loadEntViaKey = exports.loadEnt = void 0;
+exports.getEdgeTypeInGroup = exports.applyPrivacyPolicyForRows = exports.applyPrivacyPolicyForRowX = exports.applyPrivacyPolicyForRow = exports.loadNodesByEdge = exports.loadEdgeForID2 = exports.loadRawEdgeCountX = exports.loadUniqueNode = exports.loadUniqueEdge = exports.loadCustomEdges = exports.loadEdges = exports.defaultEdgeQueryOptions = exports.DefaultLimit = exports.loadEdgeDatas = exports.loadEdgeData = exports.assocEdgeLoader = exports.AssocEdgeData = exports.getCursor = exports.AssocEdge = exports.DeleteNodeOperation = exports.deleteRowsSync = exports.deleteRows = exports.editRowSync = exports.editRow = exports.buildUpdateQuery = exports.createRowSync = exports.createRow = exports.buildInsertQuery = exports.EdgeOperation = exports.EditNodeOperation = exports.buildGroupQuery = exports.buildQuery = exports.loadRows = exports.performRawQuery = exports.loadRow = exports.loadRowX = exports.loadDerivedEntX = exports.loadDerivedEnt = exports.loadCustomData = exports.loadCustomEnts = exports.loadEntsFromClause = exports.loadEntsList = exports.loadEnts = exports.loadEntXFromClause = exports.loadEntFromClause = exports.loadEntXViaKey = exports.loadEntX = exports.loadEntViaKey = exports.loadEnt = void 0;
 const db_1 = __importStar(require("./db"));
 const privacy_1 = require("./privacy");
 const clause = __importStar(require("./clause"));
@@ -144,7 +144,7 @@ async function loadEntXFromClause(viewer, options, clause) {
 exports.loadEntXFromClause = loadEntXFromClause;
 async function loadEnts(viewer, options, ...ids) {
     if (!ids.length) {
-        return [];
+        return new Map();
     }
     let loaded = false;
     let rows = [];
@@ -174,12 +174,16 @@ async function loadEnts(viewer, options, ...ids) {
         // this is always "id" if not using an ObjectLoaderFactory
         clause.In("id", ...ids), options);
     }
+    return m;
     // TODO do we want to change this to be a map not a list so that it's easy to check for existence?
     // TODO eventually this should be doing a cache then db queyr and maybe depend on dataloader to get all the results at once
-    // we need to get the result and re-sort... because the raw db access doesn't guarantee it in same order
-    // apparently
-    //  let m = await loadEntsFromClause(viewer, clause.In("id", ...ids), options);
-    let result = [];
+}
+exports.loadEnts = loadEnts;
+// calls loadEnts and returns the results sorted in the order they were passed in
+// useful for EntQuery and other paths where the order matters
+async function loadEntsList(viewer, options, ...ids) {
+    const m = await loadEnts(viewer, options, ...ids);
+    const result = [];
     ids.forEach((id) => {
         let ent = m.get(id);
         if (ent) {
@@ -188,7 +192,7 @@ async function loadEnts(viewer, options, ...ids) {
     });
     return result;
 }
-exports.loadEnts = loadEnts;
+exports.loadEntsList = loadEntsList;
 // we return a map here so that any sorting for queries that exist
 // can be done in O(N) time
 async function loadEntsFromClause(viewer, clause, options) {
@@ -266,7 +270,7 @@ exports.loadDerivedEntX = loadDerivedEntX;
 // TODO is there a smarter way to not instantiate two objects here?
 async function applyPrivacyPolicyForEnt(viewer, ent, data, fieldPrivacyOptions) {
     if (ent) {
-        const visible = await (0, privacy_1.applyPrivacyPolicy)(viewer, ent.privacyPolicy, ent);
+        const visible = await (0, privacy_1.applyPrivacyPolicy)(viewer, ent.getPrivacyPolicy(), ent);
         if (!visible) {
             return null;
         }
@@ -276,7 +280,7 @@ async function applyPrivacyPolicyForEnt(viewer, ent, data, fieldPrivacyOptions)
 }
 async function applyPrivacyPolicyForEntX(viewer, ent, data, options) {
     // this will throw
-    await (0, privacy_1.applyPrivacyPolicyX)(viewer, ent.privacyPolicy, ent);
+    await (0, privacy_1.applyPrivacyPolicyX)(viewer, ent.getPrivacyPolicy(), ent);
     return doFieldPrivacy(viewer, ent, data, options);
 }
 async function doFieldPrivacy(viewer, ent, data, options) {
@@ -1182,7 +1186,7 @@ async function loadNodesByEdge(viewer, id1, edgeType, options) {
     });
     // extract id2s
     const ids = rows.map((row) => row.id2);
-    return loadEnts(viewer, options, ...ids);
+    return loadEntsList(viewer, options, ...ids);
 }
 exports.loadNodesByEdge = loadNodesByEdge;
 async function applyPrivacyPolicyForRow(viewer, options, row) {

package/core/privacy.d.ts

@@ -121,7 +121,7 @@ export declare class AllowIfEdgeExistsRule implements PrivacyPolicyRule {
 export declare class AllowIfViewerInboundEdgeExistsRule implements PrivacyPolicyRule {
     private edgeType;
     constructor(edgeType: string);
-    apply(v: Viewer, ent: Ent): Promise<PrivacyResult>;
+    apply(v: Viewer, ent?: Ent): Promise<PrivacyResult>;
 }
 export declare class AllowIfViewerOutboundEdgeExistsRule implements PrivacyPolicyRule {
     private edgeType;

package/core/query/assoc_query.js

@@ -73,7 +73,7 @@ class AssocEdgeQueryBase extends query_1.BaseEdgeQuery {
             }
             let promises = [];
             for (const [_, value] of m) {
-                promises.push((0, ent_1.loadEnts)(this.viewer, value.options, ...value.ids));
+                promises.push((0, ent_1.loadEntsList)(this.viewer, value.options, ...value.ids));
             }
             const entss = await Promise.all(promises);
             const r = [];
@@ -83,7 +83,7 @@ class AssocEdgeQueryBase extends query_1.BaseEdgeQuery {
             return r;
         }
         const ids = edges.map((edge) => edge.id2);
-        return await (0, ent_1.loadEnts)(this.viewer, this.options, ...ids);
+        return (0, ent_1.loadEntsList)(this.viewer, this.options, ...ids);
     }
     dataToID(edge) {
         return edge.id2;

package/core/query/query.d.ts

@@ -41,7 +41,7 @@ export declare abstract class BaseEdgeQuery<TSource extends Ent, TDest extends E
     private idMap;
     private idsToFetch;
     constructor(viewer: Viewer, sortCol: string);
-    getPrivacyPolicy(): PrivacyPolicy;
+    getPrivacyPolicy(): PrivacyPolicy<Ent>;
     abstract sourceEnt(id: ID): Promise<Ent | null>;
     first(n: number, after?: string): this;
     last(n: number, before?: string): this;

package/graphql/builtins/connection.js

@@ -11,13 +11,13 @@ exports.GraphQLConnectionInterface = new graphql_1.GraphQLInterfaceType({
     description: "connection interface",
     fields: () => ({
         edges: {
-            type: (0, graphql_1.GraphQLNonNull)((0, graphql_1.GraphQLList)((0, graphql_1.GraphQLNonNull)(edge_1.GraphQLEdgeInterface))),
+            type: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(edge_1.GraphQLEdgeInterface))),
         },
         nodes: {
-            type: (0, graphql_1.GraphQLNonNull)((0, graphql_1.GraphQLList)((0, graphql_1.GraphQLNonNull)(node_1.GraphQLNodeInterface))),
+            type: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(node_1.GraphQLNodeInterface))),
         },
         pageInfo: {
-            type: (0, graphql_1.GraphQLNonNull)(page_info_1.GraphQLPageInfo),
+            type: new graphql_1.GraphQLNonNull(page_info_1.GraphQLPageInfo),
         },
     }),
 });

package/graphql/builtins/edge.js

@@ -9,10 +9,10 @@ exports.GraphQLEdgeInterface = new graphql_1.GraphQLInterfaceType({
     description: "edge interface",
     fields: () => ({
         node: {
-            type: (0, graphql_1.GraphQLNonNull)(node_1.GraphQLNodeInterface),
+            type: new graphql_1.GraphQLNonNull(node_1.GraphQLNodeInterface),
         },
         cursor: {
-            type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+            type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
         },
     }),
 });

package/graphql/builtins/node.js

@@ -8,7 +8,7 @@ exports.GraphQLNodeInterface = new graphql_1.GraphQLInterfaceType({
     description: "node interface",
     fields: () => ({
         id: {
-            type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLID),
+            type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLID),
         },
     }),
 });

package/graphql/graphql.js

@@ -79,8 +79,8 @@ const addCustomType = (type) => {
                 description: ct.description,
                 name: ct.name,
             };
-            if (ct.specifiedByUrl) {
-                type.scalarInfo.specifiedByUrl = ct.specifiedByUrl;
+            if (ct.specifiedByURL) {
+                type.scalarInfo.specifiedByUrl = ct.specifiedByURL;
             }
         }
     }

package/graphql/index.d.ts

@@ -8,3 +8,4 @@ export { GraphQLConnectionInterface } from "./builtins/connection";
 export { GraphQLEdgeInterface } from "./builtins/edge";
 export { NodeResolver, EntNodeResolver, registerResolver, clearResolvers, resolveID, nodeIDEncoder, mustDecodeIDFromGQLID, mustDecodeNullableIDFromGQLID, encodeGQLID, } from "./node_resolver";
 export { convertFromGQLEnum, convertToGQLEnum } from "./enums";
+export { transformUnionTypes } from "./mutations/union";

package/graphql/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToGQLEnum = exports.convertFromGQLEnum = exports.encodeGQLID = exports.mustDecodeNullableIDFromGQLID = exports.mustDecodeIDFromGQLID = exports.nodeIDEncoder = exports.resolveID = exports.clearResolvers = exports.registerResolver = exports.EntNodeResolver = exports.GraphQLEdgeInterface = exports.GraphQLConnectionInterface = exports.GraphQLNodeInterface = exports.GraphQLConnectionType = exports.GraphQLEdgeType = exports.GraphQLEdgeConnection = exports.GraphQLPageInfo = exports.GraphQLTime = exports.gqlFileUpload = exports.GQLCapture = exports.gqlConnection = exports.gqlContextType = exports.gqlMutation = exports.gqlQuery = exports.gqlObjectType = exports.gqlInputObjectType = exports.gqlArgType = exports.gqlArg = exports.gqlField = void 0;
+exports.transformUnionTypes = exports.convertToGQLEnum = exports.convertFromGQLEnum = exports.encodeGQLID = exports.mustDecodeNullableIDFromGQLID = exports.mustDecodeIDFromGQLID = exports.nodeIDEncoder = exports.resolveID = exports.clearResolvers = exports.registerResolver = exports.EntNodeResolver = exports.GraphQLEdgeInterface = exports.GraphQLConnectionInterface = exports.GraphQLNodeInterface = exports.GraphQLConnectionType = exports.GraphQLEdgeType = exports.GraphQLEdgeConnection = exports.GraphQLPageInfo = exports.GraphQLTime = exports.gqlFileUpload = exports.GQLCapture = exports.gqlConnection = exports.gqlContextType = exports.gqlMutation = exports.gqlQuery = exports.gqlObjectType = exports.gqlInputObjectType = exports.gqlArgType = exports.gqlArg = exports.gqlField = void 0;
 var graphql_1 = require("./graphql");
 Object.defineProperty(exports, "gqlField", { enumerable: true, get: function () { return graphql_1.gqlField; } });
 Object.defineProperty(exports, "gqlArg", { enumerable: true, get: function () { return graphql_1.gqlArg; } });
@@ -40,3 +40,5 @@ Object.defineProperty(exports, "encodeGQLID", { enumerable: true, get: function
 var enums_1 = require("./enums");
 Object.defineProperty(exports, "convertFromGQLEnum", { enumerable: true, get: function () { return enums_1.convertFromGQLEnum; } });
 Object.defineProperty(exports, "convertToGQLEnum", { enumerable: true, get: function () { return enums_1.convertToGQLEnum; } });
+var union_1 = require("./mutations/union");
+Object.defineProperty(exports, "transformUnionTypes", { enumerable: true, get: function () { return union_1.transformUnionTypes; } });

package/graphql/mutations/union.d.ts

@@ -0,0 +1,2 @@
+import { Data } from "../../core/base";
+export declare function transformUnionTypes<T extends Data>(input: T, pathsList: string[][]): T;

package/graphql/mutations/union.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformUnionTypes = void 0;
+// this transforms an input for union types from graphql format to TS format
+// in graphql, we represent it as UnionType =  {foo: FooType, bar: BarType, baz: BazType}
+// in TS, we repseent it as UnionType = FooType | BarType | BazType
+// this takes an input, paths to unions and transforms them as needed
+// only works on fields that are defined. depends on graphql to handle nullable/missing fields
+function transformUnionTypes(input, pathsList) {
+    for (const paths of pathsList) {
+        const lastPath = paths[paths.length - 1];
+        let last = input;
+        for (const path of paths) {
+            let curr = last[path];
+            if (curr === undefined) {
+                break;
+            }
+            if (path === lastPath) {
+                let count = 0;
+                let lastKey = undefined;
+                for (const k in curr) {
+                    count++;
+                    lastKey = k;
+                }
+                if (count != 1) {
+                    throw new Error(`can only only pass one key of union. passed ${count}`);
+                }
+                last[path] = curr[lastKey];
+            }
+            last = curr;
+        }
+    }
+    return input;
+}
+exports.transformUnionTypes = transformUnionTypes;

package/graphql/query/connection_type.js

@@ -15,10 +15,10 @@ class GraphQLEdgeType extends graphql_1.GraphQLObjectType {
             name: `${name}Edge`,
             fields: () => ({
                 node: {
-                    type: (0, graphql_1.GraphQLNonNull)(nodeType),
+                    type: new graphql_1.GraphQLNonNull(nodeType),
                 },
                 cursor: {
-                    type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                    type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                 },
                 ...optional,
             }),
@@ -34,25 +34,25 @@ class GraphQLConnectionType extends graphql_1.GraphQLObjectType {
             name: `${name}Connection`,
             fields: () => ({
                 edges: {
-                    type: (0, graphql_1.GraphQLNonNull)((0, graphql_1.GraphQLList)((0, graphql_1.GraphQLNonNull)(edgeType))),
+                    type: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(edgeType))),
                     resolve: (source) => {
                         return source.queryEdges();
                     },
                 },
                 nodes: {
-                    type: (0, graphql_1.GraphQLNonNull)((0, graphql_1.GraphQLList)((0, graphql_1.GraphQLNonNull)(nodeType))),
+                    type: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(nodeType))),
                     resolve: (source) => {
                         return source.queryNodes();
                     },
                 },
                 pageInfo: {
-                    type: (0, graphql_1.GraphQLNonNull)(page_info_1.GraphQLPageInfo),
+                    type: new graphql_1.GraphQLNonNull(page_info_1.GraphQLPageInfo),
                     resolve: (source) => {
                         return source.queryPageInfo();
                     },
                 },
                 rawCount: {
-                    type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLInt),
+                    type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLInt),
                     resolve: (source) => {
                         return source.queryTotalCount();
                     },

package/graphql/query/page_info.js

@@ -7,22 +7,22 @@ exports.GraphQLPageInfo = new graphql_1.GraphQLObjectType({
     name: "PageInfo",
     fields: () => ({
         hasNextPage: {
-            type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLBoolean),
+            type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLBoolean),
             resolve: (source) => {
                 return source.hasNextPage || false;
             },
         },
         hasPreviousPage: {
-            type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLBoolean),
+            type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLBoolean),
             resolve: (source) => {
                 return source.hasPreviousPage || false;
             },
         },
         startCursor: {
-            type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+            type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
         },
         endCursor: {
-            type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+            type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
         },
     }),
 });