Improved dispatchers with richer results and added predicate and regular expression based dispatchers

source/data/field-configuration-factories.mjs

@@ -15,6 +15,12 @@ export function typed_value(coercion_function, default_value, description) {
 	return new Field_Configuration(null, coercion_function, () => default_value, description);
 }
 
+export function boolean(default_value, description) {
+	//BUG: Text representations such as "false" is still truthy here - we should have a more capable coearcing function
+	return new Field_Configuration(null, Boolean, () => default_value, description);
+}
+
+
 export function typed_factory(coercion_function, factory_function, description) {
 	return new Field_Configuration(null, coercion_function, factory_function, description);
 }

source/data/string-utilities.mjs

@@ -46,6 +46,6 @@ export function *indented_line_iterator(settings, text) {
 			break;
 		}
 		default:
-			throw new Error('Unsupported indention mode');	//TODO - proper error
+			throw new Error(`Unsupported indention mode: ${settings.indention_mode}`);	//TODO - proper error
 	}
 }

source/errors.mjs

@@ -50,7 +50,7 @@ export class Item_Unresolvable extends Error {
 	constructor(data) {
 		const { resolver, item } = data;
 		const type = item === null ? 'null' : typeof item;
-		super(`Cannot resolve item ${inspect(item)} of type "${type}" using resolver ${resolver}`);
+		super(`Cannot resolve item ${inspect(item)} of type "${type}" using resolver ${resolver.constructor.name}`);
 		this.data = data;
 	}
 }

source/rule-processing/resolvers.mjs

