@jdeighan/coffee-utils 7.0.60 → 7.0.61

package/package.json

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

package/src/arrow.coffee

@@ -1,6 +1,6 @@
 # arrow.coffee
 
-import {undef, OL, setCharsAt} from '@jdeighan/coffee-utils'
+import {undef, assert, OL, setCharsAt} from '@jdeighan/coffee-utils'
 
 # --- We use spaces here because Windows Terminal handles TAB chars badly
 
@@ -16,50 +16,41 @@ export clearIndent = space + space + space + space
 
 # ---------------------------------------------------------------------------
 
-export getPrefix = (level, option='none') ->
+export prefix = (level, option='none') ->
 
-	if level==0
-		if (option == 'object')
-			return clearIndent
-		else
-			return ''
 	switch option
 		when 'withArrow'
-			result = oneIndent.repeat(level-1) + arrow
-		when 'object'
-			result = oneIndent.repeat(level) + clearIndent
-		when 'none'
-			result = oneIndent.repeat(level)
+			if (level == 0)
+				return arrow
+			else
+				return oneIndent.repeat(level-1) + arrow
+		when 'noLastVbar'
+			assert (level >= 1), "prefix(), noLastVbar but level=#{OL(level)}"
+			return oneIndent.repeat(level-1) + clearIndent
+		when 'noLast2Vbars'
+			assert (level >= 2), "prefix(), noLast2Vbars but level=#{OL(level)}"
+			return oneIndent.repeat(level-2) + clearIndent + clearIndent
 		else
-			throw new Error("getPrefix(): Bad option: '#{option}'")
-	if result.length % 4 != 0
-		throw new Error("getPrefix(): Bad prefix '#{result}'")
-	return result
+			return oneIndent.repeat(level)
 
 # ---------------------------------------------------------------------------
 
 export addArrow = (prefix) ->
 
-#	console.log "in addArrow(#{OL(prefix)})"
 	pos = prefix.lastIndexOf(vbar)
-#	console.log "pos = #{pos}"
 	if (pos == -1)
 		result = prefix
 	else
 		result = setCharsAt(prefix, pos, arrow)
-#	console.log "result = #{OL(result)}"
 	return result
 
 # ---------------------------------------------------------------------------
 
 export removeLastVbar = (prefix) ->
 
-#	console.log "in removeLastVbar(#{OL(prefix)})"
 	pos = prefix.lastIndexOf(vbar)
-#	console.log "pos = #{pos}"
 	if (pos == -1)
 		result = prefix
 	else
 		result = setCharsAt(prefix, pos, ' ')
-#	console.log "result = #{OL(result)}"
 	return result

package/src/arrow.js

@@ -2,6 +2,7 @@
   // arrow.coffee
 import {
   undef,
+  assert,
   OL,
   setCharsAt
 } from '@jdeighan/coffee-utils';
@@ -24,60 +25,46 @@ export var arrow = corner + hbar + arrowhead + space;
 export var clearIndent = space + space + space + space;
 
 // ---------------------------------------------------------------------------
