moonflower 1.6.0 → 1.6.2

package/src/openapi/analyzerModule/nodeParsers.ts

@@ -18,6 +18,16 @@ const implementationCache = new WeakMap<Node, Node>()
 const nodeShapeCache = new WeakMap<Node, ShapeOfType['shape']>()
 const typeShapeCache = new WeakMap<object, ShapeOfType['shape']>()
 
+const implementationBySymbolCache = new WeakMap<ts.Symbol, Node>()
+
+const getCanonicalSymbol = (node: Node): ts.Symbol | undefined => {
+	const symbol = node.getSymbol()
+	if (!symbol) {
+		return undefined
+	}
+	return (symbol.getAliasedSymbol() ?? symbol).compilerSymbol
+}
+
 export const findNodeImplementation = (node: Node): Node => {
 	const cached = implementationCache.get(node)
 	if (cached) {
@@ -25,30 +35,44 @@ export const findNodeImplementation = (node: Node): Node => {
 	}
 
 	if (node.getKind() === SyntaxKind.Identifier) {
-		const implementationNode = node.asKind(SyntaxKind.Identifier)!.getImplementations()[0]?.getNode()
-		if (implementationNode) {
-			const implementationParentNode = implementationNode.getParent()!
-			const assignmentValueNode = implementationParentNode.getLastChild()!
-			if (assignmentValueNode === node) {
-				throw new Error('Recursive implementation found')
+		const symbol = getCanonicalSymbol(node)
+		if (symbol) {
+			const cachedBySymbol = implementationBySymbolCache.get(symbol)
+			if (cachedBySymbol) {
+				implementationCache.set(node, cachedBySymbol)
+				return cachedBySymbol
 			}
-			const result = findNodeImplementation(assignmentValueNode)
-			implementationCache.set(node, result)
-			return result
 		}
 
-		const definitionNode = node.asKind(SyntaxKind.Identifier)!.getDefinitions()[0]?.getNode()
-		if (definitionNode) {
-			const definitionParentNode = definitionNode.getParent()!
-			const assignmentValueNode = definitionParentNode.getLastChild()!
-			if (assignmentValueNode === node) {
-				throw new Error('Recursive implementation found')
+		const resolve = (): Node => {
+			const implementationNode = node.asKind(SyntaxKind.Identifier)!.getImplementations()[0]?.getNode()
+			if (implementationNode) {
+				const implementationParentNode = implementationNode.getParent()!
+				const assignmentValueNode = implementationParentNode.getLastChild()!
+				if (assignmentValueNode === node) {
+					throw new Error('Recursive implementation found')
+				}
+				return findNodeImplementation(assignmentValueNode)
+			}
+
+			const definitionNode = node.asKind(SyntaxKind.Identifier)!.getDefinitions()[0]?.getNode()
+			if (definitionNode) {
+				const definitionParentNode = definitionNode.getParent()!
+				const assignmentValueNode = definitionParentNode.getLastChild()!
+				if (assignmentValueNode === node) {
+					throw new Error('Recursive implementation found')
+				}
+				return findNodeImplementation(assignmentValueNode)
 			}
-			const result = findNodeImplementation(assignmentValueNode)
-			implementationCache.set(node, result)
-			return result
+			throw new Error('No implementation nor definition available')
 		}
-		throw new Error('No implementation nor definition available')
+
+		const result = resolve()
+		if (symbol) {
+			implementationBySymbolCache.set(symbol, result)
+		}
+		implementationCache.set(node, result)
+		return result
 	}
 
 	implementationCache.set(node, node)
@@ -265,19 +289,30 @@ export const getShapeOfValidatorLiteral = (
 	return properties || []
 }
 
+const returnTypeCache = new WeakMap<Node, Type>()
+const getCallReturnType = (callExpression: Node): Type => {
+	const cached = returnTypeCache.get(callExpression)
+	if (cached) {
+		return cached
+	}
+	const result = callExpression.asKindOrThrow(SyntaxKind.CallExpression).getReturnType()
+	returnTypeCache.set(callExpression, result)
+	return result
+}
+
 const isZodCallExpression = (node: Node): boolean => {
 	const callExpression = node.asKind(SyntaxKind.CallExpression)
 	if (!callExpression) {
 		return false
 	}
-	const returnType = callExpression.getReturnType()
+	const returnType = getCallReturnType(callExpression)
 	const typeName = returnType.getSymbol()?.getName() ?? ''
 	return typeName.startsWith('Zod')
 }
 
 const getZodCallShape = (node: Node): ShapeOfType['shape'] => {
 	const callExpression = node.asKind(SyntaxKind.CallExpression)!
-	const returnType = callExpression.getReturnType()
+	const returnType = getCallReturnType(callExpression)
 	const outputProp = returnType.getProperty('_output')
 	if (outputProp) {
 		return getProperTypeShape(outputProp.getTypeAtLocation(callExpression), callExpression)
@@ -402,7 +437,7 @@ export const getValidatorPropertyShape = (innerLiteralNode: Node): ShapeOfType['
 export const getValidatorPropertyOptionality = (node: Node): boolean => {
 	if (isZodCallExpression(node)) {
 		const callExpression = node.asKind(SyntaxKind.CallExpression)!
-		const returnType = callExpression.getReturnType()
+		const returnType = getCallReturnType(callExpression)
 		const typeName = returnType.getSymbol()?.getName() ?? ''
 		if (typeName === 'ZodOptional') {
 			return true

package/src/openapi/discoveryModule/discoverRouterFiles/discoverRouterFiles.spec.ts

@@ -1,12 +1,21 @@
 import { resolve } from 'path'
+import { Project } from 'ts-morph'
+import { beforeEach, describe, expect, it } from 'vitest'
 
 import { discoverRouterFiles } from './discoverRouterFiles'
 
 describe('discoverRouterFiles', () => {
+	let project: Project
+	beforeEach(() => {
+		project = new Project({
+			tsConfigFilePath: resolve('./tsconfig.json'),
+			skipFileDependencyResolution: true,
+		})
+	})
 	it('discovers routers from folder correctly', () => {
 		const { discoveredRouterFiles } = discoverRouterFiles({
 			targetPath: resolve(__dirname, '.'),
-			tsConfigPath: resolve('./tsconfig.json'),
+			project,
 		})
 
 		expect(discoveredRouterFiles.length).toEqual(2)
@@ -15,8 +24,8 @@ describe('discoverRouterFiles', () => {
 	it('respects ignoring files by string', () => {
 		const { discoveredRouterFiles } = discoverRouterFiles({
 			targetPath: resolve(__dirname, '.'),
-			tsConfigPath: resolve('./tsconfig.json'),
 			excludedFiles: ['testRouterA'],
+			project,
 		})
 
 		expect(discoveredRouterFiles.length).toEqual(1)
@@ -26,8 +35,8 @@ describe('discoverRouterFiles', () => {
 	it('respects ignoring files by regex', () => {
 		const { discoveredRouterFiles } = discoverRouterFiles({
 			targetPath: resolve(__dirname, '.'),
-			tsConfigPath: resolve('./tsconfig.json'),
 			excludedFiles: [/B/g],
+			project,
 		})
 
 		expect(discoveredRouterFiles.length).toEqual(1)

package/src/openapi/discoveryModule/discoverRouterFiles/discoverRouterFiles.ts

@@ -8,12 +8,12 @@ export type DiscoveredSourceFile = ReturnType<typeof discoverRouterFiles>['disco
 
 export const discoverRouterFiles = ({
 	targetPath,
-	tsConfigPath,
 	excludedFiles,
+	project,
 }: {
 	targetPath: string
-	tsConfigPath: string
 	excludedFiles?: (string | RegExp)[]
+	project: Project
 }) => {
 	if (!fs.existsSync(targetPath)) {
 		return { discoveredRouterFiles: [], discoveredSourceFiles: [] }
@@ -41,11 +41,6 @@ export const discoverRouterFiles = ({
 		return true
 	})
 
-	const project = new Project({
-		tsConfigFilePath: tsConfigPath,
-		skipFileDependencyResolution: true,
-	})
-
 	const allSourceFiles = files
 		.map((fileName) => {
 			const filePath = path.resolve(targetPath, fileName)