laravel-request 1.2.16 → 1.2.19

package/@types/Api.d.ts

@@ -0,0 +1,48 @@
+declare module 'laravel-request' {
+    export class Api {
+        static debug: boolean;
+        static requestClass: any;
+        static tokenResolver: () => Promise<string | null>;
+        static domainResolver: () => string;
+
+        static getArg(controller: string, action: string, arg: string|number, data?: Record<string, any>): ApiRequest;
+
+        static postArg(controller: string, action: string, arg: string|number, data?: Record<string, any>): ApiRequest;
+
+        static putArg(controller: string, action: string, arg: string|number, data?: Record<string, any>): ApiRequest;
+
+        static getUrl(url: string, data?: Record<string, any>): ApiRequest;
+
+        static postUrl(url: string, data?: Record<string, any>): ApiRequest;
+
+        static putUrl(url: string, data?: Record<string, any>): ApiRequest;
+
+        static get(controller: string, action: string, data?: Record<string, any>): ApiRequest;
+
+        static post(controller: string, action: string, data?: Record<string, any>): ApiRequest;
+
+        static put(controller: string, action: string, data?: Record<string, any>): ApiRequest;
+
+        static delete(controller: string, action: string, id: string|number, data?: Record<string, any>): ApiRequest;
+
+        static encodeQueryString(params: Record<string, any>): string;
+
+        static logRequest(request: {
+            url: string;
+            method: string;
+            data?: Record<string, any>;
+            params?: Record<string, any>;
+            headers?: Record<string, any>;
+        }): void;
+
+        static makeRequest(params: {
+            url: string;
+            method: string;
+            data?: Record<string, any>;
+            params?: Record<string, any>;
+            headers?: Record<string, any>;
+            success?: (response: any, status: number, xhr: any) => void;
+            error?: (xhr: any, statusCode: number, statusText: string) => void;
+        }): Promise<any>;
+    }
+}

package/@types/ApiProxy.d.ts

@@ -0,0 +1,5 @@
+declare module 'laravel-request' {
+    export class ApiProxy {
+        // Пустая реализация класса, как в оригинале
+    }
+}

package/@types/ApiRequest.d.ts

