@plasmicapp/loader-react 1.0.101 → 1.0.104

package/dist/index.d.ts

@@ -6,5 +6,5 @@ export { ComponentRenderData, InitOptions, initPlasmicLoader, InternalPlasmicCom
 export { PlasmicComponent } from './PlasmicComponent';
 export { GlobalVariantSpec, PlasmicRootProvider, PlasmicTranslator, } from './PlasmicRootProvider';
 export { extractPlasmicQueryData, plasmicPrepass } from './prepass';
-export { hydrateFromElement, renderToElement, renderToString } from './render';
+export { extractPlasmicQueryDataFromElement, hydrateFromElement, renderToElement, renderToString, } from './render';
 export { usePlasmicComponent } from './usePlasmicComponent';

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

@@ -1133,9 +1133,9 @@ function matchesCompMeta(lookup, meta) {
   return isNameSpec(lookup) ? (lookup.name === meta.name || lookup.rawName === meta.displayName) && (lookup.isCode == null || lookup.isCode === meta.isCode) : lookup.path === meta.path;
 }
 
-function getCompMeta(metas, lookup) {
+function getCompMetas(metas, lookup) {
   var full = toFullLookup(lookup);
-  return metas.find(function (meta) {
+  return metas.filter(function (meta) {
     return matchesCompMeta(full, meta);
   });
 }
@@ -1149,6 +1149,11 @@ function getLookupSpecName(lookup) {
   }
 }
 
+function getFirstCompMeta(metas, lookup) {
+  var filtered = getCompMetas(metas, lookup);
+  return filtered.length === 0 ? undefined : filtered[0];
+}
+
 var ComponentLookup = /*#__PURE__*/function () {
   function ComponentLookup(bundle, registry) {
     this.bundle = bundle;
@@ -1162,7 +1167,7 @@ var ComponentLookup = /*#__PURE__*/function () {
       opts = {};
     }
 
-    var compMeta = getCompMeta(this.bundle.components, spec);
+    var compMeta = getFirstCompMeta(this.bundle.components, spec);
 
     if (!compMeta) {
       throw new Error("Component not found: " + spec);
@@ -1181,7 +1186,7 @@ var ComponentLookup = /*#__PURE__*/function () {
   };
 
   _proto.hasComponent = function hasComponent(spec) {
-    var compMeta = getCompMeta(this.bundle.components, spec);
+    var compMeta = getFirstCompMeta(this.bundle.components, spec);
 
     if (compMeta) {
       return this.registry.hasModule(compMeta.entry);
@@ -1205,7 +1210,7 @@ var ComponentLookup = /*#__PURE__*/function () {
   };
 
   _proto.getGlobalContextsProvider = function getGlobalContextsProvider(spec) {
-    var compMeta = getCompMeta(this.bundle.components, spec);
+    var compMeta = getFirstCompMeta(this.bundle.components, spec);
     var projectMeta = compMeta ? this.bundle.projects.find(function (x) {
       return x.id === compMeta.projectId;
     }) : undefined;
@@ -1940,19 +1945,24 @@ var InternalPlasmicComponentLoader = /*#__PURE__*/function () {
   };
 
   _proto.refreshRegistry = function refreshRegistry() {
+    var _this3 = this;
+
+    var _loop = function _loop() {
+      var sub = _step.value;
+      var metas = getCompMetas(_this3.bundle.components, sub.lookup);
+      metas.forEach(function (meta) {
+        return _this3.registry.register(meta.entry, {
+          "default": sub.component
+        });
+      });
+    };
+
     // Once we have received data, we register components to
     // substitute.  We had to wait for data to do this so
     // that we can look up the right module name to substitute
     // in component meta.
     for (var _iterator = _createForOfIteratorHelperLoose(this.subs), _step; !(_step = _iterator()).done;) {
-      var sub = _step.value;
-      var meta = getCompMeta(this.bundle.components, sub.lookup);
-
-      if (meta) {
-        this.registry.register(meta.entry, {
-          "default": sub.component
-        });
-      }
+      _loop();
     } // We also swap global variants' useXXXGlobalVariant() hook with
     // a fake one that just reads from the PlasmicRootContext. Because
     // global variant values are not supplied by the generated global variant
@@ -1986,22 +1996,24 @@ var InternalPlasmicComponentLoader = /*#__PURE__*/function () {
 }();
 
 function _maybeGetCompMetas(metas, specs) {
-  var found = [];
+  var found = new Set();
   var missing = [];
 
   for (var _iterator3 = _createForOfIteratorHelperLoose(specs), _step3; !(_step3 = _iterator3()).done;) {
     var spec = _step3.value;
-    var meta = getCompMeta(metas, spec);
+    var filteredMetas = getCompMetas(metas, spec);
 
-    if (meta) {
-      found.push(meta);
+    if (filteredMetas.length > 0) {
+      filteredMetas.forEach(function (meta) {
+        return found.add(meta);
+      });
     } else {
       missing.push(spec);
     }
   }
 
   return {
-    found: found,
+    found: Array.from(found.keys()),
     missing: missing
   };
 }
@@ -2620,12 +2632,13 @@ function renderToString(loader, lookup, opts) {
   var element = makeElement(loader, lookup, opts);
   return ReactDOMServer.renderToString(element);
 }
-function hydrateFromElement(_x5, _x6, _x7, _x8) {
-  return _hydrateFromElement.apply(this, arguments);
+function extractPlasmicQueryDataFromElement(_x5, _x6, _x7) {
+  return _extractPlasmicQueryDataFromElement.apply(this, arguments);
 }
 
-function _hydrateFromElement() {
-  _hydrateFromElement = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(loader, target, lookup, opts) {
+function _extractPlasmicQueryDataFromElement() {
+  _extractPlasmicQueryDataFromElement = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee2(loader, lookup, opts) {
+    var element;
     return runtime_1.wrap(function _callee2$(_context2) {
       while (1) {
         switch (_context2.prev = _context2.next) {
@@ -2634,7 +2647,34 @@ function _hydrateFromElement() {
               opts = {};
             }
 
-            return _context2.abrupt("return", new Promise(function (resolve) {
+            element = makeElement(loader, lookup, opts);
+            return _context2.abrupt("return", extractPlasmicQueryData(element));
+
+          case 3:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  }));
+  return _extractPlasmicQueryDataFromElement.apply(this, arguments);
+}
+
+function hydrateFromElement(_x8, _x9, _x10, _x11) {
+  return _hydrateFromElement.apply(this, arguments);
+}
+
+function _hydrateFromElement() {
+  _hydrateFromElement = _asyncToGenerator( /*#__PURE__*/runtime_1.mark(function _callee3(loader, target, lookup, opts) {
+    return runtime_1.wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            if (opts === void 0) {
+              opts = {};
+            }
+
+            return _context3.abrupt("return", new Promise(function (resolve) {
               var element = makeElement(loader, lookup, opts);
               ReactDOM.hydrate(element, target, function () {
                 return resolve();
@@ -2643,10 +2683,10 @@ function _hydrateFromElement() {
 
           case 2:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
       }
-    }, _callee2);
+    }, _callee3);
   }));
   return _hydrateFromElement.apply(this, arguments);
 }
@@ -2659,7 +2699,8 @@ function makeElement(loader, lookup, opts) {
   return React__default.createElement(PlasmicRootProvider, {
     loader: loader,
     prefetchedData: opts.prefetchedData,
-    globalVariants: opts.globalVariants
+    globalVariants: opts.globalVariants,
+    prefetchedQueryData: opts.prefetchedQueryData
   }, React__default.createElement(PlasmicComponent, {
     component: typeof lookup === 'string' ? lookup : lookup.name,
     projectId: typeof lookup === 'string' ? undefined : lookup.projectId,
@@ -2703,6 +2744,7 @@ exports.PlasmicComponentLoader = PlasmicComponentLoader;
 exports.PlasmicRootProvider = PlasmicRootProvider;
 exports.convertBundlesToComponentRenderData = convertBundlesToComponentRenderData;
 exports.extractPlasmicQueryData = extractPlasmicQueryData;
+exports.extractPlasmicQueryDataFromElement = extractPlasmicQueryDataFromElement;
 exports.hydrateFromElement = hydrateFromElement;
 exports.initPlasmicLoader = initPlasmicLoader;
 exports.plasmicPrepass = plasmicPrepass;