@schalkneethling/miyagi-core 4.4.2 → 4.4.3

package/lib/mocks/resolve.js

@@ -9,35 +9,35 @@ import { extendTemplateData } from "../render/helpers.js";
  * @returns {Function}
  */
 function getMergeMethod(method) {
-	const methods = {
-		combine: (target, source, options) => {
-			const destination = target.slice();
-
-			source.forEach((item, index) => {
-				if (options.isMergeableObject(item)) {
-					if (typeof destination[index] === "undefined") {
-						destination[index] = options.cloneUnlessOtherwiseSpecified(
-							item,
-							options,
-						);
-					} else {
-						destination[index] = deepMerge(target[index], item, options);
-					}
-				} else {
-					destination[index] = options.cloneUnlessOtherwiseSpecified(
-						item,
-						options,
-					);
-				}
-			});
-
-			return destination;
-		},
-
-		overwrite: (destinationArray, sourceArray) => sourceArray,
-	};
-
-	return methods[method];
+  const methods = {
+    combine: (target, source, options) => {
+      const destination = target.slice();
+
+      source.forEach((item, index) => {
+        if (options.isMergeableObject(item)) {
+          if (typeof destination[index] === "undefined") {
+            destination[index] = options.cloneUnlessOtherwiseSpecified(
+              item,
+              options,
+            );
+          } else {
+            destination[index] = deepMerge(target[index], item, options);
+          }
+        } else {
+          destination[index] = options.cloneUnlessOtherwiseSpecified(
+            item,
+            options,
+          );
+        }
+      });
+
+      return destination;
+    },
+
+    overwrite: (destinationArray, sourceArray) => sourceArray,
+  };
+
+  return methods[method];
 }
 
 /**
@@ -47,27 +47,27 @@ function getMergeMethod(method) {
  * @returns {Promise<{ merged, resolved, messages }>} the resolved data object
  */
 export const resolveData = async function (data, component, rootData) {
-	const mergedWithGlobalData = mergeWithGlobalData(
-		rootData ? mergeRootDataWithVariationData(rootData, data) : data,
-	);
-	const { data: refsResolved, messages: refMessages } = await resolveRefs(
-		{ ...mergedWithGlobalData },
-		component,
-	);
-	const extended = await extendTemplateData(
-		global.config,
-		refsResolved,
-		component,
-	);
-	const { data: tplsResolved, messages: tplMessages } =
-		await resolveTpls(extended);
-	const resolved = overwriteRenderKey(tplsResolved);
-
-	return {
-		merged: mergedWithGlobalData,
-		resolved,
-		messages: [...refMessages, ...tplMessages],
-	};
+  const mergedWithGlobalData = mergeWithGlobalData(
+    rootData ? mergeRootDataWithVariationData(rootData, data) : data,
+  );
+  const { data: refsResolved, messages: refMessages } = await resolveRefs(
+    { ...mergedWithGlobalData },
+    component,
+  );
+  const extended = await extendTemplateData(
+    global.config,
+    refsResolved,
+    component,
+  );
+  const { data: tplsResolved, messages: tplMessages } =
+    await resolveTpls(extended);
+  const resolved = overwriteRenderKey(tplsResolved);
+
+  return {
+    merged: mergedWithGlobalData,
+    resolved,
+    messages: [...refMessages, ...tplMessages],
+  };
 };
 
 /**
@@ -75,69 +75,69 @@ export const resolveData = async function (data, component, rootData) {
  * @returns {object} the resolved data object
  */
 export const overwriteRenderKey = function (data) {
-	let o;
-
-	if (
-		["string", "number", "boolean"].includes(typeof data) ||
-		data instanceof Map
-	) {
-		return data;
-	}
-
-	if (Array.isArray(data)) {
-		for (let item of data) {
-			item = overwriteRenderKey(item);
-		}
-
-		return data;
-	}
-
-	if (data) {
-		o = { ...data };
-		const entries = Object.entries(o);
-
-		for (const [key, val] of entries) {
-			if (key === "$render") {
-				let str = "";
-
-				if (val) {
-					for (const html of val) {
-						str += html;
-					}
-				}
-
-				o = str;
-			} else {
-				if (
-					typeof val == "string" ||
-					typeof val === "number" ||
-					typeof val === "boolean" ||
-					val instanceof Map ||
-					val === null
-				) {
-					o[key] = val;
-				} else if (Array.isArray(val)) {
-					val.forEach((v, i) => {
-						if (
-							typeof v == "string" ||
-							typeof v === "number" ||
-							typeof v === "boolean" ||
-							v instanceof Map ||
-							v === null
-						) {
-							o[key][i] = v;
-						} else {
-							o[key][i] = overwriteRenderKey(v);
-						}
-					});
-				} else {
-					o[key] = overwriteRenderKey(val);
-				}
-			}
-		}
-	}
-
-	return o;
+  let o;
+
+  if (
+    ["string", "number", "boolean"].includes(typeof data) ||
+    data instanceof Map
+  ) {
+    return data;
+  }
+
+  if (Array.isArray(data)) {
+    for (let item of data) {
+      item = overwriteRenderKey(item);
+    }
+
+    return data;
+  }
+
+  if (data) {
+    o = { ...data };
+    const entries = Object.entries(o);
+
+    for (const [key, val] of entries) {
+      if (key === "$render") {
+        let str = "";
+
+        if (val) {
+          for (const html of val) {
+            str += html;
+          }
+        }
+
+        o = str;
+      } else {
+        if (
+          typeof val == "string" ||
+          typeof val === "number" ||
+          typeof val === "boolean" ||
+          val instanceof Map ||
+          val === null
+        ) {
+          o[key] = val;
+        } else if (Array.isArray(val)) {
+          val.forEach((v, i) => {
+            if (
+              typeof v == "string" ||
+              typeof v === "number" ||
+              typeof v === "boolean" ||
+              v instanceof Map ||
+              v === null
+            ) {
+              o[key][i] = v;
+            } else {
+              o[key][i] = overwriteRenderKey(v);
+            }
+          });
+        } else {
+          o[key] = overwriteRenderKey(val);
+        }
+      }
+    }
+  }
+
+  return o;
 };
 
 /**
@@ -146,38 +146,38 @@ export const overwriteRenderKey = function (data) {
  * @returns {object} the merged data
  */
 export const mergeRootDataWithVariationData = function (
-	rootData,
-	variationData,
+  rootData,
+  variationData,
 ) {
-	if (!rootData) {
-		return variationData;
-	}
+  if (!rootData) {
+    return variationData;
+  }
 
-	if (!variationData) {
-		return rootData;
-	}
+  if (!variationData) {
+    return rootData;
+  }
 
-	const merged = deepMerge(rootData, variationData, {
-		customMerge: (key) => {
-			const options = variationData.$opts || rootData.$opts;
+  const merged = deepMerge(rootData, variationData, {
+    customMerge: (key) => {
+      const options = variationData.$opts || rootData.$opts;
 
-			if (options) {
-				const option = options[key];
+      if (options) {
+        const option = options[key];
 
-				if (option) {
-					return getMergeMethod(option);
-				}
-			}
+        if (option) {
+          return getMergeMethod(option);
+        }
+      }
 
-			return undefined;
-		},
-	});
+      return undefined;
+    },
+  });
 
-	if (merged.$opts) {
-		delete merged.$opts;
-	}
+  if (merged.$opts) {
+    delete merged.$opts;
+  }
 
-	return merged;
+  return merged;
 };
 
 /**
@@ -185,21 +185,21 @@ export const mergeRootDataWithVariationData = function (
  * @returns {object} the merged data object
  */
 function mergeWithGlobalData(data) {
-	const defaultFile = helpers.getFullPathFromShortPath(
-		`${global.config.files.mocks.name}.${global.config.files.mocks.extension[0]}`,
-	);
-	const jsFile = helpers.getFullPathFromShortPath(
-		`${global.config.files.mocks.name}.${global.config.files.mocks.extension[1]}`,
-	);
-	const globalData = {
-		...(global.state.fileContents[defaultFile] ||
-			global.state.fileContents[jsFile]),
-	};
-
-	delete globalData.$defs;
-
-	return {
-		...globalData,
-		...data,
-	};
+  const defaultFile = helpers.getFullPathFromShortPath(
+    `${global.config.files.mocks.name}.${global.config.files.mocks.extension[0]}`,
+  );
+  const jsFile = helpers.getFullPathFromShortPath(
+    `${global.config.files.mocks.name}.${global.config.files.mocks.extension[1]}`,
+  );
+  const globalData = {
+    ...(global.state.fileContents[defaultFile] ||
+      global.state.fileContents[jsFile]),
+  };
+
+  delete globalData.$defs;
+
+  return {
+    ...globalData,
+    ...data,
+  };
 }

