@cosmotech/core 1.19.1 → 2.0.0

package/CHANGELOG.md

@@ -1,3 +1,19 @@
+## **2.0.0** <sub><sup>2025-01-23 (ba70eef...4d0f1df)</sup></sub>
+
+### Features
+
+- add min & max validation in ValidationUtils and AgGridUtils file uploads ([c7f0b3d](https://github.com/Cosmo-Tech/webapp-component-core/commit/c7f0b3d))
+
+### Bug Fixes
+
+- fix user email retrieved from keycloak accounts ([ba70eef](https://github.com/Cosmo-Tech/webapp-component-core/commit/ba70eef))
+- remove forbidden characters constraint in scenario names ([9b67422](https://github.com/Cosmo-Tech/webapp-component-core/commit/9b67422))
+- modify isValid function to return error structures on validation fail ([ce4ba32](https://github.com/Cosmo-Tech/webapp-component-core/commit/ce4ba32))
+
+### BREAKING CHANGES
+
+- the function isValid now returns an Error object when the validation failed, or true if it succeeded. The Error object contains three fields: summary, context and location (the last one is set to null by the isValid function).
+
 ## **1.19.1** <sub><sup>2024-11-07 (6023cdc...6023cdc)</sup></sub>
 
 - update dependencies

package/dist/index.cjs.js

@@ -13196,6 +13196,34 @@ var DateUtils = {
 
 // Copyright (c) Cosmo Tech.
 // Licensed under the MIT license.
+
+let Error$1 = class Error {
+  constructor(summary, loc, context) {
+    this.summary = summary;
+    this.loc = loc;
+    this.context = context;
+  }
+  toString() {
+    return "Summary: ".concat(this.summary, "\n") + "Loc: ".concat(this.loc, "\n") + "Context: ".concat(this.context);
+  }
+};
+
+// Copyright (c) Cosmo Tech.
+// Licensed under the MIT license.
+var forgeTypeError = (value, type, options) => {
+  var expected;
+  if (type === 'enum') expected = "Expected values: [".concat(options.enumValues.join(), "]");else if (type === 'date') expected = "Expected format: ".concat(options === null || options === void 0 ? void 0 : options.dateFormat);
+  var error = new Error$1("Incorrect ".concat(type, " value"), null, "Incorrect value: \"".concat(value, "\" for type ").concat(type));
+  if (expected) error.context += '\n' + expected;
+  return error;
+};
+var forgeConfigError = errorContext => {
+  console.warn("Configuration error: ".concat(errorContext));
+  return {
+    summary: 'Configuration error',
+    context: errorContext
+  };
+};
 var isBool = dataStr => {
   return validator.isBoolean(dataStr, {
     loose: true
@@ -13216,6 +13244,41 @@ var isNumber = dataStr => {
 var isString = data => {
   return typeof data === 'string';
 };
+var isInRange = (value, minValue, maxValue) => {
+  if (value == null) return null;
+  var errorMessage;
+  if (minValue != null && value < minValue) errorMessage = "Value \"".concat(value, "\" should be greater than ").concat(minValue);
+  if (maxValue != null && value > maxValue) errorMessage = "Value \"".concat(value, "\" should be less than ").concat(maxValue);
+  if (errorMessage == null) return true;
+  return new Error$1("Value out of range", null, errorMessage);
+};
+var castToDate = (dateOrStrValue, dateFormat) => {
+  if (dateOrStrValue == null) return;
+  if (dateOrStrValue instanceof Date) return dateOrStrValue;
+  if (typeof dateOrStrValue !== 'string') {
+    console.warn("Configuration error: ".concat(dateOrStrValue, " is not a string nor a Date."));
+    return;
+  }
+  if (!isDate(dateOrStrValue, dateFormat)) {
+    console.warn("Configuration error: ".concat(forgeTypeError(dateOrStrValue, 'date', {
+      dateFormat
+    }).context, "."));
+    return;
+  }
+  return DateUtils.parse(dateOrStrValue, dateFormat);
+};
+var isDateInRange = (value, minValue, maxValue, dateFormat) => {
+  var minDate = castToDate(minValue, dateFormat);
+  var maxDate = castToDate(maxValue, dateFormat);
+  var format = DateUtils.format;
+  if (value == null) return null;
+  if (dateFormat == null) return forgeConfigError("Missing option dateFormat, can't perform date validation.");
+  var errorMessage;
+  if (minDate != null && value < minDate) errorMessage = "Value \"".concat(format(value, dateFormat), "\" should be greater than ").concat(format(minDate, dateFormat));
+  if (maxDate != null && value > maxDate) errorMessage = "Value \"".concat(format(value, dateFormat), "\" should be less than ").concat(format(maxDate, dateFormat));
+  if (errorMessage == null) return true;
+  return new Error$1("Value out of range", null, errorMessage);
+};
 var isValid = function isValid(dataStr, type, options) {
   var canBeEmpty = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   if (canBeEmpty && dataStr === '') {
@@ -13223,28 +13286,27 @@ var isValid = function isValid(dataStr, type, options) {
   }
   switch (type) {
     case 'bool':
-      return isBool(dataStr);
+      return isBool(dataStr) || forgeTypeError(dataStr, type, options);
     case 'date':
-      if (!options.dateFormat) {
-        console.error("Missing option dateFormat, can't perform date validation.");
-        return false;
+      {
+        if (!(options !== null && options !== void 0 && options.dateFormat)) return forgeConfigError("Missing option dateFormat, can't perform date validation.");
+        if (!isDate(dataStr, options === null || options === void 0 ? void 0 : options.dateFormat)) return forgeTypeError(dataStr, type, options);
+        var valueAsDate = DateUtils.parse(dataStr, options === null || options === void 0 ? void 0 : options.dateFormat);
+        return isDateInRange(valueAsDate, options === null || options === void 0 ? void 0 : options.minValue, options === null || options === void 0 ? void 0 : options.maxValue, options === null || options === void 0 ? void 0 : options.dateFormat);
       }
-      return isDate(dataStr, options.dateFormat);
     case 'enum':
-      if (!options.enumValues) {
-        console.error("Missing option enumValues, can't perform enum validation.");
-        return false;
-      }
-      return isEnum(dataStr, options.enumValues);
+      if (!options.enumValues) return forgeConfigError("Missing option enumValues, can't perform enum validation.");
+      return isEnum(dataStr, options.enumValues) || forgeTypeError(dataStr, type, options);
     case 'int':
-      return isInt(dataStr);
+      if (!isInt(dataStr)) return forgeTypeError(dataStr, type, options);
+      return isInRange(Number(dataStr), options === null || options === void 0 ? void 0 : options.minValue, options === null || options === void 0 ? void 0 : options.maxValue);
     case 'number':
-      return isNumber(dataStr);
+      if (!isNumber(dataStr)) return forgeTypeError(dataStr, type, options);
+      return isInRange(Number(dataStr), options === null || options === void 0 ? void 0 : options.minValue, options === null || options === void 0 ? void 0 : options.maxValue);
     case 'string':
-      return isString(dataStr);
+      return isString(dataStr) || forgeTypeError(dataStr, type, options);
     default:
-      console.error("Unknown type \"".concat(type, "\", can't perform type validation."));
-      return false;
+      return forgeConfigError("Unknown type \"".concat(type, "\", can't perform type validation."));
   }
 };
 var ValidationUtils = {
@@ -13256,20 +13318,6 @@ var ValidationUtils = {
   isValid
 };
 
-// Copyright (c) Cosmo Tech.
-// Licensed under the MIT license.
-
-let Error$1 = class Error {
-  constructor(summary, loc, context) {
-    this.summary = summary;
-    this.loc = loc;
-    this.context = context;
-  }
-  toString() {
-    return "Summary: ".concat(this.summary, "\n") + "Loc: ".concat(this.loc, "\n") + "Context: ".concat(this.context);
-  }
-};
-
 var dist = {};
 
 var CSV = {};
@@ -41554,15 +41602,6 @@ var _buildNumberColumnsError = (rowLineNumber, expectedCols, row) => {
   var errorContext = "".concat(errorSummary, " (").concat(errorLoc, ") : Expected ").concat(expectedColsCount, " fields, found ").concat(row.length, "\n") + "Expected data format : \"".concat(expectedColsName, "\"\n") + "Incorrect Row : \"".concat(row, "\"");
   return new Error$1(errorSummary, errorLoc, errorContext);
 };
-var _buildTypeError = (type, rowLineNumber, colIndex, colsData, value, expected) => {
-  var errorSummary = "Incorrect ".concat(type, " value");
-  var errorLoc = "Line ".concat(rowLineNumber, ", Column ").concat(colIndex + 1, " (\"").concat(colsData[colIndex].field, "\")");
-  var errorContext = "".concat(errorSummary, " (").concat(errorLoc, ")\n") + "Incorrect value : \"".concat(value, "\" for type ").concat(type);
-  if (!expected || expected.length === 0) {
-    return new Error$1(errorSummary, errorLoc, errorContext);
-  }
-  return new Error$1(errorSummary, errorLoc, errorContext + '\n' + expected);
-};
 var DEFAULT_CSV_EXPORT_OPTIONS = {
   colSep: ',',
   dateFormat: 'yyyy-MM-dd',
@@ -41579,15 +41618,6 @@ var _forgeColumnsCountError = (row, rowLineNumber, expectedCols, errors) => {
   });
   if (row.length !== expectedCols.length) errors.push(_buildNumberColumnsError(rowLineNumber, expectedCols, row));
 };
-var _forgeTypeError = (value, rowLineNumber, type, options, colsData, colIndex) => {
-  var expected = '';
-  if (type === 'enum') {
-    expected = "Expected values: [".concat(options.enumValues.join(), "]");
-  } else if (type === 'date') {
-    expected = "Expected format: ".concat(options.dateFormat);
-  }
-  return _buildTypeError(type, rowLineNumber, colIndex, colsData, value, expected);
-};
 var _getColTypeFromTypeArray = typeArray => {
   if (!typeArray || typeArray.length === 0) {
     return 'string'; // Fall back to default type
@@ -41615,16 +41645,23 @@ var _validateFormat = (rows, hasHeader, cols, options) => {
       if (colIndex < knownColsCount) {
         var colType = colsData[colIndex].type;
         if (colType && rowCell !== undefined) {
-          var _colsData$colIndex$en, _colsData$colIndex, _colsData$colIndex2, _ref, _colsData$colIndex$ac, _colsData$colIndex$ce;
+          var _colsData$colIndex$en, _colsData$colIndex, _colsData$colIndex2, _colsData$colIndex3, _colsData$colIndex4, _ref, _colsData$colIndex$ac, _colsData$colIndex$ce;
           // use of cellEditorParams is deprecated
-          var enumValues = (_colsData$colIndex$en = (_colsData$colIndex = colsData[colIndex]) === null || _colsData$colIndex === void 0 ? void 0 : _colsData$colIndex.enumValues) !== null && _colsData$colIndex$en !== void 0 ? _colsData$colIndex$en : (_colsData$colIndex2 = colsData[colIndex]) === null || _colsData$colIndex2 === void 0 || (_colsData$colIndex2 = _colsData$colIndex2.cellEditorParams) === null || _colsData$colIndex2 === void 0 ? void 0 : _colsData$colIndex2.enumValues;
           var colOptions = _objectSpread2(_objectSpread2({}, options), {}, {
-            enumValues
+            enumValues: (_colsData$colIndex$en = (_colsData$colIndex = colsData[colIndex]) === null || _colsData$colIndex === void 0 ? void 0 : _colsData$colIndex.enumValues) !== null && _colsData$colIndex$en !== void 0 ? _colsData$colIndex$en : (_colsData$colIndex2 = colsData[colIndex]) === null || _colsData$colIndex2 === void 0 || (_colsData$colIndex2 = _colsData$colIndex2.cellEditorParams) === null || _colsData$colIndex2 === void 0 ? void 0 : _colsData$colIndex2.enumValues,
+            minValue: (_colsData$colIndex3 = colsData[colIndex]) === null || _colsData$colIndex3 === void 0 ? void 0 : _colsData$colIndex3.minValue,
+            maxValue: (_colsData$colIndex4 = colsData[colIndex]) === null || _colsData$colIndex4 === void 0 ? void 0 : _colsData$colIndex4.maxValue
           });
           var acceptsEmptyFields = // use of cellEditorParams is deprecated
           (_ref = (_colsData$colIndex$ac = colsData[colIndex].acceptsEmptyFields) !== null && _colsData$colIndex$ac !== void 0 ? _colsData$colIndex$ac : (_colsData$colIndex$ce = colsData[colIndex].cellEditorParams) === null || _colsData$colIndex$ce === void 0 ? void 0 : _colsData$colIndex$ce.acceptsEmptyFields) !== null && _ref !== void 0 ? _ref : false;
-          if (!ValidationUtils.isValid(rowCell, colType, colOptions, acceptsEmptyFields)) {
-            errors.push(_forgeTypeError(rowCell, rowIndex + 1, colType, colOptions, colsData, colIndex));
+          var validationResult = ValidationUtils.isValid(rowCell, colType, colOptions, acceptsEmptyFields);
+          if (validationResult !== true) {
+            var {
+              summary: errorSummary,
+              context: errorContext
+            } = validationResult;
+            var errorLoc = "Line ".concat(rowIndex + 1, ", Column ").concat(colIndex + 1, " (\"").concat(colsData[colIndex].field, "\")");
+            errors.push(new Error$1(errorSummary, errorLoc, errorContext));
           }
         }
       }
@@ -57982,13 +58019,15 @@ var acquireTokens = /*#__PURE__*/function () {
 }();
 var handleResponse = response => {
   if (response != null) {
+    var _account$idTokenClaim, _account$idTokenClaim2;
     var account = response.account;
     _updateTokensInStorage(response);
     writeToStorage('authIdTokenPopup', response.idToken);
     writeToStorage('authAuthenticated', 'true');
     writeToStorage('authAccountId', account.homeAccountId);
+    writeToStorage('authEmail', (_account$idTokenClaim = account.idTokenClaims) === null || _account$idTokenClaim === void 0 ? void 0 : _account$idTokenClaim.email);
     authData.accountId = account.homeAccountId;
-    authData.userEmail = account.username; // In MSAL account data, username property contains user email
+    authData.userEmail = (_account$idTokenClaim2 = account.idTokenClaims) === null || _account$idTokenClaim2 === void 0 ? void 0 : _account$idTokenClaim2.email;
     authData.username = account.name;
     authData.userId = account.localAccountId;
     redirectOnAuthSuccess();
@@ -58014,6 +58053,7 @@ var signOut = () => {
   clearFromStorage('authIdToken');
   clearFromStorage('authAccessToken');
   clearFromStorage('authAccountId');
+  clearFromStorage('authEmail');
   writeToStorage('authAuthenticated', 'false');
   var logoutRequest = {
     account: msalApp.getAccountByHomeId((_authData$accountId = authData.accountId) !== null && _authData$accountId !== void 0 ? _authData$accountId : accountId),
@@ -58105,10 +58145,10 @@ var refreshTokens = /*#__PURE__*/function () {
   };
 }();
 var getUserEmail = () => {
-  var _authData$userEmail, _msalApp$getAllAccoun2;
+  var _ref6, _readFromStorage, _msalApp$getAllAccoun2;
   if (!checkInit()) return;
   // Note: account data from MSAL seems to contain user email in the 'username' property
-  return (_authData$userEmail = authData === null || authData === void 0 ? void 0 : authData.userEmail) !== null && _authData$userEmail !== void 0 ? _authData$userEmail : (_msalApp$getAllAccoun2 = msalApp.getAllAccounts()) === null || _msalApp$getAllAccoun2 === void 0 || (_msalApp$getAllAccoun2 = _msalApp$getAllAccoun2[0]) === null || _msalApp$getAllAccoun2 === void 0 ? void 0 : _msalApp$getAllAccoun2.username;
+  return (_ref6 = (_readFromStorage = readFromStorage('authEmail')) !== null && _readFromStorage !== void 0 ? _readFromStorage : authData === null || authData === void 0 ? void 0 : authData.userEmail) !== null && _ref6 !== void 0 ? _ref6 : (_msalApp$getAllAccoun2 = msalApp.getAllAccounts()) === null || _msalApp$getAllAccoun2 === void 0 || (_msalApp$getAllAccoun2 = _msalApp$getAllAccoun2[0]) === null || _msalApp$getAllAccoun2 === void 0 ? void 0 : _msalApp$getAllAccoun2.username;
 };
 var getUserName = () => {
   var _authData$name, _msalApp$getAllAccoun3;
@@ -58168,11 +58208,6 @@ var DatasetUtils = {
   getDatasetNames
 };
 
-// Copyright (c) Cosmo Tech.
-// Licensed under the MIT license.
-
-var NAME_VALIDATOR = /^[a-zA-Z0-9][\w\s.-]*$/;
-
 // Copyright (c) Cosmo Tech.
 // Licensed under the MIT license.
 var scenarioExistsInList = (scenarioName, scenarioList) => {
@@ -58192,15 +58227,8 @@ var scenarioExistsInTree = (scenarioName, scenarioTree) => {
 };
 var scenarioNameIsValid = (scenarioName, scenarioList) => {
   scenarioName = scenarioName.trimEnd();
-  if (scenarioName.length === 0) {
-    return 'emptyScenarioName';
-  } else {
-    if (scenarioName.match(NAME_VALIDATOR) === null) {
-      return 'forbiddenCharsInScenarioName';
-    } else if (scenarioExistsInList(scenarioName, scenarioList)) {
-      return 'existingScenarioName';
-    }
-  }
+  if (scenarioName.length === 0) return 'emptyScenarioName';
+  if (scenarioExistsInList(scenarioName, scenarioList)) return 'existingScenarioName';
   return null;
 };
 var getScenarioTree = (scenarioList, compareFn) => {

package/dist/index.esm.js

@@ -13194,6 +13194,34 @@ var DateUtils = {
 
 // Copyright (c) Cosmo Tech.
 // Licensed under the MIT license.
+
+let Error$1 = class Error {
+  constructor(summary, loc, context) {
+    this.summary = summary;
+    this.loc = loc;
+    this.context = context;
+  }
+  toString() {
+    return "Summary: ".concat(this.summary, "\n") + "Loc: ".concat(this.loc, "\n") + "Context: ".concat(this.context);
+  }
+};
+
+// Copyright (c) Cosmo Tech.
+// Licensed under the MIT license.
+var forgeTypeError = (value, type, options) => {
+  var expected;
+  if (type === 'enum') expected = "Expected values: [".concat(options.enumValues.join(), "]");else if (type === 'date') expected = "Expected format: ".concat(options === null || options === void 0 ? void 0 : options.dateFormat);
+  var error = new Error$1("Incorrect ".concat(type, " value"), null, "Incorrect value: \"".concat(value, "\" for type ").concat(type));
+  if (expected) error.context += '\n' + expected;
+  return error;
+};
+var forgeConfigError = errorContext => {
+  console.warn("Configuration error: ".concat(errorContext));
+  return {
+    summary: 'Configuration error',
+    context: errorContext
+  };
+};
 var isBool = dataStr => {
   return validator.isBoolean(dataStr, {
     loose: true
@@ -13214,6 +13242,41 @@ var isNumber = dataStr => {
 var isString = data => {
   return typeof data === 'string';
 };
+var isInRange = (value, minValue, maxValue) => {
+  if (value == null) return null;
+  var errorMessage;
+  if (minValue != null && value < minValue) errorMessage = "Value \"".concat(value, "\" should be greater than ").concat(minValue);
+  if (maxValue != null && value > maxValue) errorMessage = "Value \"".concat(value, "\" should be less than ").concat(maxValue);
+  if (errorMessage == null) return true;
+  return new Error$1("Value out of range", null, errorMessage);
+};
+var castToDate = (dateOrStrValue, dateFormat) => {
+  if (dateOrStrValue == null) return;
+  if (dateOrStrValue instanceof Date) return dateOrStrValue;
+  if (typeof dateOrStrValue !== 'string') {
+    console.warn("Configuration error: ".concat(dateOrStrValue, " is not a string nor a Date."));
+    return;
+  }
+  if (!isDate(dateOrStrValue, dateFormat)) {
+    console.warn("Configuration error: ".concat(forgeTypeError(dateOrStrValue, 'date', {
+      dateFormat
+    }).context, "."));
+    return;
+  }
+  return DateUtils.parse(dateOrStrValue, dateFormat);
+};
+var isDateInRange = (value, minValue, maxValue, dateFormat) => {
+  var minDate = castToDate(minValue, dateFormat);
+  var maxDate = castToDate(maxValue, dateFormat);
+  var format = DateUtils.format;
+  if (value == null) return null;
+  if (dateFormat == null) return forgeConfigError("Missing option dateFormat, can't perform date validation.");
+  var errorMessage;
+  if (minDate != null && value < minDate) errorMessage = "Value \"".concat(format(value, dateFormat), "\" should be greater than ").concat(format(minDate, dateFormat));
+  if (maxDate != null && value > maxDate) errorMessage = "Value \"".concat(format(value, dateFormat), "\" should be less than ").concat(format(maxDate, dateFormat));
+  if (errorMessage == null) return true;
+  return new Error$1("Value out of range", null, errorMessage);
+};
 var isValid = function isValid(dataStr, type, options) {
   var canBeEmpty = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   if (canBeEmpty && dataStr === '') {
@@ -13221,28 +13284,27 @@ var isValid = function isValid(dataStr, type, options) {
   }
   switch (type) {
     case 'bool':
-      return isBool(dataStr);
+      return isBool(dataStr) || forgeTypeError(dataStr, type, options);
     case 'date':
-      if (!options.dateFormat) {
-        console.error("Missing option dateFormat, can't perform date validation.");
-        return false;
+      {
+        if (!(options !== null && options !== void 0 && options.dateFormat)) return forgeConfigError("Missing option dateFormat, can't perform date validation.");
+        if (!isDate(dataStr, options === null || options === void 0 ? void 0 : options.dateFormat)) return forgeTypeError(dataStr, type, options);
+        var valueAsDate = DateUtils.parse(dataStr, options === null || options === void 0 ? void 0 : options.dateFormat);
+        return isDateInRange(valueAsDate, options === null || options === void 0 ? void 0 : options.minValue, options === null || options === void 0 ? void 0 : options.maxValue, options === null || options === void 0 ? void 0 : options.dateFormat);
       }
-      return isDate(dataStr, options.dateFormat);
     case 'enum':
-      if (!options.enumValues) {
-        console.error("Missing option enumValues, can't perform enum validation.");
-        return false;
-      }
-      return isEnum(dataStr, options.enumValues);
+      if (!options.enumValues) return forgeConfigError("Missing option enumValues, can't perform enum validation.");
+      return isEnum(dataStr, options.enumValues) || forgeTypeError(dataStr, type, options);
     case 'int':
-      return isInt(dataStr);
+      if (!isInt(dataStr)) return forgeTypeError(dataStr, type, options);
+      return isInRange(Number(dataStr), options === null || options === void 0 ? void 0 : options.minValue, options === null || options === void 0 ? void 0 : options.maxValue);
     case 'number':
-      return isNumber(dataStr);
+      if (!isNumber(dataStr)) return forgeTypeError(dataStr, type, options);
+      return isInRange(Number(dataStr), options === null || options === void 0 ? void 0 : options.minValue, options === null || options === void 0 ? void 0 : options.maxValue);
     case 'string':
-      return isString(dataStr);
+      return isString(dataStr) || forgeTypeError(dataStr, type, options);
     default:
-      console.error("Unknown type \"".concat(type, "\", can't perform type validation."));
-      return false;
+      return forgeConfigError("Unknown type \"".concat(type, "\", can't perform type validation."));
   }
 };
 var ValidationUtils = {
@@ -13254,20 +13316,6 @@ var ValidationUtils = {
   isValid
 };
 
-// Copyright (c) Cosmo Tech.
-// Licensed under the MIT license.
-
-let Error$1 = class Error {
-  constructor(summary, loc, context) {
-    this.summary = summary;
-    this.loc = loc;
-    this.context = context;
-  }
-  toString() {
-    return "Summary: ".concat(this.summary, "\n") + "Loc: ".concat(this.loc, "\n") + "Context: ".concat(this.context);
-  }
-};
-
 var dist = {};
 
 var CSV = {};
@@ -41552,15 +41600,6 @@ var _buildNumberColumnsError = (rowLineNumber, expectedCols, row) => {
   var errorContext = "".concat(errorSummary, " (").concat(errorLoc, ") : Expected ").concat(expectedColsCount, " fields, found ").concat(row.length, "\n") + "Expected data format : \"".concat(expectedColsName, "\"\n") + "Incorrect Row : \"".concat(row, "\"");
   return new Error$1(errorSummary, errorLoc, errorContext);
 };
-var _buildTypeError = (type, rowLineNumber, colIndex, colsData, value, expected) => {
-  var errorSummary = "Incorrect ".concat(type, " value");
-  var errorLoc = "Line ".concat(rowLineNumber, ", Column ").concat(colIndex + 1, " (\"").concat(colsData[colIndex].field, "\")");
-  var errorContext = "".concat(errorSummary, " (").concat(errorLoc, ")\n") + "Incorrect value : \"".concat(value, "\" for type ").concat(type);
-  if (!expected || expected.length === 0) {
-    return new Error$1(errorSummary, errorLoc, errorContext);
-  }
-  return new Error$1(errorSummary, errorLoc, errorContext + '\n' + expected);
-};
 var DEFAULT_CSV_EXPORT_OPTIONS = {
   colSep: ',',
   dateFormat: 'yyyy-MM-dd',
@@ -41577,15 +41616,6 @@ var _forgeColumnsCountError = (row, rowLineNumber, expectedCols, errors) => {
   });
   if (row.length !== expectedCols.length) errors.push(_buildNumberColumnsError(rowLineNumber, expectedCols, row));
 };
-var _forgeTypeError = (value, rowLineNumber, type, options, colsData, colIndex) => {
-  var expected = '';
-  if (type === 'enum') {
-    expected = "Expected values: [".concat(options.enumValues.join(), "]");
-  } else if (type === 'date') {
-    expected = "Expected format: ".concat(options.dateFormat);
-  }
-  return _buildTypeError(type, rowLineNumber, colIndex, colsData, value, expected);
-};
 var _getColTypeFromTypeArray = typeArray => {
   if (!typeArray || typeArray.length === 0) {
     return 'string'; // Fall back to default type
@@ -41613,16 +41643,23 @@ var _validateFormat = (rows, hasHeader, cols, options) => {
       if (colIndex < knownColsCount) {
         var colType = colsData[colIndex].type;
         if (colType && rowCell !== undefined) {
-          var _colsData$colIndex$en, _colsData$colIndex, _colsData$colIndex2, _ref, _colsData$colIndex$ac, _colsData$colIndex$ce;
+          var _colsData$colIndex$en, _colsData$colIndex, _colsData$colIndex2, _colsData$colIndex3, _colsData$colIndex4, _ref, _colsData$colIndex$ac, _colsData$colIndex$ce;
           // use of cellEditorParams is deprecated
-          var enumValues = (_colsData$colIndex$en = (_colsData$colIndex = colsData[colIndex]) === null || _colsData$colIndex === void 0 ? void 0 : _colsData$colIndex.enumValues) !== null && _colsData$colIndex$en !== void 0 ? _colsData$colIndex$en : (_colsData$colIndex2 = colsData[colIndex]) === null || _colsData$colIndex2 === void 0 || (_colsData$colIndex2 = _colsData$colIndex2.cellEditorParams) === null || _colsData$colIndex2 === void 0 ? void 0 : _colsData$colIndex2.enumValues;
           var colOptions = _objectSpread2(_objectSpread2({}, options), {}, {
-            enumValues
+            enumValues: (_colsData$colIndex$en = (_colsData$colIndex = colsData[colIndex]) === null || _colsData$colIndex === void 0 ? void 0 : _colsData$colIndex.enumValues) !== null && _colsData$colIndex$en !== void 0 ? _colsData$colIndex$en : (_colsData$colIndex2 = colsData[colIndex]) === null || _colsData$colIndex2 === void 0 || (_colsData$colIndex2 = _colsData$colIndex2.cellEditorParams) === null || _colsData$colIndex2 === void 0 ? void 0 : _colsData$colIndex2.enumValues,
+            minValue: (_colsData$colIndex3 = colsData[colIndex]) === null || _colsData$colIndex3 === void 0 ? void 0 : _colsData$colIndex3.minValue,
+            maxValue: (_colsData$colIndex4 = colsData[colIndex]) === null || _colsData$colIndex4 === void 0 ? void 0 : _colsData$colIndex4.maxValue
           });
           var acceptsEmptyFields = // use of cellEditorParams is deprecated
           (_ref = (_colsData$colIndex$ac = colsData[colIndex].acceptsEmptyFields) !== null && _colsData$colIndex$ac !== void 0 ? _colsData$colIndex$ac : (_colsData$colIndex$ce = colsData[colIndex].cellEditorParams) === null || _colsData$colIndex$ce === void 0 ? void 0 : _colsData$colIndex$ce.acceptsEmptyFields) !== null && _ref !== void 0 ? _ref : false;
-          if (!ValidationUtils.isValid(rowCell, colType, colOptions, acceptsEmptyFields)) {
-            errors.push(_forgeTypeError(rowCell, rowIndex + 1, colType, colOptions, colsData, colIndex));
+          var validationResult = ValidationUtils.isValid(rowCell, colType, colOptions, acceptsEmptyFields);
+          if (validationResult !== true) {
+            var {
+              summary: errorSummary,
+              context: errorContext
+            } = validationResult;
+            var errorLoc = "Line ".concat(rowIndex + 1, ", Column ").concat(colIndex + 1, " (\"").concat(colsData[colIndex].field, "\")");
+            errors.push(new Error$1(errorSummary, errorLoc, errorContext));
           }
         }
       }
@@ -57980,13 +58017,15 @@ var acquireTokens = /*#__PURE__*/function () {
 }();
 var handleResponse = response => {
   if (response != null) {
+    var _account$idTokenClaim, _account$idTokenClaim2;
     var account = response.account;
     _updateTokensInStorage(response);
     writeToStorage('authIdTokenPopup', response.idToken);
     writeToStorage('authAuthenticated', 'true');
     writeToStorage('authAccountId', account.homeAccountId);
+    writeToStorage('authEmail', (_account$idTokenClaim = account.idTokenClaims) === null || _account$idTokenClaim === void 0 ? void 0 : _account$idTokenClaim.email);
     authData.accountId = account.homeAccountId;
-    authData.userEmail = account.username; // In MSAL account data, username property contains user email
+    authData.userEmail = (_account$idTokenClaim2 = account.idTokenClaims) === null || _account$idTokenClaim2 === void 0 ? void 0 : _account$idTokenClaim2.email;
     authData.username = account.name;
     authData.userId = account.localAccountId;
     redirectOnAuthSuccess();
@@ -58012,6 +58051,7 @@ var signOut = () => {
   clearFromStorage('authIdToken');
   clearFromStorage('authAccessToken');
   clearFromStorage('authAccountId');
+  clearFromStorage('authEmail');
   writeToStorage('authAuthenticated', 'false');
   var logoutRequest = {
     account: msalApp.getAccountByHomeId((_authData$accountId = authData.accountId) !== null && _authData$accountId !== void 0 ? _authData$accountId : accountId),
@@ -58103,10 +58143,10 @@ var refreshTokens = /*#__PURE__*/function () {
   };
 }();
 var getUserEmail = () => {
-  var _authData$userEmail, _msalApp$getAllAccoun2;
+  var _ref6, _readFromStorage, _msalApp$getAllAccoun2;
   if (!checkInit()) return;
   // Note: account data from MSAL seems to contain user email in the 'username' property
-  return (_authData$userEmail = authData === null || authData === void 0 ? void 0 : authData.userEmail) !== null && _authData$userEmail !== void 0 ? _authData$userEmail : (_msalApp$getAllAccoun2 = msalApp.getAllAccounts()) === null || _msalApp$getAllAccoun2 === void 0 || (_msalApp$getAllAccoun2 = _msalApp$getAllAccoun2[0]) === null || _msalApp$getAllAccoun2 === void 0 ? void 0 : _msalApp$getAllAccoun2.username;
+  return (_ref6 = (_readFromStorage = readFromStorage('authEmail')) !== null && _readFromStorage !== void 0 ? _readFromStorage : authData === null || authData === void 0 ? void 0 : authData.userEmail) !== null && _ref6 !== void 0 ? _ref6 : (_msalApp$getAllAccoun2 = msalApp.getAllAccounts()) === null || _msalApp$getAllAccoun2 === void 0 || (_msalApp$getAllAccoun2 = _msalApp$getAllAccoun2[0]) === null || _msalApp$getAllAccoun2 === void 0 ? void 0 : _msalApp$getAllAccoun2.username;
 };
 var getUserName = () => {
   var _authData$name, _msalApp$getAllAccoun3;
@@ -58166,11 +58206,6 @@ var DatasetUtils = {
   getDatasetNames
 };
 
-// Copyright (c) Cosmo Tech.
-// Licensed under the MIT license.
-
-var NAME_VALIDATOR = /^[a-zA-Z0-9][\w\s.-]*$/;
-
 // Copyright (c) Cosmo Tech.
 // Licensed under the MIT license.
 var scenarioExistsInList = (scenarioName, scenarioList) => {
@@ -58190,15 +58225,8 @@ var scenarioExistsInTree = (scenarioName, scenarioTree) => {
 };
 var scenarioNameIsValid = (scenarioName, scenarioList) => {
   scenarioName = scenarioName.trimEnd();
-  if (scenarioName.length === 0) {
-    return 'emptyScenarioName';
-  } else {
-    if (scenarioName.match(NAME_VALIDATOR) === null) {
-      return 'forbiddenCharsInScenarioName';
-    } else if (scenarioExistsInList(scenarioName, scenarioList)) {
-      return 'existingScenarioName';
-    }
-  }
+  if (scenarioName.length === 0) return 'emptyScenarioName';
+  if (scenarioExistsInList(scenarioName, scenarioList)) return 'existingScenarioName';
   return null;
 };
 var getScenarioTree = (scenarioList, compareFn) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cosmotech/core",
-  "version": "1.19.1",
+  "version": "2.0.0",
   "description": "",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",