npm - @knapsack/spec-utils - Versions diffs - 4.75.8--canary.5662.4aaa414.0 → 4.75.8 - Mend

@knapsack/spec-utils 4.75.8--canary.5662.4aaa414.0 → 4.75.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/.turbo/turbo-build.log +1 -1
package/.turbo/turbo-lint.log +1 -1
package/.turbo/turbo-test.log +3 -3
package/CHANGELOG.md +35 -0
package/dist/analyze-type.d.ts +12 -2
package/dist/analyze-type.d.ts.map +1 -1
package/dist/analyze-type.js +137 -69
package/dist/analyze-type.js.map +1 -1
package/package.json +10 -10
package/src/analyze-type.ts +156 -77

package/.turbo/turbo-build.log CHANGED Viewed

@@ -1,4 +1,4 @@
-> @knapsack/spec-utils@4.75.6 build /home/runner/work/app-monorepo/app-monorepo/apps/client/libs/spec-utils
+> @knapsack/spec-utils@4.75.7 build /home/runner/work/app-monorepo/app-monorepo/apps/client/libs/spec-utils
 > tsc

package/.turbo/turbo-lint.log CHANGED Viewed

@@ -1,4 +1,4 @@
-> @knapsack/spec-utils@4.75.6 lint /home/runner/work/app-monorepo/app-monorepo/apps/client/libs/spec-utils
+> @knapsack/spec-utils@4.75.7 lint /home/runner/work/app-monorepo/app-monorepo/apps/client/libs/spec-utils
 > eslint ./

package/.turbo/turbo-test.log CHANGED Viewed

@@ -1,5 +1,5 @@
-> @knapsack/spec-utils@4.75.6 test /home/runner/work/app-monorepo/app-monorepo/apps/client/libs/spec-utils
+> @knapsack/spec-utils@4.75.7 test /home/runner/work/app-monorepo/app-monorepo/apps/client/libs/spec-utils
 > ava
@@ -23,8 +23,8 @@
   ✔ analyze-exports › function with basic parameters: .d.ts
   ✔ analyze-exports › async function with basic parameters: .d.ts
   ✔ analyze-exports › function with complex parameters: .d.ts
-  ✔ analyze-exports.sandbox-components › analyzeExports react (3.6s)
-  ✔ analyze-exports.sandbox-components › analyzeExports angular (2.3s)
+  ✔ analyze-exports.sandbox-components › analyzeExports react (3.4s)
+  ✔ analyze-exports.sandbox-components › analyzeExports angular (2.1s)
   ✔ convert-to-spec › string
   ✔ convert-to-spec › boolean
   ✔ convert-to-spec › object

package/CHANGELOG.md CHANGED Viewed

