namirasoft-account-react 1.0.1 → 1.2.0

package/.gitlab-ci.yml

@@ -0,0 +1,14 @@
+stages:   
+ - publish
+
+publish:
+  stage: publish
+  script:
+    - rm -rf node_modules
+    - rm -rf dist
+    - ncu -u
+    - npm i
+    - tsc
+    - npm publish
+  only:
+    - master

package/dist/IAccountProps.d.ts

@@ -1,7 +1,6 @@
 import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
 import { Messenger } from "./Messenger";
 import { ParsedNameValue } from "namirasoft-core";
-import { RouteComponentProps } from "react-router-dom";
 export interface IAccountProps {
     account: {
         token_manager: TokenManager;
@@ -16,5 +15,5 @@ export interface IAccountProps {
         redirect(sub: string, customQuery: {
             [name: string]: ParsedNameValue;
         }): void;
-    } & RouteComponentProps;
+    };
 }

package/dist/RouterMaker.d.ts

@@ -2,13 +2,9 @@ import { ReactNode } from "react";
 import { ParsedNameValue } from "namirasoft-core";
 import { IRouterStateChanger } from "./IRouterStateChanger";
 import { IRouterMaker } from "./IRouterMaker";
-import { RouteComponentProps } from 'react-router-dom';
-interface IProps extends RouteComponentProps {
-}
 export default class RouterMaker {
     private component;
-    private props;
-    constructor(component: IRouterStateChanger & IRouterMaker, props: IProps);
+    constructor(component: IRouterStateChanger & IRouterMaker);
     private init;
     getQuery(name: string): string;
     getLink(sub: string, customQuery: {
@@ -20,4 +16,3 @@ export default class RouterMaker {
     onComponentDidMount(): void;
     onRender(): ReactNode;
 }
-export {};

package/dist/RouterMaker.js

@@ -8,10 +8,22 @@ const namirasoft_core_1 = require("namirasoft-core");
 const Messenger_1 = require("./Messenger");
 const namirasoft_account_1 = require("namirasoft-account");
 const axios_1 = __importDefault(require("axios"));
+// todo
+// import { RouteComponentProps } from 'react-router-dom';
+// todo
+// interface IProps extends RouteComponentProps
+// {
+// }
 class RouterMaker {
-    constructor(component, props) {
+    // todo
+    // private props: IProps;
+    constructor(component
+    // todo
+    // , props: IProps
+    ) {
         this.component = component;
-        this.props = props;
+        // todo
+        // this.props = props;
         this.init = this.init.bind(this);
         this.getQuery = this.getQuery.bind(this);
         this.getLink = this.getLink.bind(this);
@@ -52,7 +64,13 @@ class RouterMaker {
                 token_manager,
                 server,
             },
-            url: Object.assign({ getLink: this.getLink, redirect: this.redirect, getQuery: this.getQuery }, this.props),
+            url: {
+                getLink: this.getLink,
+                redirect: this.redirect,
+                getQuery: this.getQuery,
+                // todo
+                // ...this.props
+            },
             messenger,
         };
         let inited = true;
@@ -61,7 +79,7 @@ class RouterMaker {
         return { props, inited };
     }
     getQuery(name) {
-        let location = this.props.location;
+        // todo fix location.
         let query = query_string_1.default.parse(location.search);
         let item = query[name];
         return new namirasoft_core_1.ObjectService(item).getString();
@@ -69,23 +87,25 @@ class RouterMaker {
     getLink(sub, customQuery) {
         if (!customQuery)
             customQuery = {};
-        let location = this.props.location;
+        // todo fix location.
         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) {
-        let ans = this.getLink(sub, customQuery);
-        const { history } = this.props;
-        history.push(ans);
+        // todo fix location.
+        console.log({ sub, customQuery });
+        // let ans = this.getLink(sub, customQuery);
+        // const { history } = this.props;
+        // history.push(ans);
     }
     onComponentDidMount() {
         let { inited, props } = this.init();
         this.component.setState({ notifications: [], inited });
         let token = this.getQuery("token");
         if (token) {
-            if (!props.account.token_manager.getUserData(u => u.id, 0)) {
-                props.account.server.session.get()
+            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 });

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/package.json

@@ -1,20 +1,19 @@
-{
-    "name": "namirasoft-account-react",
-    "description": "Namira Software Corporation Account React NPM Package",
-    "version": "1.0.1",
-    "main": "./dist/index.js",
-    "types": "./dist/index.d.ts",
-    "scripts": {},
-    "author": "Amir Abolhasani",
-    "license": "MIT",
-    "dependencies": {
-        "@types/react": "^18.2.36",
-        "@types/react-router-dom": "^5.3.3",
-        "namirasoft-account": "^1.0.3",
-        "namirasoft-core": "^1.0.5",
-        "query-string": "^8.1.0",
-        "react": "^18.2.0",
-        "react-router-dom": "^5.3.4",
-        "run": "^1.4.0"
-    }
+{
+    "name": "namirasoft-account-react",
+    "description": "Namira Software Corporation Account React NPM Package",
+    "version": "1.2.0",
+    "main": "./dist/index.js",
+    "types": "./dist/index.d.ts",
+    "scripts": {},
+    "author": "Amir Abolhasani",
+    "license": "MIT",
+    "dependencies": {
+        "@types/react": "^18.2.47",
+        "namirasoft-account": "^1.2.3",
+        "namirasoft-core": "^1.2.5",
+        "query-string": "^8.1.0",
+        "react": "^18.2.0",
+        "react-router-dom": "^6.21.2",
+        "run": "^1.5.0"
+    }
 }

package/src/IAccountProps.ts

@@ -1,18 +1,17 @@
-import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
-import { Messenger } from "./Messenger";
-import { ParsedNameValue } from "namirasoft-core";
-import { RouteComponentProps } from "react-router-dom";
-
-export interface IAccountProps
-{
-    account: {
-        token_manager: TokenManager
-        server: NamirasoftAccountServer;
-    },
-    messenger: Messenger;
-    url: {
-        getQuery(name: string): string;
-        getLink(sub: string, customQuery: { [name: string]: ParsedNameValue }): string;
-        redirect(sub: string, customQuery: { [name: string]: ParsedNameValue }): void;
-    } & RouteComponentProps
+import { NamirasoftAccountServer, TokenManager } from "namirasoft-account";
+import { Messenger } from "./Messenger";
+import { ParsedNameValue } from "namirasoft-core";
+
+export interface IAccountProps
+{
+    account: {
+        token_manager: TokenManager
+        server: NamirasoftAccountServer;
+    },
+    messenger: Messenger;
+    url: {
+        getQuery(name: string): string;
+        getLink(sub: string, customQuery: { [name: string]: ParsedNameValue }): string;
+        redirect(sub: string, customQuery: { [name: string]: ParsedNameValue }): void;
+    }
 }

package/src/IRouterMaker.ts

@@ -1,8 +1,8 @@
-import { ReactNode } from "react";
-import { IAccountProps } from "./IAccountProps";
-export interface IRouterMaker
-{
-    on401(): void;
-    onRenderOnLogin(props: IAccountProps): ReactNode;
-    onRenderOnLogout(props: IAccountProps, banned: boolean): ReactNode;
+import { ReactNode } from "react";
+import { IAccountProps } from "./IAccountProps";
+export interface IRouterMaker
+{
+    on401(): void;
+    onRenderOnLogin(props: IAccountProps): ReactNode;
+    onRenderOnLogout(props: IAccountProps, banned: boolean): ReactNode;
 }

package/src/IRouterState.ts

@@ -1,7 +1,7 @@
-import { Notification } from "./Notification";
-
-export interface IRouterState
-{
-    inited?: boolean;
-    notifications?: Notification[];
+import { Notification } from "./Notification";
+
+export interface IRouterState
+{
+    inited?: boolean;
+    notifications?: Notification[];
 }

package/src/IRouterStateChanger.ts

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

package/src/Messenger.ts

@@ -1,67 +1,67 @@
-import axios from "axios";
-import { IRouterStateChanger } from "./IRouterStateChanger";
-import { Notification } from "./Notification";
-import { NotificationType } from "./NotificationType";
-
-export class Messenger
-{
-    static Counter: number = 1;
-    private component: IRouterStateChanger;
-    constructor(component: IRouterStateChanger)
-    {
-        this.component = component;
-        this.notify = this.notify.bind(this);
-        this.onInformation = this.onInformation.bind(this);
-        this.onSuccess = this.onSuccess.bind(this);
-        this.onWarning = this.onWarning.bind(this);
-        this.onError = this.onError.bind(this);
-        this.delNotification = this.delNotification.bind(this);
-    }
-    private notify(message: Notification) 
-    {
-        let state = this.component.getState();
-        let id = Messenger.Counter++;
-        if (!state.notifications)
-            state.notifications = [];
-        state.notifications[id] = message;
-        this.component.setState(state);
-        setTimeout(() =>
-        {
-            this.delNotification(id);
-        }, 5000);
-        window.scrollTo({ top: 0, left: 0, behavior: 'smooth' });
-    }
-    onInformation(text: string) 
-    {
-        this.notify({ text, type: NotificationType.Information, color: "black" });
-    }
-    onSuccess(text: string) 
-    {
-        this.notify({ text, type: NotificationType.Success, color: "green" });
-    }
-    onWarning(text: string) 
-    {
-        this.notify({ text, type: NotificationType.Warning, color: "yellow" });
-    }
-    onError(error: Error | string) 
-    {
-        let text: string = "";
-        if (error instanceof Error)
-        {
-            text = error.message;
-            if (axios.isAxiosError(error))
-                if (error.response?.data)
-                    text = error.response.data;
-        }
-        else
-            text = error;
-        this.notify({ text, type: NotificationType.Error, color: "red" });
-    }
-    delNotification(id: number): void
-    {
-        let state = this.component.getState();
-        if (state.notifications)
-            delete state.notifications[id];
-        this.component.setState(state);
-    }
+import axios from "axios";
+import { IRouterStateChanger } from "./IRouterStateChanger";
+import { Notification } from "./Notification";
+import { NotificationType } from "./NotificationType";
+
+export class Messenger
+{
+    static Counter: number = 1;
+    private component: IRouterStateChanger;
+    constructor(component: IRouterStateChanger)
+    {
+        this.component = component;
+        this.notify = this.notify.bind(this);
+        this.onInformation = this.onInformation.bind(this);
+        this.onSuccess = this.onSuccess.bind(this);
+        this.onWarning = this.onWarning.bind(this);
+        this.onError = this.onError.bind(this);
+        this.delNotification = this.delNotification.bind(this);
+    }
+    private notify(message: Notification) 
+    {
+        let state = this.component.getState();
+        let id = Messenger.Counter++;
+        if (!state.notifications)
+            state.notifications = [];
+        state.notifications[id] = message;
+        this.component.setState(state);
+        setTimeout(() =>
+        {
+            this.delNotification(id);
+        }, 5000);
+        window.scrollTo({ top: 0, left: 0, behavior: 'smooth' });
+    }
+    onInformation(text: string) 
+    {
+        this.notify({ text, type: NotificationType.Information, color: "black" });
+    }
+    onSuccess(text: string) 
+    {
+        this.notify({ text, type: NotificationType.Success, color: "green" });
+    }
+    onWarning(text: string) 
+    {
+        this.notify({ text, type: NotificationType.Warning, color: "yellow" });
+    }
+    onError(error: Error | string) 
+    {
+        let text: string = "";
+        if (error instanceof Error)
+        {
+            text = error.message;
+            if (axios.isAxiosError(error))
+                if (error.response?.data)
+                    text = error.response.data;
+        }
+        else
+            text = error;
+        this.notify({ text, type: NotificationType.Error, color: "red" });
+    }
+    delNotification(id: number): void
+    {
+        let state = this.component.getState();
+        if (state.notifications)
+            delete state.notifications[id];
+        this.component.setState(state);
+    }
 }

package/src/Notification.ts

@@ -1,8 +1,8 @@
-import { NotificationType } from "./NotificationType";
-
-export type Notification =
-    {
-        text: string;
-        type: NotificationType;
-        color: string;
+import { NotificationType } from "./NotificationType";
+
+export type Notification =
+    {
+        text: string;
+        type: NotificationType;
+        color: string;
     }

package/src/NotificationType.ts

@@ -1,7 +1,7 @@
-export enum NotificationType
-{
-    Information = "Information",
-    Warning = "Warning",
-    Success = "Success",
-    Error = "Error",
+export enum NotificationType
+{
+    Information = "Information",
+    Warning = "Warning",
+    Success = "Success",
+    Error = "Error",
 }

package/src/RouterMaker.ts

@@ -1,137 +1,147 @@
-
-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 axios from "axios";
-import { RouteComponentProps } from 'react-router-dom';
-
-interface IProps extends RouteComponentProps
-{
-}
-
-export default class RouterMaker
-{
-    private component: IRouterStateChanger & IRouterMaker;
-    private props: IProps;
-    constructor(component: IRouterStateChanger & IRouterMaker, props: IProps)
-    {
-        this.component = component;
-        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.onRender = this.onRender.bind(this);
-    }
-    private init(): { props: IAccountProps, inited: boolean }
-    {
-        let messenger: Messenger = new Messenger(this.component);
-        let qStorage: string = this.getQuery("location");
-        let qAPI: string = this.getQuery("api");
-        let qToken: string = this.getQuery("token");
-        if (!qStorage)
-            if (qAPI)
-                qStorage = "memory";
-        let storage: IStorage;
-        if (qStorage === "memory")
-            storage = new IStorageMemory();
-        else
-            storage = new IStorageLocal();
-        let token_manager = new TokenManager(storage, () => this.component.setState({}));
-        if (qToken)
-            token_manager.setValue(qToken, true);
-        let server = new NamirasoftAccountServer(token_manager, (error: Error) =>
-        {
-            if (axios.isAxiosError(error))
-                if (error.response)
-                    if (error.response?.status === 401)
-                    {
-                        token_manager.del();
-                        this.component.on401();
-                        return;
-                    }
-            messenger.onError(error);
-        });
-        let props: IAccountProps = {
-            account: {
-                token_manager,
-                server,
-            },
-            url: {
-                getLink: this.getLink,
-                redirect: this.redirect,
-                getQuery: this.getQuery,
-                ...this.props
-            },
-            messenger,
-        };
-        let inited = true;
-        if (qToken)
-            inited = this.component.getState().inited ?? false;
-        return { props, inited };
-    }
-    getQuery(name: string): string
-    {
-        let location = this.props.location;
-        let query = queryString.parse(location.search);
-        let item = query[name];
-        return new ObjectService(item).getString();
-    }
-    getLink(sub: string, customQuery: { [name: string]: ParsedNameValue })
-    {
-        if (!customQuery)
-            customQuery = {};
-        let location = this.props.location;
-        let query = queryString.parse(location.search);
-        let final = { ...query, ...customQuery };
-        return URLOperation.getLink("", sub, final);
-    }
-    redirect(sub: string, customQuery: { [name: string]: ParsedNameValue }): void
-    {
-        let ans = this.getLink(sub, customQuery);
-        const { history } = this.props;
-        history.push(ans);
-    }
-    onComponentDidMount(): void
-    {
-        let { inited, props } = this.init();
-        this.component.setState({ notifications: [], inited });
-        let token = this.getQuery("token");
-        if (token)
-        {
-            if (!props.account.token_manager.getUserData(u => u.id, 0))
-            {
-                props.account.server.session.get()
-                    .then(response =>
-                    {
-                        props.account.token_manager.set(response, false);
-                        this.component.setState({ inited: true });
-                    })
-                    .catch(() =>
-                    {
-                        this.component.setState({ inited: true });
-                    });
-            }
-        }
-    }
-    onRender(): ReactNode
-    {
-        let { inited, props } = this.init();
-        if (!inited)
-            return null;
-        let banned = false;
-        if (props.account.token_manager.exists())
-        {
-            banned = props.account.token_manager.getUserData(user => user.banned, false);
-            if (!banned)
-                return this.component.onRenderOnLogin(props);
-        }
-        return this.component.onRenderOnLogout(props, banned);
-    }
+
+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 axios from "axios";
+// todo
+// import { RouteComponentProps } from 'react-router-dom';
+
+// todo
+// interface IProps extends RouteComponentProps
+// {
+// }
+
+export default class RouterMaker
+{
+    private component: IRouterStateChanger & IRouterMaker;
+    // todo
+    // private props: IProps;
+    constructor(component: IRouterStateChanger & IRouterMaker
+        // todo
+        // , props: IProps
+    )
+    {
+        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.onRender = this.onRender.bind(this);
+    }
+    private init(): { props: IAccountProps, inited: boolean }
+    {
+        let messenger: Messenger = new Messenger(this.component);
+        let qStorage: string = this.getQuery("location");
+        let qAPI: string = this.getQuery("api");
+        let qToken: string = this.getQuery("token");
+        if (!qStorage)
+            if (qAPI)
+                qStorage = "memory";
+        let storage: IStorage;
+        if (qStorage === "memory")
+            storage = new IStorageMemory();
+        else
+            storage = new IStorageLocal();
+        let token_manager = new TokenManager(storage, () => this.component.setState({}));
+        if (qToken)
+            token_manager.setValue(qToken, true);
+        let server = new NamirasoftAccountServer(token_manager, (error: Error) =>
+        {
+            if (axios.isAxiosError(error))
+                if (error.response)
+                    if (error.response?.status === 401)
+                    {
+                        token_manager.del();
+                        this.component.on401();
+                        return;
+                    }
+            messenger.onError(error);
+        });
+        let props: IAccountProps = {
+            account: {
+                token_manager,
+                server,
+            },
+            url: {
+                getLink: this.getLink,
+                redirect: this.redirect,
+                getQuery: this.getQuery,
+                // todo
+                // ...this.props
+            },
+            messenger,
+        };
+        let inited = true;
+        if (qToken)
+            inited = this.component.getState().inited ?? false;
+        return { props, inited };
+    }
+    getQuery(name: string): string
+    {
+        // todo fix location.
+        let query = queryString.parse(location.search);
+        let item = query[name];
+        return new ObjectService(item).getString();
+    }
+    getLink(sub: string, customQuery: { [name: string]: ParsedNameValue })
+    {
+        if (!customQuery)
+            customQuery = {};
+        // todo fix location.
+        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);
+    }
+    onComponentDidMount(): void
+    {
+        let { inited, props } = this.init();
+        this.component.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 });
+                    })
+                    .catch(() =>
+                    {
+                        this.component.setState({ inited: true });
+                    });
+            }
+        }
+    }
+    onRender(): ReactNode
+    {
+        let { inited, props } = this.init();
+        if (!inited)
+            return null;
+        let banned = false;
+        if (props.account.token_manager.exists())
+        {
+            banned = props.account.token_manager.getUserData(user => user.banned, false);
+            if (!banned)
+                return this.component.onRenderOnLogin(props);
+        }
+        return this.component.onRenderOnLogout(props, banned);
+    }
 };

package/src/index.ts

@@ -1,8 +1,8 @@
-export * from "./IAccountProps";
-export * from "./IRouterMaker";
-export * from "./IRouterState";
-export * from "./IRouterStateChanger";
-export * from "./Messenger";
-export * from "./Notification";
-export * from "./NotificationType";
+export * from "./IAccountProps";
+export * from "./IRouterMaker";
+export * from "./IRouterState";
+export * from "./IRouterStateChanger";
+export * from "./Messenger";
+export * from "./Notification";
+export * from "./NotificationType";
 export { default as RouterMaker } from "./RouterMaker";

package/tsconfig.json

@@ -1,30 +1,30 @@
-{
-    "compilerOptions": {
-        "target": "ES6",
-        "module": "CommonJS",
-        "rootDir": "./src",
-        "outDir": "./dist",
-        "lib": [
-            "es6",
-            "dom"
-        ],
-        "allowJs": false,
-        "checkJs": false,
-        "strict": true,
-        "esModuleInterop": true,
-        "sourceMap": true,
-        "resolveJsonModule": true,
-        "declaration": true,
-        "noUnusedLocals": true,
-        "noUnusedParameters": true,
-        "noImplicitAny": true,
-        "noImplicitOverride": true,
-        "noImplicitReturns": true,
-        "noImplicitThis": true,
-        "skipLibCheck": false,
-        "allowSyntheticDefaultImports": true,
-        "forceConsistentCasingInFileNames": true,
-        "noFallthroughCasesInSwitch": true,
-        "isolatedModules": false,
-    }
+{
+    "compilerOptions": {
+        "target": "ES6",
+        "module": "CommonJS",
+        "rootDir": "./src",
+        "outDir": "./dist",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "allowJs": false,
+        "checkJs": false,
+        "strict": true,
+        "esModuleInterop": true,
+        "sourceMap": true,
+        "resolveJsonModule": true,
+        "declaration": true,
+        "noUnusedLocals": true,
+        "noUnusedParameters": true,
+        "noImplicitAny": true,
+        "noImplicitOverride": true,
+        "noImplicitReturns": true,
+        "noImplicitThis": true,
+        "skipLibCheck": false,
+        "allowSyntheticDefaultImports": true,
+        "forceConsistentCasingInFileNames": true,
+        "noFallthroughCasesInSwitch": true,
+        "isolatedModules": false,
+    }
 }