@snowtop/ent 0.0.32-alpha.4 → 0.0.34

package/action/action.d.ts

@@ -14,6 +14,7 @@ export interface Builder<T extends Ent> {
     build(): Promise<Changeset<T>>;
     operation: WriteOperation;
     editedEnt?(): Promise<T | null>;
+    nodeType: string;
 }
 export interface Executor extends Iterable<DataOperation>, Iterator<DataOperation> {
     placeholderID: ID;

package/action/orchestrator.d.ts

@@ -66,7 +66,7 @@ export declare class Orchestrator<T extends Ent> {
     validX(): Promise<void>;
     build(): Promise<EntChangeset<T>>;
     private viewerForEntLoad;
-    private returnedRow;
+    returnedRow(): Promise<Data | null>;
     editedEnt(): Promise<T | null>;
     editedEntX(): Promise<T>;
 }

package/core/base.d.ts

@@ -92,6 +92,12 @@ export interface LoadEntOptions<T extends Ent> extends LoadableEntOptions<T>, Se
 export interface LoadCustomEntOptions<T extends Ent> extends SelectBaseDataOptions {
     ent: EntConstructor<T>;
 }
+export interface LoaderInfo {
+    tableName: string;
+    fields: string[];
+    nodeType: string;
+    loaderFactory: LoaderFactory<any, Data | null>;
+}
 export interface EditEntOptions<T extends Ent> extends LoadableEntOptions<T>, EditRowOptions {
 }
 declare enum privacyResult {

package/graphql/index.d.ts

@@ -6,5 +6,5 @@ export { GraphQLEdgeType, GraphQLConnectionType, } from "./query/connection_type
 export { GraphQLNodeInterface } from "./builtins/node";
 export { GraphQLConnectionInterface } from "./builtins/connection";
 export { GraphQLEdgeInterface } from "./builtins/edge";
-export { NodeResolver, EntNodeResolver, registerResolver, clearResolvers, resolveID, nodeIDEncoder, mustDecodeIDFromGQLID, encodeGQLID, } from "./node_resolver";
+export { NodeResolver, EntNodeResolver, registerResolver, clearResolvers, resolveID, nodeIDEncoder, mustDecodeIDFromGQLID, mustDecodeNullableIDFromGQLID, encodeGQLID, } from "./node_resolver";
 export { convertFromGQLEnum, convertToGQLEnum } from "./enums";

package/graphql/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToGQLEnum = exports.convertFromGQLEnum = exports.encodeGQLID = 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.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; } });
@@ -35,6 +35,7 @@ Object.defineProperty(exports, "clearResolvers", { enumerable: true, get: functi
 Object.defineProperty(exports, "resolveID", { enumerable: true, get: function () { return node_resolver_1.resolveID; } });
 Object.defineProperty(exports, "nodeIDEncoder", { enumerable: true, get: function () { return node_resolver_1.nodeIDEncoder; } });
 Object.defineProperty(exports, "mustDecodeIDFromGQLID", { enumerable: true, get: function () { return node_resolver_1.mustDecodeIDFromGQLID; } });
+Object.defineProperty(exports, "mustDecodeNullableIDFromGQLID", { enumerable: true, get: function () { return node_resolver_1.mustDecodeNullableIDFromGQLID; } });
 Object.defineProperty(exports, "encodeGQLID", { enumerable: true, get: function () { return node_resolver_1.encodeGQLID; } });
 var enums_1 = require("./enums");
 Object.defineProperty(exports, "convertFromGQLEnum", { enumerable: true, get: function () { return enums_1.convertFromGQLEnum; } });

package/graphql/node_resolver.d.ts

@@ -24,5 +24,6 @@ export declare function clearResolvers(): Promise<void>;
 export declare function resolveID(viewer: Viewer, id: string): Promise<Node | null>;
 export declare const nodeIDEncoder: GraphQLFieldResolver<Ent, {}>;
 export declare function mustDecodeIDFromGQLID(id: string): ID;
+export declare function mustDecodeNullableIDFromGQLID(id: string | null | undefined): any;
 export declare function encodeGQLID(node: Ent): string;
 export {};

package/graphql/node_resolver.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeGQLID = exports.mustDecodeIDFromGQLID = exports.nodeIDEncoder = exports.resolveID = exports.clearResolvers = exports.registerResolver = exports.EntNodeResolver = void 0;
+exports.encodeGQLID = exports.mustDecodeNullableIDFromGQLID = exports.mustDecodeIDFromGQLID = exports.nodeIDEncoder = exports.resolveID = exports.clearResolvers = exports.registerResolver = exports.EntNodeResolver = void 0;
 class EntNodeResolver {
     constructor(loader) {
         this.loader = loader;
@@ -76,6 +76,19 @@ function mustDecodeIDFromGQLID(id) {
     return decoded;
 }
 exports.mustDecodeIDFromGQLID = mustDecodeIDFromGQLID;
+// TODO get the right (non-any) return type here. may need to change codegen to do the right thing here
+function mustDecodeNullableIDFromGQLID(id) {
+    // support undefined because fields in action
+    if (id === null || id === undefined) {
+        return id;
+    }
+    const decoded = EntNodeResolver.decode(id);
+    if (!decoded) {
+        throw new Error(`wasn't able to decode invalid ${id}`);
+    }
+    return decoded;
+}
+exports.mustDecodeNullableIDFromGQLID = mustDecodeNullableIDFromGQLID;
 // This takes an ent and returns the graphql id
 function encodeGQLID(node) {
     // let's do 3 parts. we take the "node" prefix

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.0.32-alpha.4",
+  "version": "0.0.34",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",

package/schema/field.d.ts

@@ -144,7 +144,7 @@ export declare class ListField extends BaseField {
     private validators;
     constructor(field: Field, options: FieldOptions);
     validate(validator: (val: any[]) => boolean): this;
-    valid(val: any): boolean;
+    valid(val: any): Promise<boolean>;
     private postgresVal;
     format(val: any): any;
     minLen(l: number): this;

package/schema/field.js

@@ -24,6 +24,7 @@ const luxon_1 = require("luxon");
 const snake_case_1 = require("snake-case");
 const db_1 = __importStar(require("../core/db"));
 const schema_1 = require("./schema");
+const util_1 = require("util");
 class BaseField {
     logValue(val) {
         if (this.sensitive) {
@@ -82,8 +83,8 @@ class UUIDField extends BaseField {
             }
         }
         if (options.fieldEdge?.enforceSchema &&
-            !options.fieldEdge.getLoaderOptions) {
-            throw new Error(`cannot enforceSchema if getLoaderOptions wasn't passed in`);
+            !options.fieldEdge.getLoaderInfoFromSchema) {
+            throw new Error(`cannot enforceSchema if getLoaderInfoFromSchema wasn't passed in`);
         }
     }
     isBuilder(val) {
@@ -93,14 +94,17 @@ class UUIDField extends BaseField {
         if (!this.options.fieldEdge?.enforceSchema) {
             return true;
         }
-        const getLoaderOptions = this.options.fieldEdge.getLoaderOptions;
-        const loadRowOptions = getLoaderOptions(this.options.fieldEdge.schema);
+        const getLoaderInfo = this.options.fieldEdge.getLoaderInfoFromSchema;
+        const loaderInfo = getLoaderInfo(this.options.fieldEdge.schema);
+        if (!loaderInfo) {
+            throw new Error(`couldn't get loaderInfo for ${this.options.fieldEdge.schema}`);
+        }
         if (this.isBuilder(val)) {
-            // if builder, the ent type of the builder and the ent type returned by the load constructor should match
-            return val.ent === loadRowOptions.ent;
+            // if builder, the nodeType of the builder and the nodeType of the loaderInfo should match
+            return val.nodeType === loaderInfo.nodeType;
         }
         // TODO we need context here to make sure that we hit local cache
-        const row = await loadRowOptions.loaderFactory.createLoader().load(val);
+        const row = await loaderInfo.loaderFactory.createLoader().load(val);
         return row !== null;
     }
 }
@@ -564,7 +568,7 @@ class ListField extends BaseField {
         this.validators.push(validator);
         return this;
     }
-    valid(val) {
+    async valid(val) {
         if (!Array.isArray(val)) {
             return false;
         }
@@ -573,15 +577,18 @@ class ListField extends BaseField {
                 return false;
             }
         }
-        if (!this.field.valid) {
+        const valid = this.field.valid;
+        if (!valid) {
             return true;
         }
-        for (const v of val) {
-            if (!this.field.valid(v)) {
-                return false;
-            }
+        const res = valid.apply(this.field, [val[0]]);
+        if (util_1.types.isPromise(res)) {
+            const ret = await Promise.all(val.map(async (v) => await valid.apply(this.field, [v])));
+            return ret.every((v) => v);
         }
-        return true;
+        const ret = val.map((v) => valid.apply(this.field, [v]));
+        const result = ret.every((v) => v);
+        return result;
     }
     postgresVal(val, jsonType) {
         if (!jsonType) {

package/schema/schema.d.ts

@@ -1,4 +1,4 @@
-import { Data, Ent, LoadEntOptions } from "../core/base";
+import { Data, Ent, LoaderInfo } from "../core/base";
 import { Builder } from "../action/action";
 export default interface Schema {
     fields: Field[];
@@ -102,7 +102,7 @@ export interface ForeignKey {
     disableIndex?: boolean;
     disableBuilderType?: boolean;
 }
-declare type getLoaderOptionsFn = (type: any) => LoadEntOptions<Ent>;
+declare type getLoaderInfoFn = (type: string) => LoaderInfo;
 export interface InverseFieldEdge {
     name: string;
     edgeConstName?: string;
@@ -113,7 +113,7 @@ export interface FieldEdge {
     schema: string;
     inverseEdge?: string | InverseFieldEdge;
     enforceSchema?: boolean;
-    getLoaderOptions?: getLoaderOptionsFn;
+    getLoaderInfoFromSchema?: getLoaderInfoFn;
     disableBuilderType?: boolean;
 }
 export interface FieldOptions {
@@ -171,6 +171,7 @@ export interface ActionField {
     nullable?: boolean | NullableListOptions;
     list?: boolean;
     actionName?: string;
+    excludedFields?: string[];
 }
 export interface Action {
     operation: ActionOperation;

package/testutils/builder.d.ts

@@ -71,6 +71,7 @@ export declare class SimpleBuilder<T extends Ent> implements Builder<T> {
     placeholderID: ID;
     orchestrator: Orchestrator<T>;
     fields: Map<string, any>;
+    nodeType: string;
     constructor(viewer: Viewer, schema: BuilderSchema<T>, fields: Map<string, any>, operation?: WriteOperation, existingEnt?: T | undefined, action?: Action<T> | undefined);
     build(): Promise<Changeset<T>>;
     editedEnt(): Promise<T | null>;

package/testutils/builder.js

@@ -13,6 +13,7 @@ const pluralize_1 = __importDefault(require("pluralize"));
 const snake_case_1 = require("snake-case");
 const loaders_1 = require("../core/loaders");
 const convert_1 = require("../core/convert");
+const camel_case_1 = require("camel-case");
 class User {
     constructor(viewer, data) {
         this.viewer = viewer;
@@ -126,6 +127,7 @@ class SimpleBuilder {
         }
         this.ent = schema.ent;
         const tableName = getTableName(schema);
+        this.nodeType = (0, camel_case_1.camelCase)(schema.ent.name);
         this.orchestrator = new orchestrator_1.Orchestrator({
             viewer: this.viewer,
             operation: operation,

package/testutils/ent-graphql-tests/index.d.ts

@@ -27,6 +27,7 @@ export declare function expectQueryFromRoot(config: queryRootConfig, ...options:
 export interface mutationRootConfig extends queryConfig {
     mutation: string;
     disableInputWrapping?: boolean;
+    nullQueryPaths?: string[];
 }
 export declare function expectMutation(config: mutationRootConfig, ...options: Option[]): Promise<supertest.SuperTest<supertest.Test>>;
 export {};

package/testutils/parse_sql.js

@@ -121,6 +121,22 @@ function getDataToReturn(data, colNames, returningAll) {
     return ret;
 }
 exports.getDataToReturn = getDataToReturn;
+function processBeforeStoring(val) {
+    if (typeof val !== "string") {
+        return val;
+    }
+    // convert postgres lists into lists before storing
+    if (val[0] === "{" && val[val.length - 1] === "}") {
+        try {
+            // valid json, don't convert
+            JSON.parse(val);
+        }
+        catch (e) {
+            return val.substring(1, val.length - 1).split(",");
+        }
+    }
+    return val;
+}
 function parseInsertStatement(ast, values, // values passed to query
 returningAll) {
     const tableName = getTableName(ast.table);
@@ -138,7 +154,7 @@ returningAll) {
     // INSERT INTO tableName (cols) VALUES (pos args)
     for (let i = 0; i < columns.length; i++) {
         let col = columns[i];
-        data[col] = values[i];
+        data[col] = processBeforeStoring(values[i]);
     }
     let returningData = null;
     if (returningAll) {
@@ -411,7 +427,7 @@ function parseUpdateStatement(ast, values, map, returningAll) {
     for (const set of ast.set) {
         let col = set.column;
         let value = getValueFromRegex(set.value, values);
-        overwrite[col] = value;
+        overwrite[col] = processBeforeStoring(value);
     }
     let columns = new Set();
     if (ast.returning) {