@wocker/utils 2.0.6-beta.0 → 2.0.6-beta.1

package/lib/index.d.ts

@@ -1,3 +1,4 @@
+export * from "./makes";
 export * from "./prompts";
 export * from "./tools";
 export * from "./validators";

package/lib/index.js

@@ -14,6 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./makes"), exports);
 __exportStar(require("./prompts"), exports);
 __exportStar(require("./tools"), exports);
 __exportStar(require("./validators"), exports);

package/lib/makes/Volume.js

@@ -8,10 +8,13 @@ class Volume {
         this.options = options;
     }
     toString() {
-        return `${this.source}:${this.destination}`;
+        return `${this.source}:${this.destination}` + (this.options ? `:${this.options}` : "");
     }
     static parse(volume) {
-        const [, source, destination, options] = Volume.REGEX.exec(volume) || [];
+        if (!Volume.REGEX.test(volume)) {
+            throw new Error(`Invalid volume format for volume "${volume}"`);
+        }
+        const [, source = "/", destination = "/", options] = Volume.REGEX.exec(volume) || [];
         return new Volume(source, destination, options);
     }
 }

package/lib/makes/index.d.ts

@@ -0,0 +1 @@
+export * from "./Volume";

package/lib/makes/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./Volume"), exports);

package/lib/prompts/promptPath.d.ts

@@ -1,7 +1,8 @@
+import { Stats } from "fs";
 import { PromptConfig } from "../types/PromptConfig";
 type Config = PromptConfig<string, {
-    type?: "file" | "directory" | "any";
     basePath?: string;
+    filter?: "file" | "directory" | ((path: string, stat: Stats) => boolean);
     showHidden?: boolean;
 }>;
 export declare const promptPath: import("@inquirer/type").Prompt<string, Config>;

package/lib/prompts/promptPath.js

@@ -22,7 +22,7 @@ const prepareMessage_1 = require("../tools/prepareMessage");
 const prepareValue_1 = require("../tools/prepareValue");
 const prepareHelp_1 = require("../tools/prepareHelp");
 exports.promptPath = (0, core_1.createPrompt)((config, done) => {
-    const { message = "Enter path", type = "any", basePath = process.cwd(), showHidden = false, default: defaultValue = "" } = config;
+    const { message = "Enter path", basePath = process.cwd(), showHidden = false, filter, default: defaultValue = "" } = config;
     const theme = (0, core_1.makeTheme)({
         style: {
             message: prepareMessage_1.prepareMessage,
@@ -51,26 +51,27 @@ exports.promptPath = (0, core_1.createPrompt)((config, done) => {
             if (!fs_1.default.existsSync(currentDir)) {
                 return [];
             }
-            const files = fs_1.default.readdirSync(currentDir);
-            return files
-                .filter(file => {
+            return fs_1.default.readdirSync(currentDir)
+                .filter((file) => {
                 if (!showHidden && file.startsWith("."))
                     return false;
                 if (!file.toLowerCase().startsWith(base.toLowerCase()))
                     return false;
                 const filePath = path_1.default.join(currentDir, file);
                 const stats = fs_1.default.statSync(filePath);
-                if (type === "file")
-                    return stats.isFile();
-                if (type === "directory")
+                if (typeof filter === "function") {
+                    return filter(filePath, stats);
+                }
+                else if (filter === "file") {
+                    return stats.isFile() || stats.isDirectory();
+                }
+                else if (filter === "directory") {
                     return stats.isDirectory();
+                }
                 return true;
             })
                 .sort((a, b) => {
-                const aPath = path_1.default.join(currentDir, a);
-                const bPath = path_1.default.join(currentDir, b);
-                const aIsDir = fs_1.default.statSync(aPath).isDirectory();
-                const bIsDir = fs_1.default.statSync(bPath).isDirectory();
+                const aPath = path_1.default.join(currentDir, a), bPath = path_1.default.join(currentDir, b), aIsDir = fs_1.default.statSync(aPath).isDirectory(), bIsDir = fs_1.default.statSync(bPath).isDirectory();
                 if (aIsDir && !bIsDir)
                     return -1;
                 if (!aIsDir && bIsDir)

package/lib/tools/volumeFormat.d.ts

@@ -1,6 +1,3 @@
-export type Volume = {
-    source: string;
-    destination: string;
-    options?: string;
-};
-export declare const volumeFormat: (volume: Volume) => string;
+import { VolumeData } from "../types/VolumeData";
+/** @deprecated */
+export declare const volumeFormat: (volume: VolumeData) => string;

package/lib/tools/volumeFormat.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.volumeFormat = void 0;
+const Volume_1 = require("../makes/Volume");
+/** @deprecated */
 const volumeFormat = (volume) => {
-    const { source = "/", destination = "/", options } = volume;
-    return `${source}:${destination}` + (options ? `:${options}` : "");
+    return (new Volume_1.Volume(volume.source || "/", volume.destination || "/", volume.options)).toString();
 };
 exports.volumeFormat = volumeFormat;

package/lib/tools/volumeParse.d.ts

@@ -1,2 +1,3 @@
-import { Volume } from "./volumeFormat";
-export declare const volumeParse: (volume: string) => Volume;
+import { VolumeData } from "../types/VolumeData";
+/** @deprecated */
+export declare const volumeParse: (volume: string) => VolumeData;

package/lib/tools/volumeParse.js

@@ -1,13 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.volumeParse = void 0;
+const Volume_1 = require("../makes/Volume");
+/** @deprecated */
 const volumeParse = (volume) => {
-    const regVolume = /^([^:]+):([^:]+)(?::([^:]+))?$/;
-    const [, source, destination, options] = regVolume.exec(volume) || [];
-    return {
-        source,
-        destination,
-        options
-    };
+    try {
+        const v = Volume_1.Volume.parse(volume);
+        return {
+            source: v.source,
+            destination: v.destination,
+            options: v.options
+        };
+    }
+    catch (_a) {
+        return {};
+    }
 };
 exports.volumeParse = volumeParse;

package/lib/types/VolumeData.d.ts

@@ -0,0 +1,5 @@
+export type VolumeData = {
+    source: string;
+    destination: string;
+    options?: string | undefined;
+};

package/lib/types/VolumeData.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

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