@inneropen/marvin-sdk 3.1.0 → 3.2.0-next.10

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-L4LJWRA7.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,25 +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;
-      }
-      asset(role) {
-        return this.raw.assets.find((a) => a.role === role);
-      }
-      assetsByRole(role) {
-        return this.raw.assets.filter((a) => a.role === role);
-      }
-      resource(role) {
-        return this.raw.resources.find((r) => r.role === role);
-      }
-      resourcesByRole(role) {
-        return this.raw.resources.filter((r) => r.role === role);
+        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];
@@ -237,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;
@@ -289,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"() {
@@ -314,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
@@ -377,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 {
@@ -387,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;
@@ -542,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);
       }
     };
   }
@@ -809,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();