remove da bad tings

src/browser.ts

@@ -2,4 +2,3 @@
 export * from "./schemas/index.js";
 export * from "./shared/config.js";
 export * from "./shared/constants.js";
-export * from "./types.js";

src/cli.ts

@@ -6,7 +6,6 @@ export * from "./cli/pack.js";
 export * from "./schemas/index.js";
 export * from "./shared/config.js";
 export * from "./shared/constants.js";
-export * from "./types.js";
 
 // Include node exports since CLI needs them
 export * from "./node/files.js";

src/cli/init.ts

@@ -1,9 +1,12 @@
 import { confirm, input, select } from "@inquirer/prompts";
 import { existsSync, readFileSync, writeFileSync } from "fs";
 import { basename, join, resolve } from "path";
+import type { z } from "zod";
 
+// Import the schema for DEFAULT_MANIFEST_VERSION
+// TODO: Allow dynamic manifest version choice
+import type { McpbManifestSchema } from "../schemas/0.2.js";
 import { DEFAULT_MANIFEST_VERSION } from "../shared/constants.js";
-import type { McpbManifestDefault } from "../types.js";
 
 interface PackageJson {
   name?: string;
@@ -878,7 +881,7 @@ export function buildManifest(
   //   resources: string;
   //   default_locale: string;
   // },
-): McpbManifestDefault {
+): z.infer<typeof McpbManifestSchema> {
   const { name, displayName, version, description, authorName } = basicInfo;
   const { authorEmail, authorUrl } = authorInfo;
   const { serverType, entryPoint, mcp_config } = serverConfig;

src/index.ts

@@ -8,4 +8,3 @@ export * from "./node/validate.js";
 export * from "./schemas/index.js";
 export * from "./shared/config.js";
 export * from "./shared/constants.js";
-export * from "./types.js";

src/node.ts

@@ -7,4 +7,3 @@ export * from "./node/validate.js";
 export * from "./schemas/index.js";
 export * from "./shared/config.js";
 export * from "./shared/constants.js";
-export * from "./types.js";

src/node/sign.ts

@@ -5,8 +5,9 @@ import forge from "node-forge";
 import { tmpdir } from "os";
 import { join } from "path";
 import { promisify } from "util";
+import type { z } from "zod";
 
-import type { McpbSignatureInfo } from "../types.js";
+import type { McpbSignatureInfoSchema } from "../shared/common.js";
 
 // Signature block markers
 const SIGNATURE_HEADER = "MCPB_SIG_V1";
@@ -101,7 +102,7 @@ export function signMcpbFile(
  */
 export async function verifyMcpbFile(
   mcpbPath: string,
-): Promise<McpbSignatureInfo> {
+): Promise<z.infer<typeof McpbSignatureInfoSchema>> {
   try {
     const fileContent = readFileSync(mcpbPath);
 

src/schemas/0.1.ts

@@ -71,11 +71,6 @@ export const McpbUserConfigurationOptionSchema = z.strictObject({
   max: z.number().optional(),
 });
 
-export const McpbUserConfigValuesSchema = z.record(
-  z.string(),
-  z.union([z.string(), z.number(), z.boolean(), z.array(z.string())]),
-);
-
 export const McpbManifestSchema = z
   .strictObject({
     $schema: z.string().optional(),
@@ -113,12 +108,3 @@ export const McpbManifestSchema = z
     message:
       "Either 'dxt_version' (deprecated) or 'manifest_version' must be provided",
   });
-
-export const McpbSignatureInfoSchema = z.strictObject({
-  status: z.enum(["signed", "unsigned", "self-signed"]),
-  publisher: z.string().optional(),
-  issuer: z.string().optional(),
-  valid_from: z.string().optional(),
-  valid_to: z.string().optional(),
-  fingerprint: z.string().optional(),
-});

src/schemas/0.2.ts

@@ -71,11 +71,6 @@ export const McpbUserConfigurationOptionSchema = z.strictObject({
   max: z.number().optional(),
 });
 
-export const McpbUserConfigValuesSchema = z.record(
-  z.string(),
-  z.union([z.string(), z.number(), z.boolean(), z.array(z.string())]),
-);
-
 export const McpbManifestSchema = z
   .strictObject({
     $schema: z.string().optional(),
@@ -113,12 +108,3 @@ export const McpbManifestSchema = z
     message:
       "Either 'dxt_version' (deprecated) or 'manifest_version' must be provided",
   });
-
-export const McpbSignatureInfoSchema = z.strictObject({
-  status: z.enum(["signed", "unsigned", "self-signed"]),
-  publisher: z.string().optional(),
-  issuer: z.string().optional(),
-  valid_from: z.string().optional(),
-  valid_to: z.string().optional(),
-  fingerprint: z.string().optional(),
-});

src/schemas/0.3.ts

@@ -76,11 +76,6 @@ export const McpbUserConfigurationOptionSchema = z.strictObject({
   max: z.number().optional(),
 });
 
-export const McpbUserConfigValuesSchema = z.record(
-  z.string(),
-  z.union([z.string(), z.number(), z.boolean(), z.array(z.string())]),
-);
-
 export const McpbManifestLocalizationSchema = z.strictObject({
   resources: z
     .string()
@@ -147,12 +142,3 @@ export const McpbManifestSchema = z
     message:
       "Either 'dxt_version' (deprecated) or 'manifest_version' must be provided",
   });
-
-export const McpbSignatureInfoSchema = z.strictObject({
-  status: z.enum(["signed", "unsigned", "self-signed"]),
-  publisher: z.string().optional(),
-  issuer: z.string().optional(),
-  valid_from: z.string().optional(),
-  valid_to: z.string().optional(),
-  fingerprint: z.string().optional(),
-});

src/schemas_loose/0.1.ts

@@ -73,11 +73,6 @@ export const McpbUserConfigurationOptionSchema = z.object({
   max: z.number().optional(),
 });
 
-export const McpbUserConfigValuesSchema = z.record(
-  z.string(),
-  z.union([z.string(), z.number(), z.boolean(), z.array(z.string())]),
-);
-
 export const McpbManifestSchema = z
   .object({
     $schema: z.string().optional(),
@@ -115,12 +110,3 @@ export const McpbManifestSchema = z
     message:
       "Either 'dxt_version' (deprecated) or 'manifest_version' must be provided",
   });
-
-export const McpbSignatureInfoSchema = z.object({
-  status: z.enum(["signed", "unsigned", "self-signed"]),
-  publisher: z.string().optional(),
-  issuer: z.string().optional(),
-  valid_from: z.string().optional(),
-  valid_to: z.string().optional(),
-  fingerprint: z.string().optional(),
-});

src/schemas_loose/0.2.ts

@@ -73,11 +73,6 @@ export const McpbUserConfigurationOptionSchema = z.object({
   max: z.number().optional(),
 });
 
-export const McpbUserConfigValuesSchema = z.record(
-  z.string(),
-  z.union([z.string(), z.number(), z.boolean(), z.array(z.string())]),
-);
-
 export const McpbManifestSchema = z
   .object({
     $schema: z.string().optional(),
@@ -116,12 +111,3 @@ export const McpbManifestSchema = z
     message:
       "Either 'dxt_version' (deprecated) or 'manifest_version' must be provided",
   });
-
-export const McpbSignatureInfoSchema = z.object({
-  status: z.enum(["signed", "unsigned", "self-signed"]),
-  publisher: z.string().optional(),
-  issuer: z.string().optional(),
-  valid_from: z.string().optional(),
-  valid_to: z.string().optional(),
-  fingerprint: z.string().optional(),
-});

src/schemas_loose/0.3.ts

@@ -77,11 +77,6 @@ export const McpbUserConfigurationOptionSchema = z.object({
   max: z.number().optional(),
 });
 
-export const McpbUserConfigValuesSchema = z.record(
-  z.string(),
-  z.union([z.string(), z.number(), z.boolean(), z.array(z.string())]),
-);
-
 export const McpbManifestLocalizationSchema = z
   .object({
     resources: z
@@ -153,12 +148,3 @@ export const McpbManifestSchema = z
     message:
       "Either 'dxt_version' (deprecated) or 'manifest_version' must be provided",
   });
-
-export const McpbSignatureInfoSchema = z.object({
-  status: z.enum(["signed", "unsigned", "self-signed"]),
-  publisher: z.string().optional(),
-  issuer: z.string().optional(),
-  valid_from: z.string().optional(),
-  valid_to: z.string().optional(),
-  fingerprint: z.string().optional(),
-});

src/shared/common.ts

@@ -0,0 +1,15 @@
+import { z } from "zod";
+
+export const McpbUserConfigValuesSchema = z.record(
+  z.string(),
+  z.union([z.string(), z.number(), z.boolean(), z.array(z.string())]),
+);
+
+export const McpbSignatureInfoSchema = z.strictObject({
+  status: z.enum(["signed", "unsigned", "self-signed"]),
+  publisher: z.string().optional(),
+  issuer: z.string().optional(),
+  valid_from: z.string().optional(),
+  valid_to: z.string().optional(),
+  fingerprint: z.string().optional(),
+});

src/shared/config.ts

@@ -1,9 +1,7 @@
-import type {
-  Logger,
-  McpbManifestAny,
-  McpbUserConfigValues,
-  McpServerConfig,
-} from "../types.js";
+import type { z } from "zod";
+
+import type { Logger, McpbManifestAny } from "../types.js";
+import type { McpbUserConfigValuesSchema } from "./common.js";
 
 /**
  * This file contains utility functions for handling MCPB configuration,
@@ -88,14 +86,14 @@ interface GetMcpConfigForManifestOptions {
   manifest: McpbManifestAny;
   extensionPath: string;
   systemDirs: Record<string, string>;
-  userConfig: McpbUserConfigValues;
+  userConfig: z.infer<typeof McpbUserConfigValuesSchema>;
   pathSeparator: string;
   logger?: Logger;
 }
 
 export async function getMcpConfigForManifest(
   options: GetMcpConfigForManifestOptions,
-): Promise<McpServerConfig | undefined> {
+): Promise<McpbManifestAny["server"]["mcp_config"] | undefined> {
   const {
     manifest,
     extensionPath,
@@ -109,7 +107,7 @@ export async function getMcpConfigForManifest(
     return undefined;
   }
 
-  let result: McpServerConfig = {
+  let result: McpbManifestAny["server"]["mcp_config"] = {
     ...baseConfig,
   };
 
@@ -173,14 +171,17 @@ export async function getMcpConfigForManifest(
   }
 
   // Replace all variables in the config
-  result = replaceVariables(result, variables) as McpServerConfig;
+  result = replaceVariables(
+    result,
+    variables,
+  ) as McpbManifestAny["server"]["mcp_config"];
 
   return result;
 }
 
 interface HasRequiredConfigMissingOptions {
   manifest: McpbManifestAny;
-  userConfig?: McpbUserConfigValues;
+  userConfig?: z.infer<typeof McpbUserConfigValuesSchema>;
 }
 
 function isInvalidSingleValue(value: unknown): boolean {

src/types.ts

@@ -1,77 +1,12 @@
 import type * as z from "zod";
 
-// Import schema types from the version matching DEFAULT_MANIFEST_VERSION
-import type {
-  McpbManifestAuthorSchema,
-  McpbManifestCompatibilitySchema,
-  McpbManifestMcpConfigSchema,
-  McpbManifestPlatformOverrideSchema,
-  McpbManifestPromptSchema,
-  McpbManifestRepositorySchema,
-  McpbManifestServerSchema,
-  McpbManifestToolSchema,
-  McpbSignatureInfoSchema,
-  McpbUserConfigurationOptionSchema,
-  McpbUserConfigValuesSchema,
-  McpServerConfigSchema,
-} from "./schemas/0.2.js";
 import type { McpbManifestSchema as McpbManifestSchemaAny } from "./schemas/any.js";
-import type { VERSIONED_MANIFEST_SCHEMAS } from "./schemas/index.js";
-import type { DEFAULT_MANIFEST_VERSION } from "./shared/constants.js";
-
-export type McpServerConfig = z.infer<typeof McpServerConfigSchema>;
-
-export type McpbManifestAuthor = z.infer<typeof McpbManifestAuthorSchema>;
-
-export type McpbManifestRepository = z.infer<
-  typeof McpbManifestRepositorySchema
->;
-
-export type McpbManifestPlatformOverride = z.infer<
-  typeof McpbManifestPlatformOverrideSchema
->;
-
-export type McpbManifestMcpConfig = z.infer<typeof McpbManifestMcpConfigSchema>;
-
-export type McpbManifestServer = z.infer<typeof McpbManifestServerSchema>;
-
-export type McpbManifestCompatibility = z.infer<
-  typeof McpbManifestCompatibilitySchema
->;
-
-export type McpbManifestTool = z.infer<typeof McpbManifestToolSchema>;
-
-export type McpbManifestPrompt = z.infer<typeof McpbManifestPromptSchema>;
-
-export type McpbUserConfigurationOption = z.infer<
-  typeof McpbUserConfigurationOptionSchema
->;
-
-export type McpbUserConfigValues = z.infer<typeof McpbUserConfigValuesSchema>;
 
 /**
  * McpbManifest type representing the union of all manifest versions
  */
 export type McpbManifestAny = z.infer<typeof McpbManifestSchemaAny>;
 
-/**
- * McpbManifest type for the DEFAULT_MANIFEST_VERSION
- * Use this for creating new manifests with the default version.
- */
-export type McpbManifestDefault = z.infer<
-  (typeof VERSIONED_MANIFEST_SCHEMAS)[typeof DEFAULT_MANIFEST_VERSION]
->;
-
-/**
- * @deprecated Use McpbManifestAny instead to support all manifest versions, or McpbManifestDefault for the default version.
- */
-export type McpbManifest = McpbManifestDefault;
-
-/**
- * Information about a MCPB package signature
- */
-export type McpbSignatureInfo = z.infer<typeof McpbSignatureInfoSchema>;
-
 export interface Logger {
   log: (...args: unknown[]) => void;
   error: (...args: unknown[]) => void;