minor fixes in Helper, Add, Select; sourcemaps

Author: morrisjdev

dev/Helper.ts

@@ -50,9 +50,10 @@
             let value_a: any = valueSelector(a);
             let value_b: any = valueSelector(b);
 
-            let type: string = typeof value_a;
+            let type_a: string = typeof value_a;
+            let type_b: string = typeof value_b;
 
-            if (type === "string") {
+            if (type_a === "string" && type_a === type_b) {
                 let value_a_string: string = value_a;
                 value_a_string = value_a_string.toLowerCase();
                 let value_b_string: string = value_b;
@@ -66,12 +67,12 @@
                     return 0;
                 }
 
-            } else if (type === "number") {
+            } else if (type_a === "number" && type_a === type_b) {
                 let value_a_number: number = value_a;
                 let value_b_number: number = value_b;
 
                 return invert === true ? value_b_number - value_a_number : value_a_number - value_b_number;
-            } else if (type === "boolean") {
+            } else if (type_a === "boolean" && type_a === type_b) {
                 let value_a_bool: boolean = value_a;
                 let value_b_bool: boolean = value_b;
 
@@ -85,7 +86,15 @@
                     }
                 }
             } else {
-                throw new Error(`Linq4JS: Cannot map type '${type}' for compare`);
+                if (type_a === "undefined" && type_a === type_b) {
+                    return 0;
+                } else if (type_a === "undefined") {
+                    return invert ? 1 : -1;
+                } else if (type_b === "undefined") {
+                    return invert ? -1 : 1;
+                }
+
+                return 0;
             }
         }
 

dev/Modules/Add.ts

@@ -6,7 +6,7 @@
             let newIndex: number;
 
             let castedObject: Linq4JS.GeneratedEntity = object as any;
-            let last: Linq4JS.GeneratedEntity = that.LastOrDefault() as any;
+            let last: Linq4JS.GeneratedEntity = that.Where((x: any) => x._GeneratedId_ != null).OrderBy((x: any) => x._GeneratedId_).LastOrDefault() as any;
             if (last != null) {
                 newIndex = last._GeneratedId_ != null ? last._GeneratedId_ : 1;
 

dev/Modules/Select.ts

@@ -9,7 +9,7 @@
         if (selectStatement.match(/^\s*{.*}\s*$/) != null) {
             selectStatement = selectStatement.replace(/^\s*{(.*)}\s*$/, "$1");
 
-            let parts = selectStatement.split(",");
+            let parts = selectStatement.split(/,(?=(?:[^'"]*['"][^'"]*['"])*[^'"]*$)/g);
             let newContent = "";
 
             for (let i = 0; i < parts.length; i++) {

dist/linq4js.js

@@ -2,6 +2,7 @@ var gulp = require("gulp");
 
 var merge = require("merge2");
 var concat = require("gulp-concat");
+var sourcemaps = require("gulp-sourcemaps");
 var minify = require("gulp-minify");
 var watch = require("gulp-watch");
 var tslint = require("gulp-tslint");
@@ -28,13 +29,11 @@ gulp.task("demots", function () {
 gulp.task("typescript", function () {
     gulp.start("tslint");
 
-    var tsResult = devTS.src()
-        .pipe(devTS());
-
-    return merge([
-        tsResult.dts.pipe(gulp.dest("dist")),
-        tsResult.js.pipe(gulp.dest("dist"))
-    ]);
+    return devTS.src()
+        .pipe(sourcemaps.init())
+        .pipe(devTS())
+        .pipe(sourcemaps.write())
+        .pipe(gulp.dest("dist"));
 });
 
 gulp.task("minifyJS", ["typescript"], function () {

dist/linq4js.min.js

@@ -1,6 +1,6 @@
 {
   "name": "linq4js",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "Linq methods for JavaScript/TypeScript for working with Arrays",
   "main": "dist/linq4js.js",
   "typings": "dist/linq4js.d.ts",
@@ -35,6 +35,7 @@
     "gulp-jasmine": "^2.4.2",
     "gulp-jasmine-browser": "^1.7.1",
     "gulp-minify": "0.0.14",
+    "gulp-sourcemaps": "^2.4.1",
     "gulp-tslint": "^7.1.0",
     "gulp-typescript": "^3.1.4",
     "gulp-watch": "^4.3.11",

gulpfile.js

@@ -100,8 +100,9 @@ var Linq4JS;
         Helper.OrderCompareFunction = function (valueSelector, a, b, invert) {
             var value_a = valueSelector(a);
             var value_b = valueSelector(b);
-            var type = typeof value_a;
-            if (type === "string") {
+            var type_a = typeof value_a;
+            var type_b = typeof value_b;
+            if (type_a === "string" && type_a === type_b) {
                 var value_a_string = value_a;
                 value_a_string = value_a_string.toLowerCase();
                 var value_b_string = value_b;
@@ -116,12 +117,12 @@ var Linq4JS;
                     return 0;
                 }
             }
-            else if (type === "number") {
+            else if (type_a === "number" && type_a === type_b) {
                 var value_a_number = value_a;
                 var value_b_number = value_b;
                 return invert === true ? value_b_number - value_a_number : value_a_number - value_b_number;
             }
-            else if (type === "boolean") {
+            else if (type_a === "boolean" && type_a === type_b) {
                 var value_a_bool = value_a;
                 var value_b_bool = value_b;
                 if (value_a_bool === value_b_bool) {
@@ -137,7 +138,16 @@ var Linq4JS;
                 }
             }
             else {
-                throw new Error("Linq4JS: Cannot map type '" + type + "' for compare");
+                if (type_a === "undefined" && type_a === type_b) {
+                    return 0;
+                }
+                else if (type_a === "undefined") {
+                    return invert ? 1 : -1;
+                }
+                else if (type_b === "undefined") {
+                    return invert ? -1 : 1;
+                }
+                return 0;
             }
         };
         Helper.SplitCommand = function (command) {
@@ -221,7 +231,7 @@ Array.prototype.Add = function (object, generateId) {
         if (generateId === true) {
             var newIndex_1;
             var castedObject = object;
-            var last = that.LastOrDefault();
+            var last = that.Where(function (x) { return x._GeneratedId_ != null; }).OrderBy(function (x) { return x._GeneratedId_; }).LastOrDefault();
             if (last != null) {
                 newIndex_1 = last._GeneratedId_ != null ? last._GeneratedId_ : 1;
                 while (that.Any(function (x) {
@@ -673,7 +683,7 @@ Array.prototype.Select = function (selector) {
         var selectStatement = selectorWork.substr(selectorWork.indexOf("=>") + ("=>").length);
         if (selectStatement.match(/^\s*{.*}\s*$/) != null) {
             selectStatement = selectStatement.replace(/^\s*{(.*)}\s*$/, "$1");
-            var parts = selectStatement.split(",");
+            var parts = selectStatement.split(/,(?=(?:[^'"]*['"][^'"]*['"])*[^'"]*$)/g);
             var newContent = "";
             for (var i = 0; i < parts.length; i++) {
                 var part = parts[i];