@jdeighan/coffee-utils 8.0.2 → 8.0.5

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "8.0.2",
+	"version": "8.0.5",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -19,6 +19,8 @@
 		"./store": "./src/DataStores.js",
 		"./taml": "./src/taml.js",
 		"./placeholders": "./src/placeholders.js",
+		"./section": "./src/Section.js",
+		"./sectionmap": "./src/SectionMap.js",
 		"./package.json": "./package.json"
 	},
 	"engines": {
@@ -53,6 +55,6 @@
 		"svelte": "^3.48.0"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^2.0.8"
+		"@jdeighan/unit-tester": "^2.0.9"
 	}
 }

package/src/Section.coffee

@@ -0,0 +1,69 @@
+# Section.coffee
+
+import {
+	assert, pass, undef, defined, croak, isArray,
+	} from '@jdeighan/coffee-utils'
+import {arrayToBlock} from '@jdeighan/coffee-utils/block'
+import {indented} from '@jdeighan/coffee-utils/indent'
+
+# ---------------------------------------------------------------------------
+
+export class Section
+
+	constructor: (@name) ->
+
+		@lLines = []
+
+	# ..........................................................
+
+	length: () ->
+
+		return @lLines.length
+
+	# ..........................................................
+
+	indent: (level=1) ->
+
+		lNewLines = for line in @lLines
+			indented(line, level)
+		@lLines = lNewLines
+		return
+
+	# ..........................................................
+
+	isEmpty: () ->
+
+		return (@lLines.length == 0)
+
+	# ..........................................................
+
+	nonEmpty: () ->
+
+		return (@lLines.length > 0)
+
+	# ..........................................................
+
+	add: (data) ->
+
+		if isArray(data)
+			for line in data
+				@lLines.push line
+		else
+			@lLines.push data
+		return
+
+	# ..........................................................
+
+	prepend: (data) ->
+
+		if isArray(data)
+			@lLines = [data..., @lLines...]
+		else
+			@lLines = [data, @lLines...]
+		return
+
+	# ..........................................................
+
+	getBlock: () ->
+
+		return arrayToBlock(@lLines)

package/src/Section.js

@@ -0,0 +1,85 @@
+// Generated by CoffeeScript 2.7.0
+  // Section.coffee
+import {
+  assert,
+  pass,
+  undef,
+  defined,
+  croak,
+  isArray
+} from '@jdeighan/coffee-utils';
+
+import {
+  arrayToBlock
+} from '@jdeighan/coffee-utils/block';
+
+import {
+  indented
+} from '@jdeighan/coffee-utils/indent';
+
+// ---------------------------------------------------------------------------
+export var Section = class Section {
+  constructor(name) {
+    this.name = name;
+    this.lLines = [];
+  }
+
+  // ..........................................................
+  length() {
+    return this.lLines.length;
+  }
+
+  // ..........................................................
+  indent(level = 1) {
+    var lNewLines, line;
+    lNewLines = (function() {
+      var i, len, ref, results;
+      ref = this.lLines;
+      results = [];
+      for (i = 0, len = ref.length; i < len; i++) {
+        line = ref[i];
+        results.push(indented(line, level));
+      }
+      return results;
+    }).call(this);
+    this.lLines = lNewLines;
+  }
+
+  // ..........................................................
+  isEmpty() {
+    return this.lLines.length === 0;
+  }
+
+  // ..........................................................
+  nonEmpty() {
+    return this.lLines.length > 0;
+  }
+
+  // ..........................................................
+  add(data) {
+    var i, len, line;
+    if (isArray(data)) {
+      for (i = 0, len = data.length; i < len; i++) {
+        line = data[i];
+        this.lLines.push(line);
+      }
+    } else {
+      this.lLines.push(data);
+    }
+  }
+
+  // ..........................................................
+  prepend(data) {
+    if (isArray(data)) {
+      this.lLines = [...data, ...this.lLines];
+    } else {
+      this.lLines = [data, ...this.lLines];
+    }
+  }
+
+  // ..........................................................
+  getBlock() {
+    return arrayToBlock(this.lLines);
+  }
+
+};

package/src/SectionMap.coffee

