@openpkg-ts/extract 0.18.3 → 0.20.0

package/dist/bin/tspec.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   extract
-} from "../shared/chunk-j81wegen.js";
+} from "../shared/chunk-rej3ws8m.js";
 
 // src/cli/spec.ts
 import * as fs from "node:fs";

package/dist/shared/{chunk-j81wegen.js → chunk-rej3ws8m.js}

@@ -680,13 +680,27 @@ function getJSDocComment(node) {
   const jsDocTags = ts3.getJSDocTags(node);
   const tags = jsDocTags.map((tag) => {
     const rawText = typeof tag.comment === "string" ? tag.comment : ts3.getTextOfJSDocComment(tag.comment) ?? "";
-    let text = rawText;
     if (tag.tagName.text === "param") {
-      text = stripParamSeparator(rawText) ?? "";
-    } else if (tag.tagName.text === "typeParam") {
-      text = stripTypeParamSeparator(rawText) ?? "";
-    }
-    return { name: tag.tagName.text, text };
+      const paramTag = tag;
+      const paramName = paramTag.name?.getText() ?? "";
+      const description2 = stripParamSeparator(rawText);
+      const text = description2 ? `${paramName} - ${description2}` : paramName;
+      const typeExpr = paramTag.typeExpression;
+      const type = typeExpr ? typeExpr.type.getText() : undefined;
+      const param = { name: paramName };
+      if (type)
+        param.type = type;
+      if (description2)
+        param.description = description2;
+      if (paramTag.isBracketed)
+        param.optional = true;
+      return { name: tag.tagName.text, text, param };
+    }
+    if (tag.tagName.text === "typeParam") {
+      const text = stripTypeParamSeparator(rawText) ?? "";
+      return { name: tag.tagName.text, text };
+    }
+    return { name: tag.tagName.text, text: rawText };
   });
   const jsDocComments = node.jsDoc;
   let description;
@@ -1672,7 +1686,7 @@ async function extract(options) {
   }
   const meta = await getPackageMeta(entryFile, baseDir);
   const types = ctx.typeRegistry.getAll();
