@plasmicapp/loader-react 1.0.32 → 1.0.36

package/dist/loader-react.cjs.development.js

@@ -1040,7 +1040,7 @@ function toFullLookup(lookup) {
     };
   } else {
     return {
-      name: normalizeName(namePart),
+      name: codeComponent ? namePart : normalizeName(namePart),
       projectId: projectId,
       isCode: codeComponent
     };
@@ -1413,53 +1413,100 @@ var InternalPlasmicComponentLoader = /*#__PURE__*/function () {
   };
 
   _proto.maybeFetchComponentData = /*#__PURE__*/function () {
-    var _maybeFetchComponentData = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee() {
-      var _this$maybeGetCompMet,
+    var _maybeFetchComponentData = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2() {
+      var _this = this;
+
+      var _len2,
+          specs,
+          _key2,
+          returnWithSpecsToFetch,
+          _this$maybeGetCompMet2,
           existingMetas,
           missingSpecs,
-          _this$maybeGetCompMet2,
-          existingMetas2,
-          missingSpecs2,
-          _args = arguments;
+          _args2 = arguments;
 
-      return runtime_1.wrap(function _callee$(_context) {
+      return runtime_1.wrap(function _callee2$(_context2) {
         while (1) {
-          switch (_context.prev = _context.next) {
+          switch (_context2.prev = _context2.next) {
             case 0:
-              _this$maybeGetCompMet = this.maybeGetCompMetas.apply(this, _args), existingMetas = _this$maybeGetCompMet.found, missingSpecs = _this$maybeGetCompMet.missing;
+              for (_len2 = _args2.length, specs = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+                specs[_key2] = _args2[_key2];
+              }
 
-              if (!(missingSpecs.length === 0)) {
-                _context.next = 3;
+              returnWithSpecsToFetch = /*#__PURE__*/function () {
+                var _ref = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee(specsToFetch) {
+                  var _this$maybeGetCompMet, existingMetas2, missingSpecs2;
+
+                  return runtime_1.wrap(function _callee$(_context) {
+                    while (1) {
+                      switch (_context.prev = _context.next) {
+                        case 0:
+                          _context.next = 2;
+                          return _this.fetchMissingData({
+                            missingSpecs: specsToFetch
+                          });
+
+                        case 2:
+                          _this$maybeGetCompMet = _this.maybeGetCompMetas.apply(_this, specs), existingMetas2 = _this$maybeGetCompMet.found, missingSpecs2 = _this$maybeGetCompMet.missing;
+
+                          if (!(missingSpecs2.length > 0)) {
+                            _context.next = 5;
+                            break;
+                          }
+
+                          return _context.abrupt("return", null);
+
+                        case 5:
+                          return _context.abrupt("return", prepComponentData.apply(void 0, [_this.bundle].concat(existingMetas2)));
+
+                        case 6:
+                        case "end":
+                          return _context.stop();
+                      }
+                    }
+                  }, _callee);
+                }));
+
+                return function returnWithSpecsToFetch(_x) {
+                  return _ref.apply(this, arguments);
+                };
+              }();
+
+              if (!this.opts.alwaysFresh) {
+                _context2.next = 6;
                 break;
               }
 
-              return _context.abrupt("return", prepComponentData.apply(void 0, [this.bundle].concat(existingMetas)));
-
-            case 3:
-              _context.next = 5;
-              return this.fetchMissingData({
-                missingSpecs: missingSpecs
-              });
+              _context2.next = 5;
+              return returnWithSpecsToFetch(specs);
 
             case 5:
-              _this$maybeGetCompMet2 = this.maybeGetCompMetas.apply(this, _args), existingMetas2 = _this$maybeGetCompMet2.found, missingSpecs2 = _this$maybeGetCompMet2.missing;
+              return _context2.abrupt("return", _context2.sent);
 
-              if (!(missingSpecs2.length > 0)) {
-                _context.next = 8;
+            case 6:
+              // Else we only fetch actually missing specs
+              _this$maybeGetCompMet2 = this.maybeGetCompMetas.apply(this, specs), existingMetas = _this$maybeGetCompMet2.found, missingSpecs = _this$maybeGetCompMet2.missing;
+
+              if (!(missingSpecs.length === 0)) {
+                _context2.next = 9;
                 break;
               }
 
-              return _context.abrupt("return", null);
-
-            case 8:
-              return _context.abrupt("return", prepComponentData.apply(void 0, [this.bundle].concat(existingMetas2)));
+              return _context2.abrupt("return", prepComponentData.apply(void 0, [this.bundle].concat(existingMetas)));
 
             case 9:
+              _context2.next = 11;
+              return returnWithSpecsToFetch(missingSpecs);
+
+            case 11:
+              return _context2.abrupt("return", _context2.sent);
+
+            case 12:
             case "end":
-              return _context.stop();
+              return _context2.stop();
           }
         }
-      }, _callee, this);
+      }, _callee2, this);
     }));
 
     function maybeFetchComponentData() {
@@ -1470,39 +1517,39 @@ var InternalPlasmicComponentLoader = /*#__PURE__*/function () {
   }();
 
   _proto.fetchComponentData = /*#__PURE__*/function () {
-    var _fetchComponentData = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2() {
+    var _fetchComponentData = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee3() {
       var data,
           _this$maybeGetCompMet3,
           missingSpecs,
-          _args2 = arguments;
+          _args3 = arguments;
 
-      return runtime_1.wrap(function _callee2$(_context2) {
+      return runtime_1.wrap(function _callee3$(_context3) {
         while (1) {
-          switch (_context2.prev = _context2.next) {
+          switch (_context3.prev = _context3.next) {
             case 0:
-              _context2.next = 2;
-              return this.maybeFetchComponentData.apply(this, _args2);
+              _context3.next = 2;
+              return this.maybeFetchComponentData.apply(this, _args3);
 
             case 2:
-              data = _context2.sent;
+              data = _context3.sent;
 
               if (data) {
-                _context2.next = 6;
+                _context3.next = 6;
                 break;
               }
 
-              _this$maybeGetCompMet3 = this.maybeGetCompMetas.apply(this, _args2), missingSpecs = _this$maybeGetCompMet3.missing;
+              _this$maybeGetCompMet3 = this.maybeGetCompMetas.apply(this, _args3), missingSpecs = _this$maybeGetCompMet3.missing;
               throw new Error("Unable to find components " + missingSpecs.map(getLookupSpecName).join(', '));
 
             case 6:
-              return _context2.abrupt("return", data);
+              return _context3.abrupt("return", data);
 
             case 7:
             case "end":
-              return _context2.stop();
+              return _context3.stop();
           }
         }
-      }, _callee2, this);
+      }, _callee3, this);
     }));
 
     function fetchComponentData() {
@@ -1513,30 +1560,30 @@ var InternalPlasmicComponentLoader = /*#__PURE__*/function () {
   }();
 
   _proto.fetchPages = /*#__PURE__*/function () {
-    var _fetchPages = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee3() {
+    var _fetchPages = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee4() {
       var data;
-      return runtime_1.wrap(function _callee3$(_context3) {
+      return runtime_1.wrap(function _callee4$(_context4) {
         while (1) {
-          switch (_context3.prev = _context3.next) {
+          switch (_context4.prev = _context4.next) {
             case 0:
               this.maybeReportClientSideFetch(function () {
                 return "Plasmic: fetching all page metadata in the browser";
               });
-              _context3.next = 3;
+              _context4.next = 3;
               return this.fetchAllData();
 
             case 3:
-              data = _context3.sent;
-              return _context3.abrupt("return", data.components.filter(function (comp) {
+              data = _context4.sent;
+              return _context4.abrupt("return", data.components.filter(function (comp) {
                 return comp.isPage && comp.path;
               }));
 
             case 5:
             case "end":
-              return _context3.stop();
+              return _context4.stop();
           }
         }
-      }, _callee3, this);
+      }, _callee4, this);
     }));
 
     function fetchPages() {
@@ -1547,28 +1594,28 @@ var InternalPlasmicComponentLoader = /*#__PURE__*/function () {
   }();
 
   _proto.fetchComponents = /*#__PURE__*/function () {
-    var _fetchComponents = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee4() {
+    var _fetchComponents = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee5() {
       var data;
-      return runtime_1.wrap(function _callee4$(_context4) {
+      return runtime_1.wrap(function _callee5$(_context5) {
         while (1) {
-          switch (_context4.prev = _context4.next) {
+          switch (_context5.prev = _context5.next) {
             case 0:
               this.maybeReportClientSideFetch(function () {
                 return "Plasmic: fetching all component metadata in the browser";
               });
-              _context4.next = 3;
+              _context5.next = 3;
               return this.fetchAllData();
 
             case 3:
-              data = _context4.sent;
-              return _context4.abrupt("return", data.components);
+              data = _context5.sent;
+              return _context5.abrupt("return", data.components);
 
             case 5:
             case "end":
-              return _context4.stop();
+              return _context5.stop();
           }
         }
-      }, _callee4, this);
+      }, _callee5, this);
     }));
 
     function fetchComponents() {
@@ -1586,10 +1633,10 @@ var InternalPlasmicComponentLoader = /*#__PURE__*/function () {
   _proto.fetchMissingData =
   /*#__PURE__*/
   function () {
-    var _fetchMissingData = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee5(opts) {
-      return runtime_1.wrap(function _callee5$(_context5) {
+    var _fetchMissingData = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee6(opts) {
+      return runtime_1.wrap(function _callee6$(_context6) {
         while (1) {
-          switch (_context5.prev = _context5.next) {
+          switch (_context6.prev = _context6.next) {
             case 0:
               // TODO: do better than just fetching everything
               this.maybeReportClientSideFetch(function () {
@@ -1597,17 +1644,17 @@ var InternalPlasmicComponentLoader = /*#__PURE__*/function () {
                   return getLookupSpecName(spec);
                 }).join(', ');
               });
-              return _context5.abrupt("return", this.fetchAllData());
+              return _context6.abrupt("return", this.fetchAllData());
 
             case 2:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
         }
-      }, _callee5, this);
+      }, _callee6, this);
     }));
 
-    function fetchMissingData(_x) {
+    function fetchMissingData(_x2) {
       return _fetchMissingData.apply(this, arguments);
     }
 
@@ -1627,29 +1674,29 @@ var InternalPlasmicComponentLoader = /*#__PURE__*/function () {
   };
 
   _proto.fetchAllData = /*#__PURE__*/function () {
-    var _fetchAllData = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee6() {
+    var _fetchAllData = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee7() {
       var bundle;
-      return runtime_1.wrap(function _callee6$(_context6) {
+      return runtime_1.wrap(function _callee7$(_context7) {
         while (1) {
-          switch (_context6.prev = _context6.next) {
+          switch (_context7.prev = _context7.next) {
             case 0:
-              _context6.next = 2;
+              _context7.next = 2;
               return this.ensureFetcher().fetchAllData();
 
             case 2:
-              bundle = _context6.sent;
+              bundle = _context7.sent;
               this.mergeBundle(bundle);
               this.roots.forEach(function (watcher) {
                 return watcher.onDataFetched == null ? void 0 : watcher.onDataFetched();
               });
-              return _context6.abrupt("return", bundle);
+              return _context7.abrupt("return", bundle);
 
             case 6:
             case "end":
-              return _context6.stop();
+              return _context7.stop();
           }
         }
-      }, _callee6, this);
+      }, _callee7, this);
     }));
 
     function fetchAllData() {
@@ -1805,22 +1852,22 @@ var PlasmicComponentLoader = /*#__PURE__*/function () {
   _proto2.fetchComponentData =
   /*#__PURE__*/
   function () {
-    var _fetchComponentData2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee7() {
+    var _fetchComponentData2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee8() {
       var _this$__internal;
 
-      var _args7 = arguments;
-      return runtime_1.wrap(function _callee7$(_context7) {
+      var _args8 = arguments;
+      return runtime_1.wrap(function _callee8$(_context8) {
         while (1) {
-          switch (_context7.prev = _context7.next) {
+          switch (_context8.prev = _context8.next) {
             case 0:
-              return _context7.abrupt("return", (_this$__internal = this.__internal).fetchComponentData.apply(_this$__internal, _args7));
+              return _context8.abrupt("return", (_this$__internal = this.__internal).fetchComponentData.apply(_this$__internal, _args8));
 
             case 1:
             case "end":
-              return _context7.stop();
+              return _context8.stop();
           }
         }
-      }, _callee7, this);
+      }, _callee8, this);
     }));
 
     function fetchComponentData() {
@@ -1839,22 +1886,22 @@ var PlasmicComponentLoader = /*#__PURE__*/function () {
   _proto2.maybeFetchComponentData =
   /*#__PURE__*/
   function () {
-    var _maybeFetchComponentData2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee8() {
+    var _maybeFetchComponentData2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee9() {
       var _this$__internal2;
 
-      var _args8 = arguments;
-      return runtime_1.wrap(function _callee8$(_context8) {
+      var _args9 = arguments;
+      return runtime_1.wrap(function _callee9$(_context9) {
         while (1) {
-          switch (_context8.prev = _context8.next) {
+          switch (_context9.prev = _context9.next) {
             case 0:
-              return _context8.abrupt("return", (_this$__internal2 = this.__internal).maybeFetchComponentData.apply(_this$__internal2, _args8));
+              return _context9.abrupt("return", (_this$__internal2 = this.__internal).maybeFetchComponentData.apply(_this$__internal2, _args9));
 
             case 1:
             case "end":
-              return _context8.stop();
+              return _context9.stop();
           }
         }
-      }, _callee8, this);
+      }, _callee9, this);
     }));
 
     function maybeFetchComponentData() {
@@ -1871,19 +1918,19 @@ var PlasmicComponentLoader = /*#__PURE__*/function () {
   _proto2.fetchPages =
   /*#__PURE__*/
   function () {
-    var _fetchPages2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee9() {
-      return runtime_1.wrap(function _callee9$(_context9) {
+    var _fetchPages2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee10() {
+      return runtime_1.wrap(function _callee10$(_context10) {
         while (1) {
-          switch (_context9.prev = _context9.next) {
+          switch (_context10.prev = _context10.next) {
             case 0:
-              return _context9.abrupt("return", this.__internal.fetchPages());
+              return _context10.abrupt("return", this.__internal.fetchPages());
 
             case 1:
             case "end":
-              return _context9.stop();
+              return _context10.stop();
           }
         }
-      }, _callee9, this);
+      }, _callee10, this);
     }));
 
     function fetchPages() {
@@ -1900,19 +1947,19 @@ var PlasmicComponentLoader = /*#__PURE__*/function () {
   _proto2.fetchComponents =
   /*#__PURE__*/
   function () {
-    var _fetchComponents2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee10() {
-      return runtime_1.wrap(function _callee10$(_context10) {
+    var _fetchComponents2 = /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee11() {
+      return runtime_1.wrap(function _callee11$(_context11) {
         while (1) {
-          switch (_context10.prev = _context10.next) {
+          switch (_context11.prev = _context11.next) {
             case 0:
-              return _context10.abrupt("return", this.__internal.fetchComponents());
+              return _context11.abrupt("return", this.__internal.fetchComponents());
 
             case 1:
             case "end":
-              return _context10.stop();
+              return _context11.stop();
           }
         }
-      }, _callee10, this);
+      }, _callee11, this);
     }));
 
     function fetchComponents() {