Adjusted publishing for switch to npm

experiments/config2.mjs

@@ -2,8 +2,9 @@ import * as F from '@efforting.tech/data/field-configuration-factories';
 
 const s = new F.Schema({
 	foo: F.value(123, 'The value'),
-	bar: F.factory((t) => `Field ${t.field_name} was not set`, 'The factory'),
+	bar: F.factory((t) => `Field ${t.name} was not set`, 'The factory'),
-});
+	rq: F.required('Anything. Just not nothing.'),
+}, 'Some schema');
 
 
 console.log(s.load()) // { foo: 123, bar: 'Field bar was not set' }

experiments/package.json

@@ -1,9 +0,0 @@
-{
-	"name": "experiments",
-	"type": "module",
-	"dependencies": {
-		"@efforting.tech/errors": "link:../build/packages/errors",
-		"@efforting.tech/rule-processing": "link:../build/packages/rule-processing",
-		"@efforting.tech/data": "link:../build/packages/data"
-	}
-}

experiments/text-nodes.mjs

@@ -0,0 +1,157 @@
+import * as CF from '@efforting.tech/data/field-configuration-factories';
+
+import { readFileSync } from 'node:fs';
+import { inspect } from 'node:util';
+
+import { Indention_Mode, Text_Settings } from '@efforting.tech/text/basic-tree';
+
+// TODO: Move into string helper module
+function string_has_contents(str) {
+	return /\S/.test(str);
+}
+
+function *indented_line_iterator(settings, text) {
+
+	let line_no = settings.first_line;
+	let index = 0;
+	const { indention_tabulator_width } = settings;
+
+	switch (settings.indention_mode) {
+		case Indention_Mode.symbols.TABULATORS: {
+			for (const line of text.matchAll(/^(\t*)(.*)$/gm)) {
+				const [raw, tabs, remaining] = line;
+				yield { raw, indent: tabs.length, line: remaining, line_no: line_no++, index: index++};
+			}
+			break;
+		}
+		case Indention_Mode.symbols.SPACES: {
+			for (const line of text.matchAll(/^([ ]*)(.*)$/gm)) {
+				const [raw, spaces, remaining] = line;
+
+				if ((spaces.length % indention_tabulator_width) !== 0) {
+					throw new Error('Unaligned indention');	//TODO - proper error
+				}
+				yield { raw, indent: Math.floor(spaces.length / indention_tabulator_width), line: remaining, line_no: line_no++, index: index++};
+			}
+			break;
+		}
+		default:
+			throw new Error('Unsupported indention mode');	//TODO - proper error
+
+	}
+
+
+}
+
+
+const ts = Text_Settings.load({
+	indention_mode: 'TABULATORS',
+});
+
+const example_string =
+`branch1
+	leaf1
+	leaf2
+
+branch2
+	sub-branch1
+		leaf3
+		leaf4
+
+
+	sub-branch2
+		leaf5
+
+branch3
+		dual-indented
+
+`;
+
+
+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: [] });
+	}
+}
+
+
+const root = new Text_Node(ts);
+
+// NOTE: This first Text_Node is not added to the tree, it serves as an initial cursor only.
+let current = new Text_Node(root.text_settings, undefined, 0, undefined, undefined, undefined, root);
+
+
+for (const line_info of indented_line_iterator(ts, example_string)) {
+
+	// TODO: Implement other variants than inherit-from-previous
+	const indent = string_has_contents(line_info.line) ? line_info.indent : current.indent;
+
+	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
+		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
+			current.children.push(pending);
+			current = pending;
+		}
+	} else {
+		for (let i=0; i>delta_indent; i--) {
+			current = current.parent;
+		}
+
+		const pending = new Text_Node(current.text_settings, undefined, current.indent, undefined, undefined, undefined, current.parent);	// Partial insertion - same level
+		if (current.parent) {
+			current.parent.children.push(pending);
+		}
+		current = pending;
+	}
+
+	// Fill in partial insertion
+	Object.assign(current, {
+		line: line_info.line,
+		line_no: line_info.line_no,
+		index: line_info.index,
+		raw: line_info.raw,
+	});
+
+
+}
+
+
+function debug_dump(node, level=0) {
+	console.log(`${"  ".repeat(level)}[${node.line_no ?? '-'}] ${inspect(node.line)}`);
+	for (const child of node.children) {
+		debug_dump(child, level+1);
+	}
+}
+
+debug_dump(root);
+/*
+
+[-] undefined
+  [1] 'branch1'
+    [2] 'leaf1'
+    [3] 'leaf2'
+    [4] ''
+  [5] 'branch2'
+    [6] 'sub-branch1'
+      [7] 'leaf3'
+      [8] 'leaf4'
+      [9] ''
+      [10] ''
+    [11] 'sub-branch2'
+      [12] 'leaf5'
+      [13] ''
+  [14] 'branch3'
+    [-] undefined
+      [15] 'dual-indented'
+      [16] ''
+      [17] ''
+
+*/

