kodzero-front-sdk-alfa 0.0.9 → 0.0.15

package/dist/Kodzero.d.ts

@@ -4,15 +4,17 @@ import { ModelOptions } from "./model/BaseModel.js";
 import TokensManagerClass from "./auth/tokens.js";
 interface Options {
     host: string;
+    collection: string;
 }
 declare class Kodzero {
     host: string;
+    collection: string;
     auth: KodzeroAuth;
     tokensManager: TokensManagerClass;
     api: typeof FluidFetch;
     constructor(options: Options);
     createModel: <T extends {
-        _id?: string;
+        _id: string | null;
     }, M = {}>(options: Omit<ModelOptions, "host">) => {
         new (data: T): import("./model/BaseModel.js").default<T> & M;
         get(id: string): Promise<import("./model/BaseModel.js").default<T> & M>;

package/dist/Kodzero.js

@@ -4,14 +4,19 @@ import createModel from "./model/createModel.js";
 import TokensManagerClass from "./auth/tokens.js";
 class Kodzero {
     host;
+    collection;
     auth;
     tokensManager;
     api;
     constructor(options) {
         this.tokensManager = new TokensManagerClass('', '');
+        this.collection = options.collection;
         this.host = options.host;
         this.api = new FluidFetch();
-        this.auth = new KodzeroAuth({ host: options.host }, this.api, this.tokensManager);
+        this.auth = new KodzeroAuth({
+            host: options.host,
+            collection: options.collection
+        }, this.api, this.tokensManager);
         this.api.middlewares.request.use((req) => {
             const accessToken = this.tokensManager.access;
             if (accessToken)

package/dist/auth/email.d.ts

@@ -39,7 +39,7 @@ type RefreshResponse = SuccessResponse<{
 }>;
 declare class KodzeroAuthEmail extends KodzeroAuthBase {
     tokensManager: TokensManagerClass;
-    collection: "auth/password";
+    collection: string;
     constructor(options: AuthOptions, api: typeof FluidFetch, tokensManager: TokensManagerClass);
     _setTokens: (access: string, refresh?: string) => void;
     login: (input: KodzeroAuthEmailLogin) => Promise<LoginResponse["result"]>;

package/dist/auth/email.js

@@ -6,7 +6,7 @@ class KodzeroAuthEmail extends KodzeroAuthBase {
     constructor(options, api, tokensManager) {
         super(options, api, tokensManager);
         this.tokensManager = tokensManager;
-        this.collection = "auth/password";
+        this.collection = `${options.collection}/password`;
     }
     _setTokens = (access, refresh) => {
         this.tokensManager.setAccess(access);

package/dist/auth/index.d.ts

@@ -4,6 +4,7 @@ import KodzeroAuthEmail from "./email.js";
 import TokensManagerClass from "./tokens.js";
 export interface AuthOptions {
     host: string;
+    collection: string;
 }
 declare class KodzeroAuth extends KodzeroAuthBase {
     email: KodzeroAuthEmail;

package/dist/model/BaseModel.d.ts

@@ -6,7 +6,7 @@ export interface ModelOptions {
     schema?: Record<string, any>;
 }
 declare class BaseModel<T extends {
-    _id?: string;
+    _id: string | null;
 }> {
     host: string;
     collection: string;

package/dist/model/createModel.d.ts

@@ -9,7 +9,7 @@ export interface FindManyOptions {
     fields?: string[];
 }
 declare const createModel: <T extends {
-    _id?: string;
+    _id: string | null;
 }, M = {}>(options: ModelOptions, apiClient: typeof FluidFetch) => {
     new (data: T): BaseModel<T> & M;
     get(id: string): Promise<BaseModel<T> & M>;

package/dist/model/createModel.js

@@ -18,7 +18,10 @@ const createModel = (options, apiClient) => {
             const response = await Model.apiClient.get(getUrl);
             await Model._handleApiError(response);
             const json = await response.json();
-            return new Model(json.result);
+            const model = new Model(json.result);
+            model.modelData._id = json.result._id;
+            model.id = json.result._id;
+            return model;
         }
         static registerMethod(name, fn) {
             Model.prototype[name] = fn;
@@ -148,8 +151,9 @@ const createModel = (options, apiClient) => {
         }
         constructor(data) {
             super(options, apiClient);
-            this.modelData = { ...data, _id: null };
-            this.id = null;
+            this.modelData = { ...data };
+            this.modelData._id = data._id || null;
+            this.id = data._id || null;
         }
     };
     return Model;

package/dist/schemas/baseModel.js

@@ -9,7 +9,7 @@ class BaseModelSchema {
             type: String
         },
         schema: {
-            type: Schema,
+            type: Object,
             required: false
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kodzero-front-sdk-alfa",
-  "version": "0.0.9",
+  "version": "0.0.15",
   "main": "dist/index.js",
   "scripts": {
     "tsc": "tsc -b src/",

package/src/Kodzero.ts

@@ -6,19 +6,25 @@ import TokensManagerClass from "./auth/tokens.js"
 
 interface Options {
     host: string
+    collection: string
 }
 
 class Kodzero {
     host: string
+    collection: string
     auth: KodzeroAuth
     tokensManager: TokensManagerClass
     api: typeof FluidFetch
 
     constructor (options: Options) {
         this.tokensManager = new TokensManagerClass('', '')
+        this.collection = options.collection
         this.host = options.host
         this.api = new FluidFetch()
-        this.auth = new KodzeroAuth({host: options.host}, this.api, this.tokensManager)
+        this.auth = new KodzeroAuth({
+            host: options.host,
+            collection: options.collection
+        }, this.api, this.tokensManager)
 
         this.api.middlewares.request.use((req: any) => {
             const accessToken = this.tokensManager.access
@@ -27,7 +33,7 @@ class Kodzero {
         })
     }
 
-    createModel = <T extends { _id?: string }, M = {}>(options: Omit<ModelOptions, 'host'>) => {
+    createModel = <T extends { _id: string | null }, M = {}>(options: Omit<ModelOptions, 'host'>) => {
         return createModel<T, M>({...options, host: this.host}, this.api)
     }
 }

package/src/__tests__/Kodzero.test.ts

@@ -2,7 +2,8 @@ import Kodzero from '../Kodzero.js';
 
 it('should create an instance if host provided', async () => {
     const kodzero = new Kodzero({
-        host: 'http://localhost:6969'
+        host: 'http://localhost:6969',
+        collection: "_auth_"
     });
 
     expect(kodzero).toBeInstanceOf(Kodzero);

package/src/auth/email.ts

@@ -47,13 +47,13 @@ type LogoutResponse = SuccessResponse<boolean>
 
 class KodzeroAuthEmail extends KodzeroAuthBase {
     tokensManager: TokensManagerClass
-    collection: "auth/password"
+    collection: string
 
     constructor(options: AuthOptions, api: typeof FluidFetch, tokensManager: TokensManagerClass) {
         super(options, api, tokensManager)
 
         this.tokensManager = tokensManager
-        this.collection = "auth/password"
+        this.collection = `${options.collection}/password`
     }
 
     /**

package/src/auth/index.ts

@@ -5,6 +5,7 @@ import TokensManagerClass from "./tokens.js";
 
 export interface AuthOptions {
     host: string
+    collection: string
 }
 
 class KodzeroAuth extends KodzeroAuthBase {

package/src/model/BaseModel.ts

@@ -15,7 +15,7 @@ export interface ModelOptions {
 /**
  * Base model constructor that expose main methods to work with user-created model
  */
-class BaseModel<T extends { _id?: string }> {
+class BaseModel<T extends { _id: string | null }> {
     host: string
     collection: string
     modelData: T = {} as T

package/src/model/createModel.ts

@@ -18,7 +18,7 @@ export interface FindManyOptions {
  * Creates custom model with the specified schema, API options, etc.
  */
 const createModel = <
-    T extends { _id?: string },
+    T extends { _id: string | null},
     M = {}
 >(options: ModelOptions, apiClient: typeof FluidFetch) => {
     const Model = class extends BaseModel<T> {
@@ -40,8 +40,11 @@ const createModel = <
             await Model._handleApiError(response);
 
             const json = await response.json();
+            const model = new Model(json.result);
+            model.modelData._id = json.result._id;
+            model.id = json.result._id;
             
-            return new Model(json.result);
+            return model;
         }
 
         /**
@@ -106,7 +109,7 @@ const createModel = <
 
         static async create(data: T): Promise<T> {
             const createUrl = buildURL(Model.host, Model.collection)
-            const {_id, ...dataWithoutId} = data as T & {_id?: string};
+            const {_id, ...dataWithoutId} = data as T & {_id: string | null};
 
             const response = await Model.apiClient.post(createUrl)
                 .body(dataWithoutId)
@@ -230,8 +233,9 @@ const createModel = <
         constructor(data: T) {
             super(options, apiClient)
 
-            this.modelData = {...data, _id: null}
-            this.id = null;
+            this.modelData = {...data}
+            this.modelData._id = data._id || null;
+            this.id = data._id || null;
         }
     }
 

package/src/schemas/baseModel.ts

@@ -11,7 +11,7 @@ class BaseModelSchema {
             type: String
         },
         schema: {
-            type: Schema,
+            type: Object,
             required: false
         }
     })