@snowtop/ent 0.1.20 → 0.1.21

package/core/config.d.ts

@@ -52,6 +52,7 @@ interface CodegenConfig {
     userOveriddenFiles?: string[];
     transformLoadMethod?: string;
     transformDeleteMethod?: string;
+    disableDefaultExportForActions?: boolean;
 }
 interface PrettierConfig {
     custom?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snowtop/ent",
-  "version": "0.1.20",
+  "version": "0.1.21",
   "description": "snowtop ent framework",
   "main": "index.js",
   "types": "index.d.ts",

package/scripts/fix_action_exports.d.ts

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

package/scripts/fix_action_exports.js

@@ -0,0 +1,75 @@
+"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;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ast_1 = require("../tsc/ast");
+const transform_1 = require("../tsc/transform");
+const typescript_1 = __importStar(require("typescript"));
+class FixActionExports {
+    constructor() {
+        this.glob = "src/ent/**/actions/*_action.ts";
+        this.prettierGlob = "src/ent/**/actions/*_action.ts";
+    }
+    traverseChild(sourceFile, contents, file, node) {
+        if (!(0, typescript_1.isClassDeclaration)(node)) {
+            return { node };
+        }
+        // only Action classes
+        if (!node.name?.text.endsWith("Action")) {
+            return { node };
+        }
+        const modifiers = typescript_1.default.canHaveModifiers(node)
+            ? typescript_1.default.getModifiers(node)
+            : undefined;
+        const exported = modifiers?.filter((mod) => mod.getText(sourceFile) === "export");
+        const defaultExport = modifiers?.filter((mod) => mod.getText(sourceFile) === "default");
+        // for now, we're only supporting changing from default -> non-default
+        // trivial to support the other way around but don't need it yet
+        if (!exported?.length || !defaultExport?.length) {
+            return { node };
+        }
+        let classInfo = (0, ast_1.getClassInfo)(contents, sourceFile, node, {
+            hasExport: true,
+            hasDefault: false,
+        });
+        if (!classInfo) {
+            // somehow don't have classInfo, bye
+            return { node };
+        }
+        let klassContents = "";
+        for (const mm of node.members) {
+            klassContents += mm.getFullText(sourceFile);
+        }
+        return {
+            traversed: true,
+            rawString: classInfo.wrapClassContents(klassContents),
+        };
+    }
+}
+// ts-node-script --swc --project ./tsconfig.json -r tsconfig-paths/register ../../ts/src/scripts/fix_action_exports.ts
+function main() {
+    const f = new FixActionExports();
+    (0, transform_1.transform)(f);
+}
+main();

package/tsc/ast.d.ts

@@ -9,7 +9,10 @@ export interface ClassInfo {
     implements?: string[];
     wrapClassContents(inner: string): string;
 }
-export declare function getClassInfo(fileContents: string, sourceFile: ts.SourceFile, node: ts.ClassDeclaration): ClassInfo | undefined;
+export declare function getClassInfo(fileContents: string, sourceFile: ts.SourceFile, node: ts.ClassDeclaration, override?: {
+    hasExport: boolean;
+    hasDefault: boolean;
+}): ClassInfo | undefined;
 type transformImportFn = (imp: string) => string;
 interface transformOpts {
     removeImports?: string[];

package/tsc/ast.js

@@ -36,7 +36,7 @@ function getPreText(fileContents, node, sourceFile) {
     return fileContents.substring(node.getFullStart(), node.getStart(sourceFile));
 }
 exports.getPreText = getPreText;
-function getClassInfo(fileContents, sourceFile, node) {
+function getClassInfo(fileContents, sourceFile, node, override) {
     let className = node.name?.text;
     let classExtends;
     let impl = [];
@@ -83,7 +83,11 @@ function getClassInfo(fileContents, sourceFile, node) {
       ${inner}
     }`;
     };
-    if (node.modifiers) {
+    if (override) {
+        hasExport = override.hasExport;
+        hasDefault = override.hasDefault;
+    }
+    else if (node.modifiers) {
         for (const mod of node.modifiers) {
             const text = mod.getText(sourceFile);
             if (text === "export") {

package/tsc/transform.js

@@ -168,7 +168,7 @@ function transform(transform) {
         }
     });
     if (transform.prettierGlob) {
-        (0, child_process_1.execSync)(`prettier ${transform.prettierGlob} --write`);
+        (0, child_process_1.spawnSync)(`prettier`, [transform.prettierGlob, "--write"]);
     }
 }
 exports.transform = transform;