@ezs/basics 1.14.0 → 1.15.4

package/CHANGELOG.md

@@ -3,6 +3,55 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.15.4](https://github.com/Inist-CNRS/ezs/compare/@ezs/basics@1.15.3...@ezs/basics@1.15.4) (2022-01-31)
+
+
+### Bug Fixes
+
+* npm dependencies ([36c7ebe](https://github.com/Inist-CNRS/ezs/commit/36c7ebea03e82e9d177f7480f587511360e3dace))
+
+
+
+
+
+## [1.15.3](https://github.com/Inist-CNRS/ezs/compare/@ezs/basics@1.15.2...@ezs/basics@1.15.3) (2022-01-31)
+
+**Note:** Version bump only for package @ezs/basics
+
+
+
+
+
+## [1.15.2](https://github.com/Inist-CNRS/ezs/compare/@ezs/basics@1.15.1...@ezs/basics@1.15.2) (2022-01-27)
+
+**Note:** Version bump only for package @ezs/basics
+
+
+
+
+
+## [1.15.1](https://github.com/Inist-CNRS/ezs/compare/@ezs/basics@1.15.0...@ezs/basics@1.15.1) (2021-10-05)
+
+
+### Bug Fixes
+
+* 🐛 fix wrong options + miss dep.x ([5b38d05](https://github.com/Inist-CNRS/ezs/commit/5b38d05199a9a49c73d264f4ddb9a45dd0e64c7e))
+
+
+
+
+
+# [1.15.0](https://github.com/Inist-CNRS/ezs/compare/@ezs/basics@1.14.0...@ezs/basics@1.15.0) (2021-10-05)
+
+
+### Features
+
+* 🎸 introduce new parser ([66a408b](https://github.com/Inist-CNRS/ezs/commit/66a408b0be2f6f2374d7193df2576e2fa383d369))
+
+
+
+
+
 # [1.14.0](https://github.com/Inist-CNRS/ezs/compare/@ezs/basics@1.13.6...@ezs/basics@1.14.0) (2021-08-27)
 
 

package/README.md

@@ -284,6 +284,7 @@ Output:
 #### Parameters
 
 -   `separator` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** to split at every JSONPath found (optional, default `"*"`)
+-   `legacy` **[String](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** use legacy or newer parser (separator should be different) (optional, default `true`)
 
 Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
 

package/lib/json-parse.js

@@ -7,25 +7,35 @@ exports.default = void 0;
 
 var _JSONStream = _interopRequireDefault(require("JSONStream"));
 
+var _stream = require("stream");
+
+var _yajsonStream = _interopRequireDefault(require("yajson-stream"));
+
 var _streamWrite = _interopRequireDefault(require("stream-write"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function JSONParse(data, feed) {
-  if (!this.handle) {
+  if (this.isFirst()) {
+    const legacy = this.getParam('legacy', true);
     const separator = this.getParam('separator', '*');
-    this.handle = _JSONStream.default.parse(separator);
-    this.handle.on('data', obj => feed.write(obj));
+
+    if (legacy) {
+      this.input = _JSONStream.default.parse(separator);
+      this.whenFinish = feed.flow(this.input);
+    } else {
+      this.input = new _stream.PassThrough();
+      const stream = this.input.pipe(this.ezs.toBuffer()).pipe((0, _yajsonStream.default)(separator)).pipe(this.ezs((d, f) => f.send(d ? d.value : d)));
+      this.whenFinish = feed.flow(stream);
+    }
   }
 
-  if (!this.isLast()) {
-    (0, _streamWrite.default)(this.handle, data, () => feed.end());
-  } else {
-    this.handle.end();
-    process.nextTick(() => {
-      feed.close();
-    });
+  if (this.isLast()) {
+    this.whenFinish.finally(() => feed.close());
+    return this.input.end();
   }
+
+  (0, _streamWrite.default)(this.input, data, () => feed.end());
 }
 /**
  * Parse a `String` to JSON and generate objects.
@@ -69,6 +79,7 @@ function JSONParse(data, feed) {
  *
  * @name JSONParse
  * @param {String} [separator="*"] to split at every JSONPath found
+ * @param {String} [legacy=true] use legacy or newer parser (separator should be different)
  * @returns {Object}
  */
 

package/package.json

@@ -1,63 +1,58 @@
 {
   "name": "@ezs/basics",
-  "version": "1.14.0",
   "description": "Basics statements for EZS",
-  "directories": {
-    "test": "test"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/Inist-CNRS/ezs.git"
-  },
-  "keywords": [
-    "ezs"
-  ],
+  "version": "1.15.4",
   "author": "Nicolas Thouvenin <nthouvenin@gmail.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/Inist-CNRS/ezs/issues"
-  },
-  "homepage": "https://github.com/Inist-CNRS/ezs/tree/master/packages/basics#readme",
+  "bugs": "https://github.com/Inist-CNRS/ezs/issues",
   "dependencies": {
-    "JSONStream": "~1.3.5",
-    "better-https-proxy-agent": "1.0.8",
-    "csv-string": "~3.2.0",
-    "debug": "4.1.1",
+    "JSONStream": "1.3.5",
+    "better-https-proxy-agent": "1.0.9",
+    "csv-string": "3.2.0",
+    "debug": "4.3.3",
     "fetch-with-proxy": "3.0.1",
-    "flat": "~5.0.2",
+    "flat": "5.0.2",
     "lodash.escaperegexp": "4.1.2",
     "lodash.get": "4.4.2",
     "lodash.mapkeys": "4.6.0",
     "lodash.mapvalues": "4.6.0",
     "lodash.set": "4.3.2",
     "lodash.zipobject": "4.1.3",
-    "micromatch": "4.0.2",
+    "micromatch": "4.0.4",
     "node-abort-controller": "1.1.0",
     "parse-headers": "2.0.4",
     "stream-write": "1.0.1",
     "tmp-filepath": "2.0.0",
     "unzipper": "0.10.11",
-    "xml-mapping": "~1.7.1",
-    "xml-splitter": "~1.2.1"
+    "xml-mapping": "1.7.2",
+    "xml-splitter": "1.2.1",
+    "yajson-stream": "1.3.3"
+  },
+  "devDependencies": {
+    "pako": "2.0.4"
   },
+  "directories": {
+    "test": "test"
+  },
+  "gitHead": "653a28a1e40b088ea62b1b00c055de51e264dee1",
+  "homepage": "https://github.com/Inist-CNRS/ezs/tree/master/packages/basics#readme",
+  "keywords": [
+    "ezs"
+  ],
+  "license": "MIT",
   "main": "./lib/index.js",
+  "peerDependencies": {
+    "@ezs/core": "1.27.2"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": "Inist-CNRS/ezs.git",
   "scripts": {
+    "build": "babel --root-mode upward src --out-dir lib",
     "doc": "documentation readme src/* --sort-order=alpha --shallow --markdown-toc-max-depth=2 --readme-file=../../docs/plugin-basics.md --section=usage  && cp ../../docs/plugin-basics.md ./README.md",
     "lint": "eslint --ext=.js ./test/*.js ./src/*.js",
-    "build": "babel --root-mode upward src --out-dir lib",
     "prepublish": "npm run build",
     "pretest": "npm run build",
     "preversion": "npm run doc"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "devDependencies": {
-    "@ezs/core": "1.3.1",
-    "pako": "~1.0.11"
-  },
-  "peerDependencies": {
-    "@ezs/core": "*"
-  },
-  "gitHead": "c125659a94266cdeeeec21ee8d422231f51f6bbd"
+  }
 }