@storm-software/workspace-tools 1.197.0 → 1.198.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/CHANGELOG.md +14 -0
- package/README.md +1 -1
- package/index.js +20 -27
- package/meta.json +80 -80
- package/package.json +1 -1
- package/src/base/base-executor.js +20 -27
- package/src/base/base-generator.js +20 -27
- package/src/base/index.js +20 -27
- package/src/executors/cargo-build/executor.js +20 -27
- package/src/executors/cargo-check/executor.js +20 -27
- package/src/executors/cargo-clippy/executor.js +20 -27
- package/src/executors/cargo-doc/executor.js +20 -27
- package/src/executors/cargo-format/executor.js +20 -27
- package/src/executors/clean-package/executor.js +20 -27
- package/src/executors/rolldown/executor.js +20 -27
- package/src/executors/rollup/executor.js +20 -27
- package/src/executors/size-limit/executor.js +20 -27
- package/src/executors/tsup/executor.js +20 -27
- package/src/executors/tsup-browser/executor.js +20 -27
- package/src/executors/tsup-neutral/executor.js +20 -27
- package/src/executors/tsup-node/executor.js +20 -27
- package/src/executors/typia/executor.js +20 -27
- package/src/executors/unbuild/executor.js +20 -27
- package/src/generators/browser-library/generator.js +20 -27
- package/src/generators/config-schema/generator.js +20 -27
- package/src/generators/neutral-library/generator.js +20 -27
- package/src/generators/node-library/generator.js +20 -27
- package/src/generators/preset/generator.js +20 -27
- package/src/generators/release-version/generator.js +20 -27
- package/src/utils/index.js +20 -27
|
@@ -92316,7 +92316,7 @@ var init_logger = __esm({
|
|
|
92316
92316
|
getLogFn = (logLevel = LogLevel.INFO, config = {}) => {
|
|
92317
92317
|
const _chalk = getChalk();
|
|
92318
92318
|
const colors = !config.colors?.dark && !config.colors?.["base"] && !config.colors?.["base"]?.dark ? DEFAULT_COLOR_CONFIG : config.colors?.dark && typeof config.colors.dark === "string" ? config.colors : config.colors?.["base"]?.dark && typeof config.colors["base"].dark === "string" ? config.colors["base"].dark : config.colors?.["base"] ? config.colors?.["base"] : DEFAULT_COLOR_CONFIG;
|
|
92319
|
-
const configLogLevel = config.logLevel
|
|
92319
|
+
const configLogLevel = config.logLevel || process.env.STORM_LOG_LEVEL || LogLevelLabel.INFO;
|
|
92320
92320
|
if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
|
|
92321
92321
|
return (_6) => {
|
|
92322
92322
|
};
|
|
@@ -92324,10 +92324,9 @@ var init_logger = __esm({
|
|
|
92324
92324
|
if (typeof logLevel === "number" && LogLevel.FATAL >= logLevel || typeof logLevel === "string" && LogLevel.FATAL >= getLogLevel(logLevel)) {
|
|
92325
92325
|
return (message) => {
|
|
92326
92326
|
console.error(
|
|
92327
|
-
|
|
92328
|
-
${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.fatal ?? "#7d1a1a").whiteBright(
|
|
92327
|
+
`${_chalk.bold.hex(colors.fatal ?? "#7d1a1a")(">")} ${_chalk.bold.bgHex(colors.fatal ?? "#7d1a1a").whiteBright(
|
|
92329
92328
|
" \u{1F480} Fatal "
|
|
92330
|
-
)} ${_chalk.hex(colors.
|
|
92329
|
+
)} ${_chalk.hex(colors.fatal ?? "#7d1a1a")(formatLogMessage(message))}
|
|
92331
92330
|
`
|
|
92332
92331
|
);
|
|
92333
92332
|
};
|
|
@@ -92335,8 +92334,7 @@ ${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.f
|
|
|
92335
92334
|
if (typeof logLevel === "number" && LogLevel.ERROR >= logLevel || typeof logLevel === "string" && LogLevel.ERROR >= getLogLevel(logLevel)) {
|
|
92336
92335
|
return (message) => {
|
|
92337
92336
|
console.error(
|
|
92338
|
-
|
|
92339
|
-
${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.danger ?? "#f85149").whiteBright(
|
|
92337
|
+
`${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.danger ?? "#f85149").whiteBright(
|
|
92340
92338
|
" \u2718 Error "
|
|
92341
92339
|
)} ${_chalk.hex(colors.danger ?? "#f85149")(formatLogMessage(message))}
|
|
92342
92340
|
`
|
|
@@ -92346,8 +92344,7 @@ ${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.d
|
|
|
92346
92344
|
if (typeof logLevel === "number" && LogLevel.WARN >= logLevel || typeof logLevel === "string" && LogLevel.WARN >= getLogLevel(logLevel)) {
|
|
92347
92345
|
return (message) => {
|
|
92348
92346
|
console.warn(
|
|
92349
|
-
|
|
92350
|
-
${_chalk.bold.hex(colors.warning ?? "#e3b341")(">")} ${_chalk.bold.bgHex(colors.warning ?? "#e3b341").whiteBright(
|
|
92347
|
+
`${_chalk.bold.hex(colors.warning ?? "#e3b341")(">")} ${_chalk.bold.bgHex(colors.warning ?? "#e3b341").whiteBright(
|
|
92351
92348
|
" \u26A0 Warn "
|
|
92352
92349
|
)} ${_chalk.hex(colors.warning ?? "#e3b341")(formatLogMessage(message))}
|
|
92353
92350
|
`
|
|
@@ -92357,8 +92354,7 @@ ${_chalk.bold.hex(colors.warning ?? "#e3b341")(">")} ${_chalk.bold.bgHex(colors.
|
|
|
92357
92354
|
if (typeof logLevel === "number" && LogLevel.SUCCESS >= logLevel || typeof logLevel === "string" && LogLevel.SUCCESS >= getLogLevel(logLevel)) {
|
|
92358
92355
|
return (message) => {
|
|
92359
92356
|
console.info(
|
|
92360
|
-
|
|
92361
|
-
${_chalk.bold.hex(colors.success ?? "#56d364")(">")} ${_chalk.bold.bgHex(colors.success ?? "#56d364").whiteBright(
|
|
92357
|
+
`${_chalk.bold.hex(colors.success ?? "#56d364")(">")} ${_chalk.bold.bgHex(colors.success ?? "#56d364").whiteBright(
|
|
92362
92358
|
" \u2713 Success "
|
|
92363
92359
|
)} ${_chalk.hex(colors.success ?? "#56d364")(formatLogMessage(message))}
|
|
92364
92360
|
`
|
|
@@ -92368,19 +92364,17 @@ ${_chalk.bold.hex(colors.success ?? "#56d364")(">")} ${_chalk.bold.bgHex(colors.
|
|
|
92368
92364
|
if (typeof logLevel === "number" && LogLevel.INFO >= logLevel || typeof logLevel === "string" && LogLevel.INFO >= getLogLevel(logLevel)) {
|
|
92369
92365
|
return (message) => {
|
|
92370
92366
|
console.info(
|
|
92371
|
-
|
|
92372
|
-
${_chalk.bold.hex(colors.info ?? "#58a6ff")(">")} ${_chalk.bold.bgHex(colors.info ?? "#58a6ff").whiteBright(
|
|
92367
|
+
`${_chalk.bold.hex(colors.info ?? "#58a6ff")(">")} ${_chalk.bold.bgHex(colors.info ?? "#58a6ff").whiteBright(
|
|
92373
92368
|
" \u2139 Info "
|
|
92374
92369
|
)} ${_chalk.hex(colors.info ?? "#58a6ff")(formatLogMessage(message))}
|
|
92375
92370
|
`
|
|
92376
92371
|
);
|
|
92377
92372
|
};
|
|
92378
92373
|
}
|
|
92379
|
-
if (typeof logLevel === "number" && LogLevel.
|
|
92374
|
+
if (typeof logLevel === "number" && LogLevel.TRACE >= logLevel || typeof logLevel === "string" && LogLevel.TRACE >= getLogLevel(logLevel)) {
|
|
92380
92375
|
return (message) => {
|
|
92381
92376
|
console.debug(
|
|
92382
|
-
|
|
92383
|
-
${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.brand ?? "#1fb2a6").whiteBright(
|
|
92377
|
+
`${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.brand ?? "#1fb2a6").whiteBright(
|
|
92384
92378
|
" \u{1F6E0} Debug "
|
|
92385
92379
|
)} ${_chalk.hex(colors.brand ?? "#1fb2a6")(formatLogMessage(message))}
|
|
92386
92380
|
`
|
|
@@ -92389,8 +92383,7 @@ ${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.br
|
|
|
92389
92383
|
}
|
|
92390
92384
|
return (message) => {
|
|
92391
92385
|
console.log(
|
|
92392
|
-
|
|
92393
|
-
${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.brand ?? "#1fb2a6").whiteBright(
|
|
92386
|
+
`${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.brand ?? "#1fb2a6").whiteBright(
|
|
92394
92387
|
" \u2709 System "
|
|
92395
92388
|
)} ${_chalk.hex(colors.brand ?? "#1fb2a6")(formatLogMessage(message))}
|
|
92396
92389
|
`
|
|
@@ -92551,8 +92544,8 @@ var init_get_config_file = __esm({
|
|
|
92551
92544
|
name: fileName,
|
|
92552
92545
|
envName: fileName?.toUpperCase(),
|
|
92553
92546
|
jitiOptions: {
|
|
92554
|
-
debug:
|
|
92555
|
-
cache: process.env.
|
|
92547
|
+
debug: false,
|
|
92548
|
+
cache: process.env.STORM_SKIP_CACHE === "true" ? false : process.env.STORM_CACHE_DIRECTORY || "node_modules/.cache/storm"
|
|
92556
92549
|
},
|
|
92557
92550
|
...options
|
|
92558
92551
|
});
|
|
@@ -92563,8 +92556,8 @@ var init_get_config_file = __esm({
|
|
|
92563
92556
|
name: fileName,
|
|
92564
92557
|
envName: fileName?.toUpperCase(),
|
|
92565
92558
|
jitiOptions: {
|
|
92566
|
-
debug:
|
|
92567
|
-
cache: process.env.
|
|
92559
|
+
debug: false,
|
|
92560
|
+
cache: process.env.STORM_SKIP_CACHE === "true" ? false : process.env.STORM_CACHE_DIRECTORY || "node_modules/.cache/storm"
|
|
92568
92561
|
},
|
|
92569
92562
|
configFile: fileName,
|
|
92570
92563
|
...options
|
|
@@ -92577,9 +92570,9 @@ var init_get_config_file = __esm({
|
|
|
92577
92570
|
const result = await getConfigFileByName("storm", workspacePath);
|
|
92578
92571
|
let config = result.config;
|
|
92579
92572
|
const configFile = result.configFile;
|
|
92580
|
-
if (config && Object.keys(config).length > 0) {
|
|
92581
|
-
|
|
92582
|
-
`Found Storm configuration file "${configFile}" at "${workspacePath}"`,
|
|
92573
|
+
if (config && configFile && Object.keys(config).length > 0) {
|
|
92574
|
+
writeSystem(
|
|
92575
|
+
`Found Storm configuration file "${configFile.includes(`${workspacePath}/`) ? configFile.replace(`${workspacePath}/`, "") : configFile}" at "${workspacePath}"`,
|
|
92583
92576
|
{
|
|
92584
92577
|
logLevel: "all"
|
|
92585
92578
|
}
|
|
@@ -92592,9 +92585,9 @@ var init_get_config_file = __esm({
|
|
|
92592
92585
|
)
|
|
92593
92586
|
);
|
|
92594
92587
|
for (const result2 of results) {
|
|
92595
|
-
if (result2?.config && Object.keys(result2.config).length > 0) {
|
|
92596
|
-
|
|
92597
|
-
`Found
|
|
92588
|
+
if (result2?.config && result2?.configFile && Object.keys(result2.config).length > 0) {
|
|
92589
|
+
writeSystem(
|
|
92590
|
+
`Found alternative configuration file "${result2.configFile.includes(`${workspacePath}/`) ? result2.configFile.replace(`${workspacePath}/`, "") : result2.configFile}" at "${workspacePath}"`,
|
|
92598
92591
|
{
|
|
92599
92592
|
logLevel: "all"
|
|
92600
92593
|
}
|
|
@@ -66546,7 +66546,7 @@ var init_logger = __esm({
|
|
|
66546
66546
|
getLogFn = (logLevel = LogLevel.INFO, config = {}) => {
|
|
66547
66547
|
const _chalk = getChalk();
|
|
66548
66548
|
const colors = !config.colors?.dark && !config.colors?.["base"] && !config.colors?.["base"]?.dark ? DEFAULT_COLOR_CONFIG : config.colors?.dark && typeof config.colors.dark === "string" ? config.colors : config.colors?.["base"]?.dark && typeof config.colors["base"].dark === "string" ? config.colors["base"].dark : config.colors?.["base"] ? config.colors?.["base"] : DEFAULT_COLOR_CONFIG;
|
|
66549
|
-
const configLogLevel = config.logLevel
|
|
66549
|
+
const configLogLevel = config.logLevel || process.env.STORM_LOG_LEVEL || LogLevelLabel.INFO;
|
|
66550
66550
|
if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
|
|
66551
66551
|
return (_6) => {
|
|
66552
66552
|
};
|
|
@@ -66554,10 +66554,9 @@ var init_logger = __esm({
|
|
|
66554
66554
|
if (typeof logLevel === "number" && LogLevel.FATAL >= logLevel || typeof logLevel === "string" && LogLevel.FATAL >= getLogLevel(logLevel)) {
|
|
66555
66555
|
return (message) => {
|
|
66556
66556
|
console.error(
|
|
66557
|
-
|
|
66558
|
-
${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.fatal ?? "#7d1a1a").whiteBright(
|
|
66557
|
+
`${_chalk.bold.hex(colors.fatal ?? "#7d1a1a")(">")} ${_chalk.bold.bgHex(colors.fatal ?? "#7d1a1a").whiteBright(
|
|
66559
66558
|
" \u{1F480} Fatal "
|
|
66560
|
-
)} ${_chalk.hex(colors.
|
|
66559
|
+
)} ${_chalk.hex(colors.fatal ?? "#7d1a1a")(formatLogMessage(message))}
|
|
66561
66560
|
`
|
|
66562
66561
|
);
|
|
66563
66562
|
};
|
|
@@ -66565,8 +66564,7 @@ ${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.f
|
|
|
66565
66564
|
if (typeof logLevel === "number" && LogLevel.ERROR >= logLevel || typeof logLevel === "string" && LogLevel.ERROR >= getLogLevel(logLevel)) {
|
|
66566
66565
|
return (message) => {
|
|
66567
66566
|
console.error(
|
|
66568
|
-
|
|
66569
|
-
${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.danger ?? "#f85149").whiteBright(
|
|
66567
|
+
`${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.danger ?? "#f85149").whiteBright(
|
|
66570
66568
|
" \u2718 Error "
|
|
66571
66569
|
)} ${_chalk.hex(colors.danger ?? "#f85149")(formatLogMessage(message))}
|
|
66572
66570
|
`
|
|
@@ -66576,8 +66574,7 @@ ${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.d
|
|
|
66576
66574
|
if (typeof logLevel === "number" && LogLevel.WARN >= logLevel || typeof logLevel === "string" && LogLevel.WARN >= getLogLevel(logLevel)) {
|
|
66577
66575
|
return (message) => {
|
|
66578
66576
|
console.warn(
|
|
66579
|
-
|
|
66580
|
-
${_chalk.bold.hex(colors.warning ?? "#e3b341")(">")} ${_chalk.bold.bgHex(colors.warning ?? "#e3b341").whiteBright(
|
|
66577
|
+
`${_chalk.bold.hex(colors.warning ?? "#e3b341")(">")} ${_chalk.bold.bgHex(colors.warning ?? "#e3b341").whiteBright(
|
|
66581
66578
|
" \u26A0 Warn "
|
|
66582
66579
|
)} ${_chalk.hex(colors.warning ?? "#e3b341")(formatLogMessage(message))}
|
|
66583
66580
|
`
|
|
@@ -66587,8 +66584,7 @@ ${_chalk.bold.hex(colors.warning ?? "#e3b341")(">")} ${_chalk.bold.bgHex(colors.
|
|
|
66587
66584
|
if (typeof logLevel === "number" && LogLevel.SUCCESS >= logLevel || typeof logLevel === "string" && LogLevel.SUCCESS >= getLogLevel(logLevel)) {
|
|
66588
66585
|
return (message) => {
|
|
66589
66586
|
console.info(
|
|
66590
|
-
|
|
66591
|
-
${_chalk.bold.hex(colors.success ?? "#56d364")(">")} ${_chalk.bold.bgHex(colors.success ?? "#56d364").whiteBright(
|
|
66587
|
+
`${_chalk.bold.hex(colors.success ?? "#56d364")(">")} ${_chalk.bold.bgHex(colors.success ?? "#56d364").whiteBright(
|
|
66592
66588
|
" \u2713 Success "
|
|
66593
66589
|
)} ${_chalk.hex(colors.success ?? "#56d364")(formatLogMessage(message))}
|
|
66594
66590
|
`
|
|
@@ -66598,19 +66594,17 @@ ${_chalk.bold.hex(colors.success ?? "#56d364")(">")} ${_chalk.bold.bgHex(colors.
|
|
|
66598
66594
|
if (typeof logLevel === "number" && LogLevel.INFO >= logLevel || typeof logLevel === "string" && LogLevel.INFO >= getLogLevel(logLevel)) {
|
|
66599
66595
|
return (message) => {
|
|
66600
66596
|
console.info(
|
|
66601
|
-
|
|
66602
|
-
${_chalk.bold.hex(colors.info ?? "#58a6ff")(">")} ${_chalk.bold.bgHex(colors.info ?? "#58a6ff").whiteBright(
|
|
66597
|
+
`${_chalk.bold.hex(colors.info ?? "#58a6ff")(">")} ${_chalk.bold.bgHex(colors.info ?? "#58a6ff").whiteBright(
|
|
66603
66598
|
" \u2139 Info "
|
|
66604
66599
|
)} ${_chalk.hex(colors.info ?? "#58a6ff")(formatLogMessage(message))}
|
|
66605
66600
|
`
|
|
66606
66601
|
);
|
|
66607
66602
|
};
|
|
66608
66603
|
}
|
|
66609
|
-
if (typeof logLevel === "number" && LogLevel.
|
|
66604
|
+
if (typeof logLevel === "number" && LogLevel.TRACE >= logLevel || typeof logLevel === "string" && LogLevel.TRACE >= getLogLevel(logLevel)) {
|
|
66610
66605
|
return (message) => {
|
|
66611
66606
|
console.debug(
|
|
66612
|
-
|
|
66613
|
-
${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.brand ?? "#1fb2a6").whiteBright(
|
|
66607
|
+
`${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.brand ?? "#1fb2a6").whiteBright(
|
|
66614
66608
|
" \u{1F6E0} Debug "
|
|
66615
66609
|
)} ${_chalk.hex(colors.brand ?? "#1fb2a6")(formatLogMessage(message))}
|
|
66616
66610
|
`
|
|
@@ -66619,8 +66613,7 @@ ${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.br
|
|
|
66619
66613
|
}
|
|
66620
66614
|
return (message) => {
|
|
66621
66615
|
console.log(
|
|
66622
|
-
|
|
66623
|
-
${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.brand ?? "#1fb2a6").whiteBright(
|
|
66616
|
+
`${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.brand ?? "#1fb2a6").whiteBright(
|
|
66624
66617
|
" \u2709 System "
|
|
66625
66618
|
)} ${_chalk.hex(colors.brand ?? "#1fb2a6")(formatLogMessage(message))}
|
|
66626
66619
|
`
|
|
@@ -66781,8 +66774,8 @@ var init_get_config_file = __esm({
|
|
|
66781
66774
|
name: fileName,
|
|
66782
66775
|
envName: fileName?.toUpperCase(),
|
|
66783
66776
|
jitiOptions: {
|
|
66784
|
-
debug:
|
|
66785
|
-
cache: process.env.
|
|
66777
|
+
debug: false,
|
|
66778
|
+
cache: process.env.STORM_SKIP_CACHE === "true" ? false : process.env.STORM_CACHE_DIRECTORY || "node_modules/.cache/storm"
|
|
66786
66779
|
},
|
|
66787
66780
|
...options
|
|
66788
66781
|
});
|
|
@@ -66793,8 +66786,8 @@ var init_get_config_file = __esm({
|
|
|
66793
66786
|
name: fileName,
|
|
66794
66787
|
envName: fileName?.toUpperCase(),
|
|
66795
66788
|
jitiOptions: {
|
|
66796
|
-
debug:
|
|
66797
|
-
cache: process.env.
|
|
66789
|
+
debug: false,
|
|
66790
|
+
cache: process.env.STORM_SKIP_CACHE === "true" ? false : process.env.STORM_CACHE_DIRECTORY || "node_modules/.cache/storm"
|
|
66798
66791
|
},
|
|
66799
66792
|
configFile: fileName,
|
|
66800
66793
|
...options
|
|
@@ -66807,9 +66800,9 @@ var init_get_config_file = __esm({
|
|
|
66807
66800
|
const result = await getConfigFileByName("storm", workspacePath);
|
|
66808
66801
|
let config = result.config;
|
|
66809
66802
|
const configFile = result.configFile;
|
|
66810
|
-
if (config && Object.keys(config).length > 0) {
|
|
66811
|
-
|
|
66812
|
-
`Found Storm configuration file "${configFile}" at "${workspacePath}"`,
|
|
66803
|
+
if (config && configFile && Object.keys(config).length > 0) {
|
|
66804
|
+
writeSystem(
|
|
66805
|
+
`Found Storm configuration file "${configFile.includes(`${workspacePath}/`) ? configFile.replace(`${workspacePath}/`, "") : configFile}" at "${workspacePath}"`,
|
|
66813
66806
|
{
|
|
66814
66807
|
logLevel: "all"
|
|
66815
66808
|
}
|
|
@@ -66822,9 +66815,9 @@ var init_get_config_file = __esm({
|
|
|
66822
66815
|
)
|
|
66823
66816
|
);
|
|
66824
66817
|
for (const result2 of results) {
|
|
66825
|
-
if (result2?.config && Object.keys(result2.config).length > 0) {
|
|
66826
|
-
|
|
66827
|
-
`Found
|
|
66818
|
+
if (result2?.config && result2?.configFile && Object.keys(result2.config).length > 0) {
|
|
66819
|
+
writeSystem(
|
|
66820
|
+
`Found alternative configuration file "${result2.configFile.includes(`${workspacePath}/`) ? result2.configFile.replace(`${workspacePath}/`, "") : result2.configFile}" at "${workspacePath}"`,
|
|
66828
66821
|
{
|
|
66829
66822
|
logLevel: "all"
|
|
66830
66823
|
}
|
|
@@ -66546,7 +66546,7 @@ var init_logger = __esm({
|
|
|
66546
66546
|
getLogFn = (logLevel = LogLevel.INFO, config = {}) => {
|
|
66547
66547
|
const _chalk = getChalk();
|
|
66548
66548
|
const colors = !config.colors?.dark && !config.colors?.["base"] && !config.colors?.["base"]?.dark ? DEFAULT_COLOR_CONFIG : config.colors?.dark && typeof config.colors.dark === "string" ? config.colors : config.colors?.["base"]?.dark && typeof config.colors["base"].dark === "string" ? config.colors["base"].dark : config.colors?.["base"] ? config.colors?.["base"] : DEFAULT_COLOR_CONFIG;
|
|
66549
|
-
const configLogLevel = config.logLevel
|
|
66549
|
+
const configLogLevel = config.logLevel || process.env.STORM_LOG_LEVEL || LogLevelLabel.INFO;
|
|
66550
66550
|
if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
|
|
66551
66551
|
return (_6) => {
|
|
66552
66552
|
};
|
|
@@ -66554,10 +66554,9 @@ var init_logger = __esm({
|
|
|
66554
66554
|
if (typeof logLevel === "number" && LogLevel.FATAL >= logLevel || typeof logLevel === "string" && LogLevel.FATAL >= getLogLevel(logLevel)) {
|
|
66555
66555
|
return (message) => {
|
|
66556
66556
|
console.error(
|
|
66557
|
-
|
|
66558
|
-
${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.fatal ?? "#7d1a1a").whiteBright(
|
|
66557
|
+
`${_chalk.bold.hex(colors.fatal ?? "#7d1a1a")(">")} ${_chalk.bold.bgHex(colors.fatal ?? "#7d1a1a").whiteBright(
|
|
66559
66558
|
" \u{1F480} Fatal "
|
|
66560
|
-
)} ${_chalk.hex(colors.
|
|
66559
|
+
)} ${_chalk.hex(colors.fatal ?? "#7d1a1a")(formatLogMessage(message))}
|
|
66561
66560
|
`
|
|
66562
66561
|
);
|
|
66563
66562
|
};
|
|
@@ -66565,8 +66564,7 @@ ${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.f
|
|
|
66565
66564
|
if (typeof logLevel === "number" && LogLevel.ERROR >= logLevel || typeof logLevel === "string" && LogLevel.ERROR >= getLogLevel(logLevel)) {
|
|
66566
66565
|
return (message) => {
|
|
66567
66566
|
console.error(
|
|
66568
|
-
|
|
66569
|
-
${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.danger ?? "#f85149").whiteBright(
|
|
66567
|
+
`${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.danger ?? "#f85149").whiteBright(
|
|
66570
66568
|
" \u2718 Error "
|
|
66571
66569
|
)} ${_chalk.hex(colors.danger ?? "#f85149")(formatLogMessage(message))}
|
|
66572
66570
|
`
|
|
@@ -66576,8 +66574,7 @@ ${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.d
|
|
|
66576
66574
|
if (typeof logLevel === "number" && LogLevel.WARN >= logLevel || typeof logLevel === "string" && LogLevel.WARN >= getLogLevel(logLevel)) {
|
|
66577
66575
|
return (message) => {
|
|
66578
66576
|
console.warn(
|
|
66579
|
-
|
|
66580
|
-
${_chalk.bold.hex(colors.warning ?? "#e3b341")(">")} ${_chalk.bold.bgHex(colors.warning ?? "#e3b341").whiteBright(
|
|
66577
|
+
`${_chalk.bold.hex(colors.warning ?? "#e3b341")(">")} ${_chalk.bold.bgHex(colors.warning ?? "#e3b341").whiteBright(
|
|
66581
66578
|
" \u26A0 Warn "
|
|
66582
66579
|
)} ${_chalk.hex(colors.warning ?? "#e3b341")(formatLogMessage(message))}
|
|
66583
66580
|
`
|
|
@@ -66587,8 +66584,7 @@ ${_chalk.bold.hex(colors.warning ?? "#e3b341")(">")} ${_chalk.bold.bgHex(colors.
|
|
|
66587
66584
|
if (typeof logLevel === "number" && LogLevel.SUCCESS >= logLevel || typeof logLevel === "string" && LogLevel.SUCCESS >= getLogLevel(logLevel)) {
|
|
66588
66585
|
return (message) => {
|
|
66589
66586
|
console.info(
|
|
66590
|
-
|
|
66591
|
-
${_chalk.bold.hex(colors.success ?? "#56d364")(">")} ${_chalk.bold.bgHex(colors.success ?? "#56d364").whiteBright(
|
|
66587
|
+
`${_chalk.bold.hex(colors.success ?? "#56d364")(">")} ${_chalk.bold.bgHex(colors.success ?? "#56d364").whiteBright(
|
|
66592
66588
|
" \u2713 Success "
|
|
66593
66589
|
)} ${_chalk.hex(colors.success ?? "#56d364")(formatLogMessage(message))}
|
|
66594
66590
|
`
|
|
@@ -66598,19 +66594,17 @@ ${_chalk.bold.hex(colors.success ?? "#56d364")(">")} ${_chalk.bold.bgHex(colors.
|
|
|
66598
66594
|
if (typeof logLevel === "number" && LogLevel.INFO >= logLevel || typeof logLevel === "string" && LogLevel.INFO >= getLogLevel(logLevel)) {
|
|
66599
66595
|
return (message) => {
|
|
66600
66596
|
console.info(
|
|
66601
|
-
|
|
66602
|
-
${_chalk.bold.hex(colors.info ?? "#58a6ff")(">")} ${_chalk.bold.bgHex(colors.info ?? "#58a6ff").whiteBright(
|
|
66597
|
+
`${_chalk.bold.hex(colors.info ?? "#58a6ff")(">")} ${_chalk.bold.bgHex(colors.info ?? "#58a6ff").whiteBright(
|
|
66603
66598
|
" \u2139 Info "
|
|
66604
66599
|
)} ${_chalk.hex(colors.info ?? "#58a6ff")(formatLogMessage(message))}
|
|
66605
66600
|
`
|
|
66606
66601
|
);
|
|
66607
66602
|
};
|
|
66608
66603
|
}
|
|
66609
|
-
if (typeof logLevel === "number" && LogLevel.
|
|
66604
|
+
if (typeof logLevel === "number" && LogLevel.TRACE >= logLevel || typeof logLevel === "string" && LogLevel.TRACE >= getLogLevel(logLevel)) {
|
|
66610
66605
|
return (message) => {
|
|
66611
66606
|
console.debug(
|
|
66612
|
-
|
|
66613
|
-
${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.brand ?? "#1fb2a6").whiteBright(
|
|
66607
|
+
`${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.brand ?? "#1fb2a6").whiteBright(
|
|
66614
66608
|
" \u{1F6E0} Debug "
|
|
66615
66609
|
)} ${_chalk.hex(colors.brand ?? "#1fb2a6")(formatLogMessage(message))}
|
|
66616
66610
|
`
|
|
@@ -66619,8 +66613,7 @@ ${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.br
|
|
|
66619
66613
|
}
|
|
66620
66614
|
return (message) => {
|
|
66621
66615
|
console.log(
|
|
66622
|
-
|
|
66623
|
-
${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.brand ?? "#1fb2a6").whiteBright(
|
|
66616
|
+
`${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.brand ?? "#1fb2a6").whiteBright(
|
|
66624
66617
|
" \u2709 System "
|
|
66625
66618
|
)} ${_chalk.hex(colors.brand ?? "#1fb2a6")(formatLogMessage(message))}
|
|
66626
66619
|
`
|
|
@@ -66781,8 +66774,8 @@ var init_get_config_file = __esm({
|
|
|
66781
66774
|
name: fileName,
|
|
66782
66775
|
envName: fileName?.toUpperCase(),
|
|
66783
66776
|
jitiOptions: {
|
|
66784
|
-
debug:
|
|
66785
|
-
cache: process.env.
|
|
66777
|
+
debug: false,
|
|
66778
|
+
cache: process.env.STORM_SKIP_CACHE === "true" ? false : process.env.STORM_CACHE_DIRECTORY || "node_modules/.cache/storm"
|
|
66786
66779
|
},
|
|
66787
66780
|
...options
|
|
66788
66781
|
});
|
|
@@ -66793,8 +66786,8 @@ var init_get_config_file = __esm({
|
|
|
66793
66786
|
name: fileName,
|
|
66794
66787
|
envName: fileName?.toUpperCase(),
|
|
66795
66788
|
jitiOptions: {
|
|
66796
|
-
debug:
|
|
66797
|
-
cache: process.env.
|
|
66789
|
+
debug: false,
|
|
66790
|
+
cache: process.env.STORM_SKIP_CACHE === "true" ? false : process.env.STORM_CACHE_DIRECTORY || "node_modules/.cache/storm"
|
|
66798
66791
|
},
|
|
66799
66792
|
configFile: fileName,
|
|
66800
66793
|
...options
|
|
@@ -66807,9 +66800,9 @@ var init_get_config_file = __esm({
|
|
|
66807
66800
|
const result = await getConfigFileByName("storm", workspacePath);
|
|
66808
66801
|
let config = result.config;
|
|
66809
66802
|
const configFile = result.configFile;
|
|
66810
|
-
if (config && Object.keys(config).length > 0) {
|
|
66811
|
-
|
|
66812
|
-
`Found Storm configuration file "${configFile}" at "${workspacePath}"`,
|
|
66803
|
+
if (config && configFile && Object.keys(config).length > 0) {
|
|
66804
|
+
writeSystem(
|
|
66805
|
+
`Found Storm configuration file "${configFile.includes(`${workspacePath}/`) ? configFile.replace(`${workspacePath}/`, "") : configFile}" at "${workspacePath}"`,
|
|
66813
66806
|
{
|
|
66814
66807
|
logLevel: "all"
|
|
66815
66808
|
}
|
|
@@ -66822,9 +66815,9 @@ var init_get_config_file = __esm({
|
|
|
66822
66815
|
)
|
|
66823
66816
|
);
|
|
66824
66817
|
for (const result2 of results) {
|
|
66825
|
-
if (result2?.config && Object.keys(result2.config).length > 0) {
|
|
66826
|
-
|
|
66827
|
-
`Found
|
|
66818
|
+
if (result2?.config && result2?.configFile && Object.keys(result2.config).length > 0) {
|
|
66819
|
+
writeSystem(
|
|
66820
|
+
`Found alternative configuration file "${result2.configFile.includes(`${workspacePath}/`) ? result2.configFile.replace(`${workspacePath}/`, "") : result2.configFile}" at "${workspacePath}"`,
|
|
66828
66821
|
{
|
|
66829
66822
|
logLevel: "all"
|
|
66830
66823
|
}
|
|
@@ -66546,7 +66546,7 @@ var init_logger = __esm({
|
|
|
66546
66546
|
getLogFn = (logLevel = LogLevel.INFO, config = {}) => {
|
|
66547
66547
|
const _chalk = getChalk();
|
|
66548
66548
|
const colors = !config.colors?.dark && !config.colors?.["base"] && !config.colors?.["base"]?.dark ? DEFAULT_COLOR_CONFIG : config.colors?.dark && typeof config.colors.dark === "string" ? config.colors : config.colors?.["base"]?.dark && typeof config.colors["base"].dark === "string" ? config.colors["base"].dark : config.colors?.["base"] ? config.colors?.["base"] : DEFAULT_COLOR_CONFIG;
|
|
66549
|
-
const configLogLevel = config.logLevel
|
|
66549
|
+
const configLogLevel = config.logLevel || process.env.STORM_LOG_LEVEL || LogLevelLabel.INFO;
|
|
66550
66550
|
if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
|
|
66551
66551
|
return (_6) => {
|
|
66552
66552
|
};
|
|
@@ -66554,10 +66554,9 @@ var init_logger = __esm({
|
|
|
66554
66554
|
if (typeof logLevel === "number" && LogLevel.FATAL >= logLevel || typeof logLevel === "string" && LogLevel.FATAL >= getLogLevel(logLevel)) {
|
|
66555
66555
|
return (message) => {
|
|
66556
66556
|
console.error(
|
|
66557
|
-
|
|
66558
|
-
${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.fatal ?? "#7d1a1a").whiteBright(
|
|
66557
|
+
`${_chalk.bold.hex(colors.fatal ?? "#7d1a1a")(">")} ${_chalk.bold.bgHex(colors.fatal ?? "#7d1a1a").whiteBright(
|
|
66559
66558
|
" \u{1F480} Fatal "
|
|
66560
|
-
)} ${_chalk.hex(colors.
|
|
66559
|
+
)} ${_chalk.hex(colors.fatal ?? "#7d1a1a")(formatLogMessage(message))}
|
|
66561
66560
|
`
|
|
66562
66561
|
);
|
|
66563
66562
|
};
|
|
@@ -66565,8 +66564,7 @@ ${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.f
|
|
|
66565
66564
|
if (typeof logLevel === "number" && LogLevel.ERROR >= logLevel || typeof logLevel === "string" && LogLevel.ERROR >= getLogLevel(logLevel)) {
|
|
66566
66565
|
return (message) => {
|
|
66567
66566
|
console.error(
|
|
66568
|
-
|
|
66569
|
-
${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.danger ?? "#f85149").whiteBright(
|
|
66567
|
+
`${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.danger ?? "#f85149").whiteBright(
|
|
66570
66568
|
" \u2718 Error "
|
|
66571
66569
|
)} ${_chalk.hex(colors.danger ?? "#f85149")(formatLogMessage(message))}
|
|
66572
66570
|
`
|
|
@@ -66576,8 +66574,7 @@ ${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.d
|
|
|
66576
66574
|
if (typeof logLevel === "number" && LogLevel.WARN >= logLevel || typeof logLevel === "string" && LogLevel.WARN >= getLogLevel(logLevel)) {
|
|
66577
66575
|
return (message) => {
|
|
66578
66576
|
console.warn(
|
|
66579
|
-
|
|
66580
|
-
${_chalk.bold.hex(colors.warning ?? "#e3b341")(">")} ${_chalk.bold.bgHex(colors.warning ?? "#e3b341").whiteBright(
|
|
66577
|
+
`${_chalk.bold.hex(colors.warning ?? "#e3b341")(">")} ${_chalk.bold.bgHex(colors.warning ?? "#e3b341").whiteBright(
|
|
66581
66578
|
" \u26A0 Warn "
|
|
66582
66579
|
)} ${_chalk.hex(colors.warning ?? "#e3b341")(formatLogMessage(message))}
|
|
66583
66580
|
`
|
|
@@ -66587,8 +66584,7 @@ ${_chalk.bold.hex(colors.warning ?? "#e3b341")(">")} ${_chalk.bold.bgHex(colors.
|
|
|
66587
66584
|
if (typeof logLevel === "number" && LogLevel.SUCCESS >= logLevel || typeof logLevel === "string" && LogLevel.SUCCESS >= getLogLevel(logLevel)) {
|
|
66588
66585
|
return (message) => {
|
|
66589
66586
|
console.info(
|
|
66590
|
-
|
|
66591
|
-
${_chalk.bold.hex(colors.success ?? "#56d364")(">")} ${_chalk.bold.bgHex(colors.success ?? "#56d364").whiteBright(
|
|
66587
|
+
`${_chalk.bold.hex(colors.success ?? "#56d364")(">")} ${_chalk.bold.bgHex(colors.success ?? "#56d364").whiteBright(
|
|
66592
66588
|
" \u2713 Success "
|
|
66593
66589
|
)} ${_chalk.hex(colors.success ?? "#56d364")(formatLogMessage(message))}
|
|
66594
66590
|
`
|
|
@@ -66598,19 +66594,17 @@ ${_chalk.bold.hex(colors.success ?? "#56d364")(">")} ${_chalk.bold.bgHex(colors.
|
|
|
66598
66594
|
if (typeof logLevel === "number" && LogLevel.INFO >= logLevel || typeof logLevel === "string" && LogLevel.INFO >= getLogLevel(logLevel)) {
|
|
66599
66595
|
return (message) => {
|
|
66600
66596
|
console.info(
|
|
66601
|
-
|
|
66602
|
-
${_chalk.bold.hex(colors.info ?? "#58a6ff")(">")} ${_chalk.bold.bgHex(colors.info ?? "#58a6ff").whiteBright(
|
|
66597
|
+
`${_chalk.bold.hex(colors.info ?? "#58a6ff")(">")} ${_chalk.bold.bgHex(colors.info ?? "#58a6ff").whiteBright(
|
|
66603
66598
|
" \u2139 Info "
|
|
66604
66599
|
)} ${_chalk.hex(colors.info ?? "#58a6ff")(formatLogMessage(message))}
|
|
66605
66600
|
`
|
|
66606
66601
|
);
|
|
66607
66602
|
};
|
|
66608
66603
|
}
|
|
66609
|
-
if (typeof logLevel === "number" && LogLevel.
|
|
66604
|
+
if (typeof logLevel === "number" && LogLevel.TRACE >= logLevel || typeof logLevel === "string" && LogLevel.TRACE >= getLogLevel(logLevel)) {
|
|
66610
66605
|
return (message) => {
|
|
66611
66606
|
console.debug(
|
|
66612
|
-
|
|
66613
|
-
${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.brand ?? "#1fb2a6").whiteBright(
|
|
66607
|
+
`${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.brand ?? "#1fb2a6").whiteBright(
|
|
66614
66608
|
" \u{1F6E0} Debug "
|
|
66615
66609
|
)} ${_chalk.hex(colors.brand ?? "#1fb2a6")(formatLogMessage(message))}
|
|
66616
66610
|
`
|
|
@@ -66619,8 +66613,7 @@ ${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.br
|
|
|
66619
66613
|
}
|
|
66620
66614
|
return (message) => {
|
|
66621
66615
|
console.log(
|
|
66622
|
-
|
|
66623
|
-
${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.brand ?? "#1fb2a6").whiteBright(
|
|
66616
|
+
`${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.brand ?? "#1fb2a6").whiteBright(
|
|
66624
66617
|
" \u2709 System "
|
|
66625
66618
|
)} ${_chalk.hex(colors.brand ?? "#1fb2a6")(formatLogMessage(message))}
|
|
66626
66619
|
`
|
|
@@ -66781,8 +66774,8 @@ var init_get_config_file = __esm({
|
|
|
66781
66774
|
name: fileName,
|
|
66782
66775
|
envName: fileName?.toUpperCase(),
|
|
66783
66776
|
jitiOptions: {
|
|
66784
|
-
debug:
|
|
66785
|
-
cache: process.env.
|
|
66777
|
+
debug: false,
|
|
66778
|
+
cache: process.env.STORM_SKIP_CACHE === "true" ? false : process.env.STORM_CACHE_DIRECTORY || "node_modules/.cache/storm"
|
|
66786
66779
|
},
|
|
66787
66780
|
...options
|
|
66788
66781
|
});
|
|
@@ -66793,8 +66786,8 @@ var init_get_config_file = __esm({
|
|
|
66793
66786
|
name: fileName,
|
|
66794
66787
|
envName: fileName?.toUpperCase(),
|
|
66795
66788
|
jitiOptions: {
|
|
66796
|
-
debug:
|
|
66797
|
-
cache: process.env.
|
|
66789
|
+
debug: false,
|
|
66790
|
+
cache: process.env.STORM_SKIP_CACHE === "true" ? false : process.env.STORM_CACHE_DIRECTORY || "node_modules/.cache/storm"
|
|
66798
66791
|
},
|
|
66799
66792
|
configFile: fileName,
|
|
66800
66793
|
...options
|
|
@@ -66807,9 +66800,9 @@ var init_get_config_file = __esm({
|
|
|
66807
66800
|
const result = await getConfigFileByName("storm", workspacePath);
|
|
66808
66801
|
let config = result.config;
|
|
66809
66802
|
const configFile = result.configFile;
|
|
66810
|
-
if (config && Object.keys(config).length > 0) {
|
|
66811
|
-
|
|
66812
|
-
`Found Storm configuration file "${configFile}" at "${workspacePath}"`,
|
|
66803
|
+
if (config && configFile && Object.keys(config).length > 0) {
|
|
66804
|
+
writeSystem(
|
|
66805
|
+
`Found Storm configuration file "${configFile.includes(`${workspacePath}/`) ? configFile.replace(`${workspacePath}/`, "") : configFile}" at "${workspacePath}"`,
|
|
66813
66806
|
{
|
|
66814
66807
|
logLevel: "all"
|
|
66815
66808
|
}
|
|
@@ -66822,9 +66815,9 @@ var init_get_config_file = __esm({
|
|
|
66822
66815
|
)
|
|
66823
66816
|
);
|
|
66824
66817
|
for (const result2 of results) {
|
|
66825
|
-
if (result2?.config && Object.keys(result2.config).length > 0) {
|
|
66826
|
-
|
|
66827
|
-
`Found
|
|
66818
|
+
if (result2?.config && result2?.configFile && Object.keys(result2.config).length > 0) {
|
|
66819
|
+
writeSystem(
|
|
66820
|
+
`Found alternative configuration file "${result2.configFile.includes(`${workspacePath}/`) ? result2.configFile.replace(`${workspacePath}/`, "") : result2.configFile}" at "${workspacePath}"`,
|
|
66828
66821
|
{
|
|
66829
66822
|
logLevel: "all"
|
|
66830
66823
|
}
|