@inneropen/marvin-sdk 4.1.0 → 4.3.0

package/dist/index.cjs

@@ -510,6 +510,9 @@ var init_HttpClient = __esm({
             errorText
           );
         }
+        if (options?.responseType === "binary") {
+          return await this.readBinary(response, method, endpoint);
+        }
         const data = await this.readBody(response, method, endpoint);
         if (this.debug && data !== void 0) {
           const sanitized = this.sanitizeForLogging(data);
@@ -555,12 +558,34 @@ var init_HttpClient = __esm({
           );
         }
       }
+      /** A successful response's bytes; a 204/205 is an empty array. A failed read is a network error. */
+      async readBinary(response, method, endpoint) {
+        const contentType = response.headers.get("content-type");
+        if (response.status === 204 || response.status === 205) {
+          return { data: new Uint8Array(0), contentType };
+        }
+        try {
+          return { data: new Uint8Array(await response.arrayBuffer()), contentType };
+        } catch (error) {
+          const cause = error instanceof Error ? error : void 0;
+          throw new MarvinNetworkError(
+            `Reading the ${response.status} response to ${method} ${endpoint} failed: ${cause?.message ?? String(error)}`,
+            cause
+          );
+        }
+      }
       /**
        * GET request
        */
       async get(endpoint, params) {
         return this.request("GET", endpoint, { params });
       }
+      /**
+       * GET a binary body (a file download). Follows redirects; retried like any GET.
+       */
+      async getBinary(endpoint, params) {
+        return this.request("GET", endpoint, { params, responseType: "binary" });
+      }
       /**
        * POST request
        */
@@ -915,6 +940,12 @@ var init_http2 = __esm({
 });
 
 // src/entries/entry.ts
