@jdeighan/coffee-utils 11.0.8 → 11.0.10

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "11.0.8",
+	"version": "11.0.10",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -34,7 +34,7 @@
 	"scripts": {
 		"build": "cls && rm -f ./src/*.js && coffee -c ./src",
 		"pretest": "cls && cielo -qfc ./test && coffee -c .",
-		"test": "npx ava ./test/*.test.js"
+		"test": "npm run build && ava ./test/*.test.js && git status"
 	},
 	"repository": {
 		"type": "git",
@@ -50,7 +50,7 @@
 	},
 	"homepage": "https://github.com/johndeighan/coffee-utils#readme",
 	"dependencies": {
-		"@jdeighan/exceptions": "^1.0.7",
+		"@jdeighan/exceptions": "^1.0.8",
 		"cross-env": "^7.0.3",
 		"js-yaml": "^4.1.0",
 		"n-readlines": "^1.0.1",
@@ -58,6 +58,6 @@
 		"svelte": "^3.51.0"
 	},
 	"devDependencies": {
-		"@jdeighan/unit-tester": "^2.0.31"
+		"@jdeighan/unit-tester": "^2.0.32"
 	}
 }

package/src/fs.coffee

@@ -5,8 +5,7 @@ import urllib from 'url'
 import fs from 'fs'
 import NReadLines from 'n-readlines'
 
