@rmdes/indiekit-endpoint-blogroll 1.0.13 → 1.0.14

package/lib/storage/blogs.js

@@ -272,39 +272,44 @@ export async function upsertBlog(application, data) {
     updatedAt: now,
   };
 
-  // Conditionally add microsub fields when present
-  if (data.source) setFields.source = data.source;
-  if (data.microsubFeedId) setFields.microsubFeedId = data.microsubFeedId;
-  if (data.microsubChannelId) setFields.microsubChannelId = data.microsubChannelId;
-  if (data.microsubChannelName) setFields.microsubChannelName = data.microsubChannelName;
+  // Conditionally add microsub/optional fields to $set when provided
+  if (data.source !== undefined) setFields.source = data.source;
+  if (data.microsubFeedId !== undefined) setFields.microsubFeedId = data.microsubFeedId;
+  if (data.microsubChannelId !== undefined) setFields.microsubChannelId = data.microsubChannelId;
+  if (data.microsubChannelName !== undefined) setFields.microsubChannelName = data.microsubChannelName;
   if (data.skipItemFetch !== undefined) setFields.skipItemFetch = data.skipItemFetch;
-  if (data.photo) setFields.photo = data.photo;
+  if (data.photo !== undefined) setFields.photo = data.photo;
   if (data.lastFetchAt !== undefined) setFields.lastFetchAt = data.lastFetchAt;
-  if (data.status) setFields.status = data.status;
+  if (data.status !== undefined) setFields.status = data.status;
+
+  // $setOnInsert only for fields NOT already in $set (avoids MongoDB path conflicts)
+  const insertDefaults = {
+    description: null,
+    tags: [],
+    author: null,
+    lastError: null,
+    itemCount: 0,
+    pinned: false,
+    hidden: false,
+    notes: null,
+    createdAt: now,
+  };
+
+  // Add defaults for optional fields only when they're NOT in $set
+  if (!("source" in setFields)) insertDefaults.source = null;
+  if (!("microsubFeedId" in setFields)) insertDefaults.microsubFeedId = null;
+  if (!("microsubChannelId" in setFields)) insertDefaults.microsubChannelId = null;
+  if (!("microsubChannelName" in setFields)) insertDefaults.microsubChannelName = null;
+  if (!("skipItemFetch" in setFields)) insertDefaults.skipItemFetch = false;
+  if (!("photo" in setFields)) insertDefaults.photo = null;
+  if (!("lastFetchAt" in setFields)) insertDefaults.lastFetchAt = null;
+  if (!("status" in setFields)) insertDefaults.status = "active";
 
   const result = await collection.updateOne(
     filter,
     {
       $set: setFields,
-      $setOnInsert: {
-        description: null,
-        tags: [],
-        photo: data.photo || null,
-        author: null,
-        status: data.status || "active",
-        lastFetchAt: data.lastFetchAt || null,
-        lastError: null,
-        itemCount: 0,
-        pinned: false,
-        hidden: false,
-        notes: null,
-        source: data.source || null,
-        microsubFeedId: data.microsubFeedId || null,
-        microsubChannelId: data.microsubChannelId || null,
-        microsubChannelName: data.microsubChannelName || null,
-        skipItemFetch: data.skipItemFetch || false,
-        createdAt: now,
-      },
+      $setOnInsert: insertDefaults,
     },
     { upsert: true }
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-blogroll",
-  "version": "1.0.13",
+  "version": "1.0.14",
   "description": "Blogroll endpoint for Indiekit. Aggregates blog feeds from OPML, JSON feeds, or manual entry.",
   "keywords": [
     "indiekit",