@definite-app/data-apps 1.0.0 → 1.0.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@definite-app/data-apps",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Build source-authored React data apps that compile to a single HTML file with DuckDB WASM and Perspective.js.",
   "type": "module",
   "license": "Apache-2.0",

package/runtime/definite-runtime.tsx

@@ -8,10 +8,39 @@ type DatasetKind = "table" | "database";
 type DataAppErrorSeverity = "warning" | "error" | "fatal";
 type DataAppErrorPhase = "bridge" | "resolve" | "fetch" | "duckdb" | "perspective" | "render" | "uncaught";
 
+/**
+ * Logged-in viewer. Null in publicMode (no authenticated session).
+ * Mirrors BridgeUser in wax/src/utils/fi/dataBridge.ts.
+ */
+export type DefiniteUser = {
+  id: string;
+  email: string;
+  role: "guest" | "viewer" | "analyst" | "admin" | "embedded_viewer" | null;
+  avatar: string | null;
+  createdAt: string | null;
+  updatedAt: string | null;
+  lastSignInAt: string | null;
+};
+
+/**
+ * Active team. Null in publicMode.
+ * Mirrors BridgeTeam in wax/src/utils/fi/dataBridge.ts.
+ */
+export type DefiniteTeam = {
+  id: string;
+  domain: string;
+  plan: "trial" | "free" | "standard" | "enterprise" | null;
+  createdAt: string | null;
+  updatedAt: string | null;
+  trialEndAt: string | null;
+};
+
 type DefiniteContext = {
   publicMode: boolean;
   driveFile: string | null;
   appVersion: "v1" | "v2";
+  user: DefiniteUser | null;
+  team: DefiniteTeam | null;
 };
 
 type ResourceCacheDetails = {
@@ -235,10 +264,15 @@ function getEmbeddedBridge(): DefiniteBridge | null {
       return { ...resolved, kind: "json" };
     },
     async getContext() {
+      // Embedded mode resolves identity server-side via the Bearer token; the
+      // runtime doesn't have direct access to those fields, so we surface null
+      // until the embed endpoint widens its handshake.
       return {
         publicMode: false,
         driveFile: ctx.driveFile,
         appVersion: "v2",
+        user: null,
+        team: null,
       } satisfies DefiniteContext;
     },
     reportError(error) {
@@ -486,6 +520,8 @@ function getPreviewBridge(): DefiniteBridge | null {
         publicMode: false,
         driveFile: "preview://data-apps-v2",
         appVersion: "v2",
+        user: null,
+        team: null,
         ...(previewData.context ?? {}),
       } satisfies DefiniteContext;
     },
@@ -1383,6 +1419,36 @@ async function loadJsonResource<T>(
   return { data: value, cache };
 }
 
+// React hook for reading the host-injected viewer context. Returns null until
+// the bridge resolves; in the wax-injected case (the common path) this is
+// effectively synchronous because `window.Definite._context` is already set
+// when the iframe script runs, so the initial render already has a value.
+export function useDefiniteContext(): DefiniteContext | null {
+  const [ctx, setCtx] = useState<DefiniteContext | null>(() => {
+    // Synchronous fast path: wax injects `_context` into `window.Definite`
+    // before any app code runs, so we can read it on first render.
+    const injected = (window as unknown as { Definite?: { _context?: DefiniteContext } }).Definite?._context;
+    return injected ?? null;
+  });
+
+  useEffect(() => {
+    let cancelled = false;
+    getBridge()
+      .getContext()
+      .then((next) => {
+        if (!cancelled) setCtx(next);
+      })
+      .catch((err) => {
+        console.error("[data-apps] useDefiniteContext: getContext() failed", err);
+      });
+    return () => {
+      cancelled = true;
+    };
+  }, []);
+
+  return ctx;
+}
+
 export function useDataset(key: string, opts?: { mode?: DataAppMode }): DatasetHandle {
   const mode = opts?.mode ?? "auto";
   const [state, setState] = useState<DatasetHandle>({
@@ -3117,9 +3183,24 @@ export function EChart(props: {
   const instanceRef = useRef<any>(null);
   const onClickRef = useRef(props.onClick);
   onClickRef.current = props.onClick;
-  const serializedOption = useMemo(() => JSON.stringify(props.option), [props.option]);
+  // Change-detection key ONLY. JSON.stringify drops function values, so the
+  // serialized string must never be parsed back into the object handed to
+  // ECharts -- a JSON round-trip silently deletes every axisLabel/tooltip/
+  // label `formatter` function, leaving only string-template formatters.
+  const optionKey = useMemo(() => JSON.stringify(props.option), [props.option]);
+  const optionRef = useRef(props.option);
+  optionRef.current = props.option;
   const echartsTheme = (props.theme ?? "dark") === "light" ? "light" : "dark";
 
+  // Apply the live option object (functions intact) to an ECharts instance.
+  const applyOption = (instance: any) => {
+    const opt = optionRef.current;
+    instance.setOption(
+      opt.backgroundColor ? opt : { ...opt, backgroundColor: "transparent" },
+      true,
+    );
+  };
+
   // Init / re-init on theme change
   useEffect(() => {
     const el = containerRef.current;
@@ -3134,9 +3215,7 @@ export function EChart(props: {
     instanceRef.current = instance;
 
     try {
-      const opt = JSON.parse(serializedOption);
-      if (!opt.backgroundColor) opt.backgroundColor = "transparent";
-      instance.setOption(opt, true);
+      applyOption(instance);
     } catch (e) {
       console.error("[EChart] setOption failed", e);
     }
@@ -3159,13 +3238,11 @@ export function EChart(props: {
   useEffect(() => {
     if (!instanceRef.current) return;
     try {
-      const opt = JSON.parse(serializedOption);
-      if (!opt.backgroundColor) opt.backgroundColor = "transparent";
-      instanceRef.current.setOption(opt, true);
+      applyOption(instanceRef.current);
     } catch (e) {
       console.error("[EChart] setOption update failed", e);
     }
-  }, [serializedOption]);
+  }, [optionKey]);
 
   return (
     <div