@jdeighan/coffee-utils 14.0.9 → 14.0.11

package/package.json

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

package/src/DataStores.coffee

@@ -3,7 +3,9 @@
 import pathlib from 'path'
 import {writable, readable, get} from 'svelte/store'
 
-import {undef, pass, range} from '@jdeighan/base-utils'
+import {
+	undef, defined, notdefined, pass, range, getOptions,
+	} from '@jdeighan/base-utils'
 import {assert, croak} from '@jdeighan/base-utils/exceptions'
 import {fromTAML} from '@jdeighan/base-utils/taml'
 import {localStore} from '@jdeighan/coffee-utils/browser'
@@ -41,9 +43,11 @@ export class WritableDataStore
 
 	set: (value) ->
 		@store.set(value)
+		return
 
 	update: (func) ->
 		@store.update(func)
+		return
 
 # ---------------------------------------------------------------------------
 
@@ -55,21 +59,22 @@ export class LocalStorageDataStore extends WritableDataStore
 		#     so we can't get the localStorage value first
 		super defValue
 		value = localStore(@masterKey)
-		if value?
+		if defined(value)
 			@set value
 
 	# --- I'm assuming that when update() is called,
 	#     set() will also be called
 
 	set: (value) ->
-		if ! value?
-			croak "LocalStorageStore.set(): cannont set to undef"
+		assert defined(value), "set(): cannot set to undef"
 		super value
 		localStore @masterKey, value
+		return
 
 	update: (func) ->
 		super func
 		localStore @masterKey, get(@store)
+		return
 
 # ---------------------------------------------------------------------------
 
@@ -79,11 +84,12 @@ export class PropsDataStore extends LocalStorageDataStore
 		super masterKey, {}
 
 	setProp: (name, value) ->
-		if ! name?
-			croak "PropStore.setProp(): empty key"
+
+		assert defined(name), "PropStore.setProp(): empty key"
 		@update (hPrefs) ->
 			hPrefs[name] = value
 			return hPrefs
+		return
 
 # ---------------------------------------------------------------------------
 
@@ -99,10 +105,10 @@ export class ReadableDataStore
 		return @store.subscribe(callback)
 
 	start: () ->
-		pass
+		return
 
 	stop: () ->
-		pass
+		return
 
 # ---------------------------------------------------------------------------
 
@@ -113,9 +119,11 @@ export class DateTimeDataStore extends ReadableDataStore
 		@interval = setInterval(() ->
 			@setter new Date()
 			, 1000)
+		return
 
 	stop: () ->
 		clearInterval @interval
+		return
 
 # ---------------------------------------------------------------------------
 
@@ -129,9 +137,11 @@ export class MousePosDataStore extends ReadableDataStore
 				y: e.clientY,
 				}
 		document.body.addEventListener('mousemove', @mouseMoveHandler)
+		return
 
 	stop: () ->
 		document.body.removeEventListener('mousemove', @mouseMoveHandler)
+		return
 
 # ---------------------------------------------------------------------------
 
@@ -199,8 +209,7 @@ export class ToDoDataStore extends BaseDataStore
 		return
 
 	add: (name) ->
