@canyonjs/cli 1.0.15 → 1.0.18

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

@@ -1,11 +1,11 @@
 import chalk from "chalk";
 import { program } from "commander";
+import { log } from "node:console";
 import node_fs from "node:fs";
 import node_path from "node:path";
 import axios from "axios";
-import { log } from "node:console";
 var package_namespaceObject = {
-    rE: "1.0.15"
+    rE: "1.0.18"
 };
 function mergeNumberMaps(a = {}, b = {}) {
     const result = {
@@ -61,14 +61,20 @@ function mergeCoverageMaps(target = {}, source = {}) {
     return out;
 }
 async function mapCommand(params, options) {
-    const { dsn, repo_id: repoID, sha: sha, provider, build_target, debug, instrument_cwd } = params;
+    const { dsn, repo_id: repoID, sha, provider, build_target, debug, instrument_cwd, filter } = params;
     if (!node_fs.existsSync(node_path.resolve(process.cwd(), '.canyon_output'))) return void log('不存在');
     const files = node_fs.readdirSync(node_path.resolve(process.cwd(), '.canyon_output'));
     let data = {};
     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 = mergeCoverageMaps(data, fileCoverage);
+        let toMerge = fileCoverage;
+        if (filter && 'string' == typeof filter) {
+            const filteredEntries = Object.entries(fileCoverage).filter(([filePath])=>filePath.includes(filter));
+            if (0 === filteredEntries.length) continue;
+            toMerge = Object.fromEntries(filteredEntries);
+        }
+        data = mergeCoverageMaps(data, toMerge);
     }
     const p = {
         dsn,
@@ -98,7 +104,7 @@ program.name('canyon').version(package_namespaceObject.rE, '-v, --version', 'see
     subcommandTerm: (cmd)=>accent(cmd.name(), cmd.usage()),
     argumentTerm: (arg)=>accent(arg.name())
 }).showHelpAfterError(true);
-program.command('upload').option('--debug <dsn>', 'debug').option('--dsn <dsn>', 'dsn of the canyon server').option('--repo_id <repo_id>', 'repo id of the canyon server').option('--instrument_cwd <instrument_cwd>', 'instrument cwd of the canyon server').option('--sha <sha>', 'sha of the canyon server').option('--branch <branch>', 'branch of the canyon server').option('--provider <provider>', 'provider of the canyon server').option('--build_target <build_target>', 'build target of the canyon server').option('--coverage <coverage>', 'coverage of the canyon server').allowExcessArguments(false).allowUnknownOption(false).description('modify react native project code to adapt to canyon').addHelpText('after', `\nFor help, head on to ${accent('https://github.com/canyon-project/canyon')}`).action(async (params, options)=>await mapCommand(params, options));
+program.command('upload').option('--debug <dsn>', 'debug').option('--dsn <dsn>', 'dsn of the canyon server').option('--repo_id <repo_id>', 'repo id of the canyon server').option('--filter <filter>', '仅合并路径包含该子串的文件覆盖率').option('--instrument_cwd <instrument_cwd>', 'instrument cwd of the canyon server').option('--sha <sha>', 'sha of the canyon server').option('--branch <branch>', 'branch of the canyon server').option('--provider <provider>', 'provider of the canyon server').option('--build_target <build_target>', 'build target of the canyon server').option('--coverage <coverage>', 'coverage of the canyon server').allowExcessArguments(false).allowUnknownOption(false).description('modify react native project code to adapt to canyon').addHelpText('after', `\nFor help, head on to ${accent('https://github.com/canyon-project/canyon')}`).action(async (params, options)=>await mapCommand(params, options));
 const cli = async (args)=>{
     try {
         await program.parseAsync(args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canyonjs/cli",
-  "version": "1.0.15",
+  "version": "1.0.18",
   "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));