@durable-streams/cli 0.1.4 → 0.1.5

package/README.md

@@ -100,6 +100,18 @@ durable-stream-dev write <stream_id> '{"key": "value"}' --content-type applicati
 durable-stream-dev write <stream_id> '{"key": "value"}' --json
 ```
 
+##### JSON Mode Array Flattening
+
+In JSON mode (`--json` or `--content-type application/json`), top-level arrays are flattened into individual messages:
+
+| Input        | Messages stored        |
+| ------------ | ---------------------- |
+| `{}`         | 1 message: `{}`        |
+| `[{}, {}]`   | 2 messages: `{}`, `{}` |
+| `[[{}, {}]]` | 1 message: `[{}, {}]`  |
+
+This matches the protocol's batch semantics.
+
 #### Read from a stream
 
 ```bash

package/dist/index.cjs

@@ -28,6 +28,28 @@ const node_process = __toESM(require("node:process"));
 const node_url = __toESM(require("node:url"));
 const __durable_streams_client = __toESM(require("@durable-streams/client"));
 
+//#region src/jsonUtils.ts
+/**
+* Check if content-type indicates JSON mode.
+* Handles cases like "application/json; charset=utf-8".
+*/
+function isJsonContentType(contentType) {
+	return contentType.split(`;`)[0].trim().toLowerCase() === `application/json`;
+}
+/**
+* One-level array flattening for JSON batch semantics.
+* - Single object: `{}` → yields once
+* - Array: `[{}, {}]` → yields each element (flattened)
+* - Nested array: `[[{}, {}]]` → yields `[{}, {}]` (outer array flattened, inner preserved)
+*
+* This matches the protocol's batch semantics where servers flatten exactly one level.
+*/
+function* flattenJsonForAppend(parsed) {
+	if (Array.isArray(parsed)) for (const item of parsed) yield item;
+	else yield parsed;
+}
+
+//#endregion
 //#region src/parseWriteArgs.ts
 /**
 * Parse write command arguments, extracting content-type flags and content.
@@ -37,21 +59,33 @@ const __durable_streams_client = __toESM(require("@durable-streams/client"));
 */
 function parseWriteArgs(args) {
 	let contentType = `application/octet-stream`;
+	let batchJson = false;
 	const contentParts = [];
 	for (let i = 0; i < args.length; i++) {
 		const arg = args[i];
-		if (arg === `--json`) contentType = `application/json`;
-		else if (arg === `--content-type`) {
+		if (arg === `--json`) {
+			contentType = `application/json`;
+			continue;
+		}
+		if (arg === `--batch-json`) {
+			batchJson = true;
+			contentType = `application/json`;
+			continue;
+		}
+		if (arg === `--content-type`) {
 			const nextArg = args[i + 1];
 			if (!nextArg || nextArg.startsWith(`--`)) throw new Error(`--content-type requires a value`);
 			contentType = nextArg;
 			i++;
-		} else if (arg.startsWith(`--`)) throw new Error(`unknown flag: ${arg}`);
-		else contentParts.push(arg);
+			continue;
+		}
+		if (arg.startsWith(`--`)) throw new Error(`unknown flag: ${arg}`);
+		contentParts.push(arg);
 	}
 	return {
 		contentType,
-		content: contentParts.join(` `)
+		content: contentParts.join(` `),
+		batchJson
 	};
 }
 
@@ -69,7 +103,8 @@ Usage:
 
 Write Options:
   --content-type <type>   Content-Type for the message (default: application/octet-stream)
-  --json                  Shorthand for --content-type application/json
+  --json                  Write as JSON (input stored as single message)
+  --batch-json            Write as JSON array of messages (each array element stored separately)
 
 Environment Variables:
   STREAM_URL    Base URL of the stream server (default: http://localhost:4437)
@@ -88,8 +123,20 @@ async function createStream(streamId) {
 		process.exit(1);
 	}
 }
