@plasmicapp/loader-react 1.0.327 → 1.0.329

package/dist/index.d.ts

@@ -1,5 +1,6 @@
 import { AssetModule } from '@plasmicapp/loader-core';
 import { CodeComponentMeta as CodeComponentMeta_2 } from '@plasmicapp/host';
+import { CodeModule } from '@plasmicapp/loader-fetcher';
 import { ComponentMeta } from '@plasmicapp/loader-core';
 import { CustomFunctionMeta as CustomFunctionMeta_2 } from '@plasmicapp/host';
 import { DataCtxReader } from '@plasmicapp/host';
@@ -239,6 +240,7 @@ export declare class InternalPlasmicComponentLoader {
     fetchPages(opts?: FetchPagesOpts): Promise<PageMeta_2[]>;
     fetchComponents(): Promise<ComponentMeta[]>;
     getActiveSplits(): Split[];
+    getChunksUrl(bundle: LoaderBundleOutput, modules: CodeModule[]): string;
     trackConversion(value?: number): void;
     getActiveVariation(opts: {
         traits: Record<string, string | number | boolean>;
@@ -260,11 +262,12 @@ export declare class InternalPlasmicComponentLoader {
  *   "world"}}`
  * - `matchesPagePath("/hello/[name]", "/")` -> `false`
  * - `matchesPagePath("/hello/[...catchall]", "/hello/a/b/c")` -> `{params: {catchall: ["a", "b", "c"]}}`
+ * - `matchesPagePath("/hello/[[...catchall]]", "/hello/")` -> `{params: {catchall: []}}`
  * - `matchesPagePath("/", "")` -> `{params: {}}`
  */
-export declare function matchesPagePath(pagePath: string, lookup: string): {
+export declare function matchesPagePath(pattern: string, path: string): false | {
     params: Record<string, string | string[]>;
-} | false;
+};
 
 export { PageMeta }
 
@@ -374,6 +377,7 @@ export declare class PlasmicComponentLoader {
         known?: Record<string, string>;
         traits: Record<string, string | number | boolean>;
     }): Promise<Record<string, string>>;
+    getChunksUrl(bundle: LoaderBundleOutput, modules: CodeModule[]): string;
     getExternalVariation(variation: Record<string, string>, filters?: Parameters<typeof getExternalIds>[2]): Record<string, string>;
     getActiveSplits(): Split[];
     trackConversion(value?: number): void;

package/dist/index.esm.js

@@ -67,7 +67,9 @@ import {
   PlasmicTracker,
   Registry
 } from "@plasmicapp/loader-core";
-import { internal_getCachedBundleInNodeServer } from "@plasmicapp/loader-fetcher";
+import {
+  internal_getCachedBundleInNodeServer
+} from "@plasmicapp/loader-fetcher";
 import { getActiveVariation, getExternalIds } from "@plasmicapp/loader-splits";
 import * as PlasmicQuery from "@plasmicapp/query";
 import React3 from "react";
@@ -147,26 +149,27 @@ function useIsMounted() {
   }, []);
   return isMounted;
 }
-function matchesPagePath(pagePath, lookup) {
-  var _a;
-  pagePath = pagePath.replace(/^\/*/, "").replace(/\/*$/, "");
-  lookup = lookup.replace(/^\/*/, "").replace(/\/*$/, "");
-  const paramNames = (pagePath.match(/\[([^\]]*)\]/g) || []).map(
-    (group) => group.slice(1, -1)
-  );
-  const pagePathRegExp = new RegExp(
-    "^/?" + pagePath.replace(/\[\.\.\.[^\]]*\]/g, "(.+)").replace(/\[[^\]]*\]/g, "([^/]+)") + "$"
-  );
-  const maybeVals = (_a = lookup.replace(/[?].*/, "").match(pagePathRegExp)) == null ? void 0 : _a.slice(1);
-  if (!maybeVals) {
+function matchesPagePath(pattern, path) {
+  const normalizedPattern = "/" + pattern.replace(/^\/|\/$/g, "");
+  const normalizedPath = "/" + path.replace(/^\/|\/$/g, "");
+  const regexString = normalizedPattern.replace(/\/\[\[\.\.\.(\w+)]]/g, "(?:/([^]*))?").replace(/\/\[\.\.\.(\w+)]/g, "/([^]*)").replace(/\[(\w+)]/g, "([^/]+)").replace(/\//g, "\\/");
+  const regex = new RegExp(`^/?${regexString}$`);
+  const match = normalizedPath.match(regex);
+  if (!match)
     return false;
-  }
+  const slugNames = [...pattern.matchAll(/\[\.?\.?\.?(\w+)]/g)].map(
+    (m) => m[1]
+  );
   const params = {};
-  for (let i = 0; i < paramNames.length; i++) {
-    if (paramNames[i].startsWith("...")) {
-      params[paramNames[i].slice(3)] = maybeVals[i].split("/");
-    } else {
-      params[paramNames[i]] = maybeVals[i];
+  for (let i = 0; i < slugNames.length; i++) {
+    const slugName = slugNames[i];
+    const value = match[i + 1];
+    if (pattern.includes(`[[...${slugName}]]`)) {
+      params[slugName] = value ? value.split("/").filter(Boolean) : [];
+    } else if (pattern.includes(`[...${slugName}]`)) {
+      params[slugName] = value.split("/").filter(Boolean);
+    } else if (value !== void 0) {
+      params[slugName] = value;
     }
   }
   return { params };
@@ -673,7 +676,8 @@ var ReactServerPlasmicComponentLoader = class {
       globalGroups: [],
       external: [],
       projects: [],
-      activeSplits: []
+      activeSplits: [],
+      bundleUrlQuery: null
     };
     this.opts = args.opts;
     this.fetcher = args.fetcher;
@@ -751,6 +755,9 @@ var ReactServerPlasmicComponentLoader = class {
   getActiveSplits() {
     return this.bundle.activeSplits;
   }
+  getChunksUrl(bundle, modules) {
+    return this.fetcher.getChunksUrl(bundle, modules);
+  }
   fetchMissingData(opts) {
     return __async(this, null, function* () {
       this.maybeReportClientSideFetch(
@@ -780,9 +787,10 @@ var ReactServerPlasmicComponentLoader = class {
     });
   }
   mergeBundle(bundle) {
-    var _a;
+    var _a, _b;
     this.bundle = bundle;
-    (_a = this.onBundleMerged) == null ? void 0 : _a.call(this);
+    this.bundle.bundleUrlQuery = (_a = this.bundle.bundleUrlQuery) != null ? _a : null;
+    (_b = this.onBundleMerged) == null ? void 0 : _b.call(this);
   }
   getBundle() {
     return this.bundle;
@@ -797,7 +805,8 @@ var ReactServerPlasmicComponentLoader = class {
       globalGroups: [],
       external: [],
       projects: [],
-      activeSplits: []
+      activeSplits: [],
+      bundleUrlQuery: null
     };
   }
 };
@@ -993,6 +1002,9 @@ var InternalPlasmicComponentLoader = class {
   getActiveSplits() {
     return this.reactServerLoader.getActiveSplits();
   }
+  getChunksUrl(bundle, modules) {
+    return this.reactServerLoader.getChunksUrl(bundle, modules);
+  }
   trackConversion(value = 0) {
     this.tracker.trackConversion(value);
   }
@@ -1162,6 +1174,9 @@ var PlasmicComponentLoader = class {
       });
     });
   }
+  getChunksUrl(bundle, modules) {
+    return this.__internal.getChunksUrl(bundle, modules);
+  }
   getExternalVariation(variation, filters) {
     return getExternalIds(this.getActiveSplits(), variation, filters);
   }