@jdeighan/coffee-utils 13.0.9 → 13.0.11

package/package.json

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

package/src/indent.coffee

@@ -9,18 +9,28 @@ import {toArray, toBlock} from '@jdeighan/coffee-utils/block'
 
 # ---------------------------------------------------------------------------
 
+export getOneIndent = (str) ->
+
+	if (lMatches = str.match(/^\t+(?:\S|$)/))
+		return "\t"
+	else if (lMatches = str.match(/^(\x20+)(?:\S|$)/))   # space char
+		return lMatches[1]
+	assert notdefined(str.match(/^\s/)), "Mixed indentation types"
+	return undef
+
+# ---------------------------------------------------------------------------
+
 export splitPrefix = (line) ->
 
 	assert isString(line), "non-string #{OL(line)}"
 	line = rtrim(line)
 	lMatches = line.match(/^(\s*)(.*)$/)
-	assert defined(lMatches), "Failed to match: #{OL(line)}"
 	return [lMatches[1], lMatches[2]]
 
 # ---------------------------------------------------------------------------
 #   splitLine - separate a line into [level, line]
 
-export splitLine = (line, oneIndent="\t") ->
+export splitLine = (line, oneIndent=undef) ->
 
 	[prefix, str] = splitPrefix(line)
 	return [indentLevel(prefix, oneIndent), str]
@@ -38,22 +48,30 @@ export indentation = (level, oneIndent="\t") ->
 #   indentLevel - determine indent level of a string
 #                 it's OK if the string is ONLY indentation
 
-export indentLevel = (line, oneIndent="\t") ->
+export indentLevel = (line, oneIndent=undef) ->
 
-	len = oneIndent.length
+	assert isString(line), "not a string"
 
-	# --- This will always match
+	# --- This will always match, and it's greedy
 	if lMatches = line.match(/^(\s*)/)
 		prefix = lMatches[1]
 		prefixLen = prefix.length
 
-	remain = prefixLen % len
-	if (remain != 0)
-		throw new Error("prefix #{OL(prefix)} not a mult of #{OL(oneIndent)}")
+	if (prefixLen == 0)
+		return 0
+
+	if defined(oneIndent)
+		len = oneIndent.length
+	else
+		oneIndent = "\t"
+		len = 1
+
+	if (prefixLen % len != 0)
+		croak "prefix #{OL(prefix)} not a mult of #{OL(oneIndent)}"
 
 	level = prefixLen / len
 	if (prefix != oneIndent.repeat(level))
-		throw new Error("prefix #{OL(prefix)} not a mult of #{OL(oneIndent)}")
+		croak "prefix #{OL(prefix)} not a mult of #{OL(oneIndent)}"
 
 	return level
 

package/src/indent.js

@@ -22,19 +22,30 @@ import {
   toBlock
 } from '@jdeighan/coffee-utils/block';
 
+// ---------------------------------------------------------------------------
+export var getOneIndent = function(str) {
+  var lMatches;
+  if ((lMatches = str.match(/^\t+(?:\S|$)/))) {
+    return "\t";
+  } else if ((lMatches = str.match(/^(\x20+)(?:\S|$)/))) { // space char
+    return lMatches[1];
+  }
+  assert(notdefined(str.match(/^\s/)), "Mixed indentation types");
+  return undef;
+};
+
 // ---------------------------------------------------------------------------
 export var splitPrefix = function(line) {
   var lMatches;
   assert(isString(line), `non-string ${OL(line)}`);
   line = rtrim(line);
   lMatches = line.match(/^(\s*)(.*)$/);
-  assert(defined(lMatches), `Failed to match: ${OL(line)}`);
   return [lMatches[1], lMatches[2]];
 };
 
 // ---------------------------------------------------------------------------
 //   splitLine - separate a line into [level, line]
-export var splitLine = function(line, oneIndent = "\t") {
+export var splitLine = function(line, oneIndent = undef) {
   var prefix, str;
   [prefix, str] = splitPrefix(line);
   return [indentLevel(prefix, oneIndent), str];
@@ -51,21 +62,29 @@ export var indentation = function(level, oneIndent = "\t") {
 // ---------------------------------------------------------------------------
 //   indentLevel - determine indent level of a string
 //                 it's OK if the string is ONLY indentation
-export var indentLevel = function(line, oneIndent = "\t") {
-  var lMatches, len, level, prefix, prefixLen, remain;
-  len = oneIndent.length;
-  // --- This will always match
+export var indentLevel = function(line, oneIndent = undef) {
+  var lMatches, len, level, prefix, prefixLen;
+  assert(isString(line), "not a string");
+  // --- This will always match, and it's greedy
   if (lMatches = line.match(/^(\s*)/)) {
     prefix = lMatches[1];
     prefixLen = prefix.length;
   }
-  remain = prefixLen % len;
-  if (remain !== 0) {
-    throw new Error(`prefix ${OL(prefix)} not a mult of ${OL(oneIndent)}`);
+  if (prefixLen === 0) {
+    return 0;
+  }
+  if (defined(oneIndent)) {
+    len = oneIndent.length;
+  } else {
+    oneIndent = "\t";
+    len = 1;
+  }
+  if (prefixLen % len !== 0) {
+    croak(`prefix ${OL(prefix)} not a mult of ${OL(oneIndent)}`);
   }
   level = prefixLen / len;
   if (prefix !== oneIndent.repeat(level)) {
-    throw new Error(`prefix ${OL(prefix)} not a mult of ${OL(oneIndent)}`);
+    croak(`prefix ${OL(prefix)} not a mult of ${OL(oneIndent)}`);
   }
   return level;
 };