@jdeighan/coffee-utils 10.0.9 → 10.0.12

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "10.0.9",
+	"version": "10.0.12",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -22,6 +22,7 @@
 		"./placeholders": "./src/placeholders.js",
 		"./section": "./src/Section.js",
 		"./sectionmap": "./src/SectionMap.js",
+		"./fsa": "./src/fsa.js",
 		"./package.json": "./package.json"
 	},
 	"engines": {
@@ -56,6 +57,6 @@
 		"svelte": "^3.49.0"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^2.0.21"
+		"@jdeighan/unit-tester": "^2.0.23"
 	}
 }

package/src/block_utils.coffee

@@ -6,10 +6,12 @@ import readline from 'readline'
 import {assert, error, croak} from '@jdeighan/unit-tester/utils'
 import {
 	undef, pass, defined, isEmpty, isString, isArray, nonEmpty, rtrim,
+	escapeStr,
 	} from '@jdeighan/coffee-utils'
 
 # ---------------------------------------------------------------------------
 #   blockToArray - split a block into lines
+#   DEPRECATED - use toArray()
 
 export blockToArray = (block) ->
 
@@ -68,7 +70,8 @@ export toArray = (item, option=undef) ->
 	return lNewLines
 
 # ---------------------------------------------------------------------------
-#   arrayToBlock - block will have no trailing whitespace
+#   arrayToBlock - block and lines in block will have no trailing whitespace
+#   DEPRECATED - use toBlock()
 
 export arrayToBlock = (lLines) ->
 
@@ -90,11 +93,11 @@ export toBlock = (lLines) ->
 	if (lLines == undef)
 		return undef
 	assert isArray(lLines), "lLines is not an array"
-	lLines = lLines.filter((line) => defined(line));
-	if lLines.length == 0
-		return undef
-	else
-		return lLines.join('\n')
+	lNewLines = []
+	for line in lLines
+		if defined(line)
+			lNewLines.push rtrim(line)
+	return lNewLines.join("\n")
 
 # ---------------------------------------------------------------------------
 

package/src/block_utils.js

@@ -18,11 +18,13 @@ import {
   isString,
   isArray,
   nonEmpty,
-  rtrim
+  rtrim,
+  escapeStr
 } from '@jdeighan/coffee-utils';
 
 // ---------------------------------------------------------------------------
 //   blockToArray - split a block into lines
