@sme.up/ketchup 8.0.0 → 8.0.2

package/dist/collection/utils/filters/filters.js

@@ -1,6 +1,5 @@
 import { KupTagNames } from '../../types/GenericTypes';
 import { KupDatesFormats, KupDatesNormalize, } from '../../managers/kup-dates/kup-dates-declarations';
-import { formattedStringToCustomUnformattedStringTime, formattedStringToDefaultUnformattedStringTimestamp, formattedStringToUnformattedStringNumber, isValidFormattedStringNumber, isValidFormattedStringTime, stringToNumber, unformattedStringNumberToNumber, isNumber as isNumberThisString, } from '../utils';
 import { FilterInterval, FILTER_ANALIZER, } from './filters-declarations';
 const dom = document.documentElement;
 /**
@@ -52,8 +51,8 @@ export class Filters {
         : KupDatesFormats.ISO_TIME_WITHOUT_SECONDS)) {
         return newValue;
       }
-      if (isValidFormattedStringTime(value, manageSeconds)) {
-        return formattedStringToCustomUnformattedStringTime(value, manageSeconds
+      if (dom.ketchup.dates.isValidFormattedStringTime(value, manageSeconds)) {
+        return dom.ketchup.dates.formattedStringToCustomDateTime(value, manageSeconds
           ? KupDatesFormats.ISO_TIME
           : KupDatesFormats.ISO_TIME_WITHOUT_SECONDS, manageSeconds);
       }
@@ -62,13 +61,13 @@ export class Filters {
       if (dom.ketchup.dates.isValid(value, KupDatesFormats.ISO_DATE_TIME)) {
         return newValue;
       }
-      if (isValidFormattedStringTime(value, true)) {
-        return formattedStringToDefaultUnformattedStringTimestamp(value);
+      if (dom.ketchup.dates.isValidFormattedStringTime(value, true)) {
+        return dom.ketchup.dates.formattedStringToTimestampString(value);
       }
     }
     else if (dom.ketchup.objects.isNumber(smeupObj)) {
-      if (isValidFormattedStringNumber(value, smeupObj ? smeupObj.p : '')) {
-        return formattedStringToUnformattedStringNumber(value, smeupObj ? smeupObj.p : '');
+      if (dom.ketchup.math.isStringNumber(value, smeupObj ? smeupObj.p : '')) {
+        return dom.ketchup.math.formattedStringToNumberString(value, smeupObj ? smeupObj.p : '');
       }
     }
     return newValue;
@@ -190,12 +189,11 @@ export class Filters {
     }
     let checkByRegularExpression = true;
     if (dom.ketchup.objects.isNumber(obj)) {
-      value = unformattedStringNumberToNumber(value, obj ? obj.p : '');
-      let valueNumber = stringToNumber(value);
+      let valueNumber = dom.ketchup.math.numberifySafe(value, obj ? obj.p : '');
       if (from != '') {
-        if (isNumberThisString(from)) {
+        if (dom.ketchup.math.isNumber(from)) {
           checkByRegularExpression = false;
-          let fromNumber = stringToNumber(from);
+          let fromNumber = dom.ketchup.math.numberifySafe(from);
           if (valueNumber < fromNumber) {
             return false;
           }
@@ -205,9 +203,9 @@ export class Filters {
         }
       }
       if (to != '') {
-        if (isNumberThisString(to)) {
+        if (dom.ketchup.math.isNumber(to)) {
           checkByRegularExpression = false;
-          let toNumber = stringToNumber(to);
+          let toNumber = dom.ketchup.math.numberifySafe(to);
           if (valueNumber > toNumber) {
             return false;
           }

package/dist/collection/utils/utils.js

@@ -1,13 +1,4 @@
-import { KupDatesFormats, KupDatesNormalize, } from '../managers/kup-dates/kup-dates-declarations';
 const dom = document.documentElement;
-export var DateTimeFormatOptionsMonth;
-(function (DateTimeFormatOptionsMonth) {
-  DateTimeFormatOptionsMonth["NUMERIC"] = "numeric";
-  DateTimeFormatOptionsMonth["DIGIT2"] = "2-digit";
-  DateTimeFormatOptionsMonth["LONG"] = "long";
-  DateTimeFormatOptionsMonth["SHORT"] = "short";
-  DateTimeFormatOptionsMonth["NARROW"] = "narrow";
-})(DateTimeFormatOptionsMonth || (DateTimeFormatOptionsMonth = {}));
 export function identify(array) {
   if (array) {
     for (let i = 0; i < array.length; i++) {
@@ -15,443 +6,14 @@ export function identify(array) {
     }
   }
 }
-function getSeparator(locale, separatorType) {
-  const numberWithGroupAndDecimalSeparator = 1000.1;
-  return Intl.NumberFormat(locale)
-    .formatToParts(numberWithGroupAndDecimalSeparator)
-    .find((part) => part.type === separatorType).value;
-}
-export function getCurrentDateFormatFromBrowserLocale() {
-  const formatObj = new Intl.DateTimeFormat(dom.ketchup.dates.getLocale()).formatToParts(new Date());
-  let dateFormat = formatObj
-    .map((obj) => {
-    switch (obj.type) {
-      case 'day':
-        return 'DD';
-      case 'month':
-        return 'MM';
-      case 'year':
-        return 'YYYY';
-      default:
-        return obj.value;
-    }
-  })
-    .join('');
-  return dateFormat;
-}
-function getCurrentTimeFormatFromBrowserLocale(manageSeconds) {
-  const options = {
-    hour: '2-digit',
-    minute: '2-digit',
-    hour12: false,
-  };
-  if (manageSeconds == true) {
-    options.second = '2-digit';
-  }
-  const formatObj = new Intl.DateTimeFormat(dom.ketchup.dates.getLocale() + '-u-hc-h23', options).formatToParts(new Date());
-  let timeFormat = formatObj
-    .map((obj) => {
-    switch (obj.type) {
-      case 'hour':
-        return 'HH';
-      case 'minute':
-        return 'mm';
-      case 'second':
-        return 'ss';
-      default:
-        return obj.value;
-    }
-  })
-    .join('');
-  return timeFormat;
-}
 /**
- * @param value number as string, formatted by actual browser locale
- * @param type - type of number for calculate suffix
- * @returns true if number string in input is a valid number
+ * Fills a string with another string, eventually before
+ * @param {string} stringIn initial string
+ * @param {string} stringForFill string used for fill
+ * @param {number} finalLen final string length
+ * @param {boolean} addBefore flag for fill on left
+ * @returns the input string filled with stringForFill
  */
