@jdeighan/coffee-utils 11.0.4 → 11.0.5

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "11.0.4",
+	"version": "11.0.5",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -50,14 +50,14 @@
 	},
 	"homepage": "https://github.com/johndeighan/coffee-utils#readme",
 	"dependencies": {
-		"@jdeighan/exceptions": "^1.0.3",
+		"@jdeighan/exceptions": "^1.0.4",
 		"cross-env": "^7.0.3",
 		"js-yaml": "^4.1.0",
 		"n-readlines": "^1.0.1",
 		"readline-sync": "^1.4.10",
-		"svelte": "^3.50.1"
+		"svelte": "^3.51.0"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^2.0.27"
+		"@jdeighan/unit-tester": "^2.0.28"
 	}
 }

package/src/Section.coffee

@@ -1,12 +1,12 @@
 # Section.coffee
 
 import {assert, croak} from '@jdeighan/exceptions'
+import {debug} from '@jdeighan/exceptions/debug'
 import {
 	pass, undef, defined, isArray, isEmpty,
 	} from '@jdeighan/coffee-utils'
 import {arrayToBlock} from '@jdeighan/coffee-utils/block'
 import {indented} from '@jdeighan/coffee-utils/indent'
-import {debug} from '@jdeighan/coffee-utils/debug'
 
 # ---------------------------------------------------------------------------
 

package/src/Section.js

@@ -5,6 +5,10 @@ import {
   croak
 } from '@jdeighan/exceptions';
 
