@beinformed/ui 1.54.1 → 1.54.2

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.54.2](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.54.1...v1.54.2) (2024-09-17)
+
+
+### Bug Fixes
+
+* **layouthint-config:** merge duplicate hint entries ([29b837c](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/29b837c83d991d6f5dada5f6cd0eb165abdbd2eb))
+
 ## [1.54.1](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.54.0...v1.54.1) (2024-09-17)
 
 

package/esm/builder/mergeLayoutHintConfigurations.js

@@ -1,5 +1,5 @@
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
-import _Object$assign from "@babel/runtime-corejs3/core-js-stable/object/assign";
+import _Set from "@babel/runtime-corejs3/core-js-stable/set";
 import _JSON$stringify from "@babel/runtime-corejs3/core-js-stable/json/stringify";
 import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
 const path = require("path");
@@ -9,6 +9,7 @@ const {
   readFileSync,
   writeFileSync
 } = require("fs");
+const mergeWith = require("lodash/mergeWith");
 const {
   LayoutHintConfiguration
 } = require("../constants/LayoutHintConfig");
@@ -42,7 +43,14 @@ exports.mergeLayoutHintConfigurations = async (srcFolder, outputFolder) => {
     const content = readFileSync(file, "utf-8");
     return JSON.parse(content);
   });
-  const newConfig = _Object$assign(LayoutHintConfiguration, ...jsons);
+
+  // Function to merge arrays during merging
+  const customizer = (objValue, srcValue) => {
+    if (Array.isArray(objValue)) {
+      return [...new _Set([...objValue, ...srcValue])];
+    }
+  };
+  const newConfig = mergeWith(LayoutHintConfiguration, ...jsons, customizer);
   writeFileSync(path.join(outputFolder, "LayoutHintConfig.json"), _JSON$stringify(newConfig));
   return _Promise.resolve();
 };

