@wix/zero-config-implementation 1.87.0 → 1.88.0

package/src/information-extractors/ts/utils/semantic-type-resolver.ts

@@ -212,8 +212,8 @@ function resolveTypeBody({
     () => resolvePrimitiveType(type),
     () => resolveLiteralType(type, checker),
     () => resolveUnionType(type, checker, depth, seenTypes),
-    () => resolveIntersectionType(type, checker, depth, seenTypes),
     () => resolveArrayType(type, checker, depth, seenTypes),
+    () => resolveIntersectionType(type, checker, depth, seenTypes),
     () => resolveFunctionType(type, checker),
     () => resolveObjectType(type, checker, depth, seenTypes),
   ]
@@ -324,18 +324,47 @@ function resolveArrayType(
   depth: number,
   seenTypes: Set<ts.Type>,
 ): ResolvedType | undefined {
-  if (checker.isArrayType(type)) {
-    const arrayType = type as ts.TypeReference
-    const typeArgs = checker.getTypeArguments(arrayType)
-    if (typeArgs.length > 0) {
-      return {
-        kind: 'array',
-        elementType: resolveType({ type: typeArgs[0], checker, depth: depth + 1, seenTypes }),
-      }
-    }
+  if (!isArrayLikeType(type, checker)) {
+    return undefined
+  }
+
+  const elementType = getArrayElementType(type, checker)
+  if (!elementType) {
     return { kind: 'array', elementType: { kind: 'primitive', value: 'any' } }
   }
-  return undefined
+
+  return {
+    kind: 'array',
+    elementType: resolveType({ type: elementType, checker, depth: depth + 1, seenTypes }),
+  }
+}
+
+function isArrayLikeType(type: ts.Type, checker: ts.TypeChecker): boolean {
+  if (type.flags & ts.TypeFlags.Intersection) {
+    return (type as ts.IntersectionType).types.some((memberType) => isArrayLikeType(memberType, checker))
+  }
+
+  return checker.isArrayType(type) || checker.isTupleType(type)
+}
+
+function getArrayElementType(type: ts.Type, checker: ts.TypeChecker): ts.Type | undefined {
+  if (type.flags & ts.TypeFlags.Intersection) {
+    const intersectionType = type as ts.IntersectionType
+
+    // Prefer a declared array type over a const tuple. Intersections produced by
+    // default-prop helpers commonly look like `Item[] & readonly [{ ... }]`;
+    // the declared array carries the reusable item schema while the tuple only
+    // narrows it to the particular default values.
+    const declaredArrayMember = intersectionType.types.find((memberType) => checker.isArrayType(memberType))
+    if (declaredArrayMember) {
+      return checker.getIndexTypeOfType(declaredArrayMember, ts.IndexKind.Number)
+    }
+
+    const tupleMember = intersectionType.types.find((memberType) => checker.isTupleType(memberType))
+    return tupleMember ? checker.getIndexTypeOfType(tupleMember, ts.IndexKind.Number) : undefined
+  }
+
+  return checker.getIndexTypeOfType(type, ts.IndexKind.Number)
 }
 
 function resolveFunctionType(type: ts.Type, checker: ts.TypeChecker): ResolvedType | undefined {