@snowtop/ent 0.1.0-alpha1 → 0.1.0-alpha13

package/scripts/move_generated.js

@@ -0,0 +1,142 @@
+"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 });
+const glob_1 = require("glob");
+const path = __importStar(require("path"));
+const fs = __importStar(require("fs"));
+const compilerOptions_1 = require("../tsc/compilerOptions");
+const typescript_1 = __importDefault(require("typescript"));
+const ast_1 = require("../tsc/ast");
+const child_process_1 = require("child_process");
+// src/ent/generated and src/graphql/generated
+function transformPath(old) {
+    const parts = old.split(path.sep);
+    if (parts.length < 3) {
+        return;
+    }
+    const changedParts = parts
+        .slice(0, 2)
+        .concat("generated")
+        .concat(parts.slice(2).filter((v) => v !== "generated"));
+    const newFile = changedParts.join(path.sep);
+    return { changedParts, newFile };
+}
+function moveFiles(files) {
+    files.forEach((file) => {
+        const conv = transformPath(file);
+        if (!conv) {
+            return;
+        }
+        const { changedParts, newFile } = conv;
+        if (file === newFile) {
+            return;
+        }
+        // check if directory exists, if not, create recursive dir
+        const p = changedParts.slice(0, changedParts.length - 1).join(path.sep);
+        const statInfo = fs.statSync(p, { throwIfNoEntry: false });
+        if (!statInfo) {
+            fs.mkdirSync(p, {
+                recursive: true,
+            });
+        }
+        // move file to new location
+        fs.renameSync(file, newFile);
+    });
+}
+function updateImports(files, target, cwd) {
+    files.forEach((file) => {
+        let { contents, sourceFile } = (0, compilerOptions_1.createSourceFile)(target, file);
+        let nodes = [];
+        let updated = false;
+        typescript_1.default.forEachChild(sourceFile, function (node) {
+            let dirPath = path.join(cwd, file, "..");
+            if (typescript_1.default.isImportDeclaration(node)) {
+                const conv = isGeneratedPath(node, sourceFile, dirPath);
+                if (!conv) {
+                    nodes.push({ node });
+                    return;
+                }
+                updated = true;
+                const newImportPath = path.relative(dirPath, conv.newFile);
+                const v = (0, ast_1.updateImportPath)(contents, node, sourceFile, newImportPath);
+                nodes.push({ rawString: v });
+            }
+            else {
+                nodes.push({ node });
+            }
+        });
+        let newContents = "";
+        for (const node of nodes) {
+            if (node.node) {
+                newContents += node.node.getFullText(sourceFile);
+            }
+            else if (node.rawString) {
+                newContents += node.rawString;
+            }
+            else {
+                throw new Error(`malformed node with no node or rawString`);
+            }
+        }
+        if (updated) {
+            fs.writeFileSync(file, newContents);
+        }
+    });
+}
+function main() {
+    const entFiles = glob_1.glob.sync("src/ent/**/generated/**/**.ts");
+    const graphqlFiles = glob_1.glob.sync("src/graphql/**/generated/**/**.ts");
+    moveFiles(entFiles);
+    moveFiles(graphqlFiles);
+    const target = (0, compilerOptions_1.getTargetFromCurrentDir)();
+    const entImportFiles = glob_1.glob.sync("src/ent/**/*.ts", {
+        ignore: ["**/generated/**", "node_modules/**"],
+    });
+    const graphqlImportFiles = glob_1.glob.sync("src/graphql/**/*.ts", {
+        ignore: ["**/generated/**", "node_modules/**"],
+    });
+    const cwd = process.cwd();
+    updateImports(entImportFiles, target, cwd);
+    updateImports(graphqlImportFiles, target, cwd);
+    (0, child_process_1.execSync)("prettier src/ent/*.ts --write");
+    (0, child_process_1.execSync)("prettier src/graphql/*.ts --write");
+}
+function isGeneratedPath(node, sourceFile, dirPath) {
+    const text = node.moduleSpecifier.getText(sourceFile).slice(1, -1);
+    // it's relative and has generated in there, continue
+    if (!((text.startsWith("..") || text.startsWith("./")) &&
+        text.indexOf("/generated") !== -1)) {
+        return;
+    }
+    const oldPath = path.join(dirPath, text);
+    const relFromRoot = path.relative(".", oldPath);
+    const conv = transformPath(relFromRoot);
+    if (!conv) {
+        return;
+    }
+    if (relFromRoot === conv.newFile) {
+        return;
+    }
+    return conv;
+}
+main();

