@openpkg-ts/extract 0.12.0 → 0.14.0

package/dist/shared/{chunk-wddga8ye.js → chunk-v4cnenxs.js}

@@ -203,17 +203,133 @@ class TypeRegistry {
     if (external) {
       kind = "external";
     }
-    const typeString = checker.typeToString(type);
     const source = decl ? buildExternalSource(decl) : undefined;
+    const schema = this.buildShallowSchema(type, checker);
+    let members;
+    if (decl && (ts.isClassDeclaration(decl) || ts.isInterfaceDeclaration(decl))) {
+      members = this.extractShallowMembers(decl, checker);
+    }
     return {
       id: name,
       name,
       kind,
-      type: typeString !== name ? typeString : undefined,
+      schema,
+      members: members?.length ? members : undefined,
       ...external ? { external: true } : {},
       ...source ? { source } : {}
     };
   }
+  buildShallowSchema(type, checker) {
+    if (type.isUnion()) {
+      const allEnumLiterals = type.types.every((t) => t.flags & (ts.TypeFlags.EnumLiteral | ts.TypeFlags.NumberLiteral));
+      if (allEnumLiterals) {
+        const values = type.types.map((t) => {
+          if (t.flags & ts.TypeFlags.NumberLiteral) {
+            return t.value;
+          }
+          return checker.typeToString(t);
+        }).filter((v) => v !== undefined);
+        if (values.every((v) => typeof v === "number")) {
+          return { type: "number", enum: values };
+        }
+        return { type: "string", enum: values };
+      }
+      return {
+        anyOf: type.types.map((t) => {
+          if (t.flags & ts.TypeFlags.EnumLiteral) {
+            const value = t.value;
+            if (typeof value === "number") {
+              return { type: "number", enum: [value] };
+            }
+            return { type: checker.typeToString(t) };
+          }
+          const sym = t.getSymbol() || t.aliasSymbol;
+          if (sym && sym.flags & ts.SymbolFlags.EnumMember) {
+            return { type: checker.typeToString(t) };
+          }
+          if (sym && !sym.getName().startsWith("__")) {
+            return { $ref: `#/types/${sym.getName()}` };
+          }
+          if (t.flags & ts.TypeFlags.StringLiteral) {
+            return { type: "string", enum: [t.value] };
+          }
+          if (t.flags & ts.TypeFlags.NumberLiteral) {
+            return { type: "number", enum: [t.value] };
+          }
+          return { type: checker.typeToString(t) };
+        })
+      };
+    }
+    if (type.isIntersection()) {
+      return {
+        allOf: type.types.map((t) => {
+          const sym = t.getSymbol() || t.aliasSymbol;
+          if (sym && !sym.getName().startsWith("__")) {
+            return { $ref: `#/types/${sym.getName()}` };
+          }
+          return { type: checker.typeToString(t) };
+        })
+      };
+    }
+    const props = type.getProperties();
+    if (props.length > 0) {
+      const properties = {};
+      const required = [];
+      for (const prop of props.slice(0, 30)) {
+        const propName = prop.getName();
+        if (propName.startsWith("_"))
+          continue;
+        const propType = checker.getTypeOfSymbol(prop);
+        const callSigs = propType.getCallSignatures();
+        if (callSigs.length > 0) {
+          properties[propName] = { type: "function" };
+        } else {
+          const propSym = propType.getSymbol() || propType.aliasSymbol;
+          const symName = propSym?.getName();
+          if (propSym && symName && !symName.startsWith("__") && symName !== propName) {
+            properties[propName] = { $ref: `#/types/${symName}` };
+          } else {
+            properties[propName] = { type: checker.typeToString(propType) };
+          }
+        }
+        if (!(prop.flags & ts.SymbolFlags.Optional)) {
+          required.push(propName);
+        }
+      }
+      return {
+        type: "object",
+        properties,
+        ...required.length ? { required } : {}
+      };
+    }
+    return { type: checker.typeToString(type) };
+  }
+  extractShallowMembers(decl, checker) {
+    const members = [];
+    for (const member of decl.members) {
+      if (ts.isPropertyDeclaration(member) || ts.isPropertySignature(member)) {
+        const name = member.name?.getText();
+        if (!name || name.startsWith("#") || name.startsWith("_"))
+          continue;
+        const type = checker.getTypeAtLocation(member);
+        const sym = type.getSymbol() || type.aliasSymbol;
+        members.push({
+          name,
+          kind: "property",
+          schema: sym && !sym.getName().startsWith("__") ? { $ref: `#/types/${sym.getName()}` } : { type: checker.typeToString(type) }
+        });
+      } else if (ts.isMethodDeclaration(member) || ts.isMethodSignature(member)) {
+        const name = member.name?.getText();
+        if (!name || name.startsWith("#") || name.startsWith("_"))
+          continue;
+        members.push({
+          name,
+          kind: "method"
+        });
+      }
+    }
+    return members;
+  }
   registerFromSymbol(symbol, checker) {
     const name = symbol.getName();
     if (this.has(name))
@@ -289,6 +405,44 @@ function getParamDescription(propertyName, jsdocTags, inferredAlias) {
   }
   return;
 }
