piral-cli 0.15.0-alpha.4098 → 0.15.0-alpha.4257

package/lib/common/clients/pnpm.js

@@ -9,11 +9,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.installPackage = exports.installDependencies = void 0;
+exports.listProjects = exports.isProject = exports.initProject = exports.detectClient = exports.installPackage = exports.installDependencies = void 0;
 const path_1 = require("path");
 const log_1 = require("../log");
+const io_1 = require("../io");
 const scripts_1 = require("../scripts");
 const MemoryStream_1 = require("../MemoryStream");
+// Helpers:
 function runPnpmProcess(args, target, output) {
     (0, log_1.log)('generalDebug_0003', 'Starting the Pnpm process ...');
     const cwd = (0, path_1.resolve)(process.cwd(), target);
@@ -30,6 +32,7 @@ function convert(flags) {
         }
     });
 }
+// Client interface functions:
 function installDependencies(target = '.', ...flags) {
     return __awaiter(this, void 0, void 0, function* () {
         const ms = new MemoryStream_1.MemoryStream();
@@ -41,17 +44,48 @@ function installDependencies(target = '.', ...flags) {
 exports.installDependencies = installDependencies;
 function installPackage(packageRef, target = '.', ...flags) {
     return __awaiter(this, void 0, void 0, function* () {
+        const ms = new MemoryStream_1.MemoryStream();
+        yield runPnpmProcess(['add', packageRef, ...convert(flags)], target, ms);
+        (0, log_1.log)('generalDebug_0003', `Pnpm install package result: ${ms.value}`);
+        return ms.value;
+    });
+}
+exports.installPackage = installPackage;
+function detectClient(root) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return !!(yield (0, io_1.findFile)(root, 'pnpm-lock.yaml'));
+    });
+}
+exports.detectClient = detectClient;
+function initProject(projectName, target) {
+    return __awaiter(this, void 0, void 0, function* () { });
+}
+exports.initProject = initProject;
+function isProject(root, packageRef) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        const projects = yield listProjects(root);
+        if (Array.isArray(projects)) {
+            return (_a = projects === null || projects === void 0 ? void 0 : projects.some((p) => p.name === packageRef)) !== null && _a !== void 0 ? _a : false;
+        }
+        return false;
+    });
+}
+exports.isProject = isProject;
+// Functions to exclusively use from pnpm client:
+function listProjects(target) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const ms = new MemoryStream_1.MemoryStream();
         try {
-            const ms = new MemoryStream_1.MemoryStream();
-            yield runPnpmProcess(['add', packageRef, ...convert(flags)], target, ms);
-            (0, log_1.log)('generalDebug_0003', `Pnpm install package result: ${ms.value}`);
-            return ms.value;
+            yield runPnpmProcess(['list', '--json', '--recursive', '--depth', '0'], target, ms);
         }
-        catch (ex) {
-            (0, log_1.log)('generalError_0002', `Could not install the package "${packageRef}" using Pnpm. Make sure Pnpm is correctly installed and accessible: ${ex}`);
-            throw ex;
+        catch (e) {
+            (0, log_1.log)('generalDebug_0003', `pnpm list error: ${e}`);
+            return [];
         }
+        (0, log_1.log)('generalDebug_0003', `pnpm list project result: ${ms.value}`);
+        return JSON.parse(ms.value);
     });
 }
