grist-widget-sdk 0.5.1 → 0.6.1

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # grist-widget-sdk
 
+## 0.6.1
+
+### Patch Changes
+
+- 71785f8: **Attachment URLs only take an attachment id.** `getAttachmentUrl()`, `fetchAttachmentBlob()` (and the helpers behind them) now refuse anything but a positive integer as the attachment id, before asking Grist for an access token: the id usually comes from a cell, and the URL built from it carries the document's token, so a crafted value (`"1/../tables"`) could otherwise aim it at another route of the same Grist. The token in the URL is now encoded too.
+  
+  `grist-widget-sdk` no longer depends on `grain-rpc`, which nothing imported since the iframe transport was removed: one package fewer in every widget.
+
+## 0.6.0
+
+### Minor Changes
+
+- 04fcfe6: **One way to do each thing: `fetchRows()`, `grist-widget-sdk/actions`, and soft deprecations.**
+  
+  ```ts
+  const rows = await w.fetchRows()                       // the section's rows, in its order
+  const people = await w.fetchRows("People")             // any table's rows (full access)
+  const columns = await w.fetchRows({ columnar: true })  // Grist's own column-oriented payload
+  
+  import { gristAddColumnAction } from "grist-widget-sdk/actions"
+  ```
+  
+  - `useGrist().fetchRows(tableId?, options?)` replaces three readers. Without a table id it reads the widget's own section (filters and sort applied); with one, any table, in Grist's order (`order`, `columns` as before). Rows by default, `{ columnar: true }` for columns.
+  - `grist-widget-sdk/actions` is the user actions' own entry point, with the bulk record builders (`gristBulkAddRecordAction`, `gristBulkUpdateRecordAction`, `gristBulkRemoveRecordAction`) the root entry never exported.
+  - Deprecated, removed in 1.0: `useGristContext()` (use `widget.useGrist()` or `useGrist()`); `useGrist().isReady` and `isAvailable`, and `useGristSchema().isAvailable` (use `status`); `fetchSelectedTable`, `fetchTable` and `fetchTableRows` (use `fetchRows`); the nine user-action builders in the root entry (import them from `grist-widget-sdk/actions`). Each still works, is struck through in the editor (`@deprecated`), and warns once in development with what replaces it; a production build stays silent. https://gristwidgets.com/docs/sdk/api/deprecated lists them.
+  - The examples (`create-grist-widget --example`) are declared with `defineGristWidget()` and use none of the deprecated names.
+  
+  Existing widgets keep working unchanged. To clear the warnings, replace each name as the deprecations page says.
+
 ## 0.5.1
 
 ### Patch Changes

package/dist/actions.cjs

