@smapiot/pilet-template-angular 1.0.11 → 1.0.12-beta.7845

package/lib/index.js

@@ -274,8 +274,9 @@ var require_io = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.mergeFiles = void 0;
     var merge_1 = require_merge();
-    function mergeFiles(files) {
+    function mergeFiles(files, deep) {
       const result = {};
+      const tests = deep.map((m) => typeof m === "string" ? (path) => path === m : (path) => m.test(path));
       for (const file of files) {
         const items = result[file.path];
         if (Array.isArray(items)) {
@@ -286,7 +287,7 @@ var require_io = __commonJS({
       }
       return Object.keys(result).map((path) => {
         const items = result[path];
-        if (items.length !== 1 && path.endsWith("package.json")) {
+        if (items.length !== 1 && tests.some((test) => test(path))) {
           const obj = items.map(({ content }) => JSON.parse(content.toString("utf8"))).reduce((p, c) => (0, merge_1.deepMerge)(p, c), {});
           const str = JSON.stringify(obj);
           return {
@@ -1373,7 +1374,8 @@ var require_factory = __commonJS({
     var parent_1 = require_parent();
     var template_1 = require_template();
     var utils_1 = require_utils();
-    function createPiletTemplateFactory2(templateRoot, getAllSources, defaultArgs = {}) {
+    var mergePackageJson = [/package\.json$/];
+    function createPiletTemplateFactory2(templateRoot, getAllSources, defaultArgs = {}, deepMerged = mergePackageJson) {
       const sourceDir = (0, path_1.resolve)(templateRoot, "templates");
       return (projectRoot, args, details) => __awaiter(this, void 0, void 0, function* () {
         (0, parent_1.configure)(templateRoot, details);
@@ -1397,11 +1399,11 @@ var require_factory = __commonJS({
         ];
         const sources = [...allSources, ...defaultSources].filter((m) => m.languages.includes(language));
         const files = yield Promise.all(sources.map((source) => (0, template_1.getFileFromTemplate)(sourceDir, source, data)));
-        return (0, io_1.mergeFiles)(files);
+        return (0, io_1.mergeFiles)(files, deepMerged);
       });
     }
     exports.createPiletTemplateFactory = createPiletTemplateFactory2;
-    function createPiralTemplateFactory(templateRoot, getAllSources, defaultArgs = {}) {
+    function createPiralTemplateFactory(templateRoot, getAllSources, defaultArgs = {}, deepMerged = mergePackageJson) {
       const sourceDir = (0, path_1.resolve)(templateRoot, "templates");
       return (projectRoot, args, details) => __awaiter(this, void 0, void 0, function* () {
         (0, parent_1.configure)(templateRoot, details);
@@ -1424,7 +1426,7 @@ var require_factory = __commonJS({
         const customSources = allSources.filter((m) => m.frameworks.includes(packageName));
         const sources = [...customSources, ...defaultSources].filter((m) => m.languages.includes(language));
         const files = yield Promise.all(sources.map((source) => (0, template_1.getFileFromTemplate)(sourceDir, source, data)));
-        return (0, io_1.mergeFiles)(files);
+        return (0, io_1.mergeFiles)(files, deepMerged);
       });
     }
     exports.createPiralTemplateFactory = createPiralTemplateFactory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smapiot/pilet-template-angular",
-  "version": "1.0.11",
+  "version": "1.0.12-beta.7845",
   "description": "Official scaffolding template for pilets: 'angular'.",
   "keywords": [
     "piral-cli",
@@ -54,7 +54,7 @@
     "test": "echo \"Error: run tests from root\" && exit 1"
   },
   "devDependencies": {
-    "@smapiot/template-utils": "^1.0.11"
+    "@smapiot/template-utils": "1.0.12-beta.7845"
   },
-  "gitHead": "95eec8d8e24e6d7682694e3f23a9994f76805970"
+  "gitHead": "46a3217b7197c599d38929f71d2714c9615c9f7d"
 }