@@ -0,0 +1,221 @@
+# SectionMap.coffee
+
+import {
+	assert, pass, undef, defined, croak, OL, isEmpty, nonEmpty,
+	isString, isHash, isArray, isUniqueTree, isNonEmptyString,
+	} from '@jdeighan/coffee-utils'
+import {arrayToBlock} from '@jdeighan/coffee-utils/block'
+import {indented} from '@jdeighan/coffee-utils/indent'
+import {debug} from '@jdeighan/coffee-utils/debug'
+import {Section} from '@jdeighan/coffee-utils/section'
+
+# ---------------------------------------------------------------------------
+
+isSectionName = (name) ->
+
+	return isString(name) && name.match(/^[a-z][a-z0-9]*/)
+
+# ---------------------------------------------------------------------------
+
+isSetName = (name) ->
+
+	return isString(name) && name.match(/^[A-Z][a-z0-9]*/)
+
+# ---------------------------------------------------------------------------
+
+export class SectionMap
+
+	constructor: (lSectionTree) ->
+		# --- lSectionTree is a tree of section names
+
+		debug "enter SectionMap()", lSectionTree
+		@lSectionTree = lSectionTree   # a tree of section names
+		@hSets = {}
+		@hSections = {}
+		@addSections lSectionTree
+		debug "return from SectionMap()", @hSections
+
+	# ..........................................................
+
+	addSections: (desc) ->
+		# --- returns a flat array of sections that were added
+
+		if isString(desc)
+			assert nonEmpty(desc), "empty section name"
+			assert isSectionName(desc), "bad section name #{OL(desc)}"
+			assert (@hSections[desc] == undef), "duplicate section #{OL(desc)}"
+			@hSections[desc] = new Section(desc)
+			return [desc]
+		else
+			assert isArray(desc), "not an array or string #{OL(desc)}"
+			name = undef
+			lParts = []
+			for item,i in desc
+				if (i==0) && isSetName(item)
+					name = item
+				else
+					lAdded = @addSections item
+					for item in lAdded
+						lParts.push item
+			if defined(name)
+				@addSet name, lParts
+			return lParts
+		return
+
+	# ..........................................................
+
+	addSet: (name, lSectionTree) ->
+
+		debug "enter addSet()", name, lSectionTree
+
+		# --- check the name
+		assert isSetName(name), "not a valid set name #{OL(name)}"
+
+		# --- check lSectionTree
+		assert isArray(lSectionTree), "arg 2 not an array"
+		for secName in lSectionTree
+			assert isNonEmptyString(secName),
+					"not a non-empty string #{OL(secName)}"
+			assert defined(@hSections[secName]),
+					"not a section name #{OL(secName)}"
+
+		@hSets[name] = lSectionTree
+		debug 'hSets', @hSets
+		debug "return from addSet()"
+		return
+
+	# ..........................................................
+	# --- sections returned in depth-first order from section tree
+	#     Set names are simply skipped
+	#     yields: [<level>, <section>]
+
+	allSections: (desc=undef, level=0) ->
+
+		debug "enter allSections()", desc, level
+		if (desc == undef)
+			desc = @lSectionTree
+		if isArray(desc)
+			for item in desc
+				if isSectionName(item)
+					result = [level, @section(item)]
+					debug 'yield', result
+					yield result
+				else if isSetName(item)
+					pass
+				else
+					assert isArray(item), "not an array #{OL(item)}"
+					yield from @allSections(item, level+1)
+		else if isSectionName(desc)
+			result = [level, @section(desc)]
+			debug 'yield', result
+			yield result
+		else if isSetName(desc)
+			lTree = @hSets[desc]
+			assert defined(lTree), "Not a Set: #{OL(desc)}"
+			yield from @allSections(lTree, level)
+		else
+			croak "Bad item: #{OL(desc)}"
+		debug "return from allSections()"
+		return
+
+	# ..........................................................
+
+	getBlock: () ->
+
+		debug "enter getBlock()"
+		lParts = []
+		for [_, sect] from @allSections()
+			if sect.nonEmpty()
+				lParts.push sect.getBlock()
+		debug 'lParts', lParts
+		result = arrayToBlock(lParts)
+		debug "return from getBlock()", result
+		return result
+
+	# ..........................................................
+
+	section: (name) ->
+
+		sect = @hSections[name]
+		assert defined(sect), "No section named #{OL(name)}"
+		return sect
+
+	# ..........................................................
+
+	firstSection: (name) ->
+
+		assert isSetName(name), "bad set name #{OL(name)}"
+		lSectionTree = @hSets[name]
+		assert defined(lSectionTree), "no such set #{OL(name)}"
+		assert nonEmpty(lSectionTree), "empty section #{OL(name)}"
+		return @section(lSectionTree[0])
+
+	# ..........................................................
+
+	lastSection: (name) ->
+
+		assert isSetName(name), "bad set name #{OL(name)}"
+		lSectionTree = @hSets[name]
+		assert defined(lSectionTree), "no such set #{OL(name)}"
+		assert nonEmpty(lSectionTree), "empty section #{OL(name)}"
+		return @section(lSectionTree[lSectionTree.length - 1])
+
+	# ..........................................................
+
+	length: (desc=undef) ->
+
+		result = 0
+		for [_, sect] from @allSections(desc)
+			result += sect.length()
+		return result
+
+	# ..........................................................
+
+	isEmpty: (desc=undef) ->
+
+		return (@length(desc) == 0)
+
+	# ..........................................................
+
+	nonEmpty: (desc=undef) ->
+
+		return (@length(desc) > 0)
+
+	# ..........................................................
+
+	indent: (desc=undef, level=1) ->
+
+		for [_, sect] from @allSections(desc)
+			sect.indent(level)
+		return
+
+	# ..........................................................
+
+	enclose: (name, pre, post) ->
+
+		if isSectionName(name)
+			sect = @section(name)
+			if sect.nonEmpty()
+				sect.indent()
+				sect.prepend(pre)
+				sect.add(post)
+		else if isSetName(name)
+			if @nonEmpty(name)
+				@indent(name)
+				@firstSection(name).prepend(pre)
+				@lastSection(name).add(post)
+		else
+			croak "Bad name param #{OL(name)}"
+		return
+
+	# ..........................................................
+
+	getShape: () ->
+
+		debug "enter getShape()"
+		lParts = []
+		for [level, sect] from @allSections()
+			lParts.push indented(sect.name, level)
+		result = arrayToBlock(lParts)
+		debug "return from getShape()", result
+		return result

