@fluid-app/fluid-cli-assets 0.1.339 → 0.1.341

package/dist/index.mjs

@@ -1,11 +1,10 @@
 import { createDomainCommand, declareInputs, findProjectConfig, getAuthToken } from "@fluid-app/fluid-cli";
 import "commander";
-import { readFile, stat } from "node:fs/promises";
 import { basename } from "node:path";
 //#region src/commands/upload.ts
 const UPLOAD_BASE = (process.env["FLUID_UPLOAD_BASE"] ?? "https://upload.fluid.app").replace(/\/$/, "");
 function registerUpload(parent, ctx) {
-	parent.command("upload [file]").description("Upload a file or URL to the Fluid DAM (via upload.fluid.app)").option("--url <url>", "Fetch from an external URL instead of attaching a local file").option("--name <name>", "Display name for the DAM asset").option("--description <description>", "Asset description").option("--tags <tags>", "Comma-separated tags").option("--folder <folder>", "ImageKit folder override").option("--no-unique-filename", "Disable ImageKit's useUniqueFileName (default: enabled)").option("--create-media", "Also create a Fluid Media resource (active, share, publish-now)").action(async function(filePath, opts) {
+	declareInputs(parent.command("upload [file]").description("Upload a file or URL to the Fluid DAM (via upload.fluid.app)").option("--url <url>", "Fetch from an external URL instead of attaching a local file").option("--name <name>", "Display name for the DAM asset").option("--description <description>", "Asset description").option("--tags <tags>", "Comma-separated tags").option("--folder <folder>", "ImageKit folder override").option("--no-unique-filename", "Disable ImageKit's useUniqueFileName (default: enabled)").option("--create-media", "Also create a Fluid Media resource (active, share, publish-now)").action(async function(filePath, opts) {
 		const token = resolveToken(this.parent?.opts() ?? {});
 		if (!token) throw new Error("No API token found. Run `fluid login` or provide --token <token>.");
 		if (!filePath && !opts.url) throw new Error("Provide a file path or --url <url>. Run `fluid dam upload --help` for usage.");
@@ -15,11 +14,10 @@ function registerUpload(parent, ctx) {
 		if (opts.uniqueFilename === false) form.append("useUniqueFileName", "false");
 		if (opts.url) form.append("external_asset_url", opts.url);
 		else if (filePath) {
-			await stat(filePath);
-			const bytes = await readFile(filePath);
+			const bytes = ctx.inputs.readFile(filePath);
 			const name = basename(filePath);
 			form.append("fileName", name);
-			form.append("file", new Blob([bytes]), name);
+			form.append("file", new Blob([new Uint8Array(bytes)]), name);
 		}
 		if (opts.name) form.append("name", opts.name);
 		if (opts.description) form.append("description", opts.description);
@@ -40,7 +38,10 @@ function registerUpload(parent, ctx) {
 		}
 		const body = await resp.json();
 		ctx.output(body);
-	});
+	}), (_opts, args) => args[0] ? [{
+		kind: "file",
+		path: args[0]
+	}] : []);
 }
 /**
 * Token resolution mirrors `createCommandContext.resolveToken` from

package/jest.config.cjs

@@ -0,0 +1,14 @@
+module.exports = {
+  ...(process.env.CI === "true" ? {} : { maxWorkers: "50%" }),
+  testEnvironment: "node",
+  testMatch: ["**/src/**/__tests__/**/*.test.ts"],
+  transform: {
+    "^.+\\.(t|j)sx?$": ["@swc/jest", { module: { type: "commonjs" } }],
+  },
+  moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
+  moduleNameMapper: {
+    // The real package only ships ESM, which Jest can't resolve in CJS mode.
+    "^@fluid-app/fluid-cli$": "<rootDir>/jest.mocks/fluid-cli.ts",
+    "^(\\.{1,2}/.*)\\.js$": "$1",
+  },
+};

package/jest.mocks/fluid-cli.ts

