@jdeighan/coffee-utils 16.0.4 → 16.0.5

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "16.0.4",
+	"version": "16.0.5",
 	"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.29",
+		"@jdeighan/base-utils": "^4.0.33",
 		"cross-env": "^7.0.3",
 		"n-readlines": "^1.0.1",
 		"readline-sync": "^1.4.10",
 		"svelte": "^3.59.1"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^3.0.46",
+		"@jdeighan/unit-tester": "^3.0.47",
 		"ava": "^5.3.0"
 	}
 }

package/src/fs.coffee

@@ -16,11 +16,16 @@ import {
 	isString, isArray, isHash, isRegExp, isFunction, isBoolean,
 	OL, toBlock, getOptions, isArrayOfStrings,
 	} from '@jdeighan/base-utils'
+import {
+	mkpath, isFile, isDir, mkdirSync,
+	} from '@jdeighan/base-utils/fs'
 import {assert, croak} from '@jdeighan/base-utils/exceptions'
 import {LOG, LOGVALUE} from '@jdeighan/base-utils/log'
 import {dbg, dbgEnter, dbgReturn} from '@jdeighan/base-utils/debug'
 import {fromTAML} from '@jdeighan/base-utils/taml'
 
+export {mkpath, isFile, isDir, mkdirSync}
+
 fix = true
 
 # ---------------------------------------------------------------------------
@@ -32,37 +37,6 @@ export doFixOutput = (flag=true) =>
 
 # ---------------------------------------------------------------------------
 
-export mkpath = (lParts...) =>
-
-	# --- Ignore empty parts
-	lNewParts = []
-	for part in lParts
-		if nonEmpty(part)
-			lNewParts.push part
-
-	newPath = lNewParts.join('/').replaceAll('\\', '/')
-	if lMatches = newPath.match(/^([A-Z])\:(.*)$/)
-		[_, drive, rest] = lMatches
-		return "#{drive.toLowerCase()}:#{rest}"
-	else
-		return newPath
-
-# ---------------------------------------------------------------------------
-
-export mkdirSync = (dirpath) =>
-
-	try
-		fs.mkdirSync dirpath
-	catch err
-		if (err.code == 'EEXIST')
-			console.log 'Directory exists. Please choose another name'
-		else
-			console.log err
-		process.exit 1
-	return
-
-# ---------------------------------------------------------------------------
-
 export rmDir = (dirpath) =>
 
 	await rmdir dirpath, {recursive: true}
@@ -212,24 +186,6 @@ export getStats = (fullpath) =>
 
 # ---------------------------------------------------------------------------
 
-export isFile = (fullpath) =>
-
-	try
-		return getStats(fullpath).isFile()
-	catch
-		return false
-
-# ---------------------------------------------------------------------------
-
-export isDir = (fullpath) =>
-
-	try
-		return getStats(fullpath).isDirectory()
-	catch
-		return false
-
-# ---------------------------------------------------------------------------
-
 export isSimpleFileName = (path) =>
 
 	h = pathlib.parse(path)

package/src/fs.js

@@ -45,6 +45,13 @@ import {
   isArrayOfStrings
 } from '@jdeighan/base-utils';
 
+import {
+  mkpath,
+  isFile,
+  isDir,
+  mkdirSync
+} from '@jdeighan/base-utils/fs';
+
 import {
   assert,
   croak
@@ -65,6 +72,13 @@ import {
   fromTAML
 } from '@jdeighan/base-utils/taml';
 
+export {
+  mkpath,
+  isFile,
+  isDir,
+  mkdirSync
+};
+
 fix = true;
 
 // ---------------------------------------------------------------------------
@@ -72,42 +86,6 @@ export var doFixOutput = (flag = true) => {
   fix = flag;
 };
 
-// ---------------------------------------------------------------------------
-export var mkpath = (...lParts) => {
-  var _, drive, i, lMatches, lNewParts, len, newPath, part, rest;
-  // --- Ignore empty parts
-  lNewParts = [];
-  for (i = 0, len = lParts.length; i < len; i++) {
-    part = lParts[i];
-    if (nonEmpty(part)) {
-      lNewParts.push(part);
-    }
-  }
-  newPath = lNewParts.join('/').replaceAll('\\', '/');
-  if (lMatches = newPath.match(/^([A-Z])\:(.*)$/)) {
-    [_, drive, rest] = lMatches;
-    return `${drive.toLowerCase()}:${rest}`;
-  } else {
-    return newPath;
-  }
-};
-
-// ---------------------------------------------------------------------------
-export var mkdirSync = (dirpath) => {
-  var err;
-  try {
-    fs.mkdirSync(dirpath);
-  } catch (error1) {
-    err = error1;
-    if (err.code === 'EEXIST') {
-      console.log('Directory exists. Please choose another name');
-    } else {
-      console.log(err);
-    }
-    process.exit(1);
-  }
-};
-
 // ---------------------------------------------------------------------------
 export var rmDir = async(dirpath) => {
   await rmdir(dirpath, {
@@ -264,24 +242,6 @@ export var getStats = (fullpath) => {
   return fs.lstatSync(fullpath);
 };
 
-// ---------------------------------------------------------------------------
-export var isFile = (fullpath) => {
-  try {
-    return getStats(fullpath).isFile();
-  } catch (error1) {
-    return false;
-  }
-};
-
-// ---------------------------------------------------------------------------
-export var isDir = (fullpath) => {
-  try {
-    return getStats(fullpath).isDirectory();
-  } catch (error1) {
-    return false;
-  }
-};
-
 // ---------------------------------------------------------------------------
 export var isSimpleFileName = (path) => {
   var h;