@@ -0,0 +1,96 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/actions/index.ts
+var actions_exports = {};
+__export(actions_exports, {
+  gristAddColumnAction: () => gristAddColumnAction,
+  gristAddRecordAction: () => gristAddRecordAction,
+  gristAddTableAction: () => gristAddTableAction,
+  gristAddVisibleColumnAction: () => gristAddVisibleColumnAction,
+  gristBulkAddRecordAction: () => gristBulkAddRecordAction,
+  gristBulkRemoveRecordAction: () => gristBulkRemoveRecordAction,
+  gristBulkUpdateRecordAction: () => gristBulkUpdateRecordAction,
+  gristModifyColumnAction: () => gristModifyColumnAction,
+  gristRemoveColumnAction: () => gristRemoveColumnAction,
+  gristRemoveRecordAction: () => gristRemoveRecordAction,
+  gristRenameColumnAction: () => gristRenameColumnAction,
+  gristUpdateRecordAction: () => gristUpdateRecordAction
+});
+module.exports = __toCommonJS(actions_exports);
+
+// src/sdk/helpers/grist-user-actions.ts
+function gristUpdateRecordAction(tableId, rowId, patch) {
+  return ["UpdateRecord", tableId, rowId, patch];
+}
+function gristAddRecordAction(tableId, values) {
+  return ["AddRecord", tableId, null, values];
+}
+function gristRemoveRecordAction(tableId, rowId) {
+  return ["RemoveRecord", tableId, rowId];
+}
+function gristBulkUpdateRecordAction(tableId, rowIds, columnarPatch) {
+  return ["BulkUpdateRecord", tableId, rowIds, columnarPatch];
+}
+function gristBulkAddRecordAction(tableId, values, rowIds) {
+  const length = inferBulkLength(values);
+  const ids = rowIds ?? new Array(length).fill(null);
+  return ["BulkAddRecord", tableId, ids, values];
+}
+function gristBulkRemoveRecordAction(tableId, rowIds) {
+  return ["BulkRemoveRecord", tableId, rowIds];
+}
+function gristAddColumnAction(tableId, colId, colInfo) {
+  return ["AddColumn", tableId, colId, colInfo];
+}
+function gristAddVisibleColumnAction(tableId, colId, colInfo) {
+  return ["AddVisibleColumn", tableId, colId, colInfo];
+}
+function gristRenameColumnAction(tableId, colId, newColId) {
+  return ["RenameColumn", tableId, colId, newColId];
+}
+function gristModifyColumnAction(tableId, colId, colInfo) {
+  return ["ModifyColumn", tableId, colId, colInfo];
+}
+function gristRemoveColumnAction(tableId, colId) {
+  return ["RemoveColumn", tableId, colId];
+}
+function gristAddTableAction(tableId, tableInfo) {
+  return ["AddTable", tableId, tableInfo];
+}
+function inferBulkLength(values) {
+  for (const arr of Object.values(values)) if (Array.isArray(arr)) return arr.length;
+  return 0;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  gristAddColumnAction,
+  gristAddRecordAction,
+  gristAddTableAction,
+  gristAddVisibleColumnAction,
+  gristBulkAddRecordAction,
+  gristBulkRemoveRecordAction,
+  gristBulkUpdateRecordAction,
+  gristModifyColumnAction,
+  gristRemoveColumnAction,
+  gristRemoveRecordAction,
+  gristRenameColumnAction,
+  gristUpdateRecordAction
+});
+//# sourceMappingURL=actions.cjs.map

