@wocker/utils 2.0.1-beta.0 → 2.0.1

package/lib/prompts/promptConfirm.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.promptConfirm = void 0;
 const core_1 = require("@inquirer/core");
 const validatePrompt_1 = require("../validation/validatePrompt");
+const prepareMessage_1 = require("../tools/prepareMessage");
 exports.promptConfirm = (0, core_1.createPrompt)((config, done) => {
     const { message = "Confirm", default: defaultValue = false } = config;
     const [status, setStatus] = (0, core_1.useState)("idle"), [inputValue, setInputValue] = (0, core_1.useState)(""), [error, setError] = (0, core_1.useState)(""), icon = (0, core_1.usePrefix)({ status });
@@ -27,7 +28,11 @@ exports.promptConfirm = (0, core_1.createPrompt)((config, done) => {
         }
         return defaultValue;
     }, [inputValue, defaultValue]);
-    const theme = (0, core_1.makeTheme)({}, config.theme);
+    const theme = (0, core_1.makeTheme)({
+        style: {
+            message: prepareMessage_1.prepareMessage
+        }
+    }, config.theme);
     (0, core_1.useKeypress)((key, readline) => __awaiter(void 0, void 0, void 0, function* () {
         setStatus("idle");
         setError("");
@@ -62,9 +67,8 @@ exports.promptConfirm = (0, core_1.createPrompt)((config, done) => {
     return [
         [
             `${icon} `,
-            theme.style.message(message, status),
-            " ",
-            theme.style.defaultAnswer(config.default ? "Y/n" : "y/N"),
+            theme.style.message(message, status, "?"),
+            theme.style.defaultAnswer(typeof config.default === "boolean" ? (config.default ? "Y/n" : "y/N") : "y/n"),
             " ",
             inputValue
         ].join(""),

package/lib/prompts/promptInput.js

@@ -8,27 +8,18 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.promptInput = void 0;
 const core_1 = require("@inquirer/core");
-const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
 const validatePrompt_1 = require("../validation/validatePrompt");
+const prepareMessage_1 = require("../tools/prepareMessage");
+const prepareValue_1 = require("../tools/prepareValue");
 exports.promptInput = (0, core_1.createPrompt)((config, done) => {
     const { message = "Input", type = "text", step = 1, prefix = "", suffix = "", default: defaultValue } = config;
     const theme = (0, core_1.makeTheme)({
         style: {
-            message: (message) => `${theme.style.highlight(message + ": ")}`,
-            value: (value, status) => {
-                switch (status) {
-                    case "error":
-                        return yoctocolors_cjs_1.default.red(value);
-                    default:
-                        return value;
-                }
-            }
+            message: prepareMessage_1.prepareMessage,
+            value: prepareValue_1.prepareValue
         }
     }, config.theme);
     const [inputValue = "", setInputValue] = (0, core_1.useState)(typeof defaultValue === "number" ? defaultValue.toString() : defaultValue), [status, setStatus] = (0, core_1.useState)("idle"), [error, setError] = (0, core_1.useState)("");

package/lib/prompts/promptSelect.js

@@ -19,23 +19,14 @@ const ansi_escapes_1 = __importDefault(require("ansi-escapes"));
 const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
 const tools_1 = require("../tools");
 const validatePrompt_1 = require("../validation/validatePrompt");
+const prepareMessage_1 = require("../tools/prepareMessage");
+const prepareValue_1 = require("../tools/prepareValue");
 const selectView = (config, done) => {
     const { message = "Select", multiple, pageSize = 5, options: rawOptions = [] } = config;
     const theme = (0, core_1.makeTheme)({
         style: {
-            message: (message) => yoctocolors_cjs_1.default.bold(`${message}: `),
-            value: (value, status) => {
-                switch (status) {
-                    case "selected":
-                        return yoctocolors_cjs_1.default.green(value);
-                    case "active":
-                        return yoctocolors_cjs_1.default.blue(value);
-                    case "done":
-                        return yoctocolors_cjs_1.default.cyan(value);
-                    default:
-                        return value;
-                }
-            }
+            message: prepareMessage_1.prepareMessage,
+            value: prepareValue_1.prepareValue
         }
     }, config.theme);
     const options = (0, core_1.useMemo)(() => {

package/lib/tools/prepareMessage.d.ts

@@ -0,0 +1,2 @@
+import { Status } from "@inquirer/core";
+export declare const prepareMessage: (message: string, _: Status, ending?: string) => string;

package/lib/tools/prepareMessage.js

@@ -0,0 +1,15 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareMessage = void 0;
+const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
+const prepareMessage = (message, _, ending = ":") => {
+    message = message.trim();
+    if (!/[?:.!,;]$/.test(message)) {
+        message += ending;
+    }
+    return yoctocolors_cjs_1.default.bold(message) + " ";
+};
+exports.prepareMessage = prepareMessage;

package/lib/tools/prepareValue.d.ts

@@ -0,0 +1,2 @@
+import { Status } from "@inquirer/core";
+export declare const prepareValue: (value: string, status: Status) => string;

package/lib/tools/prepareValue.js

@@ -0,0 +1,20 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.prepareValue = void 0;
+const yoctocolors_cjs_1 = __importDefault(require("yoctocolors-cjs"));
+const prepareValue = (value, status) => {
+    switch (status) {
+        case "selected":
+            return yoctocolors_cjs_1.default.green(value);
+        case "active":
+            return yoctocolors_cjs_1.default.blue(value);
+        case "done":
+            return yoctocolors_cjs_1.default.cyan(value);
+        default:
+            return value;
+    }
+};
+exports.prepareValue = prepareValue;

package/lib/types/Theme.d.ts

@@ -1,6 +1,7 @@
 import { Theme as InquirerTheme, Status } from "@inquirer/core";
 export type Theme<T extends object = object> = InquirerTheme<T & {
     style: {
+        message: (message: string, status: Status, ending?: string) => string;
         value: (value: string, status: Status) => string;
     };
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wocker/utils",
-    "version": "2.0.1-beta.0",
+    "version": "2.0.1",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Utils for @wocker",
     "license": "MIT",