@snowtop/ent 0.1.0-alpha13 → 0.1.0-alpha131

package/testutils/db_mock.js

@@ -29,7 +29,11 @@ var queryType;
     queryType[queryType["BEGIN"] = 3] = "BEGIN";
     queryType[queryType["COMMIT"] = 4] = "COMMIT";
     queryType[queryType["ROLLBACK"] = 5] = "ROLLBACK";
+    queryType[queryType["DELETE"] = 6] = "DELETE";
 })(queryType = exports.queryType || (exports.queryType = {}));
+/**
+ * @deprecated
+ */
 class QueryRecorder {
     // TODO kill use AST or just throw away
     static getQueryStructure(query) {
@@ -76,6 +80,36 @@ class QueryRecorder {
                 };
             }
         }
+        if (/^DELETE/.test(query)) {
+            // regex can't do returning
+            let execArray = /^DELETE FROM (.+) WHERE (.+) /.exec(query);
+            if (execArray) {
+                return {
+                    tableName: execArray[1],
+                    whereClause: execArray[2],
+                    type: queryType.DELETE,
+                    query: execArray[0],
+                };
+            }
+        }
+        if (/^BEGIN/.test(query)) {
+            return {
+                type: queryType.BEGIN,
+                query: query,
+            };
+        }
+        if (/^COMMIT/.test(query)) {
+            return {
+                type: queryType.COMMIT,
+                query: query,
+            };
+        }
+        if (/^ROLLBACK/.test(query)) {
+            return {
+                type: queryType.ROLLBACK,
+                query: query,
+            };
+        }
         return null;
     }
     static recordQuery(query, values) {
@@ -131,7 +165,12 @@ class QueryRecorder {
     static getCurrentQueries() {
         return QueryRecorder.queries;
     }
-    static validateQueryStructuresFromLogs(ml, expected, skipSelect) {
+    /**
+     * @deprecated will keep this since it's just using ml.logs
+     * which we still want around (I think) but we should eventually
+     * probably stop using this
+     */
+    static validateQueryStructuresFromLogs(ml, expected, opts) {
         const queries = ml.logs.map((log) => {
             const qs = QueryRecorder.getQueryStructure(log.query);
             if (!qs) {
@@ -142,12 +181,16 @@ class QueryRecorder {
                 qs,
             };
         });
-        QueryRecorder.validateQuryStructuresImpl(expected, queries, skipSelect);
+        QueryRecorder.validateQueryStructuresImpl(expected, queries, opts);
     }
-    static validateQuryStructuresImpl(expected, queries, skipSelect) {
-        if (skipSelect) {
+    static validateQueryStructuresImpl(expected, queries, opts) {
+        if (opts?.skipSelect) {
             queries = queries.filter((query) => query.qs?.type !== queryType.SELECT);
         }
+        if (!opts?.flagBeginCommit) {
+            queries = queries.filter((query) => query.qs?.type !== queryType.BEGIN &&
+                query.qs?.type !== queryType.COMMIT);
+        }
         //    console.log(queries, expected);
         expect(queries.length).toBe(expected.length);
         for (let i = 0; i < expected.length; i++) {
@@ -167,7 +210,7 @@ class QueryRecorder {
                     expect(query.values).toBe(undefined);
                     break;
                 case queryType.SELECT:
-                    if (!skipSelect) {
+                    if (!opts?.skipSelect) {
                         console.error("validating select query structure not supported yet");
                     }
                     // TODO INSERT and UPDATE tests here...
@@ -185,7 +228,9 @@ class QueryRecorder {
         }
     }
     static mockPool(pool) {
-        const mockedPool = (0, jest_mock_1.mocked)(pool, true);
+        const mockedPool = (0, jest_mock_1.mocked)(pool);
+        // @ts-ignore
+        // TODO what changed in mockImplementation?
         mockedPool.mockImplementation(() => {
             return {
                 totalCount: 1,
@@ -218,10 +263,10 @@ class QueryRecorder {
         });
     }
 }
-exports.QueryRecorder = QueryRecorder;
 QueryRecorder.queries = [];
 QueryRecorder.ids = [];
 // we need pkeys when storing...
 QueryRecorder.data = new Map();
+exports.QueryRecorder = QueryRecorder;
 // TODO
 process.env.DB_CONNECTION_STRING = "INVALID DATABASE";

package/testutils/db_time_zone.d.ts

@@ -0,0 +1,4 @@
+export declare class DBTimeZone {
+    private static getVal;
+    static getDateOffset(d: Date): Promise<string>;
+}

package/testutils/db_time_zone.js

@@ -0,0 +1,41 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DBTimeZone = void 0;
+const luxon_1 = require("luxon");
+const schema_1 = require("../schema");
+const db_1 = __importDefault(require("../core/db"));
+let dbCurrentZone = undefined;
+class DBTimeZone {
+    static async getVal() {
+        if (dbCurrentZone !== undefined) {
+            return dbCurrentZone;
+        }
+        const r = await db_1.default.getInstance()
+            .getPool()
+            .query("SELECT current_setting('TIMEZONE');");
+        if (r.rows.length) {
+            dbCurrentZone = r.rows[0].current_setting;
+        }
+        else {
+            dbCurrentZone = null;
+        }
+        return dbCurrentZone;
+    }
+    static async getDateOffset(d) {
+        let zone = await DBTimeZone.getVal();
+        let dt = luxon_1.DateTime.fromJSDate(d);
+        if (zone) {
+            dt = dt.setZone(zone);
+        }
+        // use
+        const val = (0, schema_1.leftPad)(dt.get("offset") / 60);
+        if (val == "00") {
+            return "+00";
+        }
+        return val;
+    }
+}
+exports.DBTimeZone = DBTimeZone;

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

@@ -2,7 +2,7 @@ import { Express, RequestHandler } from "express";
 import { Viewer } from "../../core/base";
 import { GraphQLSchema } from "graphql";
 import supertest from "supertest";
-export declare type Option = [string, any];
+export type Option = [string, any];
 interface queryConfig {
     viewer?: Viewer;
     init?: (app: Express) => void;
@@ -11,6 +11,12 @@ interface queryConfig {
     headers?: object;
     debugMode?: boolean;
     args: {};
+    extraVariables?: {
+        [key: string]: {
+            graphqlType: string;
+            value: string;
+        };
+    };
     expectedStatus?: number;
     expectedError?: string | RegExp;
     callback?: (res: supertest.Response) => void;

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

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -31,6 +35,7 @@ const graphql_1 = require("graphql");
 const auth_1 = require("../../auth");
 const supertest_1 = __importDefault(require("supertest"));
 const fs = __importStar(require("fs"));
+const util_1 = require("util");
 function server(config) {
     const viewer = config.viewer;
     if (viewer) {
@@ -45,6 +50,7 @@ function server(config) {
     if (config.init) {
         config.init(app);
     }
+    // @ts-ignore something changed. come back
     app.use(express_1.default.json());
     let handlers = config.customHandlers || [];
     handlers.push(async (req, res) => {
@@ -56,9 +62,11 @@ function server(config) {
             request: req,
             schema: config.schema,
             contextFactory: async (executionContext) => {
+                // @ts-ignore something changed. come back
                 return (0, auth_1.buildContext)(req, res);
             },
         });
+        // @ts-ignore something changed. come back
         await (0, graphql_helix_1.sendResult)(result, res);
     });
     app.use(config.graphQLPath || "/graphql", ...handlers);
@@ -108,17 +116,23 @@ function makeGraphQLRequest(config, query, fieldArgs) {
             }
         }
     });
+    let variables = {
+        ...config.args,
+    };
+    for (const k in config.extraVariables) {
+        variables[k] = config.extraVariables[k].value;
+    }
     if (files.size) {
         let ret = test
             .post(config.graphQLPath || "/graphql")
             .set(config.headers || {});
         ret.field("operations", JSON.stringify({
             query: query,
-            variables: config.args,
+            variables: variables,
         }));
         let m = {};
         let idx = 0;
-        for (const [key, val] of files) {
+        for (const [key] of files) {
             m[idx] = [`variables.${key}`];
             idx++;
         }
@@ -141,15 +155,16 @@ function makeGraphQLRequest(config, query, fieldArgs) {
                 .set(config.headers || {})
                 .send({
                 query: query,
-                variables: JSON.stringify(config.args),
+                variables: JSON.stringify(variables),
             }),
         ];
     }
 }
 function buildTreeFromQueryPaths(schema, fieldType, ...options) {
     let fields;
-    if (fieldType instanceof graphql_1.GraphQLObjectType) {
-        fields = fieldType.getFields();
+    const [typ] = getInnerType(fieldType, false);
+    if (typ instanceof graphql_1.GraphQLObjectType) {
+        fields = typ.getFields();
     }
     let topLevelTree = {};
     options.forEach((option) => {
@@ -157,7 +172,7 @@ function buildTreeFromQueryPaths(schema, fieldType, ...options) {
         let parts = [];
         let match = fragmentRegex.exec(path);
         if (match) {
-            // fragment, keep the part of the fragment e.g.  ...onUser, and then split the rest....
+            // fragment, keep the part of the fragment e.g. `...on User`, and then split the rest....
             parts = [match[0], ...match[2].split(".")];
             const typ = schema.getType(match[1]);
             if (!typ) {
@@ -187,10 +202,11 @@ function buildTreeFromQueryPaths(schema, fieldType, ...options) {
             }
             // TODO this needs to be aware of paths etc so this part works for complicated
             // cases but inlineFragmentRoot is a workaround for now.
-            function handleSubtree(obj, tree) {
+            function handleSubtree(obj, tree, parts) {
+                let parts2 = [...parts];
                 if (Array.isArray(obj)) {
                     for (const obj2 of obj) {
-                        handleSubtree(obj2, tree);
+                        handleSubtree(obj2, tree, parts2);
                     }
                     return;
                 }
@@ -199,28 +215,36 @@ function buildTreeFromQueryPaths(schema, fieldType, ...options) {
                         tree[key] = {};
                     }
                     if (typeof obj[key] === "object") {
-                        if (!isScalarField(key)) {
-                            handleSubtree(obj[key], tree[key]);
+                        let parts2 = [...parts, key];
+                        if (!scalarFieldAtLeaf(parts2)) {
+                            handleSubtree(obj[key], tree[key], parts2);
                         }
                     }
                 }
             }
-            // TODO this needs to work for super complicated objects and have fields update as nesting applies...
-            function isScalarField(f) {
-                const subField = fields?.[f];
-                if (!subField) {
+            function scalarFieldAtLeaf(pathFromRoot) {
+                let root = fields;
+                if (!root) {
                     return false;
                 }
-                if (!(0, graphql_1.isWrappingType)(subField.type)) {
+                let subField;
+                for (const p of pathFromRoot) {
+                    subField = root?.[p];
+                    if (subField) {
+                        [subField] = getInnerType(subField.type, false);
+                        if (subField instanceof graphql_1.GraphQLObjectType) {
+                            root = subField.getFields();
+                        }
+                    }
+                }
+                if (!subField) {
                     return false;
                 }
-                // only spread out if an object
-                const [typ, _] = getInnerType(subField.type, true);
-                return (0, graphql_1.isScalarType)(typ);
+                return (0, graphql_1.isScalarType)(subField) || (0, graphql_1.isEnumType)(subField);
             }
             if (i === parts.length - 1 && typeof option[1] === "object") {
-                if (!isScalarField(part)) {
-                    handleSubtree(option[1], tree);
+                if (!scalarFieldAtLeaf(parts)) {
+                    handleSubtree(option[1], tree, parts);
                 }
             }
         }
@@ -302,13 +326,18 @@ async function expectFromRoot(config, ...options) {
     let fieldArgs = field.args;
     let queryParams = [];
     fieldArgs.forEach((fieldArg) => {
-        let arg = config.args[fieldArg.name];
+        const arg = config.args[fieldArg.name];
         // let the graphql runtime handle this (it may be optional for example)
         if (arg === undefined) {
             return;
         }
         queryParams.push(`$${fieldArg.name}: ${fieldArg.type}`);
     });
+    // add extra variables in queryArgs...
+    for (const key in config.extraVariables) {
+        const v = config.extraVariables[key];
+        queryParams.push(`$${key}: ${v.graphqlType}`);
+    }
     let params = [];
     for (let key in config.args) {
         params.push(`${key}: $${key}`);
@@ -347,7 +376,7 @@ async function expectFromRoot(config, ...options) {
     let [st, temp] = makeGraphQLRequest(config, q, fieldArgs);
     const res = await temp.expect("Content-Type", /json/);
     if (config.debugMode) {
-        console.log(res.body);
+        console.log((0, util_1.inspect)(res.body, false, 3));
     }
     // if there's a callback, let everything be done there and we're done
     if (config.callback) {

package/testutils/fake_comms.js

@@ -32,5 +32,5 @@ class FakeComms {
         this.sent = [];
     }
 }
-exports.FakeComms = FakeComms;
 FakeComms.sent = [];
+exports.FakeComms = FakeComms;

package/testutils/fake_data/const.d.ts

@@ -18,7 +18,8 @@ export declare enum EdgeType {
 export declare enum NodeType {
     FakeUser = "user",
     FakeContact = "contact",
-    FakeEvent = "event"
+    FakeEvent = "event",
+    FakeTag = "tag"
 }
 export declare const SymmetricEdges: Set<string>;
 export declare const InverseEdges: Map<EdgeType, EdgeType>;

package/testutils/fake_data/const.js

@@ -27,6 +27,7 @@ var NodeType;
     NodeType["FakeUser"] = "user";
     NodeType["FakeContact"] = "contact";
     NodeType["FakeEvent"] = "event";
+    NodeType["FakeTag"] = "tag";
 })(NodeType = exports.NodeType || (exports.NodeType = {}));
 exports.SymmetricEdges = new Set();
 exports.SymmetricEdges.add(EdgeType.UserToFriends);
@@ -48,6 +49,8 @@ function getLoaderOptions(type) {
             return internal_1.FakeUser.loaderOptions();
         case NodeType.FakeEvent:
             return internal_1.FakeEvent.loaderOptions();
+        case NodeType.FakeTag:
+            return internal_1.FakeTag.loaderOptions();
     }
 }
 exports.getLoaderOptions = getLoaderOptions;

package/testutils/fake_data/fake_contact.d.ts

@@ -1,4 +1,4 @@
-import { ID, Ent, Viewer, Data, LoadEntOptions, PrivacyPolicy } from "../../core/base";
+import { ID, Ent, Viewer, Data, LoadEntOptions, PrivacyPolicy, Context } from "../../core/base";
 import { SimpleBuilder } from "../builder";
 import { NodeType } from "./const";
 import { ObjectLoaderFactory } from "../../core/loaders";
@@ -15,11 +15,13 @@ export declare class FakeContact implements Ent {
     readonly userID: ID;
     getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
+    __setRawDBData(data: Data): void;
     static getFields(): string[];
-    static getTestTable(): import("../db/test_db").Table;
+    static getTestTable(): import("../db/temp_db").Table;
     static loaderOptions(): LoadEntOptions<FakeContact>;
     static load(v: Viewer, id: ID): Promise<FakeContact | null>;
     static loadX(v: Viewer, id: ID): Promise<FakeContact>;
+    static loadRawData(id: ID, context?: Context): Promise<Data | null>;
 }
 export declare const FakeContactSchema: import("../builder").BuilderSchema<FakeContact>;
 export interface ContactCreateInput {
@@ -27,7 +29,9 @@ export interface ContactCreateInput {
     lastName: string;
     emailAddress: string;
     userID: ID;
+    createdAt?: Date;
+    updatedAt?: Date;
 }
 export declare function getContactBuilder(viewer: Viewer, input: ContactCreateInput): SimpleBuilder<FakeContact, null>;
 export declare function createContact(viewer: Viewer, input: ContactCreateInput): Promise<void>;
-export declare const contactLoader: ObjectLoaderFactory<unknown>;
+export declare const contactLoader: ObjectLoaderFactory<Data>;

package/testutils/fake_data/fake_contact.js

@@ -6,11 +6,16 @@ const privacy_1 = require("../../core/privacy");
 const builder_1 = require("../builder");
 const schema_1 = require("../../schema");
 const const_1 = require("./const");
-const test_db_1 = require("../db/test_db");
+const temp_db_1 = require("../db/temp_db");
 const loaders_1 = require("../../core/loaders");
 const convert_1 = require("../../core/convert");
 const action_1 = require("../../action");
 class FakeContact {
+    getPrivacyPolicy() {
+        return {
+            rules: [new privacy_1.AllowIfViewerIsRule("userID"), privacy_1.AlwaysDenyRule],
+        };
+    }
     constructor(viewer, data) {
         this.viewer = viewer;
         this.nodeType = const_1.NodeType.FakeContact;
@@ -23,11 +28,7 @@ class FakeContact {
         this.emailAddress = data.email_address;
         this.userID = data.user_id;
     }
-    getPrivacyPolicy() {
-        return {
-            rules: [new privacy_1.AllowIfViewerIsRule("userID"), privacy_1.AlwaysDenyRule],
-        };
-    }
+    __setRawDBData(data) { }
     static getFields() {
         return [
             "id",
@@ -40,7 +41,7 @@ class FakeContact {
         ];
     }
     static getTestTable() {
-        return (0, test_db_1.table)("fake_contacts", (0, test_db_1.uuid)("id", { primaryKey: true }), (0, test_db_1.timestamptz)("created_at"), (0, test_db_1.timestamptz)("updated_at"), (0, test_db_1.text)("first_name"), (0, test_db_1.text)("last_name"), (0, test_db_1.text)("email_address"), (0, test_db_1.uuid)("user_id"));
+        return (0, temp_db_1.table)("fake_contacts", (0, temp_db_1.uuid)("id", { primaryKey: true }), (0, temp_db_1.timestamptz)("created_at"), (0, temp_db_1.timestamptz)("updated_at"), (0, temp_db_1.text)("first_name"), (0, temp_db_1.text)("last_name"), (0, temp_db_1.text)("email_address"), (0, temp_db_1.uuid)("user_id"));
     }
     static loaderOptions() {
         return {
@@ -60,6 +61,11 @@ class FakeContact {
     static async loadX(v, id) {
         return (0, ent_1.loadEntX)(v, id, FakeContact.loaderOptions());
     }
+    static async loadRawData(id, context) {
+        return FakeContact.loaderOptions()
+            .loaderFactory.createLoader(context)
+            .load(id);
+    }
 }
 exports.FakeContact = FakeContact;
 exports.FakeContactSchema = (0, builder_1.getBuilderSchemaFromFields)({

package/testutils/fake_data/fake_event.d.ts

@@ -16,14 +16,17 @@ export declare class FakeEvent implements Ent {
     readonly userID: ID;
     getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
+    __setRawDBData(data: Data): void;
     private static getFields;
-    static getTestTable(): import("../db/test_db").Table;
+    static getTestTable(): import("../db/temp_db").Table;
     static loaderOptions(): LoadEntOptions<FakeEvent>;
     static load(v: Viewer, id: ID): Promise<FakeEvent | null>;
     static loadX(v: Viewer, id: ID): Promise<FakeEvent>;
 }
 export declare const FakeEventSchema: import("../builder").BuilderSchema<FakeEvent>;
 export interface EventCreateInput {
+    createdAt?: Date;
+    updatedAt?: Date;
     startTime: Date;
     endTime?: Date | null;
     location: string;

package/testutils/fake_data/fake_event.js

@@ -6,11 +6,14 @@ const privacy_1 = require("../../core/privacy");
 const builder_1 = require("../builder");
 const schema_1 = require("../../schema");
 const const_1 = require("./const");
-const test_db_1 = require("../db/test_db");
+const temp_db_1 = require("../db/temp_db");
 const loaders_1 = require("../../core/loaders");
 const convert_1 = require("../../core/convert");
 const action_1 = require("../../action");
 class FakeEvent {
+    getPrivacyPolicy() {
+        return privacy_1.AlwaysAllowPrivacyPolicy;
+    }
     constructor(viewer, data) {
         this.viewer = viewer;
         this.nodeType = const_1.NodeType.FakeEvent;
@@ -25,9 +28,7 @@ class FakeEvent {
         this.description = data.description;
         this.userID = data.user_id;
     }
-    getPrivacyPolicy() {
-        return privacy_1.AlwaysAllowPrivacyPolicy;
-    }
+    __setRawDBData(data) { }
     static getFields() {
         return [
             "id",
@@ -42,9 +43,9 @@ class FakeEvent {
         ];
     }
     static getTestTable() {
-        return (0, test_db_1.table)("fake_events", (0, test_db_1.uuid)("id", { primaryKey: true }), (0, test_db_1.timestamptz)("created_at"), (0, test_db_1.timestamptz)("updated_at"), 
+        return (0, temp_db_1.table)("fake_events", (0, temp_db_1.uuid)("id", { primaryKey: true }), (0, temp_db_1.timestamptz)("created_at"), (0, temp_db_1.timestamptz)("updated_at"), 
         // TODO index:true
-        (0, test_db_1.timestamptz)("start_time"), (0, test_db_1.timestamptz)("end_time", { nullable: true }), (0, test_db_1.text)("location"), (0, test_db_1.text)("title"), (0, test_db_1.text)("description", { nullable: true }), (0, test_db_1.uuid)("user_id"));
+        (0, temp_db_1.timestamptz)("start_time"), (0, temp_db_1.timestamptz)("end_time", { nullable: true }), (0, temp_db_1.text)("location"), (0, temp_db_1.text)("title"), (0, temp_db_1.text)("description", { nullable: true }), (0, temp_db_1.uuid)("user_id"));
     }
     static loaderOptions() {
         return {

package/testutils/fake_data/fake_tag.d.ts

@@ -0,0 +1,36 @@
+import { ID, Ent, Viewer, Data, LoadEntOptions, PrivacyPolicy } from "../../core/base";
+import { SimpleAction } from "../builder";
+import { NodeType } from "./const";
+import { ObjectLoaderFactory } from "../../core/loaders";
+export declare class FakeTag implements Ent {
+    viewer: Viewer;
+    readonly id: ID;
+    readonly data: Data;
+    readonly nodeType = NodeType.FakeUser;
+    readonly createdAt: Date;
+    readonly updatedAt: Date;
+    readonly displayName: string;
+    readonly canonicalName: string;
+    readonly ownerID: string;
+    getPrivacyPolicy(): PrivacyPolicy<this>;
+    constructor(viewer: Viewer, data: Data);
+    __setRawDBData(data: Data): void;
+    static getFields(): string[];
+    static getTestTable(): import("../db/temp_db").Table;
+    static loaderOptions(): LoadEntOptions<FakeTag>;
+    static load(v: Viewer, id: ID): Promise<FakeTag | null>;
+    static loadX(v: Viewer, id: ID): Promise<FakeTag>;
+}
+export declare const FakeTagSchema: import("../builder").BuilderSchema<FakeTag>;
+export interface TagCreateInput {
+    displayName: string;
+    canonicalName: string;
+    ownerID: ID;
+    createdAt?: Date;
+    updatedAt?: Date;
+}
+export type TagEditInput = Partial<TagCreateInput>;
+export declare function getTagBuilder(viewer: Viewer, input: TagCreateInput): import("../builder").SimpleBuilder<FakeTag, null>;
+export declare function getTagAction(viewer: Viewer, input: TagCreateInput): SimpleAction<FakeTag, null>;
+export declare function createTag(viewer: Viewer, input: TagCreateInput): Promise<FakeTag>;
+export declare const tagLoader: ObjectLoaderFactory<Data>;