bdy 1.25.3-dev → 1.25.4-dev

package/distTs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bdy",
   "preferGlobal": false,
-  "version": "1.25.3-dev",
+  "version": "1.25.4-dev",
   "type": "commonjs",
   "license": "MIT",
   "homepage": "https://buddy.works/docs/cli",

package/distTs/src/agent/socket/tunnel.js

@@ -30,6 +30,7 @@ class AgentSocketTunnel extends events_1.default {
     totalConnections;
     connections;
     dns;
+    rawStatus;
     constructor(socket, id) {
         super();
         this.id = id;
@@ -65,6 +66,7 @@ class AgentSocketTunnel extends events_1.default {
         };
     }
     onTunnelData(data) {
+        this.rawStatus = data;
         if (data.regionLatency)
             this.regionLatency = data.regionLatency;
         if (data.targetLatency)

package/distTs/src/command/agent/proxy/status.js

@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
-const commandAgentProxyStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_AGENT_PROXY_STATUS);
-commandAgentProxyStatus.action(async () => {
+const commandAgentProxyStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_AGENT_PROXY_STATUS, { examples: texts_1.EXAMPLE_AGENT_PROXY_STATUS });
+commandAgentProxyStatus.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandAgentProxyStatus.action(async (options) => {
     const ApiAgent = require('../../../tunnel/api/agent').default;
     if (!commandAgentProxyStatus.agentInstalled) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
@@ -18,6 +19,12 @@ commandAgentProxyStatus.action(async () => {
     try {
         const api = new ApiAgent(commandAgentProxyStatus.agentPort || 0);
         const data = await api.fetchAgentProxy();
+        if (options.format === 'json') {
+            output_1.default.json(data);
+            if (!data.proxy)
+                output_1.default.exitError(texts_1.TXT_AGENT_PROXY_DISABLED);
+            output_1.default.exitNormal();
+        }
         if (data.proxy) {
             output_1.default.exitSuccess(texts_1.TXT_AGENT_PROXY_ENABLED);
         }

package/distTs/src/command/agent/status.js

@@ -8,8 +8,8 @@ const node_fs_1 = require("node:fs");
 const texts_1 = require("../../texts");
 const utils_1 = require("../../utils");
 const tunnel_1 = require("../../types/tunnel");
-const commandAgentStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_AGENT_STATUS);
-const outputStatus = (installed, standalone, version, id, running, enabled, target, tunneling, proxy, status) => {
+const commandAgentStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_AGENT_STATUS, { examples: texts_1.EXAMPLE_AGENT_STATUS, helpText: texts_1.HELP_AGENT_STATUS_JSON });
+const outputStatus = (installed, standalone, version, id, running, enabled, target, tunneling, proxy, status, json) => {
     const AgentManager = require('../../agent/manager').default;
     if (!installed) {
         // Nothing loaded, yet there is a file where the install would be - it is unreadable or not
@@ -22,6 +22,22 @@ const outputStatus = (installed, standalone, version, id, running, enabled, targ
         }
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
     }
+    const orphan = AgentManager.system.getStandaloneConfigPath();
+    const orphanedConfig = !AgentManager.system.isUserOwnedInstall() && (0, node_fs_1.existsSync)(orphan)
+        ? orphan
+        : null;
+    if (json) {
+        output_1.default.json({
+            ...commandAgentStatus.agentStatus,
+            installed,
+            standalone,
+            id: id ?? null,
+            version: version || null,
+            running,
+            orphaned_config: orphanedConfig,
+        });
+        output_1.default.exitNormal();
+    }
     let txt = 'Installation: ';
     if (standalone)
         txt += 'App @ ';
@@ -66,13 +82,13 @@ const outputStatus = (installed, standalone, version, id, running, enabled, targ
     // above: an install made before those files moved keeps its config in the system directory
     // and reports itself as an app, and a leftover in the home is just as inert next to it.
     // Inert, but only findable if it is said out loud.
-    const orphan = AgentManager.system.getStandaloneConfigPath();
-    if (!AgentManager.system.isUserOwnedInstall() && (0, node_fs_1.existsSync)(orphan)) {
+    if (orphanedConfig) {
         output_1.default.error((0, texts_1.TXT_AGENT_APP_INSTALL_ORPHANED)(orphan));
     }
     output_1.default.exitNormal();
 };
-commandAgentStatus.action(async () => {
+commandAgentStatus.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandAgentStatus.action((options) => {
     let version = '';
     const id = commandAgentStatus.agentId;
     const running = !!commandAgentStatus.agentStatus;
@@ -89,6 +105,6 @@ commandAgentStatus.action(async () => {
         tunneling = commandAgentStatus.agentStatus.tunneling;
         proxy = commandAgentStatus.agentStatus.proxy;
     }
-    outputStatus(!!commandAgentStatus.agentInstalled, !!commandAgentStatus.agentStandalone, version, id, running, enabled, target, tunneling, proxy, status);
+    outputStatus(!!commandAgentStatus.agentInstalled, !!commandAgentStatus.agentStandalone, version, id, running, enabled, target, tunneling, proxy, status, options.format === 'json');
 });
 exports.default = commandAgentStatus;

package/distTs/src/command/agent/tags/get.js

@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
-const commandAgentTagsGet = (0, utils_1.newCommand)('get', texts_1.DESC_COMMAND_AGENT_TAGS_GET);
-commandAgentTagsGet.action(async () => {
+const commandAgentTagsGet = (0, utils_1.newCommand)('get', texts_1.DESC_COMMAND_AGENT_TAGS_GET, { examples: texts_1.EXAMPLE_AGENT_TAGS_GET });
+commandAgentTagsGet.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandAgentTagsGet.action(async (options) => {
     const ApiAgent = require('../../../tunnel/api/agent').default;
     if (!commandAgentTagsGet.agentInstalled) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
@@ -18,6 +19,12 @@ commandAgentTagsGet.action(async () => {
     try {
         const api = new ApiAgent(commandAgentTagsGet.agentPort || 0);
         const data = await api.fetchAgentTags();
+        if (options.format === 'json') {
+            output_1.default.json(data);
+            if (!data.tags?.length)
+                output_1.default.exitError(texts_1.TXT_AGENT_NO_TAGS);
+            output_1.default.exitNormal();
+        }
         if (data.tags && data.tags.length > 0) {
             output_1.default.exitNormal(data.tags.join(' '));
         }

package/distTs/src/command/agent/target/status.js

@@ -6,8 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../utils");
 const texts_1 = require("../../../texts");
 const output_1 = __importDefault(require("../../../output"));
-const commandAgentTargetStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_AGENT_TARGET_STATUS);
-commandAgentTargetStatus.action(async () => {
+const commandAgentTargetStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_AGENT_TARGET_STATUS, { examples: texts_1.EXAMPLE_AGENT_TARGET_STATUS });
+commandAgentTargetStatus.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandAgentTargetStatus.action(async (options) => {
     const ApiAgent = require('../../../tunnel/api/agent').default;
     if (!commandAgentTargetStatus.agentInstalled) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
@@ -18,6 +19,12 @@ commandAgentTargetStatus.action(async () => {
     try {
         const api = new ApiAgent(commandAgentTargetStatus.agentPort || 0);
         const data = await api.fetchAgentTarget();
+        if (options.format === 'json') {
+            output_1.default.json(data);
+            if (!data.target)
+                output_1.default.exitError(texts_1.TXT_AGENT_TARGET_DISABLED);
+            output_1.default.exitNormal();
+        }
         if (data.target) {
             output_1.default.exitSuccess(texts_1.TXT_AGENT_TARGET_ENABLED);
         }

package/distTs/src/command/agent/tunnel/list.js

@@ -8,7 +8,8 @@ const texts_1 = require("../../../texts");
 const utils_1 = require("../../../utils");
 const commandAgentTunnelList = (0, utils_1.newCommand)('list', texts_1.DESC_COMMAND_AGENT_TUNNEL_LIST, { examples: texts_1.EXAMPLE_AGENT_TUNNEL_LIST });
 commandAgentTunnelList.alias('ls');
-commandAgentTunnelList.action(async () => {
+commandAgentTunnelList.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandAgentTunnelList.action(async (options) => {
     const ApiAgent = require('../../../tunnel/api/agent').default;
     if (!commandAgentTunnelList.agentInstalled) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
@@ -19,6 +20,10 @@ commandAgentTunnelList.action(async () => {
     try {
         const api = new ApiAgent(commandAgentTunnelList.agentPort || 0);
         const data = await api.fetchTunnels();
+        if (options.format === 'json') {
+            output_1.default.json(data);
+            output_1.default.exitNormal();
+        }
         output_1.default.agentTunnels(data.tunnels);
     }
     catch (err) {

package/distTs/src/command/agent/tunnel/status.js

@@ -8,7 +8,8 @@ const output_1 = __importDefault(require("../../../output"));
 const utils_1 = require("../../../utils");
 const commandAgentTunnelStatus = (0, utils_1.newCommand)('status', texts_1.DESC_COMMAND_AGENT_TUNNEL_STATUS, { examples: texts_1.EXAMPLE_AGENT_TUNNEL_STATUS });
 commandAgentTunnelStatus.argument('[id]', texts_1.OPTION_ID);
-commandAgentTunnelStatus.action(async (id) => {
+commandAgentTunnelStatus.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandAgentTunnelStatus.action(async (id, options) => {
     const ApiAgent = require('../../../tunnel/api/agent').default;
     const AgentSocketTunnel = require('../../../agent/socket/tunnel').default;
     if (!commandAgentTunnelStatus.agentInstalled) {
@@ -21,6 +22,12 @@ commandAgentTunnelStatus.action(async (id) => {
         const api = new ApiAgent(commandAgentTunnelStatus.agentPort || 0);
         if (!id) {
             const data = await api.fetchAgentTunneling();
+            if (options.format === 'json') {
+                output_1.default.json(data);
+                if (!data.tunneling)
+                    output_1.default.exitError(texts_1.TXT_AGENT_TUNNELING_DISABLED);
+                output_1.default.exitNormal();
+            }
             if (data.tunneling) {
                 output_1.default.exitSuccess(texts_1.TXT_AGENT_TUNNELING_ENABLED);
             }
@@ -32,6 +39,11 @@ commandAgentTunnelStatus.action(async (id) => {
         const ws = await api.socketTunnel(id);
         const tunnel = new AgentSocketTunnel(ws, id);
         await tunnel.waitForReady();
+        if (options.format === 'json') {
+            output_1.default.json(tunnel.rawStatus);
+            tunnel.close();
+            output_1.default.exitNormal();
+        }
         output_1.default.tunnel(tunnel);
     }
     catch (err) {

package/distTs/src/command/agent/version.js

@@ -6,14 +6,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const output_1 = __importDefault(require("../../output"));
 const texts_1 = require("../../texts");
 const utils_1 = require("../../utils");
-const commandAgentVersion = (0, utils_1.newCommand)('version', texts_1.DESC_COMMAND_AGENT_VERSION);
-commandAgentVersion.action(async () => {
+const commandAgentVersion = (0, utils_1.newCommand)('version', texts_1.DESC_COMMAND_AGENT_VERSION, { examples: texts_1.EXAMPLE_AGENT_VERSION });
+commandAgentVersion.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandAgentVersion.action(async (options) => {
     if (!commandAgentVersion.agentInstalled) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_INSTALLED);
     }
     if (!commandAgentVersion.agentStatus) {
         output_1.default.exitError(texts_1.ERR_AGENT_NOT_RUNNING);
     }
+    if (options.format === 'json') {
+        output_1.default.json(commandAgentVersion.agentStatus);
+        output_1.default.exitNormal();
+    }
     output_1.default.exitNormal(commandAgentVersion.agentStatus.version);
 });
 exports.default = commandAgentVersion;

package/distTs/src/command/api/info.js

@@ -9,6 +9,8 @@ const input_1 = __importDefault(require("../../input"));
 const output_1 = __importDefault(require("../../output"));
 /** `members` keeps declaration order, which numbers the listing; `values` does not. */
 const orderedMembers = (body) => {
+    if (body.kind === 'array')
+        return orderedMembers(body.items);
     if (body.kind !== 'union')
         return [];
     const members = body.discriminator?.members;
@@ -217,15 +219,19 @@ const chosen = (asked, names) => {
     const position = Number(asked);
     return Number.isInteger(position) && position >= 1 ? names[position - 1] : undefined;
 };
-const commandApiInfo = (0, utils_1.newCommand)('info', texts_1.DESC_COMMAND_API_INFO);
+const commandApiInfo = (0, utils_1.newCommand)('info', texts_1.DESC_COMMAND_API_INFO, {
+    helpText: texts_1.HELP_API_INFO_JSON,
+    examples: texts_1.EXAMPLE_API_INFO,
+});
 commandApiInfo.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
 commandApiInfo.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
 commandApiInfo.option('--request-schema <schema>', texts_1.OPT_COMMAND_API_INFO_SCHEMA);
 commandApiInfo.option('--response-schema <schema>', texts_1.OPT_COMMAND_API_INFO_SCHEMA);
 commandApiInfo.argument('<method>', texts_1.OPT_COMMAND_API_INFO_METHOD);
 commandApiInfo.argument('<url>', texts_1.OPT_COMMAND_API_INFO_URL);
+commandApiInfo.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandApiInfo.action(async (fm, filterUrl, options) => {
-    const { apiEndpoints } = require('../../openapi');
+    const { apiEndpoints, apiSpecification } = require('../../openapi');
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project, true);
     const method = (input_1.default.restApiMethod(fm, false) ?? '').toLowerCase();
@@ -246,6 +252,48 @@ commandApiInfo.action(async (fm, filterUrl, options) => {
     const namesOf = (bodies) => bodies.flatMap((body) => [...orderedMembers(body)]);
     const request = chosen(options.requestSchema, namesOf((listed.request?.contents ?? []).map((content) => content.body)));
     const response = chosen(options.responseSchema, namesOf(listed.responses.flatMap((one) => one.contents.map((content) => content.body))));
+    if (options.format === 'json') {
+        const raw = await apiSpecification(client.baseUrl);
+        const schema = (asked, selected, bodies) => {
+            const refs = [];
+            for (let body of bodies) {
+                while (body.kind === 'array')
+                    body = body.items;
+                if (body.kind === 'union' && selected) {
+                    const name = memberDef(body, selected);
+                    if (name && raw.components?.schemas?.[name])
+                        return raw.components.schemas[name];
+                }
+                if ('ref' in body && body.ref)
+                    refs.push(body.ref.name);
+            }
+            // Union positions use the same member list as text output. Only bodies
+            // without unions use reference positions across response/content order.
+            const name = refs.includes(asked)
+                ? asked
+                : namesOf(bodies).length === 0
+                    ? chosen(asked, refs)
+                    : undefined;
+            if (name && raw.components?.schemas?.[name])
+                return raw.components.schemas[name];
+            output_1.default.exitError((0, texts_1.ERR_API_SCHEMA_NOT_FOUND)(asked));
+        };
+        const requestSchema = options.requestSchema
+            ? schema(options.requestSchema, request, (listed.request?.contents ?? []).map((content) => content.body))
+            : undefined;
+        const responseSchema = options.responseSchema
+            ? schema(options.responseSchema, response, listed.responses.flatMap((one) => one.contents.map((content) => content.body)))
+            : undefined;
+        output_1.default.json(requestSchema && responseSchema
+            ? { request: requestSchema, response: responseSchema }
+            : (requestSchema ??
+                responseSchema ?? {
+                method: wanted.method.toUpperCase(),
+                path: (0, utils_1.openApiPrepareUrl)(wanted.path, workspace, project),
+                operation: raw.paths[wanted.path][method],
+            }));
+        output_1.default.exitNormal();
+    }
     const member = request || response
         ? { ...(request ? { request } : {}), ...(response ? { response } : {}) }
         : undefined;

package/distTs/src/command/api/list.js

@@ -25,12 +25,15 @@ const outputUrl = (operation, workspace, project) => {
     if (operation.summary)
         output_1.default.gray(operation.summary);
 };
-const commandApiList = (0, utils_1.newCommand)('list', texts_1.DESC_COMMAND_API_LIST);
+const commandApiList = (0, utils_1.newCommand)('list', texts_1.DESC_COMMAND_API_LIST, {
+    examples: texts_1.EXAMPLE_API_LIST,
+});
 commandApiList.alias('ls');
 commandApiList.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
 commandApiList.option('-p, --project <name>', texts_1.OPTION_REST_API_PROJECT);
 commandApiList.option('-m, --method <method>', texts_1.OPT_COMMAND_API_LIST_METHOD);
 commandApiList.option('-s, --search <phrase>', texts_1.OPT_COMMAND_API_LIST_SEARCH);
+commandApiList.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandApiList.action(async (options) => {
     const { apiEndpoints } = require('../../openapi');
     const workspace = input_1.default.restApiWorkspace(options.workspace);
@@ -39,12 +42,25 @@ commandApiList.action(async (options) => {
     const filter = options.search;
     const client = input_1.default.restApiTokenClient(true);
     const api = await apiEndpoints(client.baseUrl);
+    const operations = [];
     for (const operation of await api.operations()) {
         if (filter && !operation.path.includes(filter))
             continue;
         if (filterMethod && filterMethod !== operation.method.toLowerCase())
             continue;
-        outputUrl(operation, workspace, project);
+        if (options.format === 'json') {
+            operations.push({
+                method: operation.method.toUpperCase(),
+                path: (0, utils_1.openApiPrepareUrl)(operation.path, workspace, project),
+                summary: operation.summary,
+            });
+        }
+        else {
+            outputUrl(operation, workspace, project);
+        }
+    }
+    if (options.format === 'json') {
+        output_1.default.json(operations);
     }
     output_1.default.exitNormal();
 });

package/distTs/src/command/artifact/create.js

@@ -23,6 +23,7 @@ commandArtifactCreate.option('-a, --auth <user:pass>', texts_1.OPTION_HTTP_AUTH)
 commandArtifactCreate.option('--note <note>', texts_1.OPT_COMMAND_NOTE);
 commandArtifactCreate.option('--agent-note <note>', texts_1.OPT_COMMAND_AGENT_NOTE);
 commandArtifactCreate.argument('[name]', texts_1.OPT_COMMAND_ARTIFACT_NAME);
+commandArtifactCreate.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandArtifactCreate.action(async (name, options) => {
     const humanId = require('human-id').default;
     const workspace = input_1.default.restApiWorkspace(options.workspace);
@@ -71,6 +72,10 @@ commandArtifactCreate.action(async (name, options) => {
         };
     }
     const result = await client.createArtifact(workspace, data);
+    if (options.format === 'json') {
+        output_1.default.json(result);
+        output_1.default.exitNormal();
+    }
     output_1.default.exitSuccess((0, texts_1.TXT_ARTIFACT_CREATED)(client.baseUrl, workspace, result));
 });
 exports.default = commandArtifactCreate;

package/distTs/src/command/artifact/publish.js

@@ -25,8 +25,10 @@ commandArtifactPublish.option('--agent-note <note>', texts_1.OPTION_ARTIFACT_VER
 commandArtifactPublish.option('-f, --force', texts_1.OPTION_ARTIFACT_PUBLISH_OVERWRITE_VERSION);
 commandArtifactPublish.argument('<identifier>', texts_1.OPTION_ARTIFACT_ID);
 commandArtifactPublish.argument('<directory>', texts_1.OPTION_ARTIFACT_PUBLISH_PATH);
+commandArtifactPublish.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandArtifactPublish.action(async (id, path, options) => {
     const { v4 } = require('uuid');
+    const say = output_1.default.progress(options.format === 'json');
     let dirPath = input_1.default.resolvePath(path);
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project, true);
@@ -66,20 +68,15 @@ commandArtifactPublish.action(async (id, path, options) => {
         }
     }
     let artifactVersionId = data.artifact_version_id;
-    let url;
     if (artifactVersionId && !options.force) {
         output_1.default.exitError(texts_1.ERR_ARTIFACT_VERSION_EXISTS);
     }
-    if (!artifactVersionId) {
-        const d = await client.createArtifactVersion(workspace, artifactId, version, options.note, options.agentNote);
-        url = d.version_url;
-        artifactVersionId = d.id;
-    }
-    else {
-        const d = await client.getArtifactVersion(workspace, artifactId, artifactVersionId);
-        url = d.version_url;
-    }
-    output_1.default.normal(texts_1.TXT_ARTIFACT_SCANNING_DIR, false);
+    const artifactVersion = !artifactVersionId
+        ? await client.createArtifactVersion(workspace, artifactId, version, options.note, options.agentNote)
+        : await client.getArtifactVersion(workspace, artifactId, artifactVersionId);
+    const url = artifactVersion.version_url;
+    artifactVersionId = artifactVersion.id;
+    say(texts_1.TXT_ARTIFACT_SCANNING_DIR, false);
     const stat = fs_1.default.statSync(dirPath);
     let entries;
     if (stat.isDirectory()) {
@@ -106,6 +103,10 @@ commandArtifactPublish.action(async (id, path, options) => {
         dirPath = parentPath;
     }
     const outputSuccess = () => {
+        if (options.format === 'json') {
+            output_1.default.json(artifactVersion);
+            output_1.default.exitNormal();
+        }
         output_1.default.object({
             Version: `${identifier}:${version}`,
             URL: url || '-',
@@ -114,16 +115,16 @@ commandArtifactPublish.action(async (id, path, options) => {
         output_1.default.exitNormal();
     };
     if (!entries.length) {
-        output_1.default.normal(texts_1.TXT_ARTIFACT_NO_ENTRIES_FOUND);
+        say(texts_1.TXT_ARTIFACT_NO_ENTRIES_FOUND);
         outputSuccess();
     }
     else if (entries.length === 1) {
-        output_1.default.normal(texts_1.TXT_ARTIFACT_ONE_ENTRY_FOUND);
+        say(texts_1.TXT_ARTIFACT_ONE_ENTRY_FOUND);
     }
     else {
-        output_1.default.normal((0, texts_1.TXT_ARTIFACT_ENTRIES_FOUND)(entries.length));
+        say((0, texts_1.TXT_ARTIFACT_ENTRIES_FOUND)(entries.length));
     }
-    output_1.default.normal((0, texts_1.TXT_ARTIFACT_ZIP_ENTRIES)(0));
+    say((0, texts_1.TXT_ARTIFACT_ZIP_ENTRIES)(0));
     const zipPath = (0, path_1.join)((0, utils_1.getHomeDirectory)(), `${v4()}.zip`);
     const clearZip = () => {
         try {
@@ -138,11 +139,9 @@ commandArtifactPublish.action(async (id, path, options) => {
         let proc = 0;
         await (0, utils_1.createZip)(dirPath, zipPath, entries, () => {
             proc += 1;
-            output_1.default.clearPreviousLine();
-            output_1.default.normal((0, texts_1.TXT_ARTIFACT_ZIP_ENTRIES)(proc));
+            say((0, texts_1.TXT_ARTIFACT_ZIP_ENTRIES)(proc), true, true);
         });
-        output_1.default.clearPreviousLine();
-        output_1.default.normal(texts_1.TXT_ARTIFACT_ZIPPED);
+        say(texts_1.TXT_ARTIFACT_ZIPPED, true, true);
         blob = await fs_1.default.openAsBlob(zipPath);
     }
     catch (err) {
@@ -151,10 +150,9 @@ commandArtifactPublish.action(async (id, path, options) => {
         output_1.default.exitError(texts_1.ERR_SWW);
     }
     try {
-        output_1.default.normal(texts_1.TXT_ARTIFACT_UPLOADING);
+        say(texts_1.TXT_ARTIFACT_UPLOADING);
         await client.createArtifactVersionZip(workspace, artifactId, artifactVersionId, blob);
-        output_1.default.clearPreviousLine();
-        output_1.default.normal(texts_1.TXT_ARTIFACT_UPLOADED);
+        say(texts_1.TXT_ARTIFACT_UPLOADED, true, true);
         clearZip();
         outputSuccess();
     }

package/distTs/src/command/artifact/version/create.js

@@ -21,6 +21,7 @@ commandArtifactVersionCreate.option('--note <note>', texts_1.OPTION_ARTIFACT_VER
 commandArtifactVersionCreate.option('--agent-note <note>', texts_1.OPTION_ARTIFACT_VERSION_AGENT_NOTE);
 commandArtifactVersionCreate.option('--from <version>', texts_1.OPTION_ARTIFACT_VERSION_FROM);
 commandArtifactVersionCreate.argument('<identifier>', texts_1.OPTION_ARTIFACT_ID);
+commandArtifactVersionCreate.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandArtifactVersionCreate.action(async (id, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project, true);
@@ -64,6 +65,10 @@ commandArtifactVersionCreate.action(async (id, options) => {
         output_1.default.exitError(texts_1.ERR_ARTIFACT_VERSION_EXISTS_NO_FORCE);
     }
     const d = await client.createArtifactVersion(workspace, artifactId, version, options.note, options.agentNote, options.from);
+    if (options.format === 'json') {
+        output_1.default.json(d);
+        output_1.default.exitNormal();
+    }
     const url = d.version_url;
     output_1.default.object({
         Version: `${identifier}:${version}`,

package/distTs/src/command/config/get/tunnel.js

@@ -7,13 +7,18 @@ const cfg_1 = __importDefault(require("../../../tunnel/cfg"));
 const output_1 = __importDefault(require("../../../output"));
 const texts_1 = require("../../../texts");
 const utils_1 = require("../../../utils");
-const commandConfigGetTunnel = (0, utils_1.newCommand)('tunnel', texts_1.DESC_COMMAND_CONFIG_GET_TUNNEL);
+const commandConfigGetTunnel = (0, utils_1.newCommand)('tunnel', texts_1.DESC_COMMAND_CONFIG_GET_TUNNEL, { examples: texts_1.EXAMPLE_CONFIG_GET_TUNNEL });
 commandConfigGetTunnel.argument('<name>', texts_1.OPTION_NAME);
-commandConfigGetTunnel.action((name) => {
+commandConfigGetTunnel.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandConfigGetTunnel.action((name, options) => {
     if (!cfg_1.default.hasTunnel(name)) {
         output_1.default.exitError((0, texts_1.ERR_TUNNEL_NOT_FOUND)(name));
     }
-    output_1.default.configTunnel(cfg_1.default.getTunnel(name));
+    if (options.format === 'json') {
+        output_1.default.json(cfg_1.default.getTunnel(name));
+    }
+    else
+        output_1.default.configTunnel(cfg_1.default.getTunnel(name));
     output_1.default.exitNormal();
 });
 exports.default = commandConfigGetTunnel;

package/distTs/src/command/config/get/tunnels.js

@@ -7,9 +7,14 @@ const cfg_1 = __importDefault(require("../../../tunnel/cfg"));
 const output_1 = __importDefault(require("../../../output"));
 const texts_1 = require("../../../texts");
 const utils_1 = require("../../../utils");
-const commandConfigGetTunnels = (0, utils_1.newCommand)('tunnels', texts_1.DESC_COMMAND_CONFIG_GET_TUNNELS);
-commandConfigGetTunnels.action(() => {
-    output_1.default.configTunnels(cfg_1.default.getTunnels());
+const commandConfigGetTunnels = (0, utils_1.newCommand)('tunnels', texts_1.DESC_COMMAND_CONFIG_GET_TUNNELS, { examples: texts_1.EXAMPLE_CONFIG_GET_TUNNELS });
+commandConfigGetTunnels.option('--format <text|json>', texts_1.OPTION_FORMAT);
+commandConfigGetTunnels.action((options) => {
+    if (options.format === 'json') {
+        output_1.default.json(cfg_1.default.getTunnels());
+    }
+    else
+        output_1.default.configTunnels(cfg_1.default.getTunnels());
     output_1.default.exitNormal();
 });
 exports.default = commandConfigGetTunnels;

package/distTs/src/command/distro/create.js

@@ -20,6 +20,7 @@ commandDistroCreate.option('-i, --identifier <identifier>', texts_1.OPT_COMMAND_
 commandDistroCreate.option('-n, --name <name>', texts_1.OPT_COMMAND_DISTRO_NAME);
 commandDistroCreate.option('--note <note>', texts_1.OPT_COMMAND_DISTRO_NOTE);
 commandDistroCreate.option('--agent-note <note>', texts_1.OPT_COMMAND_DISTRO_AGENT_NOTE);
+commandDistroCreate.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandDistroCreate.action(async (options) => {
     const humanId = require('human-id').default;
     const workspace = input_1.default.restApiWorkspace(options.workspace);
@@ -43,6 +44,10 @@ commandDistroCreate.action(async (options) => {
     if (project && scope === distro_1.SCOPE.PROJECT)
         body.project_name = project;
     const result = await client.createDistro(workspace, body);
+    if (options.format === 'json') {
+        output_1.default.json(result);
+        output_1.default.exitNormal();
+    }
     output_1.default.identifier(result.identifier);
     output_1.default.cyan(result.html_url);
     output_1.default.green(texts_1.TXT_COMMAND_DISTRO_CREATED);

package/distTs/src/command/distro/route/create.js

@@ -24,6 +24,7 @@ commandDistroRouteCreate.option('--note <note>', texts_1.OPT_COMMAND_ROUTE_NOTE)
 commandDistroRouteCreate.option('--agent-note <note>', texts_1.OPT_COMMAND_ROUTE_AGENT_NOTE);
 commandDistroRouteCreate.option('--target <targets...>', texts_1.OPT_COMMAND_ROUTE_TARGET);
 commandDistroRouteCreate.argument('<identifier>', texts_1.OPT_COMMAND_DISTRO_IDENTIFIER);
+commandDistroRouteCreate.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandDistroRouteCreate.action(async (identifier, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project, true);
@@ -53,6 +54,10 @@ commandDistroRouteCreate.action(async (identifier, options) => {
     }
     body.targets = await input_1.default.routeTarget(client, workspace, scope === distro_1.SCOPE.PROJECT ? project : null, options.target);
     const result = await client.createRoute(workspace, scope === distro_1.SCOPE.PROJECT ? project : null, data.distribution_id, body);
+    if (options.format === 'json') {
+        output_1.default.json(result);
+        output_1.default.exitNormal();
+    }
     output_1.default.id(result.id);
     output_1.default.cyan(result.html_url);
     output_1.default.green(texts_1.TXT_COMMAND_ROUTE_CREATED);

package/distTs/src/command/distro/route/update.js

@@ -25,6 +25,7 @@ commandDistroRouteUpdate.option('--agent-note <note>', texts_1.OPT_COMMAND_ROUTE
 commandDistroRouteUpdate.option('--target <targets...>', texts_1.OPT_COMMAND_ROUTE_TARGET);
 commandDistroRouteUpdate.argument('<identifier>', texts_1.OPT_COMMAND_DISTRO_IDENTIFIER);
 commandDistroRouteUpdate.argument('<route-id>', texts_1.OPT_COMMAND_ROUTE_ID);
+commandDistroRouteUpdate.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandDistroRouteUpdate.action(async (identifier, routeId, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const project = input_1.default.restApiProject(options.project, true);
@@ -82,6 +83,10 @@ commandDistroRouteUpdate.action(async (identifier, routeId, options) => {
         output_1.default.exitError(texts_1.ERR_COMMAND_NO_UPDATE);
     }
     const result = await client.updateRoute(workspace, scope === distro_1.SCOPE.PROJECT ? project : null, data.distribution_id, routeId, body);
+    if (options.format === 'json') {
+        output_1.default.json(result);
+        output_1.default.exitNormal();
+    }
     output_1.default.id(result.id);
     output_1.default.cyan(result.html_url);
     output_1.default.green(texts_1.TXT_COMMAND_ROUTE_UPDATED);

package/distTs/src/command/distro/update.js

@@ -22,6 +22,7 @@ commandDistroUpdate.option('--agent-note <note>', texts_1.OPT_COMMAND_DISTRO_AGE
 commandDistroUpdate.option('--enable', texts_1.OPT_COMMAND_DISTRO_ENABLE);
 commandDistroUpdate.option('--disable', texts_1.OPT_COMMAND_DISTRO_DISABLE);
 commandDistroUpdate.argument('<identifier>', texts_1.OPT_COMMAND_DISTRO_IDENTIFIER);
+commandDistroUpdate.option('--format <text|json>', texts_1.OPTION_FORMAT);
 commandDistroUpdate.action(async (identifier, options) => {
     if (options.enable && options.disable) {
         output_1.default.exitError(texts_1.ERR_COMMAND_DISTRO_ENABLE_DISABLE);
@@ -59,6 +60,10 @@ commandDistroUpdate.action(async (identifier, options) => {
         output_1.default.exitError(texts_1.ERR_COMMAND_DISTRO_NOT_FOUND);
     }
     const result = await client.updateDistribution(workspace, scope === distro_1.SCOPE.PROJECT ? project : null, data.distribution_id, body);
+    if (options.format === 'json') {
+        output_1.default.json(result);
+        output_1.default.exitNormal();
+    }
     output_1.default.identifier(result.identifier);
     output_1.default.cyan(result.html_url);
     output_1.default.green(texts_1.TXT_COMMAND_DISTRO_UPDATED);