@snowtop/ent 0.1.0-alpha16 → 0.1.0-alpha24

package/tsc/transform_action.d.ts

@@ -0,0 +1,20 @@
+import ts from "typescript";
+import { customInfo } from "../tsc/ast";
+import { TransformFile } from "./transform";
+export declare class TransformAction implements TransformFile {
+    private customInfo;
+    glob: string;
+    prettierGlob: string;
+    constructor(customInfo: customInfo);
+    traverseChild(sourceFile: ts.SourceFile, contents: string, file: string, node: ts.Node): {
+        node: ts.Node;
+        rawString?: undefined;
+        traversed?: undefined;
+        imports?: undefined;
+    } | {
+        rawString: string;
+        traversed: boolean;
+        imports: Map<string, string[]>;
+        node?: undefined;
+    } | undefined;
+}

package/tsc/transform_action.js

@@ -0,0 +1,169 @@
+"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]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransformAction = void 0;
+const typescript_1 = __importDefault(require("typescript"));
+const ast_1 = require("../tsc/ast");
+const action_1 = require("../action");
+const viewer_1 = require("../core/viewer");
+const path = __importStar(require("path"));
+const snake_case_1 = require("snake-case");
+function findInput(file, classInfo, sourceFile) {
+    // @ts-ignore
+    const importStatements = sourceFile.statements.filter((stmt) => typescript_1.default.isImportDeclaration(stmt));
+    for (const imp of importStatements) {
+        const text = imp.moduleSpecifier.getText(sourceFile).slice(1, -1);
+        if ((0, ast_1.isSrcGeneratedImport)(imp, sourceFile) ||
+            (0, ast_1.isRelativeGeneratedImport)(imp, sourceFile)) {
+            // base file and we're importing from it
+            // e.g. in create_user_action, we're importing from create_user_action_base
+            if (path.basename(file).slice(0, -3) + "_base" !== path.basename(text)) {
+                continue;
+            }
+            const impInfo = (0, ast_1.getImportInfo)(imp, sourceFile);
+            if (!impInfo) {
+                continue;
+            }
+            let inputs = impInfo.imports
+                .filter((imp) => imp.trim() && imp.endsWith("Input"))
+                .map((v) => v.trim());
+            if (inputs.length === 1) {
+                return inputs[0];
+            }
+            if (inputs.length && classInfo.name.endsWith("Action")) {
+                const prefix = classInfo.name.slice(0, classInfo.name.length - 6);
+                inputs = inputs.filter((imp) => imp.slice(0, imp.length - 5) === prefix);
+                if (inputs.length === 1) {
+                    return inputs[0];
+                }
+            }
+        }
+    }
+    return null;
+}
+let m = {
+    triggers: {
+        m: "getTriggers",
+        i: "Trigger",
+    },
+    observers: {
+        m: "getObservers",
+        i: "Observer",
+    },
+    validators: {
+        m: "getValidators",
+        i: "Validator",
+    },
+};
+function getConversionInfo(mm) {
+    if (mm.kind !== typescript_1.default.SyntaxKind.PropertyDeclaration) {
+        return null;
+    }
+    const text = mm.name.escapedText;
+    const v = m[text];
+    if (v === undefined) {
+        return null;
+    }
+    return {
+        text,
+        method: v.m,
+        interface: v.i,
+    };
+}
+class TransformAction {
+    constructor(customInfo) {
+        this.customInfo = customInfo;
+        this.glob = "src/ent/**/actions/**/*_action.ts";
+        this.prettierGlob = "src/ent/**/actions/**.ts";
+    }
+    traverseChild(sourceFile, contents, file, node) {
+        if (!typescript_1.default.isClassDeclaration(node) || !node.heritageClauses) {
+            return { node };
+        }
+        let classInfo = (0, ast_1.getClassInfo)(contents, sourceFile, node);
+        // only do classes
+        if (!classInfo || !classInfo.default) {
+            return;
+        }
+        // require action
+        const p = require(path.join(process.cwd(), "./" + file.slice(0, -3)));
+        const action = new p.default(new viewer_1.LoggedOutViewer(), {});
+        const builder = action.builder.constructor.name;
+        const nodeName = action.builder.ent.name;
+        const existingEnt = action.builder.operation === action_1.WriteOperation.Insert
+            ? `${nodeName} | null`
+            : nodeName;
+        const viewer = this.customInfo.viewerInfo.name;
+        const input = findInput(file, classInfo, sourceFile);
+        if (!input) {
+            return;
+        }
+        let klassContents = "";
+        let traversed = false;
+        let newImports = [];
+        for (const mm of node.members) {
+            const conv = getConversionInfo(mm);
+            if (conv !== null) {
+                const property = mm;
+                // if invalid, bounce
+                if (!property.initializer) {
+                    return;
+                }
+                traversed = true;
+                const pp = property.initializer.getFullText(sourceFile).trim();
+                const code = `${conv.method}(): ${conv.interface}<${nodeName}, ${builder}<${input}, ${existingEnt}>, ${viewer}, ${input}, ${existingEnt}>[] {
+            return ${pp}
+          }`;
+                newImports.push(conv.interface);
+                klassContents += (0, ast_1.getPreText)(contents, mm, sourceFile) + code;
+            }
+            else {
+                klassContents += mm.getFullText(sourceFile);
+            }
+        }
+        const builderPath = `src/ent/generated/${(0, snake_case_1.snakeCase)(nodeName)}/actions/${(0, snake_case_1.snakeCase)(builder)}.ts`;
+        let imports = new Map([
+            [
+                (0, ast_1.transformRelative)(file, this.customInfo.viewerInfo.path, this.customInfo.relativeImports),
+                [viewer],
+            ],
+            [
+                (0, ast_1.transformRelative)(file, "src/ent", this.customInfo.relativeImports),
+                [nodeName],
+            ],
+            ["@snowtop/ent/action", newImports],
+            [
+                (0, ast_1.transformRelative)(file, builderPath, this.customInfo.relativeImports),
+                [builder],
+            ],
+        ]);
+        // wrap comments and transform to export class Foo extends Bar { ${inner} }
+        return {
+            rawString: classInfo.wrapClassContents(klassContents),
+            traversed,
+            imports,
+        };
+    }
+}
+exports.TransformAction = TransformAction;

