@gmod/trix 2.0.5 → 2.0.7

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v2.0.6
+
+- Re-publish v2.0.5 to npm
+
 # v2.0.5
 
 - Improve prefix searches

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import type { GenericFilehandle } from 'generic-filehandle';
 export default class Trix {
-    private ixFile;
-    private ixxFile;
+    ixxFile: GenericFilehandle;
+    ixFile: GenericFilehandle;
     maxResults: number;
     constructor(ixxFile: GenericFilehandle, ixFile: GenericFilehandle, maxResults?: number);
     search(searchString: string, opts?: {

package/dist/index.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -19,196 +8,127 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var CHUNK_SIZE = 65536;
+const buffer_1 = require("buffer");
+const CHUNK_SIZE = 65536;
 // this is the number of hex characters to use for the address in ixixx, see
 // https://github.com/GMOD/ixixx-js/blob/master/src/index.ts#L182
-var ADDRESS_SIZE = 10;
+const ADDRESS_SIZE = 10;
 // https://stackoverflow.com/a/9229821/2129219
 function uniqBy(a, key) {
-    var seen = new Set();
-    return a.filter(function (item) {
-        var k = key(item);
+    const seen = new Set();
+    return a.filter(item => {
+        const k = key(item);
         return seen.has(k) ? false : seen.add(k);
     });
 }
-var Trix = /** @class */ (function () {
-    function Trix(ixxFile, ixFile, maxResults) {
-        if (maxResults === void 0) { maxResults = 20; }
-        this.ixFile = ixFile;
+class Trix {
+    constructor(ixxFile, ixFile, maxResults = 20) {
         this.ixxFile = ixxFile;
+        this.ixFile = ixFile;
         this.maxResults = maxResults;
     }
-    Trix.prototype.search = function (searchString, opts) {
-        return __awaiter(this, void 0, void 0, function () {
-            var resultArr, searchWords, searchWord, res, end, buffer, done, _loop_1, this_1, state_1;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        resultArr = [];
-                        searchWords = searchString.split(' ');
-                        searchWord = searchWords[0].toLowerCase();
-                        return [4 /*yield*/, this._getBuffer(searchWord, opts)];
-                    case 1:
-                        res = _a.sent();
-                        if (!res) {
-                            return [2 /*return*/, []];
-                        }
-                        end = res.end, buffer = res.buffer;
-                        done = false;
-                        _loop_1 = function () {
-                            var foundSomething, str, lines, hits, res2;
-                            return __generator(this, function (_b) {
-                                switch (_b.label) {
-                                    case 0:
-                                        foundSomething = false;
-                                        str = buffer.toString();
-                                        lines = str
-                                            .slice(0, str.lastIndexOf('\n'))
-                                            .split('\n')
-                                            .filter(function (f) { return !!f; });
-                                        hits = lines
-                                            // eslint-disable-next-line @typescript-eslint/no-loop-func
-                                            .filter(function (line) {
-                                            var word = line.split(' ')[0];
-                                            var match = word.startsWith(searchWord);
-                                            if (!foundSomething && match) {
-                                                foundSomething = true;
-                                            }
-                                            // we are done scanning if we are lexicographically greater than the
-                                            // search string
-                                            if (word.slice(0, searchWord.length) > searchWord) {
-                                                done = true;
-                                            }
-                                            return match;
-                                        })
-                                            .map(function (line) {
-                                            var _a = line.split(' '), term = _a[0], parts = _a.slice(1);
-                                            return parts.map(function (elt) { return [term, elt.split(',')[0]]; });
-                                        })
-                                            .flat();
-                                        if (!(resultArr.length + hits.length < this_1.maxResults && !done)) return [3 /*break*/, 2];
-                                        return [4 /*yield*/, this_1.ixFile.read(Buffer.alloc(CHUNK_SIZE), 0, CHUNK_SIZE, end, opts)
-                                            // early break if empty response
-                                        ];
-                                    case 1:
-                                        res2 = _b.sent();
-                                        // early break if empty response
-                                        if (!res2.bytesRead) {
-                                            resultArr = resultArr.concat(hits);
-                                            return [2 /*return*/, "break"];
-                                        }
-                                        buffer = Buffer.concat([buffer, res2.buffer]);
-                                        end += CHUNK_SIZE;
-                                        return [3 /*break*/, 3];
-                                    case 2:
-                                        if (resultArr.length + hits.length >= this_1.maxResults || done) {
-                                            resultArr = resultArr.concat(hits);
-                                            return [2 /*return*/, "break"];
-                                        }
-                                        _b.label = 3;
-                                    case 3: return [2 /*return*/];
-                                }
-                            });
-                        };
-                        this_1 = this;
-                        _a.label = 2;
-                    case 2:
-                        if (!!done) return [3 /*break*/, 4];
-                        return [5 /*yield**/, _loop_1()];
-                    case 3:
-                        state_1 = _a.sent();
-                        if (state_1 === "break")
-                            return [3 /*break*/, 4];
-                        return [3 /*break*/, 2];
-                    case 4: 
-                    // deduplicate results based on the detail column (resultArr[1])
-                    return [2 /*return*/, uniqBy(resultArr, function (elt) { return elt[1]; }).slice(0, this.maxResults)];
+    search(searchString, opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let resultArr = [];
+            const searchWords = searchString.split(' ');
+            // we only search one word at a time
+            const searchWord = searchWords[0].toLowerCase();
+            const res = yield this._getBuffer(searchWord, opts);
+            if (!res) {
+                return [];
+            }
+            let { end, buffer } = res;
+            let done = false;
+            // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+            while (!done) {
+                let foundSomething = false;
+                const str = buffer.toString();
+                // slice to lastIndexOf('\n') to make sure we get complete records
+                // since the buffer fetch could get halfway into a record
+                const lines = str
+                    .slice(0, str.lastIndexOf('\n'))
+                    .split('\n')
+                    .filter(f => !!f);
+                const hits2 = [];
+                for (const line of lines) {
+                    const word = line.split(' ')[0];
+                    const match = word.startsWith(searchWord);
+                    if (!foundSomething && match) {
+                        foundSomething = true;
+                    }
+                    // we are done scanning if we are lexicographically greater than the
+                    // search string
+                    if (word.slice(0, searchWord.length) > searchWord) {
+                        done = true;
+                    }
+                    if (match) {
+                        hits2.push(line);
+                    }
                 }
-            });
-        });
-    };
-    Trix.prototype.getIndex = function (opts) {
-        return __awaiter(this, void 0, void 0, function () {
-            var file;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.ixxFile.readFile(__assign({ encoding: 'utf8' }, opts))];
-                    case 1:
-                        file = _a.sent();
-                        return [2 /*return*/, file
-                                .split('\n')
-                                .filter(function (f) { return !!f; })
-                                .map(function (line) {
-                                var p = line.length - ADDRESS_SIZE;
-                                var prefix = line.slice(0, p);
-                                var posStr = line.slice(p);
-                                var pos = Number.parseInt(posStr, 16);
-                                return [prefix, pos];
-                            })];
+                const hits = hits2.flatMap(line => {
+                    const [term, ...parts] = line.split(' ');
+                    return parts.map(elt => [term, elt.split(',')[0]]);
+                });
+                // if we are not done, and we haven't filled up maxResults with hits yet,
+                // then refetch
+                if (resultArr.length + hits.length < this.maxResults && !done) {
+                    const res2 = yield this.ixFile.read(buffer_1.Buffer.alloc(CHUNK_SIZE), 0, CHUNK_SIZE, end, opts);
+                    // early break if empty response
+                    if (!res2.bytesRead) {
+                        resultArr = resultArr.concat(hits);
+                        break;
+                    }
+                    buffer = buffer_1.Buffer.concat([buffer, res2.buffer]);
+                    end += CHUNK_SIZE;
+                }
+                // if we have filled up the hits, or we are detected to be done via the
+                // filtering, then return
+                else if (resultArr.length + hits.length >= this.maxResults || done) {
+                    resultArr = resultArr.concat(hits);
+                    break;
                 }
+            }
+            // deduplicate results based on the detail column (resultArr[1])
+            return uniqBy(resultArr, elt => elt[1]).slice(0, this.maxResults);
+        });
+    }
+    getIndex(opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const file = yield this.ixxFile.readFile(Object.assign({ encoding: 'utf8' }, opts));
+            return file
+                .split('\n')
+                .filter(f => !!f)
+                .map(line => {
+                const p = line.length - ADDRESS_SIZE;
+                const prefix = line.slice(0, p);
+                const posStr = line.slice(p);
+                const pos = Number.parseInt(posStr, 16);
+                return [prefix, pos];
             });
         });
-    };
-    Trix.prototype._getBuffer = function (searchWord, opts) {
-        return __awaiter(this, void 0, void 0, function () {
-            var start, end, indexes, i, _a, key, value, trimmedKey, len, res;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        start = 0;
-                        end = 65536;
-                        return [4 /*yield*/, this.getIndex(opts)];
-                    case 1:
-                        indexes = _b.sent();
-                        for (i = 0; i < indexes.length; i++) {
-                            _a = indexes[i], key = _a[0], value = _a[1];
-                            trimmedKey = key.slice(0, searchWord.length);
-                            if (trimmedKey < searchWord) {
-                                start = value;
-                                end = value + 65536;
-                            }
-                        }
-                        len = end - start;
-                        if (len < 0) {
-                            return [2 /*return*/, undefined];
-                        }
-                        return [4 /*yield*/, this.ixFile.read(Buffer.alloc(len), 0, len, start, opts)];
-                    case 2:
-                        res = _b.sent();
-                        return [2 /*return*/, __assign(__assign({}, res), { end: end })];
+    }
+    _getBuffer(searchWord, opts) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let start = 0;
+            let end = 65536;
+            const indexes = yield this.getIndex(opts);
+            for (const [key, value] of indexes) {
+                const trimmedKey = key.slice(0, searchWord.length);
+                if (trimmedKey < searchWord) {
+                    start = value;
+                    end = value + 65536;
                 }
-            });
+            }
+            // Return the buffer and its end position in the file.
+            const len = end - start;
+            if (len < 0) {
+                return undefined;
+            }
+            const res = yield this.ixFile.read(buffer_1.Buffer.alloc(len), 0, len, start, opts);
+            return Object.assign(Object.assign({}, res), { end });
         });
-    };
-    return Trix;
-}());
+    }
+}
 exports.default = Trix;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/esm/index.d.ts

