@progress/sitefinity-webservices-sdk 0.2.70 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@progress/sitefinity-webservices-sdk",
-  "version": "0.2.70",
+  "version": "0.3.1",
   "scripts": {
     "start": "webpack-dev-server --config config/webpack.dev.js",
     "build:dev": "webpack --config config/webpack.dev.js --progress --profile",
@@ -8,26 +8,14 @@
     "build:release": "npm run build:prod & npm run build:dev"
   },
   "devDependencies": {
-    "awesome-typescript-loader": "5.0.0",
-    "compression-webpack-plugin": "1.1.11",
+    "awesome-typescript-loader": "5.2.1",
     "html-webpack-plugin": "3.2.0",
-    "jasmine-ajax": "2.99.0",
-    "jasmine-reporters": "0.4.1",
-    "karma": "0.12.37",
-    "karma-chrome-launcher": "0.1.12",
-    "karma-coverage": "0.2.7",
-    "karma-jasmine": "0.2.3",
-    "karma-jasmine-ajax": "0.1.13",
-    "karma-junit-reporter": "0.2.2",
-    "karma-phantomjs-launcher": "0.1.4",
     "typedoc": "0.11.1",
     "typedoc-webpack-plugin": "1.1.4",
     "typescript": "2.9.1",
-    "webpack": "4.12.0",
-    "webpack-cli": "3.0.3",
-    "webpack-dev-server": "3.1.4",
-    "webpack-merge": "4.1.2",
-    "webpack-uglify-js-plugin": "1.1.9",
-    "zip-webpack-plugin": "3.0.0"
+    "webpack": "4.46.0",
+    "webpack-cli": "3.3.11",
+    "webpack-dev-server": "3.11.0",
+    "webpack-merge": "4.1.2"
   }
 }

package/src/Data.ts