package/tsc/transform_ent.d.ts

@@ -0,0 +1,17 @@
+import ts from "typescript";
+import { TransformFile } from "./transform";
+export declare class TransformEnt implements TransformFile {
+    glob: string;
+    traverseChild(sourceFile: ts.SourceFile, contents: string, file: string, node: ts.Node): {
+        node: ts.Node;
+        rawString?: undefined;
+        traversed?: undefined;
+        imports?: undefined;
+    } | {
+        rawString: string;
+        traversed: boolean;
+        imports: Map<string, string[]>;
+        node?: undefined;
+    } | undefined;
+    prettierGlob: string;
+}

package/tsc/transform_ent.js

@@ -0,0 +1,59 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TransformEnt = void 0;
+const typescript_1 = __importDefault(require("typescript"));
+const ast_1 = require("./ast");
+function isPrivacyPolicy(mm) {
+    return (mm.kind === typescript_1.default.SyntaxKind.PropertyDeclaration &&
+        mm.name.escapedText === "privacyPolicy");
+}
+class TransformEnt {
+    constructor() {
+        this.glob = "src/ent/*.ts";
+        this.prettierGlob = "src/ent/*.ts";
+    }
+    traverseChild(sourceFile, contents, file, node) {
+        if (!typescript_1.default.isClassDeclaration(node) || !node.heritageClauses) {
+            return { node };
+        }
+        let classInfo = (0, ast_1.getClassInfo)(contents, sourceFile, node);
+        if (!classInfo) {
+            return;
+        }
+        // different class. ignore
+        // only do classes which extend a base class e.g. User extends UserBase
+        // if different class (e.g. privacy rule), just return it
+        if (classInfo.extends !== classInfo.name + "Base") {
+            return { node };
+        }
+        let klassContents = "";
+        let traversed = false;
+        for (const mm of node.members) {
+            if (isPrivacyPolicy(mm)) {
+                const property = mm;
+                // if invalid privacy policy, bounce
+                if (!property.initializer) {
+                    return;
+                }
+                const pp = property.initializer.getFullText(sourceFile);
+                const code = `getPrivacyPolicy(): PrivacyPolicy<this> {
+            return ${pp}
+          }`;
+                klassContents += (0, ast_1.getPreText)(contents, mm, sourceFile) + code;
+                traversed = true;
+            }
+            else {
+                klassContents += mm.getFullText(sourceFile);
+            }
+        }
+        return {
+            rawString: classInfo.wrapClassContents(klassContents),
+            traversed,
+            imports: new Map([["@snowtop/ent", ["PrivacyPolicy"]]]),
+        };
+    }
+}
+exports.TransformEnt = TransformEnt;

