@jdeighan/coffee-utils 4.1.31 → 4.1.35

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@jdeighan/coffee-utils",
 	"type": "module",
-	"version": "4.1.31",
+	"version": "4.1.35",
 	"description": "A set of utility functions for CoffeeScript",
 	"main": "coffee_utils.js",
 	"exports": {
@@ -17,6 +17,7 @@
 		"./svelte": "./src/svelte_utils.js",
 		"./test": "./src/UnitTester.js",
 		"./store": "./src/DataStores.js",
+		"./taml": "./src/taml.js",
 		"./package.json": "./package.json"
 	},
 	"engines": {
@@ -50,6 +51,6 @@
 		"cross-env": "^7.0.3",
 		"js-yaml": "^4.1.0",
 		"readline-sync": "^1.4.10",
-		"svelte": "^3.46.3"
+		"svelte": "^3.46.4"
 	}
 }

package/src/DataStores.coffee

@@ -1,6 +1,7 @@
 # DataStores.coffee
 
 import pathlib from 'path'
+import yaml from 'js-yaml'
 import {writable, readable, get} from 'svelte/store'
 
 import {
@@ -10,7 +11,6 @@ import {log} from '@jdeighan/coffee-utils/log'
 import {
 	withExt, slurp, barf, newerDestFileExists,
 	} from '@jdeighan/coffee-utils/fs'
-import {isTAML, taml} from '@jdeighan/string-input/taml'
 
 # ---------------------------------------------------------------------------
 
@@ -128,6 +128,14 @@ export class TAMLDataStore extends WritableDataStore
 #         UTILITIES
 # ---------------------------------------------------------------------------
 
+export taml = (text) ->
+
+	if ! text?
+		return undef
+	return yaml.load(untabify(text, 1), {skipInvalid: true})
+
+# ---------------------------------------------------------------------------
+
 export brewTamlStr = (code, stub) ->
 
 	return """

package/src/DataStores.js

@@ -2,6 +2,8 @@
 // DataStores.coffee
 import pathlib from 'path';
 
+import yaml from 'js-yaml';
+
 import {
   writable,
   readable,
@@ -28,11 +30,6 @@ import {
   newerDestFileExists
 } from '@jdeighan/coffee-utils/fs';
 
-import {
-  isTAML,
-  taml
-} from '@jdeighan/string-input/taml';
-
 // ---------------------------------------------------------------------------
 export var WritableDataStore = class WritableDataStore {
   constructor(value = undef) {
@@ -170,6 +167,16 @@ export var TAMLDataStore = class TAMLDataStore extends WritableDataStore {
 
 // ---------------------------------------------------------------------------
 //         UTILITIES
+// ---------------------------------------------------------------------------
+export var taml = function(text) {
+  if (text == null) {
+    return undef;
+  }
+  return yaml.load(untabify(text, 1), {
+    skipInvalid: true
+  });
+};
+
 // ---------------------------------------------------------------------------
 export var brewTamlStr = function(code, stub) {
   return `import {TAMLDataStore} from '@jdeighan/starbucks/stores';

package/src/taml.coffee

@@ -0,0 +1,40 @@
+# taml.coffee
+
+import yaml from 'js-yaml'
+
+import {
+	assert, undef, oneline, isString,
+	} from '@jdeighan/coffee-utils'
+import {untabify, tabify} from '@jdeighan/coffee-utils/indent'
+import {log, tamlStringify} from '@jdeighan/coffee-utils/log'
+import {slurp} from '@jdeighan/coffee-utils/fs'
+import {debug} from '@jdeighan/coffee-utils/debug'
+import {firstLine} from '@jdeighan/coffee-utils/block'
+
+# ---------------------------------------------------------------------------
+#   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 taml = (text) ->
+
+	debug "enter taml(#{oneline(text)})"
+	if ! text?
+		debug "return undef from taml() - text is not defined"
+		return undef
+	assert isTAML(text), "taml(): string #{oneline(text)} isn't TAML"
+	debug "return from taml()"
+	return yaml.load(untabify(text, 1), {skipInvalid: true})
+
+# ---------------------------------------------------------------------------
+#   slurpTAML - read TAML from a file
+
+export slurpTAML = (filepath) ->
+
+	contents = slurp(filepath)
+	return taml(contents)

package/src/taml.js

@@ -0,0 +1,61 @@
+// Generated by CoffeeScript 2.6.1
+// taml.coffee
+import yaml from 'js-yaml';
+
+import {
+  assert,
+  undef,
+  oneline,
+  isString
+} from '@jdeighan/coffee-utils';
+
+import {
+  untabify,
+  tabify
+} from '@jdeighan/coffee-utils/indent';
+
+import {
+  log,
+  tamlStringify
+} from '@jdeighan/coffee-utils/log';
+
+import {
+  slurp
+} from '@jdeighan/coffee-utils/fs';
+
+import {
+  debug
+} from '@jdeighan/coffee-utils/debug';
+
+import {
+  firstLine
+} from '@jdeighan/coffee-utils/block';
+
+// ---------------------------------------------------------------------------
+//   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 taml = function(text) {
+  debug(`enter taml(${oneline(text)})`);
+  if (text == null) {
+    debug("return undef from taml() - text is not defined");
+    return undef;
+  }
+  assert(isTAML(text), `taml(): string ${oneline(text)} isn't TAML`);
+  debug("return from taml()");
+  return yaml.load(untabify(text, 1), {
+    skipInvalid: true
+  });
+};
+
+// ---------------------------------------------------------------------------
+//   slurpTAML - read TAML from a file
+export var slurpTAML = function(filepath) {
+  var contents;
+  contents = slurp(filepath);
+  return taml(contents);
+};