laravel-request 1.1.14 → 1.1.16

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "laravel-request",
   "productName": "laravel-request",
-  "version": "1.1.14",
+  "version": "1.1.16",
   "description": "laravel-request",
   "main": "src/index.js",
   "scripts": {},

package/src/Api.js

@@ -11,63 +11,38 @@ export default class Api {
 
   /**
    *
-   * @param target
-   * @param focus
-   * @param data
-   * @param method
-   * @return {ApiRequest}
-   */
-  static create(target, focus, data = {}, method = 'GET') {
-    return new this.requestClass(target, focus, data, method);
-  }
-
-  /**
-   *
-   * @param target
-   * @param focus
+   * @param controller
+   * @param action
    * @param arg
    * @param data
-   * @param method
    * @return {ApiRequest}
    */
-  static createArg(target, focus, arg, data = {}, method = 'GET') {
-    return new this.requestClass(target, focus, data, method).addArg(arg);
+  static getArg(controller, action, arg, data = {}) {
+    return this.get(controller, action, data).addArg(arg);
   }
 
   /**
    *
-   * @param target
-   * @param focus
+   * @param controller
+   * @param action
    * @param arg
    * @param data
    * @return {ApiRequest}
    */
-  static getArg(target, focus, arg, data = {}) {
-    return this.get(target, focus, data).addArg(arg);
+  static postArg(controller, action, arg, data = {}) {
+    return this.post(controller, action, data).addArg(arg);
   }
 
   /**
    *
-   * @param target
-   * @param focus
+   * @param controller
+   * @param action
    * @param arg
    * @param data
    * @return {ApiRequest}
    */
-  static postArg(target, focus, arg, data = {}) {
-    return this.post(target, focus, data).addArg(arg);
-  }
-
-  /**
-   *
-   * @param target
-   * @param focus
-   * @param arg
-   * @param data
-   * @return {ApiRequest}
-   */
-  static putArg(target, focus, arg, data = {}) {
-    return this.put(target, focus, data).addArg(arg);
+  static putArg(controller, action, arg, data = {}) {
+    return this.put(controller, action, data).addArg(arg);
   }
 
   /**
@@ -105,45 +80,61 @@ export default class Api {
 
   /**
    *
-   * @param target
-   * @param focus
+   * @param controller
+   * @param action
    * @param data
    * @returns {ApiRequest}
    */
-  static get(target, focus, data = {}) {
-    return new this.requestClass(target, focus, data, 'GET');
+  static get(controller, action, data = {}) {
+    return new this.requestClass(controller, action, data, 'GET');
   }
   /**
    *
-   * @param target
-   * @param focus
+   * @param controller
+   * @param action
    * @param data
    * @returns {ApiRequest}
    */
-  static post(target, focus, data = {}) {
-    return new this.requestClass(target, focus, data, 'POST');
+  static post(controller, action, data = {}) {
+    return new this.requestClass(controller, action, data, 'POST');
   }
   /**
    *
-   * @param target
-   * @param focus
+   * @param controller
+   * @param action
    * @param data
    * @returns {ApiRequest}
    */
-  static put(target, focus, data = {}) {
-    return new this.requestClass(target, focus, data, 'PUT');
+  static put(controller, action, data = {}) {
+    return new this.requestClass(controller, action, data, 'PUT');
   }
 
   /**
    *
-   * @param target
-   * @param focus
+   * @param controller
+   * @param action
    * @param id
    * @param data
    * @return {ApiRequest}
    */
-  static delete(target, focus, id, data = {}) {
-    return new this.requestClass(target, focus, data, 'DELETE').addArg(id);
+  static delete(controller, action, id, data = {}) {
+    return new this.requestClass(controller, action, data, 'DELETE').addArg(id);
+  }
+
+  static encodeQueryString(params) {
+    const flattenObject = (obj, parentKey = '') => {
+      return Object.entries(obj).map(([key, value]) => {
+        const newKey = parentKey ? `${parentKey}[${key}]` : key;
+        if (typeof value === 'object' && value !== null) {
+          return flattenObject(value, newKey);
+        } else {
+          return `${encodeURIComponent(newKey)}=${encodeURIComponent(value)}`;
+        }
+      });
+    };
+
+    const flatParams = flattenObject(params);
+    return flatParams.join('&');
   }
 
   /**
@@ -151,19 +142,9 @@ export default class Api {
    * @param obj
    * @return {*}
    */
-  static async makeRequest({url, method, data, params, headers, success = () => {}, error = () => {}})
+  static async makeRequest({url, method, data = {}, params = {}, headers = {}, success = () => {}, error = () => {}})
   {
     try {
-      if (typeof headers === 'undefined') {
-        headers = {};
-      }
-      if (typeof params === 'undefined') {
-        params = {};
-      }
-      if (typeof data === 'undefined') {
-        data = {};
-      }
-
       headers['Content-Type'] = 'application/json';
 
       let api_token = localStorage.getItem('api_token');
@@ -176,14 +157,32 @@ export default class Api {
       switch (method)
       {
         case 'GET':
-          data.timestamp = new Date().getTime();
+          let query = Api.encodeQueryString(data);
+
+          if(query.length > 5000)
+          {
+            //replace to POST if GET url is too long
+            data._method = 'GET';
+
+            response = await axios.request({
+              url: url,
+              method: 'PUT',//post не будет работать
+              data: data,
+              headers: headers
+            });
+
+          }else{
+            data.timestamp = new Date().getTime();
+
+            response = await axios.request({
+              url: url,
+              method: method,
+              params: data,
+              headers: headers
+            });
+          }
+
 
-          response = await axios.request({
-            url: url,
-            method: method,
-            params: data,
-            headers: headers
-          });
           break;
         default:
           params.timestamp = new Date().getTime();
@@ -230,12 +229,7 @@ export default class Api {
       let statusCode = e.request?.status;
 
       // status text
-      let statusText = e.request?.statusText;
-
-      if(!statusText)
-      {
-        statusText = e.message;
-      }
+      let statusText = e.request?.statusText || e.message;
 
       try {
         error(xhr, statusCode, statusText);

package/src/ApiRequest.js

@@ -56,11 +56,20 @@ export default class ApiRequest {
     });
   }
 
+  /**
+   *
+   * @return {null}
+   */
   getNotifyManager()
   {
     return ApiRequest.notifyClass;
   }
 
+  /**
+   *
+   * @param url
+   * @return {ApiRequest}
+   */
   setUrl(url)
   {
     this.url = url;
@@ -68,6 +77,11 @@ export default class ApiRequest {
     return this;
   }
 
+  /**
+   *
+   * @param domain
+   * @return {ApiRequest}
+   */
   setDomain(domain)
   {
     this.domain = domain;
@@ -132,6 +146,21 @@ export default class ApiRequest {
     return this.call(successCallback, errorCallback);
   }
 
+  /**
+   *
+   * @param fields
+   * @param successCallback
+   * @param errorCallback
+   * @return {ApiRequest}
+   */
+  pluck(fields, successCallback = (r) => {
+  }, errorCallback = () => {
+  }) {
+    this.data['paginateType'] = 'pluck';
+    this.data['fields'] = fields;
+    return this.call(successCallback, errorCallback);
+  }
+
   getUrl()
   {
     return this.domain + '/api/v1/call/' + this.target + '/' + this.focus;
@@ -145,6 +174,7 @@ export default class ApiRequest {
    * @param dataKey
    * @param argumentsKey
    * @param queryKey
+   * @param byUrl
    * @return {ApiRequest}
    */
   call(successCallback = (r) => {

package/src/Builder.js

@@ -3,28 +3,32 @@ export default class Builder {
     static availableMethod = [
         'select',
         'where',
+        'orWhere',
         'whereDate',
+        'orWhereDate',
         'whereYear',
+        'orWhereYear',
         'whereMonth',
+        'orWhereMonth',
         'has',
         'whereIn',
+        'orWhereIn',
         'whereNotIn',
+        'orWhereNotIn',
         'whereHas',
         'orWhereHas',
         'whereHasMorph',
         'orWhereHasMorph',
         'whereDoesntHave',
         'orWhereDoesntHave',
-        'orWhere',
+
         'orderBy',
         'groupBy',
         'whereNull',
         'orWhereNull',
         'whereNotNull',
         'orWhereNotNull',
-        /**
-         *@property Builder.availableMethod.with array
-         */
+
         'with',
         'withCount',
         'offset',
@@ -32,21 +36,6 @@ export default class Builder {
         'distinct',
         'owner',
         'whereAbs',
-
-        'whereAccount',
-        'whereDate',
-        'whereYear',
-        'whereMonth',
-
-        'whereIncomeType',
-        'whereSalaryType',
-        'whereSpendingType',
-        'whereObligationType',
-        'wherePropertyType',
-        'whereInvestType',
-        'whereCurrencyType',
-        'whereAccountType',
-        'whereInsuranceType'
     ];
 
     constructor() {