@yamato-daiwa/es-extensions-nodejs 1.7.0-alpha.2 → 1.7.0-alpha.3

package/Distributable/ConsoleApplicationLogger.d.ts

@@ -1,20 +1,20 @@
-import type { Logger, ErrorLog, ThrownErrorLog, InfoLog, SuccessLog, WarningLog, Log } from "@yamato-daiwa/es-extensions";
+import type { Logger, ErrorLog, InfoLog, SuccessLog, WarningLog, Log } from "@yamato-daiwa/es-extensions";
 declare abstract class ConsoleApplicationLogger {
     private static localization;
     static setLocalization(localization: Logger.Localization): typeof ConsoleApplicationLogger;
-    static throwErrorAndLog<CustomError extends Error>(errorLog: ThrownErrorLog<CustomError>): never;
     static logError(errorLog: ErrorLog): void;
     static logErrorLikeMessage(errorLikeLog: Log): void;
     static logWarning(warningLog: WarningLog): void;
     static logSuccess(successLog: SuccessLog): void;
     static logInfo(infoLog: InfoLog): void;
+    static logGeneric(genericLog: Log): void;
     static highlightText(targetString: string): string;
     static generateConsoleMethodParametersForFormattedOutput(formattedOutputData: ConsoleApplicationLogger.FormattedOutputData): Array<string>;
     static generateRedGreenBlueForegroundColorControlSequence(colorDefinition: ConsoleApplicationLogger.RedGreenBlue): string;
     static generateRedGreenBlueBackgroundColorControlSequence(colorDefinition: ConsoleApplicationLogger.RedGreenBlue): string;
 }
 declare namespace ConsoleApplicationLogger {
-    type FormattedOutputData = Array<[string, Formatting]>;
+    type FormattedOutputData = Array<[string | null, Formatting]>;
     type Formatting = {
         foregroundColor?: FourBitColours | RedGreenBlue;
         bold?: boolean;

package/Distributable/ConsoleApplicationLogger.js

@@ -6,25 +6,11 @@ class ConsoleApplicationLogger {
         ConsoleApplicationLogger.localization = localization;
         return ConsoleApplicationLogger;
     }
-    static throwErrorAndLog(errorLog) {
-        if ("errorInstance" in errorLog) {
-            errorLog.errorInstance.message = `${errorLog.title}\n${errorLog.errorInstance.message}` +
-                `\n\n${ConsoleApplicationLogger.localization.occurrenceLocation}: ${errorLog.occurrenceLocation}` +
-                `${(0, es_extensions_1.insertSubstringIf)(`\n\n${ConsoleApplicationLogger.localization.wrappableError}:` +
-                    `\n${(0, es_extensions_1.stringifyAndFormatArbitraryValue)(errorLog.wrappableError)}`, (0, es_extensions_1.isNotUndefined)(errorLog.wrappableError))}` +
-                `${(0, es_extensions_1.insertSubstringIf)(`\n\n${ConsoleApplicationLogger.localization.appendedData}:` +
-                    `\n${(0, es_extensions_1.stringifyAndFormatArbitraryValue)(errorLog.additionalData)}`, (0, es_extensions_1.isNotUndefined)(errorLog.additionalData))}` +
-                "\n";
-            throw errorLog.errorInstance;
-        }
-        const errorWillBeThrown = new Error(errorLog.description);
-        errorWillBeThrown.name = errorLog.errorType;
-        throw errorWillBeThrown;
-    }
     static logError(errorLog) {
         console.error(...ConsoleApplicationLogger.generateConsoleMethodParametersForFormattedOutput([
             [
-                ` ${errorLog.customBadgeText ?? ConsoleApplicationLogger.localization.badgesDefaultTitles.error} `,
+                errorLog.badge === false ?
+                    null : ` ${errorLog.badge?.customText ?? ConsoleApplicationLogger.localization.badgesDefaultTitles.error} `,
                 {
                     bold: true,
                     foregroundColor: { red: 255, green: 255, blue: 255 },
@@ -32,14 +18,14 @@ class ConsoleApplicationLogger {
                 }
             ],
             [
-                ` ${errorLog.title}\n`,
+                `${(0, es_extensions_1.insertSubstringIf)(" ", errorLog.badge !== false)}${errorLog.title}`,
                 {
                     bold: true,
                     foregroundColor: { red: 192, green: 57, blue: 43 }
                 }
             ],
             [
-                `${errorLog.description}`,
+                `${errorLog.compactLayout === true ? " " : "\n"}${errorLog.description}`,
                 {
                     foregroundColor: { red: 231, green: 76, blue: 60 }
                 }
@@ -106,7 +92,8 @@ class ConsoleApplicationLogger {
     static logErrorLikeMessage(errorLikeLog) {
         console.error(...ConsoleApplicationLogger.generateConsoleMethodParametersForFormattedOutput([
             [
-                ` ${errorLikeLog.customBadgeText ?? ConsoleApplicationLogger.localization.badgesDefaultTitles.error} `,
+                errorLikeLog.badge === false ?
+                    null : ` ${errorLikeLog.badge?.customText ?? ConsoleApplicationLogger.localization.badgesDefaultTitles.error} `,
                 {
                     bold: true,
                     foregroundColor: { red: 255, green: 255, blue: 255 },
@@ -114,14 +101,14 @@ class ConsoleApplicationLogger {
                 }
             ],
             [
-                ` ${errorLikeLog.title}\n`,
+                `${(0, es_extensions_1.insertSubstringIf)(" ", errorLikeLog.badge !== false)}${errorLikeLog.title}`,
                 {
                     bold: true,
                     foregroundColor: { red: 192, green: 57, blue: 43 }
                 }
             ],
             [
-                `${errorLikeLog.description}`,
+                `${errorLikeLog.compactLayout === true ? " " : "\n"}${errorLikeLog.description}`,
                 {
                     foregroundColor: { red: 231, green: 76, blue: 60 }
                 }
@@ -146,7 +133,8 @@ class ConsoleApplicationLogger {
     static logWarning(warningLog) {
         console.warn(...ConsoleApplicationLogger.generateConsoleMethodParametersForFormattedOutput([
             [
-                ` ${warningLog.customBadgeText ?? ConsoleApplicationLogger.localization.badgesDefaultTitles.warning} `,
+                warningLog.badge === false ?
+                    null : ` ${warningLog.badge?.customText ?? ConsoleApplicationLogger.localization.badgesDefaultTitles.warning} `,
                 {
                     bold: true,
                     foregroundColor: { red: 255, green: 255, blue: 255 },
@@ -154,14 +142,14 @@ class ConsoleApplicationLogger {
                 }
             ],
             [
-                ` ${warningLog.title}\n`,
+                `${(0, es_extensions_1.insertSubstringIf)(" ", warningLog.badge !== false)}${warningLog.title}`,
                 {
                     bold: true,
                     foregroundColor: { red: 211, green: 84, blue: 0 }
                 }
             ],
             [
-                `${warningLog.description}`,
+                `${warningLog.compactLayout === true ? " " : "\n"}${warningLog.description}`,
                 {
                     foregroundColor: { red: 230, green: 126, blue: 34 }
                 }
@@ -201,7 +189,8 @@ class ConsoleApplicationLogger {
     static logSuccess(successLog) {
         console.log(...ConsoleApplicationLogger.generateConsoleMethodParametersForFormattedOutput([
             [
-                ` ${successLog.customBadgeText ?? ConsoleApplicationLogger.localization.badgesDefaultTitles.success} `,
+                successLog.badge === false ?
+                    null : ` ${successLog.badge?.customText ?? ConsoleApplicationLogger.localization.badgesDefaultTitles.success} `,
                 {
                     bold: true,
                     foregroundColor: { red: 255, green: 255, blue: 255 },
@@ -209,14 +198,14 @@ class ConsoleApplicationLogger {
                 }
             ],
             [
-                ` ${successLog.title}\n`,
+                `${(0, es_extensions_1.insertSubstringIf)(" ", successLog.badge !== false)}${successLog.title}`,
                 {
                     bold: true,
                     foregroundColor: { red: 39, green: 174, blue: 96 }
                 }
             ],
             [
-                `${successLog.description}`,
+                `${successLog.compactLayout === true ? " " : "\n"}${successLog.description}`,
                 {
                     foregroundColor: { red: 46, green: 204, blue: 113 }
                 }
@@ -241,7 +230,8 @@ class ConsoleApplicationLogger {
     static logInfo(infoLog) {
         console.log(...ConsoleApplicationLogger.generateConsoleMethodParametersForFormattedOutput([
             [
-                ` ${infoLog.customBadgeText ?? ConsoleApplicationLogger.localization.badgesDefaultTitles.info} `,
+                infoLog.badge === false ?
+                    null : ` ${infoLog.badge?.customText ?? ConsoleApplicationLogger.localization.badgesDefaultTitles.info} `,
                 {
                     bold: true,
                     foregroundColor: { red: 255, green: 255, blue: 255 },
@@ -249,14 +239,14 @@ class ConsoleApplicationLogger {
                 }
             ],
             [
-                ` ${infoLog.title}\n`,
+                `${(0, es_extensions_1.insertSubstringIf)(" ", infoLog.badge !== false)}${infoLog.title}`,
                 {
                     foregroundColor: { red: 41, green: 128, blue: 185 },
                     bold: true
                 }
             ],
             [
-                `${infoLog.description}`,
+                `${infoLog.compactLayout === true ? " " : "\n"}${infoLog.description}`,
                 {
                     foregroundColor: { red: 52, green: 152, blue: 219 }
                 }
@@ -278,6 +268,47 @@ class ConsoleApplicationLogger {
             ] : [])
         ]));
     }
+    static logGeneric(genericLog) {
+        console.log(...ConsoleApplicationLogger.generateConsoleMethodParametersForFormattedOutput([
+            [
+                genericLog.badge === false ?
+                    null : ` ${genericLog.badge?.customText ?? ConsoleApplicationLogger.localization.badgesDefaultTitles.info} `,
+                {
+                    bold: true,
+                    foregroundColor: { red: 0, green: 0, blue: 0 },
+                    backgroundColor: { red: 255, green: 255, blue: 255 }
+                }
+            ],
+            [
+                `${(0, es_extensions_1.insertSubstringIf)(" ", genericLog.badge !== false)}${genericLog.title}`,
+                {
+                    foregroundColor: { red: 255, green: 255, blue: 255 },
+                    bold: true
+                }
+            ],
+            [
+                `${genericLog.compactLayout === true ? " " : "\n"}${genericLog.description}`,
+                {
+                    foregroundColor: { red: 255, green: 255, blue: 255 }
+                }
+            ],
+            ...("additionalData" in genericLog ? [
+                [
+                    `\n\n${ConsoleApplicationLogger.localization.appendedData}:`,
+                    {
+                        bold: true,
+                        foregroundColor: { red: 255, green: 255, blue: 255 }
+                    }
+                ],
+                [
+                    `\n${(0, es_extensions_1.stringifyAndFormatArbitraryValue)(genericLog.additionalData)}`,
+                    {
+                        foregroundColor: { red: 255, green: 255, blue: 255 }
+                    }
+                ]
+            ] : [])
+        ]));
+    }
     static highlightText(targetString) {
         return `\x1b[43m${targetString}\x1b[49m`;
     }
@@ -285,6 +316,9 @@ class ConsoleApplicationLogger {
         const logsTextings = [];
         const templatesWithFormattings = [];
         for (const singleFormattedOutputData of formattedOutputData) {
+            if ((0, es_extensions_1.isNull)(singleFormattedOutputData[0])) {
+                continue;
+            }
             let templateWithFormatting = "";
             const formatting = singleFormattedOutputData[1];
             switch (formatting.foregroundColor) {
@@ -398,7 +432,7 @@ class ConsoleApplicationLogger {
         return `\x1b[48;2;${colorDefinition.red};${colorDefinition.green};${colorDefinition.blue}m`;
     }
 }
-ConsoleApplicationLogger.localization = es_extensions_1.LoggerLocalization__English;
+ConsoleApplicationLogger.localization = es_extensions_1.loggerLocalization__english;
 (function (ConsoleApplicationLogger) {
     let FourBitColours;
     (function (FourBitColours) {

package/Distributable/ConsoleCommandsParser/ConsoleCommandsParser.d.ts

@@ -216,8 +216,7 @@ declare namespace ConsoleCommandsParser {
             }
             namespace RequiredOptionKeyIsMissing {
                 type TemplateVariables = Readonly<{
-                    commandPhrase: string;
-                    isDefaultCommandPhrase: boolean;
+                    commandPhrase?: string;
                     missingOptionKey: string;
                     commandHelpReference: string;
                 }>;

package/Distributable/ConsoleCommandsParser/ConsoleCommandsParser.js

@@ -221,7 +221,6 @@ class ConsoleCommandsParser {
                             applicationName: this.applicationName,
                             messageSpecificPart: ConsoleCommandsParser.localization.errorsMessages.requiredOptionKeyIsMissing.generate({
                                 commandPhrase: this.targetCommandPhrase,
-                                isDefaultCommandPhrase: this.isTargetCommandPhraseDefault,
                                 missingOptionKey: optionKeyWithLeading2NDashes,
                                 commandHelpReference: ConsoleCommandsParser.generateSingleCommandPhraseHelpReference({
                                     commandPhrase: this.targetCommandPhrase,

package/Distributable/ConsoleCommandsParser/ConsoleCommandsParserLocalization.english.js

@@ -58,8 +58,8 @@ const consoleCommandsParserLocalization__english = {
                 `\n${helpReference}`
         },
         requiredOptionKeyIsMissing: {
-            generate: ({ missingOptionKey, commandPhrase, isDefaultCommandPhrase, commandHelpReference }) => `The option "${missingOptionKey}" is required for the command "${commandPhrase}"` +
-                `${(0, es_extensions_1.insertSubstringIf)(" (default command phrase)", isDefaultCommandPhrase)}. ` +
+            generate: ({ missingOptionKey, commandPhrase, commandHelpReference }) => `The option "${missingOptionKey}" is required for the ` +
+                `${(0, es_extensions_1.isNotUndefined)(commandPhrase) ? `command "${commandPhrase}"` : "default command"}. ` +
                 `${consoleCommandsParserLocalization__english.generateCheckTheCommandReferenceAsking(commandHelpReference)}`
         },
         noValueFollowingTheKeyOfNonBooleanOption: {

package/Distributable/ImprovedGlob.js

@@ -3,8 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const glob_1 = __importDefault(require("glob"));
-const minimatch_1 = __importDefault(require("minimatch"));
+const glob_1 = require("glob");
+const minimatch_1 = require("minimatch");
 const es_extensions_1 = require("@yamato-daiwa/es-extensions");
 const appendCharacterIfItDoesNotPresentInLastPosition_1 = __importDefault(require("./Temporary/appendCharacterIfItDoesNotPresentInLastPosition"));
 class ImprovedGlob {
@@ -17,7 +17,7 @@ class ImprovedGlob {
         }
         const matchingFilesAbsolutePaths = [];
         for (const inclusiveGlobSelector of inclusiveGlobSelectors) {
-            matchingFilesAbsolutePaths.push(...glob_1.default.sync(inclusiveGlobSelector, {
+            matchingFilesAbsolutePaths.push(...glob_1.glob.sync(inclusiveGlobSelector, {
                 ignore: exclusiveGlobSelectors.map((globSelector) => (0, es_extensions_1.removeSpecificCharacterFromCertainPosition)({
                     targetString: globSelector,
                     fromFirstPosition: true,
@@ -31,12 +31,12 @@ class ImprovedGlob {
         return matchingFilesAbsolutePaths.map((fileAbsolutePath) => (0, es_extensions_1.replaceDoubleBackslashesWithForwardSlashes)(fileAbsolutePath));
     }
     static isFilePathMatchingWithGlobSelector(compoundParameter) {
-        return (0, minimatch_1.default)(compoundParameter.filePath, compoundParameter.globSelector);
+        return (0, minimatch_1.minimatch)(compoundParameter.filePath, compoundParameter.globSelector);
     }
     static isFilePathMatchingWithAllGlobSelectors(compoundParameter) {
         return (Array.isArray(compoundParameter.globSelectors) ?
             compoundParameter.globSelectors : [compoundParameter.globSelectors]).
-            every((globSelector) => (0, minimatch_1.default)(compoundParameter.filePath, globSelector));
+            every((globSelector) => (0, minimatch_1.minimatch)(compoundParameter.filePath, globSelector));
     }
     static isExcludingGlobSelector(globSelector) {
         return globSelector.startsWith("!");
@@ -58,7 +58,7 @@ class ImprovedGlob {
                 targetString: (0, es_extensions_1.replaceDoubleBackslashesWithForwardSlashes)(compoundParameter.basicDirectoryPath),
                 trailingCharacter: "/"
             }),
-            "**/**",
+            "**/*",
             ...(0, es_extensions_1.isNonEmptyArray)(compoundParameter.fileNamesExtensions) ?
                 [ImprovedGlob.createMultipleFilenameExtensionsGlobPostfix(compoundParameter.fileNamesExtensions)] : []
         ].join("");
@@ -70,7 +70,7 @@ class ImprovedGlob {
                 targetString: (0, es_extensions_1.replaceDoubleBackslashesWithForwardSlashes)(targetDirectoryPath),
                 trailingCharacter: "/"
             }),
-            "**/**"
+            "**/*"
         ].join("");
     }
     static buildExcludingOfFilesWithSpecificPrefixesGlobSelector(compoundParameter) {
@@ -103,7 +103,7 @@ class ImprovedGlob {
                 trailingCharacter: "/"
             }),
             "**/",
-            `@(${compoundParameter.filesNamesPrefixes.join("|")})**`,
+            `@(${compoundParameter.filesNamesPrefixes.join("|")})*`,
             `${ImprovedGlob.createMultipleFilenameExtensionsGlobPostfix(compoundParameter.filesNamesExtensions)}`
         ].join("");
     }
@@ -127,7 +127,7 @@ class ImprovedGlob {
                 trailingCharacter: "/"
             }),
             "**/",
-            `@(${compoundParameter.subdirectoriesPrefixes.join("|")})**/**/**`,
+            `@(${compoundParameter.subdirectoriesPrefixes.join("|")})*/**/*`,
             ...(0, es_extensions_1.isNonEmptyArray)(compoundParameter.filesNamesExtensions) ?
                 `${ImprovedGlob.createMultipleFilenameExtensionsGlobPostfix(compoundParameter.filesNamesExtensions)}` : []
         ].join("");
@@ -150,7 +150,7 @@ class ImprovedGlob {
                 targetString: (0, es_extensions_1.replaceDoubleBackslashesWithForwardSlashes)(compoundParameter.basicDirectoryPath),
                 trailingCharacter: "/"
             }),
-            `@(${compoundParameter.subdirectoriesNames.join("|")})/**/**`,
+            `**/@(${compoundParameter.subdirectoriesNames.join("|")})/**/*`,
             ...(0, es_extensions_1.isNonEmptyArray)(compoundParameter.filesNamesExtensions) ?
                 `${ImprovedGlob.createMultipleFilenameExtensionsGlobPostfix(compoundParameter.filesNamesExtensions)}` : []
         ].join("");

package/Distributable/ImprovedPath/ImprovedPath.js

@@ -28,7 +28,7 @@ class ImprovedPath {
                 errorInstance: new es_extensions_1.InvalidParameterValueError({ parameterName: "pathSegments", parameterNumber: 1 }),
                 title: es_extensions_1.InvalidParameterValueError.localization.defaultTitle,
                 occurrenceLocation: "ImprovedPath.joinPathSegments(pathSegments, options)",
-                wrappableError: error
+                innerError: error
             });
         }
     }
@@ -60,7 +60,7 @@ class ImprovedPath {
                 errorInstance: new es_extensions_1.InvalidParameterValueError({ parameterName: "pathSegments", parameterNumber: 1 }),
                 title: es_extensions_1.InvalidParameterValueError.localization.defaultTitle,
                 occurrenceLocation: "ImprovedPath.buildAbsolutePathFromCurrentWorkingDirectory(pathSegments, options)",
-                wrappableError: error
+                innerError: error
             });
         }
     }
@@ -74,7 +74,7 @@ class ImprovedPath {
                 errorInstance: new es_extensions_1.InvalidParameterValueError({ parameterName: "namedParameters", parameterNumber: 1 }),
                 title: es_extensions_1.InvalidParameterValueError.localization.defaultTitle,
                 occurrenceLocation: "ImprovedPath.computeRelativePath(namedParameters)",
-                wrappableError: error
+                innerError: error
             });
         }
         return namedParameters.alwaysForwardSlashSeparators === true ?

package/Distributable/ObjectDataFilesProcessor/ObjectDataFilesProcessor.js

@@ -107,7 +107,7 @@ class ObjectDataFilesProcessor {
                     errorInstance: new FileNotFoundError_1.default({ filePath }),
                     title: FileNotFoundError_1.default.localization.defaultTitle,
                     occurrenceLocation: POTENTIAL_ERROR_OCCURRENCE_LOCATION,
-                    wrappableError: error
+                    innerError: error
                 });
             }
             throw error;
@@ -145,7 +145,7 @@ class ObjectDataFilesProcessor {
                     errorInstance: new FileNotFoundError_1.default({ filePath }),
                     title: FileNotFoundError_1.default.localization.defaultTitle,
                     occurrenceLocation: POTENTIAL_ERROR_OCCURRENCE_LOCATION,
-                    wrappableError: error
+                    innerError: error
                 });
             }
             throw error;
@@ -194,7 +194,7 @@ class ObjectDataFilesProcessor {
                 errorInstance: new es_extensions_1.InvalidExternalDataError({ mentionToExpectedData: filePathForLogging }),
                 title: es_extensions_1.InvalidExternalDataError.localization.defaultTitle,
                 occurrenceLocation: POTENTIAL_ERROR_OCCURRENCE_LOCATION,
-                wrappableError: error
+                innerError: error
             });
         }
         if ((0, es_extensions_1.isUndefined)(validDataSpecification)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yamato-daiwa/es-extensions-nodejs",
-  "version": "1.7.0-alpha.2",
+  "version": "1.7.0-alpha.3",
   "description": "Additional to @yamato-daiwa/es-extensions functionality for Node.js environment. Helper functions and classes aimed to reduce the routine code. Build-in TypeScript type safety.",
   "keywords": [
     "nodejs",