@appium/docutils 1.1.1 → 2.0.0-rc.1
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/cli/command/init.d.ts +0 -27
- package/build/lib/cli/command/init.d.ts.map +1 -1
- package/build/lib/cli/command/init.js +0 -31
- package/build/lib/cli/command/init.js.map +1 -1
- package/build/lib/cli/command/validate.d.ts +0 -24
- package/build/lib/cli/command/validate.d.ts.map +1 -1
- package/build/lib/cli/command/validate.js +2 -26
- package/build/lib/cli/command/validate.js.map +1 -1
- package/build/lib/cli/config.d.ts.map +1 -1
- package/build/lib/cli/config.js +0 -9
- package/build/lib/cli/config.js.map +1 -1
- package/build/lib/constants.d.ts +0 -17
- package/build/lib/constants.d.ts.map +1 -1
- package/build/lib/constants.js +1 -18
- package/build/lib/constants.js.map +1 -1
- package/build/lib/fs.d.ts +0 -24
- package/build/lib/fs.d.ts.map +1 -1
- package/build/lib/fs.js +4 -55
- package/build/lib/fs.js.map +1 -1
- package/build/lib/init.d.ts +3 -21
- package/build/lib/init.d.ts.map +1 -1
- package/build/lib/init.js +2 -85
- package/build/lib/init.js.map +1 -1
- package/build/lib/model.d.ts +1 -7
- package/build/lib/model.d.ts.map +1 -1
- package/build/lib/validate.d.ts +2 -52
- package/build/lib/validate.d.ts.map +1 -1
- package/build/lib/validate.js +0 -118
- package/build/lib/validate.js.map +1 -1
- package/lib/cli/command/init.ts +0 -28
- package/lib/cli/command/validate.ts +2 -26
- package/lib/cli/config.ts +0 -9
- package/lib/constants.ts +0 -23
- package/lib/fs.ts +1 -26
- package/lib/init.ts +4 -79
- package/lib/model.ts +1 -8
- package/lib/validate.ts +2 -193
- package/package.json +12 -16
- package/requirements.txt +1 -1
package/build/lib/init.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../lib/init.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../lib/init.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAC,QAAQ,EAAC,MAAM,WAAW,CAAC;AAEnC,OAAO,EAAqB,mBAAmB,EAAC,MAAM,YAAY,CAAC;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAC,SAAS,EAAC,MAAM,SAAS,CAAC;AAelC;;GAEG;AACH,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,iBAAiB,EAAE,SAAS,CAmDjE,CAAC;AAEF;;;GAGG;AACH,wBAAsB,UAAU,CAAC,EAC/B,UAAU,EACV,MAAc,EACd,OAAe,GAChB,GAAE,iBAAsB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkCxC;AAED;;GAEG;AACH,MAAM,WAAW,iBAAkB,SAAQ,mBAAmB;IAC5D,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;GAKG;AACH,wBAAsB,IAAI,CAAC,EACzB,MAAM,EACN,WAAW,EAAE,eAAe,EAC5B,SAAS,EACT,MAAM,EACN,SAAS,EAAE,aAAa,EACxB,QAAQ,EACR,QAAQ,EACR,OAAO,EACP,SAAS,EACT,MAAM,EACN,GAAG,EACH,UAAU,EACV,OAAO,GACR,GAAE,WAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAkBlC;AAED,MAAM,WAAW,iBAAkB,SAAQ,mBAAmB;IAC5D;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;;;GAIG;AACH,MAAM,MAAM,WAAW,GAAG,QAAQ,CAChC,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,EAAE,MAAM,CAAC,GAAG;IACpD;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,CACF,CAAC"}
|
package/build/lib/init.js
CHANGED
|
@@ -4,54 +4,19 @@
|
|
|
4
4
|
*
|
|
5
5
|
* @module
|
|
6
6
|
*/
|
|
7
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
8
|
-
if (k2 === undefined) k2 = k;
|
|
9
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
10
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
11
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
12
|
-
}
|
|
13
|
-
Object.defineProperty(o, k2, desc);
|
|
14
|
-
}) : (function(o, m, k, k2) {
|
|
15
|
-
if (k2 === undefined) k2 = k;
|
|
16
|
-
o[k2] = m[k];
|
|
17
|
-
}));
|
|
18
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
19
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
20
|
-
}) : function(o, v) {
|
|
21
|
-
o["default"] = v;
|
|
22
|
-
});
|
|
23
|
-
var __importStar = (this && this.__importStar) || (function () {
|
|
24
|
-
var ownKeys = function(o) {
|
|
25
|
-
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
26
|
-
var ar = [];
|
|
27
|
-
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
28
|
-
return ar;
|
|
29
|
-
};
|
|
30
|
-
return ownKeys(o);
|
|
31
|
-
};
|
|
32
|
-
return function (mod) {
|
|
33
|
-
if (mod && mod.__esModule) return mod;
|
|
34
|
-
var result = {};
|
|
35
|
-
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
36
|
-
__setModuleDefault(result, mod);
|
|
37
|
-
return result;
|
|
38
|
-
};
|
|
39
|
-
})();
|
|
40
7
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
41
8
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
42
9
|
};
|
|
43
10
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
44
|
-
exports.initMkDocs =
|
|
11
|
+
exports.initMkDocs = void 0;
|
|
45
12
|
exports.initPython = initPython;
|
|
46
13
|
exports.init = init;
|
|
47
|
-
const JSON5 = __importStar(require("json5"));
|
|
48
14
|
const constants_1 = require("./constants");
|
|
49
15
|
const yaml_1 = __importDefault(require("yaml"));
|
|
50
16
|
const teen_process_1 = require("teen_process");
|
|
51
17
|
const error_1 = require("./error");
|
|
52
18
|
const scaffold_1 = require("./scaffold");
|
|
53
19
|
const logger_1 = require("./logger");
|
|
54
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
55
20
|
const fs_1 = require("./fs");
|
|
56
21
|
/**
|
|
57
22
|
* Data for the base `mkdocs.yml` file
|
|
@@ -61,46 +26,8 @@ const BASE_MKDOCS_YML = Object.freeze({
|
|
|
61
26
|
docs_dir: 'docs',
|
|
62
27
|
site_dir: 'site',
|
|
63
28
|
});
|
|
64
|
-
/**
|
|
65
|
-
* Data for the base `tsconfig.json` file
|
|
66
|
-
*/
|
|
67
|
-
const BASE_TSCONFIG_JSON = Object.freeze({
|
|
68
|
-
$schema: 'https://json.schemastore.org/tsconfig',
|
|
69
|
-
extends: '@appium/tsconfig/tsconfig.json',
|
|
70
|
-
compilerOptions: {
|
|
71
|
-
outDir: 'build',
|
|
72
|
-
},
|
|
73
|
-
});
|
|
74
29
|
const log = (0, logger_1.getLogger)('init');
|
|
75
30
|
const dryRunLog = (0, logger_1.getLogger)('dry-run', log);
|
|
76
|
-
/**
|
|
77
|
-
* Files included, by default, in `tsconfig.json`
|
|
78
|
-
*/
|
|
79
|
-
const DEFAULT_INCLUDE = ['lib', 'test', 'index.js'];
|
|
80
|
-
/**
|
|
81
|
-
* Function which scaffolds a `tsconfig.json` file
|
|
82
|
-
*/
|
|
83
|
-
exports.initTsConfigJson = (0, scaffold_1.createScaffoldTask)(constants_1.NAME_TSCONFIG_JSON, BASE_TSCONFIG_JSON, 'TypeScript configuration', {
|
|
84
|
-
/**
|
|
85
|
-
* Merges the contents of the `include` property with any passed on the CLI. If neither exists,
|
|
86
|
-
* uses the default set of includes.
|
|
87
|
-
* @param content Parsed and/or scaffolded `tsconfig.json`
|
|
88
|
-
* @param opts Options specific to this task
|
|
89
|
-
* @returns `tsconfig.json` content with potentially-modified `include` prop
|
|
90
|
-
*/
|
|
91
|
-
transform: (content, { include }) => {
|
|
92
|
-
include = [...(content.include ?? include ?? [])];
|
|
93
|
-
if (lodash_1.default.isEmpty(include)) {
|
|
94
|
-
include = [...DEFAULT_INCLUDE];
|
|
95
|
-
}
|
|
96
|
-
return {
|
|
97
|
-
...content,
|
|
98
|
-
include: lodash_1.default.uniq(include),
|
|
99
|
-
};
|
|
100
|
-
},
|
|
101
|
-
deserialize: JSON5.parse,
|
|
102
|
-
serialize: fs_1.stringifyJson5,
|
|
103
|
-
});
|
|
104
31
|
/**
|
|
105
32
|
* Function which scaffolds an `mkdocs.yml` file
|
|
106
33
|
*/
|
|
@@ -186,17 +113,7 @@ async function initPython({ pythonPath, dryRun = false, upgrade = false, } = {})
|
|
|
186
113
|
* This runs tasks in serial; it _could_ run in parallel, but it has deleterious effects upon
|
|
187
114
|
* console output which would need mitigation.
|
|
188
115
|
*/
|
|
189
|
-
async function init({
|
|
190
|
-
if (typescript && !upgrade) {
|
|
191
|
-
await (0, exports.initTsConfigJson)({
|
|
192
|
-
dest: tsconfigJsonPath,
|
|
193
|
-
packageJson: packageJsonPath,
|
|
194
|
-
overwrite,
|
|
195
|
-
include,
|
|
196
|
-
dryRun,
|
|
197
|
-
cwd,
|
|
198
|
-
});
|
|
199
|
-
}
|
|
116
|
+
async function init({ python, packageJson: packageJsonPath, overwrite, mkdocs, mkdocsYml: mkdocsYmlPath, siteName, repoName, repoUrl, copyright, dryRun, cwd, pythonPath, upgrade, } = {}) {
|
|
200
117
|
if (python) {
|
|
201
118
|
await initPython({ pythonPath, dryRun, upgrade });
|
|
202
119
|
}
|
package/build/lib/init.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../lib/init.ts"],"names":[],"mappings":";AAAA;;;;GAIG
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../lib/init.ts"],"names":[],"mappings":"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"}
|
package/build/lib/model.d.ts
CHANGED
|
@@ -3,13 +3,7 @@
|
|
|
3
3
|
*
|
|
4
4
|
* @module
|
|
5
5
|
*/
|
|
6
|
-
import type { Jsonify, JsonValue
|
|
7
|
-
/**
|
|
8
|
-
* A `tsconfig.json` file w/ `$schema` prop
|
|
9
|
-
*/
|
|
10
|
-
export type TsConfigJson = TsConfigJsonBase & {
|
|
11
|
-
$schema?: string;
|
|
12
|
-
};
|
|
6
|
+
import type { Jsonify, JsonValue } from 'type-fest';
|
|
13
7
|
/**
|
|
14
8
|
* The `nav` prop of an `mkdocs.yml` file
|
|
15
9
|
* @see {@linkcode MkDocsYml}
|
package/build/lib/model.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../lib/model.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAC,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../lib/model.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAC,OAAO,EAAE,SAAS,EAAC,MAAM,WAAW,CAAC;AAElD;;;GAGG;AACH,MAAM,MAAM,YAAY,GAAG,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC;AAEjG;;;GAGG;AACH,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC;IAC9B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC5B,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mBAAmB,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IAChE,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,OAAO,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;IACpD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,cAAc,CAAC;IACvB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB,CAAC,CAAC;AAEH;;;GAGG;AACH,MAAM,MAAM,cAAc,GACtB,MAAM,GACN,CAAC;IACC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B,GAAG,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC;AAEnC;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB"}
|
package/build/lib/validate.d.ts
CHANGED
|
@@ -4,13 +4,13 @@
|
|
|
4
4
|
* @module
|
|
5
5
|
*/
|
|
6
6
|
import { EventEmitter } from 'node:events';
|
|
7
|
-
import { NAME_MKDOCS,
|
|
7
|
+
import { NAME_MKDOCS, NAME_PYTHON } from './constants';
|
|
8
8
|
import { DocutilsError } from './error';
|
|
9
9
|
import { PipPackage } from './model';
|
|
10
10
|
/**
|
|
11
11
|
* The "kinds" of validation which were requested to be performed
|
|
12
12
|
*/
|
|
13
|
-
export type ValidationKind = typeof NAME_PYTHON | typeof
|
|
13
|
+
export type ValidationKind = typeof NAME_PYTHON | typeof NAME_MKDOCS;
|
|
14
14
|
/**
|
|
15
15
|
* This class is designed to run _all_ validation checks (as requested by the user), and emit events for
|
|
16
16
|
* each failure encountered.
|
|
@@ -26,10 +26,6 @@ export declare class DocutilsValidator extends EventEmitter {
|
|
|
26
26
|
* @todo This cannot yet be overridden by user
|
|
27
27
|
*/
|
|
28
28
|
protected readonly cwd: string;
|
|
29
|
-
/**
|
|
30
|
-
* Path to `npm` executable.
|
|
31
|
-
*/
|
|
32
|
-
protected readonly npmPath?: string;
|
|
33
29
|
/**
|
|
34
30
|
* Path to `python` executable.
|
|
35
31
|
*/
|
|
@@ -51,18 +47,6 @@ export declare class DocutilsValidator extends EventEmitter {
|
|
|
51
47
|
* Path to `mkdocs.yml`. If not provided, will be lazily resolved.
|
|
52
48
|
*/
|
|
53
49
|
protected mkDocsYmlPath?: string;
|
|
54
|
-
/**
|
|
55
|
-
* Path to `package.json`. If not provided, will be lazily resolved.
|
|
56
|
-
*/
|
|
57
|
-
protected packageJsonPath?: string;
|
|
58
|
-
/**
|
|
59
|
-
* Path to the package directory. If not provided, will be lazily resolved.
|
|
60
|
-
*/
|
|
61
|
-
protected pkgDir?: string;
|
|
62
|
-
/**
|
|
63
|
-
* Path to `tsconfig.json`. If not provided, will be lazily resolved.
|
|
64
|
-
*/
|
|
65
|
-
protected tsconfigJsonPath?: string;
|
|
66
50
|
/**
|
|
67
51
|
* Emitted when validation begins with a list of validation kinds to be performed
|
|
68
52
|
* @event
|
|
@@ -99,10 +83,6 @@ export declare class DocutilsValidator extends EventEmitter {
|
|
|
99
83
|
* @returns
|
|
100
84
|
*/
|
|
101
85
|
protected fail(err: DocutilsError | string): void;
|
|
102
|
-
/**
|
|
103
|
-
* Resolves with a the parent directory of `package.json`, if we can find it.
|
|
104
|
-
*/
|
|
105
|
-
protected findPkgDir(): Promise<string | undefined>;
|
|
106
86
|
/**
|
|
107
87
|
* Emits a {@linkcode DocutilsValidator.SUCCESS} event
|
|
108
88
|
* @param message Success message
|
|
@@ -129,12 +109,6 @@ export declare class DocutilsValidator extends EventEmitter {
|
|
|
129
109
|
* It checks if the file exists, if it can be parsed as YAML, and if it has a `site_name` property.
|
|
130
110
|
*/
|
|
131
111
|
protected validateMkDocsConfig(): Promise<void>;
|
|
132
|
-
/**
|
|
133
|
-
* Validates that the version of `npm` matches what's described in this package's `engines` field.
|
|
134
|
-
*
|
|
135
|
-
* This is required because other validators need `npm exec` to work, which is only available in npm 7+.
|
|
136
|
-
*/
|
|
137
|
-
protected validateNpmVersion(): Promise<void>;
|
|
138
112
|
/**
|
|
139
113
|
* Asserts that the dependencies as listed in `requirements.txt` are installed.
|
|
140
114
|
*
|
|
@@ -146,14 +120,6 @@ export declare class DocutilsValidator extends EventEmitter {
|
|
|
146
120
|
* Asserts that the Python version is 3.x
|
|
147
121
|
*/
|
|
148
122
|
protected validatePythonVersion(): Promise<void>;
|
|
149
|
-
/**
|
|
150
|
-
* Asserts that TypeScript is installed, runnable, and the correct version.
|
|
151
|
-
*/
|
|
152
|
-
protected validateTypeScript(): Promise<void>;
|
|
153
|
-
/**
|
|
154
|
-
* Validates a `tsconfig.json` file
|
|
155
|
-
*/
|
|
156
|
-
protected validateTypeScriptConfig(): Promise<void>;
|
|
157
123
|
}
|
|
158
124
|
/**
|
|
159
125
|
* Options for {@linkcode DocutilsValidator} constructor
|
|
@@ -167,14 +133,6 @@ export interface DocutilsValidatorOpts {
|
|
|
167
133
|
* Path to `mkdocs.yml`
|
|
168
134
|
*/
|
|
169
135
|
mkdocsYml?: string;
|
|
170
|
-
/**
|
|
171
|
-
* Path to `npm` executable
|
|
172
|
-
*/
|
|
173
|
-
npm?: string;
|
|
174
|
-
/**
|
|
175
|
-
* Path to `package.json`
|
|
176
|
-
*/
|
|
177
|
-
packageJson?: string;
|
|
178
136
|
/**
|
|
179
137
|
* If `true`, run Python validation
|
|
180
138
|
*/
|
|
@@ -183,14 +141,6 @@ export interface DocutilsValidatorOpts {
|
|
|
183
141
|
* Path to `python` executable
|
|
184
142
|
*/
|
|
185
143
|
pythonPath?: string;
|
|
186
|
-
/**
|
|
187
|
-
* Path to `tsconfig.json`
|
|
188
|
-
*/
|
|
189
|
-
tsconfigJson?: string;
|
|
190
|
-
/**
|
|
191
|
-
* If `true`, run TypeScript validation
|
|
192
|
-
*/
|
|
193
|
-
typescript?: boolean;
|
|
194
144
|
/**
|
|
195
145
|
* If `true`, run MkDocs validation
|
|
196
146
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../lib/validate.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../lib/validate.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAEzC,OAAO,EAIL,WAAW,EAGX,WAAW,EAGZ,MAAM,aAAa,CAAC;AACrB,OAAO,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AAQtC,OAAO,EAAY,UAAU,EAAC,MAAM,SAAS,CAAC;AAc9C;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,OAAO,WAAW,GAAG,OAAO,WAAW,CAAC;AAErE;;;;;;;;GAQG;AACH,qBAAa,iBAAkB,SAAQ,YAAY;IACjD;;;OAGG;IACH,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IAE/B;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAEvC;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,WAAW,sBAA6B;IAE3D;;;;;;;OAOG;IACH,SAAS,CAAC,aAAa,6BAAoC;IAE3D;;OAEG;IACH,SAAS,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAEjC;;;OAGG;IACH,gBAAuB,KAAK,WAAW;IAEvC;;;OAGG;IACH,gBAAuB,GAAG,SAAS;IAEnC;;;OAGG;IACH,gBAAuB,OAAO,UAAU;IAExC;;;OAGG;IACH,gBAAuB,OAAO,QAAQ;IAEtC,OAAO,CAAC,eAAe,CAA2B;IAElD;;OAEG;gBACS,IAAI,GAAE,qBAA0B;IAoB5C;;OAEG;IACU,QAAQ;IAoBrB;;;;;OAKG;IACH,SAAS,CAAC,IAAI,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM;IAO1C;;;OAGG;IACH,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM;IAI5B;;;;;OAKG;cACa,oBAAoB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAuB7D;;OAEG;IACH,SAAS,CAAC,KAAK;IAIf;;OAEG;cACa,cAAc;IAuC9B;;;;OAIG;cACa,oBAAoB;IA8BpC;;;;;OAKG;cACa,kBAAkB;IA4ElC;;OAEG;cACa,qBAAqB;CAkBtC;AAED;;GAEG;AAEH,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB"}
|
package/build/lib/validate.js
CHANGED
|
@@ -13,22 +13,15 @@ const support_1 = require("@appium/support");
|
|
|
13
13
|
const chalk_1 = __importDefault(require("chalk"));
|
|
14
14
|
const lodash_1 = __importDefault(require("lodash"));
|
|
15
15
|
const node_events_1 = require("node:events");
|
|
16
|
-
const node_path_1 = __importDefault(require("node:path"));
|
|
17
|
-
const semver_1 = require("semver");
|
|
18
16
|
const teen_process_1 = require("teen_process");
|
|
19
17
|
const constants_1 = require("./constants");
|
|
20
18
|
const error_1 = require("./error");
|
|
21
19
|
const fs_1 = require("./fs");
|
|
22
20
|
const logger_1 = require("./logger");
|
|
23
|
-
const util_1 = require("./util");
|
|
24
21
|
/**
|
|
25
22
|
* Matches the Python version string from `python --version`
|
|
26
23
|
*/
|
|
27
24
|
const PYTHON_VER_STR = 'Python 3.';
|
|
28
|
-
/**
|
|
29
|
-
* Matches the TypeScript version string from `tsc --version`
|
|
30
|
-
*/
|
|
31
|
-
const TYPESCRIPT_VERSION_REGEX = /Version\s(\d+\.\d+\..+)/;
|
|
32
25
|
/**
|
|
33
26
|
* Matches the MkDocs version string from `mkdocs --version`
|
|
34
27
|
*/
|
|
@@ -62,20 +55,12 @@ class DocutilsValidator extends node_events_1.EventEmitter {
|
|
|
62
55
|
* Reset after {@linkcode DocutilsValidator.validate validate} completes.
|
|
63
56
|
*/
|
|
64
57
|
this.emittedErrors = new Map();
|
|
65
|
-
this.packageJsonPath = opts.packageJson;
|
|
66
58
|
this.pythonPath = opts.pythonPath;
|
|
67
59
|
this.cwd = opts.cwd ?? process.cwd();
|
|
68
|
-
this.tsconfigJsonPath = opts.tsconfigJson;
|
|
69
|
-
this.npmPath = opts.npm;
|
|
70
60
|
this.mkDocsYmlPath = opts.mkdocsYml;
|
|
71
61
|
if (opts.python) {
|
|
72
62
|
this.validations.add(constants_1.NAME_PYTHON);
|
|
73
63
|
}
|
|
74
|
-
if (opts.typescript) {
|
|
75
|
-
this.validations.add(constants_1.NAME_TYPESCRIPT);
|
|
76
|
-
// npm validation is required for typescript
|
|
77
|
-
this.validations.add(constants_1.NAME_NPM);
|
|
78
|
-
}
|
|
79
64
|
if (opts.mkdocs) {
|
|
80
65
|
this.validations.add(constants_1.NAME_MKDOCS);
|
|
81
66
|
}
|
|
@@ -98,13 +83,6 @@ class DocutilsValidator extends node_events_1.EventEmitter {
|
|
|
98
83
|
await this.validateMkDocs();
|
|
99
84
|
await this.validateMkDocsConfig();
|
|
100
85
|
}
|
|
101
|
-
if (this.validations.has(constants_1.NAME_NPM)) {
|
|
102
|
-
await this.validateNpmVersion();
|
|
103
|
-
}
|
|
104
|
-
if (this.validations.has(constants_1.NAME_TYPESCRIPT)) {
|
|
105
|
-
await this.validateTypeScript();
|
|
106
|
-
await this.validateTypeScriptConfig();
|
|
107
|
-
}
|
|
108
86
|
this.emit(DocutilsValidator.END, this.emittedErrors.size);
|
|
109
87
|
}
|
|
110
88
|
finally {
|
|
@@ -123,15 +101,6 @@ class DocutilsValidator extends node_events_1.EventEmitter {
|
|
|
123
101
|
this.emit(DocutilsValidator.FAILURE, dErr);
|
|
124
102
|
}
|
|
125
103
|
}
|
|
126
|
-
/**
|
|
127
|
-
* Resolves with a the parent directory of `package.json`, if we can find it.
|
|
128
|
-
*/
|
|
129
|
-
async findPkgDir() {
|
|
130
|
-
return (this.pkgDir ??
|
|
131
|
-
(this.pkgDir = this.packageJsonPath
|
|
132
|
-
? node_path_1.default.dirname(this.packageJsonPath)
|
|
133
|
-
: await (0, fs_1.findPkgDir)(this.cwd)));
|
|
134
|
-
}
|
|
135
104
|
/**
|
|
136
105
|
* Emits a {@linkcode DocutilsValidator.SUCCESS} event
|
|
137
106
|
* @param message Success message
|
|
@@ -234,32 +203,6 @@ class DocutilsValidator extends node_events_1.EventEmitter {
|
|
|
234
203
|
}
|
|
235
204
|
this.ok(`MkDocs config at ${mkDocsYmlPath} OK`);
|
|
236
205
|
}
|
|
237
|
-
/**
|
|
238
|
-
* Validates that the version of `npm` matches what's described in this package's `engines` field.
|
|
239
|
-
*
|
|
240
|
-
* This is required because other validators need `npm exec` to work, which is only available in npm 7+.
|
|
241
|
-
*/
|
|
242
|
-
async validateNpmVersion() {
|
|
243
|
-
log.debug(`Validating ${constants_1.NAME_NPM} version`);
|
|
244
|
-
const npmEngineRange = constants_1.DOCUTILS_PKG.engines?.npm;
|
|
245
|
-
if (!npmEngineRange) {
|
|
246
|
-
throw new error_1.DocutilsError(`Could not find property 'engines.npm' in ${constants_1.NAME_PACKAGE_JSON}. This is a bug`);
|
|
247
|
-
}
|
|
248
|
-
const npmPath = this.npmPath ?? (await (0, fs_1.whichNpm)());
|
|
249
|
-
if (!npmPath) {
|
|
250
|
-
throw new error_1.DocutilsError(`Could not find ${constants_1.NAME_NPM} in PATH. That seems weird, doesn't it?`);
|
|
251
|
-
}
|
|
252
|
-
try {
|
|
253
|
-
const { stdout: npmVersion } = await support_1.npm.exec('-v', [], { cwd: this.cwd });
|
|
254
|
-
if (!(0, semver_1.satisfies)(npmVersion.trim(), npmEngineRange)) {
|
|
255
|
-
return this.fail(`${constants_1.NAME_NPM} v${npmVersion} is installed, but ${npmEngineRange} is required`);
|
|
256
|
-
}
|
|
257
|
-
}
|
|
258
|
-
catch {
|
|
259
|
-
return this.fail(`Could not retrieve ${constants_1.NAME_NPM} version`);
|
|
260
|
-
}
|
|
261
|
-
this.ok(`${constants_1.NAME_NPM} version OK`);
|
|
262
|
-
}
|
|
263
206
|
/**
|
|
264
207
|
* Asserts that the dependencies as listed in `requirements.txt` are installed.
|
|
265
208
|
*
|
|
@@ -342,67 +285,6 @@ class DocutilsValidator extends node_events_1.EventEmitter {
|
|
|
342
285
|
}
|
|
343
286
|
this.ok('Python version OK');
|
|
344
287
|
}
|
|
345
|
-
/**
|
|
346
|
-
* Asserts that TypeScript is installed, runnable, and the correct version.
|
|
347
|
-
*/
|
|
348
|
-
async validateTypeScript() {
|
|
349
|
-
log.debug(`Validating ${constants_1.NAME_TYPESCRIPT} version`);
|
|
350
|
-
const pkgDir = await this.findPkgDir();
|
|
351
|
-
if (!pkgDir) {
|
|
352
|
-
return this.fail(`Could not find ${constants_1.NAME_PACKAGE_JSON} in ${this.cwd}`);
|
|
353
|
-
}
|
|
354
|
-
const npmPath = this.npmPath ?? (await (0, fs_1.whichNpm)());
|
|
355
|
-
if (!npmPath) {
|
|
356
|
-
throw new error_1.DocutilsError(`Could not find ${constants_1.NAME_NPM} in PATH. That seems weird, doesn't it?`);
|
|
357
|
-
}
|
|
358
|
-
let typeScriptVersion;
|
|
359
|
-
let rawTypeScriptVersion;
|
|
360
|
-
try {
|
|
361
|
-
({ stdout: rawTypeScriptVersion } = await support_1.npm.exec('exec', ['tsc', '--', '--version'], {
|
|
362
|
-
cwd: pkgDir,
|
|
363
|
-
}));
|
|
364
|
-
}
|
|
365
|
-
catch {
|
|
366
|
-
return this.fail(`Could not find TypeScript compiler ("tsc") from ${pkgDir}`);
|
|
367
|
-
}
|
|
368
|
-
const match = rawTypeScriptVersion.match(TYPESCRIPT_VERSION_REGEX);
|
|
369
|
-
if (match) {
|
|
370
|
-
typeScriptVersion = match[1];
|
|
371
|
-
}
|
|
372
|
-
else {
|
|
373
|
-
return this.fail(`Could not parse TypeScript version from "tsc --version"; output was:\n ${rawTypeScriptVersion}`);
|
|
374
|
-
}
|
|
375
|
-
const reqdTypeScriptVersion = constants_1.DOCUTILS_PKG.dependencies?.typescript;
|
|
376
|
-
if (!reqdTypeScriptVersion) {
|
|
377
|
-
throw new error_1.DocutilsError(`Could not find ${constants_1.NAME_TYPESCRIPT} dependency in ${constants_1.NAME_PACKAGE_JSON}. This is a bug`);
|
|
378
|
-
}
|
|
379
|
-
if (!(0, semver_1.satisfies)(typeScriptVersion, reqdTypeScriptVersion)) {
|
|
380
|
-
return this.fail(`TypeScript v${typeScriptVersion} is installed, but v${reqdTypeScriptVersion} is required`);
|
|
381
|
-
}
|
|
382
|
-
this.ok('TypeScript install OK');
|
|
383
|
-
}
|
|
384
|
-
/**
|
|
385
|
-
* Validates a `tsconfig.json` file
|
|
386
|
-
*/
|
|
387
|
-
async validateTypeScriptConfig() {
|
|
388
|
-
log.debug(`Validating ${constants_1.NAME_TSCONFIG_JSON}`);
|
|
389
|
-
const pkgDir = await this.findPkgDir();
|
|
390
|
-
if (!pkgDir) {
|
|
391
|
-
return this.fail(`Could not find ${constants_1.NAME_PACKAGE_JSON} in ${this.cwd}`);
|
|
392
|
-
}
|
|
393
|
-
const tsconfigJsonPath = this.tsconfigJsonPath ?? node_path_1.default.join(pkgDir, constants_1.NAME_TSCONFIG_JSON);
|
|
394
|
-
const relTsconfigJsonPath = (0, util_1.relative)(this.cwd, tsconfigJsonPath);
|
|
395
|
-
try {
|
|
396
|
-
await (0, fs_1.readJson5)(tsconfigJsonPath);
|
|
397
|
-
}
|
|
398
|
-
catch (e) {
|
|
399
|
-
if (e instanceof SyntaxError) {
|
|
400
|
-
return this.fail(`Could not parse ${constants_1.NAME_TSCONFIG_JSON} at ${relTsconfigJsonPath}: ${e}`);
|
|
401
|
-
}
|
|
402
|
-
return this.fail(`Could not find ${constants_1.NAME_TSCONFIG_JSON} at ${relTsconfigJsonPath}; please run "${constants_1.NAME_BIN} init"`);
|
|
403
|
-
}
|
|
404
|
-
this.ok('TypeScript config OK');
|
|
405
|
-
}
|
|
406
288
|
}
|
|
407
289
|
exports.DocutilsValidator = DocutilsValidator;
|
|
408
290
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../lib/validate.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../lib/validate.ts"],"names":[],"mappings":"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"}
|
package/lib/cli/command/init.ts
CHANGED
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
* @module
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
|
-
import _ from 'lodash';
|
|
7
6
|
import type {CommandModule, InferredOptionTypes, Options} from 'yargs';
|
|
8
7
|
import {init} from '../../init';
|
|
9
8
|
import {getLogger} from '../../logger';
|
|
@@ -51,17 +50,6 @@ const opts = {
|
|
|
51
50
|
group: InitCommandGroup.Behavior,
|
|
52
51
|
type: 'boolean',
|
|
53
52
|
},
|
|
54
|
-
include: {
|
|
55
|
-
alias: 'i',
|
|
56
|
-
array: true,
|
|
57
|
-
coerce: (value: string | string[]) => _.castArray(value),
|
|
58
|
-
description: 'Files to include in compilation (globs OK)',
|
|
59
|
-
nargs: 1,
|
|
60
|
-
group: InitCommandGroup.MkDocs,
|
|
61
|
-
requiresArg: true,
|
|
62
|
-
type: 'string',
|
|
63
|
-
implies: 'mkdocs',
|
|
64
|
-
},
|
|
65
53
|
mkdocs: {
|
|
66
54
|
default: true,
|
|
67
55
|
description: 'Create mkdocs.yml if needed',
|
|
@@ -139,22 +127,6 @@ const opts = {
|
|
|
139
127
|
type: 'string',
|
|
140
128
|
implies: 'mkdocs',
|
|
141
129
|
},
|
|
142
|
-
'tsconfig-json': {
|
|
143
|
-
defaultDescription: './tsconfig.json',
|
|
144
|
-
describe: 'Path to new or existing tsconfig.json',
|
|
145
|
-
group: InitCommandGroup.Behavior,
|
|
146
|
-
nargs: 1,
|
|
147
|
-
normalize: true,
|
|
148
|
-
requiresArg: true,
|
|
149
|
-
type: 'string',
|
|
150
|
-
implies: 'typescript',
|
|
151
|
-
},
|
|
152
|
-
typescript: {
|
|
153
|
-
default: true,
|
|
154
|
-
description: 'Create tsconfig.json if needed',
|
|
155
|
-
group: InitCommandGroup.Behavior,
|
|
156
|
-
type: 'boolean',
|
|
157
|
-
},
|
|
158
130
|
upgrade: {
|
|
159
131
|
alias: 'up',
|
|
160
132
|
describe: 'Only upgrade Python dependencies if out-of-date',
|
|
@@ -33,15 +33,6 @@ const opts = {
|
|
|
33
33
|
requiresArg: true,
|
|
34
34
|
type: 'string',
|
|
35
35
|
},
|
|
36
|
-
'npm-path': {
|
|
37
|
-
defaultDescription: '(derived from shell)',
|
|
38
|
-
description: 'Path to npm executable',
|
|
39
|
-
group: ValidateCommandGroup.Paths,
|
|
40
|
-
nargs: 1,
|
|
41
|
-
normalize: true,
|
|
42
|
-
requiresArg: true,
|
|
43
|
-
type: 'string',
|
|
44
|
-
},
|
|
45
36
|
python: {
|
|
46
37
|
default: true,
|
|
47
38
|
description: 'Validate Python 3 environment',
|
|
@@ -57,21 +48,6 @@ const opts = {
|
|
|
57
48
|
requiresArg: true,
|
|
58
49
|
type: 'string',
|
|
59
50
|
},
|
|
60
|
-
'tsconfig-json': {
|
|
61
|
-
defaultDescription: './tsconfig.json',
|
|
62
|
-
describe: 'Path to tsconfig.json',
|
|
63
|
-
group: ValidateCommandGroup.Paths,
|
|
64
|
-
nargs: 1,
|
|
65
|
-
normalize: true,
|
|
66
|
-
requiresArg: true,
|
|
67
|
-
type: 'string',
|
|
68
|
-
},
|
|
69
|
-
typescript: {
|
|
70
|
-
default: true,
|
|
71
|
-
description: 'Validate TypeScript environment',
|
|
72
|
-
group: ValidateCommandGroup.Behavior,
|
|
73
|
-
type: 'boolean',
|
|
74
|
-
},
|
|
75
51
|
} as const satisfies Record<string, Options>;
|
|
76
52
|
|
|
77
53
|
type ValidateOptions = InferredOptionTypes<typeof opts>;
|
|
@@ -81,8 +57,8 @@ export default {
|
|
|
81
57
|
describe: 'Validate Environment',
|
|
82
58
|
builder(yargs) {
|
|
83
59
|
return yargs.options(opts).check(async (argv) => {
|
|
84
|
-
if (!argv.python && !argv.
|
|
85
|
-
return 'No validation targets specified; one or more of --python
|
|
60
|
+
if (!argv.python && !argv.mkdocs) {
|
|
61
|
+
return 'No validation targets specified; one or more of --python or --mkdocs must be provided';
|
|
86
62
|
}
|
|
87
63
|
return checkMissingPaths(opts, ValidateCommandGroup.Paths, argv);
|
|
88
64
|
});
|
package/lib/cli/config.ts
CHANGED
|
@@ -3,7 +3,6 @@
|
|
|
3
3
|
* @module
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
|
-
import loadTs from '@sliphua/lilconfig-ts-loader';
|
|
7
6
|
import {lilconfig, Loader} from 'lilconfig';
|
|
8
7
|
import _ from 'lodash';
|
|
9
8
|
import path from 'node:path';
|
|
@@ -20,10 +19,6 @@ const log = getLogger('config');
|
|
|
20
19
|
* `lilconfig` loader for YAML
|
|
21
20
|
*/
|
|
22
21
|
const loadYaml: Loader = _.rearg(YAML.parse, [2, 0, 1]);
|
|
23
|
-
/**
|
|
24
|
-
* `lilconfig` loader for ESM/CJS
|
|
25
|
-
*/
|
|
26
|
-
const loadEsm: Loader = (filepath: string) => import(filepath);
|
|
27
22
|
|
|
28
23
|
/**
|
|
29
24
|
* Controls how we load/find a config file.
|
|
@@ -75,10 +70,6 @@ export async function loadConfig(filepath?: string, cwd = process.cwd()): Promis
|
|
|
75
70
|
loaders: {
|
|
76
71
|
'.yaml': loadYaml,
|
|
77
72
|
'.yml': loadYaml,
|
|
78
|
-
'.ts': loadTs,
|
|
79
|
-
'.js': loadEsm,
|
|
80
|
-
'.cjs': loadEsm,
|
|
81
|
-
'.mjs': loadEsm,
|
|
82
73
|
},
|
|
83
74
|
});
|
|
84
75
|
|