@jdeighan/coffee-utils 9.0.1 → 9.0.4

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "9.0.1",
+	"version": "9.0.4",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -55,6 +55,6 @@
 		"svelte": "^3.49.0"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^2.0.19"
+		"@jdeighan/unit-tester": "^2.0.21"
 	}
 }

package/src/Section.coffee

@@ -23,10 +23,10 @@ export class Section
 
 	# ..........................................................
 
-	indent: (level=1) ->
+	indent: (level=1, oneIndent="\t") ->
 
 		lNewLines = for line in @lParts
-			indented(line, level)
+			indented(line, level, oneIndent)
 		@lParts = lNewLines
 		return
 

package/src/Section.js

@@ -34,7 +34,7 @@ export var Section = class Section {
   }
 
   // ..........................................................
-  indent(level = 1) {
+  indent(level = 1, oneIndent = "\t") {
     var lNewLines, line;
     lNewLines = (function() {
       var i, len, ref, results;
@@ -42,7 +42,7 @@ export var Section = class Section {
       results = [];
       for (i = 0, len = ref.length; i < len; i++) {
         line = ref[i];
-        results.push(indented(line, level));
+        results.push(indented(line, level, oneIndent));
       }
       return results;
     }).call(this);

package/src/SectionMap.coffee

@@ -121,10 +121,11 @@ export class SectionMap
 		return
 
 	# ..........................................................
-	# --- procFunc should be (name, block) ->
-	#        return processed block
+	# --- hProc should be <name> -> <function>
+	#     <function> should be <block> -> <block>
+	# --- lTree allows you to get just a section
 
-	getBlock: (procFunc=undef, lTree=undef) ->
+	getBlock: (hProc={}, lTree=undef) ->
 
 		debug "enter getBlock()"
 		if (lTree == undef)
@@ -135,22 +136,23 @@ export class SectionMap
 		lParts = []
 		for part in lTree
 			if isString(part)
-				text = @section(part).getBlock()
-				if nonEmpty(text) && defined(procFunc)
-					text = procFunc(part, text)
+				block = @section(part).getBlock()
+				if defined(hProc[part])
+					# --- called even if block is empty
+					block = hProc[part](block)
 			else if isNonEmptyArray(part)
 				if isSectionName(part[0])
-					text = @getBlock(procFunc, part)
+					block = @getBlock(hProc, part)
 				else if isSetName(part[0])
-					text = @getBlock(procFunc, part.slice(1))
-					if nonEmpty(text) && defined(procFunc)
-						text = procFunc(part[0], text)
+					block = @getBlock(hProc, part.slice(1))
+					if defined(hProc[part[0]])
+						block = hProc[part[0]](block)
 				else
 					croak "Bad part: #{OL(part)}"
 			else
 				croak "Bad part: #{OL(part)}"
-			if defined(text)
-				lParts.push text
+			if defined(block)
+				lParts.push block
 
 		debug 'lParts', lParts
 		result = arrayToBlock(lParts)

package/src/SectionMap.js

@@ -151,10 +151,11 @@ export var SectionMap = class SectionMap {
   }
 
   // ..........................................................
-  // --- procFunc should be (name, block) ->
-  //        return processed block
-  getBlock(procFunc = undef, lTree = undef) {
-    var j, lParts, len, part, result, text;
+  // --- hProc should be <name> -> <function>
+  //     <function> should be <block> -> <block>
+  // --- lTree allows you to get just a section
+  getBlock(hProc = {}, lTree = undef) {
+    var block, j, lParts, len, part, result;
     debug("enter getBlock()");
     if (lTree === undef) {
       lTree = this.lSectionTree;
@@ -165,17 +166,18 @@ export var SectionMap = class SectionMap {
     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);
+        block = this.section(part).getBlock();
+        if (defined(hProc[part])) {
+          // --- called even if block is empty
+          block = hProc[part](block);
         }
       } else if (isNonEmptyArray(part)) {
         if (isSectionName(part[0])) {
-          text = this.getBlock(procFunc, part);
+          block = this.getBlock(hProc, part);
         } else if (isSetName(part[0])) {
-          text = this.getBlock(procFunc, part.slice(1));
-          if (nonEmpty(text) && defined(procFunc)) {
-            text = procFunc(part[0], text);
+          block = this.getBlock(hProc, part.slice(1));
+          if (defined(hProc[part[0]])) {
+            block = hProc[part[0]](block);
           }
         } else {
           croak(`Bad part: ${OL(part)}`);
@@ -183,8 +185,8 @@ export var SectionMap = class SectionMap {
       } else {
         croak(`Bad part: ${OL(part)}`);
       }
-      if (defined(text)) {
-        lParts.push(text);
+      if (defined(block)) {
+        lParts.push(block);
       }
     }
     debug('lParts', lParts);