appium 3.4.2 → 3.5.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/appium.d.ts +3 -0
- package/build/lib/appium.d.ts.map +1 -1
- package/build/lib/appium.js +73 -51
- package/build/lib/appium.js.map +1 -1
- package/build/lib/bidi-commands.d.ts.map +1 -1
- package/build/lib/bidi-commands.js +36 -31
- package/build/lib/bidi-commands.js.map +1 -1
- package/build/lib/bootstrap/appium-initializer.d.ts.map +1 -1
- package/build/lib/bootstrap/appium-initializer.js +13 -13
- package/build/lib/bootstrap/appium-initializer.js.map +1 -1
- package/build/lib/bootstrap/appium-main-runner.d.ts.map +1 -1
- package/build/lib/bootstrap/appium-main-runner.js +2 -2
- package/build/lib/bootstrap/appium-main-runner.js.map +1 -1
- package/build/lib/bootstrap/config-file.d.ts.map +1 -1
- package/build/lib/bootstrap/config-file.js +11 -11
- package/build/lib/bootstrap/config-file.js.map +1 -1
- package/build/lib/bootstrap/grid-v3-register.d.ts.map +1 -1
- package/build/lib/bootstrap/grid-v3-register.js +9 -6
- package/build/lib/bootstrap/grid-v3-register.js.map +1 -1
- package/build/lib/bootstrap/main-helpers.d.ts +1 -1
- package/build/lib/bootstrap/main-helpers.d.ts.map +1 -1
- package/build/lib/bootstrap/main-helpers.js +19 -20
- package/build/lib/bootstrap/main-helpers.js.map +1 -1
- package/build/lib/bootstrap/node-helpers.d.ts +1 -1
- package/build/lib/bootstrap/node-helpers.d.ts.map +1 -1
- package/build/lib/bootstrap/node-helpers.js +8 -16
- package/build/lib/bootstrap/node-helpers.js.map +1 -1
- package/build/lib/bootstrap/startup-config.d.ts.map +1 -1
- package/build/lib/bootstrap/startup-config.js +32 -30
- package/build/lib/bootstrap/startup-config.js.map +1 -1
- package/build/lib/cli/args.d.ts +3 -2
- package/build/lib/cli/args.d.ts.map +1 -1
- package/build/lib/cli/args.js +2 -5
- package/build/lib/cli/args.js.map +1 -1
- package/build/lib/cli/driver-command.d.ts +1 -2
- package/build/lib/cli/driver-command.d.ts.map +1 -1
- package/build/lib/cli/driver-command.js +7 -8
- package/build/lib/cli/driver-command.js.map +1 -1
- package/build/lib/cli/extension-command.d.ts +2 -2
- package/build/lib/cli/extension-command.d.ts.map +1 -1
- package/build/lib/cli/extension-command.js +105 -71
- package/build/lib/cli/extension-command.js.map +1 -1
- package/build/lib/cli/extension.d.ts.map +1 -1
- package/build/lib/cli/extension.js.map +1 -1
- package/build/lib/cli/parser.d.ts.map +1 -1
- package/build/lib/cli/parser.js +21 -14
- package/build/lib/cli/parser.js.map +1 -1
- package/build/lib/cli/plugin-command.d.ts +1 -1
- package/build/lib/cli/plugin-command.d.ts.map +1 -1
- package/build/lib/cli/plugin-command.js +5 -5
- package/build/lib/cli/plugin-command.js.map +1 -1
- package/build/lib/cli/setup-command.d.ts +1 -1
- package/build/lib/cli/setup-command.d.ts.map +1 -1
- package/build/lib/cli/setup-command.js +14 -19
- package/build/lib/cli/setup-command.js.map +1 -1
- package/build/lib/cli/utils.d.ts.map +1 -1
- package/build/lib/cli/utils.js +3 -2
- package/build/lib/cli/utils.js.map +1 -1
- package/build/lib/doctor/doctor.d.ts +0 -1
- package/build/lib/doctor/doctor.d.ts.map +1 -1
- package/build/lib/doctor/doctor.js +12 -17
- package/build/lib/doctor/doctor.js.map +1 -1
- package/build/lib/extension/driver-config.d.ts.map +1 -1
- package/build/lib/extension/driver-config.js +11 -12
- package/build/lib/extension/driver-config.js.map +1 -1
- package/build/lib/extension/extension-config.d.ts.map +1 -1
- package/build/lib/extension/extension-config.js +30 -30
- package/build/lib/extension/extension-config.js.map +1 -1
- package/build/lib/extension/index.d.ts.map +1 -1
- package/build/lib/extension/index.js +28 -41
- package/build/lib/extension/index.js.map +1 -1
- package/build/lib/extension/manifest.d.ts +3 -2
- package/build/lib/extension/manifest.d.ts.map +1 -1
- package/build/lib/extension/manifest.js +20 -24
- package/build/lib/extension/manifest.js.map +1 -1
- package/build/lib/extension/plugin-config.d.ts.map +1 -1
- package/build/lib/extension/plugin-config.js +7 -9
- package/build/lib/extension/plugin-config.js.map +1 -1
- package/build/lib/helpers/build.d.ts +0 -1
- package/build/lib/helpers/build.d.ts.map +1 -1
- package/build/lib/helpers/build.js +2 -4
- package/build/lib/helpers/build.js.map +1 -1
- package/build/lib/helpers/capability.d.ts.map +1 -1
- package/build/lib/helpers/capability.js +27 -22
- package/build/lib/helpers/capability.js.map +1 -1
- package/build/lib/helpers/network.d.ts.map +1 -1
- package/build/lib/helpers/network.js +4 -3
- package/build/lib/helpers/network.js.map +1 -1
- package/build/lib/insecure-features.d.ts.map +1 -1
- package/build/lib/insecure-features.js +9 -13
- package/build/lib/insecure-features.js.map +1 -1
- package/build/lib/inspector-commands.d.ts.map +1 -1
- package/build/lib/inspector-commands.js +29 -28
- package/build/lib/inspector-commands.js.map +1 -1
- package/build/lib/logsink.d.ts.map +1 -1
- package/build/lib/logsink.js +8 -7
- package/build/lib/logsink.js.map +1 -1
- package/build/lib/schema/arg-spec.d.ts.map +1 -1
- package/build/lib/schema/arg-spec.js +5 -8
- package/build/lib/schema/arg-spec.js.map +1 -1
- package/build/lib/schema/cli-args.d.ts.map +1 -1
- package/build/lib/schema/cli-args.js +20 -19
- package/build/lib/schema/cli-args.js.map +1 -1
- package/build/lib/schema/cli-transformers.d.ts.map +1 -1
- package/build/lib/schema/cli-transformers.js.map +1 -1
- package/build/lib/schema/schema.d.ts.map +1 -1
- package/build/lib/schema/schema.js +28 -21
- package/build/lib/schema/schema.js.map +1 -1
- package/build/lib/utils/hash.d.ts +5 -0
- package/build/lib/utils/hash.d.ts.map +1 -0
- package/build/lib/{utils.js → utils/hash.js} +3 -21
- package/build/lib/utils/hash.js.map +1 -0
- package/build/lib/utils/index.d.ts +8 -0
- package/build/lib/utils/index.d.ts.map +1 -0
- package/build/lib/utils/index.js +31 -0
- package/build/lib/utils/index.js.map +1 -0
- package/build/lib/utils/is-package-changed.d.ts +16 -0
- package/build/lib/utils/is-package-changed.d.ts.map +1 -0
- package/build/lib/utils/is-package-changed.js +62 -0
- package/build/lib/utils/is-package-changed.js.map +1 -0
- package/build/lib/utils/object.d.ts +120 -0
- package/build/lib/utils/object.d.ts.map +1 -0
- package/build/lib/utils/object.js +288 -0
- package/build/lib/utils/object.js.map +1 -0
- package/build/lib/{extension → utils}/package-changed.d.ts +0 -1
- package/build/lib/utils/package-changed.d.ts.map +1 -0
- package/build/lib/{extension → utils}/package-changed.js +3 -4
- package/build/lib/utils/package-changed.js.map +1 -0
- package/build/lib/utils/package-json.d.ts +9 -0
- package/build/lib/utils/package-json.d.ts.map +1 -0
- package/build/lib/utils/package-json.js +32 -0
- package/build/lib/utils/package-json.js.map +1 -0
- package/build/lib/utils/resolve-from.d.ts +11 -0
- package/build/lib/utils/resolve-from.d.ts.map +1 -0
- package/build/lib/utils/resolve-from.js +41 -0
- package/build/lib/utils/resolve-from.js.map +1 -0
- package/build/types/cli.d.ts.map +1 -1
- package/build/types/index.d.ts.map +1 -1
- package/build/types/manifest/base.d.ts.map +1 -1
- package/build/types/manifest/v3.d.ts.map +1 -1
- package/build/types/manifest/v4.d.ts.map +1 -1
- package/lib/appium.ts +96 -61
- package/lib/bidi-commands.ts +107 -61
- package/lib/bootstrap/appium-initializer.ts +27 -19
- package/lib/bootstrap/appium-main-runner.ts +8 -4
- package/lib/bootstrap/config-file.ts +33 -16
- package/lib/bootstrap/grid-v3-register.ts +26 -19
- package/lib/bootstrap/main-helpers.ts +25 -19
- package/lib/bootstrap/node-helpers.ts +20 -24
- package/lib/bootstrap/startup-config.ts +42 -39
- package/lib/cli/args.ts +3 -4
- package/lib/cli/driver-command.ts +19 -13
- package/lib/cli/extension-command.ts +214 -149
- package/lib/cli/extension.ts +4 -6
- package/lib/cli/parser.ts +32 -30
- package/lib/cli/plugin-command.ts +20 -9
- package/lib/cli/setup-command.ts +54 -39
- package/lib/cli/utils.ts +4 -3
- package/lib/doctor/doctor.ts +15 -17
- package/lib/extension/driver-config.ts +22 -17
- package/lib/extension/extension-config.ts +76 -69
- package/lib/extension/index.ts +60 -51
- package/lib/extension/manifest.ts +35 -33
- package/lib/extension/plugin-config.ts +15 -10
- package/lib/helpers/build.ts +6 -5
- package/lib/helpers/capability.ts +40 -35
- package/lib/helpers/network.ts +6 -5
- package/lib/insecure-features.ts +16 -14
- package/lib/inspector-commands.ts +72 -40
- package/lib/logsink.ts +22 -26
- package/lib/schema/arg-spec.ts +9 -8
- package/lib/schema/cli-args-guards.ts +4 -4
- package/lib/schema/cli-args.ts +25 -21
- package/lib/schema/cli-transformers.ts +6 -2
- package/lib/schema/format-errors.ts +1 -1
- package/lib/schema/schema.ts +52 -38
- package/lib/{utils.ts → utils/hash.ts} +2 -19
- package/lib/utils/index.ts +23 -0
- package/lib/utils/is-package-changed.ts +78 -0
- package/lib/utils/object.ts +312 -0
- package/lib/{extension → utils}/package-changed.ts +6 -7
- package/lib/utils/package-json.ts +36 -0
- package/lib/utils/resolve-from.ts +40 -0
- package/package.json +16 -19
- package/scripts/autoinstall-extensions.js +8 -13
- package/tsconfig.json +8 -2
- package/types/cli.ts +18 -18
- package/types/index.ts +2 -2
- package/types/manifest/base.ts +2 -2
- package/types/manifest/v3.ts +2 -2
- package/types/manifest/v4.ts +2 -2
- package/build/lib/extension/package-changed.d.ts.map +0 -1
- package/build/lib/extension/package-changed.js.map +0 -1
- package/build/lib/utils.d.ts +0 -13
- package/build/lib/utils.d.ts.map +0 -1
- package/build/lib/utils.js.map +0 -1
|
@@ -1,11 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.listCommands = listCommands;
|
|
7
4
|
exports.listExtensions = listExtensions;
|
|
8
|
-
const
|
|
5
|
+
const utils_1 = require("./utils");
|
|
9
6
|
const base_driver_1 = require("@appium/base-driver");
|
|
10
7
|
/**
|
|
11
8
|
* Returns available REST and BiDi commands for base, driver and plugins.
|
|
@@ -19,16 +16,17 @@ async function listCommands(sessionId) {
|
|
|
19
16
|
const driverClass = this.driverForSession(sessionId)?.constructor;
|
|
20
17
|
driverRestMethodMap = driverClass?.newMethodMap ?? {};
|
|
21
18
|
driverBiDiCommands = driverClass?.newBidiCommands ?? {};
|
|
22
|
-
const pluginClasses = this.pluginsForSession(sessionId)
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
pluginBiDiCommands = lodash_1.default.fromPairs(pluginClasses.map((c) => [c.name, c.newBidiCommands ?? {}]));
|
|
19
|
+
const pluginClasses = this.pluginsForSession(sessionId).map((p) => p.constructor);
|
|
20
|
+
pluginRestMethodMaps = Object.fromEntries(pluginClasses.map((c) => [c.name, c.newMethodMap ?? {}]));
|
|
21
|
+
pluginBiDiCommands = Object.fromEntries(pluginClasses.map((c) => [c.name, c.newBidiCommands ?? {}]));
|
|
26
22
|
}
|
|
27
23
|
return {
|
|
28
24
|
rest: {
|
|
29
25
|
base: methodMapToRestCommandsInfo(base_driver_1.METHOD_MAP),
|
|
30
26
|
driver: methodMapToRestCommandsInfo(driverRestMethodMap),
|
|
31
|
-
plugins: pluginRestMethodMaps
|
|
27
|
+
plugins: pluginRestMethodMaps
|
|
28
|
+
? (0, utils_1.mapValues)(pluginRestMethodMaps, methodMapToRestCommandsInfo)
|
|
29
|
+
: undefined,
|
|
32
30
|
},
|
|
33
31
|
bidi: toBiDiCommandsMap(base_driver_1.BIDI_COMMANDS, driverBiDiCommands, pluginBiDiCommands),
|
|
34
32
|
};
|
|
@@ -42,14 +40,15 @@ async function listExtensions(sessionId) {
|
|
|
42
40
|
if (sessionId) {
|
|
43
41
|
const driverClass = this.driverForSession(sessionId)?.constructor;
|
|
44
42
|
driverExecuteMethodMap = driverClass?.executeMethodMap ?? {};
|
|
45
|
-
const pluginClasses = this.pluginsForSession(sessionId)
|
|
46
|
-
|
|
47
|
-
pluginExecuteMethodMaps = lodash_1.default.fromPairs(pluginClasses.map((c) => [c.name, c.executeMethodMap ?? {}]));
|
|
43
|
+
const pluginClasses = this.pluginsForSession(sessionId).map((p) => p.constructor);
|
|
44
|
+
pluginExecuteMethodMaps = Object.fromEntries(pluginClasses.map((c) => [c.name, c.executeMethodMap ?? {}]));
|
|
48
45
|
}
|
|
49
46
|
return {
|
|
50
47
|
rest: {
|
|
51
48
|
driver: executeMethodMapToCommandsInfo(driverExecuteMethodMap),
|
|
52
|
-
plugins: pluginExecuteMethodMaps
|
|
49
|
+
plugins: pluginExecuteMethodMaps
|
|
50
|
+
? (0, utils_1.mapValues)(pluginExecuteMethodMaps, executeMethodMapToCommandsInfo)
|
|
51
|
+
: undefined,
|
|
53
52
|
},
|
|
54
53
|
};
|
|
55
54
|
}
|
|
@@ -58,9 +57,9 @@ function toRestCommandParams(params) {
|
|
|
58
57
|
return;
|
|
59
58
|
}
|
|
60
59
|
const toRestCommandItemParam = (x, isRequired) => {
|
|
61
|
-
const isNameAnArray =
|
|
60
|
+
const isNameAnArray = Array.isArray(x);
|
|
62
61
|
const name = isNameAnArray ? x[0] : x;
|
|
63
|
-
if (
|
|
62
|
+
if (typeof name !== 'string') {
|
|
64
63
|
return;
|
|
65
64
|
}
|
|
66
65
|
// If parameter names are arrays then this means
|
|
@@ -74,20 +73,20 @@ function toRestCommandParams(params) {
|
|
|
74
73
|
};
|
|
75
74
|
const requiredParams = (params.required ?? [])
|
|
76
75
|
.map((name) => toRestCommandItemParam(name, true))
|
|
77
|
-
.filter((x) =>
|
|
76
|
+
.filter((x) => x !== undefined);
|
|
78
77
|
const optionalParams = (params.optional ?? [])
|
|
79
78
|
.map((name) => toRestCommandItemParam(name, false))
|
|
80
|
-
.filter((x) =>
|
|
79
|
+
.filter((x) => x !== undefined);
|
|
81
80
|
return requiredParams.length || optionalParams.length
|
|
82
81
|
? [...requiredParams, ...optionalParams]
|
|
83
82
|
: undefined;
|
|
84
83
|
}
|
|
85
84
|
function methodMapToRestCommandsInfo(mm) {
|
|
86
85
|
const res = {};
|
|
87
|
-
for (const [uriPath, methods] of
|
|
86
|
+
for (const [uriPath, methods] of Object.entries(mm)) {
|
|
88
87
|
const methodsMap = {};
|
|
89
|
-
for (const [method, spec] of
|
|
90
|
-
methodsMap[method] = {
|
|
88
|
+
for (const [method, spec] of Object.entries(methods)) {
|
|
89
|
+
methodsMap[String(method)] = {
|
|
91
90
|
command: spec.command,
|
|
92
91
|
deprecated: spec.deprecated,
|
|
93
92
|
info: spec.info,
|
|
@@ -100,7 +99,7 @@ function methodMapToRestCommandsInfo(mm) {
|
|
|
100
99
|
}
|
|
101
100
|
function executeMethodMapToCommandsInfo(emm) {
|
|
102
101
|
const result = {};
|
|
103
|
-
for (const [name, info] of
|
|
102
|
+
for (const [name, info] of Object.entries(emm)) {
|
|
104
103
|
result[name] = {
|
|
105
104
|
command: info.command,
|
|
106
105
|
deprecated: info.deprecated,
|
|
@@ -116,9 +115,9 @@ function toBiDiCommandsMap(baseModuleMap, driverModuleMap, pluginModuleMaps) {
|
|
|
116
115
|
return;
|
|
117
116
|
}
|
|
118
117
|
const toBiDiCommandItemParam = (x, isRequired) => {
|
|
119
|
-
const isNameAnArray =
|
|
118
|
+
const isNameAnArray = Array.isArray(x);
|
|
120
119
|
const name = isNameAnArray ? x[0] : x;
|
|
121
|
-
if (
|
|
120
|
+
if (typeof name !== 'string') {
|
|
122
121
|
return;
|
|
123
122
|
}
|
|
124
123
|
// If parameter names are arrays then this means
|
|
@@ -132,19 +131,19 @@ function toBiDiCommandsMap(baseModuleMap, driverModuleMap, pluginModuleMaps) {
|
|
|
132
131
|
};
|
|
133
132
|
const requiredParams = (params.required ?? [])
|
|
134
133
|
.map((name) => toBiDiCommandItemParam(name, true))
|
|
135
|
-
.filter((x) =>
|
|
134
|
+
.filter((x) => x !== undefined);
|
|
136
135
|
const optionalParams = (params.optional ?? [])
|
|
137
136
|
.map((name) => toBiDiCommandItemParam(name, false))
|
|
138
|
-
.filter((x) =>
|
|
137
|
+
.filter((x) => x !== undefined);
|
|
139
138
|
return requiredParams.length || optionalParams.length
|
|
140
139
|
? [...requiredParams, ...optionalParams]
|
|
141
140
|
: undefined;
|
|
142
141
|
};
|
|
143
142
|
const moduleMapToBiDiCommandsInfo = (mm) => {
|
|
144
143
|
const res = {};
|
|
145
|
-
for (const [domain, commands] of
|
|
144
|
+
for (const [domain, commands] of Object.entries(mm)) {
|
|
146
145
|
const commandsMap = {};
|
|
147
|
-
for (const [name, spec] of
|
|
146
|
+
for (const [name, spec] of Object.entries(commands)) {
|
|
148
147
|
commandsMap[name] = {
|
|
149
148
|
command: spec.command,
|
|
150
149
|
deprecated: spec.deprecated,
|
|
@@ -159,7 +158,9 @@ function toBiDiCommandsMap(baseModuleMap, driverModuleMap, pluginModuleMaps) {
|
|
|
159
158
|
return {
|
|
160
159
|
base: moduleMapToBiDiCommandsInfo(baseModuleMap),
|
|
161
160
|
driver: moduleMapToBiDiCommandsInfo(driverModuleMap),
|
|
162
|
-
plugins: pluginModuleMaps
|
|
161
|
+
plugins: pluginModuleMaps
|
|
162
|
+
? (0, utils_1.mapValues)(pluginModuleMaps, moduleMapToBiDiCommandsInfo)
|
|
163
|
+
: undefined,
|
|
163
164
|
};
|
|
164
165
|
}
|
|
165
166
|
//# sourceMappingURL=inspector-commands.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspector-commands.js","sourceRoot":"","sources":["../../lib/inspector-commands.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"inspector-commands.js","sourceRoot":"","sources":["../../lib/inspector-commands.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logsink.d.ts","sourceRoot":"","sources":["../../lib/logsink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"logsink.d.ts","sourceRoot":"","sources":["../../lib/logsink.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AA6C7C;;;;;;GAMG;AACH,wBAAsB,IAAI,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CA0D1D;AAED;;;GAGG;AACH,wBAAgB,KAAK,IAAI,IAAI,CAG5B;AA4KD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEpD"}
|
package/build/lib/logsink.js
CHANGED
|
@@ -9,7 +9,6 @@ exports.stripColorCodes = stripColorCodes;
|
|
|
9
9
|
const logger_1 = __importDefault(require("@appium/logger"));
|
|
10
10
|
const winston_1 = require("winston");
|
|
11
11
|
const support_1 = require("@appium/support");
|
|
12
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
13
12
|
const utils_1 = require("./utils");
|
|
14
13
|
const lru_cache_1 = require("lru-cache");
|
|
15
14
|
const LEVELS_MAP = {
|
|
@@ -75,17 +74,19 @@ async function init(args) {
|
|
|
75
74
|
prefixes.push(prefix);
|
|
76
75
|
}
|
|
77
76
|
let msg = message;
|
|
78
|
-
if (!
|
|
77
|
+
if (!support_1.util.isEmpty(prefixes)) {
|
|
79
78
|
const finalPrefix = prefixes
|
|
80
79
|
.map(toDecoratedPrefix)
|
|
81
80
|
.map((pfx) => (isLogColorEnabled(args) ? colorizePrefix(pfx) : pfx))
|
|
82
81
|
.join('');
|
|
83
82
|
msg = `${finalPrefix} ${msg}`;
|
|
84
83
|
}
|
|
85
|
-
const winstonLevel =
|
|
84
|
+
const winstonLevel = level in TO_WINSTON_LEVELS_MAP
|
|
85
|
+
? TO_WINSTON_LEVELS_MAP[level]
|
|
86
|
+
: 'info';
|
|
86
87
|
try {
|
|
87
88
|
log[winstonLevel](msg);
|
|
88
|
-
if (
|
|
89
|
+
if (typeof args.logHandler === 'function') {
|
|
89
90
|
args.logHandler(level, msg);
|
|
90
91
|
}
|
|
91
92
|
}
|
|
@@ -93,7 +94,7 @@ async function init(args) {
|
|
|
93
94
|
const err = e;
|
|
94
95
|
if (!reportedLoggerErrors.has(err.message) && process.stderr.writable) {
|
|
95
96
|
// eslint-disable-next-line no-console
|
|
96
|
-
console.error(`The log message '${
|
|
97
|
+
console.error(`The log message '${support_1.util.truncateString(msg, { length: 30 })}' cannot be written into ` +
|
|
97
98
|
`one or more requested destinations: ${[...transportNames].join(', ')}. ` +
|
|
98
99
|
`Original error: ${err.message}`);
|
|
99
100
|
reportedLoggerErrors.add(err.message);
|
|
@@ -217,7 +218,7 @@ function formatLog(args, targetConsole) {
|
|
|
217
218
|
if (targetConsole && !args.logTimestamp) {
|
|
218
219
|
delete infoCopy.timestamp;
|
|
219
220
|
}
|
|
220
|
-
if (!
|
|
221
|
+
if (!support_1.util.isEmpty(contextInfo)) {
|
|
221
222
|
infoCopy.context = { ...contextInfo };
|
|
222
223
|
}
|
|
223
224
|
return infoCopy;
|
|
@@ -261,7 +262,7 @@ const stripColorFormat = (0, winston_1.format)(function stripColor(info) {
|
|
|
261
262
|
return {
|
|
262
263
|
...info,
|
|
263
264
|
level: stripColorCodes(info.level),
|
|
264
|
-
message:
|
|
265
|
+
message: typeof info.message === 'string' ? stripColorCodes(info.message) : info.message,
|
|
265
266
|
};
|
|
266
267
|
})();
|
|
267
268
|
function isLogColorEnabled(args) {
|
package/build/lib/logsink.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logsink.js","sourceRoot":"","sources":["../../lib/logsink.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"logsink.js","sourceRoot":"","sources":["../../lib/logsink.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arg-spec.d.ts","sourceRoot":"","sources":["../../../lib/schema/arg-spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"arg-spec.d.ts","sourceRoot":"","sources":["../../../lib/schema/arg-spec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAGjD;;;GAGG;AACH,eAAO,MAAM,uBAAuB,gBAAgB,CAAC;AACrD;;;GAGG;AACH,eAAO,MAAM,gBAAgB,WAAW,CAAC;AAIzC,MAAM,WAAW,cAAc,CAAC,CAAC,GAAG,OAAO;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,CAAC,CAAC;CAClB;AAED;;;;;;GAMG;AACH,qBAAa,OAAO,CAAC,CAAC,GAAG,OAAO;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC;IACjC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;IAE1B;;;OAGG;gBACS,IAAI,EAAE,MAAM,EAAE,EAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAC,GAAE,cAAc,CAAC,CAAC,CAAM;IAgBxF;;OAEG;IACH,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM;IAQnF;;OAEG;IACH,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM;IAOzE;;OAEG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM;IAQ7E;;OAEG;IACH,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAInD;;OAEG;IACH,MAAM,CAAC,6BAA6B,CAAC,QAAQ,EAAE,MAAM,GAAG;QACtD,OAAO,CAAC,EAAE,aAAa,CAAC;QACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;KAC5B;IAYD;;OAEG;IACH,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAIxF,QAAQ,IAAI,MAAM;CAOnB"}
|
|
@@ -1,10 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.ArgSpec = exports.SERVER_PROP_NAME = exports.APPIUM_CONFIG_SCHEMA_ID = void 0;
|
|
7
|
-
const
|
|
4
|
+
const utils_1 = require("../utils");
|
|
8
5
|
/**
|
|
9
6
|
* The original ID of the Appium config schema.
|
|
10
7
|
* We use this in the CLI to convert it to `argparse` options.
|
|
@@ -40,7 +37,7 @@ class ArgSpec {
|
|
|
40
37
|
constructor(name, { extType, extName, dest, defaultValue } = {}) {
|
|
41
38
|
const arg = ArgSpec.toArg(name, extType, extName);
|
|
42
39
|
const ref = ArgSpec.toSchemaRef(name, extType, extName);
|
|
43
|
-
const rawDest =
|
|
40
|
+
const rawDest = (0, utils_1.camelCase)(dest ?? name);
|
|
44
41
|
const destKeypath = extType && extName ? [extType, extName, rawDest].join('.') : rawDest;
|
|
45
42
|
this.defaultValue = defaultValue;
|
|
46
43
|
this.name = name;
|
|
@@ -74,9 +71,9 @@ class ArgSpec {
|
|
|
74
71
|
* Return the unique CLI argument key for the argument.
|
|
75
72
|
*/
|
|
76
73
|
static toArg(name, extType, extName) {
|
|
77
|
-
const properName =
|
|
74
|
+
const properName = (0, utils_1.kebabCase)(name.replace(/^--?/, ''));
|
|
78
75
|
if (extType && extName) {
|
|
79
|
-
return [extType,
|
|
76
|
+
return [extType, (0, utils_1.kebabCase)(extName), properName].join('-');
|
|
80
77
|
}
|
|
81
78
|
return properName;
|
|
82
79
|
}
|
|
@@ -84,7 +81,7 @@ class ArgSpec {
|
|
|
84
81
|
* Normalizes a raw extension name (not including type).
|
|
85
82
|
*/
|
|
86
83
|
static toNormalizedExtName(extName) {
|
|
87
|
-
return
|
|
84
|
+
return (0, utils_1.kebabCase)(extName);
|
|
88
85
|
}
|
|
89
86
|
/**
|
|
90
87
|
* Parse root schema ID (`<extType>-<normalizedExtName>.json`) to extension info.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"arg-spec.js","sourceRoot":"","sources":["../../../lib/schema/arg-spec.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"arg-spec.js","sourceRoot":"","sources":["../../../lib/schema/arg-spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-args.d.ts","sourceRoot":"","sources":["../../../lib/schema/cli-args.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cli-args.d.ts","sourceRoot":"","sources":["../../../lib/schema/cli-args.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,aAAa,CAAC;AAiBrD;;;GAGG;AACH,wBAAgB,YAAY,IAAI,mBAAmB,CAKlD"}
|
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.toParserArgs = toParserArgs;
|
|
7
4
|
const argparse_1 = require("argparse");
|
|
8
|
-
const
|
|
5
|
+
const support_1 = require("@appium/support");
|
|
6
|
+
const utils_1 = require("../utils");
|
|
9
7
|
const format_errors_1 = require("./format-errors");
|
|
10
8
|
const schema_1 = require("./schema");
|
|
11
9
|
const cli_transformers_1 = require("./cli-transformers");
|
|
@@ -25,7 +23,7 @@ const SHORT_ARG_CUTOFF = 3;
|
|
|
25
23
|
*/
|
|
26
24
|
function toParserArgs() {
|
|
27
25
|
const flattened = (0, schema_1.flattenSchema)().filter(({ schema }) => !schema.appiumCliIgnored);
|
|
28
|
-
return new Map(
|
|
26
|
+
return new Map(flattened.map(({ schema, argSpec }) => subSchemaToArgDef(schema, argSpec)));
|
|
29
27
|
}
|
|
30
28
|
/**
|
|
31
29
|
* Convert an alias (`foo`) to a flag (`--foo`) or short flag (`-f`).
|
|
@@ -36,20 +34,20 @@ function aliasToFlag(argSpec, alias) {
|
|
|
36
34
|
const isShort = arg.length < SHORT_ARG_CUTOFF;
|
|
37
35
|
if (extType && extName) {
|
|
38
36
|
return isShort
|
|
39
|
-
? `--${extType}-${
|
|
40
|
-
: `--${extType}-${
|
|
37
|
+
? `--${extType}-${(0, utils_1.kebabCase)(extName)}-${arg}`
|
|
38
|
+
: `--${extType}-${(0, utils_1.kebabCase)(extName)}-${(0, utils_1.kebabCase)(arg)}`;
|
|
41
39
|
}
|
|
42
|
-
return isShort ? `-${arg}` : `--${
|
|
40
|
+
return isShort ? `-${arg}` : `--${(0, utils_1.kebabCase)(arg)}`;
|
|
43
41
|
}
|
|
44
|
-
const screamingSnakeCase =
|
|
42
|
+
const screamingSnakeCase = (s) => (0, utils_1.kebabCase)(s).replace(/-/g, '_').toUpperCase();
|
|
45
43
|
/**
|
|
46
44
|
* Given an argument spec, return a validator/coercer function backed by schema validation.
|
|
47
45
|
*/
|
|
48
|
-
function getSchemaValidator({ ref: schemaId }, coerce =
|
|
46
|
+
function getSchemaValidator({ ref: schemaId }, coerce = (value) => value) {
|
|
49
47
|
return (value) => {
|
|
50
48
|
const coerced = coerce(value);
|
|
51
49
|
const errors = (0, schema_1.validate)(coerced, schemaId);
|
|
52
|
-
if (
|
|
50
|
+
if (support_1.util.isEmpty(errors)) {
|
|
53
51
|
return coerced;
|
|
54
52
|
}
|
|
55
53
|
throw new argparse_1.ArgumentTypeError('\n\n' + (0, format_errors_1.formatErrors)(errors, value, { schemaId }));
|
|
@@ -85,12 +83,13 @@ function subSchemaToArgDef(subSchema, argSpec) {
|
|
|
85
83
|
break;
|
|
86
84
|
}
|
|
87
85
|
case TYPENAMES.OBJECT: {
|
|
88
|
-
argTypeFunction =
|
|
89
|
-
|
|
90
|
-
|
|
86
|
+
argTypeFunction = (value) => {
|
|
87
|
+
const o = cli_transformers_1.transformers.json(value);
|
|
88
|
+
if (!support_1.util.isPlainObject(o)) {
|
|
89
|
+
throw new argparse_1.ArgumentTypeError(`'${support_1.util.truncateString(String(o), { length: 100 })}' must be a plain object`);
|
|
91
90
|
}
|
|
92
91
|
return o;
|
|
93
|
-
}
|
|
92
|
+
};
|
|
94
93
|
break;
|
|
95
94
|
}
|
|
96
95
|
case TYPENAMES.ARRAY: {
|
|
@@ -102,7 +101,7 @@ function subSchemaToArgDef(subSchema, argSpec) {
|
|
|
102
101
|
break;
|
|
103
102
|
}
|
|
104
103
|
case TYPENAMES.INTEGER: {
|
|
105
|
-
argTypeFunction = getSchemaValidator(argSpec,
|
|
104
|
+
argTypeFunction = getSchemaValidator(argSpec, (v) => parseInt(v, 10));
|
|
106
105
|
break;
|
|
107
106
|
}
|
|
108
107
|
case TYPENAMES.STRING: {
|
|
@@ -120,16 +119,18 @@ function subSchemaToArgDef(subSchema, argSpec) {
|
|
|
120
119
|
if (appiumCliTransformer && cli_transformers_1.transformers[appiumCliTransformer]) {
|
|
121
120
|
if (type === TYPENAMES.ARRAY) {
|
|
122
121
|
const csvTransformer = argTypeFunction;
|
|
123
|
-
argTypeFunction = (val) =>
|
|
122
|
+
argTypeFunction = (val) => csvTransformer(val).flatMap((item) => cli_transformers_1.transformers[appiumCliTransformer](item));
|
|
124
123
|
}
|
|
125
124
|
else {
|
|
126
|
-
|
|
125
|
+
const baseFn = argTypeFunction ?? ((value) => value);
|
|
126
|
+
const transformer = cli_transformers_1.transformers[appiumCliTransformer];
|
|
127
|
+
argTypeFunction = (value) => transformer(baseFn(value));
|
|
127
128
|
}
|
|
128
129
|
}
|
|
129
130
|
if (argTypeFunction) {
|
|
130
131
|
argOpts.type = argTypeFunction;
|
|
131
132
|
}
|
|
132
|
-
if (enumValues && !
|
|
133
|
+
if (enumValues && !support_1.util.isEmpty(enumValues)) {
|
|
133
134
|
if (type === TYPENAMES.STRING) {
|
|
134
135
|
argOpts.choices = enumValues.map(String);
|
|
135
136
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-args.js","sourceRoot":"","sources":["../../../lib/schema/cli-args.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cli-args.js","sourceRoot":"","sources":["../../../lib/schema/cli-args.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-transformers.d.ts","sourceRoot":"","sources":["../../../lib/schema/cli-transformers.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AAEH;;GAEG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAKpD;AAED,eAAO,MAAM,YAAY;IACvB;;;OAGG;8BACc,MAAM,KAAG,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"cli-transformers.d.ts","sourceRoot":"","sources":["../../../lib/schema/cli-transformers.ts"],"names":[],"mappings":"AAGA;;;;;GAKG;AAEH;;GAEG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAKpD;AAED,eAAO,MAAM,YAAY;IACvB;;;OAGG;8BACc,MAAM,KAAG,MAAM,EAAE;IAwBlC;;OAEG;gCACgB,MAAM,KAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;CAuBvC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-transformers.js","sourceRoot":"","sources":["../../../lib/schema/cli-transformers.ts"],"names":[],"mappings":";;;AAaA,oCAKC;AAlBD,uCAA2C;AAC3C,qCAAiD;AAEjD;;;;;GAKG;AAEH;;GAEG;AACH,SAAgB,YAAY,CAAC,KAAa;IACxC,OAAO,KAAK;SACT,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC;AAEY,QAAA,YAAY,GAAG;IAC1B;;;OAGG;IACH,GAAG,EAAE,CAAC,SAAiB,EAAY,EAAE;QACnC,IAAI,GAAG,GAAG,SAAS,CAAC;QACpB,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,uEAAuE;QACvE,IAAI,IAAA,oBAAU,EAAC,SAAS,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC;gBACH,GAAG,GAAG,IAAA,sBAAY,EAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACxC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,IAAI,4BAAiB,
|
|
1
|
+
{"version":3,"file":"cli-transformers.js","sourceRoot":"","sources":["../../../lib/schema/cli-transformers.ts"],"names":[],"mappings":";;;AAaA,oCAKC;AAlBD,uCAA2C;AAC3C,qCAAiD;AAEjD;;;;;GAKG;AAEH;;GAEG;AACH,SAAgB,YAAY,CAAC,KAAa;IACxC,OAAO,KAAK;SACT,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,OAAO,CAAC,CAAC;AACrB,CAAC;AAEY,QAAA,YAAY,GAAG;IAC1B;;;OAGG;IACH,GAAG,EAAE,CAAC,SAAiB,EAAY,EAAE;QACnC,IAAI,GAAG,GAAG,SAAS,CAAC;QACpB,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,uEAAuE;QACvE,IAAI,IAAA,oBAAU,EAAC,SAAS,CAAC,EAAE,CAAC;YAC1B,IAAI,CAAC;gBACH,GAAG,GAAG,IAAA,sBAAY,EAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YACxC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,IAAI,4BAAiB,CACzB,wBAAwB,SAAS,MAAO,GAAa,CAAC,OAAO,EAAE,CAChE,CAAC;YACJ,CAAC;YACD,cAAc,GAAG,IAAI,CAAC;QACxB,CAAC;QACD,IAAI,CAAC;YACH,OAAO,cAAc,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;QAChE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,GAAG,GAAG,cAAc;gBACxB,CAAC,CAAC,0BAA0B,SAAS,uBAAuB;gBAC5D,CAAC,CAAC,uDAAuD,CAAC;YAC5D,MAAM,IAAI,SAAS,CAAC,GAAG,GAAG,qBAAsB,GAAa,CAAC,OAAO,EAAE,EAAE,EAAC,KAAK,EAAE,GAAG,EAAC,CAAC,CAAC;QACzF,CAAC;IACH,CAAC;IAED;;OAEG;IACH,IAAI,EAAE,CAAC,UAAkB,EAAuB,EAAE;QAChD,IAAI,IAAI,GAAG,UAAU,CAAC;QACtB,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,IAAI,IAAA,oBAAU,EAAC,UAAU,CAAC,EAAE,CAAC;YAC3B,IAAI,CAAC;gBACH,2DAA2D;gBAC3D,IAAI,GAAG,IAAA,sBAAY,EAAC,UAAU,EAAE,MAAM,CAAC,CAAC;YAC1C,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,IAAI,4BAAiB,CACzB,wBAAwB,UAAU,MAAO,GAAa,CAAC,OAAO,EAAE,CACjE,CAAC;YACJ,CAAC;YACD,cAAc,GAAG,IAAI,CAAC;QACxB,CAAC;QACD,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,GAAG,GAAG,cAAc;gBACxB,CAAC,CAAC,IAAI,UAAU,wBAAwB;gBACxC,CAAC,CAAC,yCAAyC,CAAC;YAC9C,MAAM,IAAI,SAAS,CAAC,GAAG,GAAG,qBAAsB,CAAW,CAAC,OAAO,EAAE,EAAE,EAAC,KAAK,EAAE,CAAC,EAAC,CAAC,CAAC;QACrF,CAAC;IACH,CAAC;CACO,CAAC;AAEX;;GAEG;AACH,SAAS,YAAY,CAAC,KAAa;IACjC,OAAO,KAAK;SACT,KAAK,CAAC,OAAO,CAAC;SACd,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,OAAO,CAAC;SACf,OAAO,CAAC,YAAY,CAAC,CAAC;AAC3B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../lib/schema/schema.ts"],"names":[],"mappings":"AAAA,OAAY,EAAC,KAAK,WAAW,EAAE,KAAK,YAAY,EAAwB,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../lib/schema/schema.ts"],"names":[],"mappings":"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"}
|