@nan0web/ui 1.0.3 → 1.0.4

package/README.md

@@ -41,8 +41,7 @@ yarn add @nan0web/ui
 
 UI communication is built around messages:
 
-- **`UIMessage`** – abstract message base class
-- **`InputMessage`** – user input message (value, options)
+- **`UiMessage`** – abstract message base class
 - **`OutputMessage`** – system output (content, error, priority)
 
 Messages are simple, serializable data containers. They help build
@@ -51,14 +50,14 @@ decoupled communication systems between UI components.
 How to create input and output messages?
 ```js
 import { InputMessage, OutputMessage } from '@nan0web/ui'
-const input = InputMessage.from({ value: 'Hello User' })
+const input = UiMessage.from({ body: 'Hello User' })
 const output = OutputMessage.from({ content: ['Welcome to @nan0web/ui'] })
-console.info(input.value) // ← Message { body: "Hello User", head: {} }
-console.info(output.content[0]) // ← Welcome to @nan0web/ui
+console.info(input) // ← Message { body: "Hello User", head: {}, id: "....", type: "" }
+console.info(String(output)) // ← Welcome to @nan0web/ui
 ```
 ### Forms
 
-`UIForm` supports field definitions, data management, and schema validation.
+`UiForm` supports field definitions, data management, and schema validation.
 Every form includes a title, fields, and current state.
 
 Field types include:
@@ -70,10 +69,10 @@ Field types include:
 - `checkbox`
 - `textarea`
 
-How to define and validate a UIForm?
+How to define and validate a UiForm?
 ```js
-import { UIForm } from '@nan0web/ui'
-const form = new UIForm({
+import { UiForm } from '@nan0web/ui'
+const form = new UiForm({
 	title: "Contact Form",
 	fields: [
 		FormInput.from({ name: "email", label: "Email Address", type: "email", required: true }),
@@ -84,9 +83,9 @@ const form = new UIForm({
 		message: "Hello!"
 	}
 })
-const result = form.validate()
-console.info(result.isValid) // ← false
-console.info(result.errors.email) // ← Invalid email format
+const errors = form.validate()
+console.info(errors.size) // ← 1
+console.info(errors.get("email")) // ← Invalid email format
 ```
 ### Components
 
@@ -164,19 +163,18 @@ with minimal setup.
 
 How to test UI components with assertions?
 ```js
-import { Welcome, InputMessage } from '@nan0web/ui'
+import { Welcome } from '@nan0web/ui'
 const output = Welcome({ user: { name: "Test" } })
-const input = InputMessage.from({ value: "test" })
-console.log(output[0].join("")) // ← Welcome Test!
+console.info(output) // ← Welcome Test!
 ```
 ## Playground Demos
 
 The library includes rich playground demos:
 
-- [Registration Form](./playground/registration.form.js)
-- [Currency Exchange](./playground/currency.exchange.js)
-- [Mobile Top-up](./playground/topup.telephone.js)
-- [Language Selector](./playground/language.form.js)
+- [Registration Form](./play/registration.form.js)
+- [Currency Exchange](./play/currency.exchange.js)
+- [Mobile Top-up](./play/topup.telephone.js)
+- [Language Selector](./play/language.form.js)
 
 Run to explore live functionality:
 
@@ -186,7 +184,7 @@ How to run the playground?
 git clone https://github.com/nan0web/ui.git
 cd ui
 npm install