@@ -1,7 +1,7 @@
 import type { GenericFilehandle } from 'generic-filehandle';
 export default class Trix {
-    private ixFile;
-    private ixxFile;
+    ixxFile: GenericFilehandle;
+    ixFile: GenericFilehandle;
     maxResults: number;
     constructor(ixxFile: GenericFilehandle, ixFile: GenericFilehandle, maxResults?: number);
     search(searchString: string, opts?: {

package/esm/index.js

@@ -1,3 +1,4 @@
+import { Buffer } from 'buffer';
 const CHUNK_SIZE = 65536;
 // this is the number of hex characters to use for the address in ixixx, see
 // https://github.com/GMOD/ixixx-js/blob/master/src/index.ts#L182
@@ -11,9 +12,12 @@ function uniqBy(a, key) {
     });
 }
 export default class Trix {
+    ixxFile;
+    ixFile;
+    maxResults;
     constructor(ixxFile, ixFile, maxResults = 20) {
-        this.ixFile = ixFile;
         this.ixxFile = ixxFile;
+        this.ixFile = ixFile;
         this.maxResults = maxResults;
     }
     async search(searchString, opts) {
@@ -27,6 +31,7 @@ export default class Trix {
         }
         let { end, buffer } = res;
         let done = false;
+        // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
         while (!done) {
             let foundSomething = false;
             const str = buffer.toString();
@@ -36,9 +41,8 @@ export default class Trix {
                 .slice(0, str.lastIndexOf('\n'))
                 .split('\n')
                 .filter(f => !!f);
-            const hits = lines
-                // eslint-disable-next-line @typescript-eslint/no-loop-func
-                .filter(line => {
+            const hits2 = [];
+            for (const line of lines) {
                 const word = line.split(' ')[0];
                 const match = word.startsWith(searchWord);
                 if (!foundSomething && match) {
@@ -49,17 +53,17 @@ export default class Trix {
                 if (word.slice(0, searchWord.length) > searchWord) {
                     done = true;
                 }
-                return match;
-            })
-                .map(line => {
+                if (match) {
+                    hits2.push(line);
+                }
+            }
+            const hits = hits2.flatMap(line => {
                 const [term, ...parts] = line.split(' ');
                 return parts.map(elt => [term, elt.split(',')[0]]);
-            })
-                .flat();
+            });
             // if we are not done, and we haven't filled up maxResults with hits yet,
             // then refetch
             if (resultArr.length + hits.length < this.maxResults && !done) {
-                // eslint-disable-next-line no-await-in-loop
                 const res2 = await this.ixFile.read(Buffer.alloc(CHUNK_SIZE), 0, CHUNK_SIZE, end, opts);
                 // early break if empty response
                 if (!res2.bytesRead) {
@@ -99,8 +103,7 @@ export default class Trix {
         let start = 0;
         let end = 65536;
         const indexes = await this.getIndex(opts);
-        for (let i = 0; i < indexes.length; i++) {
-            const [key, value] = indexes[i];
+        for (const [key, value] of indexes) {
             const trimmedKey = key.slice(0, searchWord.length);
             if (trimmedKey < searchWord) {
                 start = value;

package/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.0.5",
+  "version": "2.0.7",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "module": "esm/index.js",
@@ -12,37 +12,34 @@
     "node": ">=10"
   },
   "scripts": {
-    "lint": "eslint --report-unused-disable-directives --max-warnings 0 --ext .js,.ts src ",
+    "lint": "eslint --report-unused-disable-directives --max-warnings 0",
     "prebuild": "rimraf dist esm",
-    "build:esm": "tsc --target es2018 --outDir esm --module es2020",
-    "build:es5": "tsc --target es5 --outDir dist --module commonjs",
+    "build:esm": "tsc --target esnext --outDir esm",
+    "build:es5": "tsc --target es2015 --outDir dist --module commonjs",
     "build": "npm run build:esm && npm run build:es5",
-    "preversion": "npm run lint && npm test && npm run build",
+    "preversion": "npm run lint && npm test run && npm run build",
     "postversion": "git push --follow-tags",
-    "test": "jest"
+    "test": "vitest"
   },
   "name": "@gmod/trix",
   "author": "Matt Morgan",
   "repository": "GMOD/trix-js",
   "devDependencies": {
-    "@types/jest": "^29.2.4",
-    "@types/node": "^18.11.16",
-    "@typescript-eslint/eslint-plugin": "^5.46.1",
-    "@typescript-eslint/parser": "^5.46.1",
-    "eslint": "^8.29.0",
-    "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-prettier": "^4.2.1",
+    "@types/node": "^20.14.11",
+    "@typescript-eslint/eslint-plugin": "^8.4.0",
+    "@typescript-eslint/parser": "^8.4.0",
+    "eslint": "^9.0.0",
+    "eslint-plugin-unicorn": "^55.0.0",
     "generic-filehandle": "^3.0.0",
-    "jest": "^29.3.1",
-    "prettier": "^2.8.1",
-    "rimraf": "^3.0.2",
-    "ts-jest": "^29.0.3",
-    "typescript": "^4.9.4"
+    "prettier": "^3.3.3",
+    "rimraf": "^6.0.1",
+    "typescript": "^5.5.3",
+    "typescript-eslint": "^8.4.0",
+    "vitest": "^2.0.5"
+  },
+  "dependencies": {
+    "buffer": "^6.0.3"
   },
-  "dependencies": {},
   "publishConfig": {
     "access": "public"
   }

package/src/index.ts

@@ -1,3 +1,4 @@
+import { Buffer } from 'buffer'
 import type { GenericFilehandle } from 'generic-filehandle'
 
 const CHUNK_SIZE = 65536
@@ -16,21 +17,11 @@ function uniqBy<T>(a: T[], key: (elt: T) => string) {
 }
 
 export default class Trix {
-  private ixFile: GenericFilehandle
-
-  private ixxFile: GenericFilehandle
-
-  maxResults: number
-
   constructor(
-    ixxFile: GenericFilehandle,
-    ixFile: GenericFilehandle,
-    maxResults = 20,
-  ) {
-    this.ixFile = ixFile
-    this.ixxFile = ixxFile
-    this.maxResults = maxResults
-  }
+    public ixxFile: GenericFilehandle,
+    public ixFile: GenericFilehandle,
+    public maxResults = 20,
+  ) {}
 
   async search(searchString: string, opts?: { signal?: AbortSignal }) {
     let resultArr = [] as [string, string][]
@@ -45,6 +36,7 @@ export default class Trix {
 
     let { end, buffer } = res
     let done = false
+    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
     while (!done) {
       let foundSomething = false
       const str = buffer.toString()
@@ -56,32 +48,31 @@ export default class Trix {
         .split('\n')
         .filter(f => !!f)
 
-      const hits = lines
-        // eslint-disable-next-line @typescript-eslint/no-loop-func
-        .filter(line => {
-          const word = line.split(' ')[0]
-          const match = word.startsWith(searchWord)
-          if (!foundSomething && match) {
-            foundSomething = true
-          }
-
-          // we are done scanning if we are lexicographically greater than the
-          // search string
-          if (word.slice(0, searchWord.length) > searchWord) {
-            done = true
-          }
-          return match
-        })
-        .map(line => {
-          const [term, ...parts] = line.split(' ')
-          return parts.map(elt => [term, elt.split(',')[0]])
-        })
-        .flat() as [string, string][]
+      const hits2 = [] as string[]
+      for (const line of lines) {
+        const word = line.split(' ')[0]
+        const match = word.startsWith(searchWord)
+        if (!foundSomething && match) {
+          foundSomething = true
+        }
+
+        // we are done scanning if we are lexicographically greater than the
+        // search string
+        if (word.slice(0, searchWord.length) > searchWord) {
+          done = true
+        }
+        if (match) {
+          hits2.push(line)
+        }
+      }
+      const hits = hits2.flatMap(line => {
+        const [term, ...parts] = line.split(' ')
+        return parts.map(elt => [term, elt.split(',')[0]] as [string, string])
+      })
 
       // if we are not done, and we haven't filled up maxResults with hits yet,
       // then refetch
       if (resultArr.length + hits.length < this.maxResults && !done) {
-        // eslint-disable-next-line no-await-in-loop
         const res2 = await this.ixFile.read(
           Buffer.alloc(CHUNK_SIZE),
           0,
@@ -124,7 +115,7 @@ export default class Trix {
         const prefix = line.slice(0, p)
         const posStr = line.slice(p)
         const pos = Number.parseInt(posStr, 16)
-        return [prefix, pos] as [string, number]
+        return [prefix, pos] as const
       })
   }
 
@@ -135,8 +126,7 @@ export default class Trix {
     let start = 0
     let end = 65536
     const indexes = await this.getIndex(opts)
-    for (let i = 0; i < indexes.length; i++) {
-      const [key, value] = indexes[i]
+    for (const [key, value] of indexes) {
       const trimmedKey = key.slice(0, searchWord.length)
       if (trimmedKey < searchWord) {
         start = value