@snowtop/ent 0.0.35 → 0.0.38

package/core/config.d.ts

@@ -1,6 +1,14 @@
 /// <reference types="node" />
 import { Database, DBDict } from "./db";
 declare type logType = "query" | "warn" | "info" | "error" | "debug";
+declare enum graphqlMutationName {
+    NOUN_VERB = "NounVerb",
+    VERB_NOUN = "VerbNoun"
+}
+declare enum graphQLFieldFormat {
+    LOWER_CAMEL = "lowerCamel",
+    SNAKE_CASE = "snake_case"
+}
 export interface Config {
     dbConnectionString?: string;
     dbFile?: string;
@@ -17,6 +25,8 @@ interface CodegenConfig {
     generatedHeader?: string;
     disableBase64Encoding?: boolean;
     generateRootResolvers?: boolean;
+    defaultGraphQLMutationName?: graphqlMutationName;
+    defaultGraphQLFieldFormat?: graphQLFieldFormat;
 }
 interface PrettierConfig {
     custom?: boolean;

package/core/config.js

@@ -28,6 +28,18 @@ const js_yaml_1 = require("js-yaml");
 const db_1 = __importDefault(require("./db"));
 const path = __importStar(require("path"));
 const logger_1 = require("./logger");
+// ent.config.ts eventually. for now ent.yml
+// or ent.yml?
+var graphqlMutationName;
+(function (graphqlMutationName) {
+    graphqlMutationName["NOUN_VERB"] = "NounVerb";
+    graphqlMutationName["VERB_NOUN"] = "VerbNoun";
+})(graphqlMutationName || (graphqlMutationName = {}));
+var graphQLFieldFormat;
+(function (graphQLFieldFormat) {
+    graphQLFieldFormat["LOWER_CAMEL"] = "lowerCamel";
+    graphQLFieldFormat["SNAKE_CASE"] = "snake_case";
+})(graphQLFieldFormat || (graphQLFieldFormat = {}));
 function setConfig(cfg) {
     if (cfg.log) {
         (0, logger_1.setLogLevels)(cfg.log);

package/core/loaders/assoc_edge_loader.d.ts

@@ -32,7 +32,7 @@ export declare class AssocEdgeLoaderFactory<T extends AssocEdge> implements Load
     name: string;
     constructor(edgeType: string, edgeCtr: AssocEdgeConstructor<T> | (() => AssocEdgeConstructor<T>));
     createLoader(context?: Context): AssocLoader<T>;
-    private isFunction;
+    private isConstructor;
     createConfigurableLoader(options: EdgeQueryableDataOptions, context?: Context): AssocLoader<T>;
 }
 export {};

package/core/loaders/assoc_edge_loader.js

@@ -161,16 +161,17 @@ class AssocEdgeLoaderFactory {
     createLoader(context) {
         return this.createConfigurableLoader({}, context);
     }
-    isFunction(edgeCtr) {
-        // not constructor
-        return !(edgeCtr.prototype && edgeCtr.prototype.constructor === edgeCtr);
+    isConstructor(edgeCtr) {
+        return (edgeCtr.prototype &&
+            edgeCtr.prototype.constructor &&
+            edgeCtr.prototype.constructor.name.length > 0);
     }
     createConfigurableLoader(options, context) {
         let edgeCtr = this.edgeCtr;
         // in generated code, the edge is not necessarily defined at the time of loading
         // so we call this as follows:
         // const loader = new AssocEdgeLoaderFactory(EdgeType.Foo, ()=>DerivedEdgeClass);
-        if (this.isFunction(edgeCtr)) {
+        if (!this.isConstructor(edgeCtr)) {
             edgeCtr = edgeCtr();
         }
         // rename to make TS happy

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.0.35",
+  "version": "0.0.38",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,7 +17,7 @@
     "json5": "^2.1.3",
     "luxon": "^1.25.0",
     "memoizee": "^0.4.15",
-    "minimist": "^1.2.5",
+    "minimist": "^1.2.6",
     "pascal-case": "^3.1.2",
     "pg": "^8.0.3",
     "prettier": "^2.3.2",

package/parse_schema/parse.js

@@ -31,10 +31,29 @@ function processFields(src, patternName) {
         if (patternName) {
             f.patternName = patternName;
         }
+        transformType(field.type);
         ret.push(f);
     }
     return ret;
 }
+function transformImportType(typ) {
+    if (!typ.importType) {
+        return;
+    }
+    typ.importType = {
+        ...typ.importType,
+        // these 2 needed for forwards compatibility with new go schema
+        importPath: typ.importType.path,
+        import: typ.importType.type,
+    };
+}
+function transformType(typ) {
+    if (!typ) {
+        return;
+    }
+    transformImportType(typ);
+    transformType(typ.listElemType);
+}
 function processEdges(src, patternName) {
     const ret = [];
     for (const edge of src) {

package/schema/schema.d.ts

@@ -82,6 +82,7 @@ export declare enum DBType {
 export interface ImportType {
     path: string;
     type: string;
+    [x: string]: any;
 }
 declare type EnumMap = {
     [key: string]: string;
@@ -131,6 +132,7 @@ export interface FieldOptions {
     fieldEdge?: FieldEdge;
     primaryKey?: boolean;
     disableUserEditable?: boolean;
+    disableUserGraphQLEditable?: boolean;
     defaultValueOnCreate?(builder: Builder<Ent>, input: Data): any;
     defaultToViewerOnCreate?: boolean;
     defaultValueOnEdit?(builder: Builder<Ent>, input: Data): any;

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

@@ -16,6 +16,8 @@ interface queryConfig {
     callback?: (res: supertest.Response) => void;
     inlineFragmentRoot?: string;
     customHandlers?: RequestHandler[];
+    server?: any;
+    graphQLPath?: string;
 }
 export interface queryRootConfig extends queryConfig {
     root: string;

package/testutils/ent-graphql-tests/index.js

@@ -56,7 +56,7 @@ function server(config) {
         };
         return doWork();
     }));
-    app.use("/graphql", ...handlers);
+    app.use(config.graphQLPath || "/graphql", ...handlers);
     return app;
 }
 function getInnerType(typ, list) {
@@ -72,14 +72,14 @@ function makeGraphQLRequest(config, query, fieldArgs) {
     let test;
     if (config.test) {
         if (typeof config.test === "function") {
-            test = config.test(server(config));
+            test = config.test(config.server ? config.server : server(config));
         }
         else {
             test = config.test;
         }
     }
     else {
-        test = (0, supertest_1.default)(server(config));
+        test = (0, supertest_1.default)(config.server ? config.server : server(config));
     }
     let files = new Map();
     // handle files
@@ -104,7 +104,9 @@ function makeGraphQLRequest(config, query, fieldArgs) {
         }
     });
     if (files.size) {
-        let ret = test.post("/graphql").set(config.headers || {});
+        let ret = test
+            .post(config.graphQLPath || "/graphql")
+            .set(config.headers || {});
         ret.field("operations", JSON.stringify({
             query: query,
             variables: config.args,
@@ -130,7 +132,7 @@ function makeGraphQLRequest(config, query, fieldArgs) {
         return [
             test,
             test
-                .post("/graphql")
+                .post(config.graphQLPath || "/graphql")
                 .set(config.headers || {})
                 .send({
                 query: query,