@jdeighan/coffee-utils 10.0.3 → 10.0.6

package/package.json

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

package/src/SectionMap.coffee

@@ -10,6 +10,7 @@ import {arrayToBlock} from '@jdeighan/coffee-utils/block'
 import {indented} from '@jdeighan/coffee-utils/indent'
 import {LOG} from '@jdeighan/coffee-utils/log'
 import {debug} from '@jdeighan/coffee-utils/debug'
+import {isTAML, taml} from '@jdeighan/coffee-utils/taml'
 import {Section} from '@jdeighan/coffee-utils/section'
 
 # ---------------------------------------------------------------------------
@@ -32,6 +33,10 @@ export class SectionMap
 		# --- lSectionTree is a tree of section/set names
 
 		debug "enter SectionMap()", @lSectionTree
+
+		if isTAML(@lSectionTree)
+			@SectionTree = taml(@lSectionTree)
+
 		assert isArray(@lSectionTree), "not an array"
 
 		# --- keys are section names, values are Section objects

package/src/SectionMap.js

@@ -40,6 +40,11 @@ import {
   debug
 } from '@jdeighan/coffee-utils/debug';
 
+import {
+  isTAML,
+  taml
+} from '@jdeighan/coffee-utils/taml';
+
 import {
   Section
 } from '@jdeighan/coffee-utils/section';
