datatables.net-searchbuilder 1.7.0 → 1.8.0

package/js/dataTables.searchBuilder.mjs

@@ -1,5 +1,5 @@
-/*! SearchBuilder 1.7.0
--dev * ©SpryMedia Ltd - datatables.net/license/mit
+/*! SearchBuilder 1.8.0
+ * ©SpryMedia Ltd - datatables.net/license/mit
  */
 
 import jQuery from 'jquery';
@@ -12,12 +12,20 @@ let $ = jQuery;
     'use strict';
 
     var $$3;
-    var dataTable$3;
+    var dataTable$2;
+    /** Get a moment object. Attempt to get from DataTables for module loading first. */
     function moment() {
-        return window.moment;
+        var used = DataTable.use('moment');
+        return used
+            ? used
+            : window.moment;
     }
+    /** Get a luxon object. Attempt to get from DataTables for module loading first. */
     function luxon() {
-        return window.luxon;
+        var used = DataTable.use('luxon');
+        return used
+            ? used
+            : window.luxon;
     }
     /**
      * Sets the value of jQuery for use in the file
@@ -26,7 +34,7 @@ let $ = jQuery;
      */
     function setJQuery$2(jq) {
         $$3 = jq;
-        dataTable$3 = jq.fn.dataTable;
+        dataTable$2 = jq.fn.dataTable;
     }
     /**
      * The Criteria class is used within SearchBuilder to represent a search criteria
@@ -38,10 +46,6 @@ let $ = jQuery;
             if (serverData === void 0) { serverData = undefined; }
             if (liveSearch === void 0) { liveSearch = false; }
             var _this = this;
-            // Check that the required version of DataTables is included
-            if (!dataTable$3 || !dataTable$3.versionCheck || !dataTable$3.versionCheck('1.10.0')) {
-                throw new Error('SearchPane requires DataTables 1.10 or newer');
-            }
             this.classes = $$3.extend(true, {}, Criteria.classes);
             // Get options from user and any extra conditions/column types defined by plug-ins
             this.c = $$3.extend(true, {}, Criteria.defaults, $$3.fn.dataTable.ext.searchBuilder, opts);
@@ -130,7 +134,7 @@ let $ = jQuery;
                     val.addClass(this.classes.greyscale);
                 }
             }
-            $$3(window).on('resize.dtsb', dataTable$3.util.throttle(function () {
+            $$3(window).on('resize.dtsb', dataTable$2.util.throttle(function () {
                 _this.s.topGroup.trigger('dtsb-redrawLogic');
             }));
             this._buildCriteria();
@@ -145,10 +149,10 @@ let $ = jQuery;
         Criteria._escapeHTML = function (txt) {
             return txt
                 .toString()
-                .replace(/&/g, '&')
                 .replace(/&lt;/g, '<')
                 .replace(/&gt;/g, '>')
-                .replace(/&quot;/g, '"');
+                .replace(/&quot;/g, '"')
+                .replace(/&amp;/g, '&');
         };
         /**
          * Redraw the DataTable with the current search parameters
@@ -232,7 +236,8 @@ let $ = jQuery;
             if (this.s.condition !== undefined && condition !== undefined) {
                 var filter = rowData[this.s.dataIdx];
                 // This check is in place for if a custom decimal character is in place
-                if (this.s.type.includes('num') &&
+                if (this.s.type &&
+                    this.s.type.includes('num') &&
                     (settings.oLanguage.sDecimal !== '' ||
                         settings.oLanguage.sThousands !== '')) {
                     var splitRD = [rowData[this.s.dataIdx]];
@@ -331,7 +336,7 @@ let $ = jQuery;
                     }
                 }
             }
-            if (this.s.type.includes('num') && this.s.dt.page.info().serverSide) {
+            if (this.s.type && this.s.type.includes('num') && this.s.dt.page.info().serverSide) {
                 for (i = 0; i < this.s.value.length; i++) {
                     this.s.value[i] = this.s.value[i].replace(/[^0-9.\-]/g, '');
                 }
@@ -656,12 +661,13 @@ let $ = jQuery;
         Criteria.prototype._populateCondition = function () {
             var conditionOpts = [];
             var conditionsLength = Object.keys(this.s.conditions).length;
-            var colInits = this.s.dt.settings()[0].aoColumns;
+            var dt = this.s.dt;
+            var colInits = dt.settings()[0].aoColumns;
             var column = +this.dom.data.children('option:selected').val();
             var condition, condName;
             // If there are no conditions stored then we need to get them from the appropriate type
             if (conditionsLength === 0) {
-                this.s.type = this.s.dt.column(column).type();
+                this.s.type = dt.column(column).type();
                 if (colInits !== undefined) {
                     var colInit = colInits[column];
                     if (colInit.searchBuilderType !== undefined && colInit.searchBuilderType !== null) {
@@ -675,9 +681,9 @@ let $ = jQuery;
                 if (this.s.type === null || this.s.type === undefined) {
                     // This can only happen in DT1 - DT2 will do the invalidation of the type itself
                     if ($$3.fn.dataTable.ext.oApi) {
-                        $$3.fn.dataTable.ext.oApi._fnColumnTypes(this.s.dt.settings()[0]);
+                        $$3.fn.dataTable.ext.oApi._fnColumnTypes(dt.settings()[0]);
                     }
-                    this.s.type = this.s.dt.column(column).type();
+                    this.s.type = dt.column(column).type();
                 }
                 // Enable the condition element
                 this.dom.condition
@@ -687,9 +693,9 @@ let $ = jQuery;
                     .addClass(this.classes.italic);
                 this.dom.conditionTitle
                     .prop('selected', true);
-                var decimal = this.s.dt.settings()[0].oLanguage.sDecimal;
+                var decimal = dt.settings()[0].oLanguage.sDecimal;
                 // This check is in place for if a custom decimal character is in place
-                if (decimal !== '' && this.s.type.indexOf(decimal) === this.s.type.length - decimal.length) {
+                if (decimal !== '' && this.s.type && this.s.type.indexOf(decimal) === this.s.type.length - decimal.length) {
                     if (this.s.type.includes('num-fmt')) {
                         this.s.type = this.s.type.replace(decimal, '');
                     }
@@ -698,27 +704,36 @@ let $ = jQuery;
                     }
                 }
                 // Select which conditions are going to be used based on the column type
-                var conditionObj = this.c.conditions[this.s.type] !== undefined ?
-                    this.c.conditions[this.s.type] :
-                    this.s.type.includes('moment') ?
-                        this.c.conditions.moment :
-                        this.s.type.includes('luxon') ?
-                            this.c.conditions.luxon :
-                            this.c.conditions.string;
-                // If it is a moment format then extract the date format
-                if (this.s.type.includes('moment')) {
+                var conditionObj = void 0;
+                if (this.c.conditions[this.s.type] !== undefined) {
+                    conditionObj = this.c.conditions[this.s.type];
+                }
+                else if (this.s.type && this.s.type.includes('datetime-')) {
+                    // Date / time data types in DataTables are driven by Luxon or
+                    // Moment.js.
+                    conditionObj = DataTable.use('moment')
+                        ? this.c.conditions.moment
+                        : this.c.conditions.luxon;
+                    this.s.dateFormat = this.s.type.replace(/datetime-/g, '');
+                }
+                else if (this.s.type && this.s.type.includes('moment')) {
+                    conditionObj = this.c.conditions.moment;
                     this.s.dateFormat = this.s.type.replace(/moment-/g, '');
                 }
-                else if (this.s.type.includes('luxon')) {
+                else if (this.s.type && this.s.type.includes('luxon')) {
+                    conditionObj = this.c.conditions.luxon;
                     this.s.dateFormat = this.s.type.replace(/luxon-/g, '');
                 }
+                else {
+                    conditionObj = this.c.conditions.string;
+                }
                 // Add all of the conditions to the select element
                 for (var _i = 0, _a = Object.keys(conditionObj); _i < _a.length; _i++) {
                     condition = _a[_i];
                     if (conditionObj[condition] !== null) {
                         // Serverside processing does not supply the options for the select elements
                         // Instead input elements need to be used for these instead
-                        if (this.s.dt.page.info().serverSide && conditionObj[condition].init === Criteria.initSelect) {
+                        if (dt.page.info().serverSide && conditionObj[condition].init === Criteria.initSelect) {
                             var col = colInits[column];
                             if (this.s.serverData && this.s.serverData[col.data]) {
                                 conditionObj[condition].init = Criteria.initSelectSSP;
@@ -734,7 +749,7 @@ let $ = jQuery;
                         this.s.conditions[condition] = conditionObj[condition];
                         condName = conditionObj[condition].conditionName;
                         if (typeof condName === 'function') {
-                            condName = condName(this.s.dt, this.c.i18n);
+                            condName = condName(dt, this.c.i18n);
                         }
                         conditionOpts.push($$3('<option>', {
                             text: condName,
@@ -752,7 +767,7 @@ let $ = jQuery;
                     condition = _c[_b];
                     var name_1 = this.s.conditions[condition].conditionName;
                     if (typeof name_1 === 'function') {
-                        name_1 = name_1(this.s.dt, this.c.i18n);
+                        name_1 = name_1(dt, this.c.i18n);
                     }
                     var newOpt = $$3('<option>', {
                         text: name_1,
@@ -795,7 +810,7 @@ let $ = jQuery;
                             condName = this.s.conditions[cond].conditionName;
                             if (
                             // If the conditionName matches the text of the option
-                            (typeof condName === 'string' ? condName : condName(this.s.dt, this.c.i18n)) ===
+                            (typeof condName === 'string' ? condName : condName(dt, this.c.i18n)) ===
                                 conditionOpts[i].text() &&
                                 // and the tokens match
                                 cond === defaultCondition) {
@@ -964,7 +979,7 @@ let $ = jQuery;
             input: 'dtsb-input',
             inputCont: 'dtsb-inputCont',
             italic: 'dtsb-italic',
-            joiner: 'dtsp-joiner',
+            joiner: 'dtsb-joiner',
             left: 'dtsb-left',
             notItalic: 'dtsb-notItalic',
             option: 'dtsb-option',
@@ -2379,7 +2394,6 @@ let $ = jQuery;
     }());
 
     var $$2;
-    var dataTable$2;
     /**
      * Sets the value of jQuery for use in the file
      *
@@ -2387,7 +2401,7 @@ let $ = jQuery;
      */
     function setJQuery$1(jq) {
         $$2 = jq;
-        dataTable$2 = jq.fn.dataTable;
+        jq.fn.dataTable;
     }
     /**
      * The Group class is used within SearchBuilder to represent a group of criteria
@@ -2398,10 +2412,6 @@ let $ = jQuery;
             if (isChild === void 0) { isChild = false; }
             if (depth === void 0) { depth = 1; }
             if (serverData === void 0) { serverData = undefined; }
-            // Check that the required version of DataTables is included
-            if (!dataTable$2 || !dataTable$2.versionCheck || !dataTable$2.versionCheck('1.10.0')) {
-                throw new Error('SearchBuilder requires DataTables 1.10 or newer');
-            }
             this.classes = $$2.extend(true, {}, Group.classes);
             // Get options from user
             this.c = $$2.extend(true, {}, Group.defaults, opts);
@@ -3162,8 +3172,8 @@ let $ = jQuery;
         function SearchBuilder(builderSettings, opts) {
             var _this = this;
             // Check that the required version of DataTables is included
-            if (!dataTable$1 || !dataTable$1.versionCheck || !dataTable$1.versionCheck('1.10.0')) {
-                throw new Error('SearchBuilder requires DataTables 1.10 or newer');
+            if (!dataTable$1 || !dataTable$1.versionCheck || !dataTable$1.versionCheck('2')) {
+                throw new Error('SearchBuilder requires DataTables 2 or newer');
             }
             var table = new dataTable$1.Api(builderSettings);
             this.classes = $$1.extend(true, {}, SearchBuilder.classes);
@@ -3358,9 +3368,7 @@ let $ = jQuery;
                     data.searchBuilder = _this._collapseArray(_this.getDetails(true));
                 }
             });
-            this.s.dt.on(dataTable$1.versionCheck('2')
-                ? 'columns-reordered'
-                : 'column-reorder', function () {
+            this.s.dt.on('columns-reordered', function () {
                 _this.rebuild(_this.getDetails());
             });
             if (loadState) {
@@ -3575,7 +3583,7 @@ let $ = jQuery;
                 _this.dom.clearAll.remove();
             });
         };
-        SearchBuilder.version = '1.7.0';
+        SearchBuilder.version = '1.8.0';
         SearchBuilder.classes = {
             button: 'dtsb-button',
             clearAll: 'dtsb-clearAll',
@@ -3683,8 +3691,8 @@ let $ = jQuery;
         return SearchBuilder;
     }());
 
-    /*! SearchBuilder 1.7.0
-    -dev * ©SpryMedia Ltd - datatables.net/license/mit
+    /*! SearchBuilder 1.8.0
+     * ©SpryMedia Ltd - datatables.net/license/mit
      */
     setJQuery($);
     setJQuery$1($);

package/package.json

@@ -4,7 +4,7 @@
     "main": "js/dataTables.searchBuilder.js",
     "module": "js/dataTables.searchBuilder.mjs",
     "types": "./types/types.d.ts",
-    "version": "1.7.0",
+    "version": "1.8.0",
     "files": [
         "js/**/*.js",
         "js/**/*.mjs",
@@ -21,7 +21,7 @@
         "sort"
     ],
     "dependencies": {
-        "datatables.net": ">=1.11.0",
+        "datatables.net": "^2.1",
         "jquery": ">=1.7"
     },
     "moduleType": [

package/types/types.d.ts

@@ -48,6 +48,10 @@ declare module 'datatables.net' {
 		searchBuilderType?: string;
 	}
 
+	interface Feature {
+		searchBuilder?: string[] | ConfigSearchBuilder | ConfigSearchBuilder[];
+	}
+
 	interface Api<T> {
 		/**
 		 * SearchBuilder methods container