@fluid-app/portal-sdk 0.1.374 → 0.1.376

package/dist/index.mjs

@@ -60,7 +60,7 @@ import { i as useScreenHeaderSlotRefs, r as ScreenHeaderProvider } from "./Scree
 import { t as useStore } from "./use-store-DB3FAMT2.mjs";
 import { a as FallbackCard, i as CoreScreenPlaceholder, r as customersScreenPropertySchema, t as CustomersScreen } from "./CustomersScreen-DVHcFV8G.mjs";
 import { n as useAppNavigation, t as AppNavigationProvider } from "./AppNavigationContext-DgelzxV9.mjs";
-import { a as loadWidgetPackages, c as getDefaultWidgetPackageManifestUrl, d as createDefaultFluidConfig, i as installAndReadFluidWidgetsRegistry, l as buildWidgetRegistry, n as resolveHostedWidgetPackageManifestUrl, o as subscribeToFluidWidgetsRegistry, r as fetchWidgetPackageDescriptors, t as dedupeWidgetPackagesByPackageIdAndVersion, u as mergeRegisteredWidgetsIntoRegistry } from "./widget-package-utils-DG2ibxqS.mjs";
+import { a as loadWidgetPackages, c as getDefaultWidgetPackageManifestUrl, d as createDefaultFluidConfig, i as installAndReadFluidWidgetsRegistry, l as buildWidgetRegistry, n as resolveHostedWidgetPackageManifestUrl, o as subscribeToFluidWidgetsRegistry, r as fetchWidgetPackageDescriptors, t as dedupeWidgetPackagesByPackageIdAndVersion, u as mergeRegisteredWidgetsIntoRegistry } from "./widget-package-utils-DnNxWKOo.mjs";
 import { c as sourceWidgetPackagesToManifests, i as isSourceWidgetPackage, n as defineWidgetPackage, t as defineWidget } from "./authoring-CLuHp6qI.mjs";
 import "./use-portal-card-add-3ds-flow-BLjXfmje.mjs";
 import "./display-B3BfkaBm.mjs";