-		if defined(@find(name))
-			croak "Attempt to add duplicate #{name} todo"
+		assert notdefined(@find(name)), "Todo #{name} already exists"
 		@lToDos.push {
 			text: name
 			done: false
@@ -233,9 +242,10 @@ export brewTamlFile = (srcPath, destPath=undef, hOptions={}) =>
 	#     Valid Options:
 	#        force
 
-	if ! destPath?
-		destPath = withExt(srcPath, '.js', {removeLeadingUnderScore:true})
-	if hOptions.force || ! newerDestFileExists(srcPath, destPath)
+	if notdefined(destPath)
+		destPath = withExt(srcPath, '.js')
+	{force} = getOptions(hOptions)
+	if force || ! newerDestFileExists(srcPath, destPath)
 		hInfo = pathlib.parse(destPath)
 		stub = hInfo.name
 

package/src/DataStores.js

@@ -10,8 +10,11 @@ import {
 
 import {
   undef,
+  defined,
+  notdefined,
   pass,
-  range
+  range,
+  getOptions
 } from '@jdeighan/base-utils';
 
 import {
@@ -68,11 +71,11 @@ export var WritableDataStore = class WritableDataStore {
   }
 
   set(value) {
-    return this.store.set(value);
+    this.store.set(value);
   }
 
   update(func) {
-    return this.store.update(func);
+    this.store.update(func);
   }
 
 };
@@ -84,7 +87,7 @@ export var LocalStorageDataStore = class LocalStorageDataStore extends WritableD
     super(defValue);
     this.masterKey = masterKey1;
     value = localStore(this.masterKey);
-    if (value != null) {
+    if (defined(value)) {
       this.set(value);
     }
   }
@@ -92,16 +95,14 @@ export var LocalStorageDataStore = class LocalStorageDataStore extends WritableD
   // --- I'm assuming that when update() is called,
   //     set() will also be called
   set(value) {
-    if (value == null) {
-      croak("LocalStorageStore.set(): cannont set to undef");
-    }
+    assert(defined(value), "set(): cannot set to undef");
     super.set(value);
-    return localStore(this.masterKey, value);
+    localStore(this.masterKey, value);
   }
 
   update(func) {
     super.update(func);
-    return localStore(this.masterKey, get(this.store));
+    localStore(this.masterKey, get(this.store));
   }
 
 };
@@ -113,10 +114,8 @@ export var PropsDataStore = class PropsDataStore extends LocalStorageDataStore {
   }
 
   setProp(name, value) {
-    if (name == null) {
-      croak("PropStore.setProp(): empty key");
-    }
-    return this.update(function(hPrefs) {
+    assert(defined(name), "PropStore.setProp(): empty key");
+    this.update(function(hPrefs) {
       hPrefs[name] = value;
       return hPrefs;
     });
@@ -140,13 +139,9 @@ export var ReadableDataStore = class ReadableDataStore {
     return this.store.subscribe(callback);
   }
 
-  start() {
-    return pass;
-  }
+  start() {}
 
-  stop() {
-    return pass;
-  }
+  stop() {}
 
 };
 
@@ -154,13 +149,13 @@ export var ReadableDataStore = class ReadableDataStore {
 export var DateTimeDataStore = class DateTimeDataStore extends ReadableDataStore {
   start() {
     // --- We need to store this interval for use in stop() later
-    return this.interval = setInterval(function() {
+    this.interval = setInterval(function() {
       return this.setter(new Date(), 1000);
     });
   }
 
   stop() {
-    return clearInterval(this.interval);
+    clearInterval(this.interval);
   }
 
 };
@@ -175,11 +170,11 @@ export var MousePosDataStore = class MousePosDataStore extends ReadableDataStore
         y: e.clientY
       });
     };
-    return document.body.addEventListener('mousemove', this.mouseMoveHandler);
+    document.body.addEventListener('mousemove', this.mouseMoveHandler);
   }
 
   stop() {
-    return document.body.removeEventListener('mousemove', this.mouseMoveHandler);
+    document.body.removeEventListener('mousemove', this.mouseMoveHandler);
   }
 
 };
@@ -267,9 +262,7 @@ export var ToDoDataStore = class ToDoDataStore extends BaseDataStore {
   }
 
   add(name) {
-    if (defined(this.find(name))) {
-      croak(`Attempt to add duplicate ${name} todo`);
-    }
+    assert(notdefined(this.find(name)), `Todo ${name} already exists`);
     this.lToDos.push({
       text: name,
       done: false
@@ -297,13 +290,15 @@ export let ${stub} = new TAMLDataStore(\`${code}\`);`;
 
 // ---------------------------------------------------------------------------
 export var brewTamlFile = (srcPath, destPath = undef, hOptions = {}) => {
-  var hInfo, jsCode, stub, tamlCode;
-  if (destPath == null) {
-    destPath = withExt(srcPath, '.js', {
-      removeLeadingUnderScore: true
-    });
-  }
-  if (hOptions.force || !newerDestFileExists(srcPath, destPath)) {
+  var force, hInfo, jsCode, stub, tamlCode;
+  // --- taml => js
+  //     Valid Options:
+  //        force
+  if (notdefined(destPath)) {
+    destPath = withExt(srcPath, '.js');
+  }
+  ({force} = getOptions(hOptions));
+  if (force || !newerDestFileExists(srcPath, destPath)) {
     hInfo = pathlib.parse(destPath);
     stub = hInfo.name;
     tamlCode = slurp(srcPath);

package/src/browser.coffee

@@ -1,6 +1,6 @@
 # browser.coffee
 
-import {undef} from '@jdeighan/base-utils'
+import {undef, defined, notdefined} from '@jdeighan/base-utils'
 
 audio = undef   # audio context - create only when needed, then keep
 
@@ -27,15 +27,11 @@ export beep = (volume=100, freq=520, duration=200) =>
 export localStore = (key, value=undef) =>
 	# --- if value is undef, returns the current value
 
-	if typeof localStorage == 'undefined'
-		return
-	if value?
-		localStorage.setItem key, JSON.stringify(value)
-		return
-	else
-		value = localStorage.getItem(key)
-		if value?
-			return JSON.parse(localStorage.getItem(key))
+	if (typeof localStorage != 'undefined')
+		if defined(value)
+			localStorage.setItem key, JSON.stringify(value)
 		else
-			return undef
-
+			value = localStorage.getItem(key)
+			if defined(value)
+				return JSON.parse(localStorage.getItem(key))
+	return undef

package/src/browser.js

@@ -3,7 +3,9 @@
 var audio;
 
 import {
-  undef
+  undef,
+  defined,
+  notdefined
 } from '@jdeighan/base-utils';
 
 audio = undef; // audio context - create only when needed, then keep
@@ -30,17 +32,15 @@ export var beep = (volume = 100, freq = 520, duration = 200) => {
 // ---------------------------------------------------------------------------
 export var localStore = (key, value = undef) => {
   // --- if value is undef, returns the current value
-  if (typeof localStorage === 'undefined') {
-    return;
-  }
-  if (value != null) {
-    localStorage.setItem(key, JSON.stringify(value));
-  } else {
-    value = localStorage.getItem(key);
-    if (value != null) {
-      return JSON.parse(localStorage.getItem(key));
+  if (typeof localStorage !== 'undefined') {
+    if (defined(value)) {
+      localStorage.setItem(key, JSON.stringify(value));
     } else {
-      return undef;
+      value = localStorage.getItem(key);
+      if (defined(value)) {
+        return JSON.parse(localStorage.getItem(key));
+      }
     }
   }
+  return undef;
 };

package/src/fs.coffee

@@ -7,8 +7,9 @@ import readline from 'readline'
 import NReadLines from 'n-readlines'
 
 import {
-	undef, pass, defined, rtrim, isEmpty, nonEmpty, getOptions,
-	isString, isArray, isHash, isRegExp, isFunction, OL, toBlock,
+	undef, pass, defined, notdefined, rtrim, isEmpty, nonEmpty,
+	isString, isArray, isHash, isRegExp, isFunction,
+	OL, toBlock, getOptions,
 	} from '@jdeighan/base-utils'
 import {assert, croak} from '@jdeighan/base-utils/exceptions'
 import {LOG, LOGVALUE} from '@jdeighan/base-utils/log'
@@ -190,7 +191,7 @@ export forEachSetOfBlocks = (filepath, func,
 				if (result == true)
 					earlyExit = true
 					return true
-				else if result?
+				else if defined(result)
 					croak "forEachSetOfBlocks() - callback returned '#{result}'"
 			lBlocks = []
 			firstLineNum = lineNum+1
@@ -241,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}")
 
 # ---------------------------------------------------------------------------
@@ -260,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
@@ -319,7 +316,7 @@ export forEachFile = (dir, cb, filt=undef, level=0) =>
 		if ent.isDirectory()
 			lSubDirectories.push ent
 		else if ent.isFile()
-			if ! filt?
+			if notdefined(filt)
 				cb(ent.name, dir, level)
 			else if isRegExp(filt)
 				if ent.name.match(filt)
@@ -394,7 +391,7 @@ export allPathsTo = (fname, searchDir) =>
 	if ! searchDir
 		searchDir = process.cwd()
 	path = pathTo(fname, searchDir, {direction: "up"})
-	if path?
+	if defined(path)
 		lPaths = [path]    # --- build an array of paths
 		# --- search upward for files, but return ordered top down
 		while (h = pathlib.parse(path)) \

package/src/fs.js

@@ -16,17 +16,18 @@ import {
   undef,
   pass,
   defined,
+  notdefined,
   rtrim,
   isEmpty,
   nonEmpty,
-  getOptions,
   isString,
   isArray,
   isHash,
   isRegExp,
   isFunction,
   OL,
-  toBlock
+  toBlock,
+  getOptions
 } from '@jdeighan/base-utils';
 
 import {
@@ -226,7 +227,7 @@ export var forEachSetOfBlocks = (filepath, func, block_regexp = /^-{16,}$/, set_
         if (result === true) {
           earlyExit = true;
           return true;
-        } else if (result != null) {
+        } else if (defined(result)) {
           croak(`forEachSetOfBlocks() - callback returned '${result}'`);
         }
       }
@@ -283,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;
@@ -371,7 +367,7 @@ export var forEachFile = (dir, cb, filt = undef, level = 0) => {
     if (ent.isDirectory()) {
       lSubDirectories.push(ent);
     } else if (ent.isFile()) {
-      if (filt == null) {
+      if (notdefined(filt)) {
         cb(ent.name, dir, level);
       } else if (isRegExp(filt)) {
         if (ent.name.match(filt)) {
@@ -466,7 +462,7 @@ export var allPathsTo = (fname, searchDir) => {
   path = pathTo(fname, searchDir, {
     direction: "up"
   });
-  if (path != null) {
+  if (defined(path)) {
     lPaths = [path]; // --- build an array of paths
     // --- search upward for files, but return ordered top down
     while ((h = pathlib.parse(path)) && (path = pathTo(fname, pathlib.resolve(h.dir, '..'), {