@snowtop/ent 0.1.0-alpha1 → 0.1.0-alpha13

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/tsc/ast.d.ts

@@ -0,0 +1,21 @@
+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;
+}
+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 {};

package/tsc/ast.js

@@ -0,0 +1,154 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateImportPath = exports.transformImport = exports.getClassInfo = exports.getPreText = void 0;
+const typescript_1 = __importDefault(require("typescript"));
+function getPreText(fileContents, node, sourceFile) {
+    return fileContents.substring(node.getFullStart(), node.getStart(sourceFile));
+}
+exports.getPreText = getPreText;
+function getClassInfo(fileContents, sourceFile, node) {
+    let className = node.name?.text;
+    let classExtends;
+    let impl = [];
+    if (node.heritageClauses) {
+        for (const hc of node.heritageClauses) {
+            switch (hc.token) {
+                case typescript_1.default.SyntaxKind.ImplementsKeyword:
+                    for (const type of hc.types) {
+                        impl.push(type.expression.getText(sourceFile));
+                    }
+                    break;
+                case typescript_1.default.SyntaxKind.ExtendsKeyword:
+                    // can only extend one class
+                    for (const type of hc.types) {
+                        const text = type.expression.getText(sourceFile);
+                        classExtends = text;
+                    }
+                    break;
+            }
+        }
+    }
+    // we probably still don't need all of this...
+    if (!className || !node.heritageClauses || !classExtends) {
+        return undefined;
+    }
+    let hasExport = false;
+    let hasDefault = false;
+    let comment = getPreText(fileContents, node, sourceFile);
+    const wrapClassContents = (inner) => {
+        let ret = `${comment}`;
+        if (hasExport) {
+            ret += "export ";
+        }
+        if (hasDefault) {
+            ret += "default ";
+        }
+        ret += `class ${className} `;
+        if (classExtends) {
+            ret += `extends ${classExtends} `;
+        }
+        if (impl.length) {
+            ret += `implements ${impl.join(", ")}`;
+        }
+        return `${ret}{
+      ${inner}
+    }`;
+    };
+    if (node.modifiers) {
+        for (const mod of node.modifiers) {
+            const text = mod.getText(sourceFile);
+            if (text === "export") {
+                hasExport = true;
+            }
+            else if (text === "default") {
+                hasDefault = true;
+            }
+        }
+    }
+    return {
+        name: className,
+        extends: classExtends,
+        comment,
+        implements: impl,
+        wrapClassContents,
+        export: hasExport,
+        default: hasDefault,
+    };
+}
+exports.getClassInfo = getClassInfo;
+function transformImport(fileContents, importNode, sourceFile, opts) {
+    // remove quotes too
+    const text = importNode.moduleSpecifier.getText(sourceFile).slice(1, -1);
+    if (text !== "@snowtop/ent" &&
+        text !== "@snowtop/ent/schema" &&
+        text !== "@snowtop/ent/schema/") {
+        return;
+    }
+    const importText = importNode.importClause?.getText(sourceFile) || "";
+    const start = importText.indexOf("{");
+    const end = importText.lastIndexOf("}");
+    if (start === -1 || end === -1) {
+        return;
+    }
+    const imports = importText
+        .substring(start + 1, end)
+        //    .trim()
+        .split(",");
+    let removeImportsMap = {};
+    if (opts?.removeImports) {
+        opts.removeImports.forEach((imp) => (removeImportsMap[imp] = true));
+    }
+    let finalImports = new Set();
+    for (let i = 0; i < imports.length; i++) {
+        let imp = imports[i].trim();
+        if (imp === "") {
+            continue;
+        }
+        if (opts?.transform) {
+            imp = opts.transform(imp);
+        }
+        if (removeImportsMap[imp]) {
+            continue;
+        }
+        finalImports.add(imp);
+    }
+    if (opts?.newImports) {
+        opts.newImports.forEach((imp) => finalImports.add(imp));
+    }
+    const comment = getPreText(fileContents, importNode, sourceFile);
+    return (comment +
+        "import " +
+        importText.substring(0, start + 1) +
+        Array.from(finalImports).join(", ") +
+        importText.substring(end) +
+        ' from "' +
+        text +
+        '";');
+}
+exports.transformImport = transformImport;
+function updateImportPath(fileContents, importNode, sourceFile, newPath) {
+    const comment = getPreText(fileContents, importNode, sourceFile);
+    // all this copied from above...
+    const importText = importNode.importClause?.getText(sourceFile) || "";
+    const start = importText.indexOf("{");
+    const end = importText.lastIndexOf("}");
+    if (start === -1 || end === -1) {
+        return;
+    }
+    const imports = importText
+        .substring(start + 1, end)
+        //    .trim()
+        .split(",");
+    return (comment +
+        "import " +
+        importText.substring(0, start + 1) +
+        Array.from(imports).join(", ") +
+        importText.substring(end) +
+        ' from "' +
+        newPath +
+        '";');
+}
+exports.updateImportPath = updateImportPath;

package/tsc/compilerOptions.d.ts

@@ -1,2 +1,8 @@
 import ts from "typescript";
 export declare function readCompilerOptions(filePath: string): ts.CompilerOptions;
+export declare function getTarget(target?: string): ts.ScriptTarget;
+export declare function getTargetFromCurrentDir(): ts.ScriptTarget;
+export declare function createSourceFile(target: ts.ScriptTarget, file: string): {
+    contents: string;
+    sourceFile: ts.SourceFile;
+};

package/tsc/compilerOptions.js

@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.readCompilerOptions = void 0;
+exports.createSourceFile = exports.getTargetFromCurrentDir = exports.getTarget = exports.readCompilerOptions = void 0;
 const fs = __importStar(require("fs"));
 const json5_1 = __importDefault(require("json5"));
 const typescript_1 = __importDefault(require("typescript"));
@@ -59,3 +59,42 @@ function readCompilerOptions(filePath) {
     return options;
 }
 exports.readCompilerOptions = readCompilerOptions;
+function getTarget(target) {
+    switch (target?.toLowerCase()) {
+        case "es2015":
+            return typescript_1.default.ScriptTarget.ES2015;
+        case "es2016":
+            return typescript_1.default.ScriptTarget.ES2016;
+        case "es2017":
+            return typescript_1.default.ScriptTarget.ES2017;
+        case "es2018":
+            return typescript_1.default.ScriptTarget.ES2018;
+        case "es2019":
+            return typescript_1.default.ScriptTarget.ES2019;
+        case "es2020":
+            return typescript_1.default.ScriptTarget.ES2020;
+        case "es2021":
+            return typescript_1.default.ScriptTarget.ES2021;
+        case "es3":
+            return typescript_1.default.ScriptTarget.ES3;
+        case "es5":
+            return typescript_1.default.ScriptTarget.ES5;
+        case "esnext":
+            return typescript_1.default.ScriptTarget.ESNext;
+        default:
+            return typescript_1.default.ScriptTarget.ESNext;
+    }
+}
+exports.getTarget = getTarget;
+function getTargetFromCurrentDir() {
+    const options = readCompilerOptions(".");
+    return getTarget(options.target?.toString());
+}
+exports.getTargetFromCurrentDir = getTargetFromCurrentDir;
+function createSourceFile(target, file) {
+    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);
+    return { contents, sourceFile };
+}
+exports.createSourceFile = createSourceFile;