@runwell/shopify-toolkit 0.12.0 → 0.13.1

package/lib/baseline.js

@@ -129,7 +129,7 @@ export async function syncBaseline({ baselineRoot, targetDir, config, dryRun, wr
   }
 }
 
-function applySettingsPatches(tenantSchema, patchDoc) {
+export function applySettingsPatches(tenantSchema, patchDoc) {
   // tenantSchema is an array of setting groups. patchDoc.patches is an array.
   const patches = patchDoc.patches || [];
   for (const patchGroup of patches) {
@@ -137,12 +137,20 @@ function applySettingsPatches(tenantSchema, patchDoc) {
     if (!existing) {
       tenantSchema.push(patchGroup);
     } else {
-      // Merge settings, skipping duplicates by id (or by content for header/paragraph)
-      const existingIds = new Set((existing.settings || []).map(s => s.id).filter(Boolean));
+      // Dedup by composite key: id when present, else (type, content) for
+      // header/paragraph entries, else full JSON. Without this, header and
+      // paragraph entries (no id) get re-appended every sync.
+      const keyOf = (s) =>
+        s.id ? `id:${s.id}` :
+        s.content !== undefined ? `${s.type}:content:${s.content}` :
+        `raw:${JSON.stringify(s)}`;
+      existing.settings = existing.settings || [];
+      const existingKeys = new Set(existing.settings.map(keyOf));
       for (const s of patchGroup.settings || []) {
-        if (s.id && existingIds.has(s.id)) continue;
-        existing.settings = existing.settings || [];
+        const key = keyOf(s);
+        if (existingKeys.has(key)) continue;
         existing.settings.push(s);
+        existingKeys.add(key);
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@runwell/shopify-toolkit",
-  "version": "0.12.0",
+  "version": "0.13.1",
   "description": "Reusable Shopify theme modules from Runwell. Replaces typically app-driven features (reviews, wishlist, urgency, FAQ, post-purchase upsell, exit popups, free-ship progress, sticky ATC, testimonials, badges, bundles) with native Liquid + JS + CSS that ship across multiple client themes via a config-driven sync CLI.",
   "type": "module",
   "main": "lib/index.js",
@@ -17,7 +17,7 @@
     "LICENSE"
   ],
   "scripts": {
-    "test": "node --test test/",
+    "test": "node --test 'test/**/*.test.js'",
     "lint": "echo 'todo: eslint config'",
     "release": "npm publish --access restricted"
   },