@fragmentsx/render-react 1.4.0 → 1.5.1

package/dist/index.cjs.js

@@ -3309,34 +3309,128 @@ const Instance = (props) => {
     }
   ) });
 };
-const useArea = (options) => {
-  var _a;
-  const { manager: resultGlobalManager } = useGlobalManager(
+const IDLE_STATE = {
+  data: null,
+  fetching: false,
+  error: null
+};
+const useAsyncLoadArea = (globalManager, areaCode, skip) => {
+  const [state, setState] = react.useState(IDLE_STATE);
+  const areaCodeRef = react.useRef(areaCode);
+  if (areaCodeRef.current !== areaCode) {
+    areaCodeRef.current = areaCode;
+    setState(IDLE_STATE);
+  }
+  react.useEffect(() => {
+    var _a, _b;
+    if (skip || !globalManager || !areaCode) return;
+    const cache = getSuspenseCache(globalManager);
+    const cacheKey = `area:${areaCode}`;
+    if (cache.has(cacheKey)) {
+      try {
+        const cached = cache.get(cacheKey).read();
+        setState({ data: cached, fetching: false, error: null });
+        return;
+      } catch (e) {
+        if (!(e instanceof Promise)) {
+          setState({ data: null, fetching: false, error: e });
+          return;
+        }
+      }
+    }
+    const valueOrPromise = cache.has(cacheKey) ? void 0 : (_b = (_a = globalManager.$load) == null ? void 0 : _a.loadArea) == null ? void 0 : _b.call(_a, areaCode);
+    if (valueOrPromise != null && !(valueOrPromise instanceof Promise)) {
+      createSuspenseResource(cacheKey, valueOrPromise, cache);
+      setState({ data: valueOrPromise, fetching: false, error: null });
+      return;
+    }
+    if (valueOrPromise instanceof Promise) {
+      createSuspenseResource(cacheKey, valueOrPromise, cache);
+    }
+    setState({ data: null, fetching: true, error: null });
+    let cancelled = false;
+    const resource = cache.get(cacheKey);
+    if (!resource) return;
+    try {
+      const data = resource.read();
+      if (!cancelled) {
+        setState({ data, fetching: false, error: null });
+      }
+    } catch (e) {
+      if (e instanceof Promise) {
+        e.then(() => {
+          if (cancelled) return;
+          try {
+            const data = resource.read();
+            setState({ data, fetching: false, error: null });
+          } catch (err) {
+            if (!cancelled) {
+              setState({ data: null, fetching: false, error: err });
+            }
+          }
+        });
+      } else if (!cancelled) {
+        setState({ data: null, fetching: false, error: e });
+      }
+    }
+    return () => {
+      cancelled = true;
+    };
+  }, [skip, globalManager, areaCode]);
+  if (skip) return IDLE_STATE;
+  return state;
+};
+const useArea = (areaCode, options) => {
+  const { manager: globalManager } = useGlobalManager(
     options == null ? void 0 : options.globalManager
   );
-  const ssr = ((_a = options == null ? void 0 : options.options) == null ? void 0 : _a.ssr) ?? true;
-  const areaData = useSuspenseLoadArea(
-    resultGlobalManager,
-    options.areaCode,
-    !(isBrowser || ssr)
+  const suspense = (options == null ? void 0 : options.suspense) ?? false;
+  const ssr = (options == null ? void 0 : options.ssr) ?? true;
+  const skip = !globalManager || !(isBrowser || ssr);
+  const suspenseData = useSuspenseLoadArea(
+    globalManager,
+    areaCode,
+    !suspense || skip
+  );
+  const asyncState = useAsyncLoadArea(
+    globalManager,
+    areaCode,
+    suspense || skip
+  );
+  if (skip) {
+    return { data: null, fetching: false, error: null };
+  }
+  if (suspense) {
+    return {
+      data: suspenseData ?? null,
+      fetching: false,
+      error: null
+    };
+  }
+  const throwOnError = (options == null ? void 0 : options.throwOnError) ?? true;
+  if (throwOnError && asyncState.error) {
+    throw asyncState.error;
+  }
+  return asyncState;
+};
+const AreaInitial = (areaProps) => {
+  var _a;
+  const { data: areaData } = useArea(areaProps.areaCode, {
+    suspense: true,
+    ssr: (_a = areaProps.options) == null ? void 0 : _a.ssr,
+    globalManager: areaProps.globalManager
+  });
+  const { manager: globalManager } = useGlobalManager(
+    areaProps.globalManager
   );
   const { manager: fragmentManager } = useFragmentManager(
     areaData == null ? void 0 : areaData.fragmentId,
-    resultGlobalManager
+    globalManager
   );
   const resultProps = react.useMemo(
-    () => ({ ...(areaData == null ? void 0 : areaData.props) ?? {}, ...(options == null ? void 0 : options.props) ?? {} }),
-    [areaData, options]
+    () => ({ ...(areaData == null ? void 0 : areaData.props) ?? {}, ...(areaProps == null ? void 0 : areaProps.props) ?? {} }),
+    [areaData, areaProps]
   );
-  return {
-    ...areaData,
-    fragmentManager,
-    props: resultProps,
-    globalManager: resultGlobalManager
-  };
-};
-const AreaInitial = (areaProps) => {
-  const areaData = useArea(areaProps);
   if (!areaData) return null;
   const areaManager = react.useMemo(
     () => clientCore.createAreaManager({
@@ -3350,14 +3444,14 @@ const AreaInitial = (areaProps) => {
   return /* @__PURE__ */ jsxRuntime.jsx(AreaManagerProvider, { value: areaManager, children: /* @__PURE__ */ jsxRuntime.jsx(
     Scope,
     {
-      fragmentManager: areaData.fragmentManager,
+      fragmentManager,
       layerKey: "Area",
       value: {
         type: definition.definition.scopeTypes.AreaScope,
         areaManager,
         ...areaData ?? {}
       },
-      children: /* @__PURE__ */ jsxRuntime.jsx(Instance, { fragmentId: areaData.fragmentId, props: areaData == null ? void 0 : areaData.props })
+      children: /* @__PURE__ */ jsxRuntime.jsx(Instance, { fragmentId: areaData.fragmentId, props: resultProps })
     }
   ) });
 };

package/dist/index.es.js

@@ -3307,34 +3307,128 @@ const Instance = (props) => {
     }
   ) });
 };
-const useArea = (options) => {
-  var _a;
-  const { manager: resultGlobalManager } = useGlobalManager(
+const IDLE_STATE = {
+  data: null,
+  fetching: false,
+  error: null
+};
+const useAsyncLoadArea = (globalManager, areaCode, skip) => {
+  const [state, setState] = useState(IDLE_STATE);
+  const areaCodeRef = useRef(areaCode);
+  if (areaCodeRef.current !== areaCode) {
+    areaCodeRef.current = areaCode;
+    setState(IDLE_STATE);
+  }
+  useEffect(() => {
+    var _a, _b;
+    if (skip || !globalManager || !areaCode) return;
+    const cache = getSuspenseCache(globalManager);
+    const cacheKey = `area:${areaCode}`;
+    if (cache.has(cacheKey)) {
+      try {
+        const cached = cache.get(cacheKey).read();
+        setState({ data: cached, fetching: false, error: null });
+        return;
+      } catch (e) {
+        if (!(e instanceof Promise)) {
+          setState({ data: null, fetching: false, error: e });
+          return;
+        }
+      }
+    }
+    const valueOrPromise = cache.has(cacheKey) ? void 0 : (_b = (_a = globalManager.$load) == null ? void 0 : _a.loadArea) == null ? void 0 : _b.call(_a, areaCode);
+    if (valueOrPromise != null && !(valueOrPromise instanceof Promise)) {
+      createSuspenseResource(cacheKey, valueOrPromise, cache);
+      setState({ data: valueOrPromise, fetching: false, error: null });
+      return;
+    }
+    if (valueOrPromise instanceof Promise) {
+      createSuspenseResource(cacheKey, valueOrPromise, cache);
+    }
+    setState({ data: null, fetching: true, error: null });
+    let cancelled = false;
+    const resource = cache.get(cacheKey);
+    if (!resource) return;
+    try {
+      const data = resource.read();
+      if (!cancelled) {
+        setState({ data, fetching: false, error: null });
+      }
+    } catch (e) {
+      if (e instanceof Promise) {
+        e.then(() => {
+          if (cancelled) return;
+          try {
+            const data = resource.read();
+            setState({ data, fetching: false, error: null });
+          } catch (err) {
+            if (!cancelled) {
+              setState({ data: null, fetching: false, error: err });
+            }
+          }
+        });
+      } else if (!cancelled) {
+        setState({ data: null, fetching: false, error: e });
+      }
+    }
+    return () => {
+      cancelled = true;
+    };
+  }, [skip, globalManager, areaCode]);
+  if (skip) return IDLE_STATE;
+  return state;
+};
+const useArea = (areaCode, options) => {
+  const { manager: globalManager } = useGlobalManager(
     options == null ? void 0 : options.globalManager
   );
-  const ssr = ((_a = options == null ? void 0 : options.options) == null ? void 0 : _a.ssr) ?? true;
-  const areaData = useSuspenseLoadArea(
-    resultGlobalManager,
-    options.areaCode,
-    !(isBrowser || ssr)
+  const suspense = (options == null ? void 0 : options.suspense) ?? false;
+  const ssr = (options == null ? void 0 : options.ssr) ?? true;
+  const skip = !globalManager || !(isBrowser || ssr);
+  const suspenseData = useSuspenseLoadArea(
+    globalManager,
+    areaCode,
+    !suspense || skip
+  );
+  const asyncState = useAsyncLoadArea(
+    globalManager,
+    areaCode,
+    suspense || skip
+  );
+  if (skip) {
+    return { data: null, fetching: false, error: null };
+  }
+  if (suspense) {
+    return {
+      data: suspenseData ?? null,
+      fetching: false,
+      error: null
+    };
+  }
+  const throwOnError = (options == null ? void 0 : options.throwOnError) ?? true;
+  if (throwOnError && asyncState.error) {
+    throw asyncState.error;
+  }
+  return asyncState;
+};
+const AreaInitial = (areaProps) => {
+  var _a;
+  const { data: areaData } = useArea(areaProps.areaCode, {
+    suspense: true,
+    ssr: (_a = areaProps.options) == null ? void 0 : _a.ssr,
+    globalManager: areaProps.globalManager
+  });
+  const { manager: globalManager } = useGlobalManager(
+    areaProps.globalManager
   );
   const { manager: fragmentManager } = useFragmentManager(
     areaData == null ? void 0 : areaData.fragmentId,
-    resultGlobalManager
+    globalManager
   );
   const resultProps = useMemo(
-    () => ({ ...(areaData == null ? void 0 : areaData.props) ?? {}, ...(options == null ? void 0 : options.props) ?? {} }),
-    [areaData, options]
+    () => ({ ...(areaData == null ? void 0 : areaData.props) ?? {}, ...(areaProps == null ? void 0 : areaProps.props) ?? {} }),
+    [areaData, areaProps]
   );
-  return {
-    ...areaData,
-    fragmentManager,
-    props: resultProps,
-    globalManager: resultGlobalManager
-  };
-};
-const AreaInitial = (areaProps) => {
-  const areaData = useArea(areaProps);
   if (!areaData) return null;
   const areaManager = useMemo(
     () => createAreaManager({
@@ -3348,14 +3442,14 @@ const AreaInitial = (areaProps) => {
   return /* @__PURE__ */ jsx(AreaManagerProvider, { value: areaManager, children: /* @__PURE__ */ jsx(
     Scope,
     {
-      fragmentManager: areaData.fragmentManager,
+      fragmentManager,
       layerKey: "Area",
       value: {
         type: definition.scopeTypes.AreaScope,
         areaManager,
         ...areaData ?? {}
       },
-      children: /* @__PURE__ */ jsx(Instance, { fragmentId: areaData.fragmentId, props: areaData == null ? void 0 : areaData.props })
+      children: /* @__PURE__ */ jsx(Instance, { fragmentId: areaData.fragmentId, props: resultProps })
     }
   ) });
 };

package/dist/nodes/Area/Area.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Area.d.ts","sourceRoot":"","sources":["../../../src/nodes/Area/Area.tsx"],"names":[],"mappings":"AAQA,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE;QACR,GAAG,CAAC,EAAE,OAAO,CAAC;KACf,CAAC;CACH;AAmCD,eAAO,MAAM,IAAI,UAAW,SAAS,4CAYpC,CAAC"}
+{"version":3,"file":"Area.d.ts","sourceRoot":"","sources":["../../../src/nodes/Area/Area.tsx"],"names":[],"mappings":"AAUA,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE;QACR,GAAG,CAAC,EAAE,OAAO,CAAC;KACf,CAAC;CACH;AAqDD,eAAO,MAAM,IAAI,UAAW,SAAS,4CAYpC,CAAC"}

package/dist/nodes/Area/hooks/useArea.d.ts

@@ -1,8 +1,3 @@
-import { AreaProps } from '../Area';
-export declare const useArea: (options: AreaProps) => {
-    fragmentManager: any;
-    props: {};
-    globalManager: import('@graph-state/core').GraphState<import('@graph-state/core').SystemFields, string> | null;
-    fragmentId?: number | undefined;
-};
+import { UseAreaOptions, UseAreaResult } from './useArea.types';
+export declare const useArea: (areaCode: string, options?: UseAreaOptions) => UseAreaResult;
 //# sourceMappingURL=useArea.d.ts.map

package/dist/nodes/Area/hooks/useArea.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useArea.d.ts","sourceRoot":"","sources":["../../../../src/nodes/Area/hooks/useArea.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAMpC,eAAO,MAAM,OAAO,YAAa,SAAS;;;;;CA4BzC,CAAC"}
+{"version":3,"file":"useArea.d.ts","sourceRoot":"","sources":["../../../../src/nodes/Area/hooks/useArea.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAY,MAAM,iBAAiB,CAAC;AAE/E,eAAO,MAAM,OAAO,aACR,MAAM,YACN,cAAc,KACvB,aAwCF,CAAC"}

package/dist/nodes/Area/hooks/useArea.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=useArea.test.d.ts.map

package/dist/nodes/Area/hooks/useArea.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useArea.test.d.ts","sourceRoot":"","sources":["../../../../src/nodes/Area/hooks/useArea.test.tsx"],"names":[],"mappings":""}

package/dist/nodes/Area/hooks/useArea.types.d.ts

@@ -0,0 +1,22 @@
+export interface UseAreaOptions {
+    /** @default false */
+    suspense?: boolean;
+    throwOnError?: boolean;
+    globalManager?: unknown;
+    /** Загружать данные при SSR. @default true */
+    ssr?: boolean;
+}
+export interface AreaData {
+    fragmentId: number;
+    props: unknown;
+    areaId: string;
+    campaignId: string;
+    variantId: string;
+    areaProperties?: unknown;
+}
+export interface UseAreaResult {
+    data: AreaData | null;
+    fetching: boolean;
+    error: unknown;
+}
+//# sourceMappingURL=useArea.types.d.ts.map

package/dist/nodes/Area/hooks/useArea.types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useArea.types.d.ts","sourceRoot":"","sources":["../../../../src/nodes/Area/hooks/useArea.types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,8CAA8C;IAC9C,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,QAAQ;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;CAChB"}

package/dist/nodes/Area/hooks/useAsyncLoadArea.d.ts

@@ -0,0 +1,15 @@
+import { GraphState } from '@graph-state/core';
+import { AreaData } from './useArea.types';
+interface AsyncLoadState {
+    data: AreaData | null;
+    fetching: boolean;
+    error: unknown;
+}
+/**
+ * Хук для асинхронной загрузки данных Area без Suspense.
+ * Возвращает { data, fetching, error } — классический паттерн async state.
+ * Использует suspense-кеш для совместимости с Suspense-версией.
+ */
+export declare const useAsyncLoadArea: (globalManager: GraphState | null | undefined, areaCode: string, skip: boolean) => AsyncLoadState;
+export {};
+//# sourceMappingURL=useAsyncLoadArea.d.ts.map

package/dist/nodes/Area/hooks/useAsyncLoadArea.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useAsyncLoadArea.d.ts","sourceRoot":"","sources":["../../../../src/nodes/Area/hooks/useAsyncLoadArea.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAK/C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEhD,UAAU,cAAc;IACtB,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;CAChB;AAQD;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,kBACZ,UAAU,GAAG,IAAI,GAAG,SAAS,YAClC,MAAM,QACV,OAAO,KACZ,cAuFF,CAAC"}

package/dist/nodes/Area/hooks/useAsyncLoadArea.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=useAsyncLoadArea.test.d.ts.map

package/dist/nodes/Area/hooks/useAsyncLoadArea.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useAsyncLoadArea.test.d.ts","sourceRoot":"","sources":["../../../../src/nodes/Area/hooks/useAsyncLoadArea.test.tsx"],"names":[],"mappings":""}

package/dist/nodes/Area/index.d.ts

@@ -1,4 +1,5 @@
 export { Area } from './Area';
 export type { AreaProps } from './Area';
 export { useArea } from './hooks/useArea';
+export type { UseAreaOptions, UseAreaResult, AreaData, } from './hooks/useArea.types';
 //# sourceMappingURL=index.d.ts.map

package/dist/nodes/Area/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/nodes/Area/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,YAAY,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/nodes/Area/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,YAAY,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAC1C,YAAY,EACV,cAAc,EACd,aAAa,EACb,QAAQ,GACT,MAAM,uBAAuB,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fragmentsx/render-react",
   "private": false,
-  "version": "1.4.0",
+  "version": "1.5.1",
   "type": "module",
   "files": [
     "dist"
@@ -27,8 +27,8 @@
     "@graph-state/core": "^0.13.2",
     "@graph-state/react": "^0.8.3",
     "react-use-measure": "^2.1.7",
-    "@fragmentsx/client-core": "0.4.0",
     "@fragmentsx/definition": "0.2.2",
+    "@fragmentsx/client-core": "0.4.0",
     "@fragmentsx/utils": "0.2.0"
   },
   "devDependencies": {