@aiot-toolkit/aiotpack 2.0.2-dev.8 → 2.0.3-beta.1

package/lib/compiler/javascript/vela/utils/ZipUtil.d.ts

@@ -1,8 +1,8 @@
-/// <reference types="node" />
-import { Dictionary } from '@aiot-toolkit/shared-utils/lib/type/Type';
+import { Dictionary } from '@aiot-toolkit/shared-utils';
 import JSZip from 'jszip';
 import IJavascriptCompileOption from '../../interface/IJavascriptCompileOption';
 import IManifest from '../interface/IManifest';
+import Package from '../model/Package';
 /**
  * Zip 用于将打包成功的 build 目录按特定规则压缩成 rpk
  *
@@ -29,12 +29,26 @@ declare class ZipUtil {
      * 3. 写入到硬盘
      * @param dist
      * @param param
-     * @returns
+     * @returns 生成的 rpk 文件名
      */
-    static createRpk(dist: string, param: IJavascriptCompileOption): Promise<void>;
+    static createRpk(dist: string, param: IJavascriptCompileOption): Promise<string | undefined>;
     private static getFileName;
     private static packageToZipBuffer;
+    /**
+     *
+     * @param buffer
+     * @param param
+     * @param fileName
+     *
+     * @returns 生成的文件名
+     */
     private static generateDistFile;