package/scripts/read_schema.js

@@ -44,7 +44,21 @@ function main() {
         if (!match) {
             throw new Error(`non-typescript file ${p} returned by glob`);
         }
-        potentialSchemas[(0, pascal_case_1.pascalCase)(match[1])] = require(p).default;
+        let schema = match[1];
+        // convert foo_schema.ts -> foo
+        if (schema.endsWith("_schema")) {
+            schema = schema.slice(0, -7);
+        }
+        let relativePath;
+        const index = p.indexOf("src/schema");
+        if (index !== -1) {
+            relativePath = p.substring(index);
+        }
+        const s = require(p).default;
+        if (relativePath !== undefined) {
+            s.schemaPath = relativePath;
+        }
+        potentialSchemas[(0, pascal_case_1.pascalCase)(schema)] = s;
     }
     //  console.log(potentialSchemas);
     const result = (0, parse_1.parseSchema)(potentialSchemas);

package/scripts/transform_code.d.ts

@@ -0,0 +1 @@
+export {};

package/scripts/transform_code.js

@@ -0,0 +1,113 @@
+"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 });
+const glob_1 = require("glob");
+const typescript_1 = __importDefault(require("typescript"));
+const compilerOptions_1 = require("../tsc/compilerOptions");
+const ast_1 = require("../tsc/ast");
+const child_process_1 = require("child_process");
+const fs = __importStar(require("fs"));
+async function main() {
+    let files = glob_1.glob.sync("src/ent/*.ts");
+    const target = (0, compilerOptions_1.getTargetFromCurrentDir)();
+    files.forEach((file) => {
+        let { contents, sourceFile } = (0, compilerOptions_1.createSourceFile)(target, file);
+        let traversed = false;
+        let nodes = [];
+        typescript_1.default.forEachChild(sourceFile, function (node) {
+            if (!typescript_1.default.isClassDeclaration(node) || !node.heritageClauses) {
+                nodes.push({ node });
+                return;
+            }
+            let classInfo = (0, ast_1.getClassInfo)(contents, sourceFile, node);
+            // only do classes which extend a base class e.g. User extends UserBase
+            if (!classInfo || classInfo.extends !== classInfo.name + "Base") {
+                return;
+            }
+            // need to check for PrivacyPolicy import...
+            traversed = true;
+            let klassContents = "";
+            for (const mm of node.members) {
+                if (isPrivacyPolicy(mm)) {
+                    const property = mm;
+                    // if invalid privacy policy, bounce
+                    if (!property.initializer) {
+                        traversed = false;
+                        return;
+                    }
+                    const pp = property.initializer.getFullText(sourceFile);
+                    const code = `getPrivacyPolicy(): PrivacyPolicy<this> {
+            return ${pp}
+          }`;
+                    klassContents += code;
+                }
+                else {
+                    klassContents += mm.getFullText(sourceFile);
+                }
+            }
+            // wrap comments and transform to export class Foo extends Bar { ${inner} }
+            nodes.push({ rawString: classInfo.wrapClassContents(klassContents) });
+            //      console.debug(classInfo.wrapClassContents(klassContents));
+        });
+        // if traversed, overwrite.
+        if (!traversed) {
+            return;
+        }
+        let newContents = "";
+        for (const node of nodes) {
+            if (node.node) {
+                if (typescript_1.default.isImportDeclaration(node.node)) {
+                    let transformed = (0, ast_1.transformImport)(contents, node.node, sourceFile, {
+                        newImports: ["PrivacyPolicy"],
+                    });
+                    if (transformed) {
+                        newContents += transformed;
+                        continue;
+                    }
+                }
+                newContents += node.node.getFullText(sourceFile);
+            }
+            else if (node.rawString) {
+                newContents += node.rawString;
+            }
+            else {
+                throw new Error(`malformed node with no node or rawString`);
+            }
+            fs.writeFileSync(file, newContents);
+        }
+    });
+    (0, child_process_1.execSync)("prettier src/ent/*.ts --write");
+}
+function isPrivacyPolicy(mm) {
+    return (mm.kind === typescript_1.default.SyntaxKind.PropertyDeclaration &&
+        mm.name.escapedText === "privacyPolicy");
+}
+main()
+    .then(() => {
+    process.exit(0);
+})
+    .catch((err) => {
+    console.error(err);
+    process.exit(1);
+});