@@ -0,0 +1,14 @@
+/**
+ * Jest mock for @fluid-app/fluid-cli, which only ships ESM. The assets
+ * plugin's tests exercise its own modules.
+ */
+export function getAuthToken(): string | null {
+  return null;
+}
+
+export function findProjectConfig(): null {
+  return null;
+}
+
+export * from "../../core/src/inputs/index";
+export { createInputsReader } from "../../core/src/inputs/reader";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-app/fluid-cli-assets",
-  "version": "0.1.339",
+  "version": "0.1.341",
   "description": "Fluid CLI commands for digital asset management (DAM)",
   "type": "module",
   "main": "./dist/index.mjs",
@@ -17,13 +17,17 @@
     "access": "public"
   },
   "dependencies": {
-    "@fluid-app/fluid-cli": "0.1.351",
+    "@fluid-app/fluid-cli": "0.1.353",
     "commander": "^12.0.0"
   },
   "devDependencies": {
     "@fluid-app/api-client-scripts": "0.0.0",
     "@fluid-app/typescript-config": "0.0.0",
+    "@swc/core": "^1.15.18",
+    "@swc/jest": "^0.2.39",
+    "@types/jest": "^29.5.14",
     "@types/node": "24.10.12",
+    "jest": "^29.7.0",
     "tsdown": "^0.21.0",
     "tsx": "^4.21.0",
     "typescript": "^5"
@@ -46,6 +50,16 @@
           }
         ]
       },
+      "test": {
+        "dependsOn": [
+          {
+            "target": "build",
+            "projects": [
+              "@fluid-app/fluid-cli"
+            ]
+          }
+        ]
+      },
       "build": {
         "dependsOn": [
           "typecheck",
@@ -65,6 +79,7 @@
     "generate": "tsx scripts/generate.ts",
     "lint": "oxlint",
     "lint:fix": "oxlint --fix",
-    "typecheck": "tsgo --noEmit"
+    "typecheck": "tsgo --noEmit",
+    "test": "jest"
   }
 }

package/src/commands/__tests__/upload.test.ts

