namirasoft-account-react 1.3.0 → 1.3.2

package/dist/Messenger.d.ts

@@ -1,8 +1,10 @@
-import { IRouterStateChanger } from "./IRouterStateChanger";
+/// <reference types="react" />
+import { IRouterState } from "./IRouterState";
 export declare class Messenger {
     static Counter: number;
-    private component;
-    constructor(component: IRouterStateChanger);
+    private state;
+    private setState;
+    constructor(state: IRouterState | undefined, setState: React.Dispatch<React.SetStateAction<IRouterState | undefined>>);
     private notify;
     onInformation(text: string): void;
     onSuccess(text: string): void;

package/dist/Messenger.js

@@ -7,8 +7,9 @@ exports.Messenger = void 0;
 const axios_1 = __importDefault(require("axios"));
 const NotificationType_1 = require("./NotificationType");
 class Messenger {
-    constructor(component) {
-        this.component = component;
+    constructor(state, setState) {
+        this.state = state;
+        this.setState = setState;
         this.notify = this.notify.bind(this);
         this.onInformation = this.onInformation.bind(this);
         this.onSuccess = this.onSuccess.bind(this);
@@ -17,12 +18,14 @@ class Messenger {
         this.delNotification = this.delNotification.bind(this);
     }
     notify(message) {
-        let state = this.component.getState();
+        let state = this.state;
+        if (!state)
+            state = {};
         let id = Messenger.Counter++;
         if (!state.notifications)
             state.notifications = [];
         state.notifications[id] = message;
-        this.component.setState(state);
+        this.setState(state);
         setTimeout(() => {
             this.delNotification(id);
         }, 5000);
@@ -51,10 +54,12 @@ class Messenger {
         this.notify({ text, type: NotificationType_1.NotificationType.Error, color: "red" });
     }
     delNotification(id) {
-        let state = this.component.getState();
+        let state = this.state;
+        if (!state)
+            state = {};
         if (state.notifications)
             delete state.notifications[id];
-        this.component.setState(state);
+        this.setState(state);
     }
 }
 exports.Messenger = Messenger;

package/dist/Messenger.js.map

@@ -1 +1 @@
-{"version":3,"file":"Messenger.js","sourceRoot":"","sources":["../src/Messenger.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Messenger.js","sourceRoot":"","sources":["../src/Messenger.ts"],"names":[],"mappings":"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"}

package/dist/RouterMaker.d.ts

@@ -1,10 +1,12 @@
 import { ReactNode } from "react";
 import { ParsedNameValue } from "namirasoft-core";
-import { IRouterStateChanger } from "./IRouterStateChanger";
 import { IRouterMaker } from "./IRouterMaker";
+import { IRouterState } from "./IRouterState";
 export default class RouterMaker {
+    private state;
+    private setState;
     private component;
-    constructor(component: IRouterStateChanger & IRouterMaker);
+    constructor(state: IRouterState | undefined, setState: React.Dispatch<React.SetStateAction<IRouterState | undefined>>, component: IRouterMaker);
     private init;
     getQuery(name: string): string;
     getLink(sub: string, customQuery: {
@@ -13,6 +15,6 @@ export default class RouterMaker {
     redirect(sub: string, customQuery: {
         [name: string]: ParsedNameValue;
     }): void;
-    onComponentDidMount(): void;
+    onUseEffect(): void;
     onRender(): ReactNode;
 }

package/dist/RouterMaker.js

@@ -7,20 +7,23 @@ const query_string_1 = __importDefault(require("query-string"));
 const namirasoft_core_1 = require("namirasoft-core");
 const Messenger_1 = require("./Messenger");
 const namirasoft_account_1 = require("namirasoft-account");
+const react_router_dom_1 = require("react-router-dom");
 const axios_1 = __importDefault(require("axios"));
 class RouterMaker {
-    constructor(component) {
+    constructor(state, setState, component) {
+        this.state = state;
+        this.setState = setState;
         this.component = component;
         this.init = this.init.bind(this);
         this.getQuery = this.getQuery.bind(this);
         this.getLink = this.getLink.bind(this);
         this.redirect = this.redirect.bind(this);
-        this.onComponentDidMount = this.onComponentDidMount.bind(this);
+        this.onUseEffect = this.onUseEffect.bind(this);
         this.onRender = this.onRender.bind(this);
     }
     init() {
-        var _a;
-        let messenger = new Messenger_1.Messenger(this.component);
+        var _a, _b;
+        let messenger = new Messenger_1.Messenger(this.state, this.setState);
         let qStorage = this.getQuery("location");
         let qAPI = this.getQuery("api");
         let qToken = this.getQuery("token");
@@ -32,7 +35,7 @@ class RouterMaker {
             storage = new namirasoft_core_1.IStorageMemory();
         else
             storage = new namirasoft_core_1.IStorageLocal();
-        let token_manager = new namirasoft_account_1.TokenManager(storage, () => this.component.setState({}));
+        let token_manager = new namirasoft_account_1.TokenManager(storage, () => this.setState({}));
         if (qToken)
             token_manager.setValue(qToken, true);
         let server = new namirasoft_account_1.NamirasoftAccountServer(token_manager, (error) => {
@@ -60,10 +63,11 @@ class RouterMaker {
         };
         let inited = true;
         if (qToken)
-            inited = (_a = this.component.getState().inited) !== null && _a !== void 0 ? _a : false;
+            inited = (_b = (_a = this.state) === null || _a === void 0 ? void 0 : _a.inited) !== null && _b !== void 0 ? _b : false;
         return { props, inited };
     }
     getQuery(name) {
+        const location = (0, react_router_dom_1.useLocation)();
         let query = query_string_1.default.parse(location.search);
         let item = query[name];
         return new namirasoft_core_1.ObjectService(item).getString();
@@ -71,26 +75,29 @@ class RouterMaker {
     getLink(sub, customQuery) {
         if (!customQuery)
             customQuery = {};
+        const location = (0, react_router_dom_1.useLocation)();
         let query = query_string_1.default.parse(location.search);
         let final = Object.assign(Object.assign({}, query), customQuery);
         return namirasoft_core_1.URLOperation.getLink("", sub, final);
     }
     redirect(sub, customQuery) {
-        console.log({ sub, customQuery });
+        const navigate = (0, react_router_dom_1.useNavigate)();
+        let ans = this.getLink(sub, customQuery);
+        navigate(ans);
     }
-    onComponentDidMount() {
+    onUseEffect() {
         let { inited, props } = this.init();
-        this.component.setState({ notifications: [], inited });
+        this.setState({ notifications: [], inited });
         let token = this.getQuery("token");
         if (token) {
             if (!props.account.token_manager.getUserData(u => u.id, "")) {
                 props.account.server.session.Current()
                     .then(response => {
                     props.account.token_manager.set(response, false);
-                    this.component.setState({ inited: true });
+                    this.setState({ inited: true });
                 })
                     .catch(() => {
-                    this.component.setState({ inited: true });
+                    this.setState({ inited: true });
                 });
             }
         }

package/dist/RouterMaker.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouterMaker.js","sourceRoot":"","sources":["../src/RouterMaker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RouterMaker.js","sourceRoot":"","sources":["../src/RouterMaker.ts"],"names":[],"mappings":"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"}

package/dist/index.d.ts

@@ -1,7 +1,6 @@
 export * from "./IAccountProps";
 export * from "./IRouterMaker";
 export * from "./IRouterState";
-export * from "./IRouterStateChanger";
 export * from "./Messenger";
 export * from "./Notification";
 export * from "./NotificationType";

package/dist/index.js

@@ -21,7 +21,6 @@ exports.RouterMaker = void 0;
 __exportStar(require("./IAccountProps"), exports);
 __exportStar(require("./IRouterMaker"), exports);
 __exportStar(require("./IRouterState"), exports);
-__exportStar(require("./IRouterStateChanger"), exports);
 __exportStar(require("./Messenger"), exports);
 __exportStar(require("./Notification"), exports);
 __exportStar(require("./NotificationType"), exports);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,kDAAgC;AAChC,iDAA+B;AAC/B,iDAA+B;AAC/B,wDAAsC;AACtC,8CAA4B;AAC5B,iDAA+B;AAC/B,qDAAmC;AACnC,6CAAuD;AAA9C,2HAAA,OAAO,OAAe"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,kDAAgC;AAChC,iDAA+B;AAC/B,iDAA+B;AAC/B,8CAA4B;AAC5B,iDAA+B;AAC/B,qDAAmC;AACnC,6CAAuD;AAA9C,2HAAA,OAAO,OAAe"}

package/package.json

@@ -8,16 +8,18 @@
     "framework": "npm",
     "application": "package",
     "private": false,
-    "version": "1.3.0",
+    "version": "1.3.2",
     "main": "./dist/index.js",
     "types": "./dist/index.d.ts",
     "author": "Amir Abolhasani",
     "license": "MIT",
-    "scripts": {},
+    "scripts": {
+        "build": ""
+    },
     "dependencies": {
-        "@types/react": "^18.2.66",
-        "namirasoft-account": "^1.3.0",
-        "namirasoft-core": "^1.3.0",
+        "@types/react": "^18.2.70",
+        "namirasoft-account": "^1.3.7",
+        "namirasoft-core": "^1.3.11",
         "query-string": "^9.0.0",
         "react": "^18.2.0",
         "react-router-dom": "^6.22.3",

package/src/Messenger.ts

@@ -1,15 +1,17 @@
 import axios from "axios";
-import { IRouterStateChanger } from "./IRouterStateChanger";
 import { Notification } from "./Notification";
 import { NotificationType } from "./NotificationType";
+import { IRouterState } from "./IRouterState";
 
 export class Messenger
 {
     static Counter: number = 1;
-    private component: IRouterStateChanger;
-    constructor(component: IRouterStateChanger)
+    private state: IRouterState | undefined;
+    private setState: React.Dispatch<React.SetStateAction<IRouterState | undefined>>;
+    constructor(state: IRouterState | undefined, setState: React.Dispatch<React.SetStateAction<IRouterState | undefined>>)
     {
-        this.component = component;
+        this.state = state;
+        this.setState = setState;
         this.notify = this.notify.bind(this);
         this.onInformation = this.onInformation.bind(this);
         this.onSuccess = this.onSuccess.bind(this);
@@ -19,12 +21,14 @@ export class Messenger
     }
     private notify(message: Notification) 
     {
-        let state = this.component.getState();
+        let state = this.state;
+        if (!state)
+            state = {};
         let id = Messenger.Counter++;
         if (!state.notifications)
             state.notifications = [];
         state.notifications[id] = message;
-        this.component.setState(state);
+        this.setState(state);
         setTimeout(() =>
         {
             this.delNotification(id);
@@ -59,9 +63,11 @@ export class Messenger
     }
     delNotification(id: number): void
     {
-        let state = this.component.getState();
+        let state = this.state;
+        if (!state)
+            state = {};
         if (state.notifications)
             delete state.notifications[id];
-        this.component.setState(state);
+        this.setState(state);
     }
 }

package/src/RouterMaker.ts

@@ -2,43 +2,34 @@
 import { ReactNode } from "react";
 import queryString from 'query-string';
 import { IStorage, IStorageLocal, IStorageMemory, ObjectService, ParsedNameValue, URLOperation } from "namirasoft-core";
-import { IRouterStateChanger } from "./IRouterStateChanger";
 import { Messenger } from "./Messenger";
 import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
 import { IAccountProps } from "./IAccountProps";
 import { IRouterMaker } from "./IRouterMaker";
+import { useLocation, useNavigate } from 'react-router-dom';
 import axios from "axios";
-// todo
-// import { RouteComponentProps } from 'react-router-dom';
-
-// todo
-// interface IProps extends RouteComponentProps
-// {
-// }
+import { IRouterState } from "./IRouterState";
 
 export default class RouterMaker
 {
-    private component: IRouterStateChanger & IRouterMaker;
-    // todo
-    // private props: IProps;
-    constructor(component: IRouterStateChanger & IRouterMaker
-        // todo
-        // , props: IProps
-    )
+    private state: IRouterState | undefined;
+    private setState: React.Dispatch<React.SetStateAction<IRouterState | undefined>>;
+    private component: IRouterMaker;
+    constructor(state: IRouterState | undefined, setState: React.Dispatch<React.SetStateAction<IRouterState | undefined>>, component: IRouterMaker)
     {
+        this.state = state;
+        this.setState = setState;
         this.component = component;
-        // todo
-        // this.props = props;
         this.init = this.init.bind(this);
         this.getQuery = this.getQuery.bind(this);
         this.getLink = this.getLink.bind(this);
         this.redirect = this.redirect.bind(this);
-        this.onComponentDidMount = this.onComponentDidMount.bind(this);
+        this.onUseEffect = this.onUseEffect.bind(this);
         this.onRender = this.onRender.bind(this);
     }
     private init(): { props: IAccountProps, inited: boolean }
     {
-        let messenger: Messenger = new Messenger(this.component);
+        let messenger: Messenger = new Messenger(this.state, this.setState);
         let qStorage: string = this.getQuery("location");
         let qAPI: string = this.getQuery("api");
         let qToken: string = this.getQuery("token");
@@ -50,7 +41,7 @@ export default class RouterMaker
             storage = new IStorageMemory();
         else
             storage = new IStorageLocal();
-        let token_manager = new TokenManager(storage, () => this.component.setState({}));
+        let token_manager = new TokenManager(storage, () => this.setState({}));
         if (qToken)
             token_manager.setValue(qToken, true);
         let server = new NamirasoftAccountServer(token_manager, (error: Error) =>
@@ -74,19 +65,17 @@ export default class RouterMaker
                 getLink: this.getLink,
                 redirect: this.redirect,
                 getQuery: this.getQuery,
-                // todo
-                // ...this.props
             },
             messenger,
         };
         let inited = true;
         if (qToken)
-            inited = this.component.getState().inited ?? false;
+            inited = this.state?.inited ?? false;
         return { props, inited };
     }
     getQuery(name: string): string
     {
-        // todo fix location.
+        const location = useLocation();
         let query = queryString.parse(location.search);
         let item = query[name];
         return new ObjectService(item).getString();
@@ -95,23 +84,21 @@ export default class RouterMaker
     {
         if (!customQuery)
             customQuery = {};
-        // todo fix location.
+        const location = useLocation();
         let query = queryString.parse(location.search);
         let final = { ...query, ...customQuery };
         return URLOperation.getLink("", sub, final);
     }
     redirect(sub: string, customQuery: { [name: string]: ParsedNameValue }): void
     {
-        // todo fix location.
-        console.log({ sub, customQuery });
-        // let ans = this.getLink(sub, customQuery);
-        // const { history } = this.props;
-        // history.push(ans);
+        const navigate = useNavigate();
+        let ans = this.getLink(sub, customQuery);
+        navigate(ans);
     }
-    onComponentDidMount(): void
+    onUseEffect(): void
     {
         let { inited, props } = this.init();
-        this.component.setState({ notifications: [], inited });
+        this.setState({ notifications: [], inited });
         let token = this.getQuery("token");
         if (token)
         {
@@ -121,11 +108,11 @@ export default class RouterMaker
                     .then(response =>
                     {
                         props.account.token_manager.set(response, false);
-                        this.component.setState({ inited: true });
+                        this.setState({ inited: true });
                     })
                     .catch(() =>
                     {
-                        this.component.setState({ inited: true });
+                        this.setState({ inited: true });
                     });
             }
         }

package/src/index.ts

@@ -1,7 +1,6 @@
 export * from "./IAccountProps";
 export * from "./IRouterMaker";
 export * from "./IRouterState";
-export * from "./IRouterStateChanger";
 export * from "./Messenger";
 export * from "./Notification";
 export * from "./NotificationType";

package/dist/IRouterStateChanger.d.ts

@@ -1,5 +0,0 @@
-import { IRouterState } from "./IRouterState";
-export interface IRouterStateChanger {
-    setState(state: IRouterState): void;
-    getState(): IRouterState;
-}

package/dist/IRouterStateChanger.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=IRouterStateChanger.js.map

package/dist/IRouterStateChanger.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"IRouterStateChanger.js","sourceRoot":"","sources":["../src/IRouterStateChanger.ts"],"names":[],"mappings":""}

package/src/IRouterStateChanger.ts

@@ -1,7 +0,0 @@
-import { IRouterState } from "./IRouterState";
-
-export interface IRouterStateChanger
-{
-    setState(state: IRouterState): void;
-    getState(): IRouterState;
-}