maishu-scripts 1.4.1 → 1.4.5

package/out/index.d.ts

@@ -1,11 +1,9 @@
 import copyFile from "./modules/actions/copy-file";
 export { generateCode, watchDirectory } from "./modules/compile";
 export { run } from "./modules/run";
-export declare const options: {
-    fileActions: Record<string, import("./types").FileAction>;
-    skipFiles: Record<string, RegExp[]>;
-};
+export declare const config: import("./modules/configs").Config;
 export { create as createTsCompiler } from "./modules/actions/ts-compile";
 export { create as createBielCompiler } from "./modules/actions/babel-compile";
 export { copyFile };
 export { FileAction } from "./types";
+export { Config } from "./modules/configs";

package/out/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.copyFile = exports.createBielCompiler = exports.createTsCompiler = exports.options = exports.run = exports.watchDirectory = exports.generateCode = void 0;
+exports.Config = exports.copyFile = exports.createBielCompiler = exports.createTsCompiler = exports.config = exports.run = exports.watchDirectory = exports.generateCode = void 0;
 const configs_1 = __importDefault(require("./modules/configs"));
 const copy_file_1 = __importDefault(require("./modules/actions/copy-file"));
 exports.copyFile = copy_file_1.default;
@@ -12,8 +12,10 @@ Object.defineProperty(exports, "generateCode", { enumerable: true, get: function
 Object.defineProperty(exports, "watchDirectory", { enumerable: true, get: function () { return compile_1.watchDirectory; } });
 var run_1 = require("./modules/run");
 Object.defineProperty(exports, "run", { enumerable: true, get: function () { return run_1.run; } });
-exports.options = configs_1.default;
+exports.config = configs_1.default;
 var ts_compile_1 = require("./modules/actions/ts-compile");
 Object.defineProperty(exports, "createTsCompiler", { enumerable: true, get: function () { return ts_compile_1.create; } });
 var babel_compile_1 = require("./modules/actions/babel-compile");
 Object.defineProperty(exports, "createBielCompiler", { enumerable: true, get: function () { return babel_compile_1.create; } });
+var configs_2 = require("./modules/configs");
+Object.defineProperty(exports, "Config", { enumerable: true, get: function () { return configs_2.Config; } });

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

@@ -1,3 +1,13 @@
 import * as babel from "@babel/core";
 import { FileAction, JavaScriptExtension } from "../../types";
-export declare function create(defaultBabelOptions?: babel.TransformOptions, outExit?: JavaScriptExtension): FileAction;
+export declare function create(defaultBabelOptions?: babel.TransformOptions & {
+    declaration?: boolean;
+}, outExt?: JavaScriptExtension): FileAction;
+/**
+ * 生成声明文件
+ * @param projectPath 项目路径
+ * @param sourcePath 源文件
+ * @param targetPath 目标文件
+ * @param outExt 输出扩展名
+ */
+export declare function generateDeclarationFile(projectPath: string, sourcePath: string, targetPath: string, outExt: JavaScriptExtension): Promise<void>;

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

@@ -34,35 +34,45 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.create = create;
+exports.generateDeclarationFile = generateDeclarationFile;
 const babel = __importStar(require("@babel/core"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const ts = __importStar(require("typescript"));
 const errors_1 = require("../errors");
 const project_compiler_1 = require("../project-compiler");
 // const outExt = ProjectCompiler.tsOutExt;
-function create(defaultBabelOptions, outExit) {
+function create(defaultBabelOptions, outExt) {
     const action = (sourcePath, outputPath, projectPath) => {
-        outExit = outExit || ".js";
-        if (defaultBabelOptions) {
-            return compileFile(sourcePath, outputPath, projectPath, defaultBabelOptions, outExit);
+        outExt = outExt || ".js";
+        let babelOptions = defaultBabelOptions;
+        if (!babelOptions) {
+            // 如果没有 babelOptions，则尝试从项目目录查找 babel 配置文件，如果没有，则使用默认配置。
+            // let babelOptions: babel.TransformOptions;
+            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;
         }
-        // 如果没有 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;
+        const declaration = babelOptions.declaration || false;
+        delete babelOptions.declaration;
+        if (declaration) {
+            // 如果需要生成声明文件，则调用 ts-compile 模块的生成声明文件方法
+            const ext = path.extname(sourcePath);
+            let targetPath = path.join(outputPath, path.basename(sourcePath).replace(ext, outExt));
+            generateDeclarationFile(projectPath, sourcePath, targetPath, outExt);
         }
-        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 compileFile(sourcePath, outputPath, projectPath, babelOptions, outExt);
     };
     return action;
 }
@@ -72,39 +82,17 @@ function create(defaultBabelOptions, outExit) {
  * @param outputPath 输出目录
  * @param projectPath 项目路径
  * */
-async function compileFile(sourcePath, outputPath, projectPath, babelOptions, outExt) {
+async function compileFile(sourcePath, outputPath, projectPath, babelOptions, outExt, generateDeclaration = false) {
     if (!sourcePath)
         throw errors_1.errors.argumentNull("sourcePath");
     if (!outputPath)
         throw errors_1.errors.argumentNull("outputPath");
     if (!projectPath)
         throw errors_1.errors.argumentNull("projectPath");
-    // if (!fs.existsSync(sourcePath)) throw errors.pathNotExists(sourcePath);
     if (!fs.existsSync(sourcePath)) {
         console.warn(`Path not exists: ${sourcePath}`);
         return;
     }
-    let sourceDir = path.dirname(sourcePath);
-    // let babelOptions: babel.TransformOptions;
-    let bablePath;
-    //= projectPath ?
-    //  ProjectCompiler.getBabelConfig(projectPath, sourceDir) : ProjectCompiler.getDefaultBabelConfig();
-    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;
-    // let fileResult = babel.transformFileSync(sourcePath, {
-    //     filename: sourcePath, code: false, ast: true, plugins,
-    //     presets
-    // });
     let fileResult = babel.transformFileSync(sourcePath, babelOptions);
     if (!fileResult)
         throw errors_1.errors.compileError(sourcePath);
@@ -138,24 +126,15 @@ async function compileFile(sourcePath, outputPath, projectPath, babelOptions, ou
     if (!fs.existsSync(outDirPath))
         fs.mkdirSync(outDirPath, { recursive: true });
     fs.writeFileSync(targetPath, r.code);
+    if (generateDeclaration) {
+        await generateDeclarationFile(projectPath, sourcePath, targetPath, outExt);
+    }
 }
 function extname(file) {
     // let ext = /\.[a-zA-Z]+/.exec(file)?.[0] || '';
     let ext = path.extname(file);
     return ext;
 }
-/**
- * 获取源文件所对应生成文件的扩展名
- * @param file 源文件名
- * */
-// function fileOutExt(file: string) {
-//     let ext = extname(file);
-//     if (ext === ".ts")
-//         return outExt;
-//     if (ext === ".tsx")
-//         return outExt;
-//     return ext;
-// }
 class ImportPathRewrite {
     filePath;
     outExt;
@@ -189,3 +168,45 @@ class ImportPathRewrite {
         }
     }
 }
+/**
+ * 生成声明文件
+ * @param projectPath 项目路径
+ * @param sourcePath 源文件
+ * @param targetPath 目标文件
+ * @param outExt 输出扩展名
+ */
+function generateDeclarationFile(projectPath, sourcePath, targetPath, outExt) {
+    if (!projectPath)
+        throw errors_1.errors.argumentNull("projectPath");
+    if (!sourcePath)
+        throw errors_1.errors.argumentNull("sourcePath");
+    if (!targetPath)
+        throw errors_1.errors.argumentNull("targetPath");
+    const sourceExt = path.extname(sourcePath);
+    if (!sourceExt || (sourceExt !== ".ts" && sourceExt !== ".tsx")) {
+        return Promise.resolve();
+    }
+    const declarationPath = targetPath.endsWith(outExt)
+        ? targetPath.slice(0, targetPath.length - outExt.length) + ".d.ts"
+        : targetPath.replace(path.extname(targetPath), ".d.ts");
+    const content = fs.readFileSync(sourcePath, "utf-8");
+    const result = ts.transpileDeclaration(content, {
+        fileName: path.basename(sourcePath),
+        reportDiagnostics: false,
+        compilerOptions: {
+            declaration: true,
+            emitDeclarationOnly: true,
+            skipLibCheck: true,
+            esModuleInterop: true,
+            jsx: ts.JsxEmit.React,
+            target: ts.ScriptTarget.ESNext,
+            module: ts.ModuleKind.NodeNext,
+        }
+    });
+    const outDir = path.dirname(declarationPath);
+    if (!fs.existsSync(outDir)) {
+        fs.mkdirSync(outDir, { recursive: true });
+    }
+    fs.writeFileSync(declarationPath, result.outputText || "");
+    return Promise.resolve();
+}

package/out/modules/actions/copy-file.js

@@ -42,11 +42,19 @@ let copyFile = (filePath, outPath) => {
     if (!outPath)
         throw errors_1.errors.argumentNull("outPath");
     if (!fs.existsSync(filePath)) {
+        throw errors_1.errors.pathNotExists(filePath);
+    }
+    if (!fs.statSync(filePath).isFile()) {
         return;
     }
-    let out = filePath.replace(path.dirname(filePath), outPath);
-    let outDirPath = path.resolve(out, "..");
-    fs.mkdirSync(outDirPath, { recursive: true });
-    fs.copyFileSync(filePath, out);
+    const destFilePath = path.join(outPath, path.basename(filePath));
+    const destDirPath = path.dirname(destFilePath);
+    fs.mkdirSync(destDirPath, { recursive: true });
+    try {
+        fs.copyFileSync(filePath, destFilePath);
+    }
+    catch (err) {
+        throw errors_1.errors.copyFileError(filePath, destFilePath, err);
+    }
 };
 exports.default = copyFile;

package/out/modules/compile.d.ts

@@ -14,5 +14,6 @@ type Options = {
     skipFiles?: RegExp[];
     fileAction?: (fileName: string) => FileAction | undefined;
     callback?: Callback;
+    defaultAction?: FileAction;
 };
 export {};

package/out/modules/compile.js

@@ -104,7 +104,9 @@ function extname(file) {
     return ext;
 }
 function generateCodeByOptions(options) {
-    let { sourceDir, outDir, projectPath, skipFiles, fileAction: fileActions, callback } = options;
+    let { sourceDir, outDir, projectPath, skipFiles, fileAction: fileActions, callback, defaultAction } = options;
+    // if (!defaultAction)
+    //     defaultAction = copyFile;
     if (!sourceDir)
         throw errors_1.errors.argumentNull("sourceDir");
     if (!outDir)
@@ -126,7 +128,7 @@ function generateCodeByOptions(options) {
             console.log(`Skip ${filePath}`);
             continue;
         }
-        let action = fileActions?.(filePath) || configs_1.default.fileActions[ext];
+        let action = fileActions?.(filePath) || configs_1.default.fileActions[ext] || defaultAction;
         if (action) {
             action(filePath, outDir, projectPath);
             if (callback) {
@@ -139,12 +141,14 @@ function generateCodeByOptions(options) {
         let fullPath = path.join(sourceDir, dir);
         let outDirPath = path.join(outDir, dir);
         if (fs.statSync(fullPath).isDirectory()) {
-            generateCodeByOptions({ sourceDir: fullPath, outDir: outDirPath, projectPath: projectPath, skipFiles, fileAction: fileActions, callback });
+            generateCodeByOptions({ sourceDir: fullPath, outDir: outDirPath, projectPath: projectPath, skipFiles, fileAction: fileActions, callback, defaultAction });
         }
     }
 }
 function watchDirectoryByOptions(options) {
-    let { sourceDir, outDir, projectPath, skipFiles, fileAction: fileActions, callback } = options;
+    let { sourceDir, outDir, projectPath, skipFiles, fileAction: fileActions, callback, defaultAction } = options;
+    if (!defaultAction)
+        defaultAction = copy_file_1.default;
     (0, node_watch_1.default)(sourceDir, { recursive: true }, async (evt, name) => {
         const filePath = name.replace(/\\/g, "/");
         sourceDir = sourceDir.replace(/\\/g, "/");
@@ -159,7 +163,7 @@ function watchDirectoryByOptions(options) {
         if (evt === "remove") {
             return;
         }
-        let action = fileActions?.(filePath) || configs_1.default.fileActions[ext];
+        let action = fileActions?.(filePath) || configs_1.default.fileActions[ext] || defaultAction;
         if (!action) {
             return;
         }

package/out/modules/configs.d.ts

@@ -1,7 +1,7 @@
 import { FileAction } from "../types";
-declare class Options {
+export declare class Config {
     fileActions: Record<string, FileAction>;
     skipFiles: Record<string, RegExp[]>;
 }
-declare const _default: Options;
-export default _default;
+declare const config: Config;
+export default config;

package/out/modules/configs.js

@@ -3,17 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Config = void 0;
 const scss_compile_1 = __importDefault(require("./actions/scss-compile"));
 const less_compile_1 = __importDefault(require("./actions/less-compile"));
 const babel_compile_1 = require("./actions/babel-compile");
+const copy_file_1 = __importDefault(require("./actions/copy-file"));
 // const skipFiles = ["\\S+\\.d\\.tsx?$", "\\S+\\.test\\.tsx?$", "\\S+\\.spec\\.tsx?$"]
 const fileActions = {
     ".ts": (0, babel_compile_1.create)(),
     ".tsx": (0, babel_compile_1.create)(),
     ".scss": scss_compile_1.default,
     ".less": less_compile_1.default,
+    ".map": copy_file_1.default,
 };
-class Options {
+class Config {
     fileActions = fileActions;
     skipFiles = {
         ".tsx": [/\.d\.tsx?$/, /\.test\.tsx?$/, /\.spec\.tsx?$/],
@@ -22,6 +25,6 @@ class Options {
         ".less": [],
     };
 }
-const NAME = "maishu-scripts-options";
-global[NAME] = global[NAME] || new Options();
-exports.default = global[NAME];
+exports.Config = Config;
+const config = new Config();
+exports.default = config;

package/out/modules/errors.d.ts

@@ -4,6 +4,7 @@ declare class Errors extends BaseErrors {
     pathNotExists(path: string): Error;
     notAbsolutePath(path: string): Error;
     invalidBabelConfigExtension(extension: string, configPath: string): Error;
+    copyFileError(sourcePath: string, destPath: string, innerError?: Error): Error;
 }
 export declare const errors: Errors;
 export {};

package/out/modules/errors.js

@@ -23,5 +23,13 @@ class Errors extends errors_1.Errors {
         error.name = Errors.prototype.invalidBabelConfigExtension.name;
         return error;
     }
+    copyFileError(sourcePath, destPath, innerError) {
+        let error = new Error(`Failed to copy file from "${sourcePath}" to "${destPath}"`);
+        error.name = Errors.prototype.copyFileError.name;
+        if (innerError) {
+            error.cause = innerError;
+        }
+        return error;
+    }
 }
 exports.errors = new Errors();

package/out/package.json

@@ -0,0 +1,33 @@
+{
+    "name": "maishu-scripts",
+    "version": "1.4.4",
+    "description": "用于对 node 项目进行代码生成，打包，运行",
+    "dependencies": {
+        "@babel/core": "^7.24.3",
+        "@babel/plugin-proposal-decorators": "^7.29.0",
+        "@babel/plugin-transform-react-jsx": "^7.23.4",
+        "@babel/plugin-transform-typescript": "^7.24.1",
+        "@types/node": "^20.12.2",
+        "@types/react": "^19.2.8",
+        "babel-plugin-transform-typescript-metadata": "^0.3.2",
+        "less": "^4.5.1",
+        "maishu-toolkit": "^1.12.6",
+        "node-watch": "^0.7.4",
+        "nodemon": "^3.1.4",
+        "sass": "^1.97.1",
+        "typescript": "^5.9.3"
+    },
+    "devDependencies": {
+        "@babel/preset-env": "^7.24.3",
+        "@babel/preset-typescript": "^7.24.1",
+        "@types/babel__core": "^7.20.5",
+        "@types/jest": "^29.5.12",
+        "@types/less": "^3.0.8",
+        "jest": "^29.7.0"
+    },
+    "main": "./index.js",
+    "scripts": {
+        "build": "node ./scripts/build.js",
+        "test": "jest"
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "maishu-scripts",
-    "version": "1.4.1",
+    "version": "1.4.5",
     "description": "用于对 node 项目进行代码生成，打包，运行",
     "dependencies": {
         "@babel/core": "^7.24.3",
@@ -31,6 +31,7 @@
         "src"
     ],
     "scripts": {
-        "build": "tsc"
+        "build": "tsc -p tsconfig.build.json",
+        "test": "jest"
     }
-}
+}

package/src/index.ts

@@ -2,8 +2,9 @@ import _config from "./modules/configs";
 import copyFile from "./modules/actions/copy-file";
 export { generateCode, watchDirectory } from "./modules/compile";
 export { run } from "./modules/run";
-export const options = _config;
+export const config = _config;
 export { create as createTsCompiler } from "./modules/actions/ts-compile";
 export { create as createBielCompiler } from "./modules/actions/babel-compile";
 export { copyFile };
 export { FileAction } from "./types";
+export { Config } from "./modules/configs";