package/esm/builder/mergeLayoutHintConfigurations.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergeLayoutHintConfigurations.js","names":["path","require","readdirSync","statSync","readFileSync","writeFileSync","LayoutHintConfiguration","findFiles","dir","matchedFiles","files","file","absolute","join","isDirectory","foundFiles","push","filename","basename","exports","mergeLayoutHintConfigurations","srcFolder","outputFolder","escapedSrcFolder","replace","jsons","_mapInstanceProperty","call","content","JSON","parse","newConfig","_Object$assign","_JSON$stringify","_Promise","resolve"],"sources":["../../src/builder/mergeLayoutHintConfigurations.js"],"sourcesContent":["// @flow\nconst path = require(\"path\");\nconst { readdirSync, statSync, readFileSync, writeFileSync } = require(\"fs\");\n\nconst { LayoutHintConfiguration } = require(\"../constants/LayoutHintConfig\");\n\nconst findFiles = (dir: string): Array<string> => {\n  const matchedFiles = [];\n\n  const files = readdirSync(dir);\n\n  for (const file of files) {\n    const absolute = path.join(dir, file);\n    if (statSync(absolute).isDirectory()) {\n      const foundFiles = findFiles(absolute);\n      matchedFiles.push(...foundFiles);\n    } else {\n      const filename = path.basename(file);\n      if (filename === \"LayoutHintConfig.json\") {\n        matchedFiles.push(absolute);\n      }\n    }\n  }\n\n  return matchedFiles;\n};\n\n/**\n * Merge all LayoutHintConfig.json files from this library and in the srcFolder\n * together into one config file, and copies it to the outputFolder.<br/>\n * This file is consumed by Be Informed studio to give layout hint information\n */\nexports.mergeLayoutHintConfigurations = async (\n  srcFolder: string,\n  outputFolder: string,\n): Promise<void> => {\n  const escapedSrcFolder = srcFolder.replace(/\\\\/g, \"/\");\n\n  const files = findFiles(escapedSrcFolder);\n\n  const jsons = files.map((file) => {\n    const content = readFileSync(file, \"utf-8\");\n    return JSON.parse(content);\n  });\n\n  const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);\n\n  writeFileSync(\n    path.join(outputFolder, \"LayoutHintConfig.json\"),\n    JSON.stringify(newConfig),\n  );\n\n  return Promise.resolve();\n};\n"],"mappings":";;;;AACA,MAAMA,IAAI,GAAGC,OAAO,CAAC,MAAM,CAAC;AAC5B,MAAM;EAAEC,WAAW;EAAEC,QAAQ;EAAEC,YAAY;EAAEC;AAAc,CAAC,GAAGJ,OAAO,CAAC,IAAI,CAAC;AAE5E,MAAM;EAAEK;AAAwB,CAAC,GAAGL,OAAO,CAAC,+BAA+B,CAAC;AAE5E,MAAMM,SAAS,GAAIC,GAAW,IAAoB;EAChD,MAAMC,YAAY,GAAG,EAAE;EAEvB,MAAMC,KAAK,GAAGR,WAAW,CAACM,GAAG,CAAC;EAE9B,KAAK,MAAMG,IAAI,IAAID,KAAK,EAAE;IACxB,MAAME,QAAQ,GAAGZ,IAAI,CAACa,IAAI,CAACL,GAAG,EAAEG,IAAI,CAAC;IACrC,IAAIR,QAAQ,CAACS,QAAQ,CAAC,CAACE,WAAW,CAAC,CAAC,EAAE;MACpC,MAAMC,UAAU,GAAGR,SAAS,CAACK,QAAQ,CAAC;MACtCH,YAAY,CAACO,IAAI,CAAC,GAAGD,UAAU,CAAC;IAClC,CAAC,MAAM;MACL,MAAME,QAAQ,GAAGjB,IAAI,CAACkB,QAAQ,CAACP,IAAI,CAAC;MACpC,IAAIM,QAAQ,KAAK,uBAAuB,EAAE;QACxCR,YAAY,CAACO,IAAI,CAACJ,QAAQ,CAAC;MAC7B;IACF;EACF;EAEA,OAAOH,YAAY;AACrB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAU,OAAO,CAACC,6BAA6B,GAAG,OACtCC,SAAiB,EACjBC,YAAoB,KACF;EAClB,MAAMC,gBAAgB,GAAGF,SAAS,CAACG,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;EAEtD,MAAMd,KAAK,GAAGH,SAAS,CAACgB,gBAAgB,CAAC;EAEzC,MAAME,KAAK,GAAGC,oBAAA,CAAAhB,KAAK,EAAAiB,IAAA,CAALjB,KAAK,EAAMC,IAAI,IAAK;IAChC,MAAMiB,OAAO,GAAGxB,YAAY,CAACO,IAAI,EAAE,OAAO,CAAC;IAC3C,OAAOkB,IAAI,CAACC,KAAK,CAACF,OAAO,CAAC;EAC5B,CAAC,CAAC;EAEF,MAAMG,SAAS,GAAGC,cAAA,CAAc1B,uBAAuB,EAAE,GAAGmB,KAAK,CAAC;EAElEpB,aAAa,CACXL,IAAI,CAACa,IAAI,CAACS,YAAY,EAAE,uBAAuB,CAAC,EAChDW,eAAA,CAAeF,SAAS,CAC1B,CAAC;EAED,OAAOG,QAAA,CAAQC,OAAO,CAAC,CAAC;AAC1B,CAAC","ignoreList":[]}
+{"version":3,"file":"mergeLayoutHintConfigurations.js","names":["path","require","readdirSync","statSync","readFileSync","writeFileSync","mergeWith","LayoutHintConfiguration","findFiles","dir","matchedFiles","files","file","absolute","join","isDirectory","foundFiles","push","filename","basename","exports","mergeLayoutHintConfigurations","srcFolder","outputFolder","escapedSrcFolder","replace","jsons","_mapInstanceProperty","call","content","JSON","parse","customizer","objValue","srcValue","Array","isArray","_Set","newConfig","_JSON$stringify","_Promise","resolve"],"sources":["../../src/builder/mergeLayoutHintConfigurations.js"],"sourcesContent":["// @flow\nconst path = require(\"path\");\nconst { readdirSync, statSync, readFileSync, writeFileSync } = require(\"fs\");\n\nconst mergeWith = require(\"lodash/mergeWith\");\nconst { LayoutHintConfiguration } = require(\"../constants/LayoutHintConfig\");\n\nconst findFiles = (dir: string): Array<string> => {\n  const matchedFiles = [];\n\n  const files = readdirSync(dir);\n\n  for (const file of files) {\n    const absolute = path.join(dir, file);\n    if (statSync(absolute).isDirectory()) {\n      const foundFiles = findFiles(absolute);\n      matchedFiles.push(...foundFiles);\n    } else {\n      const filename = path.basename(file);\n      if (filename === \"LayoutHintConfig.json\") {\n        matchedFiles.push(absolute);\n      }\n    }\n  }\n\n  return matchedFiles;\n};\n\n/**\n * Merge all LayoutHintConfig.json files from this library and in the srcFolder\n * together into one config file, and copies it to the outputFolder.<br/>\n * This file is consumed by Be Informed studio to give layout hint information\n */\nexports.mergeLayoutHintConfigurations = async (\n  srcFolder: string,\n  outputFolder: string,\n): Promise<void> => {\n  const escapedSrcFolder = srcFolder.replace(/\\\\/g, \"/\");\n\n  const files = findFiles(escapedSrcFolder);\n\n  const jsons = files.map((file) => {\n    const content = readFileSync(file, \"utf-8\");\n    return JSON.parse(content);\n  });\n\n  // Function to merge arrays during merging\n  const customizer = (objValue: Object, srcValue: Object): Object => {\n    if (Array.isArray(objValue)) {\n      return [...new Set([...objValue, ...srcValue])];\n    }\n  };\n\n  const newConfig = mergeWith(LayoutHintConfiguration, ...jsons, customizer);\n\n  writeFileSync(\n    path.join(outputFolder, \"LayoutHintConfig.json\"),\n    JSON.stringify(newConfig),\n  );\n\n  return Promise.resolve();\n};\n"],"mappings":";;;;AACA,MAAMA,IAAI,GAAGC,OAAO,CAAC,MAAM,CAAC;AAC5B,MAAM;EAAEC,WAAW;EAAEC,QAAQ;EAAEC,YAAY;EAAEC;AAAc,CAAC,GAAGJ,OAAO,CAAC,IAAI,CAAC;AAE5E,MAAMK,SAAS,GAAGL,OAAO,CAAC,kBAAkB,CAAC;AAC7C,MAAM;EAAEM;AAAwB,CAAC,GAAGN,OAAO,CAAC,+BAA+B,CAAC;AAE5E,MAAMO,SAAS,GAAIC,GAAW,IAAoB;EAChD,MAAMC,YAAY,GAAG,EAAE;EAEvB,MAAMC,KAAK,GAAGT,WAAW,CAACO,GAAG,CAAC;EAE9B,KAAK,MAAMG,IAAI,IAAID,KAAK,EAAE;IACxB,MAAME,QAAQ,GAAGb,IAAI,CAACc,IAAI,CAACL,GAAG,EAAEG,IAAI,CAAC;IACrC,IAAIT,QAAQ,CAACU,QAAQ,CAAC,CAACE,WAAW,CAAC,CAAC,EAAE;MACpC,MAAMC,UAAU,GAAGR,SAAS,CAACK,QAAQ,CAAC;MACtCH,YAAY,CAACO,IAAI,CAAC,GAAGD,UAAU,CAAC;IAClC,CAAC,MAAM;MACL,MAAME,QAAQ,GAAGlB,IAAI,CAACmB,QAAQ,CAACP,IAAI,CAAC;MACpC,IAAIM,QAAQ,KAAK,uBAAuB,EAAE;QACxCR,YAAY,CAACO,IAAI,CAACJ,QAAQ,CAAC;MAC7B;IACF;EACF;EAEA,OAAOH,YAAY;AACrB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAU,OAAO,CAACC,6BAA6B,GAAG,OACtCC,SAAiB,EACjBC,YAAoB,KACF;EAClB,MAAMC,gBAAgB,GAAGF,SAAS,CAACG,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;EAEtD,MAAMd,KAAK,GAAGH,SAAS,CAACgB,gBAAgB,CAAC;EAEzC,MAAME,KAAK,GAAGC,oBAAA,CAAAhB,KAAK,EAAAiB,IAAA,CAALjB,KAAK,EAAMC,IAAI,IAAK;IAChC,MAAMiB,OAAO,GAAGzB,YAAY,CAACQ,IAAI,EAAE,OAAO,CAAC;IAC3C,OAAOkB,IAAI,CAACC,KAAK,CAACF,OAAO,CAAC;EAC5B,CAAC,CAAC;;EAEF;EACA,MAAMG,UAAU,GAAGA,CAACC,QAAgB,EAAEC,QAAgB,KAAa;IACjE,IAAIC,KAAK,CAACC,OAAO,CAACH,QAAQ,CAAC,EAAE;MAC3B,OAAO,CAAC,GAAG,IAAAI,IAAA,CAAQ,CAAC,GAAGJ,QAAQ,EAAE,GAAGC,QAAQ,CAAC,CAAC,CAAC;IACjD;EACF,CAAC;EAED,MAAMI,SAAS,GAAGhC,SAAS,CAACC,uBAAuB,EAAE,GAAGmB,KAAK,EAAEM,UAAU,CAAC;EAE1E3B,aAAa,CACXL,IAAI,CAACc,IAAI,CAACS,YAAY,EAAE,uBAAuB,CAAC,EAChDgB,eAAA,CAAeD,SAAS,CAC1B,CAAC;EAED,OAAOE,QAAA,CAAQC,OAAO,CAAC,CAAC;AAC1B,CAAC","ignoreList":[]}

