@snowtop/ent 0.1.0-alpha3 → 0.1.0-alpha30

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,18 +45,23 @@ 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();
-    }));
-    app.use("/graphql", ...handlers);
+    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;
 }
 function getInnerType(typ, list) {
@@ -72,14 +77,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 +109,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 +137,7 @@ function makeGraphQLRequest(config, query, fieldArgs) {
         return [
             test,
             test
-                .post("/graphql")
+                .post(config.graphQLPath || "/graphql")
                 .set(config.headers || {})
                 .send({
                 query: query,
@@ -353,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) {

package/testutils/fake_data/fake_contact.d.ts

@@ -1,6 +1,5 @@
 import { ID, Ent, Viewer, Data, LoadEntOptions, PrivacyPolicy } from "../../core/base";
-import { BuilderSchema, SimpleBuilder } from "../builder";
-import { BaseEntSchema, FieldMap } from "../../schema";
+import { SimpleBuilder } from "../builder";
 import { NodeType } from "./const";
 import { ObjectLoaderFactory } from "../../core/loaders";
 export declare class FakeContact implements Ent {
@@ -14,7 +13,7 @@ export declare class FakeContact implements Ent {
     readonly lastName: string;
     readonly emailAddress: string;
     readonly userID: ID;
-    privacyPolicy: PrivacyPolicy;
+    getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
     static getFields(): string[];
     static getTestTable(): import("../db/test_db").Table;
@@ -22,16 +21,13 @@ export declare class FakeContact implements Ent {
     static load(v: Viewer, id: ID): Promise<FakeContact | null>;
     static loadX(v: Viewer, id: ID): Promise<FakeContact>;
 }
-export declare class FakeContactSchema extends BaseEntSchema implements BuilderSchema<FakeContact> {
-    ent: typeof FakeContact;
-    fields: FieldMap;
-}
+export declare const FakeContactSchema: import("../builder").BuilderSchema<FakeContact>;
 export interface ContactCreateInput {
     firstName: string;
     lastName: string;
     emailAddress: string;
     userID: ID;
 }
-export declare function getContactBuilder(viewer: Viewer, input: ContactCreateInput): SimpleBuilder<FakeContact>;
+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>;

package/testutils/fake_data/fake_contact.js

@@ -9,13 +9,11 @@ const const_1 = require("./const");
 const test_db_1 = require("../db/test_db");
 const loaders_1 = require("../../core/loaders");
 const convert_1 = require("../../core/convert");
+const action_1 = require("../../action");
 class FakeContact {
     constructor(viewer, data) {
         this.viewer = viewer;
         this.nodeType = const_1.NodeType.FakeContact;
-        this.privacyPolicy = {
-            rules: [new privacy_1.AllowIfViewerIsRule("userID"), privacy_1.AlwaysDenyRule],
-        };
         this.data = data;
         this.id = data.id;
         this.createdAt = (0, convert_1.convertDate)(data.created_at);
@@ -25,6 +23,11 @@ class FakeContact {
         this.emailAddress = data.email_address;
         this.userID = data.user_id;
     }
+    getPrivacyPolicy() {
+        return {
+            rules: [new privacy_1.AllowIfViewerIsRule("userID"), privacy_1.AlwaysDenyRule],
+        };
+    }
     static getFields() {
         return [
             "id",
@@ -59,21 +62,14 @@ class FakeContact {
     }
 }
 exports.FakeContact = FakeContact;
-class FakeContactSchema extends schema_1.BaseEntSchema {
-    constructor() {
-        super(...arguments);
-        this.ent = FakeContact;
-        this.fields = {
-            firstName: (0, schema_1.StringType)(),
-            lastName: (0, schema_1.StringType)(),
-            emailAddress: (0, schema_1.StringType)(),
-            userID: (0, schema_1.UUIDType)({
-                foreignKey: { schema: "User", column: "ID" },
-            }),
-        };
-    }
-}
-exports.FakeContactSchema = FakeContactSchema;
+exports.FakeContactSchema = (0, builder_1.getBuilderSchemaFromFields)({
+    firstName: (0, schema_1.StringType)(),
+    lastName: (0, schema_1.StringType)(),
+    emailAddress: (0, schema_1.StringType)(),
+    userID: (0, schema_1.UUIDType)({
+        foreignKey: { schema: "User", column: "ID" },
+    }),
+}, FakeContact);
 function getContactBuilder(viewer, input) {
     const m = new Map();
     for (const key in input) {
@@ -82,7 +78,7 @@ function getContactBuilder(viewer, input) {
     //To lock in the value of Date now incase of advanceTo/advanceBy
     m.set("createdAt", new Date());
     m.set("updatedAt", new Date());
-    return new builder_1.SimpleBuilder(viewer, new FakeContactSchema(), m);
+    return new builder_1.SimpleBuilder(viewer, exports.FakeContactSchema, m, action_1.WriteOperation.Insert, null);
 }
 exports.getContactBuilder = getContactBuilder;
 async function createContact(viewer, input) {

package/testutils/fake_data/fake_event.d.ts

@@ -1,6 +1,5 @@
 import { ID, Ent, Viewer, Data, LoadEntOptions, PrivacyPolicy } from "../../core/base";
-import { BuilderSchema, SimpleBuilder } from "../builder";
-import { BaseEntSchema, FieldMap } from "../../schema";
+import { SimpleBuilder } from "../builder";
 import { NodeType } from "./const";
 export declare class FakeEvent implements Ent {
     viewer: Viewer;
@@ -15,7 +14,7 @@ export declare class FakeEvent implements Ent {
     readonly title: string;
     readonly description: string | null;
     readonly userID: ID;
-    privacyPolicy: PrivacyPolicy;
+    getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
     private static getFields;
     static getTestTable(): import("../db/test_db").Table;
@@ -23,10 +22,7 @@ export declare class FakeEvent implements Ent {
     static load(v: Viewer, id: ID): Promise<FakeEvent | null>;
     static loadX(v: Viewer, id: ID): Promise<FakeEvent>;
 }
-export declare class FakeEventSchema extends BaseEntSchema implements BuilderSchema<FakeEvent> {
-    ent: typeof FakeEvent;
-    fields: FieldMap;
-}
+export declare const FakeEventSchema: import("../builder").BuilderSchema<FakeEvent>;
 export interface EventCreateInput {
     startTime: Date;
     endTime?: Date | null;
@@ -35,5 +31,5 @@ export interface EventCreateInput {
     description?: string | null;
     userID: ID;
 }
-export declare function getEventBuilder(viewer: Viewer, input: EventCreateInput): SimpleBuilder<FakeEvent>;
+export declare function getEventBuilder(viewer: Viewer, input: EventCreateInput): SimpleBuilder<FakeEvent, null>;
 export declare function createEvent(viewer: Viewer, input: EventCreateInput): Promise<void>;

package/testutils/fake_data/fake_event.js

@@ -9,11 +9,11 @@ const const_1 = require("./const");
 const test_db_1 = require("../db/test_db");
 const loaders_1 = require("../../core/loaders");
 const convert_1 = require("../../core/convert");
+const action_1 = require("../../action");
 class FakeEvent {
     constructor(viewer, data) {
         this.viewer = viewer;
         this.nodeType = const_1.NodeType.FakeEvent;
-        this.privacyPolicy = privacy_1.AlwaysAllowPrivacyPolicy;
         this.data = data;
         this.id = data.id;
         this.createdAt = (0, convert_1.convertDate)(data.created_at);
@@ -25,6 +25,9 @@ class FakeEvent {
         this.description = data.description;
         this.userID = data.user_id;
     }
+    getPrivacyPolicy() {
+        return privacy_1.AlwaysAllowPrivacyPolicy;
+    }
     static getFields() {
         return [
             "id",
@@ -63,35 +66,28 @@ class FakeEvent {
     }
 }
 exports.FakeEvent = FakeEvent;
-class FakeEventSchema extends schema_1.BaseEntSchema {
-    constructor() {
-        super(...arguments);
-        this.ent = FakeEvent;
-        this.fields = {
-            startTime: (0, schema_1.TimestampType)({
-                index: true,
-            }),
-            endTime: (0, schema_1.TimestampType)({
-                nullable: true,
-            }),
-            title: (0, schema_1.StringType)(),
-            location: (0, schema_1.StringType)(),
-            description: (0, schema_1.StringType)({
-                nullable: true,
-            }),
-            userID: (0, schema_1.UUIDType)({
-                foreignKey: { schema: "User", column: "ID" },
-            }),
-        };
-    }
-}
-exports.FakeEventSchema = FakeEventSchema;
+exports.FakeEventSchema = (0, builder_1.getBuilderSchemaFromFields)({
+    startTime: (0, schema_1.TimestampType)({
+        index: true,
+    }),
+    endTime: (0, schema_1.TimestampType)({
+        nullable: true,
+    }),
+    title: (0, schema_1.StringType)(),
+    location: (0, schema_1.StringType)(),
+    description: (0, schema_1.StringType)({
+        nullable: true,
+    }),
+    userID: (0, schema_1.UUIDType)({
+        foreignKey: { schema: "User", column: "ID" },
+    }),
+}, FakeEvent);
 function getEventBuilder(viewer, input) {
     const m = new Map();
     for (const key in input) {
         m.set(key, input[key]);
     }
-    return new builder_1.SimpleBuilder(viewer, new FakeEventSchema(), m);
+    return new builder_1.SimpleBuilder(viewer, exports.FakeEventSchema, m, action_1.WriteOperation.Insert, null);
 }
 exports.getEventBuilder = getEventBuilder;
 async function createEvent(viewer, input) {

package/testutils/fake_data/fake_user.d.ts

@@ -1,6 +1,5 @@
 import { ID, Ent, Viewer, Data, LoadEntOptions, PrivacyPolicy } from "../../core/base";
-import { BuilderSchema, SimpleAction } from "../builder";
-import { BaseEntSchema, FieldMap } from "../../schema";
+import { SimpleAction } from "../builder";
 import { NodeType } from "./const";
 import { IDViewer, IDViewerOptions } from "../../core/viewer";
 import { ObjectLoaderFactory } from "../../core/loaders";
@@ -24,7 +23,7 @@ export declare class FakeUser implements Ent {
     readonly emailAddress: string;
     readonly phoneNumber: string | null;
     protected readonly password: string | null;
-    privacyPolicy: PrivacyPolicy;
+    getPrivacyPolicy(): PrivacyPolicy<this>;
     constructor(viewer: Viewer, data: Data);
     static getFields(): string[];
     static getTestTable(): import("../db/test_db").Table;
@@ -32,10 +31,7 @@ export declare class FakeUser implements Ent {
     static load(v: Viewer, id: ID): Promise<FakeUser | null>;
     static loadX(v: Viewer, id: ID): Promise<FakeUser>;
 }
-export declare class FakeUserSchema extends BaseEntSchema implements BuilderSchema<FakeUser> {
-    ent: typeof FakeUser;
-    fields: FieldMap;
-}
+export declare const FakeUserSchema: import("../builder").BuilderSchema<FakeUser>;
 export interface UserCreateInput {
     firstName: string;
     lastName: string;
@@ -44,8 +40,8 @@ export interface UserCreateInput {
     password: string | null;
 }
 export declare type UserEditInput = Partial<UserCreateInput>;
-export declare function getUserBuilder(viewer: Viewer, input: UserCreateInput): import("../builder").SimpleBuilder<FakeUser>;
-export declare function getUserAction(viewer: Viewer, input: UserCreateInput): SimpleAction<FakeUser>;
+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>;
 export declare const userLoader: ObjectLoaderFactory<unknown>;
 export declare const userEmailLoader: ObjectLoaderFactory<unknown>;

package/testutils/fake_data/fake_user.js

@@ -11,6 +11,7 @@ const viewer_1 = require("../../core/viewer");
 const test_db_1 = require("../db/test_db");
 const loaders_1 = require("../../core/loaders");
 const convert_1 = require("../../core/convert");
+const action_1 = require("../../action");
 class ViewerWithAccessToken extends viewer_1.IDViewer {
     constructor(viewerID, opts) {
         super(viewerID, opts);
@@ -26,7 +27,18 @@ class FakeUser {
     constructor(viewer, data) {
         this.viewer = viewer;
         this.nodeType = const_1.NodeType.FakeUser;
-        this.privacyPolicy = {
+        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: [
                 privacy_1.AllowIfViewerRule,
                 //can view user if friends
@@ -48,15 +60,6 @@ class FakeUser {
                 privacy_1.AlwaysDenyRule,
             ],
         };
-        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;
     }
     static getFields() {
         return [
@@ -89,22 +92,15 @@ class FakeUser {
     }
 }
 exports.FakeUser = FakeUser;
-class FakeUserSchema extends schema_1.BaseEntSchema {
-    constructor() {
-        super(...arguments);
-        this.ent = FakeUser;
-        this.fields = {
-            firstName: (0, schema_1.StringType)(),
-            lastName: (0, schema_1.StringType)(),
-            emailAddress: (0, schema_1.StringType)(),
-            phoneNumber: (0, schema_1.StringType)(),
-            password: (0, schema_1.StringType)({
-                nullable: true,
-            }),
-        };
-    }
-}
-exports.FakeUserSchema = FakeUserSchema;
+exports.FakeUserSchema = (0, builder_1.getBuilderSchemaFromFields)({
+    firstName: (0, schema_1.StringType)(),
+    lastName: (0, schema_1.StringType)(),
+    emailAddress: (0, schema_1.StringType)(),
+    phoneNumber: (0, schema_1.StringType)(),
+    password: (0, schema_1.StringType)({
+        nullable: true,
+    }),
+}, FakeUser);
 function getUserBuilder(viewer, input) {
     const action = getUserAction(viewer, input);
     return action.builder;
@@ -115,7 +111,7 @@ function getUserAction(viewer, input) {
     for (const key in input) {
         m.set(key, input[key]);
     }
-    const action = new builder_1.SimpleAction(viewer, new FakeUserSchema(), m);
+    const action = new builder_1.SimpleAction(viewer, exports.FakeUserSchema, m, action_1.WriteOperation.Insert, null);
     action.viewerForEntLoad = (data) => {
         // load the created ent using a VC of the newly created user.
         return new viewer_1.IDViewer(data.id);

package/testutils/fake_data/test_helpers.js

@@ -107,7 +107,7 @@ async function createUserPlusFriendRequests(input, slice) {
         return createTestUser(input);
     }));
     expect(friendRequests.length).toBe(userInputs.length);
-    await addEdge(user, new _1.FakeUserSchema(), _1.EdgeType.UserToFriendRequests, true, ...friendRequests);
+    await addEdge(user, _1.FakeUserSchema, _1.EdgeType.UserToFriendRequests, true, ...friendRequests);
     return [user, friendRequests];
 }
 exports.createUserPlusFriendRequests = createUserPlusFriendRequests;

package/testutils/fake_data/user_query.d.ts

@@ -53,7 +53,7 @@ export declare class UserToFriendRequestsQuery extends AssocEdgeQueryBase<FakeUs
 }
 export declare class UserToIncomingFriendRequestsQuery extends AssocEdgeQueryBase<FakeUser, FakeUser, AssocEdge> {
     constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser, FakeUser>);
-    getPrivacyPolicy(): import("../../core/base").PrivacyPolicy<Ent>;
+    getPrivacyPolicy(): import("../../core/base").PrivacyPolicy<Ent<Viewer<Ent<any> | null, ID | null>>, Viewer<Ent<any> | null, ID | null>>;
     sourceEnt(id: ID): Promise<FakeUser | null>;
     static query(viewer: Viewer, src: EdgeQuerySource<FakeUser, FakeUser>): UserToIncomingFriendRequestsQuery;
     queryContacts(): UserToContactsQuery;
@@ -90,7 +90,7 @@ export declare class UserToEventsInNextWeekQuery extends CustomEdgeQueryBase<Fak
     constructor(viewer: Viewer, src: ID | FakeUser);
     static query(viewer: Viewer, src: FakeUser | ID): UserToEventsInNextWeekQuery;
     sourceEnt(id: ID): Promise<FakeUser | null>;
-    getPrivacyPolicy(): import("../../core/base").PrivacyPolicy<Ent>;
+    getPrivacyPolicy(): import("../../core/base").PrivacyPolicy<Ent<Viewer<Ent<any> | null, ID | null>>, Viewer<Ent<any> | null, ID | null>>;
 }
 export declare class UserToFollowingQuery extends AssocEdgeQueryBase<FakeUser, Ent, AssocEdge> {
     constructor(viewer: Viewer, src: EdgeQuerySource<FakeUser, FakeUser>);

package/testutils/fake_log.d.ts

@@ -1,4 +1,4 @@
-import { Ent } from "../core/base";
+import { Ent, Viewer } from "../core/base";
 import { Builder } from "./../action";
 export declare class FakeLogger {
     private static logs;
@@ -8,6 +8,6 @@ export declare class FakeLogger {
     static contains(line: string): boolean;
     static clear(): void;
 }
-export declare class EntCreationObserver<T extends Ent> {
-    observe(builder: Builder<T>): Promise<void>;
+export declare class EntCreationObserver<TEnt extends Ent<TViewer>, TViewer extends Viewer = Viewer> {
+    observe(builder: Builder<TEnt, TViewer>): Promise<void>;
 }

package/tsc/ast.d.ts

@@ -0,0 +1,43 @@
+import ts from "typescript";
+export declare function getPreText(fileContents: string, node: ts.Node, sourceFile: ts.SourceFile): string;
+export interface ClassInfo {
+    extends?: string;
+    comment: string;
+    name: string;
+    export?: boolean;
+    default?: boolean;
+    implements?: string[];
+    wrapClassContents(inner: string): string;
+}
+export declare function getClassInfo(fileContents: string, sourceFile: ts.SourceFile, node: ts.ClassDeclaration): ClassInfo | undefined;
+declare type transformImportFn = (imp: string) => string;
+interface transformOpts {
+    removeImports?: string[];
+    newImports?: string[];
+    transform?: transformImportFn;
+    transformPath: string;
+}
+export declare function transformImport(fileContents: string, importNode: ts.ImportDeclaration, sourceFile: ts.SourceFile, opts: transformOpts): string | undefined;
+export declare function updateImportPath(fileContents: string, importNode: ts.ImportDeclaration, sourceFile: ts.SourceFile, newPath: string): string | undefined;
+export declare function isRelativeImport(node: ts.ImportDeclaration, sourceFile: ts.SourceFile): boolean;
+export declare function isRelativeGeneratedImport(node: ts.ImportDeclaration, sourceFile: ts.SourceFile): boolean;
+export declare function isSrcGeneratedImport(node: ts.ImportDeclaration, sourceFile: ts.SourceFile): boolean;
+interface importInfo {
+    imports: string[];
+    start: number;
+    end: number;
+    importText: string;
+    importPath: string;
+    default?: string;
+}
+export declare function getImportInfo(imp: ts.ImportDeclaration, sourceFile: ts.SourceFile): importInfo | undefined;
+export declare function transformRelative(file: string, importPath: string, relative?: boolean): string;
+export interface customInfo {
+    viewerInfo: {
+        path: string;
+        name: string;
+    };
+    relativeImports?: boolean;
+}
+export declare function getCustomInfo(): customInfo;
+export {};