package/dist/actions.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/actions/index.ts","../src/sdk/helpers/grist-user-actions.ts"],"sourcesContent":["/**\n * grist-widget-sdk/actions: user actions for `useGrist().applyActions()`,\n * Grist's own tuples for what the table API doesn't cover: schema changes\n * (tables, columns) and batches of changes applied as one undoable step.\n *\n * ```ts\n * import { gristAddColumnAction, gristRenameColumnAction } from \"grist-widget-sdk/actions\"\n *\n * await w.applyActions([\n *   gristAddColumnAction(\"Tasks\", \"Due\", { type: \"Date\" }),\n *   gristRenameColumnAction(\"Tasks\", \"Owner\", \"Assignee\"),\n * ])\n * ```\n *\n * Record changes in the widget's table are simpler with `w.updateRecord()`,\n * `w.addRecord()` or `w.table`.\n */\n\nexport {\n  gristAddColumnAction,\n  gristAddRecordAction,\n  gristAddTableAction,\n  gristAddVisibleColumnAction,\n  gristBulkAddRecordAction,\n  gristBulkRemoveRecordAction,\n  gristBulkUpdateRecordAction,\n  gristModifyColumnAction,\n  gristRemoveColumnAction,\n  gristRemoveRecordAction,\n  gristRenameColumnAction,\n  gristUpdateRecordAction,\n  type GristUserActionTuple,\n} from \"../sdk/helpers/grist-user-actions\"\n","/**\n * Grist `docApi.applyUserActions` payloads are arrays of user-action tuples.\n * @see https://support.getgrist.com/code/interfaces/grist_plugin_api.GristDocAPI/#applyuseractions\n */\n\nexport type GristUserActionTuple = unknown[]\n\n/** `[\"UpdateRecord\", tableId, rowId, { col: value, ... }]` */\nexport function gristUpdateRecordAction(\n  tableId: string,\n  rowId: number,\n  patch: Record<string, unknown>\n): GristUserActionTuple {\n  return [\"UpdateRecord\", tableId, rowId, patch]\n}\n\n/** `[\"AddRecord\", tableId, null, { col: value, ... }]` */\nexport function gristAddRecordAction(tableId: string, values: Record<string, unknown>): GristUserActionTuple {\n  return [\"AddRecord\", tableId, null, values]\n}\n\n/** `[\"RemoveRecord\", tableId, rowId]` */\nexport function gristRemoveRecordAction(tableId: string, rowId: number): GristUserActionTuple {\n  return [\"RemoveRecord\", tableId, rowId]\n}\n\n/** `[\"BulkUpdateRecord\", tableId, rowIds, { col: value[], ... }]` */\nexport function gristBulkUpdateRecordAction(\n  tableId: string,\n  rowIds: number[],\n  columnarPatch: Record<string, unknown[]>\n): GristUserActionTuple {\n  return [\"BulkUpdateRecord\", tableId, rowIds, columnarPatch]\n}\n\n/**\n * `[\"BulkAddRecord\", tableId, rowIds | nullArray, { col: value[], ... }]`.\n * Pass `null` (or omit) for `rowIds` to let Grist allocate ids; in user-action\n * format Grist expects an array of nulls of the same length as the value arrays.\n */\nexport function gristBulkAddRecordAction(\n  tableId: string,\n  values: Record<string, unknown[]>,\n  rowIds?: Array<number | null>\n): GristUserActionTuple {\n  const length = inferBulkLength(values)\n  const ids = rowIds ?? new Array<number | null>(length).fill(null)\n  return [\"BulkAddRecord\", tableId, ids, values]\n}\n\n/** `[\"BulkRemoveRecord\", tableId, rowIds]` */\nexport function gristBulkRemoveRecordAction(tableId: string, rowIds: number[]): GristUserActionTuple {\n  return [\"BulkRemoveRecord\", tableId, rowIds]\n}\n\n/** `[\"AddColumn\", tableId, colId, colInfo]` — `colInfo` shape depends on Grist version / column type. */\nexport function gristAddColumnAction(tableId: string, colId: string, colInfo: Record<string, unknown>): GristUserActionTuple {\n  return [\"AddColumn\", tableId, colId, colInfo]\n}\n\n/** `[\"AddVisibleColumn\", tableId, colId, colInfo]` — like `AddColumn` but also adds the column to the current view section. */\nexport function gristAddVisibleColumnAction(tableId: string, colId: string, colInfo: Record<string, unknown>): GristUserActionTuple {\n  return [\"AddVisibleColumn\", tableId, colId, colInfo]\n}\n\n/** `[\"RenameColumn\", tableId, colId, newColId]` */\nexport function gristRenameColumnAction(tableId: string, colId: string, newColId: string): GristUserActionTuple {\n  return [\"RenameColumn\", tableId, colId, newColId]\n}\n\n/** `[\"ModifyColumn\", tableId, colId, colInfo]` */\nexport function gristModifyColumnAction(tableId: string, colId: string, colInfo: Record<string, unknown>): GristUserActionTuple {\n  return [\"ModifyColumn\", tableId, colId, colInfo]\n}\n\n/** `[\"RemoveColumn\", tableId, colId]` */\nexport function gristRemoveColumnAction(tableId: string, colId: string): GristUserActionTuple {\n  return [\"RemoveColumn\", tableId, colId]\n}\n\n/** `[\"AddTable\", tableId, tableInfo]` */\nexport function gristAddTableAction(tableId: string, tableInfo: Record<string, unknown>): GristUserActionTuple {\n  return [\"AddTable\", tableId, tableInfo]\n}\n\nfunction inferBulkLength(values: Record<string, unknown[]>): number {\n  for (const arr of Object.values(values)) if (Array.isArray(arr)) return arr.length\n  return 0\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACQO,SAAS,wBACd,SACA,OACA,OACsB;AACtB,SAAO,CAAC,gBAAgB,SAAS,OAAO,KAAK;AAC/C;AAGO,SAAS,qBAAqB,SAAiB,QAAuD;AAC3G,SAAO,CAAC,aAAa,SAAS,MAAM,MAAM;AAC5C;AAGO,SAAS,wBAAwB,SAAiB,OAAqC;AAC5F,SAAO,CAAC,gBAAgB,SAAS,KAAK;AACxC;AAGO,SAAS,4BACd,SACA,QACA,eACsB;AACtB,SAAO,CAAC,oBAAoB,SAAS,QAAQ,aAAa;AAC5D;AAOO,SAAS,yBACd,SACA,QACA,QACsB;AACtB,QAAM,SAAS,gBAAgB,MAAM;AACrC,QAAM,MAAM,UAAU,IAAI,MAAqB,MAAM,EAAE,KAAK,IAAI;AAChE,SAAO,CAAC,iBAAiB,SAAS,KAAK,MAAM;AAC/C;AAGO,SAAS,4BAA4B,SAAiB,QAAwC;AACnG,SAAO,CAAC,oBAAoB,SAAS,MAAM;AAC7C;AAGO,SAAS,qBAAqB,SAAiB,OAAe,SAAwD;AAC3H,SAAO,CAAC,aAAa,SAAS,OAAO,OAAO;AAC9C;AAGO,SAAS,4BAA4B,SAAiB,OAAe,SAAwD;AAClI,SAAO,CAAC,oBAAoB,SAAS,OAAO,OAAO;AACrD;AAGO,SAAS,wBAAwB,SAAiB,OAAe,UAAwC;AAC9G,SAAO,CAAC,gBAAgB,SAAS,OAAO,QAAQ;AAClD;AAGO,SAAS,wBAAwB,SAAiB,OAAe,SAAwD;AAC9H,SAAO,CAAC,gBAAgB,SAAS,OAAO,OAAO;AACjD;AAGO,SAAS,wBAAwB,SAAiB,OAAqC;AAC5F,SAAO,CAAC,gBAAgB,SAAS,KAAK;AACxC;AAGO,SAAS,oBAAoB,SAAiB,WAA0D;AAC7G,SAAO,CAAC,YAAY,SAAS,SAAS;AACxC;AAEA,SAAS,gBAAgB,QAA2C;AAClE,aAAW,OAAO,OAAO,OAAO,MAAM,EAAG,KAAI,MAAM,QAAQ,GAAG,EAAG,QAAO,IAAI;AAC5E,SAAO;AACT;","names":[]}

