piral-cli 0.15.0-beta.4815 → 0.15.0-beta.4820

package/lib/apps/new-pilet.js

@@ -59,64 +59,54 @@ always-auth=true`, forceOverwrite);
             }
             yield (0, common_1.createFileIfNotExists)(root, 'pilet.json', JSON.stringify({
                 schemaVersion: 'v2',
-            }));
-            if (source) {
-                const [sourceName, sourceVersion, hadVersion, type] = yield (0, common_1.dissectPackageName)(fullBase, source);
-                const isLocal = (0, common_1.isLinkedPackage)(sourceName, type, hadVersion);
-                if (!isLocal) {
-                    const packageRef = (0, common_1.combinePackageRef)(sourceName, sourceVersion, type);
-                    (0, common_1.progress)(`Installing npm package %s ...`, packageRef);
-                    yield (0, common_1.installNpmPackage)(npmClient, packageRef, root, '--save-dev', '--save-exact');
-                }
-                else {
-                    (0, common_1.progress)(`Using locally available npm package %s ...`, sourceName);
-                }
-                const packageName = yield (0, common_1.getPackageName)(root, sourceName, type);
-                const packageVersion = (0, common_1.getPackageVersion)(hadVersion, sourceName, sourceVersion, type, root);
-                const piralInfo = yield (0, common_1.readPiralPackage)(root, packageName);
-                const isEmulator = (0, common_1.checkAppShellPackage)(piralInfo);
-                const { preScaffold, postScaffold, files, template: preSelectedTemplate } = (0, common_1.getPiletsInfo)(piralInfo);
-                if (preScaffold) {
-                    (0, common_1.progress)(`Running preScaffold script ...`);
-                    (0, common_1.log)('generalDebug_0003', `Run: ${preScaffold}`);
-                    yield (0, common_1.runScript)(preScaffold, root);
-                }
-                (0, common_1.progress)(`Taking care of templating ...`);
-                const data = (0, common_1.getPiletScaffoldData)(language, root, packageName, variables);
-                const chosenTemplate = template || preSelectedTemplate || 'default';
-                yield (0, common_1.scaffoldPiletSourceFiles)(chosenTemplate, registry, data, forceOverwrite);
-                if (isEmulator) {
-                    // in the emulator case we get the files (and files_once) from the contained tarballs
-                    yield (0, common_1.copyPiralFiles)(root, packageName, piralInfo, common_1.ForceOverwrite.yes, data);
-                }
-                else {
-                    // otherwise, we perform the same action as in the emulator creation
-                    // just with a different target; not a created directory, but the root
-                    const packageRoot = (0, common_1.getPiralPath)(root, packageName);
-                    yield (0, common_1.copyScaffoldingFiles)(packageRoot, root, files, piralInfo, data);
-                }
-                yield (0, common_1.patchPiletPackage)(root, packageName, packageVersion, piralInfo, isEmulator, {
-                    language,
-                    bundler: bundlerName,
-                });
-                if (install) {
-                    (0, common_1.progress)(`Installing dependencies ...`);
-                    yield (0, common_1.installNpmDependencies)(npmClient, root);
-                }
-                if (postScaffold) {
-                    (0, common_1.progress)(`Running postScaffold script ...`);
-                    (0, common_1.log)('generalDebug_0003', `Run: ${postScaffold}`);
-                    yield (0, common_1.runScript)(postScaffold, root);
-                }
+            }, undefined, 2));
+            const usedSource = source || `empty-piral@${common_1.cliVersion}`;
+            const [sourceName, sourceVersion, hadVersion, type] = yield (0, common_1.dissectPackageName)(fullBase, usedSource);
+            const isLocal = (0, common_1.isLinkedPackage)(sourceName, type, hadVersion);
+            if (!isLocal) {
+                const packageRef = (0, common_1.combinePackageRef)(sourceName, sourceVersion, type);
+                (0, common_1.progress)(`Installing npm package %s ...`, packageRef);
+                yield (0, common_1.installNpmPackage)(npmClient, packageRef, root, '--save-dev', '--save-exact');
             }
             else {
-                const data = (0, common_1.getPiletScaffoldData)(language, root, undefined, variables);
-                const chosenTemplate = template || 'default';
-                yield (0, common_1.scaffoldPiletSourceFiles)(chosenTemplate, registry, data, forceOverwrite);
-                if (install) {
-                    (0, common_1.progress)(`Installing dependencies ...`);
-                    yield (0, common_1.installNpmDependencies)(npmClient, root);
-                }
+                (0, common_1.progress)(`Using locally available npm package %s ...`, sourceName);
+            }
+            const packageName = yield (0, common_1.getPackageName)(root, sourceName, type);
+            const packageVersion = (0, common_1.getPackageVersion)(hadVersion, sourceName, sourceVersion, type, root);
+            const piralInfo = yield (0, common_1.readPiralPackage)(root, packageName);
+            const isEmulator = (0, common_1.checkAppShellPackage)(piralInfo);
+            const { preScaffold, postScaffold, files, template: preSelectedTemplate } = (0, common_1.getPiletsInfo)(piralInfo);
+            if (preScaffold) {
+                (0, common_1.progress)(`Running preScaffold script ...`);
+                (0, common_1.log)('generalDebug_0003', `Run: ${preScaffold}`);
+                yield (0, common_1.runScript)(preScaffold, root);
+            }
+            (0, common_1.progress)(`Taking care of templating ...`);
+            const data = (0, common_1.getPiletScaffoldData)(language, root, packageName, variables);
+            const chosenTemplate = template || preSelectedTemplate || 'default';
+            yield (0, common_1.scaffoldPiletSourceFiles)(chosenTemplate, registry, data, forceOverwrite);
+            if (isEmulator) {
+                // in the emulator case we get the files (and files_once) from the contained tarballs
+                yield (0, common_1.copyPiralFiles)(root, packageName, piralInfo, common_1.ForceOverwrite.yes, data);
+            }
+            else {
+                // otherwise, we perform the same action as in the emulator creation
+                // just with a different target; not a created directory, but the root
+                const packageRoot = (0, common_1.getPiralPath)(root, packageName);
+                yield (0, common_1.copyScaffoldingFiles)(packageRoot, root, files, piralInfo, data);
+            }
+            yield (0, common_1.patchPiletPackage)(root, packageName, packageVersion, piralInfo, isEmulator, {
+                language,
+                bundler: bundlerName,
+            });
+            if (install) {
+                (0, common_1.progress)(`Installing dependencies ...`);
+                yield (0, common_1.installNpmDependencies)(npmClient, root);
+            }
+            if (postScaffold) {
+                (0, common_1.progress)(`Running postScaffold script ...`);
+                (0, common_1.log)('generalDebug_0003', `Run: ${postScaffold}`);
+                yield (0, common_1.runScript)(postScaffold, root);
             }
             (0, common_1.logDone)(`Pilet scaffolded successfully!`);
         }

package/lib/apps/new-pilet.js.map

@@ -1 +1 @@
-{"version":3,"file":"new-pilet.js","sourceRoot":"","sources":["../../src/apps/new-pilet.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAyC;AACzC,oCAAoE;AACpE,sCA6BmB;AAoEN,QAAA,gBAAgB,GAAoB;IAC/C,MAAM,EAAE,GAAG;IACX,QAAQ,EAAE,eAAM,CAAC,QAAQ;IACzB,MAAM,EAAE,SAAS;IACjB,cAAc,EAAE,uBAAc,CAAC,EAAE;IACjC,QAAQ,EAAE,eAAM,CAAC,QAAQ;IACzB,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,SAAS;IACnB,QAAQ,EAAE,iBAAS,CAAC,IAAI;IACxB,SAAS,EAAE,SAAS;IACpB,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,EAAE;IACb,IAAI,EAAE,SAAS;CAChB,CAAC;AAEF,SAAsB,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,UAA2B,EAAE;;QACnF,MAAM,EACJ,MAAM,GAAG,wBAAgB,CAAC,MAAM,EAChC,QAAQ,GAAG,wBAAgB,CAAC,QAAQ,EACpC,MAAM,GAAG,wBAAgB,CAAC,MAAM,EAChC,cAAc,GAAG,wBAAgB,CAAC,cAAc,EAChD,QAAQ,GAAG,wBAAgB,CAAC,QAAQ,EACpC,OAAO,GAAG,wBAAgB,CAAC,OAAO,EAClC,QAAQ,GAAG,wBAAgB,CAAC,QAAQ,EACpC,QAAQ,GAAG,wBAAgB,CAAC,QAAQ,EACpC,WAAW,GAAG,wBAAgB,CAAC,WAAW,EAC1C,SAAS,GAAG,wBAAgB,CAAC,SAAS,EACtC,SAAS,EAAE,gBAAgB,GAAG,wBAAgB,CAAC,SAAS,EACxD,IAAI,GAAG,wBAAgB,CAAC,IAAI,GAC7B,GAAG,OAAO,CAAC;QACZ,MAAM,QAAQ,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;QACjD,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QACvC,IAAA,oBAAW,EAAC,QAAQ,CAAC,CAAC;QACtB,IAAA,iBAAQ,EAAC,iCAAiC,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAM,IAAA,wBAAe,EAAC,IAAI,CAAC,CAAC;QAE5C,IAAI,OAAO,EAAE;YACX,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAkB,EAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;YACnE,MAAM,WAAW,GAAG,IAAI,IAAI,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC;YAE3C,IAAA,iBAAQ,EAAC,iCAAiC,EAAE,IAAI,CAAC,CAAC;YAElD,MAAM,IAAA,8BAAqB,EACzB,IAAI,EACJ,cAAc,EACd,IAAI,CAAC,SAAS,CACZ;gBACE,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,OAAO;gBAChB,WAAW,EAAE,EAAE;gBACf,QAAQ,EAAE,CAAC,OAAO,CAAC;gBACnB,YAAY,EAAE,EAAE;gBAChB,eAAe,EAAE,EAAE;gBACnB,gBAAgB,EAAE,EAAE;gBACpB,OAAO,EAAE,EAAE;gBACX,IAAI,EAAE,eAAe;gBACrB,KAAK,EAAE,CAAC,MAAM,CAAC;aAChB,EACD,SAAS,EACT,CAAC,CACF,CACF,CAAC;YAEF,MAAM,IAAA,uBAAc,EAAC,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;YAEnD,IAAI,QAAQ,KAAK,wBAAgB,CAAC,QAAQ,EAAE;gBAC1C,IAAA,iBAAQ,EAAC,kCAAkC,EAAE,QAAQ,CAAC,CAAC;gBAEvD,MAAM,IAAA,8BAAqB,EACzB,IAAI,EACJ,QAAQ,EACR,YAAY,QAAQ;iBACX,EACT,cAAc,CACf,CAAC;aACH;YAED,MAAM,IAAA,8BAAqB,EACzB,IAAI,EACJ,YAAY,EACZ,IAAI,CAAC,SAAS,CAAC;gBACb,aAAa,EAAE,IAAI;aACpB,CAAC,CACH,CAAC;YAEF,IAAI,MAAM,EAAE;gBACV,MAAM,CAAC,UAAU,EAAE,aAAa,EAAE,UAAU,EAAE,IAAI,CAAC,GAAG,MAAM,IAAA,2BAAkB,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBACjG,MAAM,OAAO,GAAG,IAAA,wBAAe,EAAC,UAAU,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;gBAE9D,IAAI,CAAC,OAAO,EAAE;oBACZ,MAAM,UAAU,GAAG,IAAA,0BAAiB,EAAC,UAAU,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;oBAEtE,IAAA,iBAAQ,EAAC,+BAA+B,EAAE,UAAU,CAAC,CAAC;oBACtD,MAAM,IAAA,0BAAiB,EAAC,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC;iBACpF;qBAAM;oBACL,IAAA,iBAAQ,EAAC,4CAA4C,EAAE,UAAU,CAAC,CAAC;iBACpE;gBAED,MAAM,WAAW,GAAG,MAAM,IAAA,uBAAc,EAAC,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;gBACjE,MAAM,cAAc,GAAG,IAAA,0BAAiB,EAAC,UAAU,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBAC5F,MAAM,SAAS,GAAG,MAAM,IAAA,yBAAgB,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;gBAE5D,MAAM,UAAU,GAAG,IAAA,6BAAoB,EAAC,SAAS,CAAC,CAAC;gBAEnD,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,mBAAmB,EAAE,GAAG,IAAA,sBAAa,EAAC,SAAS,CAAC,CAAC;gBAErG,IAAI,WAAW,EAAE;oBACf,IAAA,iBAAQ,EAAC,gCAAgC,CAAC,CAAC;oBAC3C,IAAA,YAAG,EAAC,mBAAmB,EAAE,QAAQ,WAAW,EAAE,CAAC,CAAC;oBAChD,MAAM,IAAA,kBAAS,EAAC,WAAW,EAAE,IAAI,CAAC,CAAC;iBACpC;gBAED,IAAA,iBAAQ,EAAC,+BAA+B,CAAC,CAAC;gBAE1C,MAAM,IAAI,GAAG,IAAA,6BAAoB,EAAC,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC;gBAC1E,MAAM,cAAc,GAAG,QAAQ,IAAI,mBAAmB,IAAI,SAAS,CAAC;gBACpE,MAAM,IAAA,iCAAwB,EAAC,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;gBAE/E,IAAI,UAAU,EAAE;oBACd,qFAAqF;oBACrF,MAAM,IAAA,uBAAc,EAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE,uBAAc,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;iBAC9E;qBAAM;oBACL,oEAAoE;oBACpE,sEAAsE;oBACtE,MAAM,WAAW,GAAG,IAAA,qBAAY,EAAC,IAAI,EAAE,WAAW,CAAC,CAAC;oBACpD,MAAM,IAAA,6BAAoB,EAAC,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;iBACvE;gBAED,MAAM,IAAA,0BAAiB,EAAC,IAAI,EAAE,WAAW,EAAE,cAAc,EAAE,SAAS,EAAE,UAAU,EAAE;oBAChF,QAAQ;oBACR,OAAO,EAAE,WAAW;iBACrB,CAAC,CAAC;gBAEH,IAAI,OAAO,EAAE;oBACX,IAAA,iBAAQ,EAAC,6BAA6B,CAAC,CAAC;oBACxC,MAAM,IAAA,+BAAsB,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;iBAC/C;gBAED,IAAI,YAAY,EAAE;oBAChB,IAAA,iBAAQ,EAAC,iCAAiC,CAAC,CAAC;oBAC5C,IAAA,YAAG,EAAC,mBAAmB,EAAE,QAAQ,YAAY,EAAE,CAAC,CAAC;oBACjD,MAAM,IAAA,kBAAS,EAAC,YAAY,EAAE,IAAI,CAAC,CAAC;iBACrC;aACF;iBAAM;gBACL,MAAM,IAAI,GAAG,IAAA,6BAAoB,EAAC,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;gBACxE,MAAM,cAAc,GAAG,QAAQ,IAAI,SAAS,CAAC;gBAC7C,MAAM,IAAA,iCAAwB,EAAC,cAAc,EAAE,QAAQ,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;gBAE/E,IAAI,OAAO,EAAE;oBACX,IAAA,iBAAQ,EAAC,6BAA6B,CAAC,CAAC;oBACxC,MAAM,IAAA,+BAAsB,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;iBAC/C;aACF;YAED,IAAA,gBAAO,EAAC,gCAAgC,CAAC,CAAC;SAC3C;aAAM;YACL,IAAA,aAAI,EAAC,4BAA4B,CAAC,CAAC;SACpC;IACH,CAAC;CAAA;AA/ID,4BA+IC"}
+{"version":3,"file":"new-pilet.js","sourceRoot":"","sources":["../../src/apps/new-pilet.ts"],"names":[],"mappings":"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"}

package/lib/apps/new-piral.js

@@ -60,7 +60,7 @@ function newPiral(baseDir = process.cwd(), options = {}) {
                 yield (0, common_1.createFileIfNotExists)(root, '.npmrc', `registry=${registry}
 always-auth=true`, forceOverwrite);
             }
-            yield (0, common_1.createFileIfNotExists)(root, 'piral.json', JSON.stringify({}));
+            yield (0, common_1.createFileIfNotExists)(root, 'piral.json', JSON.stringify({}, undefined, 2));
             (0, common_1.progress)(`Installing npm package ${packageRef} ...`);
             yield (0, common_1.installNpmPackage)(npmClient, packageRef, root, '--save-exact');
             (0, common_1.progress)(`Taking care of templating ...`);

package/lib/apps/new-piral.js.map

@@ -1 +1 @@
-{"version":3,"file":"new-piral.js","sourceRoot":"","sources":["../../src/apps/new-piral.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAAyC;AACzC,wCAA2C;AAC3C,oCAA+E;AAC/E,sCAkBmB;AA0EN,QAAA,gBAAgB,GAAoB;IAC/C,GAAG,EAAE,kBAAkB;IACvB,QAAQ,EAAE,eAAM,CAAC,QAAQ;IACzB,SAAS,EAAE,OAAO;IAClB,MAAM,EAAE,GAAG;IACX,OAAO,EAAE,mBAAU;IACnB,cAAc,EAAE,uBAAc,CAAC,EAAE;IACjC,QAAQ,EAAE,eAAM,CAAC,QAAQ;IACzB,OAAO,EAAE,IAAI;IACb,QAAQ,EAAE,SAAS;IACnB,QAAQ,EAAE,iBAAS,CAAC,IAAI;IACxB,SAAS,EAAE,SAAS;IACpB,WAAW,EAAE,MAAM;IACnB,SAAS,EAAE,EAAE;IACb,IAAI,EAAE,SAAS;CAChB,CAAC;AAEF,SAAsB,QAAQ,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,EAAE,UAA2B,EAAE;;QACnF,MAAM,EACJ,GAAG,GAAG,wBAAgB,CAAC,GAAG,EAC1B,QAAQ,GAAG,wBAAgB,CAAC,QAAQ,EACpC,SAAS,GAAG,wBAAgB,CAAC,SAAS,EACtC,MAAM,GAAG,wBAAgB,CAAC,MAAM,EAChC,OAAO,GAAG,wBAAgB,CAAC,OAAO,EAClC,cAAc,GAAG,wBAAgB,CAAC,cAAc,EAChD,QAAQ,GAAG,wBAAgB,CAAC,QAAQ,EACpC,OAAO,GAAG,wBAAgB,CAAC,OAAO,EAClC,QAAQ,GAAG,wBAAgB,CAAC,QAAQ,EACpC,QAAQ,GAAG,wBAAgB,CAAC,QAAQ,EACpC,WAAW,GAAG,wBAAgB,CAAC,WAAW,EAC1C,SAAS,GAAG,wBAAgB,CAAC,SAAS,EACtC,IAAI,GAAG,wBAAgB,CAAC,IAAI,EAC5B,SAAS,EAAE,gBAAgB,GAAG,wBAAgB,CAAC,SAAS,GACzD,GAAG,OAAO,CAAC;QACZ,MAAM,QAAQ,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,CAAC;QACjD,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAEvC,IAAI,CAAC,uBAAa,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;YACtC,IAAA,aAAI,EAAC,mBAAmB,EAAE,yCAAyC,uBAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAChG;QAED,IAAA,oBAAW,EAAC,QAAQ,CAAC,CAAC;QAEtB,IAAA,iBAAQ,EAAC,iCAAiC,CAAC,CAAC;QAC5C,MAAM,OAAO,GAAG,MAAM,IAAA,wBAAe,EAAC,IAAI,CAAC,CAAC;QAE5C,IAAI,OAAO,EAAE;YACX,MAAM,SAAS,GAAG,MAAM,IAAA,2BAAkB,EAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;YACnE,MAAM,UAAU,GAAG,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;YACrE,MAAM,WAAW,GAAG,IAAI,IAAI,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC;YAE3C,IAAA,iBAAQ,EAAC,yCAAyC,EAAE,IAAI,CAAC,CAAC;YAE1D,MAAM,IAAA,8BAAqB,EACzB,IAAI,EACJ,cAAc,EACd,IAAI,CAAC,SAAS,CACZ;gBACE,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,OAAO;gBAChB,WAAW,EAAE,EAAE;gBACf,QAAQ,EAAE,CAAC,OAAO,CAAC;gBACnB,YAAY,EAAE,EAAE;gBAChB,OAAO,EAAE,EAAE;aACZ,EACD,SAAS,EACT,CAAC,CACF,CACF,CAAC;YAEF,MAAM,IAAA,uBAAc,EAAC,SAAS,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC;YAEnD,IAAI,QAAQ,KAAK,wBAAgB,CAAC,QAAQ,EAAE;gBAC1C,IAAA,iBAAQ,EAAC,kCAAkC,EAAE,QAAQ,CAAC,CAAC;gBAEvD,MAAM,IAAA,8BAAqB,EACzB,IAAI,EACJ,QAAQ,EACR,YAAY,QAAQ;iBACX,EACT,cAAc,CACf,CAAC;aACH;YAED,MAAM,IAAA,8BAAqB,EAAC,IAAI,EAAE,YAAY,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;YAEpE,IAAA,iBAAQ,EAAC,0BAA0B,UAAU,MAAM,CAAC,CAAC;YAErD,MAAM,IAAA,0BAAiB,EAAC,SAAS,EAAE,UAAU,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;YAErE,IAAA,iBAAQ,EAAC,+BAA+B,CAAC,CAAC;YAE1C,MAAM,IAAI,GAAG,IAAA,6BAAoB,EAAC,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC;YAE7E,MAAM,IAAA,0BAAiB,EAAC,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;YAE/D,MAAM,IAAA,iCAAwB,EAAC,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,cAAc,CAAC,CAAC;YAEzE,IAAI,OAAO,EAAE;gBACX,IAAA,iBAAQ,EAAC,6BAA6B,CAAC,CAAC;gBACxC,MAAM,IAAA,+BAAsB,EAAC,SAAS,EAAE,IAAI,CAAC,CAAC;aAC/C;YAED,IAAA,gBAAO,EAAC,yCAAyC,CAAC,CAAC;SACpD;aAAM;YACL,IAAA,aAAI,EAAC,4BAA4B,CAAC,CAAC;SACpC;IACH,CAAC;CAAA;AA1FD,4BA0FC"}
+{"version":3,"file":"new-piral.js","sourceRoot":"","sources":["../../src/apps/new-piral.ts"],"names":[],"mappings":"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"}

package/lib/common/clients/pnpm.js

@@ -53,7 +53,7 @@ function installPackage(packageRef, target = '.', ...flags) {
 exports.installPackage = installPackage;
 function detectClient(root, stopDir = (0, path_1.resolve)(root, '/')) {
     return __awaiter(this, void 0, void 0, function* () {
-        return !!(yield (0, io_1.findFile)(root, 'pnpm-lock.yaml', stopDir));
+        return !!(yield (0, io_1.findFile)(root, ['pnpm-lock.yaml', 'pnpm-workspace.yaml'], stopDir));
     });
 }
 exports.detectClient = detectClient;

package/lib/common/clients/pnpm.js.map

@@ -1 +1 @@
-{"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../../src/common/clients/pnpm.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../../src/common/clients/pnpm.ts"],"names":[],"mappings":"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"}

package/lib/common/compatibility.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkCliCompatibility = exports.checkAppShellCompatibility = void 0;
 const info_1 = require("./info");
 const package_1 = require("./package");
+const constants_1 = require("./constants");
 const log_1 = require("./log");
 function checkAppShellCompatibility(piralVersion) {
     (0, log_1.log)('generalDebug_0003', `Checking compatibility ...`);
@@ -31,7 +32,7 @@ exports.checkAppShellCompatibility = checkAppShellCompatibility;
 function checkCliCompatibility(root) {
     return __awaiter(this, void 0, void 0, function* () {
         (0, log_1.log)('generalDebug_0003', `Checking compatibility ...`);
-        const piralVersion = yield (0, package_1.findPackageVersion)(root, 'piral-base');
+        const piralVersion = yield (0, package_1.findPackageVersion)(root, constants_1.frameworkLibs);
         const compatible = (0, info_1.findCompatVersion)(piralVersion);
         (0, log_1.log)('generalDebug_0003', `Used versions: "${compatible}" and "${info_1.compatVersion}".`);
         if (info_1.compatVersion !== compatible) {

package/lib/common/compatibility.js.map

@@ -1 +1 @@
-{"version":3,"file":"compatibility.js","sourceRoot":"","sources":["../../src/common/compatibility.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAsE;AACtE,uCAA+C;AAC/C,+BAA4B;AAE5B,SAAgB,0BAA0B,CAAC,YAAoB;IAC7D,IAAA,SAAG,EAAC,mBAAmB,EAAE,4BAA4B,CAAC,CAAC;IAEvD,IAAI,CAAC,YAAY,EAAE;QACjB,IAAA,SAAG,EAAC,gCAAgC,EAAE,iBAAU,CAAC,CAAC;QAClD,OAAO,KAAK,CAAC;KACd;IAED,MAAM,UAAU,GAAG,IAAA,wBAAiB,EAAC,YAAY,CAAC,CAAC;IACnD,IAAA,SAAG,EAAC,mBAAmB,EAAE,mBAAmB,UAAU,UAAU,oBAAa,IAAI,CAAC,CAAC;IAEnF,IAAI,oBAAa,KAAK,UAAU,EAAE;QAChC,IAAA,SAAG,EAAC,2BAA2B,EAAE,YAAY,EAAE,iBAAU,CAAC,CAAC;QAC3D,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAjBD,gEAiBC;AAED,SAAsB,qBAAqB,CAAC,IAAY;;QACtD,IAAA,SAAG,EAAC,mBAAmB,EAAE,4BAA4B,CAAC,CAAC;QACvD,MAAM,YAAY,GAAG,MAAM,IAAA,4BAAkB,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;QAClE,MAAM,UAAU,GAAG,IAAA,wBAAiB,EAAC,YAAY,CAAC,CAAC;QACnD,IAAA,SAAG,EAAC,mBAAmB,EAAE,mBAAmB,UAAU,UAAU,oBAAa,IAAI,CAAC,CAAC;QAEnF,IAAI,oBAAa,KAAK,UAAU,EAAE;YAChC,IAAA,SAAG,EAAC,0BAA0B,EAAE,YAAY,EAAE,iBAAU,CAAC,CAAC;YAC1D,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAZD,sDAYC"}
+{"version":3,"file":"compatibility.js","sourceRoot":"","sources":["../../src/common/compatibility.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iCAAsE;AACtE,uCAA+C;AAC/C,2CAA4C;AAC5C,+BAA4B;AAE5B,SAAgB,0BAA0B,CAAC,YAAoB;IAC7D,IAAA,SAAG,EAAC,mBAAmB,EAAE,4BAA4B,CAAC,CAAC;IAEvD,IAAI,CAAC,YAAY,EAAE;QACjB,IAAA,SAAG,EAAC,gCAAgC,EAAE,iBAAU,CAAC,CAAC;QAClD,OAAO,KAAK,CAAC;KACd;IAED,MAAM,UAAU,GAAG,IAAA,wBAAiB,EAAC,YAAY,CAAC,CAAC;IACnD,IAAA,SAAG,EAAC,mBAAmB,EAAE,mBAAmB,UAAU,UAAU,oBAAa,IAAI,CAAC,CAAC;IAEnF,IAAI,oBAAa,KAAK,UAAU,EAAE;QAChC,IAAA,SAAG,EAAC,2BAA2B,EAAE,YAAY,EAAE,iBAAU,CAAC,CAAC;QAC3D,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAjBD,gEAiBC;AAED,SAAsB,qBAAqB,CAAC,IAAY;;QACtD,IAAA,SAAG,EAAC,mBAAmB,EAAE,4BAA4B,CAAC,CAAC;QACvD,MAAM,YAAY,GAAG,MAAM,IAAA,4BAAkB,EAAC,IAAI,EAAE,yBAAa,CAAC,CAAC;QACnE,MAAM,UAAU,GAAG,IAAA,wBAAiB,EAAC,YAAY,CAAC,CAAC;QACnD,IAAA,SAAG,EAAC,mBAAmB,EAAE,mBAAmB,UAAU,UAAU,oBAAa,IAAI,CAAC,CAAC;QAEnF,IAAI,oBAAa,KAAK,UAAU,EAAE;YAChC,IAAA,SAAG,EAAC,0BAA0B,EAAE,YAAY,EAAE,iBAAU,CAAC,CAAC;YAC1D,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,CAAC;IACd,CAAC;CAAA;AAZD,sDAYC"}

package/lib/common/declaration.js

@@ -17,11 +17,25 @@ const package_1 = require("./package");
 const constants_1 = require("./constants");
 const io_1 = require("./io");
 const external_1 = require("../external");
-function findPiralBaseApi(root) {
+function findPiralBaseRoot(root, framework) {
+    const piralJson = `${framework}/package.json`;
+    if (piralJson !== constants_1.piralBaseRoot) {
+        try {
+            const packageJsonPath = (0, external_1.getModulePath)(root, piralJson);
+            return (0, path_1.dirname)(packageJsonPath);
+        }
+        catch (_a) { }
+    }
+    return root;
+}
+function findPiralBaseApi(root, framework) {
+    // for some package managers, e.g., pnpm we need to first go into
+    // some specifics before being able to retrieve "piral-base"
+    const baseRoot = findPiralBaseRoot(root, framework);
     try {
-        const packageJsonPath = (0, external_1.getModulePath)(root, constants_1.piralBaseRoot);
-        const project = require(packageJsonPath);
+        const packageJsonPath = (0, external_1.getModulePath)(baseRoot, constants_1.piralBaseRoot);
         const projectDir = (0, path_1.dirname)(packageJsonPath);
+        const project = require(packageJsonPath);
         // By default support for piral-base < 0.15
         const { piletApiTypings = 'lib/types.d.ts' } = project;
         return [
@@ -128,7 +142,7 @@ function createPiralDeclaration(baseDir, entry, target, forceOverwrite, logLevel
     return __awaiter(this, void 0, void 0, function* () {
         (0, log_1.progress)('Reading configuration ...');
         const entryFiles = yield (0, package_1.retrievePiralRoot)(baseDir, entry);
-        const { name, root, externals } = yield (0, package_1.retrievePiletsInfo)(entryFiles);
+        const { name, root, externals, framework } = yield (0, package_1.retrievePiletsInfo)(entryFiles);
         const entryModules = yield getEntryModules(entryFiles);
         const files = yield getAllFiles(entryModules);
         const options = {
@@ -136,7 +150,7 @@ function createPiralDeclaration(baseDir, entry, target, forceOverwrite, logLevel
             root,
             files,
             types: findDeclaredTypings(root),
-            apis: findPiralBaseApi(root),
+            apis: findPiralBaseApi(root, framework),
             noModuleDeclaration: true,
             imports: externals,
             logLevel,

package/lib/common/declaration.js.map

@@ -1 +1 @@
-{"version":3,"file":"declaration.js","sourceRoot":"","sources":["../../src/common/declaration.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"declaration.js","sourceRoot":"","sources":["../../src/common/declaration.ts"],"names":[],"mappings":"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"}

package/lib/common/importmap.js

@@ -37,6 +37,23 @@ function getLocalDependencyVersion(packageJson, depName, versionSpec) {
     }
     return [details.version, details.version];
 }
+function getInheritedDependencies(inheritedImport, dir) {
+    const packageJson = (0, npm_1.tryResolvePackage)(`${inheritedImport}/package.json`, dir);
+    if (inheritedImport) {
+        const packageDir = (0, path_1.dirname)(packageJson);
+        const packageDetails = require(packageJson);
+        return readImportmap(packageDir, packageDetails, true);
+    }
+    else {
+        const directImportmap = (0, npm_1.tryResolvePackage)(inheritedImport, dir);
+        if (directImportmap) {
+            const content = require(directImportmap);
+            const baseDir = (0, path_1.dirname)(directImportmap);
+            return resolveImportmap(baseDir, content);
+        }
+    }
+    return Promise.resolve([]);
+}
 function resolveImportmap(dir, importmap) {
     return __awaiter(this, void 0, void 0, function* () {
         const dependencies = [];
@@ -139,19 +156,14 @@ function resolveImportmap(dir, importmap) {
         }
         if (Array.isArray(inheritedImports)) {
             for (const inheritedImport of inheritedImports) {
-                const packageJson = (0, npm_1.tryResolvePackage)(`${inheritedImport}/package.json`, dir);
-                if (packageJson) {
-                    const packageDir = (0, path_1.dirname)(packageJson);
-                    const packageDetails = require(packageJson);
-                    const otherDependencies = yield readImportmap(packageDir, packageDetails, true);
-                    for (const dependency of otherDependencies) {
-                        const entry = dependencies.find((dep) => dep.name === dependency.name);
-                        if (!entry) {
-                            dependencies.push(Object.assign(Object.assign({}, dependency), { parents: [inheritedImport] }));
-                        }
-                        else if (Array.isArray(entry.parents)) {
-                            entry.parents.push(inheritedImport);
-                        }
+                const otherDependencies = yield getInheritedDependencies(inheritedImport, dir);
+                for (const dependency of otherDependencies) {
+                    const entry = dependencies.find((dep) => dep.name === dependency.name);
+                    if (!entry) {
+                        dependencies.push(Object.assign(Object.assign({}, dependency), { parents: [inheritedImport] }));
+                    }
+                    else if (Array.isArray(entry.parents)) {
+                        entry.parents.push(inheritedImport);
                     }
                 }
             }
@@ -170,7 +182,7 @@ function readImportmap(dir, packageDetails, inherited = false) {
                 (0, log_1.fail)('importMapFileNotFound_0028', dir, importmap);
             }
             const baseDir = (0, path_1.dirname)((0, path_1.resolve)(dir, importmap));
-            return resolveImportmap(baseDir, content);
+            return yield resolveImportmap(baseDir, content);
         }
         else if (typeof importmap === 'undefined' && inherited) {
             // Fall back to sharedDependencies or pilets.external if available
@@ -186,7 +198,7 @@ function readImportmap(dir, packageDetails, inherited = false) {
                 }));
             }
         }
-        return resolveImportmap(dir, importmap);
+        return yield resolveImportmap(dir, importmap);
     });
 }
 exports.readImportmap = readImportmap;

package/lib/common/importmap.js.map

@@ -1 +1 @@
-{"version":3,"file":"importmap.js","sourceRoot":"","sources":["../../src/common/importmap.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"importmap.js","sourceRoot":"","sources":["../../src/common/importmap.ts"],"names":[],"mappings":"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"}

package/lib/common/io.d.ts

@@ -14,7 +14,7 @@ export declare function checkExists(target: string): Promise<boolean>;
 export declare function checkExistingDirectory(target: string): Promise<boolean>;
 export declare function checkIsDirectory(target: string): Promise<boolean>;
 export declare function getFileNames(target: string): Promise<string[]>;
-export declare function findFile(topDir: string, fileName: string, stopDir?: string): Promise<string>;
+export declare function findFile(topDir: string, fileName: string | Array<string>, stopDir?: string): Promise<string>;
 export declare function matchAnyPilet(baseDir: string, patterns: Array<string>): Promise<string[]>;
 export declare function matchFiles(baseDir: string, pattern: string): Promise<string[]>;
 export declare function createFileIfNotExists(targetDir: string, fileName: string, content: Buffer | string, forceOverwrite?: ForceOverwrite): Promise<void>;

package/lib/common/io.js

@@ -152,16 +152,19 @@ function getFileNames(target) {
 exports.getFileNames = getFileNames;
 function findFile(topDir, fileName, stopDir = (0, path_1.resolve)(topDir, '/')) {
     return __awaiter(this, void 0, void 0, function* () {
-        const path = (0, path_1.join)(topDir, fileName);
-        const exists = yield checkExists(path);
-        if (!exists) {
-            if (topDir !== stopDir) {
-                const parentDir = (0, path_1.resolve)(topDir, '..');
-                return yield findFile(parentDir, fileName, stopDir);
+        const fileNames = Array.isArray(fileName) ? fileName : [fileName];
+        for (const fn of fileNames) {
+            const path = (0, path_1.join)(topDir, fn);
+            const exists = yield checkExists(path);
+            if (exists) {
+                return path;
             }
-            return undefined;
         }
-        return path;
+        if (topDir !== stopDir) {
+            const parentDir = (0, path_1.resolve)(topDir, '..');
+            return yield findFile(parentDir, fileNames, stopDir);
+        }
+        return undefined;
     });
 }
 exports.findFile = findFile;

package/lib/common/io.js.map

@@ -1 +1 @@
-{"version":3,"file":"io.js","sourceRoot":"","sources":["../../src/common/io.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"io.js","sourceRoot":"","sources":["../../src/common/io.ts"],"names":[],"mappings":"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"}

package/lib/common/log.js

@@ -57,8 +57,9 @@ function logFail(message, ...args) {
 }
 exports.logFail = logFail;
 function progress(message, ...args) {
-    currentProgress = (0, util_1.format)(message, ...args);
-    instance.start(message);
+    const msg = (0, util_1.format)(message, ...args);
+    instance.start(msg);
+    currentProgress = msg;
 }
 exports.progress = progress;
 function logReset() {

package/lib/common/log.js.map

@@ -1 +1 @@
-{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/common/log.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"log.js","sourceRoot":"","sources":["../../src/common/log.ts"],"names":[],"mappings":"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"}

package/lib/common/npm.js

@@ -317,35 +317,8 @@ function tryResolve(packageName, baseDir = process.cwd()) {
     }
 }
 function tryResolvePackage(name, baseDir = undefined) {
-    let path = baseDir ? tryResolve(name, baseDir) : tryResolve(name);
+    const path = baseDir ? tryResolve(name, baseDir) : tryResolve(name);
     const root = baseDir || process.cwd();
-    if (!path) {
-        if (name.startsWith('.')) {
-            path = (0, path_1.resolve)(root, name);
-        }
-        else if ((0, path_1.isAbsolute)(name)) {
-            path = name;
-        }
-        else if (name.includes('/', name.startsWith('@') ? name.indexOf('/') + 1 : 0)) {
-            const parts = name.split('/');
-            const mainPart = name.startsWith('@') ? parts.slice(0, 2).join('/') : parts[0];
-            const mainPath = baseDir ? tryResolve(mainPart, baseDir) : tryResolve(mainPart);
-            const searchStr = `${path_1.sep}${mainPart.replace('/', path_1.sep)}${path_1.sep}`;
-            if (mainPath === null || mainPath === void 0 ? void 0 : mainPath.includes(searchStr)) {
-                const rest = name.startsWith('@') ? parts.slice(2) : parts.slice(1);
-                path = mainPath.substring(0, mainPath.indexOf(searchStr) + searchStr.length) + rest.join(path_1.sep);
-            }
-        }
-        else {
-            path = (0, path_1.resolve)(root, 'node_modules', name);
-        }
-        if (!(0, fs_1.existsSync)(path)) {
-            path = `${path}.js`;
-            if (!(0, fs_1.existsSync)(path)) {
-                path = undefined;
-            }
-        }
-    }
     if (!path) {
         (0, log_1.log)('generalDebug_0003', `Could not resolve the package "${name}" in "${root}".`);
     }