-export var getPrefix = function(level, option = 'none') {
-  var result;
-  if (level === 0) {
-    if (option === 'object') {
-      return clearIndent;
-    } else {
-      return '';
-    }
-  }
+export var prefix = function(level, option = 'none') {
   switch (option) {
     case 'withArrow':
-      result = oneIndent.repeat(level - 1) + arrow;
-      break;
-    case 'object':
-      result = oneIndent.repeat(level) + clearIndent;
-      break;
-    case 'none':
-      result = oneIndent.repeat(level);
+      if (level === 0) {
+        return arrow;
+      } else {
+        return oneIndent.repeat(level - 1) + arrow;
+      }
       break;
+    case 'noLastVbar':
+      assert(level >= 1, `prefix(), noLastVbar but level=${OL(level)}`);
+      return oneIndent.repeat(level - 1) + clearIndent;
+    case 'noLast2Vbars':
+      assert(level >= 2, `prefix(), noLast2Vbars but level=${OL(level)}`);
+      return oneIndent.repeat(level - 2) + clearIndent + clearIndent;
     default:
-      throw new Error(`getPrefix(): Bad option: '${option}'`);
+      return oneIndent.repeat(level);
   }
-  if (result.length % 4 !== 0) {
-    throw new Error(`getPrefix(): Bad prefix '${result}'`);
-  }
-  return result;
 };
 
 // ---------------------------------------------------------------------------
 export var addArrow = function(prefix) {
   var pos, result;
-  //	console.log "in addArrow(#{OL(prefix)})"
   pos = prefix.lastIndexOf(vbar);
-  //	console.log "pos = #{pos}"
   if (pos === -1) {
     result = prefix;
   } else {
     result = setCharsAt(prefix, pos, arrow);
   }
-  //	console.log "result = #{OL(result)}"
   return result;
 };
 
 // ---------------------------------------------------------------------------
 export var removeLastVbar = function(prefix) {
   var pos, result;
-  //	console.log "in removeLastVbar(#{OL(prefix)})"
   pos = prefix.lastIndexOf(vbar);
-  //	console.log "pos = #{pos}"
   if (pos === -1) {
     result = prefix;
   } else {
     result = setCharsAt(prefix, pos, ' ');
   }
-  //	console.log "result = #{OL(result)}"
   return result;
 };

package/src/call_stack.coffee

@@ -1,10 +1,10 @@
 # call_stack.coffee
 
 import {
-	undef, defined, croak, assert, OL, isBoolean, escapeStr, deepCopy,
+	undef, defined, croak, assert, OL,  escapeStr, deepCopy,
+	isArray, isBoolean,
 	} from '@jdeighan/coffee-utils'
-import {log, LOG} from '@jdeighan/coffee-utils/log'
-import {getPrefix} from '@jdeighan/coffee-utils/arrow'
+import {LOG} from '@jdeighan/coffee-utils/log'
 
 doDebugStack = false
 
@@ -22,7 +22,6 @@ export class CallStack
 	constructor: () ->
 
 		@lStack = []
-		@level = 0
 
 	# ........................................................................
 
@@ -31,14 +30,16 @@ export class CallStack
 		if doDebugStack
 			LOG "RESET STACK"
 		@lStack = []
-		@level = 0
 		return
 
 	# ........................................................................
 
-	enter: (funcName, lArgs=[]) ->
+	enter: (funcName, lArgs=[], isLogged) ->
 		# --- funcName might be <object>.<method>
 
+		assert isArray(lArgs), "missing lArgs"
+		assert isBoolean(isLogged), "missing isLogged"
+
 		if doDebugStack
 			LOG "[--> ENTER #{funcName}]"
 
@@ -52,26 +53,31 @@ export class CallStack
 		assert defined(lMatches), "Bad funcName: #{OL(funcName)}"
 		[_, ident1, ident2] = lMatches
 		if ident2
-			@lStack.push({
+			hStackItem = {
 				fullName: funcName     #    "#{ident1}.#{ident2}"
 				funcName: ident2
-				isLogged: false
+				isLogged
 				lArgs: deepCopy(lArgs)
-				})
+				}
 		else
-			@lStack.push({
+			hStackItem = {
 				fullName: funcName
 				funcName: ident1
-				isLogged: false
+				isLogged
 				lArgs: deepCopy(lArgs)
-				})
-		return
+				}
+		@lStack.push hStackItem
+		return hStackItem
 
 	# ........................................................................
 
 	getLevel: () ->
 
-		return @level
+		level = 0
+		for item in @lStack
+			if item.isLogged
+				level += 1
+		return level
 
 	# ........................................................................
 
@@ -82,32 +88,6 @@ export class CallStack
 		else
 			return @lStack[@lStack.length - 1].isLogged
 
-	# ........................................................................
-
-	isLoggingPrev: () ->
-
-		if (@lStack.length < 2)
-			return false
-		else
-			return @lStack[@lStack.length - 2].isLogged
-
-	# ........................................................................
-
-	logCurFunc: (funcName) ->
-
-		# --- funcName must be  the current function
-		#     and the isLogged flag must currently be false
-
-		cur = @lStack[@lStack.length - 1]
-		assert (cur.isLogged == false), "isLogged is already true"
-		if (funcName != cur.fullName)
-			LOG "cur func #{cur.fullName} is not #{funcName}"
-			LOG @dump()
-			croak "BAD"
-		cur.isLogged = true
-		@level += 1
-		return
-
 	# ........................................................................
 	# --- if stack is empty, log the error, but continue
 
@@ -121,19 +101,10 @@ export class CallStack
 			return
 
 		{fullName, isLogged} = @lStack.pop()
-		if isLogged && (@level > 0)
-			@level -= 1
-
-		# --- This should do nothing
-		while (fullName != fName) && (@lStack.length > 0)
-			LOG "[MISSING RETURN FROM #{fullName} (return from #{fName})]"
-			{fullName, isLogged} = @lStack.pop()
-			if isLogged && (@level > 0)
-				@level -= 1
-
-		if fullName != fName
-			@dump()
-			LOG "BAD BAD BAD BAD returnFrom('#{fName}')"
+		if (fullName != fName)
+			LOG "ERROR: returnFrom('#{fName}') but TOS is #{fullName}"
+			return
+
 		return
 
 	# ........................................................................
@@ -158,9 +129,9 @@ export class CallStack
 
 	# ........................................................................
 
-	dump: () ->
+	dump: (label="CALL STACK") ->
 
-		lLines = ["CALL STACK:"]
+		lLines = [label]
 		if @lStack.length == 0
 			lLines.push "   <EMPTY>"
 		else
@@ -172,8 +143,8 @@ export class CallStack
 
 	callStr: (i, item) ->
 
-		sym = if item.isLogged then '*' else ''
-		str = "#{i}#{sym}: #{item.fullName}"
+		sym = if item.isLogged then '*' else '-'
+		str = "#{i}: #{sym}#{item.fullName}"
 		for arg in item.lArgs
 			str += " #{OL(arg)}"
 		return str

package/src/call_stack.js

@@ -8,20 +8,16 @@ import {
   croak,
   assert,
   OL,
-  isBoolean,
   escapeStr,
-  deepCopy
+  deepCopy,
+  isArray,
+  isBoolean
 } from '@jdeighan/coffee-utils';
 
 import {
-  log,
   LOG
 } from '@jdeighan/coffee-utils/log';
 
-import {
-  getPrefix
-} from '@jdeighan/coffee-utils/arrow';
-
 doDebugStack = false;
 
 // ---------------------------------------------------------------------------
@@ -33,7 +29,6 @@ export var debugStack = function(flag = true) {
 export var CallStack = class CallStack {
   constructor() {
     this.lStack = [];
-    this.level = 0;
   }
 
   // ........................................................................
@@ -42,13 +37,14 @@ export var CallStack = class CallStack {
       LOG("RESET STACK");
     }
     this.lStack = [];
-    this.level = 0;
   }
 
   // ........................................................................
-  enter(funcName, lArgs = []) {
-    var _, ident1, ident2, lMatches;
+  enter(funcName, lArgs = [], isLogged) {
+    var _, hStackItem, ident1, ident2, lMatches;
     // --- funcName might be <object>.<method>
+    assert(isArray(lArgs), "missing lArgs");
+    assert(isBoolean(isLogged), "missing isLogged");
     if (doDebugStack) {
       LOG(`[--> ENTER ${funcName}]`);
     }
@@ -56,25 +52,36 @@ export var CallStack = class CallStack {
     assert(defined(lMatches), `Bad funcName: ${OL(funcName)}`);
     [_, ident1, ident2] = lMatches;
     if (ident2) {
-      this.lStack.push({
+      hStackItem = {
         fullName: funcName, //    "#{ident1}.#{ident2}"
         funcName: ident2,
-        isLogged: false,
+        isLogged,
         lArgs: deepCopy(lArgs)
-      });
+      };
     } else {
-      this.lStack.push({
+      hStackItem = {
         fullName: funcName,
         funcName: ident1,
-        isLogged: false,
+        isLogged,
         lArgs: deepCopy(lArgs)
-      });
+      };
     }
+    this.lStack.push(hStackItem);
+    return hStackItem;
   }
 
   // ........................................................................
   getLevel() {
-    return this.level;
+    var item, j, len, level, ref;
+    level = 0;
+    ref = this.lStack;
+    for (j = 0, len = ref.length; j < len; j++) {
+      item = ref[j];
+      if (item.isLogged) {
+        level += 1;
+      }
+    }
+    return level;
   }
 
   // ........................................................................
@@ -86,31 +93,6 @@ export var CallStack = class CallStack {
     }
   }
 
-  // ........................................................................
-  isLoggingPrev() {
-    if (this.lStack.length < 2) {
-      return false;
-    } else {
-      return this.lStack[this.lStack.length - 2].isLogged;
-    }
-  }
-
-  // ........................................................................
-  logCurFunc(funcName) {
-    var cur;
-    // --- funcName must be  the current function
-    //     and the isLogged flag must currently be false
-    cur = this.lStack[this.lStack.length - 1];
-    assert(cur.isLogged === false, "isLogged is already true");
-    if (funcName !== cur.fullName) {
-      LOG(`cur func ${cur.fullName} is not ${funcName}`);
-      LOG(this.dump());
-      croak("BAD");
-    }
-    cur.isLogged = true;
-    this.level += 1;
-  }
-
   // ........................................................................
   // --- if stack is empty, log the error, but continue
   returnFrom(fName) {
@@ -123,20 +105,9 @@ export var CallStack = class CallStack {
       return;
     }
     ({fullName, isLogged} = this.lStack.pop());
-    if (isLogged && (this.level > 0)) {
-      this.level -= 1;
-    }
-    // --- This should do nothing
-    while ((fullName !== fName) && (this.lStack.length > 0)) {
-      LOG(`[MISSING RETURN FROM ${fullName} (return from ${fName})]`);
-      ({fullName, isLogged} = this.lStack.pop());
-      if (isLogged && (this.level > 0)) {
-        this.level -= 1;
-      }
-    }
     if (fullName !== fName) {
-      this.dump();
-      LOG(`BAD BAD BAD BAD returnFrom('${fName}')`);
+      LOG(`ERROR: returnFrom('${fName}') but TOS is ${fullName}`);
+      return;
     }
   }
 
@@ -165,9 +136,9 @@ export var CallStack = class CallStack {
   }
 
   // ........................................................................
-  dump() {
+  dump(label = "CALL STACK") {
     var i, item, j, lLines, len, ref;
-    lLines = ["CALL STACK:"];
+    lLines = [label];
     if (this.lStack.length === 0) {
       lLines.push("   <EMPTY>");
     } else {
@@ -183,8 +154,8 @@ export var CallStack = class CallStack {
   // ........................................................................
   callStr(i, item) {
     var arg, j, len, ref, str, sym;
-    sym = item.isLogged ? '*' : '';
-    str = `${i}${sym}: ${item.fullName}`;
+    sym = item.isLogged ? '*' : '-';
+    str = `${i}: ${sym}${item.fullName}`;
     ref = item.lArgs;
     for (j = 0, len = ref.length; j < len; j++) {
       arg = ref[j];

package/src/coffee_utils.coffee

@@ -73,17 +73,11 @@ getCallers = (stackTrace, lExclude=[]) ->
 export assert = (cond, msg) ->
 
 	if ! cond
-#		try
-#			throw new Error()
-#		catch e
-#			stackTrace = e.stack
 		stackTrace = new Error().stack
 		lCallers = getCallers(stackTrace, ['assert'])
 
-#		console.log 'STACK'
-#		console.log stackTrace
 		console.log '--------------------'
-		console.log 'CALL STACK:'
+		console.log 'JavaScript CALL STACK:'
 		for caller in lCallers
 			console.log "   #{caller}"
 		console.log '--------------------'
@@ -118,6 +112,16 @@ export getClassName = (obj) ->
 
 # ---------------------------------------------------------------------------
 
+export patchStr = (bigstr, pos, str) ->
+
+	endpos = pos + str.length
+	if (endpos < bigstr.length)
+		return bigstr.substring(0, pos) + str + bigstr.substring(endpos)
+	else
+		return bigstr.substring(0, pos) + str
+
+# ---------------------------------------------------------------------------
+
 export isString = (x) ->
 
 	return typeof x == 'string' || x instanceof String

package/src/coffee_utils.js

@@ -68,16 +68,10 @@ getCallers = function(stackTrace, lExclude = []) {
 export var assert = function(cond, msg) {
   var caller, i, lCallers, len, stackTrace;
   if (!cond) {
-    //		try
-    //			throw new Error()
-    //		catch e
-    //			stackTrace = e.stack
     stackTrace = new Error().stack;
     lCallers = getCallers(stackTrace, ['assert']);
-    //		console.log 'STACK'
-    //		console.log stackTrace
     console.log('--------------------');
-    console.log('CALL STACK:');
+    console.log('JavaScript CALL STACK:');
     for (i = 0, len = lCallers.length; i < len; i++) {
       caller = lCallers[i];
       console.log(`   ${caller}`);
@@ -112,6 +106,17 @@ export var getClassName = function(obj) {
   return obj.constructor.name;
 };
 
+// ---------------------------------------------------------------------------
+export var patchStr = function(bigstr, pos, str) {
+  var endpos;
+  endpos = pos + str.length;
+  if (endpos < bigstr.length) {
+    return bigstr.substring(0, pos) + str + bigstr.substring(endpos);
+  } else {
+    return bigstr.substring(0, pos) + str;
+  }
+};
+
 // ---------------------------------------------------------------------------
 export var isString = function(x) {
   return typeof x === 'string' || x instanceof String;