mod-build 4.0.95-beta.1 → 4.0.96-beta.1

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 4.0.96
+
+- Added `resolveRefs()` to `get-default-trade-questions.js` to resolve JSON `$ref` placeholders, cutting down on repeated content in trade-questions config
+
 ## 4.0.95
 
 - Fix lazy-load HTML transform that treated `data-img-class="lazy"` as a `class="lazy"` match and rewrote `data-img-src` to `data-img-data-src`; now only real `class`, `src`, `srcset`, and `href` attributes are affected

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "mod-build",
-	"version": "4.0.95-beta.1",
+	"version": "4.0.96-beta.1",
 	"description": "Share components for S3 sites.",
 	"type": "module",
 	"scripts": {

package/tasks/get-default-trade-questions.js

@@ -2,6 +2,37 @@
 import merge from 'lodash.merge';
 import { defaultSettings } from '../src/data/config.js';
 
+function resolveRefs(value, root, refChain = new Set()) {
+	if (value === null || typeof value !== 'object') {
+		return value;
+	}
+
+	if (Array.isArray(value)) {
+		return value.map((item) => resolveRefs(item, root, refChain));
+	}
+
+	if (typeof value.$ref === 'string') {
+		if (refChain.has(value.$ref)) {
+			throw new Error(`Circular $ref detected: ${[...refChain, value.$ref].join(' -> ')}`);
+		}
+
+		const refValue = root[value.$ref];
+		if (!refValue || typeof refValue !== 'object') {
+			throw new Error(`Could not resolve $ref: ${value.$ref}`);
+		}
+
+		return resolveRefs(refValue, root, new Set(refChain).add(value.$ref));
+	}
+
+	const resolved = {};
+	for (const key in value) {
+		if (value.hasOwnProperty(key)) {
+			resolved[key] = resolveRefs(value[key], root, refChain);
+		}
+	}
+	return resolved;
+}
+
 function mergeDefaultTradeQuestionsConfigOnSteps(config, steps) {
 	if (!config || typeof config !== 'object') return;
 
@@ -204,7 +235,8 @@ export default async function(config) {
 							steps.OwnHome = commonQuestions.OwnHome;
 							steps.BuyTimeframe = commonQuestions.BuyTimeframe;
 
-							mergeDefaultTradeQuestionsConfigOnSteps(config, steps);
+							const resolvedSteps = resolveRefs(steps, steps);
+							mergeDefaultTradeQuestionsConfigOnSteps(config, resolvedSteps);
 							resolve();
 						})
 						.catch(error => {