@ramesesinc/platform-core 0.1.9 → 0.1.10

package/dist/components/view/HtmlForm.js

@@ -1,10 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { localAPI } from "@ramesesinc/lib/local-api";
-import React, { useEffect, useMemo, useState } from "react";
-import { useApp } from "../../core/AppContext";
 import { DynamicComponent } from "../../core/DynamicComponent";
+import { useApp } from "../../core/AppContext";
 import useDependHandler from "../../core/UIDependHandler";
+import { localAPI } from "@ramesesinc/lib/local-api";
+import { useEffect, useMemo, useState } from "react";
 import UIComponent from "../common/UIComponent";
+import React from "react";
 // ─────────────────────────────────────────────────────────────────────────────
 // Attr Parser
 // Handles both strict JSON {"key":"value"} and JS object literals {key: "value"}
@@ -18,9 +19,7 @@ function parseAttr(attrStr) {
     catch (_a) {
         try {
             // eslint-disable-next-line no-new-func
-            // return new Function(`"use strict"; return (${attrStr})`)();
-            const normalized = attrStr.replace(/([{,]\s*)([a-zA-Z_$][a-zA-Z0-9_$]*)(\s*:)/g, '$1"$2"$3').replace(/'([^'\\]*(\\.[^'\\]*)*)'/g, '"$1"');
-            return JSON.parse(normalized);
+            return new Function(`"use strict"; return (${attrStr})`)();
         }
         catch (_b) {
             console.warn("HtmlForm: could not parse attr →", attrStr);
@@ -60,7 +59,9 @@ function domAttrsToProps(el) {
         if (["component", "attr"].includes(attr.name))
             continue;
         const reactName = (_a = ATTR_MAP[attr.name]) !== null && _a !== void 0 ? _a : attr.name;
-        props[reactName] = attr.name === "style" ? styleStringToObject(attr.value) : attr.value;
+        props[reactName] = attr.name === "style"
+            ? styleStringToObject(attr.value)
+            : attr.value;
     }
     return props;
 }
@@ -94,14 +95,16 @@ function walkNode(node, parentTag) {
         if (tag === "span" && componentName) {
             const attr = parseAttr(el.getAttribute("attr"));
             const config = { component: componentName, attr };
-            return _jsx(DynamicComponent, { config: config }, nextKey());
+            return (_jsx(DynamicComponent, { config: config }, nextKey()));
         }
         // ── Regular element → recurse ──────────────────────────────────────────
         const props = Object.assign(Object.assign({}, domAttrsToProps(el)), { key: nextKey() });
         const children = Array.from(el.childNodes)
             .map((child) => walkNode(child, tag)) // pass current tag as parentTag
             .filter((n) => n !== null && n !== undefined);
-        return children.length > 0 ? React.createElement(tag, props, ...children) : React.createElement(tag, props);
+        return children.length > 0
+            ? React.createElement(tag, props, ...children)
+            : React.createElement(tag, props);
     }
     return null;
 }

package/dist/components/view/PageView.js

@@ -1,12 +1,11 @@
 "use client";
 import { createElement as _createElement } from "react";
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-import { forwardRef, memo, useEffect, useImperativeHandle, useRef, useState } from "react";
+import { forwardRef, memo, useEffect, useImperativeHandle, useMemo, useRef, useState } from "react";
 import Page from "../../core/Page";
 import { usePageContext } from "../../core/PageContext";
 import { PageViewProvider, usePageViewContext } from "../../core/PageViewContext";
 import useDependHandler from "../../core/UIDependHandler";
-import { useUrlParams } from "../../hooks/useUrlParams";
 import UIComponent from "../common/UIComponent";
 const StableShell = memo((props) => {
     const { uiProps, slotRef, handle, paths } = props !== null && props !== void 0 ? props : {};
@@ -16,15 +15,16 @@ const PageView = memo((props) => {
     const { name = "selectedPage", depends, url } = props !== null && props !== void 0 ? props : {};
     const [forceUpdate, setForceUpdate] = useState({});
     const providerRef = useRef({});
-    const { setAnchorPath } = useUrlParams();
     const slotRef = useRef(null);
     const pageContext = usePageContext();
-    const [ownPaths, setOwnPaths] = useState([]);
     const isEmpty = (value) => value == null || value.trim() === "";
     const pageView = usePageViewContext();
+    const [ownPaths, setOwnPaths] = useState([]);
+    const pathsRef = useRef([]);
     let preferredName = isEmpty(name) ? depends : name;
     let preferredDepends = isEmpty(depends) ? preferredName : depends;
-    const newProps = Object.assign(Object.assign({}, props), { name: preferredName, depends: preferredDepends });
+    // const newProps = { ...props, name: preferredName, depends: preferredDepends };
+    const newProps = useMemo(() => (Object.assign(Object.assign({}, props), { name: preferredName, depends: preferredDepends })), [props, preferredName, preferredDepends]);
     const propsRef = useRef(newProps);
     useEffect(() => {
         propsRef.current = newProps;
@@ -40,6 +40,32 @@ const PageView = memo((props) => {
     useEffect(() => {
         getUrlRef.current = getUrl;
     });
+    useEffect(() => {
+        var _a;
+        let paths = [];
+        let firstPath = null;
+        if (url == null) {
+            const value = pageContext.get(preferredName !== null && preferredName !== void 0 ? preferredName : "");
+            if (value == null) {
+                // only use subPaths if this pageView is directly under root
+                if (pageView.isRootView()) {
+                    paths = (_a = pageView.getSubPaths()) !== null && _a !== void 0 ? _a : [];
+                }
+            }
+            else {
+                paths = String(value).split("#");
+            }
+        }
+        else {
+            paths = String(url).split("#");
+        }
+        [firstPath] = paths;
+        if (firstPath == null || firstPath.trim() === "")
+            return;
+        pathsRef.current = paths;
+        setOwnPaths([firstPath]); // ← track own paths
+        pageViewHandleRef.current.renderPage(firstPath);
+    }, []);
     // Stable handle — never recreated
     const pageViewHandleRef = useRef({
         displayName: "PageView#pageViewHandle",
@@ -62,8 +88,8 @@ const PageView = memo((props) => {
             return pageView == null ? true : pageView.isStandalone();
         },
     });
-    const onRefresh = (val) => {
-        setForceUpdate({ val }); // ← carry the value
+    const onRefresh = () => {
+        setForceUpdate({});
     };
     useDependHandler({ name: newProps.depends, onRefresh });
     useEffect(() => {
@@ -71,10 +97,11 @@ const PageView = memo((props) => {
         if (prov == null || typeof prov.setPage !== "function")
             return;
         const url = getUrlRef.current();
-        // console.log("pageView forceUpdate", url, providerRef.current);
         providerRef.current.setPage(url);
     }, [forceUpdate]);
-    return _jsx(StableShell, { uiProps: newProps, handle: pageViewHandleRef.current, slotRef: slotRef, paths: ownPaths });
+    return (_jsx(StableShell, { uiProps: newProps, handle: pageViewHandleRef.current, slotRef: slotRef, 
+        // paths={pathsRef.current}
+        paths: ownPaths }));
 });
 const PageSlot = memo(forwardRef((_, ref) => {
     const [content, setContent] = useState(null);

package/dist/components/view/RootView.js

@@ -1,4 +1,4 @@
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { getError } from "@ramesesinc/client";
 import { forwardRef, memo, useEffect, useImperativeHandle, useLayoutEffect, useRef, useState } from "react";
 import Page from "../../core/Page";
@@ -16,6 +16,7 @@ const RootView = (props) => {
         try {
             // console.log("RootView loadPage", path); // main#tasklist
             const pageUUID = "page-" + Math.random().toString(36).slice(2);
+            const newUrl = url.split("#");
             comp = _jsx(Page, { url: path }, pageUUID);
         }
         catch (error) {
@@ -29,24 +30,24 @@ const RootView = (props) => {
         (_a = slotRef.current) === null || _a === void 0 ? void 0 : _a.update(comp);
     };
     useLayoutEffect(() => {
-        const paths = (url == null || url.trim() === "" ? "" : url).split("#");
-        // console.log("RootView useLayoutEffect ", url, paths);
-        const [firstPath] = paths;
-        mainPath.current = firstPath;
-        setPaths(paths);
+        const splitPaths = (url == null || url.trim() === "" ? "" : url).split("#");
+        const [mainPage] = splitPaths;
+        mainPath.current = mainPage;
+        setPaths(splitPaths);
     }, [url]);
+    // fires when paths changes — handles both initial load and url change
     useEffect(() => {
-        // this routine is for the initial loading
-        // pass the original url
-        loadPage(url);
-        setReInitPage(false);
+        if (paths.length === 0)
+            return;
+        loadPage(paths[0]);
     }, [paths]);
+    // fires when mode=window navigation happens
+    // setPaths first, then loadPage is triggered by paths useEffect
     useEffect(() => {
-        if (reInitPage) {
-            // let the initial loading take effect
+        if (newRootPath == null)
             return;
-        }
-        loadPage(newRootPath);
+        setPaths([newRootPath]); // ← paths updates first
+        // loadPage will be called by paths useEffect after setPaths takes effect
     }, [newRootPath]);
     const pageViewHandle = {
         displayName: "RootView#pageViewHandle",
@@ -54,7 +55,6 @@ const RootView = (props) => {
             providerRef.current = ref;
         },
         renderPage: (page) => {
-            // console.log("RootView renderPage", page);
             setNewRootPath(page);
         },
         isStandalone: () => standalone,
@@ -71,5 +71,5 @@ const ChildrenSlot = memo(forwardRef((_, ref) => {
             setContent(content);
         },
     }), []);
-    return _jsx(_Fragment, { children: content == null ? null : content });
+    return _jsx("div", { className: "px-2", children: content == null ? null : content });
 }));

package/dist/core/AuthContext.js

@@ -1,8 +1,8 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 // lib/context/AuthContext.tsx
 import { createContext, useContext, useEffect, useState } from "react";
-import * as auth from "../core/auth";
 import { useApp } from "./AppContext";
+import * as auth from "./auth";
 export const useAuth = () => {
     const ctx = useContext(AuthContext);
     if (!ctx)

package/dist/core/Page.js

@@ -101,10 +101,8 @@ const Page = (props) => {
                 params = res === null || res === void 0 ? void 0 : res.params;
             }
             const resolveParams = replaceValues(req.params, params);
-            // console.log("Page fetchData params", uuid, value, {params, resolveParams});
-            const resp = await pageContext.current.execService(req.api, resolveParams);
-            const { data } = resp !== null && resp !== void 0 ? resp : {};
-            result = data !== null && data !== void 0 ? data : resp;
+            // console.log("page fetchData exec service 1.2", req.api, resolveParams);
+            result = await pageContext.current.execService(req.api, resolveParams);
         }
         return result;
     }, [value]);

package/dist/core/PageCache.d.ts

@@ -6,10 +6,8 @@ interface CacheFallback {
 export declare const getPage: (name: string, fallback: CacheFallback) => Promise<{
     template: import("react/jsx-runtime").JSX.Element;
     pageInfo: null;
-    hasSelectionHandling?: undefined;
 } | {
     template: React.DetailedReactHTMLElement<React.HTMLAttributes<HTMLElement>, HTMLElement>;
     pageInfo: any;
-    hasSelectionHandling: any;
 }>;
 export {};

package/dist/core/PageCache.js

@@ -5,11 +5,6 @@ import React from "react";
 import { DynamicTemplate } from "./DynamicTemplate";
 // Simple in-memory cache
 const cache = {};
-// const getPlatformInfo = async () => {
-//   const platform = await localAPI.getPlatform();
-//   const { multi_tenant, tenant_name } = platform ?? {};
-//   return { multi_tenant, tenant_name };
-// };
 export const getPage = async (name, fallback) => {
     let { getTenant: tenant, getModule: module } = fallback;
     const key = `${module}/${name}`; // ✅ unique per module
@@ -30,10 +25,10 @@ export const getPage = async (name, fallback) => {
         delete pageInfo.template;
         delete pageInfo.attr;
         const tmpl = _jsx(DynamicTemplate, { template: template, attr: Object.assign(Object.assign({}, attr), { title }) });
-        const hasSelectionHandling = template === "ExplorerTemplate";
-        cache[key] = { template: tmpl, pageInfo, hasSelectionHandling };
+        // const hasSelectionHandling = template === "ExplorerTemplate";
+        cache[key] = { template: tmpl, pageInfo /*, hasSelectionHandling*/ };
     }
     const pageCache = cache[key];
     const newTemplate = React.cloneElement(pageCache.template);
-    return { template: newTemplate, pageInfo: pageCache.pageInfo, hasSelectionHandling: pageCache.hasSelectionHandling };
+    return { template: newTemplate, pageInfo: pageCache.pageInfo /*, hasSelectionHandling: pageCache.hasSelectionHandling*/ };
 };

package/dist/core/PageContext.js

@@ -38,6 +38,18 @@ export const PageProvider = ({ handle, children }) => {
     const parentContext = useContext(PageContext);
     const pageView = usePageViewContext();
     const binding = useBinding();
+    useLayoutEffect(() => {
+        var _a;
+        if (handle == null)
+            return;
+        handle.init(contextValue);
+        // load params from pageChain into binding
+        const chainInfo = pageView.getPageChainInfo();
+        const viewParams = (_a = chainInfo === null || chainInfo === void 0 ? void 0 : chainInfo.params) !== null && _a !== void 0 ? _a : {};
+        Object.keys(viewParams).forEach((k) => {
+            set(k, viewParams[k]);
+        });
+    }, []);
     // setup the selectedPath from the handle
     useMemo(() => {
         // useLayoutEffect(() => {

package/dist/core/PageViewContext.d.ts

@@ -22,7 +22,6 @@ export type PageViewContextValue = {
     getTitle: () => string | null;
     setTitle: (title: string | null) => void;
     setPage: (page: string | null, options?: PageOptions) => void;
-    setSelectedPage: (page: string | null) => void;
     getSelectedPage: () => string | null;
     pushPage: (page: string) => void;
     popPage: () => void;
@@ -32,6 +31,12 @@ export type PageViewContextValue = {
     setSelectionHandling: (hasHandling: boolean) => void;
     getOriginalLocationInfo: () => PageChainInfo | null;
     getEventHandler: () => EventHandler | null;
+    isRootView: () => boolean;
+    getUrl: () => string;
+    getPage: () => string;
+    getParams: () => Record<string, string>;
+    getSubPaths: () => string[];
+    getPageChainInfo: () => PageChainInfo;
 };
 export type PageViewHandle = {
     init: (ref: PageViewContextValue) => void;
@@ -39,11 +44,12 @@ export type PageViewHandle = {
     isStandalone: () => boolean;
 };
 export type PageSelectionHandler = {};
-type PageChainInfo = {
+export type PageChainInfo = {
     path: string;
     base: string;
     page: string;
     options: PageOptions;
+    params: Record<string, any>;
 };
 type PageViewProviderProps = {
     paths: string[];