@jdeighan/coffee-utils 6.0.5 → 6.0.8

package/package.json

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

package/src/call_stack.coffee

@@ -25,27 +25,31 @@ export class CallStack
 	call: (funcName, hInfo) ->
 
 		if doDebugStack
-			LOG "[CALL #{funcName}]"
+			prefix = '   '.repeat(@lStack.length)
+			LOG "#{prefix}[--> CALL #{funcName}]"
 		@lStack.push({funcName, hInfo})
 		return
 
 	# ........................................................................
 
-	returnFrom: (funcName) ->
+	returnFrom: (fName) ->
 
-		if doDebugStack
-			LOG "[RETURN FROM #{funcName}]"
 		if @lStack.length == 0
-			LOG "returnFrom('#{funcName}') but stack is empty"
+			LOG "returnFrom('#{fName}') but stack is empty"
 			return undef
-		TOSfName = @lStack[@lStack.length-1].funcName
-		if funcName == TOSfName
+		{funcName, hInfo} = @lStack.pop()
+		while (funcName != fName) && (@lStack.length > 0)
+			LOG "[MISSING RETURN FROM #{funcName} (return from #{fName})]"
 			{funcName, hInfo} = @lStack.pop()
-			assert funcName==TOSfName, "Bad func name on stack"
+
+		if doDebugStack
+			prefix = '   '.repeat(@lStack.length)
+			LOG "#{prefix}[<-- BACK #{fName}]"
+		if (funcName == fName)
 			return hInfo
 		else
 			@dump()
-			LOG "returnFrom('#{funcName}') but TOS is '#{TOSfName}'"
+			LOG "BAD returnFrom('#{fName}')"
 			return undef
 
 	# ........................................................................

package/src/call_stack.js

