flamerest 1.0.55 → 1.0.58

package/REST.d.ts

@@ -21,7 +21,7 @@ export function request(url: string, params: object | string, type?: string, res
  * @param titles Это чтобы мы могли контроллить какие названия полей мы будет загружать при экспорте, чтобы они были как в таблице
  * @return Promise<object>
  */
-export function get<T>(table: string, where?: object | string | null, expand?: object | string | null, fields?: object | Array<string> | string | null, sortfields?: object | Array<string> | string | null, page?: number, perPage?: number, RemoveDuplicates?, format?, titles?): Promise<Rows<T>>;
+export function get<T>(table: string, where?: object | string | null, extfields?: object | Array<string>, fields?: object | Array<string> | string | null, sortfields?: object | Array<string> | string | null, page?: number, perPage?: number, RemoveDuplicates?, format?, titles?): Promise<Rows<T>>;
 
 /**
  * Получить все записи по запросу [постранично]
@@ -29,7 +29,7 @@ export function get<T>(table: string, where?: object | string | null, expand?: o
  * @param {object} params 
  * @returns 
  */
-export function all<T>(table: string, params?: { where?: object, fields?: object | Array<string>, sort?: Array<string>, page?: number, perPage?: number, tree?: number }): Promise<Rows<T>>;
+export function all<T>(table: string, params?: { where?: object, extfields?: object | Array<string>, fields?: object | Array<string>, sort?: Array<string>, page?: number, perPage?: number, tree?: number }): Promise<Rows<T>>;
 
 /**
  * Стандартный ответ от Request с несколькими строками
@@ -56,7 +56,7 @@ type Rows<T> = {
    * @param {object|Array} fields 
    * @param {string} primaryKeyName если указан ID, то указать название первичного ключа, если от id он отличается
  */
-export function one<T>(table: string, IDOrWhere: number | string | object, fields?: object | Array<string> | null, primaryKeyName?: string): Promise<T | null>;
+export function one<T>(table: string, IDOrWhere: number | string | object, extfields?: object | Array<string>, fields?: object | Array<string> | null, primaryKeyName?: string): Promise<T | null>;
 
 /**
  * Создать новую запись

package/REST.js

@@ -298,7 +298,7 @@ class FLAMEREST {
    * @param tree дерево
    * @return Promise<>
    */
-  get(table, where, expand, fields, sortfields, page, perPage, RemoveDuplicates, format, titles, tree) {
+  get(table, where, extfields, fields, sortfields, page, perPage, RemoveDuplicates, format, titles, tree) {
 
     // Нормализуем имена таблиц
     table = table.replace(/_/g, "");
@@ -327,8 +327,8 @@ class FLAMEREST {
     if (sortfields !== undefined && sortfields !== null)
       json.sort = sortfields;
 
-    if (expand !== undefined && expand !== null)
-      json.expand = expand;
+    if (extfields !== undefined && extfields !== null)
+      json.extfields = extfields;
 
     if (RemoveDuplicates !== undefined && RemoveDuplicates !== null)
       json.RemoveDuplicates = true;
@@ -355,7 +355,7 @@ class FLAMEREST {
    * @returns {object}
    */
   all(table, params) {
-    return this.get(table, params?.where, null, params?.fields, params?.sort, params?.page, params?.perPage, null, null, null, params?.tree);
+    return this.get(table, params?.where, params?.extfields, params?.fields, params?.sort, params?.page, params?.perPage, null, null, null, params?.tree);
   }
 
   /**
@@ -366,14 +366,14 @@ class FLAMEREST {
    * @param {string} primaryKeyName 
    * @returns {object|null}
    */
-  async one(table, IDOrWhere, fields = null, primaryKeyName = 'id') {
+  async one(table, IDOrWhere, extfields = null, fields = null, primaryKeyName = 'id') {
 
     let where = {};
     if (typeof IDOrWhere === 'string' || typeof IDOrWhere === 'number') where = { [primaryKeyName]: IDOrWhere };
     else if (typeof IDOrWhere === 'object') where = IDOrWhere;
     else throw "Нужно передавать ID или объект";
 
-    let resp = await this.get(table, where, null, fields, null, 1, 1);
+    let resp = await this.get(table, where, extfields, fields, null, 1, 1);
     if (resp.errors) return resp;
     if (resp.data.length === 0) return null;
 

package/package.json

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