piral-cli 1.8.0-beta.7739 → 1.8.0-beta.7744
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/common/browser.js +2 -36
- package/lib/common/browser.js.map +1 -1
- package/lib/common/http.d.ts +1 -0
- package/lib/common/http.js +9 -5
- package/lib/common/http.js.map +1 -1
- package/lib/external/index.js +23 -16
- package/lib/questionnaire.d.ts +3 -3
- package/lib/questionnaire.js +21 -10
- package/lib/questionnaire.js.map +1 -1
- package/lib/types/public.d.ts +15 -0
- package/package.json +3 -3
- package/src/common/browser.ts +2 -3
- package/src/common/http.ts +18 -7
- package/src/external/index.ts +6 -0
- package/src/questionnaire.ts +25 -24
- package/src/types/public.ts +17 -0
package/lib/common/browser.js
CHANGED
|
@@ -1,47 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
-
if (k2 === undefined) k2 = k;
|
|
4
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
-
var ownKeys = function(o) {
|
|
20
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
-
var ar = [];
|
|
22
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
-
return ar;
|
|
24
|
-
};
|
|
25
|
-
return ownKeys(o);
|
|
26
|
-
};
|
|
27
|
-
return function (mod) {
|
|
28
|
-
if (mod && mod.__esModule) return mod;
|
|
29
|
-
var result = {};
|
|
30
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
-
__setModuleDefault(result, mod);
|
|
32
|
-
return result;
|
|
33
|
-
};
|
|
34
|
-
})();
|
|
35
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
3
|
exports.openBrowserAt = openBrowserAt;
|
|
37
4
|
exports.openBrowser = openBrowser;
|
|
5
|
+
const external_1 = require("../external");
|
|
38
6
|
const log_1 = require("./log");
|
|
39
7
|
const config_1 = require("./config");
|
|
40
8
|
async function openBrowserAt(address) {
|
|
41
9
|
try {
|
|
42
|
-
|
|
43
|
-
const open = await Promise.resolve(`${name}`).then(s => __importStar(require(s))).then((c) => c.default);
|
|
44
|
-
await open(address, undefined);
|
|
10
|
+
await (0, external_1.open)(address);
|
|
45
11
|
}
|
|
46
12
|
catch (err) {
|
|
47
13
|
(0, log_1.log)('failedToOpenBrowser_0170', err);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/common/browser.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"browser.js","sourceRoot":"","sources":["../../src/common/browser.ts"],"names":[],"mappings":";;AAIA,sCAMC;AAED,kCAMC;AAlBD,0CAAmC;AACnC,+BAA4B;AAC5B,qCAAkC;AAE3B,KAAK,UAAU,aAAa,CAAC,OAAe;IACjD,IAAI,CAAC;QACH,MAAM,IAAA,eAAI,EAAC,OAAO,CAAC,CAAC;IACtB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAA,SAAG,EAAC,0BAA0B,EAAE,GAAG,CAAC,CAAC;IACvC,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,WAAW,CAAC,UAAmB,EAAE,IAAY,EAAE,IAAY,EAAE,KAAe;IAChG,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC;QACxC,MAAM,OAAO,GAAG,GAAG,MAAM,MAAM,eAAM,CAAC,IAAI,IAAI,IAAI,GAAG,IAAI,EAAE,CAAC;QAC5D,MAAM,aAAa,CAAC,OAAO,CAAC,CAAC;IAC/B,CAAC;AACH,CAAC"}
|
package/lib/common/http.d.ts
CHANGED
|
@@ -37,5 +37,6 @@ export interface PostFormResult {
|
|
|
37
37
|
success: boolean;
|
|
38
38
|
response?: object;
|
|
39
39
|
}
|
|
40
|
+
export declare function postData(target: string, scheme: PublishScheme, key: string, data: any, customHeaders?: Record<string, string>, httpsAgent?: Agent, interactive?: boolean): Promise<PostFormResult>;
|
|
40
41
|
export declare function postForm(target: string, scheme: PublishScheme, key: string, formData: FormDataObj, customHeaders?: Record<string, string>, httpsAgent?: Agent, interactive?: boolean): Promise<PostFormResult>;
|
|
41
42
|
export declare function postFile(target: string, scheme: PublishScheme, key: string, file: Buffer, customFields?: Record<string, string>, customHeaders?: Record<string, string>, agent?: Agent, interactive?: boolean): Promise<PostFormResult>;
|
package/lib/common/http.js
CHANGED
|
@@ -8,6 +8,7 @@ exports.getAgent = getAgent;
|
|
|
8
8
|
exports.downloadFile = downloadFile;
|
|
9
9
|
exports.createAxiosForm = createAxiosForm;
|
|
10
10
|
exports.handleAxiosError = handleAxiosError;
|
|
11
|
+
exports.postData = postData;
|
|
11
12
|
exports.postForm = postForm;
|
|
12
13
|
exports.postFile = postFile;
|
|
13
14
|
const path_1 = require("path");
|
|
@@ -192,16 +193,14 @@ function handleAxiosError(error, interactive, httpsAgent, refetch, onfail) {
|
|
|
192
193
|
return onfail(500, undefined, error.message);
|
|
193
194
|
}
|
|
194
195
|
}
|
|
195
|
-
async function
|
|
196
|
-
const form = createAxiosForm(formData);
|
|
196
|
+
async function postData(target, scheme, key, data, customHeaders = {}, httpsAgent, interactive = false) {
|
|
197
197
|
const headers = {
|
|
198
|
-
...form.getHeaders(),
|
|
199
198
|
...info_1.standardHeaders,
|
|
200
199
|
...customHeaders,
|
|
201
200
|
...getAuthorizationHeaders(scheme, key),
|
|
202
201
|
};
|
|
203
202
|
try {
|
|
204
|
-
const res = await external_1.axios.post(target,
|
|
203
|
+
const res = await external_1.axios.post(target, data, {
|
|
205
204
|
headers,
|
|
206
205
|
httpsAgent,
|
|
207
206
|
maxContentLength: Infinity,
|
|
@@ -214,7 +213,7 @@ async function postForm(target, scheme, key, formData, customHeaders = {}, https
|
|
|
214
213
|
};
|
|
215
214
|
}
|
|
216
215
|
catch (error) {
|
|
217
|
-
return await handleAxiosError(error, interactive, httpsAgent, (mode, token) =>
|
|
216
|
+
return await handleAxiosError(error, interactive, httpsAgent, (mode, token) => postData(target, mode, token, data, customHeaders, httpsAgent, false), (status, statusText, response) => {
|
|
218
217
|
if (status === 500) {
|
|
219
218
|
(0, log_1.log)('failedHttpPost_0065', response);
|
|
220
219
|
return {
|
|
@@ -234,6 +233,11 @@ async function postForm(target, scheme, key, formData, customHeaders = {}, https
|
|
|
234
233
|
});
|
|
235
234
|
}
|
|
236
235
|
}
|
|
236
|
+
function postForm(target, scheme, key, formData, customHeaders = {}, httpsAgent, interactive = false) {
|
|
237
|
+
const form = createAxiosForm(formData);
|
|
238
|
+
const headers = form.getHeaders();
|
|
239
|
+
return postData(target, scheme, key, form, { ...customHeaders, ...headers }, httpsAgent, interactive);
|
|
240
|
+
}
|
|
237
241
|
function postFile(target, scheme, key, file, customFields = {}, customHeaders = {}, agent, interactive = false) {
|
|
238
242
|
const data = { ...customFields, file: [file, 'pilet.tgz'] };
|
|
239
243
|
return postForm(target, scheme, key, data, customHeaders, agent, interactive);
|
package/lib/common/http.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/common/http.ts"],"names":[],"mappings":";;AAyCA,0CAoBC;AAED,wCAWC;AAED,0DAwBC;AAOD,0CAIC;AAED,4BAQC;AAED,oCAiBC;AAID,0CAgBC;AAED,4CAoDC;AAQD,
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../src/common/http.ts"],"names":[],"mappings":"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"}
|
package/lib/external/index.js
CHANGED
|
@@ -14702,11 +14702,11 @@ var require_yoctocolors_cjs = __commonJS({
|
|
|
14702
14702
|
"../../../node_modules/yoctocolors-cjs/index.js"(exports2, module2) {
|
|
14703
14703
|
var tty3 = require("node:tty");
|
|
14704
14704
|
var hasColors = tty3?.WriteStream?.prototype?.hasColors?.() ?? false;
|
|
14705
|
-
var format = (
|
|
14705
|
+
var format = (open2, close) => {
|
|
14706
14706
|
if (!hasColors) {
|
|
14707
14707
|
return (input) => input;
|
|
14708
14708
|
}
|
|
14709
|
-
const openCode = `\x1B[${
|
|
14709
|
+
const openCode = `\x1B[${open2}m`;
|
|
14710
14710
|
const closeCode = `\x1B[${close}m`;
|
|
14711
14711
|
return (input) => {
|
|
14712
14712
|
const string = input + "";
|
|
@@ -37758,7 +37758,7 @@ var require_graceful_fs = __commonJS({
|
|
|
37758
37758
|
}
|
|
37759
37759
|
function ReadStream$open() {
|
|
37760
37760
|
var that = this;
|
|
37761
|
-
|
|
37761
|
+
open2(that.path, that.flags, that.mode, function(err, fd) {
|
|
37762
37762
|
if (err) {
|
|
37763
37763
|
if (that.autoClose)
|
|
37764
37764
|
that.destroy();
|
|
@@ -37778,7 +37778,7 @@ var require_graceful_fs = __commonJS({
|
|
|
37778
37778
|
}
|
|
37779
37779
|
function WriteStream$open() {
|
|
37780
37780
|
var that = this;
|
|
37781
|
-
|
|
37781
|
+
open2(that.path, that.flags, that.mode, function(err, fd) {
|
|
37782
37782
|
if (err) {
|
|
37783
37783
|
that.destroy();
|
|
37784
37784
|
that.emit("error", err);
|
|
@@ -37795,8 +37795,8 @@ var require_graceful_fs = __commonJS({
|
|
|
37795
37795
|
return new fs14.WriteStream(path9, options);
|
|
37796
37796
|
}
|
|
37797
37797
|
var fs$open = fs14.open;
|
|
37798
|
-
fs14.open =
|
|
37799
|
-
function
|
|
37798
|
+
fs14.open = open2;
|
|
37799
|
+
function open2(path9, flags, mode, cb) {
|
|
37800
37800
|
if (typeof mode === "function")
|
|
37801
37801
|
cb = mode, mode = null;
|
|
37802
37802
|
return go$open(path9, flags, mode, cb);
|
|
@@ -44257,6 +44257,7 @@ __export(external_exports, {
|
|
|
44257
44257
|
isInteractive: () => isInteractive,
|
|
44258
44258
|
jju: () => jju,
|
|
44259
44259
|
mime: () => src_default,
|
|
44260
|
+
open: () => open,
|
|
44260
44261
|
ora: () => ora,
|
|
44261
44262
|
rc: () => rc,
|
|
44262
44263
|
rimraf: () => rimraf,
|
|
@@ -57641,18 +57642,18 @@ var proto = Object.defineProperties(() => {
|
|
|
57641
57642
|
}
|
|
57642
57643
|
}
|
|
57643
57644
|
});
|
|
57644
|
-
var createStyler = (
|
|
57645
|
+
var createStyler = (open2, close, parent) => {
|
|
57645
57646
|
let openAll;
|
|
57646
57647
|
let closeAll;
|
|
57647
57648
|
if (parent === void 0) {
|
|
57648
|
-
openAll =
|
|
57649
|
+
openAll = open2;
|
|
57649
57650
|
closeAll = close;
|
|
57650
57651
|
} else {
|
|
57651
|
-
openAll = parent.openAll +
|
|
57652
|
+
openAll = parent.openAll + open2;
|
|
57652
57653
|
closeAll = close + parent.closeAll;
|
|
57653
57654
|
}
|
|
57654
57655
|
return {
|
|
57655
|
-
open,
|
|
57656
|
+
open: open2,
|
|
57656
57657
|
close,
|
|
57657
57658
|
openAll,
|
|
57658
57659
|
closeAll,
|
|
@@ -58972,18 +58973,18 @@ var proto2 = Object.defineProperties(() => {
|
|
|
58972
58973
|
}
|
|
58973
58974
|
}
|
|
58974
58975
|
});
|
|
58975
|
-
var createStyler2 = (
|
|
58976
|
+
var createStyler2 = (open2, close, parent) => {
|
|
58976
58977
|
let openAll;
|
|
58977
58978
|
let closeAll;
|
|
58978
58979
|
if (parent === void 0) {
|
|
58979
|
-
openAll =
|
|
58980
|
+
openAll = open2;
|
|
58980
58981
|
closeAll = close;
|
|
58981
58982
|
} else {
|
|
58982
|
-
openAll = parent.openAll +
|
|
58983
|
+
openAll = parent.openAll + open2;
|
|
58983
58984
|
closeAll = close + parent.closeAll;
|
|
58984
58985
|
}
|
|
58985
58986
|
return {
|
|
58986
|
-
open,
|
|
58987
|
+
open: open2,
|
|
58987
58988
|
close,
|
|
58988
58989
|
openAll,
|
|
58989
58990
|
closeAll,
|
|
@@ -60281,8 +60282,8 @@ var Minimatch = class {
|
|
|
60281
60282
|
});
|
|
60282
60283
|
return pp.filter((p) => p !== GLOBSTAR).join("/");
|
|
60283
60284
|
}).join("|");
|
|
60284
|
-
const [
|
|
60285
|
-
re = "^" +
|
|
60285
|
+
const [open2, close] = set.length > 1 ? ["(?:", ")"] : ["", ""];
|
|
60286
|
+
re = "^" + open2 + re + close + "$";
|
|
60286
60287
|
if (this.negate)
|
|
60287
60288
|
re = "^(?!" + re + ").+$";
|
|
60288
60289
|
try {
|
|
@@ -65313,6 +65314,11 @@ function getModulePath(root, moduleName) {
|
|
|
65313
65314
|
|
|
65314
65315
|
// src/external/index.ts
|
|
65315
65316
|
var rc = require_rc();
|
|
65317
|
+
async function open(address) {
|
|
65318
|
+
const name2 = "open";
|
|
65319
|
+
const openBrowser = await import(name2).then((c) => c.default);
|
|
65320
|
+
await openBrowser(address, void 0);
|
|
65321
|
+
}
|
|
65316
65322
|
// Annotate the CommonJS export names for ESM import in node:
|
|
65317
65323
|
0 && (module.exports = {
|
|
65318
65324
|
FormData,
|
|
@@ -65325,6 +65331,7 @@ var rc = require_rc();
|
|
|
65325
65331
|
isInteractive,
|
|
65326
65332
|
jju,
|
|
65327
65333
|
mime,
|
|
65334
|
+
open,
|
|
65328
65335
|
ora,
|
|
65329
65336
|
rc,
|
|
65330
65337
|
rimraf,
|
package/lib/questionnaire.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ToolCommand } from './types';
|
|
1
|
+
import type { ToolCommand, Flag } from './types';
|
|
2
2
|
export type IgnoredInstructions = Array<string> | Record<string, string>;
|
|
3
|
-
export declare function runQuestionnaireFor(command: ToolCommand<any, any>, args: Record<string, any>, ignoredInstructions?: IgnoredInstructions): Promise<void>;
|
|
4
|
-
export declare function runQuestionnaire(commandName: string, ignoredInstructions?: IgnoredInstructions): Promise<void>;
|
|
3
|
+
export declare function runQuestionnaireFor(command: ToolCommand<any, any>, args: Record<string, any>, ignoredInstructions?: IgnoredInstructions, extraInstructions?: Array<Flag>): Promise<void>;
|
|
4
|
+
export declare function runQuestionnaire(commandName: string, ignoredInstructions?: IgnoredInstructions, extraInstructions?: Array<Flag>): Promise<void>;
|
package/lib/questionnaire.js
CHANGED
|
@@ -113,9 +113,9 @@ function getType(flag) {
|
|
|
113
113
|
return 'confirm';
|
|
114
114
|
}
|
|
115
115
|
}
|
|
116
|
-
function runQuestionnaireFor(command, args, ignoredInstructions = ['base', 'log-level']) {
|
|
116
|
+
function runQuestionnaireFor(command, args, ignoredInstructions = ['base', 'log-level'], extraInstructions = []) {
|
|
117
117
|
const acceptAll = args.y === true || args.defaults === true;
|
|
118
|
-
const instructions = getCommandData(command.flags);
|
|
118
|
+
const instructions = [...getCommandData(command.flags), ...extraInstructions];
|
|
119
119
|
const ignored = Array.isArray(ignoredInstructions) ? ignoredInstructions : Object.keys(ignoredInstructions);
|
|
120
120
|
const questions = instructions
|
|
121
121
|
.filter((instruction) => !ignored.includes(instruction.name))
|
|
@@ -128,23 +128,34 @@ function runQuestionnaireFor(command, args, ignoredInstructions = ['base', 'log-
|
|
|
128
128
|
message: instruction.describe,
|
|
129
129
|
type: getType(instruction),
|
|
130
130
|
choices: instruction.values,
|
|
131
|
-
validate: instruction.type === 'number' ? (input) => !isNaN(+input) : () => true,
|
|
131
|
+
validate: instruction.validate || (instruction.type === 'number' ? (input) => !isNaN(+input) : () => true),
|
|
132
|
+
filter: instruction.filter,
|
|
133
|
+
when: instruction.when,
|
|
132
134
|
}));
|
|
133
135
|
return external_1.inquirer.prompt(questions).then((answers) => {
|
|
134
136
|
const parameters = {};
|
|
135
137
|
for (const instruction of instructions) {
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
138
|
+
if (!instruction.ignore && (!instruction.when || instruction.when(answers))) {
|
|
139
|
+
const name = instruction.name;
|
|
140
|
+
const value = answers[name] ??
|
|
141
|
+
ignoredInstructions[name] ??
|
|
142
|
+
[...instruction.alias, instruction.name].map((m) => args[m]).find((v) => v !== undefined);
|
|
143
|
+
const convert = instruction.convert || ((value) => value);
|
|
144
|
+
const result = convert(value !== undefined ? getValue(instruction.type, value) : instruction.default);
|
|
145
|
+
if (typeof result === 'object' && typeof parameters[name] === 'object') {
|
|
146
|
+
Object.assign(parameters[name], result);
|
|
147
|
+
}
|
|
148
|
+
else {
|
|
149
|
+
parameters[name] = result;
|
|
150
|
+
}
|
|
151
|
+
}
|
|
141
152
|
}
|
|
142
153
|
return command.run(parameters);
|
|
143
154
|
});
|
|
144
155
|
}
|
|
145
|
-
function runQuestionnaire(commandName, ignoredInstructions = ['base', 'log-level']) {
|
|
156
|
+
function runQuestionnaire(commandName, ignoredInstructions = ['base', 'log-level'], extraInstructions = []) {
|
|
146
157
|
const { argv } = require('yargs');
|
|
147
158
|
const [command] = commands_1.commands.all.filter((m) => m.name === commandName);
|
|
148
|
-
return runQuestionnaireFor(command, argv, ignoredInstructions);
|
|
159
|
+
return runQuestionnaireFor(command, argv, ignoredInstructions, extraInstructions);
|
|
149
160
|
}
|
|
150
161
|
//# sourceMappingURL=questionnaire.js.map
|
package/lib/questionnaire.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"questionnaire.js","sourceRoot":"","sources":["../src/questionnaire.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"questionnaire.js","sourceRoot":"","sources":["../src/questionnaire.ts"],"names":[],"mappings":"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"}
|
package/lib/types/public.d.ts
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
import { Argv, Arguments } from 'yargs';
|
|
2
2
|
import { RuleRunner, PiletRuleContext, PiralRuleContext, LogLevels, SharedDependency } from './common';
|
|
3
|
+
export type FlagType = 'string' | 'number' | 'boolean' | 'object';
|
|
4
|
+
export interface Flag {
|
|
5
|
+
name: string;
|
|
6
|
+
type?: FlagType;
|
|
7
|
+
alias: Array<string>;
|
|
8
|
+
values?: Array<any>;
|
|
9
|
+
describe?: string;
|
|
10
|
+
default?: any;
|
|
11
|
+
required?: boolean;
|
|
12
|
+
ignore?: boolean;
|
|
13
|
+
filter?: (answer: any, others: Record<string, any>) => any;
|
|
14
|
+
validate?: (input: any) => boolean | string | Promise<boolean | string>;
|
|
15
|
+
when?: (answers: Record<string, any>) => boolean;
|
|
16
|
+
convert?: (answer: any) => any;
|
|
17
|
+
}
|
|
3
18
|
export interface ToolCommandRunner<U = {}> {
|
|
4
19
|
(args: Arguments<U>): void | Promise<void>;
|
|
5
20
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "piral-cli",
|
|
3
|
-
"version": "1.8.0-beta.
|
|
3
|
+
"version": "1.8.0-beta.7744",
|
|
4
4
|
"description": "The standard CLI for creating and building a Piral instance or a Pilet.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"portal",
|
|
@@ -44,7 +44,7 @@
|
|
|
44
44
|
"cleanup": "rimraf lib",
|
|
45
45
|
"build": "yarn build:source && rimraf lib/external && yarn build:external",
|
|
46
46
|
"build:source": "tsc --declaration",
|
|
47
|
-
"build:external": "esbuild src/external/index.ts --bundle --outfile=lib/external/index.js --format=cjs --platform=node --external:pnpapi",
|
|
47
|
+
"build:external": "esbuild src/external/index.ts --bundle --outfile=lib/external/index.js --format=cjs --platform=node --external:pnpapi --external:open",
|
|
48
48
|
"test": "echo \"Error: run tests from root\" && exit 1"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
@@ -78,5 +78,5 @@
|
|
|
78
78
|
"typescript": "^5",
|
|
79
79
|
"yargs": "^17"
|
|
80
80
|
},
|
|
81
|
-
"gitHead": "
|
|
81
|
+
"gitHead": "8815cbfb9ea38d9e559e3b7745c7592daad7e99c"
|
|
82
82
|
}
|
package/src/common/browser.ts
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
|
+
import { open } from '../external';
|
|
1
2
|
import { log } from './log';
|
|
2
3
|
import { config } from './config';
|
|
3
4
|
|
|
4
5
|
export async function openBrowserAt(address: string) {
|
|
5
6
|
try {
|
|
6
|
-
|
|
7
|
-
const open = await import(name).then((c) => c.default);
|
|
8
|
-
await open(address, undefined);
|
|
7
|
+
await open(address);
|
|
9
8
|
} catch (err) {
|
|
10
9
|
log('failedToOpenBrowser_0170', err);
|
|
11
10
|
}
|
package/src/common/http.ts
CHANGED
|
@@ -220,26 +220,23 @@ export interface PostFormResult {
|
|
|
220
220
|
response?: object;
|
|
221
221
|
}
|
|
222
222
|
|
|
223
|
-
export async function
|
|
223
|
+
export async function postData(
|
|
224
224
|
target: string,
|
|
225
225
|
scheme: PublishScheme,
|
|
226
226
|
key: string,
|
|
227
|
-
|
|
227
|
+
data: any,
|
|
228
228
|
customHeaders: Record<string, string> = {},
|
|
229
229
|
httpsAgent?: Agent,
|
|
230
230
|
interactive = false,
|
|
231
231
|
): Promise<PostFormResult> {
|
|
232
|
-
const form = createAxiosForm(formData);
|
|
233
|
-
|
|
234
232
|
const headers: Record<string, string> = {
|
|
235
|
-
...form.getHeaders(),
|
|
236
233
|
...standardHeaders,
|
|
237
234
|
...customHeaders,
|
|
238
235
|
...getAuthorizationHeaders(scheme, key),
|
|
239
236
|
};
|
|
240
237
|
|
|
241
238
|
try {
|
|
242
|
-
const res = await axios.post(target,
|
|
239
|
+
const res = await axios.post(target, data, {
|
|
243
240
|
headers,
|
|
244
241
|
httpsAgent,
|
|
245
242
|
maxContentLength: Infinity,
|
|
@@ -256,7 +253,7 @@ export async function postForm(
|
|
|
256
253
|
error,
|
|
257
254
|
interactive,
|
|
258
255
|
httpsAgent,
|
|
259
|
-
(mode, token) =>
|
|
256
|
+
(mode, token) => postData(target, mode, token, data, customHeaders, httpsAgent, false),
|
|
260
257
|
(status, statusText, response) => {
|
|
261
258
|
if (status === 500) {
|
|
262
259
|
log('failedHttpPost_0065', response);
|
|
@@ -278,6 +275,20 @@ export async function postForm(
|
|
|
278
275
|
}
|
|
279
276
|
}
|
|
280
277
|
|
|
278
|
+
export function postForm(
|
|
279
|
+
target: string,
|
|
280
|
+
scheme: PublishScheme,
|
|
281
|
+
key: string,
|
|
282
|
+
formData: FormDataObj,
|
|
283
|
+
customHeaders: Record<string, string> = {},
|
|
284
|
+
httpsAgent?: Agent,
|
|
285
|
+
interactive = false,
|
|
286
|
+
): Promise<PostFormResult> {
|
|
287
|
+
const form = createAxiosForm(formData);
|
|
288
|
+
const headers = form.getHeaders();
|
|
289
|
+
return postData(target, scheme, key, form, { ...customHeaders, ...headers }, httpsAgent, interactive);
|
|
290
|
+
}
|
|
291
|
+
|
|
281
292
|
export function postFile(
|
|
282
293
|
target: string,
|
|
283
294
|
scheme: PublishScheme,
|
package/src/external/index.ts
CHANGED
|
@@ -13,6 +13,12 @@ import chalk from 'chalk';
|
|
|
13
13
|
import { rimraf } from 'rimraf';
|
|
14
14
|
import { getModulePath } from './resolve';
|
|
15
15
|
|
|
16
|
+
export async function open(address: string) {
|
|
17
|
+
const name = 'open';
|
|
18
|
+
const openBrowser = await import(name).then((c) => c.default);
|
|
19
|
+
await openBrowser(address, undefined);
|
|
20
|
+
}
|
|
21
|
+
|
|
16
22
|
export {
|
|
17
23
|
chalk,
|
|
18
24
|
inquirer,
|
package/src/questionnaire.ts
CHANGED
|
@@ -1,18 +1,6 @@
|
|
|
1
1
|
import { inquirer } from './external';
|
|
2
2
|
import { commands } from './commands';
|
|
3
|
-
import { ToolCommand } from './types';
|
|
4
|
-
|
|
5
|
-
type FlagType = 'string' | 'number' | 'boolean' | 'object';
|
|
6
|
-
|
|
7
|
-
interface Flag {
|
|
8
|
-
name: string;
|
|
9
|
-
type?: FlagType;
|
|
10
|
-
alias: Array<string>;
|
|
11
|
-
values?: Array<any>;
|
|
12
|
-
describe?: string;
|
|
13
|
-
default?: any;
|
|
14
|
-
required?: boolean;
|
|
15
|
-
}
|
|
3
|
+
import type { ToolCommand, Flag, FlagType } from './types';
|
|
16
4
|
|
|
17
5
|
function getCommandData(retrieve: any) {
|
|
18
6
|
const instructions: Array<Flag> = [];
|
|
@@ -115,7 +103,7 @@ function getValue(type: FlagType, value: string) {
|
|
|
115
103
|
}
|
|
116
104
|
}
|
|
117
105
|
|
|
118
|
-
function getType(flag: Flag) {
|
|
106
|
+
function getType(flag: Flag): 'list' | 'input' | 'confirm' {
|
|
119
107
|
switch (flag.type) {
|
|
120
108
|
case 'string':
|
|
121
109
|
if (flag.values) {
|
|
@@ -136,9 +124,10 @@ export function runQuestionnaireFor(
|
|
|
136
124
|
command: ToolCommand<any, any>,
|
|
137
125
|
args: Record<string, any>,
|
|
138
126
|
ignoredInstructions: IgnoredInstructions = ['base', 'log-level'],
|
|
127
|
+
extraInstructions: Array<Flag> = [],
|
|
139
128
|
) {
|
|
140
129
|
const acceptAll = args.y === true || args.defaults === true;
|
|
141
|
-
const instructions = getCommandData(command.flags);
|
|
130
|
+
const instructions = [...getCommandData(command.flags), ...extraInstructions];
|
|
142
131
|
const ignored = Array.isArray(ignoredInstructions) ? ignoredInstructions : Object.keys(ignoredInstructions);
|
|
143
132
|
const questions = instructions
|
|
144
133
|
.filter((instruction) => !ignored.includes(instruction.name))
|
|
@@ -149,21 +138,32 @@ export function runQuestionnaireFor(
|
|
|
149
138
|
name: instruction.name,
|
|
150
139
|
default: instruction.values ? instruction.values.indexOf(instruction.default) : instruction.default,
|
|
151
140
|
message: instruction.describe,
|
|
152
|
-
type: getType(instruction)
|
|
141
|
+
type: getType(instruction),
|
|
153
142
|
choices: instruction.values,
|
|
154
|
-
validate: instruction.type === 'number' ? (input: string) => !isNaN(+input) : () => true,
|
|
143
|
+
validate: instruction.validate || (instruction.type === 'number' ? (input: string) => !isNaN(+input) : () => true),
|
|
144
|
+
filter: instruction.filter,
|
|
145
|
+
when: instruction.when,
|
|
155
146
|
}));
|
|
156
147
|
|
|
157
148
|
return inquirer.prompt(questions).then((answers) => {
|
|
158
149
|
const parameters: Record<string, any> = {};
|
|
159
150
|
|
|
160
151
|
for (const instruction of instructions) {
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
152
|
+
if (!instruction.ignore && (!instruction.when || instruction.when(answers))) {
|
|
153
|
+
const name = instruction.name;
|
|
154
|
+
const value =
|
|
155
|
+
answers[name] ??
|
|
156
|
+
ignoredInstructions[name] ??
|
|
157
|
+
[...instruction.alias, instruction.name].map((m) => args[m]).find((v) => v !== undefined);
|
|
158
|
+
const convert = instruction.convert || ((value) => value);
|
|
159
|
+
const result = convert(value !== undefined ? getValue(instruction.type, value as any) : instruction.default);
|
|
160
|
+
|
|
161
|
+
if (typeof result === 'object' && typeof parameters[name] === 'object') {
|
|
162
|
+
Object.assign(parameters[name], result);
|
|
163
|
+
} else {
|
|
164
|
+
parameters[name] = result;
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
167
|
}
|
|
168
168
|
|
|
169
169
|
return command.run(parameters);
|
|
@@ -173,8 +173,9 @@ export function runQuestionnaireFor(
|
|
|
173
173
|
export function runQuestionnaire(
|
|
174
174
|
commandName: string,
|
|
175
175
|
ignoredInstructions: IgnoredInstructions = ['base', 'log-level'],
|
|
176
|
+
extraInstructions: Array<Flag> = [],
|
|
176
177
|
) {
|
|
177
178
|
const { argv } = require('yargs');
|
|
178
179
|
const [command] = commands.all.filter((m) => m.name === commandName);
|
|
179
|
-
return runQuestionnaireFor(command, argv, ignoredInstructions);
|
|
180
|
+
return runQuestionnaireFor(command, argv, ignoredInstructions, extraInstructions);
|
|
180
181
|
}
|
package/src/types/public.ts
CHANGED
|
@@ -1,6 +1,23 @@
|
|
|
1
1
|
import { Argv, Arguments } from 'yargs';
|
|
2
2
|
import { RuleRunner, PiletRuleContext, PiralRuleContext, LogLevels, SharedDependency } from './common';
|
|
3
3
|
|
|
4
|
+
export type FlagType = 'string' | 'number' | 'boolean' | 'object';
|
|
5
|
+
|
|
6
|
+
export interface Flag {
|
|
7
|
+
name: string;
|
|
8
|
+
type?: FlagType;
|
|
9
|
+
alias: Array<string>;
|
|
10
|
+
values?: Array<any>;
|
|
11
|
+
describe?: string;
|
|
12
|
+
default?: any;
|
|
13
|
+
required?: boolean;
|
|
14
|
+
ignore?: boolean;
|
|
15
|
+
filter?: (answer: any, others: Record<string, any>) => any;
|
|
16
|
+
validate?: (input: any) => boolean | string | Promise<boolean | string>;
|
|
17
|
+
when?: (answers: Record<string, any>) => boolean;
|
|
18
|
+
convert?: (answer: any) => any;
|
|
19
|
+
}
|
|
20
|
+
|
|
4
21
|
export interface ToolCommandRunner<U = {}> {
|
|
5
22
|
(args: Arguments<U>): void | Promise<void>;
|
|
6
23
|
}
|