package/lib/render/helpers/resolve-assets.js

@@ -12,47 +12,37 @@
  * @returns {{ cssFiles: string[], jsFilesHead: object[], jsFilesBody: object[] }}
  */
 export default function resolveAssets(componentAssets) {
-	const { shared, isolateComponents, css, js } = global.config.assets;
+  const { shared, isolateComponents, css, js } = global.config.assets;
 
-	if (componentAssets) {
-		const mergedCss = [
-			...shared.css,
-			...(componentAssets.css || []),
-		];
-		const mergedJs = [
-			...shared.js,
-			...(componentAssets.js || []),
-		];
+  if (componentAssets) {
+    const mergedCss = [...shared.css, ...(componentAssets.css || [])];
+    const mergedJs = [...shared.js, ...(componentAssets.js || [])];
 
-		return {
-			cssFiles: mergedCss,
-			jsFilesHead: mergedJs.filter(
-				(entry) => entry.position === "head" || !entry.position,
-			),
-			jsFilesBody: mergedJs.filter(
-				(entry) => entry.position === "body",
-			),
-		};
-	}
+    return {
+      cssFiles: mergedCss,
+      jsFilesHead: mergedJs.filter(
+        (entry) => entry.position === "head" || !entry.position,
+      ),
+      jsFilesBody: mergedJs.filter((entry) => entry.position === "body"),
+    };
+  }
 
-	if (isolateComponents) {
-		return {
-			cssFiles: [...shared.css],
-			jsFilesHead: shared.js.filter(
-				(entry) => entry.position === "head" || !entry.position,
-			),
-			jsFilesBody: shared.js.filter(
-				(entry) => entry.position === "body",
-			),
-		};
-	}
+  if (isolateComponents) {
+    return {
+      cssFiles: [...shared.css],
+      jsFilesHead: shared.js.filter(
+        (entry) => entry.position === "head" || !entry.position,
+      ),
+      jsFilesBody: shared.js.filter((entry) => entry.position === "body"),
+    };
+  }
 
-	// Legacy fallback: return all global assets
-	return {
-		cssFiles: css,
-		jsFilesHead: js.filter(
-			(entry) => entry.position === "head" || !entry.position,
-		),
-		jsFilesBody: js.filter((entry) => entry.position === "body"),
-	};
+  // Legacy fallback: return all global assets
+  return {
+    cssFiles: css,
+    jsFilesHead: js.filter(
+      (entry) => entry.position === "head" || !entry.position,
+    ),
+    jsFilesBody: js.filter((entry) => entry.position === "body"),
+  };
 }