package/dist/actions.d.cts

@@ -0,0 +1,36 @@
+/**
+ * Grist `docApi.applyUserActions` payloads are arrays of user-action tuples.
+ * @see https://support.getgrist.com/code/interfaces/grist_plugin_api.GristDocAPI/#applyuseractions
+ */
+type GristUserActionTuple = unknown[];
+/** `["UpdateRecord", tableId, rowId, { col: value, ... }]` */
+declare function gristUpdateRecordAction(tableId: string, rowId: number, patch: Record<string, unknown>): GristUserActionTuple;
+/** `["AddRecord", tableId, null, { col: value, ... }]` */
+declare function gristAddRecordAction(tableId: string, values: Record<string, unknown>): GristUserActionTuple;
+/** `["RemoveRecord", tableId, rowId]` */
+declare function gristRemoveRecordAction(tableId: string, rowId: number): GristUserActionTuple;
+/** `["BulkUpdateRecord", tableId, rowIds, { col: value[], ... }]` */
+declare function gristBulkUpdateRecordAction(tableId: string, rowIds: number[], columnarPatch: Record<string, unknown[]>): GristUserActionTuple;
+/**
+ * `["BulkAddRecord", tableId, rowIds | nullArray, { col: value[], ... }]`.
+ * Pass `null` (or omit) for `rowIds` to let Grist allocate ids; in user-action
+ * format Grist expects an array of nulls of the same length as the value arrays.
+ */
+declare function gristBulkAddRecordAction(tableId: string, values: Record<string, unknown[]>, rowIds?: Array<number | null>): GristUserActionTuple;
+/** `["BulkRemoveRecord", tableId, rowIds]` */
+declare function gristBulkRemoveRecordAction(tableId: string, rowIds: number[]): GristUserActionTuple;
+/** `["AddColumn", tableId, colId, colInfo]` — `colInfo` shape depends on Grist version / column type. */
+declare function gristAddColumnAction(tableId: string, colId: string, colInfo: Record<string, unknown>): GristUserActionTuple;
+/** `["AddVisibleColumn", tableId, colId, colInfo]` — like `AddColumn` but also adds the column to the current view section. */
+declare function gristAddVisibleColumnAction(tableId: string, colId: string, colInfo: Record<string, unknown>): GristUserActionTuple;
+/** `["RenameColumn", tableId, colId, newColId]` */
+declare function gristRenameColumnAction(tableId: string, colId: string, newColId: string): GristUserActionTuple;
+/** `["ModifyColumn", tableId, colId, colInfo]` */
+declare function gristModifyColumnAction(tableId: string, colId: string, colInfo: Record<string, unknown>): GristUserActionTuple;
+/** `["RemoveColumn", tableId, colId]` */
+declare function gristRemoveColumnAction(tableId: string, colId: string): GristUserActionTuple;
+/** `["AddTable", tableId, tableInfo]` */
+declare function gristAddTableAction(tableId: string, tableInfo: Record<string, unknown>): GristUserActionTuple;
+
+export { gristAddColumnAction, gristAddRecordAction, gristAddTableAction, gristAddVisibleColumnAction, gristBulkAddRecordAction, gristBulkRemoveRecordAction, gristBulkUpdateRecordAction, gristModifyColumnAction, gristRemoveColumnAction, gristRemoveRecordAction, gristRenameColumnAction, gristUpdateRecordAction };
+export type { GristUserActionTuple };

