@beinformed/ui 1.34.0 → 1.34.1

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.34.1](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.34.0...v1.34.1) (2023-09-13)
+
+
+### Bug Fixes
+
+* **layout-hint-json:** replace glob with node packages ([c25b89f](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/c25b89f811a934cf2ce57254e5d06a574b674561))
+
 ## [1.34.0](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.33.0...v1.34.0) (2023-09-13)
 
 

package/esm/builder/mergeLayoutHintConfigurations.js

@@ -1,24 +1,33 @@
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
-import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
 import _Object$assign from "@babel/runtime-corejs3/core-js-stable/object/assign";
 import _JSON$stringify from "@babel/runtime-corejs3/core-js-stable/json/stringify";
-const glob = require("glob");
-const fs = require("fs");
+import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
 const path = require("path");
+const {
+  readdirSync,
+  statSync,
+  readFileSync,
+  writeFileSync
+} = require("fs");
 const {
   LayoutHintConfiguration
 } = require("../constants/LayoutHintConfig");
-const readFiles = files => {
-  const filePromises = _mapInstanceProperty(files).call(files, file => new _Promise((resolve, reject) => {
-    fs.readFile(file, "utf-8", (err, data) => {
-      if (err) {
-        return reject(err);
-      } else {
-        return resolve(JSON.parse(data));
+const findFiles = dir => {
+  const matchedFiles = [];
+  const files = readdirSync(dir);
+  for (const file of files) {
+    const absolute = path.join(dir, file);
+    if (statSync(absolute).isDirectory()) {
+      const foundFiles = findFiles(absolute);
+      matchedFiles.push(...foundFiles);
+    } else {
+      const filename = path.basename(file);
+      if (filename === "LayoutHintConfig.json") {
+        matchedFiles.push(absolute);
       }
-    });
-  }));
-  return _Promise.all(filePromises);
+    }
+  }
+  return matchedFiles;
 };
 
 /**
@@ -28,21 +37,13 @@ const readFiles = files => {
  */
 exports.mergeLayoutHintConfigurations = async (srcFolder, outputFolder) => {
   const escapedSrcFolder = srcFolder.replace(/\\/g, "/");
-  return new _Promise((resolve, reject) => {
-    glob(escapedSrcFolder + "/**/LayoutHintConfig.json", {}, (err, files) => {
-      if (err) {
-        return reject(err);
-      }
-      readFiles(files).then(jsons => {
-        const newConfig = _Object$assign(LayoutHintConfiguration, ...jsons);
-        fs.writeFile(path.join(outputFolder, "LayoutHintConfig.json"), _JSON$stringify(newConfig), writeErr => {
-          if (writeErr) {
-            return reject(writeErr);
-          }
-          return resolve();
-        });
-      });
-    });
+  const files = findFiles(escapedSrcFolder);
+  const jsons = _mapInstanceProperty(files).call(files, file => {
+    const content = readFileSync(file, "utf-8");
+    return JSON.parse(content);
   });
+  const newConfig = _Object$assign(LayoutHintConfiguration, ...jsons);
+  writeFileSync(path.join(outputFolder, "LayoutHintConfig.json"), _JSON$stringify(newConfig));
+  return _Promise.resolve();
 };
 //# sourceMappingURL=mergeLayoutHintConfigurations.js.map

package/esm/builder/mergeLayoutHintConfigurations.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergeLayoutHintConfigurations.js","names":["glob","require","fs","path","LayoutHintConfiguration","readFiles","files","filePromises","_mapInstanceProperty","call","file","_Promise","resolve","reject","readFile","err","data","JSON","parse","all","exports","mergeLayoutHintConfigurations","srcFolder","outputFolder","escapedSrcFolder","replace","then","jsons","newConfig","_Object$assign","writeFile","join","_JSON$stringify","writeErr"],"sources":["../../src/builder/mergeLayoutHintConfigurations.js"],"sourcesContent":["// @flow\nconst glob = require(\"glob\");\nconst fs = require(\"fs\");\nconst path = require(\"path\");\n\nconst { LayoutHintConfiguration } = require(\"../constants/LayoutHintConfig\");\n\nconst readFiles = (files: Array<string>) => {\n  const filePromises = files.map(\n    (file) =>\n      new Promise((resolve, reject) => {\n        fs.readFile(file, \"utf-8\", (err, data) => {\n          if (err) {\n            return reject(err);\n          } else {\n            return resolve(JSON.parse(data));\n          }\n        });\n      }),\n  );\n\n  return Promise.all(filePromises);\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  return new Promise((resolve, reject) => {\n    glob(escapedSrcFolder + \"/**/LayoutHintConfig.json\", {}, (err, files) => {\n      if (err) {\n        return reject(err);\n      }\n\n      readFiles(files).then((jsons) => {\n        const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);\n        fs.writeFile(\n          path.join(outputFolder, \"LayoutHintConfig.json\"),\n          JSON.stringify(newConfig),\n\n          (writeErr) => {\n            if (writeErr) {\n              return reject(writeErr);\n            }\n\n            return resolve();\n          },\n        );\n      });\n    });\n  });\n};\n"],"mappings":";;;;AACA,MAAMA,IAAI,GAAGC,OAAO,CAAC,MAAM,CAAC;AAC5B,MAAMC,EAAE,GAAGD,OAAO,CAAC,IAAI,CAAC;AACxB,MAAME,IAAI,GAAGF,OAAO,CAAC,MAAM,CAAC;AAE5B,MAAM;EAAEG;AAAwB,CAAC,GAAGH,OAAO,CAAC,+BAA+B,CAAC;AAE5E,MAAMI,SAAS,GAAIC,KAAoB,IAAK;EAC1C,MAAMC,YAAY,GAAGC,oBAAA,CAAAF,KAAK,EAAAG,IAAA,CAALH,KAAK,EACvBI,IAAI,IACH,IAAAC,QAAA,CAAY,CAACC,OAAO,EAAEC,MAAM,KAAK;IAC/BX,EAAE,CAACY,QAAQ,CAACJ,IAAI,EAAE,OAAO,EAAE,CAACK,GAAG,EAAEC,IAAI,KAAK;MACxC,IAAID,GAAG,EAAE;QACP,OAAOF,MAAM,CAACE,GAAG,CAAC;MACpB,CAAC,MAAM;QACL,OAAOH,OAAO,CAACK,IAAI,CAACC,KAAK,CAACF,IAAI,CAAC,CAAC;MAClC;IACF,CAAC,CAAC;EACJ,CAAC,CACL,CAAC;EAED,OAAOL,QAAA,CAAQQ,GAAG,CAACZ,YAAY,CAAC;AAClC,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAa,OAAO,CAACC,6BAA6B,GAAG,OACtCC,SAAiB,EACjBC,YAAoB,KACF;EAClB,MAAMC,gBAAgB,GAAGF,SAAS,CAACG,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;EACtD,OAAO,IAAAd,QAAA,CAAY,CAACC,OAAO,EAAEC,MAAM,KAAK;IACtCb,IAAI,CAACwB,gBAAgB,GAAG,2BAA2B,EAAE,CAAC,CAAC,EAAE,CAACT,GAAG,EAAET,KAAK,KAAK;MACvE,IAAIS,GAAG,EAAE;QACP,OAAOF,MAAM,CAACE,GAAG,CAAC;MACpB;MAEAV,SAAS,CAACC,KAAK,CAAC,CAACoB,IAAI,CAAEC,KAAK,IAAK;QAC/B,MAAMC,SAAS,GAAGC,cAAA,CAAczB,uBAAuB,EAAE,GAAGuB,KAAK,CAAC;QAClEzB,EAAE,CAAC4B,SAAS,CACV3B,IAAI,CAAC4B,IAAI,CAACR,YAAY,EAAE,uBAAuB,CAAC,EAChDS,eAAA,CAAeJ,SAAS,CAAC,EAExBK,QAAQ,IAAK;UACZ,IAAIA,QAAQ,EAAE;YACZ,OAAOpB,MAAM,CAACoB,QAAQ,CAAC;UACzB;UAEA,OAAOrB,OAAO,CAAC,CAAC;QAClB,CACF,CAAC;MACH,CAAC,CAAC;IACJ,CAAC,CAAC;EACJ,CAAC,CAAC;AACJ,CAAC"}
+{"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"}

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

@@ -1,8 +1,8 @@
 import { mergeLayoutHintConfigurations } from "../mergeLayoutHintConfigurations";
 import { LayoutHintConfiguration } from "../../constants/LayoutHintConfig";
 const fs = require("fs");
-
-const projectJson = {
+//
+const projectJson1 = {
   MOCK: {
     hint: "mock",
     description: {
@@ -14,31 +14,38 @@ const projectJson = {
   },
 };
 
+const projectJson2 = {
+  MOCK2: {
+    hint: "mock2",
+    description: {
+      NL: "mock2 dutch description",
+      EN: "mock2 english description",
+    },
+    link: "",
+    component: ["attribute"],
+  },
+};
+
 jest.mock("fs", () => ({
-  readFile: jest.fn((path, options, callback) =>
-    callback(null, JSON.stringify(projectJson)),
-  ),
-  writeFile: jest.fn((path, options, callback) => callback(null)),
+  ...jest.requireActual("fs"),
+  writeFileSync: jest.fn(),
 }));
 
-jest.mock("glob", () =>
-  jest.fn((pattern, options, callback) =>
-    callback(null, ["/input/LayoutHintConfig.json"]),
-  ),
-);
-
 describe("mergeLayoutHintConfigurations", () => {
   it("generates layouthint.json", async () => {
     expect.assertions(1);
 
-    const expectedJson = { ...LayoutHintConfiguration, ...projectJson };
+    const expectedJson = {
+      ...LayoutHintConfiguration,
+      ...projectJson1,
+      ...projectJson2,
+    };
 
-    await mergeLayoutHintConfigurations("/input", "/output");
+    await mergeLayoutHintConfigurations("./src", "/output");
 
-    expect(fs.writeFile).toHaveBeenCalledWith(
-      expect.stringContaining("LayoutHintConfig.json"),
+    expect(fs.writeFileSync).toHaveBeenCalledWith(
+      "\\output\\LayoutHintConfig.json",
       JSON.stringify(expectedJson),
-      expect.anything(),
     );
   });
 });

package/lib/builder/mergeLayoutHintConfigurations.js

@@ -2,26 +2,35 @@
 
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault");
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
 var _assign = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/assign"));
 var _stringify = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/json/stringify"));
-const glob = require("glob");
-const fs = require("fs");
+var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
 const path = require("path");
+const {
+  readdirSync,
+  statSync,
+  readFileSync,
+  writeFileSync
+} = require("fs");
 const {
   LayoutHintConfiguration
 } = require("../constants/LayoutHintConfig");
-const readFiles = files => {
-  const filePromises = (0, _map.default)(files).call(files, file => new _promise.default((resolve, reject) => {
-    fs.readFile(file, "utf-8", (err, data) => {
-      if (err) {
-        return reject(err);
-      } else {
-        return resolve(JSON.parse(data));
+const findFiles = dir => {
+  const matchedFiles = [];
+  const files = readdirSync(dir);
+  for (const file of files) {
+    const absolute = path.join(dir, file);
+    if (statSync(absolute).isDirectory()) {
+      const foundFiles = findFiles(absolute);
+      matchedFiles.push(...foundFiles);
+    } else {
+      const filename = path.basename(file);
+      if (filename === "LayoutHintConfig.json") {
+        matchedFiles.push(absolute);
       }
-    });
-  }));
-  return _promise.default.all(filePromises);
+    }
+  }
+  return matchedFiles;
 };
 
 /**
@@ -31,21 +40,13 @@ const readFiles = files => {
  */
 exports.mergeLayoutHintConfigurations = async (srcFolder, outputFolder) => {
   const escapedSrcFolder = srcFolder.replace(/\\/g, "/");
-  return new _promise.default((resolve, reject) => {
-    glob(escapedSrcFolder + "/**/LayoutHintConfig.json", {}, (err, files) => {
-      if (err) {
-        return reject(err);
-      }
-      readFiles(files).then(jsons => {
-        const newConfig = (0, _assign.default)(LayoutHintConfiguration, ...jsons);
-        fs.writeFile(path.join(outputFolder, "LayoutHintConfig.json"), (0, _stringify.default)(newConfig), writeErr => {
-          if (writeErr) {
-            return reject(writeErr);
-          }
-          return resolve();
-        });
-      });
-    });
+  const files = findFiles(escapedSrcFolder);
+  const jsons = (0, _map.default)(files).call(files, file => {
+    const content = readFileSync(file, "utf-8");
+    return JSON.parse(content);
   });
+  const newConfig = (0, _assign.default)(LayoutHintConfiguration, ...jsons);
+  writeFileSync(path.join(outputFolder, "LayoutHintConfig.json"), (0, _stringify.default)(newConfig));
+  return _promise.default.resolve();
 };
 //# sourceMappingURL=mergeLayoutHintConfigurations.js.map

package/lib/builder/mergeLayoutHintConfigurations.js.flow

@@ -1,25 +1,28 @@
 // @flow
-const glob = require("glob");
-const fs = require("fs");
 const path = require("path");
+const { readdirSync, statSync, readFileSync, writeFileSync } = require("fs");
 
 const { LayoutHintConfiguration } = require("../constants/LayoutHintConfig");
 
-const readFiles = (files: Array<string>) => {
-  const filePromises = files.map(
-    (file) =>
-      new Promise((resolve, reject) => {
-        fs.readFile(file, "utf-8", (err, data) => {
-          if (err) {
-            return reject(err);
-          } else {
-            return resolve(JSON.parse(data));
-          }
-        });
-      }),
-  );
+const findFiles = (dir: string): Array<string> => {
+  const matchedFiles = [];
+
+  const files = readdirSync(dir);
 
-  return Promise.all(filePromises);
+  for (const file of files) {
+    const absolute = path.join(dir, file);
+    if (statSync(absolute).isDirectory()) {
+      const foundFiles = findFiles(absolute);
+      matchedFiles.push(...foundFiles);
+    } else {
+      const filename = path.basename(file);
+      if (filename === "LayoutHintConfig.json") {
+        matchedFiles.push(absolute);
+      }
+    }
+  }
+
+  return matchedFiles;
 };
 
 /**
@@ -32,27 +35,20 @@ exports.mergeLayoutHintConfigurations = async (
   outputFolder: string,
 ): Promise<void> => {
   const escapedSrcFolder = srcFolder.replace(/\\/g, "/");
-  return new Promise((resolve, reject) => {
-    glob(escapedSrcFolder + "/**/LayoutHintConfig.json", {}, (err, files) => {
-      if (err) {
-        return reject(err);
-      }
 
-      readFiles(files).then((jsons) => {
-        const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);
-        fs.writeFile(
-          path.join(outputFolder, "LayoutHintConfig.json"),
-          JSON.stringify(newConfig),
-
-          (writeErr) => {
-            if (writeErr) {
-              return reject(writeErr);
-            }
-
-            return resolve();
-          },
-        );
-      });
-    });
+  const files = findFiles(escapedSrcFolder);
+
+  const jsons = files.map((file) => {
+    const content = readFileSync(file, "utf-8");
+    return JSON.parse(content);
   });
+
+  const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);
+
+  writeFileSync(
+    path.join(outputFolder, "LayoutHintConfig.json"),
+    JSON.stringify(newConfig),
+  );
+
+  return Promise.resolve();
 };

package/lib/builder/mergeLayoutHintConfigurations.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergeLayoutHintConfigurations.js","names":["glob","require","fs","path","LayoutHintConfiguration","readFiles","files","filePromises","_map","default","call","file","_promise","resolve","reject","readFile","err","data","JSON","parse","all","exports","mergeLayoutHintConfigurations","srcFolder","outputFolder","escapedSrcFolder","replace","then","jsons","newConfig","_assign","writeFile","join","_stringify","writeErr"],"sources":["../../src/builder/mergeLayoutHintConfigurations.js"],"sourcesContent":["// @flow\nconst glob = require(\"glob\");\nconst fs = require(\"fs\");\nconst path = require(\"path\");\n\nconst { LayoutHintConfiguration } = require(\"../constants/LayoutHintConfig\");\n\nconst readFiles = (files: Array<string>) => {\n  const filePromises = files.map(\n    (file) =>\n      new Promise((resolve, reject) => {\n        fs.readFile(file, \"utf-8\", (err, data) => {\n          if (err) {\n            return reject(err);\n          } else {\n            return resolve(JSON.parse(data));\n          }\n        });\n      }),\n  );\n\n  return Promise.all(filePromises);\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  return new Promise((resolve, reject) => {\n    glob(escapedSrcFolder + \"/**/LayoutHintConfig.json\", {}, (err, files) => {\n      if (err) {\n        return reject(err);\n      }\n\n      readFiles(files).then((jsons) => {\n        const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);\n        fs.writeFile(\n          path.join(outputFolder, \"LayoutHintConfig.json\"),\n          JSON.stringify(newConfig),\n\n          (writeErr) => {\n            if (writeErr) {\n              return reject(writeErr);\n            }\n\n            return resolve();\n          },\n        );\n      });\n    });\n  });\n};\n"],"mappings":";;;;;;;AACA,MAAMA,IAAI,GAAGC,OAAO,CAAC,MAAM,CAAC;AAC5B,MAAMC,EAAE,GAAGD,OAAO,CAAC,IAAI,CAAC;AACxB,MAAME,IAAI,GAAGF,OAAO,CAAC,MAAM,CAAC;AAE5B,MAAM;EAAEG;AAAwB,CAAC,GAAGH,OAAO,CAAC,+BAA+B,CAAC;AAE5E,MAAMI,SAAS,GAAIC,KAAoB,IAAK;EAC1C,MAAMC,YAAY,GAAG,IAAAC,IAAA,CAAAC,OAAA,EAAAH,KAAK,EAAAI,IAAA,CAALJ,KAAK,EACvBK,IAAI,IACH,IAAAC,QAAA,CAAAH,OAAA,CAAY,CAACI,OAAO,EAAEC,MAAM,KAAK;IAC/BZ,EAAE,CAACa,QAAQ,CAACJ,IAAI,EAAE,OAAO,EAAE,CAACK,GAAG,EAAEC,IAAI,KAAK;MACxC,IAAID,GAAG,EAAE;QACP,OAAOF,MAAM,CAACE,GAAG,CAAC;MACpB,CAAC,MAAM;QACL,OAAOH,OAAO,CAACK,IAAI,CAACC,KAAK,CAACF,IAAI,CAAC,CAAC;MAClC;IACF,CAAC,CAAC;EACJ,CAAC,CACL,CAAC;EAED,OAAOL,QAAA,CAAAH,OAAA,CAAQW,GAAG,CAACb,YAAY,CAAC;AAClC,CAAC;;AAED;AACA;AACA;AACA;AACA;AACAc,OAAO,CAACC,6BAA6B,GAAG,OACtCC,SAAiB,EACjBC,YAAoB,KACF;EAClB,MAAMC,gBAAgB,GAAGF,SAAS,CAACG,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC;EACtD,OAAO,IAAAd,QAAA,CAAAH,OAAA,CAAY,CAACI,OAAO,EAAEC,MAAM,KAAK;IACtCd,IAAI,CAACyB,gBAAgB,GAAG,2BAA2B,EAAE,CAAC,CAAC,EAAE,CAACT,GAAG,EAAEV,KAAK,KAAK;MACvE,IAAIU,GAAG,EAAE;QACP,OAAOF,MAAM,CAACE,GAAG,CAAC;MACpB;MAEAX,SAAS,CAACC,KAAK,CAAC,CAACqB,IAAI,CAAEC,KAAK,IAAK;QAC/B,MAAMC,SAAS,GAAG,IAAAC,OAAA,CAAArB,OAAA,EAAcL,uBAAuB,EAAE,GAAGwB,KAAK,CAAC;QAClE1B,EAAE,CAAC6B,SAAS,CACV5B,IAAI,CAAC6B,IAAI,CAACR,YAAY,EAAE,uBAAuB,CAAC,EAChD,IAAAS,UAAA,CAAAxB,OAAA,EAAeoB,SAAS,CAAC,EAExBK,QAAQ,IAAK;UACZ,IAAIA,QAAQ,EAAE;YACZ,OAAOpB,MAAM,CAACoB,QAAQ,CAAC;UACzB;UAEA,OAAOrB,OAAO,CAAC,CAAC;QAClB,CACF,CAAC;MACH,CAAC,CAAC;IACJ,CAAC,CAAC;EACJ,CAAC,CAAC;AACJ,CAAC"}
+{"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.34.0",
+  "version": "1.34.1",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -89,7 +89,6 @@
     "dequal": "^2.0.3",
     "file-size": "^1.0.0",
     "format-message": "^6.2.4",
-    "glob": "^10.3.4",
     "html-entities": "^2.4.0",
     "iban": "^0.0.14",
     "js-cookie": "^3.0.5",

package/src/builder/__tests__/LayoutHintConfig.json

@@ -0,0 +1,11 @@
+{
+  "MOCK": {
+    "hint": "mock",
+    "description": {
+      "NL": "mock dutch description",
+      "EN": "mock english description"
+    },
+    "link": "",
+    "component": ["attribute"]
+  }
+}

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

@@ -1,8 +1,8 @@
 import { mergeLayoutHintConfigurations } from "../mergeLayoutHintConfigurations";
 import { LayoutHintConfiguration } from "../../constants/LayoutHintConfig";
 const fs = require("fs");
-
-const projectJson = {
+//
+const projectJson1 = {
   MOCK: {
     hint: "mock",
     description: {
@@ -14,31 +14,38 @@ const projectJson = {
   },
 };
 
+const projectJson2 = {
+  MOCK2: {
+    hint: "mock2",
+    description: {
+      NL: "mock2 dutch description",
+      EN: "mock2 english description",
+    },
+    link: "",
+    component: ["attribute"],
+  },
+};
+
 jest.mock("fs", () => ({
-  readFile: jest.fn((path, options, callback) =>
-    callback(null, JSON.stringify(projectJson)),
-  ),
-  writeFile: jest.fn((path, options, callback) => callback(null)),
+  ...jest.requireActual("fs"),
+  writeFileSync: jest.fn(),
 }));
 
-jest.mock("glob", () =>
-  jest.fn((pattern, options, callback) =>
-    callback(null, ["/input/LayoutHintConfig.json"]),
-  ),
-);
-
 describe("mergeLayoutHintConfigurations", () => {
   it("generates layouthint.json", async () => {
     expect.assertions(1);
 
-    const expectedJson = { ...LayoutHintConfiguration, ...projectJson };
+    const expectedJson = {
+      ...LayoutHintConfiguration,
+      ...projectJson1,
+      ...projectJson2,
+    };
 
-    await mergeLayoutHintConfigurations("/input", "/output");
+    await mergeLayoutHintConfigurations("./src", "/output");
 
-    expect(fs.writeFile).toHaveBeenCalledWith(
-      expect.stringContaining("LayoutHintConfig.json"),
+    expect(fs.writeFileSync).toHaveBeenCalledWith(
+      "\\output\\LayoutHintConfig.json",
       JSON.stringify(expectedJson),
-      expect.anything(),
     );
   });
 });

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

@@ -0,0 +1,11 @@
+{
+  "MOCK2": {
+    "hint": "mock2",
+    "description": {
+      "NL": "mock2 dutch description",
+      "EN": "mock2 english description"
+    },
+    "link": "",
+    "component": ["attribute"]
+  }
+}

package/src/builder/mergeLayoutHintConfigurations.js

@@ -1,25 +1,28 @@
 // @flow
-const glob = require("glob");
-const fs = require("fs");
 const path = require("path");
+const { readdirSync, statSync, readFileSync, writeFileSync } = require("fs");
 
 const { LayoutHintConfiguration } = require("../constants/LayoutHintConfig");
 
-const readFiles = (files: Array<string>) => {
-  const filePromises = files.map(
-    (file) =>
-      new Promise((resolve, reject) => {
-        fs.readFile(file, "utf-8", (err, data) => {
-          if (err) {
-            return reject(err);
-          } else {
-            return resolve(JSON.parse(data));
-          }
-        });
-      }),
-  );
+const findFiles = (dir: string): Array<string> => {
+  const matchedFiles = [];
+
+  const files = readdirSync(dir);
 
-  return Promise.all(filePromises);
+  for (const file of files) {
+    const absolute = path.join(dir, file);
+    if (statSync(absolute).isDirectory()) {
+      const foundFiles = findFiles(absolute);
+      matchedFiles.push(...foundFiles);
+    } else {
+      const filename = path.basename(file);
+      if (filename === "LayoutHintConfig.json") {
+        matchedFiles.push(absolute);
+      }
+    }
+  }
+
+  return matchedFiles;
 };
 
 /**
@@ -32,27 +35,20 @@ exports.mergeLayoutHintConfigurations = async (
   outputFolder: string,
 ): Promise<void> => {
   const escapedSrcFolder = srcFolder.replace(/\\/g, "/");
-  return new Promise((resolve, reject) => {
-    glob(escapedSrcFolder + "/**/LayoutHintConfig.json", {}, (err, files) => {
-      if (err) {
-        return reject(err);
-      }
 
-      readFiles(files).then((jsons) => {
-        const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);
-        fs.writeFile(
-          path.join(outputFolder, "LayoutHintConfig.json"),
-          JSON.stringify(newConfig),
-
-          (writeErr) => {
-            if (writeErr) {
-              return reject(writeErr);
-            }
-
-            return resolve();
-          },
-        );
-      });
-    });
+  const files = findFiles(escapedSrcFolder);
+
+  const jsons = files.map((file) => {
+    const content = readFileSync(file, "utf-8");
+    return JSON.parse(content);
   });
+
+  const newConfig = Object.assign(LayoutHintConfiguration, ...jsons);
+
+  writeFileSync(
+    path.join(outputFolder, "LayoutHintConfig.json"),
+    JSON.stringify(newConfig),
+  );
+
+  return Promise.resolve();
 };