@jdeighan/coffee-utils 11.0.1 → 11.0.2

package/package.json

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

package/src/coffee_utils.coffee

@@ -162,13 +162,22 @@ export isBoolean = (x) ->
 
 # ---------------------------------------------------------------------------
 
-export isObject = (x) ->
+export isObject = (x, lReqKeys=undef) ->
 
-	return (typeof x == 'object') \
+	result = (typeof x == 'object') \
 			&& ! isString(x) \
 			&& ! isArray(x) \
 			&& ! isHash(x) \
 			&& ! isNumber(x)
+	if result
+		if defined(lReqKeys)
+			assert isArray(lReqKeys), "lReqKeys is not an array"
+			for key in lReqKeys
+				if ! x.hasOwnProperty(key)
+					return false
+		return true
+	else
+		return false
 
 # ---------------------------------------------------------------------------
 

package/src/coffee_utils.js

@@ -177,8 +177,23 @@ export var isBoolean = function(x) {
 };
 
 // ---------------------------------------------------------------------------
-export var isObject = function(x) {
-  return (typeof x === 'object') && !isString(x) && !isArray(x) && !isHash(x) && !isNumber(x);
+export var isObject = function(x, lReqKeys = undef) {
+  var i, key, len1, result;
+  result = (typeof x === 'object') && !isString(x) && !isArray(x) && !isHash(x) && !isNumber(x);
+  if (result) {
+    if (defined(lReqKeys)) {
+      assert(isArray(lReqKeys), "lReqKeys is not an array");
+      for (i = 0, len1 = lReqKeys.length; i < len1; i++) {
+        key = lReqKeys[i];
+        if (!x.hasOwnProperty(key)) {
+          return false;
+        }
+      }
+    }
+    return true;
+  } else {
+    return false;
+  }
 };
 
 // ---------------------------------------------------------------------------

package/src/taml.coffee

@@ -4,7 +4,7 @@ import yaml from 'js-yaml'
 
 import {assert, error, croak} from '@jdeighan/unit-tester/utils'
 import {
-	undef, oneline, isString, chomp, escapeStr,
+	undef, defined, notdefined, oneline, isString, chomp, escapeStr,
 	} from '@jdeighan/coffee-utils'
 import {untabify, tabify, splitLine} from '@jdeighan/coffee-utils/indent'
 import {slurp} from '@jdeighan/coffee-utils/fs'
@@ -63,24 +63,28 @@ export taml = (text) ->
 export fromTAML = taml
 
 # ---------------------------------------------------------------------------
+# --- a replacer is (key, value) -> newvalue
 
-escReplacer = (name, value) ->
+myReplacer = (name, value) ->
 
-	if ! isString(value)
+	if isString(value)
+		return escapeStr(value)
+	else
 		return value
-	return escapeStr(value)
 
 # ---------------------------------------------------------------------------
 
 export toTAML = (obj, hOptions={}) ->
 
-	{useTabs, sortKeys, escape} = hOptions
+	{useTabs, sortKeys, escape, replacer} = hOptions
+	if notdefined(replacer)
+		replacer = myReplacer
 	str = yaml.dump(obj, {
 		skipInvalid: true
 		indent: 3
 		sortKeys: !!sortKeys
 		lineWidth: -1
-		replacer: if !!escape then escReplacer else (name,value) -> value
+		replacer
 		})
 	if useTabs
 		str = str.replace(/   /g, "\t")

package/src/taml.js

@@ -1,6 +1,6 @@
 // Generated by CoffeeScript 2.7.0
 // taml.coffee
-var escReplacer, squote;
+var myReplacer, squote;
 
 import yaml from 'js-yaml';
 
@@ -12,6 +12,8 @@ import {
 
 import {
   undef,
+  defined,
+  notdefined,
   oneline,
   isString,
   chomp,
@@ -90,25 +92,28 @@ export var taml = function(text) {
 export var fromTAML = taml;
 
 // ---------------------------------------------------------------------------
-escReplacer = function(name, value) {
-  if (!isString(value)) {
+// --- a replacer is (key, value) -> newvalue
+myReplacer = function(name, value) {
+  if (isString(value)) {
+    return escapeStr(value);
+  } else {
     return value;
   }
-  return escapeStr(value);
 };
 
 // ---------------------------------------------------------------------------
 export var toTAML = function(obj, hOptions = {}) {
-  var escape, sortKeys, str, useTabs;
-  ({useTabs, sortKeys, escape} = hOptions);
+  var escape, replacer, sortKeys, str, useTabs;
+  ({useTabs, sortKeys, escape, replacer} = hOptions);
+  if (notdefined(replacer)) {
+    replacer = myReplacer;
+  }
   str = yaml.dump(obj, {
     skipInvalid: true,
     indent: 3,
     sortKeys: !!sortKeys,
     lineWidth: -1,
-    replacer: !!escape ? escReplacer : function(name, value) {
-      return value;
-    }
+    replacer
   });
   if (useTabs) {
     str = str.replace(/   /g, "\t");