@livequery/client 2.0.31 → 2.0.104

package/package.json

@@ -1,29 +1,106 @@
 {
   "name": "@livequery/client",
+  "version": "2.0.104",
   "type": "module",
-  "repository": {
-    "url": "https://github.com/livequery/client"
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
+    },
+    "./LivequeryCollection": {
+      "types": "./dist/LivequeryCollection.d.ts",
+      "import": "./dist/LivequeryCollection.js",
+      "default": "./dist/LivequeryCollection.js"
+    },
+    "./LivequeryCore": {
+      "types": "./dist/LivequeryCore.d.ts",
+      "import": "./dist/LivequeryCore.js",
+      "default": "./dist/LivequeryCore.js"
+    },
+    "./LivequeryDocument": {
+      "types": "./dist/LivequeryDocument.d.ts",
+      "import": "./dist/LivequeryDocument.js",
+      "default": "./dist/LivequeryDocument.js"
+    },
+    "./LivequeryMemoryStorage": {
+      "types": "./dist/LivequeryMemoryStorage.d.ts",
+      "import": "./dist/LivequeryMemoryStorage.js",
+      "default": "./dist/LivequeryMemoryStorage.js"
+    },
+    "./LivequeryStorge": {
+      "types": "./dist/LivequeryStorge.d.ts",
+      "import": "./dist/LivequeryStorge.js",
+      "default": "./dist/LivequeryStorge.js"
+    },
+    "./LivequeryTransporter": {
+      "types": "./dist/LivequeryTransporter.d.ts",
+      "import": "./dist/LivequeryTransporter.js",
+      "default": "./dist/LivequeryTransporter.js"
+    },
+    "./types": {
+      "types": "./dist/types.d.ts",
+      "import": "./dist/types.js",
+      "default": "./dist/types.js"
+    },
+    "./helpers/filterDocs": {
+      "types": "./dist/helpers/filterDocs.d.ts",
+      "import": "./dist/helpers/filterDocs.js",
+      "default": "./dist/helpers/filterDocs.js"
+    },
+    "./package.json": "./package.json"
+  },
+  "typesVersions": {
+    "*": {
+      "LivequeryCollection": [
+        "./dist/LivequeryCollection.d.ts"
+      ],
+      "LivequeryCore": [
+        "./dist/LivequeryCore.d.ts"
+      ],
+      "LivequeryDocument": [
+        "./dist/LivequeryDocument.d.ts"
+      ],
+      "LivequeryMemoryStorage": [
+        "./dist/LivequeryMemoryStorage.d.ts"
+      ],
+      "LivequeryStorge": [
+        "./dist/LivequeryStorge.d.ts"
+      ],
+      "LivequeryTransporter": [
+        "./dist/LivequeryTransporter.d.ts"
+      ],
+      "types": [
+        "./dist/types.d.ts"
+      ],
+      "helpers/filterDocs": [
+        "./dist/helpers/filterDocs.d.ts"
+      ]
+    }
   },
-  "version": "2.0.31",
-  "description": "",
-  "main": "build/index.js",
-  "types": "build/index.d.ts",
   "files": [
-    "build/**/*"
+    "dist"
   ],
-  "dependencies": {
-    "uuid": "^8.3.2"
+  "sideEffects": false,
+  "scripts": {
+    "clean": "rm -rf dist",
+    "build:js": "bunx tsc -p tsconfig.build.json --emitDeclarationOnly false --declaration false --declarationMap false",
+    "build:types": "bunx tsc -p tsconfig.build.json --emitDeclarationOnly",
+    "build": "bun run clean && bun run build:js && bun run build:types",
+    "build:watch": "bunx tsc -p tsconfig.build.json --watch --preserveWatchOutput",
+    "prepublishOnly": "bun run build"
   },
   "devDependencies": {
-    "typescript": "^5.6.3",
-    "rxjs": "^7.8.1",
-    "@livequery/types": "^2.0.22"
+    "@types/bun": "latest",
+    "@types/chrome": "^0.1.38",
+    "typescript": "^5"
   },
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "rm -rf build; tsc -b .",
-    "deploy": "yarn build; git add .; git commit -m \"Update\"; git push origin master; npm publish --access public"
+  "dependencies": {
+    "rxjs": "^7.8.2",
+    "uuidv7": "^1.2.1"
   },
-  "author": "",
-  "license": "ISC"
+  "private": false
 }

