@jdeighan/coffee-utils 14.0.14 → 14.0.16

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "14.0.14",
+	"version": "14.0.16",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -49,13 +49,13 @@
 	},
 	"homepage": "https://github.com/johndeighan/coffee-utils#readme",
 	"dependencies": {
-		"@jdeighan/base-utils": "^4.0.8",
+		"@jdeighan/base-utils": "^4.0.10",
 		"cross-env": "^7.0.3",
 		"n-readlines": "^1.0.1",
 		"readline-sync": "^1.4.10",
 		"svelte": "^3.55.1"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^3.0.25"
+		"@jdeighan/unit-tester": "^3.0.28"
 	}
 }

package/src/fs.coffee

@@ -8,7 +8,7 @@ import NReadLines from 'n-readlines'
 
 import {
 	undef, pass, defined, notdefined, rtrim, isEmpty, nonEmpty,
-	isString, isArray, isHash, isRegExp, isFunction,
+	isString, isArray, isHash, isRegExp, isFunction, isBoolean,
 	OL, toBlock, getOptions,
 	} from '@jdeighan/base-utils'
 import {assert, croak} from '@jdeighan/base-utils/exceptions'
@@ -131,7 +131,7 @@ export getFullPath = (filepath) =>
 
 # ---------------------------------------------------------------------------
 
-export forEachLine = (filepath, func) =>
+export forEachLineInFile = (filepath, func) =>
 
 	reader = new NReadLines(filepath)
 	nLines = 0
@@ -141,12 +141,33 @@ export forEachLine = (filepath, func) =>
 		# --- text is split on \n chars,
 		#     we also need to remove \r chars
 		line = buffer.toString().replace(/\r/g, '')
-		if func(line, nLines)
+		result = func(line, nLines)
+		assert isBoolean(result)
+		if result
 			reader.close()   # allow premature termination
+			return
 	return
 
 # ---------------------------------------------------------------------------
 
+export mapEachLineInFile = (filepath, func) =>
+
+	reader = new NReadLines(filepath)
+	nLines = 0
+
+	lLines = []
+	while (buffer = reader.next())
+		nLines += 1
+		# --- text is split on \n chars,
+		#     we also need to remove \r chars
+		line = buffer.toString().replace(/\r/g, '')
+		result = func(line, nLines)
+		if defined(result)
+			lLines.push result
+	return lLines
+
+# ---------------------------------------------------------------------------
+
 export forEachBlock = (filepath, func, regexp = /^-{16,}$/) =>
 
 	lLines = []
@@ -165,9 +186,9 @@ export forEachBlock = (filepath, func, regexp = /^-{16,}$/) =>
 			firstLineNum = lineNum+1
 		else
 			lLines.push line
-		return
+		return false
 
-	forEachLine filepath, callback
+	forEachLineInFile filepath, callback
 	if ! earlyExit
 		func(lLines.join('\n'), firstLineNum)
 	return
