@jdeighan/coffee-utils 3.0.2 → 3.0.6

package/package.json

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

package/src/coffee_utils.coffee

@@ -301,26 +301,15 @@ export OL = oneline
 
 # ---------------------------------------------------------------------------
 
-export removeCR = (block) ->
+export removeCR = (str) ->
 
-	return block.replace(/\r/g, '')
+	return str.replace(/\r/g, '')
 
 # ---------------------------------------------------------------------------
 
-export splitBlock = (block) ->
+export CWS = (str) ->
 
-	block = removeCR(block)
-	if pos = block.indexOf("\n")
-		# --- pos is also the length of the 1st line
-		#     2nd arg to substr() is number of characters to return
-		return [block.substr(0, pos), block.substr(pos+1)]
-	else
-		return [block, '']
-
-# ---------------------------------------------------------------------------
-
-export CWS = (block) ->
-
-	return block.trim().replace(/\s+/g, ' ')
+	assert isString(str), "CWS(): parameter not a string"
+	return str.trim().replace(/\s+/sg, ' ')
 
 # ---------------------------------------------------------------------------

package/src/coffee_utils.js

@@ -316,26 +316,14 @@ export var oneline = function(obj) {
 export var OL = oneline;
 
 // ---------------------------------------------------------------------------
-export var removeCR = function(block) {
-  return block.replace(/\r/g, '');
+export var removeCR = function(str) {
+  return str.replace(/\r/g, '');
 };
 
 // ---------------------------------------------------------------------------
-export var splitBlock = function(block) {
-  var pos;
-  block = removeCR(block);
-  if (pos = block.indexOf("\n")) {
-    // --- pos is also the length of the 1st line
-    //     2nd arg to substr() is number of characters to return
-    return [block.substr(0, pos), block.substr(pos + 1)];
-  } else {
-    return [block, ''];
-  }
-};
-
-// ---------------------------------------------------------------------------
-export var CWS = function(block) {
-  return block.trim().replace(/\s+/g, ' ');
+export var CWS = function(str) {
+  assert(isString(str), "CWS(): parameter not a string");
+  return str.trim().replace(/\s+/sg, ' ');
 };
 
 // ---------------------------------------------------------------------------

package/src/indent_utils.coffee

@@ -3,7 +3,7 @@
 import {strict as assert} from 'assert'
 import {
 	undef, error, escapeStr,
-	oneline, isInteger, isString, isArray, isEmpty, rtrim,
+	OL, isInteger, isString, isArray, isEmpty, rtrim,
 	} from '@jdeighan/coffee-utils'
 import {arrayToBlock, blockToArray} from '@jdeighan/coffee-utils/block'
 
@@ -49,13 +49,16 @@ export indented = (input, level=0) ->
 
 	toAdd = indentation(level)
 	if isArray(input)
-		lLines = for line in input
-			"#{toAdd}#{line}"
-		return lLines
+		lInputLines = input
 	else
-		lLines = for line in blockToArray(input)
+		lInputLines = blockToArray(input)
+
+	lLines = for line in lInputLines
+		if isEmpty(line)
+			""
+		else
 			"#{toAdd}#{line}"
-		return arrayToBlock(lLines)
+	return arrayToBlock(lLines)
 
 # ---------------------------------------------------------------------------
 #   undented - string with 1st line indentation removed for each line
@@ -77,7 +80,7 @@ export undented = (text, level=undef) ->
 		if (lLines.length == 0)
 			return []
 	else
-		error "undented(): Not an array or string: #{oneline(text)}"
+		error "undented(): Not an array or string: #{OL(text)}"
 
 	# --- determine what to remove from beginning of each line
 	if level?
@@ -95,7 +98,7 @@ export undented = (text, level=undef) ->
 		else
 			assert (line.indexOf(toRemove)==0),
 				"undented(): Error removing '#{escapeStr(toRemove)}' \
-					from '#{oneline(text)}'"
+					from #{OL(text)}"
 			lNewLines.push(line.substr(nToRemove))
 
 	if isString(text)

package/src/indent_utils.js

@@ -8,7 +8,7 @@ import {
   undef,
   error,
   escapeStr,
-  oneline,
+  OL,
   isInteger,
   isString,
   isArray,
@@ -54,36 +54,31 @@ export var indentLevel = function(str) {
 // ---------------------------------------------------------------------------
 //   indented - add indentation to each string in a block
 export var indented = function(input, level = 0) {
-  var lLines, line, toAdd;
+  var lInputLines, lLines, line, toAdd;
   assert(level >= 0, "indented(): negative level");
   if (level === 0) {
     return input;
   }
   toAdd = indentation(level);
   if (isArray(input)) {
-    lLines = (function() {
-      var i, len, results;
-      results = [];
-      for (i = 0, len = input.length; i < len; i++) {
-        line = input[i];
-        results.push(`${toAdd}${line}`);
-      }
-      return results;
-    })();
-    return lLines;
+    lInputLines = input;
   } else {
-    lLines = (function() {
-      var i, len, ref, results;
-      ref = blockToArray(input);
-      results = [];
-      for (i = 0, len = ref.length; i < len; i++) {
-        line = ref[i];
+    lInputLines = blockToArray(input);
+  }
+  lLines = (function() {
+    var i, len, results;
+    results = [];
+    for (i = 0, len = lInputLines.length; i < len; i++) {
+      line = lInputLines[i];
+      if (isEmpty(line)) {
+        results.push("");
+      } else {
         results.push(`${toAdd}${line}`);
       }
-      return results;
-    })();
-    return arrayToBlock(lLines);
-  }
+    }
+    return results;
+  })();
+  return arrayToBlock(lLines);
 };
 
 // ---------------------------------------------------------------------------
@@ -107,7 +102,7 @@ export var undented = function(text, level = undef) {
       return [];
     }
   } else {
-    error(`undented(): Not an array or string: ${oneline(text)}`);
+    error(`undented(): Not an array or string: ${OL(text)}`);
   }
   // --- determine what to remove from beginning of each line
   if (level != null) {
@@ -124,7 +119,7 @@ export var undented = function(text, level = undef) {
     if (isEmpty(line)) {
       lNewLines.push('');
     } else {
-      assert(line.indexOf(toRemove) === 0, `undented(): Error removing '${escapeStr(toRemove)}' from '${oneline(text)}'`);
+      assert(line.indexOf(toRemove) === 0, `undented(): Error removing '${escapeStr(toRemove)}' from ${OL(text)}`);
       lNewLines.push(line.substr(nToRemove));
     }
   }

package/src/log_utils.coffee

@@ -121,7 +121,7 @@ export log = (lArgs...) ->
 		else
 			logger "#{prefix}#{str}:"
 			for line in blockToArray(item)
-				logger "#{itemPrefix}   #{escapeStr(line)}"
+				logger "#{itemPrefix}   '#{escapeStr(line)}'"
 	else
 		# --- It's some type of object
 		json = JSON.stringify(item)

package/src/log_utils.js

@@ -139,7 +139,7 @@ export var log = function(...lArgs) {
       ref = blockToArray(item);
       for (i = 0, len = ref.length; i < len; i++) {
         line = ref[i];
-        logger(`${itemPrefix}   ${escapeStr(line)}`);
+        logger(`${itemPrefix}   '${escapeStr(line)}'`);
       }
     }
   } else {