-exports.installPackage = installPackage;
+exports.listProjects = listProjects;
 //# sourceMappingURL=pnpm.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../../src/common/clients/pnpm.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA+B;AAC/B,gCAA6B;AAC7B,wCAAwC;AACxC,kDAA+C;AAE/C,SAAS,cAAc,CAAC,IAAmB,EAAE,MAAc,EAAE,MAA8B;IACzF,IAAA,SAAG,EAAC,mBAAmB,EAAE,+BAA+B,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;IAC3C,OAAO,IAAA,oBAAU,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,OAAO,CAAC,KAAoB;IACnC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,QAAQ,IAAI,EAAE;YACZ,KAAK,WAAW;gBACd,8DAA8D;gBAC9D,OAAO,EAAE,CAAC;YACZ;gBACE,OAAO,IAAI,CAAC;SACf;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAsB,mBAAmB,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC7E,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;QAC9B,MAAM,cAAc,CAAC,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACjE,IAAA,SAAG,EAAC,mBAAmB,EAAE,qCAAqC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QAC1E,OAAO,EAAE,CAAC,KAAK,CAAC;IAClB,CAAC;CAAA;AALD,kDAKC;AAED,SAAsB,cAAc,CAAC,UAAkB,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC5F,IAAI;YACF,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;YAC9B,MAAM,cAAc,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;YACzE,IAAA,SAAG,EAAC,mBAAmB,EAAE,gCAAgC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;YACrE,OAAO,EAAE,CAAC,KAAK,CAAC;SACjB;QAAC,OAAO,EAAE,EAAE;YACX,IAAA,SAAG,EACD,mBAAmB,EACnB,kCAAkC,UAAU,uEAAuE,EAAE,EAAE,CACxH,CAAC;YACF,MAAM,EAAE,CAAC;SACV;IACH,CAAC;CAAA;AAbD,wCAaC"}
+{"version":3,"file":"pnpm.js","sourceRoot":"","sources":["../../../src/common/clients/pnpm.ts"],"names":[],"mappings":"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"}

package/lib/common/clients/rush.d.ts

@@ -0,0 +1,6 @@
+export declare function installDependencies(target?: string, ...flags: Array<string>): Promise<string>;
+export declare function installPackage(packageRef: string, target?: string, ...flags: Array<string>): Promise<string>;
+export declare function detectClient(root: string): Promise<boolean>;
+export declare function initProject(packageName: string, target: string): Promise<void>;
+export declare function isProject(root: string, packageRef: string): Promise<any>;
+export declare function listProjects(target: string): Promise<any>;

package/lib/common/clients/rush.js

@@ -0,0 +1,118 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.listProjects = exports.isProject = exports.initProject = exports.detectClient = exports.installPackage = exports.installDependencies = void 0;
+const path_1 = require("path");
+const log_1 = require("../log");
+const io_1 = require("../io");
+const external_1 = require("../../external");
+const scripts_1 = require("../scripts");
+const MemoryStream_1 = require("../MemoryStream");
+// Helpers:
+const rushJson = 'rush.json';
+function runRushProcess(args, target, output) {
+    (0, log_1.log)('generalDebug_0003', 'Starting the Rush process ...');
+    const cwd = (0, path_1.resolve)(process.cwd(), target);
+    return (0, scripts_1.runCommand)('rush', args, cwd, output);
+}
+function convert(flags) {
+    return flags.map((flag) => {
+        switch (flag) {
+            case '--save-exact':
+                // discard as this may lead to problems
+                return '';
+            case '--save-dev':
+                return '--dev';
+            case '--no-save':
+                // unfortunately no
+                return '';
+            default:
+                return flag;
+        }
+    });
+}
+// Client interface functions:
+function installDependencies(target = '.', ...flags) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const ms = new MemoryStream_1.MemoryStream();
+        yield runRushProcess(['update', ...convert(flags)], target, ms);
+        (0, log_1.log)('generalDebug_0003', `Rush install dependencies result: ${ms.value}`);
+        return ms.value;
+    });
+}
+exports.installDependencies = installDependencies;
+function installPackage(packageRef, target = '.', ...flags) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const ms = new MemoryStream_1.MemoryStream();
+        yield runRushProcess(['add', '--package', packageRef, ...convert(flags)], target, ms);
+        (0, log_1.log)('generalDebug_0003', `Rush install package result: ${ms.value}`);
+        return ms.value;
+    });
+}
+exports.installPackage = installPackage;
+function detectClient(root) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return !!(yield (0, io_1.findFile)(root, rushJson));
+    });
+}
+exports.detectClient = detectClient;
+function initProject(packageName, target) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const rushPath = yield (0, io_1.findFile)(target, rushJson);
+        if (!rushPath) {
+            throw new Error(`Could not find the "${rushJson}" from "${target}". Sure you want to create the project in the right directory?`);
+        }
+        const rushDir = (0, path_1.dirname)(rushPath);
+        const rushContent = yield (0, io_1.readText)(rushDir, rushJson);
+        const rushData = external_1.jju.parse(rushContent);
+        const projectFolder = (0, path_1.relative)(rushDir, target);
+        if (!Array.isArray(rushData.projects)) {
+            rushData.projects = [];
+        }
+        rushData.projects.push({
+            packageName,
+            projectFolder,
+        });
+        yield (0, io_1.writeText)(rushDir, rushJson, external_1.jju.update(rushContent, rushData, {
+            mode: 'cjson',
+            indent: 2,
+        }));
+    });
+}
+exports.initProject = initProject;
+function isProject(root, packageRef) {
+    var _a, _b;
+    return __awaiter(this, void 0, void 0, function* () {
+        const details = yield listProjects(root);
+        if (typeof details === 'object' && Array.isArray(details === null || details === void 0 ? void 0 : details.projects)) {
+            return (_b = (_a = details === null || details === void 0 ? void 0 : details.projects) === null || _a === void 0 ? void 0 : _a.some((p) => p.name === packageRef)) !== null && _b !== void 0 ? _b : false;
+        }
+        return false;
+    });
+}
+exports.isProject = isProject;
+// Functions to exclusively use from rush client:
+function listProjects(target) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const ms = new MemoryStream_1.MemoryStream();
+        try {
+            yield runRushProcess(['list', '--json'], target, ms);
+        }
+        catch (e) {
+            (0, log_1.log)('generalDebug_0003', `rush list error: ${e}`);
+            return {};
+        }
+        (0, log_1.log)('generalDebug_0003', `rush list project result: ${ms.value}`);
+        return JSON.parse(ms.value);
+    });
+}
+exports.listProjects = listProjects;
+//# sourceMappingURL=rush.js.map

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

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