+function isFullEntryData(raw) {
+  if (!raw || typeof raw !== "object") return false;
+  const record = raw;
+  if ("assetSlugs" in record || "resourceSlugs" in record) return false;
+  return Array.isArray(record.assets) || Array.isArray(record.resources);
+}
 var Entry;
 var init_entry = __esm({
   "src/entries/entry.ts"() {
@@ -987,6 +1018,11 @@ var init_entry = __esm({
 });
 
 // src/entries/entries.ts
+function csv(value) {
+  if (value === void 0) return void 0;
+  const joined = (Array.isArray(value) ? value : [value]).map((v) => v.trim()).filter(Boolean).join(",");
+  return joined || void 0;
+}
 function toListEntry(raw) {
   const { collections, ...rest } = raw;
   return {
@@ -1010,19 +1046,24 @@ var init_entries = __esm({
       }
       http;
       workspaceSlug;
-      /**
-       * Get all published entries
-       */
       async list(options = {}) {
         const queryString = this.http.buildQueryString({
           entry_type: options.entryType,
           collection: options.collection,
+          tag: csv(options.tag),
+          slug: csv(options.slug),
+          updated_since: options.updatedSince instanceof Date ? options.updatedSince.toISOString() : options.updatedSince,
           limit: options.limit,
-          offset: options.offset
+          offset: options.offset,
+          expand: options.expand
         });
         const endpoint = `/api/publish/${this.workspaceSlug}/entries${queryString}`;
         const response = await this.http.fetch(endpoint);
-        return (response.data || []).map(toListEntry);
+        const data = response.data || [];
+        if (options.expand === "full" && data.every(isFullEntryData)) {
+          return data.map((entry) => new Entry(entry));
+        }
+        return data.map(toListEntry);
       }
       /**
        * Get a single entry by slug
@@ -1134,6 +1175,7 @@ var init_collections = __esm({
   "src/collections/collections.ts"() {
     "use strict";
     init_collection();
+    init_entry();
     init_errors();
     CollectionsModule = class {
       constructor(http, workspaceSlug) {
@@ -1166,18 +1208,25 @@ var init_collections = __esm({
           throw error;
         }
       }
-      /**
-       * Get entries in a collection with junction context surfaced directly.
-       * Each entry has role/position/junctionMetadata from this collection's junction,
-       * and collections reduced to slugs of other memberships.
-       * Returns empty array if collection is not found.
-       */
-      async entries(slug) {
-        const collection = await this.get(slug);
-        if (Array.isArray(collection)) {
-          return collection;
+      async entries(slug, options = {}) {
+        if (options.expand !== "full") {
+          const collection = await this.get(slug);
+          return Array.isArray(collection) ? collection : collection.entries;
         }
-        return collection.entries;
+        let data;
+        try {
+          data = await this.http.fetch(
+            `/api/publish/${this.workspaceSlug}/collections/${slug}?expand=full`
+          );
+        } catch (error) {
+          if (error instanceof MarvinNotFoundError) return [];
+          throw error;
+        }
+        const entries = data.entries ?? [];
+        if (entries.every(isFullEntryData)) {
+          return data.entries.map((entry) => new Entry(entry));
+        }
+        return new Collection(data).entries;
       }
       /**
        * Try multiple collection slugs in fallback order.
@@ -1237,6 +1286,14 @@ var init_assets = __esm({
         const endpoint = `/api/publish/${this.workspaceSlug}/assets/${slugOrId}`;
         return this.http.fetch(endpoint);
       }
+      /**
+       * Download a published asset's file by slug: its bytes and content type. The file route
+       * redirects to storage; the redirect is followed. Needs the `read:assets` permission.
+       */
+      async download(slug) {
+        const validSlug = this.http.validatePathParam(slug, "asset slug");
+        return this.http.getBinary(`/api/publish/${this.workspaceSlug}/assets/${validSlug}/file`);
+      }
       /**
        * Convenience: Get all images
        */
@@ -1665,6 +1722,7 @@ __export(index_exports, {
   createMarvinClient: () => createMarvinClient,
   createPaginatedResponse: () => createPaginatedResponse,
   extractData: () => extractData,
+  isFullEntryData: () => isFullEntryData,
   isPaginatedResponse: () => isPaginatedResponse,
   offsetToPage: () => offsetToPage,
   pageToOffset: () => pageToOffset
@@ -1766,6 +1824,7 @@ function createMarvinClient(config) {
   createMarvinClient,
   createPaginatedResponse,
   extractData,
+  isFullEntryData,
   isPaginatedResponse,
   offsetToPage,
   pageToOffset

package/dist/index.d.cts

@@ -1,9 +1,9 @@
-import { M as MarvinConfig, a as MarvinClient } from './marvin-6keK-yvS.cjs';
-export { C as Collection, E as Entry, b as MarvinApiError, c as MarvinAuthError, d as MarvinCache, e as MarvinConfigError, f as MarvinError, g as MarvinNetworkError, h as MarvinNotFoundError, i as MarvinServerError, j as MarvinValidationError, P as PaginatedResponse, k as PaginationMeta, l as PaginationParams, R as Resource, W as Workspace, m as createConfigFromEnv, n as createPaginatedResponse, o as extractData, p as isPaginatedResponse, q as offsetToPage, r as pageToOffset } from './marvin-6keK-yvS.cjs';
-import { H as HttpClient } from './HttpClient-B_rEmJuO.cjs';
-export { A as AuthStrategy, B as BearerTokenAuth, a as HttpClientConfig, N as NoAuth, S as SessionAuth } from './HttpClient-B_rEmJuO.cjs';
-import { A as AuthToken$1 } from './index-CX4jvPAA.cjs';
-export { C as CollectionContext, a as CollectionEntry, b as CollectionEntryMetadata, E as EntryAsset, c as EntryCollectionContext, d as EntryResource, G as GetAssetsOptions, e as GetEntriesOptions, f as GetResourcesOptions, L as ListEntry, M as MarvinAsset, g as MarvinCollection, h as MarvinEntry, i as MarvinEntryListItem, j as MarvinEntryType, k as MarvinPublishResponse, l as MarvinResource, m as MarvinSite, P as PublishedAssetRead, n as PublishedCollectionSummary, o as PublishedEntryAsset, p as PublishedEntryResource, q as PublishedEntryType, S as SiteConfiguration, W as WorkspaceInfo } from './index-CX4jvPAA.cjs';
+import { M as MarvinConfig, a as MarvinClient } from './marvin-gZtGa576.cjs';
+export { C as Collection, E as Entry, b as MarvinApiError, c as MarvinAuthError, d as MarvinCache, e as MarvinConfigError, f as MarvinError, g as MarvinNetworkError, h as MarvinNotFoundError, i as MarvinServerError, j as MarvinValidationError, P as PaginatedResponse, k as PaginationMeta, l as PaginationParams, R as Resource, W as Workspace, m as createConfigFromEnv, n as createPaginatedResponse, o as extractData, p as isFullEntryData, q as isPaginatedResponse, r as offsetToPage, s as pageToOffset } from './marvin-gZtGa576.cjs';
+import { H as HttpClient } from './HttpClient-DXMNOPqu.cjs';
+export { A as AuthStrategy, B as BearerTokenAuth, a as BinaryResponse, b as HttpClientConfig, N as NoAuth, S as SessionAuth } from './HttpClient-DXMNOPqu.cjs';
+import { A as AuthToken$1 } from './index-BEEbnrXV.cjs';
+export { C as CollectionContext, a as CollectionEntry, b as CollectionEntryMetadata, E as EntryAsset, c as EntryCollectionContext, d as EntryResource, e as ExpandOptions, G as GetAssetsOptions, f as GetEntriesOptions, g as GetResourcesOptions, L as ListEntry, M as MarvinAsset, h as MarvinCollection, i as MarvinCollectionExpanded, j as MarvinEntry, k as MarvinEntryListItem, l as MarvinEntryType, m as MarvinPublishResponse, n as MarvinResource, o as MarvinSite, P as PublishedAssetRead, p as PublishedCollectionSummary, q as PublishedEntryAsset, r as PublishedEntryResource, s as PublishedEntryType, S as SiteConfiguration, W as WorkspaceInfo } from './index-BEEbnrXV.cjs';
 
 /**
  * Authentication & User Registration

package/dist/index.d.ts

@@ -1,9 +1,9 @@
-import { M as MarvinConfig, a as MarvinClient } from './marvin-Cndwz82G.js';
-export { C as Collection, E as Entry, b as MarvinApiError, c as MarvinAuthError, d as MarvinCache, e as MarvinConfigError, f as MarvinError, g as MarvinNetworkError, h as MarvinNotFoundError, i as MarvinServerError, j as MarvinValidationError, P as PaginatedResponse, k as PaginationMeta, l as PaginationParams, R as Resource, W as Workspace, m as createConfigFromEnv, n as createPaginatedResponse, o as extractData, p as isPaginatedResponse, q as offsetToPage, r as pageToOffset } from './marvin-Cndwz82G.js';
-import { H as HttpClient } from './HttpClient-B_rEmJuO.js';
-export { A as AuthStrategy, B as BearerTokenAuth, a as HttpClientConfig, N as NoAuth, S as SessionAuth } from './HttpClient-B_rEmJuO.js';
-import { A as AuthToken$1 } from './index-CX4jvPAA.js';
-export { C as CollectionContext, a as CollectionEntry, b as CollectionEntryMetadata, E as EntryAsset, c as EntryCollectionContext, d as EntryResource, G as GetAssetsOptions, e as GetEntriesOptions, f as GetResourcesOptions, L as ListEntry, M as MarvinAsset, g as MarvinCollection, h as MarvinEntry, i as MarvinEntryListItem, j as MarvinEntryType, k as MarvinPublishResponse, l as MarvinResource, m as MarvinSite, P as PublishedAssetRead, n as PublishedCollectionSummary, o as PublishedEntryAsset, p as PublishedEntryResource, q as PublishedEntryType, S as SiteConfiguration, W as WorkspaceInfo } from './index-CX4jvPAA.js';
+import { M as MarvinConfig, a as MarvinClient } from './marvin-CdsjwIyH.js';
+export { C as Collection, E as Entry, b as MarvinApiError, c as MarvinAuthError, d as MarvinCache, e as MarvinConfigError, f as MarvinError, g as MarvinNetworkError, h as MarvinNotFoundError, i as MarvinServerError, j as MarvinValidationError, P as PaginatedResponse, k as PaginationMeta, l as PaginationParams, R as Resource, W as Workspace, m as createConfigFromEnv, n as createPaginatedResponse, o as extractData, p as isFullEntryData, q as isPaginatedResponse, r as offsetToPage, s as pageToOffset } from './marvin-CdsjwIyH.js';
+import { H as HttpClient } from './HttpClient-DXMNOPqu.js';
+export { A as AuthStrategy, B as BearerTokenAuth, a as BinaryResponse, b as HttpClientConfig, N as NoAuth, S as SessionAuth } from './HttpClient-DXMNOPqu.js';
+import { A as AuthToken$1 } from './index-BEEbnrXV.js';
+export { C as CollectionContext, a as CollectionEntry, b as CollectionEntryMetadata, E as EntryAsset, c as EntryCollectionContext, d as EntryResource, e as ExpandOptions, G as GetAssetsOptions, f as GetEntriesOptions, g as GetResourcesOptions, L as ListEntry, M as MarvinAsset, h as MarvinCollection, i as MarvinCollectionExpanded, j as MarvinEntry, k as MarvinEntryListItem, l as MarvinEntryType, m as MarvinPublishResponse, n as MarvinResource, o as MarvinSite, P as PublishedAssetRead, p as PublishedCollectionSummary, q as PublishedEntryAsset, r as PublishedEntryResource, s as PublishedEntryType, S as SiteConfiguration, W as WorkspaceInfo } from './index-BEEbnrXV.js';
 
 /**
  * Authentication & User Registration

package/dist/index.js

@@ -12,8 +12,9 @@ import {
   init_marvin,
   init_resource,
   init_workspace,
+  isFullEntryData,
   marvin_exports
-} from "./chunk-VS6R3V3K.js";
+} from "./chunk-KXI2FQSO.js";
 import {
   BearerTokenAuth,
   HttpClient,
@@ -36,7 +37,7 @@ import {
   offsetToPage,
   pageToOffset,
   validateEmail
-} from "./chunk-DSVYCVQD.js";
+} from "./chunk-LTX3MAUE.js";
 
 // src/index.ts
 init_marvin();
@@ -134,6 +135,7 @@ export {
   createMarvinClient,
   createPaginatedResponse,
   extractData,
+  isFullEntryData,
   isPaginatedResponse,
   offsetToPage,
   pageToOffset

package/dist/{marvin-6keK-yvS.d.cts → marvin-CdsjwIyH.d.ts}

@@ -1,5 +1,5 @@
-import { q as PublishedEntryType, l as MarvinResource, M as MarvinAsset, g as MarvinCollection, a as CollectionEntry, n as PublishedCollectionSummary, h as MarvinEntry, E as EntryAsset, c as EntryCollectionContext, d as EntryResource, L as ListEntry, m as MarvinSite, f as GetResourcesOptions$1 } from './index-CX4jvPAA.cjs';
-import { H as HttpClient } from './HttpClient-B_rEmJuO.cjs';
+import { s as PublishedEntryType, n as MarvinResource, M as MarvinAsset, h as MarvinCollection, a as CollectionEntry, j as MarvinEntry, E as EntryAsset, c as EntryCollectionContext, d as EntryResource, p as PublishedCollectionSummary, e as ExpandOptions, L as ListEntry, o as MarvinSite, g as GetResourcesOptions$1 } from './index-BEEbnrXV.js';
+import { H as HttpClient, a as BinaryResponse } from './HttpClient-DXMNOPqu.js';
 
 /**
  * Marvin SDK Configuration
@@ -274,6 +274,11 @@ declare class AssetsModule {
      * Get a single published asset by slug or ID
      */
     get(slugOrId: string): Promise<MarvinAsset>;
+    /**
+     * Download a published asset's file by slug: its bytes and content type. The file route
+     * redirects to storage; the redirect is followed. Needs the `read:assets` permission.
+     */
+    download(slug: string): Promise<BinaryResponse>;
     /**
      * Convenience: Get all images
      */
@@ -316,42 +321,15 @@ declare class Collection {
 }
 
 /**
- * Collections Module - Manage collections
+ * Entry - Rich object representing a single entry
  */
 
-declare class CollectionsModule {
-    private http;
-    private workspaceSlug;
-    constructor(http: MarvinHttpClient, workspaceSlug: string);
-    /**
-     * Get all collections
-     */
-    list(): Promise<PublishedCollectionSummary[]>;
-    /**
-     * Get a single collection by slug.
-     * Returns an empty array if the collection is not found (404).
-     */
-    get(slug: string): Promise<Collection | []>;
-    /**
-     * Get entries in a collection with junction context surfaced directly.
-     * Each entry has role/position/junctionMetadata from this collection's junction,
-     * and collections reduced to slugs of other memberships.
-     * Returns empty array if collection is not found.
-     */
-    entries(slug: string): Promise<CollectionEntry[]>;
-    /**
-     * Try multiple collection slugs in fallback order.
-     * Returns entries from the first collection that exists and has entries.
-     */
-    fallback(slugs: string[], options?: {
-        requireEntries?: boolean;
-    }): Promise<CollectionEntry[]>;
-}
-
 /**
- * Entry - Rich object representing a single entry
+ * True for a full entry as the API sends it (`PublishedEntryRead`): `assets[]` placements and no
+ * `assetSlugs`/`resourceSlugs`. A list item (`PublishedEntryListItem`) has only the slugs. Lets an
+ * `expand: 'full'` read tell an expanded response from an older server's list items.
  */
-
+declare function isFullEntryData(raw: unknown): raw is MarvinEntry;
 declare class Entry {
     private raw;
     constructor(raw: MarvinEntry);
@@ -389,6 +367,46 @@ declare class Entry {
     toJSON(): MarvinEntry;
 }
 
+/**
+ * Collections Module - Manage collections
+ */
+
+declare class CollectionsModule {
+    private http;
+    private workspaceSlug;
+    constructor(http: MarvinHttpClient, workspaceSlug: string);
+    /**
+     * Get all collections
+     */
+    list(): Promise<PublishedCollectionSummary[]>;
+    /**
+     * Get a single collection by slug.
+     * Returns an empty array if the collection is not found (404).
+     */
+    get(slug: string): Promise<Collection | []>;
+    /**
+     * Get entries in a collection with junction context surfaced directly.
+     * Each entry has role/position/junctionMetadata from this collection's junction,
+     * and collections reduced to slugs of other memberships.
+     * Returns empty array if collection is not found.
+     *
+     * With `{ expand: 'full' }` the whole collection comes back as full entries in one request:
+     * `Entry` objects, the same as `entry(slug)` returns, each with its `order` in this collection
+     * and every membership under `collections`. A server without `expand` support (or a collection
+     * past the server's expand cap) returns list items instead; those come back as
+     * `CollectionEntry[]`, exactly as without the option, so check with `instanceof Entry`.
+     */
+    entries(slug: string): Promise<CollectionEntry[]>;
+    entries(slug: string, options?: ExpandOptions): Promise<Entry[] | CollectionEntry[]>;
+    /**
+     * Try multiple collection slugs in fallback order.
+     * Returns entries from the first collection that exists and has entries.
+     */
+    fallback(slugs: string[], options?: {
+        requireEntries?: boolean;
+    }): Promise<CollectionEntry[]>;
+}
+
 /**
  * Entries Module - Manage entries
  */
@@ -396,6 +414,12 @@ declare class Entry {
 interface GetEntriesOptions {
     entryType?: string;
     collection?: string;
+    /** Only entries carrying any of these tag slugs. */
+    tag?: string | string[];
+    /** Only entries with these slugs. */
+    slug?: string | string[];
+    /** Only entries updated at or after this time (ISO 8601, or a Date). */
+    updatedSince?: string | Date;
     limit?: number;
     offset?: number;
     status?: string;
@@ -406,8 +430,13 @@ declare class EntriesModule {
     constructor(http: MarvinHttpClient, workspaceSlug: string);
     /**
      * Get all published entries
+     *
+     * With `{ expand: 'full' }` each entry on the page comes back as a full `Entry` (the
+     * single-entry read), so no per-entry reads are needed. A server without `expand` support
+     * returns list items instead; those come back as `ListEntry[]`, as without the option.
      */
     list(options?: GetEntriesOptions): Promise<ListEntry[]>;
+    list(options: GetEntriesOptions & ExpandOptions): Promise<Entry[] | ListEntry[]>;
     /**
      * Get a single entry by slug
      * Returns null if entry is not found (404)
@@ -580,4 +609,4 @@ declare class MarvinClient {
     getResourceEntries(slug: string): Promise<string[]>;
 }
 
-export { Collection as C, Entry as E, type MarvinConfig as M, type PaginatedResponse as P, Resource as R, Workspace as W, MarvinClient as a, MarvinApiError as b, MarvinAuthError as c, MarvinCache as d, MarvinConfigError as e, MarvinError as f, MarvinNetworkError as g, MarvinNotFoundError as h, MarvinServerError as i, MarvinValidationError as j, type PaginationMeta as k, type PaginationParams as l, createConfigFromEnv as m, createPaginatedResponse as n, extractData as o, isPaginatedResponse as p, offsetToPage as q, pageToOffset as r };
+export { Collection as C, Entry as E, type MarvinConfig as M, type PaginatedResponse as P, Resource as R, Workspace as W, MarvinClient as a, MarvinApiError as b, MarvinAuthError as c, MarvinCache as d, MarvinConfigError as e, MarvinError as f, MarvinNetworkError as g, MarvinNotFoundError as h, MarvinServerError as i, MarvinValidationError as j, type PaginationMeta as k, type PaginationParams as l, createConfigFromEnv as m, createPaginatedResponse as n, extractData as o, isFullEntryData as p, isPaginatedResponse as q, offsetToPage as r, pageToOffset as s };

package/dist/{marvin-Cndwz82G.d.ts → marvin-gZtGa576.d.cts}

@@ -1,5 +1,5 @@
-import { q as PublishedEntryType, l as MarvinResource, M as MarvinAsset, g as MarvinCollection, a as CollectionEntry, n as PublishedCollectionSummary, h as MarvinEntry, E as EntryAsset, c as EntryCollectionContext, d as EntryResource, L as ListEntry, m as MarvinSite, f as GetResourcesOptions$1 } from './index-CX4jvPAA.js';
-import { H as HttpClient } from './HttpClient-B_rEmJuO.js';
+import { s as PublishedEntryType, n as MarvinResource, M as MarvinAsset, h as MarvinCollection, a as CollectionEntry, j as MarvinEntry, E as EntryAsset, c as EntryCollectionContext, d as EntryResource, p as PublishedCollectionSummary, e as ExpandOptions, L as ListEntry, o as MarvinSite, g as GetResourcesOptions$1 } from './index-BEEbnrXV.cjs';
+import { H as HttpClient, a as BinaryResponse } from './HttpClient-DXMNOPqu.cjs';
 
 /**
  * Marvin SDK Configuration
@@ -274,6 +274,11 @@ declare class AssetsModule {
      * Get a single published asset by slug or ID
      */
     get(slugOrId: string): Promise<MarvinAsset>;
+    /**
+     * Download a published asset's file by slug: its bytes and content type. The file route
+     * redirects to storage; the redirect is followed. Needs the `read:assets` permission.
+     */
+    download(slug: string): Promise<BinaryResponse>;
     /**
      * Convenience: Get all images
      */
@@ -316,42 +321,15 @@ declare class Collection {
 }
 
 /**
- * Collections Module - Manage collections
+ * Entry - Rich object representing a single entry
  */
 
-declare class CollectionsModule {
-    private http;
-    private workspaceSlug;
-    constructor(http: MarvinHttpClient, workspaceSlug: string);
-    /**
-     * Get all collections
-     */
-    list(): Promise<PublishedCollectionSummary[]>;
-    /**
-     * Get a single collection by slug.
-     * Returns an empty array if the collection is not found (404).
-     */
-    get(slug: string): Promise<Collection | []>;
-    /**
-     * Get entries in a collection with junction context surfaced directly.
-     * Each entry has role/position/junctionMetadata from this collection's junction,
-     * and collections reduced to slugs of other memberships.
-     * Returns empty array if collection is not found.
-     */
-    entries(slug: string): Promise<CollectionEntry[]>;
-    /**
-     * Try multiple collection slugs in fallback order.
-     * Returns entries from the first collection that exists and has entries.
-     */
-    fallback(slugs: string[], options?: {
-        requireEntries?: boolean;
-    }): Promise<CollectionEntry[]>;
-}
-
 /**
- * Entry - Rich object representing a single entry
+ * True for a full entry as the API sends it (`PublishedEntryRead`): `assets[]` placements and no
+ * `assetSlugs`/`resourceSlugs`. A list item (`PublishedEntryListItem`) has only the slugs. Lets an
+ * `expand: 'full'` read tell an expanded response from an older server's list items.
  */
-
+declare function isFullEntryData(raw: unknown): raw is MarvinEntry;
 declare class Entry {
     private raw;
     constructor(raw: MarvinEntry);
@@ -389,6 +367,46 @@ declare class Entry {
     toJSON(): MarvinEntry;
 }
 
+/**
+ * Collections Module - Manage collections
+ */
+
+declare class CollectionsModule {
+    private http;
+    private workspaceSlug;
+    constructor(http: MarvinHttpClient, workspaceSlug: string);
+    /**
+     * Get all collections
+     */
+    list(): Promise<PublishedCollectionSummary[]>;
+    /**
+     * Get a single collection by slug.
+     * Returns an empty array if the collection is not found (404).
+     */
+    get(slug: string): Promise<Collection | []>;
+    /**
+     * Get entries in a collection with junction context surfaced directly.
+     * Each entry has role/position/junctionMetadata from this collection's junction,
+     * and collections reduced to slugs of other memberships.
+     * Returns empty array if collection is not found.
+     *
+     * With `{ expand: 'full' }` the whole collection comes back as full entries in one request:
+     * `Entry` objects, the same as `entry(slug)` returns, each with its `order` in this collection
+     * and every membership under `collections`. A server without `expand` support (or a collection
+     * past the server's expand cap) returns list items instead; those come back as
+     * `CollectionEntry[]`, exactly as without the option, so check with `instanceof Entry`.
+     */
+    entries(slug: string): Promise<CollectionEntry[]>;
+    entries(slug: string, options?: ExpandOptions): Promise<Entry[] | CollectionEntry[]>;
+    /**
+     * Try multiple collection slugs in fallback order.
+     * Returns entries from the first collection that exists and has entries.
+     */
+    fallback(slugs: string[], options?: {
+        requireEntries?: boolean;
+    }): Promise<CollectionEntry[]>;
+}
+
 /**
  * Entries Module - Manage entries
  */
@@ -396,6 +414,12 @@ declare class Entry {
 interface GetEntriesOptions {
     entryType?: string;
     collection?: string;
+    /** Only entries carrying any of these tag slugs. */
+    tag?: string | string[];
+    /** Only entries with these slugs. */
+    slug?: string | string[];
+    /** Only entries updated at or after this time (ISO 8601, or a Date). */
+    updatedSince?: string | Date;
     limit?: number;
     offset?: number;
     status?: string;
@@ -406,8 +430,13 @@ declare class EntriesModule {
     constructor(http: MarvinHttpClient, workspaceSlug: string);
     /**
      * Get all published entries
+     *
+     * With `{ expand: 'full' }` each entry on the page comes back as a full `Entry` (the
+     * single-entry read), so no per-entry reads are needed. A server without `expand` support
+     * returns list items instead; those come back as `ListEntry[]`, as without the option.
      */
     list(options?: GetEntriesOptions): Promise<ListEntry[]>;
+    list(options: GetEntriesOptions & ExpandOptions): Promise<Entry[] | ListEntry[]>;
     /**
      * Get a single entry by slug
      * Returns null if entry is not found (404)
@@ -580,4 +609,4 @@ declare class MarvinClient {
     getResourceEntries(slug: string): Promise<string[]>;
 }
 
-export { Collection as C, Entry as E, type MarvinConfig as M, type PaginatedResponse as P, Resource as R, Workspace as W, MarvinClient as a, MarvinApiError as b, MarvinAuthError as c, MarvinCache as d, MarvinConfigError as e, MarvinError as f, MarvinNetworkError as g, MarvinNotFoundError as h, MarvinServerError as i, MarvinValidationError as j, type PaginationMeta as k, type PaginationParams as l, createConfigFromEnv as m, createPaginatedResponse as n, extractData as o, isPaginatedResponse as p, offsetToPage as q, pageToOffset as r };
+export { Collection as C, Entry as E, type MarvinConfig as M, type PaginatedResponse as P, Resource as R, Workspace as W, MarvinClient as a, MarvinApiError as b, MarvinAuthError as c, MarvinCache as d, MarvinConfigError as e, MarvinError as f, MarvinNetworkError as g, MarvinNotFoundError as h, MarvinServerError as i, MarvinValidationError as j, type PaginationMeta as k, type PaginationParams as l, createConfigFromEnv as m, createPaginatedResponse as n, extractData as o, isFullEntryData as p, isPaginatedResponse as q, offsetToPage as r, pageToOffset as s };