@snowtop/ent 0.0.2 → 0.0.3-5.alpha.2

package/scripts/custom_compiler.js

@@ -67,7 +67,7 @@ class Compiler {
     resolvePaths(moduleName, _containingFile) {
         //      console.log("resolvePaths", moduleName);
         if (!this.options.paths) {
-            return null;
+            return undefined;
         }
         let paths = this.options.paths;
         for (let key in paths) {
@@ -94,16 +94,16 @@ class Compiler {
                 };
             }
         }
-        return null;
+        return undefined;
     }
-    otherLocations(moduleName, containingFile) {
+    otherLocations(moduleName, _containingFile) {
         for (const location of this.moduleSearchLocations) {
             const modulePath = path.join(location, moduleName + ".d.ts");
             if (typescript_1.default.sys.fileExists(modulePath)) {
                 return { resolvedFileName: modulePath };
             }
         }
-        return null;
+        return undefined;
     }
     readCompilerOptions() {
         let json = {};
@@ -149,19 +149,17 @@ class Compiler {
         // go through each moduleName and resolvers in order to see if we find what we're looking for
         let resolvedModules = [];
         for (const moduleName of moduleNames) {
+            // undefined is valid
+            let resolved;
             for (const resolver of this.resolvers) {
                 let result = resolver(moduleName, containingFile);
                 // yay!
                 if (result) {
-                    resolvedModules.push(result);
+                    resolved = result;
                     break;
                 }
             }
-        }
-        if (moduleNames.length !== resolvedModules.length) {
-            // TODO if not equal, we need to do more
-            // it doesn't seem to be coming here for node_modules here which is good
-            console.error("couldn't resolve everything", containingFile, moduleNames, resolvedModules);
+            resolvedModules.push(resolved);
         }
         return resolvedModules;
     }

package/scripts/custom_graphql.js

@@ -25,6 +25,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const glob_1 = __importDefault(require("glob"));
 const minimist_1 = __importDefault(require("minimist"));
+const graphql_1 = require("../graphql/graphql");
 const readline = __importStar(require("readline"));
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
@@ -52,7 +53,17 @@ async function readInputs() {
         });
     });
 }
