@inneropen/marvin-sdk 4.1.0 → 4.3.0

package/dist/publish.cjs

@@ -169,6 +169,7 @@ __export(publish_exports, {
   createMarvinClient: () => createMarvinClient,
   createPaginatedResponse: () => createPaginatedResponse,
   extractData: () => extractData,
+  isFullEntryData: () => isFullEntryData,
   isPaginatedResponse: () => isPaginatedResponse,
   offsetToPage: () => offsetToPage,
   pageToOffset: () => pageToOffset
@@ -523,6 +524,9 @@ var HttpClient = class _HttpClient {
         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);
@@ -568,12 +572,34 @@ var HttpClient = class _HttpClient {
       );
     }
   }
+  /** 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
    */
@@ -774,6 +800,12 @@ var MarvinHttpClient = class extends HttpClient {
 };
 
 // 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 = class {
   constructor(raw) {
     this.raw = raw;
@@ -840,6 +872,11 @@ var Entry = class {
 };
 
 // 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 {
@@ -857,19 +894,24 @@ var EntriesModule = class {
   }
   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
@@ -999,18 +1041,25 @@ var CollectionsModule = class {
       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.
@@ -1064,6 +1113,14 @@ var AssetsModule = class {
     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
    */
@@ -1449,6 +1506,7 @@ function createMarvinClient(config) {
   createMarvinClient,
   createPaginatedResponse,
   extractData,
+  isFullEntryData,
   isPaginatedResponse,
   offsetToPage,
   pageToOffset

package/dist/publish.d.cts

@@ -1,7 +1,7 @@
-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';
-export { G as GetAssetsOptions, e as GetEntriesOptions, f as GetResourcesOptions, 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, S as SiteConfiguration, W as WorkspaceInfo } from './index-CX4jvPAA.cjs';
-export { A as AuthStrategy, B as BearerTokenAuth, H as HttpClient, a as HttpClientConfig } from './HttpClient-B_rEmJuO.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';
+export { e as ExpandOptions, G as GetAssetsOptions, f as GetEntriesOptions, g as GetResourcesOptions, 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 SiteConfiguration, W as WorkspaceInfo } from './index-BEEbnrXV.cjs';
+export { A as AuthStrategy, B as BearerTokenAuth, H as HttpClient, b as HttpClientConfig } from './HttpClient-DXMNOPqu.cjs';
 
 /**
  * Publishing API Entry Point

package/dist/publish.d.ts

@@ -1,7 +1,7 @@
-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';
-export { G as GetAssetsOptions, e as GetEntriesOptions, f as GetResourcesOptions, 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, S as SiteConfiguration, W as WorkspaceInfo } from './index-CX4jvPAA.js';
-export { A as AuthStrategy, B as BearerTokenAuth, H as HttpClient, a as HttpClientConfig } from './HttpClient-B_rEmJuO.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';
+export { e as ExpandOptions, G as GetAssetsOptions, f as GetEntriesOptions, g as GetResourcesOptions, 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 SiteConfiguration, W as WorkspaceInfo } from './index-BEEbnrXV.js';
+export { A as AuthStrategy, B as BearerTokenAuth, H as HttpClient, b as HttpClientConfig } from './HttpClient-DXMNOPqu.js';
 
 /**
  * Publishing API Entry Point

package/dist/publish.js

@@ -11,8 +11,9 @@ import {
   init_entry,
   init_marvin,
   init_resource,
-  init_workspace
-} from "./chunk-VS6R3V3K.js";
+  init_workspace,
+  isFullEntryData
+} from "./chunk-KXI2FQSO.js";
 import {
   BearerTokenAuth,
   HttpClient,
@@ -32,7 +33,7 @@ import {
   isPaginatedResponse,
   offsetToPage,
   pageToOffset
-} from "./chunk-DSVYCVQD.js";
+} from "./chunk-LTX3MAUE.js";
 
 // src/publish.ts
 init_marvin();
@@ -69,6 +70,7 @@ export {
   createMarvinClient,
   createPaginatedResponse,
   extractData,
+  isFullEntryData,
   isPaginatedResponse,
   offsetToPage,
   pageToOffset

package/dist/types/index.d.cts

@@ -1 +1 @@
-export { s as AssetAttachment, t as AssetUploadRequest, A as AuthToken, u as CollectionAttachment, C as CollectionContext, a as CollectionEntry, b as CollectionEntryMetadata, E as EntryAsset, c as EntryCollectionContext, v as EntryCollectionRead, d as EntryResource, G as GetAssetsOptions, e as GetEntriesOptions, f as GetResourcesOptions, L as ListEntry, M as MarvinAsset, w as MarvinClientConfig, 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, x as PublishedEntryCollection, p as PublishedEntryResource, q as PublishedEntryType, y as PublishedResourceSummary, R as ResourceAttachment, S as SiteConfiguration, z as SiteSeo, B as SiteSeoVerification, W as WorkspaceInfo } from '../index-CX4jvPAA.cjs';
+export { u as AssetAttachment, v as AssetUploadRequest, A as AuthToken, w as CollectionAttachment, C as CollectionContext, a as CollectionEntry, b as CollectionEntryMetadata, E as EntryAsset, c as EntryCollectionContext, x as EntryCollectionRead, d as EntryResource, e as ExpandOptions, G as GetAssetsOptions, f as GetEntriesOptions, g as GetResourcesOptions, L as ListEntry, M as MarvinAsset, y as MarvinClientConfig, 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, z as PublishedEntryCollection, r as PublishedEntryResource, s as PublishedEntryType, B as PublishedResourceSummary, R as ResourceAttachment, S as SiteConfiguration, D as SiteSeo, F as SiteSeoVerification, W as WorkspaceInfo } from '../index-BEEbnrXV.cjs';

package/dist/types/index.d.ts

@@ -1 +1 @@
-export { s as AssetAttachment, t as AssetUploadRequest, A as AuthToken, u as CollectionAttachment, C as CollectionContext, a as CollectionEntry, b as CollectionEntryMetadata, E as EntryAsset, c as EntryCollectionContext, v as EntryCollectionRead, d as EntryResource, G as GetAssetsOptions, e as GetEntriesOptions, f as GetResourcesOptions, L as ListEntry, M as MarvinAsset, w as MarvinClientConfig, 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, x as PublishedEntryCollection, p as PublishedEntryResource, q as PublishedEntryType, y as PublishedResourceSummary, R as ResourceAttachment, S as SiteConfiguration, z as SiteSeo, B as SiteSeoVerification, W as WorkspaceInfo } from '../index-CX4jvPAA.js';
+export { u as AssetAttachment, v as AssetUploadRequest, A as AuthToken, w as CollectionAttachment, C as CollectionContext, a as CollectionEntry, b as CollectionEntryMetadata, E as EntryAsset, c as EntryCollectionContext, x as EntryCollectionRead, d as EntryResource, e as ExpandOptions, G as GetAssetsOptions, f as GetEntriesOptions, g as GetResourcesOptions, L as ListEntry, M as MarvinAsset, y as MarvinClientConfig, 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, z as PublishedEntryCollection, r as PublishedEntryResource, s as PublishedEntryType, B as PublishedResourceSummary, R as ResourceAttachment, S as SiteConfiguration, D as SiteSeo, F as SiteSeoVerification, W as WorkspaceInfo } from '../index-BEEbnrXV.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inneropen/marvin-sdk",
-  "version": "4.1.0",
+  "version": "4.3.0",
   "description": "Official TypeScript SDK for Marvin CMS",
   "type": "module",
   "main": "./dist/index.cjs",