@appium/docutils 2.2.2 → 2.3.0
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/build/lib/builder/deploy.d.ts.map +1 -1
- package/build/lib/builder/deploy.js +1 -2
- package/build/lib/builder/deploy.js.map +1 -1
- package/build/lib/builder/site.d.ts.map +1 -1
- package/build/lib/builder/site.js +1 -2
- package/build/lib/builder/site.js.map +1 -1
- package/build/lib/util.d.ts +5 -0
- package/build/lib/util.d.ts.map +1 -1
- package/build/lib/util.js +15 -0
- package/build/lib/util.js.map +1 -1
- package/lib/builder/deploy.ts +2 -3
- package/lib/builder/site.ts +2 -3
- package/lib/util.ts +19 -0
- package/package.json +8 -8
- package/requirements.txt +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../lib/builder/deploy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"deploy.d.ts","sourceRoot":"","sources":["../../../lib/builder/deploy.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,cAAc,CAAC;AAczD,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,SAAS,CAAC;AAwDxD;;;GAGG;AACH,wBAAsB,MAAM,CAAC,EAC3B,SAAS,EAAE,aAAa,EACxB,WAAW,EAAE,eAAe,EAC5B,aAAa,EAAE,OAAO,EACtB,GAAmB,EACnB,KAAa,EACb,IAAY,EACZ,MAA8B,EAC9B,MAA8B,EAC9B,YAAY,EACZ,OAAO,EACP,KAAK,EACL,SAAqC,EACrC,IAAyB,EACzB,IAAyB,EACzB,SAAS,EACT,QAAQ,GACT,GAAE,UAAe,iBAiEjB;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;OAEG;IACH,IAAI,CAAC,EAAE,OAAO,CAAC;IACf;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;OAEG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;OAEG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd;;OAEG;IACH,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAElC;;OAEG;IACH,SAAS,CAAC,EAAE,0BAA0B,CAAC;CACxC"}
|
|
@@ -11,7 +11,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
11
11
|
exports.deploy = deploy;
|
|
12
12
|
const lodash_1 = __importDefault(require("lodash"));
|
|
13
13
|
const node_path_1 = __importDefault(require("node:path"));
|
|
14
|
-
const teen_process_1 = require("teen_process");
|
|
15
14
|
const constants_1 = require("../constants");
|
|
16
15
|
const error_1 = require("../error");
|
|
17
16
|
const fs_1 = require("../fs");
|
|
@@ -38,7 +37,7 @@ async function doServe(mikePath, args = [], opts = {}) {
|
|
|
38
37
|
async function doDeploy(mikePath, args = [], opts = {}) {
|
|
39
38
|
const finalArgs = ['deploy', ...args];
|
|
40
39
|
log.debug('Executing %s via: %s %O', constants_1.NAME_MIKE, mikePath, finalArgs);
|
|
41
|
-
return await (0,
|
|
40
|
+
return await (0, util_1.execWithErrorHandling)(mikePath, finalArgs, opts);
|
|
42
41
|
}
|
|
43
42
|
/**
|
|
44
43
|
* Derives a deployment version from `package.json`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../lib/builder/deploy.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../lib/builder/deploy.ts"],"names":[],"mappings":";AAAA;;;;GAIG;;;;;AA8EH,wBAkFC;AA9JD,oDAAuB;AACvB,0DAA6B;AAE7B,4CASsB;AACtB,oCAAuC;AACvC,8BAAiG;AACjG,sCAAoC;AAEpC,kCAAyF;AAEzF,MAAM,GAAG,GAAG,IAAA,kBAAS,EAAC,gBAAgB,CAAC,CAAC;AAExC;;;;;GAKG;AACH,KAAK,UAAU,OAAO,CACpB,QAAgB,EAChB,OAAiB,EAAE,EACnB,OAAmC,EAAE;IAErC,MAAM,SAAS,GAAG,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;IACrC,GAAG,CAAC,KAAK,CAAC,yBAAyB,EAAE,qBAAS,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IACrE,OAAO,IAAA,6BAAsB,EAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;AAC3D,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,QAAQ,CAAC,QAAgB,EAAE,OAAiB,EAAE,EAAE,OAA+B,EAAE;IAC9F,MAAM,SAAS,GAAG,CAAC,QAAQ,EAAE,GAAG,IAAI,CAAC,CAAC;IACtC,GAAG,CAAC,KAAK,CAAC,yBAAyB,EAAE,qBAAS,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IACrE,OAAO,MAAM,IAAA,4BAAqB,EAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;AAChE,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,iBAAiB,CAAC,eAAwB,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE;IAC5E,MAAM,EAAC,GAAG,EAAC,GAAG,MAAM,IAAA,oBAAe,EAAC,eAAe,CAAC,CAAC,CAAC,mBAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IACjG,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;IAC5B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,qBAAa,CACrB,yFAAyF,CAC1F,CAAC;IACJ,CAAC;IAED,6FAA6F;IAC7F,gCAAgC;IAChC,MAAM,YAAY,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACxC,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,OAAO,GAAG,YAAY,CAAC,CAAC,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;AACjD,CAAC;AAED;;;GAGG;AACI,KAAK,UAAU,MAAM,CAAC,EAC3B,SAAS,EAAE,aAAa,EACxB,WAAW,EAAE,eAAe,EAC5B,aAAa,EAAE,OAAO,EACtB,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,EACnB,KAAK,GAAG,KAAK,EACb,IAAI,GAAG,KAAK,EACZ,MAAM,GAAG,iCAAqB,EAC9B,MAAM,GAAG,iCAAqB,EAC9B,YAAY,EACZ,OAAO,EACP,KAAK,EACL,SAAS,GAAG,qCAAyB,EACrC,IAAI,GAAG,8BAAkB,EACzB,IAAI,GAAG,8BAAkB,EACzB,SAAS,EACT,QAAQ,MACM,EAAE;IAChB,MAAM,IAAI,GAAG,IAAA,gBAAS,EAAC,QAAQ,CAAC,CAAC;IAEjC,MAAM,IAAA,kBAAa,GAAE,CAAC;IAEtB,MAAM,eAAe,GAAG,MAAM,IAAA,sBAAiB,GAAE,CAAC;IAClD,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,qBAAa,CAAC,iDAAiD,oBAAQ,QAAQ,CAAC,CAAC;IAC7F,CAAC;IAED,aAAa,GAAG,aAAa,IAAI,CAAC,MAAM,IAAA,kBAAa,EAAC,GAAG,CAAC,CAAC,CAAC;IAC5D,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,MAAM,IAAI,qBAAa,CACrB,kBAAkB,2BAAe,SAAS,GAAG,iBAAiB,oBAAQ,QAAQ,CAC/E,CAAC;IACJ,CAAC;IACD,OAAO,GAAG,OAAO,IAAI,CAAC,MAAM,iBAAiB,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,CAAC;IAErE,wCAAwC;IACxC,OAAO,GAAG,OAAO,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAE1C,MAAM,QAAQ,GAAG;QACf,aAAa,EAAE,aAAa;QAC5B,IAAI;QACJ,MAAM;QACN,MAAM;QACN,eAAe,EAAE,YAAY;QAC7B,OAAO;QACP,IAAI;QACJ,IAAI;KACL,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,IAAA,aAAQ,GAAE,CAAC;IAClC,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,qBAAa,CACrB,kBAAkB,qBAAS,4BAA4B,oBAAQ,QAAQ,CACxE,CAAC;IACJ,CAAC;IACD,IAAI,KAAK,EAAE,CAAC;QACV,MAAM,QAAQ,GAAG;YACf,GAAG,IAAA,aAAM,EAAC,gBAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;SAC9E,CAAC;QACF,IAAI,EAAE,CAAC,CAAC,UAAU;QAClB,0CAA0C;QAC1C,MAAM,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC/C,CAAC;SAAM,CAAC;QACN,GAAG,CAAC,IAAI,CAAC,0BAA0B,EAAE,MAAM,CAAC,CAAC;QAC7C,MAAM,QAAQ,GAAG;YACf,GAAG,IAAA,aAAM,EACP,gBAAC,CAAC,MAAM,CACN,QAAQ,EACR,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE,CAAC,gBAAC,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,gBAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CACpF,CACF;SACF,CAAC;QACF,IAAI,KAAK,EAAE,CAAC;YACV,QAAQ,CAAC,IAAI,CAAC,kBAAkB,EAAE,cAAc,EAAE,SAAS,CAAC,CAAC;YAC7D,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAChC,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzB,CAAC;QACD,MAAM,QAAQ,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;QAE7C,GAAG,CAAC,OAAO,CAAC,2CAA2C,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3E,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site.d.ts","sourceRoot":"","sources":["../../../lib/builder/site.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"site.d.ts","sourceRoot":"","sources":["../../../lib/builder/site.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAC,sBAAsB,EAAC,MAAM,cAAc,CAAC;AAKzD,OAAO,KAAK,EAAC,0BAA0B,EAAC,MAAM,SAAS,CAAC;AAkCxD;;;GAGG;AACH,wBAAsB,SAAS,CAAC,EAC9B,SAAS,EAAE,aAAa,EACxB,OAAO,EACP,GAAmB,EACnB,KAAa,EACb,SAAS,EACT,QAAQ,GACT,GAAE,eAAoB,iBA+CtB;AAED;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IAEf;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IAEb;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;OAEG;IACH,QAAQ,CAAC,EAAE,sBAAsB,CAAC;IAElC;;OAEG;IACH,SAAS,CAAC,EAAE,0BAA0B,CAAC;CACxC"}
|
|
@@ -11,7 +11,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.buildSite = buildSite;
|
|
13
13
|
const node_path_1 = __importDefault(require("node:path"));
|
|
14
|
-
const teen_process_1 = require("teen_process");
|
|
15
14
|
const constants_1 = require("../constants");
|
|
16
15
|
const error_1 = require("../error");
|
|
17
16
|
const fs_1 = require("../fs");
|
|
@@ -39,7 +38,7 @@ async function doServe(pythonPath, args = [], opts = {}) {
|
|
|
39
38
|
async function doBuild(pythonPath, args = [], opts = {}) {
|
|
40
39
|
const finalArgs = ['-m', constants_1.NAME_MKDOCS, 'build', ...args];
|
|
41
40
|
log.debug('Executing %s via: %s, %O', constants_1.NAME_MKDOCS, pythonPath, finalArgs);
|
|
42
|
-
return await (0,
|
|
41
|
+
return await (0, util_1.execWithErrorHandling)(pythonPath, finalArgs, opts);
|
|
43
42
|
}
|
|
44
43
|
/**
|
|
45
44
|
* Runs `mkdocs build` or `mkdocs serve`
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"site.js","sourceRoot":"","sources":["../../../lib/builder/site.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;
|
|
1
|
+
{"version":3,"file":"site.js","sourceRoot":"","sources":["../../../lib/builder/site.ts"],"names":[],"mappings":"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"}
|
package/build/lib/util.d.ts
CHANGED
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import _ from 'lodash';
|
|
6
6
|
import type { SpawnOptions } from 'node:child_process';
|
|
7
|
+
import type { TeenProcessExecOptions } from 'teen_process';
|
|
7
8
|
/**
|
|
8
9
|
* Computes a relative path, prepending `./`
|
|
9
10
|
*/
|
|
@@ -50,4 +51,8 @@ export declare const argify: (obj: Record<string, string | number | boolean | un
|
|
|
50
51
|
*/
|
|
51
52
|
export declare function spawnBackgroundProcess(command: string, args: string[], opts: SpawnOptions): Promise<void>;
|
|
52
53
|
export type SpawnBackgroundProcessOpts = Omit<SpawnOptions, 'stdio'>;
|
|
54
|
+
/**
|
|
55
|
+
* Wraps {@linkcode exec} with error handling that appends stderr to the thrown error message.
|
|
56
|
+
*/
|
|
57
|
+
export declare function execWithErrorHandling(cmd: string, args?: string[], opts?: TeenProcessExecOptions): Promise<import("teen_process").TeenProcessExecResult<string>>;
|
|
53
58
|
//# sourceMappingURL=util.d.ts.map
|
package/build/lib/util.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../lib/util.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../lib/util.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,CAAC,MAAM,QAAQ,CAAC;AACvB,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,oBAAoB,CAAC;AAGrD,OAAO,KAAK,EAAY,sBAAsB,EAAC,MAAM,cAAc,CAAC;AAGpE;;GAEG;AACH,eAAO,MAAM,QAAQ,4CAEpB,CAAC;AAEF;;;;;;GAMG;AACH,wBAAgB,SAAS,CAAC,EAAE,EAAE,MAAM,gBAQnC;yBARe,SAAS;;;AAWzB;;GAEG;AACH,MAAM,MAAM,aAAa,CACvB,CAAC,SAAS,SAAS,GAAG,EAAE,EACxB,CAAC,SAAS,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,EAAE,CAAC,EAAE,WAAW,CAAC,IAC1D;KAAE,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CAAC,CAAC;AAEzD;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAgE,CACxF,KAAK,EAAE,GAAG,KACP,KAAK,IAAI,MAAM,EAAE,CAAC;AAEvB;;;;;GAKG;AACH,eAAO,MAAM,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAC,KAAK,MAAM,EAaxF,CAAC;AAEJ;;;;;;;;;GASG;AACH,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,YAAY,iBAY/F;AAED,MAAM,MAAM,0BAA0B,GAAG,IAAI,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;AAErE;;GAEG;AACH,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,MAAM,EACX,IAAI,CAAC,EAAE,MAAM,EAAE,EACf,IAAI,CAAC,EAAE,sBAAsB,iEAS9B"}
|
package/build/lib/util.js
CHANGED
|
@@ -10,9 +10,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
10
10
|
exports.argify = exports.isStringArray = exports.relative = void 0;
|
|
11
11
|
exports.stopwatch = stopwatch;
|
|
12
12
|
exports.spawnBackgroundProcess = spawnBackgroundProcess;
|
|
13
|
+
exports.execWithErrorHandling = execWithErrorHandling;
|
|
13
14
|
const lodash_1 = __importDefault(require("lodash"));
|
|
14
15
|
const node_child_process_1 = require("node:child_process");
|
|
15
16
|
const node_path_1 = __importDefault(require("node:path"));
|
|
17
|
+
const teen_process_1 = require("teen_process");
|
|
16
18
|
/**
|
|
17
19
|
* Computes a relative path, prepending `./`
|
|
18
20
|
*/
|
|
@@ -78,4 +80,17 @@ async function spawnBackgroundProcess(command, args, opts) {
|
|
|
78
80
|
});
|
|
79
81
|
});
|
|
80
82
|
}
|
|
83
|
+
/**
|
|
84
|
+
* Wraps {@linkcode exec} with error handling that appends stderr to the thrown error message.
|
|
85
|
+
*/
|
|
86
|
+
async function execWithErrorHandling(cmd, args, opts) {
|
|
87
|
+
try {
|
|
88
|
+
return await (0, teen_process_1.exec)(cmd, args, opts);
|
|
89
|
+
}
|
|
90
|
+
catch (err) {
|
|
91
|
+
const execErr = err;
|
|
92
|
+
execErr.message = execErr.stderr ? `${execErr.message}\nCommand error:\n${execErr.stderr}` : execErr.message;
|
|
93
|
+
throw execErr;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
81
96
|
//# sourceMappingURL=util.js.map
|
package/build/lib/util.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/util.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;;
|
|
1
|
+
{"version":3,"file":"util.js","sourceRoot":"","sources":["../../lib/util.ts"],"names":[],"mappings":"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"}
|
package/lib/builder/deploy.ts
CHANGED
|
@@ -7,7 +7,6 @@
|
|
|
7
7
|
import _ from 'lodash';
|
|
8
8
|
import path from 'node:path';
|
|
9
9
|
import type {TeenProcessExecOptions} from 'teen_process';
|
|
10
|
-
import {exec} from 'teen_process';
|
|
11
10
|
import {
|
|
12
11
|
DEFAULT_DEPLOY_ALIAS_TYPE,
|
|
13
12
|
DEFAULT_DEPLOY_BRANCH,
|
|
@@ -22,7 +21,7 @@ import {DocutilsError} from '../error';
|
|
|
22
21
|
import {findMike, findMkDocsYml, isMkDocsInstalled, readPackageJson, requirePython} from '../fs';
|
|
23
22
|
import {getLogger} from '../logger';
|
|
24
23
|
import type {SpawnBackgroundProcessOpts} from '../util';
|
|
25
|
-
import {argify, spawnBackgroundProcess, stopwatch} from '../util';
|
|
24
|
+
import {argify, execWithErrorHandling, spawnBackgroundProcess, stopwatch} from '../util';
|
|
26
25
|
|
|
27
26
|
const log = getLogger('builder:deploy');
|
|
28
27
|
|
|
@@ -51,7 +50,7 @@ async function doServe(
|
|
|
51
50
|
async function doDeploy(mikePath: string, args: string[] = [], opts: TeenProcessExecOptions = {}) {
|
|
52
51
|
const finalArgs = ['deploy', ...args];
|
|
53
52
|
log.debug('Executing %s via: %s %O', NAME_MIKE, mikePath, finalArgs);
|
|
54
|
-
return await
|
|
53
|
+
return await execWithErrorHandling(mikePath, finalArgs, opts);
|
|
55
54
|
}
|
|
56
55
|
|
|
57
56
|
/**
|
package/lib/builder/site.ts
CHANGED
|
@@ -7,13 +7,12 @@
|
|
|
7
7
|
|
|
8
8
|
import path from 'node:path';
|
|
9
9
|
import type {TeenProcessExecOptions} from 'teen_process';
|
|
10
|
-
import {exec} from 'teen_process';
|
|
11
10
|
import {DEFAULT_SITE_DIR, NAME_BIN, NAME_MKDOCS, NAME_MKDOCS_YML} from '../constants';
|
|
12
11
|
import {DocutilsError} from '../error';
|
|
13
12
|
import {findMkDocsYml, isMkDocsInstalled, readMkDocsYml, requirePython} from '../fs';
|
|
14
13
|
import {getLogger} from '../logger';
|
|
15
14
|
import type {SpawnBackgroundProcessOpts} from '../util';
|
|
16
|
-
import {relative, spawnBackgroundProcess, stopwatch} from '../util';
|
|
15
|
+
import {execWithErrorHandling, relative, spawnBackgroundProcess, stopwatch} from '../util';
|
|
17
16
|
|
|
18
17
|
const log = getLogger('mkdocs');
|
|
19
18
|
|
|
@@ -43,7 +42,7 @@ async function doServe(
|
|
|
43
42
|
async function doBuild(pythonPath: string, args: string[] = [], opts: TeenProcessExecOptions = {}) {
|
|
44
43
|
const finalArgs = ['-m', NAME_MKDOCS, 'build', ...args];
|
|
45
44
|
log.debug('Executing %s via: %s, %O', NAME_MKDOCS, pythonPath, finalArgs);
|
|
46
|
-
return await
|
|
45
|
+
return await execWithErrorHandling(pythonPath, finalArgs, opts);
|
|
47
46
|
}
|
|
48
47
|
|
|
49
48
|
/**
|
package/lib/util.ts
CHANGED
|
@@ -7,6 +7,8 @@ import _ from 'lodash';
|
|
|
7
7
|
import type {SpawnOptions} from 'node:child_process';
|
|
8
8
|
import {spawn} from 'node:child_process';
|
|
9
9
|
import path from 'node:path';
|
|
10
|
+
import type {ExecError, TeenProcessExecOptions} from 'teen_process';
|
|
11
|
+
import {exec} from 'teen_process';
|
|
10
12
|
|
|
11
13
|
/**
|
|
12
14
|
* Computes a relative path, prepending `./`
|
|
@@ -96,3 +98,20 @@ export async function spawnBackgroundProcess(command: string, args: string[], op
|
|
|
96
98
|
}
|
|
97
99
|
|
|
98
100
|
export type SpawnBackgroundProcessOpts = Omit<SpawnOptions, 'stdio'>;
|
|
101
|
+
|
|
102
|
+
/**
|
|
103
|
+
* Wraps {@linkcode exec} with error handling that appends stderr to the thrown error message.
|
|
104
|
+
*/
|
|
105
|
+
export async function execWithErrorHandling(
|
|
106
|
+
cmd: string,
|
|
107
|
+
args?: string[],
|
|
108
|
+
opts?: TeenProcessExecOptions,
|
|
109
|
+
) {
|
|
110
|
+
try {
|
|
111
|
+
return await exec(cmd, args, opts);
|
|
112
|
+
} catch (err) {
|
|
113
|
+
const execErr = err as ExecError;
|
|
114
|
+
execErr.message = execErr.stderr ? `${execErr.message}\nCommand error:\n${execErr.stderr}` : execErr.message;
|
|
115
|
+
throw execErr;
|
|
116
|
+
}
|
|
117
|
+
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@appium/docutils",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.3.0",
|
|
4
4
|
"description": "Documentation generation utilities for Appium and related projects",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"automation",
|
|
@@ -46,16 +46,16 @@
|
|
|
46
46
|
"start": "node ./build/lib/cli/index.js"
|
|
47
47
|
},
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@appium/support": "
|
|
49
|
+
"@appium/support": "7.1.0",
|
|
50
50
|
"consola": "3.4.2",
|
|
51
|
-
"diff": "8.0.
|
|
51
|
+
"diff": "8.0.4",
|
|
52
52
|
"lilconfig": "3.1.3",
|
|
53
|
-
"lodash": "4.
|
|
53
|
+
"lodash": "4.18.1",
|
|
54
54
|
"package-directory": "8.2.0",
|
|
55
55
|
"read-pkg": "10.1.0",
|
|
56
|
-
"teen_process": "4.0
|
|
57
|
-
"type-fest": "5.
|
|
58
|
-
"yaml": "2.8.
|
|
56
|
+
"teen_process": "4.1.0",
|
|
57
|
+
"type-fest": "5.5.0",
|
|
58
|
+
"yaml": "2.8.3",
|
|
59
59
|
"yargs": "18.0.0",
|
|
60
60
|
"yargs-parser": "22.0.0"
|
|
61
61
|
},
|
|
@@ -66,5 +66,5 @@
|
|
|
66
66
|
"publishConfig": {
|
|
67
67
|
"access": "public"
|
|
68
68
|
},
|
|
69
|
-
"gitHead": "
|
|
69
|
+
"gitHead": "7a8965f5c30ffec2ad04ce75903b3960537cef06"
|
|
70
70
|
}
|
package/requirements.txt
CHANGED