@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
|
@@ -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
|
}
|
|
@@ -68370,7 +68370,7 @@ var init_logger = __esm({
|
|
|
68370
68370
|
getLogFn = (logLevel = LogLevel.INFO, config = {}) => {
|
|
68371
68371
|
const _chalk = getChalk();
|
|
68372
68372
|
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;
|
|
68373
|
-
const configLogLevel = config.logLevel
|
|
68373
|
+
const configLogLevel = config.logLevel || process.env.STORM_LOG_LEVEL || LogLevelLabel.INFO;
|
|
68374
68374
|
if (typeof logLevel === "number" && (logLevel >= getLogLevel(configLogLevel) || logLevel <= LogLevel.SILENT) || typeof logLevel === "string" && getLogLevel(logLevel) >= getLogLevel(configLogLevel)) {
|
|
68375
68375
|
return (_6) => {
|
|
68376
68376
|
};
|
|
@@ -68378,10 +68378,9 @@ var init_logger = __esm({
|
|
|
68378
68378
|
if (typeof logLevel === "number" && LogLevel.FATAL >= logLevel || typeof logLevel === "string" && LogLevel.FATAL >= getLogLevel(logLevel)) {
|
|
68379
68379
|
return (message) => {
|
|
68380
68380
|
console.error(
|
|
68381
|
-
|
|
68382
|
-
${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.fatal ?? "#7d1a1a").whiteBright(
|
|
68381
|
+
`${_chalk.bold.hex(colors.fatal ?? "#7d1a1a")(">")} ${_chalk.bold.bgHex(colors.fatal ?? "#7d1a1a").whiteBright(
|
|
68383
68382
|
" \u{1F480} Fatal "
|
|
68384
|
-
)} ${_chalk.hex(colors.
|
|
68383
|
+
)} ${_chalk.hex(colors.fatal ?? "#7d1a1a")(formatLogMessage(message))}
|
|
68385
68384
|
`
|
|
68386
68385
|
);
|
|
68387
68386
|
};
|
|
@@ -68389,8 +68388,7 @@ ${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.f
|
|
|
68389
68388
|
if (typeof logLevel === "number" && LogLevel.ERROR >= logLevel || typeof logLevel === "string" && LogLevel.ERROR >= getLogLevel(logLevel)) {
|
|
68390
68389
|
return (message) => {
|
|
68391
68390
|
console.error(
|
|
68392
|
-
|
|
68393
|
-
${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.danger ?? "#f85149").whiteBright(
|
|
68391
|
+
`${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.danger ?? "#f85149").whiteBright(
|
|
68394
68392
|
" \u2718 Error "
|
|
68395
68393
|
)} ${_chalk.hex(colors.danger ?? "#f85149")(formatLogMessage(message))}
|
|
68396
68394
|
`
|
|
@@ -68400,8 +68398,7 @@ ${_chalk.bold.hex(colors.danger ?? "#f85149")(">")} ${_chalk.bold.bgHex(colors.d
|
|
|
68400
68398
|
if (typeof logLevel === "number" && LogLevel.WARN >= logLevel || typeof logLevel === "string" && LogLevel.WARN >= getLogLevel(logLevel)) {
|
|
68401
68399
|
return (message) => {
|
|
68402
68400
|
console.warn(
|
|
68403
|
-
|
|
68404
|
-
${_chalk.bold.hex(colors.warning ?? "#e3b341")(">")} ${_chalk.bold.bgHex(colors.warning ?? "#e3b341").whiteBright(
|
|
68401
|
+
`${_chalk.bold.hex(colors.warning ?? "#e3b341")(">")} ${_chalk.bold.bgHex(colors.warning ?? "#e3b341").whiteBright(
|
|
68405
68402
|
" \u26A0 Warn "
|
|
68406
68403
|
)} ${_chalk.hex(colors.warning ?? "#e3b341")(formatLogMessage(message))}
|
|
68407
68404
|
`
|
|
@@ -68411,8 +68408,7 @@ ${_chalk.bold.hex(colors.warning ?? "#e3b341")(">")} ${_chalk.bold.bgHex(colors.
|
|
|
68411
68408
|
if (typeof logLevel === "number" && LogLevel.SUCCESS >= logLevel || typeof logLevel === "string" && LogLevel.SUCCESS >= getLogLevel(logLevel)) {
|
|
68412
68409
|
return (message) => {
|
|
68413
68410
|
console.info(
|
|
68414
|
-
|
|
68415
|
-
${_chalk.bold.hex(colors.success ?? "#56d364")(">")} ${_chalk.bold.bgHex(colors.success ?? "#56d364").whiteBright(
|
|
68411
|
+
`${_chalk.bold.hex(colors.success ?? "#56d364")(">")} ${_chalk.bold.bgHex(colors.success ?? "#56d364").whiteBright(
|
|
68416
68412
|
" \u2713 Success "
|
|
68417
68413
|
)} ${_chalk.hex(colors.success ?? "#56d364")(formatLogMessage(message))}
|
|
68418
68414
|
`
|
|
@@ -68422,19 +68418,17 @@ ${_chalk.bold.hex(colors.success ?? "#56d364")(">")} ${_chalk.bold.bgHex(colors.
|
|
|
68422
68418
|
if (typeof logLevel === "number" && LogLevel.INFO >= logLevel || typeof logLevel === "string" && LogLevel.INFO >= getLogLevel(logLevel)) {
|
|
68423
68419
|
return (message) => {
|
|
68424
68420
|
console.info(
|
|
68425
|
-
|
|
68426
|
-
${_chalk.bold.hex(colors.info ?? "#58a6ff")(">")} ${_chalk.bold.bgHex(colors.info ?? "#58a6ff").whiteBright(
|
|
68421
|
+
`${_chalk.bold.hex(colors.info ?? "#58a6ff")(">")} ${_chalk.bold.bgHex(colors.info ?? "#58a6ff").whiteBright(
|
|
68427
68422
|
" \u2139 Info "
|
|
68428
68423
|
)} ${_chalk.hex(colors.info ?? "#58a6ff")(formatLogMessage(message))}
|
|
68429
68424
|
`
|
|
68430
68425
|
);
|
|
68431
68426
|
};
|
|
68432
68427
|
}
|
|
68433
|
-
if (typeof logLevel === "number" && LogLevel.
|
|
68428
|
+
if (typeof logLevel === "number" && LogLevel.TRACE >= logLevel || typeof logLevel === "string" && LogLevel.TRACE >= getLogLevel(logLevel)) {
|
|
68434
68429
|
return (message) => {
|
|
68435
68430
|
console.debug(
|
|
68436
|
-
|
|
68437
|
-
${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.brand ?? "#1fb2a6").whiteBright(
|
|
68431
|
+
`${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.brand ?? "#1fb2a6").whiteBright(
|
|
68438
68432
|
" \u{1F6E0} Debug "
|
|
68439
68433
|
)} ${_chalk.hex(colors.brand ?? "#1fb2a6")(formatLogMessage(message))}
|
|
68440
68434
|
`
|
|
@@ -68443,8 +68437,7 @@ ${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.br
|
|
|
68443
68437
|
}
|
|
68444
68438
|
return (message) => {
|
|
68445
68439
|
console.log(
|
|
68446
|
-
|
|
68447
|
-
${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.brand ?? "#1fb2a6").whiteBright(
|
|
68440
|
+
`${_chalk.bold.hex(colors.brand ?? "#1fb2a6")(">")} ${_chalk.bold.bgHex(colors.brand ?? "#1fb2a6").whiteBright(
|
|
68448
68441
|
" \u2709 System "
|
|
68449
68442
|
)} ${_chalk.hex(colors.brand ?? "#1fb2a6")(formatLogMessage(message))}
|
|
68450
68443
|
`
|
|
@@ -68605,8 +68598,8 @@ var init_get_config_file = __esm({
|
|
|
68605
68598
|
name: fileName,
|
|
68606
68599
|
envName: fileName?.toUpperCase(),
|
|
68607
68600
|
jitiOptions: {
|
|
68608
|
-
debug:
|
|
68609
|
-
cache: process.env.
|
|
68601
|
+
debug: false,
|
|
68602
|
+
cache: process.env.STORM_SKIP_CACHE === "true" ? false : process.env.STORM_CACHE_DIRECTORY || "node_modules/.cache/storm"
|
|
68610
68603
|
},
|
|
68611
68604
|
...options
|
|
68612
68605
|
});
|
|
@@ -68617,8 +68610,8 @@ var init_get_config_file = __esm({
|
|
|
68617
68610
|
name: fileName,
|
|
68618
68611
|
envName: fileName?.toUpperCase(),
|
|
68619
68612
|
jitiOptions: {
|
|
68620
|
-
debug:
|
|
68621
|
-
cache: process.env.
|
|
68613
|
+
debug: false,
|
|
68614
|
+
cache: process.env.STORM_SKIP_CACHE === "true" ? false : process.env.STORM_CACHE_DIRECTORY || "node_modules/.cache/storm"
|
|
68622
68615
|
},
|
|
68623
68616
|
configFile: fileName,
|
|
68624
68617
|
...options
|
|
@@ -68631,9 +68624,9 @@ var init_get_config_file = __esm({
|
|
|
68631
68624
|
const result = await getConfigFileByName("storm", workspacePath);
|
|
68632
68625
|
let config = result.config;
|
|
68633
68626
|
const configFile = result.configFile;
|
|
68634
|
-
if (config && Object.keys(config).length > 0) {
|
|
68635
|
-
|
|
68636
|
-
`Found Storm configuration file "${configFile}" at "${workspacePath}"`,
|
|
68627
|
+
if (config && configFile && Object.keys(config).length > 0) {
|
|
68628
|
+
writeSystem(
|
|
68629
|
+
`Found Storm configuration file "${configFile.includes(`${workspacePath}/`) ? configFile.replace(`${workspacePath}/`, "") : configFile}" at "${workspacePath}"`,
|
|
68637
68630
|
{
|
|
68638
68631
|
logLevel: "all"
|
|
68639
68632
|
}
|
|
@@ -68646,9 +68639,9 @@ var init_get_config_file = __esm({
|
|
|
68646
68639
|
)
|
|
68647
68640
|
);
|
|
68648
68641
|
for (const result2 of results) {
|
|
68649
|
-
if (result2?.config && Object.keys(result2.config).length > 0) {
|
|
68650
|
-
|
|
68651
|
-
`Found
|
|
68642
|
+
if (result2?.config && result2?.configFile && Object.keys(result2.config).length > 0) {
|
|
68643
|
+
writeSystem(
|
|
68644
|
+
`Found alternative configuration file "${result2.configFile.includes(`${workspacePath}/`) ? result2.configFile.replace(`${workspacePath}/`, "") : result2.configFile}" at "${workspacePath}"`,
|
|
68652
68645
|
{
|
|
68653
68646
|
logLevel: "all"
|
|
68654
68647
|
}
|