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

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 - 2024 smapiot
+Copyright (c) 2019 - 2025 smapiot
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

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;
@@ -1493,7 +1495,9 @@ var tsVersions = {
   14: "~4.7",
   15: "~4.8",
   16: "~4.9",
-  17: "~5.2"
+  17: "~5.2",
+  18: "~5.5",
+  19: "~5.7"
 };
 var rxjsVersions = {
   2: "^5.0",
@@ -1510,7 +1514,9 @@ var rxjsVersions = {
   14: "^7.4",
   15: "^7.4",
   16: "^7.4",
-  17: "^7.4"
+  17: "^7.4",
+  18: "^7.4",
+  19: "^7.4"
 };
 var zoneVersions = {
   2: "~0.9",
@@ -1527,7 +1533,9 @@ var zoneVersions = {
   14: "0.12.0",
   15: "0.13.0",
   16: "0.13.0",
-  17: "0.14.0"
+  17: "~0.14",
+  18: "~0.14",
+  19: "~0.15"
 };
 
 // src/helpers.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smapiot/pilet-template-angular",
-  "version": "1.0.11",
+  "version": "1.0.12-beta.7966",
   "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.7966"
   },
-  "gitHead": "95eec8d8e24e6d7682694e3f23a9994f76805970"
+  "gitHead": "f697eb2178abc8eebbc3a453dc0c71f1f0627ecf"
 }

package/src/versions.ts

@@ -1,3 +1,5 @@
+// Source: https://angular.dev/reference/versions
+
 // Mapping of Angular to TypeScript versions
 export const tsVersions = {
   2: '~2.0',
@@ -15,6 +17,8 @@ export const tsVersions = {
   15: '~4.8',
   16: '~4.9',
   17: '~5.2',
+  18: '~5.5',
+  19: '~5.7',
 };
 
 // Mapping of Angular to RxJs versions
@@ -34,6 +38,8 @@ export const rxjsVersions = {
   15: '^7.4',
   16: '^7.4',
   17: '^7.4',
+  18: '^7.4',
+  19: '^7.4',
 };
 
 // Mapping of Angular to Zone.js versions
@@ -52,5 +58,7 @@ export const zoneVersions = {
   14: '0.12.0',
   15: '0.13.0',
   16: '0.13.0',
-  17: '0.14.0',
+  17: '~0.14',
+  18: '~0.14',
+  19: '~0.15',
 };