@smapiot/pilet-template-angular 0.15.0-beta.4610 → 0.15.0-beta.4629

package/lib/index.js

@@ -46,9 +46,73 @@ var __toCommonJS = /* @__PURE__ */ ((cache) => {
 // ../../packages/template-utils/lib/merge.js
 var require_merge = __commonJS({
   "../../packages/template-utils/lib/merge.js"(exports) {
+    "use strict";
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.deepMerge = void 0;
+    function isMergeableObject(val) {
+      const nonNullObject = val && typeof val === "object";
+      return nonNullObject && Object.prototype.toString.call(val) !== "[object RegExp]" && Object.prototype.toString.call(val) !== "[object Date]";
+    }
+    function emptyTarget(val) {
+      return Array.isArray(val) ? [] : {};
+    }
+    function cloneIfNecessary(value) {
+      switch (typeof value) {
+        case "boolean":
+        case "number":
+        case "string":
+        case "symbol":
+        case "undefined":
+          return value;
+      }
+      return deepMerge(emptyTarget(value), value);
+    }
+    function defaultArrayMerge(target, source) {
+      const destination = target.slice();
+      source.forEach((e, i) => {
+        if (typeof destination[i] === "undefined") {
+          destination[i] = cloneIfNecessary(e);
+        } else if (isMergeableObject(e)) {
+          destination[i] = deepMerge(target[i], e);
+        } else if (target.indexOf(e) === -1) {
+          destination.push(cloneIfNecessary(e));
+        }
+      });
+      return destination;
+    }
+    function mergeObject(target, source) {
+      const destination = {};
+      if (isMergeableObject(target)) {
+        Object.keys(target).forEach((key) => {
+          destination[key] = cloneIfNecessary(target[key]);
+        });
+      }
+      Object.keys(source).forEach((key) => {
+        if (!isMergeableObject(source[key]) || !target[key]) {
+          destination[key] = cloneIfNecessary(source[key]);
+        } else {
+          destination[key] = deepMerge(target[key], source[key]);
+        }
+      });
+      return destination;
+    }
+    function deepMerge(target, source) {
+      if (Array.isArray(source)) {
+        return Array.isArray(target) ? defaultArrayMerge(target, source) : cloneIfNecessary(source);
+      }
+      return mergeObject(target, source);
+    }
+    exports.deepMerge = deepMerge;
+  }
+});
+
+// ../../packages/template-utils/lib/io.js
+var require_io = __commonJS({
+  "../../packages/template-utils/lib/io.js"(exports) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.mergeFiles = void 0;
+    var merge_1 = require_merge();
     function mergeFiles(files) {
       const result = {};
       for (const file of files) {
@@ -62,7 +126,7 @@ var require_merge = __commonJS({
       return Object.keys(result).map((path) => {
         const items = result[path];
         if (items.length !== 1 && path.endsWith("package.json")) {
-          const obj = items.map(({ content }) => JSON.parse(content.toString("utf8"))).reduce((p, c) => Object.assign(p, c), {});
+          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 {
             path,
@@ -1175,7 +1239,7 @@ var require_factory = __commonJS({
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.createPiralTemplateFactory = exports.createPiletTemplateFactory = void 0;
     var path_1 = require("path");
-    var merge_1 = require_merge();
+    var io_1 = require_io();
     var template_1 = require_template();
     var parent_1 = require_parent();
     var utils_1 = require_utils2();
@@ -1199,7 +1263,7 @@ var require_factory = __commonJS({
         });
         const defaultSource = (0, utils_1.getPackageJsonWithSource)(data.projectRoot, data.src, `index${data.extension}`);
         const files = yield Promise.all([...sources, defaultSource].map((source) => (0, template_1.getFileFromTemplate)(sourceDir, source, data)));
-        return (0, merge_1.mergeFiles)(files);
+        return (0, io_1.mergeFiles)(files);
       });
     }
     exports.createPiletTemplateFactory = createPiletTemplateFactory2;
@@ -1224,7 +1288,7 @@ var require_factory = __commonJS({
           mocks
         });
         const files = yield Promise.all(sources.map((source) => (0, template_1.getFileFromTemplate)(sourceDir, source, data)));
-        return (0, merge_1.mergeFiles)(files);
+        return (0, io_1.mergeFiles)(files);
       });
     }
     exports.createPiralTemplateFactory = createPiralTemplateFactory;
@@ -1301,20 +1365,18 @@ function getStandalonePackageJson(cliVersion, ngVersion) {
   return {
     importmap: {
       imports: {
-        "@angular/animations": ".",
-        "@angular/cli": ".",
-        "@angular/common": ".",
-        "@angular/compiler": ".",
-        "@angular/core": ".",
-        "@angular/forms": ".",
-        "@angular/platform-browser": ".",
-        "@angular/platform-browser-dynamic": ".",
-        "@angular/router": "."
+        "@angular/animations": "@angular/animations",
+        "@angular/common": "@angular/common",
+        "@angular/compiler": "@angular/compiler",
+        "@angular/core": "@angular/core",
+        "@angular/forms": "@angular/forms",
+        "@angular/platform-browser": "@angular/platform-browser",
+        "@angular/platform-browser-dynamic": "@angular/platform-browser-dynamic",
+        "@angular/router": "@angular/router"
       }
     },
     dependencies: {
       "@angular/animations": ngVersion,
-      "@angular/cli": ngVersion,
       "@angular/common": ngVersion,
       "@angular/compiler": ngVersion,
       "@angular/core": ngVersion,
@@ -1328,6 +1390,7 @@ function getStandalonePackageJson(cliVersion, ngVersion) {
     },
     devDependencies: {
       "@angular/compiler-cli": ngVersion,
+      "@angular/cli": ngVersion,
       "@ngtools/webpack": ngVersion,
       "copy-webpack-plugin": "^10",
       "html-loader": "^3",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smapiot/pilet-template-angular",
-  "version": "0.15.0-beta.4610",
+  "version": "0.15.0-beta.4629",
   "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": "0.15.0-beta.4610"
+    "@smapiot/template-utils": "0.15.0-beta.4629"
   },
-  "gitHead": "198b49c082726c9d902fb4a1530199c0939c2eca"
+  "gitHead": "9f8126295daf838dfe133de6ee0a173110c36527"
 }

package/src/helpers.ts

@@ -27,20 +27,18 @@ export function getStandalonePackageJson(cliVersion: string, ngVersion: string)
   return {
     importmap: {
       imports: {
-        '@angular/animations': '.',
-        '@angular/cli': '.',
-        '@angular/common': '.',
-        '@angular/compiler': '.',
-        '@angular/core': '.',
-        '@angular/forms': '.',
-        '@angular/platform-browser': '.',
-        '@angular/platform-browser-dynamic': '.',
-        '@angular/router': '.',
+        '@angular/animations': '@angular/animations',
+        '@angular/common': '@angular/common',
+        '@angular/compiler': '@angular/compiler',
+        '@angular/core': '@angular/core',
+        '@angular/forms': '@angular/forms',
+        '@angular/platform-browser': '@angular/platform-browser',
+        '@angular/platform-browser-dynamic': '@angular/platform-browser-dynamic',
+        '@angular/router': '@angular/router',
       },
     },
     dependencies: {
       '@angular/animations': ngVersion,
-      '@angular/cli': ngVersion,
       '@angular/common': ngVersion,
       '@angular/compiler': ngVersion,
       '@angular/core': ngVersion,
@@ -54,6 +52,7 @@ export function getStandalonePackageJson(cliVersion: string, ngVersion: string)
     },
     devDependencies: {
       '@angular/compiler-cli': ngVersion,
+      '@angular/cli': ngVersion,
       '@ngtools/webpack': ngVersion,
       'copy-webpack-plugin': '^10',
       'html-loader': '^3',

package/templates/app.module.ts.ejs

@@ -5,9 +5,9 @@ import { SharedModule } from 'piral-ng/common';
 import { PageComponent } from './page.component';
 
 @NgModule({
-	bootstrap: [PageComponent],
-	declarations: [PageComponent],
-	exports: [PageComponent],
-	imports: [BrowserModule, SharedModule]
+  bootstrap: [PageComponent],
+  declarations: [PageComponent],
+  exports: [PageComponent],
+  imports: [BrowserModule, SharedModule]
 })
 export class AppModule {}

package/templates/index.jsx.ejs

@@ -1,3 +1 @@
-import * as React from 'react';
-
 export function setup(app) {}

package/templates/index.tsx.ejs

@@ -1,5 +1,5 @@
-import * as React from 'react';
 <% if (standalone) { -%>
+import '@angular/compiler';
 import { defineNgModule, fromNg } from 'piral-ng/convert';
 <% } -%>
 import { AppModule } from './app/app.module';
@@ -8,18 +8,18 @@ import type { PiletApi } from '<%- sourceName %>';
 
 export function setup(app: PiletApi) {
 <% if (standalone) { -%>
-	app.defineNgModule(AppModule, {
+  defineNgModule(AppModule, {
     // remove the following if you actually want to enable zone.js
-		ngZone: 'noop',
-	});
+    ngZone: 'noop',
+  });
 
-  app.registerPage('/sample', app.fromNg(PageComponent));
+  app.registerPage('/sample', fromNg(PageComponent));
 <% } else { -%>
-	defineNgModule(AppModule, {
+  app.defineNgModule(AppModule, {
     // remove the following if you actually want to enable zone.js
-		ngZone: 'noop',
-	});
+    ngZone: 'noop',
+  });
 
-  app.registerPage('/sample', fromNg(PageComponent));
+  app.registerPage('/sample', app.fromNg(PageComponent));
 <% } -%>
 }

package/templates/page.component.ts.ejs

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 
 @Component({
-	styleUrls: ['./page.component.css'],
-	templateUrl: './page.component.html'
+  styleUrls: ['./page.component.css'],
+  templateUrl: './page.component.html'
 })
 export class PageComponent {}