+//   DEPRECATED - use toArray()
 export var blockToArray = function(block) {
   var lLines, len;
   if (isEmpty(block)) {
@@ -89,7 +91,8 @@ export var toArray = function(item, option = undef) {
 };
 
 // ---------------------------------------------------------------------------
-//   arrayToBlock - block will have no trailing whitespace
+//   arrayToBlock - block and lines in block will have no trailing whitespace
+//   DEPRECATED - use toBlock()
 export var arrayToBlock = function(lLines) {
   if (lLines === undef) {
     return undef;
@@ -109,18 +112,19 @@ export var arrayToBlock = function(lLines) {
 //   toBlock - block may have trailing whitespace
 //             but undef items are ignored
 export var toBlock = function(lLines) {
+  var i, lNewLines, len1, line;
   if (lLines === undef) {
     return undef;
   }
   assert(isArray(lLines), "lLines is not an array");
-  lLines = lLines.filter((line) => {
-    return defined(line);
-  });
-  if (lLines.length === 0) {
-    return undef;
-  } else {
-    return lLines.join('\n');
+  lNewLines = [];
+  for (i = 0, len1 = lLines.length; i < len1; i++) {
+    line = lLines[i];
+    if (defined(line)) {
+      lNewLines.push(rtrim(line));
+    }
   }
+  return lNewLines.join("\n");
 };
 
 // ---------------------------------------------------------------------------

package/src/coffee_utils.coffee

@@ -241,7 +241,10 @@ export pushCond = (lItems, item, doPush=notInArray) ->
 
 export words = (str) ->
 
-	return str.trim().split(/\s+/)
+	str = str.trim()
+	if (str == '')
+		return []
+	return str.split(/\s+/)
 
 # ---------------------------------------------------------------------------
 

package/src/coffee_utils.js

@@ -253,7 +253,11 @@ export var pushCond = function(lItems, item, doPush = notInArray) {
 
 // ---------------------------------------------------------------------------
 export var words = function(str) {
-  return str.trim().split(/\s+/);
+  str = str.trim();
+  if (str === '') {
+    return [];
+  }
+  return str.split(/\s+/);
 };
 
 // ---------------------------------------------------------------------------

package/src/fsa.coffee

@@ -0,0 +1,83 @@
+# fsa.coffee
+
+import {assert, croak} from '@jdeighan/unit-tester/utils'
+import {
+	undef, defined, notdefined, words, isEmpty, nonEmpty,
+	isString, OL,
+	} from '@jdeighan/coffee-utils'
+import {toArray} from '@jdeighan/coffee-utils/block'
+import {LOG} from '@jdeighan/coffee-utils/log'
+import {debug} from '@jdeighan/coffee-utils/debug'
+
+# ---------------------------------------------------------------------------
+
+export class FSA
+
+	constructor: (block) ->
+
+		debug "enter FSA()"
+		assert isString(block), "block not a string"
+		@hTransitions = {}
+		lLines = toArray(block, 'noEmptyLines')
+		debug 'lLines', lLines
+		for line,i in lLines
+			debug "LINE #{i}", line
+			lWords = words(line)
+			if (lWords.length == 3)
+				[bState, token, eState] = lWords
+				output = undef
+			else if (lWords.length == 4)
+				[bState, token, eState, output] = lWords
+			else
+				croak "Invalid desc: #{OL(line)}"
+			debug "LINE #{i}: #{OL(bState)} #{OL(token)} #{OL(eState)} #{OL(output)}"
+			assert nonEmpty(eState), "Invalid FSA description #{i}"
+
+			# --- tokens may be quoted (but may not contain whitespace),
+			#     but the quotes are stripped
+			if (i == 0)
+				assert (bState == 'start'), "Invalid FSA description #{i}"
+			token = @fixToken(token)
+			debug 'token', token
+			if isEmpty(output)
+				output = undef
+			hTrans = @hTransitions[bState]
+			if notdefined(hTrans)
+				hTrans = @hTransitions[bState] = {}
+			assert notdefined(hTrans[token]), "Duplicate transition"
+			hTrans[token] = [eState, output]
+		debug 'hTransitions', @hTransitions
+		@curState = 'start'
+		debug "return from FSA()"
+
+	# ..........................................................
+
+	fixToken: (token) ->
+
+		if lMatches = token.match(/^\'(.*)\'$/)
+			return lMatches[1]
+		else if lMatches = token.match(/^\"(.*)\"$/)
+			return lMatches[1]
+		else
+			return token
+
+	# ..........................................................
+
+	got: (token) ->
+		# --- returns pair [newState, output]
+
+		hTrans = @hTransitions[@curState]
+		if notdefined(hTrans)
+			return [undef, undef]
+		result = hTrans[token]
+		if notdefined(result)
+			return [undef, undef]
+		[newState, output] = result
+		assert nonEmpty(newState), "Failed: #{@curState} -> #{token}"
+		@curState = newState
+		return result
+
+	# ..........................................................
+
+	state: () ->
+		return @curState

package/src/fsa.js

@@ -0,0 +1,111 @@
+// Generated by CoffeeScript 2.7.0
+  // fsa.coffee
+import {
+  assert,
+  croak
+} from '@jdeighan/unit-tester/utils';
+
+import {
+  undef,
+  defined,
+  notdefined,
+  words,
+  isEmpty,
+  nonEmpty,
+  isString,
+  OL
+} from '@jdeighan/coffee-utils';
+
+import {
+  toArray
+} from '@jdeighan/coffee-utils/block';
+
+import {
+  LOG
+} from '@jdeighan/coffee-utils/log';
+
+import {
+  debug
+} from '@jdeighan/coffee-utils/debug';
+
+// ---------------------------------------------------------------------------
+export var FSA = class FSA {
+  constructor(block) {
+    var bState, eState, hTrans, i, j, lLines, lWords, len, line, output, token;
+    debug("enter FSA()");
+    assert(isString(block), "block not a string");
+    this.hTransitions = {};
+    lLines = toArray(block, 'noEmptyLines');
+    debug('lLines', lLines);
+    for (i = j = 0, len = lLines.length; j < len; i = ++j) {
+      line = lLines[i];
+      debug(`LINE ${i}`, line);
+      lWords = words(line);
+      if (lWords.length === 3) {
+        [bState, token, eState] = lWords;
+        output = undef;
+      } else if (lWords.length === 4) {
+        [bState, token, eState, output] = lWords;
+      } else {
+        croak(`Invalid desc: ${OL(line)}`);
+      }
+      debug(`LINE ${i}: ${OL(bState)} ${OL(token)} ${OL(eState)} ${OL(output)}`);
+      assert(nonEmpty(eState), `Invalid FSA description ${i}`);
+      // --- tokens may be quoted (but may not contain whitespace),
+      //     but the quotes are stripped
+      if (i === 0) {
+        assert(bState === 'start', `Invalid FSA description ${i}`);
+      }
+      token = this.fixToken(token);
+      debug('token', token);
+      if (isEmpty(output)) {
+        output = undef;
+      }
+      hTrans = this.hTransitions[bState];
+      if (notdefined(hTrans)) {
+        hTrans = this.hTransitions[bState] = {};
+      }
+      assert(notdefined(hTrans[token]), "Duplicate transition");
+      hTrans[token] = [eState, output];
+    }
+    debug('hTransitions', this.hTransitions);
+    this.curState = 'start';
+    debug("return from FSA()");
+  }
+
+  // ..........................................................
+  fixToken(token) {
+    var lMatches;
+    if (lMatches = token.match(/^\'(.*)\'$/)) {
+      return lMatches[1];
+    } else if (lMatches = token.match(/^\"(.*)\"$/)) {
+      return lMatches[1];
+    } else {
+      return token;
+    }
+  }
+
+  // ..........................................................
+  got(token) {
+    var hTrans, newState, output, result;
+    // --- returns pair [newState, output]
+    hTrans = this.hTransitions[this.curState];
+    if (notdefined(hTrans)) {
+      return [undef, undef];
+    }
+    result = hTrans[token];
+    if (notdefined(result)) {
+      return [undef, undef];
+    }
+    [newState, output] = result;
+    assert(nonEmpty(newState), `Failed: ${this.curState} -> ${token}`);
+    this.curState = newState;
+    return result;
+  }
+
+  // ..........................................................
+  state() {
+    return this.curState;
+  }
+
+};

package/src/log_utils.coffee

@@ -173,7 +173,10 @@ export logItem = (label, item, pre='', itemPre=undef) ->
 		LOG "pre = #{OL(pre)}"
 		LOG "itemPre = #{OL(itemPre)}"
 
-	labelStr = if label then "#{label} = " else ""
+	if label
+		labelStr = "#{label} = "
+	else
+		labelStr = ""
 
 	if (item == undef)
 		putstr "#{pre}#{labelStr}undef"

package/src/log_utils.js

@@ -198,7 +198,11 @@ export var logItem = function(label, item, pre = '', itemPre = undef) {
     LOG(`pre = ${OL(pre)}`);
     LOG(`itemPre = ${OL(itemPre)}`);
   }
-  labelStr = label ? `${label} = ` : "";
+  if (label) {
+    labelStr = `${label} = `;
+  } else {
+    labelStr = "";
+  }
   if (item === undef) {
     putstr(`${pre}${labelStr}undef`);
   } else if (item === null) {