package/scripts/transform_schema.js

@@ -27,51 +27,26 @@ const typescript_1 = __importDefault(require("typescript"));
 const fs = __importStar(require("fs"));
 const compilerOptions_1 = require("../tsc/compilerOptions");
 const child_process_1 = require("child_process");
-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;
-    }
-}
+const path_1 = __importDefault(require("path"));
+const ast_1 = require("../tsc/ast");
 async function main() {
-    // this assumes this is being run from root of directory
-    const options = (0, compilerOptions_1.readCompilerOptions)(".");
     let files = glob_1.glob.sync("src/schema/*.ts");
-    const target = options.target
-        ? // @ts-ignore
-            getTarget(options.target)
-        : typescript_1.default.ScriptTarget.ESNext;
+    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";
-        let contents = fs.readFileSync(file).toString();
+        //    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
-        const sourceFile = typescript_1.default.createSourceFile(file, contents, target, false, typescript_1.default.ScriptKind.TS);
+        let { contents, sourceFile } = (0, compilerOptions_1.createSourceFile)(target, file);
         const nodes = [];
         let updateImport = false;
+        let removeImports = [];
         const f = {
             trackNode: function (tni) {
                 nodes.push({
@@ -79,6 +54,9 @@ async function main() {
                     importNode: tni.node && typescript_1.default.isImportDeclaration(tni.node),
                     rawString: tni.rawString,
                 });
+                if (tni.removeImports) {
+                    removeImports.push(...tni.removeImports);
+                }
             },
             flagUpdateImport() {
                 updateImport = true;
@@ -91,7 +69,10 @@ async function main() {
         for (const node of nodes) {
             if (updateImport && node.importNode) {
                 const importNode = node.node;
-                const transformedImport = transformImport(importNode, sourceFile);
+                const transformedImport = (0, ast_1.transformImport)(contents, importNode, sourceFile, {
+                    removeImports,
+                    transform: transformSchema,
+                });
                 if (transformedImport) {
                     newContents += transformedImport;
                     continue;
@@ -110,6 +91,7 @@ async function main() {
         //    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");
 }
@@ -129,62 +111,183 @@ function traverse(fileContents, sourceFile, f) {
     });
     return traversed;
 }
-// TODO need to replace class field member, print that and see what happens
 function traverseClass(fileContents, sourceFile, node, f) {
-    let updated = false;
-    // beginning of class...
-    // including comment
-    let klassContents = fileContents.substring(node.getFullStart(), node.members[0].getFullStart());
+    const ci = getTransformClassInfo(fileContents, sourceFile, node);
+    if (!ci) {
+        return false;
+    }
+    let klassContents = `${ci.comment}const ${ci.name} = new ${ci.class}({\n`;
+    let removeImports = [];
+    if (ci.implementsSchema) {
+        removeImports.push("Schema");
+    }
     for (let member of node.members) {
-        if (!isFieldElement(member, sourceFile)) {
-            klassContents += member.getFullText(sourceFile);
-            continue;
-        }
-        // intentionally doesn't parse decorators since we don't need it
-        let fieldMap = "";
-        // fieldMapComment...
-        const comment = getPreText(fileContents, member, sourceFile);
-        if (comment) {
-            fieldMap += comment;
+        const fInfo = getClassElementInfo(fileContents, member, sourceFile);
+        if (!fInfo) {
+            return false;
         }
-        updated = true;
-        // need to change to fields: FieldMap = {code: StringType()};
-        const property = member;
-        const initializer = property.initializer;
-        fieldMap += "fields: FieldMap = {";
-        for (const element of initializer.elements) {
-            const parsed = parseFieldElement(element, sourceFile, fileContents);
-            if (parsed === null) {
-                return false;
-            }
-            const { callEx, name, nameComment, properties } = parsed;
-            let property = "";
-            const fieldComment = getPreText(fileContents, element, sourceFile).trim();
-            if (fieldComment) {
-                property += "\n" + fieldComment + "\n";
-            }
-            if (nameComment) {
-                property += nameComment + "\n";
-            }
-            // e.g. UUIDType, StringType etc
-            let call = callEx.expression.getText(sourceFile);
-            let fnCall = "";
-            if (properties.length) {
-                fnCall = `{${properties.join(",")}}`;
-            }
-            property += `${name}:${call}(${fnCall}),`;
-            fieldMap += property;
+        klassContents += `${fInfo.comment}${fInfo.key}:${fInfo.value},\n`;
+        if (fInfo.type) {
+            removeImports.push(fInfo.type);
         }
-        fieldMap += "}";
-        klassContents += fieldMap;
     }
-    klassContents += "\n}";
+    klassContents += "\n})";
+    if (ci.export && ci.default) {
+        klassContents += `\n export default ${ci.name};`;
+    }
+    else if (ci.export) {
+        klassContents = "export " + klassContents;
+    }
     //  console.debug(klassContents);
-    if (!updated) {
-        return updated;
+    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;
+}
+// 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) {
+    const generic = (0, ast_1.getClassInfo)(fileContents, sourceFile, node);
+    if (!generic) {
+        return;
+    }
+    let className = generic.name;
+    if (!className?.endsWith("Schema")) {
+        className += "Schema";
+    }
+    let implementsSchema = generic.implements?.some((v) => v == "Schema");
+    let classExtends = generic.extends;
+    if (classExtends && classExtends === transformSchema(classExtends)) {
+        return undefined;
+    }
+    if (!className || !node.heritageClauses || !classExtends) {
+        return undefined;
+    }
+    let ci = {
+        ...generic,
+        name: className,
+        class: classExtends,
+        implementsSchema,
+    };
+    return ci;
+}
+// intentionally doesn't parse decorators since we don't need it
+function getClassElementInfo(fileContents, member, sourceFile) {
+    if (isFieldElement(member, sourceFile)) {
+        return getFieldElementInfo(fileContents, member, sourceFile);
+    }
+    if (member.kind === typescript_1.default.SyntaxKind.Constructor) {
+        return getConstructorElementInfo(fileContents, member, sourceFile);
+    }
+    if (member.kind !== typescript_1.default.SyntaxKind.PropertyDeclaration) {
+        return;
+    }
+    // other properties
+    const property = member;
+    if (!property.initializer) {
+        return;
     }
-    f.trackNode({ rawString: klassContents });
-    return updated;
+    const token = property.name;
+    return {
+        key: token.escapedText.toString(),
+        value: property.initializer?.getFullText(sourceFile),
+        comment: (0, ast_1.getPreText)(fileContents, member, sourceFile),
+        type: getType(property, sourceFile),
+    };
+}
+function getType(property, sourceFile) {
+    let propertytype = property.type?.getText(sourceFile) || "";
+    let ends = ["| null", "[]"];
+    for (const end of ends) {
+        if (propertytype.endsWith(end)) {
+            propertytype = propertytype.slice(0, -1 * end.length);
+        }
+    }
+    return propertytype;
+}
+function getFieldElementInfo(fileContents, member, sourceFile) {
+    let fieldMap = "";
+    // need to change to fields: {code: StringType()};
+    const property = member;
+    const initializer = property.initializer;
+    fieldMap += "{";
+    for (const element of initializer.elements) {
+        const parsed = parseFieldElement(element, sourceFile, fileContents);
+        if (parsed === null) {
+            return;
+        }
+        const { callEx, name, nameComment, properties } = parsed;
+        let property = "";
+        const fieldComment = (0, ast_1.getPreText)(fileContents, element, sourceFile).trim();
+        if (fieldComment) {
+            property += "\n" + fieldComment + "\n";
+        }
+        if (nameComment) {
+            property += nameComment + "\n";
+        }
+        // e.g. UUIDType, StringType etc
+        let call = callEx.expression.getText(sourceFile);
+        let fnCall = "";
+        if (properties.length) {
+            fnCall = `{${properties.join(",")}}`;
+        }
+        property += `${name}:${call}(${fnCall}),`;
+        fieldMap += property;
+    }
+    fieldMap += "}";
+    return {
+        key: "fields",
+        value: fieldMap,
+        comment: (0, ast_1.getPreText)(fileContents, member, sourceFile),
+        type: getType(property, sourceFile),
+    };
+}
+function getConstructorElementInfo(fileContents, member, sourceFile) {
+    const c = member;
+    //remove {}
+    let fullText = c.body?.getFullText(sourceFile) || "";
+    fullText = fullText.trim().slice(1, -1).trim();
+    // convert something like
+    /*
+    constructor() {
+      super();
+      this.addPatterns(
+        new Feedback(),
+        new DayOfWeek(),
+        new Feedback(),
+        new DayOfWeek(),
+      );
+    }
+      */
+    // into this.addPatterns(new Feedback(),new DayOfWeek(),new Feedback(),new DayOfWeek(),)
+    const lines = fullText
+        .split("\n")
+        .map((line) => line.trim())
+        .join("")
+        .split(";")
+        .filter((f) => f != "super()" && f != "");
+    // at this point there should be only line for what we handle
+    if (lines.length != 1) {
+        return;
+    }
+    const line = lines[0];
+    const addPatterns = "this.addPatterns(";
+    if (!line.startsWith(addPatterns)) {
+        return;
+    }
+    return {
+        key: "patterns",
+        // remove this.addPatterns at the front, remove trailing ) at the end
+        // if there's a trailing comma, it'll be handled by prettier
+        value: `[${line.slice(addPatterns.length, -1)}]`,
+        comment: "",
+    };
 }
 function isFieldElement(member, sourceFile) {
     if (member.kind !== typescript_1.default.SyntaxKind.PropertyDeclaration) {
@@ -230,7 +333,7 @@ function parseFieldElement(element, sourceFile, fileContents) {
         if (p2.name.escapedText === "name") {
             name = p2.initializer.getText(sourceFile);
             // check for any comment associated with name: "fooo"
-            propertyComment = getPreText(fileContents, p, sourceFile).trim();
+            propertyComment = (0, ast_1.getPreText)(fileContents, p, sourceFile).trim();
         }
         else {
             properties.push(p.getFullText(sourceFile));
@@ -249,40 +352,4 @@ function parseFieldElement(element, sourceFile, fileContents) {
         nameComment: propertyComment,
     };
 }
-function transformImport(importNode, sourceFile) {
-    // 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(",");
-    for (let i = 0; i < imports.length; i++) {
-        const imp = imports[i].trim();
-        if (imp === "Field") {
-            imports[i] = "FieldMap";
-        }
-    }
-    // TODO better to update node instead of doing this but this works for now
-    return ("import " +
-        importText.substring(0, start + 1) +
-        imports.join(", ") +
-        importText.substring(end) +
-        ' from "' +
-        text +
-        '"');
-}
-function getPreText(fileContents, node, sourceFile) {
-    return fileContents.substring(node.getFullStart(), node.getStart(sourceFile));
-}
 Promise.resolve(main());