package/src/SectionMap.js

@@ -0,0 +1,262 @@
+// Generated by CoffeeScript 2.7.0
+// SectionMap.coffee
+var isSectionName, isSetName;
+
+import {
+  assert,
+  pass,
+  undef,
+  defined,
+  croak,
+  OL,
+  isEmpty,
+  nonEmpty,
+  isString,
+  isHash,
+  isArray,
+  isUniqueTree,
+  isNonEmptyString
+} from '@jdeighan/coffee-utils';
+
+import {
+  arrayToBlock
+} from '@jdeighan/coffee-utils/block';
+
+import {
+  indented
+} from '@jdeighan/coffee-utils/indent';
+
+import {
+  debug
+} from '@jdeighan/coffee-utils/debug';
+
+import {
+  Section
+} from '@jdeighan/coffee-utils/section';
+
+// ---------------------------------------------------------------------------
+isSectionName = function(name) {
+  return isString(name) && name.match(/^[a-z][a-z0-9]*/);
+};
+
+// ---------------------------------------------------------------------------
+isSetName = function(name) {
+  return isString(name) && name.match(/^[A-Z][a-z0-9]*/);
+};
+
+// ---------------------------------------------------------------------------
+export var SectionMap = class SectionMap {
+  constructor(lSectionTree) {
+    // --- lSectionTree is a tree of section names
+    debug("enter SectionMap()", lSectionTree);
+    this.lSectionTree = lSectionTree; // a tree of section names
+    this.hSets = {};
+    this.hSections = {};
+    this.addSections(lSectionTree);
+    debug("return from SectionMap()", this.hSections);
+  }
+
+  // ..........................................................
+  addSections(desc) {
+    var i, item, j, k, lAdded, lParts, len, len1, name;
+    // --- returns a flat array of sections that were added
+    if (isString(desc)) {
+      assert(nonEmpty(desc), "empty section name");
+      assert(isSectionName(desc), `bad section name ${OL(desc)}`);
+      assert(this.hSections[desc] === undef, `duplicate section ${OL(desc)}`);
+      this.hSections[desc] = new Section(desc);
+      return [desc];
+    } else {
+      assert(isArray(desc), `not an array or string ${OL(desc)}`);
+      name = undef;
+      lParts = [];
+      for (i = j = 0, len = desc.length; j < len; i = ++j) {
+        item = desc[i];
+        if ((i === 0) && isSetName(item)) {
+          name = item;
+        } else {
+          lAdded = this.addSections(item);
+          for (k = 0, len1 = lAdded.length; k < len1; k++) {
+            item = lAdded[k];
+            lParts.push(item);
+          }
+        }
+      }
+      if (defined(name)) {
+        this.addSet(name, lParts);
+      }
+      return lParts;
+    }
+  }
+
+  // ..........................................................
+  addSet(name, lSectionTree) {
+    var j, len, secName;
+    debug("enter addSet()", name, lSectionTree);
+    // --- check the name
+    assert(isSetName(name), `not a valid set name ${OL(name)}`);
+    // --- check lSectionTree
+    assert(isArray(lSectionTree), "arg 2 not an array");
+    for (j = 0, len = lSectionTree.length; j < len; j++) {
+      secName = lSectionTree[j];
+      assert(isNonEmptyString(secName), `not a non-empty string ${OL(secName)}`);
+      assert(defined(this.hSections[secName]), `not a section name ${OL(secName)}`);
+    }
+    this.hSets[name] = lSectionTree;
+    debug('hSets', this.hSets);
+    debug("return from addSet()");
+  }
+
+  // ..........................................................
+  // --- sections returned in depth-first order from section tree
+  //     Set names are simply skipped
+  //     yields: [<level>, <section>]
+  * allSections(desc = undef, level = 0) {
+    var item, j, lTree, len, result;
+    debug("enter allSections()", desc, level);
+    if (desc === undef) {
+      desc = this.lSectionTree;
+    }
+    if (isArray(desc)) {
+      for (j = 0, len = desc.length; j < len; j++) {
+        item = desc[j];
+        if (isSectionName(item)) {
+          result = [level, this.section(item)];
+          debug('yield', result);
+          yield result;
+        } else if (isSetName(item)) {
+          pass;
+        } else {
+          assert(isArray(item), `not an array ${OL(item)}`);
+          yield* this.allSections(item, level + 1);
+        }
+      }
+    } else if (isSectionName(desc)) {
+      result = [level, this.section(desc)];
+      debug('yield', result);
+      yield result;
+    } else if (isSetName(desc)) {
+      lTree = this.hSets[desc];
+      assert(defined(lTree), `Not a Set: ${OL(desc)}`);
+      yield* this.allSections(lTree, level);
+    } else {
+      croak(`Bad item: ${OL(desc)}`);
+    }
+    debug("return from allSections()");
+  }
+
+  // ..........................................................
+  getBlock() {
+    var _, lParts, ref, result, sect, x;
+    debug("enter getBlock()");
+    lParts = [];
+    ref = this.allSections();
+    for (x of ref) {
+      [_, sect] = x;
+      if (sect.nonEmpty()) {
+        lParts.push(sect.getBlock());
+      }
+    }
+    debug('lParts', lParts);
+    result = arrayToBlock(lParts);
+    debug("return from getBlock()", result);
+    return result;
+  }
+
+  // ..........................................................
+  section(name) {
+    var sect;
+    sect = this.hSections[name];
+    assert(defined(sect), `No section named ${OL(name)}`);
+    return sect;
+  }
+
+  // ..........................................................
+  firstSection(name) {
+    var lSectionTree;
+    assert(isSetName(name), `bad set name ${OL(name)}`);
+    lSectionTree = this.hSets[name];
+    assert(defined(lSectionTree), `no such set ${OL(name)}`);
+    assert(nonEmpty(lSectionTree), `empty section ${OL(name)}`);
+    return this.section(lSectionTree[0]);
+  }
+
+  // ..........................................................
+  lastSection(name) {
+    var lSectionTree;
+    assert(isSetName(name), `bad set name ${OL(name)}`);
+    lSectionTree = this.hSets[name];
+    assert(defined(lSectionTree), `no such set ${OL(name)}`);
+    assert(nonEmpty(lSectionTree), `empty section ${OL(name)}`);
+    return this.section(lSectionTree[lSectionTree.length - 1]);
+  }
+
+  // ..........................................................
+  length(desc = undef) {
+    var _, ref, result, sect, x;
+    result = 0;
+    ref = this.allSections(desc);
+    for (x of ref) {
+      [_, sect] = x;
+      result += sect.length();
+    }
+    return result;
+  }
+
+  // ..........................................................
+  isEmpty(desc = undef) {
+    return this.length(desc) === 0;
+  }
+
+  // ..........................................................
+  nonEmpty(desc = undef) {
+    return this.length(desc) > 0;
+  }
+
+  // ..........................................................
+  indent(desc = undef, level = 1) {
+    var _, ref, sect, x;
+    ref = this.allSections(desc);
+    for (x of ref) {
+      [_, sect] = x;
+      sect.indent(level);
+    }
+  }
+
+  // ..........................................................
+  enclose(name, pre, post) {
+    var sect;
+    if (isSectionName(name)) {
+      sect = this.section(name);
+      if (sect.nonEmpty()) {
+        sect.indent();
+        sect.prepend(pre);
+        sect.add(post);
+      }
+    } else if (isSetName(name)) {
+      if (this.nonEmpty(name)) {
+        this.indent(name);
+        this.firstSection(name).prepend(pre);
+        this.lastSection(name).add(post);
+      }
+    } else {
+      croak(`Bad name param ${OL(name)}`);
+    }
+  }
+
+  // ..........................................................
+  getShape() {
+    var lParts, level, ref, result, sect, x;
+    debug("enter getShape()");
+    lParts = [];
+    ref = this.allSections();
+    for (x of ref) {
+      [level, sect] = x;
+      lParts.push(indented(sect.name, level));
+    }
+    result = arrayToBlock(lParts);
+    debug("return from getShape()", result);
+    return result;
+  }
+
+};

