remult 0.16.0-exp.11 → 0.16.0-exp.13

package/esm/remult-express.js

@@ -18,6 +18,6 @@ export function remultExpress(options) {
         getRemult: (req) => server.getRemult(req),
         openApiDoc: (options) => server.openApiDoc(options),
         registerRouter: x => server.registerRouter(x),
-        withRemultMiddleware: (...args) => server.withRemultMiddleware(...args)
+        withRemult: (...args) => server.withRemult(...args)
     });
 }

package/esm/server/expressBridge.d.ts

@@ -33,7 +33,7 @@ export interface RemultServer {
     }): any;
     registerRouter(r: GenericRouter): void;
     handle(req: GenericRequest, gRes?: GenericResponse): Promise<ServerHandleResponse | undefined>;
-    withRemultMiddleware(req: GenericRequest, res: GenericResponse, next: VoidFunction): any;
+    withRemult(req: GenericRequest, res: GenericResponse, next: VoidFunction): any;
 }
 export declare type GenericRouter = {
     route(path: string): SpecificRoute;

package/esm/server/expressBridge.js

@@ -82,7 +82,7 @@ class RemultServerImplementation {
             };
         }
     }
-    withRemultMiddleware(req, res, next) {
+    withRemult(req, res, next) {
         this.process(async () => { next(); })(req, res);
     }
     handle(req, gRes) {

package/esm/src/data-providers/rest-data-provider.d.ts

@@ -30,6 +30,9 @@ export declare class RestDataProviderHttpProviderUsingFetch implements RestDataP
     put(url: string, data: any): Promise<any>;
     delete(url: string): Promise<any>;
     post(url: string, data: any): Promise<any>;
-    myFetch(url: string, init?: RequestInit): Promise<any>;
+    myFetch(url: string, options?: {
+        method?: string;
+        body?: string;
+    }): Promise<any>;
 }
 export declare function addFilterToUrlAndReturnTrueIfSuccessful(filter: any, url: UrlBuilder): boolean;

package/esm/src/data-providers/rest-data-provider.js

@@ -122,7 +122,7 @@ export class RestDataProviderHttpProviderUsingFetch {
         });
     }
     delete(url) {
-        return this.myFetch(url, { method: 'delete', credentials: 'include' });
+        return this.myFetch(url, { method: 'delete' });
     }
     async post(url, data) {
         return await retry(() => this.myFetch(url, {
@@ -130,21 +130,22 @@ export class RestDataProviderHttpProviderUsingFetch {
             body: JSON.stringify(data)
         }));
     }
-    myFetch(url, init) {
-        if (!init)
-            init = {};
-        if (!init.headers)
-            init.headers = new Headers();
-        var h = init.headers;
-        h.append('Content-type', "application/json");
-        init.credentials = 'include';
+    myFetch(url, options) {
+        const headers = {
+            "Content-type": "application/json"
+        };
         if (typeof window !== 'undefined' && typeof window.document !== 'undefined' && typeof (window.document.cookie !== 'undefined'))
             for (const cookie of window.document.cookie.split(';')) {
                 if (cookie.trim().startsWith('XSRF-TOKEN=')) {
-                    h.append('X-XSRF-TOKEN', cookie.split('=')[1]);
+                    headers['X-XSRF-TOKEN'] = cookie.split('=')[1];
                 }
             }
-        return (this.fetch || fetch)(url, init).then(response => {
+        return (this.fetch || fetch)(url, {
+            credentials: 'include',
+            method: options?.method,
+            body: options?.body,
+            headers
+        }).then(response => {
             return onSuccess(response);
         }).catch(async (error) => {
             let r = await error;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.16.0-exp.11",
+    "version": "0.16.0-exp.13",
     "description": "A CRUD framework for full-stack TypeScript",
     "main": "index.js",
     "types": "index.d.ts",

package/remult-express.js

@@ -22,12 +22,12 @@ function remultExpress(options) {
         getRemult: function (req) { return server.getRemult(req); },
         openApiDoc: function (options) { return server.openApiDoc(options); },
         registerRouter: function (x) { return server.registerRouter(x); },
-        withRemultMiddleware: function () {
+        withRemult: function () {
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
                 args[_i] = arguments[_i];
             }
-            return server.withRemultMiddleware.apply(server, tslib_1.__spread(args));
+            return server.withRemult.apply(server, tslib_1.__spread(args));
         }
     });
 }

package/server/expressBridge.d.ts

@@ -33,7 +33,7 @@ export interface RemultServer {
     }): any;
     registerRouter(r: GenericRouter): void;
     handle(req: GenericRequest, gRes?: GenericResponse): Promise<ServerHandleResponse | undefined>;
-    withRemultMiddleware(req: GenericRequest, res: GenericResponse, next: VoidFunction): any;
+    withRemult(req: GenericRequest, res: GenericResponse, next: VoidFunction): any;
 }
 export declare type GenericRouter = {
     route(path: string): SpecificRoute;

package/server/expressBridge.js

@@ -109,7 +109,7 @@ var RemultServerImplementation = /** @class */ (function () {
             };
         }
     }
-    RemultServerImplementation.prototype.withRemultMiddleware = function (req, res, next) {
+    RemultServerImplementation.prototype.withRemult = function (req, res, next) {
         var _this = this;
         this.process(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
             next();

package/src/data-providers/rest-data-provider.d.ts

@@ -30,6 +30,9 @@ export declare class RestDataProviderHttpProviderUsingFetch implements RestDataP
     put(url: string, data: any): Promise<any>;
     delete(url: string): Promise<any>;
     post(url: string, data: any): Promise<any>;
-    myFetch(url: string, init?: RequestInit): Promise<any>;
+    myFetch(url: string, options?: {
+        method?: string;
+        body?: string;
+    }): Promise<any>;
 }
 export declare function addFilterToUrlAndReturnTrueIfSuccessful(filter: any, url: UrlBuilder): boolean;

package/src/data-providers/rest-data-provider.js

@@ -189,7 +189,7 @@ var RestDataProviderHttpProviderUsingFetch = /** @class */ (function () {
         });
     };
     RestDataProviderHttpProviderUsingFetch.prototype.delete = function (url) {
-        return this.myFetch(url, { method: 'delete', credentials: 'include' });
+        return this.myFetch(url, { method: 'delete' });
     };
     RestDataProviderHttpProviderUsingFetch.prototype.post = function (url, data) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
@@ -205,22 +205,18 @@ var RestDataProviderHttpProviderUsingFetch = /** @class */ (function () {
             });
         });
     };
-    RestDataProviderHttpProviderUsingFetch.prototype.myFetch = function (url, init) {
+    RestDataProviderHttpProviderUsingFetch.prototype.myFetch = function (url, options) {
         var e_4, _a;
         var _this = this;
-        if (!init)
-            init = {};
-        if (!init.headers)
-            init.headers = new Headers();
-        var h = init.headers;
-        h.append('Content-type', "application/json");
-        init.credentials = 'include';
+        var headers = {
+            "Content-type": "application/json"
+        };
         if (typeof window !== 'undefined' && typeof window.document !== 'undefined' && typeof (window.document.cookie !== 'undefined'))
             try {
                 for (var _b = tslib_1.__values(window.document.cookie.split(';')), _c = _b.next(); !_c.done; _c = _b.next()) {
                     var cookie = _c.value;
                     if (cookie.trim().startsWith('XSRF-TOKEN=')) {
-                        h.append('X-XSRF-TOKEN', cookie.split('=')[1]);
+                        headers['X-XSRF-TOKEN'] = cookie.split('=')[1];
                     }
                 }
             }
@@ -231,7 +227,12 @@ var RestDataProviderHttpProviderUsingFetch = /** @class */ (function () {
                 }
                 finally { if (e_4) throw e_4.error; }
             }
-        return (this.fetch || fetch)(url, init).then(function (response) {
+        return (this.fetch || fetch)(url, {
+            credentials: 'include',
+            method: options === null || options === void 0 ? void 0 : options.method,
+            body: options === null || options === void 0 ? void 0 : options.body,
+            headers: headers
+        }).then(function (response) {
             return onSuccess(response);
         }).catch(function (error) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             var r;