@inneropen/marvin-sdk 3.2.0-next.1 → 3.2.0-next.11

package/dist/publish.cjs

@@ -410,7 +410,7 @@ var HttpClient = class {
     const timeoutId = setTimeout(() => controller.abort(), this.timeout);
     const startTime = Date.now();
     if (this.debug) {
-      this.logger.log(`[Marvin] ${method} ${url}`);
+      this.logger.log(`[Marvin SDK] ${method} ${url}`);
     }
     try {
       const response = await fetch(url, {
@@ -424,7 +424,7 @@ var HttpClient = class {
       const duration = Date.now() - startTime;
       if (this.debug) {
         this.logger.log(
-          `[Marvin] ${response.status} ${response.statusText} (${duration}ms)`
+          `[Marvin SDK] ${response.status} ${response.statusText} (${duration}ms)`
         );
       }
       if (response.status === 401 && this.auth.handleUnauthorized) {
@@ -434,7 +434,7 @@ var HttpClient = class {
         const errorText = await response.text().catch(() => "");
         if (this.debug) {
           this.logger.error(
-            `[Marvin] Error response: ${response.status} ${response.statusText}`,
+            `[Marvin SDK] Error response: ${response.status} ${response.statusText}`,
             errorText ? `Body: ${errorText}` : ""
           );
         }
@@ -444,7 +444,7 @@ var HttpClient = class {
           const delay = this.calculateRetryDelay(retryAttempt);
           if (this.debug) {
             this.logger.warn(
-              `[Marvin] Retry ${retryAttempt + 1}/${this.retryConfig.maxRetries} after ${delay}ms (status: ${response.status})`
+              `[Marvin SDK] Retry ${retryAttempt + 1}/${this.retryConfig.maxRetries} after ${delay}ms (status: ${response.status})`
             );
           }
           await this.sleep(delay);
@@ -483,7 +483,7 @@ var HttpClient = class {
       const data = await response.json();
       if (this.debug) {
         const sanitized = this.sanitizeForLogging(data);
-        this.logger.log("[Marvin] Response:", JSON.stringify(sanitized, null, 2));
+        this.logger.log("[Marvin SDK] Response:", JSON.stringify(sanitized, null, 2));
       }
       return data;
     } catch (error) {
@@ -497,7 +497,7 @@ var HttpClient = class {
           const delay = this.calculateRetryDelay(retryAttempt);
           if (this.debug) {
             this.logger.warn(
-              `[Marvin] Retry ${retryAttempt + 1}/${this.retryConfig.maxRetries} after ${delay}ms (network error)`
+              `[Marvin SDK] Retry ${retryAttempt + 1}/${this.retryConfig.maxRetries} after ${delay}ms (network error)`
             );
           }
           await this.sleep(delay);
@@ -756,13 +756,22 @@ var Entry = class {
     return this.raw.order;
   }
   get assets() {
-    return this.raw.assets;
+    return (this.raw.assets ?? []).map(({ asset, role, position, metadataJson }) => ({
+      ...asset,
+      entryMetadata: { role: role ?? null, position, metadataJson: metadataJson ?? null }
+    }));
   }
   get collections() {
-    return this.raw.collections;
+    return (this.raw.collections ?? []).map(({ collection, role, position, metadataJson }) => ({
+      collection,
+      entryMetadata: { role: role ?? null, position, metadataJson: metadataJson ?? null }
+    }));
   }
   get resources() {
-    return this.raw.resources;
+    return (this.raw.resources ?? []).map(({ resource, role, position, metadataJson }) => ({
+      ...resource,
+      entryMetadata: { role: role ?? null, position, metadataJson: metadataJson ?? null }
+    }));
   }
   field(key) {
     return this.raw.data[key];
@@ -776,6 +785,16 @@ var Entry = class {
 };
 
 // src/entries/entries.ts
+function toListEntry(raw) {
+  const { collections, ...rest } = raw;
+  return {
+    ...rest,
+    collections: (collections ?? []).map(({ collection, role, position, metadataJson }) => ({
+      collection,
+      entryMetadata: { role: role ?? null, position, metadataJson: metadataJson ?? null }
+    }))
+  };
+}
 var EntriesModule = class {
   constructor(http, workspaceSlug) {
     this.http = http;
@@ -795,7 +814,7 @@ var EntriesModule = class {
     });
     const endpoint = `/api/publish/${this.workspaceSlug}/entries${queryString}`;
     const response = await this.http.fetch(endpoint);
-    return response.data || [];
+    return (response.data || []).map(toListEntry);
   }
   /**
    * Get a single entry by slug
@@ -860,8 +879,33 @@ var Collection = class {
   get entryCount() {
     return this.data.entryCount;
   }
+  /**
+   * Entries with junction context for this collection surfaced directly.
+   * - role, position, junctionMetadata: from this collection's junction record
+   * - collections: slugs of other collections the entry belongs to
+   */
   get entries() {
-    return this.data.entries;
+    return this.data.entries.map((entry) => {
+      const { collections, ...rest } = entry;
+      const junction = collections.find((ec) => ec.collection.slug === this.data.slug);
+      const entryMetadata = {
+        role: junction?.role ?? null,
+        position: junction?.position ?? 0,
+        metadataJson: junction?.metadataJson ?? null
+      };
+      const collection = {
+        slug: this.data.slug,
+        name: this.data.name,
+        description: this.data.description,
+        metadataJson: this.data.metadataJson,
+        entryMetadata
+      };
+      return {
+        ...rest,
+        collection,
+        collectionSlugs: collections.map((ec) => ec.collection.slug)
+      };
+    });
   }
   toJSON() {
     return this.data;
@@ -885,8 +929,8 @@ var CollectionsModule = class {
     return response.data || [];
   }
   /**
-   * Get a single collection by slug
-   * Returns null if collection is not found (404)
+   * Get a single collection by slug.
+   * Returns an empty array if the collection is not found (404).
    */
   async get(slug) {
     try {
@@ -895,32 +939,34 @@ var CollectionsModule = class {
       return new Collection(data);
     } catch (error) {
       if (error instanceof MarvinNotFoundError) {
-        return null;
+        return [];
       }
       throw error;
     }
   }
   /**
-   * Get entries in a collection
-   * Returns empty array if collection is not found
+   * 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 (!collection) {
-      return [];
+    if (Array.isArray(collection)) {
+      return collection;
     }
     return collection.entries;
   }
   /**
-   * Try multiple collection slugs in fallback order
-   * Returns the first collection that exists and has entries
+   * Try multiple collection slugs in fallback order.
+   * Returns entries from the first collection that exists and has entries.
    */
   async fallback(slugs, options = {}) {
     const { requireEntries = true } = options;
     for (const slug of slugs) {
       try {
         const collection = await this.get(slug);
-        if (!collection) {
+        if (Array.isArray(collection)) {
           continue;
         }
         const entries = collection.entries;
@@ -1066,7 +1112,8 @@ var RenderersModule = class {
   workspaceSlug;
   async list() {
     const endpoint = `/api/publish/${this.workspaceSlug}/entry-types`;
-    return this.http.fetch(endpoint);
+    const all = await this.http.fetch(endpoint);
+    return all.filter((et) => et.isRendered);
   }
 };
 
@@ -1282,7 +1329,7 @@ var MarvinClient = class {
    */
   async getCollection(slug) {
     const collection = await this.workspace.collections.get(slug);
-    if (!collection) {
+    if (Array.isArray(collection)) {
       return null;
     }
     return collection.toJSON();

package/dist/publish.d.cts

@@ -1,6 +1,6 @@
-import { M as MarvinConfig, a as MarvinClient } from './marvin-BLhk8ZKO.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-BLhk8ZKO.cjs';
-export { G as GetAssetsOptions, a as GetEntriesOptions, b as GetResourcesOptions, M as MarvinAsset, c as MarvinCollection, d as MarvinEntry, e as MarvinEntryListItem, f as MarvinEntryType, g as MarvinPublishResponse, h as MarvinResource, i as MarvinSite, P as PublishedAssetRead, j as PublishedCollectionSummary, k as PublishedEntryAsset, l as PublishedEntryResource, S as SiteConfiguration, W as WorkspaceInfo } from './index-D4PQGrOK.cjs';
+import { M as MarvinConfig, a as MarvinClient } from './marvin-RZZj02LS.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-RZZj02LS.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-BVm5dIcw.cjs';
 export { A as AuthStrategy, B as BearerTokenAuth, H as HttpClient, a as HttpClientConfig } from './HttpClient-CdF3IHM1.cjs';
 
 /**

package/dist/publish.d.ts

@@ -1,6 +1,6 @@
-import { M as MarvinConfig, a as MarvinClient } from './marvin-DWlYHd6f.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-DWlYHd6f.js';
-export { G as GetAssetsOptions, a as GetEntriesOptions, b as GetResourcesOptions, M as MarvinAsset, c as MarvinCollection, d as MarvinEntry, e as MarvinEntryListItem, f as MarvinEntryType, g as MarvinPublishResponse, h as MarvinResource, i as MarvinSite, P as PublishedAssetRead, j as PublishedCollectionSummary, k as PublishedEntryAsset, l as PublishedEntryResource, S as SiteConfiguration, W as WorkspaceInfo } from './index-D4PQGrOK.js';
+import { M as MarvinConfig, a as MarvinClient } from './marvin-BZ4meaB-.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-BZ4meaB-.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-BVm5dIcw.js';
 export { A as AuthStrategy, B as BearerTokenAuth, H as HttpClient, a as HttpClientConfig } from './HttpClient-CdF3IHM1.js';
 
 /**

package/dist/publish.js

@@ -12,7 +12,7 @@ import {
   init_marvin,
   init_resource,
   init_workspace
-} from "./chunk-R3EZI43S.js";
+} from "./chunk-YHBF2SB3.js";
 import {
   BearerTokenAuth,
   HttpClient,
@@ -32,7 +32,7 @@ import {
   isPaginatedResponse,
   offsetToPage,
   pageToOffset
-} from "./chunk-WJC4X7TB.js";
+} from "./chunk-SVH7AMMY.js";
 
 // src/publish.ts
 init_marvin();

package/dist/types/index.d.cts

@@ -1 +1 @@
-export { o as AssetAttachment, p as AssetUploadRequest, A as AuthToken, E as EntryResourceRead, G as GetAssetsOptions, a as GetEntriesOptions, b as GetResourcesOptions, M as MarvinAsset, q as MarvinClientConfig, c as MarvinCollection, d as MarvinEntry, e as MarvinEntryListItem, f as MarvinEntryType, g as MarvinPublishResponse, h as MarvinResource, i as MarvinSite, P as PublishedAssetRead, j as PublishedCollectionSummary, k as PublishedEntryAsset, l as PublishedEntryResource, m as PublishedEntryType, R as ResourceAttachment, S as SiteConfiguration, W as WorkspaceInfo } from '../index-D4PQGrOK.cjs';
+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, W as WorkspaceInfo } from '../index-BVm5dIcw.cjs';

package/dist/types/index.d.ts

@@ -1 +1 @@
-export { o as AssetAttachment, p as AssetUploadRequest, A as AuthToken, E as EntryResourceRead, G as GetAssetsOptions, a as GetEntriesOptions, b as GetResourcesOptions, M as MarvinAsset, q as MarvinClientConfig, c as MarvinCollection, d as MarvinEntry, e as MarvinEntryListItem, f as MarvinEntryType, g as MarvinPublishResponse, h as MarvinResource, i as MarvinSite, P as PublishedAssetRead, j as PublishedCollectionSummary, k as PublishedEntryAsset, l as PublishedEntryResource, m as PublishedEntryType, R as ResourceAttachment, S as SiteConfiguration, W as WorkspaceInfo } from '../index-D4PQGrOK.js';
+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, W as WorkspaceInfo } from '../index-BVm5dIcw.js';

package/package.json

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