piral-cli 0.15.0-beta.4472 → 0.15.0-beta.4549

package/lib/injectors/pilet-injector.js

@@ -16,8 +16,7 @@ const log_1 = require("../common/log");
 const spec_1 = require("../common/spec");
 const config_1 = require("../common/config");
 const external_1 = require("../external");
-const { host } = config_1.config;
-function fillPiletMeta(pilet, basePath, metaFile) {
+function fillPiletMeta(pilet, metaFile, subPath) {
     const { root, bundler } = pilet;
     const metaPath = (0, path_1.join)(root, metaFile);
     const packagePath = (0, path_1.join)(root, 'package.json');
@@ -25,10 +24,11 @@ function fillPiletMeta(pilet, basePath, metaFile) {
     const metaOverride = (0, fs_1.existsSync)(metaPath) ? external_1.jju.parse((0, fs_1.readFileSync)(metaPath, 'utf8')) : undefined;
     const file = bundler.bundle.name.replace(/^[\/\\]/, '');
     const target = (0, path_1.join)(bundler.bundle.dir, file);
-    const url = new url_1.URL(file, basePath);
-    const meta = Object.assign(Object.assign(Object.assign({ custom: def.custom, config: def.piletConfig }, metaOverride), { name: def.name, version: def.version, link: `${url.href}?updated=${Date.now()}` }), (0, spec_1.getPiletSpecMeta)(target, basePath));
-    pilet.meta = meta;
-    return JSON.stringify(meta);
+    pilet.getMeta = (parentPath) => {
+        const basePath = `${parentPath}${subPath}`;
+        const url = new url_1.URL(file, basePath);
+        return Object.assign(Object.assign(Object.assign({ custom: def.custom, config: def.piletConfig }, metaOverride), { name: def.name, version: def.version, link: `${url.href}?updated=${Date.now()}` }), (0, spec_1.getPiletSpecMeta)(target, basePath));
+    };
 }
 function loadFeed(feed) {
     var _a;
@@ -51,29 +51,30 @@ function loadFeed(feed) {
     });
 }
 class PiletInjector {
-    constructor(options, config, core) {
-        this.config = options;
+    constructor(config, serverConfig, core) {
+        this.config = config;
+        this.serverConfig = serverConfig;
         if (this.config.active) {
-            // either take a full URI or make it an absolute path relative to the current origin
-            this.piletApi = /^https?:/.test(options.api)
-                ? options.api
-                : `${config.ssl ? 'https' : 'http'}://${host}:${config.port}${options.api}`;
-            const { pilets, api, publicUrl } = options;
+            const { pilets, api, publicUrl } = config;
             this.indexPath = `${publicUrl}index.html`;
             const cbs = {};
             core.on('user-connected', (e) => {
                 if (e.target === '*' && e.url === api.substring(1)) {
-                    cbs[e.id] = (msg) => e.ws.send(msg);
+                    cbs[e.id] = {
+                        baseUrl: e.req.headers.origin,
+                        notify: (msg) => e.ws.send(msg),
+                    };
                 }
             });
             core.on('user-disconnected', (e) => {
                 delete cbs[e.id];
             });
             pilets.forEach((p, i) => p.bundler.on(() => {
-                const basePath = `${this.piletApi}/${i}/`;
-                const meta = fillPiletMeta(p, basePath, options.meta);
+                fillPiletMeta(p, config.meta, `/${i}/`);
                 for (const id of Object.keys(cbs)) {
-                    cbs[id](meta);
+                    const { baseUrl, notify } = cbs[id];
+                    const meta = this.getPiletMeta(baseUrl, p);
+                    notify(meta);
                 }
             }));
         }
@@ -91,10 +92,29 @@ class PiletInjector {
         return {};
     }
     setOptions() { }
-    getMeta() {
+    getPiletApi(baseUrl) {
+        const { api } = this.config;
+        if (/^https?:/.test(api)) {
+            return api;
+        }
+        else if (baseUrl) {
+            return `${baseUrl}${api}`;
+        }
+        else {
+            const { ssl, port } = this.serverConfig;
+            const { host } = config_1.config;
+            return `${ssl ? 'https' : 'http'}://${host}:${port}${api}`;
+        }
+    }
+    getPiletMeta(baseUrl, pilet) {
+        const basePath = this.getPiletApi(baseUrl);
+        return JSON.stringify(pilet.getMeta(basePath));
+    }
+    getIndexMeta(baseUrl) {
         return __awaiter(this, void 0, void 0, function* () {
             const { pilets, feed } = this.config;
-            const localPilets = pilets.map((pilet) => pilet.meta).filter(Boolean);
+            const basePath = this.getPiletApi(baseUrl);
+            const localPilets = pilets.map((pilet) => { var _a; return (_a = pilet.getMeta) === null || _a === void 0 ? void 0 : _a.call(pilet, basePath); }).filter(Boolean);
             const mergedPilets = this.mergePilets(localPilets, yield this.loadRemoteFeed(feed));
             return JSON.stringify(mergedPilets);
         });
@@ -136,7 +156,7 @@ class PiletInjector {
         const type = (_a = external_1.mime.getType(target)) !== null && _a !== void 0 ? _a : 'application/octet-stream';
         return this.sendContent(content, type, url);
     }
-    sendResponse(path, url) {
+    sendResponse(path, url, baseUrl) {
         return __awaiter(this, void 0, void 0, function* () {
             const { pilets } = this.config;
             const [index, ...rest] = path.split('/');
@@ -144,7 +164,7 @@ class PiletInjector {
             const bundler = pilet === null || pilet === void 0 ? void 0 : pilet.bundler;
             if (!path) {
                 yield (bundler === null || bundler === void 0 ? void 0 : bundler.ready());
-                const content = yield this.getMeta();
+                const content = yield this.getIndexMeta(baseUrl);
                 return this.sendContent(content, 'application/json', url);
             }
             else {
@@ -157,10 +177,10 @@ class PiletInjector {
             }
         });
     }
-    sendIndexFile(target, url) {
+    sendIndexFile(target, url, baseUrl) {
         const indexHtml = (0, fs_1.readFileSync)(target, 'utf8');
         // mechanism to inject server side debug piletApi config into piral emulator
-        const windowInjectionScript = `window['dbg:pilet-api'] = '${this.piletApi}';`;
+        const windowInjectionScript = `window['dbg:pilet-api'] = '${this.getPiletApi(baseUrl)}';`;
         const findStr = `<script`;
         const replaceStr = `<script>/* Pilet Debugging Emulator Config Injection */${windowInjectionScript}</script><script`;
         const content = indexHtml.replace(`${findStr}`, `${replaceStr}`);
@@ -168,13 +188,14 @@ class PiletInjector {
     }
     handle(req) {
         const { app, api, publicUrl } = this.config;
+        const baseUrl = req.headers.host ? `${req.encrypted ? 'https' : 'http'}://${req.headers.host}` : undefined;
         if (!req.target) {
             if (req.url.startsWith(publicUrl)) {
                 const path = req.url.substring(publicUrl.length).split('?')[0];
                 const target = (0, path_1.join)(app, path);
                 if ((0, fs_1.existsSync)(target) && (0, fs_1.statSync)(target).isFile()) {
                     if (req.url === this.indexPath) {
-                        return this.sendIndexFile(target, req.url);
+                        return this.sendIndexFile(target, req.url, baseUrl);
                     }
                     else {
                         return this.sendFile(target, req.url);
@@ -188,7 +209,7 @@ class PiletInjector {
         }
         else if (req.target === api) {
             const path = req.url.substring(1).split('?')[0];
-            return this.sendResponse(path, req.url);
+            return this.sendResponse(path, req.url, baseUrl);
         }
     }
 }

package/lib/injectors/pilet-injector.js.map

@@ -1 +1 @@
-{"version":3,"file":"pilet-injector.js","sourceRoot":"","sources":["../../src/injectors/pilet-injector.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pilet-injector.js","sourceRoot":"","sources":["../../src/injectors/pilet-injector.ts"],"names":[],"mappings":";;;;;;;;;;;AAAA,6BAA0B;AAC1B,+BAA4B;AAE5B,2BAAwD;AAExD,uCAAoC;AACpC,yCAAkD;AAClD,6CAA0D;AAC1D,0CAA+C;AAwB/C,SAAS,aAAa,CAAC,KAAY,EAAE,QAAgB,EAAE,OAAe;IACpE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAChC,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACtC,MAAM,WAAW,GAAG,IAAA,WAAI,EAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IAC/C,MAAM,GAAG,GAAG,cAAG,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC;IACzD,MAAM,YAAY,GAAG,IAAA,eAAU,EAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,cAAG,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IAClG,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAE9C,KAAK,CAAC,OAAO,GAAG,CAAC,UAAU,EAAE,EAAE;QAC7B,MAAM,QAAQ,GAAG,GAAG,UAAU,GAAG,OAAO,EAAE,CAAC;QAC3C,MAAM,GAAG,GAAG,IAAI,SAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAEpC,mDACE,MAAM,EAAE,GAAG,CAAC,MAAM,EAClB,MAAM,EAAE,GAAG,CAAC,WAAW,IACpB,YAAY,KACf,IAAI,EAAE,GAAG,CAAC,IAAI,EACd,OAAO,EAAE,GAAG,CAAC,OAAO,EACpB,IAAI,EAAE,GAAG,GAAG,CAAC,IAAI,YAAY,IAAI,CAAC,GAAG,EAAE,EAAE,KACtC,IAAA,uBAAgB,EAAC,MAAM,EAAE,QAAQ,CAAC,EACrC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,SAAe,QAAQ,CAAC,IAAY;;;QAClC,IAAI;YACF,MAAM,QAAQ,GAAG,MAAM,gBAAK,CAAC,OAAO,CAAC,GAAG,CACtC,IAAI,CACL,CAAC;YAEF,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBAChC,OAAO,QAAQ,CAAC,IAAI,CAAC;aACtB;iBAAM,IAAI,KAAK,CAAC,OAAO,CAAC,MAAA,QAAQ,CAAC,IAAI,0CAAE,KAAK,CAAC,EAAE;gBAC9C,OAAO,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC;aAC5B;iBAAM;gBACL,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;aACxB;SACF;QAAC,OAAO,CAAC,EAAE;YACV,IAAA,SAAG,EAAC,qBAAqB,EAAE,yBAAyB,IAAI,GAAG,CAAC,CAAC;SAC9D;;CACF;AAED,MAAqB,aAAa;IAKhC,YAAY,MAA2B,EAAE,YAA+B,EAAE,IAAkB;QAC1F,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QAEjC,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YACtB,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;YAC1C,IAAI,CAAC,SAAS,GAAG,GAAG,SAAS,YAAY,CAAC;YAC1C,MAAM,GAAG,GAAG,EAAE,CAAC;YAEf,IAAI,CAAC,EAAE,CAAC,gBAAgB,EAAE,CAAC,CAAC,EAAE,EAAE;gBAC9B,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE;oBAClD,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG;wBACV,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM;wBAC7B,MAAM,EAAE,CAAC,GAAW,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC;qBACxC,CAAC;iBACH;YACH,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,CAAC,EAAE,EAAE;gBACjC,OAAO,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACnB,CAAC,CAAC,CAAC;YAEH,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACtB,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE;gBAChB,aAAa,CAAC,CAAC,EAAE,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;gBAExC,KAAK,MAAM,EAAE,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;oBACjC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC,CAAC;oBACpC,MAAM,IAAI,GAAG,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;oBAC3C,MAAM,CAAC,IAAI,CAAC,CAAC;iBACd;YACH,CAAC,CAAC,CACH,CAAC;SACH;IACH,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAC5B,CAAC;IAED,IAAI,MAAM,CAAC,KAAK;QACd,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;IAC7B,CAAC;IAED,IAAI,IAAI;QACN,OAAO,gBAAgB,CAAC;IAC1B,CAAC;IAED,UAAU;QACR,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,UAAU,KAAI,CAAC;IAEf,WAAW,CAAC,OAAe;QACzB,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QAE5B,IAAI,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACxB,OAAO,GAAG,CAAC;SACZ;aAAM,IAAI,OAAO,EAAE;YAClB,OAAO,GAAG,OAAO,GAAG,GAAG,EAAE,CAAC;SAC3B;aAAM;YACL,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;YACxC,MAAM,EAAE,IAAI,EAAE,GAAG,eAAY,CAAC;YAC9B,OAAO,GAAG,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,MAAM,IAAI,IAAI,IAAI,GAAG,GAAG,EAAE,CAAC;SAC5D;IACH,CAAC;IAED,YAAY,CAAC,OAAe,EAAE,KAAY;QACxC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC3C,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IACjD,CAAC;IAEK,YAAY,CAAC,OAAe;;YAChC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;YACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC3C,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,WAAC,OAAA,MAAA,KAAK,CAAC,OAAO,sDAAG,QAAQ,CAAC,CAAA,EAAA,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACrF,MAAM,YAAY,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,EAAE,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC;YACpF,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACtC,CAAC;KAAA;IAEK,cAAc,CAAC,IAA6B;;YAChD,IAAI,IAAI,EAAE;gBACR,MAAM,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBAClD,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;aAC/C;QACH,CAAC;KAAA;IAED,WAAW,CAAC,WAAiC,EAAE,WAAwC;QACrF,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,WAAW,CAAC;SACpB;QAED,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,MAAM,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC;QAEhC,KAAK,MAAM,YAAY,IAAI,WAAW,EAAE;YACtC,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;YAC1G,KAAK,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5C,MAAM,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,CAAC;SAC3B;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,WAAW,CAAC,OAAwB,EAAE,IAAY,EAAE,GAAW;QAC7D,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QAEhC,OAAO;YACL,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE;YAC7B,OAAO,kCACF,OAAO,KACV,cAAc,EAAE,IAAI,EACpB,eAAe,EAAE,qCAAqC,EACtD,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,GAAG,GACb;YACD,MAAM,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE;YACrB,GAAG;YACH,OAAO;SACR,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,MAAc,EAAE,GAAW;;QAClC,MAAM,OAAO,GAAG,IAAA,iBAAY,EAAC,MAAM,CAAC,CAAC;QACrC,MAAM,IAAI,GAAG,MAAA,eAAI,CAAC,OAAO,CAAC,MAAM,CAAC,mCAAI,0BAA0B,CAAC;QAChE,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IAC9C,CAAC;IAEK,YAAY,CAAC,IAAY,EAAE,GAAW,EAAE,OAAe;;YAC3D,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;YAC/B,MAAM,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACzC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC;YAC7B,MAAM,OAAO,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,CAAC;YAE/B,IAAI,CAAC,IAAI,EAAE;gBACT,MAAM,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,EAAE,CAAA,CAAC;gBACvB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBACjD,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,kBAAkB,EAAE,GAAG,CAAC,CAAC;aAC3D;iBAAM;gBACL,OAAO,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE;oBAChC,MAAM,MAAM,GAAG,IAAA,WAAI,EAAC,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;oBAExD,IAAI,IAAA,eAAU,EAAC,MAAM,CAAC,IAAI,IAAA,aAAQ,EAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;wBACnD,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;qBACnC;gBACH,CAAC,CAAC,CAAC;aACJ;QACH,CAAC;KAAA;IAED,aAAa,CAAC,MAAc,EAAE,GAAW,EAAE,OAAe;QACxD,MAAM,SAAS,GAAG,IAAA,iBAAY,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAE/C,4EAA4E;QAC5E,MAAM,qBAAqB,GAAG,8BAA8B,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;QAC1F,MAAM,OAAO,GAAG,SAAS,CAAC;QAC1B,MAAM,UAAU,GAAG,0DAA0D,qBAAqB,kBAAkB,CAAC;QACrH,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,OAAO,EAAE,EAAE,GAAG,UAAU,EAAE,CAAC,CAAC;QAEjE,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,eAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;IAC9D,CAAC;IAED,MAAM,CAAC,GAAgB;QACrB,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC;QAC5C,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,MAAM,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAE3G,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE;YACf,IAAI,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;gBACjC,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/D,MAAM,MAAM,GAAG,IAAA,WAAI,EAAC,GAAG,EAAE,IAAI,CAAC,CAAC;gBAE/B,IAAI,IAAA,eAAU,EAAC,MAAM,CAAC,IAAI,IAAA,aAAQ,EAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE;oBACnD,IAAI,GAAG,CAAC,GAAG,KAAK,IAAI,CAAC,SAAS,EAAE;wBAC9B,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;qBACrD;yBAAM;wBACL,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;qBACvC;iBACF;qBAAM,IAAI,GAAG,CAAC,GAAG,KAAK,IAAI,CAAC,SAAS,EAAE;oBACrC,OAAO,IAAI,CAAC,MAAM,iCACb,GAAG,KACN,GAAG,EAAE,IAAI,CAAC,SAAS,IACnB,CAAC;iBACJ;aACF;YAED,OAAO,SAAS,CAAC;SAClB;aAAM,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE;YAC7B,MAAM,IAAI,GAAG,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;YAChD,OAAO,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;SAClD;IACH,CAAC;CACF;AApMD,gCAoMC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-cli",
-  "version": "0.15.0-beta.4472",
+  "version": "0.15.0-beta.4549",
   "description": "The standard CLI for creating and building a Piral instance or a Pilet.",
   "keywords": [
     "portal",
@@ -78,5 +78,5 @@
     "typescript": "^4.7.3",
     "yargs": "^15.4.1"
   },
-  "gitHead": "327a25c420b779caf6d2ea2edfc7ee59acd94a5b"
+  "gitHead": "ca7224ab671fd632fe9e5cfe9b7f573d9a105ce8"
 }

package/src/apps/new-piral.ts

@@ -4,8 +4,7 @@ import { SourceLanguage, LogLevels, Framework, NpmClientType } from '../types';
 import {
   ForceOverwrite,
   installNpmPackage,
-  updateExistingJson,
-  getPiralPackage,
+  patchPiralPackage,
   scaffoldPiralSourceFiles,
   createDirectory,
   createFileIfNotExists,
@@ -20,8 +19,6 @@ import {
   getPiralScaffoldData,
   config,
   initNpmProject,
-  logInfo,
-  getPiletsInfo,
 } from '../common';
 
 export interface NewPiralOptions {
@@ -173,11 +170,7 @@ always-auth=true`,
       );
     }
 
-    await createFileIfNotExists(
-      root,
-      'piral.json',
-      JSON.stringify({}),
-    );
+    await createFileIfNotExists(root, 'piral.json', JSON.stringify({}));
 
     progress(`Installing npm package ${packageRef} ...`);
 
@@ -187,8 +180,7 @@ always-auth=true`,
 
     const data = getPiralScaffoldData(language, root, app, framework, variables);
 
-    await updateExistingJson(root, 'package.json', getPiralPackage(app, data, version, bundlerName));
-    await updateExistingJson(root, 'piral.json', { pilets: getPiletsInfo({}) });
+    await patchPiralPackage(root, app, data, version, bundlerName);
 
     await scaffoldPiralSourceFiles(template, registry, data, forceOverwrite);
 

package/src/common/emulator.ts

@@ -44,6 +44,11 @@ export async function createEmulatorSources(
     return deps;
   }, {} as Record<string, string>);
 
+  const importmapEntries = externalPackages.reduce((deps, dep) => {
+    deps[dep.name] = dep.name;
+    return deps;
+  }, {} as Record<string, string>);
+
   const rootDir = resolve(targetDir, '..');
   const appDir = relative(rootDir, targetDir);
   const filesDir = resolve(rootDir, filesTar);
@@ -70,6 +75,9 @@ export async function createEmulatorSources(
     license: piralPkg.license,
     homepage: piralPkg.homepage,
     keywords: piralPkg.keywords,
+    importmap: {
+      imports: importmapEntries,
+    },
     pilets: {
       ...piralPkg.pilets,
       files: filesMap,

package/src/common/importmap.ts

@@ -152,7 +152,7 @@ async function resolveImportmap(dir: string, importmap: Importmap) {
       if (packageJson) {
         const packageDir = dirname(packageJson);
         const packageDetails = require(packageJson);
-        const otherDependencies = await readImportmap(packageDir, packageDetails);
+        const otherDependencies = await readImportmap(packageDir, packageDetails, true);
 
         for (const dependency of otherDependencies) {
           const entry = dependencies.find((dep) => dep.name === dependency.name);
@@ -173,7 +173,11 @@ async function resolveImportmap(dir: string, importmap: Importmap) {
   return dependencies;
 }
 
-export async function readImportmap(dir: string, packageDetails: any) {
+export async function readImportmap(
+  dir: string,
+  packageDetails: any,
+  inherited = false,
+): Promise<Array<SharedDependency>> {
   const importmap = packageDetails.importmap;
 
   if (typeof importmap === 'string') {
@@ -186,6 +190,20 @@ export async function readImportmap(dir: string, packageDetails: any) {
 
     const baseDir = dirname(resolve(dir, importmap));
     return resolveImportmap(baseDir, content);
+  } else if (typeof importmap === 'undefined' && inherited) {
+    // Fall back to sharedDependencies or pilets.external if available
+    const shared: Array<string> = packageDetails.sharedDependencies ?? packageDetails.pilets?.externals;
+
+    if (Array.isArray(shared)) {
+      return shared.map((dep) => ({
+        id: dep,
+        name: dep,
+        entry: dep,
+        type: 'local',
+        ref: undefined,
+        requireId: dep,
+      }));
+    }
   }
 
   return resolveImportmap(dir, importmap);

package/src/common/package.test.ts

@@ -46,15 +46,48 @@ describe('CLI package module', () => {
     expect(result).toStrictEqual(piralInfo.pilets);
   });
 
-  it('getPiralPackage returns piral package', () => {
-    let result = getPiralPackage(
+  it('getPiralPackage returns piral package with webpack in latest version',async () => {
+    const result = await getPiralPackage(
       'app',
       { language: 'ts', packageName: 'piral-base', reactRouterVersion: 5, reactVersion: 17 },
-      '1.0.0',
+      '10.0.0',
       'webpack',
     );
-    expect(result.devDependencies['piral-cli-webpack']).toEqual('1.0.0');
-    result = getPiralPackage(
+    expect(result.devDependencies['piral-cli-webpack']).toEqual('latest');
+  });
+
+  it('getPiralPackage returns piral package with webpack in beta version',async () => {
+    const result = await getPiralPackage(
+      'app',
+      { language: 'ts', packageName: 'piral-base', reactRouterVersion: 5, reactVersion: 17 },
+      '0.15.0-beta.1',
+      'webpack',
+    );
+    expect(result.devDependencies['piral-cli-webpack']).toEqual('next');
+  });
+
+  it('getPiralPackage returns piral package with webpack in alpha version',async () => {
+    const result = await getPiralPackage(
+      'app',
+      { language: 'ts', packageName: 'piral-base', reactRouterVersion: 5, reactVersion: 17 },
+      '0.15.0-alpha.1',
+      'webpack',
+    );
+    expect(result.devDependencies['piral-cli-webpack']).toEqual('canary');
+  });
+
+  it('getPiralPackage returns piral package with webpack in existing version',async () => {
+    const result = await getPiralPackage(
+      'app',
+      { language: 'ts', packageName: 'piral-base', reactRouterVersion: 5, reactVersion: 17 },
+      '0.14.0',
+      'webpack',
+    );
+    expect(result.devDependencies['piral-cli-webpack']).toEqual('0.14.0');
+  });
+
+  it('getPiralPackage returns piral package without bundler',async () => {
+    const result = await getPiralPackage(
       'app',
       { language: 'ts', packageName: 'piral-base', reactRouterVersion: 5, reactVersion: 17 },
       '1.0.0',

package/src/common/package.ts

@@ -11,7 +11,7 @@ import { filesTar, filesOnceTar, declarationEntryExtensions, bundlerNames } from
 import { getHash, checkIsDirectory, matchFiles } from './io';
 import { readJson, copy, updateExistingJson, findFile, checkExists } from './io';
 import { isGitPackage, isLocalPackage, makeGitUrl, makeFilePath } from './npm';
-import { makePiletExternals, makeExternals, findPackageRoot } from './npm';
+import { makePiletExternals, makeExternals, findPackageRoot, findSpecificVersion } from './npm';
 import {
   SourceLanguage,
   Framework,
@@ -22,18 +22,37 @@ import {
   SharedDependency,
 } from '../types';
 
-function appendBundler(devDependencies: Record<string, string>, bundler: string, version: string) {
+async function appendBundler(devDependencies: Record<string, string>, bundler: string, proposedVersion: string) {
   if (bundler && bundler !== 'none') {
-    if (bundlerNames.includes(bundler as any)) {
-      devDependencies[`piral-cli-${bundler}`] = version;
-    } else if (!isValidDependency(bundler)) {
+    if (isValidDependency(bundler)) {
+      const sep = bundler.indexOf('@', 1);
+      const hasVersion = sep !== -1;
+      const proposedName = bundler.substring(0, hasVersion ? sep : bundler.length);
+      const givenVersion = hasVersion ? bundler.substring(sep + 1) : proposedVersion;
+      const name = bundlerNames.includes(proposedName as any) ? `piral-cli-${bundler}` : proposedName;
+      const versions = new Set([
+        givenVersion,
+        givenVersion.includes('-beta.') && 'next',
+        givenVersion.includes('-alpha.') && 'canary',
+        'latest',
+      ]);
+
+      for (const version of versions) {
+        if (version) {
+          const isAvailable = await findSpecificVersion(name, version);
+
+          // only if something was returned we know that the version exists; so we can take it.
+          if (isAvailable) {
+            devDependencies[name] = version;
+            return;
+          }
+        }
+      }
+
+      log('generalWarning_0001', `Could not find a valid version for the provided bundler "${bundler}".'`);
+    } else {
       //Error case - print warning and ignore
       log('generalWarning_0001', `The provided bundler name "${bundler}" does not refer to a valid package name.'`);
-    } else {
-      const sep = bundler.indexOf('@', 1);
-      const name = bundler.substring(0, sep !== -1 ? sep : bundler.length);
-      const version = sep !== -1 ? bundler.substring(sep + 1) : 'latest';
-      devDependencies[name] = version;
     }
   }
 }
@@ -160,7 +179,24 @@ export interface PiralPackageData {
   reactRouterVersion: number;
 }
 
-export function getPiralPackage(app: string, data: PiralPackageData, version: string, bundler?: string) {
+export async function patchPiralPackage(
+  root: string,
+  app: string,
+  data: PiralPackageData,
+  version: string,
+  bundler?: string,
+) {
+  log('generalDebug_0003', `Patching the package.json in "${root}" ...`);
+  const pkg = await getPiralPackage(app, data, version, bundler);
+
+  await updateExistingJson(root, 'package.json', pkg);
+  log('generalDebug_0003', `Succesfully patched the package.json.`);
+
+  await updateExistingJson(root, 'piral.json', { pilets: getPiletsInfo({}) });
+  log('generalDebug_0003', `Succesfully patched the pilet.json.`);
+}
+
+export async function getPiralPackage(app: string, data: PiralPackageData, version: string, bundler?: string) {
   const framework = data.packageName;
   const devDependencies = {
     ...getDevDependencies(
@@ -173,7 +209,7 @@ export function getPiralPackage(app: string, data: PiralPackageData, version: st
     ...getDependencies(data.language, getDependencyPackages(framework, data.reactVersion, data.reactRouterVersion)),
   };
 
-  appendBundler(devDependencies, bundler, version);
+  await appendBundler(devDependencies, bundler, version);
 
   return {
     app,
@@ -507,6 +543,27 @@ export async function patchPiletPackage(
   newInfo?: { language: SourceLanguage; bundler: string },
 ) {
   log('generalDebug_0003', `Patching the package.json in "${root}" ...`);
+  const pkg = await getPiletPackage(root, name, version, piralInfo, fromEmulator, newInfo);
+
+  await updateExistingJson(root, 'package.json', pkg);
+  log('generalDebug_0003', `Succesfully patched the package.json.`);
+
+  await updateExistingJson(root, 'pilet.json', {
+    piralInstances: {
+      [name]: {},
+    },
+  });
+  log('generalDebug_0003', `Succesfully patched the pilet.json.`);
+}
+
+export async function getPiletPackage(
+  root: string,
+  name: string,
+  version: string,
+  piralInfo: PackageData,
+  fromEmulator: boolean,
+  newInfo?: { language: SourceLanguage; bundler: string },
+) {
   const { externals, packageOverrides, ...info } = getPiletsInfo(piralInfo);
   const piralDependencies = {
     ...piralInfo.devDependencies,
@@ -548,10 +605,10 @@ export async function patchPiletPackage(
     const bundler = newInfo.bundler;
     const version = `^${cliVersion}`;
     devDependencies['piral-cli'] = version;
-    appendBundler(devDependencies, bundler, version);
+    await appendBundler(devDependencies, bundler, version);
   }
 
-  await updateExistingJson(root, 'package.json', deepMerge(packageOverrides, {
+  return deepMerge(packageOverrides, {
     importmap: {
       imports: {},
       inherit: [name],
@@ -561,16 +618,7 @@ export async function patchPiletPackage(
       [name]: undefined,
     },
     scripts,
-  }));
-
-  log('generalDebug_0003', `Succesfully patched the package.json.`);
-
-  await updateExistingJson(root, 'pilet.json', {
-    piralInstances: {
-      [name]: {},
-    },
   });
-  log('generalDebug_0003', `Succesfully patched the pilet.json.`);
 }
 
 /**

package/src/injectors/pilet-injector.test.ts

@@ -5,11 +5,9 @@ import PiletInjector from './pilet-injector';
 const optionsMock = {
   pilets: [],
   publicUrl: '/',
-  meta: 'debug-meta.json',
   api: '',
   app: '',
   active: true,
-  publicUrl: '/',
   meta: '',
   headers: {},
 };
@@ -18,7 +16,7 @@ const configMock: any = {
   port: 1234,
 };
 
-describe('Piral-CLI piral injector', () => {
+describe('Piral-CLI pilet injector', () => {
   it('PiletInjector is active when configured', () => {
     const core = new EventEmitter();
     const injector = new PiletInjector(optionsMock, configMock, core);
@@ -35,7 +33,7 @@ describe('Piral-CLI piral injector', () => {
     injector.name;
     injector.getOptions();
     //injector.getMetaOf(0);
-    injector.getMeta();
+    injector.getIndexMeta('http://localhost:9000');
 
     // Assert
     expect(injector.active).toBeFalsy();
@@ -78,7 +76,7 @@ describe('Piral-CLI piral injector', () => {
     const injector = new PiletInjector(optionsMock, configMock, core);
 
     // Act
-    const res = await injector.sendResponse('some/nice/invalid/path', 'localhost:1234');
+    const res = await injector.sendResponse('some/nice/invalid/path', 'localhost:1234', 'http://localhost:9000');
 
     // Assert
     expect(res).toBeUndefined();
@@ -88,8 +86,6 @@ describe('Piral-CLI piral injector', () => {
     // Arrange
     const optionsMock = {
       pilets: [],
-      meta: 'debug-meta.json',
-      publicUrl: '/',
       api: 'http://someFakeApi:1234',
       app: '',
       publicUrl: '/',
@@ -120,8 +116,6 @@ describe('Piral-CLI piral injector', () => {
     // Arrange
     const optionsMock = {
       pilets: [],
-      meta: 'debug-meta.json',
-      publicUrl: '/',
       api: 'http://someFakeApi:1234',
       app: '',
       publicUrl: '/',