@canyonjs/cli 1.0.12 → 1.0.16

package/README.md

@@ -0,0 +1 @@
+合并本地覆盖率

package/bin/canyon.js

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+// * The entry point of the CLI
+import('../dist/index.js').then((m) => m.cli(process.argv));

package/dist/index.js

@@ -5,8 +5,61 @@ import node_path from "node:path";
 import axios from "axios";
 import { log } from "node:console";
 var package_namespaceObject = {
-    rE: "1.0.12"
+    rE: "1.0.16"
 };
+function mergeNumberMaps(a = {}, b = {}) {
+    const result = {
+        ...a
+    };
+    for (const key of Object.keys(b)){
+        const aVal = result[key] ?? 0;
+        const bVal = b[key] ?? 0;
+        result[key] = aVal + bVal;
+    }
+    return result;
+}
+function mergeBranchArrays(aArr = [], bArr = []) {
+    const maxLen = Math.max(aArr.length, bArr.length);
+    const out = new Array(maxLen);
+    for(let i = 0; i < maxLen; i++){
+        const aVal = aArr[i] ?? 0;
+        const bVal = bArr[i] ?? 0;
+        out[i] = aVal + bVal;
+    }
+    return out;
+}
+function mergeBranchMaps(a = {}, b = {}) {
+    const result = {
+        ...a
+    };
+    for (const key of Object.keys(b)){
+        const aArr = result[key] ?? [];
+        const bArr = b[key] ?? [];
+        result[key] = mergeBranchArrays(aArr, bArr);
+    }
+    return result;
+}
+function mergeFileCoverage(a, b) {
+    return {
+        ...a,
+        path: b.path ?? a.path,
+        s: mergeNumberMaps(a.s, b.s),
+        f: mergeNumberMaps(a.f, b.f),
+        b: mergeBranchMaps(a.b, b.b)
+    };
+}
+function mergeCoverageMaps(target = {}, source = {}) {
+    const out = {
+        ...target
+    };
+    for (const filePath of Object.keys(source)){
+        const existing = out[filePath];
+        const incoming = source[filePath];
+        if (existing) out[filePath] = mergeFileCoverage(existing, incoming);
+        else out[filePath] = incoming;
+    }
+    return out;
+}
 async function mapCommand(params, options) {
     const { dsn, repo_id: repoID, sha: sha, provider, build_target, debug, instrument_cwd } = params;
     if (!node_fs.existsSync(node_path.resolve(process.cwd(), '.canyon_output'))) return void log('不存在');
@@ -15,10 +68,7 @@ async function mapCommand(params, options) {
     for(let i = 0; i < files.length; i++){
         const fileCoverageString = node_fs.readFileSync(node_path.resolve(process.cwd(), '.canyon_output', files[i]), 'utf-8');
         const fileCoverage = JSON.parse(fileCoverageString);
-        data = {
-            ...data,
-            ...fileCoverage
-        };
+        data = mergeCoverageMaps(data, fileCoverage);
     }
     const p = {
         dsn,

package/dist/utils/mergeCoverage.d.ts

@@ -0,0 +1,13 @@
+export type StatementCounts = Record<string, number>;
+export type FunctionCounts = Record<string, number>;
+export type BranchCounts = Record<string, number[]>;
+export interface FileCoverageCounters {
+    s?: StatementCounts;
+    f?: FunctionCounts;
+    b?: BranchCounts;
+    path?: string;
+    [key: string]: any;
+}
+export type CoverageMap = Record<string, FileCoverageCounters>;
+export declare function mergeFileCoverage(a: FileCoverageCounters, b: FileCoverageCounters): FileCoverageCounters;
+export declare function mergeCoverageMaps(target?: CoverageMap, source?: CoverageMap): CoverageMap;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canyonjs/cli",
-  "version": "1.0.12",
+  "version": "1.0.16",
   "type": "module",
   "exports": {
     ".": {
@@ -14,7 +14,7 @@
     "bin"
   ],
   "bin": {
-    "canyon": "bin/canyon"
+    "canyon": "bin/canyon.js"
   },
   "devDependencies": {
     "@biomejs/biome": "2.2.3",
@@ -30,7 +30,7 @@
   },
   "scripts": {
     "build": "rslib build",
-    "my-test": "npm run build && node ./bin/canyon upload",
+    "my-test": "npm run build && node ./bin/canyon.js upload",
     "check": "biome check --write",
     "dev": "rslib build --watch",
     "format": "biome format --write",

package/bin/canyon

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-// * The entry point of the CLI
-import('../dist/index.js').then(m => m.cli(process.argv));