@snowtop/ent 0.1.0-alpha16 → 0.1.0-alpha160-test2

package/tsc/ast.js

@@ -1,10 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (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.getImportInfo = exports.isRelativeGeneratedImport = exports.isRelativeImport = exports.updateImportPath = exports.transformImport = exports.getClassInfo = exports.getPreText = void 0;
+exports.getCustomInfo = exports.transformRelative = exports.getImportInfo = exports.isSrcGeneratedImport = exports.isRelativeGeneratedImport = exports.isRelativeImport = exports.updateImportPath = exports.transformImport = exports.getClassInfo = exports.getPreText = void 0;
 const typescript_1 = __importDefault(require("typescript"));
+const path = __importStar(require("path"));
+const js_yaml_1 = require("js-yaml");
+const fs = __importStar(require("fs"));
+const const_1 = require("../core/const");
 function getPreText(fileContents, node, sourceFile) {
     return fileContents.substring(node.getFullStart(), node.getStart(sourceFile));
 }
@@ -31,8 +58,7 @@ function getClassInfo(fileContents, sourceFile, node) {
             }
         }
     }
-    // we probably still don't need all of this...
-    if (!className || !node.heritageClauses || !classExtends) {
+    if (!className) {
         return undefined;
     }
     let hasExport = false;
@@ -82,26 +108,22 @@ exports.getClassInfo = getClassInfo;
 function transformImport(fileContents, importNode, sourceFile, opts) {
     // remove quotes too
     const text = importNode.moduleSpecifier.getText(sourceFile).slice(1, -1);
-    if (opts?.transformPath) {
-        if (text !== opts.transformPath) {
-            return;
-        }
-    }
-    else {
-        if (text !== "@snowtop/ent" &&
-            text !== "@snowtop/ent/schema" &&
-            text !== "@snowtop/ent/schema/") {
-            return;
-        }
+    if (text != opts.transformPath) {
+        return;
     }
     const impInfo = getImportInfo(importNode, sourceFile);
     if (!impInfo) {
         return;
     }
-    const { imports, start, end, importText } = impInfo;
+    let { imports, start, end, importText, default: def } = impInfo;
     let removeImportsMap = {};
     if (opts?.removeImports) {
-        opts.removeImports.forEach((imp) => (removeImportsMap[imp] = true));
+        opts.removeImports.forEach((imp) => {
+            removeImportsMap[imp] = true;
+            if (def === imp) {
+                def = "";
+            }
+        });
     }
     let finalImports = new Set();
     for (let i = 0; i < imports.length; i++) {
@@ -121,11 +143,18 @@ function transformImport(fileContents, importNode, sourceFile, opts) {
         opts.newImports.forEach((imp) => finalImports.add(imp));
     }
     const comment = getPreText(fileContents, importNode, sourceFile);
+    if (!finalImports.size) {
+        return;
+    }
     return (comment +
         "import " +
-        importText.substring(0, start + 1) +
+        // add default
+        (def || "") +
+        // should probably always be "{" now that we support default
+        (start >= 0 ? importText.substring(0, start + 1) : "{") +
         Array.from(finalImports).join(", ") +
-        importText.substring(end) +
+        // should probably always be "}"
+        (end >= 0 ? importText.substring(end) : "}") +
         ' from "' +
         text +
         '";');
@@ -165,23 +194,85 @@ function isRelativeGeneratedImport(node, sourceFile) {
         text.indexOf("/generated") !== -1);
 }
 exports.isRelativeGeneratedImport = isRelativeGeneratedImport;
+function isSrcGeneratedImport(node, sourceFile) {
+    const text = node.moduleSpecifier.getText(sourceFile).slice(1, -1);
+    return text.startsWith("src") && text.includes("/generated");
+}
+exports.isSrcGeneratedImport = isSrcGeneratedImport;
+// TODO doesn't support default + {} yet
 function getImportInfo(imp, sourceFile) {
     const importText = imp.importClause?.getText(sourceFile) || "";
     const start = importText.indexOf("{");
     const end = importText.lastIndexOf("}");
     const text = imp.moduleSpecifier.getText(sourceFile).slice(1, -1);
-    if (start === -1 || end === -1) {
+    if ((start === -1 || end === -1) && !importText.length) {
         return;
     }
+    let imports = [];
+    let def;
+    if (start !== -1 && end !== -1) {
+        imports = importText
+            .substring(start + 1, end)
+            //.trim()
+            .split(",");
+    }
+    else {
+        def = importText;
+    }
     return {
         importPath: text,
         importText,
         start,
         end,
-        imports: importText
-            .substring(start + 1, end)
-            //.trim()
-            .split(","),
+        imports,
+        default: def,
     };
 }
 exports.getImportInfo = getImportInfo;
+function transformRelative(file, importPath, relative) {
+    if (!relative || !importPath.startsWith("src")) {
+        return importPath;
+    }
+    const fileFullPath = path.join(process.cwd(), file);
+    const impFullPath = path.join(process.cwd(), importPath);
+    // relative path is from directory
+    return normalizePath(path.relative(path.dirname(fileFullPath), impFullPath));
+}
+exports.transformRelative = transformRelative;
+function normalizePath(p) {
+    if (p.endsWith("..")) {
+        return p + "/";
+    }
+    if (!p.startsWith("..")) {
+        return "./" + p;
+    }
+    return p;
+}
+// also used in parse schema logic
+function getCustomInfo() {
+    let yaml = {};
+    let relativeImports = false;
+    try {
+        yaml = (0, js_yaml_1.load)(fs.readFileSync(path.join(process.cwd(), "ent.yml"), {
+            encoding: "utf8",
+        }));
+        relativeImports = yaml?.codegen?.relativeImports || false;
+        if (yaml?.codegen?.templatizedViewer) {
+            return {
+                viewerInfo: yaml.codegen.templatizedViewer,
+                relativeImports,
+                globalSchemaPath: yaml.globalSchemaPath,
+            };
+        }
+    }
+    catch (e) { }
+    return {
+        viewerInfo: {
+            path: const_1.PACKAGE,
+            name: "Viewer",
+        },
+        relativeImports,
+        globalSchemaPath: yaml.globalSchemaPath,
+    };
+}
+exports.getCustomInfo = getCustomInfo;

package/tsc/compilerOptions.js

@@ -1,7 +1,11 @@
 "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]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/tsc/move_generated.d.ts

@@ -0,0 +1 @@
+export declare function moveGenerated(relativeImports: boolean): void;

package/tsc/move_generated.js

@@ -0,0 +1,164 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (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.moveGenerated = void 0;
+const glob = __importStar(require("glob"));
+const path = __importStar(require("path"));
+const fs = __importStar(require("fs"));
+const typescript_1 = __importDefault(require("typescript"));
+const ast_1 = require("./ast");
+const transform_1 = require("./transform");
+class MoveFiles {
+    constructor(globPath) {
+        this.globPath = globPath;
+    }
+    move() {
+        const files = glob.sync(this.globPath);
+        moveFiles(files);
+    }
+}
+class TransformImports {
+    constructor(glob, prettierGlob, relativeImports, checkRelativeImportsValid) {
+        this.glob = glob;
+        this.prettierGlob = prettierGlob;
+        this.relativeImports = relativeImports;
+        this.checkRelativeImportsValid = checkRelativeImportsValid;
+        this.globOptions = {
+            ignore: ["node_modules/**"],
+        };
+        this.cwd = process.cwd();
+    }
+    traverseChild(sourceFile, contents, file, node) {
+        if (!typescript_1.default.isImportDeclaration(node)) {
+            return { node };
+        }
+        let dirPath = path.join(this.cwd, file, "..");
+        const newImportPath = this.getNewImportPath(node, file, sourceFile, dirPath);
+        if (!newImportPath) {
+            return { node };
+        }
+        const v = (0, ast_1.updateImportPath)(contents, node, sourceFile, newImportPath);
+        return {
+            traversed: true,
+            rawString: v,
+        };
+    }
+    getNewImportPath(node, file, sourceFile, dirPath) {
+        const text = node.moduleSpecifier.getText(sourceFile).slice(1, -1);
+        // it's relative and has generated in there, continue
+        // do relative imports path regardless of if relative imports is on or not
+        if ((0, ast_1.isRelativeGeneratedImport)(node, sourceFile)) {
+            const oldPath = path.join(dirPath, text);
+            const relFromRoot = path.relative(".", oldPath);
+            const conv = transformPath(relFromRoot);
+            if (!conv || conv.newFile === relFromRoot) {
+                return;
+            }
+            return path.relative(dirPath, conv.newFile);
+        }
+        if (this.checkRelativeImportsValid && (0, ast_1.isRelativeImport)(node, sourceFile)) {
+            const parts = file.split(path.sep);
+            if (parts.length === 5 &&
+                parts.slice(0, 3).join(path.sep) ===
+                    ["src", "graphql", "generated"].join(path.sep)) {
+                // we have custom graphql import paths
+                // src/graphql/generated/mutations|resolvers/foo_type.ts
+                // which used to be
+                // src/graphql/mutations|resolvers/generated/foo_type.ts
+                // we probably have a broken import.
+                // try and fix it...
+                let temp = parts[2];
+                parts[2] = parts[3];
+                parts[3] = temp;
+                const oldPath = parts.join(path.sep);
+                let oldDir = path.join(this.cwd, oldPath, "..");
+                let importPath = path.join(oldDir, text);
+                let exists = fs.statSync(importPath + ".ts", { throwIfNoEntry: false });
+                if (!exists) {
+                    // doesn't exist. sadly has to be fixed manually. could theoretically also be a directory but we shouldn't have that
+                    return;
+                }
+                return path.relative(dirPath, importPath);
+            }
+        }
+        // if relative imports, we done.
+        if (this.relativeImports) {
+            return;
+        }
+        // non relative, only transform src paths with generated
+        if ((0, ast_1.isSrcGeneratedImport)(node, sourceFile)) {
+            const conv = transformPath(text);
+            if (!conv || conv.newFile === text) {
+                return;
+            }
+            return conv.newFile;
+        }
+        return;
+    }
+}
+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 moveGenerated(relativeImports) {
+    new MoveFiles("src/ent/**/generated/**/**.ts").move();
+    new MoveFiles("src/graphql/**/generated/**/**.ts").move();
+    (0, transform_1.transform)(new TransformImports("src/ent/**/*.ts", "src/ent/**/*.ts", relativeImports));
+    (0, transform_1.transform)(new TransformImports("src/graphql/**/*.ts", "src/graphql/**/*.ts", relativeImports, true));
+}
+exports.moveGenerated = moveGenerated;

package/tsc/transform.d.ts

@@ -0,0 +1,22 @@
+import * as glob from "glob";
+import ts from "typescript";
+interface TraverseChildResponse {
+    node?: ts.Node;
+    rawString?: string;
+    traversed?: boolean;
+    imports?: Map<string, string[]>;
+    removeImports?: string[];
+    allowSeenImportsAdded?: boolean;
+}
+export interface TransformFile {
+    glob: string;
+    globOptions?: glob.GlobOptions;
+    preprocessFile?: (contents: string, file: string, sourceFile: ts.SourceFile) => boolean;
+    traverseChild(sourceFile: ts.SourceFile, contents: string, file: string, node: ts.Node): TraverseChildResponse | undefined;
+    filter?(files: string[]): string[];
+    fileToWrite?(file: string): string;
+    postProcess?(file: string): void;
+    prettierGlob?: string;
+}
+export declare function transform(transform: TransformFile): void;
+export {};

package/tsc/transform.js

@@ -0,0 +1,182 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (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.transform = void 0;
+const glob = __importStar(require("glob"));
+const typescript_1 = __importDefault(require("typescript"));
+const child_process_1 = require("child_process");
+const fs = __importStar(require("fs"));
+const ast_1 = require("./ast");
+const compilerOptions_1 = require("./compilerOptions");
+function normalizePath(p) {
+    if (p.endsWith("..")) {
+        return p + "/";
+    }
+    return p;
+}
+function transform(transform) {
+    let files = glob.sync(transform.glob, transform.globOptions ?? {});
+    const target = (0, compilerOptions_1.getTargetFromCurrentDir)();
+    if (transform.filter) {
+        const f2 = files.map((f) => (typeof f === "string" ? f : f.path));
+        files = transform.filter(f2);
+    }
+    files.forEach((file) => {
+        let { contents, sourceFile } = (0, compilerOptions_1.createSourceFile)(target, file);
+        let nodes = [];
+        let imports = new Map();
+        let removeImports = [];
+        let traversed = false;
+        let allowSeenImportsAdded = false;
+        let seenImports = new Map();
+        typescript_1.default.forEachChild(sourceFile, function (node) {
+            if (typescript_1.default.isImportDeclaration(node)) {
+                const imp = (0, ast_1.getImportInfo)(node, sourceFile);
+                if (imp) {
+                    imp.imports.forEach((v) => {
+                        v = v.trim();
+                        v && seenImports.set(v, true);
+                    });
+                }
+            }
+            const ret = transform.traverseChild(sourceFile, contents, file, node);
+            if (!ret) {
+                return;
+            }
+            if (ret.node || ret.rawString) {
+                nodes.push(ret);
+            }
+            if (ret.imports) {
+                for (const [k, v] of ret.imports) {
+                    imports.set(k, v);
+                }
+            }
+            if (ret.traversed) {
+                traversed = ret.traversed;
+            }
+            if (ret.removeImports?.length) {
+                removeImports.push(...ret.removeImports);
+            }
+            if (ret.allowSeenImportsAdded) {
+                allowSeenImportsAdded = ret.allowSeenImportsAdded;
+            }
+        });
+        if (!traversed) {
+            return;
+        }
+        let newContents = "";
+        let afterProcessed = false;
+        let seen = new Map();
+        const processAfterImport = () => {
+            // do this for the first non-import node we see
+            // we want to add new imports to end of imports and there's an assumption that imports are ordered
+            // at top of file
+            // TODO account for placement after first comment
+            if (!afterProcessed) {
+                for (const [imp, list] of imports) {
+                    if (seen.has(imp)) {
+                        continue;
+                    }
+                    // this says only add things you haven't seen
+                    // we want to add something we've seen in this case
+                    let final = list;
+                    if (!allowSeenImportsAdded) {
+                        final = list.filter((v) => !seenImports.has(v));
+                    }
+                    if (final.length) {
+                        newContents += `\nimport { ${final.join(", ")} } from "${imp}";\n`;
+                    }
+                }
+                afterProcessed = true;
+            }
+        };
+        for (const node of nodes) {
+            if (node.node) {
+                if (typescript_1.default.isImportDeclaration(node.node)) {
+                    const impInfo = (0, ast_1.getImportInfo)(node.node, sourceFile);
+                    //          console.debug(impInfo);
+                    if (impInfo) {
+                        const impPath = normalizePath(impInfo.importPath);
+                        const list = imports.get(impPath);
+                        // path exists, we care about it
+                        if (list !== undefined) {
+                            let transformed = (0, ast_1.transformImport)(contents, node.node, sourceFile, {
+                                // if we've done this path before, don't try and add
+                                // but still try and do any removals since we don't know which of the imports
+                                // has it
+                                newImports: seen.has(impPath) ? undefined : list,
+                                removeImports,
+                                // don't use normalized path here, we wanna use the path that's in code...
+                                transformPath: impInfo.importPath,
+                            });
+                            if (transformed) {
+                                newContents += transformed;
+                                seen.set(impPath, true);
+                                continue;
+                            }
+                        }
+                    }
+                }
+                else {
+                    if (!typescript_1.default.isExportDeclaration(node.node) &&
+                        !isRequireStatement(node.node, sourceFile)) {
+                        processAfterImport();
+                    }
+                }
+                newContents += node.node.getFullText(sourceFile);
+            }
+            else if (node.rawString) {
+                processAfterImport();
+                newContents += node.rawString;
+            }
+            else {
+                throw new Error(`malformed node with no node or rawString`);
+            }
+        }
+        let writeFile = file;
+        if (transform.fileToWrite) {
+            writeFile = transform.fileToWrite(file);
+        }
+        fs.writeFileSync(writeFile, newContents);
+        if (transform.postProcess) {
+            transform.postProcess(file);
+        }
+    });
+    if (transform.prettierGlob) {
+        (0, child_process_1.execSync)(`prettier ${transform.prettierGlob} --write`);
+    }
+}
+exports.transform = transform;
+function isRequireStatement(node, sourceFile) {
+    if (node.kind !== typescript_1.default.SyntaxKind.VariableStatement) {
+        return false;
+    }
+    const v = node;
+    const text = v.declarationList.declarations[0].getFullText(sourceFile);
+    return text.includes("require(");
+}

package/tsc/transform_action.d.ts

@@ -0,0 +1,22 @@
+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;
+        removeImports?: undefined;
+    } | {
+        rawString: string;
+        traversed: boolean;
+        imports: Map<string, string[]>;
+        removeImports: string[];
+        node?: undefined;
+    } | undefined;
+}