@@ -200,9 +221,9 @@ export forEachSetOfBlocks = (filepath, func,
 			lLines = []
 		else
 			lLines.push line
-		return
+		return false
 
-	forEachLine filepath, callback
+	forEachLineInFile filepath, callback
 	if ! earlyExit
 		lBlocks.push(lLines.join('\n'))
 		func(lBlocks, firstLineNum)
@@ -215,7 +236,7 @@ export slurp = (filepath, maxLines=undef) =>
 
 	if defined(maxLines)
 		lLines = []
-		forEachLine filepath, (line, nLines) ->
+		forEachLineInFile filepath, (line, nLines) ->
 			lLines.push line
 			return (nLines >= maxLines)
 		contents = toBlock(lLines)

package/src/fs.js

@@ -25,6 +25,7 @@ import {
   isHash,
   isRegExp,
   isFunction,
+  isBoolean,
   OL,
   toBlock,
   getOptions
@@ -167,8 +168,8 @@ export var getFullPath = (filepath) => {
 };
 
 // ---------------------------------------------------------------------------
-export var forEachLine = (filepath, func) => {
-  var buffer, line, nLines, reader;
+export var forEachLineInFile = (filepath, func) => {
+  var buffer, line, nLines, reader, result;
   reader = new NReadLines(filepath);
   nLines = 0;
   while ((buffer = reader.next())) {
@@ -176,12 +177,34 @@ export var forEachLine = (filepath, func) => {
     // --- text is split on \n chars,
     //     we also need to remove \r chars
     line = buffer.toString().replace(/\r/g, '');
-    if (func(line, nLines)) {
+    result = func(line, nLines);
+    assert(isBoolean(result));
+    if (result) {
       reader.close(); // allow premature termination
+      return;
     }
   }
 };
 
+// ---------------------------------------------------------------------------
+export var mapEachLineInFile = (filepath, func) => {
+  var buffer, lLines, line, nLines, reader, result;
+  reader = new NReadLines(filepath);
+  nLines = 0;
+  lLines = [];
+  while ((buffer = reader.next())) {
+    nLines += 1;
+    // --- text is split on \n chars,
+    //     we also need to remove \r chars
+    line = buffer.toString().replace(/\r/g, '');
+    result = func(line, nLines);
+    if (defined(result)) {
+      lLines.push(result);
+    }
+  }
+  return lLines;
+};
+
 // ---------------------------------------------------------------------------
 export var forEachBlock = (filepath, func, regexp = /^-{16,}$/) => {
   var callback, earlyExit, firstLineNum, lLines;
@@ -204,8 +227,9 @@ export var forEachBlock = (filepath, func, regexp = /^-{16,}$/) => {
     } else {
       lLines.push(line);
     }
+    return false;
   };
-  forEachLine(filepath, callback);
+  forEachLineInFile(filepath, callback);
   if (!earlyExit) {
     func(lLines.join('\n'), firstLineNum);
   }
@@ -239,8 +263,9 @@ export var forEachSetOfBlocks = (filepath, func, block_regexp = /^-{16,}$/, set_
     } else {
       lLines.push(line);
     }
+    return false;
   };
-  forEachLine(filepath, callback);
+  forEachLineInFile(filepath, callback);
   if (!earlyExit) {
     lBlocks.push(lLines.join('\n'));
     func(lBlocks, firstLineNum);
@@ -253,7 +278,7 @@ export var slurp = (filepath, maxLines = undef) => {
   var contents, lLines;
   if (defined(maxLines)) {
     lLines = [];
-    forEachLine(filepath, function(line, nLines) {
+    forEachLineInFile(filepath, function(line, nLines) {
       lLines.push(line);
       return nLines >= maxLines;
     });

package/src/indent.coffee

@@ -136,7 +136,18 @@ export undented = (input, level=undef, oneIndent="\t") =>
 	if defined(level) && (level==0)
 		return input
 
-	lLines = toArray(input, 'noLeadingEmptyLines')
+	# --- Remove any leading blank lines, set lLines
+	if isString(input)
+		if lMatches = input.match(///^ [\r\n]+ (.*) $///s)
+			input = lMatches[1]
+		lLines = toArray(input)
+	else if isArray(input)
+		lLines = input
+		while (lLines.length > 0) && isEmpty(lLines[0])
+			lLines.shift()
+	else
+		croak "input not a string or array"
+
 	if (lLines.length == 0)
 		if isString(input)
 			return ''

package/src/indent.js

@@ -150,7 +150,20 @@ export var undented = (input, level = undef, oneIndent = "\t") => {
   if (defined(level) && (level === 0)) {
     return input;
   }
-  lLines = toArray(input, 'noLeadingEmptyLines');
+  // --- Remove any leading blank lines, set lLines
+  if (isString(input)) {
+    if (lMatches = input.match(/^[\r\n]+(.*)$/s)) {
+      input = lMatches[1];
+    }
+    lLines = toArray(input);
+  } else if (isArray(input)) {
+    lLines = input;
+    while ((lLines.length > 0) && isEmpty(lLines[0])) {
+      lLines.shift();
+    }
+  } else {
+    croak("input not a string or array");
+  }
   if (lLines.length === 0) {
     if (isString(input)) {
       return '';