package-manifest.yaml

@@ -1,6 +1,6 @@
 scope: '@efforting.tech'
 registry: 'https://npm.efforting.tech/'
-version: 0.2.6
+version: 0.2.8
 
 author:
   name: 'Mikael Lövqvist'
@@ -23,11 +23,18 @@ packages:
 
   data:
     path: source/data
-    #documentation: documentation/data
+    documentation: documentation/data
     description: Data management
     internal-dependencies:
       - errors
 
+  text:
+    path: source/text
+    #documentation: documentation/text
+    description: Text management
+    internal-dependencies:
+      - data
+
 wip-packages:
   object-graph-storage:
     path: source/object-graph-storage

package.json

@@ -1,5 +0,0 @@
-{
-	"dependencies": {
-		"experiments": "^0.3.0"
-	}
-}

source/data/field-configuration-factories.mjs

@@ -26,3 +26,33 @@ export function required(description) {
 export function typed_required(coercion_function, description) {
 	return new Field_Configuration((value) => value !== undefined, coercion_function, null, description);
 }
+
+export function symbol_set(description_to_name_mapping, description=null) {
+
+	const symbols_by_name = Object.fromEntries(Object.keys(description_to_name_mapping).map(k => [k, Symbol(k)]));
+	const valid_symbols = new Set(Object.values(symbols_by_name));
+
+	const descriptions_by_symbol = Object.fromEntries(Object.entries(symbols_by_name).map(([n, s]) => [s, description_to_name_mapping[n]]));
+
+	const result = new Field_Configuration(
+		(v) => valid_symbols.has(v),
+		(v) => typeof v === 'string' ? symbols_by_name[v] : v,	// TODO: Assert that we could look up the symbol
+		null,
+		description,
+	);
+
+	// HACK: We are just tacking these on here but the proper method would be to create a proper subclass for the symbol set field type which is planned.
+	result.symbols = symbols_by_name;
+	result.symbol_descriptions = descriptions_by_symbol;
+
+	return result;
+
+}
+
+export function cardinal_value(default_value=null, description=null) {
+	return new Field_Configuration((v) => Number.isInteger(v) && v >= 1, parseInt, () => default_value, description);
+}
+
+export function natural_value(default_value=null, description=null) {
+	return new Field_Configuration((v) => Number.isInteger(v) && v >= 0, parseInt, () => default_value, description);
+}

source/text/basic-tree.mjs

@@ -0,0 +1,16 @@
+import * as CF from '@efforting.tech/data/field-configuration-factories';
+
+
+export const Indention_Mode = new CF.symbol_set({
+	AUTO: 'Automatic detection of indention mode',
+	SPACES: 'Indention is based on spaces',
+	TABULATORS: 'Indention is based on tabulators',
+}, 'Indention mode');
+
+
+// BUG: Current implementation of CF.symbol_set doesn't support default value
+export const Text_Settings = new CF.Schema({
+	indention_mode: Indention_Mode,
+	indention_tabulator_width: CF.cardinal_value(4, 'Width of a tabulator in spaces'),
+	first_line: CF.natural_value(1, 'First line number'),
+}, 'Text settings');

tools/stage-for-pnpm.mjs

@@ -52,9 +52,7 @@ function link_tree(src, dest) {
 	}
 }
 