-async function writeStream(streamId, contentType, content) {
+/**
+* Append JSON data to a stream with one-level array flattening.
+*/
+async function appendJson(stream, parsed) {
+	let count = 0;
+	for (const item of flattenJsonForAppend(parsed)) {
+		await stream.append(item);
+		count++;
+	}
+	return count;
+}
+async function writeStream(streamId, contentType, batchJson, content) {
 	const url = `${STREAM_URL}/v1/stream/${streamId}`;
+	const isJson = isJsonContentType(contentType);
 	try {
 		const stream = new __durable_streams_client.DurableStream({
 			url,
@@ -97,8 +144,19 @@ async function writeStream(streamId, contentType, content) {
 		});
 		if (content) {
 			const processedContent = content.replace(/\\n/g, `\n`).replace(/\\t/g, `\t`).replace(/\\r/g, `\r`).replace(/\\\\/g, `\\`);
-			await stream.append(processedContent);
-			console.log(`Wrote ${processedContent.length} bytes to ${streamId}`);
+			if (isJson) {
+				const parsed = JSON.parse(processedContent);
+				if (batchJson) {
+					const count = await appendJson(stream, parsed);
+					console.log(`Wrote ${count} message(s) to ${streamId}`);
+				} else {
+					await stream.append(parsed);
+					console.log(`Wrote 1 message to ${streamId}`);
+				}
+			} else {
+				await stream.append(processedContent);
+				console.log(`Wrote ${processedContent.length} bytes to ${streamId}`);
+			}
 		} else {
 			const chunks = [];
 			node_process.stdin.on(`data`, (chunk) => {
@@ -109,8 +167,19 @@ async function writeStream(streamId, contentType, content) {
 				node_process.stdin.on(`error`, reject);
 			});
 			const data = Buffer.concat(chunks);
-			await stream.append(data);
-			console.log(`Wrote ${data.length} bytes to ${streamId}`);
+			if (isJson) {
+				const parsed = JSON.parse(data.toString(`utf8`));
+				if (batchJson) {
+					const count = await appendJson(stream, parsed);
+					console.log(`Wrote ${count} message(s) to ${streamId}`);
+				} else {
+					await stream.append(parsed);
+					console.log(`Wrote 1 message to ${streamId}`);
+				}
+			} else {
+				await stream.append(data);
+				console.log(`Wrote ${data.length} bytes to ${streamId}`);
+			}
 		}
 	} catch (error) {
 		if (error instanceof Error) node_process.stderr.write(`Error writing to stream: ${error.message}\n`);
@@ -170,8 +239,8 @@ async function main() {
 				if (error instanceof Error) node_process.stderr.write(`Error: ${error.message}\n`);
 				process.exit(1);
 			}
-			if (!node_process.stdin.isTTY) await writeStream(streamId, parsed.contentType);
-			else if (parsed.content) await writeStream(streamId, parsed.contentType, parsed.content);
+			if (!node_process.stdin.isTTY) await writeStream(streamId, parsed.contentType, parsed.batchJson);
+			else if (parsed.content) await writeStream(streamId, parsed.contentType, parsed.batchJson, parsed.content);
 			else {
 				node_process.stderr.write(`Error: content required (provide as argument or pipe to stdin)\n`);
 				printUsage();
@@ -215,4 +284,6 @@ if (isMainModule()) main().catch((error) => {
 });
 
 //#endregion
+exports.flattenJsonForAppend = flattenJsonForAppend
+exports.isJsonContentType = isJsonContentType
 exports.parseWriteArgs = parseWriteArgs

package/dist/index.d.cts

@@ -1,7 +1,25 @@
+//#region src/jsonUtils.d.ts
+/**
+* Check if content-type indicates JSON mode.
+* Handles cases like "application/json; charset=utf-8".
+*/
+declare function isJsonContentType(contentType: string): boolean;
+/**
+* One-level array flattening for JSON batch semantics.
+* - Single object: `{}` → yields once
+* - Array: `[{}, {}]` → yields each element (flattened)
+* - Nested array: `[[{}, {}]]` → yields `[{}, {}]` (outer array flattened, inner preserved)
+*
+* This matches the protocol's batch semantics where servers flatten exactly one level.
+*/
+declare function flattenJsonForAppend(parsed: unknown): Generator<unknown>;
+
+//#endregion
 //#region src/parseWriteArgs.d.ts
 interface ParsedWriteArgs {
   contentType: string;
   content: string;
+  batchJson: boolean;
 }
 /**
 * Parse write command arguments, extracting content-type flags and content.
@@ -12,4 +30,4 @@ interface ParsedWriteArgs {
 declare function parseWriteArgs(args: Array<string>): ParsedWriteArgs;
 
 //#endregion
-export { ParsedWriteArgs, parseWriteArgs };
+export { ParsedWriteArgs, flattenJsonForAppend, isJsonContentType, parseWriteArgs };

package/dist/index.d.ts

@@ -1,7 +1,25 @@
+//#region src/jsonUtils.d.ts
+/**
+* Check if content-type indicates JSON mode.
+* Handles cases like "application/json; charset=utf-8".
+*/
+declare function isJsonContentType(contentType: string): boolean;
+/**
+* One-level array flattening for JSON batch semantics.
+* - Single object: `{}` → yields once
+* - Array: `[{}, {}]` → yields each element (flattened)
+* - Nested array: `[[{}, {}]]` → yields `[{}, {}]` (outer array flattened, inner preserved)
+*
+* This matches the protocol's batch semantics where servers flatten exactly one level.
+*/
+declare function flattenJsonForAppend(parsed: unknown): Generator<unknown>;
+
+//#endregion
 //#region src/parseWriteArgs.d.ts
 interface ParsedWriteArgs {
   contentType: string;
   content: string;
+  batchJson: boolean;
 }
 /**
 * Parse write command arguments, extracting content-type flags and content.
@@ -12,4 +30,4 @@ interface ParsedWriteArgs {
 declare function parseWriteArgs(args: Array<string>): ParsedWriteArgs;
 
 //#endregion
-export { ParsedWriteArgs, parseWriteArgs };
+export { ParsedWriteArgs, flattenJsonForAppend, isJsonContentType, parseWriteArgs };

package/dist/index.js

@@ -4,6 +4,28 @@ import { stderr, stdin, stdout } from "node:process";
 import { fileURLToPath } from "node:url";
 import { DurableStream } from "@durable-streams/client";
 
+//#region src/jsonUtils.ts
+/**
+* Check if content-type indicates JSON mode.
+* Handles cases like "application/json; charset=utf-8".
+*/
+function isJsonContentType(contentType) {
+	return contentType.split(`;`)[0].trim().toLowerCase() === `application/json`;
+}
+/**
+* One-level array flattening for JSON batch semantics.
+* - Single object: `{}` → yields once
+* - Array: `[{}, {}]` → yields each element (flattened)
+* - Nested array: `[[{}, {}]]` → yields `[{}, {}]` (outer array flattened, inner preserved)
+*
+* This matches the protocol's batch semantics where servers flatten exactly one level.
+*/
+function* flattenJsonForAppend(parsed) {
+	if (Array.isArray(parsed)) for (const item of parsed) yield item;
+	else yield parsed;
+}
+
+//#endregion
 //#region src/parseWriteArgs.ts
 /**
 * Parse write command arguments, extracting content-type flags and content.
@@ -13,21 +35,33 @@ import { DurableStream } from "@durable-streams/client";
 */
 function parseWriteArgs(args) {
 	let contentType = `application/octet-stream`;
+	let batchJson = false;
 	const contentParts = [];
 	for (let i = 0; i < args.length; i++) {
 		const arg = args[i];
-		if (arg === `--json`) contentType = `application/json`;
-		else if (arg === `--content-type`) {
+		if (arg === `--json`) {
+			contentType = `application/json`;
+			continue;
+		}
+		if (arg === `--batch-json`) {
+			batchJson = true;
+			contentType = `application/json`;
+			continue;
+		}
+		if (arg === `--content-type`) {
 			const nextArg = args[i + 1];
 			if (!nextArg || nextArg.startsWith(`--`)) throw new Error(`--content-type requires a value`);
 			contentType = nextArg;
 			i++;
-		} else if (arg.startsWith(`--`)) throw new Error(`unknown flag: ${arg}`);
-		else contentParts.push(arg);
+			continue;
+		}
+		if (arg.startsWith(`--`)) throw new Error(`unknown flag: ${arg}`);
+		contentParts.push(arg);
 	}
 	return {
 		contentType,
-		content: contentParts.join(` `)
+		content: contentParts.join(` `),
+		batchJson
 	};
 }
 
@@ -45,7 +79,8 @@ Usage:
 
 Write Options:
   --content-type <type>   Content-Type for the message (default: application/octet-stream)
-  --json                  Shorthand for --content-type application/json
+  --json                  Write as JSON (input stored as single message)
+  --batch-json            Write as JSON array of messages (each array element stored separately)
 
 Environment Variables:
   STREAM_URL    Base URL of the stream server (default: http://localhost:4437)
@@ -64,8 +99,20 @@ async function createStream(streamId) {
 		process.exit(1);
 	}
 }
-async function writeStream(streamId, contentType, content) {
+/**
+* Append JSON data to a stream with one-level array flattening.
+*/
+async function appendJson(stream, parsed) {
+	let count = 0;
+	for (const item of flattenJsonForAppend(parsed)) {
+		await stream.append(item);
+		count++;
+	}
+	return count;
+}
+async function writeStream(streamId, contentType, batchJson, content) {
 	const url = `${STREAM_URL}/v1/stream/${streamId}`;
+	const isJson = isJsonContentType(contentType);
 	try {
 		const stream = new DurableStream({
 			url,
@@ -73,8 +120,19 @@ async function writeStream(streamId, contentType, content) {
 		});
 		if (content) {
 			const processedContent = content.replace(/\\n/g, `\n`).replace(/\\t/g, `\t`).replace(/\\r/g, `\r`).replace(/\\\\/g, `\\`);
-			await stream.append(processedContent);
-			console.log(`Wrote ${processedContent.length} bytes to ${streamId}`);
+			if (isJson) {
+				const parsed = JSON.parse(processedContent);
+				if (batchJson) {
+					const count = await appendJson(stream, parsed);
+					console.log(`Wrote ${count} message(s) to ${streamId}`);
+				} else {
+					await stream.append(parsed);
+					console.log(`Wrote 1 message to ${streamId}`);
+				}
+			} else {
+				await stream.append(processedContent);
+				console.log(`Wrote ${processedContent.length} bytes to ${streamId}`);
+			}
 		} else {
 			const chunks = [];
 			stdin.on(`data`, (chunk) => {
@@ -85,8 +143,19 @@ async function writeStream(streamId, contentType, content) {
 				stdin.on(`error`, reject);
 			});
 			const data = Buffer.concat(chunks);
-			await stream.append(data);
-			console.log(`Wrote ${data.length} bytes to ${streamId}`);
+			if (isJson) {
+				const parsed = JSON.parse(data.toString(`utf8`));
+				if (batchJson) {
+					const count = await appendJson(stream, parsed);
+					console.log(`Wrote ${count} message(s) to ${streamId}`);
+				} else {
+					await stream.append(parsed);
+					console.log(`Wrote 1 message to ${streamId}`);
+				}
+			} else {
+				await stream.append(data);
+				console.log(`Wrote ${data.length} bytes to ${streamId}`);
+			}
 		}
 	} catch (error) {
 		if (error instanceof Error) stderr.write(`Error writing to stream: ${error.message}\n`);
@@ -146,8 +215,8 @@ async function main() {
 				if (error instanceof Error) stderr.write(`Error: ${error.message}\n`);
 				process.exit(1);
 			}
-			if (!stdin.isTTY) await writeStream(streamId, parsed.contentType);
-			else if (parsed.content) await writeStream(streamId, parsed.contentType, parsed.content);
+			if (!stdin.isTTY) await writeStream(streamId, parsed.contentType, parsed.batchJson);
+			else if (parsed.content) await writeStream(streamId, parsed.contentType, parsed.batchJson, parsed.content);
 			else {
 				stderr.write(`Error: content required (provide as argument or pipe to stdin)\n`);
 				printUsage();
@@ -191,4 +260,4 @@ if (isMainModule()) main().catch((error) => {
 });
 
 //#endregion
-export { parseWriteArgs };
+export { flattenJsonForAppend, isJsonContentType, parseWriteArgs };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@durable-streams/cli",
   "description": "CLI tool for working with Durable Streams",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "author": "Durable Stream contributors",
   "bin": {
     "cli": "./dist/index.js",
@@ -12,7 +12,7 @@
     "url": "https://github.com/durable-streams/durable-streams/issues"
   },
   "dependencies": {
-    "@durable-streams/client": "0.1.3"
+    "@durable-streams/client": "0.1.4"
   },
   "devDependencies": {
     "@types/node": "^22.15.21",
@@ -20,7 +20,7 @@
     "tsx": "^4.19.2",
     "typescript": "^5.5.2",
     "vitest": "^3.1.3",
-    "@durable-streams/server": "0.1.4"
+    "@durable-streams/server": "0.1.5"
   },
   "engines": {
     "node": ">=18.0.0"