@micromag/cli 0.3.506 → 0.3.509

package/bin/export.js

@@ -8,7 +8,6 @@ var core = require('@micromag/core');
 var screensManager = require('@micromag/screens');
 var FieldsManager = require('@micromag/fields');
 var transforms = require('@micromag/transforms');
-var tslib = require('tslib');
 var path = require('path');
 var puppeteer = require('puppeteer');
 var nodeFetch = require('node-fetch');
@@ -20,83 +19,116 @@ var Viewer = require('@micromag/viewer');
 
 const readJSON = file => fsExtra.readJsonSync(file);
 
+// 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.
  */
-/**
- * Lower case as a function.
- */
-function lowerCase(str) {
-  return str.toLowerCase();
+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);
 }
-
-// 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.
+ * Split the input string into an array of words, separating numbers.
  */
-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);
+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;
 }
 /**
- * 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 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);
 }
-
-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 lowerFactory(locale) {
+    return locale === false
+        ? (input) => input.toLowerCase()
+        : (input) => input.toLocaleLowerCase(locale);
 }
-function pascalCase(input, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  return noCase(input, tslib.__assign({
-    delimiter: "",
-    transform: pascalCaseTransform
-  }, options));
+function upperFactory(locale) {
+    return locale === false
+        ? (input) => input.toUpperCase()
+        : (input) => input.toLocaleUpperCase(locale);
 }
-
-function camelCaseTransform(input, index) {
-  if (index === 0) return input.toLowerCase();
-  return pascalCaseTransform(input, index);
+function capitalCaseTransformFactory(lower, upper) {
+    return (word) => `${upper(word[0])}${lower(word.slice(1))}`;
 }
-function camelCase(input, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  return pascalCase(input, tslib.__assign({
-    transform: camelCaseTransform
-  }, options));
+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),
+    ];
 }
 
 const transformStory = (story, format) => {

package/lib/index.js

@@ -7,7 +7,6 @@ var core = require('@micromag/core');
 var screensManager = require('@micromag/screens');
 var FieldsManager = require('@micromag/fields');
 var transforms = require('@micromag/transforms');
-var tslib = require('tslib');
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var path = require('path');
 var puppeteer = require('puppeteer');
@@ -19,83 +18,116 @@ var React = require('react');
 var ReactDOMServer = require('react-dom/server');
 var Viewer = require('@micromag/viewer');
 
+// 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.
  */
-/**
- * Lower case as a function.
- */
-function lowerCase(str) {
-  return str.toLowerCase();
+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);
 }
-
-// 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.
+ * Split the input string into an array of words, separating numbers.
  */
-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);
+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;
 }
 /**
- * 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 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);
 }
-
-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 lowerFactory(locale) {
+    return locale === false
+        ? (input) => input.toLowerCase()
+        : (input) => input.toLocaleLowerCase(locale);
 }
-function pascalCase(input, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  return noCase(input, tslib.__assign({
-    delimiter: "",
-    transform: pascalCaseTransform
-  }, options));
+function upperFactory(locale) {
+    return locale === false
+        ? (input) => input.toUpperCase()
+        : (input) => input.toLocaleUpperCase(locale);
 }
-
-function camelCaseTransform(input, index) {
-  if (index === 0) return input.toLowerCase();
-  return pascalCaseTransform(input, index);
+function capitalCaseTransformFactory(lower, upper) {
+    return (word) => `${upper(word[0])}${lower(word.slice(1))}`;
 }
-function camelCase(input, options) {
-  if (options === void 0) {
-    options = {};
-  }
-  return pascalCase(input, tslib.__assign({
-    transform: camelCaseTransform
-  }, options));
+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 transformStory = function transformStory(story, format) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/cli",
-    "version": "0.3.506",
+    "version": "0.3.509",
     "private": false,
     "description": "",
     "keywords": [
@@ -47,21 +47,21 @@
     },
     "dependencies": {
         "@babel/runtime": "^7.13.10",
-        "@micromag/core": "^0.3.506",
-        "@micromag/elements": "^0.3.506",
-        "@micromag/fields": "^0.3.506",
-        "@micromag/screens": "^0.3.506",
-        "@micromag/transforms": "^0.3.506",
-        "@micromag/viewer": "^0.3.506",
-        "@micromag/viewer-build": "^0.3.506",
-        "change-case": "^4.0.0",
+        "@micromag/core": "^0.3.509",
+        "@micromag/elements": "^0.3.509",
+        "@micromag/fields": "^0.3.509",
+        "@micromag/screens": "^0.3.509",
+        "@micromag/transforms": "^0.3.509",
+        "@micromag/viewer": "^0.3.509",
+        "@micromag/viewer-build": "^0.3.509",
+        "change-case": "^5.4.4",
         "classnames": "^2.2.6",
-        "commander": "^8.3.0",
+        "commander": "^12.0.0",
         "express": "^4.17.1",
-        "fs-extra": "^10.0.0",
-        "get-port": "^5.1.1",
+        "fs-extra": "^11.2.0",
+        "get-port": "^7.1.0",
         "lodash": "^4.17.21",
-        "node-fetch": "^2.6.1",
+        "node-fetch": "^3.3.2",
         "prop-types": "^15.7.2",
         "puppeteer": "^9.1.1",
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
@@ -71,5 +71,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "b3bc0905b6e926384f26f5807551c772ccc55452"
+    "gitHead": "28ca6abf74ab585d218a4918b415b7d0564e5a09"
 }