@@ -2652,6 +2652,12 @@ function AppShell({ appData: appDataProp, navigation: navigationProp, customPage
 }
 //#endregion
 //#region src/entry/create-portal.tsx
+const warnedPortalRuntimeMergeWarningMessages = /* @__PURE__ */ new Set();
+const warnPortalRuntimeMergeWarningOnce = (message) => {
+	if (warnedPortalRuntimeMergeWarningMessages.has(message)) return;
+	warnedPortalRuntimeMergeWarningMessages.add(message);
+	console.warn(message);
+};
 /**
 * Last-resort error boundary for crashes above the AppShell (provider
 * setup, theme/auth bootstrap). Renders above FluidThemeProvider, so the
@@ -2732,37 +2738,67 @@ var RootBoundary = class extends Component {
 		});
 	}
 };
-function RuntimeWidgetBootstrap({ children, fluidConfig, initialWidgetRegistry, ingestFluidWidgetsRegistry, widgetPackageLoadPromise }) {
-	const [widgetRegistry, setWidgetRegistry] = useState(initialWidgetRegistry);
+function RuntimeWidgetBootstrap({ children, fluidConfig, baseWidgetRegistry, initialGlobalRegisteredWidgets, shouldSubscribeToGlobalWidgetRegistry, widgetPackageLoadPromise }) {
+	const [globalRegisteredWidgets, setGlobalRegisteredWidgets] = useState(initialGlobalRegisteredWidgets);
+	const [loadedRegisteredWidgets, setLoadedRegisteredWidgets] = useState([]);
 	const [isLoading, setIsLoading] = useState(() => Boolean(widgetPackageLoadPromise));
 	const [loadFailed, setLoadFailed] = useState(false);
 	useEffect(() => {
-		setWidgetRegistry(initialWidgetRegistry);
-		if (!ingestFluidWidgetsRegistry) return;
-		return subscribeToFluidWidgetsRegistry((registeredWidgets) => {
-			setWidgetRegistry((currentRegistry) => mergeRegisteredWidgetsIntoRegistry(currentRegistry, registeredWidgets));
+		setGlobalRegisteredWidgets(initialGlobalRegisteredWidgets);
+	}, [initialGlobalRegisteredWidgets]);
+	useEffect(() => {
+		if (!shouldSubscribeToGlobalWidgetRegistry) return;
+		const subscription = subscribeToFluidWidgetsRegistry((registeredWidgets) => {
+			setGlobalRegisteredWidgets(registeredWidgets);
 		});
-	}, [initialWidgetRegistry, ingestFluidWidgetsRegistry]);
+		setGlobalRegisteredWidgets(subscription.registeredWidgets);
+		return subscription.unsubscribe;
+	}, [shouldSubscribeToGlobalWidgetRegistry]);
 	useEffect(() => {
+		setLoadedRegisteredWidgets([]);
 		setIsLoading(Boolean(widgetPackageLoadPromise));
 		setLoadFailed(false);
 		if (!widgetPackageLoadPromise) return;
 		let cancelled = false;
 		widgetPackageLoadPromise.then((summary) => {
 			if (cancelled) return;
-			setWidgetRegistry((currentRegistry) => mergeRegisteredWidgetsIntoRegistry(currentRegistry, summary.registeredWidgets));
+			setLoadedRegisteredWidgets(summary.registeredWidgets);
+			if (shouldSubscribeToGlobalWidgetRegistry) setGlobalRegisteredWidgets(installAndReadFluidWidgetsRegistry());
 			setIsLoading(false);
 			setLoadFailed(summary.hasFailures);
 		}).catch((error) => {
 			if (cancelled) return;
 			console.error("[portal] Failed to load widget packages:", error);
+			if (shouldSubscribeToGlobalWidgetRegistry) setGlobalRegisteredWidgets(installAndReadFluidWidgetsRegistry());
 			setIsLoading(false);
 			setLoadFailed(true);
 		});
 		return () => {
 			cancelled = true;
 		};
-	}, [widgetPackageLoadPromise]);
+	}, [shouldSubscribeToGlobalWidgetRegistry, widgetPackageLoadPromise]);
+	const warnedDuplicateGlobalWidgetTypesRef = useRef(/* @__PURE__ */ new Set());
+	const { duplicateGlobalWidgetTypes, widgetRegistry } = useMemo(() => {
+		const activeLoadedRegisteredWidgets = shouldSubscribeToGlobalWidgetRegistry ? syncLoadedWidgetsWithGlobalRegistry(loadedRegisteredWidgets, globalRegisteredWidgets) : loadedRegisteredWidgets;
+		const dedupedGlobalWidgets = dedupeGlobalRegisteredWidgetsByType(shouldSubscribeToGlobalWidgetRegistry ? filterGlobalWidgetsAlreadyRepresentedByLoadedWidgets(globalRegisteredWidgets, activeLoadedRegisteredWidgets) : globalRegisteredWidgets);
+		const globalWidgetRegistry = mergeRegisteredWidgetsIntoRegistry(baseWidgetRegistry, dedupedGlobalWidgets.widgets, warnPortalRuntimeMergeWarningOnce);
+		return {
+			duplicateGlobalWidgetTypes: dedupedGlobalWidgets.duplicateTypes,
+			widgetRegistry: mergeRegisteredWidgetsIntoRegistry(globalWidgetRegistry, activeLoadedRegisteredWidgets, warnPortalRuntimeMergeWarningOnce)
+		};
+	}, [
+		baseWidgetRegistry,
+		globalRegisteredWidgets,
+		loadedRegisteredWidgets,
+		shouldSubscribeToGlobalWidgetRegistry
+	]);
+	useEffect(() => {
+		for (const widgetType of duplicateGlobalWidgetTypes) {
+			if (warnedDuplicateGlobalWidgetTypesRef.current.has(widgetType)) continue;
+			warnedDuplicateGlobalWidgetTypesRef.current.add(widgetType);
+			warnDuplicateGlobalRuntimeWidgetType(widgetType);
+		}
+	}, [duplicateGlobalWidgetTypes]);
 	const statusMessage = loadFailed ? "Some widgets failed to load. The portal will continue with available widgets." : isLoading ? "Loading widget packages…" : null;
 	return /* @__PURE__ */ jsxs(FluidProvider, {
 		config: fluidConfig,
@@ -2788,6 +2824,68 @@ function RuntimeWidgetBootstrap({ children, fluidConfig, initialWidgetRegistry,
 		}) : null, children]
 	});
 }