+function extractTypeParameters(node, checker) {
+  if (!node.typeParameters || node.typeParameters.length === 0) {
+    return;
+  }
+  return node.typeParameters.map((tp) => {
+    const name = tp.name.text;
+    let constraint;
+    if (tp.constraint) {
+      const constraintType = checker.getTypeAtLocation(tp.constraint);
+      constraint = checker.typeToString(constraintType);
+    }
+    let defaultType;
+    if (tp.default) {
+      const defType = checker.getTypeAtLocation(tp.default);
+      defaultType = checker.typeToString(defType);
+    }
+    return {
+      name,
+      ...constraint ? { constraint } : {},
+      ...defaultType ? { default: defaultType } : {}
+    };
+  });
+}
+function isSymbolDeprecated(symbol) {
+  if (!symbol) {
+    return false;
+  }
+  const jsDocTags = symbol.getJsDocTags();
+  if (jsDocTags.some((tag) => tag.name.toLowerCase() === "deprecated")) {
+    return true;
+  }
+  for (const declaration of symbol.getDeclarations() ?? []) {
+    if (ts2.getJSDocDeprecatedTag(declaration)) {
+      return true;
+    }
+  }
+  return false;
+}
 
 // src/compiler/program.ts
 import * as path2 from "node:path";
@@ -339,59 +493,32 @@ function createProgram({
   };
 }
 
-// src/serializers/classes.ts
-function serializeClass(node, ctx) {
-  const symbol = ctx.typeChecker.getSymbolAtLocation(node.name ?? node);
-  const name = symbol?.getName() ?? node.name?.getText();
-  if (!name)
-    return null;
-  const declSourceFile = node.getSourceFile();
-  const { description, tags, examples } = getJSDocComment(node);
-  const source = getSourceLocation(node, declSourceFile);
-  return {
-    id: name,
-    name,
-    kind: "class",
-    description,
-    tags,
-    source,
-    members: [],
-    ...examples.length > 0 ? { examples } : {}
-  };
-}
-
-// src/serializers/enums.ts
-function serializeEnum(node, ctx) {
-  const symbol = ctx.typeChecker.getSymbolAtLocation(node.name ?? node);
-  const name = symbol?.getName() ?? node.name?.getText();
-  if (!name)
-    return null;
-  const declSourceFile = node.getSourceFile();
-  const { description, tags, examples } = getJSDocComment(node);
-  const source = getSourceLocation(node, declSourceFile);
-  const members = node.members.map((member) => {
-    const memberSymbol = ctx.typeChecker.getSymbolAtLocation(member.name);
-    const memberName = memberSymbol?.getName() ?? member.name.getText();
-    return {
-      id: memberName,
-      name: memberName,
-      kind: "enum-member"
-    };
-  });
-  return {
-    id: name,
-    name,
-    kind: "enum",
-    description,
-    tags,
-    source,
-    members,
-    ...examples.length > 0 ? { examples } : {}
-  };
-}
-
 // src/types/schema-builder.ts
 import ts4 from "typescript";
