aemdm 0.2.3 → 0.4.0

package/dist/cli.js

@@ -3,7 +3,7 @@ import { fileURLToPath } from "node:url";
 import { realpathSync } from "node:fs";
 import { Command, CommanderError, Option } from "commander";
 import { z } from "zod";
-import { CliError, request, requestJson, resolveBucket, resolveOptionalImsToken, resolveSearchAuth, } from "./lib/client.js";
+import { CliError, normalizeBucket, request, requestJson, resolveBucket, resolveOptionalImsToken, resolveSearchAuth, } from "./lib/client.js";
 import { readProfileConfig, writeProfileConfig, } from "./lib/config.js";
 import { buildAssetUrl, buildMetadataUrl, deliveryFormatSchema, resolveDimensions, } from "./lib/delivery.js";
 import { buildSearchRequest, getAssetIdFromHit, loadRawQuery, } from "./lib/search.js";
@@ -167,7 +167,7 @@ async function handleAssetGet(assetId, options, runtime) {
     const parsed = parseWithSchema(assetGetSchema, options);
     const profile = await readProfileConfig(runtime.env);
     const baseUrl = resolveBucket(parsed.bucket, runtime.env, profile.bucket);
-    const imsToken = resolveOptionalImsToken(parsed.imsToken, runtime.env);
+    const imsToken = resolveOptionalImsToken(parsed.imsToken, runtime.env, profile.imsToken);
     const dimensions = resolveDimensions(parsed.size, parsed.width, parsed.height);
     verbose(runtime, `bucket: ${baseUrl}`);
     verbose(runtime, `asset:  ${assetId}`);
@@ -227,7 +227,7 @@ async function handleSearch(options, runtime) {
     const parsed = parseWithSchema(searchSchema, options);
     const profile = await readProfileConfig(runtime.env);
     const baseUrl = resolveBucket(parsed.bucket, runtime.env, profile.bucket);
-    const { imsToken, apiKey } = resolveSearchAuth(parsed.imsToken, parsed.apiKey, runtime.env);
+    const { imsToken, apiKey } = resolveSearchAuth(parsed.imsToken, parsed.apiKey, runtime.env, profile.imsToken);
     const searchBody = await buildSearchBody(parsed);
     const searchUrl = `${baseUrl}/search`;
     verbose(runtime, `bucket:   ${baseUrl}`);
@@ -347,7 +347,7 @@ function buildProgram(runtime) {
     program
         .name("aemdm")
         .description("CLI for Adobe Dynamic Media with OpenAPI")
-        .version("0.2.3")
+        .version("0.4.0")
         .showHelpAfterError()
         .option("-v, --verbose", "Show additional diagnostic output")
         .configureOutput({
@@ -401,7 +401,8 @@ Core commands:
 Important defaults:
 - Bucket comes from --bucket or AEMDM_BUCKET.
 - A standalone call like aemdm --bucket delivery-p123-e456.adobeaemcloud.com saves the default bucket to the local aemdm profile config.
-- Search auth comes from --ims-token/AEMDM_IMS_TOKEN and --api-key/AEMDM_API_KEY.
+- aemdm --ims-token <token> saves the IMS token to the profile config. Both can be saved together.
+- Search auth comes from --ims-token/AEMDM_IMS_TOKEN/profile config and --api-key/AEMDM_API_KEY.
 - asset get prints a URL by default.
 - asset get --metadata prints full JSON metadata when authenticated, or basic public JSON metadata when no token is supplied.
 - asset get --binary downloads the asset and requires --output.
@@ -444,14 +445,31 @@ LLM usage guidance:
 - Prefer --first-binary with --output when the user wants the downloaded file.
 `;
 }
-function getStandaloneBucketValue(argv) {
-    if (argv.length === 1 && argv[0].startsWith("--bucket=")) {
-        return argv[0].slice("--bucket=".length);
+function parseStandaloneConfig(argv) {
+    const config = {};
+    const args = [...argv];
+    while (args.length > 0) {
+        const arg = args.shift();
+        if (arg.startsWith("--bucket=")) {
+            config.bucket = arg.slice("--bucket=".length);
+        }
+        else if (arg === "--bucket" && args.length > 0) {
+            config.bucket = args.shift();
+        }
+        else if (arg.startsWith("--ims-token=")) {
+            config.imsToken = arg.slice("--ims-token=".length);
+        }
+        else if (arg === "--ims-token" && args.length > 0) {
+            config.imsToken = args.shift();
+        }
+        else {
+            return undefined;
+        }
     }
-    if (argv.length === 2 && argv[0] === "--bucket") {
-        return argv[1];
+    if (!config.bucket && !config.imsToken) {
+        return undefined;
     }
-    return undefined;
+    return config;
 }
 function toCliError(error) {
     if (error instanceof CliError) {
@@ -482,11 +500,21 @@ export async function runCli(argv, runtimeOverrides = {}) {
         ...runtimeOverrides,
     };
     try {
-        const standaloneBucket = getStandaloneBucketValue(argv);
-        if (standaloneBucket !== undefined) {
-            const bucket = resolveBucket(standaloneBucket, runtime.env);
-            const configPath = await writeProfileConfig(runtime.env, { bucket });
-            writeLine(runtime.stdout, `Saved bucket to profile config: ${bucket}`);
+        const standaloneConfig = parseStandaloneConfig(argv);
+        if (standaloneConfig !== undefined) {
+            const existing = await readProfileConfig(runtime.env);
+            const merged = { ...existing };
+            if (standaloneConfig.bucket) {
+                merged.bucket = normalizeBucket(standaloneConfig.bucket);
+            }
+            if (standaloneConfig.imsToken) {
+                merged.imsToken = standaloneConfig.imsToken;
+            }
+            const configPath = await writeProfileConfig(runtime.env, merged);
+            if (merged.bucket)
+                writeLine(runtime.stdout, `Saved bucket: ${merged.bucket}`);
+            if (standaloneConfig.imsToken)
+                writeLine(runtime.stdout, `Saved IMS token to profile config`);
             writeLine(runtime.stdout, `Config file: ${configPath}`);
             return 0;
         }

package/dist/lib/client.js

@@ -40,11 +40,11 @@ export function resolveBucket(explicitValue, env, profileBucket) {
     }
     return normalizeBucket(bucket);
 }
-export function resolveOptionalImsToken(explicitValue, env) {
-    return explicitValue ?? env.AEMDM_IMS_TOKEN;
+export function resolveOptionalImsToken(explicitValue, env, profileImsToken) {
+    return explicitValue ?? env.AEMDM_IMS_TOKEN ?? profileImsToken;
 }
-export function resolveSearchAuth(imsToken, apiKey, env) {
-    const resolvedImsToken = imsToken ?? env.AEMDM_IMS_TOKEN;
+export function resolveSearchAuth(imsToken, apiKey, env, profileImsToken) {
+    const resolvedImsToken = imsToken ?? env.AEMDM_IMS_TOKEN ?? profileImsToken;
     const resolvedApiKey = apiKey ?? env.AEMDM_API_KEY ?? "asset_search_service";
     if (!resolvedImsToken) {
         throw new CliError("Missing IMS token. Use --ims-token or set AEMDM_IMS_TOKEN.");

package/dist/lib/config.js

@@ -3,6 +3,7 @@ import path from "node:path";
 import { z } from "zod";
 const profileSchema = z.object({
     bucket: z.string().optional(),
+    imsToken: z.string().optional(),
 });
 export function resolveConfigPath(env) {
     if (env.AEMDM_CONFIG_PATH) {

package/dist/lib/delivery.js

@@ -1,7 +1,7 @@
 import { z } from "zod";
 import { CliError } from "./client.js";
 export const DEFAULT_SEO_NAME = "asset";
-export const TRANSFORM_FALLBACK_FORMAT = "avif";
+export const TRANSFORM_FALLBACK_FORMAT = "png";
 export const deliveryFormatSchema = z.enum(["gif", "png", "jpg", "jpeg", "webp", "avif"]);
 const qualitySchema = z.number().int().min(1).max(100);
 const dimensionSchema = z.number().int().min(1);
@@ -39,12 +39,12 @@ export function resolveDimensions(size, width, height) {
     };
 }
 export function buildMetadataUrl(baseUrl, assetId) {
-    return `${baseUrl.replace(/\/+$/, "")}/${encodeURIComponent(assetId)}/metadata`;
+    return `${baseUrl.replace(/\/+$/, "")}/${assetId}/metadata`;
 }
 export function buildAssetUrl(baseUrl, options) {
     const seoName = options.seoName ?? DEFAULT_SEO_NAME;
     const normalizedBase = baseUrl.replace(/\/+$/, "");
-    const encodedAssetId = encodeURIComponent(options.assetId);
+    const encodedAssetId = options.assetId;
     const encodedSeoName = encodeURIComponent(seoName);
     if (options.quality !== undefined) {
         qualitySchema.parse(options.quality);
@@ -66,22 +66,23 @@ export function buildAssetUrl(baseUrl, options) {
         options.height !== undefined ||
         options.quality !== undefined ||
         options.maxQuality !== undefined;
+    const format = options.format ?? TRANSFORM_FALLBACK_FORMAT;
     if (!shouldUseTransformRoute) {
-        return `${normalizedBase}/${encodedAssetId}`;
+        return `${normalizedBase}/${encodedAssetId}/as/${encodedSeoName}.${format}`;
     }
-    const format = options.format ?? TRANSFORM_FALLBACK_FORMAT;
-    const url = new URL(`${normalizedBase}/${encodedAssetId}/as/${encodedSeoName}.${format}`);
+    const base = `${normalizedBase}/${encodedAssetId}/as/${encodedSeoName}.${format}`;
+    const params = [];
     if (options.width !== undefined) {
-        url.searchParams.set("width", String(options.width));
+        params.push(`width=${options.width}`);
     }
     if (options.height !== undefined) {
-        url.searchParams.set("height", String(options.height));
+        params.push(`height=${options.height}`);
     }
     if (options.quality !== undefined) {
-        url.searchParams.set("quality", String(options.quality));
+        params.push(`quality=${options.quality}`);
     }
     if (options.maxQuality !== undefined) {
-        url.searchParams.set("max-quality", String(options.maxQuality));
+        params.push(`max-quality=${options.maxQuality}`);
     }
-    return url.toString();
+    return params.length > 0 ? `${base}?${params.join("&")}` : base;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aemdm",
-  "version": "0.2.3",
+  "version": "0.4.0",
   "description": "CLI for Adobe Dynamic Media with OpenAPI",
   "license": "Apache-2.0",
   "author": "Chris Pilsworth",