larapi 0.0.1 → 0.0.2

package/__tests__/connect.test.js

@@ -1,8 +1,5 @@
 import API from "../lib/index.js";
 
 test('Connect', () => {
-	// const api = new API({
-	// 	host: 'http://127.0.0.1:8000'
-	// });
-	
+	//todo
 });

package/babel.config.json

@@ -0,0 +1,3 @@
+{
+	"presets": ["@babel/preset-env"]
+}

package/global.d.ts

@@ -0,0 +1,3 @@
+declare global {
+	function apiSetInitData(): void;
+}

package/lib/Core.d.ts

@@ -1,21 +1,21 @@
 import { Events, Event } from 'easy-event-emitter';
-import { TCache, TMethod, TParams, TListenerEvents } from './types';
+import { TCache, TGroupsData, TMethod, TParams, TListenerEvents } from './types';
 declare abstract class Core {
     private host;
     token: string;
     cache: TCache;
+    initData: TGroupsData;
     protected events: Events;
     constructor();
     protected request(method: TMethod, params: TParams): {
         clearCache: () => void;
-    };
+    } | undefined;
     addListener(event: TListenerEvents, callback: (data: any) => void): Event;
     private getCache;
     setHost(host: string): void;
     private setCache;
     private deleteCacheGroup;
     private deleteCache;
-    setToken(token: string): void;
-    getToken(): string;
+    setInitData(data: TGroupsData): void;
 }
 export default Core;

package/lib/Core.js

