sdf-parser 7.0.2 → 7.0.3

package/lib/index.js

@@ -214,12 +214,18 @@ class MolfileStream extends TransformStream {
         this.#buffer += chunk;
         let begin = 0;
         let index = 0;
-        while ((index = this.#buffer.indexOf('\n$$$$', index)) !== -1) {
-          controller.enqueue(this.#buffer.slice(begin, index));
-          index += 5;
-          if (this.#buffer[index] === '\r') {
-            index++;
+        while ((index = this.#buffer.indexOf('$$$$', index)) !== -1) {
+          // we need to check if the delimiter '\n' is in the current buffer
+          // if it is not we need to wait for the next chunk
+          const endOfDelimiter = this.#buffer.indexOf('\n', index);
+          if (endOfDelimiter === -1) {
+            index = begin;
+            break;
           }
+          const eolLength = this.#buffer[endOfDelimiter - 1] === '\r' ? 2 : 1;
+          // need to remove the last eol because we will split on eol+'>' in getMolecule
+          controller.enqueue(this.#buffer.slice(begin, index - eolLength));
+          index = endOfDelimiter + eolLength;
           begin = index;
         }
         this.#buffer = this.#buffer.slice(begin);
@@ -234,7 +240,7 @@ class MolfileStream extends TransformStream {
 }
 
 /**
- *  Parse a SDF file
+ *  Parse a SDF file as an iterator
  * @param {ReadableStream} readStream - SDF file to parse
  * @param {object} [options={}] - iterator options
  * @param {Function} [options.filter] - Callback allowing to filter the molecules
@@ -245,10 +251,10 @@ class MolfileStream extends TransformStream {
 async function* iterator(readStream, options = {}) {
   const { eol = '\n', dynamicTyping = true } = options;
 
-  const moleculeStream = readStream.pipeThrough(new MolfileStream());
-  for await (const molfile of moleculeStream) {
-    if (molfile.length < 20) continue;
-    const molecule = getMolecule(molfile, {
+  const moleculeStream = readStream.pipeThrough(new MolfileStream({ eol }));
+  for await (const entry of moleculeStream) {
+    if (entry.length < 20) continue;
+    const molecule = getMolecule(entry, {
       eol,
       dynamicTyping,
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sdf-parser",
-  "version": "7.0.2",
+  "version": "7.0.3",
   "description": "SDF parser",
   "main": "lib/index.js",
   "module": "src/index.js",

package/src/MolfileStream.js

@@ -7,12 +7,18 @@ export class MolfileStream extends TransformStream {
         this.#buffer += chunk;
         let begin = 0;
         let index = 0;
-        while ((index = this.#buffer.indexOf('\n$$$$', index)) !== -1) {
-          controller.enqueue(this.#buffer.slice(begin, index));
-          index += 5;
-          if (this.#buffer[index] === '\r') {
-            index++;
+        while ((index = this.#buffer.indexOf('$$$$', index)) !== -1) {
+          // we need to check if the delimiter '\n' is in the current buffer
+          // if it is not we need to wait for the next chunk
+          const endOfDelimiter = this.#buffer.indexOf('\n', index);
+          if (endOfDelimiter === -1) {
+            index = begin;
+            break;
           }
+          const eolLength = this.#buffer[endOfDelimiter - 1] === '\r' ? 2 : 1;
+          // need to remove the last eol because we will split on eol+'>' in getMolecule
+          controller.enqueue(this.#buffer.slice(begin, index - eolLength));
+          index = endOfDelimiter + eolLength;
           begin = index;
         }
         this.#buffer = this.#buffer.slice(begin);

package/src/iterator.js

@@ -3,7 +3,7 @@ import { parseString } from 'dynamic-typing';
 import { MolfileStream } from './MolfileStream.js';
 
 /**
- *  Parse a SDF file
+ *  Parse a SDF file as an iterator
  * @param {ReadableStream} readStream - SDF file to parse
  * @param {object} [options={}] - iterator options
  * @param {Function} [options.filter] - Callback allowing to filter the molecules
@@ -14,10 +14,10 @@ import { MolfileStream } from './MolfileStream.js';
 export async function* iterator(readStream, options = {}) {
   const { eol = '\n', dynamicTyping = true } = options;
 
-  const moleculeStream = readStream.pipeThrough(new MolfileStream());
-  for await (const molfile of moleculeStream) {
-    if (molfile.length < 20) continue;
-    const molecule = getMolecule(molfile, {
+  const moleculeStream = readStream.pipeThrough(new MolfileStream({ eol }));
+  for await (const entry of moleculeStream) {
+    if (entry.length < 20) continue;
+    const molecule = getMolecule(entry, {
       eol,
       dynamicTyping,
     });