package/lib/common/clients/yarn.d.ts

@@ -1,2 +1,6 @@
 export declare function installDependencies(target?: string, ...flags: Array<string>): Promise<string>;
 export declare function installPackage(packageRef: string, target?: string, ...flags: Array<string>): Promise<string>;
+export declare function detectClient(root: string): Promise<boolean>;
+export declare function initProject(projectName: string, target: string): Promise<void>;
+export declare function isProject(root: string, packageRef: string): Promise<boolean>;
+export declare function listProjects(target: string): Promise<any>;

package/lib/common/clients/yarn.js

@@ -9,13 +9,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.installPackage = exports.installDependencies = void 0;
+exports.listProjects = exports.isProject = exports.initProject = exports.detectClient = exports.installPackage = exports.installDependencies = void 0;
 const path_1 = require("path");
 const log_1 = require("../log");
+const io_1 = require("../io");
 const scripts_1 = require("../scripts");
 const MemoryStream_1 = require("../MemoryStream");
+// Helpers:
 function runYarnProcess(args, target, output) {
-    (0, log_1.log)('generalDebug_0003', 'Starting the Yarn process ...');
+    (0, log_1.log)('generalDebug_0003', 'Starting the Yarn@1 process ...');
     const cwd = (0, path_1.resolve)(process.cwd(), target);
     return (0, scripts_1.runCommand)('yarn', args, cwd, output);
 }
@@ -34,28 +36,60 @@ function convert(flags) {
         }
     });
 }
