@trenskow/reader 0.1.58 → 0.1.60

package/lib/interview.js

@@ -6,31 +6,51 @@
 // See license in LICENSE.
 //
 
-import { default as isvalid, plugins, formalize, keyPaths } from 'isvalid';
-import keyd from 'keyd';
 import print from '@trenskow/print';
+import keyd from 'keyd';
+import Puqeue from 'puqeue';
 
 import question from './question.js';
 
-plugins.use('readerInterview', () => ({
-	phase: 'pre',
-	supportsType: () => true,
-	validatorsForType: () => ({
-		label: ['string'],
-		description: ['string'],
-		silent: ['boolean']
-	}),
-	validate: (data) => data,
-	formalize: (schema) => schema
-}));
+const queue = new Puqeue();
+
+let _isvalid;
+
+const isvalid = async () => {
+	return await queue.add(async () => {
+
+		if (typeof globalThis.isvalid === 'undefined') {
+			globalThis.isvalid = (await import('isvalid')).default;
+		}
+
+		if (typeof _isvalid === 'undefined') {
+			_isvalid = globalThis.isvalid;
+			_isvalid.plugins.use('readerInterview', () => ({
+				phase: 'pre',
+				supportsType: () => true,
+				validatorsForType: () => ({
+					label: ['string'],
+					description: ['string'],
+					silent: ['boolean']
+				}),
+				validate: (data) => data,
+				formalize: (schema) => schema
+			}));
+
+		}
+
+		return _isvalid;
+
+	});
+};
 
 const interview = async (schema, { spacing = 0, input = process.stdin, output = process.stdout, strings = {} } = {}) => {
 
-	schema = formalize(schema);
+	schema = (await isvalid()).formalize(schema);
 
 	if (schema.type === Object) {
 
-		const allKeyPaths = keyPaths(schema)
+		const allKeyPaths = (await isvalid()).keyPaths(schema)
 			.all({ maxDepth: 1 })
 			.filter((keyPath) => keyPath);
 
@@ -40,7 +60,7 @@ const interview = async (schema, { spacing = 0, input = process.stdin, output =
 
 			const keyPath = allKeyPaths[idx];
 
-			keyd(result).set(keyPath, await interview(keyPaths(schema).get(keyPath), { spacing, strings }));
+			keyd(result).set(keyPath, await interview((await isvalid()).keyPaths(schema).get(keyPath), { spacing, strings }));
 
 			if (idx < allKeyPaths.length - 1) {
 				for (let i = 0; i < spacing; i++) {
@@ -50,7 +70,7 @@ const interview = async (schema, { spacing = 0, input = process.stdin, output =
 
 		}
 
-		return await isvalid(result, schema);
+		return await (await isvalid())(result, schema);
 
 	}
 
@@ -84,7 +104,7 @@ const interview = async (schema, { spacing = 0, input = process.stdin, output =
 				print.tty.nn('\x1b[0m');
 			}
 
-			return await isvalid(await question(`${schema.label}${schema.required ? ` ${strings?.required || '(required)'}` : ''}: `, {
+			return await (await isvalid())(await question(`${schema.label}${schema.required ? ` ${strings?.required || '(required)'}` : ''}: `, {
 				defaultValue: schema.default,
 				input,
 				output,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@trenskow/reader",
-	"version": "0.1.58",
+	"version": "0.1.60",
 	"description": "A simple package to ask questions of a stream.",
 	"main": "index.js",
 	"type": "module",
@@ -27,12 +27,13 @@
 	"devDependencies": {
 		"@eslint/eslintrc": "^3.3.3",
 		"@eslint/js": "^9.17.0",
-		"eslint": "^9.39.1",
+		"eslint": "^9.39.2",
 		"globals": "^16.5.0"
 	},
 	"dependencies": {
-		"@trenskow/print": "^0.1.35",
+		"@trenskow/print": "^0.1.36",
 		"isvalid": "^4.2.12",
-		"keyd": "^2.1.41"
+		"keyd": "^2.1.42",
+		"puqeue": "^1.1.24"
 	}
 }