@@ -0,0 +1,154 @@
+declare module 'laravel-request' {
+    import * as axios from "axios/index";
+
+    export interface ApiRequest extends BuilderMethodSignatures {}
+
+    export class ApiRequest {
+        url: string;
+        source: any;
+        static notifyClass: any | null;
+        domain: string;
+        target: string;
+        focus: string;
+        method: string;
+        data: any;
+        headers: any[];
+        arguments: any[];
+        builder: Builder;
+        notifyCallback: (status: number) => boolean;
+        responseBinding: Binding | Binding[] | null;
+        responseBindingErrors: Binding | null;
+        callSuccess: Function;
+        callError: Function;
+
+        constructor(target: string, focus: string, data?: object, method?: string);
+
+        getNotifyManager(): any | null;
+
+        setUrl(url: string): ApiRequest;
+
+        setDomain(domain: string): ApiRequest;
+
+        addArg(arg: any | any[]): ApiRequest;
+
+        first(
+            successCallback?: (response: { data: any; result: string; meta?: any }) => void,
+            errorCallback?: (xhr: XMLHttpRequest, responseData: any) => void,
+            finalCallback?: () => void
+        ): any;
+
+        all(
+            successCallback?: (response: { data: any; result: string; meta?: any }) => void,
+            errorCallback?: (xhr: XMLHttpRequest, responseData: any) => void,
+            finalCallback?: () => void
+        ): any;
+
+        paginate(
+            page?: number,
+            perPage?: number,
+            successCallback?: (response: { data: any; result: string; meta?: any }) => void,
+            errorCallback?: (xhr: XMLHttpRequest, responseData: any) => void,
+            finalCallback?: () => void
+        ): any;
+
+        pluck(
+            fields: any,
+            successCallback?: (response: { data: any; result: string; meta?: any }) => void,
+            errorCallback?: (xhr: XMLHttpRequest, responseData: any) => void,
+            finalCallback?: () => void
+        ): ApiRequest;
+
+        getUrl(): string;
+
+        getSource(): axios.CancelTokenSource | null;
+
+        call(
+            successCallback?: (response: { data: any; result: string; meta?: any }) => void,
+            errorCallback?: (xhr: XMLHttpRequest, responseData: any) => void,
+            finalCallback?: () => void,
+            params?: object,
+            dataKey?: string,
+            argumentsKey?: string,
+            queryKey?: string,
+            byUrl?: boolean
+        ): ApiRequest;
+
+        callSync(
+            successCallback?: (response: { data: any; result: string; meta?: any }) => void,
+            errorCallback?: (xhr: XMLHttpRequest, responseData: any) => void,
+            finalCallback?: () => void
+        ): ApiRequest;
+
+        callUrl(
+            successCallback?: (response: { response: { data: any; result: string; meta?: any } }) => void,
+            errorCallback?: (xhr: XMLHttpRequest, responseData: any) => void,
+            finalCallback?: () => void,
+            params?: object,
+            dataKey?: string,
+            argumentsKey?: string,
+            queryKey?: string
+        ): ApiRequest;
+
+        constructRequestData(
+            dataKey: string,
+            argumentsKey: string,
+            queryKey: string
+        ): object;
+
+        getErrorNotification(
+            xhr: XMLHttpRequest,
+            errorText: string
+        ): object | null;
+
+        defaultErrorMessage(
+            xhr: XMLHttpRequest,
+            errorText: string
+        ): object | null;
+
+        getErrorNotificationFallback(e: Error): object | null;
+
+        executeRequest(
+            successCallback: (response: { data: any; result: string; meta?: any }) => void,
+            errorCallback: (xhr: XMLHttpRequest, responseData: any) => void,
+            finalCallback?: () => void,
+            params?: object,
+            dataKey?: string,
+            argumentsKey?: string,
+            queryKey?: string,
+            byUrl?: boolean
+        ): ApiRequest;
+
+        handleSuccessNotification(
+            response: any,
+            status: number
+        ): object | null;
+
+        handleError(
+            notify: object | null,
+            errorCallback: (xhr: XMLHttpRequest, responseData: any) => void,
+            xhr: XMLHttpRequest,
+            errorText: string
+        ): void;
+
+        bind(
+            obj: any,
+            item: string | [string, string][],
+            rerender?: boolean,
+            cb?: Function
+        ): ApiRequest;
+
+        toBind(response: any): void;
+
+        resetBindErrors(): void;
+
+        toBindErrors(response?: object): void;
+
+        withValidateForm(
+            obj: any,
+            item?: string,
+            key?: string
+        ): ApiRequest;
+
+        withoutNotify(callback?: (status: number) => boolean): ApiRequest;
+    }
+}

package/@types/Binding.d.ts

@@ -0,0 +1,30 @@
+declare module 'laravel-request' {
+    interface Target {
+        state: Record<string, any>;
+
+        setState(
+            callback: (prevState: Record<string, any>) => Record<string, any>,
+            onSuccess?: () => void
+        ): void;
+    }
+
+    export class Binding {
+        target: Target;
+        pathTarget: string[];
+        pathData: string[];
+        callback?: () => void;
+        rerender: boolean;
+
+        constructor(
+            target: Target,
+            pathTarget: string,
+            pathData: string,
+            rerender: boolean,
+            onSuccess?: () => void
+        );
+
+        fire(data: Record<string, any>): void;
+
+        getData(value: Record<string, any>): any;
+    }
+}

package/@types/Builder.d.ts

@@ -0,0 +1,14 @@
+declare module 'laravel-request' {
+    export interface Builder extends BuilderMethodSignatures {}
+    export class Builder {
+        static availableMethod: string[];
+
+        query: Array<Record<string, any>>;
+
+        constructor();
+
+        add(method: string, args: any[]): Builder;
+
+        toArray(): Array<Record<string, any>>;
+    }
+}

package/@types/BuilderMethodSignatures.d.ts

