Fix type-only exports

js/ai/src/index.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-export { Document, DocumentData, DocumentDataSchema } from './document.js';
+export { Document, DocumentDataSchema, type DocumentData } from './document.js';
 export {
   embed,
   embedderRef,
@@ -36,38 +36,38 @@ export {
   type EvaluatorReference,
 } from './evaluator.js';
 export {
+  generate,
   GenerateResponse,
+  generateStream,
   GenerationBlockedError,
   GenerationResponseError,
   Message,
-  generate,
-  generateStream,
   toGenerateRequest,
   type GenerateOptions,
   type GenerateStreamOptions,
   type GenerateStreamResponse,
 } from './generate.js';
 export {
-  GenerateRequest,
-  GenerateRequestData,
-  GenerateResponseData,
   GenerationCommonConfigSchema,
-  GenerationUsage,
-  MediaPart,
-  MessageData,
   MessageSchema,
-  ModelArgument,
-  ModelReference,
-  ModelRequest,
   ModelRequestSchema,
-  ModelResponseData,
   ModelResponseSchema,
-  Part,
   PartSchema,
-  Role,
   RoleSchema,
-  ToolRequestPart,
-  ToolResponsePart,
+  type GenerateRequest,
+  type GenerateRequestData,
+  type GenerateResponseData,
+  type GenerationUsage,
+  type MediaPart,
+  type MessageData,
+  type ModelArgument,
+  type ModelReference,
+  type ModelRequest,
+  type ModelResponseData,
+  type Part,
+  type Role,
+  type ToolRequestPart,
+  type ToolResponsePart,
 } from './model.js';
 export {
   definePrompt,

js/core/src/index.ts

@@ -24,10 +24,10 @@ export * from './action.js';
 export { getFlowAuth } from './auth.js';
 export { GenkitError } from './error.js';
 export {
-  Flow,
-  FlowServer,
   defineFlow,
   defineStreamingFlow,
+  Flow,
+  FlowServer,
   run,
   type CallableFlow,
   type FlowAuthPolicy,
@@ -41,6 +41,6 @@ export {
 export * from './flowTypes.js';
 export * from './plugin.js';
 export * from './reflection.js';
-export { JSONSchema, defineJsonSchema, defineSchema } from './schema.js';
+export { defineJsonSchema, defineSchema, type JSONSchema } from './schema.js';
 export * from './telemetryTypes.js';
 export * from './utils.js';

js/genkit/src/index.ts

@@ -15,140 +15,140 @@
  */
 
 export {
-  BaseDataPointSchema,
-  CommonLlmOptions,
+  asTool,
   Document,
-  DocumentData,
   DocumentDataSchema,
-  EmbedderAction,
-  EmbedderArgument,
-  EmbedderInfo,
-  EmbedderParams,
-  EmbedderReference,
-  Embedding,
-  EvalResponses,
-  EvaluatorAction,
-  EvaluatorInfo,
-  EvaluatorParams,
-  EvaluatorReference,
-  GenerateOptions,
-  GenerateRequest,
-  GenerateRequestData,
-  GenerateResponse,
-  GenerateResponseData,
-  GenerateStreamOptions,
-  GenerateStreamResponse,
+  embedderRef,
+  evaluatorRef,
   GenerationBlockedError,
   GenerationCommonConfigSchema,
   GenerationResponseError,
-  GenerationUsage,
-  IndexerAction,
-  IndexerArgument,
-  IndexerInfo,
-  IndexerParams,
-  IndexerReference,
-  LlmResponse,
+  indexerRef,
   LlmResponseSchema,
-  LlmStats,
   LlmStatsSchema,
-  MediaPart,
   Message,
-  MessageData,
   MessageSchema,
-  ModelArgument,
-  ModelId,
   ModelIdSchema,
-  ModelReference,
-  ModelRequest,
   ModelRequestSchema,
-  ModelResponseData,
   ModelResponseSchema,
-  Part,
   PartSchema,
-  PromptAction,
-  PromptConfig,
-  PromptFn,
-  RankedDocument,
-  RerankerAction,
-  RerankerArgument,
-  RerankerInfo,
-  RerankerParams,
-  RerankerReference,
-  RetrieverAction,
-  RetrieverArgument,
-  RetrieverInfo,
-  RetrieverParams,
-  RetrieverReference,
-  Role,
-  RoleSchema,
-  Tool,
-  ToolAction,
-  ToolArgument,
-  ToolCall,
-  ToolCallSchema,
-  ToolConfig,
-  ToolRequestPart,
-  ToolResponsePart,
-  ToolSchema,
-  asTool,
-  embedderRef,
-  evaluatorRef,
-  indexerRef,
   rerankerRef,
   retrieverRef,
+  RoleSchema,
   toGenerateRequest,
+  ToolCallSchema,
+  ToolSchema,
   toToolWireFormat,
+  type BaseDataPointSchema,
+  type CommonLlmOptions,
+  type DocumentData,
+  type EmbedderAction,
+  type EmbedderArgument,
+  type EmbedderInfo,
+  type EmbedderParams,
+  type EmbedderReference,
+  type Embedding,
+  type EvalResponses,
+  type EvaluatorAction,
+  type EvaluatorInfo,
+  type EvaluatorParams,
+  type EvaluatorReference,
+  type GenerateOptions,
+  type GenerateRequest,
+  type GenerateRequestData,
+  type GenerateResponse,
+  type GenerateResponseData,
+  type GenerateStreamOptions,
+  type GenerateStreamResponse,
+  type GenerationUsage,
+  type IndexerAction,
+  type IndexerArgument,
+  type IndexerInfo,
+  type IndexerParams,
+  type IndexerReference,
+  type LlmResponse,
+  type LlmStats,
+  type MediaPart,
+  type MessageData,
+  type ModelArgument,
+  type ModelId,
+  type ModelReference,
+  type ModelRequest,
+  type ModelResponseData,
+  type Part,
+  type PromptAction,
+  type PromptConfig,
+  type PromptFn,
+  type RankedDocument,
+  type RerankerAction,
+  type RerankerArgument,
+  type RerankerInfo,
+  type RerankerParams,
+  type RerankerReference,
+  type RetrieverAction,
+  type RetrieverArgument,
+  type RetrieverInfo,
+  type RetrieverParams,
+  type RetrieverReference,
+  type Role,
+  type Tool,
+  type ToolAction,
+  type ToolArgument,
+  type ToolCall,
+  type ToolConfig,
+  type ToolRequestPart,
+  type ToolResponsePart,
 } from '@genkit-ai/ai';
 export {
-  Action,
-  ActionMetadata,
-  CallableFlow,
-  Flow,
-  FlowActionInput,
-  FlowActionInputSchema,
-  FlowAuthPolicy,
-  FlowConfig,
-  FlowError,
-  FlowErrorSchema,
-  FlowFn,
-  FlowInvokeEnvelopeMessage,
-  FlowInvokeEnvelopeMessageSchema,
-  FlowResponseSchema,
-  FlowResultSchema,
-  FlowServer,
-  FlowServerOptions,
-  GENKIT_CLIENT_HEADER,
-  GENKIT_VERSION,
-  GenkitError,
-  JSONSchema,
-  JSONSchema7,
-  Middleware,
-  ReflectionServer,
-  ReflectionServerOptions,
-  RunActionResponse,
-  RunActionResponseSchema,
-  SideChannelData,
-  Status,
-  StatusCodes,
-  StatusSchema,
-  StreamableFlow,
-  StreamingCallback,
-  StreamingFlowConfig,
-  TelemetryConfig,
-  __RequestWithAuth,
   defineFlow,
   defineJsonSchema,
   defineSchema,
   defineStreamingFlow,
   deleteUndefinedProps,
+  FlowActionInputSchema,
+  FlowErrorSchema,
+  FlowInvokeEnvelopeMessageSchema,
   flowMetadataPrefix,
+  FlowServer,
+  GenkitError,
+  GENKIT_CLIENT_HEADER,
+  GENKIT_VERSION,
   getCurrentEnv,
   getFlowAuth,
   getStreamingCallback,
   isDevEnv,
+  ReflectionServer,
   run,
+  RunActionResponseSchema,
   runWithStreamingCallback,
+  StatusCodes,
+  StatusSchema,
   z,
+  type Action,
+  type ActionMetadata,
+  type CallableFlow,
+  type Flow,
+  type FlowActionInput,
+  type FlowAuthPolicy,
+  type FlowConfig,
+  type FlowError,
+  type FlowFn,
+  type FlowInvokeEnvelopeMessage,
+  type FlowResponseSchema,
+  type FlowResultSchema,
+  type FlowServerOptions,
+  type JSONSchema,
+  type JSONSchema7,
+  type Middleware,
+  type ReflectionServerOptions,
+  type RunActionResponse,
+  type SideChannelData,
+  type Status,
+  type StreamableFlow,
+  type StreamingCallback,
+  type StreamingFlowConfig,
+  type TelemetryConfig,
+  type __RequestWithAuth,
 } from '@genkit-ai/core';
 export { loadPromptFile } from '@genkit-ai/dotprompt';
 export * from './genkit.js';

js/plugins/dotprompt/src/index.ts

@@ -20,13 +20,18 @@ import {
   defineDotprompt,
   Dotprompt,
   DotpromptRef,
-  PromptGenerateOptions,
+  type PromptGenerateOptions,
 } from './prompt.js';
 import { loadPromptFolder, lookupPrompt } from './registry.js';
 
 export { type PromptMetadata } from './metadata.js';
 export { defineHelper, definePartial } from './template.js';
-export { defineDotprompt, Dotprompt, loadPromptFolder, PromptGenerateOptions };
+export {
+  defineDotprompt,
+  Dotprompt,
+  loadPromptFolder,
+  type PromptGenerateOptions,
+};
 
 export interface DotpromptPluginOptions {
   // Directory to look for .prompt files.

js/plugins/googleai/package.json

@@ -31,7 +31,7 @@
   "author": "genkit",
   "license": "Apache-2.0",
   "dependencies": {
-    "@google/generative-ai": "^0.16.0",
+    "@google/generative-ai": "^0.21.0",
     "google-auth-library": "^9.6.3",
     "node-fetch": "^3.3.2"
   },