@nuschtos/fixx 0.0.5 → 0.0.7

package/README.md

@@ -1,12 +1,20 @@
 # ixx
 
+ixx is the search engine and index creation tool used by [NüschtOS Search](https://github.com/NuschtOS/search).
+
 ## Building fixx
 
 ```
 wasm-pack build --release fixx --target web
 ```
 
-The result will be in fixx/pkg
+The result will be in `fixx/pkg`.
+
+## Contact
+
+For bugs and issues please open an issue in this repository.
+
+If you want to chat about things or have ideas, feel free to join the [Matrix Chat](https://matrix.to/#/#nuschtos:c3d2.de).
 
 ## License
 

package/fixx.d.ts

@@ -1,42 +1,19 @@
 /* tslint:disable */
 /* eslint-disable */
 export class Index {
+  private constructor();
   free(): void;
-  /**
-   * @param {Uint8Array} buf
-   * @returns {Index}
-   */
   static read(buf: Uint8Array): Index;
-  /**
-   * @returns {number}
-   */
   chunk_size(): number;
-  /**
-   * @returns {(string)[]}
-   */
-  scopes(): (string)[];
-  /**
-   * @param {number | undefined} scope_id
-   * @param {string} query
-   * @param {number} max_results
-   * @returns {(SearchedOption)[]}
-   */
-  search(scope_id: number | undefined, query: string, max_results: number): (SearchedOption)[];
-  /**
-   * @param {string} name
-   * @returns {number | undefined}
-   */
-  get_idx_by_name(name: string): number | undefined;
+  scopes(): string[];
+  search(scope_id: number | null | undefined, query: string, max_results: number): SearchedOption[];
+  get_idx_by_name(scope_id: number, name: string): number | undefined;
 }
 export class SearchedOption {
+  private constructor();
   free(): void;
-  /**
-   * @returns {number}
-   */
   idx(): number;
-  /**
-   * @returns {string}
-   */
+  scope_id(): number;
   name(): string;
 }
 
@@ -50,7 +27,8 @@ export interface InitOutput {
   readonly index_chunk_size: (a: number) => number;
   readonly index_scopes: (a: number, b: number) => void;
   readonly index_search: (a: number, b: number, c: number, d: number, e: number, f: number) => void;
-  readonly index_get_idx_by_name: (a: number, b: number, c: number, d: number) => void;
+  readonly index_get_idx_by_name: (a: number, b: number, c: number, d: number, e: number) => void;
+  readonly searchedoption_scope_id: (a: number) => number;
   readonly searchedoption_name: (a: number, b: number) => void;
   readonly searchedoption_idx: (a: number) => number;
   readonly __wbindgen_add_to_stack_pointer: (a: number) => number;

package/fixx.js

@@ -1,5 +1,20 @@
 let wasm;
 
+const heap = new Array(128).fill(undefined);
+
+heap.push(undefined, null, true, false);
+
+let heap_next = heap.length;
+
+function addHeapObject(obj) {
+    if (heap_next === heap.length) heap.push(heap.length + 1);
+    const idx = heap_next;
+    heap_next = heap[idx];
+
+    heap[idx] = obj;
+    return idx;
+}
+
 const cachedTextDecoder = (typeof TextDecoder !== 'undefined' ? new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }) : { decode: () => { throw Error('TextDecoder not available') } } );
 
 if (typeof TextDecoder !== 'undefined') { cachedTextDecoder.decode(); };
@@ -18,21 +33,6 @@ function getStringFromWasm0(ptr, len) {
     return cachedTextDecoder.decode(getUint8ArrayMemory0().subarray(ptr, ptr + len));
 }
 
-const heap = new Array(128).fill(undefined);
-
-heap.push(undefined, null, true, false);
-
-let heap_next = heap.length;
-
-function addHeapObject(obj) {
-    if (heap_next === heap.length) heap.push(heap.length + 1);
-    const idx = heap_next;
-    heap_next = heap[idx];
-
-    heap[idx] = obj;
-    return idx;
-}
-
 let WASM_VECTOR_LEN = 0;
 
 function passArray8ToWasm0(arg, malloc) {
@@ -187,7 +187,7 @@ export class Index {
         return ret >>> 0;
     }
     /**
-     * @returns {(string)[]}
+     * @returns {string[]}
      */
     scopes() {
         try {
@@ -208,10 +208,10 @@ export class Index {
         }
     }
     /**
-     * @param {number | undefined} scope_id
+     * @param {number | null | undefined} scope_id
      * @param {string} query
      * @param {number} max_results
-     * @returns {(SearchedOption)[]}
+     * @returns {SearchedOption[]}
      */
     search(scope_id, query, max_results) {
         try {
@@ -234,23 +234,23 @@ export class Index {
         }
     }
     /**
+     * @param {number} scope_id
      * @param {string} name
      * @returns {number | undefined}
      */
-    get_idx_by_name(name) {
+    get_idx_by_name(scope_id, name) {
         try {
             const retptr = wasm.__wbindgen_add_to_stack_pointer(-16);
             const ptr0 = passStringToWasm0(name, wasm.__wbindgen_export_0, wasm.__wbindgen_export_2);
             const len0 = WASM_VECTOR_LEN;
-            wasm.index_get_idx_by_name(retptr, this.__wbg_ptr, ptr0, len0);
-            var r0 = getDataViewMemory0().getInt32(retptr + 4 * 0, true);
-            var r1 = getDataViewMemory0().getInt32(retptr + 4 * 1, true);
+            wasm.index_get_idx_by_name(retptr, this.__wbg_ptr, scope_id, ptr0, len0);
+            var r0 = getDataViewMemory0().getFloat64(retptr + 8 * 0, true);
             var r2 = getDataViewMemory0().getInt32(retptr + 4 * 2, true);
             var r3 = getDataViewMemory0().getInt32(retptr + 4 * 3, true);
             if (r3) {
                 throw takeObject(r2);
             }
-            return r0 === 0 ? undefined : r1 >>> 0;
+            return r0 === 0x100000001 ? undefined : r0;
         } finally {
             wasm.__wbindgen_add_to_stack_pointer(16);
         }
@@ -289,6 +289,13 @@ export class SearchedOption {
         const ret = wasm.index_chunk_size(this.__wbg_ptr);
         return ret >>> 0;
     }
+    /**
+     * @returns {number}
+     */
+    scope_id() {
+        const ret = wasm.searchedoption_scope_id(this.__wbg_ptr);
+        return ret;
+    }
     /**
      * @returns {string}
      */
@@ -345,14 +352,14 @@ async function __wbg_load(module, imports) {
 function __wbg_get_imports() {
     const imports = {};
     imports.wbg = {};
-    imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
-        const ret = getStringFromWasm0(arg0, arg1);
-        return addHeapObject(ret);
-    };
     imports.wbg.__wbg_searchedoption_new = function(arg0) {
         const ret = SearchedOption.__wrap(arg0);
         return addHeapObject(ret);
     };
+    imports.wbg.__wbindgen_string_new = function(arg0, arg1) {
+        const ret = getStringFromWasm0(arg0, arg1);
+        return addHeapObject(ret);
+    };
     imports.wbg.__wbindgen_throw = function(arg0, arg1) {
         throw new Error(getStringFromWasm0(arg0, arg1));
     };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nuschtos/fixx",
   "type": "module",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "license": "MIT OR Apache-2.0",
   "repository": {
     "type": "git",