-  const forgottenExports = collectForgottenExports(exports, types, program, sourceFile);
+  const forgottenExports = collectForgottenExports(exports, types, program, sourceFile, exportedIds);
   for (const forgotten of forgottenExports) {
     const refSummary = forgotten.referencedBy.slice(0, 3).map((r) => `${r.exportName} (${r.location})`).join(", ");
     const moreRefs = forgotten.referencedBy.length > 3 ? ` +${forgotten.referencedBy.length - 3} more` : "";
@@ -1802,7 +1816,7 @@ function hasInternalTag(typeName, program, sourceFile) {
   const jsTags = symbol.getJsDocTags();
   return jsTags.some((tag) => tag.name === "internal");
 }
-function collectForgottenExports(exports, types, program, sourceFile) {
+function collectForgottenExports(exports, types, program, sourceFile, exportedIds) {
   const definedTypes = new Set(types.map((t) => t.id));
   const referencedTypes = new Map;
   for (const exp of exports) {
@@ -1829,6 +1843,8 @@ function collectForgottenExports(exports, types, program, sourceFile) {
       continue;
     if (hasInternalTag(typeName, program, sourceFile))
       continue;
+    if (exportedIds.has(typeName))
+      continue;
     const definedIn = findTypeDefinition(typeName, program, sourceFile);
     const isExternal = isExternalType2(definedIn);
     forgottenExports.push({

package/dist/src/index.d.ts

@@ -180,15 +180,43 @@ declare const typeboxAdapter: SchemaAdapter;
 declare const valibotAdapter: SchemaAdapter;
 declare const zodAdapter: SchemaAdapter;
 /**
-* Standard JSON Schema v1 interface (minimal for detection).
+* Target version for JSON Schema generation.
+* @see https://standardschema.dev/json-schema
 */
-interface StandardJSONSchemaV1 {
+type StandardJSONSchemaTarget = "draft-2020-12" | "draft-07" | "openapi-3.0" | (string & {});
+/**
+* Options for JSON Schema generation methods.
+*/
+interface StandardJSONSchemaOptions {
+	/** Specifies the target version of the generated JSON Schema */
+	readonly target: StandardJSONSchemaTarget;
+	/** Vendor-specific parameters */
+	readonly libraryOptions?: Record<string, unknown>;
+}
+/**
+* Standard JSON Schema v1 interface.
+* @see https://standardschema.dev/json-schema
+*/
+interface StandardJSONSchemaV1<
+	Input = unknown,
+	Output = Input
+> {
 	"~standard": {
-		version: number;
+		/** The version number of the standard (always 1) */
+		version: 1;
+		/** The vendor name of the schema library */
 		vendor: string;
-		jsonSchema?: {
-			output: (target?: string) => Record<string, unknown>;
-			input?: (target?: string) => Record<string, unknown>;
+		/** Inferred types (optional) */
+		types?: {
+			input: Input;
+			output: Output;
+		};
+		/** JSON Schema conversion methods */
+		jsonSchema: {
+			/** Converts input type to JSON Schema */
+			input: (options: StandardJSONSchemaOptions) => Record<string, unknown>;
+			/** Converts output type to JSON Schema */
+			output: (options: StandardJSONSchemaOptions) => Record<string, unknown>;
 		};
 	};
 }
@@ -208,7 +236,9 @@ interface ExtractStandardSchemasOptions {
 	/** Timeout in milliseconds (default: 10000) */
 	timeout?: number;
 	/** JSON Schema target version (default: 'draft-2020-12') */
-	target?: "draft-2020-12" | "draft-07" | "openapi-3.0";
+	target?: StandardJSONSchemaTarget;
+	/** Vendor-specific options to pass through */
+	libraryOptions?: Record<string, unknown>;
 }
 /**
 * Result of Standard Schema extraction.
@@ -329,4 +359,4 @@ declare function findDiscriminatorProperty(unionTypes: ts12.Type[], checker: ts1
 import ts13 from "typescript";
 declare function isExported(node: ts13.Node): boolean;
 declare function getNodeName(node: ts13.Node): string | undefined;
-export { zodAdapter, withDescription, valibotAdapter, typeboxAdapter, serializeVariable, serializeTypeAlias, serializeInterface, serializeFunctionExport, serializeEnum, serializeClass, schemasAreEqual, schemaIsAny, resolveCompiledPath, registerReferencedTypes, registerAdapter, isTypeReference, isSymbolDeprecated, isStandardJSONSchema, isSchemaType, isPureRefSchema, isPrimitiveName, isExported, isBuiltinGeneric, isAnonymous, getSourceLocation, getParamDescription, getNonNullableType, getNodeName, getJSDocComment, findDiscriminatorProperty, findAdapter, extractTypeParameters, extractStandardSchemasFromProject, extractStandardSchemas, extractSchemaType, extractParameters, extract, deduplicateSchemas, createProgram, buildSchema, arktypeAdapter, TypeRegistry, TypeReference2 as TypeReference, StandardSchemaExtractionResult, StandardSchemaExtractionOutput, StandardJSONSchemaV1, SerializerContext, SchemaExtractionResult, SchemaAdapter, ProgramResult, ProgramOptions, ForgottenExport, ExtractStandardSchemasOptions, ExtractResult, ExtractOptions, Diagnostic, BUILTIN_TYPE_SCHEMAS };
+export { zodAdapter, withDescription, valibotAdapter, typeboxAdapter, serializeVariable, serializeTypeAlias, serializeInterface, serializeFunctionExport, serializeEnum, serializeClass, schemasAreEqual, schemaIsAny, resolveCompiledPath, registerReferencedTypes, registerAdapter, isTypeReference, isSymbolDeprecated, isStandardJSONSchema, isSchemaType, isPureRefSchema, isPrimitiveName, isExported, isBuiltinGeneric, isAnonymous, getSourceLocation, getParamDescription, getNonNullableType, getNodeName, getJSDocComment, findDiscriminatorProperty, findAdapter, extractTypeParameters, extractStandardSchemasFromProject, extractStandardSchemas, extractSchemaType, extractParameters, extract, deduplicateSchemas, createProgram, buildSchema, arktypeAdapter, TypeRegistry, TypeReference2 as TypeReference, StandardSchemaExtractionResult, StandardSchemaExtractionOutput, StandardJSONSchemaV1, StandardJSONSchemaTarget, StandardJSONSchemaOptions, SerializerContext, SchemaExtractionResult, SchemaAdapter, ProgramResult, ProgramOptions, ForgottenExport, ExtractStandardSchemasOptions, ExtractResult, ExtractOptions, Diagnostic, BUILTIN_TYPE_SCHEMAS };

package/dist/src/index.js

@@ -26,7 +26,7 @@ import {
   serializeTypeAlias,
   serializeVariable,
   withDescription
-} from "../shared/chunk-j81wegen.js";
+} from "../shared/chunk-rej3ws8m.js";
 // src/schema/registry.ts
 function isTypeReference(type) {
   return !!(type.flags & 524288 && type.objectFlags && type.objectFlags & 4);
@@ -200,7 +200,7 @@ function isStandardJSONSchema(obj) {
   if (typeof std !== "object" || std === null)
     return false;
   const stdObj = std;
-  if (typeof stdObj.version !== "number")
+  if (stdObj.version !== 1)
     return false;
   if (typeof stdObj.vendor !== "string")
     return false;
@@ -208,7 +208,7 @@ function isStandardJSONSchema(obj) {
   if (typeof jsonSchema !== "object" || jsonSchema === null)
     return false;
   const jsObj = jsonSchema;
-  return typeof jsObj.output === "function";
+  return typeof jsObj.output === "function" && typeof jsObj.input === "function";
 }
 var WORKER_SCRIPT = `
 const path = require('path');
@@ -233,7 +233,8 @@ function sanitizeTypeBoxSchema(schema) {
 async function extract() {
   // With node -e, argv is: [node, arg1, arg2, ...]
   // (the -e script is NOT in argv)
-  const [modulePath, target] = process.argv.slice(1);
+  const [modulePath, optionsJson] = process.argv.slice(1);
+  const { target, libraryOptions } = JSON.parse(optionsJson || '{}');
 
   try {
     // Import the module using dynamic import (works with ESM and CJS)
@@ -257,12 +258,14 @@ async function extract() {
       if (name.startsWith('_')) continue;
       if (typeof value !== 'object' || value === null) continue;
 
-      // Priority 1: Standard Schema (Zod 4.2+, ArkType, etc.)
+      // Priority 1: Standard JSON Schema (Zod 4.2+, ArkType 2.1.28+, Valibot 1.2+)
       const std = value['~standard'];
-      if (std && typeof std === 'object' && typeof std.version === 'number' && typeof std.vendor === 'string' && std.jsonSchema && typeof std.jsonSchema.output === 'function') {
+      if (std && typeof std === 'object' && std.version === 1 && typeof std.vendor === 'string' && std.jsonSchema && typeof std.jsonSchema.output === 'function') {
         try {
-          const outputSchema = std.jsonSchema.output(target);
-          const inputSchema = std.jsonSchema.input ? std.jsonSchema.input(target) : undefined;
+          // Per spec: pass options object with target and optional libraryOptions
+          const options = { target: target || 'draft-2020-12', ...(libraryOptions && { libraryOptions }) };
+          const outputSchema = std.jsonSchema.output(options);
+          const inputSchema = typeof std.jsonSchema.input === 'function' ? std.jsonSchema.input(options) : undefined;
           results.push({
             exportName: name,
             vendor: std.vendor,
@@ -315,7 +318,7 @@ function resolveCompiledPath(tsPath, baseDir) {
   return null;
 }
 async function extractStandardSchemas(compiledJsPath, options = {}) {
-  const { timeout = 1e4, target = "draft-2020-12" } = options;
+  const { timeout = 1e4, target = "draft-2020-12", libraryOptions } = options;
   const result = {
     schemas: new Map,
     errors: []
@@ -324,8 +327,9 @@ async function extractStandardSchemas(compiledJsPath, options = {}) {
     result.errors.push(`Compiled JS not found: ${compiledJsPath}`);
     return result;
   }
+  const optionsJson = JSON.stringify({ target, libraryOptions });
   return new Promise((resolve) => {
-    const child = spawn("node", ["-e", WORKER_SCRIPT, compiledJsPath, target], {
+    const child = spawn("node", ["-e", WORKER_SCRIPT, compiledJsPath, optionsJson], {
       timeout,
       stdio: ["ignore", "pipe", "pipe"]
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openpkg-ts/extract",
-  "version": "0.18.3",
+  "version": "0.20.0",
   "description": "TypeScript export extraction to OpenPkg spec",
   "keywords": [
     "openpkg",
@@ -40,7 +40,7 @@
     "format": "biome format --write src/"
   },
   "dependencies": {
-    "@openpkg-ts/spec": "^0.12.0",
+    "@openpkg-ts/spec": "^0.19.0",
     "chalk": "^5.4.1",
     "commander": "^12.0.0",
     "tree-sitter-wasms": "^0.1.13",