@@ -1,3 +1,38 @@
+# v4.75.8 (Tue Feb 25 2025)
+#### 🐛 Bug Fix
+- updates handling of visited types, adds depth limit [#5694](https://github.com/knapsack-labs/app-monorepo/pull/5694) ([@mabry1985](https://github.com/mabry1985))
+#### Authors: 1
+- Josh Mabry ([@mabry1985](https://github.com/mabry1985))
+---
+# v4.75.7 (Mon Feb 24 2025)
+#### 🐛 Bug Fix
+- merge from latest ([@illepic](https://github.com/illepic))
+- Merge branch 'latest' into feature/strictNullChecks-gitlab-rest-api ([@illepic](https://github.com/illepic))
+- Merge branch 'latest' into feature/strictNullChecks-github-api-2 ([@illepic](https://github.com/illepic))
+- Merge branch 'latest' into feature/strictNullChecks-bitbucket-cloud-api ([@illepic](https://github.com/illepic))
+- Merge branch 'latest' into 12-12-start_of_strictNullChecks_in_lambdas ([@illepic](https://github.com/illepic))
+#### 🏠 Internal
+- strictNullChecks: github-api [#5376](https://github.com/knapsack-labs/app-monorepo/pull/5376) ([@illepic](https://github.com/illepic))
+- strictNullChecks: gitlab-rest-api [#5386](https://github.com/knapsack-labs/app-monorepo/pull/5386) ([@illepic](https://github.com/illepic) [@freneticpixel](https://github.com/freneticpixel))
+- strictNullChecks: bitbucket-cloud-api [#5333](https://github.com/knapsack-labs/app-monorepo/pull/5333) ([@illepic](https://github.com/illepic))
+#### Authors: 2
+- Christopher Bloom ([@illepic](https://github.com/illepic))
+- Jim Frenette ([@freneticpixel](https://github.com/freneticpixel))
+---
 # v4.75.6 (Fri Feb 14 2025)
 #### 🏠 Internal

package/dist/analyze-type.d.ts CHANGED Viewed

@@ -1,9 +1,19 @@
 import ts from 'typescript';
 import { TypeInfo } from './types.js';
-export declare function analyzeType({ type, checker, isOptional, visitedTypes, }: {
+/**
+ * Analyzes a TypeScript type and returns a structured TypeInfo representation
+ */
+export declare function analyzeType({ type, checker, isOptional, visitedTypes, depth,
+/**
+ * The maximum depth of type analysis.
+ * This is used to avoid infinite recursion.
+ */
+maxDepth, }: {
     type: ts.Type;
     checker: ts.TypeChecker;
     isOptional?: boolean;
-    visitedTypes?: Set<ts.Type>;
+    visitedTypes?: Map<string, TypeInfo>;
+    depth?: number;
+    maxDepth?: number;
 }): TypeInfo;
 //# sourceMappingURL=analyze-type.d.ts.map

package/dist/analyze-type.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"analyze-type.d.ts","sourceRoot":"","sources":["../src/analyze-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAkB,MAAM,YAAY,CAAC;~~AAGtD~~,wBAAgB,WAAW,CAAC,EAC1B,IAAI,EACJ,OAAO,EACP,UAAU,EACV,~~YAAwB~~,~~GACzB~~,EAAE;IACD,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC;IACd,OAAO,EAAE,EAAE,CAAC,WAAW,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,~~IAAI~~,CAAC,CAAC;~~CAC7B~~,GAAG,QAAQ,~~CA8NX~~"}
1	+ {"version":3,"file":"analyze-type.d.ts","sourceRoot":"","sources":["../src/analyze-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAkB,MAAM,YAAY,CAAC;AA4CtD;;GAEG;AACH,wBAAgB,WAAW,CAAC,EAC1B,IAAI,EACJ,OAAO,EACP,UAAU,EACV,YAA0C,EAC1C,KAAS;AACT;;;GAGG;AACH,QAAY,GACb,EAAE;IACD,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC;IACd,OAAO,EAAE,EAAE,CAAC,WAAW,CAAC;IACxB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,YAAY,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACrC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,GAAG,QAAQ,CAyPX"}

package/dist/analyze-type.js CHANGED Viewed

@@ -1,26 +1,52 @@
 import ts from 'typescript';
 import { getSetFlags } from './utils.js';
-export function analyzeType({ type, checker, isOptional, visitedTypes = new Set(), }) {
+// Cache for type IDs to improve performance
+const typeIdMap = new WeakMap();
+/**
+ * Generates a consistent identifier for a TypeScript type
+ * Uses the type's string representation to ensure identical types get the same ID
+ */
+function getTypeId(type, checker) {
+    // Check if we already have an ID for this type
+    const existingId = typeIdMap.get(type);
+    if (existingId) {
+        return existingId;
+    }
+    // Generate a new ID based on the type's string representation
+    // This ensures identical types get the same ID
+    const typeString = checker.typeToString(type, undefined,
+    // eslint-disable-next-line no-bitwise
+    ts.TypeFormatFlags.NoTruncation);
+    // Add some additional information to help distinguish types
+    // that might have the same string representation
+    const idComponents = [typeString];
+    // Add symbol name if available
+    const symbol = type.getSymbol();
+    if (symbol) {
+        idComponents.push(symbol.getName());
+    }
+    // Add type flags to help distinguish types
+    idComponents.push(String(type.flags));
+    const newId = idComponents.join('_');
+    typeIdMap.set(type, newId);
+    return newId;
+}
+/**
+ * Analyzes a TypeScript type and returns a structured TypeInfo representation
+ */
+export function analyzeType({ type, checker, isOptional, visitedTypes = new Map(), depth = 0,
+/**
+ * The maximum depth of type analysis.
+ * This is used to avoid infinite recursion.
+ */
+maxDepth = 3, }) {
     var _a;
-    // Prevent infinite recursion
-    if (visitedTypes.has(type)) {
-        return {
-            type: 'misc',
-            tsRawType: checker.typeToString(type, undefined,
-            // eslint-disable-next-line no-bitwise
-            ts.TypeFormatFlags.MultilineObjectLiterals |
-                ts.TypeFormatFlags.NoTruncation),
-            tsMetadata: {
-                typeFlags: getSetFlags({
-                    flags: type.flags,
-                    enumObject: ts.TypeFlags,
-                }),
-                type,
-            },
-            isOptional,
-        };
+    // Generate a unique key for the type
+    const typeId = getTypeId(type, checker);
+    // Check if we've already analyzed this type
+    if (visitedTypes.has(typeId)) {
+        return visitedTypes.get(typeId);
     }
-    visitedTypes.add(type);
     const tsRawType = checker.typeToString(type, undefined,
     // eslint-disable-next-line no-bitwise
     ts.TypeFormatFlags.MultilineObjectLiterals |
@@ -37,42 +63,71 @@ export function analyzeType({ type, checker, isOptional, visitedTypes = new Set(
         },
         isOptional,
     };
+    // If we've reached max depth, return a simplified type
+    if (depth >= maxDepth) {
+        const result = {
+            type: 'misc',
+            ...typeInfoCommon,
+        };
+        visitedTypes.set(typeId, result);
+        return result;
+    }
+    let result;
     // Handle primitive types first
     if (tsRawType === 'number' ||
         tsRawType === 'boolean' ||
         tsRawType === 'string') {
-        return {
+        result = {
             type: tsRawType,
             ...typeInfoCommon,
         };
+        visitedTypes.set(typeId, result);
+        return result;
     }
     // Handle literal types
     if (type.isStringLiteral()) {
-        return {
+        result = {
             type: 'stringLiteral',
             value: type.value,
             ...typeInfoCommon,
         };
+        visitedTypes.set(typeId, result);
+        return result;
     }
     if (type.isNumberLiteral()) {
-        return {
+        result = {
             type: 'numberLiteral',
             value: type.value,
             ...typeInfoCommon,
         };
+        visitedTypes.set(typeId, result);
+        return result;
     }
+    // Create a placeholder to avoid infinite recursion
+    const placeholder = {
+        type: 'misc',
+        ...typeInfoCommon,
+    };
+    visitedTypes.set(typeId, placeholder);
     // Handle unions
     if (type.isUnion()) {
-        return {
+        result = {
             type: 'union',
-            items: type.types.map((t) => analyzeType({ type: t, checker, isOptional, visitedTypes })),
+            items: type.types.map((t) => analyzeType({
+                type: t,
+                checker,
+                isOptional,
+                visitedTypes,
+                depth: depth + 1,
+                maxDepth,
+            })),
             ...typeInfoCommon,
         };
     }
     // Handle arrays
-    if (checker.isArrayType(type) || checker.isArrayLikeType(type)) {
+    else if (checker.isArrayType(type) || checker.isArrayLikeType(type)) {
         const indexInfos = checker.getIndexInfosOfType(type);
-        return {
+        result = {
             type: 'array',
             items: indexInfos.length === 1
                 ? analyzeType({
@@ -80,6 +135,8 @@ export function analyzeType({ type, checker, isOptional, visitedTypes = new Set(
                     checker,
                     isOptional,
                     visitedTypes,
+                    depth: depth + 1,
+                    maxDepth,
                 })
                 : { type: 'misc', ...typeInfoCommon },
             ...typeInfoCommon,
@@ -91,7 +148,7 @@ export function analyzeType({ type, checker, isOptional, visitedTypes = new Set(
     // from each type in the intersection, but we may want to limit the depth of the intersection
     // to avoid bringing in too much.
     // https://linear.app/knapsack/issue/KSP-5885/update-handling-of-intersection-types-in-spec-utils
-    if (type.isIntersection()) {
+    else if (type.isIntersection()) {
         const properties = type.getProperties();
         if (properties.length > 0) {
             const analyzedProperties = properties.reduce((acc, prop) => {
@@ -105,6 +162,8 @@ export function analyzeType({ type, checker, isOptional, visitedTypes = new Set(
                             // eslint-disable-next-line no-bitwise
                             isOptional: !!(prop.flags & ts.SymbolFlags.Optional),
                             visitedTypes,
+                            depth: depth + 1,
+                            maxDepth,
                         });
                         acc[prop.getName()] = {
                             name: prop.getName(),
@@ -126,17 +185,24 @@ export function analyzeType({ type, checker, isOptional, visitedTypes = new Set(
                 return acc;
             }, {});
             if (Object.keys(analyzedProperties).length > 0) {
-                return {
+                result = {
                     type: 'object',
                     properties: analyzedProperties,
                     ...typeInfoCommon,
                 };
             }
+            else {
+                result = placeholder;
+            }
+        }
+        else {
+            result = placeholder;
         }
     }
     // Handle function types
-    if (typeFlags.includes('Object') && type.getCallSignatures().length > 0) {
-        return {
+    else if (typeFlags.includes('Object') &&
+        type.getCallSignatures().length > 0) {
+        result = {
             type: 'function',
             parameters: [],
             returnType: { type: 'misc', ...typeInfoCommon },
@@ -146,57 +212,59 @@ export function analyzeType({ type, checker, isOptional, visitedTypes = new Set(
     // Handle object types
     // @TODO: update handling of object type inference
     // https://linear.app/knapsack/issue/KSP-5880/handle-arrays-of-objects-in-react-renderer-infer-spec
-    // if (typeFlags.includes('Object')) {
+    // else if (typeFlags.includes('Object')) {
     //   const properties = type.getProperties();
     //   if (properties.length > 0) {
-    //     const analyzedProperties = properties.reduce<Record<string, SymbolInfo>>(
-    //       (acc, prop) => {
-    //         try {
-    //           const propType = checker.getTypeOfSymbol(prop);
-    //           if (propType) {
-    //             const propAnalysis = analyzeType({
+    //     const analyzedProperties = properties.reduce((acc, prop) => {
+    //       try {
+    //         const propType = checker.getTypeOfSymbol(prop);
+    //         if (propType) {
+    //           const propAnalysis = analyzeType({
+    //             type: propType,
+    //             checker,
+    //             // eslint-disable-next-line no-bitwise
+    //             isOptional: !!(prop.flags & ts.SymbolFlags.Optional),
+    //             visitedTypes,
+    //             depth: depth + 1,
+    //             maxDepth,
+    //           });
+    //           acc[prop.getName()] = {
+    //             name: prop.getName(),
+    //             typeInfo: propAnalysis,
+    //             tsMetadata: {
+    //               symbol: prop,
     //               type: propType,
-    //               checker,
-    //               // eslint-disable-next-line no-bitwise
-    //               isOptional: !!(prop.flags & ts.SymbolFlags.Optional),
-    //               visitedTypes,
-    //               depth: depth + 1,
-    //             });
-    //             acc[prop.getName()] = {
-    //               name: prop.getName(),
-    //               typeInfo: propAnalysis,
-    //               tsMetadata: {
-    //                 symbol: prop,
-    //                 type: propType,
-    //                 symbolFlags: getSetFlags({
-    //                   flags: prop.flags,
-    //                   enumObject: ts.SymbolFlags,
-    //                 }),
-    //               },
-    //             };
-    //           }
-    //         } catch (error) {
-    //           console.debug(
-    //             `Error analyzing property ${prop.getName()}: ${error}`,
-    //           );
+    //               symbolFlags: getSetFlags({
+    //                 flags: prop.flags,
+    //                 enumObject: ts.SymbolFlags,
+    //               }),
+    //             },
+    //           };
     //         }
-    //         return acc;
-    //       },
-    //       {},
-    //     );
+    //       } catch (error) {
+    //         console.debug(`Error analyzing property ${prop.getName()}: ${error}`);
+    //       }
+    //       return acc;
+    //     }, {} as Record<string, any>);
     //     if (Object.keys(analyzedProperties).length > 0) {
-    //       return {
+    //       result = {
     //         type: 'object',
     //         properties: analyzedProperties,
     //         ...typeInfoCommon,
     //       };
+    //     } else {
+    //       result = placeholder;
     //     }
+    //   } else {
+    //     result = placeholder;
     //   }
     // }
     // Default to misc type for anything we can't properly analyze
-    return {
-        type: 'misc',
-        ...typeInfoCommon,
-    };
+    else {
+        result = placeholder;
+    }
+    // Update the cache with the actual result
+    visitedTypes.set(typeId, result);
+    return result;
 }
 //# sourceMappingURL=analyze-type.js.map

package/dist/analyze-type.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"analyze-type.js","sourceRoot":"","sources":["../src/analyze-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEzC,MAAM,~~UAAU~~,~~WAAW~~,~~CAAC,EAC1B,~~IAAI,~~EACJ,~~OAAO,~~EACP~~,~~UAAU~~,~~EACV~~,~~YAAY~~,~~GAAG~~,~~IAAI~~,~~GAAG,~~EAAE,~~GAMzB;;IACC,6BAA6B~~;~~IAC7B~~,~~IAAI~~,~~YAAY~~,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;~~QAC3B~~,OAAO;~~YACL~~,~~IAAI~~,~~EAAE~~,MAAM~~;YACZ~~,~~SAAS~~,~~EAAE~~,OAAO,CAAC,YAAY,~~CAC7B~~,IAAI,EACJ,SAAS;~~YACT~~,sCAAsC;~~YACtC~~,EAAE,CAAC,eAAe,CAAC,~~uBAAuB;gBACxC~~,~~EAAE~~,CAAC,~~eAAe~~,~~CAAC~~,YAAY,~~CAClC;YACD~~,UAAU,~~EAAE~~;~~gBACV~~,SAAS,EAAE,~~WAAW~~,CAAC;~~oBACrB~~,~~KAAK~~,EAAE,IAAI,CAAC,KAAK;~~oBACjB~~,~~UAAU~~,~~EAAE~~,EAAE,CAAC,~~SAAS~~;~~iBACzB~~,CAAC;~~gBACF~~,~~IAAI~~;~~aACL~~;~~YACD~~,UAAU;~~SACX~~,CAAC;~~IACJ~~,CAAC;~~IACD~~,YAAY,CAAC,GAAG,CAAC,~~IAAI~~,CAAC,CAAC;~~IAEvB~~,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CACpC,IAAI,EACJ,SAAS;IACT,sCAAsC;IACtC,EAAE,CAAC,eAAe,CAAC,uBAAuB;QACxC,EAAE,CAAC,eAAe,CAAC,YAAY,CAClC,CAAC;IACF,MAAM,SAAS,GAAG,WAAW,CAAC;QAC5B,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,UAAU,EAAE,EAAE,CAAC,SAAS;KACzB,CAAC,CAAC;IACH,MAAM,cAAc,GAAmB;QACrC,SAAS;QACT,UAAU,EAAE;YACV,SAAS;YACT,IAAI;SACL;QACD,UAAU;KACX,CAAC;IAEF,+BAA+B;IAC/B,IACE,SAAS,KAAK,QAAQ;QACtB,SAAS,KAAK,SAAS;QACvB,SAAS,KAAK,QAAQ,EACtB,CAAC;QACD,~~OAAO~~;~~YACL~~,IAAI,EAAE,SAAS;YACf,GAAG,cAAc;SAClB,CAAC;~~IACJ~~,CAAC;IAED,uBAAuB;IACvB,IAAI,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC;QAC3B,~~OAAO~~;~~YACL~~,IAAI,EAAE,eAAe;YACrB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,GAAG,cAAc;SAClB,CAAC;~~IACJ~~,CAAC;IAED,IAAI,IAAI,CAAC,eAAe,EAAE,EAAE,CAAC;QAC3B,~~OAAO~~;~~YACL~~,IAAI,EAAE,eAAe;YACrB,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,GAAG,cAAc;SAClB,CAAC;~~IACJ~~,CAAC;IAED,gBAAgB;IAChB,IAAI,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;QACnB,~~OAAO~~;~~YACL~~,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1B,WAAW,CAAC,~~EAAE,~~IAAI,EAAE,CAAC,~~EAAE,~~OAAO,~~EAAE,~~UAAU,~~EAAE,~~YAAY,EAAE,CAAC,~~CAC5D~~;YACD,GAAG,cAAc;SAClB,CAAC;IACJ,CAAC;~~IAED~~,gBAAgB;~~IAChB~~,IAAI,OAAO,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;~~QAC/D~~,MAAM,UAAU,GAAG,OAAO,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAC;QAErD,~~OAAO~~;~~YACL~~,IAAI,EAAE,OAAO;YACb,KAAK,EACH,UAAU,CAAC,MAAM,KAAK,CAAC;gBACrB,CAAC,CAAC,WAAW,CAAC;oBACV,IAAI,EAAE,MAAA,UAAU,CAAC,CAAC,CAAC,0CAAE,IAAI;oBACzB,OAAO;oBACP,UAAU;oBACV,YAAY;~~iBACb~~,CAAC;gBACJ,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,cAAc,EAAE;YACzC,GAAG,cAAc;SAClB,CAAC;IACJ,CAAC;~~IAED~~,uBAAuB;IACvB,6CAA6C;IAC7C,iGAAiG;IACjG,6FAA6F;IAC7F,iCAAiC;IACjC,iGAAiG;~~IACjG~~,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE,CAAC;~~QAC1B~~,MAAM,UAAU,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC;QACxC,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,MAAM,kBAAkB,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;gBACzD,IAAI,CAAC;oBACH,2EAA2E;oBAC3E,MAAM,QAAQ,GAAG,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;oBAE/C,IAAI,QAAQ,EAAE,CAAC;wBACb,MAAM,YAAY,GAAG,WAAW,CAAC;4BAC/B,IAAI,EAAE,QAAQ;4BACd,OAAO;4BACP,sCAAsC;4BACtC,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC,WAAW,CAAC,QAAQ,CAAC;4BACpD,YAAY;~~yBACb~~,CAAC,CAAC;wBAEH,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG;4BACpB,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE;4BACpB,QAAQ,EAAE,YAAY;4BACtB,UAAU,EAAE;gCACV,MAAM,EAAE,IAAI;gCACZ,IAAI,EAAE,QAAQ;gCACd,WAAW,EAAE,WAAW,CAAC;oCACvB,KAAK,EAAE,IAAI,CAAC,KAAK;oCACjB,UAAU,EAAE,EAAE,CAAC,WAAW;iCAC3B,CAAC;6BACH;yBACF,CAAC;oBACJ,CAAC;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,OAAO,EAAE,KAAK,KAAK,EAAE,CAAC,CAAC;gBACxE,CAAC;gBACD,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,EAAyB,CAAC,CAAC;YAE9B,IAAI,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/C,~~OAAO~~;~~oBACL~~,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE,kBAAkB;oBAC9B,GAAG,cAAc;iBAClB,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;~~IAED~~,wBAAwB;~~IACxB~~,~~IAAI~~,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,~~IAAI,~~CAAC,iBAAiB,EAAE,CAAC,MAAM,GAAG,CAAC,~~EAAE~~,CAAC;~~QACxE~~,~~OAAO~~;~~YACL~~,IAAI,EAAE,UAAU;YAChB,UAAU,EAAE,EAAE;YACd,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,cAAc,EAAE;YAC/C,GAAG,cAAc;SAClB,CAAC;IACJ,CAAC;IAED,sBAAsB;IACtB,kDAAkD;IAClD,mGAAmG;IACnG,~~sCAAsC~~;~~IACtC~~,6CAA6C;IAC7C,iCAAiC;IACjC,~~gFAAgF~~;~~IAChF~~,~~yBAAyB~~;~~IACzB~~,~~gBAAgB~~;~~IAChB~~,~~4DAA4D~~;~~IAC5D~~,~~4BAA4B~~;~~IAC5B~~,~~iDAAiD~~;~~IACjD~~,~~gCAAgC~~;~~IAChC~~,~~yBAAyB~~;~~IACzB~~,~~uDAAuD~~;~~IACvD~~,~~sEAAsE~~;~~IACtE~~,~~8BAA8B~~;~~IAC9B~~,~~kCAAkC~~;~~IAClC~~,~~kBAAkB~~;~~IAClB~~,~~sCAAsC~~;~~IACtC~~,sCAAsC;IACtC,~~wCAAwC~~;~~IACxC~~,8BAA8B;IAC9B,gCAAgC;IAChC,~~kCAAkC~~;~~IAClC~~,~~6CAA6C~~;~~IAC7C~~,~~uCAAuC~~;~~IACvC~~,~~gDAAgD~~;~~IAChD~~,~~sBAAsB;IACtB,mBAAmB;IACnB,~~iBAAiB;IACjB,~~cAAc;IACd,4BAA4B;IAC5B,2BAA2B;IAC3B,sEAAsE;IACtE,~~eAAe;IACf,YAAY;IACZ,~~sBAAsB~~;~~IACtB~~,~~WAAW~~;~~IACX~~,~~YAAY~~;~~IACZ~~,~~SAAS~~;~~IAET~~,wDAAwD;IACxD,~~iBAAiB~~;~~IACjB~~,0BAA0B;IAC1B,0CAA0C;IAC1C,6BAA6B;IAC7B,WAAW;IACX,QAAQ;IACR,MAAM;IACN,IAAI;~~IAEJ~~,8DAA8D;~~IAC9D~~,~~OAAO~~;~~QACL~~,~~IAAI~~,~~EAAE~~,~~MAAM~~;~~QACZ~~,GAAG,~~cAAc~~;~~KAClB~~,CAAC;~~AACJ~~,CAAC"}
1	+ {"version":3,"file":"analyze-type.js","sourceRoot":"","sources":["../src/analyze-type.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,7 +1,7 @@
 {
   "name": "@knapsack/spec-utils",
   "description": "",
-  "version": "4.75.8--canary.5662.4aaa414.0",
+  "version": "4.75.8",
   "type": "module",
   "exports": {
     ".": {
@@ -19,17 +19,17 @@
     "test": "ava"
   },
   "dependencies": {
-    "@knapsack/utils": "4.75.8--canary.5662.4aaa414.0",
+    "@knapsack/utils": "4.75.8",
     "typescript": "^5.7.3"
   },
   "devDependencies": {
-    "@knapsack/angular-sandbox-components": "4.75.8--canary.5662.4aaa414.0",
-    "@knapsack/eslint-config-starter": "4.75.8--canary.5662.4aaa414.0",
-    "@knapsack/prettier-config": "4.75.8--canary.5662.4aaa414.0",
-    "@knapsack/sandbox-components": "4.75.8--canary.5662.4aaa414.0",
-    "@knapsack/test-ava": "4.75.8--canary.5662.4aaa414.0",
-    "@knapsack/types": "4.75.8--canary.5662.4aaa414.0",
-    "@knapsack/typescript-config-starter": "4.75.8--canary.5662.4aaa414.0",
+    "@knapsack/angular-sandbox-components": "4.75.8",
+    "@knapsack/eslint-config-starter": "4.75.8",
+    "@knapsack/prettier-config": "4.75.8",
+    "@knapsack/sandbox-components": "4.75.8",
+    "@knapsack/test-ava": "4.75.8",
+    "@knapsack/types": "4.75.8",
+    "@knapsack/typescript-config-starter": "4.75.8",
     "@types/node": "^20.17.17",
     "ava": "^6.2.0",
     "eslint": "^8.57.0"
@@ -43,5 +43,5 @@
     "directory": "apps/client/libs/spec-utils",
     "type": "git"
   },
-  "gitHead": "4aaa4141d29cd422ab27528c231cc2740e531dfb"
+  "gitHead": "56fb9c1d8b39ce275d2dba24b9b93d97c9a213ca"
 }

package/src/analyze-type.ts CHANGED Viewed

@@ -2,39 +2,76 @@ import ts from 'typescript';
 import { TypeInfo, TypeInfoCommon } from './types.js';
 import { getSetFlags } from './utils.js';
+// Cache for type IDs to improve performance
+const typeIdMap = new WeakMap<ts.Type, string>();
+/**
+ * Generates a consistent identifier for a TypeScript type
+ * Uses the type's string representation to ensure identical types get the same ID
+ */
+function getTypeId(type: ts.Type, checker: ts.TypeChecker): string {
+  // Check if we already have an ID for this type
+  const existingId = typeIdMap.get(type);
+  if (existingId) {
+    return existingId;
+  }
+  // Generate a new ID based on the type's string representation
+  // This ensures identical types get the same ID
+  const typeString = checker.typeToString(
+    type,
+    undefined,
+    // eslint-disable-next-line no-bitwise
+    ts.TypeFormatFlags.NoTruncation,
+  );
+  // Add some additional information to help distinguish types
+  // that might have the same string representation
+  const idComponents = [typeString];
+  // Add symbol name if available
+  const symbol = type.getSymbol();
+  if (symbol) {
+    idComponents.push(symbol.getName());
+  }
+  // Add type flags to help distinguish types
+  idComponents.push(String(type.flags));
+  const newId = idComponents.join('_');
+  typeIdMap.set(type, newId);
+  return newId;
+}
+/**
+ * Analyzes a TypeScript type and returns a structured TypeInfo representation
+ */
 export function analyzeType({
   type,
   checker,
   isOptional,
-  visitedTypes = new Set(),
+  visitedTypes = new Map<string, TypeInfo>(),
+  depth = 0,
+  /**
+   * The maximum depth of type analysis.
+   * This is used to avoid infinite recursion.
+   */
+  maxDepth = 3,
 }: {
   type: ts.Type;
   checker: ts.TypeChecker;
   isOptional?: boolean;
-  visitedTypes?: Set<ts.Type>;
+  visitedTypes?: Map<string, TypeInfo>;
+  depth?: number;
+  maxDepth?: number;
 }): TypeInfo {
-  // Prevent infinite recursion
-  if (visitedTypes.has(type)) {
-    return {
-      type: 'misc',
-      tsRawType: checker.typeToString(
-        type,
-        undefined,
-        // eslint-disable-next-line no-bitwise
-        ts.TypeFormatFlags.MultilineObjectLiterals |
-          ts.TypeFormatFlags.NoTruncation,
-      ),
-      tsMetadata: {
-        typeFlags: getSetFlags({
-          flags: type.flags,
-          enumObject: ts.TypeFlags,
-        }),
-        type,
-      },
-      isOptional,
-    };
+  // Generate a unique key for the type
+  const typeId = getTypeId(type, checker);
+  // Check if we've already analyzed this type
+  if (visitedTypes.has(typeId)) {
+    return visitedTypes.get(typeId)!;
   }
-  visitedTypes.add(type);
   const tsRawType = checker.typeToString(
     type,
@@ -56,51 +93,82 @@ export function analyzeType({
     isOptional,
   };
+  // If we've reached max depth, return a simplified type
+  if (depth >= maxDepth) {
+    const result: TypeInfo = {
+      type: 'misc',
+      ...typeInfoCommon,
+    };
+    visitedTypes.set(typeId, result);
+    return result;
+  }
+  let result: TypeInfo;
   // Handle primitive types first
   if (
     tsRawType === 'number' ||
     tsRawType === 'boolean' ||
     tsRawType === 'string'
   ) {
-    return {
+    result = {
       type: tsRawType,
       ...typeInfoCommon,
     };
+    visitedTypes.set(typeId, result);
+    return result;
   }
   // Handle literal types
   if (type.isStringLiteral()) {
-    return {
+    result = {
       type: 'stringLiteral',
       value: type.value,
       ...typeInfoCommon,
     };
+    visitedTypes.set(typeId, result);
+    return result;
   }
   if (type.isNumberLiteral()) {
-    return {
+    result = {
       type: 'numberLiteral',
       value: type.value,
       ...typeInfoCommon,
     };
+    visitedTypes.set(typeId, result);
+    return result;
   }
+  // Create a placeholder to avoid infinite recursion
+  const placeholder: TypeInfo = {
+    type: 'misc',
+    ...typeInfoCommon,
+  };
+  visitedTypes.set(typeId, placeholder);
   // Handle unions
   if (type.isUnion()) {
-    return {
+    result = {
       type: 'union',
       items: type.types.map((t) =>
-        analyzeType({ type: t, checker, isOptional, visitedTypes }),
+        analyzeType({
+          type: t,
+          checker,
+          isOptional,
+          visitedTypes,
+          depth: depth + 1,
+          maxDepth,
+        }),
       ),
       ...typeInfoCommon,
     };
   }
   // Handle arrays
-  if (checker.isArrayType(type) || checker.isArrayLikeType(type)) {
+  else if (checker.isArrayType(type) || checker.isArrayLikeType(type)) {
     const indexInfos = checker.getIndexInfosOfType(type);
-    return {
+    result = {
       type: 'array',
       items:
         indexInfos.length === 1
@@ -109,19 +177,20 @@ export function analyzeType({
               checker,
               isOptional,
               visitedTypes,
+              depth: depth + 1,
+              maxDepth,
             })
           : { type: 'misc', ...typeInfoCommon },
       ...typeInfoCommon,
     };
   }
   // Handle intersections
   // This is where ForwardRef is being inferred
   // @TODO: We need to find a way to handle depth here. Currently we bring in all of the properties
   // from each type in the intersection, but we may want to limit the depth of the intersection
   // to avoid bringing in too much.
   // https://linear.app/knapsack/issue/KSP-5885/update-handling-of-intersection-types-in-spec-utils
-  if (type.isIntersection()) {
+  else if (type.isIntersection()) {
     const properties = type.getProperties();
     if (properties.length > 0) {
       const analyzedProperties = properties.reduce((acc, prop) => {
@@ -136,6 +205,8 @@ export function analyzeType({
               // eslint-disable-next-line no-bitwise
               isOptional: !!(prop.flags & ts.SymbolFlags.Optional),
               visitedTypes,
+              depth: depth + 1,
+              maxDepth,
             });
             acc[prop.getName()] = {
@@ -158,18 +229,24 @@ export function analyzeType({
       }, {} as Record<string, any>);
       if (Object.keys(analyzedProperties).length > 0) {
-        return {
+        result = {
           type: 'object',
           properties: analyzedProperties,
           ...typeInfoCommon,
         };
+      } else {
+        result = placeholder;
       }
+    } else {
+      result = placeholder;
     }
   }
   // Handle function types
-  if (typeFlags.includes('Object') && type.getCallSignatures().length > 0) {
-    return {
+  else if (
+    typeFlags.includes('Object') &&
+    type.getCallSignatures().length > 0
+  ) {
+    result = {
       type: 'function',
       parameters: [],
       returnType: { type: 'misc', ...typeInfoCommon },
@@ -180,58 +257,60 @@ export function analyzeType({
   // Handle object types
   // @TODO: update handling of object type inference
   // https://linear.app/knapsack/issue/KSP-5880/handle-arrays-of-objects-in-react-renderer-infer-spec
-  // if (typeFlags.includes('Object')) {
+  // else if (typeFlags.includes('Object')) {
   //   const properties = type.getProperties();
   //   if (properties.length > 0) {
-  //     const analyzedProperties = properties.reduce<Record<string, SymbolInfo>>(
-  //       (acc, prop) => {
-  //         try {
-  //           const propType = checker.getTypeOfSymbol(prop);
-  //           if (propType) {
-  //             const propAnalysis = analyzeType({
+  //     const analyzedProperties = properties.reduce((acc, prop) => {
+  //       try {
+  //         const propType = checker.getTypeOfSymbol(prop);
+  //         if (propType) {
+  //           const propAnalysis = analyzeType({
+  //             type: propType,
+  //             checker,
+  //             // eslint-disable-next-line no-bitwise
+  //             isOptional: !!(prop.flags & ts.SymbolFlags.Optional),
+  //             visitedTypes,
+  //             depth: depth + 1,
+  //             maxDepth,
+  //           });
+  //           acc[prop.getName()] = {
+  //             name: prop.getName(),
+  //             typeInfo: propAnalysis,
+  //             tsMetadata: {
+  //               symbol: prop,
   //               type: propType,
-  //               checker,
-  //               // eslint-disable-next-line no-bitwise
-  //               isOptional: !!(prop.flags & ts.SymbolFlags.Optional),
-  //               visitedTypes,
-  //               depth: depth + 1,
-  //             });
-  //             acc[prop.getName()] = {
-  //               name: prop.getName(),
-  //               typeInfo: propAnalysis,
-  //               tsMetadata: {
-  //                 symbol: prop,
-  //                 type: propType,
-  //                 symbolFlags: getSetFlags({
-  //                   flags: prop.flags,
-  //                   enumObject: ts.SymbolFlags,
-  //                 }),
-  //               },
-  //             };
-  //           }
-  //         } catch (error) {
-  //           console.debug(
-  //             `Error analyzing property ${prop.getName()}: ${error}`,
-  //           );
+  //               symbolFlags: getSetFlags({
+  //                 flags: prop.flags,
+  //                 enumObject: ts.SymbolFlags,
+  //               }),
+  //             },
+  //           };
   //         }
-  //         return acc;
-  //       },
-  //       {},
-  //     );
+  //       } catch (error) {
+  //         console.debug(`Error analyzing property ${prop.getName()}: ${error}`);
+  //       }
+  //       return acc;
+  //     }, {} as Record<string, any>);
   //     if (Object.keys(analyzedProperties).length > 0) {
-  //       return {
+  //       result = {
   //         type: 'object',
   //         properties: analyzedProperties,
   //         ...typeInfoCommon,
   //       };
+  //     } else {
+  //       result = placeholder;
   //     }
+  //   } else {
+  //     result = placeholder;
   //   }
   // }
   // Default to misc type for anything we can't properly analyze
-  return {
-    type: 'misc',
-    ...typeInfoCommon,
-  };
+  else {
+    result = placeholder;
+  }
+  // Update the cache with the actual result
+  visitedTypes.set(typeId, result);
+  return result;
 }