@smapiot/pilet-template-angular 0.15.0-beta.4608 → 0.15.0-beta.4611

package/lib/index.js

@@ -43,6 +43,39 @@ var __toCommonJS = /* @__PURE__ */ ((cache) => {
   };
 })(typeof WeakMap !== "undefined" ? /* @__PURE__ */ new WeakMap() : 0);
 
+// ../../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.mergeFiles = void 0;
+    function mergeFiles(files) {
+      const result = {};
+      for (const file of files) {
+        const items = result[file.path];
+        if (Array.isArray(items)) {
+          items.push(file);
+        } else {
+          result[file.path] = [file];
+        }
+      }
+      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 str = JSON.stringify(obj);
+          return {
+            path,
+            content: Buffer.from(str, "utf8")
+          };
+        }
+        return items.pop();
+      });
+    }
+    exports.mergeFiles = mergeFiles;
+  }
+});
+
 // ../../node_modules/ejs/lib/utils.js
 var require_utils = __commonJS({
   "../../node_modules/ejs/lib/utils.js"(exports) {
@@ -1036,10 +1069,12 @@ var require_utils2 = __commonJS({
       const absPath = path_1.posix.join(targetDir, fileName);
       const path = (0, path_1.isAbsolute)(absPath) ? (0, path_1.relative)(root2, absPath) : absPath;
       (0, log_1.log)("verbose", `Adding "source" to package.json: "${path}"`);
-      return Promise.resolve({
-        content: Buffer.from(`{"source": ${JSON.stringify(path)}}`, "utf8"),
-        path: "package.json"
-      });
+      return {
+        languages: ["ts", "js"],
+        name: "package.json",
+        content: JSON.stringify({ source: path }),
+        target: "<root>/package.json"
+      };
     }
     exports.getPackageJsonWithSource = getPackageJsonWithSource;
     function getPiralInstance2(root2, sourceName) {
@@ -1140,12 +1175,13 @@ 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 template_1 = require_template();
     var parent_1 = require_parent();
     var utils_1 = require_utils2();
     function createPiletTemplateFactory2(templateRoot, getAllSources, defaultArgs = {}) {
       const sourceDir = (0, path_1.resolve)(templateRoot, "templates");
-      return (projectRoot, args, details) => {
+      return (projectRoot, args, details) => __awaiter(this, void 0, void 0, function* () {
         (0, parent_1.configure)(templateRoot, details);
         const allArgs = Object.assign(Object.assign({}, defaultArgs), args);
         const { language = "ts", sourceName, src = "<root>/src", plugins = (0, utils_1.getPlugins)(projectRoot, sourceName), mocks = "<src>/mocks" } = allArgs;
@@ -1161,11 +1197,10 @@ var require_factory = __commonJS({
           src,
           mocks
         });
-        return Promise.all([
-          ...sources.map((source) => (0, template_1.getFileFromTemplate)(sourceDir, source, data)),
-          (0, utils_1.getPackageJsonWithSource)(data.projectRoot, data.src, `index${data.extension}`)
-        ]);
-      };
+        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);
+      });
     }
     exports.createPiletTemplateFactory = createPiletTemplateFactory2;
     function createPiralTemplateFactory(templateRoot, getAllSources, defaultArgs = {}) {
@@ -1188,7 +1223,8 @@ var require_factory = __commonJS({
           src,
           mocks
         });
-        return Promise.all(sources.map((source) => (0, template_1.getFileFromTemplate)(sourceDir, source, data)));
+        const files = yield Promise.all(sources.map((source) => (0, template_1.getFileFromTemplate)(sourceDir, source, data)));
+        return (0, merge_1.mergeFiles)(files);
       });
     }
     exports.createPiralTemplateFactory = createPiralTemplateFactory;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smapiot/pilet-template-angular",
-  "version": "0.15.0-beta.4608",
+  "version": "0.15.0-beta.4611",
   "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.4608"
+    "@smapiot/template-utils": "0.15.0-beta.4611"
   },
-  "gitHead": "4ed832080876ebeaf3cf147b42a2f2fadac0e14e"
+  "gitHead": "3884a484ec7819ec8f42aa09dafb8d09e445cd14"
 }

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,4 +1,3 @@
-import * as React from 'react';
 <% if (standalone) { -%>
 import { defineNgModule, fromNg } from 'piral-ng/convert';
 <% } -%>
@@ -8,18 +7,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 {}

package/templates/webpack.config.js.ejs

@@ -3,7 +3,7 @@ const extendWebpack = require('piral-ng/extend-webpack');
 module.exports = (config) => {
   return extendWebpack({
     ngOptions: {
-      jitMode: true
-    }
+      jitMode: true,
+    },
   })(config);
 };