@jdeighan/coffee-utils 16.0.0 → 16.0.2

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "16.0.0",
+	"version": "16.0.2",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -45,14 +45,14 @@
 	},
 	"homepage": "https://github.com/johndeighan/coffee-utils#readme",
 	"dependencies": {
-		"@jdeighan/base-utils": "^4.0.26",
+		"@jdeighan/base-utils": "^4.0.27",
 		"cross-env": "^7.0.3",
 		"n-readlines": "^1.0.1",
 		"readline-sync": "^1.4.10",
-		"svelte": "^3.58.0"
+		"svelte": "^3.59.1"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^3.0.44",
+		"@jdeighan/unit-tester": "^3.0.45",
 		"ava": "^5.2.0"
 	}
 }

package/src/fs.coffee

@@ -14,7 +14,7 @@ import NReadLines from 'n-readlines'
 import {
 	undef, pass, defined, notdefined, rtrim, isEmpty, nonEmpty,
 	isString, isArray, isHash, isRegExp, isFunction, isBoolean,
-	OL, toBlock, getOptions,
+	OL, toBlock, getOptions, isArrayOfStrings,
 	} from '@jdeighan/base-utils'
 import {assert, croak} from '@jdeighan/base-utils/exceptions'
 import {LOG, LOGVALUE} from '@jdeighan/base-utils/log'
@@ -93,7 +93,7 @@ export rmFileSync = (filepath) =>
 
 export fixOutput = (contents) =>
 
-	if fix
+	if fix && isString(contents)
 		return rtrim(contents) + "\n"
 	else
 		return contents
@@ -398,12 +398,11 @@ export barf = (filepath, contents='', hOptions={}) =>
 			contents = JSON.stringify(contents, null, 3)
 		else
 			assert notdefined(format), "Unknown format: #{format}"
-			if isArray(contents)
-				contents = toBlock(contents)
-			else if ! isString(contents)
-				croak "barf(): Invalid contents"
-			contents = fixOutput(contents)
-	fs.writeFileSync(filepath, contents, {encoding: 'utf8'})
+			if isArrayOfStrings(contents)
+				contents = fixOutput(toBlock(contents))
+			else if isString(contents)
+				contents = fixOutput(contents)
+	fs.writeFileSync(filepath, contents)
 	return
 
 # ---------------------------------------------------------------------------

package/src/fs.js

@@ -41,7 +41,8 @@ import {
   isBoolean,
   OL,
   toBlock,
-  getOptions
+  getOptions,
+  isArrayOfStrings
 } from '@jdeighan/base-utils';
 
 import {
@@ -133,7 +134,7 @@ export var rmFileSync = (filepath) => {
 
 // --------------------------------------------------------------------------
 export var fixOutput = (contents) => {
-  if (fix) {
+  if (fix && isString(contents)) {
     return rtrim(contents) + "\n";
   } else {
     return contents;
@@ -461,16 +462,13 @@ export var barf = (filepath, contents = '', hOptions = {}) => {
       break;
     default:
       assert(notdefined(format), `Unknown format: ${format}`);
-      if (isArray(contents)) {
-        contents = toBlock(contents);
-      } else if (!isString(contents)) {
-        croak("barf(): Invalid contents");
+      if (isArrayOfStrings(contents)) {
+        contents = fixOutput(toBlock(contents));
+      } else if (isString(contents)) {
+        contents = fixOutput(contents);
       }
-      contents = fixOutput(contents);
   }
-  fs.writeFileSync(filepath, contents, {
-    encoding: 'utf8'
-  });
+  fs.writeFileSync(filepath, contents);
 };
 
 // ---------------------------------------------------------------------------