@@ -0,0 +1,47 @@
+// BuilderMethodSignatures.d.ts
+
+declare module 'laravel-request' {
+    /**
+     * Общий набор "флюентных" методов,
+     * которые динамически навешиваются и на Builder, и на ApiRequest.
+     *
+     * Все они возвращают `this`, чтобы цепочки методов (fluent API) типизировались правильно:
+     * - в Builder методы будут возвращать Builder,
+     * - в ApiRequest – ApiRequest.
+     */
+    export interface BuilderMethodSignatures {
+        select(...args: any[]): this;
+        where(...args: any[]): this;
+        orWhere(...args: any[]): this;
+        whereDate(...args: any[]): this;
+        orWhereDate(...args: any[]): this;
+        whereYear(...args: any[]): this;
+        orWhereYear(...args: any[]): this;
+        whereMonth(...args: any[]): this;
+        orWhereMonth(...args: any[]): this;
+        has(...args: any[]): this;
+        whereIn(...args: any[]): this;
+        orWhereIn(...args: any[]): this;
+        whereNotIn(...args: any[]): this;
+        orWhereNotIn(...args: any[]): this;
+        whereHas(...args: any[]): this;
+        orWhereHas(...args: any[]): this;
+        whereHasMorph(...args: any[]): this;
+        orWhereHasMorph(...args: any[]): this;
+        whereDoesntHave(...args: any[]): this;
+        orWhereDoesntHave(...args: any[]): this;
+        whereNull(...args: any[]): this;
+        orWhereNull(...args: any[]): this;
+        whereNotNull(...args: any[]): this;
+        orWhereNotNull(...args: any[]): this;
+        orderBy(...args: any[]): this;
+        groupBy(...args: any[]): this;
+        with(...args: any[]): this;
+        withCount(...args: any[]): this;
+        offset(...args: any[]): this;
+        limit(...args: any[]): this;
+        distinct(...args: any[]): this;
+        owner(...args: any[]): this;
+        whereAbs(...args: any[]): this;
+    }
+}

package/@types/UrlBind.d.ts

@@ -0,0 +1,30 @@
+declare module 'laravel-request' {
+    interface Query {
+        orderBy(field: string, direction: string): Query;
+        where(field: string, operator: string, value: any): Query;
+        // Добавляйте остальные методы по необходимости
+    }
+
+    interface OptionData {
+        value: string;
+        method?: (query: Query, value: string) => void;
+        field?: string;
+        operator?: string;
+    }
+
+    interface Options {
+        [key: string]: OptionData;
+    }
+
+    export class UrlBind {
+        static parse: boolean;
+
+        static order(query: Query, options: { value: string }): Query;
+
+        static filter(query: Query, options: Options): Query;
+
+        static getParams(query: Query, options: Options): Query;
+
+        static urlParse(obj: Record<string, OptionData>): void;
+    }
+}

package/@types/laravel-request.d.ts

