@openpkg-ts/extract 0.23.0 → 0.23.1

package/dist/bin/tspec.js

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

package/dist/shared/{chunk-y5d5qgyt.js → chunk-qwkv7jxy.js}

@@ -2768,7 +2768,8 @@ async function extract(options) {
   }
   const meta = await getPackageMeta(entryFile, baseDir);
   const types = ctx.typeRegistry.getAll();
-  const forgottenExports = collectForgottenExports(exports, types, program, sourceFile, exportedIds);
+  const projectBaseDir = baseDir ?? path3.dirname(entryFile);
+  const forgottenExports = collectForgottenExports(exports, types, program, sourceFile, exportedIds, projectBaseDir);
   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` : "";
@@ -2799,8 +2800,8 @@ async function extract(options) {
   }
   let runtimeMetadata;
   if (options.schemaExtraction === "hybrid") {
-    const projectBaseDir = baseDir || path3.dirname(entryFile);
-    const runtimeResult = await extractStandardSchemasFromProject(entryFile, projectBaseDir, {
+    const projectBaseDir2 = baseDir || path3.dirname(entryFile);
+    const runtimeResult = await extractStandardSchemasFromProject(entryFile, projectBaseDir2, {
       target: options.schemaTarget || "draft-2020-12",
       timeout: 15000
     });
@@ -2916,10 +2917,14 @@ function findTypeDefinition(typeName, program, sourceFile) {
   }
   return;
 }
-function isExternalType2(definedIn) {
+function isExternalType2(definedIn, baseDir) {
   if (!definedIn)
     return true;
-  return definedIn.includes("node_modules");
+  if (definedIn.includes("node_modules"))
+    return true;
+  const normalizedDefined = path3.resolve(definedIn);
+  const normalizedBase = path3.resolve(baseDir);
+  return !normalizedDefined.startsWith(normalizedBase);
 }
 function hasInternalTag(typeName, program, sourceFile) {
   const checker = program.getTypeChecker();
@@ -2929,7 +2934,7 @@ function hasInternalTag(typeName, program, sourceFile) {
   const jsTags = symbol.getJsDocTags();
   return jsTags.some((tag) => tag.name === "internal");
 }
-function collectForgottenExports(exports, types, program, sourceFile, exportedIds) {
+function collectForgottenExports(exports, types, program, sourceFile, exportedIds, baseDir) {
   const definedTypes = new Set(types.map((t) => t.id));
   const referencedTypes = new Map;
   for (const exp of exports) {
@@ -2959,7 +2964,7 @@ function collectForgottenExports(exports, types, program, sourceFile, exportedId
     if (exportedIds.has(typeName))
       continue;
     const definedIn = findTypeDefinition(typeName, program, sourceFile);
-    const isExternal = isExternalType2(definedIn);
+    const isExternal = isExternalType2(definedIn, baseDir);
     forgottenExports.push({
       name: typeName,
       definedIn,

package/dist/src/index.js

@@ -46,7 +46,7 @@ import {
   valibotAdapter,
   withDescription,
   zodAdapter
-} from "../shared/chunk-y5d5qgyt.js";
+} from "../shared/chunk-qwkv7jxy.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.23.0",
+  "version": "0.23.1",
   "description": "TypeScript export extraction to OpenPkg spec",
   "keywords": [
     "openpkg",