+// Client interface functions:
 function installDependencies(target = '.', ...flags) {
     return __awaiter(this, void 0, void 0, function* () {
         const ms = new MemoryStream_1.MemoryStream();
         yield runYarnProcess(['install', ...convert(flags)], target, ms);
-        (0, log_1.log)('generalDebug_0003', `Yarn install dependencies result: ${ms.value}`);
+        (0, log_1.log)('generalDebug_0003', `Yarn@1 install dependencies result: ${ms.value}`);
         return ms.value;
     });
 }
 exports.installDependencies = installDependencies;
 function installPackage(packageRef, target = '.', ...flags) {
     return __awaiter(this, void 0, void 0, function* () {
+        const ms = new MemoryStream_1.MemoryStream();
+        yield runYarnProcess(['add', packageRef, ...convert(flags)], target, ms);
+        (0, log_1.log)('generalDebug_0003', `Yarn@1 install package result: ${ms.value}`);
+        return ms.value;
+    });
+}
+exports.installPackage = installPackage;
+function detectClient(root) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return !!(yield (0, io_1.findFile)(root, 'yarn.lock'));
+    });
+}
+exports.detectClient = detectClient;
+function initProject(projectName, target) {
+    return __awaiter(this, void 0, void 0, function* () { });
+}
+exports.initProject = initProject;
+function isProject(root, packageRef) {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+        const details = yield listProjects(root);
+        if (typeof details === 'object') {
+            return typeof ((_a = details === null || details === void 0 ? void 0 : details[packageRef]) === null || _a === void 0 ? void 0 : _a.location) === 'string';
+        }
+        return false;
+    });
+}
+exports.isProject = isProject;
+// Functions to exclusively use from yarn client:
+function listProjects(target) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const ms = new MemoryStream_1.MemoryStream();
         try {
-            const ms = new MemoryStream_1.MemoryStream();
-            yield runYarnProcess(['add', packageRef, ...convert(flags)], target, ms);
-            (0, log_1.log)('generalDebug_0003', `Yarn install package result: ${ms.value}`);
-            return ms.value;
+            yield runYarnProcess(['workspaces', 'info'], target, ms);
         }
-        catch (ex) {
-            (0, log_1.log)('generalError_0002', `Could not install the package "${packageRef}" using Yarn. Make sure Yarn@1 is correctly installed and accessible: ${ex}`);
-            throw ex;
+        catch (e) {
+            (0, log_1.log)('generalDebug_0003', `yarn workspaces error: ${e}`);
+            return {};
         }
+        (0, log_1.log)('generalDebug_0003', `yarn workspaces result: ${ms.value}`);
+        return JSON.parse(ms.value);
     });
 }
-exports.installPackage = installPackage;
+exports.listProjects = listProjects;
 //# sourceMappingURL=yarn.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../src/common/clients/yarn.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+BAA+B;AAC/B,gCAA6B;AAC7B,wCAAwC;AACxC,kDAA+C;AAE/C,SAAS,cAAc,CAAC,IAAmB,EAAE,MAAc,EAAE,MAA8B;IACzF,IAAA,SAAG,EAAC,mBAAmB,EAAE,+BAA+B,CAAC,CAAC;IAC1D,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;IAC3C,OAAO,IAAA,oBAAU,EAAC,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;AAC/C,CAAC;AAED,SAAS,OAAO,CAAC,KAAoB;IACnC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACxB,QAAQ,IAAI,EAAE;YACZ,KAAK,cAAc;gBACjB,OAAO,SAAS,CAAC;YACnB,KAAK,YAAY;gBACf,OAAO,OAAO,CAAC;YACjB,KAAK,WAAW;gBACd,iEAAiE;gBACjE,OAAO,EAAE,CAAC;YACZ;gBACE,OAAO,IAAI,CAAC;SACf;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAsB,mBAAmB,CAAC,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC7E,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;QAC9B,MAAM,cAAc,CAAC,CAAC,SAAS,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;QACjE,IAAA,SAAG,EAAC,mBAAmB,EAAE,qCAAqC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;QAC1E,OAAO,EAAE,CAAC,KAAK,CAAC;IAClB,CAAC;CAAA;AALD,kDAKC;AAED,SAAsB,cAAc,CAAC,UAAkB,EAAE,MAAM,GAAG,GAAG,EAAE,GAAG,KAAoB;;QAC5F,IAAI;YACF,MAAM,EAAE,GAAG,IAAI,2BAAY,EAAE,CAAC;YAC9B,MAAM,cAAc,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;YACzE,IAAA,SAAG,EAAC,mBAAmB,EAAE,gCAAgC,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;YACrE,OAAO,EAAE,CAAC,KAAK,CAAC;SACjB;QAAC,OAAO,EAAE,EAAE;YACX,IAAA,SAAG,EACD,mBAAmB,EACnB,kCAAkC,UAAU,yEAAyE,EAAE,EAAE,CAC1H,CAAC;YACF,MAAM,EAAE,CAAC;SACV;IACH,CAAC;CAAA;AAbD,wCAaC"}
+{"version":3,"file":"yarn.js","sourceRoot":"","sources":["../../../src/common/clients/yarn.ts"],"names":[],"mappings":"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"}

