@snowtop/ent 0.1.0-alpha8 → 0.1.0-alpha9

package/graphql/builtins/connection.js

@@ -11,13 +11,13 @@ exports.GraphQLConnectionInterface = new graphql_1.GraphQLInterfaceType({
     description: "connection interface",
     fields: () => ({
         edges: {
-            type: (0, graphql_1.GraphQLNonNull)((0, graphql_1.GraphQLList)((0, graphql_1.GraphQLNonNull)(edge_1.GraphQLEdgeInterface))),
+            type: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(edge_1.GraphQLEdgeInterface))),
         },
         nodes: {
-            type: (0, graphql_1.GraphQLNonNull)((0, graphql_1.GraphQLList)((0, graphql_1.GraphQLNonNull)(node_1.GraphQLNodeInterface))),
+            type: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(node_1.GraphQLNodeInterface))),
         },
         pageInfo: {
-            type: (0, graphql_1.GraphQLNonNull)(page_info_1.GraphQLPageInfo),
+            type: new graphql_1.GraphQLNonNull(page_info_1.GraphQLPageInfo),
         },
     }),
 });

package/graphql/builtins/edge.js

@@ -9,10 +9,10 @@ exports.GraphQLEdgeInterface = new graphql_1.GraphQLInterfaceType({
     description: "edge interface",
     fields: () => ({
         node: {
-            type: (0, graphql_1.GraphQLNonNull)(node_1.GraphQLNodeInterface),
+            type: new graphql_1.GraphQLNonNull(node_1.GraphQLNodeInterface),
         },
         cursor: {
-            type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+            type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
         },
     }),
 });

package/graphql/builtins/node.js

@@ -8,7 +8,7 @@ exports.GraphQLNodeInterface = new graphql_1.GraphQLInterfaceType({
     description: "node interface",
     fields: () => ({
         id: {
-            type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLID),
+            type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLID),
         },
     }),
 });

package/graphql/graphql.js

@@ -79,8 +79,8 @@ const addCustomType = (type) => {
                 description: ct.description,
                 name: ct.name,
             };
-            if (ct.specifiedByUrl) {
-                type.scalarInfo.specifiedByUrl = ct.specifiedByUrl;
+            if (ct.specifiedByURL) {
+                type.scalarInfo.specifiedByUrl = ct.specifiedByURL;
             }
         }
     }

package/graphql/query/connection_type.js

@@ -15,10 +15,10 @@ class GraphQLEdgeType extends graphql_1.GraphQLObjectType {
             name: `${name}Edge`,
             fields: () => ({
                 node: {
-                    type: (0, graphql_1.GraphQLNonNull)(nodeType),
+                    type: new graphql_1.GraphQLNonNull(nodeType),
                 },
                 cursor: {
-                    type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+                    type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
                 },
                 ...optional,
             }),
@@ -34,25 +34,25 @@ class GraphQLConnectionType extends graphql_1.GraphQLObjectType {
             name: `${name}Connection`,
             fields: () => ({
                 edges: {
-                    type: (0, graphql_1.GraphQLNonNull)((0, graphql_1.GraphQLList)((0, graphql_1.GraphQLNonNull)(edgeType))),
+                    type: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(edgeType))),
                     resolve: (source) => {
                         return source.queryEdges();
                     },
                 },
                 nodes: {
-                    type: (0, graphql_1.GraphQLNonNull)((0, graphql_1.GraphQLList)((0, graphql_1.GraphQLNonNull)(nodeType))),
+                    type: new graphql_1.GraphQLNonNull(new graphql_1.GraphQLList(new graphql_1.GraphQLNonNull(nodeType))),
                     resolve: (source) => {
                         return source.queryNodes();
                     },
                 },
                 pageInfo: {
-                    type: (0, graphql_1.GraphQLNonNull)(page_info_1.GraphQLPageInfo),
+                    type: new graphql_1.GraphQLNonNull(page_info_1.GraphQLPageInfo),
                     resolve: (source) => {
                         return source.queryPageInfo();
                     },
                 },
                 rawCount: {
-                    type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLInt),
+                    type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLInt),
                     resolve: (source) => {
                         return source.queryTotalCount();
                     },

package/graphql/query/page_info.js

@@ -7,22 +7,22 @@ exports.GraphQLPageInfo = new graphql_1.GraphQLObjectType({
     name: "PageInfo",
     fields: () => ({
         hasNextPage: {
-            type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLBoolean),
+            type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLBoolean),
             resolve: (source) => {
                 return source.hasNextPage || false;
             },
         },
         hasPreviousPage: {
-            type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLBoolean),
+            type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLBoolean),
             resolve: (source) => {
                 return source.hasPreviousPage || false;
             },
         },
         startCursor: {
-            type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+            type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
         },
         endCursor: {
-            type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLString),
+            type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLString),
         },
     }),
 });

