maishu-scripts 1.4.0 → 1.4.1

package/out/modules/actions/babel-compile.d.ts

@@ -1,3 +1,3 @@
 import * as babel from "@babel/core";
-import { FileAction } from "../../types";
-export declare function create(babelOptions?: babel.TransformOptions): FileAction;
+import { FileAction, JavaScriptExtension } from "../../types";
+export declare function create(defaultBabelOptions?: babel.TransformOptions, outExit?: JavaScriptExtension): FileAction;

package/out/modules/actions/babel-compile.js

@@ -39,26 +39,30 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const errors_1 = require("../errors");
 const project_compiler_1 = require("../project-compiler");
-const outExt = project_compiler_1.ProjectCompiler.tsOutExt;
-function create(babelOptions) {
+// const outExt = ProjectCompiler.tsOutExt;
+function create(defaultBabelOptions, outExit) {
     const action = (sourcePath, outputPath, projectPath) => {
-        if (!babelOptions) {
-            let bablePath;
-            let sourceDir = path.dirname(sourcePath);
-            if (projectPath) {
-                let c = project_compiler_1.ProjectCompiler.getBabelConfig(projectPath, sourceDir);
-                bablePath = c.path;
-                babelOptions = c.options;
-            }
-            else {
-                babelOptions = project_compiler_1.ProjectCompiler.getDefaultBabelConfig();
-                bablePath = '';
-            }
-            babelOptions.filename = sourcePath;
-            babelOptions.code = false;
-            babelOptions.ast = true;
+        outExit = outExit || ".js";
+        if (defaultBabelOptions) {
+            return compileFile(sourcePath, outputPath, projectPath, defaultBabelOptions, outExit);
         }
-        return compileFile(sourcePath, outputPath, projectPath, babelOptions);
+        // 如果没有 babelOptions，则尝试从项目目录查找 babel 配置文件，如果没有，则使用默认配置。
+        let babelOptions;
+        let bablePath;
+        let sourceDir = path.dirname(sourcePath);
+        if (projectPath) {
+            let c = project_compiler_1.ProjectCompiler.getBabelConfig(projectPath, sourceDir);
+            bablePath = c.path;
+            babelOptions = c.options;
+        }
+        else {
+            babelOptions = project_compiler_1.ProjectCompiler.getDefaultBabelConfig();
+            bablePath = '';
+        }
+        babelOptions.filename = sourcePath;
+        babelOptions.code = false;
+        babelOptions.ast = true;
+        return compileFile(sourcePath, outputPath, projectPath, babelOptions, outExit);
     };
     return action;
 }
@@ -68,7 +72,7 @@ function create(babelOptions) {
  * @param outputPath 输出目录
  * @param projectPath 项目路径
  * */
-async function compileFile(sourcePath, outputPath, projectPath, babelOptions) {
+async function compileFile(sourcePath, outputPath, projectPath, babelOptions, outExt) {
     if (!sourcePath)
         throw errors_1.errors.argumentNull("sourcePath");
     if (!outputPath)
@@ -107,7 +111,7 @@ async function compileFile(sourcePath, outputPath, projectPath, babelOptions) {
     let ast = fileResult.ast;
     if (!ast)
         throw errors_1.errors.compileError(sourcePath);
-    new ImportPathRewrite(sourcePath, ast);
+    new ImportPathRewrite(sourcePath, ast, outExt);
     let r = babel.transformFromAstSync(ast, undefined, {
         filename: sourcePath, plugins: babelOptions.plugins,
         presets: babelOptions.presets, sourceMaps: babelOptions.sourceMaps
@@ -115,7 +119,7 @@ async function compileFile(sourcePath, outputPath, projectPath, babelOptions) {
     if (!r || r.code == null)
         throw errors_1.errors.compileError(sourcePath);
     let ext = extname(sourcePath);
-    let outExt = fileOutExt(sourcePath);
+    //let outExt = fileOutExt(sourcePath);
     let targetPath = path.join(outputPath, path.basename(sourcePath).replace(ext, outExt)); //sourcePath.replace(new RegExp(ext + "$"), outExt).replace(path.dirname(sourcePath), outDir);
     let outDirPath = path.resolve(targetPath, "..");
     let mapPath = targetPath + ".map";
@@ -144,18 +148,20 @@ function extname(file) {
  * 获取源文件所对应生成文件的扩展名
  * @param file 源文件名
  * */
-function fileOutExt(file) {
-    let ext = extname(file);
-    if (ext === ".ts")
-        return outExt;
-    if (ext === ".tsx")
-        return outExt;
-    return ext;
-}
+// function fileOutExt(file: string) {
+//     let ext = extname(file);
+//     if (ext === ".ts")
+//         return outExt;
+//     if (ext === ".tsx")
+//         return outExt;
+//     return ext;
+// }
 class ImportPathRewrite {
     filePath;
-    constructor(filePath, node) {
+    outExt;
+    constructor(filePath, node, outExt) {
         this.filePath = filePath;
+        this.outExt = outExt;
         this.traverse(node);
     }
     traverse(node) {
@@ -169,14 +175,14 @@ class ImportPathRewrite {
             case "ImportDeclaration":
                 if (node.source.type === "StringLiteral" && node.source.value.startsWith(".")) {
                     let ext = extname(node.source.value);
-                    if (ext != outExt) {
+                    if (ext != this.outExt) {
                         let dir = path.dirname(this.filePath);
                         let fullPath = path.join(dir, node.source.value);
                         console.log(`ImportDeclaration: ${fullPath} -> ${ext}`);
                         if (fs.existsSync(fullPath) && fs.statSync(fullPath).isDirectory()) {
                             node.source.value = node.source.value + "/index";
                         }
-                        node.source.value += outExt;
+                        node.source.value += this.outExt;
                     }
                 }
                 break;

package/out/modules/actions/ts-compile.d.ts

@@ -1,5 +1,5 @@
 import * as ts from 'typescript';
-import { FileAction } from '../../types';
-export declare function create(compilerOptions?: ts.CompilerOptions): FileAction;
+import { FileAction, JavaScriptExtension } from '../../types';
+export declare function create(defaultCompilerOptions?: ts.CompilerOptions, outExt?: JavaScriptExtension): FileAction;
 export declare function getTypescriptConfig(projectPath: string, directoryPath: string): ts.CompilerOptions;
 export declare function findTypeScriptConfigPath(projectPath: string, directoryPath: string): string | null;

package/out/modules/actions/ts-compile.js

@@ -40,14 +40,16 @@ const ts = __importStar(require("typescript"));
 const errors_1 = require("../errors");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
-const project_compiler_1 = require("../project-compiler");
 const TS_CONFIG_FILE = 'tsconfig.json';
-function create(compilerOptions) {
+function create(defaultCompilerOptions, outExt) {
+    outExt = outExt || ".js";
     const action = async (filePath, outDir, projectPath) => {
-        if (!compilerOptions) {
-            compilerOptions = getTypescriptConfig(projectPath, path.dirname(filePath));
+        if (defaultCompilerOptions) {
+            return compileFile(filePath, outDir, projectPath, defaultCompilerOptions, outExt);
         }
-        return compileFile(filePath, outDir, projectPath, compilerOptions);
+        // 如果没有指定默认编译选项，则尝试从项目目录查找 tsconfig.json 文件，并使用其中的配置进行编译
+        const compilerOptions = getTypescriptConfig(projectPath, path.dirname(filePath));
+        return compileFile(filePath, outDir, projectPath, compilerOptions, outExt);
     };
     return action;
 }
@@ -57,7 +59,7 @@ function create(compilerOptions) {
  * @param outDir 输出目录，相对于项目路径
  * @param projectPath 项目路径，绝对路径
  * */
-async function compileFile(filePath, outDir, projectPath, compilerOptions) {
+async function compileFile(filePath, outDir, projectPath, compilerOptions, outExt) {
     if (!filePath)
         throw errors_1.errors.argumentNull('sourcePath');
     if (!outDir)
@@ -68,7 +70,6 @@ async function compileFile(filePath, outDir, projectPath, compilerOptions) {
     // let compilerOptions = getTypescriptConfig(projectPath, path.dirname(filePath));
     let result = ts.transpileModule(content, { compilerOptions });
     let ext = path.extname(filePath);
-    let outExt = project_compiler_1.ProjectCompiler.tsOutExt;
     let targetPath = path.join(projectPath, outDir, path.basename(filePath).replace(ext, outExt));
     let outDirPath = path.resolve(targetPath, "..");
     if (!fs.existsSync(outDirPath))

package/out/modules/compile.js

@@ -126,11 +126,7 @@ function generateCodeByOptions(options) {
             console.log(`Skip ${filePath}`);
             continue;
         }
-        fileActions = fileActions || function (fileName) {
-            const ext = path.extname(fileName);
-            return configs_1.default.fileActions[ext];
-        };
-        let action = fileActions(filePath);
+        let action = fileActions?.(filePath) || configs_1.default.fileActions[ext];
         if (action) {
             action(filePath, outDir, projectPath);
             if (callback) {
@@ -150,7 +146,9 @@ function generateCodeByOptions(options) {
 function watchDirectoryByOptions(options) {
     let { sourceDir, outDir, projectPath, skipFiles, fileAction: fileActions, callback } = options;
     (0, node_watch_1.default)(sourceDir, { recursive: true }, async (evt, name) => {
-        const filePath = name;
+        const filePath = name.replace(/\\/g, "/");
+        sourceDir = sourceDir.replace(/\\/g, "/");
+        outDir = outDir.replace(/\\/g, "/");
         const ext = extname(filePath);
         skipFiles = skipFiles || configs_1.default.skipFiles[ext] || [];
         let isSkip = skipFiles.some(pattern => pattern.test(filePath)); //isIgnoredFile(filePath);//skipFiles.some(pattern => new RegExp(pattern).test(filePath));
@@ -166,10 +164,10 @@ function watchDirectoryByOptions(options) {
             return;
         }
         try {
-            let outPath = path.dirname(name).replace(sourceDir, outDir);
-            action(name, outPath, projectPath);
+            let outPath = path.dirname(filePath).replace(sourceDir, outDir);
+            action(filePath, outPath, projectPath);
             if (callback)
-                callback(name, outPath, projectPath);
+                callback(filePath, outPath, projectPath);
         }
         catch (e) {
             console.error(e);

package/out/types.d.ts

@@ -1 +1,2 @@
 export type FileAction = (filePath: string, outPath: string, projectPath: string) => void;
+export type JavaScriptExtension = ".js" | ".mjs" | ".cjs";

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "maishu-scripts",
-    "version": "1.4.0",
+    "version": "1.4.1",
     "description": "用于对 node 项目进行代码生成，打包，运行",
     "dependencies": {
         "@babel/core": "^7.24.3",

package/src/modules/actions/babel-compile.ts

@@ -4,31 +4,37 @@ import * as fs from "fs";
 import * as path from "path";
 import { errors } from "../errors";
 import { ProjectCompiler } from "../project-compiler";
-import { FileAction } from "../../types";
+import { FileAction, JavaScriptExtension } from "../../types";
 
-const outExt = ProjectCompiler.tsOutExt;
+// const outExt = ProjectCompiler.tsOutExt;
 
 
-export function create(babelOptions?: babel.TransformOptions): FileAction {
+export function create(defaultBabelOptions?: babel.TransformOptions, outExit?: JavaScriptExtension): FileAction {
     const action: FileAction = (sourcePath: string, outputPath: string, projectPath: string) => {
-        if (!babelOptions) {
-            let bablePath: string;
-            let sourceDir = path.dirname(sourcePath);
-            if (projectPath) {
-                let c = ProjectCompiler.getBabelConfig(projectPath, sourceDir);
-                bablePath = c.path;
-                babelOptions = c.options;
-            }
-            else {
-                babelOptions = ProjectCompiler.getDefaultBabelConfig();
-                bablePath = '';
-            }
-            babelOptions.filename = sourcePath;
-            babelOptions.code = false;
-            babelOptions.ast = true;
+        outExit = outExit || ".js";
+        if (defaultBabelOptions) {
+            return compileFile(sourcePath, outputPath, projectPath, defaultBabelOptions, outExit);
         }
 
-        return compileFile(sourcePath, outputPath, projectPath, babelOptions);
+        // 如果没有 babelOptions，则尝试从项目目录查找 babel 配置文件，如果没有，则使用默认配置。
+        let babelOptions: babel.TransformOptions;
+        let bablePath: string;
+        let sourceDir = path.dirname(sourcePath);
+        if (projectPath) {
+            let c = ProjectCompiler.getBabelConfig(projectPath, sourceDir);
+            bablePath = c.path;
+            babelOptions = c.options;
+        }
+        else {
+            babelOptions = ProjectCompiler.getDefaultBabelConfig();
+            bablePath = '';
+        }
+
+        babelOptions.filename = sourcePath;
+        babelOptions.code = false;
+        babelOptions.ast = true;
+
+        return compileFile(sourcePath, outputPath, projectPath, babelOptions, outExit);
     }
     return action;
 }
@@ -39,7 +45,7 @@ export function create(babelOptions?: babel.TransformOptions): FileAction {
  * @param outputPath 输出目录
  * @param projectPath 项目路径
  * */
-async function compileFile(sourcePath: string, outputPath: string, projectPath: string, babelOptions: babel.TransformOptions) {
+async function compileFile(sourcePath: string, outputPath: string, projectPath: string, babelOptions: babel.TransformOptions, outExt: JavaScriptExtension) {
     if (!sourcePath) throw errors.argumentNull("sourcePath");
     if (!outputPath) throw errors.argumentNull("outputPath");
     if (!projectPath) throw errors.argumentNull("projectPath");
@@ -82,7 +88,7 @@ async function compileFile(sourcePath: string, outputPath: string, projectPath:
     if (!ast)
         throw errors.compileError(sourcePath);
 
-    new ImportPathRewrite(sourcePath, ast);
+    new ImportPathRewrite(sourcePath, ast, outExt);
     let r = babel.transformFromAstSync(ast, undefined, {
         filename: sourcePath, plugins: babelOptions.plugins,
         presets: babelOptions.presets, sourceMaps: babelOptions.sourceMaps
@@ -91,7 +97,7 @@ async function compileFile(sourcePath: string, outputPath: string, projectPath:
         throw errors.compileError(sourcePath);
 
     let ext = extname(sourcePath);
-    let outExt = fileOutExt(sourcePath);
+    //let outExt = fileOutExt(sourcePath);
     let targetPath = path.join(outputPath, path.basename(sourcePath).replace(ext, outExt));//sourcePath.replace(new RegExp(ext + "$"), outExt).replace(path.dirname(sourcePath), outDir);
     let outDirPath = path.resolve(targetPath, "..");
 
@@ -128,20 +134,20 @@ function extname(file: string) {
  * 获取源文件所对应生成文件的扩展名 
  * @param file 源文件名
  * */
-function fileOutExt(file: string) {
-    let ext = extname(file);
-    if (ext === ".ts")
-        return outExt;
+// function fileOutExt(file: string) {
+//     let ext = extname(file);
+//     if (ext === ".ts")
+//         return outExt;
 
-    if (ext === ".tsx")
-        return outExt;
+//     if (ext === ".tsx")
+//         return outExt;
 
-    return ext;
-}
+//     return ext;
+// }
 
 
 class ImportPathRewrite {
-    constructor(private filePath: string, node: babel.types.File) {
+    constructor(private filePath: string, node: babel.types.File, private outExt: JavaScriptExtension) {
         this.traverse(node);
     }
 
@@ -156,14 +162,14 @@ class ImportPathRewrite {
             case "ImportDeclaration":
                 if (node.source.type === "StringLiteral" && node.source.value.startsWith(".")) {
                     let ext = extname(node.source.value);
-                    if (ext != outExt) {
+                    if (ext != this.outExt) {
                         let dir = path.dirname(this.filePath);
                         let fullPath = path.join(dir, node.source.value);
                         console.log(`ImportDeclaration: ${fullPath} -> ${ext}`)
                         if (fs.existsSync(fullPath) && fs.statSync(fullPath).isDirectory()) {
                             node.source.value = node.source.value + "/index";
                         }
-                        node.source.value += outExt;
+                        node.source.value += this.outExt;
                     }
                 }
                 break;

package/src/modules/actions/ts-compile.ts

@@ -3,7 +3,7 @@ import { errors } from '../errors';
 import * as fs from 'fs';
 import * as path from 'path';
 import { ProjectCompiler } from '../project-compiler';
-import { FileAction } from '../../types';
+import { FileAction, JavaScriptExtension } from '../../types';
 
 const TS_CONFIG_FILE = 'tsconfig.json';
 
@@ -11,12 +11,16 @@ type TypeScriptProjectConfig = {
     compilerOptions: ts.CompilerOptions;
 }
 
-export function create(compilerOptions?: ts.CompilerOptions): FileAction {
+export function create(defaultCompilerOptions?: ts.CompilerOptions, outExt?: JavaScriptExtension): FileAction {
+    outExt = outExt || ".js";
     const action: FileAction = async (filePath: string, outDir: string, projectPath: string) => {
-        if (!compilerOptions) {
-            compilerOptions = getTypescriptConfig(projectPath, path.dirname(filePath));
+        if (defaultCompilerOptions) {
+            return compileFile(filePath, outDir, projectPath, defaultCompilerOptions, outExt);
         }
-        return compileFile(filePath, outDir, projectPath, compilerOptions)
+
+        // 如果没有指定默认编译选项，则尝试从项目目录查找 tsconfig.json 文件，并使用其中的配置进行编译
+        const compilerOptions = getTypescriptConfig(projectPath, path.dirname(filePath));
+        return compileFile(filePath, outDir, projectPath, compilerOptions, outExt);
     }
 
     return action;
@@ -28,7 +32,7 @@ export function create(compilerOptions?: ts.CompilerOptions): FileAction {
  * @param outDir 输出目录，相对于项目路径
  * @param projectPath 项目路径，绝对路径
  * */
-async function compileFile(filePath: string, outDir: string, projectPath: string, compilerOptions: ts.CompilerOptions) {
+async function compileFile(filePath: string, outDir: string, projectPath: string, compilerOptions: ts.CompilerOptions, outExt: JavaScriptExtension) {
     if (!filePath)
         throw errors.argumentNull('sourcePath');
     if (!outDir)
@@ -42,7 +46,6 @@ async function compileFile(filePath: string, outDir: string, projectPath: string
     let result = ts.transpileModule(content, { compilerOptions });
 
     let ext = path.extname(filePath);
-    let outExt = ProjectCompiler.tsOutExt;
     let targetPath = path.join(projectPath, outDir, path.basename(filePath).replace(ext, outExt));
     let outDirPath = path.resolve(targetPath, "..");
 

package/src/modules/compile.test.ts

@@ -143,6 +143,7 @@ describe("Compile Test", function () {
 
         // 在 srcPath 中创建文件
         let filePath = path.join(srcPath, "test.txt");
+        filePath = filePath.replace(/\\/g, "/");
         fs.writeFileSync(filePath, "test");
         const fileAction = jest.fn();
 

package/src/modules/compile.ts

@@ -116,11 +116,7 @@ function generateCodeByOptions(options: Options) {
             continue;
         }
 
-        fileActions = fileActions || function (fileName: string) {
-            const ext = path.extname(fileName);
-            return configs.fileActions[ext];
-        };
-        let action = fileActions(filePath);
+        let action = fileActions?.(filePath) || configs.fileActions[ext];
         if (action) {
             action(filePath, outDir, projectPath);
             if (callback) {
@@ -143,7 +139,10 @@ function watchDirectoryByOptions(options: Options) {
     let { sourceDir, outDir, projectPath, skipFiles, fileAction: fileActions, callback } = options;
 
     watch(sourceDir, { recursive: true }, async (evt, name) => {
-        const filePath = name;
+        const filePath = name.replace(/\\/g, "/");
+        sourceDir = sourceDir.replace(/\\/g, "/");
+        outDir = outDir.replace(/\\/g, "/");
+
         const ext = extname(filePath);
         skipFiles = skipFiles || configs.skipFiles[ext] || [];
         let isSkip = skipFiles.some(pattern => pattern.test(filePath));//isIgnoredFile(filePath);//skipFiles.some(pattern => new RegExp(pattern).test(filePath));
@@ -162,10 +161,10 @@ function watchDirectoryByOptions(options: Options) {
         }
 
         try {
-            let outPath = path.dirname(name).replace(sourceDir, outDir);
-            action(name, outPath, projectPath);
+            let outPath = path.dirname(filePath).replace(sourceDir, outDir);
+            action(filePath, outPath, projectPath);
             if (callback)
-                callback(name, outPath, projectPath);
+                callback(filePath, outPath, projectPath);
         }
         catch (e) {
             console.error(e);

package/src/types.ts

@@ -1 +1,2 @@
-export type FileAction = (filePath: string, outPath: string, projectPath: string) => void;
+export type FileAction = (filePath: string, outPath: string, projectPath: string) => void;
+export type JavaScriptExtension = ".js" | ".mjs" | ".cjs";