@adinsure-ops/ops-cli 5.3.0 → 5.3.1

package/lib/commands/download/studio.d.ts

@@ -7,7 +7,7 @@ export default class DownloadStudio extends CommandBase<typeof DownloadStudio> {
     static flags: {
         source: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         version: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
-        output: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
+        output: import("@oclif/core/lib/interfaces/parser.js").OptionFlag<string, import("@oclif/core/lib/interfaces/parser.js").CustomOptions>;
         install: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         skip: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;
         keep: import("@oclif/core/lib/interfaces/parser.js").BooleanFlag<boolean>;

package/lib/commands/download/studio.js

@@ -75,16 +75,13 @@ class DownloadStudio extends CommandBase {
         });
         return __awaiter(this, void 0, void 0, function* () {
             _super.run.call(this);
+            // Set default based on config, else use './' as final fallback
+            const config = new OpsConfig(this.security.getConfigPath());
+            const defaultFolder = config.get('download_folder');
+            DownloadStudio.flags.output.default = defaultFolder || './';
             const { flags } = yield this.parse(DownloadStudio);
             // The os.homedir expands the ~ char, as the node path.resolve method does not expand it
             let outputDir = flags.output;
-            if (!outputDir) {
-                // If the user didn't provide the output flag, try to get the default from config.
-                const config = new OpsConfig(this.security.getConfigPath());
-                const defaultFolder = config.get('download_folder');
-                outputDir = defaultFolder || './'; // no flag -> DEFAULT output is "./"
-            }
-            // Expand tilde if present
             const basePath = outputDir.charAt(0) === '~'
                 ? os.homedir() + outputDir.split('~')[1]
                 : outputDir;
@@ -181,6 +178,7 @@ DownloadStudio.flags = {
     output: Flags.string({
         char: 'o',
         description: 'output directory',
+        default: './',
     }),
     install: Flags.boolean({
         char: 'i',

package/lib/commands/npm/publish.d.ts

@@ -15,7 +15,9 @@ export default class NpmPublish extends CommandBase<typeof NpmPublish> {
     publishPackage(pkg: NpmPackage, cmd?: string[]): Promise<{
         data: string;
         error: string;
+        exitCode: unknown;
     }>;
+    wasPublished(data: string, error: string, exitCode: unknown): Promise<boolean>;
     checkPackageCanPublish(pkg: NpmPackage, allPackages: AzurePackageArray, version: string, retries: number): Promise<boolean>;
     publishPackages(packages: NpmPackage[], allPackages: AzurePackageArray, version: string, retries: number): Promise<void>;
     run(): Promise<void>;

package/lib/commands/npm/publish.js

@@ -18,56 +18,61 @@ class NpmPublish extends CommandBase {
             else {
                 [sh, ...args] = cmd;
             }
+            this.cp = spawn(sh, args, {
+                cwd: pkg.path,
+                env: Object.assign(Object.assign({}, process.env), process.stdout.isTTY ? { FORCE_COLOR: process.env.FORCE_COLOR || '1' } : {}),
+                stdio: 'pipe',
+            });
+            let data = '';
             try {
-                this.cp = spawn(sh, args, {
-                    cwd: pkg.path,
-                    env: Object.assign(Object.assign({}, process.env), process.stdout.isTTY ? { FORCE_COLOR: process.env.FORCE_COLOR || '1' } : {}),
-                    stdio: 'pipe',
-                });
-                let data = '';
-                try {
-                    for (var _g = true, _h = __asyncValues(this.cp.stdout), _j; _j = yield _h.next(), _a = _j.done, !_a; _g = true) {
-                        _c = _j.value;
-                        _g = false;
-                        const chunk = _c;
-                        data += chunk;
-                    }
-                }
-                catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                finally {
-                    try {
-                        if (!_g && !_a && (_b = _h.return)) yield _b.call(_h);
-                    }
-                    finally { if (e_1) throw e_1.error; }
+                for (var _g = true, _h = __asyncValues(this.cp.stdout), _j; _j = yield _h.next(), _a = _j.done, !_a; _g = true) {
+                    _c = _j.value;
+                    _g = false;
+                    const chunk = _c;
+                    data += chunk;
                 }
-                let error = '';
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
                 try {
-                    for (var _k = true, _l = __asyncValues(this.cp.stderr), _m; _m = yield _l.next(), _d = _m.done, !_d; _k = true) {
-                        _f = _m.value;
-                        _k = false;
-                        const chunk = _f;
-                        error += chunk;
-                    }
+                    if (!_g && !_a && (_b = _h.return)) yield _b.call(_h);
                 }
-                catch (e_2_1) { e_2 = { error: e_2_1 }; }
-                finally {
-                    try {
-                        if (!_k && !_d && (_e = _l.return)) yield _e.call(_l);
-                    }
-                    finally { if (e_2) throw e_2.error; }
+                finally { if (e_1) throw e_1.error; }
+            }
+            let error = '';
+            try {
+                for (var _k = true, _l = __asyncValues(this.cp.stderr), _m; _m = yield _l.next(), _d = _m.done, !_d; _k = true) {
+                    _f = _m.value;
+                    _k = false;
+                    const chunk = _f;
+                    error += chunk;
                 }
-                const exitCode = yield new Promise((resolve) => {
-                    this.cp.on('close', resolve);
-                });
-                if (exitCode) {
-                    throw new Error(`subprocess error exit ${exitCode}, ${error}`);
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (!_k && !_d && (_e = _l.return)) yield _e.call(_l);
                 }
-                return { data, error };
-                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                finally { if (e_2) throw e_2.error; }
             }
-            catch (error) {
-                throw new Error(error.message);
+            const exitCode = yield new Promise((resolve) => {
+                this.cp.on('close', resolve);
+            });
+            return { data, error, exitCode };
+        });
+    }
+    wasPublished(data, error, exitCode) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (exitCode) {
+                return false;
+            }
+            // Extract the HTTP status code from the error message
+            const statusCodeMatch = /\d{3}/.exec(error);
+            const statusCode = statusCodeMatch ? Number.parseInt(statusCodeMatch[0], 10) : null;
+            if (statusCode && (statusCode >= 400 && statusCode < 600)) {
+                return false;
             }
+            return true;
         });
     }
     checkPackageCanPublish(pkg, allPackages, version, retries) {
@@ -83,22 +88,17 @@ class NpmPublish extends CommandBase {
             if (!matchedPackage) {
                 ux.action.stop(`${chalk.green('new package')}`);
                 ux.action.start(`publish new package ${pkg.name}@${pkg.version} from ${pkg.jsonPath}`, undefined, { stdout: true });
-                try {
-                    yield this.publishPackage(pkg);
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                }
-                catch (error) {
-                    if (error instanceof Error && error.message.includes('subprocess error exit')) {
-                        // Check if the error message contains 'subprocess error exit'
-                        // Extract the HTTP status code from the error message
-                        const statusCodeMatch = /\d{3}/.exec(error.message);
-                        const statusCode = statusCodeMatch ? Number.parseInt(statusCodeMatch[0], 10) : null;
-                        if (statusCode && (statusCode >= 400 && statusCode < 600)) {
-                            for (let i = 0; i < retries - 1; i++) {
-                                yield this.publishPackage(pkg);
-                            }
-                        }
+                let published = false;
+                for (let i = 0; i < retries - 1; i++) {
+                    const { data, error, exitCode } = yield this.publishPackage(pkg);
+                    if (!this.wasPublished(data, error, exitCode)) {
+                        continue;
                     }
+                    published = true;
+                    break;
+                }
+                if (!published) {
+                    throw new Error(`publishing of ${pkg.name}@${pkg.version} failed`);
                 }
                 ux.action.stop(`${chalk.green('done')}`);
                 return true;
@@ -107,7 +107,10 @@ class NpmPublish extends CommandBase {
             if (!matchVersion) {
                 ux.action.stop(`${chalk.yellow('version missing')}`);
                 ux.action.start(`publish new version ${pkg.name}@${pkg.version} from ${pkg.jsonPath}`, undefined, { stdout: true });
-                yield this.publishPackage(pkg);
+                const { data, error, exitCode } = yield this.publishPackage(pkg);
+                if (!this.wasPublished(data, error, exitCode)) {
+                    throw new Error(`publishing of ${pkg.name}@${pkg.version} failed`);
+                }
                 ux.action.stop(`${chalk.green('done')}`);
                 return true;
             }

package/oclif.manifest.json

@@ -1095,6 +1095,7 @@
           "char": "o",
           "description": "output directory",
           "name": "output",
+          "default": "./",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
@@ -1852,5 +1853,5 @@
       ]
     }
   },
-  "version": "5.3.0"
+  "version": "5.3.1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@adinsure-ops/ops-cli",
     "description": "Operations CLI for working with AdInsure",
-    "version": "5.3.0",
+    "version": "5.3.1",
     "author": "Adacta Digital Service Department",
     "bin": {
         "ops": "./bin/run.js"