package/build/Collection.d.ts

@@ -1,52 +0,0 @@
-import { Subject, BehaviorSubject } from 'rxjs';
-import { LivequeryBaseEntity, QueryOption, Transporter, UpdatedData, Paging, Response } from '@livequery/types';
-export type LoadingIndicator = false | 'backward' | 'forward' | 'both';
-export type CollectionOption<T extends LivequeryBaseEntity = LivequeryBaseEntity> = {
-    transporter: Transporter;
-    sync_delay?: number;
-    options?: Partial<QueryOption<T>>;
-    realtime?: boolean;
-};
-export type SmartQueryItem<T> = T & {
-    __remove: Function;
-    __removing: boolean;
-    __update: (data: Partial<T>) => any;
-    __updating: boolean;
-    __adding: boolean;
-    __trigger: <R extends {}>(name: string, payload?: any, query?: any) => Promise<Response<R>>;
-    __ref: string;
-    toJson: () => T;
-};
-export type CollectionStream<T extends LivequeryBaseEntity = LivequeryBaseEntity> = {
-    n: number;
-    items: SmartQueryItem<T>[];
-    paging: Partial<Paging>;
-    loading?: LoadingIndicator;
-    options: Partial<QueryOption<T>>;
-    error?: boolean;
-    code?: string;
-    message?: string;
-    summary?: {
-        [key: string]: any;
-    };
-};
-export declare class CollectionObservable<T extends LivequeryBaseEntity = LivequeryBaseEntity> extends BehaviorSubject<CollectionStream<T>> {
-    #private;
-    private ref;
-    private collection_options;
-    readonly $changes: Subject<UpdatedData<T>>;
-    unsubscribe(): void;
-    constructor(ref: string | false | null | '' | undefined, collection_options: CollectionOption<T>);
-    set_realtime(realtime: boolean): void;
-    private fetch_data;
-    reset(): void;
-    fetch_more(): void;
-    fetch_prev(): void;
-    filter(filters: Partial<QueryOption<T>>): void;
-    add(payload: Partial<T>): Promise<import("@livequery/types").DocumentResponse<T & LivequeryBaseEntity>>;
-    update({ id: update_payload_id, ...payload }: Partial<T>): Promise<import("@livequery/types").DocumentResponse<T & LivequeryBaseEntity> | undefined>;
-    remove(remove_document_id?: string): Promise<import("@livequery/types").DocumentResponse<LivequeryBaseEntity> | undefined>;
-    trigger<R extends {}>(name: string, payload?: object, trigger_document_id?: string, query?: {
-        [key: string]: string | number | boolean;
-    }): Promise<Response<R>>;
-}

package/build/Collection.js

