@snowtop/ent 0.2.10 → 0.2.12

package/graphql/graphql.js

@@ -61,11 +61,12 @@ const isCustomType = (type) => {
 };
 exports.isCustomType = isCustomType;
 const isGraphQLScalarType = (type) => {
-    return !!type &&
+    return (!isGraphQLEnumType(type) &&
+        !!type &&
         typeof type === "object" &&
         typeof type.serialize === "function" &&
         typeof type.parseValue === "function" &&
-        typeof type.parseLiteral === "function";
+        typeof type.parseLiteral === "function");
 };
 const isGraphQLEnumType = (type) => {
     return (!!type &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.2.10",
+  "version": "0.2.12",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",
@@ -8,22 +8,22 @@
     "example": "examples"
   },
   "dependencies": {
-    "@types/node": "^25.0.3",
-    "dataloader": "^2.2.3",
-    "glob": "^13.0.0",
-    "js-yaml": "^4.1.1",
-    "luxon": "^3.7.2",
-    "pg": "^8.16.3",
-    "ts-node": "^11.0.0-beta.1",
-    "tsconfig-paths": "^4.2.0",
-    "tslib": "^2.8.1",
-    "typescript": "^5.9.3",
-    "uuid": "^9.0.1"
+    "@types/node": "25.0.3",
+    "dataloader": "2.2.3",
+    "glob": "13.0.0",
+    "js-yaml": "4.1.1",
+    "luxon": "3.7.2",
+    "pg": "8.16.3",
+    "ts-node": "11.0.0-beta.1",
+    "tsconfig-paths": "4.2.0",
+    "tslib": "2.8.1",
+    "typescript": "5.9.3",
+    "uuid": "9.0.1"
   },
   "peerDependencies": {
-    "@swc-node/register": "^1.6.8",
-    "better-sqlite3": "^12.5.0",
-    "graphql": "^16.8.1"
+    "@swc-node/register": "1.6.8",
+    "better-sqlite3": "12.5.0",
+    "graphql": "16.12.0"
   },
   "peerDependenciesMeta": {
     "better-sqlite3": {

package/schema/field.js

@@ -63,13 +63,13 @@ exports.IntegerEnumListType = IntegerEnumListType;
 exports.UUIDListType = UUIDListType;
 const luxon_1 = require("luxon");
 const types_1 = require("util/types");
-const uuid_1 = require("uuid");
 const base_1 = require("../core/base");
 const db_1 = __importStar(require("../core/db"));
 const global_schema_1 = require("../core/global_schema");
 const logger_1 = require("../core/logger");
 const names_1 = require("../names/names");
 const schema_1 = require("./schema");
+const UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 class BaseField {
     logValue(val) {
         if (this.sensitive) {
@@ -133,7 +133,7 @@ class UUIDField extends BaseField {
         return val.placeholderID !== undefined;
     }
     async valid(val) {
-        if (typeof val === "string" && !(0, uuid_1.validate)(val)) {
+        if (typeof val === "string" && !UUID_REGEX.test(val)) {
             return false;
         }
         if (!this.options?.fieldEdge?.enforceSchema) {

package/scripts/custom_graphql.js

@@ -48,6 +48,7 @@ const imports_1 = require("../imports");
 const process_1 = require("process");
 const child_process_1 = require("child_process");
 const const_1 = require("../core/const");
+const stdout_1 = require("./stdout");
 const { parseArgs } = require("./parse_args");
 // need to use the GQLCapture from the package so that when we call GQLCapture.enable()
 // we're affecting the local paths as opposed to a different instance
@@ -243,23 +244,7 @@ async function processJSON(gqlCapture, json) {
         processCustomTypes(json.customTypes, gqlCapture);
     }
 }
-async function captureCustom(filePath, filesCsv, jsonPath, gqlCapture) {
-    if (jsonPath !== undefined) {
-        const json = parseJSONC(jsonPath, fs.readFileSync(jsonPath, {
-            encoding: "utf8",
-        }));
-        processJSON(gqlCapture, json);
-        return;
-    }
-    if (filesCsv !== undefined) {
-        let files = filesCsv.split(",");
-        for (let i = 0; i < files.length; i++) {
-            // TODO fix. we have "src" in the path we get here
-            files[i] = path.join(filePath, "..", files[i]);
-        }
-        await requireFiles(files);
-        return;
-    }
+async function loadGraphQLDecoratorFiles(filePath) {
     // TODO delete all of this eventually
     // TODO configurable paths eventually
     // for now only files that are in the include path of the roots are allowed
@@ -286,11 +271,69 @@ async function captureCustom(filePath, filesCsv, jsonPath, gqlCapture) {
         .filter(fileImportsGraphQLDecorators);
     await requireFiles(files);
 }
+async function captureCustom(filePath, filesCsv, jsonPath, gqlCapture) {
+    if (jsonPath !== undefined) {
+        const json = parseJSONC(jsonPath, fs.readFileSync(jsonPath, {
+            encoding: "utf8",
+        }));
+        await processJSON(gqlCapture, json);
+        await loadGraphQLDecoratorFiles(filePath);
+        return;
+    }
+    if (filesCsv !== undefined) {
+        let files = filesCsv.split(",");
+        for (let i = 0; i < files.length; i++) {
+            // TODO fix. we have "src" in the path we get here
+            files[i] = path.join(filePath, "..", files[i]);
+        }
+        await requireFiles(files);
+        return;
+    }
+    await loadGraphQLDecoratorFiles(filePath);
+}
+const customGraphQLDecoratorImports = new Set([
+    "gqlArgType",
+    "gqlField",
+    "gqlInputObjectType",
+    "gqlInterfaceType",
+    "gqlMutation",
+    "gqlObjectType",
+    "gqlQuery",
+    "gqlUnionType",
+]);
 function fileImportsGraphQLDecorators(file) {
     const contents = fs.readFileSync(file, {
         encoding: "utf8",
     });
-    return /@snowtop\/ent\/graphql(?:\/graphql)?/.test(contents);
+    const sourceFile = typescript_1.default.createSourceFile(file, contents, typescript_1.default.ScriptTarget.ES2015, true);
+    for (const statement of sourceFile.statements) {
+        if (!typescript_1.default.isImportDeclaration(statement)) {
+            continue;
+        }
+        const moduleSpecifier = statement.moduleSpecifier;
+        if (!typescript_1.default.isStringLiteral(moduleSpecifier) ||
+            (moduleSpecifier.text !== "@snowtop/ent/graphql" &&
+                moduleSpecifier.text !== "@snowtop/ent/graphql/graphql")) {
+            continue;
+        }
+        if (statement.importClause?.isTypeOnly) {
+            continue;
+        }
+        const namedBindings = statement.importClause?.namedBindings;
+        if (!namedBindings || !typescript_1.default.isNamedImports(namedBindings)) {
+            continue;
+        }
+        for (const importSpecifier of namedBindings.elements) {
+            if (importSpecifier.isTypeOnly) {
+                continue;
+            }
+            const importedName = importSpecifier.propertyName?.text ?? importSpecifier.name.text;
+            if (customGraphQLDecoratorImports.has(importedName)) {
+                return true;
+            }
+        }
+    }
+    return false;
 }
 async function requireFiles(files) {
     for (const file of files) {
@@ -398,10 +441,6 @@ async function main() {
         importPath: "graphql-type-json",
         type: "GraphQLJSON",
     }, gqlCapture);
-    (0, graphql_1.addCustomType)({
-        importPath: "graphql-scalars",
-        type: "GraphQLByte",
-    }, gqlCapture);
     const [inputsRead, _, __, imports] = await Promise.all([
         readInputs(),
         captureCustom(options.path, options.files, options.json_path, gqlCapture),
@@ -479,7 +518,7 @@ async function main() {
     for (const k in fields) {
         buildClasses(fields[k]);
     }
-    console.log(JSON.stringify({
+    await (0, stdout_1.writeJSONToStdout)({
         args,
         inputs,
         fields,
@@ -491,7 +530,7 @@ async function main() {
         unions,
         files: allFiles,
         customTypes,
-    }));
+    });
 }
 main()
     .then()

package/scripts/read_schema.js

@@ -39,7 +39,8 @@ const { parseArgs } = require("./parse_args");
 const parse_1 = require("../parse_schema/parse");
 const ast_1 = require("../tsc/ast");
 const names_1 = require("../names/names");
-function main() {
+const stdout_1 = require("./stdout");
+async function main() {
     const options = parseArgs(process.argv.slice(2));
     if (!options.path) {
         throw new Error("path required");
@@ -80,16 +81,10 @@ function main() {
         potentialSchemas[(0, names_1.toClassName)(schema)] = s;
     }
     //  console.log(potentialSchemas);
-    // NB: do not change this to async/await
-    // doing so runs it buffer limit on linux (65536 bytes) and we lose data reading in go
-    (0, parse_1.parseSchema)(potentialSchemas, globalSchema).then((result) => {
-        console.log(JSON.stringify(result));
-    });
-}
-try {
-    main();
+    const result = await (0, parse_1.parseSchema)(potentialSchemas, globalSchema);
+    await (0, stdout_1.writeJSONToStdout)(result);
 }
-catch (err) {
+main().catch((err) => {
     console.error(err);
     process.exit(1);
-}
+});

package/scripts/stdout.d.ts

@@ -0,0 +1 @@
+export declare function writeJSONToStdout(value: unknown): Promise<void>;

package/scripts/stdout.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeJSONToStdout = writeJSONToStdout;
+async function writeJSONToStdout(value) {
+    await writeToStdout(JSON.stringify(value));
+}
+async function writeToStdout(payload) {
+    // Bun can exit before a large piped stdout write is fully consumed.
+    await new Promise((resolve, reject) => {
+        process.stdout.write(payload, (err) => {
+            if (err) {
+                reject(err);
+                return;
+            }
+            resolve();
+        });
+    });
+}

package/testutils/db/temp_db.js

@@ -450,8 +450,8 @@ class TempDB {
                 db_1.default.initDB({
                     connectionString: connStr,
                     cfg: {
-                        max: 200,
-                        idleTimeoutMillis: 100,
+                        max: 50,
+                        idleTimeoutMillis: 10000,
                     },
                 });
             }
@@ -653,11 +653,22 @@ function setupPostgres(tables, opts) {
     if (!opts?.disableDeleteAfterEachTest) {
         afterEach(async () => {
             const client = await db_1.default.getInstance().getNewClient();
-            for (const [key, _] of tdb.__getTables()) {
-                const query = `delete from ${key}`;
-                await client.exec(query);
+            let err;
+            let hadErr = false;
+            try {
+                for (const [key, _] of tdb.__getTables()) {
+                    const query = `delete from ${key}`;
+                    await client.exec(query);
+                }
+            }
+            catch (e) {
+                err = e;
+                hadErr = true;
+                throw e;
+            }
+            finally {
+                client.release(hadErr ? (err instanceof Error ? err : true) : undefined);
             }
-            client.release();
         });
     }
     afterAll(async () => {

package/testutils/write.js

@@ -41,6 +41,9 @@ const db_1 = __importStar(require("../core/db"));
 function isSyncClient(client) {
     return client.execSync !== undefined;
 }
+function releaseError(err) {
+    return err instanceof Error ? err : true;
+}
 async function createRowForTest(options, suffix) {
     let client;
     if (db_1.Dialect.SQLite === db_1.default.getDialect()) {
@@ -49,37 +52,58 @@ async function createRowForTest(options, suffix) {
     else {
         client = await db_1.default.getInstance().getNewClient();
     }
+    let err;
+    let hadErr = false;
     try {
         if (isSyncClient(client)) {
             return (0, ent_1.createRowSync)(client, options, suffix || "");
         }
         return (0, ent_1.createRow)(client, options, suffix || "");
     }
+    catch (e) {
+        err = e;
+        hadErr = true;
+        throw e;
+    }
     finally {
-        client.release();
+        client.release(hadErr ? releaseError(err) : undefined);
     }
 }
 async function editRowForTest(options, suffix) {
     const client = await db_1.default.getInstance().getNewClient();
+    let err;
+    let hadErr = false;
     try {
         if (isSyncClient(client)) {
             return (0, ent_1.editRowSync)(client, options, suffix || "");
         }
         return (0, ent_1.editRow)(client, options, suffix);
     }
+    catch (e) {
+        err = e;
+        hadErr = true;
+        throw e;
+    }
     finally {
-        client.release();
+        client.release(hadErr ? releaseError(err) : undefined);
     }
 }
 async function deleteRowsForTest(options, cls) {
     const client = await db_1.default.getInstance().getNewClient();
+    let err;
+    let hadErr = false;
     try {
         if (isSyncClient(client)) {
             return (0, ent_1.deleteRowsSync)(client, options, cls);
         }
         return (0, ent_1.deleteRows)(client, options, cls);
     }
+    catch (e) {
+        err = e;
+        hadErr = true;
+        throw e;
+    }
     finally {
-        client.release();
+        client.release(hadErr ? releaseError(err) : undefined);
     }
 }

package/scripts/migrate_v0.1.d.ts

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

package/scripts/migrate_v0.1.js

@@ -1,33 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const { parseArgs } = require("./parse_args");
-const transform_1 = require("../tsc/transform");
-const transform_schema_1 = require("../tsc/transform_schema");
-const transform_ent_1 = require("../tsc/transform_ent");
-const move_generated_1 = require("../tsc/move_generated");
-const transform_action_1 = require("../tsc/transform_action");
-const ast_1 = require("../tsc/ast");
-// todo-sqlite
-//  ts-node-script --swc --project ./tsconfig.json -r tsconfig-paths/register ../../ts/src/scripts/migrate_v0.1.ts --transform_schema --old_base_class BaseEntTodoSchema --new_schema_class TodoEntSchema  --transform_path src/schema/patterns/base
-function main() {
-    const customInfo = (0, ast_1.getCustomInfo)();
-    const options = parseArgs(process.argv.slice(2));
-    // install 0.1.x dependencies
-    // maybe provide options to make this easier if someone wants to do this in steps to see what's happening
-    if (options.move_generated) {
-        (0, move_generated_1.moveGenerated)(customInfo.relativeImports);
-    }
-    // codegen  write-all --disable-custom-graphql
-    if (options.transform_schema) {
-        (0, transform_1.transform)(new transform_schema_1.TransformSchema(customInfo.relativeImports, options.old_base_class, options.new_schema_class, options.transform_path));
-    }
-    // codegen write-all --disable-custom-graphql
-    if (options.transform_ent) {
-        (0, transform_1.transform)(new transform_ent_1.TransformEnt());
-    }
-    if (options.transform_action) {
-        (0, transform_1.transform)(new transform_action_1.TransformAction(customInfo));
-    }
-    // codegen write-all
-}
-main();

package/tsc/move_generated.d.ts

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

package/tsc/move_generated.js

@@ -1,173 +0,0 @@
-"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 () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __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 = moveGenerated;
-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, formatGlob, relativeImports, checkRelativeImportsValid) {
-        this.glob = glob;
-        this.formatGlob = formatGlob;
-        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));
-}

package/tsc/transform_action.d.ts

@@ -1,22 +0,0 @@
-import ts from "typescript";
-import { customInfo } from "../tsc/ast";
-import { TransformFile } from "./transform";
-export declare class TransformAction implements TransformFile {
-    private customInfo;
-    glob: string;
-    formatGlob: 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;
-}

package/tsc/transform_action.js

@@ -1,193 +0,0 @@
-"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 () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __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 viewer_1 = require("../core/viewer");
-const path = __importStar(require("path"));
-const names_1 = require("../names/names");
-// returns input and importPath
-function getBaseFileInfo(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 {
-                    input: inputs[0],
-                    importPath: impInfo.importPath,
-                };
-            }
-            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 {
-                        input: inputs[0],
-                        importPath: impInfo.importPath,
-                    };
-                }
-            }
-        }
-    }
-    return null;
-}
-let m = {
-    triggers: {
-        m: "getTriggers",
-        i: "Trigger",
-        suffix: "Triggers",
-    },
-    observers: {
-        m: "getObservers",
-        i: "Observer",
-        suffix: "Observers",
-    },
-    validators: {
-        m: "getValidators",
-        i: "Validator",
-        suffix: "Validators",
-    },
-};
-function getConversionInfo(mm, actionName) {
-    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,
-        // CreateFooActionTriggers etc
-        methodType: actionName + v.suffix,
-    };
-}
-class TransformAction {
-    constructor(customInfo) {
-        this.customInfo = customInfo;
-        this.glob = "src/ent/**/actions/**/*_action.ts";
-        this.formatGlob = "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 actionName = action.constructor.name;
-        const builder = action.builder.constructor.name;
-        const nodeName = action.builder.ent.name;
-        const viewer = this.customInfo.viewerInfo.name;
-        const baseInfo = getBaseFileInfo(file, classInfo, sourceFile);
-        if (!baseInfo) {
-            return;
-        }
-        let klassContents = "";
-        let traversed = false;
-        let newImports = [];
-        for (const mm of node.members) {
-            const conv = getConversionInfo(mm, actionName);
-            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.methodType} {
-            return ${pp}
-          }`;
-                newImports.push(conv.methodType);
-                klassContents += (0, ast_1.getPreText)(contents, mm, sourceFile) + code;
-            }
-            else {
-                klassContents += mm.getFullText(sourceFile);
-            }
-        }
-        const builderPath = `src/ent/generated/${(0, names_1.toFilePath)(nodeName)}/actions/${(0, names_1.toFilePath)(builder)}`;
-        let imports = new Map([
-            [
-                (0, ast_1.transformRelative)(file, this.customInfo.viewerInfo.path, this.customInfo.relativeImports),
-                [viewer],
-            ],
-            [
-                (0, ast_1.transformRelative)(file, baseInfo.importPath, this.customInfo.relativeImports),
-                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,
-            removeImports: ["Trigger", "Observer", "Validator"],
-            // not removing FooBuilder incase it's still somehow used in type of inline builders
-        };
-    }
-}
-exports.TransformAction = TransformAction;

package/tsc/transform_ent.d.ts

@@ -1,17 +0,0 @@
-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;
-    formatGlob: string;
-}

package/tsc/transform_ent.js

@@ -1,60 +0,0 @@
-"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 const_1 = require("../core/const");
-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.formatGlob = "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([[const_1.PACKAGE, ["PrivacyPolicy"]]]),
-        };
-    }
-}
-exports.TransformEnt = TransformEnt;

package/tsc/transform_schema.d.ts

@@ -1,27 +0,0 @@
-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;
-    formatGlob: string;
-}

package/tsc/transform_schema.js

@@ -1,394 +0,0 @@
-"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 () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __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.TransformSchema = void 0;
-const typescript_1 = __importDefault(require("typescript"));
-const fs = __importStar(require("fs"));
-const path_1 = __importDefault(require("path"));
-const ast_1 = require("../tsc/ast");
-const const_1 = require("../core/const");
-function traverseClass(fileContents, sourceFile, node, transformSchema) {
-    const ci = getTransformClassInfo(fileContents, sourceFile, node, transformSchema);
-    if (!ci) {
-        return;
-    }
-    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;
-        }
-        klassContents += `${fInfo.comment}${fInfo.key}:${fInfo.value},\n`;
-        if (fInfo.type) {
-            removeImports.push(fInfo.type);
-        }
-    }
-    klassContents += "\n})";
-    if (ci.export && ci.default) {
-        klassContents += `\n export default ${ci.name};`;
-    }
-    else if (ci.export) {
-        klassContents = "export " + klassContents;
-    }
-    //  console.debug(klassContents);
-    return {
-        rawString: klassContents,
-        removeImports: removeImports,
-        newImports,
-    };
-}
-function getTransformClassInfo(fileContents, sourceFile, node, transformSchema) {
-    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;
-    // nothing transformed here, so nothing to do here
-    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(fileContents, 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;
-    }
-    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, suffix } = 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})${suffix || ""},`;
-        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 the formatter
-        value: `[${line.slice(addPatterns.length, -1)}]`,
-        comment: "",
-    };
-}
-function isFieldElement(fileContents, member, sourceFile) {
-    if (member.kind !== typescript_1.default.SyntaxKind.PropertyDeclaration) {
-        return false;
-    }
-    const property = member;
-    const token = property.name;
-    if (token.escapedText !== "fields") {
-        return false;
-    }
-    const propertytype = property.type?.getText(sourceFile);
-    if (propertytype !== "Field[]") {
-        return false;
-    }
-    if (property.initializer?.kind !== typescript_1.default.SyntaxKind.ArrayLiteralExpression) {
-        throwErr(fileContents, member, "invalid array type");
-        return false;
-    }
-    return true;
-}
-// if there's an error transforming any of the schemas, we should stop...
-function throwErr(fileContents, node, error) {
-    console.error(error);
-    throw new Error(`error transforming this field ${fileContents.substring(node.getFullStart(), node.getEnd())}`);
-}
-function parseFieldElement(element, sourceFile, fileContents, nested) {
-    if (element.kind !== typescript_1.default.SyntaxKind.CallExpression &&
-        element.kind !== typescript_1.default.SyntaxKind.PropertyAccessExpression) {
-        throwErr(fileContents, element, `skipped unknown (non-call|non-property) expression ${element.kind}`);
-        return null;
-    }
-    if (element.kind === typescript_1.default.SyntaxKind.PropertyAccessExpression) {
-        const ret = parseFieldElement(element.expression, sourceFile, fileContents, true);
-        if (ret !== null) {
-            if (!nested) {
-                ret.suffix = fileContents.substring(ret.callEx.getEnd(), element.getEnd());
-            }
-            return ret;
-        }
-    }
-    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;
-            }
-        }
-        throwErr(fileContents, element, "callExpression with arguments not of length 1");
-    }
-    let arg = callEx.arguments[0];
-    if (arg.kind !== typescript_1.default.SyntaxKind.ObjectLiteralExpression) {
-        // this and the check above for PropertyAccessExpression are to handle things like
-        // FooType({
-        /// ...
-        // }).function(blah)
-        const ret = parseFieldElement(callEx.expression, sourceFile, fileContents, true);
-        if (ret !== null) {
-            if (!nested) {
-                ret.suffix = fileContents.substring(ret.callEx.getEnd(), callEx.getEnd());
-            }
-            return ret;
-        }
-        throwErr(fileContents, element, `not objectLiteralExpression. kind ${arg.kind}`);
-        return null;
-    }
-    let expr = arg;
-    let name = "";
-    let propertyComment;
-    let properties = [];
-    for (const p of expr.properties) {
-        const p2 = p;
-        // found name property
-        if (p2.name.escapedText === "name") {
-            name = p2.initializer.getText(sourceFile);
-            // check for any comment associated with name: "fooo"
-            propertyComment = (0, ast_1.getPreText)(fileContents, p, sourceFile).trim();
-        }
-        else {
-            properties.push(p.getFullText(sourceFile));
-        }
-    }
-    if (!name) {
-        throwErr(fileContents, element, `couldn't find name property`);
-        return null;
-    }
-    // remove quotes
-    name = name.slice(1, -1);
-    return {
-        callEx,
-        name,
-        properties,
-        nameComment: propertyComment,
-    };
-}
-// find which of these importPaths is being used and use that to replace
-function findSchemaImportPath(sourceFile) {
-    const paths = {
-        [const_1.PACKAGE]: true,
-        [const_1.SCHEMA_PATH]: true,
-        [`${const_1.SCHEMA_PATH}/`]: 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.formatGlob = "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;