@fabriktor/client 0.0.48 → 0.0.50

package/dist/src/users/users.d.ts

@@ -1,6 +1,6 @@
 import { type InUser, type OperationResult, type PLUsersContactList, type PLUsersForgotPassword, type PLUsersResolveUsername, type PLUsersSignInLink, type PLUsersVerifyEmail, type UpsertResult, type User } from "@fabriktor/schema";
 import type { TokenProvider } from "../core/auth.js";
-import type { OperationResultOf } from "../core/crud.js";
+import type { DeleteOneOptionsCRUD, FindOneOptionsCRUD, OperationResultOf, QueryOptionsCRUD, ReplaceOneOptionsCRUD, SearchManyOptionsCRUD, SearchResultOf } from "../core/crud.js";
 import type { HTTPDoer } from "../core/http.js";
 import type { CompletePayload } from "../core/type.js";
 export type BootstrapOptions = {
@@ -11,14 +11,16 @@ export type ForgotPasswordOptions = CompletePayload<PLUsersForgotPassword>;
 export type SendSignInLinkOptions = CompletePayload<PLUsersSignInLink>;
 export type SendEmailVerificationOptions = CompletePayload<PLUsersVerifyEmail>;
 export type MatchOptions = CompletePayload<PLUsersContactList>;
-export type SearchOptions = {
-    q: string;
-    limit?: number;
-};
 export type GetByUIDOptions = {
     uid: string;
 };
+export type SearchManyUsersOptions = SearchManyOptionsCRUD & GetByUIDOptions;
 export interface UsersOperator {
+    queryUsers(opts?: QueryOptionsCRUD): Promise<OperationResultOf<User[]>>;
+    findOneUser(opts: FindOneOptionsCRUD): Promise<OperationResultOf<User>>;
+    replaceOneUser(opts: ReplaceOneOptionsCRUD<InUser>): Promise<OperationResult>;
+    deleteOneUser(opts: DeleteOneOptionsCRUD): Promise<OperationResult>;
+    searchManyUsers(opts: SearchManyUsersOptions): Promise<OperationResultOf<SearchResultOf<User>>>;
     bootstrap(opts: BootstrapOptions): Promise<OperationResultOf<UpsertResult>>;
     sync(): Promise<OperationResult>;
     sendEmailVerification(opts: SendEmailVerificationOptions): Promise<void>;
@@ -26,7 +28,6 @@ export interface UsersOperator {
     sendSignInLink(opts: SendSignInLinkOptions): Promise<void>;
     resolveUsername(opts: ResolveUsernameOptions): Promise<OperationResultOf<string>>;
     match(opts: MatchOptions): Promise<OperationResultOf<User[]>>;
-    search(opts: SearchOptions): Promise<OperationResultOf<User[]>>;
     getByUID(opts: GetByUIDOptions): Promise<OperationResultOf<User[]>>;
 }
 export type UsersClientOptions = {
@@ -35,10 +36,16 @@ export type UsersClientOptions = {
     get_token?: TokenProvider;
 };
 export declare class UsersClient implements UsersOperator {
+    private users;
     private http;
     private base_url;
     private get_token?;
     constructor(opts: UsersClientOptions);
+    queryUsers(opts?: QueryOptionsCRUD): Promise<OperationResultOf<User[]>>;
+    findOneUser(opts: FindOneOptionsCRUD): Promise<OperationResultOf<User>>;
+    replaceOneUser(opts: ReplaceOneOptionsCRUD<InUser>): Promise<OperationResult>;
+    deleteOneUser(opts: DeleteOneOptionsCRUD): Promise<OperationResult>;
+    searchManyUsers(opts: SearchManyUsersOptions): Promise<OperationResultOf<SearchResultOf<User>>>;
     bootstrap(opts: BootstrapOptions): Promise<OperationResultOf<UpsertResult>>;
     sync(): Promise<OperationResult>;
     sendEmailVerification(opts: SendEmailVerificationOptions): Promise<void>;
@@ -46,7 +53,6 @@ export declare class UsersClient implements UsersOperator {
     sendSignInLink(opts: SendSignInLinkOptions): Promise<void>;
     resolveUsername(opts: ResolveUsernameOptions): Promise<OperationResultOf<string>>;
     match(opts: MatchOptions): Promise<OperationResultOf<User[]>>;
-    search(opts: SearchOptions): Promise<OperationResultOf<User[]>>;
     getByUID(opts: GetByUIDOptions): Promise<OperationResultOf<User[]>>;
 }
 export declare function newUsersClient(opts: UsersClientOptions): UsersClient;

package/dist/src/users/users.js

@@ -3,19 +3,50 @@
 // Licensed under the Apache License, Version 2.0 (the "License"); you may
 // not use this file except in compliance with the License. You may obtain
 // a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
-import { ColUsersUsers, HTTPMethodGet, HTTPMethodPost, PathSearch, PathUsersBootstrap, PathUsersForgotPassword, PathUsersMatch, PathUsersResolveUsername, PathUsersSendEmailVerification, PathUsersSendSignInLink, PathUsersSync, SvcUsers, } from "@fabriktor/schema";
+import { ColUsersUsers, HTTPMethodPost, PathUsersBootstrap, PathUsersForgotPassword, PathUsersMatch, PathUsersResolveUsername, PathUsersSendEmailVerification, PathUsersSendSignInLink, PathUsersSync, SvcUsers, } from "@fabriktor/schema";
 import { requiredToken } from "../core/auth.js";
-import { queryParam, withQuery } from "../core/col.js";
+import { queryParam } from "../core/col.js";
+import { newCRUDClient } from "../core/crud.js";
 import { buildPath } from "../core/path.js";
 export class UsersClient {
+    users;
     http;
     base_url;
     get_token;
     constructor(opts) {
+        this.users = newCRUDClient({
+            http: opts.http,
+            base_url: opts.base_url,
+            svc: SvcUsers,
+            col: ColUsersUsers,
+            get_token: opts.get_token,
+        });
         this.http = opts.http;
         this.base_url = opts.base_url;
         this.get_token = opts.get_token;
     }
+    async queryUsers(opts) {
+        return await this.users.query(opts);
+    }
+    async findOneUser(opts) {
+        return await this.users.findOne(opts);
+    }
+    async replaceOneUser(opts) {
+        return await this.users.replaceOne(opts);
+    }
+    async deleteOneUser(opts) {
+        return await this.users.deleteOne(opts);
+    }
+    async searchManyUsers(opts) {
+        const { uid, query, ...searchOpts } = opts;
+        return await this.users.searchMany({
+            ...searchOpts,
+            query: {
+                ...(query ?? {}),
+                ...userUIDQuery(uid),
+            },
+        });
+    }
     async bootstrap(opts) {
         const token = await requiredToken(this.get_token);
         return await this.http.do({
@@ -79,40 +110,15 @@ export class UsersClient {
             body: opts,
         });
     }
-    async search(opts) {
-        const token = await requiredToken(this.get_token);
-        return await this.http.do({
-            base_url: this.base_url,
-            path: userPath(PathSearch),
-            method: HTTPMethodPost,
-            token,
-            body: {
-                q: opts.q,
-                limit: opts.limit,
-            },
-        });
-    }
     async getByUID(opts) {
-        const token = await requiredToken(this.get_token);
-        return await this.http.do({
-            base_url: this.base_url,
-            path: withQuery(collectionPath(), {
-                query: queryParam("uid", opts.uid),
-            }),
-            method: HTTPMethodGet,
-            token,
+        return await this.queryUsers({
+            query: userUIDQuery(opts.uid),
         });
     }
 }
 export function newUsersClient(opts) {
     return new UsersClient(opts);
 }
-function collectionPath() {
-    return buildPath({
-        svc: SvcUsers,
-        col: ColUsersUsers,
-    });
-}
 function userPath(action) {
     return buildPath({
         svc: SvcUsers,
@@ -120,3 +126,6 @@ function userPath(action) {
         action,
     });
 }
+function userUIDQuery(uid) {
+    return queryParam("uid", uid);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fabriktor/client",
-  "version": "0.0.48",
+  "version": "0.0.50",
   "description": "![Fabriktor Logo](./img/fabriktor-character.gif)",
   "type": "module",
   "exports": {