-async function captureCustom(filePath) {
+async function captureCustom(filePath, filesCsv) {
+    if (filesCsv !== undefined) {
+        let files = filesCsv.split(",");
+        for (let i = 0; i < files.length; i++) {
+            // TODO fix. we have "src" in the path we get here
+            files[i] = path.join(filePath, "..", files[i]);
+        }
+        await requireFiles(files);
+        return;
+    }
+    // TODO delete all of this eventually
     // TODO configurable paths eventually
     // for now only files that are in the include path of the roots are allowed
     const rootFiles = [
@@ -81,18 +92,28 @@ async function captureCustom(filePath) {
         ignore: ignore,
     });
     const files = rootFiles.concat(customGQLResolvers, customGQLMutations);
-    //console.log(files);
-    let promises = [];
-    files.forEach((file) => {
+    await requireFiles(files);
+}
+async function requireFiles(files) {
+    await Promise.all(files.map(async (file) => {
         if (fs.existsSync(file)) {
-            promises.push(require(file));
+            try {
+                await require(file);
+            }
+            catch (e) {
+                throw new Error(`${e.message} loading ${file}`);
+            }
+        }
+        else {
+            throw new Error(`file ${file} doesn't exist`);
         }
+    })).catch((err) => {
+        throw new Error(err);
     });
-    await Promise.all(promises);
 }
 async function parseImports(filePath) {
     // only do graphql files...
-    return imports_1.parseCustomInput(path.join(filePath, "graphql"), {
+    return (0, imports_1.parseCustomImports)(path.join(filePath, "graphql"), {
         ignore: ["**/generated/**", "**/tests/**"],
     });
 }
@@ -110,7 +131,21 @@ function findGraphQLPath(filePath) {
     return undefined;
 }
 async function main() {
-    const options = minimist_1.default(process.argv.slice(2));
+    // known custom types that are not required
+    // if not in the schema, will be ignored
+    // something like GraphQLUpload gotten via gqlArg({type: gqlFileUpload})
+    // these 2 need this because they're added by the schema
+    // if this list grows too long, need to build this into golang types and passed here
+    // TODO foreign non-scalars eventually
+    (0, graphql_1.addCustomType)({
+        importPath: "../graphql/scalars/time",
+        type: "GraphQLTime",
+    });
+    (0, graphql_1.addCustomType)({
+        importPath: "graphql-type-json",
+        type: "GraphQLJSON",
+    });
+    const options = (0, minimist_1.default)(process.argv.slice(2));
     if (!options.path) {
         throw new Error("path required");
     }
@@ -126,7 +161,7 @@ async function main() {
     GQLCapture.enable(true);
     const [inputsRead, _, imports] = await Promise.all([
         readInputs(),
-        captureCustom(options.path),
+        captureCustom(options.path, options.files),
         parseImports(options.path),
     ]);
     const { nodes, nodesMap } = inputsRead;
@@ -210,5 +245,5 @@ main()
     .then()
     .catch((err) => {
     console.error(err);
-    process_1.exit(1);
+    (0, process_1.exit)(1);
 });

package/scripts/read_schema.js

@@ -27,58 +27,9 @@ const path = __importStar(require("path"));
 const pascal_case_1 = require("pascal-case");
 const minimist_1 = __importDefault(require("minimist"));
 const process_1 = require("process");
-function processFields(dst, src) {
-    for (const field of src) {
-        let f = {};
-        f = field;
-        f["hasDefaultValueOnCreate"] = field.defaultValueOnCreate != undefined;
-        f["hasDefaultValueOnEdit"] = field.defaultValueOnEdit != undefined;
-        if (field.polymorphic) {
-            // convert boolean into object
-            // we keep boolean as an option to keep API simple
-            if (typeof field.polymorphic === "boolean") {
-                f["polymorphic"] = {};
-            }
-            else {
-                f["polymorphic"] = field.polymorphic;
-            }
-        }
-        dst.push(f);
-    }
-}
-var NullableResult;
-(function (NullableResult) {
-    NullableResult["CONTENTS"] = "contents";
-    NullableResult["CONTENTS_AND_LIST"] = "contentsAndList";
-    NullableResult["ITEM"] = "true";
-})(NullableResult || (NullableResult = {}));
-function processAction(action) {
-    if (!action.actionOnlyFields) {
-        return action;
-    }
-    let ret = action;
-    ret.actionOnlyFields = action.actionOnlyFields.map((f) => {
-        let f2 = f;
-        if (!f.nullable) {
-            return f2;
-        }
-        if (typeof f.nullable === "boolean") {
-            f2.nullable = NullableResult.ITEM;
-        }
-        else {
-            if (f.nullable === "contentsAndList") {
-                f2.nullable = NullableResult.CONTENTS_AND_LIST;
-            }
-            else {
-                f2.nullable = NullableResult.CONTENTS;
-            }
-        }
-        return f2;
-    });
-    return ret;
-}
+const parse_1 = require("../parse_schema/parse");
 function main() {
-    const options = minimist_1.default(process.argv.slice(2));
+    const options = (0, minimist_1.default)(process.argv.slice(2));
     if (!options.path) {
         throw new Error("path required");
     }
@@ -93,69 +44,16 @@ function main() {
         if (!match) {
             throw new Error(`non-typescript file ${p} returned by glob`);
         }
-        potentialSchemas[pascal_case_1.pascalCase(match[1])] = require(p).default;
+        potentialSchemas[(0, pascal_case_1.pascalCase)(match[1])] = require(p).default;
     }
     //  console.log(potentialSchemas);
-    let schemas = {};
-    for (const key in potentialSchemas) {
-        const value = potentialSchemas[key];
-        let schema;
-        if (value.constructor == Object) {
-            schema = value;
-        }
-        else {
-            schema = new value();
-        }
-        // let's put patterns first just so we have id, created_at, updated_at first
-        // ¯\_(ツ)_/¯
-        let fields = [];
-        if (schema.patterns) {
-            for (const pattern of schema.patterns) {
-                processFields(fields, pattern.fields);
-            }
-        }
-        processFields(fields, schema.fields);
-        let assocEdges = [];
-        let assocEdgeGroups = [];
-        if (schema.edges) {
-            for (const edge of schema.edges) {
-                let edge2 = edge;
-                edge2.edgeActions = edge.edgeActions?.map((action) => processAction(action));
-                assocEdges.push(edge2);
-            }
-        }
-        if (schema.edgeGroups) {
-            // array-ify this
-            for (const group of schema.edgeGroups) {
-                if (group.nullStates && !Array.isArray(group.nullStates)) {
-                    group.nullStates = [group.nullStates];
-                }
-                let group2 = group;
-                if (group.edgeAction) {
-                    group2.edgeAction = processAction(group.edgeAction);
-                }
-                assocEdgeGroups.push(group2);
-            }
-        }
-        schemas[key] = {
-            tableName: schema.tableName,
-            fields: fields,
-            assocEdges: assocEdges,
-            assocEdgeGroups: assocEdgeGroups,
-            actions: schema.actions?.map((action) => processAction(action)),
-            enumTable: schema.enumTable,
-            dbRows: schema.dbRows,
-            constraints: schema.constraints,
-            indices: schema.indices,
-            hideFromGraphQL: schema.hideFromGraphQL,
-        };
-    }
-    console.log(JSON.stringify(schemas));
+    const result = (0, parse_1.parseSchema)(potentialSchemas);
+    console.log(JSON.stringify(result));
 }
 try {
     main();
 }
 catch (err) {
     console.error(err);
-    process_1.exit(1);
+    (0, process_1.exit)(1);
 }

package/testutils/builder.d.ts

@@ -9,6 +9,7 @@ export declare class User implements Ent {
     accountID: string;
     nodeType: string;
     privacyPolicy: import("../core/base").PrivacyPolicy;
+    firstName: string;
     constructor(viewer: Viewer, data: Data);
 }
 export declare class Event implements Ent {
@@ -65,12 +66,13 @@ export declare class SimpleBuilder<T extends Ent> implements Builder<T> {
     viewer: Viewer;
     private schema;
     operation: WriteOperation;
-    existingEnt: Ent | undefined;
+    existingEnt: T | undefined;
     ent: EntConstructor<T>;
     placeholderID: ID;
     orchestrator: Orchestrator<T>;
     fields: Map<string, any>;
-    constructor(viewer: Viewer, schema: BuilderSchema<T>, fields: Map<string, any>, operation?: WriteOperation, existingEnt?: Ent | undefined, action?: Action<T> | undefined);
+    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>;
     editedEntX(): Promise<T>;
@@ -92,12 +94,13 @@ export declare class SimpleAction<T extends Ent> implements Action<T> {
     viewerForEntLoad: viewerEntLoadFunc | undefined;
     constructor(viewer: Viewer, schema: BuilderSchema<T>, fields: Map<string, any>, operation?: WriteOperation, existingEnt?: T | undefined);
     getPrivacyPolicy(): import("../core/base").PrivacyPolicy;
-    getInput(): Map<string, any>;
+    getInput(): Data;
     changeset(): Promise<Changeset<T>>;
     valid(): Promise<boolean>;
     validX(): Promise<void>;
     save(): Promise<T | null>;
     saveX(): Promise<T>;
     editedEnt(): Promise<T | null>;
+    editedEntX(): Promise<T>;
 }
 export {};

package/testutils/builder.js

@@ -13,15 +13,18 @@ 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;
         this.data = data;
+        this.accountID = "";
         this.nodeType = "User";
         this.privacyPolicy = privacy_1.AlwaysAllowPrivacyPolicy;
-        this.data.created_at = convert_1.convertDate(data.created_at);
-        this.data.updated_at = convert_1.convertDate(data.updated_at);
+        this.data.created_at = (0, convert_1.convertDate)(data.created_at);
+        this.data.updated_at = (0, convert_1.convertDate)(data.updated_at);
         this.id = data.id;
+        this.firstName = data.first_name;
     }
 }
 exports.User = User;
@@ -29,6 +32,7 @@ class Event {
     constructor(viewer, data) {
         this.viewer = viewer;
         this.data = data;
+        this.accountID = "";
         this.nodeType = "Event";
         this.privacyPolicy = privacy_1.AlwaysAllowPrivacyPolicy;
         this.id = data.id;
@@ -39,10 +43,11 @@ class Contact {
     constructor(viewer, data) {
         this.viewer = viewer;
         this.data = data;
+        this.accountID = "";
         this.nodeType = "Contact";
         this.privacyPolicy = privacy_1.AlwaysAllowPrivacyPolicy;
-        this.data.created_at = convert_1.convertDate(data.created_at);
-        this.data.updated_at = convert_1.convertDate(data.updated_at);
+        this.data.created_at = (0, convert_1.convertDate)(data.created_at);
+        this.data.updated_at = (0, convert_1.convertDate)(data.updated_at);
         this.id = data.id;
     }
 }
@@ -51,6 +56,7 @@ class Group {
     constructor(viewer, data) {
         this.viewer = viewer;
         this.data = data;
+        this.accountID = "";
         this.nodeType = "Group";
         this.privacyPolicy = privacy_1.AlwaysAllowPrivacyPolicy;
         this.id = data.id;
@@ -61,6 +67,7 @@ class Message {
     constructor(viewer, data) {
         this.viewer = viewer;
         this.data = data;
+        this.accountID = "";
         this.nodeType = "Message";
         this.privacyPolicy = privacy_1.AlwaysAllowPrivacyPolicy;
         this.id = data.id;
@@ -71,6 +78,7 @@ class Address {
     constructor(viewer, data) {
         this.viewer = viewer;
         this.data = data;
+        this.accountID = "";
         this.nodeType = "Address";
         this.privacyPolicy = privacy_1.AlwaysAllowPrivacyPolicy;
         this.id = data.id;
@@ -82,7 +90,7 @@ function getSchemaName(value) {
 }
 exports.getSchemaName = getSchemaName;
 function getTableName(value) {
-    return pluralize_1.default(snake_case_1.snakeCase(value.ent.name)).toLowerCase();
+    return (0, pluralize_1.default)((0, snake_case_1.snakeCase)(value.ent.name)).toLowerCase();
 }
 exports.getTableName = getTableName;
 function randomNum() {
@@ -107,18 +115,19 @@ class SimpleBuilder {
             }
         }
         this.fields = fields;
-        const schemaFields = schema_1.getFields(schema);
+        const schemaFields = (0, schema_1.getFields)(schema);
         let key = "id";
         if (!schemaFields.has("id") && !schemaFields.has("ID")) {
             if (schemaFields.size !== 1) {
                 throw new Error(`no id field and multiple fields so can't deduce key. add an id field to schema`);
             }
             for (const [name, _] of fields) {
-                key = snake_case_1.snakeCase(name);
+                key = (0, snake_case_1.snakeCase)(name);
             }
         }
         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,
@@ -152,10 +161,10 @@ class SimpleBuilder {
         return await this.orchestrator.editedEntX();
     }
     async save() {
-        await action_1.saveBuilder(this);
+        await (0, action_1.saveBuilder)(this);
     }
     async saveX() {
-        await action_1.saveBuilderX(this);
+        await (0, action_1.saveBuilderX)(this);
     }
     async valid() {
         return await this.orchestrator.valid();
@@ -178,7 +187,11 @@ class SimpleAction {
         return privacy_1.AlwaysAllowPrivacyPolicy;
     }
     getInput() {
-        return this.fields;
+        const ret = {};
+        for (const [k, v] of this.fields) {
+            ret[k] = v;
+        }
+        return ret;
     }
     changeset() {
         return this.builder.build();
@@ -190,18 +203,21 @@ class SimpleAction {
         return this.builder.orchestrator.validX();
     }
     async save() {
-        await action_1.saveBuilder(this.builder);
+        await (0, action_1.saveBuilder)(this.builder);
         if (this.builder.operation !== action_1.WriteOperation.Delete) {
-            return await this.builder.orchestrator.editedEnt();
+            return this.builder.orchestrator.editedEnt();
         }
         return null;
     }
     async saveX() {
-        await action_1.saveBuilderX(this.builder);
-        return await this.builder.orchestrator.editedEntX();
+        await (0, action_1.saveBuilderX)(this.builder);
+        return this.builder.orchestrator.editedEntX();
     }
     async editedEnt() {
-        return await this.builder.orchestrator.editedEnt();
+        return this.builder.orchestrator.editedEnt();
+    }
+    async editedEntX() {
+        return this.builder.orchestrator.editedEntX();
     }
 }
 exports.SimpleAction = SimpleAction;

package/testutils/db/test_db.d.ts

@@ -10,6 +10,7 @@ interface Column extends SchemaItem {
     datatype(): string;
     nullable?: boolean;
     primaryKey?: boolean;
+    unique?: boolean;
     default?: string;
     foreignKey?: {
         table: string;
@@ -19,21 +20,25 @@ interface Column extends SchemaItem {
 interface Constraint extends SchemaItem {
     generate(): string;
 }
-export interface Table {
+export interface CoreConcept {
     name: string;
-    columns: Column[];
-    constraints?: Constraint[];
     create(): string;
     drop(): string;
 }
-declare type options = Pick<Column, "nullable" | "primaryKey" | "default" | "foreignKey">;
+export interface Table extends CoreConcept {
+    columns: Column[];
+    constraints?: Constraint[];
+}
+declare type options = Pick<Column, "nullable" | "primaryKey" | "default" | "foreignKey" | "unique">;
 export declare function primaryKey(name: string, cols: string[]): Constraint;
 export declare function foreignKey(name: string, cols: string[], fkey: {
     table: string;
     cols: string[];
 }): Constraint;
+export declare function uniqueIndex(name: string): Constraint;
 export declare function uuid(name: string, opts?: options): Column;
 export declare function text(name: string, opts?: options): Column;
+export declare function enumCol(name: string, type: string): Column;
 export declare function timestamp(name: string, opts?: options): Column;
 export declare function timestamptz(name: string, opts?: options): Column;
 export declare function time(name: string, opts?: options): Column;
@@ -42,6 +47,8 @@ export declare function date(name: string, opts?: options): Column;
 export declare function bool(name: string, opts?: options): Column;
 export declare function integer(name: string, opts?: options): Column;
 export declare function float(name: string, opts?: options): Column;
+export declare function json(name: string, opts?: options): Column;
+export declare function jsonb(name: string, opts?: options): Column;
 export declare function textList(name: string, opts?: options): Column;
 export declare function integerList(name: string, opts?: options): Column;
 export declare function uuidList(name: string, opts?: options): Column;
@@ -52,6 +59,7 @@ export declare function timetzList(name: string, opts?: options): Column;
 export declare function dateList(name: string, opts?: options): Column;
 export declare function boolList(name: string, opts?: options): Column;
 export declare function table(name: string, ...items: SchemaItem[]): Table;
+export declare function enumType(name: string, values: string[]): CoreConcept;
 export declare class TempDB {
     private db;
     private client;
@@ -59,17 +67,17 @@ export declare class TempDB {
     private tables;
     private dialect;
     private sqlite;
-    constructor(dialect: Dialect, tables?: Table[]);
-    constructor(tables: Table[]);
+    constructor(dialect: Dialect, tables?: CoreConcept[]);
+    constructor(tables: CoreConcept[]);
     getDialect(): Dialect;
-    getTables(): Map<string, Table>;
+    getTables(): Map<string, CoreConcept>;
     beforeAll(): Promise<void>;
     getSqliteClient(): SqliteDatabase;
     getPostgresClient(): PGClient;
     afterAll(): Promise<void>;
     dropAll(): Promise<void>;
     drop(...tables: string[]): Promise<void>;
-    create(...tables: Table[]): Promise<void>;
+    create(...tables: CoreConcept[]): Promise<void>;
 }
 export declare function assoc_edge_config_table(): Table;
 export declare function assoc_edge_table(name: string): Table;