flamerest 1.0.46 → 1.0.49

package/REST.d.ts

@@ -39,8 +39,8 @@ type Rows<T> = {
   status: Number,
   ok: boolean,
   data?: Array<T>,
-  errors: Object|undefined,
-  message: string|undefined,
+  errors: Object | undefined,
+  message: string | undefined,
   pages: {
     page: Number,
     perPage: Number,
@@ -63,7 +63,7 @@ export function one<T>(table: string, IDOrWhere: number | string | object, field
  * @param table
  * @param values
  */
-export function create<T>(table: string, values: object): Promise<SavedObject<T>>
+export function create<T>(table: string, values: object, appendTo: number | string | null = null, insertAfter: number | string | null = null, insertFirst: number | string | null = null): Promise<SavedObject<T>>
 
 /**
  * Удалить запись
@@ -71,7 +71,7 @@ export function create<T>(table: string, values: object): Promise<SavedObject<T>
  * @param id
  * @param byFields Если указан, удаляет по этим параметрам
  */
-export function remove(table: string, id: number | string, byFields?: object): Promise<boolean|Array<any>>
+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): P
  * @param ID
  * @param values
  */
-export function edit<T>(table: string, ID: number | string, values: object): Promise<SavedObject<T>>
+export function edit<T>(table: string, ID: number | string, values: object, appendTo: number | string | null = null, insertAfter: number | string | null = null, insertFirst: number | string | null = null): Promise<SavedObject<T>>
 
 
 /**

package/REST.js

@@ -97,7 +97,7 @@ class FLAMEREST {
                 // Ошибка валидации: Собираем все ошибки полей
                 case 422:
                   let Errs = {};
-                  for(let err of ResolveBody.errors) {
+                  for (let err of ResolveBody.errors) {
                     Errs[err['field']] = Errs[err['field']] === undefined ? err['message'] : Errs[err['field']] + ". " + err['message']
                   }
                   ResolveBody.errors = Errs;
@@ -295,9 +295,10 @@ class FLAMEREST {
    * @param RemoveDuplicates
    * @param format
    * @param titles Это чтобы мы могли контроллить какие названия полей мы будет загружать при экспорте, чтобы они были как в таблице
+   * @param tree дерево
    * @return Promise<>
    */
-  get(table, where, expand, fields, sortfields, page, perPage, RemoveDuplicates, format, titles) {
+  get(table, where, expand, fields, sortfields, page, perPage, RemoveDuplicates, format, titles, tree) {
 
     // Нормализуем имена таблиц
     table = table.replace(/_/g, "");
@@ -313,6 +314,10 @@ class FLAMEREST {
     if (where !== undefined && where !== null)
       json.where = where;
 
+    // Генерим условия
+    if (tree !== undefined && tree !== null)
+      json.tree = tree;
+
     if (fields !== undefined && fields !== null)
       json.fields = fields;
 
@@ -362,15 +367,15 @@ class FLAMEREST {
    * @returns {object|null}
    */
   async one(table, IDOrWhere, fields = null, primaryKeyName = 'id') {
-    
+
     let where = {};
-    if(typeof IDOrWhere === 'string' || typeof IDOrWhere === 'number') where = {[primaryKeyName]:id};
-    else if(typeof IDOrWhere === 'object') where = IDOrWhere;
+    if (typeof IDOrWhere === 'string' || typeof IDOrWhere === 'number') where = { [primaryKeyName]: id };
+    else if (typeof IDOrWhere === 'object') where = IDOrWhere;
     else throw "Нужно передавать ID или объект";
 
-    let resp = await this.get(table, where , null, fields, null, 1, 1);
-    if(resp.errors) return resp;
-    if(resp.data.length === 0) return null;
+    let resp = await this.get(table, where, null, fields, null, 1, 1);
+    if (resp.errors) return resp;
+    if (resp.data.length === 0) return null;
 
     return resp.data[0];
   }
@@ -380,7 +385,7 @@ class FLAMEREST {
    * @param table
    * @param values
    */
-  async create(table, values) {
+  async create(table, values, appendTo = null, insertAfter = null, insertFirst = null) {
 
     // Нормализуем имена таблиц
     table = table.replace(/_/g, "");
@@ -388,7 +393,15 @@ class FLAMEREST {
     // Подготовить значения
     await this.prepare(values);
 
-    return this.request(this.SERVER + '/api/' + this.version + '/' + table + '/create', JSON.stringify(values), 'POST');
+    if (appendTo === undefined) appendTo = null;
+    if (insertAfter === undefined) insertAfter = null;
+    if (insertFirst === undefined) insertFirst = null;
+
+    return this.request(this.SERVER + '/api/' + this.version + '/' + table + '/create?'
+      + (appendTo !== null ? '&appendTo=' + appendTo : '')
+      + (insertAfter !== null ? '&insertAfter=' + insertAfter : '')
+      + (insertFirst !== null ? '&insertFirst=' + insertFirst : '')
+      , JSON.stringify(values), 'POST');
 
   }
 
@@ -404,11 +417,11 @@ class FLAMEREST {
     table = table.replace(/_/g, "");
 
     let params = {};
-    if(byFields instanceof Object) params = byFields;
-    
+    if (byFields instanceof Object) params = byFields;
+
     let resp = await this.request(this.SERVER + '/api/' + this.version + '/' + table + '/delete?id=' + id, JSON.stringify(params), 'DELETE');
 
-    if(resp.status === 204) return true;
+    if (resp.status === 204) return true;
 
     return resp;
 
@@ -420,7 +433,7 @@ class FLAMEREST {
    * @param ID
    * @param values
    */
-  async edit(table, ID, values) {
+  async edit(table, ID, values, appendTo = null, insertAfter = null, insertFirst = null) {
 
     // Нормализуем имена таблиц
     table = table.replace(/_/g, "");
@@ -428,7 +441,15 @@ class FLAMEREST {
     // Подготовить значения
     await this.prepare(values);
 
-    return this.request(this.SERVER + '/api/' + this.version + '/' + table + '/update?id=' + ID, JSON.stringify(values), 'PATCH');
+    if(appendTo === undefined) appendTo = null;
+    if (insertAfter === undefined) insertAfter = null;
+    if (insertFirst === undefined) insertFirst = null;
+
+    return this.request(this.SERVER + '/api/' + this.version + '/' + table + '/update?id=' + ID
+      + (appendTo!==null ? '&appendTo=' + appendTo : '')
+      + (insertAfter!==null ? '&insertAfter=' + insertAfter : '')
+      + (insertFirst!==null ? '&insertFirst=' + insertFirst : '')
+      , JSON.stringify(values), 'PATCH');
   }
 
   /**
@@ -450,9 +471,9 @@ class FLAMEREST {
   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;}
+
+    if (resp.errors) return resp;
+    if (resp.data.length === 0) { resp.errors = []; return resp; }
 
     return resp.data;
 
@@ -461,9 +482,9 @@ class FLAMEREST {
   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;}
+
+    if (resp.errors) return resp;
+    if (resp.data.length === 0) { resp.errors = []; return resp; }
 
     return resp.data;
 
@@ -482,20 +503,20 @@ class FLAMEREST {
 
     // Если в один из параметров передан FileList или input[type=file], т.е. нужно загрузить файлы
     for (let val in values) {
-      
+
       // Преобразуем
       let value = values[val];
       let isRef = false;
-      if (value instanceof Object 
-        && value.hasOwnProperty('_value') 
+      if (value instanceof Object
+        && value.hasOwnProperty('_value')
         && (
-          value._value instanceof Event || 
-          value._value instanceof HTMLInputElement || 
-          value._value instanceof ClipboardEvent || 
-          value._value instanceof DataTransfer || 
+          value._value instanceof Event ||
+          value._value instanceof HTMLInputElement ||
+          value._value instanceof ClipboardEvent ||
+          value._value instanceof DataTransfer ||
           value._value instanceof FileList
-          )
-      ) {value = value.value; isRef = true}
+        )
+      ) { value = value.value; isRef = true }
 
       if (value instanceof Event && value.target instanceof HTMLInputElement && value.target.type === 'file') value = value.target.files;
       if (value instanceof HTMLInputElement && value.type === 'file') value = value.files;
@@ -529,13 +550,13 @@ class FLAMEREST {
   readFileAsync(file) {
     return new Promise((resolve, reject) => {
       let reader = new FileReader();
-  
+
       reader.onloadend = () => {
         resolve(reader.result);
       };
-  
+
       reader.onerror = reject;
-  
+
       reader.readAsDataURL(file);
     })
   }

package/package.json

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