@micromag/core 0.3.507 → 0.3.509

package/lib/index.js

@@ -12,7 +12,6 @@ var sortBy = require('lodash/sortBy');
 var _callSuper = require('@babel/runtime/helpers/callSuper');
 var _inherits = require('@babel/runtime/helpers/inherits');
 var EventEmitter = require('wolfy87-eventemitter');
-var tslib = require('tslib');
 var uniqBy = require('lodash/uniqBy');
 var _typeof = require('@babel/runtime/helpers/typeof');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
@@ -23,88 +22,123 @@ var isEmpty = require('lodash/isEmpty');
 var tracking = require('@folklore/tracking');
 var PropTypes$1 = require('prop-types');
 
+// Regexps involved with splitting words in various case formats.
+const SPLIT_LOWER_UPPER_RE = /([\p{Ll}\d])(\p{Lu})/gu;
+const SPLIT_UPPER_UPPER_RE = /(\p{Lu})([\p{Lu}][\p{Ll}])/gu;
+// Used to iterate over the initial split result and separate numbers.
+const SPLIT_SEPARATE_NUMBER_RE = /(\d)\p{Ll}|(\p{L})\d/u;
+// Regexp involved with stripping non-word characters from the result.
+const DEFAULT_STRIP_REGEXP = /[^\p{L}\d]+/giu;
+// The replacement value for splits.
+const SPLIT_REPLACE_VALUE = "$1\0$2";
+// The default characters to keep after transforming case.
+const DEFAULT_PREFIX_SUFFIX_CHARACTERS = "";
 /**
- * Source: ftp://ftp.unicode.org/Public/UCD/latest/ucd/SpecialCasing.txt
+ * Split any cased input strings into an array of words.
  */
+function split(value) {
+    let result = value.trim();
+    result = result
+        .replace(SPLIT_LOWER_UPPER_RE, SPLIT_REPLACE_VALUE)
+        .replace(SPLIT_UPPER_UPPER_RE, SPLIT_REPLACE_VALUE);
+    result = result.replace(DEFAULT_STRIP_REGEXP, "\0");
+    let start = 0;
+    let end = result.length;
+    // Trim the delimiter from around the output string.
+    while (result.charAt(start) === "\0")
+        start++;
+    if (start === end)
+        return [];
+    while (result.charAt(end - 1) === "\0")
+        end--;
+    return result.slice(start, end).split(/\0/g);
+}
 /**
- * Lower case as a function.
+ * Split the input string into an array of words, separating numbers.
  */