-npm run playground
+npm run play
 ```
 
 ## API Documentation

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@nan0web/ui",
-	"version": "1.0.3",
+	"version": "1.0.4",
 	"description": "NaN•Web UI. One application logic (algorithm) and many UI.",
 	"main": "src/index.js",
 	"types": "types/index.d.ts",
@@ -12,7 +12,7 @@
 	],
 	"scripts": {
 		"build": "tsc",
-		"playground": "node playground/main.js",
+		"play": "node play/main.js",
 		"test": "node --test --test-timeout=3333 \"src/**/*.test.js\"",
 		"test:nan0test": "node --test --test-timeout=3333 \"src/**/*.test.js\" | nan0test parse --fail",
 		"test:coverage": "node --experimental-test-coverage --test-coverage-include=\"src/**/*.js\" --test-coverage-exclude=\"src/**/*.test.js\" --test \"src/**/*.test.js\"",
@@ -20,6 +20,8 @@
 		"test:docs": "node --test src/README.md.js",
 		"test:release": "node --test \"releases/**/*.test.js\"",
 		"test:status": "nan0test status --hide-name",
+		"test:play": "node --test --test-timeout=3333 \"play/**/*.test.js\"",
+		"test:all": "npm run test && npm run test:docs && npm run test:play && npm run build",
 		"precommit": "npm test",
 		"prepush": "npm test",
 		"prepare": "husky",
@@ -52,23 +54,20 @@
 	"license": "ISC",
 	"packageManager": "pnpm@10.11.0",
 	"devDependencies": {
-		"@nan0web/co": "workspace:*",
-		"@nan0web/event": "workspace:*",
-		"@nan0web/i18n": "workspace:*",
-		"@nan0web/release": "workspace:*",
-		"@nan0web/test": "workspace:*",
-		"@nan0web/types": "workspace:*",
-		"@nan0web/ui-cli": "workspace:*",
+		"@nan0web/event": "^1.0.0",
+		"@nan0web/i18n": "^1.0.1",
+		"@nan0web/release": "1.0.1",
+		"@nan0web/test": "1.1.0",
+		"@nan0web/ui-cli": "1.0.2",
 		"@vitest/coverage-v8": "^3.2.4",
-		"vitest": "^3.2.4",
-		"husky": "^9.1.7"
+		"husky": "^9.1.7",
+		"vitest": "^3.2.4"
 	},
 	"dependencies": {
+		"@nan0web/co": "^2.0.0",
+		"@nan0web/event": "^1.0.0",
+		"@nan0web/types": "^1.2.0",
 		"string-width": "^7.2.0"
 	},
-	"peerDependencies": {
-		"@nan0web/co": "^1.0.0",
-		"@nan0web/event": "^1.0.0",
-		"@nan0web/types": "^1.0.0"
-	}
+	"peerDependencies": {}
 }

package/src/App/Core/UI.js

@@ -35,52 +35,6 @@ class UI extends Widget {
 		throw new Error("convertInput must be implemented by subclass")
 	}
 
-	/**
-	 * Process input, run commands on app, and output results.
-	 * Supports progress callback.
-	 * @emits {start} Emitted when processing begins
-	 * @emits {data} Emitted for each command being processed
-	 * @emits {end} Emitted when all commands have been processed
-	 * @param {any} rawInput - Raw input to process
-	 * @returns {Promise<any[]>} Results of command processing
-	 */
-	async process(rawInput) {
-		const commands = this.convertInput(rawInput).filter(notEmpty)
-		const results = []
-		let count = commands.length
-
-		const proc = this.view.get("UIProcess")
-		if (proc) {
-			this.show(proc)
-		}
-
-		if (0 === count && this.app.selectCommand) {
-			const answer = await this.app.selectCommand(this)
-			if (answer) {
-				const [input] = this.convertInput(rawInput)
-				const cmd = new Message({
-					argv: [answer],
-					opts: input?.opts ?? {},
-				})
-				commands.push(cmd)
-				++count
-			} else {
-				this.emit("end", { commands, results })
-				return results
-			}
-		}
-		this.emit("start", { commands })
-		for (let i = 0; i < count; i++) {
-			const command = commands[i]
-			this.emit("data", { i, count, command })
-			const result = await this.app.processCommand(command, this)
-			results.push(result)
-		}
-		this.emit("end", { commands, results })
-		// this.output(results)
-		return results
-	}
-
 	/**
 	 * Sets up event handlers for UI process events.
 	 * @param {ComponentFn} UIProcess - Process view component

package/src/App/Core/Widget.js

@@ -1,7 +1,7 @@
 import EventProcessor from "@nan0web/event/oop"
 import View from "../../View/View.js"
-import InputMessage from "../../core/Message/InputMessage.js"
 import { StreamEntry } from "@nan0web/db"
+import { UiMessage } from "../../core/index.js"
 
 /** @typedef {import("./UI.js").ComponentFn} ComponentFn */
 
@@ -10,7 +10,7 @@ import { StreamEntry } from "@nan0web/db"
  * Widget is a view with ability to input data in a specific format.
  * Input and output data are typed classes.
  */
-class Widget extends EventProcessor {
+export default class Widget extends EventProcessor {
 	/** @type {View} The view associated with this widget */
 	view
 
@@ -25,8 +25,8 @@ class Widget extends EventProcessor {
 
 	/**
 	 * Ask user for input data of specific class.
-	 * @param {InputMessage} input - instance of InputMessage or similar
-	 * @returns {Promise<InputMessage | null>} instance of InputMessage or null
+	 * @param {UiMessage} input - instance of UiMessage or similar
+	 * @returns {Promise<UiMessage | null>} instance of UiMessage or null
 	 */
 	async ask(input) {
 		return await this.view.ask(input)
@@ -63,5 +63,3 @@ class Widget extends EventProcessor {
 		return this.view.render(viewFn)(outputData)
 	}
 }
-
-export default Widget

package/src/App/User/Command/Message.js

@@ -1,44 +1,30 @@
-import { CommandMessage } from "../../Command/index.js"
-import UserAppCommandOptions from "./Options.js"
+import Message from "@nan0web/co"
+import UIMessage from "../../../core/Message/Message.js"
 
-/**
- * Extends Command.Message to include user-specific command options.
- */
-class UserAppCommandMessage extends CommandMessage {
-	/**
-	 * Creates a new UserAppCommandMessage instance.
-	 * @param {object} props - Command message properties
-	 * @param {string[]} [props.args=[]] - Command arguments
-	 * @param {Partial<UserAppCommandOptions>} [props.opts={}] - User-specific options
-	 */
-	constructor(props = {}) {
-		super(props)
+class DepsCommandParams {
+	fix = false
+	static fix = {
+		help: "Fix dependencies",
+		defaultValue: false
 	}
-
-	/** @returns {UserAppCommandOptions} */
-	get opts() {
-		return UserAppCommandOptions.from(super.opts)
-	}
-
-	/**
-	 * @param {Partial<UserAppCommandOptions>} value
-	 */
-	set opts(value) {
-		super.opts = UserAppCommandOptions.from(value)
+	constructor(input = {}) {
+		const {
+			fix = this.fix
+		} = input
 	}
+}
 
-	/**
-	 * Parses an array of strings into a UserAppCommandMessage.
-	 * @param {string[] | string} value - Arguments to parse
-	 * @returns {UserAppCommandMessage} Parsed command message
-	 */
-	static parse(value = []) {
-		if ("string" === typeof value) {
-			value = value.split(" ")
-		}
-		const result = super.parse(value)
-		return new this(result)
+export class DepsCommand extends UIMessage {
+	static Body = DepsCommandParams
+	/** @type {DepsCommandParams} */
+	body
+	constructor(input = {}) {
+		const {
+			body = new DepsCommandParams()
+		} = UIMessage.parseBody(input, DepsCommandParams)
+		super(input)
+		this.body = body
 	}
 }
 
-export default UserAppCommandMessage
+export default DepsCommand

package/src/App/User/Command/index.js

@@ -1,11 +1,6 @@
-import Command from "../../Command/index.js"
 import CommandMessage from "./Message.js"
-import CommandOptions from "./Options.js"
+import DepsCommand from "./Message.js"
 
-export { CommandMessage, CommandOptions }
+export { CommandMessage, DepsCommand }
 
-export default {
-	...Command,
-	Message: CommandMessage,
-	Options: CommandOptions,
-}
+export default CommandMessage

package/src/App/User/UserApp.js

@@ -3,14 +3,17 @@ import { notEmpty } from "@nan0web/types"
 import CoreApp from "../Core/CoreApp.js"
 import User from "../../Model/User/User.js"
 import UserUI from "./UserUI.js"
-import InputMessage from "../../core/Message/InputMessage.js"
+import UserAppCommandMessage from "./Command/Message.js"
+import DepsCommand from "./Command/Message.js"
+import UIStream from "../../core/Stream.js"
+import { UiMessage } from "../../core/index.js"
 
 /**
  * UserApp requires user name and shows Welcome view.
  * If user.name is provided in command input, ignores user input.
  * User can change user data to see another Welcome view.
  */
-class UserApp extends CoreApp {
+export default class UserApp extends CoreApp {
 	/**
 	 * Creates a new UserApp instance.
 	 * @param {Partial<CoreApp>} [props={}] - UserApp properties
@@ -19,16 +22,35 @@ class UserApp extends CoreApp {
 		super(props)
 		this.registerCommand("setUser", this.setUser.bind(this))
 		this.registerCommand("welcome", this.welcome.bind(this))
+		this.registerCommand("deps", this.handleDeps.bind(this)) // Register new command
+	}
+
+	/**
+	 * Handle deps command with async generator for stream processing.
+	 * @param {DepsCommand} cmd - Command message with deps parameters
+	 * @param {UserUI} ui - UI instance
+	 * @returns {Promise<Object>} Command output
+	 */
+	async handleDeps(cmd, ui) {
+		// Example: Use async generator to stream deps processing
+		const processorFn = async () => new UIStream.StreamEntry({ value: { message: `Deps command executed with fix: ${cmd.body.fix}` }, done: true })
+		const generatorFn = UIStream.createProcessor(new AbortController().signal, processorFn)
+		await UIStream.process(new AbortController().signal, generatorFn,
+			(progress, item) => ui.output && ui.output(item.value), // Fix to output the value
+			(error) => ui.output && ui.output({ error }), // Assume ui has output method
+			(item) => ui.output && ui.output(item.value) // Fix complete callback
+		)
+		return { completed: true }
 	}
 
 	/**
 	 * Set user data from params.
-	 * @param {Message} cmd - Command message with user data
+	 * @param {UserAppCommandMessage} cmd - Command message with user data
 	 * @param {UserUI} ui - UI instance
 	 * @returns {Promise<{ message: string }>} Welcome message
 	 */
 	async setUser(cmd, ui) {
-		this.state.user = User.from(cmd.opts.user)
+		this.state.user = User.from(cmd.body.user) // cmd is UserAppCommandMessage, has user
 		const frame = await this.welcome(cmd, ui)
 		return {
 			message: String(frame)
@@ -37,22 +59,20 @@ class UserApp extends CoreApp {
 
 	/**
 	 * Show welcome message for current user.
-	 * @param {Message} cmd - Command message
+	 * @param {UserAppCommandMessage} cmd - Command message
 	 * @param {UserUI} ui - UI instance
 	 * @returns {Promise<string[][]>} Welcome view output
 	 */
 	async welcome(cmd, ui) {
-		if (cmd.opts.user) {
-			const user = User.from(cmd.opts.user)
+		if (cmd.body.user) { // cmd is UserAppCommandMessage, has user
+			const user = User.from(cmd.body.user)
 			return ui.render("Welcome", { user })
 		}
 		if (notEmpty(this.user)) {
 			return ui.render("Welcome", { user: this.user })
 		}
-		const answer = await ui.ask(InputMessage.from("What is your name?"))
+		const answer = await ui.ask(UiMessage.from("What is your name?"))
 		this.user = User.from(answer?.value)
 		return ui.render("Welcome", { user: this.user })
 	}
 }
-
-export default UserApp

package/src/README.md.js

@@ -8,17 +8,13 @@ import {
 	runSpawn,
 } from "@nan0web/test"
 import {
-	App,
-	Component,
 	Frame,
-	InputMessage,
 	Model,
 	OutputMessage,
-	UIMessage,
-	UIForm,
-	UIStream,
 	View,
 	FormInput,
+	UiMessage,
+	UiForm,
 } from "./index.js"
 import { Welcome } from "./Component/index.js"
 
@@ -108,8 +104,7 @@ function testRender() {
 	 *
 	 * UI communication is built around messages:
 	 *
-	 * - **`UIMessage`** – abstract message base class
-	 * - **`InputMessage`** – user input message (value, options)
+	 * - **`UiMessage`** – abstract message base class
 	 * - **`OutputMessage`** – system output (content, error, priority)
 	 *
 	 * Messages are simple, serializable data containers. They help build
@@ -118,19 +113,22 @@ function testRender() {
 	it("How to create input and output messages?", () => {
 		//import { InputMessage, OutputMessage } from '@nan0web/ui'
 
-		const input = InputMessage.from({ value: 'Hello User' })
+		const input = UiMessage.from({ body: 'Hello User' })
 		const output = OutputMessage.from({ content: ['Welcome to @nan0web/ui'] })
-		console.info(input.value) // ← Message { body: "Hello User", head: {} }
-		console.info(output.content[0]) // ← Welcome to @nan0web/ui
-		assert.deepStrictEqual({ ...console.output()[0][1] }, { body: "Hello User", head: {} })
-		assert.equal(console.output()[1][1], 'Welcome to @nan0web/ui')
+		console.info(input) // ← Message { body: "Hello User", head: {}, id: "....", type: "" }
+		console.info(String(output)) // ← Welcome to @nan0web/ui
+		assert.deepStrictEqual(console.output()[0][1].body, "Hello User")
+		assert.deepStrictEqual(console.output()[0][1].head, {})
+		assert.deepStrictEqual(console.output()[0][1].type, "")
+		assert.ok(console.output()[0][1].id)
+		assert.ok(console.output()[1][1].endsWith('Welcome to @nan0web/ui'))
 	})
 
 	/**
 	 * @docs
 	 * ### Forms
 	 *
-	 * `UIForm` supports field definitions, data management, and schema validation.
+	 * `UiForm` supports field definitions, data management, and schema validation.
 	 * Every form includes a title, fields, and current state.
 	 *
 	 * Field types include:
@@ -142,10 +140,10 @@ function testRender() {
 	 * - `checkbox`
 	 * - `textarea`
 	 */
-	it("How to define and validate a UIForm?", () => {
-		//import { UIForm } from '@nan0web/ui'
+	it("How to define and validate a UiForm?", () => {
+		//import { UiForm } from '@nan0web/ui'
 
-		const form = new UIForm({
+		const form = new UiForm({
 			title: "Contact Form",
 			fields: [
 				FormInput.from({ name: "email", label: "Email Address", type: "email", required: true }),
@@ -157,12 +155,12 @@ function testRender() {
 			}
 		})
 
-		const result = form.validate()
-		console.info(result.isValid) // ← false
-		console.info(result.errors.email) // ← Invalid email format
+		const errors = form.validate()
+		console.info(errors.size) // ← 1
+		console.info(errors.get("email")) // ← Invalid email format
 
-		assert.equal(result.isValid, false)
-		assert.equal(result.errors.email, "Invalid email format")
+		assert.equal(console.output()[0][1], 1)
+		assert.equal(console.output()[1][1], "Invalid email format")
 	})
 
 	/**
@@ -277,13 +275,15 @@ function testRender() {
 	 * with minimal setup.
 	 */
 	it("How to test UI components with assertions?", () => {
-		//import { Welcome, InputMessage } from '@nan0web/ui'
+		//import { Welcome } from '@nan0web/ui'
 
 		const output = Welcome({ user: { name: "Test" } })
-		const input = InputMessage.from({ value: "test" })
-		console.log(output[0].join("")) // ← Welcome Test!
-		assert.equal(console.output()[0][1], "Welcome Test!")
-		assert.ok(input instanceof InputMessage)
+		console.info(output) // ← Welcome Test!
+		assert.deepStrictEqual(console.output()[0][1], [
+			["Welcome", " ", "Test", "!"],
+			["What can we do today great?"],
+			[""],
+		])
 	})
 
 	/**
@@ -292,10 +292,10 @@ function testRender() {
 	 *
 	 * The library includes rich playground demos:
 	 *
-	 * - [Registration Form](./playground/registration.form.js)
-	 * - [Currency Exchange](./playground/currency.exchange.js)
-	 * - [Mobile Top-up](./playground/topup.telephone.js)
-	 * - [Language Selector](./playground/language.form.js)
+	 * - [Registration Form](./play/registration.form.js)
+	 * - [Currency Exchange](./play/currency.exchange.js)
+	 * - [Mobile Top-up](./play/topup.telephone.js)
+	 * - [Language Selector](./play/language.form.js)
 	 *
 	 * Run to explore live functionality:
 	 */
@@ -306,10 +306,10 @@ function testRender() {
 		 * git clone https://github.com/nan0web/ui.git
 		 * cd ui
 		 * npm install
-		 * npm run playground
+		 * npm run play
 		 * ```
 		 */