package/lib/builder/__tests__/mergeLayoutHintConfigurations.spec.js.flow

@@ -1,6 +1,7 @@
 import { mergeLayoutHintConfigurations } from "../mergeLayoutHintConfigurations";
 import { LayoutHintConfiguration } from "../../constants/LayoutHintConfig";
 const fs = require("fs");
+
 //
 const projectJson1 = {
   MOCK: {
@@ -26,6 +27,18 @@ const projectJson2 = {
   },
 };
 
+const projectMerge = {
+  MERGE: {
+    hint: "merge",
+    description: {
+      NL: "merge with extra component",
+      EN: "merge with extra component",
+    },
+    link: "",
+    component: ["component1", "component2", "component3"],
+  },
+};
+
 jest.mock("fs", () => ({
   ...jest.requireActual("fs"),
   writeFileSync: jest.fn(),
@@ -33,19 +46,26 @@ jest.mock("fs", () => ({
 
 describe("mergeLayoutHintConfigurations", () => {
   it("generates layouthint.json", async () => {
-    expect.assertions(1);
+    expect.assertions(2);
 
     const expectedJson = {
       ...LayoutHintConfiguration,
       ...projectJson1,
       ...projectJson2,
+      ...projectMerge,
     };
 
     await mergeLayoutHintConfigurations("./src", "/output");
 
     expect(fs.writeFileSync).toHaveBeenCalledWith(
       expect.stringContaining("LayoutHintConfig.json"),
-      JSON.stringify(expectedJson),
+      expect.any(String),
     );
+
+    // Check that the JSON written matches the expected JSON
+    const actualJson = JSON.parse(fs.writeFileSync.mock.calls[0][1]);
+
+    // Compare objects using deep comparison to ensure they are equal
+    expect(actualJson).toEqual(expectedJson);
   });
 });

package/lib/builder/mergeLayoutHintConfigurations.js

@@ -2,7 +2,7 @@
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/assign"));
+var _set = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/set"));
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/json/stringify"));
 var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
 const path = require("path");
@@ -12,6 +12,7 @@ const {
   readFileSync,
   writeFileSync
 } = require("fs");
+const mergeWith = require("lodash/mergeWith");
 const {
   LayoutHintConfiguration
 } = require("../constants/LayoutHintConfig");
@@ -45,7 +46,14 @@ exports.mergeLayoutHintConfigurations = async (srcFolder, outputFolder) => {
     const content = readFileSync(file, "utf-8");
     return JSON.parse(content);
   });
-  const newConfig = (0, _assign.default)(LayoutHintConfiguration, ...jsons);
+
+  // Function to merge arrays during merging
+  const customizer = (objValue, srcValue) => {
+    if (Array.isArray(objValue)) {
+      return [...new _set.default([...objValue, ...srcValue])];
+    }
+  };
+  const newConfig = mergeWith(LayoutHintConfiguration, ...jsons, customizer);
   writeFileSync(path.join(outputFolder, "LayoutHintConfig.json"), (0, _stringify.default)(newConfig));
   return _promise.default.resolve();
 };

package/lib/builder/mergeLayoutHintConfigurations.js.flow

@@ -2,6 +2,7 @@
 const path = require("path");
 const { readdirSync, statSync, readFileSync, writeFileSync } = require("fs");
 
+const mergeWith = require("lodash/mergeWith");
 const { LayoutHintConfiguration } = require("../constants/LayoutHintConfig");
 
 const findFiles = (dir: string): Array<string> => {
@@ -43,7 +44,14 @@ exports.mergeLayoutHintConfigurations = async (
     return JSON.parse(content);
   });
 
-  const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);
+  // Function to merge arrays during merging
+  const customizer = (objValue: Object, srcValue: Object): Object => {
+    if (Array.isArray(objValue)) {
+      return [...new Set([...objValue, ...srcValue])];
+    }
+  };
+
+  const newConfig = mergeWith(LayoutHintConfiguration, ...jsons, customizer);
 
   writeFileSync(
     path.join(outputFolder, "LayoutHintConfig.json"),

package/lib/builder/mergeLayoutHintConfigurations.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergeLayoutHintConfigurations.js","names":["path","require","readdirSync","statSync","readFileSync","writeFileSync","LayoutHintConfiguration","findFiles","dir","matchedFiles","files","file","absolute","join","isDirectory","foundFiles","push","filename","basename","exports","mergeLayoutHintConfigurations","srcFolder","outputFolder","escapedSrcFolder","replace","jsons","_map","default","call","content","JSON","parse","newConfig","_assign","_stringify","_promise","resolve"],"sources":["../../src/builder/mergeLayoutHintConfigurations.js"],"sourcesContent":["// @flow\nconst path = require(\"path\");\nconst { readdirSync, statSync, readFileSync, writeFileSync } = require(\"fs\");\n\nconst { LayoutHintConfiguration } = require(\"../constants/LayoutHintConfig\");\n\nconst findFiles = (dir: string): Array<string> => {\n  const matchedFiles = [];\n\n  const files = readdirSync(dir);\n\n  for (const file of files) {\n    const absolute = path.join(dir, file);\n    if (statSync(absolute).isDirectory()) {\n      const foundFiles = findFiles(absolute);\n      matchedFiles.push(...foundFiles);\n    } else {\n      const filename = path.basename(file);\n      if (filename === \"LayoutHintConfig.json\") {\n        matchedFiles.push(absolute);\n      }\n    }\n  }\n\n  return matchedFiles;\n};\n\n/**\n * Merge all LayoutHintConfig.json files from this library and in the srcFolder\n * together into one config file, and copies it to the outputFolder.<br/>\n * This file is consumed by Be Informed studio to give layout hint information\n */\nexports.mergeLayoutHintConfigurations = async (\n  srcFolder: string,\n  outputFolder: string,\n): Promise<void> => {\n  const escapedSrcFolder = srcFolder.replace(/\\\\/g, \"/\");\n\n  const files = findFiles(escapedSrcFolder);\n\n  const jsons = files.map((file) => {\n    const content = readFileSync(file, \"utf-8\");\n    return JSON.parse(content);\n  });\n\n  const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);\n\n  writeFileSync(\n    path.join(outputFolder, \"LayoutHintConfig.json\"),\n    JSON.stringify(newConfig),\n  );\n\n  return Promise.resolve();\n};\n"],"mappings":";;;;;;;AACA,MAAMA,IAAI,GAAGC,OAAO,CAAC,MAAM,CAAC;AAC5B,MAAM;EAAEC,WAAW;EAAEC,QAAQ;EAAEC,YAAY;EAAEC;AAAc,CAAC,GAAGJ,OAAO,CAAC,IAAI,CAAC;AAE5E,MAAM;EAAEK;AAAwB,CAAC,GAAGL,OAAO,CAAC,+BAA+B,CAAC;AAE5E,MAAMM,SAAS,GAAIC,GAAW,IAAoB;EAChD,MAAMC,YAAY,GAAG,EAAE;EAEvB,MAAMC,KAAK,GAAGR,WAAW,CAACM,GAAG,CAAC;EAE9B,KAAK,MAAMG,IAAI,IAAID,KAAK,EAAE;IACxB,MAAME,QAAQ,GAAGZ,IAAI,CAACa,IAAI,CAACL,GAAG,EAAEG,IAAI,CAAC;IACrC,IAAIR,QAAQ,CAACS,QAAQ,CAAC,CAACE,WAAW,CAAC,CAAC,EAAE;MACpC,MAAMC,UAAU,GAAGR,SAAS,CAACK,QAAQ,CAAC;MACtCH,YAAY,CAACO,IAAI,CAAC,GAAGD,UAAU,CAAC;IAClC,CAAC,MAAM;MACL,MAAME,QAAQ,GAAGjB,IAAI,CAACkB,QAAQ,CAACP,IAAI,CAAC;MACpC,IAAIM,QAAQ,KAAK,uBAAuB,EAAE;QACxCR,YAAY,CAACO,IAAI,CAACJ,QAAQ,CAAC;MAC7B;IACF;EACF;EAEA,OAAOH,YAAY;AACrB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAU,OAAO,CAACC,6BAA6B,GAAG,OACtCC,SAAiB,EACjBC,YAAoB,KACF;EAClB,MAAMC,gBAAgB,GAAGF,SAAS,CAACG,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;EAEtD,MAAMd,KAAK,GAAGH,SAAS,CAACgB,gBAAgB,CAAC;EAEzC,MAAME,KAAK,GAAG,IAAAC,IAAA,CAAAC,OAAA,EAAAjB,KAAK,EAAAkB,IAAA,CAALlB,KAAK,EAAMC,IAAI,IAAK;IAChC,MAAMkB,OAAO,GAAGzB,YAAY,CAACO,IAAI,EAAE,OAAO,CAAC;IAC3C,OAAOmB,IAAI,CAACC,KAAK,CAACF,OAAO,CAAC;EAC5B,CAAC,CAAC;EAEF,MAAMG,SAAS,GAAG,IAAAC,OAAA,CAAAN,OAAA,EAAcrB,uBAAuB,EAAE,GAAGmB,KAAK,CAAC;EAElEpB,aAAa,CACXL,IAAI,CAACa,IAAI,CAACS,YAAY,EAAE,uBAAuB,CAAC,EAChD,IAAAY,UAAA,CAAAP,OAAA,EAAeK,SAAS,CAC1B,CAAC;EAED,OAAOG,QAAA,CAAAR,OAAA,CAAQS,OAAO,CAAC,CAAC;AAC1B,CAAC","ignoreList":[]}
+{"version":3,"file":"mergeLayoutHintConfigurations.js","names":["path","require","readdirSync","statSync","readFileSync","writeFileSync","mergeWith","LayoutHintConfiguration","findFiles","dir","matchedFiles","files","file","absolute","join","isDirectory","foundFiles","push","filename","basename","exports","mergeLayoutHintConfigurations","srcFolder","outputFolder","escapedSrcFolder","replace","jsons","_map","default","call","content","JSON","parse","customizer","objValue","srcValue","Array","isArray","_set","newConfig","_stringify","_promise","resolve"],"sources":["../../src/builder/mergeLayoutHintConfigurations.js"],"sourcesContent":["// @flow\nconst path = require(\"path\");\nconst { readdirSync, statSync, readFileSync, writeFileSync } = require(\"fs\");\n\nconst mergeWith = require(\"lodash/mergeWith\");\nconst { LayoutHintConfiguration } = require(\"../constants/LayoutHintConfig\");\n\nconst findFiles = (dir: string): Array<string> => {\n  const matchedFiles = [];\n\n  const files = readdirSync(dir);\n\n  for (const file of files) {\n    const absolute = path.join(dir, file);\n    if (statSync(absolute).isDirectory()) {\n      const foundFiles = findFiles(absolute);\n      matchedFiles.push(...foundFiles);\n    } else {\n      const filename = path.basename(file);\n      if (filename === \"LayoutHintConfig.json\") {\n        matchedFiles.push(absolute);\n      }\n    }\n  }\n\n  return matchedFiles;\n};\n\n/**\n * Merge all LayoutHintConfig.json files from this library and in the srcFolder\n * together into one config file, and copies it to the outputFolder.<br/>\n * This file is consumed by Be Informed studio to give layout hint information\n */\nexports.mergeLayoutHintConfigurations = async (\n  srcFolder: string,\n  outputFolder: string,\n): Promise<void> => {\n  const escapedSrcFolder = srcFolder.replace(/\\\\/g, \"/\");\n\n  const files = findFiles(escapedSrcFolder);\n\n  const jsons = files.map((file) => {\n    const content = readFileSync(file, \"utf-8\");\n    return JSON.parse(content);\n  });\n\n  // Function to merge arrays during merging\n  const customizer = (objValue: Object, srcValue: Object): Object => {\n    if (Array.isArray(objValue)) {\n      return [...new Set([...objValue, ...srcValue])];\n    }\n  };\n\n  const newConfig = mergeWith(LayoutHintConfiguration, ...jsons, customizer);\n\n  writeFileSync(\n    path.join(outputFolder, \"LayoutHintConfig.json\"),\n    JSON.stringify(newConfig),\n  );\n\n  return Promise.resolve();\n};\n"],"mappings":";;;;;;;AACA,MAAMA,IAAI,GAAGC,OAAO,CAAC,MAAM,CAAC;AAC5B,MAAM;EAAEC,WAAW;EAAEC,QAAQ;EAAEC,YAAY;EAAEC;AAAc,CAAC,GAAGJ,OAAO,CAAC,IAAI,CAAC;AAE5E,MAAMK,SAAS,GAAGL,OAAO,CAAC,kBAAkB,CAAC;AAC7C,MAAM;EAAEM;AAAwB,CAAC,GAAGN,OAAO,CAAC,+BAA+B,CAAC;AAE5E,MAAMO,SAAS,GAAIC,GAAW,IAAoB;EAChD,MAAMC,YAAY,GAAG,EAAE;EAEvB,MAAMC,KAAK,GAAGT,WAAW,CAACO,GAAG,CAAC;EAE9B,KAAK,MAAMG,IAAI,IAAID,KAAK,EAAE;IACxB,MAAME,QAAQ,GAAGb,IAAI,CAACc,IAAI,CAACL,GAAG,EAAEG,IAAI,CAAC;IACrC,IAAIT,QAAQ,CAACU,QAAQ,CAAC,CAACE,WAAW,CAAC,CAAC,EAAE;MACpC,MAAMC,UAAU,GAAGR,SAAS,CAACK,QAAQ,CAAC;MACtCH,YAAY,CAACO,IAAI,CAAC,GAAGD,UAAU,CAAC;IAClC,CAAC,MAAM;MACL,MAAME,QAAQ,GAAGlB,IAAI,CAACmB,QAAQ,CAACP,IAAI,CAAC;MACpC,IAAIM,QAAQ,KAAK,uBAAuB,EAAE;QACxCR,YAAY,CAACO,IAAI,CAACJ,QAAQ,CAAC;MAC7B;IACF;EACF;EAEA,OAAOH,YAAY;AACrB,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAU,OAAO,CAACC,6BAA6B,GAAG,OACtCC,SAAiB,EACjBC,YAAoB,KACF;EAClB,MAAMC,gBAAgB,GAAGF,SAAS,CAACG,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;EAEtD,MAAMd,KAAK,GAAGH,SAAS,CAACgB,gBAAgB,CAAC;EAEzC,MAAME,KAAK,GAAG,IAAAC,IAAA,CAAAC,OAAA,EAAAjB,KAAK,EAAAkB,IAAA,CAALlB,KAAK,EAAMC,IAAI,IAAK;IAChC,MAAMkB,OAAO,GAAG1B,YAAY,CAACQ,IAAI,EAAE,OAAO,CAAC;IAC3C,OAAOmB,IAAI,CAACC,KAAK,CAACF,OAAO,CAAC;EAC5B,CAAC,CAAC;;EAEF;EACA,MAAMG,UAAU,GAAGA,CAACC,QAAgB,EAAEC,QAAgB,KAAa;IACjE,IAAIC,KAAK,CAACC,OAAO,CAACH,QAAQ,CAAC,EAAE;MAC3B,OAAO,CAAC,GAAG,IAAAI,IAAA,CAAAV,OAAA,CAAQ,CAAC,GAAGM,QAAQ,EAAE,GAAGC,QAAQ,CAAC,CAAC,CAAC;IACjD;EACF,CAAC;EAED,MAAMI,SAAS,GAAGjC,SAAS,CAACC,uBAAuB,EAAE,GAAGmB,KAAK,EAAEO,UAAU,CAAC;EAE1E5B,aAAa,CACXL,IAAI,CAACc,IAAI,CAACS,YAAY,EAAE,uBAAuB,CAAC,EAChD,IAAAiB,UAAA,CAAAZ,OAAA,EAAeW,SAAS,CAC1B,CAAC;EAED,OAAOE,QAAA,CAAAb,OAAA,CAAQc,OAAO,CAAC,CAAC;AAC1B,CAAC","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.54.1",
+  "version": "1.54.2",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",

package/src/builder/__tests__/LayoutHintConfig.json

@@ -7,5 +7,14 @@
     },
     "link": "",
     "component": ["attribute"]
+  },
+  "MERGE": {
+    "hint": "merge",
+    "description": {
+      "NL": "merge with extra component",
+      "EN": "merge with extra component"
+    },
+    "link": "",
+    "component": ["component1", "component2"]
   }
 }

package/src/builder/__tests__/mergeLayoutHintConfigurations.spec.js

@@ -1,6 +1,7 @@
 import { mergeLayoutHintConfigurations } from "../mergeLayoutHintConfigurations";
 import { LayoutHintConfiguration } from "../../constants/LayoutHintConfig";
 const fs = require("fs");
+
 //
 const projectJson1 = {
   MOCK: {
@@ -26,6 +27,18 @@ const projectJson2 = {
   },
 };
 
+const projectMerge = {
+  MERGE: {
+    hint: "merge",
+    description: {
+      NL: "merge with extra component",
+      EN: "merge with extra component",
+    },
+    link: "",
+    component: ["component1", "component2", "component3"],
+  },
+};
+
 jest.mock("fs", () => ({
   ...jest.requireActual("fs"),
   writeFileSync: jest.fn(),
@@ -33,19 +46,26 @@ jest.mock("fs", () => ({
 
 describe("mergeLayoutHintConfigurations", () => {
   it("generates layouthint.json", async () => {
-    expect.assertions(1);
+    expect.assertions(2);
 
     const expectedJson = {
       ...LayoutHintConfiguration,
       ...projectJson1,
       ...projectJson2,
+      ...projectMerge,
     };
 
     await mergeLayoutHintConfigurations("./src", "/output");
 
     expect(fs.writeFileSync).toHaveBeenCalledWith(
       expect.stringContaining("LayoutHintConfig.json"),
-      JSON.stringify(expectedJson),
+      expect.any(String),
     );
+
+    // Check that the JSON written matches the expected JSON
+    const actualJson = JSON.parse(fs.writeFileSync.mock.calls[0][1]);
+
+    // Compare objects using deep comparison to ensure they are equal
+    expect(actualJson).toEqual(expectedJson);
   });
 });

package/src/builder/__tests__/subdir/LayoutHintConfig.json

@@ -7,5 +7,14 @@
     },
     "link": "",
     "component": ["attribute"]
+  },
+  "MERGE": {
+    "hint": "merge",
+    "description": {
+      "NL": "merge with extra component",
+      "EN": "merge with extra component"
+    },
+    "link": "",
+    "component": ["component1", "component3"]
   }
 }

package/src/builder/mergeLayoutHintConfigurations.js

@@ -2,6 +2,7 @@
 const path = require("path");
 const { readdirSync, statSync, readFileSync, writeFileSync } = require("fs");
 
+const mergeWith = require("lodash/mergeWith");
 const { LayoutHintConfiguration } = require("../constants/LayoutHintConfig");
 
 const findFiles = (dir: string): Array<string> => {
@@ -43,7 +44,14 @@ exports.mergeLayoutHintConfigurations = async (
     return JSON.parse(content);
   });
 
-  const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);
+  // Function to merge arrays during merging
+  const customizer = (objValue: Object, srcValue: Object): Object => {
+    if (Array.isArray(objValue)) {
+      return [...new Set([...objValue, ...srcValue])];
+    }
+  };
+
+  const newConfig = mergeWith(LayoutHintConfiguration, ...jsons, customizer);
 
   writeFileSync(
     path.join(outputFolder, "LayoutHintConfig.json"),