package/dist/actions.d.ts

@@ -0,0 +1,36 @@
+/**
+ * Grist `docApi.applyUserActions` payloads are arrays of user-action tuples.
+ * @see https://support.getgrist.com/code/interfaces/grist_plugin_api.GristDocAPI/#applyuseractions
+ */
+type GristUserActionTuple = unknown[];
+/** `["UpdateRecord", tableId, rowId, { col: value, ... }]` */
+declare function gristUpdateRecordAction(tableId: string, rowId: number, patch: Record<string, unknown>): GristUserActionTuple;
+/** `["AddRecord", tableId, null, { col: value, ... }]` */
+declare function gristAddRecordAction(tableId: string, values: Record<string, unknown>): GristUserActionTuple;
+/** `["RemoveRecord", tableId, rowId]` */
+declare function gristRemoveRecordAction(tableId: string, rowId: number): GristUserActionTuple;
+/** `["BulkUpdateRecord", tableId, rowIds, { col: value[], ... }]` */
+declare function gristBulkUpdateRecordAction(tableId: string, rowIds: number[], columnarPatch: Record<string, unknown[]>): GristUserActionTuple;
+/**
+ * `["BulkAddRecord", tableId, rowIds | nullArray, { col: value[], ... }]`.
+ * Pass `null` (or omit) for `rowIds` to let Grist allocate ids; in user-action
+ * format Grist expects an array of nulls of the same length as the value arrays.
+ */
+declare function gristBulkAddRecordAction(tableId: string, values: Record<string, unknown[]>, rowIds?: Array<number | null>): GristUserActionTuple;
+/** `["BulkRemoveRecord", tableId, rowIds]` */
+declare function gristBulkRemoveRecordAction(tableId: string, rowIds: number[]): GristUserActionTuple;
+/** `["AddColumn", tableId, colId, colInfo]` — `colInfo` shape depends on Grist version / column type. */
+declare function gristAddColumnAction(tableId: string, colId: string, colInfo: Record<string, unknown>): GristUserActionTuple;
+/** `["AddVisibleColumn", tableId, colId, colInfo]` — like `AddColumn` but also adds the column to the current view section. */
+declare function gristAddVisibleColumnAction(tableId: string, colId: string, colInfo: Record<string, unknown>): GristUserActionTuple;
+/** `["RenameColumn", tableId, colId, newColId]` */
+declare function gristRenameColumnAction(tableId: string, colId: string, newColId: string): GristUserActionTuple;
+/** `["ModifyColumn", tableId, colId, colInfo]` */
+declare function gristModifyColumnAction(tableId: string, colId: string, colInfo: Record<string, unknown>): GristUserActionTuple;
+/** `["RemoveColumn", tableId, colId]` */
+declare function gristRemoveColumnAction(tableId: string, colId: string): GristUserActionTuple;
+/** `["AddTable", tableId, tableInfo]` */
+declare function gristAddTableAction(tableId: string, tableInfo: Record<string, unknown>): GristUserActionTuple;
+
+export { gristAddColumnAction, gristAddRecordAction, gristAddTableAction, gristAddVisibleColumnAction, gristBulkAddRecordAction, gristBulkRemoveRecordAction, gristBulkUpdateRecordAction, gristModifyColumnAction, gristRemoveColumnAction, gristRemoveRecordAction, gristRenameColumnAction, gristUpdateRecordAction };
+export type { GristUserActionTuple };

