@openpkg-ts/sdk 0.54.0 → 0.54.2

package/dist/index.js

@@ -1787,6 +1787,12 @@ import ts13 from "typescript";
 import * as path3 from "node:path";
 import ts from "typescript";
 var NODE_MODULES_PKG = /node_modules\/(@[^/]+\/[^/]+|[^/]+)/g;
+function isLibFile(fileName) {
+  return fileName.includes("/typescript/lib/lib.") || fileName.includes("\\typescript\\lib\\lib.");
+}
+function isLibSymbol(symbol) {
+  return symbol?.declarations?.some((d) => isLibFile(d.getSourceFile().fileName)) ?? false;
+}
 function packageNameFromPath(fileName) {
   return [...fileName.matchAll(NODE_MODULES_PKG)].at(-1)?.[1];
 }
@@ -2827,14 +2833,7 @@ function isPrimitiveName(name) {
   return PRIMITIVES.has(name);
 }
 function isBuiltinSymbol(symbol) {
-  if (!symbol)
-    return false;
-  const declarations = symbol.getDeclarations();
-  if (!declarations || declarations.length === 0)
-    return false;
-  const sourceFile = declarations[0].getSourceFile();
-  const fileName = sourceFile.fileName;
-  return fileName.includes("/typescript/lib/lib.") || fileName.includes("\\typescript\\lib\\lib.");
+  return isLibSymbol(symbol);
 }
 function getTypeOrigin(type, _checker) {
   const symbol = type.getSymbol() ?? type.aliasSymbol;
@@ -2843,11 +2842,9 @@ function getTypeOrigin(type, _checker) {
   const declarations = symbol.getDeclarations();
   if (!declarations || declarations.length === 0)
     return;
-  const fileName = declarations[0].getSourceFile().fileName;
-  const pkg = packageNameFromPath(fileName);
-  if (pkg === "typescript")
+  if (isLibSymbol(symbol))
     return;
-  return pkg;
+  return packageNameFromPath(declarations[0].getSourceFile().fileName);
 }
 function isBuiltinGeneric(name) {
   return BUILTIN_GENERICS.has(name);
@@ -3977,7 +3974,7 @@ class TypeRegistry {
     const props = {};
     const required = [];
     const limit = ctx.maxProperties;
-    const isArrayLike = checker.isArrayType(type) || checker.isTupleType(type) || type.symbol?.getName() === "Array" && type.symbol?.getDeclarations()?.[0]?.getSourceFile()?.fileName?.includes("/typescript/lib/lib.");
+    const isArrayLike = checker.isArrayType(type) || checker.isTupleType(type) || type.symbol?.getName() === "Array" && isLibFile(type.symbol?.getDeclarations()?.[0]?.getSourceFile()?.fileName ?? "");
     const isStringLike = type.flags & ts6.TypeFlags.StringLike;
     const isNumberLike = type.flags & ts6.TypeFlags.NumberLike;
     const included = properties.filter((prop) => {
@@ -6961,9 +6958,6 @@ function hasInternalTag(typeName, program, sourceFile) {
 
 // src/builder/type-expansion.ts
 import ts18 from "typescript";
-function isLibFile(fileName) {
-  return fileName.includes("/typescript/lib/lib.") || fileName.includes("\\typescript\\lib\\lib.");
-}
 function createExternalExpansionPredicate(opts) {
   const matchesEntry = (entry, pkg) => {
     if (!entry.includes("*"))
@@ -6972,8 +6966,6 @@ function createExternalExpansionPredicate(opts) {
     return rx.test(pkg);
   };
   const packageAllowed = (pkg) => {
-    if (pkg === "typescript")
-      return false;
     if (opts.followExternal === true)
       return true;
     if (Array.isArray(opts.followExternal) && opts.followExternal.some((e) => matchesEntry(e, pkg))) {
@@ -6985,10 +6977,9 @@ function createExternalExpansionPredicate(opts) {
     const decl = symbol.declarations?.[0];
     if (!decl)
       return false;
-    const fileName = decl.getSourceFile().fileName;
-    if (isLibFile(fileName))
+    if (isLibSymbol(symbol))
       return false;
-    const pkg = packageNameFromPath(fileName);
+    const pkg = packageNameFromPath(decl.getSourceFile().fileName);
     if (pkg)
       return packageAllowed(pkg);
     return true;
@@ -7963,7 +7954,7 @@ function findTypeInProgram(name, checker, program, sourceFile, symFlags) {
   const entryDir = path10.dirname(sourceFile.fileName);
   for (const sf of program.getSourceFiles()) {
     const fn = sf.fileName;
-    if (fn.includes("/typescript/lib/lib.") || fn.includes("\\typescript\\lib\\lib."))
+    if (isLibFile(fn))
       continue;
     if (fn.includes("/@types/node/") || fn.includes("\\@types\\node\\"))
       continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openpkg-ts/sdk",
-  "version": "0.54.0",
+  "version": "0.54.2",
   "description": "TypeScript API extraction SDK - programmatic primitives for OpenPkg specs",
   "keywords": [
     "openpkg",