@runwell/shopify-toolkit 0.14.3 → 0.15.0

package/lib/diff-baseline.js

@@ -26,10 +26,6 @@ export async function diffBaseline(flags) {
     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 });
@@ -45,6 +41,16 @@ export async function diffBaseline(flags) {
   const currentMan = loadBaselineManifest(currentRoot);
   const targetMan = loadBaselineManifest(targetRoot);
 
+  // Disclose actual resolution. Especially important when --baseline-path
+  // or config.baseline_path overrides the npm pin: the operator should see
+  // which versions are actually being compared, not just the pin strings.
+  const currentSource = describeSource(flags, config, currentRoot);
+  console.log(`current pin in config: ${currentPin}`);
+  console.log(`current resolved:      ${currentMan.name}@${currentMan.version} (${currentSource})`);
+  console.log(`target pin:            ${targetPin}`);
+  console.log(`target resolved:       ${targetMan.name}@${targetMan.version} (npm cache)`);
+  console.log('');
+
   // Compare owned files
   const currentFiles = enumerateOwned(currentMan);
   const targetFiles = enumerateOwned(targetMan);
@@ -129,3 +135,9 @@ function enumerateOwned(manifest) {
 function fileHash(p) {
   return crypto.createHash('sha1').update(fs.readFileSync(p)).digest('hex');
 }
+
+function describeSource(flags, config, resolvedRoot) {
+  if (flags && flags.baselinePath) return `--baseline-path ${flags.baselinePath}`;
+  if (config && config.baseline_path) return `config.baseline_path ${path.resolve(config.baseline_path)}`;
+  return `npm cache: ${resolvedRoot}`;
+}

package/lib/qa.js

@@ -19,7 +19,29 @@ import { loadConfig, loadModuleManifest, resolveVariant } from './config-loader.
    Caller can skip stages with --skip <name,name>.
 */
 
-const STAGES = ['validate-config', 'doctor', 'template-integrity', 'orphan-assets', 'theme-check'];
+const STAGES = ['validate-config', 'doctor', 'template-integrity', 'orphan-assets', 'brand-fields', 'theme-check'];
+
+/* Walk the toolkit modules tree and collect every {{brand.X}} reference.
+   Returns the set of unique X identifiers (e.g. 'primary', 'rain-forrest',
+   'support_email'). Used by the brand-fields QA stage to verify each
+   tenant config defines all referenced brand keys. */
+function collectBrandFieldReferences(modulesDir) {
+  const refs = new Set();
+  const re = /\{\{\s*brand\.([\w.-]+)\s*\}\}/g;
+  function walk(dir) {
+    if (!fs.existsSync(dir)) return;
+    for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+      const full = path.join(dir, entry.name);
+      if (entry.isDirectory()) { walk(full); continue; }
+      if (!/\.(liquid|css|js|json)$/.test(entry.name)) continue;
+      const content = fs.readFileSync(full, 'utf8');
+      let m;
+      while ((m = re.exec(content)) !== null) refs.add(m[1]);
+    }
+  }
+  walk(modulesDir);
+  return refs;
+}
 
 export async function qa(flags) {
   const targetDir = path.resolve(flags.target || process.cwd());
@@ -37,7 +59,7 @@ export async function qa(flags) {
 
   // Stage 1: validate-config
   if (!skip.has('validate-config')) {
-    console.log('1/5 validate-config');
+    console.log('1/6 validate-config');
     try {
       const { config } = loadConfig(flags.config || './runwell.config.json');
       if (!config.client) log('errors', 'validate-config', 'missing required field "client"');
@@ -60,7 +82,7 @@ export async function qa(flags) {
 
   // Stage 2: doctor (manifest drift)
   if (!skip.has('doctor')) {
-    console.log('2/5 doctor (manifest drift)');
+    console.log('2/6 doctor (manifest drift)');
     const manifestPath = path.join(targetDir, 'runwell-manifest.json');
     if (!fs.existsSync(manifestPath)) {
       log('errors', 'doctor', 'no runwell-manifest.json (run "runwell-shopify sync" first)');
@@ -81,7 +103,7 @@ export async function qa(flags) {
 
   // Stage 3: template-integrity (every section in templates/*.json must exist)
   if (!skip.has('template-integrity')) {
-    console.log('3/5 template-integrity');
+    console.log('3/6 template-integrity');
     const tmplDir = path.join(targetDir, 'templates');
     if (fs.existsSync(tmplDir)) {
       const jsons = fs.readdirSync(tmplDir).filter(f => f.endsWith('.json'));
@@ -124,7 +146,7 @@ export async function qa(flags) {
 
   // Stage 4: orphan-assets (runwell-* files in theme that aren't synced from any enabled module)
   if (!skip.has('orphan-assets')) {
-    console.log('4/5 orphan-assets');
+    console.log('4/6 orphan-assets');
     const manifestPath = path.join(targetDir, 'runwell-manifest.json');
     if (fs.existsSync(manifestPath)) {
       const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
@@ -148,9 +170,38 @@ export async function qa(flags) {
     console.log('');
   }
 
-  // Stage 5: theme-check via Shopify CLI (parse --output json for accuracy)
+  // Stage 5: brand-fields (every {{brand.X}} reference in toolkit modules must be defined in tenant config.brand)
+  if (!skip.has('brand-fields')) {
+    console.log('5/6 brand-fields');
+    try {
+      const { config } = loadConfig(flags.config || './runwell.config.json');
+      const brand = config.brand || {};
+      const refs = collectBrandFieldReferences(path.join(flags.toolkitRoot, 'modules'));
+      const missing = [];
+      for (const key of refs) {
+        const segments = key.split('.');
+        let val = brand;
+        for (const seg of segments) {
+          val = val == null ? undefined : val[seg];
+        }
+        if (val == null || val === '') missing.push(key);
+      }
+      if (missing.length === 0) {
+        log('info', 'brand-fields', `${refs.size} brand fields referenced; all defined`);
+      } else {
+        for (const key of missing) {
+          log('warnings', 'brand-fields', `brand.${key} is referenced by toolkit modules but missing in runwell.config.json brand block`);
+        }
+      }
+    } catch (err) {
+      log('warnings', 'brand-fields', `could not run check (${err.message})`);
+    }
+    console.log('');
+  }
+
+  // Stage 6: theme-check via Shopify CLI (parse --output json for accuracy)
   if (!skip.has('theme-check')) {
-    console.log('5/5 theme-check');
+    console.log('6/6 theme-check');
     await new Promise(resolve => {
       const proc = spawn('shopify', ['theme', 'check', '--path', targetDir, '--output', 'json'], {
         stdio: ['ignore', 'pipe', 'pipe']

package/modules/_shared/css-tokens/assets/runwell-tokens.css

@@ -2,6 +2,12 @@
    Generated from runwell.config.json brand vars. Every other module
    references these via var(--runwell-X). Do not hand-edit in client
    themes; re-run runwell-shopify sync to update.
+
+   --runwell-tertiary is the canonical brand-tertiary token; the
+   --runwell-rain-forrest alias is preserved for one minor cycle of
+   backwards compatibility and will be removed in 0.16.0. Tenants
+   should reference --runwell-tertiary going forward and define
+   brand.tertiary in runwell.config.json.
 */
 :root {
   --runwell-primary: {{brand.primary}};
@@ -10,5 +16,6 @@
   --runwell-oat: {{brand.oat}};
   --runwell-celadon: {{brand.celadon}};
   --runwell-blue: {{brand.blue}};
-  --runwell-rain-forrest: {{brand.rain-forrest}};
+  --runwell-tertiary: {{brand.tertiary}};
+  --runwell-rain-forrest: {{brand.tertiary}};
 }

package/modules/reviews/sections/runwell-pdp-reviews.liquid

@@ -48,8 +48,20 @@
         </ul>
       {%- else -%}
         <div class="runwell-reviews__empty">
-          {%- comment -%}brand.support_email is interpolated at sync time from runwell.config.json; falls back to Shopify admin shop.email if the brand var is unset.{%- endcomment -%}
-          {%- assign reply_to = '{{brand.support_email}}' | default: shop.email | default: shop.url -%}
+          {%- comment -%}
+            brand.support_email is interpolated at sync time from runwell.config.json.
+            If the tenant has not set it, the literal string '{{brand.support_email}}'
+            survives the sync and is detected at render time so we fall back to
+            shop.email (Shopify admin) and finally shop.url. Liquid's `default` only
+            triggers on blank, not on the unsubstituted-template literal, hence
+            the explicit contains check.
+          {%- endcomment -%}
+          {%- assign brand_email = '{{brand.support_email}}' -%}
+          {%- if brand_email == blank or brand_email contains '{{' -%}
+            {%- assign reply_to = shop.email | default: shop.url -%}
+          {%- else -%}
+            {%- assign reply_to = brand_email -%}
+          {%- endif -%}
           <p>No reviews on this one yet. If you have tried it, write us at <a href="mailto:{{ reply_to }}?subject=Review for {{ product.title | escape }}">{{ reply_to }}</a> and we will publish thoughtful reviews on the page.</p>
         </div>
       {%- endif -%}

package/package.json

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