package/dist/actions.js

@@ -0,0 +1,29 @@
+import {
+  gristAddColumnAction,
+  gristAddRecordAction,
+  gristAddTableAction,
+  gristAddVisibleColumnAction,
+  gristBulkAddRecordAction,
+  gristBulkRemoveRecordAction,
+  gristBulkUpdateRecordAction,
+  gristModifyColumnAction,
+  gristRemoveColumnAction,
+  gristRemoveRecordAction,
+  gristRenameColumnAction,
+  gristUpdateRecordAction
+} from "./chunk-YGQXH2P5.js";
+export {
+  gristAddColumnAction,
+  gristAddRecordAction,
+  gristAddTableAction,
+  gristAddVisibleColumnAction,
+  gristBulkAddRecordAction,
+  gristBulkRemoveRecordAction,
+  gristBulkUpdateRecordAction,
+  gristModifyColumnAction,
+  gristRemoveColumnAction,
+  gristRemoveRecordAction,
+  gristRenameColumnAction,
+  gristUpdateRecordAction
+};
+//# sourceMappingURL=actions.js.map

package/dist/actions.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}

package/dist/app.cjs

@@ -37,6 +37,27 @@ var import_client = require("react-dom/client");
 // src/sdk/use-grist.ts
 var import_react = require("react");
 
