@jdeighan/coffee-utils 8.0.7 → 8.0.10

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "8.0.7",
+	"version": "8.0.10",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -52,9 +52,9 @@
 		"js-yaml": "^4.1.0",
 		"n-readlines": "^1.0.1",
 		"readline-sync": "^1.4.10",
-		"svelte": "^3.48.0"
+		"svelte": "^3.49.0"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^2.0.9"
+		"@jdeighan/unit-tester": "^2.0.11"
 	}
 }

package/src/indent_utils.coffee

@@ -6,6 +6,15 @@ import {
 	} from '@jdeighan/coffee-utils'
 import {arrayToBlock, blockToArray} from '@jdeighan/coffee-utils/block'
 
+# ---------------------------------------------------------------------------
+
+export splitPrefix = (line) ->
+
+	assert isString(line), "non-string #{OL(line)}"
+	line = rtrim(line)
+	lMatches = line.match(/^(\s*)(.*)$/)
+	return [lMatches[1], lMatches[2]]
+
 # ---------------------------------------------------------------------------
 #        NOTE: Currently, only TAB indentation is supported
 # ---------------------------------------------------------------------------
@@ -13,11 +22,8 @@ import {arrayToBlock, blockToArray} from '@jdeighan/coffee-utils/block'
 
 export splitLine = (line) ->
 
-	assert defined(line), "splitLine(): line is undef"
-	assert isString(line), "splitLine(): non-string #{OL(line)}"
-	line = rtrim(line)
-	lMatches = line.match(/^(\s*)(.*)$/)
-	return [lMatches[1].length, lMatches[2]]
+	[prefix, str] = splitPrefix(line)
+	return [indentLevel(prefix), str]
 
 # ---------------------------------------------------------------------------
 #   indentation - return appropriate indentation string for given level

package/src/indent_utils.js

@@ -19,17 +19,23 @@ import {
   blockToArray
 } from '@jdeighan/coffee-utils/block';
 
+// ---------------------------------------------------------------------------
+export var splitPrefix = function(line) {
+  var lMatches;
+  assert(isString(line), `non-string ${OL(line)}`);
+  line = rtrim(line);
+  lMatches = line.match(/^(\s*)(.*)$/);
+  return [lMatches[1], lMatches[2]];
+};
+
 // ---------------------------------------------------------------------------
 //        NOTE: Currently, only TAB indentation is supported
 // ---------------------------------------------------------------------------
 //   splitLine - separate a line into [level, line]
 export var splitLine = function(line) {
-  var lMatches;
-  assert(defined(line), "splitLine(): line is undef");
-  assert(isString(line), `splitLine(): non-string ${OL(line)}`);
-  line = rtrim(line);
-  lMatches = line.match(/^(\s*)(.*)$/);
-  return [lMatches[1].length, lMatches[2]];
+  var prefix, str;
+  [prefix, str] = splitPrefix(line);
+  return [indentLevel(prefix), str];
 };
 
 // ---------------------------------------------------------------------------