package/lib/render/helpers.js

@@ -12,40 +12,40 @@ import path from "path";
  * @returns {Promise<object>} the extended data object
  */
 export const extendTemplateData = async (config, data, component) => {
-	for (const extension of config.extensions) {
-		if (extension) {
-			const ext = Array.isArray(extension) ? extension[0] : extension;
+  for (const extension of config.extensions) {
+    if (extension) {
+      const ext = Array.isArray(extension) ? extension[0] : extension;
 
-			if (ext.extendTemplateData) {
-				data = await ext.extendTemplateData(
-					path.join(config.components.folder, component.paths.tpl.short),
-					{},
-					data,
-				);
-			}
-		}
-	}
+      if (ext.extendTemplateData) {
+        data = await ext.extendTemplateData(
+          path.join(config.components.folder, component.paths.tpl.short),
+          {},
+          data,
+        );
+      }
+    }
+  }
 
-	return data;
+  return data;
 };
 
 export const getUserUiConfig = (cookies = {}) => {
-	const projectName = global.config.projectName.replaceAll(" ", "-");
-	const mode = cookies[`miyagi_${projectName}_mode`];
-	const theme = cookies[`miyagi_${projectName}_theme`];
-	const componentTextDirection =
-		cookies[`miyagi_${projectName}_text_direction`];
+  const projectName = global.config.projectName.replaceAll(" ", "-");
+  const mode = cookies[`miyagi_${projectName}_mode`];
+  const theme = cookies[`miyagi_${projectName}_theme`];
+  const componentTextDirection =
+    cookies[`miyagi_${projectName}_text_direction`];
 
-	return {
-		mode: global.config.isBuild ? "presentation" : mode || "dev",
-		theme: theme || global.config.ui.mode,
-		componentTextDirection:
-			componentTextDirection || global.config.components.textDirection,
-	};
+  return {
+    mode: global.config.isBuild ? "presentation" : mode || "dev",
+    theme: theme || global.config.ui.mode,
+    componentTextDirection:
+      componentTextDirection || global.config.components.textDirection,
+  };
 };
 
 export const getThemeMode = (cookies = {}) => {
-	return cookies[
-		`miyagi_${global.config.projectName.replaceAll(" ", "-")}_theme`
-	];
+  return cookies[
+    `miyagi_${global.config.projectName.replaceAll(" ", "-")}_theme`
+  ];
 };

package/lib/render/index.js

