@snowtop/ent 0.1.0-alpha88 → 0.1.0-alpha89

package/action/action.d.ts

@@ -46,7 +46,7 @@ export interface Observer<TEnt extends Ent<TViewer>, TBuilder extends Builder<TE
     observe(builder: TBuilder, input: TInput): void | Promise<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> | void;
+    validate(builder: TBuilder, input: TInput): Promise<void | undefined | Error> | void | Error | undefined;
 }
 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;

package/action/orchestrator.js

@@ -368,13 +368,14 @@ class Orchestrator {
         // not ideal we're calling this twice. fix...
         // needed for now. may need to rewrite some of this?
         const editedFields2 = await this.options.editedFields();
-        const [errors, _] = await Promise.all([
+        const [errors, errs2] = await Promise.all([
             this.formatAndValidateFields(schemaFields, editedFields2),
             this.validators(validators, action, builder),
         ]);
         if (privacyError !== null) {
             errors.unshift(privacyError);
         }
+        errors.push(...errs2);
         return errors;
     }
     async triggers(action, builder, triggers) {
@@ -420,16 +421,19 @@ class Orchestrator {
         }
     }
     async validators(validators, action, builder) {
-        // TODO need to catch errors and return it...
-        // don't need it initially since what we need this for doesn't have the errors
-        let promises = [];
-        validators.forEach((validator) => {
-            let res = validator.validate(builder, action.getInput());
-            if (res) {
-                promises.push(res);
-            }
-        });
-        await Promise.all(promises);
+        const errors = [];
+        await Promise.all(validators.map(async (v) => {
+            try {
+                const r = await v.validate(builder, action.getInput());
+                if (r instanceof Error) {
+                    errors.push(r);
+                }
+            }
+            catch (err) {
+                errors.push(err);
+            }
+        }));
+        return errors;
     }
     isBuilder(val) {
         return val.placeholderID !== undefined;

package/core/clause.d.ts

@@ -4,6 +4,7 @@ export interface Clause {
     values(): any[];
     instanceKey(): string;
     logValues(): any[];
+    compositeOp?: string;
 }
 export interface SensitiveValue {
     value(): any;
@@ -37,6 +38,7 @@ export declare class inClause implements Clause {
 declare class compositeClause implements Clause {
     private clauses;
     private sep;
+    compositeOp: string;
     constructor(clauses: Clause[], sep: string);
     clause(idx: number): string;
     columns(): string[];
@@ -97,6 +99,7 @@ export declare function LessEq(col: string, value: any): simpleClause;
 export declare function And(...args: Clause[]): compositeClause;
 export declare function AndOptional(...args: (Clause | undefined)[]): Clause;
 export declare function Or(...args: Clause[]): compositeClause;
+export declare function OrOptional(...args: (Clause | undefined)[]): Clause;
 export declare function In(col: string, ...values: any): Clause;
 export declare function In(col: string, values: any[], type?: string): Clause;
 interface TsQuery {

package/core/clause.js

@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JSONPathValuePredicate = exports.JSONObjectFieldKeyAsText = exports.JSONObjectFieldKeyASJSON = exports.sensitiveValue = exports.TsVectorWebsearchToTsQuery = exports.TsVectorPhraseToTsQuery = exports.TsVectorPlainToTsQuery = exports.TsVectorColTsQuery = exports.WebsearchToTsQuery = exports.PhraseToTsQuery = exports.PlainToTsQuery = exports.TsQuery = exports.In = exports.Or = exports.AndOptional = exports.And = exports.LessEq = exports.GreaterEq = exports.Less = exports.Greater = exports.NotEq = exports.Eq = exports.ArrayNotEq = exports.ArrayEq = exports.PostgresArrayNotOverlaps = exports.PostgresArrayOverlaps = exports.PostgresArrayNotContains = exports.PostgresArrayNotContainsValue = exports.PostgresArrayContains = exports.PostgresArrayContainsValue = exports.inClause = void 0;
+exports.JSONPathValuePredicate = exports.JSONObjectFieldKeyAsText = exports.JSONObjectFieldKeyASJSON = exports.sensitiveValue = exports.TsVectorWebsearchToTsQuery = exports.TsVectorPhraseToTsQuery = exports.TsVectorPlainToTsQuery = exports.TsVectorColTsQuery = exports.WebsearchToTsQuery = exports.PhraseToTsQuery = exports.PlainToTsQuery = exports.TsQuery = exports.In = exports.OrOptional = exports.Or = exports.AndOptional = exports.And = exports.LessEq = exports.GreaterEq = exports.Less = exports.Greater = exports.NotEq = exports.Eq = exports.ArrayNotEq = exports.ArrayEq = exports.PostgresArrayNotOverlaps = exports.PostgresArrayOverlaps = exports.PostgresArrayNotContains = exports.PostgresArrayNotContainsValue = exports.PostgresArrayContains = exports.PostgresArrayContainsValue = exports.inClause = void 0;
 const db_1 = __importStar(require("./db"));
 function isSensitive(val) {
     return (val !== null &&
@@ -59,9 +59,9 @@ class simpleClause {
         return [this.col];
     }
     values() {
-        const sqliteClause = this.nullClause();
-        if (sqliteClause) {
-            return sqliteClause.values();
+        const nullClause = this.nullClause();
+        if (nullClause) {
+            return nullClause.values();
         }
         if (isSensitive(this.value)) {
             return [this.value.value()];
@@ -69,9 +69,9 @@ class simpleClause {
         return [this.value];
     }
     logValues() {
-        const sqliteClause = this.nullClause();
-        if (sqliteClause) {
-            return sqliteClause.logValues();
+        const nullClause = this.nullClause();
+        if (nullClause) {
+            return nullClause.logValues();
         }
         if (isSensitive(this.value)) {
             return [this.value.logValue()];
@@ -79,9 +79,9 @@ class simpleClause {
         return [this.value];
     }
     instanceKey() {
-        const sqliteClause = this.nullClause();
-        if (sqliteClause) {
-            return sqliteClause.instanceKey();
+        const nullClause = this.nullClause();
+        if (nullClause) {
+            return nullClause.instanceKey();
         }
         return `${this.col}${this.op}${rawValue(this.value)}`;
     }
@@ -300,11 +300,17 @@ class compositeClause {
     constructor(clauses, sep) {
         this.clauses = clauses;
         this.sep = sep;
+        this.compositeOp = this.sep;
     }
     clause(idx) {
         let clauses = [];
         for (const clause of this.clauses) {
-            clauses.push(clause.clause(idx));
+            let cls = clause.clause(idx);
+            // if composite clause and a different op, add parens so that we enforce order of precedence
+            if (clause.compositeOp && clause.compositeOp !== this.sep) {
+                cls = `(${cls})`;
+            }
+            clauses.push(cls);
             idx = idx + clause.values().length;
         }
         return clauses.join(this.sep);
@@ -332,7 +338,14 @@ class compositeClause {
     }
     instanceKey() {
         let keys = [];
-        this.clauses.forEach((clause) => keys.push(clause.instanceKey()));
+        this.clauses.forEach((clause) => {
+            if (clause.compositeOp && clause.compositeOp != this.sep) {
+                keys.push(`(${clause.instanceKey()})`);
+            }
+            else {
+                keys.push(clause.instanceKey());
+            }
+        });
         return keys.join(this.sep);
     }
 }
@@ -513,6 +526,15 @@ function Or(...args) {
     return new compositeClause(args, " OR ");
 }
 exports.Or = Or;
+function OrOptional(...args) {
+    // @ts-ignore
+    let filtered = args.filter((v) => v !== undefined);
+    if (filtered.length === 1) {
+        return filtered[0];
+    }
+    return Or(...filtered);
+}
+exports.OrOptional = OrOptional;
 function In(...args) {
     if (args.length < 2) {
         throw new Error(`invalid args passed to In`);

package/core/ent.js

@@ -196,6 +196,11 @@ function getEntKey(viewer, id, options) {
 }
 exports.getEntKey = getEntKey;
 async function loadEnt(viewer, id, options) {
+    if (typeof id !== "string" &&
+        typeof id !== "number" &&
+        typeof id !== "bigint") {
+        throw new Error(`invalid id ${id} passed to loadEnt`);
+    }
     const r = await getEntLoader(viewer, options).load(id);
     return r instanceof ErrorWrapper ? null : r;
 }
@@ -239,6 +244,11 @@ async function loadEntViaKey(viewer, key, options) {
 }
 exports.loadEntViaKey = loadEntViaKey;
 async function loadEntX(viewer, id, options) {
+    if (typeof id !== "string" &&
+        typeof id !== "number" &&
+        typeof id !== "bigint") {
+        throw new Error(`invalid id ${id} passed to loadEntX`);
+    }
     const r = await getEntLoader(viewer, options).load(id);
     if (r instanceof ErrorWrapper) {
         throw r.error;

package/index.d.ts

@@ -13,6 +13,7 @@ declare const query: {
     And: typeof q.And;
     AndOptional: typeof q.AndOptional;
     Or: typeof q.Or;
+    OrOptional: typeof q.OrOptional;
     In: typeof q.In;
     Greater: typeof q.Greater;
     Less: typeof q.Less;

package/index.js

@@ -112,6 +112,7 @@ const query = {
     And: q.And,
     AndOptional: q.AndOptional,
     Or: q.Or,
+    OrOptional: q.OrOptional,
     In: q.In,
     Greater: q.Greater,
     Less: q.Less,

package/package.json

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

package/schema/schema.d.ts

@@ -68,7 +68,8 @@ export interface AssocEdgeGroup {
     tableName?: string;
     assocEdges: AssocEdge[];
     statusEnums?: string[];
-    nullStates: string | string[];
+    viewerBased?: boolean;
+    nullStates?: string | string[];
     nullStateFn?: string;
     edgeAction?: EdgeGroupAction;
 }
@@ -210,6 +211,7 @@ export interface FieldOptions {
     [x: string]: any;
 }
 export interface PolymorphicOptions {
+    name?: string;
     types?: string[];
     hideFromInverseGraphQL?: boolean;
     disableBuilderType?: boolean;