@@ -60,6 +65,9 @@ export var SectionMap = class SectionMap {
     this.lSectionTree = lSectionTree;
     // --- lSectionTree is a tree of section/set names
     debug("enter SectionMap()", this.lSectionTree);
+    if (isTAML(this.lSectionTree)) {
+      this.SectionTree = taml(this.lSectionTree);
+    }
     assert(isArray(this.lSectionTree), "not an array");
     // --- keys are section names, values are Section objects
     this.hSections = {};

package/src/coffee_utils.coffee

@@ -21,6 +21,13 @@ export isComment = (line) ->
 
 # ---------------------------------------------------------------------------
 
+export isSubclassOf = (subClass, superClass) ->
+
+	return (subClass == superClass) \
+		|| (subClass.prototype instanceof superClass)
+
+# ---------------------------------------------------------------------------
+
 export eval_expr = (str) ->
 
 	str = str.replace(/\bundef\b/g, 'undefined')
@@ -33,14 +40,6 @@ export pass = () ->
 
 # ---------------------------------------------------------------------------
 
-export getClassName = (obj) ->
-
-	if (typeof obj != 'object')
-		return undef
-	return obj.constructor.name
-
-# ---------------------------------------------------------------------------
-
 export patchStr = (bigstr, pos, str) ->
 
 	endpos = pos + str.length
@@ -62,6 +61,55 @@ export charCount = (str, ch) ->
 
 # ---------------------------------------------------------------------------
 
+export isConstructor = (f) ->
+
+	try
+		new f()
+	catch err
+		if (err.message.indexOf('is not a constructor') >= 0)
+			return false;
+	return true;
+
+# ---------------------------------------------------------------------------
+
+export jsType = (x) ->
+
+	if notdefined(x)
+		return [undef, undef]
+	else if isString(x)
+		if x.match(/^\s*$/)
+			return ['string', 'empty']
+		else
+			return ['string', undef]
+	else if isNumber(x)
+		if Number.isInteger(x)
+			return ['number', 'integer']
+		else
+			return ['number', undef]
+	else if isBoolean(x)
+		return ['boolean', undef]
+	else if isHash(x)
+		lKeys = Object.keys(x);
+		if (lKeys.length == 0)
+			return ['hash', 'empty']
+		else
+			return ['hash', undef]
+	else if isArray(x)
+		if (x.length == 0)
+			return ['array', 'empty']
+		else
+			return ['array', undef]
+	else if isConstructor(x)
+		return ['function', 'constructor']
+	else if isFunction(x)
+		return ['function', undef]
+	else if isObject(x)
+		return ['object', undef]
+	else
+		croak "Unknown type: #{OL(x)}"
+
+# ---------------------------------------------------------------------------
+
 export isString = (x) ->
 
 	return (typeof x == 'string') || (x instanceof String)
@@ -94,6 +142,14 @@ export isObject = (x) ->
 
 # ---------------------------------------------------------------------------
 
+export getClassName = (obj) ->
+
+	if (typeof obj != 'object')
+		return undef
+	return obj.constructor.name
+
+# ---------------------------------------------------------------------------
+
 export isArray = (x) ->
 
 	return Array.isArray(x)
@@ -207,13 +263,15 @@ export isRegExp = (x) ->
 
 # ---------------------------------------------------------------------------
 
-export isNumber = (x, hOptions={}) ->
+export isNumber = (x, hOptions=undef) ->
 
 	result = (typeof x == 'number') || (x instanceof Number)
-	if result
-		if defined(hOptions.min) && (x < hOptions.min)
+	if result && defined(hOptions)
+		assert isHash(hOptions), "2nd arg not a hash: #{OL(hOptions)}"
+		{min, max} = hOptions
+		if defined(min) && (x < min)
 			result = false
-		if defined(hOptions.max) && (x > hOptions.max)
+		if defined(max) && (x > max)
 			result = false
 	return result
 

package/src/coffee_utils.js

@@ -27,6 +27,11 @@ export var isComment = function(line) {
   return defined(lMatches);
 };
 
+// ---------------------------------------------------------------------------
+export var isSubclassOf = function(subClass, superClass) {
+  return (subClass === superClass) || (subClass.prototype instanceof superClass);
+};
+
 // ---------------------------------------------------------------------------
 export var eval_expr = function(str) {
   str = str.replace(/\bundef\b/g, 'undefined');
@@ -37,14 +42,6 @@ export var eval_expr = function(str) {
 //   pass - do nothing
 export var pass = function() {};
 
-// ---------------------------------------------------------------------------
-export var getClassName = function(obj) {
-  if (typeof obj !== 'object') {
-    return undef;
-  }
-  return obj.constructor.name;
-};
-
 // ---------------------------------------------------------------------------
 export var patchStr = function(bigstr, pos, str) {
   var endpos;
@@ -68,6 +65,63 @@ export var charCount = function(str, ch) {
   return count;
 };
 
+// ---------------------------------------------------------------------------
+export var isConstructor = function(f) {
+  var err;
+  try {
+    new f();
+  } catch (error1) {
+    err = error1;
+    if (err.message.indexOf('is not a constructor') >= 0) {
+      return false;
+    }
+  }
+  return true;
+};
+
+// ---------------------------------------------------------------------------
+export var jsType = function(x) {
+  var lKeys;
+  if (notdefined(x)) {
+    return [undef, undef];
+  } else if (isString(x)) {
+    if (x.match(/^\s*$/)) {
+      return ['string', 'empty'];
+    } else {
+      return ['string', undef];
+    }
+  } else if (isNumber(x)) {
+    if (Number.isInteger(x)) {
+      return ['number', 'integer'];
+    } else {
+      return ['number', undef];
+    }
+  } else if (isBoolean(x)) {
+    return ['boolean', undef];
+  } else if (isHash(x)) {
+    lKeys = Object.keys(x);
+    if (lKeys.length === 0) {
+      return ['hash', 'empty'];
+    } else {
+      return ['hash', undef];
+    }
+  } else if (isArray(x)) {
+    if (x.length === 0) {
+      return ['array', 'empty'];
+    } else {
+      return ['array', undef];
+    }
+  } else if (isConstructor(x)) {
+    return ['function', 'constructor'];
+  } else if (isFunction(x)) {
+    return ['function', undef];
+  } else if (isObject(x)) {
+    return ['object', undef];
+  } else {
+    return croak(`Unknown type: ${OL(x)}`);
+  }
+};
+
 // ---------------------------------------------------------------------------
 export var isString = function(x) {
   return (typeof x === 'string') || (x instanceof String);
@@ -94,6 +148,14 @@ export var isObject = function(x) {
   return (typeof x === 'object') && !isString(x) && !isArray(x) && !isHash(x) && !isNumber(x);
 };
 
+// ---------------------------------------------------------------------------
+export var getClassName = function(obj) {
+  if (typeof obj !== 'object') {
+    return undef;
+  }
+  return obj.constructor.name;
+};
+
 // ---------------------------------------------------------------------------
 export var isArray = function(x) {
   return Array.isArray(x);
@@ -220,14 +282,16 @@ export var isRegExp = function(x) {
 };
 
 // ---------------------------------------------------------------------------
-export var isNumber = function(x, hOptions = {}) {
-  var result;
+export var isNumber = function(x, hOptions = undef) {
+  var max, min, result;
   result = (typeof x === 'number') || (x instanceof Number);
-  if (result) {
-    if (defined(hOptions.min) && (x < hOptions.min)) {
+  if (result && defined(hOptions)) {
+    assert(isHash(hOptions), `2nd arg not a hash: ${OL(hOptions)}`);
+    ({min, max} = hOptions);
+    if (defined(min) && (x < min)) {
       result = false;
     }
-    if (defined(hOptions.max) && (x > hOptions.max)) {
+    if (defined(max) && (x > max)) {
       result = false;
     }
   }

package/src/log_utils.coffee

@@ -183,7 +183,12 @@ export logItem = (label, item, pre='', itemPre=undef) ->
 		putstr "#{pre}#{labelStr}#{item}"
 	else if isString(item)
 		if (item.length <= maxOneLine)
-			putstr "#{pre}#{labelStr}'#{escapeStr(item)}'"
+			result = escapeStr(item)
+			hasApos = (result.indexOf("'") >= 0)
+			if hasApos
+				putstr "#{pre}#{labelStr}\"#{result}\""
+			else
+				putstr "#{pre}#{labelStr}'#{result}'"
 		else
 			if label
 				putstr "#{pre}#{label}:"

package/src/log_utils.js

@@ -184,7 +184,7 @@ export var logBareItem = function(item, pre = '') {
 
 // ---------------------------------------------------------------------------
 export var logItem = function(label, item, pre = '', itemPre = undef) {
-  var i, labelStr, len, ref, str;
+  var hasApos, i, labelStr, len, ref, result, str;
   assert(isString(pre), `not a string: ${OL(pre)}`);
   assert(isFunction(putstr), "putstr not properly set");
   assert(!label || isString(label), "label a non-string");
@@ -207,7 +207,13 @@ export var logItem = function(label, item, pre = '', itemPre = undef) {
     putstr(`${pre}${labelStr}${item}`);
   } else if (isString(item)) {
     if (item.length <= maxOneLine) {
-      putstr(`${pre}${labelStr}'${escapeStr(item)}'`);
+      result = escapeStr(item);
+      hasApos = result.indexOf("'") >= 0;
+      if (hasApos) {
+        putstr(`${pre}${labelStr}\"${result}\"`);
+      } else {
+        putstr(`${pre}${labelStr}'${result}'`);
+      }
     } else {
       if (label) {
         putstr(`${pre}${label}:`);