strtok3 7.0.0-alpha.5 → 7.0.0-alpha.6

package/lib/AbstractTokenizer.js

@@ -1,11 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AbstractTokenizer = void 0;
-const peek_readable_1 = require("peek-readable");
+import { EndOfStreamError } from 'peek-readable';
+import { Buffer } from 'node:buffer';
 /**
  * Core tokenizer
  */
-class AbstractTokenizer {
+export class AbstractTokenizer {
     constructor(fileInfo) {
         /**
          * Tokenizer-stream position
@@ -24,7 +22,7 @@ class AbstractTokenizer {
         const uint8Array = Buffer.alloc(token.len);
         const len = await this.readBuffer(uint8Array, { position });
         if (len < token.len)
-            throw new peek_readable_1.EndOfStreamError();
+            throw new EndOfStreamError();
         return token.get(uint8Array, 0);
     }
     /**
@@ -37,7 +35,7 @@ class AbstractTokenizer {
         const uint8Array = Buffer.alloc(token.len);
         const len = await this.peekBuffer(uint8Array, { position });
         if (len < token.len)
-            throw new peek_readable_1.EndOfStreamError();
+            throw new EndOfStreamError();
         return token.get(uint8Array, 0);
     }
     /**
@@ -48,7 +46,7 @@ class AbstractTokenizer {
     async readNumber(token) {
         const len = await this.readBuffer(this.numBuffer, { length: token.len });
         if (len < token.len)
-            throw new peek_readable_1.EndOfStreamError();
+            throw new EndOfStreamError();
         return token.get(this.numBuffer, 0);
     }
     /**
@@ -59,7 +57,7 @@ class AbstractTokenizer {
     async peekNumber(token) {
         const len = await this.peekBuffer(this.numBuffer, { length: token.len });
         if (len < token.len)
-            throw new peek_readable_1.EndOfStreamError();
+            throw new EndOfStreamError();
         return token.get(this.numBuffer, 0);
     }
     /**
@@ -101,4 +99,3 @@ class AbstractTokenizer {
         };
     }
 }
-exports.AbstractTokenizer = AbstractTokenizer;

package/lib/BufferTokenizer.d.ts

@@ -1,5 +1,5 @@
 import { IFileInfo, IReadChunkOptions } from './types';
-import { AbstractTokenizer } from './AbstractTokenizer';
+import { AbstractTokenizer } from './AbstractTokenizer.js';
 export declare class BufferTokenizer extends AbstractTokenizer {
     private uint8Array;
     /**

package/lib/BufferTokenizer.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BufferTokenizer = void 0;
-const peek_readable_1 = require("peek-readable");
-const AbstractTokenizer_1 = require("./AbstractTokenizer");
-class BufferTokenizer extends AbstractTokenizer_1.AbstractTokenizer {
+import { EndOfStreamError } from 'peek-readable';
+import { AbstractTokenizer } from './AbstractTokenizer.js';
+export class BufferTokenizer extends AbstractTokenizer {
     /**
      * Construct BufferTokenizer
      * @param uint8Array - Uint8Array to tokenize
@@ -41,7 +38,7 @@ class BufferTokenizer extends AbstractTokenizer_1.AbstractTokenizer {
         const normOptions = this.normalizeOptions(uint8Array, options);
         const bytes2read = Math.min(this.uint8Array.length - normOptions.position, normOptions.length);
         if ((!normOptions.mayBeLess) && bytes2read < normOptions.length) {
-            throw new peek_readable_1.EndOfStreamError();
+            throw new EndOfStreamError();
         }
         else {
             uint8Array.set(this.uint8Array.subarray(normOptions.position, normOptions.position + bytes2read), normOptions.offset);
@@ -52,4 +49,3 @@ class BufferTokenizer extends AbstractTokenizer_1.AbstractTokenizer {
         // empty
     }
 }
-exports.BufferTokenizer = BufferTokenizer;

package/lib/FileTokenizer.d.ts

@@ -1,5 +1,5 @@
-import { AbstractTokenizer } from './AbstractTokenizer';
-import { IFileInfo, IReadChunkOptions } from './types';
+import { AbstractTokenizer } from './AbstractTokenizer.js';
+import { IFileInfo, IReadChunkOptions } from './types.js';
 export declare class FileTokenizer extends AbstractTokenizer {
     private fd;
     constructor(fd: number, fileInfo: IFileInfo);

package/lib/FileTokenizer.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromFile = exports.FileTokenizer = void 0;
-const AbstractTokenizer_1 = require("./AbstractTokenizer");
-const peek_readable_1 = require("peek-readable");
-const fs = require("./FsPromise");
-class FileTokenizer extends AbstractTokenizer_1.AbstractTokenizer {
+import { AbstractTokenizer } from './AbstractTokenizer.js';
+import { EndOfStreamError } from 'peek-readable';
+import * as fs from './FsPromise.js';
+export class FileTokenizer extends AbstractTokenizer {
     constructor(fd, fileInfo) {
         super(fileInfo);
         this.fd = fd;
@@ -21,7 +18,7 @@ class FileTokenizer extends AbstractTokenizer_1.AbstractTokenizer {
         const res = await fs.read(this.fd, uint8Array, normOptions.offset, normOptions.length, normOptions.position);
         this.position += res.bytesRead;
         if (res.bytesRead < normOptions.length && (!options || !options.mayBeLess)) {
-            throw new peek_readable_1.EndOfStreamError();
+            throw new EndOfStreamError();
         }
         return res.bytesRead;
     }
@@ -35,7 +32,7 @@ class FileTokenizer extends AbstractTokenizer_1.AbstractTokenizer {
         const normOptions = this.normalizeOptions(uint8Array, options);
         const res = await fs.read(this.fd, uint8Array, normOptions.offset, normOptions.length, normOptions.position);
         if ((!normOptions.mayBeLess) && res.bytesRead < normOptions.length) {
-            throw new peek_readable_1.EndOfStreamError();
+            throw new EndOfStreamError();
         }
         return res.bytesRead;
     }
@@ -43,8 +40,7 @@ class FileTokenizer extends AbstractTokenizer_1.AbstractTokenizer {
         return fs.close(this.fd);
     }
 }
-exports.FileTokenizer = FileTokenizer;
-async function fromFile(sourceFilePath) {
+export async function fromFile(sourceFilePath) {
     const stat = await fs.stat(sourceFilePath);
     if (!stat.isFile) {
         throw new Error(`File not a file: ${sourceFilePath}`);
@@ -52,4 +48,3 @@ async function fromFile(sourceFilePath) {
     const fd = await fs.open(sourceFilePath, 'r');
     return new FileTokenizer(fd, { path: sourceFilePath, size: stat.size });
 }
-exports.fromFile = fromFile;

package/lib/FsPromise.d.ts

@@ -2,7 +2,7 @@
  * Module convert fs functions to promise based functions
  */
 /// <reference types="node" />
-import * as fs from 'fs';
+import fs from 'node:fs';
 export interface IReadResult {
     bytesRead: number;
     buffer: Uint8Array;

package/lib/FsPromise.js

@@ -1,13 +1,10 @@
-"use strict";
 /**
  * Module convert fs functions to promise based functions
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readFile = exports.writeFileSync = exports.writeFile = exports.read = exports.open = exports.close = exports.stat = exports.createReadStream = exports.pathExists = void 0;
-const fs = require("fs");
-exports.pathExists = fs.existsSync;
-exports.createReadStream = fs.createReadStream;
-async function stat(path) {
+import fs from 'node:fs';
+export const pathExists = fs.existsSync;
+export const createReadStream = fs.createReadStream;
+export async function stat(path) {
     return new Promise((resolve, reject) => {
         fs.stat(path, (err, stats) => {
             if (err)
@@ -17,8 +14,7 @@ async function stat(path) {
         });
     });
 }
-exports.stat = stat;
-async function close(fd) {
+export async function close(fd) {
     return new Promise((resolve, reject) => {
         fs.close(fd, err => {
             if (err)
@@ -28,8 +24,7 @@ async function close(fd) {
         });
     });
 }
-exports.close = close;
-async function open(path, mode) {
+export async function open(path, mode) {
     return new Promise((resolve, reject) => {
         fs.open(path, mode, (err, fd) => {
             if (err)
@@ -39,8 +34,7 @@ async function open(path, mode) {
         });
     });
 }
-exports.open = open;
-async function read(fd, buffer, offset, length, position) {
+export async function read(fd, buffer, offset, length, position) {
     return new Promise((resolve, reject) => {
         fs.read(fd, buffer, offset, length, position, (err, bytesRead, _buffer) => {
             if (err)
@@ -50,8 +44,7 @@ async function read(fd, buffer, offset, length, position) {
         });
     });
 }
-exports.read = read;
-async function writeFile(path, data) {
+export async function writeFile(path, data) {
     return new Promise((resolve, reject) => {
         fs.writeFile(path, data, err => {
             if (err)
@@ -61,12 +54,10 @@ async function writeFile(path, data) {
         });
     });
 }
-exports.writeFile = writeFile;
-function writeFileSync(path, data) {
+export function writeFileSync(path, data) {
     fs.writeFileSync(path, data);
 }
-exports.writeFileSync = writeFileSync;
-async function readFile(path) {
+export async function readFile(path) {
     return new Promise((resolve, reject) => {
         fs.readFile(path, (err, buffer) => {
             if (err)
@@ -76,4 +67,3 @@ async function readFile(path) {
         });
     });
 }
-exports.readFile = readFile;

package/lib/ReadStreamTokenizer.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
-import { AbstractTokenizer } from './AbstractTokenizer';
-import { Readable } from 'stream';
-import { IFileInfo, IReadChunkOptions } from './types';
+import { AbstractTokenizer } from './AbstractTokenizer.js';
+import { Readable } from 'node:stream';
+import { IFileInfo, IReadChunkOptions } from './types.js';
 export declare class ReadStreamTokenizer extends AbstractTokenizer {
     private streamReader;
     constructor(stream: Readable, fileInfo?: IFileInfo);

package/lib/ReadStreamTokenizer.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ReadStreamTokenizer = void 0;
-const AbstractTokenizer_1 = require("./AbstractTokenizer");
-const peek_readable_1 = require("peek-readable");
+import { AbstractTokenizer } from './AbstractTokenizer.js';
+import { EndOfStreamError, StreamReader } from 'peek-readable';
 const maxBufferSize = 256000;
-class ReadStreamTokenizer extends AbstractTokenizer_1.AbstractTokenizer {
+export class ReadStreamTokenizer extends AbstractTokenizer {
     constructor(stream, fileInfo) {
         super(fileInfo);
-        this.streamReader = new peek_readable_1.StreamReader(stream);
+        this.streamReader = new StreamReader(stream);
     }
     /**
      * Get file information, an HTTP-client may implement this doing a HEAD request
@@ -38,7 +35,7 @@ class ReadStreamTokenizer extends AbstractTokenizer_1.AbstractTokenizer {
         const bytesRead = await this.streamReader.read(uint8Array, normOptions.offset, normOptions.length);
         this.position += bytesRead;
         if ((!options || !options.mayBeLess) && bytesRead < normOptions.length) {
-            throw new peek_readable_1.EndOfStreamError();
+            throw new EndOfStreamError();
         }
         return bytesRead;
     }
@@ -68,13 +65,13 @@ class ReadStreamTokenizer extends AbstractTokenizer_1.AbstractTokenizer {
                 bytesRead = await this.streamReader.peek(uint8Array, normOptions.offset, normOptions.length);
             }
             catch (err) {
-                if (options && options.mayBeLess && err instanceof peek_readable_1.EndOfStreamError) {
+                if (options && options.mayBeLess && err instanceof EndOfStreamError) {
                     return 0;
                 }
                 throw err;
             }
             if ((!normOptions.mayBeLess) && bytesRead < normOptions.length) {
-                throw new peek_readable_1.EndOfStreamError();
+                throw new EndOfStreamError();
             }
         }
         return bytesRead;
@@ -95,4 +92,3 @@ class ReadStreamTokenizer extends AbstractTokenizer_1.AbstractTokenizer {
         return totBytesRead;
     }
 }
-exports.ReadStreamTokenizer = ReadStreamTokenizer;

package/lib/core.d.ts

@@ -1,10 +1,10 @@
 /// <reference types="node" />
-import { ReadStreamTokenizer } from './ReadStreamTokenizer';
-import { Readable } from 'stream';
-import { BufferTokenizer } from './BufferTokenizer';
-import { IFileInfo } from './types';
+import { ReadStreamTokenizer } from './ReadStreamTokenizer.js';
+import { Readable } from 'node:stream';
+import { BufferTokenizer } from './BufferTokenizer.js';
+import { IFileInfo } from './types.js';
 export { EndOfStreamError } from 'peek-readable';
-export { ITokenizer, IFileInfo } from './types';
+export { ITokenizer, IFileInfo } from './types.js';
 export { IToken, IGetToken } from '@tokenizer/token';
 /**
  * Construct ReadStreamTokenizer from given Stream.

package/lib/core.js

@@ -1,10 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromBuffer = exports.fromStream = exports.EndOfStreamError = void 0;
-const ReadStreamTokenizer_1 = require("./ReadStreamTokenizer");
-const BufferTokenizer_1 = require("./BufferTokenizer");
-var peek_readable_1 = require("peek-readable");
-Object.defineProperty(exports, "EndOfStreamError", { enumerable: true, get: function () { return peek_readable_1.EndOfStreamError; } });
+import { ReadStreamTokenizer } from './ReadStreamTokenizer.js';
+import { BufferTokenizer } from './BufferTokenizer.js';
+export { EndOfStreamError } from 'peek-readable';
 /**
  * Construct ReadStreamTokenizer from given Stream.
  * Will set fileSize, if provided given Stream has set the .path property/
@@ -12,18 +8,16 @@ Object.defineProperty(exports, "EndOfStreamError", { enumerable: true, get: func
  * @param fileInfo - Pass the file information, like size and MIME-type of the corresponding stream.
  * @returns ReadStreamTokenizer
  */
-function fromStream(stream, fileInfo) {
+export function fromStream(stream, fileInfo) {
     fileInfo = fileInfo ? fileInfo : {};
-    return new ReadStreamTokenizer_1.ReadStreamTokenizer(stream, fileInfo);
+    return new ReadStreamTokenizer(stream, fileInfo);
 }
-exports.fromStream = fromStream;
 /**
  * Construct ReadStreamTokenizer from given Buffer.
  * @param uint8Array - Uint8Array to tokenize
  * @param fileInfo - Pass additional file information to the tokenizer
  * @returns BufferTokenizer
  */
-function fromBuffer(uint8Array, fileInfo) {
-    return new BufferTokenizer_1.BufferTokenizer(uint8Array, fileInfo);
+export function fromBuffer(uint8Array, fileInfo) {
+    return new BufferTokenizer(uint8Array, fileInfo);
 }
-exports.fromBuffer = fromBuffer;

package/lib/index.d.ts

@@ -1,9 +1,9 @@
 /// <reference types="node" />
-import { Readable } from 'stream';
-import { ReadStreamTokenizer } from './ReadStreamTokenizer';
-import * as core from './core';
-export { fromFile } from './FileTokenizer';
-export { ITokenizer, EndOfStreamError, fromBuffer, IFileInfo } from './core';
+import { Readable } from 'node:stream';
+import { ReadStreamTokenizer } from './ReadStreamTokenizer.js';
+import * as core from './core.js';
+export { fromFile } from './FileTokenizer.js';
+export { ITokenizer, EndOfStreamError, fromBuffer, IFileInfo } from './core.js';
 export { IToken, IGetToken } from '@tokenizer/token';
 /**
  * Construct ReadStreamTokenizer from given Stream.

package/lib/index.js

@@ -1,13 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromStream = exports.fromBuffer = exports.EndOfStreamError = exports.fromFile = void 0;
-const fs = require("./FsPromise");
-const core = require("./core");
-var FileTokenizer_1 = require("./FileTokenizer");
-Object.defineProperty(exports, "fromFile", { enumerable: true, get: function () { return FileTokenizer_1.fromFile; } });
-var core_1 = require("./core");
-Object.defineProperty(exports, "EndOfStreamError", { enumerable: true, get: function () { return core_1.EndOfStreamError; } });
-Object.defineProperty(exports, "fromBuffer", { enumerable: true, get: function () { return core_1.fromBuffer; } });
+import * as fs from './FsPromise.js';
+import * as core from './core.js';
+export { fromFile } from './FileTokenizer.js';
+export { EndOfStreamError, fromBuffer } from './core.js';
 /**
  * Construct ReadStreamTokenizer from given Stream.
  * Will set fileSize, if provided given Stream has set the .path property.
@@ -15,7 +9,7 @@ Object.defineProperty(exports, "fromBuffer", { enumerable: true, get: function (
  * @param fileInfo - Pass additional file information to the tokenizer
  * @returns Tokenizer
  */
-async function fromStream(stream, fileInfo) {
+export async function fromStream(stream, fileInfo) {
     fileInfo = fileInfo ? fileInfo : {};
     if (stream.path) {
         const stat = await fs.stat(stream.path);
@@ -24,4 +18,3 @@ async function fromStream(stream, fileInfo) {
     }
     return core.fromStream(stream, fileInfo);
 }
-exports.fromStream = fromStream;

package/lib/types.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "strtok3",
-  "version": "7.0.0-alpha.5",
+  "version": "7.0.0-alpha.6",
   "description": "A promise based streaming tokenizer",
   "author": {
     "name": "Borewit",