@singularsystems/neo-core 1.0.16 → 1.0.17

package/dist/Dates/DateUtils.d.ts

@@ -18,7 +18,7 @@ export default class DateUtils {
      * @param dateString The string to parse
      * @param format The format string. This is only used to get the order of d/m/y
      * @param requireAllParts True if day month and year must be specified
-     * @param refDate Reference date. E.g. if the year is ommitted in the date string, then the year from the reference date will be used. Today is used if no reference date is supplied.
+     * @param refDate Reference date. E.g. if the year is omitted in the date string, then the year from the reference date will be used. Today is used if no reference date is supplied.
     */
     static tryParse(dateString: string, format?: string, requireAllParts?: boolean, refDate?: Date): Date | null;
     static min(date1: Date, date2: Date): Date;

package/dist/Dates/DateUtils.js

@@ -70,9 +70,10 @@ var DateUtils = /** @class */ (function () {
      * @param dateString The string to parse
      * @param format The format string. This is only used to get the order of d/m/y
      * @param requireAllParts True if day month and year must be specified
-     * @param refDate Reference date. E.g. if the year is ommitted in the date string, then the year from the reference date will be used. Today is used if no reference date is supplied.
+     * @param refDate Reference date. E.g. if the year is omitted in the date string, then the year from the reference date will be used. Today is used if no reference date is supplied.
     */
     DateUtils.tryParse = function (dateString, format, requireAllParts, refDate) {
+        var _a;
         if (format === void 0) { format = ""; }
         if (requireAllParts === void 0) { requireAllParts = false; }
         if (!dateString)
@@ -80,38 +81,36 @@ var DateUtils = /** @class */ (function () {
         if (!format)
             format = DateUtils.defaultFormatString;
         var returnDate = !refDate ? new Date() : new Date(refDate);
+        var timeString = "", isPM = false;
         // Find the position of d m and y in the format string.
-        var d = format.indexOf('d'), m = format.indexOf('M'), y = format.indexOf('y'), Extra = 100;
-        // Check for time component.
-        var timeString = "";
-        var isPM = false;
-        var timePos = dateString.indexOf(":");
-        if (timePos == -1) {
-            timePos = dateString.toUpperCase().indexOf("PM");
+        var d = format.indexOf('d'), m = format.indexOf('M'), y = format.indexOf('y'), h = format.indexOf("H"), extra = 100;
+        var expectedDateParts = (d < 0 ? 0 : 1) + (m < 0 ? 0 : 1) + (y < 0 ? 0 : 1);
+        // Replace common separators in the date string with /
+        dateString = dateString.replace(/-/g, '/').replace(/ /g, '/').replace(/\xA0/g, '/');
+        // If the user doesn't put in separators, e.g. 0103, then add them to make the string value 01/03
+        if ((d == 0 || m == 0) && dateString.indexOf('/') == -1 && dateString.length >= 4 && !isNaN(+dateString)) {
+            dateString = dateString.substring(0, 2) + '/' + dateString.substring(2, 4) + (dateString.length == 8 || dateString.length == 6 ? '/' + dateString.substring(4, dateString.length) : '');
         }
-        if (timePos == -1) {
-            timePos = dateString.toUpperCase().indexOf("AM");
-        }
-        if (timePos >= 1) {
-            timePos = Math.max(0, timePos - (dateString[timePos - 1] == " " ? 3 : 2));
-            timeString = dateString.substring(timePos);
-            dateString = dateString.substring(0, timePos);
-            isPM = timeString.toUpperCase().indexOf("PM") > 0;
-            timeString = timeString.replace(/a/gi, "").replace(/p/gi, "").replace(/m/gi, "").replace(/ /gi, "");
+        var parts = dateString.split("/");
+        if (parts.length > expectedDateParts && (h >= 0)) {
+            timeString = parts.pop();
+            var pmPos = (_a = /[ap]m/i.exec(timeString)) === null || _a === void 0 ? void 0 : _a.index;
+            if (pmPos !== undefined) {
+                isPM = timeString.toUpperCase().indexOf("PM") >= 0;
+                if (pmPos === 0) {
+                    timeString = parts.pop();
+                }
+                else {
+                    timeString = timeString.substring(0, pmPos);
+                }
+            }
         }
         // Date component
-        if (d >= 0 || m >= 0 || y >= 0) {
+        if (expectedDateParts > 0) {
             // Add missing d/m/y on the end.
-            d = d == -1 ? Extra++ : d;
-            m = m == -1 ? Extra++ : m;
-            y = y == -1 ? Extra++ : y;
-            // Replace common separators in the date string with /
-            var str = dateString.replace(/-/g, '/').replace(/ /g, '/').replace(/\xA0/g, '/');
-            // If the user doesnt put in separators, e.g. 0103, then add them to make the string value 01/03
-            if ((d == 0 || m == 0) && str.indexOf('/') == -1 && str.length >= 4 && !isNaN(+str)) {
-                str = str.substring(0, 2) + '/' + str.substring(2, 4) + (str.length == 8 || str.length == 6 ? '/' + str.substring(4, str.length) : '');
-            }
-            var parts = str.split('/');
+            d = d == -1 ? extra++ : d;
+            m = m == -1 ? extra++ : m;
+            y = y == -1 ? extra++ : y;
             if (requireAllParts && parts.length < 3)
                 return null;
             // if format is dd mmm yyyy, and the user omits the dd, then add 1st day.
@@ -141,6 +140,14 @@ var DateUtils = /** @class */ (function () {
         }
         // Get time component.
         if (timeString) {
+            if (timeString.indexOf(":") < 0) {
+                if (timeString.length >= 5) {
+                    timeString = timeString.substring(0, timeString.length - 4) + ":" + timeString.substring(timeString.length - 4, timeString.length - 2) + ":" + timeString.substring(timeString.length - 2);
+                }
+                else if (timeString.length >= 3) {
+                    timeString = timeString.substring(0, timeString.length - 2) + ":" + timeString.substring(timeString.length - 2);
+                }
+            }
             var time = new Date(0);
             time.setHours.apply(time, timeString.split(":").map(function (s) { return parseInt(s); }));
             if (isNaN(time)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@singularsystems/neo-core",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "description": "Core functionality for the Neo client library",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",