@jdeighan/coffee-utils 8.0.6 → 8.0.9

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "8.0.6",
+	"version": "8.0.9",
 	"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.10"
 	}
 }

package/src/Section.coffee

@@ -12,34 +12,34 @@ export class Section
 
 	constructor: (@name) ->
 
-		@lLines = []
+		@lParts = []
 
 	# ..........................................................
 
 	length: () ->
 
-		return @lLines.length
+		return @lParts.length
 
 	# ..........................................................
 
 	indent: (level=1) ->
 
-		lNewLines = for line in @lLines
+		lNewLines = for line in @lParts
 			indented(line, level)
-		@lLines = lNewLines
+		@lParts = lNewLines
 		return
 
 	# ..........................................................
 
 	isEmpty: () ->
 
-		return (@lLines.length == 0)
+		return (@lParts.length == 0)
 
 	# ..........................................................
 
 	nonEmpty: () ->
 
-		return (@lLines.length > 0)
+		return (@lParts.length > 0)
 
 	# ..........................................................
 
@@ -47,9 +47,9 @@ export class Section
 
 		if isArray(data)
 			for line in data
-				@lLines.push line
+				@lParts.push line
 		else
-			@lLines.push data
+			@lParts.push data
 		return
 
 	# ..........................................................
@@ -57,16 +57,22 @@ export class Section
 	prepend: (data) ->
 
 		if isArray(data)
-			@lLines = [data..., @lLines...]
+			@lParts = [data..., @lParts...]
 		else
-			@lLines = [data, @lLines...]
+			@lParts = [data, @lParts...]
 		return
 
 	# ..........................................................
 
+	getParts: () ->
+
+		return @lParts
+
+	# ..........................................................
+
 	getBlock: () ->
 
-		if (@lLines.length == 0)
+		if (@lParts.length == 0)
 			return undef
 		else
-			return arrayToBlock(@lLines)
+			return arrayToBlock(@lParts)

package/src/Section.js

@@ -21,12 +21,12 @@ import {
 export var Section = class Section {
   constructor(name) {
     this.name = name;
-    this.lLines = [];
+    this.lParts = [];
   }
 
   // ..........................................................
   length() {
-    return this.lLines.length;
+    return this.lParts.length;
   }
 
   // ..........................................................
@@ -34,7 +34,7 @@ export var Section = class Section {
     var lNewLines, line;
     lNewLines = (function() {
       var i, len, ref, results;
-      ref = this.lLines;
+      ref = this.lParts;
       results = [];
       for (i = 0, len = ref.length; i < len; i++) {
         line = ref[i];
@@ -42,17 +42,17 @@ export var Section = class Section {
       }
       return results;
     }).call(this);
-    this.lLines = lNewLines;
+    this.lParts = lNewLines;
   }
 
   // ..........................................................
   isEmpty() {
-    return this.lLines.length === 0;
+    return this.lParts.length === 0;
   }
 
   // ..........................................................
   nonEmpty() {
-    return this.lLines.length > 0;
+    return this.lParts.length > 0;
   }
 
   // ..........................................................
@@ -61,28 +61,33 @@ export var Section = class Section {
     if (isArray(data)) {
       for (i = 0, len = data.length; i < len; i++) {
         line = data[i];
-        this.lLines.push(line);
+        this.lParts.push(line);
       }
     } else {
-      this.lLines.push(data);
+      this.lParts.push(data);
     }
   }
 
   // ..........................................................
   prepend(data) {
     if (isArray(data)) {
-      this.lLines = [...data, ...this.lLines];
+      this.lParts = [...data, ...this.lParts];
     } else {
-      this.lLines = [data, ...this.lLines];
+      this.lParts = [data, ...this.lParts];
     }
   }
 
+  // ..........................................................
+  getParts() {
+    return this.lParts;
+  }
+
   // ..........................................................
   getBlock() {
-    if (this.lLines.length === 0) {
+    if (this.lParts.length === 0) {
       return undef;
     } else {
-      return arrayToBlock(this.lLines);
+      return arrayToBlock(this.lParts);
     }
   }
 

package/src/SectionMap.coffee

@@ -120,7 +120,8 @@ export class SectionMap
 		return
 
 	# ..........................................................
-	# --- procFunc should be (name, text) -> return processedText
+	# --- procFunc should be (name, block) ->
+	#        return processed block
 
 	getBlock: (procFunc=undef, lTree=undef) ->
 

package/src/SectionMap.js

@@ -147,7 +147,8 @@ export var SectionMap = class SectionMap {
   }
 
   // ..........................................................
-  // --- procFunc should be (name, text) -> return processedText
+  // --- procFunc should be (name, block) ->
+  //        return processed block
   getBlock(procFunc = undef, lTree = undef) {
     var j, lParts, len, part, result, text;
     debug("enter getBlock()");

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];
 };
 
 // ---------------------------------------------------------------------------