+// src/sdk/helpers/deprecate.ts
+function isDevelopment() {
+  try {
+    return process.env.NODE_ENV !== "production";
+  } catch {
+    return false;
+  }
+}
+var warned = /* @__PURE__ */ new Set();
+function warnDeprecated(name, instead) {
+  if (warned.has(name) || !isDevelopment()) return;
+  warned.add(name);
+  console.warn(`[grist-widget-sdk] ${name} is deprecated and goes in 1.0: ${instead}. https://gristwidgets.com/docs/sdk/api/deprecated`);
+}
+function deprecatedFunction(name, instead, fn) {
+  return ((...args) => {
+    warnDeprecated(name, instead);
+    return fn(...args);
+  });
+}
+
 // src/sdk/helpers/grist-value-codec.ts
 var MARSHALLED_TAGS = /* @__PURE__ */ new Set(["E", "L", "D", "d", "R", "r", "P"]);
 function isMarshalledTuple(value) {
@@ -344,8 +365,12 @@ async function getAttachmentDownloadUrl(docApi, attachmentId, options) {
   if (!getAccessToken) {
     throw new Error("getAccessToken is not available on docApi");
   }
+  const id = String(attachmentId).trim();
+  if (!/^[1-9]\d*$/.test(id)) {
+    throw new Error(`getAttachmentDownloadUrl: "${attachmentId}" is not an attachment id (a positive integer).`);
+  }
   const { token: token2, baseUrl } = await getAccessToken({ readOnly: options?.readOnly ?? false });
-  return `${baseUrl}/attachments/${attachmentId}/download?auth=${token2}`;
+  return `${baseUrl}/attachments/${id}/download?auth=${encodeURIComponent(token2)}`;
 }
 async function fetchBytesFromSignedAttachmentUrl(url) {
   const response = await fetch(url);
@@ -607,15 +632,32 @@ function createGristApi(runtime) {
     destroy: (ids) => write(() => resolve().destroy(ids))
   });
   const tables = /* @__PURE__ */ new Map();
+  const selectedColumns = (options) => read(async () => {
+    const impl = docApi().fetchSelectedTable ?? grist.fetchSelectedTable;
+    if (!impl) throw new Error("fetchSelectedTable is not available in this Grist version");
+    return await impl({ keepEncoded: false, ...options });
+  });
+  const tableColumns = (tableId) => read(async () => await docApi().fetchTable(tableId));
+  const fetchRows = (async (a, b) => {
+    const tableId = typeof a === "string" ? a : null;
+    const { columnar, ...rowOptions } = (typeof a === "object" && a !== null ? a : b) ?? {};
+    if (tableId === null) {
+      const data = await selectedColumns(rowOptions.columns ? { keepEncoded: true } : void 0);
+      return columnar ? data : materializeGristRowsFromColumnar(data, { order: "none", ...rowOptions });
+    }
+    if (columnar) return tableColumns(tableId);
+    return read(() => fetchGristTableRows(docApi(), tableId, rowOptions));
+  });
   return {
     reload: () => runtime.reload(),
-    fetchSelectedTable: (options) => read(async () => {
-      const impl = docApi().fetchSelectedTable ?? grist.fetchSelectedTable;
-      if (!impl) throw new Error("fetchSelectedTable is not available in this Grist version");
-      return await impl({ keepEncoded: false, ...options });
-    }),
-    fetchTable: (tableId) => read(async () => await docApi().fetchTable(tableId)),
-    fetchTableRows: (tableId, options) => read(() => fetchGristTableRows(docApi(), tableId, options ?? {})),
+    fetchRows,
+    fetchSelectedTable: deprecatedFunction("useGrist().fetchSelectedTable()", "use fetchRows({ columnar: true }), or fetchRows() for rows", selectedColumns),
+    fetchTable: deprecatedFunction("useGrist().fetchTable()", "use fetchRows(tableId, { columnar: true }), or fetchRows(tableId) for rows", tableColumns),
+    fetchTableRows: deprecatedFunction(
+      "useGrist().fetchTableRows()",
+      "use fetchRows(tableId, options)",
+      (tableId, options) => read(() => fetchGristTableRows(docApi(), tableId, options ?? {}))
+    ),
     listTables: (options) => read(async () => {
       const all = [...await docApi().listTables()];
       return options?.includeSystem ? all : all.filter((t) => !t.startsWith("_grist") && !t.startsWith("GristHidden_"));