package/tsc/transform_schema.d.ts

@@ -0,0 +1,27 @@
+import ts from "typescript";
+import { TransformFile } from "./transform";
+export declare class TransformSchema implements TransformFile {
+    private relativeImports;
+    private oldBaseClass?;
+    private newSchemaClass?;
+    private transformPath?;
+    constructor(relativeImports: boolean, oldBaseClass?: string | undefined, newSchemaClass?: string | undefined, transformPath?: string | undefined);
+    glob: string;
+    private transformSchema;
+    traverseChild(sourceFile: ts.SourceFile, contents: string, file: string, node: ts.Node): {
+        node: ts.Node;
+        traversed?: undefined;
+        rawString?: undefined;
+        removeImports?: undefined;
+        imports?: undefined;
+    } | {
+        traversed: boolean;
+        rawString: string;
+        removeImports: string[];
+        imports: Map<string, string[]>;
+        node?: undefined;
+    } | undefined;
+    fileToWrite(file: string): string;
+    postProcess(file: string): void;
+    prettierGlob: string;
+}

package/{scripts → tsc}/transform_schema.js

@@ -22,109 +22,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const glob_1 = require("glob");
+exports.TransformSchema = void 0;
 const typescript_1 = __importDefault(require("typescript"));
 const fs = __importStar(require("fs"));
-const compilerOptions_1 = require("../tsc/compilerOptions");
-const child_process_1 = require("child_process");
 const path_1 = __importDefault(require("path"));
 const ast_1 = require("../tsc/ast");
