AJAX via devextreme/core/utils/ajax (#374)

Author: AlekseyMartynov

build/make-nojquery.js

@@ -8,14 +8,6 @@ const README = `# DevExtreme ASP.NET Data
 jQuery-free version of [devextreme-aspnet-data](https://www.npmjs.com/package/devextreme-aspnet-data).
 `;
 
-const JQ_SURROGATE_MODULAR = `$1{
-$1    ajax: require("devextreme/core/utils/ajax").sendRequest,
-$1    Deferred: require("devextreme/core/utils/deferred").Deferred,
-$1    extend: require("devextreme/core/utils/extend").extend
-$1}`;
-
-const JQ_SURROGATE_GLOBAL = `throw "This script should be used with an AMD or CommonJS loader"`;
-
 const AJAX_SETTINGS_SURROGATE = `{
         cache?: boolean;
         contentType?: any;
@@ -44,8 +36,9 @@ fs.writeFileSync(path.join(outputPath, "package.json"), JSON.stringify(nojqueryP
 fs.writeFileSync(
     path.join(outputPath, "index.js"),
     fs.readFileSync(path.join(__dirname, "../js/dx.aspnet.data.js"), "utf-8")
-        .replace(/( +)require\("jquery"\)/g, JQ_SURROGATE_MODULAR)
-        .replace(/DevExpress\.data\.AspNet = [^]+?\)/, JQ_SURROGATE_GLOBAL)
+        .replace(/\brequire\("jquery"\).Deferred/g, `require("devextreme/core/utils/deferred").Deferred`)
+        .replace(/\brequire\("jquery"\).extend/g, `require("devextreme/core/utils/extend").extend`)
+        .replace(/DevExpress\.data\.AspNet = [^]+?\)/, `throw "This script should be used with an AMD or CommonJS loader"`)
         .replace(/\/\* global .+?\*\//, "/* global define, module, require */")
 );
 

js-test/test.js

@@ -10,6 +10,7 @@
                 require("xhr-mock").default,
                 require("devextreme/core/version"),
                 require("devextreme/data/data_source"),
+                require("devextreme/core/utils/ajax"),
                 require(ASPNET_DATA_SCRIPT)
             );
         });
@@ -18,23 +19,27 @@
             require("xhr-mock").default,
             require("devextreme/core/version"),
             require("devextreme/data/data_source"),
+            require("devextreme/core/utils/ajax"),
             require(ASPNET_DATA_SCRIPT)
         );
     } else {
         factory(
             window.XHRMock,
             DevExpress.VERSION,
             DevExpress.data.DataSource,
+            DevExpress.utils.ajax,
             DevExpress.data.AspNet
         );
     }
 
-})(function(XHRMock, devextremeVersion, DataSource, AspNet) {
+})(function(XHRMock, devextremeVersion, DataSource, ajaxUtility, AspNet) {
     "use strict";
 
     // https://github.com/karma-runner/karma-qunit/issues/57
     var QUnit = window.QUnit;
 
+    devextremeVersion = devextremeVersion.split(".").map(Number);
+
     var createStore = AspNet.createStore,
         NEVER_RESOLVE = new Promise(function() { });
 
@@ -54,11 +59,8 @@
     }
 
     function useLegacyStoreResult() {
-        var versionArray = devextremeVersion.split("."),
-            major = Number(versionArray[0]),
-            minor = Number(versionArray[1]);
-
-        return major < 18 || major === 18 && minor < 2;
+        return devextremeVersion[0] < 18
+            || devextremeVersion[0] === 18 && devextremeVersion[1] < 2;
     }
 
     QUnit.testStart(function() {
@@ -869,4 +871,20 @@
             done();
         }
     });
+
+    if(devextremeVersion[0] >= 19) {
+        QUnit.test("ajax.inject", function(assert) {
+            var done = assert.async();
+
+            function customSendRequest() {
+                ajaxUtility.resetInjection();
+                assert.expect(0);
+                done();
+                return NEVER_RESOLVE;
+            }
+
+            ajaxUtility.inject({ sendRequest: customSendRequest });
+            createStore({ loadUrl: "/"}).load();
+        })
+    }
 });

js/dx.aspnet.data.js

@@ -9,26 +9,32 @@
     if(typeof define === "function" && define.amd) {
         define(function(require, exports, module) {
             module.exports = factory(
-                require("jquery"),
+                require("devextreme/core/utils/ajax"),
+                require("jquery").Deferred,
+                require("jquery").extend,
                 require("devextreme/data/custom_store"),
                 require("devextreme/data/utils")
             );
         });
     } else if (typeof module === "object" && module.exports) {
         module.exports = factory(
-            require("jquery"),
+            require("devextreme/core/utils/ajax"),
+            require("jquery").Deferred,
+            require("jquery").extend,
             require("devextreme/data/custom_store"),
             require("devextreme/data/utils")
         );
     } else {
         DevExpress.data.AspNet = factory(
-            jQuery,
+            DevExpress.utils.ajax || { sendRequest: jQuery.ajax },
+            jQuery.Deferred,
+            jQuery.extend,
             DevExpress.data.CustomStore,
             DevExpress.data.utils
         );
     }
 
-})(function($, CustomStore, dataUtils) {
+})(function(ajaxUtility, Deferred, extend, CustomStore, dataUtils) {
     "use strict";
 
     var CUSTOM_STORE_OPTIONS = [
@@ -55,7 +61,7 @@
             onAjaxError = options.onAjaxError;
 
         function send(operation, requiresKey, ajaxSettings, customSuccessHandler) {
-            var d = $.Deferred();
+            var d = Deferred();
 
             if(requiresKey && !keyExpr) {
                 d.reject(new Error("Primary key is not specified (operation: '" + operation + "', url: '" + ajaxSettings.url + "')"));
@@ -70,14 +76,14 @@
                 if(onBeforeSend)
                     onBeforeSend(operation, ajaxSettings);
 
-                $.ajax(ajaxSettings)
-                    .done(function(res, textStatus, xhr) {
+                ajaxUtility.sendRequest(ajaxSettings).then(
+                    function(res, textStatus, xhr) {
                         if(customSuccessHandler)
                             customSuccessHandler(d, res, xhr);
                         else
                             d.resolve();
-                    })
-                    .fail(function(xhr, textStatus) {
+                    },
+                    function(xhr, textStatus) {
                         var error = getErrorMessageFromXhr(xhr);
 
                         if(onAjaxError) {
@@ -90,7 +96,8 @@
                             d.reject(error);
                         else
                             d.reject(xhr, textStatus);
-                    });
+                    }
+                );
             }
 
             return d.promise();
@@ -133,7 +140,7 @@
                 }
 
                 if(Array.isArray(filter)) {
-                    filter = $.extend(true, [], filter);
+                    filter = extend(true, [], filter);
                     stringifyDatesInFilter(filter);
                     result.filter = JSON.stringify(filter);
                 }
@@ -151,7 +158,7 @@
                 }
             }
 
-            $.extend(result, loadParams);
+            extend(result, loadParams);
 
             return result;
         }