@idlebox/node 1.4.0 → 1.4.2
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/cjs/child_process/execa.cjs +2 -2
- package/lib/cjs/child_process/execa.cjs.map +1 -1
- package/lib/cjs/child_process/lateError.cjs +5 -5
- package/lib/cjs/child_process/lateError.cjs.map +1 -1
- package/lib/cjs/child_process/respawn.cjs +5 -5
- package/lib/cjs/child_process/respawn.cjs.map +1 -1
- package/lib/cjs/environment/findBinary.cjs +4 -4
- package/lib/cjs/environment/findBinary.cjs.map +1 -1
- package/lib/cjs/environment/npmConfig.cjs +2 -2
- package/lib/cjs/environment/npmConfig.cjs.map +1 -1
- package/lib/cjs/environment/pathEnvironment.cjs +3 -3
- package/lib/cjs/environment/pathEnvironment.cjs.map +1 -1
- package/lib/cjs/error/nodejs-error-code.generated.cjs +268 -217
- package/lib/cjs/error/nodejs-error-code.generated.cjs.map +1 -1
- package/lib/cjs/error/types.cjs +6 -6
- package/lib/cjs/error/types.cjs.map +1 -1
- package/lib/cjs/fs/commandExists.cjs +3 -3
- package/lib/cjs/fs/commandExists.cjs.map +1 -1
- package/lib/cjs/fs/exists.cjs +3 -3
- package/lib/cjs/fs/exists.cjs.map +1 -1
- package/lib/cjs/fs/tempFolder.cjs +2 -2
- package/lib/cjs/fs/tempFolder.cjs.map +1 -1
- package/lib/cjs/fs/weiteChanged.cjs +3 -3
- package/lib/cjs/fs/weiteChanged.cjs.map +1 -1
- package/lib/cjs/path-resolve/findPackageRoot.cjs +2 -2
- package/lib/cjs/path-resolve/findPackageRoot.cjs.map +1 -1
- package/lib/cjs/path-resolve/findUp.cjs +5 -5
- package/lib/cjs/path-resolve/findUp.cjs.map +1 -1
- package/lib/cjs/stream/collectingStream.cjs +3 -3
- package/lib/cjs/stream/collectingStream.cjs.map +1 -1
- package/lib/cjs/stream/streamPromise.cjs +5 -4
- package/lib/cjs/stream/streamPromise.cjs.map +1 -1
- package/lib/esm/__virtual_tsconfig.tsbuildinfo +1 -1
- package/lib/esm/child_process/execa.js +1 -1
- package/lib/esm/child_process/execa.js.map +1 -1
- package/lib/esm/child_process/lateError.js +2 -2
- package/lib/esm/child_process/lateError.js.map +1 -1
- package/lib/esm/child_process/respawn.js +3 -3
- package/lib/esm/child_process/respawn.js.map +1 -1
- package/lib/esm/environment/findBinary.js +2 -2
- package/lib/esm/environment/findBinary.js.map +1 -1
- package/lib/esm/environment/npmConfig.js +1 -1
- package/lib/esm/environment/npmConfig.js.map +1 -1
- package/lib/esm/environment/pathEnvironment.js +1 -1
- package/lib/esm/environment/pathEnvironment.js.map +1 -1
- package/lib/esm/error/nodejs-error-code.generated.d.ts +269 -218
- package/lib/esm/error/nodejs-error-code.generated.d.ts.map +1 -1
- package/lib/esm/error/nodejs-error-code.generated.js +268 -217
- package/lib/esm/error/nodejs-error-code.generated.js.map +1 -1
- package/lib/esm/error/types.d.ts +2 -2
- package/lib/esm/error/types.d.ts.map +1 -1
- package/lib/esm/error/types.js +2 -2
- package/lib/esm/error/types.js.map +1 -1
- package/lib/esm/fs/commandExists.js +1 -1
- package/lib/esm/fs/commandExists.js.map +1 -1
- package/lib/esm/fs/exists.js +1 -1
- package/lib/esm/fs/exists.js.map +1 -1
- package/lib/esm/fs/tempFolder.js +1 -1
- package/lib/esm/fs/tempFolder.js.map +1 -1
- package/lib/esm/fs/weiteChanged.js +1 -1
- package/lib/esm/fs/weiteChanged.js.map +1 -1
- package/lib/esm/path-resolve/findPackageRoot.js +1 -1
- package/lib/esm/path-resolve/findPackageRoot.js.map +1 -1
- package/lib/esm/path-resolve/findUp.js +1 -1
- package/lib/esm/path-resolve/findUp.js.map +1 -1
- package/lib/esm/stream/collectingStream.d.ts +1 -1
- package/lib/esm/stream/collectingStream.js +1 -1
- package/lib/esm/stream/collectingStream.js.map +1 -1
- package/lib/esm/stream/streamPromise.d.ts.map +1 -1
- package/lib/esm/stream/streamPromise.js +5 -4
- package/lib/esm/stream/streamPromise.js.map +1 -1
- package/package.json +4 -4
- package/src/child_process/execa.ts +1 -1
- package/src/child_process/lateError.ts +2 -2
- package/src/child_process/respawn.ts +3 -3
- package/src/environment/findBinary.ts +2 -2
- package/src/environment/npmConfig.ts +1 -1
- package/src/environment/pathEnvironment.ts +1 -1
- package/src/error/cache.generated.json +467 -323
- package/src/error/nodejs-error-code.generated.ts +268 -218
- package/src/error/nodejs-error-code.generator.ts +1 -1
- package/src/error/types.ts +2 -2
- package/src/fs/commandExists.ts +1 -1
- package/src/fs/exists.ts +1 -1
- package/src/fs/tempFolder.ts +1 -1
- package/src/fs/weiteChanged.ts +1 -1
- package/src/path-resolve/findPackageRoot.ts +1 -1
- package/src/path-resolve/findUp.ts +1 -1
- package/src/stream/collectingStream.ts +1 -1
- package/src/stream/streamPromise.ts +5 -4
|
@@ -8,7 +8,7 @@ exports.spawnGetEverything = spawnGetEverything;
|
|
|
8
8
|
require("@gongt/fix-esm");
|
|
9
9
|
const common_1 = require("@idlebox/common");
|
|
10
10
|
const execa_1 = require("execa");
|
|
11
|
-
const
|
|
11
|
+
const error_js_1 = require("./error.cjs");
|
|
12
12
|
function sanitizeEnv(env, addonPath) {
|
|
13
13
|
if (!env)
|
|
14
14
|
return undefined;
|
|
@@ -38,7 +38,7 @@ function spawnWithoutOutputSync({ exec, cwd, env, addonPath }) {
|
|
|
38
38
|
reject: false,
|
|
39
39
|
env: sanitizeEnv(env, addonPath),
|
|
40
40
|
};
|
|
41
|
-
(0,
|
|
41
|
+
(0, error_js_1.checkChildProcessResult)((0, execa_1.execaSync)(cmd, args, opts));
|
|
42
42
|
}
|
|
43
43
|
async function spawnWithoutOutput({ exec, cwd, env, addonPath }) {
|
|
44
44
|
const [cmd, ...args] = exec;
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/child_process/execa.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": ";;AAuCA,wDAUC;AAED,gDAWC;AAED,gDAaC;AAED,wCAcC;AAED,gDAeC;AA9GD,0BAAwB;AACxB,4CAAqD;AAErD,iCAAyC;AACzC,
|
|
9
|
+
"mappings": "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"
|
|
10
10
|
}
|
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.execLazyError = execLazyError;
|
|
4
4
|
const execa_1 = require("execa");
|
|
5
|
-
const
|
|
6
|
-
const
|
|
5
|
+
const output_js_1 = require("../cli-io/output.cjs");
|
|
6
|
+
const error_js_1 = require("./error.cjs");
|
|
7
7
|
/**
|
|
8
8
|
* 运行命令，如果出错，则输出缓冲的stderr（如果stdout是inherit，也同时输出stdout）
|
|
9
9
|
* 如果程序正常结束，则程序向stderr输出的内容直接丢弃
|
|
@@ -38,16 +38,16 @@ async function execLazyError(cmd, args, spawnOptions) {
|
|
|
38
38
|
const p = (0, execa_1.execa)(cmd, args, opt);
|
|
39
39
|
return p.then((ret) => {
|
|
40
40
|
try {
|
|
41
|
-
(0,
|
|
41
|
+
(0, error_js_1.checkChildProcessResult)(ret);
|
|
42
42
|
}
|
|
43
43
|
catch (e) {
|
|
44
44
|
if (process.stderr.isTTY) {
|
|
45
|
-
(0,
|
|
45
|
+
(0, output_js_1.printLine)();
|
|
46
46
|
console.error('\x1B[2m + %s %s:\x1B[0m', cmd, args.join(' '));
|
|
47
47
|
}
|
|
48
48
|
console.error(ret.all || ret.stderr);
|
|
49
49
|
if (process.stderr.isTTY) {
|
|
50
|
-
(0,
|
|
50
|
+
(0, output_js_1.printLine)();
|
|
51
51
|
}
|
|
52
52
|
throw e;
|
|
53
53
|
}
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/child_process/lateError.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": ";;AA2BA,sCAkDC;AA7ED,iCAA+D;AAC/D,
|
|
9
|
+
"mappings": ";;AA2BA,sCAkDC;AA7ED,iCAA+D;AAC/D,oDAAgD;AAChD,0CAAqD;AAqBrD;;;GAGG;AACI,KAAK,UAAU,aAAa,CAClC,GAAW,EACX,IAAc,EACd,YAAe;IAEf,IAAI,GAAG,GAAG,KAAK,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,YAAY,CAAC;IAEzD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAC1B,GAAG,GAAG,IAAI,CAAC;QACX,MAAM,GAAG,MAAM,CAAC;IACjB,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACb,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAC1B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACrE,CAAC;aAAM,CAAC;YACP,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACvD,CAAC;IACF,CAAC;IAED,MAAM,GAAG,GAA+B;QACvC,GAAG,MAAM;QACT,OAAO,EAAE,MAAM;QACf,KAAK,EAAE,KAAK;QACZ,KAAK,EAAE,SAAS;QAChB,KAAK,EAAE,KAAK,IAAI,QAAQ;QACxB,MAAM;QACN,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,GAAG;QACR,QAAQ,EAAE,MAAM;QAChB,MAAM,EAAE,KAAK;KACb,CAAC;IACF,MAAM,CAAC,GAAG,IAAA,aAAK,EAAC,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;IAChC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;QACrB,IAAI,CAAC;YACJ,IAAA,kCAAuB,EAAC,GAAG,CAAC,CAAC;QAC9B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACZ,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;gBAC1B,IAAA,qBAAS,GAAE,CAAC;gBACZ,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC/D,CAAC;YACD,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC;YACrC,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;gBAC1B,IAAA,qBAAS,GAAE,CAAC;YACb,CAAC;YACD,MAAM,CAAC,CAAC;QACT,CAAC;QACD,OAAO,GAAU,CAAC;IACnB,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,WAAW;AACX,6DAA6D;AAC7D,8BAA8B"
|
|
10
10
|
}
|
|
@@ -6,8 +6,8 @@ exports.respawnInScope = respawnInScope;
|
|
|
6
6
|
const child_process_1 = require("child_process");
|
|
7
7
|
const module_1 = require("module");
|
|
8
8
|
const os_1 = require("os");
|
|
9
|
-
const
|
|
10
|
-
const
|
|
9
|
+
const findBinary_js_1 = require("../environment/findBinary.cjs");
|
|
10
|
+
const execa_js_1 = require("./execa.cjs");
|
|
11
11
|
const unshareArgs = ['--pid', '--cgroup', '--fork', '--mount-proc', '--propagation=slave'];
|
|
12
12
|
if ((0, os_1.platform)() === 'linux' && process.getuid() !== 0) {
|
|
13
13
|
unshareArgs.push('--map-root-user');
|
|
@@ -63,12 +63,12 @@ function insideScope() {
|
|
|
63
63
|
}
|
|
64
64
|
function supportScope() {
|
|
65
65
|
if ((0, os_1.platform)() === 'linux') {
|
|
66
|
-
unshare = (0,
|
|
66
|
+
unshare = (0, findBinary_js_1.findBinary)('unshare');
|
|
67
67
|
if (!unshare) {
|
|
68
68
|
return false;
|
|
69
69
|
}
|
|
70
70
|
try {
|
|
71
|
-
const supported = (0,
|
|
71
|
+
const supported = (0, execa_js_1.spawnGetOutputSync)({
|
|
72
72
|
exec: [unshare, ...unshareArgs, 'echo', 'yes'],
|
|
73
73
|
});
|
|
74
74
|
if (supported !== 'yes') {
|
|
@@ -106,7 +106,7 @@ function execLinux(cmds) {
|
|
|
106
106
|
try {
|
|
107
107
|
process.env.NEVER_UNSHARE = 'true';
|
|
108
108
|
const require = (0, module_1.createRequire)(("file://" + __filename));
|
|
109
|
-
const kexec = require('
|
|
109
|
+
const kexec = require('kexec');
|
|
110
110
|
process.removeAllListeners('SIGINT');
|
|
111
111
|
process.removeAllListeners('SIGTERM');
|
|
112
112
|
kexec(unshare, args);
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/child_process/respawn.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": ";;AAYA,gEAIC;AAcD,0CAMC;AAaD,wCAQC;AAzDD,iDAA0C;AAC1C,mCAAuC;AACvC,2BAA8B;AAC9B,
|
|
9
|
+
"mappings": "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"
|
|
10
10
|
}
|
|
@@ -2,11 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.findBinary = findBinary;
|
|
4
4
|
const path_1 = require("path");
|
|
5
|
-
const
|
|
6
|
-
const
|
|
7
|
-
function findBinary(what, pathvar = new
|
|
5
|
+
const exists_js_1 = require("../fs/exists.cjs");
|
|
6
|
+
const pathEnvironment_js_1 = require("./pathEnvironment.cjs");
|
|
7
|
+
function findBinary(what, pathvar = new pathEnvironment_js_1.PathEnvironment(), cwd = process.cwd()) {
|
|
8
8
|
for (const path of pathvar.values()) {
|
|
9
|
-
if ((0,
|
|
9
|
+
if ((0, exists_js_1.existsSync)(path + '/' + what)) {
|
|
10
10
|
return (0, path_1.resolve)(cwd, path, what);
|
|
11
11
|
}
|
|
12
12
|
}
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/environment/findBinary.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": ";;AAIA,gCAWC;AAfD,+BAA+B;AAC/B,
|
|
9
|
+
"mappings": ";;AAIA,gCAWC;AAfD,+BAA+B;AAC/B,gDAA6C;AAC7C,8DAAuD;AAEvD,SAAgB,UAAU,CACzB,IAAY,EACZ,UAA+C,IAAI,oCAAe,EAAE,EACpE,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE;IAEnB,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QACrC,IAAI,IAAA,sBAAU,EAAC,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC;YACnC,OAAO,IAAA,cAAO,EAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;QACjC,CAAC;IACF,CAAC;IACD,OAAO,EAAE,CAAC;AACX,CAAC"
|
|
10
10
|
}
|
|
@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getNpmConfigValue = getNpmConfigValue;
|
|
4
4
|
const common_1 = require("@idlebox/common");
|
|
5
5
|
const path_1 = require("path");
|
|
6
|
-
const
|
|
6
|
+
const execa_js_1 = require("../child_process/execa.cjs");
|
|
7
7
|
async function getNpmConfigValue(field) {
|
|
8
8
|
const env_name = 'npm_config_' + (0, common_1.linux_case)(field);
|
|
9
9
|
if (typeof process.env[env_name] === 'string') {
|
|
10
10
|
return process.env[env_name];
|
|
11
11
|
}
|
|
12
|
-
return await (0,
|
|
12
|
+
return await (0, execa_js_1.spawnGetOutput)({
|
|
13
13
|
exec: ['npm', 'config', 'get', field],
|
|
14
14
|
addonPath: [(0, path_1.dirname)(process.argv0)],
|
|
15
15
|
})
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/environment/npmConfig.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": ";;AAIA,8CAkBC;AAtBD,4CAA6C;AAC7C,+BAA+B;AAC/B,
|
|
9
|
+
"mappings": ";;AAIA,8CAkBC;AAtBD,4CAA6C;AAC7C,+BAA+B;AAC/B,yDAA2D;AAEpD,KAAK,UAAU,iBAAiB,CAAC,KAAa;IACpD,MAAM,QAAQ,GAAG,aAAa,GAAG,IAAA,mBAAU,EAAC,KAAK,CAAC,CAAC;IACnD,IAAI,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,QAAQ,EAAE,CAAC;QAC/C,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC;IAC/B,CAAC;IAED,OAAO,MAAM,IAAA,yBAAc,EAAC;QAC3B,IAAI,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC;QACrC,SAAS,EAAE,CAAC,IAAA,cAAO,EAAC,OAAO,CAAC,KAAK,CAAC,CAAC;KACnC,CAAC;SACA,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC;SACf,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;QACX,IAAI,CAAC,KAAK,WAAW,EAAE,CAAC;YACvB,OAAO,EAAE,CAAC;QACX,CAAC;aAAM,CAAC;YACP,OAAO,EAAE,CAAC;QACX,CAAC;IACF,CAAC,CAAC,CAAC;AACL,CAAC"
|
|
10
10
|
}
|
|
@@ -3,19 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.PathEnvironment = exports.PATH_SEPARATOR = void 0;
|
|
4
4
|
const os_1 = require("os");
|
|
5
5
|
const common_1 = require("@idlebox/common");
|
|
6
|
-
const
|
|
6
|
+
const getEnvironment_js_1 = require("./getEnvironment.cjs");
|
|
7
7
|
exports.PATH_SEPARATOR = (0, os_1.platform)() === 'win32' ? ';' : ':';
|
|
8
8
|
class PathEnvironment extends common_1.PathArray {
|
|
9
9
|
name;
|
|
10
10
|
env;
|
|
11
11
|
constructor(varName = (0, os_1.platform)() === 'win32' ? 'Path' : 'PATH', env = process.env) {
|
|
12
|
-
const { name, value } = (0,
|
|
12
|
+
const { name, value } = (0, getEnvironment_js_1.getEnvironment)(varName, env);
|
|
13
13
|
super('', exports.PATH_SEPARATOR);
|
|
14
14
|
this.name = name;
|
|
15
15
|
this.env = env;
|
|
16
16
|
if (value)
|
|
17
17
|
super.add(value);
|
|
18
|
-
(0,
|
|
18
|
+
(0, getEnvironment_js_1.cleanupEnvironment)(varName);
|
|
19
19
|
}
|
|
20
20
|
add(p) {
|
|
21
21
|
const pSize = this.size;
|
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
"../../../src/environment/pathEnvironment.ts"
|
|
7
7
|
],
|
|
8
8
|
"names": [],
|
|
9
|
-
"mappings": ";;;AAAA,2BAA8B;AAC9B,4CAA4C;AAC5C,
|
|
9
|
+
"mappings": ";;;AAAA,2BAA8B;AAC9B,4CAA4C;AAC5C,4DAAyE;AAE5D,QAAA,cAAc,GAAG,IAAA,aAAQ,GAAE,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;AACjE,MAAa,eAAgB,SAAQ,kBAAS;IAC5B,IAAI,CAAS;IACb,GAAG,CAAoB;IAExC,YAAY,OAAO,GAAG,IAAA,aAAQ,GAAE,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,MAAyB,OAAO,CAAC,GAAG;QACnG,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,IAAA,kCAAc,EAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACrD,KAAK,CAAC,EAAE,EAAE,sBAAc,CAAC,CAAC;QAE1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QAEf,IAAI,KAAK;YAAE,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAC5B,IAAA,sCAAkB,EAAC,OAAO,CAAC,CAAC;IAC7B,CAAC;IAEQ,GAAG,CAAC,CAAS;QACrB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC;QACxB,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;QACb,IAAI,KAAK,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC;YACzB,IAAI,CAAC,IAAI,EAAE,CAAC;QACb,CAAC;QACD,OAAO,IAAI,CAAC;IACb,CAAC;IACQ,KAAK;QACb,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC;QAC7B,KAAK,CAAC,KAAK,EAAE,CAAC;QACd,IAAI,MAAM;YAAE,IAAI,CAAC,IAAI,EAAE,CAAC;IACzB,CAAC;IACQ,MAAM,CAAC,CAAS;QACxB,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;YACrB,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,OAAO,IAAI,CAAC;QACb,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC;IAED,IAAI;QACH,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;IACvC,CAAC;CACD;AAvCD,0CAuCC"
|
|
10
10
|
}
|