-async function main() {
-    let files = glob_1.glob.sync("src/schema/*.ts");
-    const target = (0, compilerOptions_1.getTargetFromCurrentDir)();
-    // filter to only event.ts e.g. for comments and whitespace...
-    //  files = files.filter((f) => f.endsWith("event.ts"));
-    files.forEach((file) => {
-        // assume valid file since we do glob above
-        //    const idx = file.lastIndexOf(".ts");
-        //    const writeFile = file.substring(0, idx) + "2" + ".ts";
-        //    console.debug(file);
-        const writeFile = "src/schema/" + path_1.default.basename(file).slice(0, -3) + "_schema.ts";
-        // const writeFile = file;
-        //    console.debug(file, writeFile);
-        // go through the file and print everything back if not starting immediately after other position
-        let { contents, sourceFile } = (0, compilerOptions_1.createSourceFile)(target, file);
-        const nodes = [];
-        let updateImport = false;
-        let removeImports = [];
-        const f = {
-            trackNode: function (tni) {
-                nodes.push({
-                    node: tni.node,
-                    importNode: tni.node && typescript_1.default.isImportDeclaration(tni.node),
-                    rawString: tni.rawString,
-                });
-                if (tni.removeImports) {
-                    removeImports.push(...tni.removeImports);
-                }
-            },
-            flagUpdateImport() {
-                updateImport = true;
-            },
-        };
-        if (!traverse(contents, sourceFile, f)) {
-            return;
-        }
-        let newContents = "";
-        for (const node of nodes) {
-            if (updateImport && node.importNode) {
-                const importNode = node.node;
-                const transformedImport = (0, ast_1.transformImport)(contents, importNode, sourceFile, {
-                    removeImports,
-                    transform: transformSchema,
-                });
-                if (transformedImport) {
-                    newContents += transformedImport;
-                    continue;
-                }
-            }
-            if (node.node) {
-                newContents += node.node.getFullText(sourceFile);
-            }
-            else if (node.rawString) {
-                newContents += node.rawString;
-            }
-            else {
-                console.error("invalid node");
-            }
-        }
-        //    console.debug(newContents);
-        // ideally there's a flag that indicates if we write
-        fs.writeFileSync(writeFile, newContents);
-        fs.rmSync(file);
-    });
-    (0, child_process_1.execSync)("prettier src/schema/*.ts --write");
-}
-function traverse(fileContents, sourceFile, f) {
-    let traversed = false;
-    typescript_1.default.forEachChild(sourceFile, function (node) {
-        if (typescript_1.default.isClassDeclaration(node)) {
-            traversed = true;
-            // TODO address implicit schema doesn't work here...
-            //        console.debug(sourceFile.fileName, node.kind);
-            if (traverseClass(fileContents, sourceFile, node, f)) {
-                f.flagUpdateImport();
-                return;
-            }
-        }
-        f.trackNode({ node });
-    });
-    return traversed;
-}
-function traverseClass(fileContents, sourceFile, node, f) {
-    const ci = getTransformClassInfo(fileContents, sourceFile, node);
+function traverseClass(fileContents, sourceFile, node, transformSchema) {
+    const ci = getTransformClassInfo(fileContents, sourceFile, node, transformSchema);
     if (!ci) {
-        return false;
+        return;
     }
-    let klassContents = `${ci.comment}const ${ci.name} = new ${ci.class}({\n`;
+    let klassContents = `${ci.comment}const ${ci.name} = new ${transformSchema(ci.class)}({\n`;
     let removeImports = [];
     if (ci.implementsSchema) {
         removeImports.push("Schema");
     }
+    removeImports.push(ci.class);
+    let newImports = [transformSchema(ci.class)];
     for (let member of node.members) {
         const fInfo = getClassElementInfo(fileContents, member, sourceFile);
         if (!fInfo) {
-            return false;
+            return;
         }
         klassContents += `${fInfo.comment}${fInfo.key}:${fInfo.value},\n`;
         if (fInfo.type) {
@@ -139,20 +57,13 @@ function traverseClass(fileContents, sourceFile, node, f) {
         klassContents = "export " + klassContents;
     }
     //  console.debug(klassContents);
-    f.trackNode({ rawString: klassContents, removeImports: removeImports });
-    return true;
-}
-function transformSchema(str) {
-    // only do known class names
-    if (str === "BaseEntSchema" || str === "BaseEntSchemaWithTZ") {
-        return str.substring(4);
-    }
-    return str;
+    return {
+        rawString: klassContents,
+        removeImports: removeImports,
+        newImports,
+    };
 }
-// TODO need to generify this...
-// and then have a schema specific version
-// may make sense to just duplicate this logic...
-function getTransformClassInfo(fileContents, sourceFile, node) {
+function getTransformClassInfo(fileContents, sourceFile, node, transformSchema) {
     const generic = (0, ast_1.getClassInfo)(fileContents, sourceFile, node);
     if (!generic) {
         return;
@@ -163,6 +74,7 @@ function getTransformClassInfo(fileContents, sourceFile, node) {
     }
     let implementsSchema = generic.implements?.some((v) => v == "Schema");
     let classExtends = generic.extends;
+    // nothing transformed here, so nothing to do here
     if (classExtends && classExtends === transformSchema(classExtends)) {
         return undefined;
     }
@@ -222,7 +134,7 @@ function getFieldElementInfo(fileContents, member, sourceFile) {
         if (parsed === null) {
             return;
         }
-        const { callEx, name, nameComment, properties } = parsed;
+        const { callEx, name, nameComment, properties, suffix } = parsed;
         let property = "";
         const fieldComment = (0, ast_1.getPreText)(fileContents, element, sourceFile).trim();
         if (fieldComment) {
@@ -237,7 +149,7 @@ function getFieldElementInfo(fileContents, member, sourceFile) {
         if (properties.length) {
             fnCall = `{${properties.join(",")}}`;
         }
-        property += `${name}:${call}(${fnCall}),`;
+        property += `${name}:${call}(${fnCall})${suffix || ""},`;
         fieldMap += property;
     }
     fieldMap += "}";
@@ -308,13 +220,24 @@ function isFieldElement(member, sourceFile) {
     }
     return true;
 }
-function parseFieldElement(element, sourceFile, fileContents) {
+function parseFieldElement(element, sourceFile, fileContents, nested) {
     if (element.kind !== typescript_1.default.SyntaxKind.CallExpression) {
         console.error("skipped non-call expression");
         return null;
     }
     let callEx = element;
     if (callEx.arguments.length !== 1) {
+        // have a situation like:     StringType({ name: "canonicalName" }).trim().toLowerCase(),
+        // need to keep calling this until we find what we want and then get the suffix we should just add to the end of the transformed code
+        if (callEx.expression.kind === typescript_1.default.SyntaxKind.PropertyAccessExpression) {
+            const ret = parseFieldElement(callEx.expression.expression, sourceFile, fileContents, true);
+            if (ret !== null) {
+                if (!nested) {
+                    ret.suffix = fileContents.substring(ret.callEx.getEnd(), callEx.getEnd());
+                }
+                return ret;
+            }
+        }
         console.error("callExpression with arguments not of length 1");
         return null;
     }
@@ -352,4 +275,80 @@ function parseFieldElement(element, sourceFile, fileContents) {
         nameComment: propertyComment,
     };
 }
-Promise.resolve(main());
+// find which of these importPaths is being used and use that to replace
+function findSchemaImportPath(sourceFile) {
+    const paths = {
+        "@snowtop/ent": true,
+        "@snowtop/ent/schema": true,
+        "@snowtop/ent/schema/": true,
+    };
+    // @ts-ignore
+    const importStatements = sourceFile.statements.filter((stmt) => typescript_1.default.isImportDeclaration(stmt));
+    for (const imp of importStatements) {
+        const impInfo = (0, ast_1.getImportInfo)(imp, sourceFile);
+        if (!impInfo) {
+            continue;
+        }
+        if (paths[impInfo.importPath] !== undefined) {
+            return impInfo.importPath;
+        }
+    }
+}
+class TransformSchema {
+    // we only end up doing this once because we change the schema representation
+    // so safe to run this multiple times
+    constructor(relativeImports, oldBaseClass, newSchemaClass, transformPath) {
+        this.relativeImports = relativeImports;
+        this.oldBaseClass = oldBaseClass;
+        this.newSchemaClass = newSchemaClass;
+        this.transformPath = transformPath;
+        this.glob = "src/schema/*.ts";
+        this.prettierGlob = "src/schema/*.ts";
+    }
+    transformSchema(className) {
+        if (className === "BaseEntSchema" || className === "BaseEntSchemaWithTZ") {
+            return className.substring(4);
+        }
+        if (className === this.oldBaseClass && this.newSchemaClass) {
+            return this.newSchemaClass;
+        }
+        return className;
+    }
+    traverseChild(sourceFile, contents, file, node) {
+        if (!typescript_1.default.isClassDeclaration(node)) {
+            return { node };
+        }
+        // TODO address implicit schema doesn't work here...
+        const ret = traverseClass(contents, sourceFile, node, this.transformSchema.bind(this));
+        if (ret === undefined) {
+            return;
+        }
+        let imports = new Map();
+        const imp = findSchemaImportPath(sourceFile);
+        if (imp) {
+            if (this.transformPath) {
+                imports.set(imp, []);
+            }
+            else {
+                imports.set(imp, ret.newImports);
+            }
+        }
+        if (this.transformPath) {
+            // add new imports to this path
+            imports.set((0, ast_1.transformRelative)(file, this.transformPath, this.relativeImports), ret.newImports);
+        }
+        return {
+            traversed: true,
+            rawString: ret.rawString,
+            removeImports: ret.removeImports,
+            imports: imports,
+        };
+    }
+    fileToWrite(file) {
+        return "src/schema/" + path_1.default.basename(file).slice(0, -3) + "_schema.ts";
+    }
+    postProcess(file) {
+        fs.rmSync(file);
+    }
+}
+exports.TransformSchema = TransformSchema;