Separate host and client exports

.claude/settings.local.json

@@ -0,0 +1,9 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(npm run build:*)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

package.json

@@ -13,15 +13,13 @@
     "type": "git",
     "url": "https://github.com/hbmartin/react-vscode-webview-ipc"
   },
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "host": ["./dist/host.d.ts"],
+      "client": ["./dist/client.d.ts"]
+    }
+  },
   "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
-    },
     "./host": {
       "types": "./dist/host.d.ts",
       "import": "./dist/host.js",

src/lib/client.ts

@@ -1,9 +1,9 @@
-export { type WebviewContextValue } from './client/WebviewContext';
+// export { type WebviewContextValue } from './client/WebviewContext';
 export { WebviewProvider } from './client/WebviewProvider';
 export { createCtxKey, useWebviewApi } from './client/useWebviewApi';
 export { useVscodeState } from './client/useVscodeState';
 export { useLogger } from './client/useLogger';
-export { isViewApiRequest, isViewApiResponse, isViewApiEvent, type CtxKey } from './types';
-export type { ClientCalls, ViewApiResponse, ViewApiError } from './types';
-export type { StateReducer, WebviewKey } from './types/ipcReducer';
-export type { WebviewLayout } from './types';
+export { isViewApiRequest, type CtxKey } from './types';
+export type { ClientCalls, HostCalls, ViewApiResponse, ViewApiError } from './types';
+export type { WebviewKey } from './types/reducer';
+export type { StateReducer, WebviewLayout } from './client/types';

src/lib/client/WebviewContext.tsx

@@ -1,4 +1,5 @@
-import type { ClientCalls, HostCalls, VsCodeApi } from '../types';
+import type { ClientCalls, HostCalls } from '../types';
+import type { VsCodeApi } from './types';
 
 /**
  * Context value interface providing type-safe API access

src/lib/host/WebviewLogger.ts → src/lib/client/WebviewLogger.ts

@@ -1,28 +1,5 @@
-import type { VsCodeApi } from '../types';
-import { LogLevel, type ILogger } from './ILogger';
-
-export interface LogMessage {
-  type: 'log';
-  level: LogLevel;
-  message: string;
-  data?: Record<string, unknown>;
-}
-
-export function isLogMessage(value: unknown): value is LogMessage {
-  if (value === null || typeof value !== 'object' || Array.isArray(value)) {
-    return false;
-  }
-  if (!('type' in value) || value.type !== 'log') {
-    return false;
-  }
-  if (!('level' in value) || typeof value.level !== 'number') {
-    return false;
-  }
-  if (!('message' in value) || typeof value.message !== 'string') {
-    return false;
-  }
-  return true;
-}
+import { LogLevel, type ILogger, type LogMessage } from '../types';
+import type { VsCodeApi } from './types';
 
 export class WebviewLogger implements ILogger {
   constructor(

src/lib/client/WebviewProvider.tsx

@@ -9,9 +9,9 @@
   type HostCalls,
   type RequestContext,
   type ViewApiRequest,
-  type VsCodeApi,
 } from '../types';
+import { type VsCodeApi } from './types';
 import { generateId } from '../utils';
 import { DeferredPromise } from './types';
 import { TypedContexts } from './useWebviewApi';
 import type { WebviewContextValue } from './WebviewContext';

src/lib/client/ipcReducer.ts

@@ -0,0 +1,10 @@
+import type { FnKeys } from '../types/reducer';
+
+export function isFnKey<T extends object>(
+  prop: string | symbol | number,
+  obj: T
+): prop is FnKeys<T> {
+  return (
+    Object.prototype.hasOwnProperty.call(obj, prop) && typeof obj[prop as keyof T] === 'function'
+  );
+}

src/lib/client/types.ts

@@ -1,3 +1,5 @@
+import type { FnKeys, Patches } from '../types/reducer';
+
 /**
  * Deferred promise for handling async responses with timeout management
  */
@@ -42,3 +44,16 @@ export class DeferredPromise<T> {
     this.settled = true;
   }
 }
+
+export type WebviewLayout = 'sidebar' | 'panel';
+// VS Code webview API
+
+export interface VsCodeApi {
+  postMessage(message: unknown): Thenable<boolean>;
+  getState(): unknown;
+  setState(state: unknown): void;
+}
+
+export type StateReducer<S, A> = {
+  [Key in FnKeys<A>]: (prevState: S, patch: Patches<A>[Key]) => S;
+};