+    /**
+     * 根据文件列表创建 zip 的 Buffer
+     * @param fileList 文件列表
+     * @param comment zip 的注释
+     * @returns
+     */
     static createZipBufferFromFileList(fileList: {
         path: string;
         content: string | Buffer;
@@ -46,7 +60,9 @@ declare class ZipUtil {
      * @param files
      * @returns
      */
-    private static createPackagesDefinition;
+    static createPackagesDefinition(param: IJavascriptCompileOption, config: IManifest, files: string[]): Promise<{
+        fullPackage: Package;
+    }>;
     /**
      * 获取有序的文件列表
      *
@@ -70,6 +86,14 @@ declare class ZipUtil {
      * 创建打包的注释属性
      */
     static createComment(param: IJavascriptCompileOption): Dictionary<any>;
+    /**
+     * 生成rpk的最终的Buffer
+     *
+     * @description 使用证书对原始rpk包的 buffer 签名. 签名失败，返回原始包； 签名成功，返回新包
+     * @param fullPackage 原始包 buffer
+     * @param signConfig 证书信息
+     * @returns
+     */
     private static buildProjectAndOutput;
 }
 export default ZipUtil;

package/lib/compiler/javascript/vela/utils/ZipUtil.js

@@ -13,9 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
-const CommonUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/CommonUtil"));
-const FileUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/FileUtil"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const jszip_1 = __importDefault(require("jszip"));
 const path_1 = __importDefault(require("path"));
@@ -43,7 +41,7 @@ class ZipUtil {
      * 3. 写入到硬盘
      * @param dist
      * @param param
-     * @returns
+     * @returns 生成的 rpk 文件名
      */
     static createRpk(dist, param) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -51,19 +49,16 @@ class ZipUtil {
             // 1
             const files = this.getSortedFiles(dist, param, config);
             if (!files.length) {
-                ColorConsole_1.default.error(`The build file is missing, stop generating the application package, please check carefully`);
+                shared_utils_1.ColorConsole.error(`The build file is missing, stop generating the application package, please check carefully`);
                 return;
             }
             // 2
             const { fullPackage } = yield this.createPackagesDefinition(param, config, files);
-            const zipBuffer = yield this.packageToZipBuffer(fullPackage);
             // 生产出带签名的rpk文件buffer
             const signConfig = SignUtil_1.default.getProjectSignConfig(param);
-            const { rpkBuffer } = yield ZipUtil.buildProjectAndOutput(zipBuffer, signConfig);
-            // IDE 扫码预览打包 todo
-            // IDE 重置包名
+            const rpkBuffer = yield _a.buildProjectAndOutput(fullPackage, signConfig);
             // 3
-            this.generateDistFile(rpkBuffer, param, this.getFileName(param, config, 'rpk'));
+            return this.generateDistFile(rpkBuffer, param, this.getFileName(param, config, 'rpk'));
         });
     }
     static getFileName(param, config, ext) {
@@ -72,7 +67,7 @@ class ZipUtil {
         return [
             packageName,
             mode === CompileMode_1.default.DEVELOPMENT ? 'debug' : 'release',
-            buildNameFormat === BuildNameFormatType_1.default.DEFAULT ? config.versionName : '',
+            buildNameFormat === BuildNameFormatType_1.default.ORIGINAL ? '' : config.versionName,
             ext
         ]
             .filter(Boolean)
@@ -90,14 +85,29 @@ class ZipUtil {
             return yield this.createZipBufferFromFileList(packageFileList, comment);
         });
     }
+    /**
+     *
+     * @param buffer
+     * @param param
+     * @param fileName
+     *
+     * @returns 生成的文件名
+     */
     static generateDistFile(buffer, param, fileName) {
         return __awaiter(this, void 0, void 0, function* () {
             const { releasePath, projectPath } = param;
             const filePath = path_1.default.join(projectPath, releasePath, fileName);
             fs_extra_1.default.outputFileSync(filePath, buffer);
-            ColorConsole_1.default.success(`Project build and generate files：${fileName}`);
+            shared_utils_1.ColorConsole.success(`Project build and generate files：${fileName}`);
+            return fileName;
         });
     }
+    /**
+     * 根据文件列表创建 zip 的 Buffer
+     * @param fileList 文件列表
+     * @param comment zip 的注释
+     * @returns
+     */
     static createZipBufferFromFileList(fileList, comment) {
         return __awaiter(this, void 0, void 0, function* () {
             const zip = new jszip_1.default();
@@ -129,11 +139,11 @@ class ZipUtil {
             for (let fileBuildPath of files) {
                 const absPath = path_1.default.join(projectPath, outputPath, fileBuildPath);
                 let fileContentBuffer = fs_extra_1.default.readFileSync(absPath);
-                if (fileBuildPath === ZipUtil.CERT_PATH) {
+                if (fileBuildPath === _a.CERT_PATH) {
                     let metaZip = yield jszip_1.default.loadAsync(fileContentBuffer);
-                    fileContentBuffer = (yield metaZip.generateAsync(Object.assign(Object.assign({}, ZipUtil.ZIP_OPTION), { comment: null })));
+                    fileContentBuffer = (yield metaZip.generateAsync(Object.assign(Object.assign({}, _a.ZIP_OPTION), { comment: null })));
                 }
-                const fileContentDigest = CommonUtil_1.default.calcDataDigest(fileContentBuffer);
+                const fileContentDigest = shared_utils_1.CommonUtil.calcDataDigest(fileContentBuffer);
                 const resourceInfo = {
                     fileBuildPath,
                     fileContentBuffer,
@@ -174,13 +184,13 @@ class ZipUtil {
         // 1. 排除META-INF 目录下的文件
         // 2. 生产环境排除 .map 文件
         const mapReg = /\.map$/;
-        let result = FileUtil_1.default.readAlldirSync(dist);
+        let result = shared_utils_1.FileUtil.readAlldirSync(dist);
         result = result
             .filter((item) => {
             return !(item.startsWith(UxCompileUtil_1.default.DIGEST_ZIP_DIR) ||
                 (param.mode === CompileMode_1.default.PRODUCTION && mapReg.test(item)));
         })
-            .map((item) => path_1.default.relative(dist, item));
+            .map((item) => path_1.default.relative(dist, item).split(path_1.default.sep).join(path_1.default.posix.sep));
         result.sort((a, b) => {
             const indexA = getFileIndex(a);
             const indexB = getFileIndex(b);
@@ -210,7 +220,7 @@ class ZipUtil {
             ...entrySkFiles,
             new RegExp(`^${entry}/$`),
             new RegExp(`^${entry}/.+`),
-            /^common\//i,
+            /^common\//i, // 静态资源
             /.+\.js/,
             'META-INF/build.txt'
         ];
@@ -231,27 +241,31 @@ class ZipUtil {
         };
         return obj;
     }
-    static buildProjectAndOutput(fullPackage, signConfig) {
+    /**
+     * 生成rpk的最终的Buffer
+     *
+     * @description 使用证书对原始rpk包的 buffer 签名. 签名失败，返回原始包； 签名成功，返回新包
+     * @param fullPackage 原始包 buffer
+     * @param signConfig 证书信息
+     * @returns
+     */
+    static buildProjectAndOutput(target, signConfig) {
         return __awaiter(this, void 0, void 0, function* () {
-            // 1. 默认携带META，如果禁用流失打包，需要删除META
-            // 2. 是否需要增加签名内容
+            let result;
             if (signConfig) {
                 const { privatekey, certificate } = signConfig;
-                // fullPackageBuffer
-                const fullPackageBuffer = yield SignUtil_1.default.signZipBufferForPackage(fullPackage, privatekey, certificate);
+                const fullPackageBuffer = yield SignUtil_1.default.signPackage(target, privatekey, certificate);
                 if (fullPackageBuffer === false) {
-                    ColorConsole_1.default.throw('Fullpackage signature failed');
+                    shared_utils_1.ColorConsole.throw('Fullpackage signature failed');
                 }
                 else {
-                    fullPackage = fullPackageBuffer;
+                    result = fullPackageBuffer;
                 }
             }
-            // 3. 校验体积等
-            // 4. 生成rpks：不需要META和签名
-            // 5. 返回
-            return {
-                rpkBuffer: fullPackage
-            };
+            if (!result) {
+                result = yield this.packageToZipBuffer(target);
+            }
+            return result;
         });
     }
 }

package/lib/compiler/javascript/vela/utils/signature/Base64.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 /**
  * Base64
  */

package/lib/compiler/javascript/vela/utils/signature/SignUtil.d.ts

@@ -1,29 +1,45 @@
-/// <reference types="node" />
-import ICompileParam from '../../../../interface/ICompileParam';
 import IJavascriptCompileOption from '../../../interface/IJavascriptCompileOption';
+import Package from '../../model/Package';
 /**
  * SignUtil
  */
 declare class SignUtil {
     /**
      * 获取签名相关的配置内容
-     * 1. ICompileParam参数中获取编译模式是否为release
-     * 2. IJavascriptCompileOption参数中获取签名目录等内容
-     * @param param
+     * @param param IJavascriptCompileOption参数中获取签名目录等内容
+     * @returns
      */
-    static getProjectSignConfig(param: ICompileParam & IJavascriptCompileOption): {
+    static getProjectSignConfig(param: IJavascriptCompileOption): {
         privatekey: Buffer;
         certificate: Buffer;
     };
-    static signZipBufferForPackage(zipBuffer: Buffer, privatekey: Buffer, certificate: Buffer): Promise<false | Buffer>;
+    /**
+     * 对二进制zipBuffer签名
+     *
+     * 1. 对`META-INF/CERT`做签名，并生成新的`META-INF/CERT` buffer
+     * 2. "新`META-INF/CERT` + 其它文件"生成新的 zipBuffer
+     * 3. 对“新zipBuffer”，做整体签名
+     * @param zipBuffer
+     * @param privatekey
+     * @param certificate
+     * @returns
+     */
+    static signPackage(target: Package, privatekey: Buffer, certificate: Buffer): Promise<false | Buffer>;
     /**
      * 根据ZIP流获取文件实例
+     *
+     * 1. zipbuffer转换为JSZip对象
+     * 2. 提取文件列表，并生成每个文件的 buffer
+     * 3. 创建获取文件buffer的函数
+     *
      * @param zipBuffer
      * @returns
      */
     private static createFileListFromZipBuffer;
     /**
      * 为 zip buffer 签名，返回签名后的buffer
+     *
+     * @description 根据zipBuffer + zip的文件列表 + 私钥 + 证书，对 zipbuffer 签名
      * @param fileBuffer
      * @param files
      * @param privatekey

package/lib/compiler/javascript/vela/utils/signature/SignUtil.js

@@ -12,9 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const ColorConsole_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/ColorConsole"));
-const CommonUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/CommonUtil"));
-const FileUtil_1 = __importDefault(require("@aiot-toolkit/shared-utils/lib/utils/FileUtil"));
+const shared_utils_1 = require("@aiot-toolkit/shared-utils");
 const crypto_1 = __importDefault(require("crypto"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const jsrsasign_1 = __importDefault(require("jsrsasign"));
@@ -31,64 +29,104 @@ const Signer_1 = __importDefault(require("./Signer"));
 class SignUtil {
     /**
      * 获取签名相关的配置内容
-     * 1. ICompileParam参数中获取编译模式是否为release
-     * 2. IJavascriptCompileOption参数中获取签名目录等内容
-     * @param param
+     * @param param IJavascriptCompileOption参数中获取签名目录等内容
+     * @returns
      */
     static getProjectSignConfig(param) {
         const { mode, projectPath, signRoot } = param;
+        const signPathFolder = path_1.default.join(projectPath, signRoot || 'sign');
+        const signPathConfig = {
+            debug: {
+                privatekey: path_1.default.join(signPathFolder, 'debug', 'private.pem'),
+                certificate: path_1.default.join(signPathFolder, 'debug', 'certificate.pem')
+            },
+            sign: {
+                privatekey: path_1.default.join(signPathFolder, 'private.pem'),
+                certificate: path_1.default.join(signPathFolder, 'certificate.pem')
+            },
+            defaultDevelopment: {
+                privatekey: path_1.default.join(__dirname, 'pem', 'private.pem'),
+                certificate: path_1.default.join(__dirname, 'pem', 'certificate.pem')
+            },
+            oldRelease: {
+                privatekey: path_1.default.join(signPathFolder, 'release', 'private.pem'),
+                certificate: path_1.default.join(signPathFolder, 'release', 'certificate.pem')
+            }
+        };
+        // build模式 优先sign/debug/证书 其次sign/证书 最后toolkit中默认的证书
+        const developmentSignConfig = [
+            signPathConfig.debug,
+            signPathConfig.sign,
+            signPathConfig.defaultDevelopment
+        ];
+        // release模式 优先sign/release/证书 其次sign/证书
+        const releaseSignConfig = [signPathConfig.oldRelease, signPathConfig.sign];
+        let modeSignConfig = [];
         let signConfig;
-        let privatekeyPath;
-        let certificatePath;
         switch (mode) {
             case CompileMode_1.default.DEVELOPMENT:
-                privatekeyPath = path_1.default.join(__dirname, 'pem', 'private.pem');
-                certificatePath = path_1.default.join(__dirname, 'pem', 'certificate.pem');
-                ColorConsole_1.default.info(`User debug signature is enabled by project build`);
+                modeSignConfig = developmentSignConfig;
                 break;
             case CompileMode_1.default.PRODUCTION:
-                privatekeyPath = path_1.default.join(projectPath, signRoot, 'private.pem');
-                certificatePath = path_1.default.join(projectPath, signRoot, 'certificate.pem');
-                ColorConsole_1.default.info(`release signature is enabled by project build`);
+                modeSignConfig = releaseSignConfig;
                 break;
             default:
                 // 打印信息， 模式未定义
-                ColorConsole_1.default.error(`Error: mode ${mode} undefined`);
+                shared_utils_1.ColorConsole.error(`Error: mode ${mode} undefined`);
                 break;
         }
-        // 检查路径是否真实存在
-        if (privatekeyPath &&
-            certificatePath &&
-            FileUtil_1.default.checkFilePath([privatekeyPath, certificatePath])) {
+        // 寻找有效的证书路径
+        const findPath = modeSignConfig.find(({ privatekey, certificate }) => shared_utils_1.FileUtil.checkFilePath([privatekey, certificate]));
+        if (findPath) {
+            let { privatekey: privatekeyPath, certificate: certificatePath } = findPath;
+            shared_utils_1.ColorConsole.info('privatekeyPath is ', {
+                word: privatekeyPath
+            }, `\ncertificatePath is `, {
+                word: certificatePath
+            });
+            // 读取证书内容
             signConfig = {
                 privatekey: fs_extra_1.default.readFileSync(privatekeyPath),
                 certificate: fs_extra_1.default.readFileSync(certificatePath)
             };
         }
         else {
-            // 结束程序
-            process.exit();
+            // 抛出错误,在指定模式下未找到证书
+            throw new Error(`The current mode is ${mode}, and there is a problem with the certification path`);
         }
         return signConfig;
     }
-    static signZipBufferForPackage(zipBuffer, privatekey, certificate) {
+    /**
+     * 对二进制zipBuffer签名
+     *
+     * 1. 对`META-INF/CERT`做签名，并生成新的`META-INF/CERT` buffer
+     * 2. "新`META-INF/CERT` + 其它文件"生成新的 zipBuffer
+     * 3. 对“新zipBuffer”，做整体签名
+     * @param zipBuffer
+     * @param privatekey
+     * @param certificate
+     * @returns
+     */
+    static signPackage(target, privatekey, certificate) {
         return __awaiter(this, void 0, void 0, function* () {
-            // 1. 解压得到文件列表
-            const zipInstWrap = yield SignUtil.createFileListFromZipBuffer(zipBuffer);
-            // 摘要map
+            var _a;
+            const getFileBuffer = (path) => {
+                return target.getResource(path);
+            };
+            // 摘要 和 文件列表
             const fileDigestHash = [];
             const fileList = [];
-            // 2. 如果包含META-INF/CERT，则对其解压，增加签名
-            const metaBuffer = zipInstWrap.getFileBuffer(ZipUtil_1.default.CERT_PATH);
+            // 1
+            const metaBuffer = (_a = getFileBuffer(ZipUtil_1.default.CERT_PATH)) === null || _a === void 0 ? void 0 : _a.fileContentBuffer;
             if (metaBuffer) {
                 const metaHash = {
                     name: ZipUtil_1.default.DIGEST_HASH_JSON,
-                    hash: CommonUtil_1.default.calcDataDigest(metaBuffer)
+                    hash: shared_utils_1.CommonUtil.calcDataDigest(metaBuffer)
                 };
                 const signedMetaBuffer = SignUtil.doSign(metaBuffer, [metaHash], privatekey, certificate);
                 if (signedMetaBuffer === false) {
                     // META-INF/CERT签名失败
-                    ColorConsole_1.default.throw('META-INF/CERT signature failed');
+                    shared_utils_1.ColorConsole.throw('META-INF/CERT signature failed');
                 }
                 else {
                     fileList.push({
@@ -97,32 +135,45 @@ class SignUtil {
                     });
                     fileDigestHash.push({
                         name: ZipUtil_1.default.CERT_PATH,
-                        hash: CommonUtil_1.default.calcDataDigest(signedMetaBuffer)
+                        hash: shared_utils_1.CommonUtil.calcDataDigest(signedMetaBuffer)
                     });
                 }
             }
-            // 3. 对整个zip做签名
-            const files = zipInstWrap.fileList;
-            files.filter(SignUtil.fileFilter).map((item) => {
+            // 2
+            const files = target.resourceList;
+            files
+                .map((item) => {
+                return {
+                    path: item.fileBuildPath,
+                    content: item.fileContentBuffer
+                };
+            })
+                .filter(SignUtil.fileFilter)
+                .map((item) => {
                 fileList.push(item);
                 fileDigestHash.push({
                     name: item.path,
-                    hash: CommonUtil_1.default.calcDataDigest(item.content)
+                    hash: shared_utils_1.CommonUtil.calcDataDigest(item.content)
                 });
             });
             // 因为META变化，重新创建ZIP流
-            const newZipBuffer = yield ZipUtil_1.default.createZipBufferFromFileList(fileList, zipInstWrap.comment);
-            // 对新ZIP流重新签名
+            const newZipBuffer = yield ZipUtil_1.default.createZipBufferFromFileList(fileList, target.comment);
+            // 3
             const signedZipBuffer = SignUtil.doSign(newZipBuffer, fileDigestHash, privatekey, certificate);
             if (signedZipBuffer === false) {
                 // 签名失败
-                ColorConsole_1.default.throw('package signature failed');
+                shared_utils_1.ColorConsole.throw('package signature failed');
             }
             return signedZipBuffer;
         });
     }
     /**
      * 根据ZIP流获取文件实例
+     *
+     * 1. zipbuffer转换为JSZip对象
+     * 2. 提取文件列表，并生成每个文件的 buffer
+     * 3. 创建获取文件buffer的函数
+     *
      * @param zipBuffer
      * @returns
      */
@@ -144,17 +195,15 @@ class SignUtil {
                 comment: zipInst.comment,
                 getFileBuffer(path) {
                     const buffer = fileList.find((item) => item.path === path);
-                    let content;
-                    if (buffer) {
-                        content = buffer.content;
-                    }
-                    return content;
+                    return buffer === null || buffer === void 0 ? void 0 : buffer.content;
                 }
             };
         });
     }
     /**
      * 为 zip buffer 签名，返回签名后的buffer
+     *
+     * @description 根据zipBuffer + zip的文件列表 + 私钥 + 证书，对 zipbuffer 签名
      * @param fileBuffer
      * @param files
      * @param privatekey
@@ -180,13 +229,13 @@ class SignUtil {
     static unZipFiles(fileBuffer, files) {
         // 1. 读取zip文件
         if (!fileBuffer || fileBuffer.length <= 4) {
-            ColorConsole_1.default.error('Zip file open failed');
+            shared_utils_1.ColorConsole.error('Zip file open failed');
             return false;
         }
         // 2. 检查文件格式是否正确
         const fileMagic = fileBuffer.readInt32LE(0);
         if (fileMagic !== 0x4034b50) {
-            ColorConsole_1.default.error('Zip file format is wrong');
+            shared_utils_1.ColorConsole.error('Zip file format is wrong');
             return false;
         }
         // 3. 解析数据块
@@ -386,7 +435,7 @@ class SignUtil {
         const cert = Buffer.from(Base64_1.default.unarmor(certificate));
         const c = new jsrsasign_1.default.X509();
         c.readCertPEM(certificate.toString());
-        const pubKey = jsrsasign_1.default.KEYUTIL.getPEM(c.subjectPublicKeyRSA);
+        const pubKey = jsrsasign_1.default.KEYUTIL.getPEM(c.getPublicKey());
         // 摘要块
         const digestBuf = Buffer.alloc(sign.length + 12);
         digestBuf.writeInt32LE(sign.length + 8, 0);

package/lib/compiler/javascript/vela/utils/signature/Signer.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 /**
  * Signer
  */

package/lib/compiler/javascript/vela/utils/webpackLoader/addColSourceMap.d.ts

@@ -0,0 +1,3 @@
+import { LoaderContext } from '@rspack/core';
+declare function addColSourceMap(this: LoaderContext<any>, source: string, map: any): Promise<void>;
+export default addColSourceMap;

package/lib/compiler/javascript/vela/utils/webpackLoader/addColSourceMap.js

@@ -0,0 +1,56 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const parser_1 = require("@aiot-toolkit/parser");
+function addColSourceMap(source, map) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const callback = this.async();
+        if (!map) {
+            callback(null, source, map);
+        }
+        let { consumer, tempGenerator } = yield parser_1.SourceMapUtil.createConsumerAndGenerator(JSON.stringify(map));
+        let recordLine = -1;
+        consumer.eachMapping((mapping) => {
+            if (mapping.source === consumer.sources[consumer.sources.length - 1]) {
+                if (recordLine < mapping.generatedLine &&
+                    (mapping.generatedColumn !== 0 || mapping.originalColumn !== 0)) {
+                    tempGenerator.addMapping({
+                        generated: {
+                            line: mapping.generatedLine,
+                            column: 0
+                        },
+                        original: {
+                            line: mapping.originalLine,
+                            column: 0
+                        },
+                        source: mapping.source,
+                        name: ''
+                    });
+                }
+                recordLine = mapping.generatedLine;
+            }
+            tempGenerator.addMapping({
+                generated: {
+                    line: mapping.generatedLine,
+                    column: mapping.generatedColumn
+                },
+                original: {
+                    line: mapping.originalLine,
+                    column: mapping.originalColumn
+                },
+                source: mapping.source,
+                name: mapping.name
+            });
+        });
+        callback(null, source, JSON.parse(tempGenerator.toString()));
+    });
+}
+exports.default = addColSourceMap;

package/lib/compiler/javascript/vela/utils/webpackLoader/extractMapData.d.ts

@@ -0,0 +1,3 @@
+import { LoaderContext } from '@rspack/core';
+declare function extractMapData(this: LoaderContext<any>, source: string, map: any): void;
+export default extractMapData;

package/lib/compiler/javascript/vela/utils/webpackLoader/{splitMap.js → extractMapData.js}

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-function splitMap(source, map) {
+function extractMapData(source, map) {
     const enterFilePath = this.resourcePath;
     // 获取当前文件夹和文件名
     const dirName = path_1.default.dirname(enterFilePath);
@@ -17,4 +17,4 @@ function splitMap(source, map) {
     }
     this.callback(null, source, map && JSON.parse(map));
 }
-exports.default = splitMap;
+exports.default = extractMapData;