+var BUILTIN_TYPE_SCHEMAS = {
+  Date: { type: "string", format: "date-time" },
+  RegExp: { type: "object", description: "RegExp" },
+  Error: { type: "object" },
+  Promise: { type: "object" },
+  Map: { type: "object" },
+  Set: { type: "object" },
+  WeakMap: { type: "object" },
+  WeakSet: { type: "object" },
+  Function: { type: "object" },
+  ArrayBuffer: { type: "string", format: "binary" },
+  ArrayBufferLike: { type: "string", format: "binary" },
+  DataView: { type: "string", format: "binary" },
+  Uint8Array: { type: "string", format: "byte" },
+  Uint16Array: { type: "string", format: "byte" },
+  Uint32Array: { type: "string", format: "byte" },
+  Int8Array: { type: "string", format: "byte" },
+  Int16Array: { type: "string", format: "byte" },
+  Int32Array: { type: "string", format: "byte" },
+  Float32Array: { type: "string", format: "byte" },
+  Float64Array: { type: "string", format: "byte" },
+  BigInt64Array: { type: "string", format: "byte" },
+  BigUint64Array: { type: "string", format: "byte" }
+};
 var PRIMITIVES2 = new Set([
   "string",
   "number",
@@ -487,10 +614,10 @@ function buildSchema(type, checker, ctx, _depth = 0) {
   if (isAtMaxDepth(ctx)) {
     return { type: checker.typeToString(type) };
   }
-  if (ctx && ctx.visitedTypes.has(type)) {
+  if (ctx?.visitedTypes.has(type)) {
     const symbol2 = type.getSymbol() || type.aliasSymbol;
     if (symbol2) {
-      return { $ref: symbol2.getName() };
+      return { $ref: `#/types/${symbol2.getName()}` };
     }
     return { type: checker.typeToString(type) };
   }
@@ -574,15 +701,15 @@ function buildSchema(type, checker, ctx, _depth = 0) {
     const elementTypes = typeRef2.typeArguments ?? [];
     if (ctx) {
       return withDepth(ctx, () => ({
-        type: "tuple",
-        items: elementTypes.map((t) => buildSchema(t, checker, ctx)),
+        type: "array",
+        prefixedItems: elementTypes.map((t) => buildSchema(t, checker, ctx)),
         minItems: elementTypes.length,
         maxItems: elementTypes.length
       }));
     }
     return {
-      type: "tuple",
-      items: elementTypes.map((t) => buildSchema(t, checker, ctx)),
+      type: "array",
+      prefixedItems: elementTypes.map((t) => buildSchema(t, checker, ctx)),
       minItems: elementTypes.length,
       maxItems: elementTypes.length
     };
@@ -591,15 +718,18 @@ function buildSchema(type, checker, ctx, _depth = 0) {
   if (typeRef.target && typeRef.typeArguments && typeRef.typeArguments.length > 0) {
     const symbol2 = typeRef.target.getSymbol();
     const name = symbol2?.getName();
+    if (name && BUILTIN_TYPES.has(name)) {
+      return { $ref: `#/types/${name}` };
+    }
     if (name && (isBuiltinGeneric(name) || !isAnonymous(typeRef.target))) {
       if (ctx) {
         return withDepth(ctx, () => ({
-          $ref: name,
+          $ref: `#/types/${name}`,
           typeArguments: typeRef.typeArguments.map((t) => buildSchema(t, checker, ctx))
         }));
       }
       return {
-        $ref: name,
+        $ref: `#/types/${name}`,
         typeArguments: typeRef.typeArguments.map((t) => buildSchema(t, checker, ctx))
       };
     }
@@ -611,10 +741,10 @@ function buildSchema(type, checker, ctx, _depth = 0) {
       return { type: name };
     }
     if (BUILTIN_TYPES.has(name)) {
-      return { $ref: name };
+      return { $ref: `#/types/${name}` };
     }
     if (!name.startsWith("__")) {
-      return { $ref: name };
+      return { $ref: `#/types/${name}` };
     }
   }
   if (type.flags & ts4.TypeFlags.Object) {
@@ -681,6 +811,110 @@ function buildObjectSchema(properties, checker, ctx) {
   }
   return buildProps();
 }
+function isPureRefSchema(schema) {
+  return typeof schema === "object" && Object.keys(schema).length === 1 && "$ref" in schema;
+}
+function withDescription(schema, description) {
+  if (isPureRefSchema(schema)) {
+    return {
+      allOf: [schema],
+      description
+    };
+  }
+  return { ...schema, description };
+}
+function schemaIsAny(schema) {
+  if (typeof schema === "string") {
+    return schema === "any";
+  }
+  if ("type" in schema && schema.type === "any" && Object.keys(schema).length === 1) {
+    return true;
+  }
+  return false;
+}
+function schemasAreEqual(left, right) {
+  if (typeof left !== typeof right) {
+    return false;
+  }
+  if (typeof left === "string" && typeof right === "string") {
+    return left === right;
+  }
+  if (left == null || right == null) {
+    return left === right;
+  }
+  const normalize = (value) => {
+    if (Array.isArray(value)) {
+      return value.map((item) => normalize(item));
+    }
+    if (value && typeof value === "object") {
+      const sortedEntries = Object.entries(value).map(([key, val]) => [key, normalize(val)]).sort(([keyA], [keyB]) => keyA.localeCompare(keyB));
+      return Object.fromEntries(sortedEntries);
+    }
+    return value;
+  };
+  return JSON.stringify(normalize(left)) === JSON.stringify(normalize(right));
+}
+function deduplicateSchemas(schemas) {
+  const result = [];
+  for (const schema of schemas) {
+    const isDuplicate = result.some((existing) => schemasAreEqual(existing, schema));
+    if (!isDuplicate) {
+      result.push(schema);
+    }
+  }
+  return result;
+}
+function findDiscriminatorProperty(unionTypes, checker) {
+  const memberProps = [];
+  for (const t of unionTypes) {
+    if (t.flags & (ts4.TypeFlags.Null | ts4.TypeFlags.Undefined)) {
+      continue;
+    }
+    const props = t.getProperties();
+    if (!props || props.length === 0) {
+      return;
+    }
+    const propValues = new Map;
+    for (const prop of props) {
+      const declaration = prop.valueDeclaration ?? prop.declarations?.[0];
+      if (!declaration)
+        continue;
+      try {
+        const propType = checker.getTypeOfSymbolAtLocation(prop, declaration);
+        if (propType.isStringLiteral()) {
+          propValues.set(prop.getName(), propType.value);
+        } else if (propType.isNumberLiteral()) {
+          propValues.set(prop.getName(), propType.value);
+        }
+      } catch {}
+    }
+    memberProps.push(propValues);
+  }
+  if (memberProps.length < 2) {
+    return;
+  }
+  const firstMember = memberProps[0];
+  for (const [propName, firstValue] of firstMember) {
+    const values = new Set([firstValue]);
+    let isDiscriminator = true;
+    for (let i = 1;i < memberProps.length; i++) {
+      const value = memberProps[i].get(propName);
+      if (value === undefined) {
+        isDiscriminator = false;
+        break;
+      }
+      if (values.has(value)) {
+        isDiscriminator = false;
+        break;
+      }
+      values.add(value);
+    }
+    if (isDiscriminator) {
+      return propName;
+    }
+  }
+  return;
+}
 
 // src/types/parameters.ts
 import ts5 from "typescript";
@@ -801,7 +1035,10 @@ function extractDefaultValue(initializer) {
 function registerReferencedTypes(type, ctx) {
   if (ctx.visitedTypes.has(type))
     return;
-  ctx.visitedTypes.add(type);
+  const isPrimitive = type.flags & (ts5.TypeFlags.String | ts5.TypeFlags.Number | ts5.TypeFlags.Boolean | ts5.TypeFlags.Void | ts5.TypeFlags.Undefined | ts5.TypeFlags.Null | ts5.TypeFlags.Any | ts5.TypeFlags.Unknown | ts5.TypeFlags.Never | ts5.TypeFlags.StringLiteral | ts5.TypeFlags.NumberLiteral | ts5.TypeFlags.BooleanLiteral);
+  if (!isPrimitive) {
+    ctx.visitedTypes.add(type);
+  }
   const { typeChecker: checker, typeRegistry, exportedIds } = ctx;
   typeRegistry.registerType(type, checker, exportedIds);
   const typeArgs = type.typeArguments;
@@ -822,6 +1059,280 @@ function registerReferencedTypes(type, ctx) {
   }
 }
 
+// src/serializers/classes.ts
+import ts6 from "typescript";
+function serializeClass(node, ctx) {
+  const { typeChecker: checker } = ctx;
+  const symbol = checker.getSymbolAtLocation(node.name ?? node);
+  const name = symbol?.getName() ?? node.name?.getText();
+  if (!name)
+    return null;
+  const declSourceFile = node.getSourceFile();
+  const { description, tags, examples } = getJSDocComment(node);
+  const source = getSourceLocation(node, declSourceFile);
+  const typeParameters = extractTypeParameters(node, checker);
+  const members = [];
+  const signatures = [];
+  const methodsByName = new Map;
+  for (const member of node.members) {
+    const memberName = getMemberName(member);
+    if (memberName?.startsWith("#"))
+      continue;
+    if (ts6.isPropertyDeclaration(member)) {
+      const propMember = serializeProperty(member, ctx);
+      if (propMember)
+        members.push(propMember);
+    } else if (ts6.isMethodDeclaration(member)) {
+      const methodMember = serializeMethod(member, ctx);
+      if (methodMember?.name) {
+        if (!methodsByName.has(methodMember.name)) {
+          methodsByName.set(methodMember.name, methodMember);
+        } else {
+          const existing = methodsByName.get(methodMember.name);
+          if (!existing.description && methodMember.description) {
+            existing.description = methodMember.description;
+          }
+          if (!existing.tags && methodMember.tags) {
+            existing.tags = methodMember.tags;
+          }
+        }
+      }
+    } else if (ts6.isConstructorDeclaration(member)) {
+      const ctorSig = serializeConstructor(member, ctx);
+      if (ctorSig)
+        signatures.push(ctorSig);
+    } else if (ts6.isGetAccessorDeclaration(member) || ts6.isSetAccessorDeclaration(member)) {
+      const accessorMember = serializeAccessor(member, ctx);
+      if (accessorMember)
+        members.push(accessorMember);
+    }
+  }
+  members.push(...methodsByName.values());
+  const extendsClause = getExtendsClause(node, checker);
+  const implementsClause = getImplementsClause(node, checker);
+  return {
+    id: name,
+    name,
+    kind: "class",
+    description,
+    tags,
+    source,
+    typeParameters,
+    members: members.length > 0 ? members : undefined,
+    signatures: signatures.length > 0 ? signatures : undefined,
+    extends: extendsClause,
+    implements: implementsClause?.length ? implementsClause : undefined,
+    ...examples.length > 0 ? { examples } : {}
+  };
+}
+function getMemberName(member) {
+  if (ts6.isConstructorDeclaration(member))
+    return "constructor";
+  if (!member.name)
+    return;
+  if (ts6.isIdentifier(member.name))
+    return member.name.text;
+  if (ts6.isPrivateIdentifier(member.name))
+    return member.name.text;
+  return member.name.getText();
+}
+function getVisibility(member) {
+  const modifiers = ts6.getModifiers(member);
+  if (!modifiers)
+    return;
+  for (const mod of modifiers) {
+    if (mod.kind === ts6.SyntaxKind.PrivateKeyword)
+      return "private";
+    if (mod.kind === ts6.SyntaxKind.ProtectedKeyword)
+      return "protected";
+    if (mod.kind === ts6.SyntaxKind.PublicKeyword)
+      return "public";
+  }
+  return;
+}
+function isStatic(member) {
+  const modifiers = ts6.getModifiers(member);
+  return modifiers?.some((m) => m.kind === ts6.SyntaxKind.StaticKeyword) ?? false;
+}
+function isReadonly(member) {
+  const modifiers = ts6.getModifiers(member);
+  return modifiers?.some((m) => m.kind === ts6.SyntaxKind.ReadonlyKeyword) ?? false;
+}
+function serializeProperty(node, ctx) {
+  const { typeChecker: checker } = ctx;
+  const name = getMemberName(node);
+  if (!name)
+    return null;
+  const { description, tags } = getJSDocComment(node);
+  const visibility = getVisibility(node);
+  const type = checker.getTypeAtLocation(node);
+  const schema = buildSchema(type, checker, ctx);
+  registerReferencedTypes(type, ctx);
+  const flags = {};
+  if (isStatic(node))
+    flags.static = true;
+  if (isReadonly(node))
+    flags.readonly = true;
+  if (node.questionToken)
+    flags.optional = true;
+  return {
+    name,
+    kind: "property",
+    description,
+    tags: tags.length > 0 ? tags : undefined,
+    visibility,
+    schema,
+    flags: Object.keys(flags).length > 0 ? flags : undefined
+  };
+}
+function serializeMethod(node, ctx) {
+  const { typeChecker: checker } = ctx;
+  const name = getMemberName(node);
+  if (!name)
+    return null;
+  const { description, tags } = getJSDocComment(node);
+  const visibility = getVisibility(node);
+  const type = checker.getTypeAtLocation(node);
+  const callSignatures = type.getCallSignatures();
+  const signatures = callSignatures.map((sig) => {
+    const params = extractParameters(sig, ctx);
+    const returnType = checker.getReturnTypeOfSignature(sig);
+    registerReferencedTypes(returnType, ctx);
+    return {
+      parameters: params.length > 0 ? params : undefined,
+      returns: {
+        schema: buildSchema(returnType, checker, ctx)
+      }
+    };
+  });
+  const flags = {};
+  if (isStatic(node))
+    flags.static = true;
+  if (node.asteriskToken)
+    flags.generator = true;
+  const modifiers = ts6.getModifiers(node);
+  if (modifiers?.some((m) => m.kind === ts6.SyntaxKind.AsyncKeyword)) {
+    flags.async = true;
+  }
+  return {
+    name,
+    kind: "method",
+    description,
+    tags: tags.length > 0 ? tags : undefined,
+    visibility,
+    signatures: signatures.length > 0 ? signatures : undefined,
+    flags: Object.keys(flags).length > 0 ? flags : undefined
+  };
+}
+function serializeConstructor(node, ctx) {
+  const { typeChecker: checker } = ctx;
+  const { description } = getJSDocComment(node);
+  const sig = checker.getSignatureFromDeclaration(node);
+  if (!sig)
+    return null;
+  const params = extractParameters(sig, ctx);
+  return {
+    description,
+    parameters: params.length > 0 ? params : undefined
+  };
+}
+function serializeAccessor(node, ctx) {
+  const { typeChecker: checker } = ctx;
+  const name = getMemberName(node);
+  if (!name)
+    return null;
+  const { description, tags } = getJSDocComment(node);
+  const visibility = getVisibility(node);
+  const type = checker.getTypeAtLocation(node);
+  const schema = buildSchema(type, checker, ctx);
+  registerReferencedTypes(type, ctx);
+  const kind = ts6.isGetAccessorDeclaration(node) ? "getter" : "setter";
+  const flags = {};
+  if (isStatic(node))
+    flags.static = true;
+  return {
+    name,
+    kind,
+    description,
+    tags: tags.length > 0 ? tags : undefined,
+    visibility,
+    schema,
+    flags: Object.keys(flags).length > 0 ? flags : undefined
+  };
+}
+function getExtendsClause(node, checker) {
+  if (!node.heritageClauses)
+    return;
+  for (const clause of node.heritageClauses) {
+    if (clause.token === ts6.SyntaxKind.ExtendsKeyword) {
+      const expr = clause.types[0];
+      if (expr) {
+        const type = checker.getTypeAtLocation(expr);
+        const symbol = type.getSymbol();
+        return symbol?.getName() ?? expr.expression.getText();
+      }
+    }
+  }
+  return;
+}
+function getImplementsClause(node, checker) {
+  if (!node.heritageClauses)
+    return;
+  for (const clause of node.heritageClauses) {
+    if (clause.token === ts6.SyntaxKind.ImplementsKeyword) {
+      return clause.types.map((expr) => {
+        const type = checker.getTypeAtLocation(expr);
+        const symbol = type.getSymbol();
+        return symbol?.getName() ?? expr.expression.getText();
+      });
+    }
+  }
+  return;
+}
+
+// src/serializers/enums.ts
+function serializeEnum(node, ctx) {
+  const { typeChecker: checker } = ctx;
+  const symbol = checker.getSymbolAtLocation(node.name ?? node);
+  const name = symbol?.getName() ?? node.name?.getText();
+  if (!name)
+    return null;
+  const declSourceFile = node.getSourceFile();
+  const { description, tags, examples } = getJSDocComment(node);
+  const source = getSourceLocation(node, declSourceFile);
+  const members = node.members.map((member) => {
+    const memberSymbol = checker.getSymbolAtLocation(member.name);
+    const memberName = memberSymbol?.getName() ?? member.name.getText();
+    const constantValue = checker.getConstantValue(member);
+    let schema;
+    if (typeof constantValue === "string") {
+      schema = { type: "string", enum: [constantValue] };
+    } else if (typeof constantValue === "number") {
+      schema = { type: "number", enum: [constantValue] };
+    } else if (member.initializer) {
+      schema = { type: member.initializer.getText() };
+    }
+    const { description: memberDesc } = getJSDocComment(member);
+    return {
+      id: memberName,
+      name: memberName,
+      kind: "enum-member",
+      ...schema ? { schema } : {},
+      ...memberDesc ? { description: memberDesc } : {}
+    };
+  });
+  return {
+    id: name,
+    name,
+    kind: "enum",
+    description,
+    tags,
+    source,
+    members,
+    ...examples.length > 0 ? { examples } : {}
+  };
+}
+
 // src/serializers/functions.ts
 function serializeFunctionExport(node, ctx) {
   const symbol = ctx.typeChecker.getSymbolAtLocation(node.name ?? node);
@@ -831,6 +1342,7 @@ function serializeFunctionExport(node, ctx) {
   const declSourceFile = node.getSourceFile();
   const { description, tags, examples } = getJSDocComment(node);
   const source = getSourceLocation(node, declSourceFile);
+  const typeParameters = extractTypeParameters(node, ctx.typeChecker);
   const type = ctx.typeChecker.getTypeAtLocation(node);
   const callSignatures = type.getCallSignatures();
   const signatures = callSignatures.map((sig) => {
@@ -851,20 +1363,50 @@ function serializeFunctionExport(node, ctx) {
     description,
     tags,
     source,
+    typeParameters,
     signatures,
     ...examples.length > 0 ? { examples } : {}
   };
 }
 
 // src/serializers/interfaces.ts
+import ts7 from "typescript";
 function serializeInterface(node, ctx) {
-  const symbol = ctx.typeChecker.getSymbolAtLocation(node.name ?? node);
+  const { typeChecker: checker } = ctx;
+  const symbol = checker.getSymbolAtLocation(node.name ?? node);
   const name = symbol?.getName() ?? node.name?.getText();
   if (!name)
     return null;
   const declSourceFile = node.getSourceFile();
   const { description, tags, examples } = getJSDocComment(node);
   const source = getSourceLocation(node, declSourceFile);
+  const typeParameters = extractTypeParameters(node, checker);
+  const members = [];
+  const methodsByName = new Map;
+  for (const member of node.members) {
+    if (ts7.isPropertySignature(member)) {
+      const propMember = serializePropertySignature(member, ctx);
+      if (propMember)
+        members.push(propMember);
+    } else if (ts7.isMethodSignature(member)) {
+      const methodMember = serializeMethodSignature(member, ctx);
+      if (methodMember?.name) {
+        if (!methodsByName.has(methodMember.name)) {
+          methodsByName.set(methodMember.name, methodMember);
+        }
+      }
+    } else if (ts7.isCallSignatureDeclaration(member)) {
+      const callMember = serializeCallSignature(member, ctx);
+      if (callMember)
+        members.push(callMember);
+    } else if (ts7.isIndexSignatureDeclaration(member)) {
+      const indexMember = serializeIndexSignature(member, ctx);
+      if (indexMember)
+        members.push(indexMember);
+    }
+  }
+  members.push(...methodsByName.values());
+  const extendsClause = getInterfaceExtends(node, checker);
   return {
     id: name,
     name,
@@ -872,10 +1414,121 @@ function serializeInterface(node, ctx) {
     description,
     tags,
     source,
-    members: [],
+    typeParameters,
+    members: members.length > 0 ? members : undefined,
+    extends: extendsClause,
     ...examples.length > 0 ? { examples } : {}
   };
 }
+function serializePropertySignature(node, ctx) {
+  const { typeChecker: checker } = ctx;
+  const name = node.name.getText();
+  const { description, tags } = getJSDocComment(node);
+  const type = checker.getTypeAtLocation(node);
+  const schema = buildSchema(type, checker, ctx);
+  registerReferencedTypes(type, ctx);
+  const flags = {};
+  if (node.questionToken)
+    flags.optional = true;
+  if (node.modifiers?.some((m) => m.kind === ts7.SyntaxKind.ReadonlyKeyword)) {
+    flags.readonly = true;
+  }
+  return {
+    name,
+    kind: "property",
+    description,
+    tags: tags.length > 0 ? tags : undefined,
+    schema,
+    flags: Object.keys(flags).length > 0 ? flags : undefined
+  };
+}
+function serializeMethodSignature(node, ctx) {
+  const { typeChecker: checker } = ctx;
+  const name = node.name.getText();
+  const { description, tags } = getJSDocComment(node);
+  const type = checker.getTypeAtLocation(node);
+  const callSignatures = type.getCallSignatures();
+  const signatures = callSignatures.map((sig) => {
+    const params = extractParameters(sig, ctx);
+    const returnType = checker.getReturnTypeOfSignature(sig);
+    registerReferencedTypes(returnType, ctx);
+    return {
+      parameters: params.length > 0 ? params : undefined,
+      returns: {
+        schema: buildSchema(returnType, checker, ctx)
+      }
+    };
+  });
+  const flags = {};
+  if (node.questionToken)
+    flags.optional = true;
+  return {
+    name,
+    kind: "method",
+    description,
+    tags: tags.length > 0 ? tags : undefined,
+    signatures: signatures.length > 0 ? signatures : undefined,
+    flags: Object.keys(flags).length > 0 ? flags : undefined
+  };
+}
+function serializeCallSignature(node, ctx) {
+  const { typeChecker: checker } = ctx;
+  const { description, tags } = getJSDocComment(node);
+  const sig = checker.getSignatureFromDeclaration(node);
+  if (!sig)
+    return null;
+  const params = extractParameters(sig, ctx);
+  const returnType = checker.getReturnTypeOfSignature(sig);
+  registerReferencedTypes(returnType, ctx);
+  return {
+    name: "()",
+    kind: "call-signature",
+    description,
+    tags: tags.length > 0 ? tags : undefined,
+    signatures: [
+      {
+        parameters: params.length > 0 ? params : undefined,
+        returns: {
+          schema: buildSchema(returnType, checker, ctx)
+        }
+      }
+    ]
+  };
+}
+function serializeIndexSignature(node, ctx) {
+  const { typeChecker: checker } = ctx;
+  const { description, tags } = getJSDocComment(node);
+  const valueType = node.type ? checker.getTypeAtLocation(node.type) : checker.getAnyType();
+  const valueSchema = buildSchema(valueType, checker, ctx);
+  registerReferencedTypes(valueType, ctx);
+  const keyParam = node.parameters[0];
+  const keyType = keyParam?.type ? checker.getTypeAtLocation(keyParam.type) : checker.getStringType();
+  const keyTypeName = checker.typeToString(keyType);
+  return {
+    name: `[${keyTypeName}]`,
+    kind: "index-signature",
+    description,
+    tags: tags.length > 0 ? tags : undefined,
+    schema: {
+      type: "object",
+      additionalProperties: valueSchema
+    }
+  };
+}
+function getInterfaceExtends(node, checker) {
+  if (!node.heritageClauses)
+    return;
+  for (const clause of node.heritageClauses) {
+    if (clause.token === ts7.SyntaxKind.ExtendsKeyword && clause.types.length > 0) {
+      const names = clause.types.map((expr) => {
+        const type = checker.getTypeAtLocation(expr);
+        return type.getSymbol()?.getName() ?? expr.expression.getText();
+      });
+      return names.length === 1 ? names[0] : names;
+    }
+  }
+  return;
+}
 
 // src/serializers/type-aliases.ts
 function serializeTypeAlias(node, ctx) {
@@ -886,7 +1539,9 @@ function serializeTypeAlias(node, ctx) {
   const declSourceFile = node.getSourceFile();
   const { description, tags, examples } = getJSDocComment(node);
   const source = getSourceLocation(node, declSourceFile);
+  const typeParameters = extractTypeParameters(node, ctx.typeChecker);
   const type = ctx.typeChecker.getTypeAtLocation(node);
+  const schema = buildSchema(type, ctx.typeChecker, ctx);
   registerReferencedTypes(type, ctx);
   return {
     id: name,
@@ -895,7 +1550,8 @@ function serializeTypeAlias(node, ctx) {
     description,
     tags,
     source,
-    schema: buildSchema(type, ctx.typeChecker, ctx),
+    typeParameters,
+    schema,
     ...examples.length > 0 ? { examples } : {}
   };
 }
@@ -910,6 +1566,7 @@ function serializeVariable(node, statement, ctx) {
   const { description, tags, examples } = getJSDocComment(statement);
   const source = getSourceLocation(node, declSourceFile);
   const type = ctx.typeChecker.getTypeAtLocation(node);
+  const schema = buildSchema(type, ctx.typeChecker, ctx);
   registerReferencedTypes(type, ctx);
   return {
     id: name,
@@ -918,7 +1575,7 @@ function serializeVariable(node, statement, ctx) {
     description,
     tags,
     source,
-    schema: buildSchema(type, ctx.typeChecker, ctx),
+    schema,
     ...examples.length > 0 ? { examples } : {}
   };
 }
@@ -926,8 +1583,8 @@ function serializeVariable(node, statement, ctx) {
 // src/builder/spec-builder.ts
 import * as fs2 from "node:fs";
 import * as path3 from "node:path";
-import { SCHEMA_VERSION } from "@openpkg-ts/spec";
-import ts6 from "typescript";
+import { SCHEMA_URL, SCHEMA_VERSION } from "@openpkg-ts/spec";
+import ts8 from "typescript";
 
 // src/serializers/context.ts
 function createContext(program, sourceFile, options = {}) {
@@ -946,15 +1603,52 @@ function createContext(program, sourceFile, options = {}) {
 }
 
 // src/builder/spec-builder.ts
+var BUILTIN_TYPES2 = new Set([
+  "Array",
+  "Promise",
+  "Map",
+  "Set",
+  "Record",
+  "Partial",
+  "Required",
+  "Pick",
+  "Omit",
+  "Exclude",
+  "Extract",
+  "NonNullable",
+  "Parameters",
+  "ReturnType",
+  "Readonly",
+  "ReadonlyArray",
+  "Awaited",
+  "Date",
+  "RegExp",
+  "Error",
+  "Function",
+  "Object",
+  "String",
+  "Number",
+  "Boolean",
+  "Symbol",
+  "BigInt"
+]);
 async function extract(options) {
-  const { entryFile, baseDir, content, maxTypeDepth, maxExternalTypeDepth, resolveExternalTypes } = options;
+  const {
+    entryFile,
+    baseDir,
+    content,
+    maxTypeDepth,
+    maxExternalTypeDepth,
+    resolveExternalTypes,
+    includeSchema
+  } = options;
   const diagnostics = [];
   const exports = [];
   const result = createProgram({ entryFile, baseDir, content });
   const { program, sourceFile } = result;
   if (!sourceFile) {
     return {
-      spec: createEmptySpec(entryFile),
+      spec: createEmptySpec(entryFile, includeSchema),
       diagnostics: [{ message: `Could not load source file: ${entryFile}`, severity: "error" }]
     };
   }
@@ -962,7 +1656,7 @@ async function extract(options) {
   const moduleSymbol = typeChecker.getSymbolAtLocation(sourceFile);
   if (!moduleSymbol) {
     return {
-      spec: createEmptySpec(entryFile),
+      spec: createEmptySpec(entryFile, includeSchema),
       diagnostics: [{ message: "Could not get module symbol", severity: "warning" }]
     };
   }
@@ -971,7 +1665,11 @@ async function extract(options) {
   for (const symbol of exportedSymbols) {
     exportedIds.add(symbol.getName());
   }
-  const ctx = createContext(program, sourceFile, { maxTypeDepth, maxExternalTypeDepth, resolveExternalTypes });
+  const ctx = createContext(program, sourceFile, {
+    maxTypeDepth,
+    maxExternalTypeDepth,
+    resolveExternalTypes
+  });
   ctx.exportedIds = exportedIds;
   for (const symbol of exportedSymbols) {
     try {
@@ -990,11 +1688,31 @@ async function extract(options) {
     }
   }
   const meta = await getPackageMeta(entryFile, baseDir);
+  const types = ctx.typeRegistry.getAll();
+  const danglingRefs = collectDanglingRefs(exports, types);
+  for (const ref of danglingRefs) {
+    diagnostics.push({
+      message: `Type '${ref}' is referenced but not defined in types[].`,
+      severity: "warning",
+      code: "DANGLING_REF",
+      suggestion: "The type may be from an external package. Check import paths."
+    });
+  }
+  const externalTypes = types.filter((t) => t.kind === "external");
+  if (externalTypes.length > 0) {
+    diagnostics.push({
+      message: `${externalTypes.length} external type(s) could not be fully resolved: ${externalTypes.slice(0, 5).map((t) => t.id).join(", ")}${externalTypes.length > 5 ? "..." : ""}`,
+      severity: "warning",
+      code: "EXTERNAL_TYPE_STUBS",
+      suggestion: "Types are from external packages. Full resolution requires type declarations."
+    });
+  }
   const spec = {
+    ...includeSchema ? { $schema: SCHEMA_URL } : {},
     openpkg: SCHEMA_VERSION,
     meta,
     exports,
-    types: ctx.typeRegistry.getAll(),
+    types,
     generation: {
       generator: "@openpkg-ts/extract",
       timestamp: new Date().toISOString()
@@ -1002,46 +1720,72 @@ async function extract(options) {
   };
   return { spec, diagnostics };
 }
+function collectAllRefs(obj, refs) {
+  if (obj === null || obj === undefined)
+    return;
+  if (Array.isArray(obj)) {
+    for (const item of obj) {
+      collectAllRefs(item, refs);
+    }
+    return;
+  }
+  if (typeof obj === "object") {
+    const record = obj;
+    if (typeof record.$ref === "string" && record.$ref.startsWith("#/types/")) {
+      refs.add(record.$ref.slice("#/types/".length));
+    }
+    for (const value of Object.values(record)) {
+      collectAllRefs(value, refs);
+    }
+  }
+}
+function collectDanglingRefs(exports, types) {
+  const definedTypes = new Set(types.map((t) => t.id));
+  const referencedTypes = new Set;
+  collectAllRefs(exports, referencedTypes);
+  collectAllRefs(types, referencedTypes);
+  return Array.from(referencedTypes).filter((ref) => !definedTypes.has(ref) && !BUILTIN_TYPES2.has(ref));
+}
 function resolveExportTarget(symbol, checker) {
   let targetSymbol = symbol;
-  if (symbol.flags & ts6.SymbolFlags.Alias) {
+  if (symbol.flags & ts8.SymbolFlags.Alias) {
     const aliasTarget = checker.getAliasedSymbol(symbol);
     if (aliasTarget && aliasTarget !== symbol) {
       targetSymbol = aliasTarget;
     }
   }
   const declarations = targetSymbol.declarations ?? [];
-  const declaration = targetSymbol.valueDeclaration || declarations.find((decl) => decl.kind !== ts6.SyntaxKind.ExportSpecifier) || declarations[0];
+  const declaration = targetSymbol.valueDeclaration || declarations.find((decl) => decl.kind !== ts8.SyntaxKind.ExportSpecifier) || declarations[0];
   return { declaration, targetSymbol };
 }
-function serializeDeclaration(declaration, exportSymbol, targetSymbol, exportName, ctx) {
+function serializeDeclaration(declaration, exportSymbol, _targetSymbol, exportName, ctx) {
   let result = null;
-  if (ts6.isFunctionDeclaration(declaration)) {
+  if (ts8.isFunctionDeclaration(declaration)) {
     result = serializeFunctionExport(declaration, ctx);
-  } else if (ts6.isClassDeclaration(declaration)) {
+  } else if (ts8.isClassDeclaration(declaration)) {
     result = serializeClass(declaration, ctx);
-  } else if (ts6.isInterfaceDeclaration(declaration)) {
+  } else if (ts8.isInterfaceDeclaration(declaration)) {
     result = serializeInterface(declaration, ctx);
-  } else if (ts6.isTypeAliasDeclaration(declaration)) {
+  } else if (ts8.isTypeAliasDeclaration(declaration)) {
     result = serializeTypeAlias(declaration, ctx);
-  } else if (ts6.isEnumDeclaration(declaration)) {
+  } else if (ts8.isEnumDeclaration(declaration)) {
     result = serializeEnum(declaration, ctx);
-  } else if (ts6.isVariableDeclaration(declaration)) {
+  } else if (ts8.isVariableDeclaration(declaration)) {
     const varStatement = declaration.parent?.parent;
-    if (varStatement && ts6.isVariableStatement(varStatement)) {
+    if (varStatement && ts8.isVariableStatement(varStatement)) {
       result = serializeVariable(declaration, varStatement, ctx);
     }
-  } else if (ts6.isNamespaceExport(declaration) || ts6.isModuleDeclaration(declaration)) {
-    result = serializeNamespaceExport(exportSymbol, exportName, ctx);
-  } else if (ts6.isSourceFile(declaration)) {
-    result = serializeNamespaceExport(exportSymbol, exportName, ctx);
+  } else if (ts8.isNamespaceExport(declaration) || ts8.isModuleDeclaration(declaration)) {
+    result = serializeNamespaceExport(exportSymbol, exportName);
+  } else if (ts8.isSourceFile(declaration)) {
+    result = serializeNamespaceExport(exportSymbol, exportName);
   }
   if (result) {
     result = withExportName(result, exportName);
   }
   return result;
 }
-function serializeNamespaceExport(symbol, exportName, ctx) {
+function serializeNamespaceExport(symbol, exportName) {
   const { description, tags, examples } = getJSDocFromExportSymbol(symbol);
   return {
     id: exportName,
@@ -1057,11 +1801,11 @@ function getJSDocFromExportSymbol(symbol) {
   const examples = [];
   const decl = symbol.declarations?.[0];
   if (decl) {
-    const exportDecl = ts6.isNamespaceExport(decl) ? decl.parent : decl;
-    if (exportDecl && ts6.isExportDeclaration(exportDecl)) {
-      const jsDocs = ts6.getJSDocCommentsAndTags(exportDecl);
+    const exportDecl = ts8.isNamespaceExport(decl) ? decl.parent : decl;
+    if (exportDecl && ts8.isExportDeclaration(exportDecl)) {
+      const jsDocs = ts8.getJSDocCommentsAndTags(exportDecl);
       for (const doc of jsDocs) {
-        if (ts6.isJSDoc(doc) && doc.comment) {
+        if (ts8.isJSDoc(doc) && doc.comment) {
           const commentText = typeof doc.comment === "string" ? doc.comment : doc.comment.map((c) => ("text" in c) ? c.text : "").join("");
           if (commentText) {
             return {
@@ -1119,8 +1863,9 @@ function withExportName(entry, exportName) {
     name: entry.name
   };
 }
-function createEmptySpec(entryFile) {
+function createEmptySpec(entryFile, includeSchema) {
   return {
+    ...includeSchema ? { $schema: SCHEMA_URL } : {},
     openpkg: SCHEMA_VERSION,
     meta: { name: path3.basename(entryFile, path3.extname(entryFile)) },
     exports: [],
@@ -1145,4 +1890,4 @@ async function getPackageMeta(entryFile, baseDir) {
   } catch {}
   return { name: path3.basename(searchDir) };
 }
-export { TypeRegistry, getJSDocComment, getSourceLocation, createProgram, serializeClass, serializeEnum, isPrimitiveName, isBuiltinGeneric, isAnonymous, buildSchema, extractParameters, registerReferencedTypes, serializeFunctionExport, serializeInterface, serializeTypeAlias, serializeVariable, extract };
+export { TypeRegistry, getJSDocComment, getSourceLocation, getParamDescription, extractTypeParameters, isSymbolDeprecated, createProgram, BUILTIN_TYPE_SCHEMAS, isPrimitiveName, isBuiltinGeneric, isAnonymous, buildSchema, isPureRefSchema, withDescription, schemaIsAny, schemasAreEqual, deduplicateSchemas, findDiscriminatorProperty, extractParameters, registerReferencedTypes, serializeClass, serializeEnum, serializeFunctionExport, serializeInterface, serializeTypeAlias, serializeVariable, extract };