package/src/block_utils.coffee

@@ -30,19 +30,31 @@ export blockToArray = (block) ->
 export arrayToBlock = (lLines) ->
 
 	if (lLines == undef)
-		return ''
+		return undef
 	assert isArray(lLines), "lLines is not an array"
 	lLines = lLines.filter((line) => defined(line));
 	if lLines.length == 0
-		return ''
+		return undef
 	else
 		return rtrim(lLines.join('\n'))
 
 # ---------------------------------------------------------------------------
 
+export splitBlock = (block) ->
+
+	assert isString(block), "not a string"
+	pos = block.indexOf('\n')
+	if (pos == -1)
+		return [block, undef]
+	else
+		return [block.substring(0, pos), block.substring(pos+1)]
+
+
+# ---------------------------------------------------------------------------
+
 export firstLine = (block) ->
 
-	assert isString(block), "firstLine(): string expected"
+	assert isString(block), "not a string"
 	pos = block.indexOf('\n')
 	if (pos == -1)
 		return block
@@ -53,10 +65,10 @@ export firstLine = (block) ->
 
 export remainingLines = (block) ->
 
-	assert isString(block), "remainingLines(): string expected"
+	assert isString(block), "not a string"
 	pos = block.indexOf('\n')
 	if (pos == -1)
