@openpkg-ts/extract 0.22.0 → 0.22.1

package/dist/bin/tspec.js

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

package/dist/shared/{chunk-nymjpc96.js → chunk-7fp2zqf8.js}

@@ -125,9 +125,15 @@ function buildSchema(type, checker, ctx, _depth = 0) {
       return buildFunctionSchema(callSignatures, checker, ctx);
     }
     const symbol2 = type.getSymbol() || type.aliasSymbol;
-    if (symbol2) {
+    if (symbol2 && !isAnonymous(type)) {
       return { $ref: `#/types/${symbol2.getName()}` };
     }
+    if (type.flags & ts.TypeFlags.Object) {
+      const properties = type.getProperties();
+      if (properties.length > 0) {
+        return buildObjectSchema(properties, checker, ctx);
+      }
+    }
     return { type: checker.typeToString(type) };
   }
   if (ctx && type.flags & ts.TypeFlags.Object) {
@@ -1498,6 +1504,169 @@ function serializeTypeAlias(node, ctx) {
   };
 }
 
+// src/schema/registry.ts
+function isTypeReference(type) {
+  return !!(type.flags & 524288 && type.objectFlags && type.objectFlags & 4);
+}
+function getNonNullableType(type) {
+  if (type.isUnion()) {
+    const nonNullable = type.types.filter((t) => !(t.flags & 32768) && !(t.flags & 65536));
+    if (nonNullable.length === 1) {
+      return nonNullable[0];
+    }
+  }
+  return type;
+}
+var adapters = [];
+function registerAdapter(adapter) {
+  adapters.push(adapter);
+}
+function findAdapter(type, checker) {
+  return adapters.find((a) => a.matches(type, checker));
+}
+function isSchemaType(type, checker) {
+  return adapters.some((a) => a.matches(type, checker));
+}
+function extractSchemaType(type, checker) {
+  const adapter = findAdapter(type, checker);
+  if (!adapter)
+    return null;
+  const outputType = adapter.extractOutputType(type, checker);
+  if (!outputType)
+    return null;
+  const inputType = adapter.extractInputType?.(type, checker) ?? undefined;
+  return {
+    adapter,
+    outputType,
+    inputType
+  };
+}
+
+// src/schema/adapters/arktype.ts
+var ARKTYPE_TYPE_PATTERN = /^Type</;
+var arktypeAdapter = {
+  id: "arktype",
+  packages: ["arktype"],
+  matches(type, checker) {
+    const typeName = checker.typeToString(type);
+    return ARKTYPE_TYPE_PATTERN.test(typeName);
+  },
+  extractOutputType(type, checker) {
+    if (!isTypeReference(type)) {
+      return null;
+    }
+    const args = checker.getTypeArguments(type);
+    if (args.length < 1) {
+      return null;
+    }
+    return args[0];
+  },
+  extractInputType(type, checker) {
+    if (!isTypeReference(type)) {
+      return null;
+    }
+    const args = checker.getTypeArguments(type);
+    if (args.length < 2) {
+      return null;
+    }
+    return args[1];
+  }
+};
+
+// src/schema/adapters/typebox.ts
+var TYPEBOX_TYPE_PATTERN = /^T[A-Z]/;
+var typeboxAdapter = {
+  id: "typebox",
+  packages: ["@sinclair/typebox"],
+  matches(type, checker) {
+    const typeName = checker.typeToString(type);
+    if (!TYPEBOX_TYPE_PATTERN.test(typeName)) {
+      return false;
+    }
+    const typeProperty = type.getProperty("type");
+    return typeProperty !== undefined;
+  },
+  extractOutputType(type, checker) {
+    const staticSymbol = type.getProperty("static");
+    if (staticSymbol) {
+      return checker.getTypeOfSymbol(staticSymbol);
+    }
+    return null;
+  }
+};
+
+// src/schema/adapters/valibot.ts
+var VALIBOT_TYPE_PATTERN = /Schema(<|$)/;
+var valibotAdapter = {
+  id: "valibot",
+  packages: ["valibot"],
+  matches(type, checker) {
+    const typeName = checker.typeToString(type);
+    return VALIBOT_TYPE_PATTERN.test(typeName) && !typeName.includes("Zod");
+  },
+  extractOutputType(type, checker) {
+    const typesSymbol = type.getProperty("~types");
+    if (!typesSymbol) {
+      return null;
+    }
+    let typesType = checker.getTypeOfSymbol(typesSymbol);
+    typesType = getNonNullableType(typesType);
+    const outputSymbol = typesType.getProperty("output");
+    if (!outputSymbol) {
+      return null;
+    }
+    return checker.getTypeOfSymbol(outputSymbol);
+  },
+  extractInputType(type, checker) {
+    const typesSymbol = type.getProperty("~types");
+    if (!typesSymbol) {
+      return null;
+    }
+    let typesType = checker.getTypeOfSymbol(typesSymbol);
+    typesType = getNonNullableType(typesType);
+    const inputSymbol = typesType.getProperty("input");
+    if (!inputSymbol) {
+      return null;
+    }
+    return checker.getTypeOfSymbol(inputSymbol);
+  }
+};
+
+// src/schema/adapters/zod.ts
+var ZOD_TYPE_PATTERN = /^Zod[A-Z]/;
+var zodAdapter = {
+  id: "zod",
+  packages: ["zod"],
+  matches(type, checker) {
+    const typeName = checker.typeToString(type);
+    return ZOD_TYPE_PATTERN.test(typeName);
+  },
+  extractOutputType(type, checker) {
+    const outputSymbol = type.getProperty("_output");
+    if (outputSymbol) {
+      return checker.getTypeOfSymbol(outputSymbol);
+    }
+    const typeSymbol = type.getProperty("_type");
+    if (typeSymbol) {
+      return checker.getTypeOfSymbol(typeSymbol);
+    }
+    return null;
+  },
+  extractInputType(type, checker) {
+    const inputSymbol = type.getProperty("_input");
+    if (inputSymbol) {
+      return checker.getTypeOfSymbol(inputSymbol);
+    }
+    return null;
+  }
+};
+
+// src/schema/adapters/index.ts
+registerAdapter(zodAdapter);
+registerAdapter(valibotAdapter);
+registerAdapter(arktypeAdapter);
+registerAdapter(typeboxAdapter);
+
 // src/serializers/variables.ts
 function serializeVariable(node, statement, ctx) {
   const symbol = ctx.typeChecker.getSymbolAtLocation(node.name);
@@ -1508,8 +1677,14 @@ function serializeVariable(node, statement, ctx) {
   const { description, tags, examples } = getJSDocComment(statement);
   const source = getSourceLocation(node, declSourceFile);
   const type = ctx.typeChecker.getTypeAtLocation(node);
-  registerReferencedTypes(type, ctx);
-  const schema = buildSchema(type, ctx.typeChecker, ctx);
+  const schemaExtraction = extractSchemaType(type, ctx.typeChecker);
+  const typeToSerialize = schemaExtraction?.outputType ?? type;
+  registerReferencedTypes(typeToSerialize, ctx);
+  const schema = buildSchema(typeToSerialize, ctx.typeChecker, ctx);
+  const flags = schemaExtraction ? {
+    schemaLibrary: schemaExtraction.adapter.id,
+    ...schemaExtraction.inputType && schemaExtraction.inputType !== schemaExtraction.outputType ? { hasTransform: true } : {}
+  } : undefined;
   return {
     id: name,
     name,
@@ -1518,6 +1693,7 @@ function serializeVariable(node, statement, ctx) {
     tags,
     source,
     schema,
+    ...flags ? { flags } : {},
     ...examples.length > 0 ? { examples } : {}
   };
 }
@@ -2577,4 +2753,4 @@ async function getPackageMeta(entryFile, baseDir) {
   } catch {}
   return { name: path3.basename(searchDir) };
 }
-export { BUILTIN_TYPE_SCHEMAS, isPrimitiveName, isBuiltinGeneric, isAnonymous, buildSchema, isPureRefSchema, withDescription, schemaIsAny, schemasAreEqual, deduplicateSchemas, findDiscriminatorProperty, TypeRegistry, getJSDocComment, getSourceLocation, getParamDescription, extractTypeParameters, isSymbolDeprecated, createProgram, extractParameters, registerReferencedTypes, serializeClass, serializeEnum, serializeFunctionExport, serializeInterface, serializeTypeAlias, serializeVariable, isStandardJSONSchema, detectTsRuntime, extractStandardSchemasFromTs, resolveCompiledPath, extractStandardSchemas, extractStandardSchemasFromProject, extract };
+export { BUILTIN_TYPE_SCHEMAS, isPrimitiveName, isBuiltinGeneric, isAnonymous, buildSchema, isPureRefSchema, withDescription, schemaIsAny, schemasAreEqual, deduplicateSchemas, findDiscriminatorProperty, TypeRegistry, getJSDocComment, getSourceLocation, getParamDescription, extractTypeParameters, isSymbolDeprecated, createProgram, extractParameters, registerReferencedTypes, serializeClass, serializeEnum, serializeFunctionExport, serializeInterface, serializeTypeAlias, isTypeReference, getNonNullableType, registerAdapter, findAdapter, isSchemaType, extractSchemaType, arktypeAdapter, typeboxAdapter, valibotAdapter, zodAdapter, serializeVariable, isStandardJSONSchema, detectTsRuntime, extractStandardSchemasFromTs, resolveCompiledPath, extractStandardSchemas, extractStandardSchemasFromProject, extract };

package/dist/src/index.js

@@ -1,26 +1,33 @@
 import {
   BUILTIN_TYPE_SCHEMAS,
   TypeRegistry,
+  arktypeAdapter,
   buildSchema,
   createProgram,
   deduplicateSchemas,
   detectTsRuntime,
   extract,
   extractParameters,
+  extractSchemaType,
   extractStandardSchemas,
   extractStandardSchemasFromProject,
   extractStandardSchemasFromTs,
   extractTypeParameters,
+  findAdapter,
   findDiscriminatorProperty,
   getJSDocComment,
+  getNonNullableType,
   getParamDescription,
   getSourceLocation,
   isAnonymous,
   isBuiltinGeneric,
   isPrimitiveName,
   isPureRefSchema,
+  isSchemaType,
   isStandardJSONSchema,
   isSymbolDeprecated,
+  isTypeReference,
+  registerAdapter,
   registerReferencedTypes,
   resolveCompiledPath,
   schemaIsAny,
@@ -31,170 +38,11 @@ import {
   serializeInterface,
   serializeTypeAlias,
   serializeVariable,
-  withDescription
-} from "../shared/chunk-nymjpc96.js";
-// src/schema/registry.ts
-function isTypeReference(type) {
-  return !!(type.flags & 524288 && type.objectFlags && type.objectFlags & 4);
-}
-function getNonNullableType(type) {
-  if (type.isUnion()) {
-    const nonNullable = type.types.filter((t) => !(t.flags & 32768) && !(t.flags & 65536));
-    if (nonNullable.length === 1) {
-      return nonNullable[0];
-    }
-  }
-  return type;
-}
-var adapters = [];
-function registerAdapter(adapter) {
-  adapters.push(adapter);
-}
-function findAdapter(type, checker) {
-  return adapters.find((a) => a.matches(type, checker));
-}
-function isSchemaType(type, checker) {
-  return adapters.some((a) => a.matches(type, checker));
-}
-function extractSchemaType(type, checker) {
-  const adapter = findAdapter(type, checker);
-  if (!adapter)
-    return null;
-  const outputType = adapter.extractOutputType(type, checker);
-  if (!outputType)
-    return null;
-  const inputType = adapter.extractInputType?.(type, checker) ?? undefined;
-  return {
-    adapter,
-    outputType,
-    inputType
-  };
-}
-
-// src/schema/adapters/arktype.ts
-var ARKTYPE_TYPE_PATTERN = /^Type</;
-var arktypeAdapter = {
-  id: "arktype",
-  packages: ["arktype"],
-  matches(type, checker) {
-    const typeName = checker.typeToString(type);
-    return ARKTYPE_TYPE_PATTERN.test(typeName);
-  },
-  extractOutputType(type, checker) {
-    if (!isTypeReference(type)) {
-      return null;
-    }
-    const args = checker.getTypeArguments(type);
-    if (args.length < 1) {
-      return null;
-    }
-    return args[0];
-  },
-  extractInputType(type, checker) {
-    if (!isTypeReference(type)) {
-      return null;
-    }
-    const args = checker.getTypeArguments(type);
-    if (args.length < 2) {
-      return null;
-    }
-    return args[1];
-  }
-};
-
-// src/schema/adapters/typebox.ts
-var TYPEBOX_TYPE_PATTERN = /^T[A-Z]/;
-var typeboxAdapter = {
-  id: "typebox",
-  packages: ["@sinclair/typebox"],
-  matches(type, checker) {
-    const typeName = checker.typeToString(type);
-    if (!TYPEBOX_TYPE_PATTERN.test(typeName)) {
-      return false;
-    }
-    const typeProperty = type.getProperty("type");
-    return typeProperty !== undefined;
-  },
-  extractOutputType(type, checker) {
-    const staticSymbol = type.getProperty("static");
-    if (staticSymbol) {
-      return checker.getTypeOfSymbol(staticSymbol);
-    }
-    return null;
-  }
-};
-
-// src/schema/adapters/valibot.ts
-var VALIBOT_TYPE_PATTERN = /Schema(<|$)/;
-var valibotAdapter = {
-  id: "valibot",
-  packages: ["valibot"],
-  matches(type, checker) {
-    const typeName = checker.typeToString(type);
-    return VALIBOT_TYPE_PATTERN.test(typeName) && !typeName.includes("Zod");
-  },
-  extractOutputType(type, checker) {
-    const typesSymbol = type.getProperty("~types");
-    if (!typesSymbol) {
-      return null;
-    }
-    let typesType = checker.getTypeOfSymbol(typesSymbol);
-    typesType = getNonNullableType(typesType);
-    const outputSymbol = typesType.getProperty("output");
-    if (!outputSymbol) {
-      return null;
-    }
-    return checker.getTypeOfSymbol(outputSymbol);
-  },
-  extractInputType(type, checker) {
-    const typesSymbol = type.getProperty("~types");
-    if (!typesSymbol) {
-      return null;
-    }
-    let typesType = checker.getTypeOfSymbol(typesSymbol);
-    typesType = getNonNullableType(typesType);
-    const inputSymbol = typesType.getProperty("input");
-    if (!inputSymbol) {
-      return null;
-    }
-    return checker.getTypeOfSymbol(inputSymbol);
-  }
-};
-
-// src/schema/adapters/zod.ts
-var ZOD_TYPE_PATTERN = /^Zod[A-Z]/;
-var zodAdapter = {
-  id: "zod",
-  packages: ["zod"],
-  matches(type, checker) {
-    const typeName = checker.typeToString(type);
-    return ZOD_TYPE_PATTERN.test(typeName);
-  },
-  extractOutputType(type, checker) {
-    const outputSymbol = type.getProperty("_output");
-    if (outputSymbol) {
-      return checker.getTypeOfSymbol(outputSymbol);
-    }
-    const typeSymbol = type.getProperty("_type");
-    if (typeSymbol) {
-      return checker.getTypeOfSymbol(typeSymbol);
-    }
-    return null;
-  },
-  extractInputType(type, checker) {
-    const inputSymbol = type.getProperty("_input");
-    if (inputSymbol) {
-      return checker.getTypeOfSymbol(inputSymbol);
-    }
-    return null;
-  }
-};
-
-// src/schema/adapters/index.ts
-registerAdapter(zodAdapter);
-registerAdapter(valibotAdapter);
-registerAdapter(arktypeAdapter);
-registerAdapter(typeboxAdapter);
+  typeboxAdapter,
+  valibotAdapter,
+  withDescription,
+  zodAdapter
+} from "../shared/chunk-7fp2zqf8.js";
 // src/types/utils.ts
 function isExported(node) {
   const modifiers = node.modifiers;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openpkg-ts/extract",
-  "version": "0.22.0",
+  "version": "0.22.1",
   "description": "TypeScript export extraction to OpenPkg spec",
   "keywords": [
     "openpkg",