not-manage 0.2.2 → 0.2.3

package/src/resource-command-runner.js

@@ -3,7 +3,10 @@ const {
   fetchResourcePage,
   getValidAccessToken,
 } = require("./clio-api");
+const { readIdsInput } = require("./agent-input");
 const { fetchPages } = require("./resource-utils");
+const { maybeCompactPayload } = require("./compact-output");
+const { UsageError } = require("./cli-errors");
 const { maybeRedactData, maybeRedactPayload } = require("./redaction");
 const { getConfig, getTokenSet } = require("./store");
 
@@ -44,6 +47,16 @@ async function fetchDefaultItemPayload({ accessToken, apiPath, config, id, query
   return fetchResourceById(config, accessToken, apiPath, id, query);
 }
 
+function buildGetJsonEnvelope(items, requestedCount) {
+  return {
+    data: items,
+    meta: {
+      requested_count: requestedCount,
+      returned_count: items.length,
+    },
+  };
+}
+
 function createListCommand(commandConfig) {
   const {
     apiPath,
@@ -69,7 +82,10 @@ function createListCommand(commandConfig) {
       options,
       query,
     });
-    const data = maybeRedactData(result.data, options, redactionResourceType);
+    const data = maybeCompactPayload(
+      maybeRedactData(result.data, options, redactionResourceType),
+      options
+    );
 
     if (options.json) {
       const jsonMeta = buildJsonMeta ? buildJsonMeta({ data, options, result }) : {};
@@ -105,11 +121,62 @@ function createGetCommand(commandConfig) {
   } = commandConfig;
 
   return async function getCommand(options = {}) {
-    if (!options.id) {
-      throw new Error(usage);
+    if (!options.id && !options.idsFile) {
+      throw new UsageError(usage, {
+        code: "missing_resource_id",
+        hint: usage.replace(/^Usage:\s*/, ""),
+        details: { missing: ["id"] },
+      });
     }
 
     const { accessToken, config } = await getAuthContext();
+
+    if (options.idsFile) {
+      if (options.id) {
+        throw new UsageError("Pass either an ID argument or `--ids-file`, not both.", {
+          code: "conflicting_id_inputs",
+          hint: "Use `not-manage <resource> get <id>` or `not-manage <resource> get --ids-file ids.txt --json`.",
+        });
+      }
+      if (!options.json) {
+        throw new UsageError("Bulk `get` from `--ids-file` requires `--json`.", {
+          code: "json_required_for_bulk_get",
+          hint: "Re-run with `--json` or `--agent`.",
+        });
+      }
+
+      const ids = await readIdsInput(options.idsFile);
+      if (ids.length === 0) {
+        throw new UsageError("Bulk `get` did not receive any IDs.", {
+          code: "missing_resource_id",
+          hint: "Provide one ID per line, a JSON array of IDs, or objects with an `id` field.",
+          details: { missing: ["id"] },
+        });
+      }
+
+      const items = [];
+      for (const id of ids) {
+        const payload = await fetchItemPayload({
+          accessToken,
+          apiPath,
+          config,
+          id,
+          options,
+          query: {
+            fields: options.fields || defaultFields,
+          },
+        });
+        const redactedPayload = maybeCompactPayload(
+          maybeRedactPayload(payload, options, redactionResourceType),
+          options
+        );
+        items.push(redactedPayload?.data ?? redactedPayload);
+      }
+
+      console.log(JSON.stringify(buildGetJsonEnvelope(items, ids.length), null, options.compact ? 0 : 2));
+      return;
+    }
+
     const payload = await fetchItemPayload({
       accessToken,
       apiPath,
@@ -120,7 +187,10 @@ function createGetCommand(commandConfig) {
         fields: options.fields || defaultFields,
       },
     });
-    const redactedPayload = maybeRedactPayload(payload, options, redactionResourceType);
+    const redactedPayload = maybeCompactPayload(
+      maybeRedactPayload(payload, options, redactionResourceType),
+      options
+    );
 
     if (options.json) {
       console.log(JSON.stringify(redactedPayload, null, 2));
@@ -132,6 +202,7 @@ function createGetCommand(commandConfig) {
 }
 
 module.exports = {
+  buildGetJsonEnvelope,
   buildListJsonEnvelope,
   buildSummaryMessage,
   createGetCommand,

package/src/resource-handlers.js

@@ -6,6 +6,7 @@ const {
 } = require("./resource-display");
 const { buildListQueryFromResource } = require("./resource-query-builder");
 const { createGetCommand, createListCommand } = require("./resource-command-runner");
+const { getResourceMetadata } = require("./resource-metadata");
 
 const RESOURCE_HANDLERS = {
   activities: {
@@ -21,7 +22,7 @@ const RESOURCE_HANDLERS = {
 const GENERIC_HANDLER_CACHE = new Map();
 
 function createGenericHandlers(resourceMetadata) {
-  if (!resourceMetadata || !resourceMetadata.display) {
+  if (!resourceMetadata) {
     return null;
   }
 
@@ -30,15 +31,23 @@ function createGenericHandlers(resourceMetadata) {
     return cached;
   }
 
+  const displayMetadata =
+    resourceMetadata.display
+      ? resourceMetadata
+      : getResourceMetadata(resourceMetadata.handlerKey);
+  if (!displayMetadata?.display) {
+    return null;
+  }
+
   const handlers = {};
 
-  if (resourceMetadata.capabilities.list.enabled && resourceMetadata.display.list) {
-    const printList = createListPrinter(resourceMetadata.display.list);
+  if (resourceMetadata.capabilities.list.enabled && displayMetadata.display.list) {
+    const printList = createListPrinter(displayMetadata.display.list);
     handlers.list = createListCommand({
       apiPath: resourceMetadata.apiPath,
       buildQuery: (options) =>
         buildListQueryFromResource(resourceMetadata, options, resourceMetadata.listQuery),
-      formatRow: resourceMetadata.display.list.formatRow,
+      formatRow: displayMetadata.display.list.formatRow,
       pluralLabel: resourceMetadata.summaryLabels.plural,
       printList,
       redactionResourceType: resourceMetadata.redaction.resourceType,
@@ -46,8 +55,8 @@ function createGenericHandlers(resourceMetadata) {
     });
   }
 
-  if (resourceMetadata.capabilities.get.enabled && resourceMetadata.display.get) {
-    const printItem = createDetailPrinter(resourceMetadata.display.get);
+  if (resourceMetadata.capabilities.get.enabled && displayMetadata.display.get) {
+    const printItem = createDetailPrinter(displayMetadata.display.get);
     handlers.get = createGetCommand({
       apiPath: resourceMetadata.apiPath,
       defaultFields: resourceMetadata.defaultFields.get,

package/src/resource-metadata.js

@@ -2217,9 +2217,27 @@ function listRequiredOptionFlags(resourceMetadata, sub) {
   });
 }
 
+function findMissingRequiredOptions(resourceMetadata, sub, options = {}) {
+  if (!resourceMetadata) {
+    return [];
+  }
+
+  const requiredOptions = resourceMetadata.capabilities?.[sub]?.requiredOptions || [];
+  return requiredOptions
+    .filter((propertyName) => {
+      const value = options[propertyName];
+      return value === undefined || value === null || value === "";
+    })
+    .map((propertyName) => {
+      const optionName = resourceMetadata.optionSchema?.[sub]?.[propertyName]?.option;
+      return optionName ? `--${optionName}` : `--${propertyName}`;
+    });
+}
+
 module.exports = {
   RESOURCE_METADATA,
   RESOURCE_ORDER,
+  findMissingRequiredOptions,
   getResourceMetadata,
   listResourceMetadata,
   listRequiredOptionFlags,

package/src/store.js

@@ -153,7 +153,7 @@ async function getStoredTokenSet() {
     };
   } catch (_error) {
     throw new Error(
-      "Stored token data is invalid. Run `not-manage auth revoke` then `not-manage auth login`."
+      "Stored token data is invalid. Run `not-manage auth revoke --yes` then `not-manage auth login`."
     );
   }
 }