@snowtop/ent 0.1.0-alpha96-2a5ea200-82e5-11ed-8c55-4da1cd949242 → 0.1.0-alpha97

package/schema/field.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UUIDListType = exports.IntegerEnumListType = exports.EnumListType = exports.DateListType = exports.TimetzListType = exports.TimeListType = exports.TimestamptzListType = exports.TimestampListType = exports.BooleanListType = exports.BigIntegerListType = exports.FloatListType = exports.IntegerListType = exports.IntListType = exports.StringListType = exports.ListField = exports.IntegerEnumType = exports.IntegerEnumField = exports.EnumType = exports.StringEnumField = exports.EnumField = exports.DateType = exports.DateField = exports.TimetzType = exports.TimeType = exports.TimeField = exports.leftPad = exports.TimestamptzType = exports.TimestampType = exports.TimestampField = exports.StringType = exports.PolymorphicStringField = exports.StringField = exports.BooleanType = exports.BooleanField = exports.FloatType = exports.FloatField = exports.BigIntegerType = exports.BigIntegerField = exports.IntegerType = exports.IntegerField = exports.UUIDType = exports.UUIDField = exports.BaseField = void 0;
+exports.UUIDListType = exports.IntegerEnumListType = exports.EnumListType = exports.DateListType = exports.TimetzListType = exports.TimeListType = exports.TimestamptzListType = exports.TimestampListType = exports.BooleanListType = exports.BigIntegerListType = exports.FloatListType = exports.IntegerListType = exports.IntListType = exports.StringListType = exports.ListField = exports.IntegerEnumType = exports.IntegerEnumField = exports.EnumType = exports.StringEnumField = exports.EnumField = exports.DateType = exports.DateField = exports.TimetzType = exports.TimeType = exports.TimeField = exports.leftPad = exports.TimestamptzType = exports.TimestampType = exports.TimestampField = exports.StringType = exports.PolymorphicStringField = exports.StringField = exports.BooleanType = exports.BooleanField = exports.FloatType = exports.FloatField = exports.BigIntegerType = exports.BigIntegerField = exports.IntegerType = exports.IntegerField = exports.NumberField = exports.UUIDType = exports.UUIDField = exports.BaseField = void 0;
 const luxon_1 = require("luxon");
 const camel_case_1 = require("camel-case");
 const util_1 = require("util");
@@ -119,9 +119,10 @@ function UUIDType(options) {
     return Object.assign(result, options);
 }
 exports.UUIDType = UUIDType;