@@ -28,30 +28,35 @@ export var CallStack = class CallStack {
 
   // ........................................................................
   call(funcName, hInfo) {
+    var prefix;
     if (doDebugStack) {
-      LOG(`[CALL ${funcName}]`);
+      prefix = '   '.repeat(this.lStack.length);
+      LOG(`${prefix}[--> CALL ${funcName}]`);
     }
     this.lStack.push({funcName, hInfo});
   }
 
   // ........................................................................
-  returnFrom(funcName) {
-    var TOSfName, hInfo;
-    if (doDebugStack) {
-      LOG(`[RETURN FROM ${funcName}]`);
-    }
+  returnFrom(fName) {
+    var funcName, hInfo, prefix;
     if (this.lStack.length === 0) {
-      LOG(`returnFrom('${funcName}') but stack is empty`);
+      LOG(`returnFrom('${fName}') but stack is empty`);
       return undef;
     }
-    TOSfName = this.lStack[this.lStack.length - 1].funcName;
-    if (funcName === TOSfName) {
+    ({funcName, hInfo} = this.lStack.pop());
+    while ((funcName !== fName) && (this.lStack.length > 0)) {
+      LOG(`[MISSING RETURN FROM ${funcName} (return from ${fName})]`);
       ({funcName, hInfo} = this.lStack.pop());
-      assert(funcName === TOSfName, "Bad func name on stack");
+    }
+    if (doDebugStack) {
+      prefix = '   '.repeat(this.lStack.length);
+      LOG(`${prefix}[<-- BACK ${fName}]`);
+    }
+    if (funcName === fName) {
       return hInfo;
     } else {
       this.dump();
-      LOG(`returnFrom('${funcName}') but TOS is '${TOSfName}'`);
+      LOG(`BAD returnFrom('${fName}')`);
       return undef;
     }
   }

package/src/log_utils.coffee

@@ -34,6 +34,8 @@ export LOG = (lArgs...) ->
 		console.log label
 	return
 
+export DEBUG = LOG   # synonym
+
 # ---------------------------------------------------------------------------
 
 export setStringifier = (func) ->

package/src/log_utils.js

@@ -59,6 +59,9 @@ export var LOG = function(...lArgs) {
   }
 };
 
+export var DEBUG = LOG; // synonym
+
+
 // ---------------------------------------------------------------------------
 export var setStringifier = function(func) {
   var orgStringifier;

package/src/taml.coffee

@@ -5,11 +5,13 @@ import yaml from 'js-yaml'
 import {
 	assert, undef, oneline, isString,
 	} from '@jdeighan/coffee-utils'
-import {untabify, tabify} from '@jdeighan/coffee-utils/indent'
+import {untabify, tabify, splitLine} from '@jdeighan/coffee-utils/indent'
 import {log, tamlStringify} from '@jdeighan/coffee-utils/log'
 import {slurp} from '@jdeighan/coffee-utils/fs'
 import {debug} from '@jdeighan/coffee-utils/debug'
-import {firstLine} from '@jdeighan/coffee-utils/block'
+import {
+	firstLine, blockToArray, arrayToBlock,
+	} from '@jdeighan/coffee-utils/block'
 
 # ---------------------------------------------------------------------------
 #   isTAML - is the string valid TAML?
@@ -18,6 +20,12 @@ export isTAML = (text) ->
 
 	return isString(text) && (firstLine(text).indexOf('---') == 0)
 
+# ---------------------------------------------------------------------------
+
+squote = (text) ->
+
+	return "'" + text.replace(/'/g, "''") + "'"
+
 # ---------------------------------------------------------------------------
 #   taml - convert valid TAML string to a JavaScript value
 
@@ -28,8 +36,27 @@ export taml = (text) ->
 		debug "return undef from taml() - text is not defined"
 		return undef
 	assert isTAML(text), "taml(): string #{oneline(text)} isn't TAML"
+
+	lLines = for line in blockToArray(text)
+		[level, str] = splitLine(line)
+		prefix = ' '.repeat(level)
+		if lMatches = line.match(///^
+				([A-Za-z_][A-Za-z0-9_]*)    # the key
+				\s*
+				:
+				\s*
+				(.*)
+				$///)
+			[_, key, text] = lMatches
+			if isEmpty(text) || text.match(/\d+(?:\.\d*)$/)
+				prefix + str
+			else
+				prefix + key + ':' + ' ' + squote(text)
+		else
+			prefix + str
+
 	debug "return from taml()"
-	return yaml.load(untabify(text, 1), {skipInvalid: true})
+	return yaml.load(arrayToBlock(lLines), {skipInvalid: true})
 
 # ---------------------------------------------------------------------------
 #   slurpTAML - read TAML from a file

package/src/taml.js

@@ -1,5 +1,7 @@
 // Generated by CoffeeScript 2.6.1
 // taml.coffee
+var squote;
+
 import yaml from 'js-yaml';
 
 import {
@@ -11,7 +13,8 @@ import {
 
 import {
   untabify,
-  tabify
+  tabify,
+  splitLine
 } from '@jdeighan/coffee-utils/indent';
 
 import {
@@ -28,7 +31,9 @@ import {
 } from '@jdeighan/coffee-utils/debug';
 
 import {
-  firstLine
+  firstLine,
+  blockToArray,
+  arrayToBlock
 } from '@jdeighan/coffee-utils/block';
 
 // ---------------------------------------------------------------------------
@@ -37,17 +42,44 @@ export var isTAML = function(text) {
   return isString(text) && (firstLine(text).indexOf('---') === 0);
 };
 
+// ---------------------------------------------------------------------------
+squote = function(text) {
+  return "'" + text.replace(/'/g, "''") + "'";
+};
+
 // ---------------------------------------------------------------------------
 //   taml - convert valid TAML string to a JavaScript value
 export var taml = function(text) {
+  var _, key, lLines, lMatches, level, line, prefix, str;
   debug(`enter taml(${oneline(text)})`);
   if (text == null) {
     debug("return undef from taml() - text is not defined");
     return undef;
   }
   assert(isTAML(text), `taml(): string ${oneline(text)} isn't TAML`);
+  lLines = (function() {
+    var i, len, ref, results;
+    ref = blockToArray(text);
+    results = [];
+    for (i = 0, len = ref.length; i < len; i++) {
+      line = ref[i];
+      [level, str] = splitLine(line);
+      prefix = ' '.repeat(level);
+      if (lMatches = line.match(/^([A-Za-z_][A-Za-z0-9_]*)\s*:\s*(.*)$/)) { // the key
+        [_, key, text] = lMatches;
+        if (isEmpty(text) || text.match(/\d+(?:\.\d*)$/)) {
+          results.push(prefix + str);
+        } else {
+          results.push(prefix + key + ':' + ' ' + squote(text));
+        }
+      } else {
+        results.push(prefix + str);
+      }
+    }
+    return results;
+  })();
   debug("return from taml()");
-  return yaml.load(untabify(text, 1), {
+  return yaml.load(arrayToBlock(lLines), {
     skipInvalid: true
   });
 };