@jdeighan/coffee-utils 10.0.0 → 10.0.1

package/package.json

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

package/src/SectionMap.coffee

@@ -83,37 +83,56 @@ export class SectionMap
 	#        a set name
 	#        undef (equivalent to being set to @SectionTree)
 
-	getBlock: (desc=undef, hProcs={}) ->
+	getBlock: (desc=undef, hReplacers={}) ->
 
-		debug "enter SectionMap.getBlock()", desc, hProcs
+		debug "enter SectionMap.getBlock()", desc, hReplacers
 
-		if notdefined(desc)
+		# --- desc can only be a string or an array
+		#     so, if it's a hash, then it's really the hReplacers
+		#     and the real desc is undef
+
+		if isHash(desc)
+			debug "arg 1 is hReplacers, no desc"
+			assert isEmpty(hReplacers), "invalid parms"
+			hReplacers = desc
+			desc = @lSectionTree
+		else if notdefined(desc)
 			desc = @lSectionTree
 
 		if isArray(desc)
 			lBlocks = []
 			setName = undef
 			for item in desc
-				if isArray(item) || isSectionName(item)
-					# --- arrayToBlock() will skip undef items
-					#     so, no need to check for undef block
-					lBlocks.push @getBlock(item, hProcs)
+				subBlock = undef
+				if isArray(item)
+					subBlock = @getBlock(item, hReplacers)
+				else if isSectionName(item)
+					subBlock = @getBlock(item, hReplacers)
 				else if isSetName(item)
 					setName = item
 				else if isString(item)
-					lBlocks.push item   # a literal string
+					subBlock = item   # a literal string
 				else
 					croak "Bad item: #{OL(item)}"
+				if defined(subBlock)
+					lBlocks.push subBlock
 			block = arrayToBlock(lBlocks)
+			if defined(setName)
+				if defined(proc = hReplacers[setName])
+					debug "REPLACE #{setName}"
+					block = proc(block)
+				else
+					debug "NO REPLACER for #{setName}"
 		else if isSectionName(desc)
 			block = @section(desc).getBlock()
-			if defined(proc = hProcs[desc])
+			if defined(proc = hReplacers[desc])
+				debug "REPLACE #{desc}"
 				block = proc(block)
+			else
+				debug "NO REPLACER for #{desc}"
 		else if isSetName(desc)
 			# --- pass array to getBlock()
-			block = @getBlock(@hSets[desc], hProcs)
-			if defined(proc = hProcs[desc])
-				block = proc(block)
+			block = @getBlock(@hSets[desc], hReplacers)
 		else
 			croak "Bad 1st arg: #{OL(desc)}"
 		debug "return from SectionMap.getBlock()", block

package/src/SectionMap.js

@@ -114,10 +114,18 @@ export var SectionMap = class SectionMap {
   //        a section name
   //        a set name
   //        undef (equivalent to being set to @SectionTree)
-  getBlock(desc = undef, hProcs = {}) {
-    var block, i, item, lBlocks, len, proc, setName;
-    debug("enter SectionMap.getBlock()", desc, hProcs);
-    if (notdefined(desc)) {
+  getBlock(desc = undef, hReplacers = {}) {
+    var block, i, item, lBlocks, len, proc, setName, subBlock;
+    debug("enter SectionMap.getBlock()", desc, hReplacers);
+    // --- desc can only be a string or an array
+    //     so, if it's a hash, then it's really the hReplacers
+    //     and the real desc is undef
+    if (isHash(desc)) {
+      debug("arg 1 is hReplacers, no desc");
+      assert(isEmpty(hReplacers), "invalid parms");
+      hReplacers = desc;
+      desc = this.lSectionTree;
+    } else if (notdefined(desc)) {
       desc = this.lSectionTree;
     }
     if (isArray(desc)) {
@@ -125,30 +133,42 @@ export var SectionMap = class SectionMap {
       setName = undef;
       for (i = 0, len = desc.length; i < len; i++) {
         item = desc[i];
-        if (isArray(item) || isSectionName(item)) {
-          // --- arrayToBlock() will skip undef items
-          //     so, no need to check for undef block
-          lBlocks.push(this.getBlock(item, hProcs));
+        subBlock = undef;
+        if (isArray(item)) {
+          subBlock = this.getBlock(item, hReplacers);
+        } else if (isSectionName(item)) {
+          subBlock = this.getBlock(item, hReplacers);
         } else if (isSetName(item)) {
           setName = item;
         } else if (isString(item)) {
-          lBlocks.push(item); // a literal string
+          subBlock = item; // a literal string
         } else {
           croak(`Bad item: ${OL(item)}`);
         }
+        if (defined(subBlock)) {
+          lBlocks.push(subBlock);
+        }
       }
       block = arrayToBlock(lBlocks);
+      if (defined(setName)) {
+        if (defined(proc = hReplacers[setName])) {
+          debug(`REPLACE ${setName}`);
+          block = proc(block);
+        } else {
+          debug(`NO REPLACER for ${setName}`);
+        }
+      }
     } else if (isSectionName(desc)) {
       block = this.section(desc).getBlock();
-      if (defined(proc = hProcs[desc])) {
+      if (defined(proc = hReplacers[desc])) {
+        debug(`REPLACE ${desc}`);
         block = proc(block);
+      } else {
+        debug(`NO REPLACER for ${desc}`);
       }
     } else if (isSetName(desc)) {
       // --- pass array to getBlock()
-      block = this.getBlock(this.hSets[desc], hProcs);
-      if (defined(proc = hProcs[desc])) {
-        block = proc(block);
-      }
+      block = this.getBlock(this.hSets[desc], hReplacers);
     } else {
       croak(`Bad 1st arg: ${OL(desc)}`);
     }