-class IntegerField extends BaseField {
+class NumberField extends BaseField {
     constructor(options) {
         super();
+        // to be overriden as needed
         this.type = { dbType: schema_1.DBType.Int };
         this.validators = [];
         this.options = {};
@@ -145,9 +146,11 @@ class IntegerField extends BaseField {
         this.options = options;
     }
     min(l) {
+        // @ts-ignore Operator '>=' cannot be applied to types 'number' and 'T'.
         return this.validate((val) => val >= l);
     }
     max(l) {
+        // @ts-ignore Operator '<=' cannot be applied to types 'number' and 'T'.
         return this.validate((val) => val <= l);
     }
     valid(val) {
@@ -163,13 +166,20 @@ class IntegerField extends BaseField {
         return this;
     }
 }
+exports.NumberField = NumberField;
+class IntegerField extends NumberField {
+    constructor() {
+        super(...arguments);
+        this.type = { dbType: schema_1.DBType.Int };
+    }
+}
 exports.IntegerField = IntegerField;
 function IntegerType(options) {
     let result = new IntegerField(options);
     return Object.assign(result, options);
 }
 exports.IntegerType = IntegerType;
-class BigIntegerField extends BaseField {
+class BigIntegerField extends NumberField {
     constructor() {
         super(...arguments);
         this.type = { dbType: schema_1.DBType.BigInt };
@@ -177,11 +187,11 @@ class BigIntegerField extends BaseField {
 }
 exports.BigIntegerField = BigIntegerField;
 function BigIntegerType(options) {
-    let result = new BigIntegerField();
+    let result = new BigIntegerField(options);
     return Object.assign(result, options);
 }
 exports.BigIntegerType = BigIntegerType;
-class FloatField extends BaseField {
+class FloatField extends NumberField {
     constructor() {
         super(...arguments);
         this.type = { dbType: schema_1.DBType.Float };
@@ -189,7 +199,7 @@ class FloatField extends BaseField {
 }
 exports.FloatField = FloatField;
 function FloatType(options) {
-    let result = new FloatField();
+    let result = new FloatField(options);
     return Object.assign(result, options);
 }
 exports.FloatType = FloatType;
@@ -527,7 +537,7 @@ class EnumField extends BaseField {
             }
             if (options.map) {
                 let count = 0;
-                for (const k in options.map) {
+                for (const _ in options.map) {
                     count++;
                     break;
                 }
@@ -594,7 +604,7 @@ class IntegerEnumField extends BaseField {
             deprecatedIntEnumMap: options.deprecated,
         };
         let count = 0;
-        for (const k in options.map) {
+        for (const _ in options.map) {
             count++;
             break;
         }

package/schema/schema.d.ts

@@ -9,7 +9,7 @@ interface FieldInfo {
     dbCol: string;
     inputKey: string;
 }
-export declare type FieldInfoMap = {
+export type FieldInfoMap = {
     [key: string]: FieldInfo;
 };
 export interface GlobalSchema {
@@ -18,12 +18,12 @@ export interface GlobalSchema {
     transformEdgeRead?: () => Clause;
     transformEdgeWrite?: (stmt: EdgeUpdateOperation) => TransformedEdgeUpdateOperation | null;
 }
-declare type FieldOverride = Pick<FieldOptions, "nullable" | "storageKey" | "serverDefault" | "unique" | "hideFromGraphQL" | "graphqlName" | "index">;
-export declare type FieldOverrideMap = {
+type FieldOverride = Pick<FieldOptions, "nullable" | "storageKey" | "serverDefault" | "unique" | "hideFromGraphQL" | "graphqlName" | "index">;
+export type FieldOverrideMap = {
     [key: string]: FieldOverride;
 };
 export default interface Schema {
-    fields: FieldMap | Field[];
+    fields: FieldMap;
     fieldOverrides?: FieldOverrideMap;
     tableName?: string;
     patterns?: Pattern[];
@@ -78,10 +78,10 @@ export interface AssocEdgeGroup {
     nullStateFn?: string;
     edgeAction?: EdgeGroupAction;
 }
-export declare type Edge = AssocEdge;
+export type Edge = AssocEdge;
 export interface Pattern {
     name: string;
-    fields: FieldMap | Field[];
+    fields: FieldMap;
     disableMixin?: boolean;
     edges?: Edge[];
     transformRead?: () => Clause;
@@ -173,7 +173,7 @@ export interface ForeignKey {
     disableBuilderType?: boolean;
     [x: string]: any;
 }
-declare type getLoaderInfoFn = (type: string) => LoaderInfo;
+type getLoaderInfoFn = (type: string) => LoaderInfo;
 export interface InverseFieldEdge {
     name: string;
     edgeConstName?: string;
@@ -234,7 +234,7 @@ export interface Field extends FieldOptions {
 export interface SchemaConstructor {
     new (): Schema;
 }
-export declare type SchemaInputType = Schema | SchemaConstructor;
+export type SchemaInputType = Schema | SchemaConstructor;
 export declare function getSchema(value: SchemaInputType): Schema;
 export declare function getFields(value: SchemaInputType): Map<string, Field>;
 /**
@@ -258,8 +258,8 @@ export declare enum ActionOperation {
     RemoveEdge = 32,
     EdgeGroup = 64
 }
-declare type actionFieldType = "ID" | "Boolean" | "Int" | "Float" | "String" | "Time" | "Object";
-declare type NullableListOptions = "contents" | "contentsAndList";
+type actionFieldType = "ID" | "Boolean" | "Int" | "Float" | "String" | "Time" | "Object";
+type NullableListOptions = "contents" | "contentsAndList";
 export interface ActionField {
     name: string;
     type: actionFieldType;

package/schema/schema.js

@@ -56,22 +56,6 @@ exports.getSchema = getSchema;
 function getFields(value) {
     const schema = getSchema(value);
     function addFields(fields) {
-        if (Array.isArray(fields)) {
-            for (const field of fields) {
-                if (field.dbOnly) {
-                    continue;
-                }
-                const name = field.name;
-                if (!name) {
-                    throw new Error(`name required`);
-                }
-                if (field.getDerivedFields !== undefined) {
-                    addFields(field.getDerivedFields(name));
-                }
-                m.set(name, field);
-            }
-            return;
-        }
         for (const name in fields) {
             const field = fields[name];
             if (field.dbOnly) {

package/scripts/custom_graphql.js

@@ -114,6 +114,7 @@ function processTopLevel(l, l2) {
             fieldType: custom.fieldType,
             args: transformArgs(custom),
             results: transformResultType(custom),
+            description: custom.description,
         });
     }
 }
@@ -128,6 +129,7 @@ function processCustomFields(fields, gqlCapture, nodeName) {
             fieldType: f.fieldType,
             args: transformArgs(f),
             results: transformResultType(f),
+            description: f.description,
         });
     }
     m.set(nodeName, results);
@@ -213,11 +215,27 @@ async function requireFiles(files) {
         throw new Error(err);
     });
 }
+// filePath is path-to-src
 async function parseImports(filePath) {
-    // only do graphql files...
-    return (0, imports_1.parseCustomImports)(path.join(filePath, "graphql"), {
-        ignore: ["**/generated/**", "**/tests/**"],
-    });
+    return (0, imports_1.parseCustomImports)(filePath, [
+        {
+            // graphql files
+            root: path.join(filePath, "graphql"),
+            opts: {
+                ignore: ["**/generated/**", "**/tests/**"],
+            },
+        },
+        {
+            // can't just use top level ent files but have to check for all (non-generated) files
+            // in src/ent/* because custom edges (or other things) could have @gqlField etc
+            // and then have to look for these imports etc
+            root: path.join(filePath, "ent"),
+            opts: {
+                // not in action files since we can't customize payloads (yet?)
+                ignore: ["**/generated/**", "**/tests/**", "**/actions/**"],
+            },
+        },
+    ]);
 }
 function findGraphQLPath(filePath) {
     while (filePath !== "/") {
@@ -232,6 +250,10 @@ function findGraphQLPath(filePath) {
     }
     return undefined;
 }
+// test as follows:
+// there should be an easier way to do this...
+// also, there should be a way to get the list of objects here that's not manual
+//echo "User\nContact\nContactEmail\nComment" | ts-node-script --log-error --project ./tsconfig.json -r tsconfig-paths/register ../../ts/src/scripts/custom_graphql.ts --path ~/code/ent/examples/simple/src/
 async function main() {
     // known custom types that are not required
     // if not in the schema, will be ignored
@@ -345,6 +367,10 @@ async function main() {
     };
     buildClasses(mutations);
     buildClasses(queries);
+    // call for every field in a node
+    for (const k in fields) {
+        buildClasses(fields[k]);
+    }
     console.log(JSON.stringify({
         args,
         inputs,

package/testutils/action/complex_schemas.d.ts

@@ -0,0 +1,69 @@
+import { Ent, ID, Viewer, Data } from "../../core/base";
+import { DataOperation } from "../../core/ent";
+import { Action, Builder, Executor, WriteOperation, Trigger, Observer, TriggerReturn } from "../../action/action";
+import { EdgeInputData } from "../../action/orchestrator";
+import { User, Group, Message, Contact, SimpleBuilder, BuilderSchema, SimpleAction, BaseEnt } from "../../testutils/builder";
+import { MockLogs } from "../../testutils/mock_log";
+import { Table } from "../db/temp_db";
+export declare function setupTest(): void;
+export declare function getML(): MockLogs;
+export declare function getOperations(): DataOperation<Ent<Viewer<Ent<any> | null, ID | null>>>[];
+export declare const UserSchema: BuilderSchema<User>;
+export declare class UserWithBalance extends User {
+}
+export declare const UserBalanceSchema: BuilderSchema<UserWithBalance>;
+export declare class UserWithBalanceWithCheck extends UserWithBalance {
+}
+export declare const UserBalanceWithCheckSchema: BuilderSchema<UserWithBalanceWithCheck>;
+export declare class Account extends BaseEnt {
+    accountID: string;
+    nodeType: string;
+}
+export declare const AccountSchema: BuilderSchema<Account>;
+export declare const ContactSchema: BuilderSchema<Contact>;
+export declare const GroupSchema: BuilderSchema<Group>;
+export declare class GroupMembership extends BaseEnt {
+    nodeType: string;
+}
+export declare const GroupMembershipSchema: BuilderSchema<GroupMembership>;
+export declare class Changelog extends BaseEnt {
+    nodeType: string;
+}
+export declare const ChangelogSchema: BuilderSchema<Changelog>;
+export declare const MessageSchema: BuilderSchema<Message>;
+export declare function executeAction<T extends Ent, E = any>(action: Action<T, Builder<T>>, name?: E): Promise<Executor>;
+export declare function createGroup(): Promise<Group>;
+export declare function createUser(): Promise<User>;
+export declare class MessageAction extends SimpleAction<Message> {
+    constructor(viewer: Viewer, fields: Map<string, any>, operation: WriteOperation, existingEnt: Message | null);
+    getTriggers(): Trigger<Message, SimpleBuilder<Message, Message | null>>[];
+    getObservers(): Observer<Message, SimpleBuilder<Message>>[];
+}
+export declare class UserAction extends SimpleAction<User> {
+    contactAction: SimpleAction<Contact> | undefined;
+    constructor(viewer: Viewer, fields: Map<string, any>, operation: WriteOperation, existingEnt: User | null);
+    getTriggers(): Trigger<User, SimpleBuilder<User>>[];
+    getObservers(): Observer<User, SimpleBuilder<User>>[];
+}
+type getMembershipFunction = (viewer: Viewer, edge: EdgeInputData) => SimpleAction<Ent>;
+export declare class GroupMembershipTrigger implements Trigger<Group, SimpleBuilder<Group>> {
+    private getter;
+    constructor(getter: getMembershipFunction);
+    changeset(builder: SimpleBuilder<Group>, input: Data): TriggerReturn;
+}
+export declare class EditGroupAction extends SimpleAction<Group> {
+    viewer: Viewer;
+    private getter;
+    constructor(viewer: Viewer, schema: BuilderSchema<Group>, fields: Map<string, any>, existingEnt: Group, getter: getMembershipFunction);
+    getTriggers: () => GroupMembershipTrigger[];
+}
+export declare function verifyGroupMembers(group: Group, members: User[]): Promise<ID[]>;
+export declare function loadMemberships(viewer: Viewer, membershipids: ID[]): Promise<GroupMembership[]>;
+export declare function loadChangelogs(viewer: Viewer, clids: ID[]): Promise<Changelog[]>;
+export declare function verifyChangelogFromMeberships(user: User, memberships: GroupMembership[]): Promise<void>;
+export declare class GroupMemberOf extends BaseEnt {
+    nodeType: string;
+}
+export declare const GroupMemberOfSchema: BuilderSchema<GroupMemberOf>;
+export declare const getTables: () => Table[];
+export {};