@offckb/cli 0.4.4-canary-c8d18ae.0 → 0.4.4-canary-345ced0.0

package/build/index.js

@@ -267,10 +267,12 @@ function writeSettings(settings) {
 }
 function getCKBBinaryInstallPath(version) {
     const setting = readSettings();
-    return `${setting.bins.rootFolder}/${version}`;
+    return path.join(setting.bins.rootFolder, version);
 }
 function getCKBBinaryPath(version) {
-    return `${getCKBBinaryInstallPath(version)}/ckb`;
+    const platform = process.platform;
+    const binaryName = platform === 'win32' ? 'ckb.exe' : 'ckb';
+    return path.join(getCKBBinaryInstallPath(version), binaryName);
 }
 function deepMerge(target, source) {
     for (const key in source) {
@@ -2321,15 +2323,27 @@ function downloadCKBBinaryAndUnzip(version) {
             const sourcePath = path.join(extractDir, ckbPackageName);
             const targetPath = (0, setting_1.getCKBBinaryInstallPath)(version);
             if (fs.existsSync(targetPath)) {
-                fs.rmdirSync(targetPath, { recursive: true });
+                fs.rmSync(targetPath, { recursive: true, force: true });
             }
             fs.mkdirSync(targetPath, { recursive: true });
-            fs.renameSync(sourcePath, targetPath); // Move binary to desired location
-            fs.chmodSync((0, setting_1.getCKBBinaryPath)(version), '755'); // Make the binary executable
+            // Use fs.cp for cross-platform file copying (Node 16.7+)
+            // This is more reliable than renameSync on Windows
+            if (fs.cpSync) {
+                fs.cpSync(sourcePath, targetPath, { recursive: true, force: true });
+                fs.rmSync(sourcePath, { recursive: true, force: true });
+            }
+            else {
+                // Fallback for older Node versions
+                fs.renameSync(sourcePath, targetPath);
+            }
+            // Make the binary executable (only for non-Windows platforms)
+            if (process.platform !== 'win32') {
+                fs.chmodSync((0, setting_1.getCKBBinaryPath)(version), '755');
+            }
             logger_1.logger.info(`CKB ${version} installed successfully.`);
         }
         catch (error) {
-            logger_1.logger.error('Error installing dependency binary:', error);
+            logger_1.logger.error('Error installing dependency binary:', error.message);
         }
     });
 }
@@ -2592,6 +2606,7 @@ const list_hashes_1 = __nccwpck_require__(31603);
 const logger_1 = __nccwpck_require__(65370);
 const const_1 = __nccwpck_require__(75587);
 const toml_1 = __importDefault(__nccwpck_require__(2811));
+const util_1 = __nccwpck_require__(58642);
 function getDevnetSystemScriptsFromListHashes() {
     var _a;
     const settings = (0, setting_1.readSettings)();
@@ -2607,9 +2622,8 @@ function getDevnetSystemScriptsFromListHashes() {
     }
     const systemScriptArray = chainSpecHashes.system_cells
         .map((cell) => {
-        var _a;
-        // Extract the file name
-        const name = ((_a = cell.path.split('/').pop()) === null || _a === void 0 ? void 0 : _a.replace(')', '')) || 'unknown script';
+        // Extract the file name from the path using the helper function
+        const name = (0, util_1.extractScriptNameFromPath)(cell.path);
         const depGroupIndex = chainSpecHashes.dep_groups.findIndex((depGroup) => depGroup.included_cells.includes(cell.path));
         const depType = depGroupIndex === -1 ? 'code' : 'depGroup';
         const depGroup = depGroupIndex === -1
@@ -2961,7 +2975,7 @@ exports.MAINNET_SYSTEM_SCRIPTS = {
                 {
                     cellDep: {
                         outPoint: {
-                            txHash: '0x1911208b136957d5f7c1708a8835edfe8ae1d02700d5cb2c3a6aacf4d5906306',
+                            txHash: '0x99b116dd1e4f1fa903b70112ae672c18bb34241d3d03a9ad555cd2a611be7327',
                             index: 0,
                         },
                         depType: 'code',
@@ -3044,6 +3058,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.readDeployedScriptInfoFrom = readDeployedScriptInfoFrom;
 exports.getScriptInfoFrom = getScriptInfoFrom;
+exports.extractScriptNameFromPath = extractScriptNameFromPath;
 const fs = __importStar(__nccwpck_require__(79896));
 const migration_1 = __nccwpck_require__(76679);
 const path_1 = __importDefault(__nccwpck_require__(16928));
@@ -3111,6 +3126,29 @@ function getScriptInfoFrom(recipe) {
         scriptsInfo,
     };
 }
+/**
+ * Extracts the script name from a CKB list-hashes path string.
+ * Handles both Bundled() and FileSystem() wrappers, and works with Unix and Windows path separators.
+ *
+ * @param pathString - The path string from CKB list-hashes output
+ * @returns The extracted script name
+ *
+ * @example
+ * extractScriptNameFromPath('Bundled(specs/cells/secp256k1_blake160_sighash_all)') // => 'secp256k1_blake160_sighash_all'
+ * extractScriptNameFromPath('FileSystem(/Users/user/devnet/specs/anyone_can_pay)') // => 'anyone_can_pay'
+ * extractScriptNameFromPath('FileSystem(C:\\Users\\user\\devnet\\specs\\anyone_can_pay)') // => 'anyone_can_pay'
+ */
+function extractScriptNameFromPath(pathString) {
+    // Remove FileSystem(...) or Bundled(...) wrapper if present
+    const wrapperMatch = pathString.match(/^(?:FileSystem|Bundled)\((.+)\)$/);
+    if (wrapperMatch) {
+        pathString = wrapperMatch[1];
+    }
+    // Use path.basename to extract the filename
+    // This is robust and handles the platform's native path separator correctly
+    // On Windows, it handles backslashes; on Unix, it handles forward slashes
+    return path_1.default.basename(pathString);
+}
 
 
 /***/ }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@offckb/cli",
-  "version": "0.4.4-canary-c8d18ae.0",
+  "version": "0.4.4-canary-345ced0.0",
   "description": "ckb development network for your first try",
   "author": "CKB EcoFund",
   "license": "MIT",
@@ -36,7 +36,10 @@
     "clean": "node scripts/clean.js",
     "lint": "eslint \"src/**/*.ts\" --ignore-pattern 'node_modules/'",
     "lint:fix": "eslint \"src/**/*.ts\" --ignore-pattern 'node_modules/' --fix",
-    "fmt": "prettier --write '{src,templates,account}/**/*.{js,jsx,ts,tsx,md,json}'"
+    "fmt": "prettier --write '{src,templates,account}/**/*.{js,jsx,ts,tsx,md,json}'",
+    "test": "jest",
+    "test:watch": "jest --watch",
+    "test:coverage": "jest --coverage"
   },
   "husky": {
     "hooks": {
@@ -54,6 +57,7 @@
   },
   "devDependencies": {
     "@types/adm-zip": "^0.5.5",
+    "@types/jest": "^30.0.0",
     "@types/node": "^20.17.24",
     "@types/node-fetch": "^2.6.11",
     "@types/semver": "^7.5.7",
@@ -63,8 +67,10 @@
     "@vercel/ncc": "^0.38.3",
     "eslint": "^8.57.0",
     "husky": "^9.0.11",
+    "jest": "^30.2.0",
     "lint-staged": "^15.2.2",
     "prettier": "^3.2.5",
+    "ts-jest": "^29.4.6",
     "ts-node-dev": "^2.0.0",
     "typescript": "^5.3.3"
   },