@@ -0,0 +1,121 @@
+import { mkdtempSync, realpathSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { Command } from "commander";
+import * as cli from "@fluid-app/fluid-cli";
+import {
+  guardUndeclaredReads,
+  registerInputsHook,
+  type CommandContext,
+  type CommandInputs,
+} from "@fluid-app/fluid-cli";
+
+const createInputsReader = (cli as unknown as { createInputsReader(): CommandInputs }).createInputsReader;
+
+import { registerUpload } from "../upload";
+
+class Exit extends Error {
+  constructor(readonly code: number) {
+    super(`exit ${code}`);
+  }
+}
+
+const dir = realpathSync(mkdtempSync(join(tmpdir(), "assets-inputs-")));
+const photo = join(dir, "photo.jpg");
+const RESOLVE = { FLUID_INPUTS_MODE: "resolve" };
+
+async function drive(
+  env: NodeJS.ProcessEnv,
+  argv: string[],
+  afterInputs?: () => void,
+) {
+  const program = new Command("fluid").exitOverride();
+  const out = { stdout: "", stderr: "", code: null as number | null };
+  registerInputsHook(program, {
+    env,
+    stdout: (t) => (out.stdout += t),
+    stderr: (t) => (out.stderr += t),
+    exit: (code) => {
+      throw new Exit(code);
+    },
+  });
+  if (afterInputs) program.hook("preAction", afterInputs);
+  const ctx = {
+    inputs: createInputsReader(),
+    output: jest.fn(),
+    verbose: false,
+  } as unknown as CommandContext;
+  registerUpload(program.command("assets"), ctx);
+  try {
+    await program.parseAsync(["assets", "upload", ...argv], { from: "user" });
+  } catch (error) {
+    if (!(error instanceof Exit)) throw error;
+    out.code = error.code;
+  }
+  return out;
+}
+
+describe("assets upload inputs", () => {
+  const fetchMock = jest.fn();
+  const realFetch = global.fetch;
+  const realToken = process.env["FLUID_TOKEN"];
+
+  beforeEach(() => {
+    writeFileSync(photo, "bytes-1");
+    fetchMock.mockReset();
+    fetchMock.mockResolvedValue({ ok: true, json: async () => ({ id: 1 }) });
+    global.fetch = fetchMock as unknown as typeof fetch;
+    process.env["FLUID_TOKEN"] = "tok";
+  });
+
+  afterAll(() => {
+    global.fetch = realFetch;
+    if (realToken === undefined) delete process.env["FLUID_TOKEN"];
+    else process.env["FLUID_TOKEN"] = realToken;
+  });
+
+  it("resolves the path as a file input", async () => {
+    const out = await drive(RESOLVE, [photo]);
+    expect(out.code).toBe(0);
+    const manifest = JSON.parse(out.stdout);
+    expect(manifest.command).toBe("fluid assets upload");
+    expect(manifest.inputs).toEqual([
+      { kind: "file", path: photo, sha256: expect.any(String), size: 7 },
+    ]);
+    expect(fetchMock).not.toHaveBeenCalled();
+  });
+
+  it("declares no input for --url", async () => {
+    const out = await drive(RESOLVE, ["--url", "https://example.test/a.jpg"]);
+    expect(JSON.parse(out.stdout).inputs).toEqual([]);
+  });
+
+  it("refuses a byte change made after approval", async () => {
+    const manifest = join(dir, "manifest.json");
+    writeFileSync(manifest, (await drive(RESOLVE, [photo])).stdout);
+    writeFileSync(photo, "bytes-2");
+    const out = await drive({ FLUID_INPUTS_EXPECT: manifest }, [photo]);
+    expect(out.code).toBe(65);
+    expect(out.stderr).toBe("inputs_mismatch\n");
+    expect(fetchMock).not.toHaveBeenCalled();
+  });
+
+  it("uploads the approved bytes even if the file changes after the expect read", async () => {
+    const manifest = join(dir, "approved.json");
+    writeFileSync(manifest, (await drive(RESOLVE, [photo])).stdout);
+    const guard = guardUndeclaredReads();
+    let out;
+    try {
+      out = await drive({ FLUID_INPUTS_EXPECT: manifest }, [photo], () =>
+        writeFileSync(photo, "bytes-X"),
+      );
+    } finally {
+      guard.restore();
+    }
+    expect(out.code).toBeNull();
+    expect(guard.violations).toEqual([]);
+    const body = fetchMock.mock.calls[0]![1].body as FormData;
+    const sent = Buffer.from(await (body.get("file") as File).arrayBuffer());
+    expect(sent.toString()).toBe("bytes-1");
+  });
+});

package/src/commands/upload.ts

@@ -16,9 +16,12 @@
  * regular Fluid API and we just need the bearer to forward.
  */
 import { Command } from "commander";
-import { readFile, stat } from "node:fs/promises";
 import { basename } from "node:path";
-import { findProjectConfig, getAuthToken } from "@fluid-app/fluid-cli";
+import {
+  declareInputs,
+  findProjectConfig,
+  getAuthToken,
+} from "@fluid-app/fluid-cli";
 import type { CommandContext } from "@fluid-app/fluid-cli";
 
 // Hard-coded — the bearer token we forward is the user's Fluid API
@@ -47,7 +50,7 @@ interface UploadOptions {
 }
 
 export function registerUpload(parent: Command, ctx: CommandContext): void {
-  parent
+  const upload = parent
     .command("upload [file]")
     .description("Upload a file or URL to the Fluid DAM (via upload.fluid.app)")
     .option(
@@ -111,16 +114,13 @@ export function registerUpload(parent: Command, ctx: CommandContext): void {
       if (opts.url) {
         form.append("external_asset_url", opts.url);
       } else if (filePath) {
-        // Validate first — `readFile` errors are friendlier than the
-        // service returning a generic 500 for a missing file.
-        await stat(filePath);
-        const bytes = await readFile(filePath);
+        const bytes = ctx.inputs.readFile(filePath);
         const name = basename(filePath);
         form.append("fileName", name);
         // Wrap as a Blob so the global fetch's multipart serializer
         // emits a proper Content-Disposition with filename. Node 20+
         // global FormData accepts (Blob, filename) pairs.
-        form.append("file", new Blob([bytes]), name);
+        form.append("file", new Blob([new Uint8Array(bytes)]), name);
       }
 
       if (opts.name) form.append("name", opts.name);
@@ -155,6 +155,9 @@ export function registerUpload(parent: Command, ctx: CommandContext): void {
       const body: unknown = await resp.json();
       ctx.output(body);
     });
+  declareInputs(upload, (_opts, args) =>
+    args[0] ? [{ kind: "file", path: args[0] }] : [],
+  );
 }
 
 /**