@@ -1,352 +1,9 @@
-// Define an interface for the ApiRequest class
-
-declare module 'laravel-request' {
-    import * as axios from "axios/index";
-
-    export class ApiRequest {
-        url: string;
-        source: any;
-        static notifyClass: any | null;
-        domain: string;
-        target: string;
-        focus: string;
-        method: string;
-        data: any;
-        headers: any[];
-        arguments: any[];
-        builder: Builder;
-        notifyCallback: (status: number) => boolean;
-        responseBinding: Binding | Binding[] | null;
-        responseBindingErrors: Binding | null;
-        callSuccess: Function;
-        callError: Function;
-
-        constructor(target: string, focus: string, data?: object, method?: string);
-
-        getNotifyManager(): any | null;
-
-        setUrl(url: string): ApiRequest;
-
-        setDomain(domain: string): ApiRequest;
-
-        addArg(arg: any | any[]): ApiRequest;
-
-        first(
-            successCallback?: (response: {data: any, result: string, meta?: any, }) => void,
-            errorCallback?: (xhr: XMLHttpRequest, responseData: any) => void,
-            finalCallback?: () => void,
-        ): any;
-
-        all(
-            successCallback?: (response: {data: any, result: string, meta?: any}) => void,
-            errorCallback?: (xhr: XMLHttpRequest, responseData: any) => void,
-            finalCallback?: () => void,
-        ): any;
-
-        paginate(
-            page?: number,
-            perPage?: number,
-            successCallback?: (response: {data: any, result: string, meta?: any}) => void,
-            errorCallback?: (xhr: XMLHttpRequest, responseData: any) => void,
-            finalCallback?: () => void,
-        ): any;
-
-        pluck(
-            fields: any,
-            successCallback?: (response: {data: any, result: string, meta?: any}) => void,
-            errorCallback?: (xhr: XMLHttpRequest, responseData: any) => void,
-            finalCallback?: () => void,
-        ): ApiRequest;
-
-        getUrl(): string;
-
-        getSource(): axios.CancelTokenSource|null;
-
-        call(
-            successCallback?: (response: {data: any, result: string, meta?: any}) => void,
-            errorCallback?: (xhr: XMLHttpRequest, responseData: any) => void,
-            finalCallback?: () => void,
-            params?: object,
-            dataKey?: string,
-            argumentsKey?: string,
-            queryKey?: string,
-            byUrl?: boolean
-        ): ApiRequest;
-
-        callSync(
-            successCallback?: (response: {data: any, result: string, meta?: any}) => void,
-            errorCallback?: (xhr: XMLHttpRequest, responseData: any) => void,
-            finalCallback?: () => void
-        ): ApiRequest;
-
-        callUrl(
-            successCallback?: (response: {response: {data: any, result: string, meta?: any}}) => void,
-            errorCallback?: (xhr: XMLHttpRequest, responseData: any) => void,
-            finalCallback?: () => void,
-            params?: object,
-            dataKey?: string,
-            argumentsKey?: string,
-            queryKey?: string
-        ): ApiRequest;
-
-        constructRequestData(
-            dataKey: string,
-            argumentsKey: string,
-            queryKey: string
-        ): object;
-
-        getErrorNotification(
-            xhr: XMLHttpRequest, errorText: string
-        ): object | null;
-
-        defaultErrorMessage(
-            xhr: XMLHttpRequest, errorText: string
-        ): object | null;
-
-        getErrorNotificationFallback(e: Error): object | null;
-
-        executeRequest(
-            successCallback: (response: {data: any, result: string, meta?: any}) => void,
-            errorCallback: (xhr: XMLHttpRequest, responseData: any) => void,
-            finalCallback?: () => void,
-            params?: object,
-            dataKey?: string,
-            argumentsKey?: string,
-            queryKey?: string,
-            byUrl?: boolean
-        ): ApiRequest;
-
-        handleSuccessNotification(
-            response: any,
-            status: number
-        ): object | null;
-
-        handleError(
-            notify: object | null,
-            errorCallback: (xhr: XMLHttpRequest, responseData: any) => void,
-            xhr: XMLHttpRequest,
-            errorText: string
-        ): void;
-
-        bind(
-            obj: any,
-            item: string | [string, string][],
-            rerender?: boolean,
-            cb?: Function
-        ): ApiRequest;
-
-        toBind(response: any): void;
-
-        resetBindErrors(): void;
-
-        toBindErrors(response?: object): void;
-
-        withValidateForm(
-            obj: any,
-            item?: string,
-            key?: string
-        ): ApiRequest;
-
-        withoutNotify(callback?: (status: number) => boolean): ApiRequest;
-    }
-
-// Define the Api class type with all static methods
-    export class Api {
-        static debug: boolean;
-        static requestClass: any;
-        static tokenResolver: () => Promise<string | null>;
-        static domainResolver: () => string;
-
-        static getArg(controller: string, action: string, arg: string, data?: Record<string, any>): ApiRequest|Builder;
-
-        static postArg(controller: string, action: string, arg: string, data?: Record<string, any>): ApiRequest|Builder;
-
-        static putArg(controller: string, action: string, arg: string, data?: Record<string, any>): ApiRequest|Builder;
-
-        static getUrl(url: string, data?: Record<string, any>): ApiRequest|Builder;
-
-        static postUrl(url: string, data?: Record<string, any>): ApiRequest|Builder;
-
-        static putUrl(url: string, data?: Record<string, any>): ApiRequest|Builder;
-
-        static get(controller: string, action: string, data?: Record<string, any>): ApiRequest|Builder;
-
-        static post(controller: string, action: string, data?: Record<string, any>): ApiRequest|Builder;
-
-        static put(controller: string, action: string, data?: Record<string, any>): ApiRequest|Builder;
-
-        static delete(controller: string, action: string, id: string, data?: Record<string, any>): ApiRequest|Builder;
-
-        static encodeQueryString(params: Record<string, any>): string;
-
-        static logRequest(request: {
-            url: string;
-            method: string;
-            data?: Record<string, any>;
-            params?: Record<string, any>;
-            headers?: Record<string, any>;
-        }): void;
-
-        static makeRequest(params: {
-            url: string;
-            method: string;
-            data?: Record<string, any>;
-            params?: Record<string, any>;
-            headers?: Record<string, any>;
-            success?: (response: any, status: number, xhr: any) => void;
-            error?: (xhr: any, statusCode: number, statusText: string) => void;
-        }): Promise<any>;
-    }
-
-    export class Builder {
-        static availableMethod: string[];
-
-        query: Array<Record<string, any>>;
-
-        constructor();
-
-        call(
-            successCallback?: (response: {data: any, result: string, meta?: any}) => void,
-            errorCallback?: (xhr: XMLHttpRequest, responseData: any) => void,
-            finalCallback?: () => void,
-            params?: object,
-            dataKey?: string,
-            argumentsKey?: string,
-            queryKey?: string,
-            byUrl?: boolean
-        ): ApiRequest;
-
-        add(method: string, args: any[]): Builder;
-
-        toArray(): Array<Record<string, any>>;
-
-        // Define dynamic method signatures for available methods
-        select(...args: any): Builder|ApiRequest;
-
-        where(...args: any): Builder|ApiRequest;
-
-        orWhere(...args: any): Builder|ApiRequest;
-
-        whereDate(...args: any): Builder|ApiRequest;
-
-        orWhereDate(...args: any): Builder|ApiRequest;
-
-        whereYear(...args: any): Builder|ApiRequest;
-
-        orWhereYear(...args: any): Builder|ApiRequest;
-
-        whereMonth(...args: any): Builder|ApiRequest;
-
-        orWhereMonth(...args: any): Builder|ApiRequest;
-
-        has(...args: any): Builder|ApiRequest;
-
-        whereIn(...args: any): Builder|ApiRequest;
-
-        orWhereIn(...args: any): Builder|ApiRequest;
-
-        whereNotIn(...args: any): Builder|ApiRequest;
-
-        orWhereNotIn(...args: any): Builder|ApiRequest;
-
-        whereHas(...args: any): Builder|ApiRequest;
-
-        orWhereHas(...args: any): Builder|ApiRequest;
-
-        whereHasMorph(...args: any): Builder|ApiRequest;
-
-        orWhereHasMorph(...args: any): Builder|ApiRequest;
-
-        whereDoesntHave(...args: any): Builder|ApiRequest;
-
-        orWhereDoesntHave(...args: any): Builder|ApiRequest;
-
-        whereNull(...args: any): Builder|ApiRequest;
-
-        orWhereNull(...args: any): Builder|ApiRequest;
-
-        whereNotNull(...args: any): Builder|ApiRequest;
-
-        orWhereNotNull(...args: any): Builder|ApiRequest;
-
-        orderBy(...args: any): Builder|ApiRequest;
-
-        groupBy(...args: any): Builder|ApiRequest;
-
-        with(...args: any): Builder|ApiRequest;
-
-        withCount(...args: any): Builder|ApiRequest;
-
-        offset(...args: any): Builder|ApiRequest;
-
-        limit(...args: any): Builder|ApiRequest;
-
-        distinct(...args: any): Builder|ApiRequest;
-
-        owner(...args: any): Builder|ApiRequest;
-
-        whereAbs(...args: any): Builder|ApiRequest;
-    }
-
-    interface Target {
-        state: Record<string, any>;
-
-        setState(callback: (prevState: Record<string, any>) => Record<string, any>, onSuccess?: () => void): void;
-    }
-
-    export class Binding {
-        target: Target;
-        pathTarget: string[];
-        pathData: string[];
-        callback?: () => void;
-        rerender: boolean;
-
-        constructor(
-            target: Target,
-            pathTarget: string,
-            pathData: string,
-            rerender: boolean,
-            onSuccess?: () => void
-        );
-
-        fire(data: Record<string, any>): void;
-
-        getData(value: Record<string, any>): any;
-    }
-
-    export class ApiProxy {
-
-    }
-
-    interface Query {
-        orderBy(field: string, direction: string): Query;
-
-        where(field: string, operator: string, value: any): Query;
-
-        // Define other methods as required
-    }
-
-    interface OptionData {
-        value: string;
-        method?: (query: Query, value: string) => void;
-        field?: string;
-        operator?: string;
-    }
-
-    interface Options {
-        [key: string]: OptionData;
-    }
-
-// Declare the UrlBind class
-    export class UrlBind {
-        static parse: boolean;
-
-        static order(query: Query, options: { value: string }): Query;
-
-        static filter(query: Query, options: Options): Query;
-
-        static getParams(query: Query, options: Options): Query;
-
-        static urlParse(obj: Record<string, OptionData>): void;
-    }
-}
+// index.d.ts
+/// <reference path="./ApiRequest.d.ts" />
+/// <reference path="./Api.d.ts" />
+/// <reference path="./Builder.d.ts" />
+/// <reference path="./Binding.d.ts" />
+/// <reference path="./ApiProxy.d.ts" />
+/// <reference path="./UrlBind.d.ts" />
+
+export * from 'laravel-request';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "laravel-request",
   "productName": "laravel-request",
