@runwell/shopify-toolkit 0.11.0 → 0.13.1

package/bin/runwell-shopify

@@ -10,6 +10,7 @@ import { validate } from '../lib/validate.js';
 import { qa } from '../lib/qa.js';
 import { init } from '../lib/init.js';
 import { upgradeBaseline } from '../lib/upgrade-baseline.js';
+import { diffBaseline } from '../lib/diff-baseline.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -56,6 +57,9 @@ Commands:
                                   to override the default pin.
   upgrade-baseline <pkg@version>  Bump the baseline pin in runwell.config.json.
                                   Run "runwell-shopify sync" after to apply.
+  diff-baseline <pkg@version>     Compare the currently pinned baseline against
+                                  a target version. Lists files added, removed,
+                                  modified, plus patch deltas. Run before upgrade.
   help                            Show this help
 
 Common options:
@@ -99,6 +103,9 @@ flags.toolkitRoot = TOOLKIT_ROOT;
       case 'upgrade-baseline':
         await upgradeBaseline(flags);
         break;
+      case 'diff-baseline':
+        await diffBaseline(flags);
+        break;
       case undefined:
       case 'help':
       case '--help':

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/lib/diff-baseline.js

@@ -0,0 +1,131 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import crypto from 'node:crypto';
+import { loadConfig } from './config-loader.js';
+import { resolveBaseline, parseBaselinePin, loadBaselineManifest } from './baseline.js';
+
+/* runwell-shopify diff-baseline <pin>: compare the current pinned
+   baseline against a target version. Reports owned files added /
+   removed / modified plus patch file changes. Useful before running
+   upgrade-baseline so the operator sees what will change.
+*/
+
+export async function diffBaseline(flags) {
+  const targetPin = flags.positional && flags.positional[0];
+  if (!targetPin) {
+    console.error('Usage: runwell-shopify diff-baseline <package@version>');
+    console.error('Example: runwell-shopify diff-baseline @runwell/dawn-runwell@1.1.0');
+    process.exit(1);
+  }
+
+  const configPath = path.resolve(flags.config || './runwell.config.json');
+  const { config } = loadConfig(configPath);
+  const currentPin = config.baseline;
+  if (!currentPin) {
+    console.error('runwell.config.json has no "baseline" pin. Set one with runwell-shopify init or upgrade-baseline first.');
+    process.exit(1);
+  }
+
+  console.log(`current: ${currentPin}`);
+  console.log(`target:  ${targetPin}`);
+  console.log('');
+
+  // Resolve both versions
+  const currentRoot = resolveBaseline(flags, config);
+  const targetRoot = resolveBaseline({}, { baseline: targetPin });
+  if (!currentRoot) {
+    console.error(`Could not resolve current baseline ${currentPin}`);
+    process.exit(1);
+  }
+  if (!targetRoot) {
+    console.error(`Could not resolve target baseline ${targetPin}`);
+    process.exit(1);
+  }
+
+  const currentMan = loadBaselineManifest(currentRoot);
+  const targetMan = loadBaselineManifest(targetRoot);
+
+  // Compare owned files
+  const currentFiles = enumerateOwned(currentMan);
+  const targetFiles = enumerateOwned(targetMan);
+
+  const added = [...targetFiles].filter(f => !currentFiles.has(f));
+  const removed = [...currentFiles].filter(f => !targetFiles.has(f));
+  const common = [...targetFiles].filter(f => currentFiles.has(f));
+
+  const modified = [];
+  for (const rel of common) {
+    const a = path.join(currentRoot, rel);
+    const b = path.join(targetRoot, rel);
+    if (!fs.existsSync(a) || !fs.existsSync(b)) continue;
+    if (fileHash(a) !== fileHash(b)) modified.push(rel);
+  }
+
+  // Compare patches
+  const patchKeys = new Set([...Object.keys(currentMan.patches || {}), ...Object.keys(targetMan.patches || {})]);
+  const patchChanges = [];
+  for (const k of patchKeys) {
+    const cur = (currentMan.patches || {})[k];
+    const tgt = (targetMan.patches || {})[k];
+    if (!cur && tgt) patchChanges.push({ kind: 'added-patch', file: k });
+    else if (cur && !tgt) patchChanges.push({ kind: 'removed-patch', file: k });
+    else if (cur && tgt) {
+      const ca = path.join(currentRoot, cur);
+      const cb = path.join(targetRoot, tgt);
+      if (fs.existsSync(ca) && fs.existsSync(cb) && fileHash(ca) !== fileHash(cb)) {
+        patchChanges.push({ kind: 'modified-patch', file: k });
+      }
+    }
+  }
+
+  // Compatibility / metadata diff
+  const metaChanges = [];
+  if (currentMan.compatibility?.toolkit !== targetMan.compatibility?.toolkit) {
+    metaChanges.push(`toolkit compatibility: ${currentMan.compatibility?.toolkit || '(none)'} -> ${targetMan.compatibility?.toolkit || '(none)'}`);
+  }
+
+  // Print summary
+  console.log(`Owned files: ${added.length} added, ${removed.length} removed, ${modified.length} modified, ${common.length - modified.length} unchanged`);
+  console.log(`Patches:     ${patchChanges.length} changes`);
+  console.log('');
+  if (added.length) {
+    console.log('Added (will be created on sync):');
+    added.forEach(f => console.log(`  + ${f}`));
+    console.log('');
+  }
+  if (removed.length) {
+    console.log('Removed (will NOT be auto-deleted; manually clean if needed):');
+    removed.forEach(f => console.log(`  - ${f}`));
+    console.log('');
+  }
+  if (modified.length) {
+    console.log('Modified (sync will overwrite tenant theme dir):');
+    modified.forEach(f => console.log(`  ~ ${f}`));
+    console.log('');
+  }
+  if (patchChanges.length) {
+    console.log('Patch changes (sync will deep-merge):');
+    patchChanges.forEach(p => console.log(`  ${p.kind === 'added-patch' ? '+' : p.kind === 'removed-patch' ? '-' : '~'} ${p.file}`));
+    console.log('');
+  }
+  if (metaChanges.length) {
+    console.log('Metadata:');
+    metaChanges.forEach(m => console.log(`  ${m}`));
+    console.log('');
+  }
+
+  console.log(`Apply with: runwell-shopify upgrade-baseline ${targetPin} && runwell-shopify sync`);
+}
+
+function enumerateOwned(manifest) {
+  const out = new Set();
+  for (const [bucket, files] of Object.entries(manifest.files || {})) {
+    if (!Array.isArray(files)) continue;
+    for (const rel of files) out.add(`${bucket}/${rel}`);
+  }
+  return out;
+}
+
+function fileHash(p) {
+  return crypto.createHash('sha1').update(fs.readFileSync(p)).digest('hex');
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@runwell/shopify-toolkit",
-  "version": "0.11.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"
   },