+function dedupeGlobalRegisteredWidgetsByType(globalWidgets) {
+	if (globalWidgets.length < 2) return {
+		duplicateTypes: [],
+		widgets: globalWidgets
+	};
+	const duplicateTypes = /* @__PURE__ */ new Set();
+	const widgetsByType = /* @__PURE__ */ new Map();
+	for (const widget of globalWidgets) {
+		if (widgetsByType.has(widget.type)) {
+			duplicateTypes.add(widget.type);
+			continue;
+		}
+		widgetsByType.set(widget.type, widget);
+	}
+	return duplicateTypes.size > 0 ? {
+		duplicateTypes: Array.from(duplicateTypes),
+		widgets: Array.from(widgetsByType.values())
+	} : {
+		duplicateTypes: [],
+		widgets: globalWidgets
+	};
+}
+function warnDuplicateGlobalRuntimeWidgetType(widgetType) {
+	console.warn(`[portal-sdk] Ignoring duplicate global runtime widget type "${widgetType}" because an earlier global registration already provides that SDK-facing type.`);
+}
+function syncLoadedWidgetsWithGlobalRegistry(loadedWidgets, globalWidgets) {
+	if (loadedWidgets.length === 0) return [];
+	if (globalWidgets.length === 0) return loadedWidgets;
+	const globalWidgetsByKey = new Map(globalWidgets.map((widget) => [createRuntimeRegisteredWidgetKey(widget.packageId, widget.version, widget.type), widget]));
+	return loadedWidgets.flatMap((loadedWidget) => {
+		const globalWidget = globalWidgetsByKey.get(createRuntimeRegisteredWidgetKey(loadedWidget.packageId, loadedWidget.version, loadedWidget.type));
+		if (!globalWidget) return [];
+		return [mergeLoadedWidgetWithGlobalWidget(loadedWidget, globalWidget)];
+	});
+}
+function mergeLoadedWidgetWithGlobalWidget(loadedWidget, globalWidget) {
+	return {
+		...loadedWidget,
+		...globalWidget,
+		name: globalWidget.name ?? loadedWidget.name,
+		displayName: globalWidget.displayName ?? loadedWidget.displayName,
+		description: globalWidget.description ?? loadedWidget.description,
+		icon: globalWidget.icon ?? loadedWidget.icon,
+		category: globalWidget.category ?? loadedWidget.category,
+		container: globalWidget.container ?? loadedWidget.container,
+		minSdkVersion: globalWidget.minSdkVersion ?? loadedWidget.minSdkVersion,
+		resizable: globalWidget.resizable ?? loadedWidget.resizable,
+		packageType: loadedWidget.packageType
+	};
+}
+function filterGlobalWidgetsAlreadyRepresentedByLoadedWidgets(globalWidgets, loadedWidgets) {
+	if (globalWidgets.length === 0 || loadedWidgets.length === 0) return globalWidgets;
+	const loadedWidgetKeys = new Set(loadedWidgets.map((widget) => createRuntimeRegisteredWidgetKey(widget.packageId, widget.version, widget.type)));
+	return globalWidgets.filter((widget) => !loadedWidgetKeys.has(createRuntimeRegisteredWidgetKey(widget.packageId, widget.version, widget.type)));
+}
+function createRuntimeRegisteredWidgetKey(packageId, version, type) {
+	return JSON.stringify([
+		packageId,
+		version,
+		type
+	]);
+}
 /**
 * Bootstrap a Fluid portal with a single function call.
 *
@@ -2822,8 +2920,9 @@ function createPortal(config = {}) {
 	const rootElement = document.getElementById(config.rootId ?? "root");
 	if (!rootElement) throw new Error(`Portal root element "#${config.rootId ?? "root"}" not found`);
 	const fluidConfig = createDefaultFluidConfig(config.fluid);
-	const preRegisteredWidgets = config.ingestPreRegisteredWidgets === false ? [] : installAndReadFluidWidgetsRegistry();
-	const initialWidgetRegistry = mergeRegisteredWidgetsIntoRegistry(buildWidgetRegistry(config.customWidgets ?? []), preRegisteredWidgets);
+	const shouldSubscribeToGlobalWidgetRegistry = config.ingestPreRegisteredWidgets !== false;
+	const initialGlobalRegisteredWidgets = shouldSubscribeToGlobalWidgetRegistry ? installAndReadFluidWidgetsRegistry() : [];
+	const baseWidgetRegistry = buildWidgetRegistry(config.customWidgets ?? []);
 	const widgetPackageLoadPromise = createWidgetPackageLoadPromise(config, fluidConfig);
 	let app = /* @__PURE__ */ jsx(AppShell, {
 		customPages: config.customPages,
@@ -2838,8 +2937,9 @@ function createPortal(config = {}) {
 		errorReporter: config.errorReporter,
 		children: /* @__PURE__ */ jsx(RuntimeWidgetBootstrap, {
 			fluidConfig,
-			initialWidgetRegistry,
-			ingestFluidWidgetsRegistry: config.ingestPreRegisteredWidgets !== false,
+			baseWidgetRegistry,
+			initialGlobalRegisteredWidgets,
+			shouldSubscribeToGlobalWidgetRegistry,
 			widgetPackageLoadPromise,
 			children: app
 		})
@@ -2850,11 +2950,12 @@ function createWidgetPackageLoadPromise(config, fluidConfig) {
 	const explicitWidgetPackages = dedupeWidgetPackagesByPackageIdAndVersion(config.widgetPackages ?? []);
 	const hasExplicitDescriptorEndpoint = config.widgetPackageManifestUrl !== void 0;
 	const descriptorEndpointUrl = hasExplicitDescriptorEndpoint ? config.widgetPackageManifestUrl ?? false : getDefaultWidgetPackageManifestUrl();
-	if (descriptorEndpointUrl === false) return explicitWidgetPackages.length ? loadWidgetPackages(explicitWidgetPackages) : void 0;
+	const loadOptions = { ignoreExistingGlobalRegistrations: config.ingestPreRegisteredWidgets === false };
+	if (descriptorEndpointUrl === false) return explicitWidgetPackages.length ? loadWidgetPackages(explicitWidgetPackages, loadOptions) : void 0;
 	const isOmittedHostedCatalog = !hasExplicitDescriptorEndpoint && descriptorEndpointUrl === "/api/app/widget-packages";
-	return loadFetchedAndExplicitWidgetPackages(explicitWidgetPackages, isOmittedHostedCatalog ? resolveHostedWidgetPackageManifestUrl(descriptorEndpointUrl, fluidConfig.baseUrl) : descriptorEndpointUrl, config.widgetPackageAllowedOrigins, isOmittedHostedCatalog, isOmittedHostedCatalog ? "include" : void 0);
+	return loadFetchedAndExplicitWidgetPackages(explicitWidgetPackages, isOmittedHostedCatalog ? resolveHostedWidgetPackageManifestUrl(descriptorEndpointUrl, fluidConfig.baseUrl) : descriptorEndpointUrl, config.widgetPackageAllowedOrigins, isOmittedHostedCatalog, isOmittedHostedCatalog ? "include" : void 0, loadOptions);
 }
-async function loadFetchedAndExplicitWidgetPackages(explicitWidgetPackages, descriptorEndpointUrl, widgetPackageAllowedOrigins, trustCatalogAssetOrigins, credentials) {
+async function loadFetchedAndExplicitWidgetPackages(explicitWidgetPackages, descriptorEndpointUrl, widgetPackageAllowedOrigins, trustCatalogAssetOrigins, credentials, loadOptions) {
 	let fetchedWidgetPackages = [];
 	try {
 		fetchedWidgetPackages = await fetchWidgetPackageDescriptors(descriptorEndpointUrl, {
@@ -2865,7 +2966,7 @@ async function loadFetchedAndExplicitWidgetPackages(explicitWidgetPackages, desc
 	} catch (error) {
 		console.warn("[portal] Failed to fetch widget package descriptors; continuing with explicit packages only:", error);
 	}
-	return loadWidgetPackages(dedupeWidgetPackagesByPackageIdAndVersion([...explicitWidgetPackages, ...fetchedWidgetPackages]));
+	return loadWidgetPackages(dedupeWidgetPackagesByPackageIdAndVersion([...explicitWidgetPackages, ...fetchedWidgetPackages]), loadOptions);
 }
 //#endregion
 //#region src/hooks/use-fluid-profile.ts