flow-api-translator 0.34.0 → 0.36.0

package/dist/flowDefToTSDef.js

@@ -85,6 +85,7 @@ function flowDefToTSDef(originalCode, ast, scopeManager, opts) {
   for (const node of ast.body) {
     if (node.type in transform) {
       const result = transform[// $FlowExpectedError[prop-missing]
+      // $FlowFixMe[incompatible-type]
       node.type]( // $FlowExpectedError[incompatible-type]
       node);
       tsBody.push(...(Array.isArray(result) ? result : [result]));
@@ -3120,7 +3121,7 @@ const getTransforms = (originalCode, scopeManager, opts) => {
 
     ObjectTypeAnnotation(node) {
       if (node.properties.length === 1 && node.properties[0].type === 'ObjectTypeMappedTypeProperty') {
-        var _prop$variance;
+        var _prop$variance, _prop$variance2;
 
         // Mapped Object Object types must not have other object properties.
         const prop = node.properties[0];
@@ -3145,7 +3146,7 @@ const getTransforms = (originalCode, scopeManager, opts) => {
             name: prop.keyTparam.name
           },
           constraint: transformTypeAnnotationType(prop.sourceType),
-          readonly: ((_prop$variance = prop.variance) == null ? void 0 : _prop$variance.kind) === 'plus',
+          readonly: ((_prop$variance = prop.variance) == null ? void 0 : _prop$variance.kind) === 'plus' || ((_prop$variance2 = prop.variance) == null ? void 0 : _prop$variance2.kind) === 'readonly',
           optional: prop.optional === 'Optional',
           typeAnnotation: transformTypeAnnotationType(prop.propType),
           nameType: null
@@ -3366,10 +3367,10 @@ const getTransforms = (originalCode, scopeManager, opts) => {
     },
 
     ObjectTypeIndexer(node) {
-      var _node$variance2;
+      var _node$variance3, _node$variance4;
 
       if (node.key.type === 'GenericTypeAnnotation') {
-        var _node$variance;
+        var _node$variance, _node$variance2;
 
         const ident = node.key.id.type === 'Identifier' ? node.key.id : node.key.id.id;
         return {
@@ -3391,7 +3392,7 @@ const getTransforms = (originalCode, scopeManager, opts) => {
               loc: DUMMY_LOC
             }
           },
-          readonly: ((_node$variance = node.variance) == null ? void 0 : _node$variance.kind) === 'plus',
+          readonly: ((_node$variance = node.variance) == null ? void 0 : _node$variance.kind) === 'plus' || ((_node$variance2 = node.variance) == null ? void 0 : _node$variance2.kind) === 'readonly',
           static: node.static,
           typeAnnotation: {
             type: 'TSTypeAnnotation',
@@ -3414,7 +3415,7 @@ const getTransforms = (originalCode, scopeManager, opts) => {
             typeAnnotation: transformTypeAnnotationType(node.key)
           }
         }],
-        readonly: ((_node$variance2 = node.variance) == null ? void 0 : _node$variance2.kind) === 'plus',
+        readonly: ((_node$variance3 = node.variance) == null ? void 0 : _node$variance3.kind) === 'plus' || ((_node$variance4 = node.variance) == null ? void 0 : _node$variance4.kind) === 'readonly',
         static: node.static,
         typeAnnotation: {
           type: 'TSTypeAnnotation',
@@ -3425,7 +3426,7 @@ const getTransforms = (originalCode, scopeManager, opts) => {
     },
 
     ObjectTypeProperty(node) {
-      var _node$variance3;
+      var _node$variance5, _node$variance6;
 
       const [key, computed] = (() => {
         if (node.key.type === 'Identifier' && node.key.name.startsWith('@@')) {
@@ -3509,7 +3510,7 @@ const getTransforms = (originalCode, scopeManager, opts) => {
         computed,
         key,
         optional: node.optional,
-        readonly: ((_node$variance3 = node.variance) == null ? void 0 : _node$variance3.kind) === 'plus',
+        readonly: ((_node$variance5 = node.variance) == null ? void 0 : _node$variance5.kind) === 'plus' || ((_node$variance6 = node.variance) == null ? void 0 : _node$variance6.kind) === 'readonly',
         static: node.static,
         typeAnnotation: {
           type: 'TSTypeAnnotation',
@@ -3631,7 +3632,7 @@ const getTransforms = (originalCode, scopeManager, opts) => {
     },
 
     TupleTypeAnnotation(node) {
-      const allReadOnly = node.elementTypes.length > 0 && node.elementTypes.every(element => element.type === 'TupleTypeLabeledElement' && element.variance != null && element.variance.kind === 'plus');
+      const allReadOnly = node.elementTypes.length > 0 && node.elementTypes.every(element => element.type === 'TupleTypeLabeledElement' && element.variance != null && (element.variance.kind === 'plus' || element.variance.kind === 'readonly'));
       const elems = node.elementTypes.map(element => {
         switch (element.type) {
           case 'TupleTypeLabeledElement':

package/dist/flowDefToTSDef.js.flow

@@ -99,6 +99,7 @@ export function flowDefToTSDef(
     if (node.type in transform) {
       const result: $FlowFixMe | Array<$FlowFixMe> = transform[
         // $FlowExpectedError[prop-missing]
+        // $FlowFixMe[incompatible-type]
         node.type
       ](
         // $FlowExpectedError[incompatible-type]
@@ -3422,7 +3423,9 @@ const getTransforms = (
             name: prop.keyTparam.name,
           },
           constraint: transformTypeAnnotationType(prop.sourceType),
-          readonly: prop.variance?.kind === 'plus',
+          readonly:
+            prop.variance?.kind === 'plus' ||
+            prop.variance?.kind === 'readonly',
           optional: prop.optional === 'Optional',
           typeAnnotation: transformTypeAnnotationType(prop.propType),
           nameType: null,
@@ -3699,7 +3702,9 @@ const getTransforms = (
               loc: DUMMY_LOC,
             },
           },
-          readonly: node.variance?.kind === 'plus',
+          readonly:
+            node.variance?.kind === 'plus' ||
+            node.variance?.kind === 'readonly',
           static: node.static,
           typeAnnotation: {
             type: 'TSTypeAnnotation',
@@ -3723,7 +3728,8 @@ const getTransforms = (
             },
           },
         ],
-        readonly: node.variance?.kind === 'plus',
+        readonly:
+          node.variance?.kind === 'plus' || node.variance?.kind === 'readonly',
         static: node.static,
         typeAnnotation: {
           type: 'TSTypeAnnotation',
@@ -3824,7 +3830,8 @@ const getTransforms = (
         computed,
         key,
         optional: node.optional,
-        readonly: node.variance?.kind === 'plus',
+        readonly:
+          node.variance?.kind === 'plus' || node.variance?.kind === 'readonly',
         static: node.static,
         typeAnnotation: {
           type: 'TSTypeAnnotation',
@@ -3965,7 +3972,8 @@ const getTransforms = (
           element =>
             element.type === 'TupleTypeLabeledElement' &&
             element.variance != null &&
-            element.variance.kind === 'plus',
+            (element.variance.kind === 'plus' ||
+              element.variance.kind === 'readonly'),
         );
       const elems = node.elementTypes.map((element): TSESTree.TypeNode => {
         switch (element.type) {

package/dist/src/flowDefToTSDef.js

@@ -85,6 +85,7 @@ function flowDefToTSDef(originalCode, ast, scopeManager, opts) {
   for (const node of ast.body) {
     if (node.type in transform) {
       const result = transform[// $FlowExpectedError[prop-missing]
+      // $FlowFixMe[incompatible-type]
       node.type]( // $FlowExpectedError[incompatible-type]
       node);
       tsBody.push(...(Array.isArray(result) ? result : [result]));
@@ -3120,7 +3121,7 @@ const getTransforms = (originalCode, scopeManager, opts) => {
 
     ObjectTypeAnnotation(node) {
       if (node.properties.length === 1 && node.properties[0].type === 'ObjectTypeMappedTypeProperty') {
-        var _prop$variance;
+        var _prop$variance, _prop$variance2;
 
         // Mapped Object Object types must not have other object properties.
         const prop = node.properties[0];
@@ -3145,7 +3146,7 @@ const getTransforms = (originalCode, scopeManager, opts) => {
             name: prop.keyTparam.name
           },
           constraint: transformTypeAnnotationType(prop.sourceType),
-          readonly: ((_prop$variance = prop.variance) == null ? void 0 : _prop$variance.kind) === 'plus',
+          readonly: ((_prop$variance = prop.variance) == null ? void 0 : _prop$variance.kind) === 'plus' || ((_prop$variance2 = prop.variance) == null ? void 0 : _prop$variance2.kind) === 'readonly',
           optional: prop.optional === 'Optional',
           typeAnnotation: transformTypeAnnotationType(prop.propType),
           nameType: null
@@ -3366,10 +3367,10 @@ const getTransforms = (originalCode, scopeManager, opts) => {
     },
 
     ObjectTypeIndexer(node) {
-      var _node$variance2;
+      var _node$variance3, _node$variance4;
 
       if (node.key.type === 'GenericTypeAnnotation') {
-        var _node$variance;
+        var _node$variance, _node$variance2;
 
         const ident = node.key.id.type === 'Identifier' ? node.key.id : node.key.id.id;
         return {
@@ -3391,7 +3392,7 @@ const getTransforms = (originalCode, scopeManager, opts) => {
               loc: DUMMY_LOC
             }
           },
-          readonly: ((_node$variance = node.variance) == null ? void 0 : _node$variance.kind) === 'plus',
+          readonly: ((_node$variance = node.variance) == null ? void 0 : _node$variance.kind) === 'plus' || ((_node$variance2 = node.variance) == null ? void 0 : _node$variance2.kind) === 'readonly',
           static: node.static,
           typeAnnotation: {
             type: 'TSTypeAnnotation',
@@ -3414,7 +3415,7 @@ const getTransforms = (originalCode, scopeManager, opts) => {
             typeAnnotation: transformTypeAnnotationType(node.key)
           }
         }],
-        readonly: ((_node$variance2 = node.variance) == null ? void 0 : _node$variance2.kind) === 'plus',
+        readonly: ((_node$variance3 = node.variance) == null ? void 0 : _node$variance3.kind) === 'plus' || ((_node$variance4 = node.variance) == null ? void 0 : _node$variance4.kind) === 'readonly',
         static: node.static,
         typeAnnotation: {
           type: 'TSTypeAnnotation',
@@ -3425,7 +3426,7 @@ const getTransforms = (originalCode, scopeManager, opts) => {
     },
 
     ObjectTypeProperty(node) {
-      var _node$variance3;
+      var _node$variance5, _node$variance6;
 
       const [key, computed] = (() => {
         if (node.key.type === 'Identifier' && node.key.name.startsWith('@@')) {
@@ -3509,7 +3510,7 @@ const getTransforms = (originalCode, scopeManager, opts) => {
         computed,
         key,
         optional: node.optional,
-        readonly: ((_node$variance3 = node.variance) == null ? void 0 : _node$variance3.kind) === 'plus',
+        readonly: ((_node$variance5 = node.variance) == null ? void 0 : _node$variance5.kind) === 'plus' || ((_node$variance6 = node.variance) == null ? void 0 : _node$variance6.kind) === 'readonly',
         static: node.static,
         typeAnnotation: {
           type: 'TSTypeAnnotation',
@@ -3631,7 +3632,7 @@ const getTransforms = (originalCode, scopeManager, opts) => {
     },
 
     TupleTypeAnnotation(node) {
-      const allReadOnly = node.elementTypes.length > 0 && node.elementTypes.every(element => element.type === 'TupleTypeLabeledElement' && element.variance != null && element.variance.kind === 'plus');
+      const allReadOnly = node.elementTypes.length > 0 && node.elementTypes.every(element => element.type === 'TupleTypeLabeledElement' && element.variance != null && (element.variance.kind === 'plus' || element.variance.kind === 'readonly'));
       const elems = node.elementTypes.map(element => {
         switch (element.type) {
           case 'TupleTypeLabeledElement':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flow-api-translator",
-  "version": "0.34.0",
+  "version": "0.36.0",
   "description": "Toolkit for creating Flow and TypeScript compatible libraries from Flow source code.",
   "main": "dist/index.js",
   "license": "MIT",
@@ -13,10 +13,10 @@
     "@typescript-eslint/parser": "8.38.0",
     "@typescript-eslint/visitor-keys": "8.38.0",
     "flow-enums-runtime": "^0.0.6",
-    "hermes-eslint": "0.34.0",
-    "hermes-estree": "0.34.0",
-    "hermes-parser": "0.34.0",
-    "hermes-transform": "0.34.0",
+    "hermes-eslint": "0.36.0",
+    "hermes-estree": "0.36.0",
+    "hermes-parser": "0.36.0",
+    "hermes-transform": "0.36.0",
     "typescript": "5.3.2"
   },
   "peerDependencies": {