package/lib/common/constants.d.ts

@@ -2,7 +2,7 @@ export declare const defaultRegistry = "https://registry.npmjs.org/";
 export declare const filesTar = "files";
 export declare const filesOnceTar = "files_once";
 export declare const piralBaseRoot = "piral-base/package.json";
-export declare const frameworkLibs: ("piral" | "piral-core" | "piral-base")[];
+export declare const frameworkLibs: ("piral-native" | "piral" | "piral-core" | "piral-base")[];
 export declare const entryModuleExtensions: string[];
 export declare const bundlerNames: ("esbuild" | "parcel" | "parcel2" | "rollup" | "webpack" | "webpack5" | "vite" | "xbuild")[];
 export declare const declarationEntryExtensions: string[];

package/lib/common/constants.js

@@ -5,7 +5,7 @@ exports.defaultRegistry = 'https://registry.npmjs.org/';
 exports.filesTar = 'files';
 exports.filesOnceTar = 'files_once';
 exports.piralBaseRoot = 'piral-base/package.json';
-exports.frameworkLibs = ['piral', 'piral-core', 'piral-base'];
+exports.frameworkLibs = ['piral-native', 'piral', 'piral-core', 'piral-base'];
 exports.entryModuleExtensions = ['.ts', '.tsx', '.js', '.jsx'];
 exports.bundlerNames = [
     'esbuild',

package/lib/common/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,6BAA6B,CAAC;AAChD,QAAA,QAAQ,GAAG,OAAO,CAAC;AACnB,QAAA,YAAY,GAAG,YAAY,CAAC;AAC5B,QAAA,aAAa,GAAG,yBAAyB,CAAC;AAC1C,QAAA,aAAa,GAAG,CAAC,OAAgB,EAAE,YAAqB,EAAE,YAAqB,CAAC,CAAC;AACjF,QAAA,qBAAqB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACvD,QAAA,YAAY,GAAG;IAC1B,SAAkB;IAClB,QAAiB;IACjB,SAAkB;IAClB,QAAiB;IACjB,SAAkB;IAClB,UAAmB;IACnB,MAAe;IACf,QAAiB;CAClB,CAAC;AACW,QAAA,0BAA0B,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,6BAAqB,CAAC,CAAC;AACzE,QAAA,mBAAmB,GAAG;IACjC,sBAAsB;IACtB,aAAa;IACb,SAAS;IACT,OAAO;IACP,WAAW;IACX,cAAc;IACd,kBAAkB;IAClB,OAAO;IACP,gBAAgB;CACjB,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":";;;AAAa,QAAA,eAAe,GAAG,6BAA6B,CAAC;AAChD,QAAA,QAAQ,GAAG,OAAO,CAAC;AACnB,QAAA,YAAY,GAAG,YAAY,CAAC;AAC5B,QAAA,aAAa,GAAG,yBAAyB,CAAC;AAC1C,QAAA,aAAa,GAAG,CAAC,cAAuB,EAAE,OAAgB,EAAE,YAAqB,EAAE,YAAqB,CAAC,CAAC;AAC1G,QAAA,qBAAqB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;AACvD,QAAA,YAAY,GAAG;IAC1B,SAAkB;IAClB,QAAiB;IACjB,SAAkB;IAClB,QAAiB;IACjB,SAAkB;IAClB,UAAmB;IACnB,MAAe;IACf,QAAiB;CAClB,CAAC;AACW,QAAA,0BAA0B,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,6BAAqB,CAAC,CAAC;AACzE,QAAA,mBAAmB,GAAG;IACjC,sBAAsB;IACtB,aAAa;IACb,SAAS;IACT,OAAO;IACP,WAAW;IACX,cAAc;IACd,kBAAkB;IAClB,OAAO;IACP,gBAAgB;CACjB,CAAC"}

package/lib/common/declaration.js

@@ -25,10 +25,16 @@ function findPiralBaseApi(root) {
         const projectDir = (0, path_1.dirname)(packageJsonPath);
         // By default support for piral-base < 0.15
         const { piletApiTypings = 'lib/types.d.ts' } = project;
-        return (0, path_1.resolve)(projectDir, piletApiTypings);
+        return [
+            {
+                file: (0, path_1.resolve)(projectDir, piletApiTypings),
+                name: 'PiletApi',
+            },
+        ];
     }
-    catch (_a) {
-        return undefined;
+    catch (err) {
+        (0, log_1.log)('generalError_0002', `Could not find the root API of "piral-base" from "${root}": ${err}`);
+        return [];
     }
 }
 function findDeclaredTypings(root) {
@@ -130,17 +136,15 @@ function createPiralDeclaration(baseDir, entry, target, forceOverwrite, logLevel
             root,
             files,
             types: findDeclaredTypings(root),
-            apis: [
-                {
-                    file: findPiralBaseApi(root),
-                    name: 'PiletApi',
-                },
-            ],
+            apis: findPiralBaseApi(root),
             imports: externals,
             logLevel,
             logger: createLogger(),
         };
-        return yield createDeclarationFile(options, baseDir, target, forceOverwrite);
+        if (options.apis.length) {
+            return yield createDeclarationFile(options, baseDir, target, forceOverwrite);
+        }
+        (0, log_1.log)('declarationCouldNotBeGenerated_0076', baseDir, 'The main Pilet API interface could not be found.');
     });
 }
 exports.createPiralDeclaration = createPiralDeclaration;

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/emulator.js

