@jdeighan/coffee-utils 14.0.10 → 14.0.11

package/package.json

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

package/src/fs.coffee

@@ -242,17 +242,13 @@ export barf = (filepath, contents) =>
 # ---------------------------------------------------------------------------
 #   withExt - change file extention in a file name
 
-export withExt = (path, newExt, hOptions={}) =>
-	# --- Valid options:
-	#        removeLeadingUnderScore - boolean
+export withExt = (path, newExt) =>
 
 	assert newExt, "withExt(): No newExt provided"
 	if newExt.indexOf('.') != 0
 		newExt = '.' + newExt
 
 	{dir, name, ext} = pathlib.parse(path)
-	if hOptions.removeLeadingUnderScore && (name.indexOf('_')==0)
-		name = name.substr(1)
 	return mkpath(dir, "#{name}#{newExt}")
 
 # ---------------------------------------------------------------------------
@@ -261,12 +257,12 @@ export withExt = (path, newExt, hOptions={}) =>
 export removeFileWithExt = (path, newExt, hOptions={}) =>
 	# --- Valid options:
 	#        doLog
-	#        removeLeadingUnderScore
 
-	fullpath = withExt(path, newExt, hOptions)
+	{doLog} = getOptions(hOptions)
+	fullpath = withExt(path, newExt)
 	try
 		fs.unlinkSync fullpath
-		if hOptions.doLog
+		if doLog
 			LOG "   unlink #{filename}"
 		success = true
 	catch err

package/src/fs.js

@@ -284,32 +284,27 @@ export var barf = (filepath, contents) => {
 
 // ---------------------------------------------------------------------------
 //   withExt - change file extention in a file name
-export var withExt = (path, newExt, hOptions = {}) => {
+export var withExt = (path, newExt) => {
   var dir, ext, name;
-  // --- Valid options:
-  //        removeLeadingUnderScore - boolean
   assert(newExt, "withExt(): No newExt provided");
   if (newExt.indexOf('.') !== 0) {
     newExt = '.' + newExt;
   }
   ({dir, name, ext} = pathlib.parse(path));
-  if (hOptions.removeLeadingUnderScore && (name.indexOf('_') === 0)) {
-    name = name.substr(1);
-  }
   return mkpath(dir, `${name}${newExt}`);
 };
 
 // ---------------------------------------------------------------------------
 //   removeFileWithExt - remove file with different ext
 export var removeFileWithExt = (path, newExt, hOptions = {}) => {
-  var err, fullpath, success;
+  var doLog, err, fullpath, success;
   // --- Valid options:
   //        doLog
-  //        removeLeadingUnderScore
-  fullpath = withExt(path, newExt, hOptions);
+  ({doLog} = getOptions(hOptions));
+  fullpath = withExt(path, newExt);
   try {
     fs.unlinkSync(fullpath);
-    if (hOptions.doLog) {
+    if (doLog) {
       LOG(`   unlink ${filename}`);
     }
     success = true;