-import {assert, croak} from '@jdeighan/exceptions'
-import {LOG} from '@jdeighan/exceptions/log'
+import {assert, croak, LOG, fromTAML} from '@jdeighan/exceptions'
 import {
 	undef, pass, defined, rtrim, isEmpty, nonEmpty,
 	isString, isArray, isHash, isRegExp, isFunction, OL,
@@ -411,3 +410,11 @@ export backup = (file, from, to, report=false) ->
 			LOG "MISSING #{src}"
 	else
 		fs.copyFileSync(src, dest)
+
+# ---------------------------------------------------------------------------
+#   slurpTAML - read TAML from a file
+
+export slurpTAML = (filepath) ->
+
+	contents = slurp(filepath)
+	return fromTAML(contents)

package/src/fs.js

@@ -12,13 +12,11 @@ import NReadLines from 'n-readlines';
 
 import {
   assert,
-  croak
+  croak,
+  LOG,
+  fromTAML
 } from '@jdeighan/exceptions';
 
-import {
-  LOG
-} from '@jdeighan/exceptions/log';
-
 import {
   undef,
   pass,
@@ -487,3 +485,11 @@ export var backup = function(file, from, to, report = false) {
     return fs.copyFileSync(src, dest);
   }
 };
+
+// ---------------------------------------------------------------------------
+//   slurpTAML - read TAML from a file
+export var slurpTAML = function(filepath) {
+  var contents;
+  contents = slurp(filepath);
+  return fromTAML(contents);
+};

package/src/html.coffee

@@ -203,14 +203,12 @@ export tag2str = (hToken, type='begin') ->
 export elem = (tagName, hAttr=undef, text=undef, oneIndent="\t") ->
 
 	if isEmpty(text)
-		return undef
-	hToken = {
-		tagName
-		hAttr
-		text
-		}
-	return toBlock([
-		tag2str(hToken, 'begin')
-		indented(text, 1, oneIndent)
-		tag2str(hToken, 'end')
-		])
+		hToken = {tagName, hAttr}
+		return tag2str(hToken, 'begin') + tag2str(hToken, 'end')
+	else
+		hToken = {tagName, hAttr, text}
+		return toBlock([
+			tag2str(hToken, 'begin')
+			indented(text, 1, oneIndent)
+			tag2str(hToken, 'end')
+			])

package/src/html.js

@@ -210,8 +210,10 @@ export var tag2str = function(hToken, type = 'begin') {
 export var elem = function(tagName, hAttr = undef, text = undef, oneIndent = "\t") {
   var hToken;
   if (isEmpty(text)) {
-    return undef;
+    hToken = {tagName, hAttr};
+    return tag2str(hToken, 'begin') + tag2str(hToken, 'end');
+  } else {
+    hToken = {tagName, hAttr, text};
+    return toBlock([tag2str(hToken, 'begin'), indented(text, 1, oneIndent), tag2str(hToken, 'end')]);
   }
-  hToken = {tagName, hAttr, text};
-  return toBlock([tag2str(hToken, 'begin'), indented(text, 1, oneIndent), tag2str(hToken, 'end')]);
 };

package/src/taml.coffee

@@ -2,7 +2,7 @@
 
 import yaml from 'js-yaml'
 
-import {assert, croak} from '@jdeighan/exceptions'
+import {assert, croak, isTAML, fromTAML, toTAML} from '@jdeighan/exceptions'
 import {
 	undef, defined, notdefined, OL, chomp, escapeStr,
 	isString, isObject, isEmpty,
@@ -11,84 +11,6 @@ import {splitLine} from '@jdeighan/coffee-utils/indent'
 import {
 	firstLine, toArray, toBlock,
 	} from '@jdeighan/coffee-utils/block'
-import {slurp} from '@jdeighan/coffee-utils/fs'
+import {slurpTAML} from '@jdeighan/coffee-utils/fs'
 
-# ---------------------------------------------------------------------------
-#   isTAML - is the string valid TAML?
-
-export isTAML = (text) ->
-
-	return isString(text) && (firstLine(text).indexOf('---') == 0)
-
-# ---------------------------------------------------------------------------
-#   taml - convert valid TAML string to a JavaScript value
-
-export fromTAML = (text) ->
-
-	if notdefined(text)
-		return undef
-	assert isTAML(text), "string #{OL(text)} isn't TAML"
-
-	lLines = for line in toArray(text)
-		[level, str] = splitLine(line)
-		prefix = ' '.repeat(level)
-		if lMatches = line.match(///^
-				([A-Za-z_][A-Za-z0-9_]*)    # the key
-				\s*
-				:
-				\s*
-				(.*)
-				$///)
-			[_, key, text] = lMatches
-			if isEmpty(text) || text.match(/\d+(?:\.\d*)$/)
-				prefix + str
-			else
-				prefix + key + ':' + ' ' + squote(text)
-		else
-			prefix + str
-
-	return yaml.load(toBlock(lLines), {skipInvalid: true})
-
-# ---------------------------------------------------------------------------
-# --- a replacer is (key, value) -> newvalue
-
-myReplacer = (name, value) ->
-
-	if isString(value)
-		return escapeStr(value)
-	else if isObject(value, ['tamlReplacer'])
-		return value.tamlReplacer()
-	else
-		return value
-
-# ---------------------------------------------------------------------------
-
-export toTAML = (obj, hOptions={}) ->
-
-	{useTabs, sortKeys, escape, replacer} = hOptions
-	if notdefined(replacer)
-		replacer = myReplacer
-	str = yaml.dump(obj, {
-		skipInvalid: true
-		indent: 3
-		sortKeys: !!sortKeys
-		lineWidth: -1
-		replacer
-		})
-	if useTabs
-		str = str.replace(/   /g, "\t")
-	return "---\n" + chomp(str)
-
-# ---------------------------------------------------------------------------
-
-squote = (text) ->
-
-	return "'" + text.replace(/'/g, "''") + "'"
-
-# ---------------------------------------------------------------------------
-#   slurpTAML - read TAML from a file
-
-export slurpTAML = (filepath) ->
-
-	contents = slurp(filepath)
-	return fromTAML(contents)
+export {isTAML, fromTAML, toTAML, slurpTAML}

package/src/taml.js

@@ -1,12 +1,13 @@
 // Generated by CoffeeScript 2.7.0
 // taml.coffee
-var myReplacer, squote;
-
 import yaml from 'js-yaml';
 
 import {
   assert,
-  croak
+  croak,
+  isTAML,
+  fromTAML,
+  toTAML
 } from '@jdeighan/exceptions';
 
 import {
@@ -32,90 +33,12 @@ import {
 } from '@jdeighan/coffee-utils/block';
 
 import {
-  slurp
+  slurpTAML
 } from '@jdeighan/coffee-utils/fs';
 
-// ---------------------------------------------------------------------------
-//   isTAML - is the string valid TAML?
-export var isTAML = function(text) {
-  return isString(text) && (firstLine(text).indexOf('---') === 0);
-};
-
-// ---------------------------------------------------------------------------
-//   taml - convert valid TAML string to a JavaScript value
-export var fromTAML = function(text) {
-  var _, key, lLines, lMatches, level, line, prefix, str;
-  if (notdefined(text)) {
-    return undef;
-  }
-  assert(isTAML(text), `string ${OL(text)} isn't TAML`);
-  lLines = (function() {
-    var i, len, ref, results;
-    ref = toArray(text);
-    results = [];
-    for (i = 0, len = ref.length; i < len; i++) {
-      line = ref[i];
-      [level, str] = splitLine(line);
-      prefix = ' '.repeat(level);
-      if (lMatches = line.match(/^([A-Za-z_][A-Za-z0-9_]*)\s*:\s*(.*)$/)) { // the key
-        [_, key, text] = lMatches;
-        if (isEmpty(text) || text.match(/\d+(?:\.\d*)$/)) {
-          results.push(prefix + str);
-        } else {
-          results.push(prefix + key + ':' + ' ' + squote(text));
-        }
-      } else {
-        results.push(prefix + str);
-      }
-    }
-    return results;
-  })();
-  return yaml.load(toBlock(lLines), {
-    skipInvalid: true
-  });
-};
-
-// ---------------------------------------------------------------------------
-// --- a replacer is (key, value) -> newvalue
-myReplacer = function(name, value) {
-  if (isString(value)) {
-    return escapeStr(value);
-  } else if (isObject(value, ['tamlReplacer'])) {
-    return value.tamlReplacer();
-  } else {
-    return value;
-  }
-};
-
-// ---------------------------------------------------------------------------
-export var toTAML = function(obj, hOptions = {}) {
-  var escape, replacer, sortKeys, str, useTabs;
-  ({useTabs, sortKeys, escape, replacer} = hOptions);
-  if (notdefined(replacer)) {
-    replacer = myReplacer;
-  }
-  str = yaml.dump(obj, {
-    skipInvalid: true,
-    indent: 3,
-    sortKeys: !!sortKeys,
-    lineWidth: -1,
-    replacer
-  });
-  if (useTabs) {
-    str = str.replace(/   /g, "\t");
-  }
-  return "---\n" + chomp(str);
-};
-
-// ---------------------------------------------------------------------------
-squote = function(text) {
-  return "'" + text.replace(/'/g, "''") + "'";
-};
-
-// ---------------------------------------------------------------------------
-//   slurpTAML - read TAML from a file
-export var slurpTAML = function(filepath) {
-  var contents;
-  contents = slurp(filepath);
-  return fromTAML(contents);
+export {
+  isTAML,
+  fromTAML,
+  toTAML,
+  slurpTAML
 };