@offckb/cli 0.3.0-rc9 → 0.3.1

package/dist/cli.js

@@ -146,7 +146,7 @@ program
     .command('deploy')
     .description('Deploy contracts to different networks, only supports devnet and testnet')
     .option('--network <network>', 'Specify the network to deploy to', 'devnet')
-    .option('--target <target>', 'Specify the relative bin target folder to deploy to')
+    .option('--target <target>', 'Specify the script binaries file/folder path to deploy')
     .option('--config <config>', 'Specify the offckb.config.ts file path for deployment', undefined)
     .option('-t, --type-id', 'Specify if use upgradable type id to deploy the script')
     .option('--privkey <privkey>', 'Specify the private key to deploy scripts')

package/dist/cmd/deploy.js

@@ -34,9 +34,8 @@ function deploy(opt = { network: base_1.Network.devnet, typeId: false, target: u
         const configPath = opt.config;
         const targetFolder = opt.target;
         if (targetFolder) {
-            const binFolder = (0, fs_1.isAbsolutePath)(targetFolder) ? targetFolder : path_1.default.resolve(process.cwd(), targetFolder);
-            const bins = (0, fs_1.listBinaryFilesInFolder)(binFolder);
-            const binPaths = bins.map((bin) => path_1.default.resolve(binFolder, bin));
+            const binFilesOrFolder = (0, fs_1.isAbsolutePath)(targetFolder) ? targetFolder : path_1.default.resolve(process.cwd(), targetFolder);
+            const binPaths = (0, fs_1.getBinaryFilesFromPath)(binFilesOrFolder);
             const results = yield (0, deploy_1.deployBinaries)(binPaths, privateKey, enableTypeId, ckb);
             // record the deployed contract infos
             (0, deploy_1.recordDeployResult)(results, network); // we don't update my-scripts.json since we don't know where the file is

package/dist/deploy/index.js

@@ -26,11 +26,11 @@ function getToDeployBinsPath(userOffCKBConfigPath) {
     const match = fileContent.match(/contractBinFolder:\s*['"]([^'"]+)['"]/);
     if (match && match[1]) {
         const contractBinFolderValue = match[1];
-        const binFolderPath = (0, fs_1.isAbsolutePath)(contractBinFolderValue)
+        const binFileOrFolderPath = (0, fs_1.isAbsolutePath)(contractBinFolderValue)
             ? contractBinFolderValue
             : path_1.default.resolve(userOffCKBConfigPath, contractBinFolderValue);
-        const bins = (0, fs_1.listBinaryFilesInFolder)(binFolderPath);
-        return bins.map((bin) => path_1.default.resolve(binFolderPath, bin));
+        const bins = (0, fs_1.getBinaryFilesFromPath)(binFileOrFolderPath);
+        return bins;
     }
     else {
         console.log('contractBinFolder value not found in offckb.config.ts');

package/dist/util/fs.d.ts

@@ -4,6 +4,7 @@ export declare function copyFileSync(source: string, target: string): void;
 export declare function copyFilesWithExclusion(sourceDir: string, destinationDir: string, excludedFolders: string[]): Promise<void>;
 export declare function copyRecursive(source: string, destination: string, excludedFolders: string[]): Promise<void>;
 export declare function readFileToUint8Array(filePath: string): Promise<Uint8Array>;
+export declare function getBinaryFilesFromPath(fileOrFolderPath: string): string[];
 export declare function listBinaryFilesInFolder(folderPath: string): string[];
 export declare function isBinaryFile(filePath: string): boolean;
 export declare function isAbsolutePath(filePath: string): boolean;

package/dist/util/fs.js

@@ -32,7 +32,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSubfolders = exports.findFileInFolder = exports.isAbsolutePath = exports.isBinaryFile = exports.listBinaryFilesInFolder = exports.readFileToUint8Array = exports.copyRecursive = exports.copyFilesWithExclusion = exports.copyFileSync = exports.copyFolderSync = exports.isFolderExists = void 0;
+exports.getSubfolders = exports.findFileInFolder = exports.isAbsolutePath = exports.isBinaryFile = exports.listBinaryFilesInFolder = exports.getBinaryFilesFromPath = exports.readFileToUint8Array = exports.copyRecursive = exports.copyFilesWithExclusion = exports.copyFileSync = exports.copyFolderSync = exports.isFolderExists = void 0;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 function isFolderExists(folderPath) {
@@ -135,19 +135,29 @@ function readFileToUint8Array(filePath) {
     });
 }
 exports.readFileToUint8Array = readFileToUint8Array;
+function getBinaryFilesFromPath(fileOrFolderPath) {
+    if (!fs.existsSync(fileOrFolderPath)) {
+        throw new Error(`File or Folder not exits ${fileOrFolderPath}`);
+    }
+    // Check if the provided path is a directory
+    if (fs.lstatSync(fileOrFolderPath).isDirectory()) {
+        return listBinaryFilesInFolder(fileOrFolderPath);
+    }
+    if (fs.lstatSync(fileOrFolderPath).isFile() && isBinaryFile(fileOrFolderPath)) {
+        return [fileOrFolderPath];
+    }
+    throw new Error(`${fileOrFolderPath} is not a valid path to deploy scripts.`);
+}
+exports.getBinaryFilesFromPath = getBinaryFilesFromPath;
 function listBinaryFilesInFolder(folderPath) {
     // Check if the provided path is a directory
     if (!fs.existsSync(folderPath) || !fs.lstatSync(folderPath).isDirectory()) {
         throw new Error(`${folderPath} is not a valid directory.`);
     }
     // Read the contents of the directory
-    const files = fs.readdirSync(folderPath);
+    const files = fs.readdirSync(folderPath).map((f) => path.join(folderPath, f));
     // Filter out only the binary files (assuming they have extensions like .exe, .bin, .dll, etc.)
-    const binaryFiles = files.filter((file) => {
-        const filePath = path.join(folderPath, file);
-        // Check if the file is a regular file and not a directory
-        return fs.statSync(filePath).isFile() && isBinaryFile(filePath);
-    });
+    const binaryFiles = files.filter((file) => fs.statSync(file).isFile() && isBinaryFile(file));
     return binaryFiles;
 }
 exports.listBinaryFilesInFolder = listBinaryFilesInFolder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@offckb/cli",
-  "version": "0.3.0-rc9",
+  "version": "0.3.1",
   "description": "ckb development network for your first try",
   "author": "CKB EcoFund",
   "license": "MIT",