@@ -124,6 +124,9 @@ export class Data {
         if (!(parameters.data))
             throw "Parameter 'data' is required!";
 
+        if (parameters.query)
+            this.urlOptions.ODataParams = parameters.query;
+
         var request = this.factory.create({
             urlOptions: this.urlOptions,
             key: parameters.key,

package/src/Expression.ts

@@ -9,7 +9,7 @@ export class ExpressionBase {
 }
 
 export class BinaryExpression extends ExpressionBase {
-    constructor(type: string, public parameter: string, public constant: any) {
+    constructor(type: string, public parameter: string, public constant: any, public caseSensitive: boolean = true) {
         super(type);
     }
 
@@ -20,10 +20,14 @@ export class BinaryExpression extends ExpressionBase {
     getConstant(): any {
         return this.constant;
     }
+
+    isCaseSensitive(): boolean {
+        return this.caseSensitive;
+    }
 }
 
 export class ComplexExpression extends ExpressionBase {
-    constructor (type: string, private expressions: ExpressionBase[]) {
+    constructor(type: string, private expressions: ExpressionBase[]) {
         super(type);
     }
 

package/src/QueryBuilder.ts

@@ -140,11 +140,15 @@ export class QueryBuilder {
 
                 result = `(${expression.getParameter()} ${type} ${this._checkType(constant)})`;
                 break;
-                // TODO contains is substringOf in Odata ?
+            // TODO contains is substringOf in Odata ?
             case ExpressionType.contains:
             case ExpressionType.startsWith:
             case ExpressionType.endsWith:
-                result = `${type.toLowerCase()}(${expression.getParameter()}, ${this._checkType(expression.getConstant())})`;
+                var expressionParameter = this._applyCaseSensitiveSettings(expression, expression.getParameter());
+                var expressionConstant =  this._checkType(expression.getConstant());
+                var expressionValue = this._applyCaseSensitiveSettings(expression, expressionConstant);
+
+                result = `${type.toLowerCase()}(${expressionParameter}, ${expressionValue})`;
                 break;
             default:
                 var msg = `Unsupported operator ${type}`;
@@ -154,6 +158,14 @@ export class QueryBuilder {
         return result;
     }
 
+    private _applyCaseSensitiveSettings(expression, value) {
+        if (expression.isCaseSensitive()) {
+            return value;
+        }
+
+        return `tolower(${value})`;
+    }
+
     private _checkType(constant: any) {
         if (this._isGuid(constant))
             return constant;
@@ -161,12 +173,12 @@ export class QueryBuilder {
         if (constant == null)
             return null;
 
-        constant = constant.replace(/[+/?%#&]/g, function($0) {
+        constant = constant.replace(/[+/?%#&]/g, function ($0) {
             return encodeURIComponent($0);
         });
 
-         // escapes the apostrophes
-        constant = constant.replace(/'/g,"''");
+        // escapes the apostrophes
+        constant = constant.replace(/'/g, "''");
 
         return "'" + constant + "'";
     }

package/src/Requests/Request.ts

@@ -39,19 +39,40 @@ export class RequestBase {
     }
 
     _getQueryParameters(paramDictionary: any, urlOptions: any) {
-        var clause = constants.SfParams;
+        if (urlOptions.ODataParams) {
+            var query = urlOptions.ODataParams.build();
+            if (utils.isString(query.$filter))
+                paramDictionary[constants.ODataParams.$filter] = query.$filter;
+            if (utils.isString(query.$select))
+                paramDictionary[constants.ODataParams.$select] = query.$select;
+            if (utils.isString(query.$expand))
+                paramDictionary[constants.ODataParams.$expand] = query.$expand;
+            if (utils.isString(query.$orderby))
+                paramDictionary[constants.ODataParams.$orderby] = query.$orderby;
+            if (utils.isNumber(query.$skip))
+                paramDictionary[constants.ODataParams.$skip] = query.$skip;
+            if (utils.isNumber(query.$top))
+                paramDictionary[constants.ODataParams.$top] = query.$top;
+            if (utils.isString(query.$search))
+                paramDictionary[constants.ODataParams.$search] = query.$search;
+
+            // inline count
+            if (utils.isBoolean(query.$count) && query.$count)
+                paramDictionary[constants.ODataParams.$count] = query.$count;
+        }
+
         if (urlOptions.SFParams) {
             var sfParams = urlOptions.SFParams;
             if (sfParams.provider) {
-                paramDictionary[clause.provider] = sfParams.provider;
+                paramDictionary[constants.SfParams.provider] = sfParams.provider;
             }
 
             if (sfParams.culture) {
-                paramDictionary[clause.culture] = sfParams.culture;
+                paramDictionary[constants.SfParams.culture] = sfParams.culture;
             }
 
             if (sfParams.siteId) {
-                paramDictionary[clause.siteId] = sfParams.siteId;
+                paramDictionary[constants.SfParams.siteId] = sfParams.siteId;
             }
         }
 
@@ -144,34 +165,6 @@ export class GetRequest extends RequestBase {
     _getMethod() {
         return httpMethods.Get;
     }
-
-    _getQueryParameters(paramDictionary: any, urlOptions: any) {
-        var clause = constants.ODataParams;
-
-        if (urlOptions.ODataParams) {
-            var query = urlOptions.ODataParams.build();
-            if (utils.isString(query.$filter))
-                paramDictionary[clause.$filter] = query.$filter;
-            if (utils.isString(query.$select))
-                paramDictionary[clause.$select] = query.$select;
-            if (utils.isString(query.$expand))
-                paramDictionary[clause.$expand] = query.$expand;
-            if (utils.isString(query.$orderby))
-                paramDictionary[clause.$orderby] = query.$orderby;
-            if (utils.isNumber(query.$skip))
-                paramDictionary[clause.$skip] = query.$skip;
-            if (utils.isNumber(query.$top))
-                paramDictionary[clause.$top] = query.$top;
-            if (utils.isString(query.$search))
-                paramDictionary[clause.$search] = query.$search;
-
-            // inline count
-            if (utils.isBoolean(query.$count) && query.$count)
-                paramDictionary[clause.$count] = query.$count;
-        }
-
-        super._getQueryParameters(paramDictionary, urlOptions);
-    }
 }
 
 export class GetByIdRequest extends RequestBase {
@@ -182,20 +175,6 @@ export class GetByIdRequest extends RequestBase {
     _getMethod() {
         return httpMethods.Get;
     }
-
-    _getQueryParameters(paramDictionary, urlOptions) {
-        var clause = constants.ODataParams;
-
-        if (urlOptions.ODataParams) {
-            var query = urlOptions.ODataParams.build();
-            if (utils.isString(query.$select))
-                paramDictionary[clause.$select] = query.$select;
-            if (utils.isString(query.$expand))
-                paramDictionary[clause.$expand] = query.$expand;
-        }
-
-        super._getQueryParameters(paramDictionary, urlOptions);
-    }
 }
 
 export class DeleteRequest extends RequestBase {

package/src/WhereQuery.ts

@@ -13,12 +13,12 @@ export class WhereQuery {
         this.expression = new ComplexExpression(type, []);
     }
 
-     /**
-     * Adds an `and` clause to the current condition and returns it for further chaining.
-     * @method and
-     * @memberOf WhereQuery.prototype
-     * @returns {WhereQuery}
-     */
+    /**
+    * Adds an `and` clause to the current condition and returns it for further chaining.
+    * @method and
+    * @memberOf WhereQuery.prototype
+    * @returns {WhereQuery}
+    */
     and(): WhereQuery {
         return new WhereQuery(this, OperatorType.and);
     }
@@ -51,8 +51,8 @@ export class WhereQuery {
         return new WhereQuery(this, OperatorType.not);
     }
 
-    private _simple (type: string, parameter: string, constant: any): WhereQuery {
-        var currentExpr = new BinaryExpression(type, parameter, constant);
+    private _simple(type: string, parameter: string, constant: any, caseSensitive: boolean = true): WhereQuery {
+        var currentExpr = new BinaryExpression(type, parameter, constant, caseSensitive);
         var subExpressions = this.expression.getExpressions();
         subExpressions.push(currentExpr);
 
@@ -134,11 +134,12 @@ export class WhereQuery {
      * @memberOf WhereQuery.prototype
      * @param {string} field Field name.
      * @param {string} value The string that the field should start with.
+     * @param {boolean} caseSensitive A flag indicating if tolower should be applied to the parameter
      * @param {string} [options] A string of regex options to use. See [specs](http://docs.mongodb.org/manual/reference/operator/query/regex/#op._S_options) for a description of available options.
      * @returns {WhereQuery}
      */
-    startsWith(parameter: string, constant: any): WhereQuery {
-        return this._simple(OperatorType.startsWith, parameter, constant);
+    startsWith(parameter: string, constant: any, caseSensitive: boolean = true): WhereQuery {
+        return this._simple(OperatorType.startsWith, parameter, constant, caseSensitive);
     }
 
     /**
@@ -147,11 +148,12 @@ export class WhereQuery {
      * @memberOf WhereQuery.prototype
      * @param {string} field Field name.
      * @param {string} value The string that the field should start with.
+     * @param {boolean} caseSensitive A flag indicating if tolower should be applied to the parameter
      * @param {string} [options] A string of regex options to use. See [specs](http://docs.mongodb.org/manual/reference/operator/query/regex/#op._S_options) for a description of available options.
      * @returns {WhereQuery}
      */
-    contains(parameter: string, constant: any) {
-        return this._simple(OperatorType.contains, parameter, constant);
+    contains(parameter: string, constant: any, caseSensitive: boolean = true) {
+        return this._simple(OperatorType.contains, parameter, constant, caseSensitive);
     }
 
     /**
@@ -160,11 +162,12 @@ export class WhereQuery {
      * @memberOf WhereQuery.prototype
      * @param {string} field Field name.
      * @param {string} value The string that the field should end with.
+     * @param {boolean} caseSensitive A flag indicating if tolower should be applied to the parameter
      * @param {string} [options] A string of  regex options to use. See [specs](http://docs.mongodb.org/manual/reference/operator/query/regex/#op._S_options) for a description of available options.
      * @returns {WhereQuery}
      */
-    endsWith(parameter: string, constant: any) {
-        return this._simple(OperatorType.endsWith, parameter, constant);
+    endsWith(parameter: string, constant: any, caseSensitive: boolean = true) {
+        return this._simple(OperatorType.endsWith, parameter, constant, caseSensitive);
     }
 
     /**
@@ -184,7 +187,7 @@ export class WhereQuery {
         return this.parent;
     }
 
-    _getExpression () {
+    _getExpression() {
         return this.expression;
     }
 

package/version.txt

@@ -1 +1 @@
-0.2.70 
+0.3.1