@@ -2,11 +2,12 @@ import { Item_Unresolvable } from '@efforting.tech/errors';
 
 export class Abstract_Resolver {
 	resolve(item) {
-		const handler = this.resolve_handler(item);
-		if (!handler) {
+		const result = this.resolve_handler(item);
+		if (!result?.handler) {
 			throw new Item_Unresolvable({ resolver: this, item });
 		}
-		return handler({ resolver: this, item });
+		// TO DOC: Spreading result into the resulting context means there are some reserved keys we need to be mindful of to avoid clobbering them
+		return result.handler({ resolver: this, item, ...result });
 	}
 }
 
@@ -19,14 +20,47 @@ export class Chained_Resolver extends Abstract_Resolver {
 	resolve_handler(item) {
 		const { chain_links } = this;
 		for (const link of chain_links) {
-			const handler = link.resolve_handler(item);
-			if (handler) {
-				return handler;
+			const result = link.resolve_handler(item);
+			if (result?.handler) {
+				return result;
 			}
 		}
 	}
 }
 
+export class Predicate_Resolver extends Abstract_Resolver {
+	constructor(rules=[]) {
+		// NOTE: Rules should be iterable as [predicate, handler] pairs
+		super();
+		Object.assign(this, { rules });
+	}
+
+	resolve_handler(item) {
+		const { rules } = this;
+		for (const [predicate, handler] of rules) {
+			const predicate_result = predicate(item);
+			if (predicate_result !== undefined) {
+				return { handler, predicate_result };
+			}
+		}
+	}
+}
+
+export class RegExp_Resolver extends Predicate_Resolver {
+	constructor(rules=[]) {
+		// NOTE: Rules should be iterable as [predicate, handler] pairs
+		super();
+		Object.assign(this, { rules: rules.map(([pattern, handler]) => {
+
+			const wrapped_handler = handler;	//TODO
+			const predicate = ((str) => str.match(pattern));
+
+			return [predicate, wrapped_handler];
+		})});
+	}
+
+
+}
 
 export class Mapping_Resolver extends Abstract_Resolver {
 	constructor(rules=new Map(), key_function=null) {

source/text/basic-tree.mjs

@@ -1,19 +1,36 @@
 import { string_has_contents, indented_line_iterator } from  '@efforting.tech/data/string-utilities';
+import * as CF from '@efforting.tech/data/field-configuration-factories';
+import { Text_Settings } from  '@efforting.tech/data/string-utilities';
 
-export class Text_Node {
-	constructor(text_settings, line=undefined, indent=0, line_no=undefined, index=undefined, raw=undefined, parent=undefined) {
-		Object.assign(this, { text_settings, line, indent, line_no, index, raw, parent, children: [] });
+export const Text_Tree_Settings = new CF.Schema({
+	//BUG - there is currently no way (I think) to put defaults into a sub schema - this should be fixed
+	text: Text_Settings,
+	trim_head: CF.boolean(false, 'Trim the empty lines from the head of a node'),
+	trim_tail: CF.boolean(false, 'Trim the empty lines from the tail of a node'),
+	trim_lines: CF.boolean(false, 'Trim lines'),
+}, 'Text tree settings');
+
+
+export class Text_Tree_Node {
+	constructor(text_tree_settings, line=undefined, indent=0, line_no=undefined, index=undefined, raw=undefined, parent=undefined) {
+		Object.assign(this, { text_tree_settings, line, indent, line_no, index, raw, parent, children: [] });
 	}
 
-	static from_string(text_settings, str) {
+	get has_line() {
+		return string_has_contents(this.line);
+	}
 
-		const root = new this(text_settings);
+
+	static from_string(text_tree_settings, str) {
+
+		const root = new this(text_tree_settings);
+		const { trim_head, trim_tail, trim_lines } = text_tree_settings;
 
 		// NOTE: This first Text_Node is not added to the tree, it serves as an initial cursor only.
-		let current = new this(root.text_settings, undefined, 0, undefined, undefined, undefined, root);
+		let current = new this(root.text_tree_settings, undefined, 0, undefined, undefined, undefined, root);
 
 
-		for (const line_info of indented_line_iterator(text_settings, str)) {
+		for (const line_info of indented_line_iterator(text_tree_settings.text, str)) {
 
 			// TODO: Implement other variants than inherit-from-previous
 			const indent = string_has_contents(line_info.line) ? line_info.indent : current.indent;
@@ -21,14 +38,14 @@ export class Text_Node {
 			const delta_indent = indent - current.indent;
 
 			if (delta_indent == 0) {
-				const pending = new Text_Node(current.text_settings, undefined, current.indent, undefined, undefined, undefined, current.parent);	// Partial insertion - same level
+				const pending = new this(current.text_tree_settings, undefined, current.indent, undefined, undefined, undefined, current.parent);	// Partial insertion - same level
 				if (current.parent) {
 					current.parent.children.push(pending);
 				}
 				current = pending;
 			} else if (delta_indent > 0) {
 				for (let i=0; i<delta_indent; i++) {
-					const pending = new Text_Node(current.text_settings, undefined, current.indent + 1, undefined, undefined, undefined, current);	// Partial insertion
+					const pending = new this(current.text_tree_settings, undefined, current.indent + 1, undefined, undefined, undefined, current);	// Partial insertion
 					current.children.push(pending);
 					current = pending;
 				}
@@ -37,7 +54,7 @@ export class Text_Node {
 					current = current.parent;
 				}
 
-				const pending = new Text_Node(current.text_settings, undefined, current.indent, undefined, undefined, undefined, current.parent);	// Partial insertion - same level
+				const pending = new this(current.text_tree_settings, undefined, current.indent, undefined, undefined, undefined, current.parent);	// Partial insertion - same level
 				if (current.parent) {
 					current.parent.children.push(pending);
 				}
@@ -46,7 +63,7 @@ export class Text_Node {
 
 			// Fill in partial insertion
 			Object.assign(current, {
-				line: line_info.line,
+				line: trim_lines ? line_info.line.trim() : line_info.line,
 				line_no: line_info.line_no,
 				index: line_info.index,
 				raw: line_info.raw,
@@ -54,6 +71,12 @@ export class Text_Node {
 
 
 		}
+
+
+		if (trim_head || trim_tail) {	//TODO: Implement
+			throw new Error('Trimming is not implemented');	//TODO: Proper non implemented error
+		}
+
 		return root;
 
 	}