-const workspace_manifest = {
+const published_packages = [];
-	packages: [],
-};
 
 const { scope, registry, author, version } = manifest;
 
@@ -62,23 +60,27 @@ const common_package_data = {
 	author,
 	version,
 	type: 'module',
-	publishConfig: {
-		registry
-	},
 };
 
 const root_package = {
-	name: path.join(scope, 'root'),
+	name: path.join(scope, '_root'),
 	dependencies: {},
+	private: true,
 	...common_package_data,
 };
 
+const local_dev_package = {
+	name: path.join(scope, '_dev'),
+	dependencies: {},
+	private: true,
+	...common_package_data,
+};
 
 for (const [package_name, package_data] of Object.entries(manifest.packages)) {
 	const pkg = { name: package_name, ...package_data };
 
 	const pkg_scope_path = path.join(scope, pkg.name);
-	workspace_manifest.packages.push(pkg.name);
+	published_packages.push(pkg.name);
 
 	const pkg_dir = path.join(output_directory, pkg.name);
 	const linked_sources = link_tree(pkg.path, pkg_dir).map(p => path.relative(pkg_dir, p));
@@ -116,20 +118,26 @@ for (const [package_name, package_data] of Object.entries(manifest.packages)) {
 	writeFileSync(path.join(pkg_dir, 'package.json'), pkg_json, 'utf-8');
 	//console.log({linked_sources});	// ['errors.mjs']
 
-	root_package.dependencies[pkg_scope_path] = version;
 
 }
 
-const root_pkg_json = JSON.stringify(root_package, null, '    ');
-writeFileSync(path.join(output_directory, 'package.json'), root_pkg_json, 'utf-8');
 
-writeFileSync(path.join(output_directory, 'pnpm-workspace.yaml'), format_yaml(workspace_manifest), 'utf-8');
 
-const publish_tool = 'pnpm publish --no-git-checks';
+//const publish_tool = 'pnpm publish --no-git-checks';
-const publish_script_lines = workspace_manifest.packages.map(
+const publish_tool = `npm publish --registry "${registry}"`;
-	pkg => `${publish_tool} ${pkg}`
+const publish_script_lines = published_packages.map(
+	pkg => `${publish_tool} ./${pkg}`
 );
 
+const dev_stage_script_lines = published_packages.map(
+	pkg => `ln -sf "${path.resolve(output_directory, pkg)}" "${path.resolve(output_directory, 'node_modules', path.join(scope, pkg))}"`
+);
+
+const dev_stage_mkdir_lines = [...new Set(published_packages.map(
+	pkg => `mkdir -p "${path.dirname(path.resolve(output_directory, 'node_modules', path.join(scope, pkg)))}"`
+))];
+
+
 
 const publish_script = (
 	'#!/usr/bin/env bash\n' +
@@ -137,8 +145,19 @@ const publish_script = (
 	`${publish_script_lines.join('\n')}\n`
 );
 
+const dev_stage_script = (
+	'#!/usr/bin/env bash\n' +
+	'set -e\n' +
+	`${dev_stage_mkdir_lines.join('\n')}\n` +
+	`${dev_stage_script_lines.join('\n')}\n`
+);
+
+
 const publish_script_path = path.join(output_directory, 'publish-all.sh');
+const dev_stage_script_path = path.join(output_directory, 'local-install.sh');
 writeFileSync(publish_script_path, publish_script, 'utf-8');
+writeFileSync(dev_stage_script_path, dev_stage_script, 'utf-8');
 chmodSync(publish_script_path, 0o755);
+chmodSync(dev_stage_script_path, 0o755);