@snowtop/ent 0.1.0-alpha15 → 0.1.0-alpha20

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) {
+function traverseClass(fileContents, sourceFile, node) {
     const ci = getTransformClassInfo(fileContents, sourceFile, node);
     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,8 +57,11 @@ function traverseClass(fileContents, sourceFile, node, f) {
         klassContents = "export " + klassContents;
     }
     //  console.debug(klassContents);
-    f.trackNode({ rawString: klassContents, removeImports: removeImports });
-    return true;
+    return {
+        rawString: klassContents,
+        removeImports: removeImports,
+        newImports,
+    };
 }
 function transformSchema(str) {
     // only do known class names
@@ -222,7 +143,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 +158,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 +229,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 +284,58 @@ function parseFieldElement(element, sourceFile, fileContents) {
         nameComment: propertyComment,
     };
 }
-Promise.resolve(main());
+// find which of these importPaths is being used and use that to replace
+function findImportPath(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 {
+    constructor() {
+        // we only end up doing this once because we change the schema representation
+        // so safe to run this multiple times
+        this.glob = "src/schema/*.ts";
+        this.prettierGlob = "src/schema/*.ts";
+    }
+    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);
+        if (ret === undefined) {
+            return;
+        }
+        let imports = new Map();
+        const imp = findImportPath(sourceFile);
+        if (imp) {
+            imports.set(imp, 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;

package/scripts/move_generated.js

@@ -1,142 +0,0 @@
-"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/transform_code.d.ts

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

package/scripts/transform_code.js

@@ -1,113 +0,0 @@
-"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.d.ts

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