@jdeighan/coffee-utils 8.0.5 → 8.0.8

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "8.0.5",
+	"version": "8.0.8",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {

package/src/Section.coffee

@@ -12,34 +12,34 @@ export class Section
 
 	constructor: (@name) ->
 
-		@lLines = []
+		@lParts = []
 
 	# ..........................................................
 
 	length: () ->
 
-		return @lLines.length
+		return @lParts.length
 
 	# ..........................................................
 
 	indent: (level=1) ->
 
-		lNewLines = for line in @lLines
+		lNewLines = for line in @lParts
 			indented(line, level)
-		@lLines = lNewLines
+		@lParts = lNewLines
 		return
 
 	# ..........................................................
 
 	isEmpty: () ->
 
-		return (@lLines.length == 0)
+		return (@lParts.length == 0)
 
 	# ..........................................................
 
 	nonEmpty: () ->
 
-		return (@lLines.length > 0)
+		return (@lParts.length > 0)
 
 	# ..........................................................
 
@@ -47,9 +47,9 @@ export class Section
 
 		if isArray(data)
 			for line in data
-				@lLines.push line
+				@lParts.push line
 		else
-			@lLines.push data
+			@lParts.push data
 		return
 
 	# ..........................................................
@@ -57,13 +57,22 @@ export class Section
 	prepend: (data) ->
 
 		if isArray(data)
-			@lLines = [data..., @lLines...]
+			@lParts = [data..., @lParts...]
 		else
-			@lLines = [data, @lLines...]
+			@lParts = [data, @lParts...]
 		return
 
 	# ..........................................................
 
+	getParts: () ->
+
+		return @lParts
+
+	# ..........................................................
+
 	getBlock: () ->
 
-		return arrayToBlock(@lLines)
+		if (@lParts.length == 0)
+			return undef
+		else
+			return arrayToBlock(@lParts)

package/src/Section.js

@@ -21,12 +21,12 @@ import {
 export var Section = class Section {
   constructor(name) {
     this.name = name;
-    this.lLines = [];
+    this.lParts = [];
   }
 
   // ..........................................................
   length() {
-    return this.lLines.length;
+    return this.lParts.length;
   }
 
   // ..........................................................
@@ -34,7 +34,7 @@ export var Section = class Section {
     var lNewLines, line;
     lNewLines = (function() {
       var i, len, ref, results;
-      ref = this.lLines;
+      ref = this.lParts;
       results = [];
       for (i = 0, len = ref.length; i < len; i++) {
         line = ref[i];
@@ -42,17 +42,17 @@ export var Section = class Section {
       }
       return results;
     }).call(this);
-    this.lLines = lNewLines;
+    this.lParts = lNewLines;
   }
 
   // ..........................................................
   isEmpty() {
-    return this.lLines.length === 0;
+    return this.lParts.length === 0;
   }
 
   // ..........................................................
   nonEmpty() {
-    return this.lLines.length > 0;
+    return this.lParts.length > 0;
   }
 
   // ..........................................................
@@ -61,25 +61,34 @@ export var Section = class Section {
     if (isArray(data)) {
       for (i = 0, len = data.length; i < len; i++) {
         line = data[i];
-        this.lLines.push(line);
+        this.lParts.push(line);
       }
     } else {
-      this.lLines.push(data);
+      this.lParts.push(data);
     }
   }
 
   // ..........................................................
   prepend(data) {
     if (isArray(data)) {
-      this.lLines = [...data, ...this.lLines];
+      this.lParts = [...data, ...this.lParts];
     } else {
-      this.lLines = [data, ...this.lLines];
+      this.lParts = [data, ...this.lParts];
     }
   }
 
+  // ..........................................................
+  getParts() {
+    return this.lParts;
+  }
+
   // ..........................................................
   getBlock() {
-    return arrayToBlock(this.lLines);
+    if (this.lParts.length === 0) {
+      return undef;
+    } else {
+      return arrayToBlock(this.lParts);
+    }
   }
 
 };

package/src/SectionMap.coffee

@@ -3,6 +3,7 @@
 import {
 	assert, pass, undef, defined, croak, OL, isEmpty, nonEmpty,
 	isString, isHash, isArray, isUniqueTree, isNonEmptyString,
+	isNonEmptyArray,
 	} from '@jdeighan/coffee-utils'
 import {arrayToBlock} from '@jdeighan/coffee-utils/block'
 import {indented} from '@jdeighan/coffee-utils/indent'
@@ -119,14 +120,37 @@ export class SectionMap
 		return
 
 	# ..........................................................
+	# --- procFunc should be (name, block) ->
+	#        return processed block
 
-	getBlock: () ->
+	getBlock: (procFunc=undef, lTree=undef) ->
 
 		debug "enter getBlock()"
+		if (lTree == undef)
+			lTree = @lSectionTree
+		else
+			assert isArray(lTree), "not an array #{OL(lTree)}"
+
 		lParts = []
-		for [_, sect] from @allSections()
-			if sect.nonEmpty()
-				lParts.push sect.getBlock()
+		for part in lTree
+			if isString(part)
+				text = @section(part).getBlock()
+				if nonEmpty(text) && defined(procFunc)
+					text = procFunc(part, text)
+			else if isNonEmptyArray(part)
+				if isSectionName(part[0])
+					text = @getBlock(procFunc, part)
+				else if isSetName(part[0])
+					text = @getBlock(procFunc, part.slice(1))
+					if nonEmpty(text) && defined(procFunc)
+						text = procFunc(part[0], text)
+				else
+					croak "Bad part: #{OL(part)}"
+			else
+				croak "Bad part: #{OL(part)}"
+			if defined(text)
+				lParts.push text
+
 		debug 'lParts', lParts
 		result = arrayToBlock(lParts)
 		debug "return from getBlock()", result
@@ -183,33 +207,6 @@ export class SectionMap
 
 	# ..........................................................
 
-	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()"

package/src/SectionMap.js

@@ -15,7 +15,8 @@ import {
   isHash,
   isArray,
   isUniqueTree,
-  isNonEmptyString
+  isNonEmptyString,
+  isNonEmptyArray
 } from '@jdeighan/coffee-utils';
 
 import {
@@ -146,15 +147,40 @@ export var SectionMap = class SectionMap {
   }
 
   // ..........................................................
-  getBlock() {
-    var _, lParts, ref, result, sect, x;
+  // --- procFunc should be (name, block) ->
+  //        return processed block
+  getBlock(procFunc = undef, lTree = undef) {
+    var j, lParts, len, part, result, text;
     debug("enter getBlock()");
+    if (lTree === undef) {
+      lTree = this.lSectionTree;
+    } else {
+      assert(isArray(lTree), `not an array ${OL(lTree)}`);
+    }
     lParts = [];
-    ref = this.allSections();
-    for (x of ref) {
-      [_, sect] = x;
-      if (sect.nonEmpty()) {
-        lParts.push(sect.getBlock());
+    for (j = 0, len = lTree.length; j < len; j++) {
+      part = lTree[j];
+      if (isString(part)) {
+        text = this.section(part).getBlock();
+        if (nonEmpty(text) && defined(procFunc)) {
+          text = procFunc(part, text);
+        }
+      } else if (isNonEmptyArray(part)) {
+        if (isSectionName(part[0])) {
+          text = this.getBlock(procFunc, part);
+        } else if (isSetName(part[0])) {
+          text = this.getBlock(procFunc, part.slice(1));
+          if (nonEmpty(text) && defined(procFunc)) {
+            text = procFunc(part[0], text);
+          }
+        } else {
+          croak(`Bad part: ${OL(part)}`);
+        }
+      } else {
+        croak(`Bad part: ${OL(part)}`);
+      }
+      if (defined(text)) {
+        lParts.push(text);
       }
     }
     debug('lParts', lParts);
@@ -213,37 +239,6 @@ export var SectionMap = class SectionMap {
     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;

package/src/coffee_utils.coffee

@@ -173,6 +173,12 @@ export isArray = (x) ->
 
 # ---------------------------------------------------------------------------
 
+export isNonEmptyArray = (x) ->
+
+	return isArray(x) && (x.length > 0)
+
+# ---------------------------------------------------------------------------
+
 export isHash = (x, lKeys) ->
 
 	if ! x || (getClassName(x) != 'Object')
@@ -186,6 +192,12 @@ export isHash = (x, lKeys) ->
 
 # ---------------------------------------------------------------------------
 
+export isNonEmptyHash = (x) ->
+
+	return isHash(x) && (Object.keys(x).length > 0)
+
+# ---------------------------------------------------------------------------
+
 export hashHasKey = (x, key) ->
 
 	assert isHash(x), "hashHasKey(): not a hash"

package/src/coffee_utils.js

@@ -159,6 +159,11 @@ export var isArray = function(x) {
   return Array.isArray(x);
 };
 
+// ---------------------------------------------------------------------------
+export var isNonEmptyArray = function(x) {
+  return isArray(x) && (x.length > 0);
+};
+
 // ---------------------------------------------------------------------------
 export var isHash = function(x, lKeys) {
   var i, key, len;
@@ -177,6 +182,11 @@ export var isHash = function(x, lKeys) {
   return true;
 };
 
+// ---------------------------------------------------------------------------
+export var isNonEmptyHash = function(x) {
+  return isHash(x) && (Object.keys(x).length > 0);
+};
+
 // ---------------------------------------------------------------------------
 export var hashHasKey = function(x, key) {
   assert(isHash(x), "hashHasKey(): not a hash");

package/src/indent_utils.coffee

@@ -6,6 +6,15 @@ import {
 	} from '@jdeighan/coffee-utils'
 import {arrayToBlock, blockToArray} from '@jdeighan/coffee-utils/block'
 
+# ---------------------------------------------------------------------------
+
+export splitPrefix = (line) ->
+
+	assert isString(line), "non-string #{OL(line)}"
+	line = rtrim(line)
+	lMatches = line.match(/^(\s*)(.*)$/)
+	return [lMatches[1], lMatches[2]]
+
 # ---------------------------------------------------------------------------
 #        NOTE: Currently, only TAB indentation is supported
 # ---------------------------------------------------------------------------
@@ -13,11 +22,8 @@ import {arrayToBlock, blockToArray} from '@jdeighan/coffee-utils/block'
 
 export splitLine = (line) ->
 
-	assert defined(line), "splitLine(): line is undef"
-	assert isString(line), "splitLine(): non-string #{OL(line)}"
-	line = rtrim(line)
-	lMatches = line.match(/^(\s*)(.*)$/)
-	return [lMatches[1].length, lMatches[2]]
+	[prefix, str] = splitPrefix(line)
+	return [indentLevel(prefix), str]
 
 # ---------------------------------------------------------------------------
 #   indentation - return appropriate indentation string for given level
@@ -146,3 +152,10 @@ export tabify = (str, numSpaces=undef) ->
 export untabify = (str, numSpaces=3) ->
 
 	return str.replace(/\t/g, ' '.repeat(numSpaces))
+
+# ---------------------------------------------------------------------------
+#    enclose - indent text, surround with pre and post
+
+export enclose = (text, pre, post) ->
+
+	return pre + "\n" + indented(text) + "\n" + post

package/src/indent_utils.js

@@ -19,17 +19,23 @@ import {
   blockToArray
 } from '@jdeighan/coffee-utils/block';
 
+// ---------------------------------------------------------------------------
+export var splitPrefix = function(line) {
+  var lMatches;
+  assert(isString(line), `non-string ${OL(line)}`);
+  line = rtrim(line);
+  lMatches = line.match(/^(\s*)(.*)$/);
+  return [lMatches[1], lMatches[2]];
+};
+
 // ---------------------------------------------------------------------------
 //        NOTE: Currently, only TAB indentation is supported
 // ---------------------------------------------------------------------------
 //   splitLine - separate a line into [level, line]
 export var splitLine = function(line) {
-  var lMatches;
-  assert(defined(line), "splitLine(): line is undef");
-  assert(isString(line), `splitLine(): non-string ${OL(line)}`);
-  line = rtrim(line);
-  lMatches = line.match(/^(\s*)(.*)$/);
-  return [lMatches[1].length, lMatches[2]];
+  var prefix, str;
+  [prefix, str] = splitPrefix(line);
+  return [indentLevel(prefix), str];
 };
 
 // ---------------------------------------------------------------------------
@@ -175,3 +181,9 @@ export var tabify = function(str, numSpaces = undef) {
 export var untabify = function(str, numSpaces = 3) {
   return str.replace(/\t/g, ' '.repeat(numSpaces));
 };
+
+// ---------------------------------------------------------------------------
+//    enclose - indent text, surround with pre and post
+export var enclose = function(text, pre, post) {
+  return pre + "\n" + indented(text) + "\n" + post;
+};