Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions cmd/generatets/main-generatets.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,13 @@ func generateWshClientApiFile(tsTypeMap map[reflect.Type]string) error {
fmt.Fprintf(&buf, " mockWshRpcCall(client: WshClient, command: string, data: any, opts?: RpcOpts): Promise<any>;\n")
fmt.Fprintf(&buf, " mockWshRpcStream(client: WshClient, command: string, data: any, opts?: RpcOpts): AsyncGenerator<any, void, boolean>;\n")
fmt.Fprintf(&buf, "}\n\n")
fmt.Fprintf(&buf, "let mockClient: MockRpcClient = null;\n\n")
fmt.Fprintf(&buf, "export function setMockRpcClient(client: MockRpcClient): void {\n")
fmt.Fprintf(&buf, " mockClient = client;\n")
fmt.Fprintf(&buf, "}\n\n")
orderedKeys := utilfn.GetOrderedMapKeys(declMap)
fmt.Fprintf(&buf, "// WshServerCommandToDeclMap\n")
fmt.Fprintf(&buf, "class RpcApiType {\n")
fmt.Fprintf(&buf, "export class RpcApiType {\n")
fmt.Fprintf(&buf, " mockClient: MockRpcClient = null;\n\n")
fmt.Fprintf(&buf, " setMockRpcClient(client: MockRpcClient): void {\n")
fmt.Fprintf(&buf, " this.mockClient = client;\n")
fmt.Fprintf(&buf, " }\n\n")
for _, methodDecl := range orderedKeys {
methodDecl := declMap[methodDecl]
methodStr := tsgen.GenerateWshClientApiMethod(methodDecl, tsTypeMap)
Expand Down
11 changes: 8 additions & 3 deletions frontend/app/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import {
import { ClientModel } from "@/app/store/client-model";
import { GlobalModel } from "@/app/store/global-model";
import { getTabModelByTabId, TabModelContext } from "@/app/store/tab-model";
import { WaveEnvContext } from "@/app/waveenv/waveenv";
import { makeWaveEnvImpl } from "@/app/waveenv/waveenvimpl";
import { Workspace } from "@/app/workspace/workspace";
import { getLayoutModelForStaticTab } from "@/layout/index";
import { ContextMenuModel } from "@/store/contextmenu";
Expand Down Expand Up @@ -39,14 +41,17 @@ const focusLog = debug("wave:focus");

const App = ({ onFirstRender }: { onFirstRender: () => void }) => {
const tabId = useAtomValue(atoms.staticTabId);
const waveEnvRef = useRef(makeWaveEnvImpl());
useEffect(() => {
onFirstRender();
}, []);
return (
<Provider store={globalStore}>
<TabModelContext.Provider value={getTabModelByTabId(tabId)}>
<AppInner />
</TabModelContext.Provider>
<WaveEnvContext.Provider value={waveEnvRef.current}>
<TabModelContext.Provider value={getTabModelByTabId(tabId)}>
<AppInner />
</TabModelContext.Provider>
</WaveEnvContext.Provider>
</Provider>
);
};
Expand Down
593 changes: 223 additions & 370 deletions frontend/app/store/wshclientapi.ts

Large diffs are not rendered by default.

17 changes: 17 additions & 0 deletions frontend/app/waveenv/mockboundary.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Copyright 2026, Command Line Inc.
// SPDX-License-Identifier: Apache-2.0

import { isPreviewWindow } from "@/app/store/windowtype";
import React from "react";

type MockBoundaryProps = {
fallback: React.ReactNode;
children: React.ReactNode;
};

export function MockBoundary({ fallback, children }: MockBoundaryProps) {
if (isPreviewWindow()) {
return <>{fallback}</>;
}
return <>{children}</>;
}
29 changes: 29 additions & 0 deletions frontend/app/waveenv/waveenv.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// Copyright 2026, Command Line Inc.
// SPDX-License-Identifier: Apache-2.0

import { RpcApiType } from "@/app/store/wshclientapi";
import { Atom } from "jotai";
import React from "react";

type ConfigAtoms = { [K in keyof SettingsType]: Atom<SettingsType[K]> };

// default implementation for production is in ./waveenvimpl.ts
export type WaveEnv = {
electron: ElectronApi;
rpc: RpcApiType;
configAtoms: ConfigAtoms;
isDev: () => boolean;
atoms: GlobalAtomsType;
createBlock: (blockDef: BlockDef, magnified?: boolean, ephemeral?: boolean) => Promise<string>;
showContextMenu: (menu: ContextMenuItem[], e: React.MouseEvent) => void;
};

export const WaveEnvContext = React.createContext<WaveEnv>(null);

type EnvContract<T> = {
[K in keyof T]?: T[K] extends (...args: any[]) => any ? T[K] : T[K] extends object ? EnvContract<T[K]> : T[K];
};

export function useWaveEnv<T extends EnvContract<WaveEnv> = WaveEnv>(): T {
return React.useContext(WaveEnvContext) as T;
}
27 changes: 27 additions & 0 deletions frontend/app/waveenv/waveenvimpl.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
// Copyright 2026, Command Line Inc.
// SPDX-License-Identifier: Apache-2.0

import { atoms, createBlock, getSettingsKeyAtom, isDev } from "@/app/store/global";
import { ContextMenuModel } from "@/app/store/contextmenu";
import { RpcApi } from "@/app/store/wshclientapi";
import { WaveEnv } from "@/app/waveenv/waveenv";

const configAtoms = new Proxy({} as WaveEnv["configAtoms"], {
get<K extends keyof SettingsType>(_target: WaveEnv["configAtoms"], key: K) {
return getSettingsKeyAtom(key);
},
});

export function makeWaveEnvImpl(): WaveEnv {
return {
electron: (window as any).api,
rpc: RpcApi,
configAtoms,
isDev,
atoms,
createBlock,
showContextMenu: (menu: ContextMenuItem[], e: React.MouseEvent) => {
ContextMenuModel.getInstance().showContextMenu(menu, e);
},
};
}
Loading
Loading