@snowtop/ent 0.1.0-alpha13 → 0.1.0-alpha131

package/action/action.d.ts

@@ -1,23 +1,27 @@
-import { Ent, EntConstructor, Viewer, ID, Data, PrivacyPolicy, Context } from "../core/base";
+import { Ent, EntConstructor, Viewer, ID, Data, PrivacyPolicy, Context, WriteOperation } from "../core/base";
 import { DataOperation, AssocEdgeInputOptions } from "../core/ent";
 import { Queryer } from "../core/db";
 import { TransformedUpdateOperation, UpdateOperation } from "../schema";
-export declare enum WriteOperation {
-    Insert = "insert",
-    Edit = "edit",
-    Delete = "delete"
+import { FieldInfoMap } from "../schema/schema";
+export { WriteOperation };
+type MaybeNull<T extends Ent> = T | null;
+type TMaybleNullableEnt<T extends Ent> = T | MaybeNull<T>;
+interface BuilderOrchestrator {
+    __getOptions(): {
+        fieldInfo: FieldInfoMap;
+    };
 }
-declare type MaybeNull<T extends Ent> = T | null;
-declare type TMaybleNullableEnt<T extends Ent> = T | MaybeNull<T>;
-export interface Builder<T extends Ent, TExistingEnt extends TMaybleNullableEnt<T> = MaybeNull<T>> {
+export interface Builder<TEnt extends Ent<TViewer>, TViewer extends Viewer = Viewer, TExistingEnt extends TMaybleNullableEnt<TEnt> = MaybeNull<TEnt>> {
     existingEnt: TExistingEnt;
-    ent: EntConstructor<T>;
+    ent: EntConstructor<TEnt, TViewer>;
     placeholderID: ID;
-    readonly viewer: Viewer;
-    build(): Promise<Changeset<T>>;
+    readonly viewer: TViewer;
+    build(): Promise<Changeset>;
     operation: WriteOperation;
-    editedEnt?(): Promise<T | null>;
+    editedEnt?(): Promise<TEnt | null>;
     nodeType: string;
+    getInput(): Data;
+    orchestrator: BuilderOrchestrator;
 }
 export interface Executor extends Iterable<DataOperation>, Iterator<DataOperation> {
     placeholderID: ID;
@@ -27,43 +31,43 @@ export interface Executor extends Iterable<DataOperation>, Iterator<DataOperatio
     postFetch?(queryer: Queryer, context?: Context): Promise<void>;
     executeObservers?(): Promise<void>;
 }
-export interface Changeset<T extends Ent> {
+export interface Changeset {
     executor(): Executor;
     viewer: Viewer;
     placeholderID: ID;
-    changesets?: Changeset<Ent>[];
+    changesets?: Changeset[];
     dependencies?: Map<ID, Builder<Ent>>;
 }
-export declare type TriggerReturn = void | Promise<Changeset<Ent> | void | (Changeset<Ent> | void)[]> | Promise<Changeset<Ent>>[];
-export interface Trigger<TEnt extends Ent, TBuilder extends Builder<TEnt, TExistingEnt>, TInput extends Data = Data, TExistingEnt extends TMaybleNullableEnt<TEnt> = MaybeNull<TEnt>> {
+export type TriggerReturn = void | Promise<Changeset | void | (Changeset | void)[]> | Promise<Changeset>[];
+export interface Trigger<TEnt extends Ent<TViewer>, TBuilder extends Builder<TEnt, TViewer, TExistingEnt>, TViewer extends Viewer = Viewer, TInput extends Data = Data, TExistingEnt extends TMaybleNullableEnt<TEnt> = MaybeNull<TEnt>> {
     changeset(builder: TBuilder, input: TInput): TriggerReturn;
 }
-export interface Observer<TEnt extends Ent, TBuilder extends Builder<TEnt, TExistingEnt>, TInput extends Data = Data, TExistingEnt extends TMaybleNullableEnt<TEnt> = MaybeNull<TEnt>> {
+export interface Observer<TEnt extends Ent<TViewer>, TBuilder extends Builder<TEnt, TViewer, TExistingEnt>, TViewer extends Viewer = Viewer, TInput extends Data = Data, TExistingEnt extends TMaybleNullableEnt<TEnt> = MaybeNull<TEnt>> {
     observe(builder: TBuilder, input: TInput): void | Promise<void>;
 }
-export interface Validator<TEnt extends Ent, TBuilder extends Builder<TEnt, TExistingEnt>, TInput extends Data, TExistingEnt extends TMaybleNullableEnt<TEnt> = MaybeNull<TEnt>> {
-    validate(builder: TBuilder, input: TInput): Promise<void> | void;
+export interface Validator<TEnt extends Ent<TViewer>, TBuilder extends Builder<TEnt, TViewer, TExistingEnt>, TViewer extends Viewer = Viewer, TInput extends Data = Data, TExistingEnt extends TMaybleNullableEnt<TEnt> = MaybeNull<TEnt>> {
+    validate(builder: TBuilder, input: TInput): Promise<void | undefined | Error> | void | Error | undefined;
 }
-export interface Action<TEnt extends Ent, TBuilder extends Builder<TEnt, TExistingEnt>, TInput extends Data, TExistingEnt extends TMaybleNullableEnt<TEnt> = MaybeNull<TEnt>> {
+export interface Action<TEnt extends Ent<TViewer>, TBuilder extends Builder<TEnt, TViewer, TExistingEnt>, TViewer extends Viewer = Viewer, TInput extends Data = Data, TExistingEnt extends TMaybleNullableEnt<TEnt> = MaybeNull<TEnt>> {
     readonly viewer: Viewer;
-    changeset(): Promise<Changeset<TEnt>>;
+    changeset(): Promise<Changeset>;
     builder: TBuilder;
     getPrivacyPolicy(): PrivacyPolicy<TEnt>;
-    triggers?: Trigger<TEnt, TBuilder, TInput, TExistingEnt>[];
-    observers?: Observer<TEnt, TBuilder, TInput, TExistingEnt>[];
-    validators?: Validator<TEnt, TBuilder, TInput, TExistingEnt>[];
+    getTriggers?(): (Trigger<TEnt, TBuilder, TViewer, TInput, TExistingEnt> | Trigger<TEnt, TBuilder, TViewer, TInput, TExistingEnt>[])[];
+    getObservers?(): Observer<TEnt, TBuilder, TViewer, TInput, TExistingEnt>[];
+    getValidators?(): Validator<TEnt, TBuilder, TViewer, TInput, TExistingEnt>[];
     getInput(): TInput;
-    transformWrite?: (stmt: UpdateOperation<TEnt>) => Promise<TransformedUpdateOperation<TEnt>> | TransformedUpdateOperation<TEnt> | null;
+    transformWrite?: (stmt: UpdateOperation<TEnt, TViewer>) => Promise<TransformedUpdateOperation<TEnt, TViewer>> | TransformedUpdateOperation<TEnt, TViewer> | null;
     valid(): Promise<boolean>;
     validX(): Promise<void>;
-    viewerForEntLoad?(data: Data): Viewer | Promise<Viewer>;
+    viewerForEntLoad?(data: Data, context?: Context<TViewer>): TViewer | Promise<TViewer>;
 }
-export declare function saveBuilder<T extends Ent>(builder: Builder<T>): Promise<void>;
-export declare function saveBuilderX<T extends Ent>(builder: Builder<T>): Promise<void>;
+export declare function saveBuilder<TEnt extends Ent<TViewer>, TViewer extends Viewer>(builder: Builder<TEnt, TViewer>): Promise<void>;
+export declare function saveBuilderX<TEnt extends Ent<TViewer>, TViewer extends Viewer>(builder: Builder<TEnt, TViewer>): Promise<void>;
 interface Orchestrator {
     addOutboundEdge<T2 extends Ent>(id2: ID | Builder<T2>, edgeType: string, nodeType: string, options?: AssocEdgeInputOptions): void;
     removeOutboundEdge(id2: ID, edgeType: string): void;
     viewer: Viewer;
 }
 export declare function setEdgeTypeInGroup<T extends string>(orchestrator: Orchestrator, inputEnumValue: string, id1: ID, id2: ID, nodeType: string, m: Map<T, string>): Promise<void>;
-export {};
+export declare function clearEdgeTypeInGroup<T extends string>(orchestrator: Orchestrator, id1: ID, id2: ID, m: Map<T, string>): Promise<void>;

package/action/action.js

@@ -1,14 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setEdgeTypeInGroup = exports.saveBuilderX = exports.saveBuilder = exports.WriteOperation = void 0;
+exports.clearEdgeTypeInGroup = exports.setEdgeTypeInGroup = exports.saveBuilderX = exports.saveBuilder = exports.WriteOperation = void 0;
+const base_1 = require("../core/base");
+Object.defineProperty(exports, "WriteOperation", { enumerable: true, get: function () { return base_1.WriteOperation; } });
 const ent_1 = require("../core/ent");
 const logger_1 = require("../core/logger");
-var WriteOperation;
-(function (WriteOperation) {
-    WriteOperation["Insert"] = "insert";
-    WriteOperation["Edit"] = "edit";
-    WriteOperation["Delete"] = "delete";
-})(WriteOperation = exports.WriteOperation || (exports.WriteOperation = {}));
 async function saveBuilder(builder) {
     await saveBuilderImpl(builder, false);
 }
@@ -88,3 +84,22 @@ async function setEdgeTypeInGroup(orchestrator, inputEnumValue, id1, id2, nodeTy
     await Promise.all(promises);
 }
 exports.setEdgeTypeInGroup = setEdgeTypeInGroup;
+async function clearEdgeTypeInGroup(orchestrator, id1, id2, m) {
+    let promises = [];
+    for (const [_, edgeType] of m) {
+        promises.push((async () => {
+            let edge = await (0, ent_1.loadEdgeForID2)({
+                id1,
+                id2,
+                edgeType,
+                ctr: ent_1.AssocEdge,
+                context: orchestrator.viewer.context,
+            });
+            if (edge) {
+                orchestrator.removeOutboundEdge(id2, edgeType);
+            }
+        })());
+    }
+    await Promise.all(promises);
+}
+exports.clearEdgeTypeInGroup = clearEdgeTypeInGroup;

package/action/executor.d.ts

@@ -10,7 +10,7 @@ export declare class ListBasedExecutor<T extends Ent> implements Executor {
     private operations;
     private options?;
     private idx;
-    constructor(viewer: Viewer, placeholderID: ID, operations: DataOperation<T>[], options?: OrchestratorOptions<T, Data, T | null> | undefined);
+    constructor(viewer: Viewer, placeholderID: ID, operations: DataOperation<T>[], options?: OrchestratorOptions<T, Data, Viewer<Ent<any> | null, ID | null>, T | null> | undefined);
     private lastOp;
     private createdEnt;
     resolveValue(val: ID): Ent | null;
@@ -29,7 +29,7 @@ export declare class ComplexExecutor<T extends Ent> implements Executor {
     private lastOp;
     private allOperations;
     private executors;
-    constructor(viewer: Viewer, placeholderID: ID, operations: DataOperation[], dependencies: Map<ID, Builder<T>>, changesets: Changeset<T>[], options?: OrchestratorOptions<T, Data>);
+    constructor(viewer: Viewer, placeholderID: ID, operations: DataOperation[], dependencies: Map<ID, Builder<T>>, changesets: Changeset[], options?: OrchestratorOptions<T, Data, Viewer>);
     [Symbol.iterator](): this;
     private handleCreatedEnt;
     next(): IteratorResult<DataOperation<Ent>>;
@@ -39,4 +39,4 @@ export declare class ComplexExecutor<T extends Ent> implements Executor {
     preFetch?(queryer: Queryer, context: Context): Promise<void>;
     postFetch?(queryer: Queryer, context: Context): Promise<void>;
 }
-export declare function executeOperations(executor: Executor, context?: Context, trackOps?: true): Promise<DataOperation<Ent>[]>;
+export declare function executeOperations(executor: Executor, context?: Context, trackOps?: true): Promise<DataOperation<Ent<Viewer<Ent<any> | null, ID | null>>>[]>;

package/action/executor.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.executeOperations = exports.ComplexExecutor = exports.ListBasedExecutor = void 0;
 const graph_data_structure_1 = __importDefault(require("graph-data-structure"));
+const ent_1 = require("../core/ent");
 const db_1 = __importDefault(require("../core/db"));
 const logger_1 = require("../core/logger");
 // private to ent
@@ -47,11 +48,11 @@ class ListBasedExecutor {
     }
     async executeObservers() {
         const action = this.options?.action;
-        if (!this.options || !action || !action.observers) {
+        if (!this.options || !action || !action.getObservers) {
             return;
         }
         const builder = this.options.builder;
-        await Promise.all(action.observers.map(async (observer) => {
+        await Promise.all(action.getObservers().map(async (observer) => {
             await observer.observe(builder, action.getInput());
         }));
     }
@@ -98,7 +99,7 @@ class ComplexExecutor {
             changesetMap.set(c.placeholderID.toString(), c);
             graph.addNode(c.placeholderID.toString());
             if (c.dependencies) {
-                for (let [key, builder] of c.dependencies) {
+                for (let [_, builder] of c.dependencies) {
                     // dependency should go first...
                     graph.addEdge(builder.placeholderID.toString(), c.placeholderID.toString(), 1);
                 }
@@ -258,6 +259,7 @@ async function executeOperations(executor, context, trackOps) {
             });
         }
         else {
+            (0, ent_1.logQuery)("BEGIN", []);
             await client.query("BEGIN");
             for (const operation of executor) {
                 if (trackOps) {
@@ -269,6 +271,7 @@ async function executeOperations(executor, context, trackOps) {
                 }
                 await operation.performWrite(client, context);
             }
+            (0, ent_1.logQuery)("COMMIT", []);
             await client.query("COMMIT");
         }
         if (executor.postFetch) {
@@ -280,6 +283,8 @@ async function executeOperations(executor, context, trackOps) {
     }
     catch (e) {
         if (!isSyncClient(client)) {
+            // TODO these changes break tests
+            (0, ent_1.logQuery)("ROLLBACK", []);
             await client.query("ROLLBACK");
         }
         (0, logger_1.log)("error", e);

package/action/experimental_action.d.ts

@@ -1,40 +1,50 @@
+import { Orchestrator } from "./orchestrator";
 import { Viewer, Ent, Data } from "../core/base";
 import { Action, WriteOperation, Builder, Trigger, Observer, Changeset, Validator } from "./action";
-export interface ActionOptions<T extends Ent, TData extends Data> {
-    existingEnt?: T | null;
+export interface ActionOptions<TEnt extends Ent<TViewer>, TViewer extends Viewer, TData extends Data, TExistingEnt extends TMaybleNullableEnt<TEnt> = MaybeNull<TEnt>> {
+    existingEnt: TExistingEnt;
     input?: TData;
     operation?: WriteOperation;
 }
-interface EntBuilder<T extends Ent> extends Builder<T> {
+type MaybeNull<T extends Ent> = T | null;
+type TMaybleNullableEnt<T extends Ent> = T | MaybeNull<T>;
+export interface EntBuilder<TEnt extends Ent<TViewer>, TViewer extends Viewer, TInput extends Data, TExistingEnt extends TMaybleNullableEnt<TEnt> = MaybeNull<TEnt>> extends Builder<TEnt, TViewer, TExistingEnt> {
     valid(): Promise<boolean>;
     validX(): Promise<void>;
     save(): Promise<void>;
     saveX(): Promise<void>;
-    editedEnt(): Promise<T | null>;
-    editedEntX(): Promise<T>;
+    editedEnt(): Promise<TEnt | null>;
+    editedEntX(): Promise<TEnt>;
+    getInput(): TInput;
+    orchestrator: Orchestrator<TEnt, TInput, TViewer, TExistingEnt>;
 }
-export declare class BaseAction<TEnt extends Ent, TData extends Data> implements Action<TEnt, EntBuilder<TEnt>, TData> {
-    viewer: Viewer;
-    builderCtr: BuilderConstructor<TEnt, TData>;
-    builder: EntBuilder<TEnt>;
+export declare class BaseAction<TEnt extends Ent<TViewer>, TViewer extends Viewer, TInput extends Data, TExistingEnt extends TMaybleNullableEnt<TEnt> = MaybeNull<TEnt>> implements Action<TEnt, EntBuilder<TEnt, TViewer, TInput, TExistingEnt>, TViewer, TInput, TExistingEnt> {
+    viewer: TViewer;
+    builderCtr: BuilderConstructor<TEnt, TViewer, TInput, TExistingEnt>;
+    builder: EntBuilder<TEnt, TViewer, TInput, TExistingEnt>;
     private input;
-    triggers: Trigger<TEnt, EntBuilder<TEnt>, TData>[];
-    observers: Observer<TEnt, EntBuilder<TEnt>, TData>[];
-    validators: Validator<TEnt, 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>>;
+    getPrivacyPolicy(): import("../core/base").PrivacyPolicy<Ent<Viewer<Ent<any> | null, import("../core/base").ID | null>>, Viewer<Ent<any> | null, import("../core/base").ID | null>>;
+    getTriggers(): Trigger<TEnt, EntBuilder<TEnt, TViewer, TInput, TExistingEnt>, TViewer, TInput, TExistingEnt>[];
+    getObservers(): Observer<TEnt, EntBuilder<TEnt, TViewer, TInput, TExistingEnt>, TViewer, TInput, TExistingEnt>[];
+    getValidators(): Validator<TEnt, EntBuilder<TEnt, TViewer, TInput, TExistingEnt>, TViewer, TInput, TExistingEnt>[];
+    constructor(viewer: TViewer, builderCtr: BuilderConstructor<TEnt, TViewer, TInput, TExistingEnt>, options: ActionOptions<TEnt, TViewer, TInput, TExistingEnt>);
+    static createBuilder<TEnt extends Ent<TViewer>, TViewer extends Viewer, TInput extends Data, TExistingEnt extends TMaybleNullableEnt<TEnt> = MaybeNull<TEnt>>(viewer: Viewer, builderCtr: BuilderConstructor<TEnt, TViewer, TInput, TExistingEnt>, options: ActionOptions<TEnt, TViewer, TInput, TExistingEnt>): Builder<TEnt>;
+    /**
+     * @deprecated use Transaction
+     */
+    static bulkAction<TEnt extends Ent<TViewer>, TViewer extends Viewer, TInput extends Data>(ent: TEnt, builderCtr: BuilderConstructor<TEnt, TViewer, TInput, TEnt>, ...actions: Action<Ent, Builder<Ent, any>>[]): BaseAction<TEnt, TViewer, TInput, TEnt>;
+    changeset(): Promise<Changeset>;
     valid(): Promise<boolean>;
     validX(): Promise<void>;
     save(): Promise<TEnt | null>;
     saveX(): Promise<TEnt>;
-    getInput(): TData;
+    getInput(): TInput;
 }
-interface BuilderConstructor<TEnt extends Ent, TData extends Data> {
-    new (viewer: Viewer, operation: WriteOperation, action: Action<TEnt, EntBuilder<TEnt>, TData>, existingEnt: TEnt | null): EntBuilder<TEnt>;
+export interface BuilderConstructor<TEnt extends Ent<TViewer>, TViewer extends Viewer, TInput extends Data, TExistingEnt extends TMaybleNullableEnt<TEnt> = MaybeNull<TEnt>> {
+    new (viewer: TViewer, operation: WriteOperation, action: Action<TEnt, any, TViewer, TInput, TExistingEnt>, existingEnt: TExistingEnt): EntBuilder<TEnt, TViewer, TInput, TExistingEnt>;
 }
-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 declare function updateRawObject<TEnt extends Ent<TViewer>, TViewer extends Viewer, TInput extends Data>(viewer: TViewer, builderCtr: BuilderConstructor<TEnt, TViewer, TInput, TEnt>, existingEnt: TEnt, input: TInput): Promise<TEnt>;
+export declare function getSimpleEditAction<TEnt extends Ent<TViewer>, TViewer extends Viewer, TInput extends Data>(viewer: TViewer, builderCtr: BuilderConstructor<TEnt, TViewer, TInput, TEnt>, existingEnt: TEnt, input: TInput): BaseAction<TEnt, TViewer, TInput, TEnt>;
+export declare function getSimpleDeleteAction<TEnt extends Ent<TViewer>, TViewer extends Viewer, TInput extends Data>(viewer: TViewer, builderCtr: BuilderConstructor<TEnt, TViewer, TInput, TEnt>, existingEnt: TEnt, input: TInput): BaseAction<TEnt, TViewer, TInput, TEnt>;
+export declare function getSimpleInsertAction<TEnt extends Ent<TViewer>, TViewer extends Viewer, TInput extends Data>(viewer: TViewer, builderCtr: BuilderConstructor<TEnt, TViewer, TInput, null>, input: TInput): BaseAction<TEnt, TViewer, TInput, null>;
 export {};

package/action/experimental_action.js

@@ -1,15 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSimpleEditAction = exports.updateRawObject = exports.BaseAction = void 0;
+exports.getSimpleInsertAction = exports.getSimpleDeleteAction = exports.getSimpleEditAction = exports.updateRawObject = exports.BaseAction = void 0;
 const privacy_1 = require("../core/privacy");
 const action_1 = require("./action");
 class BaseAction {
+    getPrivacyPolicy() {
+        return privacy_1.AlwaysAllowPrivacyPolicy;
+    }
+    getTriggers() {
+        return [];
+    }
+    getObservers() {
+        return [];
+    }
+    getValidators() {
+        return [];
+    }
     constructor(viewer, builderCtr, options) {
         this.viewer = viewer;
         this.builderCtr = builderCtr;
-        this.triggers = [];
-        this.observers = [];
-        this.validators = [];
         let operation = options?.operation;
         if (!operation) {
             if (options?.existingEnt) {
@@ -20,10 +29,7 @@ class BaseAction {
             }
         }
         this.input = options?.input || {};
-        this.builder = new builderCtr(viewer, operation, this, options?.existingEnt || null);
-    }
-    getPrivacyPolicy() {
-        return privacy_1.AlwaysAllowPrivacyPolicy;
+        this.builder = new builderCtr(viewer, operation, this, options.existingEnt);
     }
     static createBuilder(viewer, builderCtr, options) {
         let action = new BaseAction(viewer, builderCtr, options);
@@ -31,11 +37,14 @@ class BaseAction {
     }
     // perform a bulk action in a transaction rooted on ent T
     // it ends up creating triggers and having all the given actions performed in a transaction
+    /**
+     * @deprecated use Transaction
+     */
     static bulkAction(ent, builderCtr, ...actions) {
         let action = new BaseAction(ent.viewer, builderCtr, {
             existingEnt: ent,
         });
-        action.triggers = [
+        action.getTriggers = () => [
             {
                 changeset: () => {
                     return actions.map((action) => action.changeset());
@@ -79,6 +88,7 @@ async function updateRawObject(viewer, builderCtr, existingEnt, input) {
     return action.saveX();
 }
 exports.updateRawObject = updateRawObject;
+// TODO need to fix types for all these
 // creates an action which has no privacy, triggers, observers etc
 // does do field validation
 // useful to batch a bunch of writes together with BaseAction.bulkAction
@@ -91,3 +101,19 @@ function getSimpleEditAction(viewer, builderCtr, existingEnt, input) {
     });
 }
 exports.getSimpleEditAction = getSimpleEditAction;
+function getSimpleDeleteAction(viewer, builderCtr, existingEnt, input) {
+    return new BaseAction(viewer, builderCtr, {
+        existingEnt: existingEnt,
+        operation: action_1.WriteOperation.Delete,
+        input,
+    });
+}
+exports.getSimpleDeleteAction = getSimpleDeleteAction;
+function getSimpleInsertAction(viewer, builderCtr, input) {
+    return new BaseAction(viewer, builderCtr, {
+        operation: action_1.WriteOperation.Insert,
+        input,
+        existingEnt: null,
+    });
+}
+exports.getSimpleInsertAction = getSimpleInsertAction;

package/action/index.d.ts

@@ -1,3 +1,5 @@
 export { WriteOperation, Builder, Changeset, Trigger, Observer, Validator, Action, saveBuilder, saveBuilderX, setEdgeTypeInGroup, TriggerReturn, } from "./action";
 export { OrchestratorOptions, Orchestrator, EntChangeset, EdgeInputData, } from "./orchestrator";
 export { DenyIfBuilder, AllowIfBuilder } from "./privacy";
+export { RelativeFieldValue, RelativeNumberValue, NumberOps, convertRelativeInput, maybeConvertRelativeInputPlusExpressions, } from "./relative_value";
+export { Transaction } from "./transaction";

package/action/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AllowIfBuilder = exports.DenyIfBuilder = exports.EntChangeset = exports.Orchestrator = exports.setEdgeTypeInGroup = exports.saveBuilderX = exports.saveBuilder = exports.WriteOperation = void 0;
+exports.Transaction = exports.maybeConvertRelativeInputPlusExpressions = exports.convertRelativeInput = exports.NumberOps = exports.AllowIfBuilder = exports.DenyIfBuilder = exports.EntChangeset = exports.Orchestrator = exports.setEdgeTypeInGroup = exports.saveBuilderX = exports.saveBuilder = exports.WriteOperation = void 0;
 var action_1 = require("./action");
 Object.defineProperty(exports, "WriteOperation", { enumerable: true, get: function () { return action_1.WriteOperation; } });
 Object.defineProperty(exports, "saveBuilder", { enumerable: true, get: function () { return action_1.saveBuilder; } });
@@ -12,3 +12,9 @@ Object.defineProperty(exports, "EntChangeset", { enumerable: true, get: function
 var privacy_1 = require("./privacy");
 Object.defineProperty(exports, "DenyIfBuilder", { enumerable: true, get: function () { return privacy_1.DenyIfBuilder; } });
 Object.defineProperty(exports, "AllowIfBuilder", { enumerable: true, get: function () { return privacy_1.AllowIfBuilder; } });
+var relative_value_1 = require("./relative_value");
+Object.defineProperty(exports, "NumberOps", { enumerable: true, get: function () { return relative_value_1.NumberOps; } });
+Object.defineProperty(exports, "convertRelativeInput", { enumerable: true, get: function () { return relative_value_1.convertRelativeInput; } });
+Object.defineProperty(exports, "maybeConvertRelativeInputPlusExpressions", { enumerable: true, get: function () { return relative_value_1.maybeConvertRelativeInputPlusExpressions; } });
+var transaction_1 = require("./transaction");
+Object.defineProperty(exports, "Transaction", { enumerable: true, get: function () { return transaction_1.Transaction; } });

package/action/orchestrator.d.ts

@@ -3,19 +3,21 @@ import { AssocEdgeInputOptions, DataOperation } from "../core/ent";
 import { SchemaInputType, FieldInfoMap } from "../schema/schema";
 import { Changeset, Executor } from "../action/action";
 import { WriteOperation, Builder, Action } from "../action";
-declare type MaybeNull<T extends Ent> = T | null;
-declare type TMaybleNullableEnt<T extends Ent> = T | MaybeNull<T>;
-export interface OrchestratorOptions<TEnt extends Ent, TData extends Data, TExistingEnt extends TMaybleNullableEnt<TEnt> = MaybeNull<TEnt>> {
+import * as clause from "../core/clause";
+type MaybeNull<T extends Ent> = T | null;
+type TMaybleNullableEnt<T extends Ent> = T | MaybeNull<T>;
+export interface OrchestratorOptions<TEnt extends Ent<TViewer>, TInput extends Data, TViewer extends Viewer, TExistingEnt extends TMaybleNullableEnt<TEnt> = MaybeNull<TEnt>> {
     viewer: Viewer;
     operation: WriteOperation;
     tableName: string;
-    loaderOptions: LoadEntOptions<TEnt>;
+    loaderOptions: LoadEntOptions<TEnt, TViewer>;
     key: string;
-    builder: Builder<TEnt, TExistingEnt>;
-    action?: Action<TEnt, Builder<TEnt>, TData>;
+    builder: Builder<TEnt, TViewer, TExistingEnt>;
+    action?: Action<TEnt, Builder<TEnt, TViewer>, TViewer, TInput>;
     schema: SchemaInputType;
     editedFields(): Map<string, any> | Promise<Map<string, any>>;
-    updateInput?: (data: TData) => void;
+    updateInput?: (data: TInput) => void;
+    expressions?: Map<string, clause.Clause>;
     fieldInfo: FieldInfoMap;
 }
 interface edgeInputDataOpts {
@@ -31,7 +33,7 @@ export declare enum edgeDirection {
     inboundEdge = 0,
     outboundEdge = 1
 }
-export declare class Orchestrator<TEnt extends Ent, TData extends Data, TExistingEnt extends TMaybleNullableEnt<TEnt> = MaybeNull<TEnt>> {
+export declare class Orchestrator<TEnt extends Ent<TViewer>, TInput extends Data, TViewer extends Viewer, TExistingEnt extends TMaybleNullableEnt<TEnt> = MaybeNull<TEnt>> {
     private options;
     private edgeSet;
     private edges;
@@ -48,11 +50,12 @@ export declare class Orchestrator<TEnt extends Ent, TData extends Data, TExistin
     private existingEnt;
     private disableTransformations;
     private memoizedGetFields;
-    constructor(options: OrchestratorOptions<TEnt, TData, TExistingEnt>);
+    constructor(options: OrchestratorOptions<TEnt, TInput, TViewer, TExistingEnt>);
+    __getOptions(): OrchestratorOptions<any, any, any, any>;
     private addEdge;
     setDisableTransformations(val: boolean): void;
-    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;
+    addInboundEdge<T2 extends Ent>(id1: ID | Builder<T2, any>, edgeType: string, nodeType: string, options?: AssocEdgeInputOptions): void;
+    addOutboundEdge<T2 extends Ent>(id2: ID | Builder<T2, any>, edgeType: string, nodeType: string, options?: AssocEdgeInputOptions): void;
     removeInboundEdge(id1: ID, edgeType: string): void;
     removeOutboundEdge(id2: ID, edgeType: string): void;
     getInputEdges(edgeType: string, op: WriteOperation): EdgeInputData[];
@@ -66,6 +69,11 @@ export declare class Orchestrator<TEnt extends Ent, TData extends Data, TExistin
     private getWriteOpForSQLStamentOp;
     getPossibleUnsafeEntForPrivacy(): Promise<TEnt>;
     getEditedData(): Promise<Data>;
+    /**
+     * @returns validated and formatted fields that would be written to the db
+     * throws an error if called before valid() or validX() has been called
+     */
+    getValidatedFields(): Data;
     private getFieldsInfo;
     private validate;
     private triggers;
@@ -79,22 +87,31 @@ export declare class Orchestrator<TEnt extends Ent, TData extends Data, TExistin
     private formatAndValidateFields;
     valid(): Promise<boolean>;
     validX(): Promise<void>;
+    /**
+     * @experimental API that's not guaranteed to remain in the future which returns
+     * a list of errors encountered
+     * 0 errors indicates valid
+     * NOTE that this currently doesn't catch errors returned by validators().
+     * If those throws, this still throws and doesn't return them
+     */
+    validWithErrors(): Promise<Error[]>;
     build(): Promise<EntChangeset<TEnt>>;
     private viewerForEntLoad;
     returnedRow(): Promise<Data | null>;
     editedEnt(): Promise<TEnt | null>;
     editedEntX(): Promise<TEnt>;
 }
-export declare class EntChangeset<T extends Ent> implements Changeset<T> {
+export declare class EntChangeset<T extends Ent> implements Changeset {
     viewer: Viewer;
     readonly placeholderID: ID;
     readonly ent: EntConstructor<T>;
     operations: DataOperation[];
-    dependencies?: Map<ID, Builder<Ent, Ent | null>> | undefined;
-    changesets?: Changeset<Ent>[] | undefined;
+    dependencies?: Map<ID, Builder<Ent<Viewer<Ent<any> | null, ID | null>>, Viewer<Ent<any> | null, ID | null>, Ent<Viewer<Ent<any> | null, ID | null>> | null>> | undefined;
+    changesets?: Changeset[] | undefined;
     private options?;
     private _executor;
-    constructor(viewer: Viewer, placeholderID: ID, ent: EntConstructor<T>, operations: DataOperation[], dependencies?: Map<ID, Builder<Ent, Ent | null>> | undefined, changesets?: Changeset<Ent>[] | undefined, options?: OrchestratorOptions<T, Data, MaybeNull<T>> | undefined);
+    constructor(viewer: Viewer, placeholderID: ID, ent: EntConstructor<T>, operations: DataOperation[], dependencies?: Map<ID, Builder<Ent<Viewer<Ent<any> | null, ID | null>>, Viewer<Ent<any> | null, ID | null>, Ent<Viewer<Ent<any> | null, ID | null>> | null>> | undefined, changesets?: Changeset[] | undefined, options?: OrchestratorOptions<T, Data, Viewer<Ent<any> | null, ID | null>, MaybeNull<T>> | undefined);
+    static changesetFrom(builder: Builder<any, any, any>, ops: DataOperation[]): EntChangeset<any>;
     executor(): Executor;
 }
 export {};