@jdeighan/coffee-utils 5.0.0 → 5.0.1

package/package.json

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

package/src/DataStores.coffee

@@ -11,6 +11,7 @@ import {log} from '@jdeighan/coffee-utils/log'
 import {
 	withExt, slurp, barf, newerDestFileExists,
 	} from '@jdeighan/coffee-utils/fs'
+import {untabify} from '@jdeighan/coffee-utils/indent'
 
 # ---------------------------------------------------------------------------
 

package/src/DataStores.js

@@ -30,6 +30,10 @@ import {
   newerDestFileExists
 } from '@jdeighan/coffee-utils/fs';
 
+import {
+  untabify
+} from '@jdeighan/coffee-utils/indent';
+
 // ---------------------------------------------------------------------------
 export var WritableDataStore = class WritableDataStore {
   constructor(value = undef) {

package/src/coffee_utils.coffee

@@ -30,15 +30,15 @@ export assert = (cond, msg) ->
 
 export croak = (err, label, obj) ->
 
-	message = if (typeof err == 'object') then err.message else err
-	console.log "ERROR (croak): #{message}"
-	console.log obj, label
+	curmsg = if isString(err) then err else err.message
+	newmsg = """
+			ERROR (croak): #{curmsg}
+			#{label}:
+			#{JSON.stringify(obj)}
+			"""
 
 	# --- re-throw the error
-	if (typeof err == 'object')
-		throw err
-	else
-		throw new Error(message)
+	throw new Error(newmsg)
 
 # ---------------------------------------------------------------------------
 

package/src/coffee_utils.js

@@ -29,16 +29,13 @@ export var assert = function(cond, msg) {
 // ---------------------------------------------------------------------------
 //   croak - throws an error after possibly printing useful info
 export var croak = function(err, label, obj) {
-  var message;
-  message = (typeof err === 'object') ? err.message : err;
-  console.log(`ERROR (croak): ${message}`);
-  console.log(obj, label);
+  var curmsg, newmsg;
+  curmsg = isString(err) ? err : err.message;
+  newmsg = `ERROR (croak): ${curmsg}
+${label}:
+${JSON.stringify(obj)}`;
   // --- re-throw the error
-  if (typeof err === 'object') {
-    throw err;
-  } else {
-    throw new Error(message);
-  }
+  throw new Error(newmsg);
 };
 
 // ---------------------------------------------------------------------------