@snowtop/ent 0.1.0-alpha95 → 0.1.0-alpha96

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

@@ -35,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) {
@@ -115,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++;
         }
@@ -148,7 +155,7 @@ function makeGraphQLRequest(config, query, fieldArgs) {
                 .set(config.headers || {})
                 .send({
                 query: query,
-                variables: JSON.stringify(config.args),
+                variables: JSON.stringify(variables),
             }),
         ];
     }
@@ -309,13 +316,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}`);
@@ -354,7 +366,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_data/fake_contact.d.ts

@@ -15,6 +15,7 @@ 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/temp_db").Table;
     static loaderOptions(): LoadEntOptions<FakeContact>;

package/testutils/fake_data/fake_contact.js

@@ -11,6 +11,11 @@ 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",

package/testutils/fake_data/fake_event.d.ts

@@ -16,6 +16,7 @@ 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/temp_db").Table;
     static loaderOptions(): LoadEntOptions<FakeEvent>;

package/testutils/fake_data/fake_event.js

@@ -11,6 +11,9 @@ 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",

package/testutils/fake_data/fake_tag.d.ts

@@ -14,6 +14,7 @@ export declare class FakeTag implements Ent {
     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>;
@@ -28,7 +29,7 @@ export interface TagCreateInput {
     createdAt?: Date;
     updatedAt?: Date;
 }
-export declare type TagEditInput = Partial<TagCreateInput>;
+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>;

package/testutils/fake_data/fake_tag.js

@@ -11,6 +11,11 @@ const loaders_1 = require("../../core/loaders");
 const convert_1 = require("../../core/convert");
 const action_1 = require("../../action");
 class FakeTag {
+    getPrivacyPolicy() {
+        return {
+            rules: [new privacy_1.AllowIfViewerIsEntPropertyRule("ownerID"), privacy_1.AlwaysDenyRule],
+        };
+    }
     constructor(viewer, data) {
         this.viewer = viewer;
         this.nodeType = const_1.NodeType.FakeUser;
@@ -22,11 +27,7 @@ class FakeTag {
         this.canonicalName = data.canonical_name;
         this.ownerID = data.owner_id;
     }
-    getPrivacyPolicy() {
-        return {
-            rules: [new privacy_1.AllowIfViewerIsEntPropertyRule("ownerID"), privacy_1.AlwaysDenyRule],
-        };
-    }
+    __setRawDBData(data) { }
     static getFields() {
         return [
             "id",

package/testutils/fake_data/fake_user.d.ts

@@ -25,6 +25,7 @@ export declare class FakeUser implements Ent {
     protected readonly password: string | null;
     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<FakeUser>;
@@ -41,7 +42,7 @@ export interface UserCreateInput {
     createdAt?: Date;
     updatedAt?: Date;
 }
-export declare type UserEditInput = Partial<UserCreateInput>;
+export type UserEditInput = Partial<UserCreateInput>;
 export declare function getUserBuilder(viewer: Viewer, input: UserCreateInput): import("../builder").SimpleBuilder<FakeUser, null>;
 export declare function getUserAction(viewer: Viewer, input: UserCreateInput): SimpleAction<FakeUser, null>;
 export declare function createUser(viewer: Viewer, input: UserCreateInput): Promise<FakeUser>;

package/testutils/fake_data/fake_user.js

@@ -24,19 +24,6 @@ class ViewerWithAccessToken extends viewer_1.IDViewer {
 }
 exports.ViewerWithAccessToken = ViewerWithAccessToken;
 class FakeUser {
-    constructor(viewer, data) {
-        this.viewer = viewer;
-        this.nodeType = const_1.NodeType.FakeUser;
-        this.data = data;
-        this.id = data.id;
-        this.createdAt = (0, convert_1.convertDate)(data.created_at);
-        this.updatedAt = (0, convert_1.convertDate)(data.updated_at);
-        this.firstName = data.first_name;
-        this.lastName = data.last_name;
-        this.emailAddress = data.email_address;
-        this.phoneNumber = data.phone_number;
-        this.password = data.password;
-    }
     getPrivacyPolicy() {
         return {
             rules: [
@@ -61,6 +48,20 @@ class FakeUser {
             ],
         };
     }
+    constructor(viewer, data) {
+        this.viewer = viewer;
+        this.nodeType = const_1.NodeType.FakeUser;
+        this.data = data;
+        this.id = data.id;
+        this.createdAt = (0, convert_1.convertDate)(data.created_at);
+        this.updatedAt = (0, convert_1.convertDate)(data.updated_at);
+        this.firstName = data.first_name;
+        this.lastName = data.last_name;
+        this.emailAddress = data.email_address;
+        this.phoneNumber = data.phone_number;
+        this.password = data.password;
+    }
+    __setRawDBData(data) { }
     static getFields() {
         return [
             "id",

package/tsc/ast.d.ts

@@ -10,7 +10,7 @@ export interface ClassInfo {
     wrapClassContents(inner: string): string;
 }
 export declare function getClassInfo(fileContents: string, sourceFile: ts.SourceFile, node: ts.ClassDeclaration): ClassInfo | undefined;
-declare type transformImportFn = (imp: string) => string;
+type transformImportFn = (imp: string) => string;
 interface transformOpts {
     removeImports?: string[];
     newImports?: string[];