@snowtop/ent 0.1.0-alpha7 → 0.1.0-alpha8

package/testutils/fake_data/fake_event.js

@@ -63,35 +63,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);
 }
 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";
@@ -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;

package/testutils/fake_data/fake_user.js

@@ -89,22 +89,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 +108,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.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;