src/lib/client/useLogger.ts

@@ -1,8 +1,8 @@
 /* eslint-disable no-console */
 import { useMemo } from 'react';
-import type { VsCodeApi } from '../types';
-import { WebviewLogger } from '../host/WebviewLogger';
-import type { ILogger } from '../host/ILogger';
+import type { ILogger } from '../types';
+import { WebviewLogger } from './WebviewLogger';
+import type { VsCodeApi } from './types';
 
 /**
  * React hook to get a logger instance for use in webview components.

src/lib/client/useVscodeState.ts

@@ -1,14 +1,7 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
-import type { VsCodeApi } from '../types';
-import {
-  ACT,
-  type Patch,
-  PATCH,
-  type Action,
-  type WebviewKey,
-  type StateReducer,
-  isFnKey,
-} from '../types/ipcReducer';
+import { ACT, type Patch, PATCH, type Action, type WebviewKey } from '../types/reducer';
+import { isFnKey } from './ipcReducer';
+import type { StateReducer, VsCodeApi } from './types';
 
 type PostAction<A extends object> = Pick<Action<A>, 'key' | 'params'>;
 

src/lib/host.ts

@@ -1,8 +1,6 @@
-export type { ILogger } from './host/ILogger';
 export { Logger, getLogger, disallowedLogKeys } from './host/logger';
 export { WebviewApiProvider } from './host/WebviewApiProvider';
 export { BaseWebviewViewProvider } from './host/BaseWebviewViewProvider';
-export { isViewApiRequest, isViewApiResponse, isViewApiEvent, type CtxKey } from './types';
-export type { HostCalls, ViewApiResponse, ViewApiError } from './types';
-export type { ActionDelegate, StateReducer, WebviewKey } from './types/ipcReducer';
-export type { WebviewLayout } from './types';
+export { isViewApiRequest } from './types';
+export type { ViewApiResponse, ViewApiError, ILogger } from './types';
+export type { ActionDelegate } from './types/reducer';

src/lib/host/BaseWebviewViewProvider.ts

@@ -1,17 +1,15 @@
 import * as vscode from 'vscode';
-import type { HostCalls } from '../types';
+import { type HostCalls, type ILogger, isLogMessage, LogLevel, type LogMessage } from '../types';
 import {
-  isMyActionMessage,
   PATCH,
   type ActionDelegate,
   type FnKeys,
   type Patch,
   type Patches,
   type WebviewKey,
-} from '../types/ipcReducer';
-import { LogLevel, type ILogger } from './ILogger';
+} from '../types/reducer';
 import { getLogger } from './logger';
-import { isLogMessage, type LogMessage } from './WebviewLogger';
+import { isMyActionMessage } from './utils';
 import type { WebviewApiProvider } from './WebviewApiProvider';
 
 export abstract class BaseWebviewViewProvider<A extends object>

src/lib/host/WebviewApiProvider.ts

@@ -1,7 +1,7 @@
 import type { HostCalls, RequestContext, ViewApiEvent } from '../types';
 import { generateId, getErrorMessage } from '../utils';
 import { getLogger } from './logger';
-import type { WebviewKey } from '../types/ipcReducer';
+import type { WebviewKey } from '../types/reducer';
 import type * as vscode from 'vscode';
 
 /**

src/lib/host/logger.ts

@@ -1,5 +1,5 @@
 import * as vscode from 'vscode';
-import { LogLevel, type ILogger } from './ILogger';
+import { LogLevel, type ILogger } from '../types';
 
 export const disallowedLogKeys = ['password', 'secret', 'token', 'apiKey', 'apiSecret', 'content'];
 

src/lib/host/utils.ts

@@ -0,0 +1,21 @@
+import { ACT, type Action, type WebviewKey } from '../types/reducer';
+
+export function isMyActionMessage<T extends object>(
+  message: unknown,
+  providerId: WebviewKey
+): message is Action<T> {
+  return (
+    message !== null &&
+    message !== undefined &&
+    typeof message === 'object' &&
+    'providerId' in message &&
+    'type' in message &&
+    'key' in message &&
+    'params' in message &&
+    message.type === ACT &&
+    typeof message.providerId === 'string' &&
+    message.providerId === providerId &&
+    (typeof message.key === 'string' || typeof message.key === 'symbol') &&
+    Array.isArray(message.params)
+  );
+}

src/lib/types/index.ts

@@ -0,0 +1,4 @@
+export * from './log';
+export * from './rpc';
+
+export type Brand<T, B> = T & { readonly __brand: B };

src/lib/types/log.ts

@@ -0,0 +1,42 @@
+/**
+ * Interface for logging services that can be implemented
+ * by both the extension host (Logger) and webview (WebviewLogger)
+ */
+
+export interface ILogger {
+  debug(message: string, data?: Record<string, unknown>): void;
+  info(message: string, data?: Record<string, unknown>): void;
+  warn(message: string, data?: Record<string, unknown>): void;
+  error(message: string, data?: Record<string, unknown>): void;
+  dispose(): void;
+}
+
+export enum LogLevel {
+  DEBUG,
+  INFO,
+  WARN,
+  ERROR,
+}
+
+export interface LogMessage {
+  type: 'log';
+  level: LogLevel;
+  message: string;
+  data?: Record<string, unknown>;
+}
+
+export function isLogMessage(value: unknown): value is LogMessage {
+  if (value === null || typeof value !== 'object' || Array.isArray(value)) {
+    return false;
+  }
+  if (!('type' in value) || value.type !== 'log') {
+    return false;
+  }
+  if (!('level' in value) || typeof value.level !== 'number') {
+    return false;
+  }
+  if (!('message' in value) || typeof value.message !== 'string') {
+    return false;
+  }
+  return true;
+}

