read-data-file 2.0.1 → 2.0.4

package/package.json

@@ -1,5 +1,5 @@
 { "name": "read-data-file",
-  "version": "2.0.1",
+  "version": "2.0.4",
   "description": "Read data/config files in various formats (parsers list is configurable).",
   "keywords": [
     "read data file",
@@ -25,27 +25,27 @@
   },
 
   "dependencies": {
-    "ceson": "^0.1.3",
-    "esmod-pmb": "^0.1.11",
-    "getown": "^0.1.0",
-    "if-fun": "^1.0.0",
-    "ini": "^1.3.5",
-    "is-string": "^1.0.4",
-    "js-yaml": "^3.13.1",
+    "ceson": "^0.1.5",
+    "esmod-pmb": "^0.1.13",
+    "getown": "^1.0.0",
+    "if-fun": "^1.0.1",
+    "ini": "^2.0.0",
+    "is-string": "^1.0.7",
     "json-parse-pmb": "^1.0.0",
-    "json5": "^2.1.1",
+    "json5": "^2.2.0",
     "map-assoc-core": "^0.1.3",
-    "merge-options": "^2.0.0",
+    "merge-options": "^3.0.4",
     "nofs": "^0.12.2",
-    "strip-bom": "^3.0.0",
-    "toml": "^2.3.6"
+    "safeload-yaml-pmb": "^4.210519.0",
+    "strip-bom": "^4.0.0",
+    "toml": "^3.0.0"
   },
   "devDependencies": {
     "absdir": "^1.0.6",
-    "equal-pmb": "^0.1.20",
-    "nodemjs": "^0.1.8",
-    "p-fatal": "^0.1.2",
-    "usnam-pmb": "^0.2.4"
+    "equal-pmb": "^0.1.24",
+    "nodemjs": "^0.1.9",
+    "p-fatal": "^0.1.3",
+    "usnam-pmb": "^0.2.5"
   },
 
 

package/rdf.mjs

@@ -15,7 +15,7 @@ import iniLib from 'ini';
 import json5Lib from 'json5';
 import jsonParser from 'json-parse-pmb';
 import tomlLib from 'toml';
-import yamlLib from 'js-yaml';
+import yamlSafeLoad from 'safeload-yaml-pmb';
 
 
 function makeReaderFunc() {
@@ -43,7 +43,7 @@ const defaultImpl = {
     json: jsonParser,
     json5(data) { return json5Lib.parse(data); },
     toml(data) { return tomlLib.parse(data); },
-    yaml(data) { return yamlLib.safeLoad(data); },
+    yaml(data) { return yamlSafeLoad(data); },
     yml: 'yaml',
   },
 
@@ -62,15 +62,28 @@ const defaultImpl = {
       return custom;
     },
 
-    findBestReaderAndParser(path) {
-      const { readersByFext, parsersByFext } = this;
+    parseFilenameDotParts(path, opt) {
+      const fmtOvr = opt.format;
+      if (fmtOvr) { return fmtOvr.split(/\./).reverse(); }
+      if (fmtOvr === undefined) {
+        const m = /^<fmt=([\w\.]+)>(?=[\S\s])/.exec(path);
+        if (m) {
+          const dp = m[1].split(/\./).reverse();
+          dp.realPath = path.slice(m[0].length);
+          return dp;
+        }
+      }
       const basename = pathLib.parse(path).base;
-      const dotParts = basename.split(/\./).slice(1).reverse();
+      return basename.split(/\./).slice(1).reverse();
+    },
+
+    findBestReaderAndParser(pathDotParts) {
+      const { readersByFext, parsersByFext } = this;
       // ^-- e.g. cats.json.rot13.gz -> [gz, rot13, json]
       let fext;
       let reader;
       let parser;
-      dotParts.forEach(function lookup(dotPart) {
+      pathDotParts.forEach(function lookup(dotPart) {
         fext = dotPart + (fext ? '.' + fext : '');
         if (reader === undefined) { reader = dlookup(readersByFext, fext); }
         if (parser === undefined) { parser = dlookup(parsersByFext, fext); }
@@ -93,11 +106,14 @@ const defaultImpl = {
       throw err;
     },
 
-    async readFile(path) {
-      const rop = this.findBestReaderAndParser(path);
-      if (!rop) { return this.unsupportedFext(path); }
+    async readFile(path, origOpt) {
+      const opt = { ...origOpt };
+      const dotParts = this.parseFilenameDotParts(path, opt);
+      const realPath = (dotParts.realPath || path);
+      const rop = this.findBestReaderAndParser(dotParts);
+      if (!rop) { return this.unsupportedFext(realPath); }
       const { reader, parser } = rop;
-      const content = await ifFun(reader, this.defaultReader)(path);
+      const content = await ifFun(reader, this.defaultReader)(realPath);
       const data = await ifFun(parser, identity)(content);
       return data;
     },

package/test/usage.mjs

@@ -22,9 +22,11 @@ async function shouldReject(pr) {
 
 
 // ¦mjsUsageDemo¦+
+function toNativeObjects(x) { return JSON.parse(JSON.stringify(x)); }
+
 async function verifyOneFixture(filename, customRdf) {
   const data = await (customRdf || readDataFile)(addTestDirPath(filename));
-  equal(data, nativeCats);
+  equal.named(filename, () => equal(toNativeObjects(data), nativeCats));
   console.log('+OK correct data for', filename);
 }
 
@@ -39,8 +41,8 @@ async function verifyAllFixtures() {
   await verifyOneFixture('cats.yml');
 
   const noIni = readDataFile.cfg({ parsersByFext: { ini: false } });
-  await shouldReject(verifyOneFixture('cats.ini', noIni)).then(rej => {
-    equal(rej.name, 'ReadDataFileUnsupportedFext');
+  await shouldReject(verifyOneFixture('cats.ini', noIni)).then((rej) => {
+    equal.named('noIni', () => equal(rej.name, 'ReadDataFileUnsupportedFext'));
     console.log('+OK ini parser disabled');
   });
 }