-export function isValidFormattedStringNumber(value, type) {
-  if (value == null || value.trim() == '') {
-    return false;
-  }
-  let tmpStr = formattedStringToUnformattedStringNumber(value, type);
-  if (isNumber(tmpStr)) {
-    return true;
-  }
-  return false;
-}
-export function isNumber(value) {
-  //return typeof value === 'number';
-  return !isNaN(value);
-}
-/**
- * @param input number as string, formatted by locale US, decimal separator . (like java decimal numbers)
- * @returns number
- **/
-export function stringToNumber(input) {
-  if (!input || input == null || input.trim() == '') {
-    input = '0';
-  }
-  return dom.ketchup.math.numberify(input);
-}
-/**
- * @param input number
- * @param decimals number of significant decimal digits for output
- * @returns number as string, formatted by actual browser locale
- **/
-export function numberToString(input, decimals) {
-  if (input == null) {
-    return '';
-  }
-  return _numberToString(input, decimals, dom.ketchup.dates.getLocale(), true);
-}
-/**
- * @param type - type of number for calculate suffix
- * @returns suffix for number, by type
- **/
-export function getNumericValueSuffixByType(type) {
-  type = type.toUpperCase();
-  let nstr = '';
-  if (type == 'P') {
-    nstr = ' %';
-  }
-  else if (type == 'VE') {
-    nstr = ' €';
-  }
-  else if (type == 'VL') {
-    nstr = ' £';
-  }
-  else if (type == 'VV') {
-    nstr = ' $';
-  }
-  return nstr;
-}
-/**
- * @param input number
- * @param decimals number of significant decimal digits for output
- * @param type - type of number for calculate suffix
- * @returns number as string, formatted by actual browser locale, with suffix by type
- **/
-export function numberToFormattedStringNumber(input, decimals, type) {
-  if (input == null || isNaN(input)) {
-    return '';
-  }
-  let nstr = numberToString(input, decimals);
-  nstr = nstr + getNumericValueSuffixByType(type);
-  return nstr;
-}
-/**
- * @param input number as string, formatted by locale US, decimal separator . (like java decimal numbers)
- * @param decimals number of significant decimal digits for output
- * @param type - type of number for calculate suffix
- * @returns number as string, formatted by actual browser locale, with suffix by type
- **/
-export function unformattedStringToFormattedStringNumber(input, decimals, type) {
-  return numberToFormattedStringNumber(stringToNumber(input), decimals, type);
-}
-/**
- * @param input number as string, formatted by actual browser locale
- * @param type - type of number for calculate suffix
- * @returns number as string, formatted by locale US, decimal separator . (like java decimal numbers), without group separator
- **/
-export function formattedStringToUnformattedStringNumber(input, type) {
-  return numberStringToNumberString(input, type, getDecimalSeparator(dom.ketchup.dates.getLocale()));
-}
-/**
- * @param input number as string, formatted by locale US, decimal separator . (like java decimal numbers), with group separator
- * @param type - type of number for calculate suffix
- * @returns number as string, formatted by locale US, decimal separator . (like java decimal numbers), without group separator
- **/
-export function unformattedStringNumberToNumber(input, type) {
-  return numberStringToNumberString(input, type, '.');
-}
-function numberStringToNumberString(input, type, decFmt) {
-  if (input == null || input.trim() == '') {
-    return '';
-  }
-  let originalInputValue = input;
-  let suffix = getNumericValueSuffixByType(type);
-  if (suffix != '') {
-    input = input.replace(suffix, '');
-  }
-  let regExpr = null;
-  if (decFmt == '.') {
-    regExpr = /,/g;
-  }
-  else {
-    regExpr = /\./g;
-  }
-  input = input.replace(regExpr, '');
-  if (decFmt != '.') {
-    input = input.replace(/,/g, '.');
-  }
-  if (dom.ketchup.math.numberify(input) == null ||
-    isNaN(dom.ketchup.math.numberify(input))) {
-    return originalInputValue;
-  }
-  let unf = stringToNumber(input);
-  return _numberToString(unf, -1, 'en-US', false);
-}
-export function getDecimalSeparator(locale) {
-  return getSeparator(locale, 'decimal');
-}
-function countDecimals(value) {
-  if (Math.floor(value) === value)
-    return 0;
-  let stringValue = value.toString().split('.')[1];
-  if (stringValue) {
-    return stringValue.length ? stringValue.length : 0;
-  }
-  else {
-    return 0;
-  }
-}
-export function _numberToString(input, decimals, locale, useGrouping) {
-  if (input == null) {
-    input = 0;
-  }
-  if (decimals == null || decimals == -1) {
-    decimals = countDecimals(input);
-  }
-  let n = Number(input);
-  let f = decimals > -1
-    ? {
-      minimumFractionDigits: decimals,
-      maximumFractionDigits: decimals,
-      useGrouping: useGrouping,
-    }
-    : { useGrouping: useGrouping };
-  return n.toLocaleString(locale, f);
-}
-/**
- * @param time time as Date object
- * @param manageSeconds flag to set seconds managing
- * @return time as string, formatted
- **/
-export function formatTime(time, manageSeconds) {
-  const options = {
-    hour: '2-digit',
-    minute: '2-digit',
-    hour12: false,
-  };
-  if (manageSeconds == true) {
-    options.second = '2-digit';
-  }
-  return time.toLocaleTimeString(dom.ketchup.dates.getLocale() + '-u-hc-h23', options);
-}
-/**
- * @param value time string, formatted by actual browser locale
- * @returns true if time string in input is a valid time
- */
-export function isValidFormattedStringTime(value, manageSeconds) {
-  let format = getCurrentTimeFormatFromBrowserLocale(manageSeconds);
-  return dom.ketchup.dates.isValid(value, format, true);
-}
-/**
- * @param value time as string, formatted by actual browser locale
- * @returns time as string, formatted ISO
- **/
-export function formattedStringToDefaultUnformattedStringTime(value) {
-  return formattedStringToCustomUnformattedStringTime(value, KupDatesFormats.ISO_TIME, true);
-}
-/**
- * @param value date/time as string, formatted by actual browser locale
- * @returns date/time as string, formatted ISO
- **/
-export function formattedStringToDefaultUnformattedStringTimestamp(value) {
-  return formattedStringToCustomUnformattedStringTime(value, KupDatesFormats.ISO_DATE_TIME, true);
-}
-/**
- * @param value time as string, formatted by actual browser locale
- * @param outputFormat time format to return
- * @param manageSeconds flag to set seconds managing
- * @returns time as string, formatted
- **/
-export function formattedStringToCustomUnformattedStringTime(value, outputFormat, manageSeconds) {
-  let inputFormat = getCurrentTimeFormatFromBrowserLocale(manageSeconds);
-  if (dom.ketchup.dates.isValid(value, inputFormat)) {
-    return dom.ketchup.dates.format(dom.ketchup.dates.normalize(value, KupDatesNormalize.TIME), outputFormat);
-  }
-  else {
-    return '';
-  }
-}
-/**
- * @param value time as string, formatted ISO
- * @param manageSeconds flag to set seconds managing
- * @param valueTimeFormat time format (default ISO)
- * @param customedFormat time format from smeupObject
- * @returns time as string, formatted by actual browser locale
- **/
-export function unformattedStringToFormattedStringTime(value, manageSeconds, customedFormat) {
-  const options = {
-    hour: '2-digit',
-    minute: '2-digit',
-    hour12: false,
-  };
-  if (manageSeconds == true) {
-    options.second = '2-digit';
-  }
-  let date = dom.ketchup.dates.toDate(dom.ketchup.dates.normalize(value, KupDatesNormalize.TIME));
-  return formatByCustomedOutputTimeFormat(value, date, options, customedFormat);
-}
-function formatByCustomedOutputTimeFormat(valueStr, date, options, customedFormat) {
-  if (customedFormat == null) {
-    return date.toLocaleTimeString(dom.ketchup.dates.getLocale() + '-u-hc-h23', options);
-  }
-  switch (customedFormat) {
-    case 'I13': {
-      //hh:mm
-      break;
-    }
-    case 'I12': {
-      //hh:mm:ss
-      break;
-    }
-    case 'I11': {
-      //???
-      //hh:dddd
-      //return moment(date).format('HH:DDDD');
-      return valueStr;
-    }
-    case 'I14': {
-      //???
-      //sssss
-      //return moment(date).format('SSSSS');
-      return valueStr;
-    }
-    case 'I1H': {
-      //???
-      //Ora,Cen/Min HH,xx
-      return valueStr;
-    }
-    case 'I1M': {
-      //???
-      //Min,Cen/Sec  MMMM,xx
-      return valueStr;
-    }
-    case 'I21': {
-      //???
-      //Giorni,(4 decim)
-      return valueStr;
-    }
-    case 'I22': {
-      //???
-      //Ore,(4 decim)
-      return valueStr;
-    }
-    case 'I23': {
-      //???
-      //Minuti,(4 decim)
-      return valueStr;
-    }
-    case 'I24': {
-      //???
-      //Secondi
-      return valueStr;
-    }
-    case 'I2H': {
-      //???
-      //Ora,Cen/Min HHHH,xx
-      return valueStr;
-    }
-    case 'I2D': {
-      //???
-      //Ore Minuti Secondi HHMMS
-      return valueStr;
-    }
-    case 'I2M': {
-      //???
-      //Min,Cen/Sec MMMM,xx
-      return valueStr;
-    }
-  }
-  return date.toLocaleTimeString(dom.ketchup.dates.getLocale() + '-u-hc-h23', options);
-}
-/**
- * @param value date/time as string, formatted ISO
- * @param valueDateFormat date/time format (default ISO)
- * @returns date/time as string, formatted by actual browser locale
- **/
-export function unformattedStringToFormattedStringTimestamp(value) {
-  const options = {
-    day: '2-digit',
-    month: '2-digit',
-    year: 'numeric',
-    hour: '2-digit',
-    minute: '2-digit',
-    second: '2-digit',
-    hour12: false,
-  };
-  let date = dom.ketchup.dates.toDate(dom.ketchup.dates.normalize(value, KupDatesNormalize.TIMESTAMP));
-  return date.toLocaleString(dom.ketchup.dates.getLocale() + '-u-hc-h23', options);
-}
-export function getMonthAsStringByLocale(month, format) {
-  if (month == null) {
-    return '';
-  }
-  const dateTmp = new Date();
-  dateTmp.setDate(1);
-  dateTmp.setMonth(month - 1);
-  const options = {
-    month: format,
-  };
-  const dateTimeFormat = new Intl.DateTimeFormat(dom.ketchup.dates.getLocale(), options);
-  return dateTimeFormat.format(dateTmp);
-}
-export function getMonthsAsStringByLocale(format) {
-  if (format == null || format.trim() == '') {
-    format = DateTimeFormatOptionsMonth.LONG;
-  }
-  var months = [];
-  for (var i = 0; i < 12; i++) {
-    months[i] = getMonthAsStringByLocale(i + 1, format);
-  }
-  return months;
-}
-export function getDayAsStringByLocale(date) {
-  if (date == null) {
-    return '';
-  }
-  const options = {
-    weekday: 'narrow',
-    /** weekday: 'narrow' 'short' 'long' */
-  };
-  const dateTimeFormat = new Intl.DateTimeFormat(dom.ketchup.dates.getLocale(), options);
-  return dateTimeFormat.format(date);
-}
-function firstDayThisWeek(firstDayIndex) {
-  var d = new Date();
-  const day = d.getDay();
-  // dayIndex0
-  d.setDate(d.getDate() - day);
-  // dayIndexX
-  d.setDate(d.getDate() + firstDayIndex);
-  return d;
-}
-const offsetDate = (base, count) => {
-  const date = new Date(base);
-  date.setDate(base.getDate() + count);
-  return date;
-};
-function thisWeek(firstDayIndex) {
-  const firstDay = firstDayThisWeek(firstDayIndex);
-  return {
-    startDate: firstDay,
-    endDate: offsetDate(firstDay, 6),
-  };
-}
-export function getDaysOfWeekAsStringByLocale(firstDayIndex) {
-  var thisWeekDays = thisWeek(firstDayIndex);
-  var monday = thisWeekDays.startDate;
-  var days = [];
-  for (var i = 0; i < 7; i++) {
-    var date = new Date(monday.toISOString());
-    date.setDate(date.getDate() + i);
-    days[i] = getDayAsStringByLocale(date);
-  }
-  return days;
-}
 export function fillString(stringIn, stringForFill, finalLen, addBefore) {
   let initSize = stringIn.length;
   let stringOut = '';
@@ -504,3 +66,15 @@ export function setProps(comp, list, props) {
     }
   }
 }
+/**
+ * Creates a regular expression object, from a string un-escaped
+ * @param s string to use for create regular expression (not escaped)
+ * @param flags flags used for the regular expression
+ * @returns the regular expression object
+ */
+export function getRegExpFromString(s, flags) {
+  return new RegExp(escapeRegExp(s), flags);
+}
+function escapeRegExp(s) {
+  return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matched string
+}