flow-api-translator 0.14.0 → 0.15.1

package/dist/flowDefToTSDef.js

@@ -606,10 +606,6 @@ const getTransforms = (originalCode, scopeManager, opts) => {
       case 'TupleTypeAnnotation':
         return transform.TupleTypeAnnotation(node);
 
-      case 'TupleTypeLabeledElement':
-      case 'TupleTypeSpreadElement':
-        return unsupportedAnnotation(node, node.type);
-
       case 'TypeofTypeAnnotation':
         return transform.TypeofTypeAnnotation(node);
 
@@ -1202,6 +1198,17 @@ const getTransforms = (originalCode, scopeManager, opts) => {
       return unsupportedAnnotation(node, 'existential type');
     },
 
+    ExportAllDeclaration(node) {
+      return {
+        type: 'ExportAllDeclaration',
+        // flow does not currently support import/export assertions
+        assertions: [],
+        exportKind: node.exportKind,
+        source: transform.StringLiteral(node.source),
+        exported: node.exported == null ? null : transform.Identifier(node.exported)
+      };
+    },
+
     ExportNamedDeclaration(node) {
       if (node.source != null || node.specifiers.length > 0) {
         // can never have a declaration with a source
@@ -1582,23 +1589,6 @@ const getTransforms = (originalCode, scopeManager, opts) => {
             };
           }
 
-        case '$Shape':
-        case '$Partial':
-          {
-            // `$Partial<T>` => `Partial<T>`
-            return {
-              type: 'TSTypeReference',
-              typeName: {
-                type: 'Identifier',
-                name: 'Partial'
-              },
-              typeParameters: {
-                type: 'TSTypeParameterInstantiation',
-                params: assertHasExactlyNTypeParameters(1)
-              }
-            };
-          }
-
         case '$Values':
           {
             // `$Values<T>` => `T[keyof T]`
@@ -1971,6 +1961,28 @@ const getTransforms = (originalCode, scopeManager, opts) => {
                 }
               };
             }
+          // React.ElementProps<A> -> React.ComponentProps<A>
+          // React$ElementProps<A> -> React.ComponentProps<A>
+
+          case 'React.ElementProps':
+          case 'React$ElementProps':
+            {
+              return {
+                type: 'TSTypeReference',
+                typeName: {
+                  type: 'TSQualifiedName',
+                  left: getReactIdentifier(),
+                  right: {
+                    type: 'Identifier',
+                    name: 'ComponentProps'
+                  }
+                },
+                typeParameters: {
+                  type: 'TSTypeParameterInstantiation',
+                  params: assertHasExactlyNTypeParameters(1)
+                }
+              };
+            }
           // React.ElementConfig<A> ->  JSX.LibraryManagedAttributes<A, React.ComponentProps<A>>
           // React$ElementConfig<A> ->  JSX.LibraryManagedAttributes<A, React.ComponentProps<A>>
 
@@ -2640,10 +2652,47 @@ const getTransforms = (originalCode, scopeManager, opts) => {
     },
 
     TupleTypeAnnotation(node) {
-      return {
+      const allReadOnly = node.types.length > 0 && node.types.every(element => element.type === 'TupleTypeLabeledElement' && element.variance != null && element.variance.kind === 'plus');
+      const tupleAnnot = {
         type: 'TSTupleType',
-        elementTypes: node.types.map(transformTypeAnnotationType)
+        elementTypes: node.types.map(element => {
+          switch (element.type) {
+            case 'TupleTypeLabeledElement':
+              if (!allReadOnly && element.variance != null) {
+                return unsupportedAnnotation(element, 'tuple type element variance annotations');
+              }
+
+              return {
+                type: 'TSNamedTupleMember',
+                label: transform.Identifier(element.label),
+                optional: element.optional,
+                elementType: transformTypeAnnotationType(element.elementType)
+              };
+
+            case 'TupleTypeSpreadElement':
+              {
+                const annot = transformTypeAnnotationType(element.typeAnnotation);
+                return {
+                  type: 'TSRestType',
+                  typeAnnotation: element.label != null ? {
+                    type: 'TSNamedTupleMember',
+                    label: transform.Identifier(element.label),
+                    optional: false,
+                    elementType: annot
+                  } : annot
+                };
+              }
+
+            default:
+              return transformTypeAnnotationType(element);
+          }
+        })
       };
+      return allReadOnly ? {
+        type: 'TSTypeOperator',
+        operator: 'readonly',
+        typeAnnotation: tupleAnnot
+      } : tupleAnnot;
     },
 
     TypeAlias(node) {

package/dist/flowDefToTSDef.js.flow

@@ -650,9 +650,6 @@ const getTransforms = (
         return transform.ThisTypeAnnotation(node);
       case 'TupleTypeAnnotation':
         return transform.TupleTypeAnnotation(node);
-      case 'TupleTypeLabeledElement':
-      case 'TupleTypeSpreadElement':
-        return unsupportedAnnotation(node, node.type);
       case 'TypeofTypeAnnotation':
         return transform.TypeofTypeAnnotation(node);
       case 'UnionTypeAnnotation':
@@ -1337,6 +1334,19 @@ const getTransforms = (
       // It's also super deprecated - so let's not ever worry
       return unsupportedAnnotation(node, 'existential type');
     },
+    ExportAllDeclaration(
+      node: FlowESTree.ExportAllDeclaration,
+    ): TSESTree.ExportAllDeclaration {
+      return {
+        type: 'ExportAllDeclaration',
+        // flow does not currently support import/export assertions
+        assertions: [],
+        exportKind: node.exportKind,
+        source: transform.StringLiteral(node.source),
+        exported:
+          node.exported == null ? null : transform.Identifier(node.exported),
+      };
+    },
     ExportNamedDeclaration(
       node: FlowESTree.ExportNamedDeclaration,
     ):
@@ -1747,22 +1757,6 @@ const getTransforms = (
           };
         }
 
-        case '$Shape':
-        case '$Partial': {
-          // `$Partial<T>` => `Partial<T>`
-          return {
-            type: 'TSTypeReference',
-            typeName: {
-              type: 'Identifier',
-              name: 'Partial',
-            },
-            typeParameters: {
-              type: 'TSTypeParameterInstantiation',
-              params: assertHasExactlyNTypeParameters(1),
-            },
-          };
-        }
-
         case '$Values': {
           // `$Values<T>` => `T[keyof T]`
           const transformedType = assertHasExactlyNTypeParameters(1)[0];
@@ -2133,6 +2127,26 @@ const getTransforms = (
               },
             };
           }
+          // React.ElementProps<A> -> React.ComponentProps<A>
+          // React$ElementProps<A> -> React.ComponentProps<A>
+          case 'React.ElementProps':
+          case 'React$ElementProps': {
+            return {
+              type: 'TSTypeReference',
+              typeName: {
+                type: 'TSQualifiedName',
+                left: getReactIdentifier(),
+                right: {
+                  type: 'Identifier',
+                  name: 'ComponentProps',
+                },
+              },
+              typeParameters: {
+                type: 'TSTypeParameterInstantiation',
+                params: assertHasExactlyNTypeParameters(1),
+              },
+            };
+          }
           // React.ElementConfig<A> ->  JSX.LibraryManagedAttributes<A, React.ComponentProps<A>>
           // React$ElementConfig<A> ->  JSX.LibraryManagedAttributes<A, React.ComponentProps<A>>
           case 'React.ElementConfig':
@@ -2895,11 +2909,59 @@ const getTransforms = (
     },
     TupleTypeAnnotation(
       node: FlowESTree.TupleTypeAnnotation,
-    ): TSESTree.TSTupleType {
-      return {
+    ): TSESTree.TSTupleType | TSESTree.TSTypeOperator {
+      const allReadOnly =
+        node.types.length > 0 &&
+        node.types.every(
+          element =>
+            element.type === 'TupleTypeLabeledElement' &&
+            element.variance != null &&
+            element.variance.kind === 'plus',
+        );
+      const tupleAnnot = {
         type: 'TSTupleType',
-        elementTypes: node.types.map(transformTypeAnnotationType),
+        elementTypes: node.types.map(element => {
+          switch (element.type) {
+            case 'TupleTypeLabeledElement':
+              if (!allReadOnly && element.variance != null) {
+                return unsupportedAnnotation(
+                  element,
+                  'tuple type element variance annotations',
+                );
+              }
+              return {
+                type: 'TSNamedTupleMember',
+                label: transform.Identifier(element.label),
+                optional: element.optional,
+                elementType: transformTypeAnnotationType(element.elementType),
+              };
+            case 'TupleTypeSpreadElement': {
+              const annot = transformTypeAnnotationType(element.typeAnnotation);
+              return {
+                type: 'TSRestType',
+                typeAnnotation:
+                  element.label != null
+                    ? {
+                        type: 'TSNamedTupleMember',
+                        label: transform.Identifier(element.label),
+                        optional: false,
+                        elementType: annot,
+                      }
+                    : annot,
+              };
+            }
+            default:
+              return transformTypeAnnotationType(element);
+          }
+        }),
       };
+      return allReadOnly
+        ? {
+            type: 'TSTypeOperator',
+            operator: 'readonly',
+            typeAnnotation: tupleAnnot,
+          }
+        : tupleAnnot;
     },
     TypeAlias(node: FlowESTree.TypeAlias): TSESTree.TSTypeAliasDeclaration {
       return transform.DeclareTypeAlias(node);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flow-api-translator",
-  "version": "0.14.0",
+  "version": "0.15.1",
   "description": "Toolkit for creating Flow and TypeScript compatible libraries from Flow source code.",
   "main": "dist/index.js",
   "license": "MIT",
@@ -12,10 +12,10 @@
     "@babel/code-frame": "^7.16.0",
     "@typescript-eslint/visitor-keys": "^5.42.0",
     "flow-enums-runtime": "^0.0.6",
-    "hermes-eslint": "0.14.0",
-    "hermes-estree": "0.14.0",
-    "hermes-parser": "0.14.0",
-    "hermes-transform": "0.14.0"
+    "hermes-eslint": "0.15.1",
+    "hermes-estree": "0.15.1",
+    "hermes-parser": "0.15.1",
+    "hermes-transform": "0.15.1"
   },
   "peerDependencies": {
     "prettier": "^3.0.0 || ^2.7.1"