@canyonjs/cli 1.0.31 → 1.0.33

package/bin/canyon.js

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

package/dist/index.js

@@ -4,7 +4,7 @@ import node_fs from "node:fs";
 import node_path from "node:path";
 import axios from "axios";
 var package_namespaceObject = {
-    rE: "1.0.31"
+    rE: "1.0.33"
 };
 function mergeNumberMaps(a = {}, b = {}) {
     const result = {
@@ -60,26 +60,26 @@ function mergeCoverageMaps(target = {}, source = {}) {
     return out;
 }
 async function mapCommand(params, options) {
-    console.log('Current working directory:', process.cwd());
-    const isGitHubActions = 'true' === process.env.GITHUB_ACTIONS || !!process.env.GITHUB_EVENT_PATH;
+    console.log("Current working directory:", process.cwd());
+    const isGitHubActions = "true" === process.env.GITHUB_ACTIONS || !!process.env.GITHUB_EVENT_PATH;
     let githubEvent;
     if (isGitHubActions && process.env.GITHUB_EVENT_PATH) try {
-        if (node_fs.existsSync(process.env.GITHUB_EVENT_PATH)) githubEvent = node_fs.readFileSync(process.env.GITHUB_EVENT_PATH, 'utf8');
-        else console.log('GITHUB_EVENT_PATH file not found:', process.env.GITHUB_EVENT_PATH);
+        if (node_fs.existsSync(process.env.GITHUB_EVENT_PATH)) githubEvent = node_fs.readFileSync(process.env.GITHUB_EVENT_PATH, "utf8");
+        else console.log("GITHUB_EVENT_PATH file not found:", process.env.GITHUB_EVENT_PATH);
     } catch (error) {
-        console.warn('Failed to read GITHUB_EVENT_PATH:', error);
+        console.warn("Failed to read GITHUB_EVENT_PATH:", error);
     }
     const { dsn, repo_id: repoID, sha, provider, build_target, debug, instrument_cwd, filter, scene } = params;
-    if (!node_fs.existsSync(node_path.resolve(process.cwd(), '.canyon_output'))) return void console.log('No .canyon_output directory found, skipping upload.');
-    const files = node_fs.readdirSync(node_path.resolve(process.cwd(), '.canyon_output'));
+    if (!node_fs.existsSync(node_path.resolve(process.cwd(), ".canyon_output"))) return void console.log("No .canyon_output directory found, skipping upload.");
+    const files = node_fs.readdirSync(node_path.resolve(process.cwd(), ".canyon_output"));
     let data = {};
     for(let i = 0; i < files.length; i++){
         const fileName = files[i];
         const isCoverageFinalFile = /^coverage-final-.*\.json$/.test(fileName);
-        const fileCoverageString = node_fs.readFileSync(node_path.resolve(process.cwd(), '.canyon_output', fileName), 'utf-8');
+        const fileCoverageString = node_fs.readFileSync(node_path.resolve(process.cwd(), ".canyon_output", fileName), "utf-8");
         const fileCoverage = JSON.parse(fileCoverageString);
         let toMerge = fileCoverage;
-        if (filter && 'string' == typeof filter && isCoverageFinalFile) {
+        if (filter && "string" == typeof filter && isCoverageFinalFile) {
             const filteredEntries = Object.entries(fileCoverage).filter(([filePath])=>filePath.includes(filter));
             if (0 === filteredEntries.length) continue;
             toMerge = Object.fromEntries(filteredEntries);
@@ -88,13 +88,22 @@ async function mapCommand(params, options) {
     }
     const env_branch = process.env.CI_COMMIT_BRANCH;
     const env_buildID = process.env.CI_JOB_ID;
-    const env_buildProvider = 'gitlab_runner';
+    const env_buildProvider = "gitlab_runner";
+    let diffData;
+    const diffJsonPath = node_path.resolve(process.cwd(), "diff.json");
+    if (node_fs.existsSync(diffJsonPath)) try {
+        const diffJsonContent = node_fs.readFileSync(diffJsonPath, "utf-8");
+        diffData = JSON.parse(diffJsonContent);
+        console.log(`Found diff.json file: ${diffJsonPath}`);
+    } catch (error) {
+        console.warn(`Failed to read or parse diff.json: ${error}`);
+    }
     let sceneMap;
     if (scene && Array.isArray(scene)) {
         sceneMap = {};
         for (const pair of scene){
-            if ('string' != typeof pair) return void console.error(`Invalid scene parameter: ${pair}. Expected format: key=value`);
-            const equalIndex = pair.indexOf('=');
+            if ("string" != typeof pair) return void console.error(`Invalid scene parameter: ${pair}. Expected format: key=value`);
+            const equalIndex = pair.indexOf("=");
             if (-1 === equalIndex || 0 === equalIndex) return void console.error(`Invalid scene parameter format: ${pair}. Expected format: key=value`);
             const key = pair.substring(0, equalIndex);
             const value = pair.substring(equalIndex + 1);
@@ -104,13 +113,13 @@ async function mapCommand(params, options) {
     }
     const p = {
         dsn,
-        provider: provider || 'gitlab',
+        provider: provider || "gitlab",
         repoID: repoID || process.env.CI_PROJECT_ID,
         sha: sha || process.env.CI_COMMIT_SHA,
-        instrumentCwd: instrument_cwd || process.cwd(),
-        reportID: 'initial_coverage_data',
-        reportProvider: 'ci',
-        buildTarget: build_target || '',
+        instrumentCwd: instrument_cwd || '',
+        reportID: "initial_coverage_data",
+        reportProvider: "ci",
+        buildTarget: build_target || "",
         coverage: Object.keys(data),
         build: {
             provider: isGitHubActions ? "github_actions" : env_buildProvider,
@@ -120,9 +129,12 @@ async function mapCommand(params, options) {
         },
         ...sceneMap && {
             scene: sceneMap
+        },
+        ...diffData && {
+            diff: diffData
         }
     };
-    if ('true' === debug) console.log(p);
+    if ("true" === debug) console.log(p);
     await axios.post(dsn, {
         ...p,
         coverage: data
@@ -136,17 +148,17 @@ async function mapCommand(params, options) {
     });
 }
 const accent = chalk.greenBright;
-const CLI_BEFORE_ALL_TXT = `canyon: The ${accent('Canyon')} CLI - Version ${package_namespaceObject.rE} (${accent('https://github.com/canyon-project/canyon')}) ${chalk.black.bold.bgYellowBright(' ALPHA ')} \n`;
-const CLI_AFTER_ALL_TXT = `\nFor more help, head on to ${accent('https://github.com/canyon-project/canyon')}`;
-program.name('canyon').version(package_namespaceObject.rE, '-v, --version', 'see the current version of canyon-uploader').usage('[options or commands] arguments').addHelpText('beforeAll', CLI_BEFORE_ALL_TXT).addHelpText('after', CLI_AFTER_ALL_TXT).configureHelp({
+const CLI_BEFORE_ALL_TXT = `canyon: The ${accent("Canyon")} CLI - Version ${package_namespaceObject.rE} (${accent("https://github.com/canyon-project/canyon")}) ${chalk.black.bold.bgYellowBright(" ALPHA ")} \n`;
+const CLI_AFTER_ALL_TXT = `\nFor more help, head on to ${accent("https://github.com/canyon-project/canyon")}`;
+program.name("canyon").version(package_namespaceObject.rE, "-v, --version", "see the current version of canyon-uploader").usage("[options or commands] arguments").addHelpText("beforeAll", CLI_BEFORE_ALL_TXT).addHelpText("after", CLI_AFTER_ALL_TXT).configureHelp({
     optionTerm: (option)=>accent(option.flags),
     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('--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').option('--scene <key=value>', 'scene key-value pair, can be used multiple times, e.g. --scene env=prod --scene type=e2e', (value, previous = [])=>{
+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").option("--scene <key=value>", "scene key-value pair, can be used multiple times, e.g. --scene env=prod --scene type=e2e", (value, previous = [])=>{
     previous.push(value);
     return previous;
-}, []).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));
+}, []).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,31 +1,31 @@
 {
   "name": "@canyonjs/cli",
-  "version": "1.0.31",
+  "version": "1.0.33",
+  "bin": {
+    "canyon": "bin/canyon.js"
+  },
+  "files": [
+    "dist",
+    "bin"
+  ],
   "type": "module",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js"
     }
   },
-  "types": "./dist/index.d.ts",
-  "files": [
-    "dist",
-    "bin"
-  ],
-  "bin": {
-    "canyon": "bin/canyon.js"
+  "dependencies": {
+    "axios": "^1.12.2",
+    "chalk": "^5.6.2",
+    "commander": "^14.0.1"
   },
   "devDependencies": {
     "@rslib/core": "^0.15.1",
     "@rstest/core": "^0.5.1",
     "@types/node": "^24.10.1",
-    "@typescript/native-preview": "7.0.0-dev.20260126.1"
-  },
-  "dependencies": {
-    "axios": "^1.12.2",
-    "chalk": "^5.6.2",
-    "commander": "^14.0.1"
+    "@typescript/native-preview": "7.0.0-dev.20260223.1"
   },
   "scripts": {
     "build": "rslib build",