@@ -27,7 +27,7 @@ function createEmulatorSources(sourceDir, targetDir, targetFile, logLevel) {
         const piralPkg = require((0, path_1.resolve)(sourceDir, packageJson));
         const files = (_b = (_a = piralPkg.pilets) === null || _a === void 0 ? void 0 : _a.files) !== null && _b !== void 0 ? _b : [];
         const allDeps = Object.assign(Object.assign({}, piralPkg.devDependencies), piralPkg.dependencies);
-        const allExternals = (0, npm_1.makeExternals)(allDeps, (_c = piralPkg.pilets) === null || _c === void 0 ? void 0 : _c.externals);
+        const allExternals = (0, npm_1.makeExternals)(sourceDir, allDeps, (_c = piralPkg.pilets) === null || _c === void 0 ? void 0 : _c.externals);
         const externalPackages = yield Promise.all(allExternals.filter(package_1.isValidDependency).map((name) => __awaiter(this, void 0, void 0, function* () {
             return ({
                 name,
@@ -104,7 +104,7 @@ exports.createEmulatorSources = createEmulatorSources;
 function packageEmulator(rootDir) {
     return __awaiter(this, void 0, void 0, function* () {
         // finally package everything up
-        yield (0, npm_1.createPackage)(rootDir);
+        yield (0, npm_1.createNpmPackage)(rootDir);
         // get all files
         const names = yield (0, io_1.getFileNames)(rootDir);
         // cleanup

package/lib/common/emulator.js.map

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

package/lib/common/http.d.ts

@@ -6,4 +6,4 @@ export interface PostFileResult {
     success: boolean;
     response?: object;
 }
-export declare function postFile(target: string, scheme: PiletPublishScheme, key: string, file: Buffer, customFields?: Record<string, string>, customHeaders?: Record<string, string>, ca?: Buffer): Promise<PostFileResult>;
+export declare function postFile(target: string, scheme: PiletPublishScheme, key: string, file: Buffer, customFields?: Record<string, string>, customHeaders?: Record<string, string>, ca?: Buffer, interactive?: boolean): Promise<PostFileResult>;

package/lib/common/http.js

@@ -6,11 +6,9 @@ const https_1 = require("https");
 const os_1 = require("os");
 const fs_1 = require("fs");
 const log_1 = require("./log");
+const info_1 = require("./info");
+const interactive_1 = require("./interactive");
 const external_1 = require("../external");
-const os = (0, os_1.platform)();
-const standardHeaders = {
-    'user-agent': `piral-cli/http.node-${os}`,
-};
 function getMessage(body) {
     if (typeof body === 'string') {
         try {
@@ -44,7 +42,7 @@ function downloadFile(target, ca) {
     return external_1.axios.default
         .get(target, {
         responseType: 'stream',
-        headers: standardHeaders,
+        headers: info_1.standardHeaders,
         httpsAgent,
     })
         .then((res) => {
@@ -59,12 +57,12 @@ function downloadFile(target, ca) {
     });
 }
 exports.downloadFile = downloadFile;
-function postFile(target, scheme, key, file, customFields = {}, customHeaders = {}, ca) {
+function postFile(target, scheme, key, file, customFields = {}, customHeaders = {}, ca, interactive = false) {
     const form = new external_1.FormData();
     const httpsAgent = ca ? new https_1.Agent({ ca }) : undefined;
     Object.keys(customFields).forEach((key) => form.append(key, customFields[key]));
     form.append('file', file, 'pilet.tgz');
-    const headers = Object.assign(Object.assign(Object.assign({}, form.getHeaders()), standardHeaders), customHeaders);
+    const headers = Object.assign(Object.assign(Object.assign({}, form.getHeaders()), info_1.standardHeaders), customHeaders);
     if (key) {
         switch (scheme) {
             case 'basic':
@@ -99,6 +97,13 @@ function postFile(target, scheme, key, file, customFields = {}, customHeaders =
             // The request was made and the server responded with a status code
             // that falls out of the range of 2xx
             const { data, statusText, status } = error.response;
+            if (interactive && 'interactiveAuth' in data) {
+                const { interactiveAuth } = data;
+                if (typeof interactiveAuth === 'string') {
+                    (0, log_1.log)('generalDebug_0003', `Received status "${status}" from HTTP - trying interactive log in to "${interactiveAuth}".`);
+                    return (0, interactive_1.getTokenInteractively)(interactiveAuth, httpsAgent).then(({ mode, token }) => postFile(target, mode, token, file, customFields, customHeaders, ca, false));
+                }
+            }
             const message = getMessage(data) || '';
             (0, log_1.log)('unsuccessfulHttpPost_0066', statusText, status, message);
             return {

package/lib/common/http.js.map

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

package/lib/common/importmap.js

@@ -15,18 +15,8 @@ const log_1 = require("./log");
 const version_1 = require("./version");
 const hash_1 = require("./hash");
 const io_1 = require("./io");
+const npm_1 = require("./npm");
 const shorthandsUrls = ['', '.', '...'];
-function tryResolve(baseDir, name) {
-    try {
-        return require.resolve(name, {
-            paths: [baseDir],
-        });
-    }
-    catch (ex) {
-        (0, log_1.log)('generalDebug_0003', `Could not resolve the package "${name}" in "${baseDir}": ${ex}`);
-        return undefined;
-    }
-}
 function getDependencyDetails(depName) {
     const sep = depName.indexOf('@', 1);
     const version = sep > 0 ? depName.substring(sep + 1) : '';
@@ -71,7 +61,7 @@ function resolveImportmap(dir, importmap) {
                     });
                 }
                 else if (url === identifier || shorthandsUrls.includes(url)) {
-                    const entry = tryResolve(dir, identifier);
+                    const entry = (0, npm_1.tryResolvePackage)(identifier, dir);
                     if (entry) {
                         const packageJson = yield (0, io_1.findFile)((0, path_1.dirname)(entry), 'package.json');
                         const [version, requireVersion] = getLocalDependencyVersion(packageJson, depName, versionSpec);
@@ -102,7 +92,7 @@ function resolveImportmap(dir, importmap) {
                             dependencies.push({
                                 id: `${identifier}@${version}`,
                                 requireId: `${identifier}@${requireVersion}`,
-                                entry: isDirectory ? tryResolve(dir, entry) : entry,
+                                entry: isDirectory ? (0, npm_1.tryResolvePackage)(entry, dir) : entry,
                                 name: identifier,
                                 ref: `${assetName}.js`,
                                 type: 'local',
@@ -131,7 +121,7 @@ function resolveImportmap(dir, importmap) {
         }
         if (Array.isArray(inheritedImports)) {
             for (const inheritedImport of inheritedImports) {
-                const packageJson = tryResolve(dir, `${inheritedImport}/package.json`);
+                const packageJson = (0, npm_1.tryResolvePackage)(`${inheritedImport}/package.json`, dir);
                 if (packageJson) {
                     const packageDir = (0, path_1.dirname)(packageJson);
                     const packageDetails = require(packageJson);