-  "version": "1.2.16",
+  "version": "1.2.19",
   "description": "laravel-request",
   "main": "src/index.js",
   "module": "src/index.js",

package/src/Api.js

@@ -59,7 +59,7 @@ export default class Api {
    * @param action
    * @param arg
    * @param data
-   * @return {ApiRequest|Builder}
+   * @return {ApiRequest}
    */
   static getArg(controller, action, arg, data = {}) {
     return this.get(controller, action, data).addArg(arg);
@@ -71,7 +71,7 @@ export default class Api {
    * @param action
    * @param arg
    * @param data
-   * @return {ApiRequest|Builder}
+   * @return {ApiRequest}
    */
   static postArg(controller, action, arg, data = {}) {
     return this.post(controller, action, data).addArg(arg);
@@ -83,7 +83,7 @@ export default class Api {
    * @param action
    * @param arg
    * @param data
-   * @return {ApiRequest|Builder}
+   * @return {ApiRequest}
    */
   static putArg(controller, action, arg, data = {}) {
     return this.put(controller, action, data).addArg(arg);
@@ -93,7 +93,7 @@ export default class Api {
    *
    * @param url
    * @param data
-   * @return {ApiRequest|Builder}
+   * @return {ApiRequest}
    */
   static getUrl(url, data = {})
   {
@@ -104,7 +104,7 @@ export default class Api {
    *
    * @param url
    * @param data
-   * @return {ApiRequest|Builder}
+   * @return {ApiRequest}
    */
   static postUrl(url, data = {})
   {
@@ -115,7 +115,7 @@ export default class Api {
    *
    * @param url
    * @param data
-   * @return {ApiRequest|Builder}
+   * @return {ApiRequest}
    */
   static putUrl(url, data = {})
   {
@@ -127,7 +127,7 @@ export default class Api {
    * @param controller
    * @param action
    * @param data
-   * @returns {ApiRequest|Builder}
+   * @returns {ApiRequest}
    */
   static get(controller, action, data = {}) {
     return new this.requestClass(controller, action, data, 'GET');
@@ -137,7 +137,7 @@ export default class Api {
    * @param controller
    * @param action
    * @param data
-   * @returns {ApiRequest|Builder}
+   * @returns {ApiRequest}
    */
   static post(controller, action, data = {}) {
     return new this.requestClass(controller, action, data, 'POST');
@@ -147,7 +147,7 @@ export default class Api {
    * @param controller
    * @param action
    * @param data
-   * @returns {ApiRequest|Builder}
+   * @returns {ApiRequest}
    */
   static put(controller, action, data = {}) {
     return new this.requestClass(controller, action, data, 'PUT');
@@ -159,7 +159,7 @@ export default class Api {
    * @param action
    * @param id
    * @param data
-   * @return {ApiRequest|Builder}
+   * @return {ApiRequest}
    */
   static delete(controller, action, id, data = {}) {
     return new this.requestClass(controller, action, data, 'DELETE').addArg(id);