@@ -26,6 +26,12 @@ class Core {
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "initData", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "events", {
             enumerable: true,
             configurable: true,
@@ -36,11 +42,16 @@ class Core {
         this.host = 'http://127.0.0.1/';
         this.token = '';
         this.cache = {};
+        this.initData = {};
+        this.request = this.request.bind(this);
         this.setHost = this.setHost.bind(this);
-        this.setToken = this.setToken.bind(this);
         this.addListener = this.addListener.bind(this);
+        this.setInitData = this.setInitData.bind(this);
     }
     request(method, params) {
+        var _a;
+        if (typeof XMLHttpRequest === 'undefined')
+            return;
         //Заголовки от 200 до 299
         const success = (...args) => {
             if (typeof params.success === 'function')
@@ -102,11 +113,11 @@ class Core {
         const pathCache = (0, md5_1.default)(path + JSON.stringify(params.data));
         var dataCache;
         if (params.globalName) {
-            // if (__global && __global[params.globalName]) {
-            // 	Core.setCache(pathCache, __global[params.globalName], (typeof params.cache === 'boolean' ? undefined : params.cache));
-            // 	params.cache = params.cache ?? true;
-            // 	delete __global[params.globalName];
-            // }
+            if (this.initData[params.globalName]) {
+                this.setCache(pathCache, this.initData[params.globalName], (typeof params.cache === 'boolean' ? undefined : params.cache));
+                params.cache = (_a = params.cache) !== null && _a !== void 0 ? _a : true;
+                delete this.initData[params.globalName];
+            }
         }
         if (params.cache) {
             if (dataCache = this.getCache(pathCache)) {
@@ -118,32 +129,37 @@ class Core {
             this.deleteCache(pathCache);
         }
         if (!dataCache) {
-            const xhr = new XMLHttpRequest();
-            xhr.open(method, this.host + path, true);
-            for (const header in fetchParams.headers) {
-                xhr.setRequestHeader(header, fetchParams.headers[header]);
-            }
-            xhr.onreadystatechange = () => {
-                if (xhr.readyState !== 4) {
-                    return;
+            try {
+                const xhr = new XMLHttpRequest();
+                xhr.open(method, this.host + path, true);
+                for (const header in fetchParams.headers) {
+                    xhr.setRequestHeader(header, fetchParams.headers[header]);
                 }
-                const result = xhr.responseText ? JSON.parse(xhr.responseText) : {};
-                if (xhr.status >= 200 && xhr.status <= 299) {
-                    if (params.cache) {
-                        this.setCache(pathCache, result, (typeof params.cache === 'boolean' ? undefined : params.cache));
+                xhr.onreadystatechange = () => {
+                    if (xhr.readyState !== 4) {
+                        return;
                     }
-                    success(result);
-                }
-                else {
-                    if (xhr.status >= 400 && xhr.status <= 499) {
-                        fail(result);
+                    const result = xhr.responseText ? JSON.parse(xhr.responseText) : {};
+                    if (xhr.status >= 200 && xhr.status <= 299) {
+                        if (params.cache) {
+                            this.setCache(pathCache, result, (typeof params.cache === 'boolean' ? undefined : params.cache));
+                        }
+                        success(result);
                     }
-                    error(result);
-                    console.error(result);
-                }
-                complete(result);
-            };
-            xhr.send(fetchParams.body);
+                    else {
+                        if (xhr.status >= 400 && xhr.status <= 499) {
+                            fail(result);
+                        }
+                        error(result);
+                        console.warn(result);
+                    }
+                    complete(result);
+                };
+                xhr.send(fetchParams.body);
+            }
+            catch (e) {
+                console.warn(e);
+            }
         }
         return {
             clearCache: () => {
@@ -192,12 +208,8 @@ class Core {
         }
         delete this.cache[keyCache];
     }
-    setToken(token) {
-        localStorage.setItem('token', token);
-        this.token = token;
-    }
-    getToken() {
-        return this.token;
+    setInitData(data) {
+        this.initData = data;
     }
 }
 exports.default = Core;

package/lib/index.d.ts

@@ -12,21 +12,30 @@ declare class API extends Core {
     constructor(config: TConfig);
     get(params: TParams): {
         clearCache: () => void;
-    };
+    } | undefined;
     post(params: TParams): {
         clearCache: () => void;
-    };
+    } | undefined;
     private init;
+    setToken(token: string): void;
+    getToken(): string;
     get uid(): number;
     get user(): TUser;
     setUser(user: TUser): void;
     updateUser(user: TUser): void;
     logout(): void;
+    static get: (params: TParams) => {
+        clearCache: () => void;
+    } | undefined;
+    static post: (params: TParams) => {
+        clearCache: () => void;
+    } | undefined;
     static setHost: (host: string) => void;
     static setUser: (user: TUser) => void;
     static updateUser: (user: TUser) => void;
     static logout: () => void;
     static setToken: (token: string) => void;
     static addListener: (event: import("./types").TListenerEvents, callback: (data: any) => void) => import("easy-event-emitter").Event;
+    static setInitData: (data: import("./types").TGroupsData) => void;
 }
 export default API;

package/lib/index.js

@@ -17,9 +17,12 @@ class API extends Core_1.default {
         this.setHost(config.host);
         this._user = {};
         this.init();
+        this.setToken = this.setToken.bind(this);
         this.setUser = this.setUser.bind(this);
         this.updateUser = this.updateUser.bind(this);
         this.logout = this.logout.bind(this);
+        this.get = this.get.bind(this);
+        this.post = this.post.bind(this);
     }
     get(params) {
         return this.request('GET', params);
@@ -28,6 +31,8 @@ class API extends Core_1.default {
         return this.request('POST', params);
     }
     init() {
+        if (typeof window === 'undefined')
+            return;
         const token = localStorage.getItem('token');
         const strUser = localStorage.getItem('user');
         if (strUser) {
@@ -38,6 +43,15 @@ class API extends Core_1.default {
             this.setToken(token);
         }
     }
+    setToken(token) {
+        if (typeof window === 'undefined')
+            return;
+        localStorage.setItem('token', token);
+        this.token = token;
+    }
+    getToken() {
+        return this.token;
+    }
     get uid() {
         return 'id' in this._user ? Number(this._user.id) : 0;
     }
@@ -45,6 +59,8 @@ class API extends Core_1.default {
         return this._user;
     }
     setUser(user) {
+        if (typeof window === 'undefined')
+            return;
         localStorage.setItem('user', JSON.stringify(user));
         this._user = user;
         this.events.emit('login', user);
@@ -54,9 +70,11 @@ class API extends Core_1.default {
         this.setUser(Object.assign(Object.assign({}, this.user), user));
     }
     logout() {
-        this.events.emit('logout', this.user);
+        if (typeof window === 'undefined')
+            return;
         localStorage.removeItem('user');
         localStorage.removeItem('token');
+        this.events.emit('logout', this.user);
         this.setUser({});
         this.setToken('');
     }
@@ -70,6 +88,18 @@ Object.defineProperty(API, "instance", {
         host: ''
     })
 });
+Object.defineProperty(API, "get", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: _a.instance.get
+});
+Object.defineProperty(API, "post", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: _a.instance.post
+});
 Object.defineProperty(API, "setHost", {
     enumerable: true,
     configurable: true,
@@ -106,4 +136,11 @@ Object.defineProperty(API, "addListener", {
     writable: true,
     value: _a.instance.addListener
 });
+Object.defineProperty(API, "setInitData", {
+    enumerable: true,
+    configurable: true,
+    writable: true,
+    value: _a.instance.setInitData
+});
+globalThis.apiSetInitData = API.setInitData;
 exports.default = API;

package/lib/types.d.ts

@@ -4,6 +4,9 @@ export type TCache = {
 export type TData = {
     [index: string]: any;
 };
+export type TGroupsData = {
+    [index: string]: TData;
+};
 export type TMethod = 'GET' | 'POST';
 export type TParams = {
     path: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "larapi",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "API client for laravel",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -10,6 +10,7 @@
   },
   "jest": {
     "transform": {
+      "^.+\\.ts?$": "ts-jest",
       "^.+\\.[t|j]sx?$": "babel-jest"
     }
   },
@@ -31,9 +32,11 @@
   "homepage": "https://github.com/SergoMorello/larasopp.client#readme",
   "devDependencies": {
     "@babel/preset-env": "^7.22.9",
-    "@types/jest": "^29.5.3",
+    "@babel/preset-typescript": "^7.22.5",
+    "@types/jest": "^29.4.3",
     "babel-jest": "^29.4.3",
     "jest": "^29.4.3",
+    "ts-jest": "^29.1.1",
     "typescript": "^5.1.6"
   },
   "dependencies": {

package/src/Core.ts

@@ -7,6 +7,7 @@ import EventEmitter,{
 import {
 	TCache,
 	TData,
+	TGroupsData,
 	TMethod,
 	TParams,
 	TRequestParams,
@@ -17,6 +18,7 @@ abstract class Core {
 	private host: string;
 		token: string;
 		cache: TCache;
+		initData: TGroupsData;
 	protected events: Events;
 
 	constructor() {
@@ -24,13 +26,16 @@ abstract class Core {
 		this.host = 'http://127.0.0.1/';
 		this.token = '';
 		this.cache = {};
+		this.initData = {};
 
+		this.request = this.request.bind(this);
 		this.setHost = this.setHost.bind(this);
-		this.setToken = this.setToken.bind(this);
 		this.addListener = this.addListener.bind(this);
+		this.setInitData = this.setInitData.bind(this);
 	}
 
 	protected request(method: TMethod, params: TParams) {
+		if (typeof XMLHttpRequest === 'undefined') return;
 
 		//Заголовки от 200 до 299
 		const success = (...args: any) => {
@@ -107,11 +112,11 @@ abstract class Core {
 		var dataCache;
 
 		if (params.globalName) {
-			// if (__global && __global[params.globalName]) {
-			// 	Core.setCache(pathCache, __global[params.globalName], (typeof params.cache === 'boolean' ? undefined : params.cache));
-			// 	params.cache = params.cache ?? true;
-			// 	delete __global[params.globalName];
-			// }
+			if (this.initData[params.globalName]) {
+				this.setCache(pathCache, this.initData[params.globalName], (typeof params.cache === 'boolean' ? undefined : params.cache));
+				params.cache = params.cache ?? true;
+				delete this.initData[params.globalName];
+			}
 		}
 		
 		if (params.cache) {
@@ -123,37 +128,41 @@ abstract class Core {
 			this.deleteCache(pathCache);
 		}
 		if (!dataCache) {
-			const xhr = new XMLHttpRequest();
-
-			xhr.open(method, this.host + path, true);
-			for(const header in fetchParams.headers) {
-				xhr.setRequestHeader(header, fetchParams.headers[header]);
-			}
+			try {
+				const xhr = new XMLHttpRequest();
 
-			xhr.onreadystatechange = () => {
-				if (xhr.readyState !== 4) {
-					return;
+				xhr.open(method, this.host + path, true);
+				for(const header in fetchParams.headers) {
+					xhr.setRequestHeader(header, fetchParams.headers[header]);
 				}
-				
-				const result = xhr.responseText ? JSON.parse(xhr.responseText) : {};
-
-				if (xhr.status >= 200 && xhr.status <= 299) {
-					if (params.cache) {
-						this.setCache(pathCache, result, (typeof params.cache === 'boolean' ? undefined : params.cache));
-					}
-					success(result);
-				}else{
-					if (xhr.status >= 400 && xhr.status <= 499) {
-						fail(result);
+	
+				xhr.onreadystatechange = () => {
+					if (xhr.readyState !== 4) {
+						return;
 					}
 					
-					error(result);
-					console.error(result);
+					const result = xhr.responseText ? JSON.parse(xhr.responseText) : {};
+	
+					if (xhr.status >= 200 && xhr.status <= 299) {
+						if (params.cache) {
+							this.setCache(pathCache, result, (typeof params.cache === 'boolean' ? undefined : params.cache));
+						}
+						success(result);
+					}else{
+						if (xhr.status >= 400 && xhr.status <= 499) {
+							fail(result);
+						}
+						
+						error(result);
+						console.warn(result);
+					}
+					complete(result);
 				}
-				complete(result);
+				xhr.send(fetchParams.body);
+			}catch(e) {
+				console.warn(e);
 			}
-
-			xhr.send(fetchParams.body);
+			
 		}
 		return {
 			clearCache: () => {
@@ -209,13 +218,8 @@ abstract class Core {
 		delete this.cache[keyCache];
 	}
 
-	public setToken(token: string) {
-		localStorage.setItem('token', token);
-		this.token = token;
-	}
-
-	public getToken() {
-		return this.token;
+	public setInitData(data: TGroupsData): void {
+		this.initData = data;
 	}
 }
 

package/src/index.ts

@@ -21,9 +21,12 @@ class API extends Core {
 		this._user = {};
 		this.init();
 
+		this.setToken = this.setToken.bind(this);
 		this.setUser = this.setUser.bind(this);
 		this.updateUser = this.updateUser.bind(this);
 		this.logout = this.logout.bind(this);
+		this.get = this.get.bind(this);
+		this.post = this.post.bind(this);
 	}
 
 	public get(params: TParams) {
@@ -35,6 +38,7 @@ class API extends Core {
 	}
 
 	private init(): void {
+		if (typeof window === 'undefined') return;
 		const token = localStorage.getItem('token');
 		const strUser = localStorage.getItem('user');
 		if (strUser) {
@@ -46,6 +50,16 @@ class API extends Core {
 		}
 	}
 
+	public setToken(token: string) {
+		if (typeof window === 'undefined') return;
+		localStorage.setItem('token', token);
+		this.token = token;
+	}
+
+	public getToken() {
+		return this.token;
+	}
+
 	public get uid(): number {
 			return 'id' in this._user ? Number(this._user.id) : 0;
 	}
@@ -55,6 +69,7 @@ class API extends Core {
 	}
 
 	public setUser(user: TUser) {
+		if (typeof window === 'undefined') return;
 		localStorage.setItem('user', JSON.stringify(user));
 		this._user = user;
 		this.events.emit('login', user);
@@ -66,19 +81,25 @@ class API extends Core {
 	}
 
 	public logout() {
-		this.events.emit('logout', this.user);
+		if (typeof window === 'undefined') return;
 		localStorage.removeItem('user');
 		localStorage.removeItem('token');
+		this.events.emit('logout', this.user);
 		this.setUser({});
 		this.setToken('');
 	}
 
+	public static get = this.instance.get;
+	public static post = this.instance.post;
 	public static setHost = this.instance.setHost;
 	public static setUser = this.instance.setUser;
 	public static updateUser = this.instance.updateUser;
 	public static logout = this.instance.logout;
 	public static setToken = this.instance.setToken;
 	public static addListener = this.instance.addListener;
+	public static setInitData = this.instance.setInitData;
 }
 
+(globalThis as any).apiSetInitData = API.setInitData;
+
 export default API;

package/src/types.ts

@@ -6,6 +6,10 @@ export type TData = {
 	[index: string]: any;
 }
 
+export type TGroupsData = {
+	[index: string]: TData;
+}
+
 export type TMethod = 'GET' | 'POST';
 
 export type TParams = {

package/tsconfig.json

@@ -11,8 +11,8 @@
     // "disableReferencedProjectLoad": true,             /* Reduce the number of projects loaded automatically by TypeScript. */
 
     /* Language and Environment */
-    "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
-    // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
+    "target": "ES2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
+    "lib": ["DOM"],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
     // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
@@ -25,7 +25,7 @@
     // "moduleDetection": "auto",                        /* Control what method is used to detect module-format JS files. */
 
     /* Modules */
-    "module": "commonjs",                                /* Specify what module code is generated. */
+    "module": "CommonJS",                                /* Specify what module code is generated. */
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
     // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */