@servlyadmin/runtime-react 0.1.37 → 0.1.40

package/dist/index.cjs

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -37,7 +47,7 @@ __export(index_exports, {
 module.exports = __toCommonJS(index_exports);
 
 // src/ServlyComponent.tsx
-var import_react = require("react");
+var import_react = __toESM(require("react"), 1);
 var import_react_dom = require("react-dom");
 var import_runtime_core = require("@servlyadmin/runtime-core");
 var import_jsx_runtime = require("react/jsx-runtime");
@@ -98,6 +108,9 @@ var ErrorDisplay = ({ error, onRetry, className, style }) => /* @__PURE__ */ (0,
     ]
   }
 );
+function isReactElement(value) {
+  return import_react.default.isValidElement(value);
+}
 function useSlotElements(containerRef, isRendered) {
   const [slotElements, setSlotElements] = (0, import_react.useState)({});
   (0, import_react.useEffect)(() => {
@@ -143,13 +156,27 @@ function ServlyComponent({
     data: null
   });
   const slotElements = useSlotElements(containerRef, isRendered);
+  const slotBindings = (0, import_react.useMemo)(() => {
+    if (!state.data?.layout) return /* @__PURE__ */ new Map();
+    return (0, import_runtime_core.extractSlotBindings)(state.data.layout);
+  }, [state.data?.layout]);
   const effectiveSlots = (0, import_react.useMemo)(() => {
     const result = { ...slots };
     if (children && !result.default) {
       result.default = children;
     }
+    if (props && typeof props === "object") {
+      for (const [propName, propValue] of Object.entries(props)) {
+        if (isReactElement(propValue)) {
+          const slotId = slotBindings.get(propName);
+          if (slotId && !result[slotId]) {
+            result[slotId] = propValue;
+          }
+        }
+      }
+    }
     return result;
-  }, [slots, children]);
+  }, [slots, children, props, slotBindings]);
   const loadComponent = (0, import_react.useCallback)(async () => {
     if (abortControllerRef.current) {
       abortControllerRef.current.abort();

package/dist/index.js

@@ -1,11 +1,12 @@
 // src/ServlyComponent.tsx
-import { useRef, useEffect, useState, useCallback, useMemo } from "react";
+import React, { useRef, useEffect, useState, useCallback, useMemo } from "react";
 import { createPortal } from "react-dom";
 import {
   render,
   fetchComponent,
   markElementReady,
-  injectTailwind
+  injectTailwind,
+  extractSlotBindings
 } from "@servlyadmin/runtime-core";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 if (typeof document !== "undefined") {
@@ -65,6 +66,9 @@ var ErrorDisplay = ({ error, onRetry, className, style }) => /* @__PURE__ */ jsx
     ]
   }
 );
+function isReactElement(value) {
+  return React.isValidElement(value);
+}
 function useSlotElements(containerRef, isRendered) {
   const [slotElements, setSlotElements] = useState({});
   useEffect(() => {
@@ -110,13 +114,27 @@ function ServlyComponent({
     data: null
   });
   const slotElements = useSlotElements(containerRef, isRendered);
+  const slotBindings = useMemo(() => {
+    if (!state.data?.layout) return /* @__PURE__ */ new Map();
+    return extractSlotBindings(state.data.layout);
+  }, [state.data?.layout]);
   const effectiveSlots = useMemo(() => {
     const result = { ...slots };
     if (children && !result.default) {
       result.default = children;
     }
+    if (props && typeof props === "object") {
+      for (const [propName, propValue] of Object.entries(props)) {
+        if (isReactElement(propValue)) {
+          const slotId = slotBindings.get(propName);
+          if (slotId && !result[slotId]) {
+            result[slotId] = propValue;
+          }
+        }
+      }
+    }
     return result;
-  }, [slots, children]);
+  }, [slots, children, props, slotBindings]);
   const loadComponent = useCallback(async () => {
     if (abortControllerRef.current) {
       abortControllerRef.current.abort();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@servlyadmin/runtime-react",
-  "version": "0.1.37",
+  "version": "0.1.40",
   "description": "React wrapper for Servly runtime renderer",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -36,7 +36,7 @@
     "react-dom": ">=17.0.0"
   },
   "dependencies": {
-    "@servlyadmin/runtime-core": "^0.1.44"
+    "@servlyadmin/runtime-core": "^0.1.46"
   },
   "devDependencies": {
     "@types/react": "^18.2.0",
@@ -46,4 +46,4 @@
     "tsup": "^8.0.0",
     "typescript": "^5.3.0"
   }
-}
+}

package/dist/index.d.cts

@@ -1,52 +0,0 @@
-import React from 'react';
-import { CacheStrategy, RetryConfig } from '@servlyadmin/runtime-core';
-export { BindingContext, CacheStrategy, ComponentData, FetchOptions, LayoutElement, PropDefinition, RetryConfig, clearAllCaches, compareVersions, fetchComponent, getRegistryUrl, invalidateCache, isComponentAvailable, parseVersion, prefetchComponents, resolveVersion, satisfiesVersion, setRegistryUrl } from '@servlyadmin/runtime-core';
-
-/**
- * ServlyComponent
- * React wrapper for Servly runtime renderer with slot support
- */
-
-/**
- * Slot content type - React nodes keyed by slot name
- */
-type SlotContent = Record<string, React.ReactNode>;
-/**
- * Props for ServlyComponent
- */
-interface ServlyComponentProps<P = Record<string, any>> {
-    /** Component ID from the registry */
-    id: string;
-    /** Version specifier (exact, range, or "latest") */
-    version?: string;
-    /** Props to pass to the component */
-    props?: P;
-    /** Slot content - React nodes to portal into named slots */
-    slots?: SlotContent;
-    /** Fallback UI while loading or on error */
-    fallback?: React.ReactNode;
-    /** Error callback */
-    onError?: (error: Error) => void;
-    /** Load complete callback */
-    onLoad?: () => void;
-    /** Custom className for wrapper */
-    className?: string;
-    /** Custom styles for wrapper */
-    style?: React.CSSProperties;
-    /** Show loading skeleton */
-    showSkeleton?: boolean;
-    /** Cache strategy */
-    cacheStrategy?: CacheStrategy;
-    /** Retry configuration */
-    retryConfig?: Partial<RetryConfig>;
-    /** Event handlers keyed by element ID then event name */
-    eventHandlers?: Record<string, Record<string, (e: Event) => void>>;
-    /** Children - rendered into default slot if no slots prop */
-    children?: React.ReactNode;
-}
-/**
- * ServlyComponent - React wrapper for Servly runtime with slot support
- */
-declare function ServlyComponent<P = Record<string, any>>({ id, version, props, slots, fallback, onError, onLoad, className, style, showSkeleton, cacheStrategy, retryConfig, eventHandlers, children, }: ServlyComponentProps<P>): React.ReactElement | null;
-
-export { ServlyComponent, type ServlyComponentProps, ServlyComponent as default };

package/dist/index.d.ts

@@ -1,52 +0,0 @@
-import React from 'react';
-import { CacheStrategy, RetryConfig } from '@servlyadmin/runtime-core';
-export { BindingContext, CacheStrategy, ComponentData, FetchOptions, LayoutElement, PropDefinition, RetryConfig, clearAllCaches, compareVersions, fetchComponent, getRegistryUrl, invalidateCache, isComponentAvailable, parseVersion, prefetchComponents, resolveVersion, satisfiesVersion, setRegistryUrl } from '@servlyadmin/runtime-core';
-
-/**
- * ServlyComponent
- * React wrapper for Servly runtime renderer with slot support
- */
-
-/**
- * Slot content type - React nodes keyed by slot name
- */
-type SlotContent = Record<string, React.ReactNode>;
-/**
- * Props for ServlyComponent
- */
-interface ServlyComponentProps<P = Record<string, any>> {
-    /** Component ID from the registry */
-    id: string;
-    /** Version specifier (exact, range, or "latest") */
-    version?: string;
-    /** Props to pass to the component */
-    props?: P;
-    /** Slot content - React nodes to portal into named slots */
-    slots?: SlotContent;
-    /** Fallback UI while loading or on error */
-    fallback?: React.ReactNode;
-    /** Error callback */
-    onError?: (error: Error) => void;
-    /** Load complete callback */
-    onLoad?: () => void;
-    /** Custom className for wrapper */
-    className?: string;
-    /** Custom styles for wrapper */
-    style?: React.CSSProperties;
-    /** Show loading skeleton */
-    showSkeleton?: boolean;
-    /** Cache strategy */
-    cacheStrategy?: CacheStrategy;
-    /** Retry configuration */
-    retryConfig?: Partial<RetryConfig>;
-    /** Event handlers keyed by element ID then event name */
-    eventHandlers?: Record<string, Record<string, (e: Event) => void>>;
-    /** Children - rendered into default slot if no slots prop */
-    children?: React.ReactNode;
-}
-/**
- * ServlyComponent - React wrapper for Servly runtime with slot support
- */
-declare function ServlyComponent<P = Record<string, any>>({ id, version, props, slots, fallback, onError, onLoad, className, style, showSkeleton, cacheStrategy, retryConfig, eventHandlers, children, }: ServlyComponentProps<P>): React.ReactElement | null;
-
-export { ServlyComponent, type ServlyComponentProps, ServlyComponent as default };