[optimize] Filter type supports Range fields (Number or Date) (#15)

Author: TechQuery

ReadMe.md

@@ -157,6 +157,7 @@ import { Repository, RepositoryModel } from './Repository';
 export type User = components['schemas']['public-user'];
 
 export class MultipleRepository extends Stream<Repository>(RepositoryModel) {
+    declare baseURI: string;
     client = client;
 
     async *getOrgRepos() {
@@ -214,7 +215,8 @@ Here is an example:
 ## Wrapper
 
 1. [Strapi v4](https://github.com/idea2app/MobX-RESTful/blob/main/wrapper/Strapi)
-2. [Lark/FeiShu](https://github.com/idea2app/MobX-Lark)
+2. [GitHub](https://github.com/idea2app/MobX-GitHub)
+3. [Lark/FeiShu](https://github.com/idea2app/MobX-Lark)
 
 ## Component
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "mobx-restful",
-    "version": "1.0.0-rc.5",
+    "version": "1.0.0",
     "license": "LGPL-3.0",
     "author": "[email protected]",
     "description": "MobX SDK for RESTful API",
@@ -24,11 +24,12 @@
     },
     "source": "source/index.ts",
     "types": "dist/index.d.ts",
+    "module": "dist/index.esm.js",
     "main": "dist/index.js",
     "dependencies": {
         "@swc/helpers": "^0.5.11",
         "idb-keyval": "^6.2.1",
-        "koajax": "^1.1.0",
+        "koajax": "^1.1.2",
         "native-file-system-adapter": "^3.0.1",
         "regenerator-runtime": "^0.14.1",
         "web-streams-polyfill": "^4.0.0",
@@ -44,7 +45,7 @@
         "@parcel/transformer-typescript-tsc": "~2.12.0",
         "@parcel/transformer-typescript-types": "~2.12.0",
         "@types/jest": "^29.5.12",
-        "@types/node": "^18.19.33",
+        "@types/node": "^18.19.34",
         "dotenv": "^16.4.5",
         "husky": "^9.0.11",
         "jest": "^29.7.0",
@@ -53,10 +54,10 @@
         "mobx": "^6.12.3",
         "open-cli": "^8.0.0",
         "parcel": "~2.12.0",
-        "prettier": "^3.2.5",
+        "prettier": "^3.3.1",
         "ts-jest": "^29.1.4",
         "typedoc": "^0.25.13",
-        "typedoc-plugin-mdn-links": "^3.1.27",
+        "typedoc-plugin-mdn-links": "^3.1.28",
         "typescript": "~5.5.0-beta"
     },
     "prettier": {

pnpm-lock.yaml

@@ -21,13 +21,10 @@ export class HTTPDownloadTask extends DownloadTask {
         const { path } = this;
         const suggestedName = DownloadTask.nameOf(path);
 
-        try {
-            this.fsHandle ||= await (
-                await import('native-file-system-adapter')
-            ).showSaveFilePicker({ suggestedName });
-        } catch {
-            return;
-        }
+        this.fsHandle ||= await (
+            await import('native-file-system-adapter')
+        ).showSaveFilePicker({ suggestedName });
+
         const writer = await (
                 this.fsHandle as FileSystemFileHandle
             ).createWritable({

source/Downloader/HTTP.ts

@@ -4,7 +4,7 @@ import type {
     HTTPClient,
     TransferProgress
 } from 'koajax';
-import { computed, observable, reaction } from 'mobx';
+import { computed, observable } from 'mobx';
 import type { FileSystemHandle } from 'native-file-system-adapter';
 import type { ReadableStream } from 'web-streams-polyfill';
 import { ByteSize } from 'web-utility';
@@ -97,16 +97,27 @@ export abstract class DownloadTask implements Partial<TransferProgress> {
     async start(options = this.options) {
         this.options = options;
 
+        const started = Promise.withResolvers<void>();
+
         const [innerStream, outerStream] = (
             await import('web-streams-polyfill')
         ).ReadableStream.from<Partial<TransferProgress>>(
             this.loadStream(options)
         ).tee();
 
         (async () => {
-            for await (const chunk of innerStream) console.table(chunk);
+            try {
+                for await (const chunk of innerStream) {
+                    started.resolve();
+                    console.table(chunk);
+                }
+            } catch (error) {
+                started.reject(error);
+            }
         })();
 
+        await started.promise;
+
         return (this.stream = outerStream);
     }
 
@@ -119,11 +130,4 @@ export abstract class DownloadTask implements Partial<TransferProgress> {
 
         return destroy(this, this.id);
     }
-
-    onFinished(callback: (task: DownloadTask) => any) {
-        return reaction(
-            () => this.percent === 100,
-            () => callback(this)
-        );
-    }
 }

source/Downloader/Task.ts

@@ -48,11 +48,14 @@ export class Downloader {
     }
 
     createTask(path: string, name?: string) {
-        const { tasks } = this,
-            task = Downloader.createTask(path, name);
+        const { tasks } = this;
+        const sameTask = tasks.find(task => task.path === path);
+
+        if (sameTask) return sameTask;
+
+        const task = Downloader.createTask(path, name);
 
-        if (!tasks.find(task => task.path === path))
-            this.tasks = [...tasks, task];
+        this.tasks = [...tasks, task];
 
         return task;
     }

source/Downloader/index.ts

@@ -71,9 +71,7 @@ export abstract class ListModel<
 
     @computed
     get noMore() {
-        const { totalCount, allItems } = this;
-
-        return allItems.length >= totalCount;
+        return this.pageIndex * this.pageSize >= this.totalCount;
     }
 
     @observable
@@ -135,7 +133,7 @@ export abstract class ListModel<
      * @protected
      */
     async loadNewPage(pageIndex: number, pageSize: number, filter: F) {
-        const { pageData, totalCount = Infinity } = await this.loadPage(
+        const { pageData, totalCount } = await this.loadPage(
             pageIndex,
             pageSize,
             filter
@@ -146,7 +144,12 @@ export abstract class ListModel<
         list[pageIndex - 1] = pageData;
         this.pageList = list;
 
-        this.totalCount ||= totalCount;
+        this.totalCount =
+            totalCount != null
+                ? isNaN(totalCount) || totalCount < 0
+                    ? Infinity
+                    : totalCount
+                : Infinity;
 
         return { pageData, totalCount };
     }
@@ -318,8 +321,6 @@ export function Stream<
     M extends AbstractClass<ListModel<D, F>> = AbstractClass<ListModel<D, F>>
 >(Super: M) {
     abstract class StreamListMixin extends Super {
-        baseURI = '';
-
         stream?: AsyncGenerator<D, void, any>;
         abstract openStream(filter: F): AsyncGenerator<D, void, any>;
 

source/List.ts

@@ -129,6 +129,7 @@ describe('List model', () => {
         class MultipleRepositoryModel extends Stream<Repository>(
             RepositoryModel
         ) {
+            declare baseURI: string;
             client = client;
 
             async *getOrgRepos() {

test/List.spec.ts

@@ -7,7 +7,7 @@
         "downlevelIteration": true,
         "useDefineForClassFields": true,
         "skipLibCheck": true,
-        "lib": ["ES2023", "DOM", "DOM.Iterable"],
+        "lib": ["ESNext", "DOM", "DOM.Iterable"],
         "declaration": true,
         "outDir": "dist"
     },