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

package/dist/{chunk-WJC4X7TB.js → chunk-SVH7AMMY.js}

@@ -270,7 +270,7 @@ var init_HttpClient = __esm({
         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, {
@@ -284,7 +284,7 @@ var init_HttpClient = __esm({
           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) {
@@ -294,7 +294,7 @@ var init_HttpClient = __esm({
             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}` : ""
               );
             }
@@ -304,7 +304,7 @@ var init_HttpClient = __esm({
               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);
@@ -343,7 +343,7 @@ var init_HttpClient = __esm({
           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) {
@@ -357,7 +357,7 @@ var init_HttpClient = __esm({
               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);

package/dist/{chunk-R3EZI43S.js → chunk-YHBF2SB3.js}

@@ -7,7 +7,7 @@ import {
   __export,
   init_core,
   init_errors
-} from "./chunk-WJC4X7TB.js";
+} from "./chunk-SVH7AMMY.js";
 
 // src/client/config.ts
 var config_exports = {};
@@ -173,13 +173,22 @@ var init_entry = __esm({
         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];
@@ -225,8 +234,33 @@ var init_collection = __esm({
       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;
@@ -277,6 +311,16 @@ var init_resource = __esm({
 });
 
 // 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;
 var init_entries = __esm({
   "src/entries/entries.ts"() {
@@ -302,7 +346,7 @@ var init_entries = __esm({
         });
         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
@@ -365,8 +409,8 @@ var init_collections = __esm({
         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 {
@@ -375,32 +419,34 @@ var init_collections = __esm({
           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;
@@ -530,7 +576,8 @@ var init_renderers = __esm({
       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);
       }
     };
   }
@@ -797,7 +844,7 @@ var init_marvin = __esm({
        */
       async getCollection(slug) {
         const collection = await this.workspace.collections.get(slug);
-        if (!collection) {
+        if (Array.isArray(collection)) {
           return null;
         }
         return collection.toJSON();

package/dist/{index-D4PQGrOK.d.cts → index-BVm5dIcw.d.cts}

@@ -250,10 +250,6 @@ interface components {
             role?: string | null;
             /** Position */
             position?: number | null;
-            /** Caption */
-            caption?: string | null;
-            /** Focal Point */
-            focal_point?: string | null;
             /** Metadata */
             metadata?: {
                 [key: string]: unknown;
@@ -306,8 +302,8 @@ interface components {
             publicUrl?: string | null;
             /** Description */
             description?: string | null;
-            /** Metadata */
-            metadata_?: {
+            /** Metadatajson */
+            metadataJson?: {
                 [key: string]: unknown;
             } | null;
             /**
@@ -411,6 +407,20 @@ interface components {
             /** Isuptodate */
             isUpToDate: boolean;
         };
+        /** CollectionAttachment */
+        CollectionAttachment: {
+            /**
+             * Collection Id
+             * Format: uuid4
+             */
+            collection_id: string;
+            /** Role */
+            role?: string | null;
+            /** Metadata */
+            metadata?: {
+                [key: string]: unknown;
+            } | null;
+        };
         /**
          * CollectionCreate
          * @description Schema for creating a new collection.
@@ -744,10 +754,6 @@ interface components {
              * @default 0
              */
             position: number;
-            /** Focalpoint */
-            focalPoint?: string | null;
-            /** Caption */
-            caption?: string | null;
             /** Placementmetadata */
             placementMetadata?: {
                 [key: string]: unknown;
@@ -794,8 +800,8 @@ interface components {
             publicUrl?: string | null;
             /** Description */
             description?: string | null;
-            /** Metadata */
-            metadata_?: {
+            /** Metadatajson */
+            metadataJson?: {
                 [key: string]: unknown;
             } | null;
             /**
@@ -804,6 +810,36 @@ interface components {
              */
             uploadedBy: string;
         };
+        /**
+         * EntryCollectionRead
+         * @description Collection summary with entry-specific placement details.
+         */
+        EntryCollectionRead: {
+            /**
+             * Id
+             * Format: uuid4
+             */
+            id: string;
+            /** Name */
+            name: string;
+            /** Slug */
+            slug: string;
+            /** Icon */
+            icon?: string | null;
+            /** Color */
+            color?: string | null;
+            /** Role */
+            role?: string | null;
+            /** Placementmetadata */
+            placementMetadata?: {
+                [key: string]: unknown;
+            } | null;
+            /**
+             * Sortorder
+             * @default 0
+             */
+            sortOrder: number;
+        };
         /**
          * EntryCreate
          * @description Schema for creating an entry.
@@ -852,6 +888,8 @@ interface components {
             } | null;
             /** Collectionids */
             collectionIds?: string[] | null;
+            /** Collectionattachments */
+            collectionAttachments?: components["schemas"]["CollectionAttachment"][] | null;
             /** Assetids */
             assetIds?: string[] | null;
             /** Resourceids */
@@ -947,7 +985,7 @@ interface components {
              * Collections
              * @default []
              */
-            collections: string[];
+            collections: components["schemas"]["EntryCollectionRead"][];
             /** Order */
             order?: number | null;
         };
@@ -958,10 +996,6 @@ interface components {
         EntryResourceRead: {
             /** Role */
             role?: string | null;
-            /** Quantity */
-            quantity?: string | null;
-            /** Unit */
-            unit?: string | null;
             /**
              * Position
              * @default 0
@@ -1225,6 +1259,8 @@ interface components {
             } | null;
             /** Collection Ids */
             collection_ids?: string[] | null;
+            /** Collection Attachments */
+            collection_attachments?: components["schemas"]["CollectionAttachment"][] | null;
             /** Asset Ids */
             asset_ids?: string[] | null;
             /** Resource Ids */
@@ -2226,6 +2262,8 @@ interface components {
             slug: string;
             /** Name */
             name: string;
+            /** Description */
+            description?: string | null;
             /** Metadatajson */
             metadataJson?: {
                 [key: string]: unknown;
@@ -2263,16 +2301,30 @@ interface components {
              * @default 0
              */
             position: number;
-            /** Focalpoint */
-            focalPoint?: string | null;
-            /** Caption */
-            caption?: string | null;
             /** Metadatajson */
             metadataJson?: {
                 [key: string]: unknown;
             } | null;
             asset: components["schemas"]["PublishedAssetRead"];
         };
+        /**
+         * PublishedEntryCollection
+         * @description A collection as used by a specific entry — relationship context + collection data.
+         */
+        PublishedEntryCollection: {
+            /** Role */
+            role?: string | null;
+            /**
+             * Position
+             * @default 0
+             */
+            position: number;
+            /** Metadatajson */
+            metadataJson?: {
+                [key: string]: unknown;
+            } | null;
+            collection: components["schemas"]["PublishedCollectionSummary"];
+        };
         /**
          * PublishedEntryListItem
          * @description Minimal entry schema for list responses.
@@ -2298,7 +2350,7 @@ interface components {
              * Collections
              * @default []
              */
-            collections: string[];
+            collections: components["schemas"]["PublishedEntryCollection"][];
             /**
              * Assetslugs
              * @default []
@@ -2351,7 +2403,7 @@ interface components {
              * Collections
              * @default []
              */
-            collections: components["schemas"]["PublishedCollectionSummary"][];
+            collections: components["schemas"]["PublishedEntryCollection"][];
             /**
              * Resources
              * @default []
@@ -2372,10 +2424,6 @@ interface components {
         PublishedEntryResource: {
             /** Role */
             role?: string | null;
-            /** Quantity */
-            quantity?: string | null;
-            /** Unit */
-            unit?: string | null;
             /**
              * Position
              * @default 0
@@ -2533,10 +2581,6 @@ interface components {
             resource_id: string;
             /** Role */
             role?: string | null;
-            /** Quantity */
-            quantity?: string | null;
-            /** Unit */
-            unit?: string | null;
             /** Position */
             position?: number | null;
             /** Metadata */
@@ -2588,8 +2632,8 @@ interface components {
             url?: string | null;
             /** Externalid */
             externalId?: string | null;
-            /** Metadata */
-            metadata?: {
+            /** Metadatajson */
+            metadataJson?: {
                 [key: string]: unknown;
             } | null;
             /**
@@ -2889,6 +2933,18 @@ interface components {
              */
             unlocked: number;
         };
+        /**
+         * UpdateEntryCollectionRequest
+         * @description Schema for updating junction fields on an entry-collection relationship.
+         */
+        UpdateEntryCollectionRequest: {
+            /** Role */
+            role?: string | null;
+            /** Metadatajson */
+            metadataJson?: {
+                [key: string]: unknown;
+            } | null;
+        };
         /**
          * UserCreate
          * @description Schema for creating a new user.
@@ -3445,15 +3501,74 @@ type MarvinEntryListItem = components['schemas']['PublishedEntryListItem'];
 type PublishedEntryType = components['schemas']['PublishedEntryTypeRead'];
 type MarvinCollection = components['schemas']['PublishedCollectionRead'];
 type PublishedCollectionSummary = components['schemas']['PublishedCollectionSummary'];
+type PublishedEntryCollection = components['schemas']['PublishedEntryCollection'];
 type MarvinAsset = components['schemas']['PublishedAssetRead'];
 type PublishedAssetRead = components['schemas']['PublishedAssetRead'];
 type PublishedEntryAsset = components['schemas']['PublishedEntryAsset'];
 type MarvinResource = components['schemas']['PublishedResourceSummary'];
+type PublishedResourceSummary = components['schemas']['PublishedResourceSummary'];
 type PublishedEntryResource = components['schemas']['PublishedEntryResource'];
 type AssetAttachment = components['schemas']['AssetAttachment'];
+type CollectionAttachment = components['schemas']['CollectionAttachment'];
 type ResourceAttachment = components['schemas']['ResourceAttachment'];
-type EntryResourceRead = components['schemas']['EntryResourceRead'];
+type EntryCollectionRead = components['schemas']['EntryCollectionRead'];
 type MarvinEntryType = components['schemas']['EntryTypeRead'];
+/** Entry-specific relationship data within a collection */
+interface CollectionEntryMetadata {
+    role: string | null;
+    position: number;
+    metadataJson: Record<string, unknown> | null;
+}
+/** The collection context when an entry is fetched through a specific collection */
+interface CollectionContext {
+    slug: string;
+    name: string;
+    description?: string | null;
+    metadataJson?: Record<string, unknown> | null;
+    /** This entry's relationship to the collection (role, position, junction metadata) */
+    entryMetadata: CollectionEntryMetadata;
+}
+/**
+ * An entry as returned when fetched through a specific collection.
+ * - `collection`: the collection you queried through, with its junction context
+ * - `collectionSlugs`: slugs of other collections this entry also belongs to
+ */
+interface CollectionEntry extends Omit<MarvinEntryListItem, 'collections'> {
+    collection: CollectionContext;
+    /** All collection slugs this entry belongs to, including the one queried through */
+    collectionSlugs: string[];
+}
+/**
+ * A collection membership as it appears on an entry.
+ * - `collection`: the collection's own fields (slug, name, description, metadataJson, sortOrder)
+ * - `entryMetadata`: the entry's relationship to this collection (role, position, metadataJson)
+ */
+interface EntryCollectionContext {
+    collection: PublishedCollectionSummary;
+    entryMetadata: CollectionEntryMetadata;
+}
+/**
+ * An entry as returned from the general entries list.
+ * Same as MarvinEntryListItem but with collections transformed to EntryCollectionContext[]
+ * so the entryMetadata naming convention is consistent across all entry contexts.
+ */
+interface ListEntry extends Omit<MarvinEntryListItem, 'collections'> {
+    collections: EntryCollectionContext[];
+}
+/**
+ * An asset as it appears on an entry — includes the asset's own fields
+ * plus `entryMetadata` for the entry's relationship to this asset.
+ */
+interface EntryAsset extends PublishedAssetRead {
+    entryMetadata: CollectionEntryMetadata;
+}
+/**
+ * A resource as it appears on an entry — includes the resource's own fields
+ * plus `entryMetadata` for the entry's relationship to this resource.
+ */
+interface EntryResource extends PublishedResourceSummary {
+    entryMetadata: CollectionEntryMetadata;
+}
 interface AssetUploadRequest {
     slug: string;
     name: string;
@@ -3496,4 +3611,4 @@ interface AuthToken {
     tokenType: string;
 }
 
-export type { AuthToken as A, EntryResourceRead as E, GetAssetsOptions as G, MarvinAsset as M, PublishedAssetRead as P, ResourceAttachment as R, SiteConfiguration as S, WorkspaceInfo as W, GetEntriesOptions as a, GetResourcesOptions as b, MarvinCollection as c, MarvinEntry as d, MarvinEntryListItem as e, MarvinEntryType as f, MarvinPublishResponse as g, MarvinResource as h, MarvinSite as i, PublishedCollectionSummary as j, PublishedEntryAsset as k, PublishedEntryResource as l, PublishedEntryType as m, components as n, AssetAttachment as o, AssetUploadRequest as p, MarvinClientConfig as q };
+export type { AuthToken as A, CollectionContext as C, EntryAsset as E, GetAssetsOptions as G, ListEntry as L, MarvinAsset as M, PublishedAssetRead as P, ResourceAttachment as R, SiteConfiguration as S, WorkspaceInfo as W, CollectionEntry as a, CollectionEntryMetadata as b, EntryCollectionContext as c, EntryResource as d, GetEntriesOptions as e, GetResourcesOptions as f, MarvinCollection as g, MarvinEntry as h, MarvinEntryListItem as i, MarvinEntryType as j, MarvinPublishResponse as k, MarvinResource as l, MarvinSite as m, PublishedCollectionSummary as n, PublishedEntryAsset as o, PublishedEntryResource as p, PublishedEntryType as q, components as r, AssetAttachment as s, AssetUploadRequest as t, CollectionAttachment as u, EntryCollectionRead as v, MarvinClientConfig as w, PublishedEntryCollection as x, PublishedResourceSummary as y };