flamerest 1.0.36 → 1.0.39

package/REST.d.ts

@@ -71,7 +71,7 @@ export function create<T>(table: string, values: object): Promise<T>
  * @param id
  * @param byFields Если указан, удаляет по этим параметрам
  */
-export function remove(table: string, id: number | string, byFields?: object)
+export function remove(table: string, id: number | string, byFields?: object): Promise<boolean|Array<any>>
 
 /**
  * Редактировать значения
@@ -79,7 +79,7 @@ export function remove(table: string, id: number | string, byFields?: object)
  * @param ID
  * @param values
  */
-export function edit(table: string, ID: number | string, values: object)
+export function edit<T>(table: string, ID: number | string, values: object): Promise<T>
 
 /**
  * Получить схемы всех таблиц
@@ -113,7 +113,7 @@ type Authorized = {
     name: string,
     role: string
   };
-  errors: object|undefined;
+  errors: { [key: string]: any };
 }
 
 /**

package/REST.js

@@ -398,7 +398,7 @@ class FLAMEREST {
    * @param id
    * @param byFields
    */
-  remove(table, id = 0, byFields = null) {
+  async remove(table, id = 0, byFields = null) {
 
     // Нормализуем имена таблиц
     table = table.replace(/_/g, "");
@@ -406,7 +406,11 @@ class FLAMEREST {
     let params = {};
     if(byFields instanceof Object) params = byFields;
     
-    return this.request(this.SERVER + '/api/' + this.version + '/' + table + '/delete?id=' + id, JSON.stringify(params), 'DELETE');
+    let resp = await this.request(this.SERVER + '/api/' + this.version + '/' + table + '/delete?id=' + id, JSON.stringify(params), 'DELETE');
+
+    if(resp.status === 204) return true;
+
+    return resp;
 
   }
 
@@ -443,12 +447,26 @@ class FLAMEREST {
       return new Promise((resolve, reject) => { resolve(JSON.parse(window.sessionStorage.getItem("crudschema"))) });
   }
 
-  auth(username, password) {
-    return this.request(this.SERVER + '/auth/auth', JSON.stringify({ login: username, password: password }), 'POST');
+  async auth(username, password) {
+
+    let resp = await this.request(this.SERVER + '/auth/auth', JSON.stringify({ login: username, password: password }), 'POST');
+    
+    if(resp.errors) return resp;
+    if(resp.data.length === 0) {resp.errors = []; return resp;}
+
+    return resp.data;
+
   }
 
-  signup(username, password) {
-    return this.request(this.SERVER + '/auth/signup', JSON.stringify({ login: username, password: password }), 'POST');
+  async signup(username, password) {
+
+    let resp = await this.request(this.SERVER + '/auth/signup', JSON.stringify({ login: username, password: password }), 'POST');
+    
+    if(resp.errors) return resp;
+    if(resp.data.length === 0) {resp.errors = []; return resp;}
+
+    return resp.data;
+
   }
 
   logout() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flamerest",
-  "version": "1.0.36",
+  "version": "1.0.39",
   "description": "",
   "main": "REST.js",
   "typings": "./REST.d.ts",