@canyonjs/cli 1.0.2 → 1.0.5

package/README.md

@@ -1,9 +0,0 @@
-代办项
-
-upload
-- [x] 对于init json，先尝试找input SourceMap
-
-
-参考 https://docs.hoppscotch.io/documentation/clients/cli/overview#hopp-test
-
-md.canyonjs.io 玩一下

package/dist/index.js

@@ -5,18 +5,25 @@ import node_path from "node:path";
 import axios from "axios";
 import { log } from "node:console";
 var package_namespaceObject = {
-    rE: "1.0.2"
+    rE: "1.0.5"
 };
 async function mapCommand(params, options) {
-    const { dsn, repo_id: repoID, commit_sha: sha, provider } = 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"));
+    const { dsn, repo_id: repoID, commit_sha: sha, provider, build_target } = 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 fileCoverageString = node_fs.readFileSync(node_path.resolve(process.cwd(), '.canyon_output', files[i]), 'utf-8');
+        const fileCoverage = JSON.parse(fileCoverageString);
+        if (files[i].includes('-init-')) try {
+            const pathString = node_fs.readFileSync(node_path.resolve(Object.keys(fileCoverage)[0] + '.map'), 'utf-8');
+            Object.entries(fileCoverage).forEach((item)=>{
+                item[1].inputSourceMap = JSON.parse(pathString);
+            });
+        } catch (e) {}
         data = {
             ...data,
-            ...JSON.parse(fileCoverageString)
+            ...fileCoverage
         };
     }
     const p = {
@@ -27,24 +34,23 @@ async function mapCommand(params, options) {
         instrumentCwd: process.cwd(),
         reportID: 'initial_coverage_data',
         reportProvider: 'ci',
-        buildTarget: '',
+        buildTarget: build_target || '',
         coverage: Object.keys(data)
     };
-    log(p);
     await axios.post(dsn, {
         ...p,
         coverage: data
     });
 }
 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("--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('--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));
 const cli = async (args)=>{
     try {
         await program.parseAsync(args);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canyonjs/cli",
-  "version": "1.0.2",
+  "version": "1.0.5",
   "type": "module",
   "exports": {
     ".": {
@@ -30,6 +30,7 @@
   },
   "scripts": {
     "build": "rslib build",
+    "my-test": "npm run build && node ./bin/canyon upload",
     "check": "biome check --write",
     "dev": "rslib build --watch",
     "format": "biome format --write",