+import {
+  debug
+} from '@jdeighan/exceptions/debug';
+
 import {
   pass,
   undef,
@@ -21,10 +25,6 @@ import {
   indented
 } from '@jdeighan/coffee-utils/indent';
 
-import {
-  debug
-} from '@jdeighan/coffee-utils/debug';
-
 // ---------------------------------------------------------------------------
 export var Section = class Section {
   constructor(name, content = undef) {

package/src/SectionMap.coffee

@@ -1,13 +1,14 @@
 # SectionMap.coffee
 
-import {LOG, assert, croak} from '@jdeighan/exceptions'
+import {assert, croak} from '@jdeighan/exceptions'
+import {LOG} from '@jdeighan/exceptions/log'
+import {debug} from '@jdeighan/exceptions/debug'
 import {
 	pass, undef, defined, notdefined, OL, isEmpty, nonEmpty,
 	isString, isHash, isArray, isUniqueTree, isNonEmptyString,
 	isNonEmptyArray,
 	} from '@jdeighan/coffee-utils'
 import {toBlock} from '@jdeighan/coffee-utils/block'
-import {debug} from '@jdeighan/coffee-utils/debug'
 import {isTAML, fromTAML} from '@jdeighan/coffee-utils/taml'
 import {Section} from '@jdeighan/coffee-utils/section'
 

package/src/SectionMap.js

@@ -3,11 +3,18 @@
 var isSectionName, isSetName;
 
 import {
-  LOG,
   assert,
   croak
 } from '@jdeighan/exceptions';
 
+import {
+  LOG
+} from '@jdeighan/exceptions/log';
+
+import {
+  debug
+} from '@jdeighan/exceptions/debug';
+
 import {
   pass,
   undef,
@@ -28,10 +35,6 @@ import {
   toBlock
 } from '@jdeighan/coffee-utils/block';
 
-import {
-  debug
-} from '@jdeighan/coffee-utils/debug';
-
 import {
   isTAML,
   fromTAML

package/src/block.coffee

@@ -4,29 +4,14 @@ import fs from 'fs'
 import readline from 'readline'
 
 import {assert, croak} from '@jdeighan/exceptions'
+import {blockToArray, arrayToBlock} from '@jdeighan/exceptions/utils'
 import {
 	undef, pass, defined, notdefined,
 	isEmpty, isString, isArray, nonEmpty, isArrayOfStrings,
 	rtrim, OL,
 	} from '@jdeighan/coffee-utils'
 
-# ---------------------------------------------------------------------------
-#   blockToArray - split a block into lines
-#   DEPRECATED - use toArray()
-
-export blockToArray = (block) ->
-
-	if isEmpty(block)
-		return []
-	else
-		lLines = block.split(/\r?\n/)
-
-		# --- remove trailing empty lines
-		len = lLines.length
-		while (len > 0) && isEmpty(lLines[len-1])
-			lLines.pop()
-			len -= 1
-		return lLines
+export {blockToArray, arrayToBlock}
 
 # ---------------------------------------------------------------------------
 #   toArray - split a block or array into lines w/o newlines
@@ -70,21 +55,6 @@ export toArray = (item, option=undef) ->
 			lNewLines.push line
 	return lNewLines
 
-# ---------------------------------------------------------------------------
-#   arrayToBlock - block and lines in block will have no trailing whitespace
-#   DEPRECATED - use toBlock()
-
-export arrayToBlock = (lLines) ->
-
-	if (lLines == undef)
-		return undef
-	assert isArray(lLines), "lLines is not an array"
-	lLines = lLines.filter((line) => defined(line));
-	if lLines.length == 0
-		return undef
-	else
-		return rtrim(lLines.join('\n'))
-
 # ---------------------------------------------------------------------------
 #   toBlock - block may have trailing whitespace
 #             but undef items are ignored

package/src/block.js

@@ -9,6 +9,11 @@ import {
   croak
 } from '@jdeighan/exceptions';
 
+import {
+  blockToArray,
+  arrayToBlock
+} from '@jdeighan/exceptions/utils';
+
 import {
   undef,
   pass,
@@ -23,29 +28,15 @@ import {
   OL
 } from '@jdeighan/coffee-utils';
 
-// ---------------------------------------------------------------------------
-//   blockToArray - split a block into lines
-//   DEPRECATED - use toArray()
-export var blockToArray = function(block) {
-  var lLines, len;
-  if (isEmpty(block)) {
-    return [];
-  } else {
-    lLines = block.split(/\r?\n/);
-    // --- remove trailing empty lines
-    len = lLines.length;
-    while ((len > 0) && isEmpty(lLines[len - 1])) {
-      lLines.pop();
-      len -= 1;
-    }
-    return lLines;
-  }
+export {
+  blockToArray,
+  arrayToBlock
 };
 
 // ---------------------------------------------------------------------------
 //   toArray - split a block or array into lines w/o newlines
 export var toArray = function(item, option = undef) {
-  var i, j, lLines, lNewLines, len1, len2, line, nonEmptyFound, ref, substr;
+  var i, j, lLines, lNewLines, len, len1, line, nonEmptyFound, ref, substr;
   // --- Valid options:
   //     'noEmptyLines'
   //     'noLeadingEmptyLines'
@@ -60,7 +51,7 @@ export var toArray = function(item, option = undef) {
   //     and possibly remove empty lines
   lNewLines = [];
   nonEmptyFound = false;
-  for (i = 0, len1 = lLines.length; i < len1; i++) {
+  for (i = 0, len = lLines.length; i < len; i++) {
     line = lLines[i];
     if (isEmpty(line)) {
       if ((option === 'noEmptyLines') || ((option === 'noLeadingEmptyLines') && !nonEmptyFound)) {
@@ -70,7 +61,7 @@ export var toArray = function(item, option = undef) {
       }
     } else if (line.indexOf("\n") > -1) {
       ref = toArray(line);
-      for (j = 0, len2 = ref.length; j < len2; j++) {
+      for (j = 0, len1 = ref.length; j < len1; j++) {
         substr = ref[j];
         if (isEmpty(substr)) {
           if ((option === 'noEmptyLines') || ((option === 'noLeadingEmptyLines') && !nonEmptyFound)) {
@@ -91,35 +82,17 @@ export var toArray = function(item, option = undef) {
   return lNewLines;
 };
 
-// ---------------------------------------------------------------------------
-//   arrayToBlock - block and lines in block will have no trailing whitespace
-//   DEPRECATED - use toBlock()
-export var arrayToBlock = function(lLines) {
-  if (lLines === undef) {
-    return undef;
-  }
-  assert(isArray(lLines), "lLines is not an array");
-  lLines = lLines.filter((line) => {
-    return defined(line);
-  });
-  if (lLines.length === 0) {
-    return undef;
-  } else {
-    return rtrim(lLines.join('\n'));
-  }
-};
-
 // ---------------------------------------------------------------------------
 //   toBlock - block may have trailing whitespace
 //             but undef items are ignored
 export var toBlock = function(lLines) {
-  var i, lNewLines, len1, line;
+  var i, lNewLines, len, line;
   if (notdefined(lLines)) {
     return undef;
   }
   assert(isArrayOfStrings(lLines), `lLines is not an array: ${OL(lLines)}`);
   lNewLines = [];
-  for (i = 0, len1 = lLines.length; i < len1; i++) {
+  for (i = 0, len = lLines.length; i < len; i++) {
     line = lLines[i];
     if (defined(line)) {
       lNewLines.push(rtrim(line));
@@ -173,10 +146,10 @@ export var normalizeBlock = function(content) {
     throw new Error("normalizeBlock(): not a string");
   }
   lLines = (function() {
-    var i, len1, ref, results;
+    var i, len, ref, results;
     ref = blockToArray(content);
     results = [];
-    for (i = 0, len1 = ref.length; i < len1; i++) {
+    for (i = 0, len = ref.length; i < len; i++) {
       line = ref[i];
       line = line.trim();
       results.push(line.replace(/\s+/g, ' '));
@@ -200,10 +173,10 @@ export var truncateBlock = function(str, numLines) {
 
 // ---------------------------------------------------------------------------
 export var joinBlocks = function(...lBlocks) {
-  var block, i, lNonEmptyBlocks, len1, ref;
+  var block, i, lNonEmptyBlocks, len, ref;
   lNonEmptyBlocks = [];
   ref = lBlocks.flat(999);
-  for (i = 0, len1 = ref.length; i < len1; i++) {
+  for (i = 0, len = ref.length; i < len; i++) {
     block = ref[i];
     assert(isString(block), `joinBlocks(): ${block} is not a string`);
     if (nonEmpty(block)) {

package/src/fs.coffee

@@ -5,7 +5,8 @@ import urllib from 'url'
 import fs from 'fs'
 import NReadLines from 'n-readlines'
 
-import {LOG, assert, croak} from '@jdeighan/exceptions'
+import {assert, croak} from '@jdeighan/exceptions'
+import {LOG} from '@jdeighan/exceptions/log'
 import {
 	undef, pass, defined, rtrim, isEmpty, nonEmpty,
 	isString, isArray, isHash, isRegExp, isFunction, OL,

package/src/fs.js

@@ -11,11 +11,14 @@ import fs from 'fs';
 import NReadLines from 'n-readlines';
 
 import {
-  LOG,
   assert,
   croak
 } from '@jdeighan/exceptions';
 
+import {
+  LOG
+} from '@jdeighan/exceptions/log';
+
 import {
   undef,
   pass,

package/src/fsa.coffee

@@ -1,12 +1,13 @@
 # fsa.coffee
 
-import {LOG, assert, croak} from '@jdeighan/exceptions'
+import {assert, croak} from '@jdeighan/exceptions'
+import {LOG} from '@jdeighan/exceptions/log'
+import {debug} from '@jdeighan/exceptions/debug'
 import {
 	undef, defined, notdefined, words, isEmpty, nonEmpty,
 	isString, OL,
 	} from '@jdeighan/coffee-utils'
 import {toArray} from '@jdeighan/coffee-utils/block'
-import {debug} from '@jdeighan/coffee-utils/debug'
 
 # ---------------------------------------------------------------------------
 

package/src/fsa.js

@@ -1,11 +1,18 @@
 // Generated by CoffeeScript 2.7.0
   // fsa.coffee
 import {
-  LOG,
   assert,
   croak
 } from '@jdeighan/exceptions';
 
+import {
+  LOG
+} from '@jdeighan/exceptions/log';
+
+import {
+  debug
+} from '@jdeighan/exceptions/debug';
+
 import {
   undef,
   defined,
@@ -21,10 +28,6 @@ import {
   toArray
 } from '@jdeighan/coffee-utils/block';
 
-import {
-  debug
-} from '@jdeighan/coffee-utils/debug';
-
 // ---------------------------------------------------------------------------
 export var FSA = class FSA {
   constructor(block) {

package/src/svelte.coffee

@@ -1,6 +1,7 @@
 # svelte.coffee
 
-import {assert, croak, LOG} from '@jdeighan/exceptions'
+import {assert, croak} from '@jdeighan/exceptions'
+import {LOG} from '@jdeighan/exceptions/log'
 import {isFunction} from '@jdeighan/coffee-utils'
 
 # ---------------------------------------------------------------------------

package/src/svelte.js

@@ -2,10 +2,13 @@
   // svelte.coffee
 import {
   assert,
-  croak,
-  LOG
+  croak
 } from '@jdeighan/exceptions';
 
+import {
+  LOG
+} from '@jdeighan/exceptions/log';
+
 import {
   isFunction
 } from '@jdeighan/coffee-utils';