bdy 1.25.17-dev → 1.25.18-stage

package/distTs/package.json

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

package/distTs/src/command/domain/get.js

@@ -3,11 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const cliError_1 = __importDefault(require("../../cliError"));
 const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const input_1 = __importDefault(require("../../input"));
 const output_1 = __importDefault(require("../../output"));
+const resolve_1 = require("./resolve");
 const commandDomainGet = (0, utils_1.newCommand)('get', texts_1.DESC_COMMAND_DOMAIN_GET, { requiredScopes: [utils_1.REST_API_SCOPE.DOMAIN_READ] });
 commandDomainGet.option('-w, --workspace <domain>', texts_1.OPTION_REST_API_WORKSPACE);
 commandDomainGet.option('--format <text|json>', texts_1.OPTION_FORMAT);
@@ -15,20 +15,7 @@ commandDomainGet.argument('<id|name>', texts_1.OPTION_COMMAND_DOMAIN_IDENTIFIER)
 commandDomainGet.action(async (name, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const client = input_1.default.restApiTokenClient();
-    let domain;
-    try {
-        domain = await client.getDomain(workspace, name);
-    }
-    catch {
-        const response = await client.getDomains(workspace);
-        domain = (response.domains || []).find((d) => d.name === name);
-        if (domain) {
-            domain = await client.getDomain(workspace, domain.id);
-        }
-    }
-    if (!domain) {
-        output_1.default.exitError(new cliError_1.default('not_found', texts_1.ERR_COMMAND_DOMAIN_NOT_FOUND, texts_1.HINT_DOMAIN_LIST));
-    }
+    const domain = await (0, resolve_1.resolveDomain)(client, workspace, name, true);
     if (options.format === 'json') {
         output_1.default.json(domain);
     }

package/distTs/src/command/domain/open.js

@@ -7,7 +7,7 @@ const utils_1 = require("../../utils");
 const texts_1 = require("../../texts");
 const input_1 = __importDefault(require("../../input"));
 const output_1 = __importDefault(require("../../output"));
-const cliError_1 = __importDefault(require("../../cliError"));
+const resolve_1 = require("./resolve");
 const commandDomainOpen = (0, utils_1.newCommand)('open', texts_1.DESC_COMMAND_RESOURCE_OPEN, {
     requiredScopes: [utils_1.REST_API_SCOPE.DOMAIN_READ],
     examples: [{ description: 'Open a domain in Buddy', command: 'bdy domain open example.com' }],
@@ -18,18 +18,7 @@ commandDomainOpen.argument('<id|name>', texts_1.OPTION_COMMAND_DOMAIN_IDENTIFIER
 commandDomainOpen.action(async (name, options) => {
     const workspace = input_1.default.restApiWorkspace(options.workspace);
     const client = input_1.default.restApiTokenClient();
-    let domain;
-    try {
-        domain = await client.getDomain(workspace, name);
-    }
-    catch {
-        const response = await client.getDomains(workspace);
-        const found = response.domains.find((item) => item.name === name);
-        if (found)
-            domain = await client.getDomain(workspace, found.id);
-    }
-    if (!domain)
-        throw new cliError_1.default('not_found', texts_1.ERR_COMMAND_DOMAIN_NOT_FOUND, texts_1.HINT_DOMAIN_LIST);
+    const domain = await (0, resolve_1.resolveDomain)(client, workspace, name);
     await output_1.default.openUrl(domain.html_url, options.format === 'json');
 });
 exports.default = commandDomainOpen;

package/distTs/src/command/domain/resolve.js

@@ -6,14 +6,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveDomain = void 0;
 const cliError_1 = __importDefault(require("../../cliError"));
 const texts_1 = require("../../texts");
-// Domains are addressed by id in the API, but users know them by name. The
-// list is the only lookup by name, and it carries the id either way.
-const resolveDomain = async (client, workspace, idOrName) => {
-    const { domains } = await client.getDomains(workspace);
-    const domain = (domains || []).find((d) => d.name === idOrName || d.id === idOrName);
-    if (!domain) {
-        throw new cliError_1.default('not_found', texts_1.ERR_COMMAND_DOMAIN_NOT_FOUND, texts_1.HINT_DOMAIN_LIST);
+const notFound = () => new cliError_1.default('not_found', texts_1.ERR_COMMAND_DOMAIN_NOT_FOUND, texts_1.HINT_DOMAIN_LIST);
+// Domains are addressed by id in the API, but users know them by name. A name always has a
+// dot and an id never does, so the argument says which it is: an id is fetched directly, and a
+// name goes through the list, the only lookup by name. List items are short views, so `full`
+// fetches the domain after a name lookup for callers that show more than its id and name.
+const resolveDomain = async (client, workspace, idOrName, full = false) => {
+    if (!idOrName.includes('.')) {
+        try {
+            return await client.getDomain(workspace, idOrName);
+        }
+        catch (err) {
+            // Only a 404 means "no such domain"; anything else (auth, 5xx) is the real error.
+            if (cliError_1.default.details(err).code === 'not_found')
+                throw notFound();
+            throw err;
+        }
     }
-    return domain;
+    const { domains } = await client.getDomains(workspace);
+    const domain = (domains || []).find((d) => d.name === idOrName);
+    if (!domain)
+        throw notFound();
+    return full ? await client.getDomain(workspace, domain.id) : domain;
 };
 exports.resolveDomain = resolveDomain;

package/package.json

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