-function lowerCase(str) {
-  return str.toLowerCase();
+function splitSeparateNumbers(value) {
+    const words = split(value);
+    for (let i = 0; i < words.length; i++) {
+        const word = words[i];
+        const match = SPLIT_SEPARATE_NUMBER_RE.exec(word);
+        if (match) {
+            const offset = match.index + (match[1] ?? match[2]).length;
+            words.splice(i, 1, word.slice(0, offset), word.slice(offset));
+        }
+    }
+    return words;
 }
-
-// Support camel case ("camelCase" -> "camel Case" and "CAMELCase" -> "CAMEL Case").
-var DEFAULT_SPLIT_REGEXP = [/([a-z0-9])([A-Z])/g, /([A-Z])([A-Z][a-z])/g];
-// Remove all non-word characters.
-var DEFAULT_STRIP_REGEXP = /[^A-Z0-9]+/gi;
 /**
- * Normalize the string into something other libraries can manipulate easier.
+ * Convert a string to space separated lower case (`foo bar`).
  */
 function noCase(input, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  var _a = options.splitRegexp,
-    splitRegexp = _a === void 0 ? DEFAULT_SPLIT_REGEXP : _a,
-    _b = options.stripRegexp,
-    stripRegexp = _b === void 0 ? DEFAULT_STRIP_REGEXP : _b,
-    _c = options.transform,
-    transform = _c === void 0 ? lowerCase : _c,
-    _d = options.delimiter,
-    delimiter = _d === void 0 ? " " : _d;
-  var result = replace(replace(input, splitRegexp, "$1\0$2"), stripRegexp, "\0");
-  var start = 0;
-  var end = result.length;
-  // Trim the delimiter from around the output string.
-  while (result.charAt(start) === "\0") start++;
-  while (result.charAt(end - 1) === "\0") end--;
-  // Transform each token independently.
-  return result.slice(start, end).split("\0").map(transform).join(delimiter);
+    const [prefix, words, suffix] = splitPrefixSuffix(input, options);
+    return (prefix +
+        words.map(lowerFactory(options?.locale)).join(options?.delimiter ?? " ") +
+        suffix);
 }
 /**
- * Replace `re` in the input string with the replacement value.
+ * Convert a string to pascal case (`FooBar`).
  */
-function replace(input, re, value) {
-  if (re instanceof RegExp) return input.replace(re, value);
-  return re.reduce(function (input, re) {
-    return input.replace(re, value);
-  }, input);
+function pascalCase(input, options) {
+    const [prefix, words, suffix] = splitPrefixSuffix(input, options);
+    const lower = lowerFactory(options?.locale);
+    const upper = upperFactory(options?.locale);
+    const transform = options?.mergeAmbiguousCharacters
+        ? capitalCaseTransformFactory(lower, upper)
+        : pascalCaseTransformFactory(lower, upper);
+    return prefix + words.map(transform).join(options?.delimiter ?? "") + suffix;
 }
-
-function pascalCaseTransform(input, index) {
-  var firstChar = input.charAt(0);
-  var lowerChars = input.substr(1).toLowerCase();
-  if (index > 0 && firstChar >= "0" && firstChar <= "9") {
-    return "_" + firstChar + lowerChars;
-  }
-  return "" + firstChar.toUpperCase() + lowerChars;
+/**
+ * Convert a string to snake case (`foo_bar`).
+ */
+function snakeCase(input, options) {
+    return noCase(input, { delimiter: "_", ...options });
 }
-function pascalCase(input, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  return noCase(input, tslib.__assign({
-    delimiter: "",
-    transform: pascalCaseTransform
-  }, options));
+function lowerFactory(locale) {
+    return locale === false
+        ? (input) => input.toLowerCase()
+        : (input) => input.toLocaleLowerCase(locale);
 }
-
-function dotCase(input, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  return noCase(input, tslib.__assign({
-    delimiter: "."
-  }, options));
+function upperFactory(locale) {
+    return locale === false
+        ? (input) => input.toUpperCase()
+        : (input) => input.toLocaleUpperCase(locale);
 }
-
-function snakeCase(input, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  return dotCase(input, tslib.__assign({
-    delimiter: "_"
-  }, options));
+function capitalCaseTransformFactory(lower, upper) {
+    return (word) => `${upper(word[0])}${lower(word.slice(1))}`;
+}
+function pascalCaseTransformFactory(lower, upper) {
+    return (word, index) => {
+        const char0 = word[0];
+        const initial = index > 0 && char0 >= "0" && char0 <= "9" ? "_" + char0 : upper(char0);
+        return initial + lower(word.slice(1));
+    };
+}
+function splitPrefixSuffix(input, options = {}) {
+    const splitFn = options.split ?? (options.separateNumbers ? splitSeparateNumbers : split);
+    const prefixCharacters = options.prefixCharacters ?? DEFAULT_PREFIX_SUFFIX_CHARACTERS;
+    const suffixCharacters = options.suffixCharacters ?? DEFAULT_PREFIX_SUFFIX_CHARACTERS;
+    let prefixIndex = 0;
+    let suffixIndex = input.length;
+    while (prefixIndex < input.length) {
+        const char = input.charAt(prefixIndex);
+        if (!prefixCharacters.includes(char))
+            break;
+        prefixIndex++;
+    }
+    while (suffixIndex > prefixIndex) {
+        const index = suffixIndex - 1;
+        const char = input.charAt(index);
+        if (!suffixCharacters.includes(char))
+            break;
+        suffixIndex = index;
+    }
+    return [
+        input.slice(0, prefixIndex),
+        splitFn(input.slice(prefixIndex, suffixIndex)),
+        input.slice(suffixIndex),
+    ];
 }
 
 /**
@@ -292,10 +326,11 @@ var customFont = PropTypes$1.shape({
 var font = PropTypes$1.oneOfType([PropTypes$1.object, PropTypes$1.string]);
 var fonts = PropTypes$1.arrayOf(font);
 var textAlign = PropTypes$1.oneOf(['left', 'right', 'center']);
-var color = PropTypes$1.shape({
+var colorObject = PropTypes$1.shape({
   color: PropTypes$1.string,
   alpha: PropTypes$1.number
 });
+var color = PropTypes$1.oneOfType([colorObject, PropTypes$1.string]);
 var textStyle = PropTypes$1.shape({
   fontFamily: font,
   fontSize: PropTypes$1.number,
@@ -739,7 +774,7 @@ var PropTypes = /*#__PURE__*/Object.freeze({
     closedCaptions: closedCaptions,
     closedCaptionsElement: closedCaptionsElement,
     closedCaptionsMedia: closedCaptionsMedia,
-    color: color,
+    colorObject: colorObject,
     component: component,
     componentNames: componentNames,
     components: components,

package/lib/utils.js

@@ -4,7 +4,6 @@ var _regeneratorRuntime = require('@babel/runtime/helpers/regeneratorRuntime');
 var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
-var tslib = require('tslib');
 var isNumber = require('lodash/isNumber');
 var isObject = require('lodash/isObject');
 var react = require('react');
@@ -16,115 +15,154 @@ var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
 var slugify = require('slugify');
 
+// Regexps involved with splitting words in various case formats.
+const SPLIT_LOWER_UPPER_RE = /([\p{Ll}\d])(\p{Lu})/gu;
+const SPLIT_UPPER_UPPER_RE = /(\p{Lu})([\p{Lu}][\p{Ll}])/gu;
+// Used to iterate over the initial split result and separate numbers.
+const SPLIT_SEPARATE_NUMBER_RE = /(\d)\p{Ll}|(\p{L})\d/u;
+// Regexp involved with stripping non-word characters from the result.
+const DEFAULT_STRIP_REGEXP = /[^\p{L}\d]+/giu;
+// The replacement value for splits.
+const SPLIT_REPLACE_VALUE = "$1\0$2";
+// The default characters to keep after transforming case.
+const DEFAULT_PREFIX_SUFFIX_CHARACTERS = "";
 /**
- * Source: ftp://ftp.unicode.org/Public/UCD/latest/ucd/SpecialCasing.txt
+ * Split any cased input strings into an array of words.
  */
+function split(value) {
+    let result = value.trim();
+    result = result
+        .replace(SPLIT_LOWER_UPPER_RE, SPLIT_REPLACE_VALUE)
+        .replace(SPLIT_UPPER_UPPER_RE, SPLIT_REPLACE_VALUE);
+    result = result.replace(DEFAULT_STRIP_REGEXP, "\0");
+    let start = 0;
+    let end = result.length;
+    // Trim the delimiter from around the output string.
+    while (result.charAt(start) === "\0")
+        start++;
+    if (start === end)
+        return [];
+    while (result.charAt(end - 1) === "\0")
+        end--;
+    return result.slice(start, end).split(/\0/g);
+}
 /**
- * Lower case as a function.
+ * Split the input string into an array of words, separating numbers.
  */
-function lowerCase(str) {
-  return str.toLowerCase();
+function splitSeparateNumbers(value) {
+    const words = split(value);
+    for (let i = 0; i < words.length; i++) {
+        const word = words[i];
+        const match = SPLIT_SEPARATE_NUMBER_RE.exec(word);
+        if (match) {
+            const offset = match.index + (match[1] ?? match[2]).length;
+            words.splice(i, 1, word.slice(0, offset), word.slice(offset));
+        }
+    }
+    return words;
 }
-
-// Support camel case ("camelCase" -> "camel Case" and "CAMELCase" -> "CAMEL Case").
-var DEFAULT_SPLIT_REGEXP = [/([a-z0-9])([A-Z])/g, /([A-Z])([A-Z][a-z])/g];
-// Remove all non-word characters.
-var DEFAULT_STRIP_REGEXP = /[^A-Z0-9]+/gi;
 /**
- * Normalize the string into something other libraries can manipulate easier.
+ * Convert a string to space separated lower case (`foo bar`).
  */
 function noCase(input, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  var _a = options.splitRegexp,
-    splitRegexp = _a === void 0 ? DEFAULT_SPLIT_REGEXP : _a,
-    _b = options.stripRegexp,
-    stripRegexp = _b === void 0 ? DEFAULT_STRIP_REGEXP : _b,
-    _c = options.transform,
-    transform = _c === void 0 ? lowerCase : _c,
-    _d = options.delimiter,
-    delimiter = _d === void 0 ? " " : _d;
-  var result = replace(replace(input, splitRegexp, "$1\0$2"), stripRegexp, "\0");
-  var start = 0;
-  var end = result.length;
-  // Trim the delimiter from around the output string.
-  while (result.charAt(start) === "\0") start++;
-  while (result.charAt(end - 1) === "\0") end--;
-  // Transform each token independently.
-  return result.slice(start, end).split("\0").map(transform).join(delimiter);
+    const [prefix, words, suffix] = splitPrefixSuffix(input, options);
+    return (prefix +
+        words.map(lowerFactory(options?.locale)).join(options?.delimiter ?? " ") +
+        suffix);
 }
 /**
- * Replace `re` in the input string with the replacement value.
+ * Convert a string to camel case (`fooBar`).
  */
-function replace(input, re, value) {
-  if (re instanceof RegExp) return input.replace(re, value);
-  return re.reduce(function (input, re) {
-    return input.replace(re, value);
-  }, input);
-}
-
-function pascalCaseTransform(input, index) {
-  var firstChar = input.charAt(0);
-  var lowerChars = input.substr(1).toLowerCase();
-  if (index > 0 && firstChar >= "0" && firstChar <= "9") {
-    return "_" + firstChar + lowerChars;
-  }
-  return "" + firstChar.toUpperCase() + lowerChars;
+function camelCase(input, options) {
+    const [prefix, words, suffix] = splitPrefixSuffix(input, options);
+    const lower = lowerFactory(options?.locale);
+    const upper = upperFactory(options?.locale);
+    const transform = options?.mergeAmbiguousCharacters
+        ? capitalCaseTransformFactory(lower, upper)
+        : pascalCaseTransformFactory(lower, upper);
+    return (prefix +
+        words
+            .map((word, index) => {
+            if (index === 0)
+                return lower(word);
+            return transform(word, index);
+        })
+            .join(options?.delimiter ?? "") +
+        suffix);
 }
+/**
+ * Convert a string to pascal case (`FooBar`).
+ */
 function pascalCase(input, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  return noCase(input, tslib.__assign({
-    delimiter: "",
-    transform: pascalCaseTransform
-  }, options));
+    const [prefix, words, suffix] = splitPrefixSuffix(input, options);
+    const lower = lowerFactory(options?.locale);
+    const upper = upperFactory(options?.locale);
+    const transform = options?.mergeAmbiguousCharacters
+        ? capitalCaseTransformFactory(lower, upper)
+        : pascalCaseTransformFactory(lower, upper);
+    return prefix + words.map(transform).join(options?.delimiter ?? "") + suffix;
 }
-
-function camelCaseTransform(input, index) {
-  if (index === 0) return input.toLowerCase();
-  return pascalCaseTransform(input, index);
+/**
+ * Convert a string to kebab case (`foo-bar`).
+ */
+function kebabCase(input, options) {
+    return noCase(input, { delimiter: "-", ...options });
 }
-function camelCase(input, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  return pascalCase(input, tslib.__assign({
-    transform: camelCaseTransform
-  }, options));
+/**
+ * Convert a string to snake case (`foo_bar`).
+ */
+function snakeCase(input, options) {
+    return noCase(input, { delimiter: "_", ...options });
 }
-
-function dotCase(input, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  return noCase(input, tslib.__assign({
-    delimiter: "."
-  }, options));
+function lowerFactory(locale) {
+    return locale === false
+        ? (input) => input.toLowerCase()
+        : (input) => input.toLocaleLowerCase(locale);
 }
-
-function paramCase(input, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  return dotCase(input, tslib.__assign({
-    delimiter: "-"
-  }, options));
+function upperFactory(locale) {
+    return locale === false
+        ? (input) => input.toUpperCase()
+        : (input) => input.toLocaleUpperCase(locale);
 }
-
-function snakeCase(input, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  return dotCase(input, tslib.__assign({
-    delimiter: "_"
-  }, options));
+function capitalCaseTransformFactory(lower, upper) {
+    return (word) => `${upper(word[0])}${lower(word.slice(1))}`;
+}
+function pascalCaseTransformFactory(lower, upper) {
+    return (word, index) => {
+        const char0 = word[0];
+        const initial = index > 0 && char0 >= "0" && char0 <= "9" ? "_" + char0 : upper(char0);
+        return initial + lower(word.slice(1));
+    };
+}
+function splitPrefixSuffix(input, options = {}) {
+    const splitFn = options.split ?? (options.separateNumbers ? splitSeparateNumbers : split);
+    const prefixCharacters = options.prefixCharacters ?? DEFAULT_PREFIX_SUFFIX_CHARACTERS;
+    const suffixCharacters = options.suffixCharacters ?? DEFAULT_PREFIX_SUFFIX_CHARACTERS;
+    let prefixIndex = 0;
+    let suffixIndex = input.length;
+    while (prefixIndex < input.length) {
+        const char = input.charAt(prefixIndex);
+        if (!prefixCharacters.includes(char))
+            break;
+        prefixIndex++;
+    }
+    while (suffixIndex > prefixIndex) {
+        const index = suffixIndex - 1;
+        const char = input.charAt(index);
+        if (!suffixCharacters.includes(char))
+            break;
+        suffixIndex = index;
+    }
+    return [
+        input.slice(0, prefixIndex),
+        splitFn(input.slice(prefixIndex, suffixIndex)),
+        input.slice(suffixIndex),
+    ];
 }
 
 var convertStyleToString = function convertStyleToString(style) {
   return style !== null ? Object.keys(style).map(function (key) {
-    return "".concat(paramCase(key), ":").concat(isNumber(style[key]) ? "".concat(style[key], "px") : style[key], ";");
+    return "".concat(kebabCase(key), ":").concat(isNumber(style[key]) ? "".concat(style[key], "px") : style[key], ";");
   }).join('\n') : '';
 };
 var convertStyleToString$1 = convertStyleToString;
@@ -1272,7 +1310,7 @@ var slug = function slug(str) {
   var separator = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   var toSlug;
   if (separator === '-') {
-    toSlug = paramCase(str);
+    toSlug = kebabCase(str);
   } else {
     toSlug = snakeCase(str);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/core",
-    "version": "0.3.507",
+    "version": "0.3.509",
     "private": false,
     "description": "",
     "keywords": [
@@ -112,38 +112,28 @@
         "@folklore/services": "^0.1.24",
         "@folklore/size": "^0.1.20",
         "@folklore/tracking": "^0.0.9",
-        "@fortawesome/fontawesome-svg-core": "^1.2.32",
-        "@fortawesome/free-solid-svg-icons": "^5.15.1",
-        "@fortawesome/react-fontawesome": "^0.1.13",
+        "@fortawesome/fontawesome-svg-core": "^6.5.2",
+        "@fortawesome/free-solid-svg-icons": "^6.5.2",
+        "@fortawesome/react-fontawesome": "^0.2.0",
+        "@panneau/uppy": "^3.0.162",
         "@react-spring/core": "^9.6.1",
         "@react-spring/web": "^9.6.1",
-        "@uppy/core": "^2.1.4",
-        "@uppy/dashboard": "^2.1.3",
-        "@uppy/dropbox": "^2.0.5",
-        "@uppy/facebook": "^2.0.5",
-        "@uppy/google-drive": "^2.0.5",
-        "@uppy/instagram": "^2.0.5",
-        "@uppy/locales": "^2.0.5",
-        "@uppy/react": "^2.1.2",
-        "@uppy/tus": "^2.2.0",
-        "@uppy/webcam": "^2.0.5",
-        "@uppy/xhr-upload": "^2.0.7",
-        "@use-gesture/react": "^10.3.0",
-        "bootstrap": "^5.3.0",
-        "change-case": "^4.0.0",
+        "@use-gesture/react": "^10.3.1",
+        "bootstrap": "^5.3.1",
+        "change-case": "^5.4.4",
         "classnames": "^2.2.6",
         "css-mediaquery": "^0.1.2",
         "dayjs": "^1.11.10",
         "debug": "^4.3.4",
-        "flat": "^5.0.2",
+        "flat": "^6.0.1",
         "hoist-non-react-statics": "^3.3.2",
         "lodash": "^4.17.21",
         "prop-types": "^15.7.2",
-        "query-string": "^6.13.7",
+        "query-string": "^9.0.0",
         "raf": "^3.4.1",
         "react-helmet": "^6.1.0",
-        "react-intl": "^6.6.2",
-        "screenfull": "^5.1.0",
+        "react-intl": "^6.6.4",
+        "screenfull": "^5.2.0",
         "slugify": "^1.6.5",
         "tinycolor2": "^1.4.2",
         "uuid": "^9.0.0",
@@ -155,5 +145,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "117b7fb2035672f22c544f6ad2d002ccae35f03a"
+    "gitHead": "28ca6abf74ab585d218a4918b415b7d0564e5a09"
 }