@graffy/common 0.19.1-alpha.1 → 0.19.1-alpha.3

package/coding/args.d.ts

@@ -1,5 +1,7 @@
-export declare function splitArgs(arg: any): {}[];
+export declare function splitArgs(arg: any): [Record<string, any> | undefined, Record<string, any> | undefined];
 export declare function encode(arg: any): {
-    key: Uint8Array<any>;
+    key?: Uint8Array<ArrayBuffer>;
+    end?: Uint8Array<ArrayBuffer>;
+    limit?: number;
 };
 export declare function decode(node: any): any;

package/coding/args.js

@@ -36,7 +36,6 @@ export function encode(arg) {
     if (!page)
         return { key: encodeValue(filter || {}) };
     const { $cursor, ...range } = page;
-    // @ts-expect-error
     const { $first, $all, $last, $after, $before, $since, $until } = range;
     const hasRange = !isEmpty(range);
     errIf('first_and_last', isDef($first) && isDef($last), arg);

package/coding/decodeTree.js

@@ -150,17 +150,18 @@ function decode(nodes = [], { isGraph } = {}) {
             }
             child.$key = { ...args, ...child.$key };
         }
-        if (children.$put === true) {
-            children[PRE_CHI_PUT] = [{ ...args, $all: true }];
+        const ch = children;
+        if (ch.$put === true) {
+            ch[PRE_CHI_PUT] = [{ ...args, $all: true }];
         }
-        else if (Array.isArray(children.$put)) {
-            children[PRE_CHI_PUT] = children.$put.map((rarg) => ({
+        else if (Array.isArray(ch.$put)) {
+            ch[PRE_CHI_PUT] = ch.$put.map((rarg) => ({
                 ...args,
                 ...rarg,
             }));
         }
-        else if (isDef(children.$put)) {
-            children[PRE_CHI_PUT] = [{ ...args, ...children.$put }];
+        else if (isDef(ch.$put)) {
+            ch[PRE_CHI_PUT] = [{ ...args, ...ch.$put }];
         }
         return children;
     }

package/coding/decorate.js

@@ -182,9 +182,9 @@ function addPageMeta(graph, args) {
         Object.assign(graph, { $page: args, $prev: null, $next: null });
         return;
     }
-    const [{ $first, $last, ...bounds }, filter] = splitArgs(args);
+    const [page, filter] = splitArgs(args);
+    const { $first, $last, ...bounds } = page;
     const count = $first || $last;
-    /** @type {any} */
     const $page = { ...filter, ...bounds, $all: true };
     if (graph.length === count) {
         // This result was limited by the count; update the "outer" bound.

package/coding/encodeTree.js

@@ -93,7 +93,10 @@ function encode(value, { version, isGraph } = {}) {
                 if ((!isDef(key) || Number.isInteger(key)) &&
                     (filter || isDef(page.$cursor))) {
                     object.$key = isDef(page.$cursor) ? page.$cursor : page;
-                    const wrapper = { $key: filter || {}, $chi: [object] };
+                    const wrapper = {
+                        $key: filter || {},
+                        $chi: [object],
+                    };
                     if (isGraph)
                         wrapper.$put = foundPuts;
                     const node = makeNode(wrapper, key, ver);

package/coding/pack.d.ts

@@ -1,2 +1,2 @@
-export declare function pack(children: any, parentVersion: any): any;
-export declare function unpack(children: any, parentVersion: any): any;
+export declare function pack(children: any, parentVersion?: any): any;
+export declare function unpack(children: any, parentVersion?: any): any;

package/coding/path.d.ts

@@ -1,3 +1,3 @@
 export declare function encode(path: any): any;
 export declare function decode(path: any): any[];
-export declare function splitRef($ref: any): {}[];
+export declare function splitRef($ref: any): any[] | [Record<string, any>, Record<string, any>];

package/coding/struct.d.ts

@@ -1,11 +1,3 @@
-export declare const END = 0;
-export declare const NULL = 1;
-export declare const FALSE = 2;
-export declare const TRUE = 3;
-export declare const NUM = 4;
 export declare const STR = 5;
-export declare const ARR = 6;
-export declare const OBJ = 7;
-export declare const EOK = 127;
 export declare function encode(value: any): Uint8Array<any>;
 export declare function decode(buffer: any): any;

package/coding/struct.js

@@ -7,15 +7,15 @@ import { decode as decodeString, encode as encodeString } from "./string.js";
   The constraints are:
   - Sorting a byte stream should
 */
-export const END = 0;
-export const NULL = 1;
-export const FALSE = 2;
-export const TRUE = 3;
-export const NUM = 4;
+const END = 0;
+const NULL = 1;
+const FALSE = 2;
+const TRUE = 3;
+const NUM = 4;
 export const STR = 5;
-export const ARR = 6;
-export const OBJ = 7;
-export const EOK = 127; // end-of-key
+const ARR = 6;
+const OBJ = 7;
+const EOK = 127; // end-of-key
 function encodeArray(array) {
     return [ARR, ...array.flatMap((value) => encodeParts(value)), END];
 }
@@ -92,7 +92,6 @@ export function encode(value) {
 const nextKey = new WeakMap();
 export function decode(buffer) {
     let i = 0;
-    /** @type {Array<{ [prop: string]: any }|Array>} */
     const stack = [[]];
     function readString() {
         const start = i;

package/node/find.d.ts

@@ -1,2 +1,2 @@
-export declare function findFirst(children: any, target: any, first: any, last: any): number;
-export declare function findLast(children: any, end: any, first: any, last: any): number;
+export declare function findFirst(children: any, target: any, first?: number, last?: any): number;
+export declare function findLast(children: any, end: any, first?: number, last?: any): number;

package/node/find.js

@@ -1,5 +1,5 @@
 import { cmp, find } from "../util.js";
-export function findFirst(children, target, first, last) {
+export function findFirst(children, target, first = 0, last = children.length) {
     return find(children, ({ key, end }) => {
         const keyCmp = cmp(key, target);
         const endCmp = end && cmp(end, target);
@@ -8,7 +8,7 @@ export function findFirst(children, target, first, last) {
         return keyCmp;
     }, first, last);
 }
-export function findLast(children, end, first, last) {
+export function findLast(children, end, first = 0, last = children.length) {
     const ix = findFirst(children, end, first, last);
     return children[ix] && cmp(children[ix].key, end) <= 0 ? ix + 1 : ix;
 }

package/ops/finalize.d.ts

@@ -5,7 +5,7 @@
  * @param {number | false} version
  * @returns any
  */
-export default function finalize(graph: any, query: any, version?: number): {
+export default function finalize(graph: any, query: any, version?: number | false): {
     key: Uint8Array<ArrayBuffer>;
     end: Uint8Array<ArrayBuffer>;
     version: number;

package/ops/merge.d.ts

@@ -1,3 +1 @@
 export default function merge(current: any, changes: any): any;
-export declare function insertRange(current: any, change: any, start?: number): number;
-export declare function insertNode(current: any, change: any, start?: number): any;

package/ops/merge.js

@@ -12,7 +12,7 @@ export default function merge(current, changes) {
     }
     return current;
 }
-export function insertRange(current, change, start = 0) {
+function insertRange(current, change, start = 0) {
     const { key, end } = change;
     const keyIx = findFirst(current, key, start);
     const endIx = findLast(current, end, keyIx);
@@ -41,7 +41,7 @@ function mergeRanges(base, node) {
         cmp(base.end, node.end) > 0 && { ...base, key: keyAfter(node.end) },
     ].filter(Boolean);
 }
-export function insertNode(current, change, start = 0) {
+function insertNode(current, change, start = 0) {
     if (!current)
         throw new Error(`merge.insertNode: ${current}`);
     const key = change.key;

package/ops/sieve.d.ts

@@ -1,3 +1 @@
 export default function sieve(current: any, changes: any, result?: any[]): any[];
-export declare function insertRange(current: any, change: any, result: any, start?: number): number;
-export declare function insertNode(current: any, change: any, result: any, start?: number): any;

package/ops/sieve.js

@@ -10,7 +10,7 @@ export default function sieve(current, changes, result = []) {
     }
     return result;
 }
-export function insertRange(current, change, result, start = 0) {
+function insertRange(current, change, result, start = 0) {
     const { key, end } = change;
     const keyIx = findFirst(current, key, start);
     const endIx = findLast(current, end, keyIx);
@@ -89,7 +89,7 @@ function mergeRanges(base, node) {
         cmp(base.end, node.end) > 0 && { ...base, key: keyAfter(node.end) },
     ].filter(Boolean);
 }
-export function insertNode(current, change, result, start = 0) {
+function insertNode(current, change, result, start = 0) {
     const key = change.key;
     const index = findFirst(current, key, start);
     const node = current[index];

package/ops/slice.d.ts

@@ -1,9 +1,12 @@
 declare class Result {
-    constructor(root: any);
+    root: Result;
+    known?: any[];
+    unknown?: any[];
+    linked?: any[];
+    constructor(root?: any);
     addKnown(node: any): void;
     addUnknown(node: any): void;
     addLinked(children: any): any;
 }
-export default function slice(graph: any, query: any, root: any): Result;
-export declare function sliceRange(graph: any, query: any, result: any): void;
+export default function slice(graph: any, query: any, root?: any): Result;
 export {};

package/ops/slice.js

@@ -93,7 +93,7 @@ function sliceNode(graph, query, result) {
         result.addKnown(graph);
     }
 }
-export function sliceRange(graph, query, result) {
+function sliceRange(graph, query, result) {
     let { key, end, limit = Number.POSITIVE_INFINITY, version } = query;
     const step = cmp(key, end) < 0 ? 1 : -1;
     // Prefixes are used to combine filtering and pagination. In schemas where

package/package.json

@@ -2,18 +2,9 @@
   "name": "@graffy/common",
   "description": "Common libraries that used by various Graffy modules.",
   "author": "aravind (https://github.com/aravindet)",
-  "version": "0.19.1-alpha.1",
-  "main": "./cjs/index.js",
-  "exports": {
-    ".": {
-      "import": "./index.js",
-      "types": "./index.d.ts"
-    },
-    "./*": {
-      "import": "./*.js",
-      "types": "./*.d.ts"
-    }
-  },
+  "version": "0.19.1-alpha.3",
+  "type": "module",
+  "main": "./index.js",
   "types": "./index.d.ts",
   "repository": {
     "type": "git",
@@ -22,9 +13,9 @@
   "license": "Apache-2.0",
   "dependencies": {
     "debug": "^4.4.3",
-    "lodash": "^4.17.23",
-    "nanoid": "^5.1.6",
-    "@graffy/stream": "0.19.1-alpha.1",
+    "lodash": "^4.18.1",
+    "nanoid": "^5.1.11",
+    "@graffy/stream": "0.19.1-alpha.3",
     "merge-async-iterators": "^0.2.1"
   }
 }

package/stream/makeWatcher.d.ts

@@ -1,7 +1,7 @@
 export default function makeWatcher(): {
     write: (change: any) => void;
     watch: (...args: any[]) => {
-        debugId: any;
+        debugId: string;
         next: () => any;
         return(value: any): any;
         throw(error: any): any;

package/util.d.ts

@@ -5,7 +5,7 @@ export declare function isMaxKey(key: any): boolean;
 export declare function err(message: any, { cause, ...args }?: {
     cause?: any;
 }): void;
-export declare function errIf(message: any, condition: any, args: any): void;
+export declare function errIf(message: any, condition: any, args?: any): void;
 export declare function isEmpty(object: any): boolean;
 export declare function isDef(value: any): boolean;
 export declare function isPlainObject(arg: any): boolean;