@@ -17,22 +17,22 @@ import iframeDesignTokens from "./views/iframe/design-tokens/index.js";
 import renderMainDesignTokens from "./views/main/design-tokens.js";
 
 export default {
-	renderMainIndex,
-	renderMainComponent,
-	renderMainComponentDocs,
-	renderMainDocs,
-	renderIframeVariation,
-	renderIframeVariationStandalone,
-	renderIframeComponent,
-	renderIframeComponentDocs,
-	renderIframeDocs,
-	renderIframeIndex,
-	renderMainDesignTokens,
-	iframe: {
-		designTokens: {
-			colors: iframeDesignTokens.colors,
-			sizes: iframeDesignTokens.sizes,
-			typography: iframeDesignTokens.typography,
-		},
-	},
+  renderMainIndex,
+  renderMainComponent,
+  renderMainComponentDocs,
+  renderMainDocs,
+  renderIframeVariation,
+  renderIframeVariationStandalone,
+  renderIframeComponent,
+  renderIframeComponentDocs,
+  renderIframeDocs,
+  renderIframeIndex,
+  renderMainDesignTokens,
+  iframe: {
+    designTokens: {
+      colors: iframeDesignTokens.colors,
+      sizes: iframeDesignTokens.sizes,
+      typography: iframeDesignTokens.typography,
+    },
+  },
 };

package/lib/render/views/iframe/component.docs.js

@@ -10,48 +10,48 @@ import { getUserUiConfig, getThemeMode } from "../../helpers.js";
  * @param {object} [object.cookies]
  */
 export default async function renderIframeComponentDocs({
-	res,
-	component,
-	cb,
-	cookies,
+  res,
+  component,
+  cb,
+  cookies,
 }) {
-	const componentDocumentation =
-		global.state.fileContents[component.paths.docs.full];
-	const componentName = getHeadlineFromFileName(
-		path.basename(
-			component.paths.docs.full,
-			path.extname(component.paths.docs.full),
-		),
-	);
-	const themeMode = getThemeMode(cookies);
+  const componentDocumentation =
+    global.state.fileContents[component.paths.docs.full];
+  const componentName = getHeadlineFromFileName(
+    path.basename(
+      component.paths.docs.full,
+      path.extname(component.paths.docs.full),
+    ),
+  );
+  const themeMode = getThemeMode(cookies);
 
-	await res.render(
-		"iframe_component.twig.miyagi",
-		{
-			lang: global.config.ui.lang,
-			miyagiDev: !!process.env.MIYAGI_DEVELOPMENT,
-			prod: process.env.NODE_ENV === "production",
-			projectName: config.projectName,
-			userProjectName: global.config.projectName,
-			isBuild: global.config.isBuild,
-			userUiConfig: getUserUiConfig(cookies),
-			theme: themeMode
-				? Object.assign(global.config.ui.theme, { mode: themeMode })
-				: global.config.ui.theme,
-			documentation: componentDocumentation,
-			name: componentDocumentation?.includes("<h1") ? null : componentName,
-			uiTextDirection: global.config.ui.textDirection,
-		},
-		(html) => {
-			if (res.send) {
-				res.send(html);
-			}
+  await res.render(
+    "iframe_component.twig.miyagi",
+    {
+      lang: global.config.ui.lang,
+      miyagiDev: !!process.env.MIYAGI_DEVELOPMENT,
+      prod: process.env.NODE_ENV === "production",
+      projectName: config.projectName,
+      userProjectName: global.config.projectName,
+      isBuild: global.config.isBuild,
+      userUiConfig: getUserUiConfig(cookies),
+      theme: themeMode
+        ? Object.assign(global.config.ui.theme, { mode: themeMode })
+        : global.config.ui.theme,
+      documentation: componentDocumentation,
+      name: componentDocumentation?.includes("<h1") ? null : componentName,
+      uiTextDirection: global.config.ui.textDirection,
+    },
+    (html) => {
+      if (res.send) {
+        res.send(html);
+      }
 
-			if (cb) {
-				cb(null, html);
-			}
-		},
-	);
+      if (cb) {
+        cb(null, html);
+      }
+    },
+  );
 }
 
 /**
@@ -59,19 +59,19 @@ export default async function renderIframeComponentDocs({
  * @returns {string}
  */
 function getHeadlineFromFileName(file) {
-	if (typeof file !== "string") return "";
+  if (typeof file !== "string") return "";
 
-	let fileName = file;
+  let fileName = file;
 
-	if (fileName.startsWith("/")) {
-		fileName = fileName.slice(1);
-	}
+  if (fileName.startsWith("/")) {
+    fileName = fileName.slice(1);
+  }
 
-	if (file.endsWith("README.md") || file.endsWith("index.md")) {
-		fileName = path.dirname(fileName);
-	} else {
-		fileName = path.basename(fileName, ".md");
-	}
+  if (file.endsWith("README.md") || file.endsWith("index.md")) {
+    fileName = path.dirname(fileName);
+  } else {
+    fileName = path.basename(fileName, ".md");
+  }
 
-	return fileName.replaceAll("-", " ");
+  return fileName.replaceAll("-", " ");
 }