@canyonjs/cli 1.0.26 → 1.0.27

package/dist/index.js

@@ -1,11 +1,10 @@
 import chalk from "chalk";
 import { program } from "commander";
-import { error, log } from "node:console";
 import node_fs from "node:fs";
 import node_path from "node:path";
 import axios from "axios";
 var package_namespaceObject = {
-    rE: "1.0.26"
+    rE: "1.0.27"
 };
 function mergeNumberMaps(a = {}, b = {}) {
     const result = {
@@ -61,9 +60,9 @@ function mergeCoverageMaps(target = {}, source = {}) {
     return out;
 }
 async function mapCommand(params, options) {
-    log('Current working directory:', process.cwd());
+    console.log('Current working directory:', process.cwd());
     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 log('不存在');
+    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++){
@@ -83,12 +82,17 @@ async function mapCommand(params, options) {
     const env_buildID = process.env.CI_JOB_ID;
     const env_buildProvider = 'gitlab_runner';
     let sceneMap;
-    if (scene) try {
-        sceneMap = 'string' == typeof scene ? JSON.parse(scene) : scene;
-        if ('object' != typeof sceneMap || Array.isArray(sceneMap)) throw new Error('scene must be a valid JSON object');
-    } catch (e) {
-        error(`Failed to parse scene parameter: ${e}. Expected JSON format like '{"key1":"value1","key2":"value2"}'`);
-        return;
+    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 (-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);
+            if (!key || !value) return void console.error(`Invalid scene parameter format: ${pair}. Key and value cannot be empty`);
+            sceneMap[key] = value;
+        }
     }
     const p = {
         dsn,
@@ -109,15 +113,15 @@ async function mapCommand(params, options) {
             scene: sceneMap
         }
     };
-    if ('true' === debug) log(p);
+    if ('true' === debug) console.log(p);
     await axios.post(dsn, {
         ...p,
         coverage: data
     }).then((r)=>{
-        log(JSON.stringify(r.data, null, 2));
+        console.log(JSON.stringify(r.data, null, 2));
         return r;
     }).catch((err)=>{
-        if (err?.response?.data) log(err?.response?.data);
+        if (err?.response?.data) console.log(err?.response?.data);
         else String(err);
         return err;
     });
@@ -130,7 +134,10 @@ 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('--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 <scene>', 'scene map in JSON format, e.g. \'{"key1":"value1","key2":"value2"}\'').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').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));
 const cli = async (args)=>{
     try {
         await program.parseAsync(args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canyonjs/cli",
-  "version": "1.0.26",
+  "version": "1.0.27",
   "type": "module",
   "exports": {
     ".": {
@@ -20,7 +20,7 @@
     "@rslib/core": "^0.15.1",
     "@rstest/core": "^0.5.1",
     "@types/node": "^24.10.1",
-    "@typescript/native-preview": "^7.0.0-dev.20251215.1"
+    "@typescript/native-preview": "7.0.0-dev.20260119.1"
   },
   "dependencies": {
     "axios": "^1.12.2",
@@ -29,7 +29,7 @@
   },
   "scripts": {
     "build": "rslib build",
-    "my-test": "npm run build && node ./bin/canyon.js upload --debug=true --scene='{\"key1\":\"value1\",\"key2\":\"value2\"}'",
+    "do-test": "npm run build && node ./bin/canyon.js upload --debug true --scene k1=v2 --scene k2=v3",
     "dev-cli": "rslib build --watch"
   }
 }