@micromag/core 0.3.477 → 0.3.480

package/es/hooks.js

@@ -1839,7 +1839,8 @@ var useParsedStory = function useParsedStory(story) {
   var parser = useMemo(function () {
     return new StoryParser({
       screensManager: screensManager,
-      fieldsManager: fieldsManager
+      fieldsManager: fieldsManager,
+      fieldsPattern: screensManager.getFieldsPattern()
     });
   }, [screensManager, fieldsManager]);
   var newStory = useMemo(function () {

package/es/index.js

@@ -1245,11 +1245,13 @@ var _excluded$4 = ["medias"],
 var MediasParser = /*#__PURE__*/function () {
   function MediasParser(_ref) {
     var fieldsManager = _ref.fieldsManager,
-      screensManager = _ref.screensManager;
+      screensManager = _ref.screensManager,
+      _ref$fieldsPattern = _ref.fieldsPattern,
+      fieldsPattern = _ref$fieldsPattern === void 0 ? {} : _ref$fieldsPattern;
     _classCallCheck(this, MediasParser);
     this.fieldsManager = fieldsManager;
     this.screensManager = screensManager;
-    this.fieldsPatternCache = {};
+    this.fieldsPatternCache = fieldsPattern || {};
     this.parsedThemesCache = {};
   }
   _createClass(MediasParser, [{
@@ -1273,7 +1275,7 @@ var MediasParser = /*#__PURE__*/function () {
         var _ref2 = this.screensManager.getDefinition(type) || {},
           _ref2$fields = _ref2.fields,
           fields = _ref2$fields === void 0 ? [] : _ref2$fields;
-        this.fieldsPatternCache[type] = this.getMediaFieldsPattern(fields);
+        this.fieldsPatternCache[type] = this.getFieldsPattern(fields);
       }
       return this.fieldsPatternCache[type];
     }
@@ -1373,8 +1375,8 @@ var MediasParser = /*#__PURE__*/function () {
       }) : story;
     }
   }, {
-    key: "getMediaFieldsPattern",
-    value: function getMediaFieldsPattern(fields) {
+    key: "getFieldsPattern",
+    value: function getFieldsPattern(fields) {
       var _this2 = this;
       var namePrefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
       return fields.reduce(function (patterns, field) {
@@ -1394,7 +1396,7 @@ var MediasParser = /*#__PURE__*/function () {
           itemsField = _fieldDefinition$item === void 0 ? null : _fieldDefinition$item,
           _fieldDefinition$sett = fieldDefinition.settings,
           settings = _fieldDefinition$sett === void 0 ? [] : _fieldDefinition$sett;
-        return [].concat(_toConsumableArray(patterns), _toConsumableArray(MediasParser.fieldIsMedia(fieldDefinition) ? [new RegExp("^".concat(path, "$"))] : []), _toConsumableArray(MediasParser.fieldIsFontFamily(fieldDefinition) ? [new RegExp("^".concat(path, "\\.media$")), new RegExp("^".concat(path, "\\.variants\\.[0-9]+\\.media$"))] : []), _toConsumableArray(_this2.getMediaFieldsPattern(subFields, path)), _toConsumableArray(_this2.getMediaFieldsPattern(settings, path)), _toConsumableArray(itemsField !== null ? _this2.getMediaFieldsPattern([itemsField], "".concat(path, "\\.[0-9]+")) : []));
+        return [].concat(_toConsumableArray(patterns), _toConsumableArray(MediasParser.fieldIsMedia(fieldDefinition) ? [new RegExp("^".concat(path, "$"))] : []), _toConsumableArray(MediasParser.fieldIsFontFamily(fieldDefinition) ? [new RegExp("^".concat(path, "\\.media$")), new RegExp("^".concat(path, "\\.variants\\.[0-9]+\\.media$"))] : []), _toConsumableArray(_this2.getFieldsPattern(subFields, path)), _toConsumableArray(_this2.getFieldsPattern(settings, path)), _toConsumableArray(itemsField !== null ? _this2.getFieldsPattern([itemsField], "".concat(path, "\\.[0-9]+")) : []));
       }, []);
     }
   }], [{
@@ -1515,8 +1517,12 @@ var MediasParser = /*#__PURE__*/function () {
 var ScreensManager = /*#__PURE__*/function (_DefinitionsManager) {
   _inherits(ScreensManager, _DefinitionsManager);
   function ScreensManager() {
+    var _this;
+    var definitions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     _classCallCheck(this, ScreensManager);
-    return _callSuper(this, ScreensManager, arguments);
+    _this = _callSuper(this, ScreensManager, [definitions]);
+    _this.fieldsPattern = null;
+    return _this;
   }
   _createClass(ScreensManager, [{
     key: "getFields",
@@ -1534,6 +1540,16 @@ var ScreensManager = /*#__PURE__*/function (_DefinitionsManager) {
         layouts = _ref2$layouts === void 0 ? null : _ref2$layouts;
       return layouts;
     }
+  }, {
+    key: "getFieldsPattern",
+    value: function getFieldsPattern() {
+      return this.fieldsPattern;
+    }
+  }, {
+    key: "setFieldsPattern",
+    value: function setFieldsPattern(fieldsPattern) {
+      this.fieldsPattern = fieldsPattern;
+    }
   }, {
     key: "filter",
     value: function filter(_filter) {
@@ -1541,6 +1557,15 @@ var ScreensManager = /*#__PURE__*/function (_DefinitionsManager) {
       // this.definitions = this.definitions.filter(filter);
       // return this;
     }
+  }, {
+    key: "merge",
+    value: function merge(manager) {
+      var newFieldsPattern = manager.getFieldsPattern();
+      if (newFieldsPattern !== null && this.fieldsPattern === null) {
+        this.fieldsPattern = newFieldsPattern;
+      }
+      return this.addDefinitions(manager.getDefinitions());
+    }
   }]);
   return ScreensManager;
 }(DefinitionsManager);
@@ -1549,11 +1574,13 @@ var _excluded$3 = ["fonts"];
 var FontsParser = /*#__PURE__*/function () {
   function FontsParser(_ref) {
     var fieldsManager = _ref.fieldsManager,
-      screensManager = _ref.screensManager;
+      screensManager = _ref.screensManager,
+      _ref$fieldsPattern = _ref.fieldsPattern,
+      fieldsPattern = _ref$fieldsPattern === void 0 ? {} : _ref$fieldsPattern;
     _classCallCheck(this, FontsParser);
     this.fieldsManager = fieldsManager;
     this.screensManager = screensManager;
-    this.fieldsPatternCache = {};
+    this.fieldsPatternCache = fieldsPattern || {};
   }
   _createClass(FontsParser, [{
     key: "getFieldsPatternByScreen",
@@ -2090,18 +2117,26 @@ var ThemeParser = /*#__PURE__*/function () {
 var StoryParser = /*#__PURE__*/function () {
   function StoryParser(_ref) {
     var screensManager = _ref.screensManager,
-      fieldsManager = _ref.fieldsManager;
+      fieldsManager = _ref.fieldsManager,
+      fieldsPattern = _ref.fieldsPattern;
     _classCallCheck(this, StoryParser);
+    var _ref2 = fieldsPattern || {},
+      _ref2$medias = _ref2.medias,
+      mediasPattern = _ref2$medias === void 0 ? null : _ref2$medias,
+      _ref2$fonts = _ref2.fonts,
+      fontsPattern = _ref2$fonts === void 0 ? null : _ref2$fonts;
     this.themeParser = new ThemeParser({
       screensManager: screensManager
     });
     this.mediasParser = new MediasParser({
       screensManager: screensManager,
-      fieldsManager: fieldsManager
+      fieldsManager: fieldsManager,
+      fieldsPattern: mediasPattern
     });
     this.fontsParser = new FontsParser({
       screensManager: screensManager,
-      fieldsManager: fieldsManager
+      fieldsManager: fieldsManager,
+      fieldsPattern: fontsPattern
     });
     this.migrationsParser = new MigrationsParser({
       screensManager: screensManager
@@ -2111,15 +2146,15 @@ var StoryParser = /*#__PURE__*/function () {
     key: "parse",
     value: function parse(story) {
       var _this = this;
-      var _ref2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-        _ref2$withTheme = _ref2.withTheme,
-        withTheme = _ref2$withTheme === void 0 ? true : _ref2$withTheme,
-        _ref2$withMedias = _ref2.withMedias,
-        withMedias = _ref2$withMedias === void 0 ? true : _ref2$withMedias,
-        _ref2$withFonts = _ref2.withFonts,
-        withFonts = _ref2$withFonts === void 0 ? true : _ref2$withFonts,
-        _ref2$withMigrations = _ref2.withMigrations,
-        withMigrations = _ref2$withMigrations === void 0 ? true : _ref2$withMigrations;
+      var _ref3 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+        _ref3$withTheme = _ref3.withTheme,
+        withTheme = _ref3$withTheme === void 0 ? true : _ref3$withTheme,
+        _ref3$withMedias = _ref3.withMedias,
+        withMedias = _ref3$withMedias === void 0 ? true : _ref3$withMedias,
+        _ref3$withFonts = _ref3.withFonts,
+        withFonts = _ref3$withFonts === void 0 ? true : _ref3$withFonts,
+        _ref3$withMigrations = _ref3.withMigrations,
+        withMigrations = _ref3$withMigrations === void 0 ? true : _ref3$withMigrations;
       if (story === null) {
         return story;
       }
@@ -2132,10 +2167,10 @@ var StoryParser = /*#__PURE__*/function () {
       }], [withMigrations, function (newStory) {
         return _this.migrationsParser.parse(newStory);
       }]];
-      return parsers.reduce(function (parsedStory, _ref3) {
-        var _ref4 = _slicedToArray(_ref3, 2),
-          enabled = _ref4[0],
-          parse = _ref4[1];
+      return parsers.reduce(function (parsedStory, _ref4) {
+        var _ref5 = _slicedToArray(_ref4, 2),
+          enabled = _ref5[0],
+          parse = _ref5[1];
         return enabled ? parse(parsedStory) : parsedStory;
       }, story);
     }

package/lib/hooks.js

@@ -1841,7 +1841,8 @@ var useParsedStory = function useParsedStory(story) {
   var parser = react.useMemo(function () {
     return new core.StoryParser({
       screensManager: screensManager,
-      fieldsManager: fieldsManager
+      fieldsManager: fieldsManager,
+      fieldsPattern: screensManager.getFieldsPattern()
     });
   }, [screensManager, fieldsManager]);
   var newStory = react.useMemo(function () {

package/lib/index.js

@@ -1247,11 +1247,13 @@ var _excluded$4 = ["medias"],
 var MediasParser = /*#__PURE__*/function () {
   function MediasParser(_ref) {
     var fieldsManager = _ref.fieldsManager,
-      screensManager = _ref.screensManager;
+      screensManager = _ref.screensManager,
+      _ref$fieldsPattern = _ref.fieldsPattern,
+      fieldsPattern = _ref$fieldsPattern === void 0 ? {} : _ref$fieldsPattern;
     _classCallCheck(this, MediasParser);
     this.fieldsManager = fieldsManager;
     this.screensManager = screensManager;
-    this.fieldsPatternCache = {};
+    this.fieldsPatternCache = fieldsPattern || {};
     this.parsedThemesCache = {};
   }
   _createClass(MediasParser, [{
@@ -1275,7 +1277,7 @@ var MediasParser = /*#__PURE__*/function () {
         var _ref2 = this.screensManager.getDefinition(type) || {},
           _ref2$fields = _ref2.fields,
           fields = _ref2$fields === void 0 ? [] : _ref2$fields;
-        this.fieldsPatternCache[type] = this.getMediaFieldsPattern(fields);
+        this.fieldsPatternCache[type] = this.getFieldsPattern(fields);
       }
       return this.fieldsPatternCache[type];
     }
@@ -1375,8 +1377,8 @@ var MediasParser = /*#__PURE__*/function () {
       }) : story;
     }
   }, {
-    key: "getMediaFieldsPattern",
-    value: function getMediaFieldsPattern(fields) {
+    key: "getFieldsPattern",
+    value: function getFieldsPattern(fields) {
       var _this2 = this;
       var namePrefix = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
       return fields.reduce(function (patterns, field) {
@@ -1396,7 +1398,7 @@ var MediasParser = /*#__PURE__*/function () {
           itemsField = _fieldDefinition$item === void 0 ? null : _fieldDefinition$item,
           _fieldDefinition$sett = fieldDefinition.settings,
           settings = _fieldDefinition$sett === void 0 ? [] : _fieldDefinition$sett;
-        return [].concat(_toConsumableArray(patterns), _toConsumableArray(MediasParser.fieldIsMedia(fieldDefinition) ? [new RegExp("^".concat(path, "$"))] : []), _toConsumableArray(MediasParser.fieldIsFontFamily(fieldDefinition) ? [new RegExp("^".concat(path, "\\.media$")), new RegExp("^".concat(path, "\\.variants\\.[0-9]+\\.media$"))] : []), _toConsumableArray(_this2.getMediaFieldsPattern(subFields, path)), _toConsumableArray(_this2.getMediaFieldsPattern(settings, path)), _toConsumableArray(itemsField !== null ? _this2.getMediaFieldsPattern([itemsField], "".concat(path, "\\.[0-9]+")) : []));
+        return [].concat(_toConsumableArray(patterns), _toConsumableArray(MediasParser.fieldIsMedia(fieldDefinition) ? [new RegExp("^".concat(path, "$"))] : []), _toConsumableArray(MediasParser.fieldIsFontFamily(fieldDefinition) ? [new RegExp("^".concat(path, "\\.media$")), new RegExp("^".concat(path, "\\.variants\\.[0-9]+\\.media$"))] : []), _toConsumableArray(_this2.getFieldsPattern(subFields, path)), _toConsumableArray(_this2.getFieldsPattern(settings, path)), _toConsumableArray(itemsField !== null ? _this2.getFieldsPattern([itemsField], "".concat(path, "\\.[0-9]+")) : []));
       }, []);
     }
   }], [{
@@ -1517,8 +1519,12 @@ var MediasParser = /*#__PURE__*/function () {
 var ScreensManager = /*#__PURE__*/function (_DefinitionsManager) {
   _inherits(ScreensManager, _DefinitionsManager);
   function ScreensManager() {
+    var _this;
+    var definitions = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
     _classCallCheck(this, ScreensManager);
-    return _callSuper(this, ScreensManager, arguments);
+    _this = _callSuper(this, ScreensManager, [definitions]);
+    _this.fieldsPattern = null;
+    return _this;
   }
   _createClass(ScreensManager, [{
     key: "getFields",
@@ -1536,6 +1542,16 @@ var ScreensManager = /*#__PURE__*/function (_DefinitionsManager) {
         layouts = _ref2$layouts === void 0 ? null : _ref2$layouts;
       return layouts;
     }
+  }, {
+    key: "getFieldsPattern",
+    value: function getFieldsPattern() {
+      return this.fieldsPattern;
+    }
+  }, {
+    key: "setFieldsPattern",
+    value: function setFieldsPattern(fieldsPattern) {
+      this.fieldsPattern = fieldsPattern;
+    }
   }, {
     key: "filter",
     value: function filter(_filter) {
@@ -1543,6 +1559,15 @@ var ScreensManager = /*#__PURE__*/function (_DefinitionsManager) {
       // this.definitions = this.definitions.filter(filter);
       // return this;
     }
+  }, {
+    key: "merge",
+    value: function merge(manager) {
+      var newFieldsPattern = manager.getFieldsPattern();
+      if (newFieldsPattern !== null && this.fieldsPattern === null) {
+        this.fieldsPattern = newFieldsPattern;
+      }
+      return this.addDefinitions(manager.getDefinitions());
+    }
   }]);
   return ScreensManager;
 }(DefinitionsManager);
@@ -1551,11 +1576,13 @@ var _excluded$3 = ["fonts"];
 var FontsParser = /*#__PURE__*/function () {
   function FontsParser(_ref) {
     var fieldsManager = _ref.fieldsManager,
-      screensManager = _ref.screensManager;
+      screensManager = _ref.screensManager,
+      _ref$fieldsPattern = _ref.fieldsPattern,
+      fieldsPattern = _ref$fieldsPattern === void 0 ? {} : _ref$fieldsPattern;
     _classCallCheck(this, FontsParser);
     this.fieldsManager = fieldsManager;
     this.screensManager = screensManager;
-    this.fieldsPatternCache = {};
+    this.fieldsPatternCache = fieldsPattern || {};
   }
   _createClass(FontsParser, [{
     key: "getFieldsPatternByScreen",
@@ -2092,18 +2119,26 @@ var ThemeParser = /*#__PURE__*/function () {
 var StoryParser = /*#__PURE__*/function () {
   function StoryParser(_ref) {
     var screensManager = _ref.screensManager,
-      fieldsManager = _ref.fieldsManager;
+      fieldsManager = _ref.fieldsManager,
+      fieldsPattern = _ref.fieldsPattern;
     _classCallCheck(this, StoryParser);
+    var _ref2 = fieldsPattern || {},
+      _ref2$medias = _ref2.medias,
+      mediasPattern = _ref2$medias === void 0 ? null : _ref2$medias,
+      _ref2$fonts = _ref2.fonts,
+      fontsPattern = _ref2$fonts === void 0 ? null : _ref2$fonts;
     this.themeParser = new ThemeParser({
       screensManager: screensManager
     });
     this.mediasParser = new MediasParser({
       screensManager: screensManager,
-      fieldsManager: fieldsManager
+      fieldsManager: fieldsManager,
+      fieldsPattern: mediasPattern
     });
     this.fontsParser = new FontsParser({
       screensManager: screensManager,
-      fieldsManager: fieldsManager
+      fieldsManager: fieldsManager,
+      fieldsPattern: fontsPattern
     });
     this.migrationsParser = new MigrationsParser({
       screensManager: screensManager
@@ -2113,15 +2148,15 @@ var StoryParser = /*#__PURE__*/function () {
     key: "parse",
     value: function parse(story) {
       var _this = this;
-      var _ref2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-        _ref2$withTheme = _ref2.withTheme,
-        withTheme = _ref2$withTheme === void 0 ? true : _ref2$withTheme,
-        _ref2$withMedias = _ref2.withMedias,
-        withMedias = _ref2$withMedias === void 0 ? true : _ref2$withMedias,
-        _ref2$withFonts = _ref2.withFonts,
-        withFonts = _ref2$withFonts === void 0 ? true : _ref2$withFonts,
-        _ref2$withMigrations = _ref2.withMigrations,
-        withMigrations = _ref2$withMigrations === void 0 ? true : _ref2$withMigrations;
+      var _ref3 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+        _ref3$withTheme = _ref3.withTheme,
+        withTheme = _ref3$withTheme === void 0 ? true : _ref3$withTheme,
+        _ref3$withMedias = _ref3.withMedias,
+        withMedias = _ref3$withMedias === void 0 ? true : _ref3$withMedias,
+        _ref3$withFonts = _ref3.withFonts,
+        withFonts = _ref3$withFonts === void 0 ? true : _ref3$withFonts,
+        _ref3$withMigrations = _ref3.withMigrations,
+        withMigrations = _ref3$withMigrations === void 0 ? true : _ref3$withMigrations;
       if (story === null) {
         return story;
       }
@@ -2134,10 +2169,10 @@ var StoryParser = /*#__PURE__*/function () {
       }], [withMigrations, function (newStory) {
         return _this.migrationsParser.parse(newStory);
       }]];
-      return parsers.reduce(function (parsedStory, _ref3) {
-        var _ref4 = _slicedToArray(_ref3, 2),
-          enabled = _ref4[0],
-          parse = _ref4[1];
+      return parsers.reduce(function (parsedStory, _ref4) {
+        var _ref5 = _slicedToArray(_ref4, 2),
+          enabled = _ref5[0],
+          parse = _ref5[1];
         return enabled ? parse(parsedStory) : parsedStory;
       }, story);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/core",
-    "version": "0.3.477",
+    "version": "0.3.480",
     "private": false,
     "description": "",
     "keywords": [
@@ -153,5 +153,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "bb9bf58bc81bab88260ffd2f231abe01d9caa841"
+    "gitHead": "4a69863ce7f8aa2e254242a2fd368763611cf096"
 }