-		assert.ok(String(pkg.scripts?.playground).includes("node playground"))
+		assert.ok(String(pkg.scripts?.play).includes("node play"))
 		const response = await runSpawn("git", ["remote", "get-url", "origin"])
 		assert.ok(response.code === 0, "git command fails (e.g., not in a git repo)")
 		assert.ok(response.text.trim().endsWith(":nan0web/ui.git"))

package/src/StdIn.js

@@ -1,20 +1,20 @@
 import EventProcessor from "@nan0web/event/oop"
 import { typeOf } from "@nan0web/types"
-import InputMessage from "./core/Message/InputMessage.js"
+import { UiMessage } from "./core/index.js"
 
 class Processor extends EventProcessor { }
 
 /**
  * Handles standard input stream with message buffering.
  */
-class StdIn extends EventProcessor {
+export default class StdIn extends EventProcessor {
 	/** @type {number} Read interval in milliseconds */
 	static READ_INTERVAL = 99
 
 	/** @type {string[]} Messages to ignore */
 	static IGNORE_MESSAGES = ["", "undefined"]
 
-	/** @type {InputMessage[]} Input message buffer */
+	/** @type {UiMessage[]} Input message buffer */
 	stream = []
 
 	/** @type {Processor} Input processor */
@@ -24,7 +24,7 @@ class StdIn extends EventProcessor {
 	 * Creates a new StdIn instance.
 	 * @param {object} props - StdIn properties
 	 * @param {Processor} [props.processor] - Input processor
-	 * @param {InputMessage[]} [props.stream=[]] - Initial input stream
+	 * @param {UiMessage[]} [props.stream=[]] - Initial input stream
 	 */
 	constructor(props = {}) {
 		super()
@@ -58,13 +58,13 @@ class StdIn extends EventProcessor {
 	/**
 	 * Reads a message from the input stream.
 	 * Waits until messages are available if stream is empty.
-	 * @returns {Promise<InputMessage>} Next input message
+	 * @returns {Promise<UiMessage>} Next input message
 	 */
 	async read() {
 		while (this.ended) {
 			await new Promise(resolve => setTimeout(resolve, StdIn.READ_INTERVAL))
 		}
-		return this.stream.shift() ?? new InputMessage()
+		return this.stream.shift() ?? new UiMessage()
 	}
 
 	/**
@@ -83,16 +83,16 @@ class StdIn extends EventProcessor {
 	}
 
 	/**
-	 * Decodes a message into an InputMessage instance.
-	 * @param {InputMessage | string[] | any} message - Message to decode
-	 * @returns {InputMessage} Decoded input message
+	 * Decodes a message into an UiMessage instance.
+	 * @param {UiMessage | string[] | any} message - Message to decode
+	 * @returns {UiMessage} Decoded input message
 	 */
 	decode(message) {
-		if (message instanceof InputMessage) return message
+		if (message instanceof UiMessage) return message
 		if (Array.isArray(message) && message.every(typeOf(String))) {
-			return new InputMessage({ value: message })
+			return new UiMessage({ value: message })
 		}
-		return new InputMessage(message)
+		return new UiMessage(message)
 	}
 
 	/**
@@ -106,4 +106,3 @@ class StdIn extends EventProcessor {
 	}
 }
 
-export default StdIn

package/src/View/View.js

@@ -3,13 +3,13 @@ import Frame, { FrameRenderMethod } from "../Frame/Frame.js"
 import Locale from "../Locale.js"
 import StdOut from "../StdOut.js"
 import StdIn from "../StdIn.js"
-import InputMessage from "../core/Message/InputMessage.js"
 import RenderOptions from "./RenderOptions.js"
+import UiMessage from "../core/Message/Message.js"
 
 /**
  * @typedef {Object} ComponentFn
  * @property {string} name
- * @property {(input: InputMessage) => Promise<any>} ask
+ * @property {(input: UiMessage) => Promise<any>} ask
  * @property {Function} bind
  */
 
@@ -256,8 +256,8 @@ export default class View {
 	}
 
 	/**
-	 * @param {InputMessage} input
-	 * @returns {Promise<InputMessage | null>}
+	 * @param {UiMessage} input
+	 * @returns {Promise<UiMessage | null>}
 	 */
 	async ask(input) {
 		const name = input.constructor.name.replace(/Input$/, "")
@@ -268,7 +268,7 @@ export default class View {
 		let result = null
 		do {
 			const answer = await this.stdin.read()
-			result = /** @type {typeof InputMessage} */ (input.constructor).from(answer)
+			result = /** @type {typeof UiMessage} */ (input.constructor).from(answer)
 		} while (!result.isValid && !result.escaped)
 		return result.escaped ? null : result
 	}