@@ -1,366 +0,0 @@
-import { Subject, merge, BehaviorSubject } from 'rxjs';
-import { bufferTime, filter, finalize, first, map, share, skip, tap, toArray } from 'rxjs/operators';
-export class CollectionObservable extends BehaviorSubject {
-    ref;
-    collection_options;
-    $changes = new Subject();
-    #pages = new Map();
-    #queries = new Set();
-    #sorters = new Array;
-    #IdMap = new Map();
-    #refs = [];
-    unsubscribe() {
-        super.unsubscribe();
-        this.#queries.forEach(s => s.unsubscribe());
-    }
-    constructor(ref, collection_options) {
-        super({
-            n: 0,
-            items: [],
-            loading: false,
-            paging: {},
-            options: collection_options.options || {}
-        });
-        this.ref = ref;
-        this.collection_options = collection_options;
-        if (ref && (ref.startsWith('/') || ref.endsWith('/')))
-            throw 'INVAILD_REF_FORMAT';
-        this.#refs = this.#ref_parser(ref);
-    }
-    #ref_parser(path) {
-        if (!path)
-            return [];
-        const refs_builder = (paths) => {
-            const [a, b, ...c] = paths;
-            if (!b)
-                return paths;
-            const r = a.map(aa => b.map(bb => `${aa}/${bb}`)).flat(2);
-            const d = [r, ...c];
-            return refs_builder(d);
-        };
-        return path.split(',').map(f => refs_builder(f.trim().split('/').map(l => l.split('|')))).flat(2);
-    }
-    set_realtime(realtime) {
-        this.collection_options.realtime = realtime;
-    }
-    #sync(stream, from, direction) {
-        if (from == 'realtime' && this.collection_options.realtime == false)
-            return;
-        const state = this.getValue();
-        const actions = { reindex: false };
-        for (const { data, error, code, message, } of stream) {
-            if (from == 'request') {
-                state.loading = false;
-                state.n = state.n + 1;
-            }
-            // Error & paging
-            if (error) {
-                state.error = true;
-                state.code = code;
-                state.message = message;
-            }
-            if (data?.summary) {
-                state.summary = data.summary;
-            }
-            // Sync 
-            for (const change of data?.changes || []) {
-                if (!change?.data?.id)
-                    continue;
-                const { data: payload, type } = change;
-                this.$changes.next(change);
-                const index = this.#IdMap.get(payload.id) ?? -1;
-                if (index == -1 && type == 'added') {
-                    if (
-                    // Is first value from HTTP query
-                    from == 'request'
-                        || (
-                        // Is realtime update that match filters
-                        from == 'realtime' && Object
-                            .keys(state.options || {})
-                            .filter(key => !key.startsWith(':'))
-                            .every(key => {
-                            const [field, expression] = key.split(':');
-                            const a = payload[field];
-                            const b = state.options?.[field];
-                            const map = {
-                                eq: () => a == b,
-                                ne: () => a != b,
-                                lt: () => typeof a == 'number' && typeof b == 'number' && a < b,
-                                lte: () => typeof a == 'number' && typeof b == 'number' && a <= b,
-                                gt: () => typeof a == 'number' && typeof b == 'number' && a > b,
-                                gte: () => typeof a == 'number' && typeof b == 'number' && a >= b,
-                                in: () => Array.isArray(a) && a?.includes(b),
-                                like: () => typeof a == 'string' && a.includes(`${b}`),
-                                between: () => typeof a == 'number' && Array.isArray(b) && typeof b[0] == 'number' && b[0] <= a && typeof b[1] == 'number' && a <= b[1]
-                            };
-                            try {
-                                const expr = expression == '' ? 'eq' : expression;
-                                if (map[expr])
-                                    return map[expr]();
-                            }
-                            catch (e) { }
-                            return true;
-                        }))) {
-                        const item = {
-                            ...payload,
-                            id: payload.id || payload._id,
-                            __adding: false,
-                            __updating: false,
-                            __removing: false,
-                            __remove: () => this.remove(payload?.id),
-                            __trigger: (name, input = undefined, query) => this.trigger(name, input, payload?.id, query),
-                            __update: (input) => this.update({ ...input, id: payload?.id }),
-                            __ref: change.ref,
-                            toJson: () => payload
-                        };
-                        direction == 'forward' ? state.items.push(item) : state.items.unshift(item);
-                        actions.reindex = true;
-                    }
-                }
-                if (index >= 0) {
-                    if (type == 'added' || type == 'modified') {
-                        const sort_key_value_updated = this.#sorters.some(({ key }) => {
-                            const value = payload[key];
-                            if (typeof value == 'string' || typeof value == 'number')
-                                return true;
-                        });
-                        if (sort_key_value_updated) {
-                            actions.reindex = true;
-                        }
-                        state.items[index] = {
-                            ...state.items[index],
-                            __adding: false,
-                            __updating: false,
-                            __removing: false,
-                            ...payload
-                        };
-                    }
-                    if (type == 'removed') {
-                        state.items.splice(index, 1);
-                        for (const [document_id, i] of this.#IdMap) {
-                            i == index && this.#IdMap.delete(document_id);
-                            i > index && this.#IdMap.set(document_id, i - 1);
-                        }
-                    }
-                }
-            }
-        }
-        if (actions.reindex) {
-            state.items = state.items.sort((a, b) => {
-                for (const { key, order } of this.#sorters) {
-                    const aa = a[key];
-                    const bb = b[key];
-                    if (typeof aa == 'number' && typeof bb == 'number') {
-                        const rs = aa - bb;
-                        if (rs == 0)
-                            continue;
-                        return rs * order;
-                    }
-                    if (typeof aa == 'string' && typeof bb == 'string') {
-                        const rs = aa.localeCompare(bb);
-                        if (rs == 0)
-                            continue;
-                        return rs * order;
-                    }
-                }
-                return -1;
-            });
-            this.#IdMap.clear();
-            state.items.map((item, index) => this.#IdMap.set(item.id, index));
-        }
-        if (state.paging?.count) {
-            const d = state.items.length - state.paging.count.current;
-            state.paging.count.current = state.items.length;
-            state.paging.count.total += d;
-        }
-        if (direction && stream.some(d => d.data?.paging)) {
-            // Cache paging
-            this.#pages.clear();
-            stream.forEach(s => s.data?.paging && this.#pages.set(s.ref, s.data?.paging));
-            // Caculate paging here
-            const last_page_total = state.items.length;
-            const total = stream.reduce((p, c) => p + (c.data?.paging?.count?.total || 0), 0);
-            const prev = stream.reduce((p, c) => p + (c.data?.paging?.count?.prev || 0), 0);
-            const next = stream.reduce((p, c) => p + (c.data?.paging?.count?.next || 0), 0);
-            state.paging = {
-                count: {
-                    current: state.items.length,
-                    next: next - (direction == 'backward' ? last_page_total : 0),
-                    prev: prev - (direction == 'forward' ? last_page_total : 0),
-                    total
-                },
-                has: {
-                    next: stream.some(s => s.data?.paging?.has?.next),
-                    prev: stream.some(s => s.data?.paging?.has?.prev)
-                },
-                page: {
-                    current: Math.min(...stream.map(s => s.data?.paging?.page?.current || 0)),
-                    total: Math.max(...stream.map(s => s.data?.paging?.page?.total || 0))
-                }
-            };
-        }
-        this.next(state);
-    }
-    fetch_data(options = {}, loading, flush = false) {
-        if (flush) {
-            this.#pages.clear();
-            this.#queries.forEach(s => s.unsubscribe());
-            this.#queries.clear();
-            this.#IdMap.clear();
-        }
-        if (!this.ref)
-            return;
-        if (this.#refs.length == 0)
-            return;
-        if (this.getValue().loading && !flush)
-            return;
-        const remain_data_refs = this.#refs.filter(ref => {
-            const paging = this.#pages.get(ref);
-            if (!paging)
-                return true;
-            return loading == 'forward' ? paging.has?.next : paging.has?.prev;
-        });
-        if (remain_data_refs.length == 0)
-            return;
-        this.next({
-            ...this.getValue(),
-            items: flush ? [] : this.getValue().items,
-            loading,
-            options: {
-                ...this.getValue().options || {},
-                ...options
-            }
-        });
-        this.collection_options.options = options;
-        this.#sorters = Object.keys(options).filter(k => k.endsWith(':sort')).map(k => {
-            const key = k.split(':sort')[0];
-            const order = options[k] == 1 ? 1 : -1;
-            return { key, order };
-        });
-        this.#sorters.every(a => a.key != 'id') && this.#sorters.push({ key: 'id', order: -1 });
-        const queries = remain_data_refs.map((ref, index) => {
-            const cursor = this.#pages.get(ref)?.cursor;
-            const opts = {
-                ...options,
-                ...loading == 'backward' && cursor?.first ? { ':before': cursor?.first } : {},
-                ...loading == 'forward' && cursor?.last ? { ':after': cursor?.last } : {},
-            };
-            return this
-                .collection_options
-                .transporter
-                .query(ref, opts).pipe(map(data => ({
-                ...data,
-                ref
-            })), share());
-        });
-        const first_values = merge(...queries.map(q => q.pipe(filter(r => !!r.data?.paging || !!r.error), first()))).pipe(toArray(), tap(list => this.#sync(list, 'request', loading))).subscribe();
-        const subscription = merge(...queries.map(q => q.pipe(skip(1)))).pipe(bufferTime(this.collection_options?.sync_delay || 500), filter(list => list.length > 0), map(data => this.#sync(data, 'realtime', loading)), finalize(() => first_values.unsubscribe())).subscribe();
-        this.#queries.add(subscription);
-    }
-    reset() {
-        this.fetch_data({}, 'both', true);
-    }
-    fetch_more() {
-        const { options } = this.getValue();
-        this.fetch_data(options, 'forward');
-    }
-    fetch_prev() {
-        const { options } = this.getValue();
-        this.fetch_data(options, 'backward');
-    }
-    filter(filters) {
-        this.fetch_data(filters, 'forward', true);
-    }
-    #find_ref_by_id(id) {
-        if (!id || !this.ref)
-            return { ref: this.ref, collection_ref: this.ref, doc: null };
-        const index = this.#IdMap.get(id);
-        if (index == undefined)
-            return {};
-        const doc = this.getValue().items[index];
-        const origin_ref = doc.__ref;
-        if (!origin_ref)
-            throw 'COLLECTION_REF_NOT_FOUND';
-        const refs = origin_ref.split('/');
-        const collection_ref = refs.slice(0, refs.length - (refs.length % 2 == 1 ? 0 : 1)).join('/');
-        const ref = `${collection_ref}/${id}`;
-        return { ref, id, collection_ref, index, doc };
-    }
-    async add(payload) {
-        const r = await this.collection_options.transporter.add(`${this.ref}`, payload);
-        if (r.data && r.data.item && !r.data.item.id) {
-            r.data.item.id = r.data.item._id;
-        }
-        return r;
-    }
-    async update({ id: update_payload_id, ...payload }) {
-        const { id, ref, doc } = this.#find_ref_by_id(update_payload_id);
-        if (!ref)
-            return;
-        // Trigger local update
-        this.#sync([{
-                ref,
-                data: {
-                    changes: [{
-                            data: { ...payload, id, __updating: true },
-                            ref,
-                            type: 'modified'
-                        }]
-                }
-            }], 'local');
-        try {
-            return await this.collection_options.transporter.update(ref, payload);
-        }
-        catch (e) {
-            this.#sync([{
-                    ref,
-                    data: {
-                        changes: [{
-                                data: { ...doc || {}, id, __updating: false },
-                                ref,
-                                type: 'modified'
-                            }]
-                    }
-                }], 'local');
-            throw e;
-        }
-    }
-    async remove(remove_document_id) {
-        const { id, ref } = this.#find_ref_by_id(remove_document_id);
-        if (!ref)
-            return;
-        this.#sync([{
-                ref,
-                data: {
-                    changes: [{
-                            data: { id, __removing: true },
-                            ref,
-                            type: 'modified'
-                        }]
-                }
-            }], 'local');
-        // Trigger  
-        try {
-            return await this.collection_options.transporter.remove(ref);
-        }
-        catch (e) {
-            this.#sync([{
-                    ref,
-                    data: {
-                        changes: [{
-                                data: { id, __removing: false },
-                                ref,
-                                type: 'modified'
-                            }]
-                    }
-                }], 'local');
-            throw e;
-        }
-    }
-    async trigger(name, payload, trigger_document_id, query = {}) {
-        const { ref } = this.#find_ref_by_id(trigger_document_id);
-        if (!ref)
-            throw new Error('INVAILD_REF');
-        return await this.collection_options.transporter.trigger(ref, name, payload, query);
-    }
-}

package/build/index.d.ts

@@ -1 +0,0 @@
-export * from './Collection.js';

package/build/index.js

@@ -1 +0,0 @@
-export * from './Collection.js';

package/build/tsconfig.tsbuildinfo

@@ -1 +0,0 @@
-{"root":["../src/index.ts","../src/collection.ts"],"version":"5.6.3"}