-		return ''
+		return undef
 	else
 		return block.substring(pos+1)
 

package/src/block_utils.js

@@ -38,23 +38,35 @@ export var blockToArray = function(block) {
 //   arrayToBlock - block will have no trailing whitespace
 export var arrayToBlock = function(lLines) {
   if (lLines === undef) {
-    return '';
+    return undef;
   }
   assert(isArray(lLines), "lLines is not an array");
   lLines = lLines.filter((line) => {
     return defined(line);
   });
   if (lLines.length === 0) {
-    return '';
+    return undef;
   } else {
     return rtrim(lLines.join('\n'));
   }
 };
 
+// ---------------------------------------------------------------------------
+export var splitBlock = function(block) {
+  var pos;
+  assert(isString(block), "not a string");
+  pos = block.indexOf('\n');
+  if (pos === -1) {
+    return [block, undef];
+  } else {
+    return [block.substring(0, pos), block.substring(pos + 1)];
+  }
+};
+
 // ---------------------------------------------------------------------------
 export var firstLine = function(block) {
   var pos;
-  assert(isString(block), "firstLine(): string expected");
+  assert(isString(block), "not a string");
   pos = block.indexOf('\n');
   if (pos === -1) {
     return block;
@@ -66,10 +78,10 @@ export var firstLine = function(block) {
 // ---------------------------------------------------------------------------
 export var remainingLines = function(block) {
   var pos;
-  assert(isString(block), "remainingLines(): string expected");
+  assert(isString(block), "not a string");
   pos = block.indexOf('\n');
   if (pos === -1) {
-    return '';
+    return undef;
   } else {
     return block.substring(pos + 1);
   }