@tablecraft-app/plugin-redis 1.5.1 → 1.7.0

package/index.js

@@ -52106,6 +52106,10 @@ var KEY_COLUMN = {
 	name: "key",
 	type: null
 };
+var FIELD_COLUMN = {
+	name: "field",
+	type: null
+};
 var MEMBER_COLUMN = {
 	name: "member",
 	type: null
@@ -52216,24 +52220,62 @@ async function* yieldRows(rows) {
 	for (const row of rows) yield row;
 	return Promise.resolve();
 }
-/** A command's reply as an `ExecuteResult`: a scalar as `reply`, anything else as rows. */
-function resultOf(reply, options = {}) {
+/**
+* A command's reply as an `ExecuteResult`: a scalar as `reply`, anything else as rows. A bulk
+* string, or the nil of a command that reads one key, is a value read (decision 119).
+*/
+function resultOf(reply, options = {}, readsKey = false) {
 	const table = tableOf(reply, options);
-	if (table === null) return {
-		columns: [],
-		rows: yieldRows([]),
-		rowsAffected: null,
-		reply: {
-			value: cellOf(reply, options),
-			text: replyText(reply)
-		}
-	};
+	if (table === null) {
+		const read = reply instanceof Uint8Array || readsKey && (reply === null || reply === void 0);
+		return {
+			columns: [],
+			rows: yieldRows([]),
+			rowsAffected: null,
+			reply: {
+				value: cellOf(reply, options),
+				text: replyText(reply),
+				...read ? { read } : {}
+			}
+		};
+	}
 	return {
 		columns: table.columns,
 		rows: yieldRows(table.rows),
 		rowsAffected: null
 	};
 }
+function membersOf(reply) {
+	return Array.isArray(reply) || reply instanceof Set ? [...reply] : null;
+}
+/**
+* A reply holding a whole key in the columns a key tab reads that type with (decision 119), so an
+* edit maps to the key the same way: list positions count from 0 as `LSET` does. Null when the
+* reply is not that shape, or the type is not one a console result edits as rows.
+*/
+function wholeKeyResult(reply, type, options = {}) {
+	const result = (columns, rows) => ({
+		columns,
+		rows: yieldRows(rows),
+		rowsAffected: null
+	});
+	const members = membersOf(reply);
+	switch (type) {
+		case "hash":
+			if (!(reply instanceof Map)) return null;
+			return result([FIELD_COLUMN, VALUE_COLUMN], [...reply].map(([field, value]) => [cellOf(field, options), cellOf(value, options)]));
+		case "set": return members === null ? null : result([MEMBER_COLUMN], members.map((member) => [cellOf(member, options)]));
+		case "list": return members === null ? null : result([INDEX_COLUMN, VALUE_COLUMN], members.map((element, index) => [index, cellOf(element, options)]));
+		case "zset":
+			if (members === null) return null;
+			if (members.length > 0 && members.every(isScoredPair)) return result([MEMBER_COLUMN, SCORE_COLUMN], members.map((element) => {
+				const [member, score] = element;
+				return [cellOf(member, options), score];
+			}));
+			return result([MEMBER_COLUMN], members.map((member) => [cellOf(member, options)]));
+		default: return null;
+	}
+}
 /** One reply per primary, each row led by the node it came from (decision 114). */
 function fannedOutResult(replies, options = {}) {
 	const tables = replies.map(({ node, reply }) => ({
@@ -55096,6 +55138,33 @@ var RedisSessionMonitor = class {
 		});
 	}
 };
+var FIRST = "0";
+var LAST = "-1";
+var STREAM_START = "-";
+var STREAM_END = "+";
+/** The one key a read-only command reads, or null for writes, keyless and multi-key commands. */
+function keyRead(table, words, args) {
+	if (!flagsOf(table, words).includes("readonly")) return null;
+	const keys = keyArguments(table, words, args);
+	return keys === "movable" || keys.length !== 1 ? null : keys[0] ?? null;
+}
+/**
+* Whether the command's reply holds the whole of a key of `type` (decision 119): `GET`, `HGETALL`,
+* `SMEMBERS`, `LRANGE k 0 -1`, `ZRANGE k 0 -1 [WITHSCORES]` and `XRANGE k - +`, with no other
+* option that narrows or reorders them.
+*/
+function readsWholeKey(words, type) {
+	const [name, , from, to, option] = words;
+	switch (type) {
+		case "string": return name === "GET" && words.length === 2;
+		case "hash": return name === "HGETALL" && words.length === 2;
+		case "set": return name === "SMEMBERS" && words.length === 2;
+		case "list": return name === "LRANGE" && words.length === 4 && from === FIRST && to === LAST;
+		case "zset": return name === "ZRANGE" && from === FIRST && to === LAST && (words.length === 4 || words.length === 5 && option === "WITHSCORES");
+		case "stream": return name === "XRANGE" && words.length === 4 && from === STREAM_START && to === STREAM_END;
+		default: return false;
+	}
+}
 // ../../plugins/redis/src/session.ts
 var CLOSE_GRACE_MS = 3e3;
 var BUSY_MESSAGE = "Another command is still running in this session.";
@@ -55235,10 +55304,18 @@ var RedisSession = class RedisSession {
 				const refusal = readOnlyRefusal(await this.commandTable(), words);
 				if (refusal !== null) throw new PluginError("statementFailed", refusal);
 			}
-			const routed = await this.#run(tokens.map((token) => token.bytes), words, options?.node);
+			const args = tokens.map((token) => token.bytes);
+			const routed = await this.#run(args, words, options?.node);
 			if (words[0] === "SELECT" && !routed.fanned) this.#database = Number(words[1]);
-			const wire = { fullBytes: options?.fullBytes === true };
-			return routed.fanned ? fannedOutResult(routed.replies, wire) : resultOf(routed.reply, wire);
+			if (routed.fanned) return fannedOutResult(routed.replies, { fullBytes: options?.fullBytes === true });
+			const key = routed.reply === "QUEUED" ? null : keyRead(await this.commandTable(), words, args);
+			const source = key === null ? null : await this.#sourceOf(key, words);
+			const wire = { fullBytes: options?.fullBytes === true || key !== null };
+			const result = (source?.whole === true ? wholeKeyResult(routed.reply, source.type, wire) : null) ?? resultOf(routed.reply, wire, key !== null);
+			return source === null ? result : {
+				...result,
+				source
+			};
 		} finally {
 			this.#running = false;
 		}
@@ -55352,6 +55429,21 @@ var RedisSession = class RedisSession {
 		this.#queue = run.catch(() => void 0);
 		return run;
 	}
+	/** The key the command read, typed by `TYPE` (decision 119); null when it is gone or `TYPE` is refused. */
+	async #sourceOf(key, words) {
+		try {
+			const type = keyTypeOf(String(await this.#router.onKey(key, ["TYPE", key])));
+			if (type === null) return null;
+			return {
+				database: this.#database,
+				key: keyBytesOf(key),
+				type,
+				whole: readsWholeKey(words, type)
+			};
+		} catch {
+			return null;
+		}
+	}
 	#run(args, words, node) {
 		return this.#failures(() => this.#router.run(args, words, node));
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tablecraft-app/plugin-redis",
-  "version": "1.5.1",
+  "version": "1.7.0",
   "description": "The Redis datasource plugin for TableCraft, downloaded by the app when a data source needs it.",
   "license": "MIT",
   "type": "module",
@@ -24,6 +24,6 @@
   },
   "tableCraft": {
     "id": "redis",
-    "apiVersion": "1.2.0"
+    "apiVersion": "1.3.0"
   }
 }

package/table-craft-plugin.json

@@ -1,8 +1,8 @@
 {
   "id": "redis",
   "name": "Redis",
-  "version": "1.5.1",
-  "apiVersion": "1.2.0",
+  "version": "1.7.0",
+  "apiVersion": "1.3.0",
   "entry": "index.js",
   "capabilities": [
     "commands",