datatables.net-searchbuilder-bs 1.3.4 → 1.4.2

package/js/searchBuilder.bootstrap.js

@@ -1,52 +1,74 @@
 /*! Bootstrap ui integration for DataTables' SearchBuilder
- * ©2016 SpryMedia Ltd - datatables.net/license
- */
-(function (factory) {
-    if (typeof define === 'function' && define.amd) {
-        // AMD
-        define(['jquery', 'datatables.net-bs', 'datatables.net-searchbuilder'], function ($) {
-            return factory($);
-        });
-    }
-    else if (typeof exports === 'object') {
-        // CommonJS
-        module.exports = function (root, $) {
-            if (!root) {
-                root = window;
-            }
-            if (!$ || !$.fn.dataTable) {
-                // eslint-disable-next-line @typescript-eslint/no-var-requires
-                $ = require('datatables.net-bs')(root, $).$;
-            }
-            if (!$.fn.dataTable.searchBuilder) {
-                // eslint-disable-next-line @typescript-eslint/no-var-requires
-                require('datatables.net-searchbuilder')(root, $);
-            }
-            return factory($);
-        };
-    }
-    else {
-        // Browser
-        factory(jQuery);
-    }
-}(function ($) {
-    'use strict';
-    var dataTable = $.fn.dataTable;
-    $.extend(true, dataTable.SearchBuilder.classes, {
-        clearAll: 'btn btn-default dtsb-clearAll'
-    });
-    $.extend(true, dataTable.Group.classes, {
-        add: 'btn btn-default dtsb-add',
-        clearGroup: 'btn btn-default dtsb-clearGroup',
-        logic: 'btn btn-default dtsb-logic'
-    });
-    $.extend(true, dataTable.Criteria.classes, {
-        condition: 'form-control dtsb-condition',
-        data: 'form-control dtsb-data',
-        "delete": 'btn btn-default dtsb-delete',
-        left: 'btn btn-default dtsb-left',
-        right: 'btn btn-default dtsb-right',
-        value: 'form-control dtsb-value'
-    });
-    return dataTable.searchPanes;
+ * © SpryMedia Ltd - datatables.net/license
+*/
+
+(function( factory ){
+	if ( typeof define === 'function' && define.amd ) {
+		// AMD
+		define( ['jquery', 'datatables.net-bs', 'datatables.net-searchbuilder'], function ( $ ) {
+			return factory( $, window, document );
+		} );
+	}
+	else if ( typeof exports === 'object' ) {
+		// CommonJS
+		var jq = require('jquery');
+		var cjsRequires = function (root, $) {
+			if ( ! $.fn.dataTable ) {
+				require('datatables.net-bs')(root, $);
+			}
+
+			if ( ! $.fn.dataTable.SearchBuilder ) {
+				require('datatables.net-searchbuilder')(root, $);
+			}
+		};
+
+		if (typeof window !== 'undefined') {
+			module.exports = function (root, $) {
+				if ( ! root ) {
+					// CommonJS environments without a window global must pass a
+					// root. This will give an error otherwise
+					root = window;
+				}
+
+				if ( ! $ ) {
+					$ = jq( root );
+				}
+
+				cjsRequires( root, $ );
+				return factory( $, root, root.document );
+			};
+		}
+		else {
+			cjsRequires( window, jq );
+			module.exports = factory( jq, window, window.document );
+		}
+	}
+	else {
+		// Browser
+		factory( jQuery, window, document );
+	}
+}(function( $, window, document, undefined ) {
+'use strict';
+var DataTable = $.fn.dataTable;
+
+
+$.extend(true, DataTable.SearchBuilder.classes, {
+    clearAll: 'btn btn-default dtsb-clearAll'
+});
+$.extend(true, DataTable.Group.classes, {
+    add: 'btn btn-default dtsb-add',
+    clearGroup: 'btn btn-default dtsb-clearGroup',
+    logic: 'btn btn-default dtsb-logic'
+});
+$.extend(true, DataTable.Criteria.classes, {
+    condition: 'form-control dtsb-condition',
+    data: 'form-control dtsb-data',
+    "delete": 'btn btn-default dtsb-delete',
+    left: 'btn btn-default dtsb-left',
+    right: 'btn btn-default dtsb-right',
+    value: 'form-control dtsb-value'
+});
+
+
+return DataTable;
 }));

package/js/searchBuilder.bootstrap.min.js

@@ -1,6 +1,4 @@
-/*!
- Bootstrap ui integration for DataTables' SearchBuilder
- ©2016 SpryMedia Ltd - datatables.net/license
+/*! Bootstrap ui integration for DataTables' SearchBuilder
+ * © SpryMedia Ltd - datatables.net/license
 */
-(function(b){"function"===typeof define&&define.amd?define(["jquery","datatables.net-bs","datatables.net-searchbuilder"],function(a){return b(a)}):"object"===typeof exports?module.exports=function(a,c){a||(a=window);c&&c.fn.dataTable||(c=require("datatables.net-bs")(a,c).$);c.fn.dataTable.searchBuilder||require("datatables.net-searchbuilder")(a,c);return b(c)}:b(jQuery)})(function(b){var a=b.fn.dataTable;b.extend(!0,a.SearchBuilder.classes,{clearAll:"btn btn-default dtsb-clearAll"});b.extend(!0,a.Group.classes,
-{add:"btn btn-default dtsb-add",clearGroup:"btn btn-default dtsb-clearGroup",logic:"btn btn-default dtsb-logic"});b.extend(!0,a.Criteria.classes,{condition:"form-control dtsb-condition",data:"form-control dtsb-data","delete":"btn btn-default dtsb-delete",left:"btn btn-default dtsb-left",right:"btn btn-default dtsb-right",value:"form-control dtsb-value"});return a.searchPanes});
+!function(n){var d,a;"function"==typeof define&&define.amd?define(["jquery","datatables.net-bs","datatables.net-searchbuilder"],function(t){return n(t,window,document)}):"object"==typeof exports?(d=require("jquery"),a=function(t,e){e.fn.dataTable||require("datatables.net-bs")(t,e),e.fn.dataTable.SearchBuilder||require("datatables.net-searchbuilder")(t,e)},"undefined"!=typeof window?module.exports=function(t,e){return t=t||window,e=e||d(t),a(t,e),n(e,0,t.document)}:(a(window,d),module.exports=n(d,window,window.document))):n(jQuery,window,document)}(function(t,e,n,d){"use strict";var a=t.fn.dataTable;return t.extend(!0,a.SearchBuilder.classes,{clearAll:"btn btn-default dtsb-clearAll"}),t.extend(!0,a.Group.classes,{add:"btn btn-default dtsb-add",clearGroup:"btn btn-default dtsb-clearGroup",logic:"btn btn-default dtsb-logic"}),t.extend(!0,a.Criteria.classes,{condition:"form-control dtsb-condition",data:"form-control dtsb-data",delete:"btn btn-default dtsb-delete",left:"btn btn-default dtsb-left",right:"btn btn-default dtsb-right",value:"form-control dtsb-value"}),a});

package/js/searchBuilder.bootstrap.min.mjs

@@ -0,0 +1,4 @@
+/*! Bootstrap ui integration for DataTables' SearchBuilder
+ * © SpryMedia Ltd - datatables.net/license
+*/
+import $ from"jquery";import DataTable from"datatables.net-bs";import SearchBuilder from"datatables.net-searchbuilder";$.extend(!0,DataTable.SearchBuilder.classes,{clearAll:"btn btn-default dtsb-clearAll"}),$.extend(!0,DataTable.Group.classes,{add:"btn btn-default dtsb-add",clearGroup:"btn btn-default dtsb-clearGroup",logic:"btn btn-default dtsb-logic"}),$.extend(!0,DataTable.Criteria.classes,{condition:"form-control dtsb-condition",data:"form-control dtsb-data",delete:"btn btn-default dtsb-delete",left:"btn btn-default dtsb-left",right:"btn btn-default dtsb-right",value:"form-control dtsb-value"});export default DataTable;

package/js/searchBuilder.bootstrap.mjs

@@ -0,0 +1,27 @@
+/*! Bootstrap ui integration for DataTables' SearchBuilder
+ * © SpryMedia Ltd - datatables.net/license
+*/
+
+import $ from 'jquery';
+import DataTable from 'datatables.net-bs';
+import SearchBuilder from 'datatables.net-searchbuilder';
+
+$.extend(true, DataTable.SearchBuilder.classes, {
+    clearAll: 'btn btn-default dtsb-clearAll'
+});
+$.extend(true, DataTable.Group.classes, {
+    add: 'btn btn-default dtsb-add',
+    clearGroup: 'btn btn-default dtsb-clearGroup',
+    logic: 'btn btn-default dtsb-logic'
+});
+$.extend(true, DataTable.Criteria.classes, {
+    condition: 'form-control dtsb-condition',
+    data: 'form-control dtsb-data',
+    "delete": 'btn btn-default dtsb-delete',
+    left: 'btn btn-default dtsb-left',
+    right: 'btn btn-default dtsb-right',
+    value: 'form-control dtsb-value'
+});
+
+
+export default DataTable;

package/package.json

@@ -2,12 +2,14 @@
     "name": "datatables.net-searchbuilder-bs",
     "description": "SearchBuilder for DataTables with styling for [Bootstrap](https://getbootstrap.com/docs/3.3/)",
     "main": "js/searchBuilder.bootstrap.js",
+    "module": "js/searchBuilder.bootstrap.mjs",
     "style": "css/searchBuilder.bootstrap.css",
-    "types": "./types/searchBuilder.bootstrap.d.ts",
-    "version": "1.3.4",
+    "types": "./types/types.d.ts",
+    "version": "1.4.2",
     "files": [
         "css/**/*.css",
         "js/**/*.js",
+        "js/**/*.mjs",
         "types/**/*.d.ts"
     ],
     "keywords": [
@@ -22,8 +24,8 @@
         "sort"
     ],
     "dependencies": {
-        "datatables.net-searchbuilder": ">=1.2.2",
-        "datatables.net-bs": ">=1.11.3",
+        "datatables.net-searchbuilder": ">=1.3.4",
+        "datatables.net-bs": ">=1.12.1",
         "jquery": ">=1.7"
     },
     "moduleType": [

package/types/searchBuilder.bootstrap.d.ts

@@ -0,0 +1,4 @@
+/*! Bootstrap ui integration for DataTables' SearchBuilder
+ * © SpryMedia Ltd - datatables.net/license
+*/
+declare var DataTable: any;

package/types/types.d.ts

@@ -0,0 +1,115 @@
+// Type definitions for DataTables SearchBuilder
+//
+// Project: https://datatables.net/extensions/searchbuilder/, https://datatables.net
+
+/// <reference types="jquery" />
+
+import DataTables, {Api} from 'datatables.net';
+import {IDefaults, IDetails, II18n} from './searchBuilder';
+
+export default DataTables;
+
+type DeepPartial<T> = T extends object ? {
+    [P in keyof T]?: DeepPartial<T[P]>;
+} : T;
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * DataTables' types integration
+ */
+declare module 'datatables.net' {
+	interface Config {
+		/**
+		 * SearchBuilder extension options
+		 */
+		searchBuilder?: boolean | string[] | ConfigSearchBuilder | ConfigSearchBuilder[];
+	}
+
+	interface ConfigLanguage {
+		/**
+		 * SearchBuilder language options
+		 */
+		searchBuilder?: ConfigSearchBuilderLanguage;
+	}
+
+	interface ConfigColumns {
+		searchBuilder?: {
+			/** Set a default condition for this column */
+			defaultCondition?: number | string;
+
+			/** Set values of orthogonal data for rendering functions */
+			orthogonal?: {[key: string]: string};
+		};
+
+		/** Set a custom title for a column in SearchBuilder */
+		searchBuilderTitle?: string;
+
+		/** Set the SearchBuilder type to use for a column */
+		searchBuilderType?: string;
+	}
+
+	interface Api<T> {
+		/**
+		 * SearchBuilder methods container
+		 * 
+		 * @returns Api for chaining with the additional SearchBuilder methods
+		 */
+		searchBuilder: ApiSearchBuilder<T>;
+	}
+
+	interface ApiStatic {
+		/**
+		 * SearchBuilder class
+		 */
+		SearchBuilder: {
+			/**
+			 * Create a new SearchBuilder instance for the target DataTable
+			 */
+			new (dt: Api<any>, settings: string[] | ConfigSearchBuilder | ConfigSearchBuilder[]);
+
+			/**
+			 * SearchBuilder version
+			 */
+			version: string;
+
+			/**
+			 * Default configuration values
+			 */
+			defaults: ConfigSearchBuilder;
+		}
+	}
+}
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Options
+ */
+
+interface ConfigSearchBuilder extends Partial<IDefaults> {}
+
+interface ConfigSearchBuilderLanguage extends DeepPartial<II18n> {}
+
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * API
+ */
+interface ApiSearchBuilder<T> extends Api<T> {
+	/**
+	 * Returns the node of the SearchBuilder Container
+	 */
+	container(): JQuery<HTMLElement>;
+
+	/**
+	 * Gets the details of the current SearchBuilder setup
+	 */
+	getDetails(): IDetails;
+
+	/**
+	 * Rebuild the search to a given state.
+	 *
+	 * @param state Object of the same structure that is returned from searchBuilder.getDetails().
+	 * This contains all of the details needed to rebuild the state.
+	 * @returns self for chaining
+	 */
+	rebuild(state: IDetails): Api<T>;
+}