package/graphql/query/shared_assoc_test.js

@@ -110,7 +110,7 @@ function sharedAssocTests() {
             name: "User",
             fields: {
                 id: {
-                    type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLID),
+                    type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLID),
                 },
                 firstName: {
                     type: graphql_1.GraphQLString,
@@ -128,7 +128,7 @@ function sharedAssocTests() {
             name: "Event",
             fields: {
                 id: {
-                    type: (0, graphql_1.GraphQLNonNull)(graphql_1.GraphQLID),
+                    type: new graphql_1.GraphQLNonNull(graphql_1.GraphQLID),
                 },
             },
             interfaces: [node_1.GraphQLNodeInterface],

package/graphql/scalars/time.d.ts

@@ -1,2 +1,2 @@
 import { GraphQLScalarType } from "graphql";
-export declare const GraphQLTime: GraphQLScalarType;
+export declare const GraphQLTime: GraphQLScalarType<Date, string>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.0-alpha8",
+  "version": "0.1.0-alpha9",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",
@@ -31,7 +31,7 @@
   },
   "peerDependencies": {
     "better-sqlite3": "^7.4.1",
-    "graphql": "^15.5"
+    "graphql": "^16.5.0"
   },
   "peerDependenciesMeta": {
     "better-sqlite3": {

package/parse_schema/parse.d.ts

@@ -23,6 +23,7 @@ declare type ProcessedSchema = Omit<Schema, "edges" | "actions" | "edgeGroups" |
     assocEdges: ProcessedAssocEdge[];
     assocEdgeGroups: ProcessedAssocEdgeGroup[];
     fields: ProcessedField[];
+    schemaPath?: string;
 };
 declare type ProcessedAssocEdgeGroup = Omit<AssocEdgeGroup, "edgeAction"> & {
     edgeAction?: OutputAction;
@@ -59,5 +60,8 @@ interface Result {
     schemas: schemasDict;
     patterns: patternsDict;
 }
-export declare function parseSchema(potentialSchemas: {}): Result;
+declare type PotentialSchemas = {
+    [key: string]: any;
+};
+export declare function parseSchema(potentialSchemas: PotentialSchemas): Result;
 export {};

package/parse_schema/parse.js

@@ -189,6 +189,7 @@ function parseSchema(potentialSchemas) {
         }
         let processedSchema = {
             fields: [],
+            schemaPath: schema.schemaPath,
             tableName: schema.tableName,
             enumTable: schema.enumTable,
             dbRows: schema.dbRows,

package/schema/base_schema.d.ts

@@ -20,7 +20,7 @@ export declare class EntSchema implements Schema {
     hideFromGraphQL?: boolean;
     constructor(cfg: SchemaConfig);
 }
-export declare class EntSchemaWithTZ {
+export declare class EntSchemaWithTZ implements Schema {
     fields: FieldMap | Field[];
     tableName: string | undefined;
     patterns: Pattern[];

package/scripts/read_schema.js

@@ -44,7 +44,21 @@ function main() {
         if (!match) {
             throw new Error(`non-typescript file ${p} returned by glob`);
         }
-        potentialSchemas[(0, pascal_case_1.pascalCase)(match[1])] = require(p).default;
+        let schema = match[1];
+        // convert foo_schema.ts -> foo
+        if (schema.endsWith("_schema")) {
+            schema = schema.slice(0, -7);
+        }
+        let relativePath;
+        const index = p.indexOf("src/schema");
+        if (index !== -1) {
+            relativePath = p.substring(index);
+        }
+        const s = require(p).default;
+        if (relativePath !== undefined) {
+            s.schemaPath = relativePath;
+        }
+        potentialSchemas[(0, pascal_case_1.pascalCase)(schema)] = s;
     }
     //  console.log(potentialSchemas);
     const result = (0, parse_1.parseSchema)(potentialSchemas);

package/scripts/transform_schema.js

@@ -27,6 +27,7 @@ const typescript_1 = __importDefault(require("typescript"));
 const fs = __importStar(require("fs"));
 const compilerOptions_1 = require("../tsc/compilerOptions");
 const child_process_1 = require("child_process");
+const path_1 = __importDefault(require("path"));
 function getTarget(target) {
     switch (target.toLowerCase()) {
         case "es2015":
@@ -62,12 +63,15 @@ async function main() {
             getTarget(options.target)
         : typescript_1.default.ScriptTarget.ESNext;
     // filter to only event.ts e.g. for comments and whitespace...
-    // files = files.filter((f) => f.endsWith("user.ts"));
+    //  files = files.filter((f) => f.endsWith("event.ts"));
     files.forEach((file) => {
         // assume valid file since we do glob above
         //    const idx = file.lastIndexOf(".ts");
         //    const writeFile = file.substring(0, idx) + "2" + ".ts";
-        const writeFile = file;
+        //    console.debug(file);
+        const writeFile = "src/schema/" + path_1.default.basename(file).slice(0, -3) + "_schema.ts";
+        // const writeFile = file;
+        //    console.debug(file, writeFile);
         let contents = fs.readFileSync(file).toString();
         // go through the file and print everything back if not starting immediately after other position
         const sourceFile = typescript_1.default.createSourceFile(file, contents, target, false, typescript_1.default.ScriptKind.TS);
@@ -115,6 +119,7 @@ async function main() {
         //    console.debug(newContents);
         // ideally there's a flag that indicates if we write
         fs.writeFileSync(writeFile, newContents);
+        fs.rmSync(file);
     });
     (0, child_process_1.execSync)("prettier src/schema/*.ts --write");
 }
@@ -173,7 +178,10 @@ function transformSchema(str) {
     return str;
 }
 function getClassInfo(fileContents, sourceFile, node) {
-    const className = node.name?.text;
+    let className = node.name?.text;
+    if (!className?.endsWith("Schema")) {
+        className += "Schema";
+    }
     let classExtends;
     let implementsSchema = false;
     if (node.heritageClauses) {
@@ -429,7 +437,7 @@ function transformImport(importNode, sourceFile, removeImports) {
         importText.substring(end) +
         ' from "' +
         text +
-        '"');
+        '";');
 }
 function getPreText(fileContents, node, sourceFile) {
     return fileContents.substring(node.getFullStart(), node.getStart(sourceFile));

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

@@ -26,7 +26,7 @@ exports.expectMutation = exports.expectQueryFromRoot = void 0;
 // NB: this is copied from ent-graphql-tests package until I have time to figure out how to share code here effectively
 // the circular dependencies btw this package and ent-graphql-tests seems to imply something needs to change
 const express_1 = __importDefault(require("express"));
-const express_graphql_1 = require("express-graphql");
+const graphql_helix_1 = require("graphql-helix");
 const graphql_1 = require("graphql");
 const auth_1 = require("../../auth");
 const supertest_1 = __importDefault(require("supertest"));
@@ -45,17 +45,22 @@ function server(config) {
     if (config.init) {
         config.init(app);
     }
+    app.use(express_1.default.json());
     let handlers = config.customHandlers || [];
-    handlers.push((0, express_graphql_1.graphqlHTTP)((request, response) => {
-        const doWork = async () => {
-            let context = await (0, auth_1.buildContext)(request, response);
-            return {
-                schema: config.schema,
-                context,
-            };
-        };
-        return doWork();
-    }));
+    handlers.push(async (req, res) => {
+        const { operationName, query, variables } = (0, graphql_helix_1.getGraphQLParameters)(req);
+        const result = await (0, graphql_helix_1.processRequest)({
+            operationName,
+            query,
+            variables,
+            request: req,
+            schema: config.schema,
+            contextFactory: async (executionContext) => {
+                return (0, auth_1.buildContext)(req, res);
+            },
+        });
+        await (0, graphql_helix_1.sendResult)(result, res);
+    });
     app.use(config.graphQLPath || "/graphql", ...handlers);
     return app;
 }
@@ -355,7 +360,9 @@ async function expectFromRoot(config, ...options) {
     else {
         expect(res.ok, `expected ok response. instead got ${res.status} and result ${JSON.stringify(res.body)}`);
     }
-    if (!res.ok) {
+    // res.ok = true in graphql-helix when there's errors...
+    // res.ok = false in express-graphql when there's errors...
+    if (!res.ok || (res.body.errors && res.body.errors.length > 0)) {
         let errors = res.body.errors;
         expect(errors.length).toBeGreaterThan(0);
         if (config.expectedError) {