src/lib/types/ipcReducer.ts → src/lib/types/reducer.ts

@@ -1,7 +1,6 @@
-import type { Brand } from '../types';
+import type { Brand } from '.';
 
 export type WebviewKey = Brand<string, 'WebviewKey'>;
-
 export const PATCH = 'patch';
 export const ACT = 'act';
 
@@ -10,26 +9,24 @@ export type FnKeys<T> = {
   [K in keyof T]: T[K] extends (...args: any[]) => any ? K : never;
 }[keyof T];
 
-export function isFnKey<T extends object>(
-  prop: string | symbol | number,
-  obj: T
-): prop is FnKeys<T> {
-  return (
-    Object.prototype.hasOwnProperty.call(obj, prop) && typeof obj[prop as keyof T] === 'function'
-  );
-}
-
 interface IpcMessage {
   readonly type: string;
   readonly providerId: WebviewKey;
 }
+
 export interface Action<T extends object, K extends FnKeys<T> = FnKeys<T>> extends IpcMessage {
   readonly type: typeof ACT;
   readonly key: K;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   readonly params: T[K] extends (...a: infer A) => any ? Readonly<A> : never;
 }
 
+export type ActionDelegate<A> = {
+  [K in FnKeys<A>]: A[K] extends (...args: infer P) => infer R
+    ? (...args: P) => R | Promise<R>
+    : never;
+};
+
 export interface Patch<A, K extends FnKeys<A> = FnKeys<A>> extends IpcMessage {
   readonly type: typeof PATCH;
   readonly key: K;
@@ -44,33 +41,3 @@ export type Patches<A> = {
       : R
     : never;
 };
-
-export function isMyActionMessage<T extends object>(
-  message: unknown,
-  providerId: WebviewKey
-): message is Action<T> {
-  return (
-    message !== null &&
-    message !== undefined &&
-    typeof message === 'object' &&
-    'providerId' in message &&
-    'type' in message &&
-    'key' in message &&
-    'params' in message &&
-    message.type === ACT &&
-    typeof message.providerId === 'string' &&
-    message.providerId === providerId &&
-    (typeof message.key === 'string' || typeof message.key === 'symbol') &&
-    Array.isArray(message.params)
-  );
-}
-
-export type StateReducer<S, A> = {
-  [Key in FnKeys<A>]: (prevState: S, patch: Patches<A>[Key]) => S;
-};
-
-export type ActionDelegate<A> = {
-  [K in FnKeys<A>]: A[K] extends (...args: infer P) => infer R
-    ? (...args: P) => R | Promise<R>
-    : never;
-};