hermes-parser 0.18.0 → 0.18.2

package/dist/estree/StripComponentSyntax.js

@@ -78,7 +78,7 @@ function getComponentParameterName(paramName) {
   }
 }
 
-function createPropsTypeAnnotation(loc, range) {
+function createPropsTypeAnnotation(propTypes, spread, loc, range) {
   // Create empty loc for type annotation nodes
   const createParamsTypeLoc = () => ({
     loc: {
@@ -87,8 +87,34 @@ function createPropsTypeAnnotation(loc, range) {
     },
     range: range != null ? range : [0, 0],
     parent: EMPTY_PARENT
-  });
+  }); // Optimize `{...Props}` -> `Props`
+
+
+  if (spread != null && propTypes.length === 0) {
+    return {
+      type: 'TypeAnnotation',
+      typeAnnotation: spread.argument,
+      ...createParamsTypeLoc()
+    };
+  }
+
+  const typeProperties = [...propTypes];
+
+  if (spread != null) {
+    // Spread needs to be the first type, as inline properties take precedence.
+    typeProperties.unshift(spread);
+  }
 
+  const propTypeObj = {
+    type: 'ObjectTypeAnnotation',
+    callProperties: [],
+    properties: typeProperties,
+    indexers: [],
+    internalSlots: [],
+    exact: false,
+    inexact: false,
+    ...createParamsTypeLoc()
+  };
   return {
     type: 'TypeAnnotation',
     typeAnnotation: {
@@ -102,16 +128,7 @@ function createPropsTypeAnnotation(loc, range) {
       },
       typeParameters: {
         type: 'TypeParameterInstantiation',
-        params: [{
-          type: 'ObjectTypeAnnotation',
-          callProperties: [],
-          properties: [],
-          indexers: [],
-          internalSlots: [],
-          exact: false,
-          inexact: true,
-          ...createParamsTypeLoc()
-        }],
+        params: [propTypeObj],
         ...createParamsTypeLoc()
       },
       ...createParamsTypeLoc()
@@ -130,13 +147,9 @@ function mapComponentParameters(params) {
 
 
   if (params.length === 1 && params[0].type === 'RestElement' && params[0].argument.type === 'Identifier') {
-    var _restElementArgument$, _restElementArgument$2;
-
     const restElementArgument = params[0].argument;
     return {
-      props: nodeWith(restElementArgument, {
-        typeAnnotation: createPropsTypeAnnotation((_restElementArgument$ = restElementArgument.typeAnnotation) == null ? void 0 : _restElementArgument$.loc, (_restElementArgument$2 = restElementArgument.typeAnnotation) == null ? void 0 : _restElementArgument$2.range)
-      }),
+      props: restElementArgument,
       ref: null
     };
   } // Filter out any ref param and capture it's details.
@@ -151,12 +164,30 @@ function mapComponentParameters(params) {
 
     return true;
   });
+  const [propTypes, spread] = paramsWithoutRef.reduce(([propTypes, spread], param) => {
+    switch (param.type) {
+      case 'RestElement':
+        {
+          if (spread != null) {
+            throw (0, _createSyntaxError.createSyntaxError)(param, `Invalid state, multiple rest elements found as Component Parameters`);
+          }
+
+          return [propTypes, mapComponentParameterRestElementType(param)];
+        }
+
+      case 'ComponentParameter':
+        {
+          propTypes.push(mapComponentParameterType(param));
+          return [propTypes, spread];
+        }
+    }
+  }, [[], null]);
   const propsProperties = paramsWithoutRef.flatMap(mapComponentParameter);
   let props = null;
 
   if (propsProperties.length === 0) {
     if (refParam == null) {
-      throw new Error('TransformReactScriptForBabel: Invalid state, ref should always be set at this point if props are empty');
+      throw new Error('StripComponentSyntax: Invalid state, ref should always be set at this point if props are empty');
     }
 
     const emptyParamsLoc = {
@@ -169,7 +200,7 @@ function mapComponentParameters(params) {
       type: 'Identifier',
       name: '_$$empty_props_placeholder$$',
       optional: false,
-      typeAnnotation: createPropsTypeAnnotation(emptyParamsLoc, emptyParamsRange),
+      typeAnnotation: createPropsTypeAnnotation([], null, emptyParamsLoc, emptyParamsRange),
       loc: emptyParamsLoc,
       range: emptyParamsRange,
       parent: EMPTY_PARENT
@@ -179,7 +210,7 @@ function mapComponentParameters(params) {
     props = {
       type: 'ObjectPattern',
       properties: propsProperties,
-      typeAnnotation: createPropsTypeAnnotation({
+      typeAnnotation: createPropsTypeAnnotation(propTypes, spread, {
         start: lastPropsProperty.loc.end,
         end: lastPropsProperty.loc.end
       }, [lastPropsProperty.range[1], lastPropsProperty.range[1]]),
@@ -204,6 +235,53 @@ function mapComponentParameters(params) {
   };
 }
 
+function mapComponentParameterType(param) {
+  var _typeAnnotation$typeA;
+
+  const typeAnnotation = param.local.type === 'AssignmentPattern' ? param.local.left.typeAnnotation : param.local.typeAnnotation;
+  const optional = param.local.type === 'AssignmentPattern' ? true : param.local.type === 'Identifier' ? param.local.optional : false;
+  return {
+    type: 'ObjectTypeProperty',
+    key: (0, _astNodeMutationHelpers.shallowCloneNode)(param.name),
+    value: (_typeAnnotation$typeA = typeAnnotation == null ? void 0 : typeAnnotation.typeAnnotation) != null ? _typeAnnotation$typeA : {
+      type: 'AnyTypeAnnotation',
+      loc: param.local.loc,
+      range: param.local.range,
+      parent: EMPTY_PARENT
+    },
+    kind: 'init',
+    optional,
+    method: false,
+    static: false,
+    proto: false,
+    variance: null,
+    loc: param.local.loc,
+    range: param.local.range,
+    parent: EMPTY_PARENT
+  };
+}
+
+function mapComponentParameterRestElementType(param) {
+  var _param$argument$typeA, _param$argument$typeA2;
+
+  if (param.argument.type !== 'Identifier' && param.argument.type !== 'ObjectPattern') {
+    throw (0, _createSyntaxError.createSyntaxError)(param, `Invalid ${param.argument.type} encountered in restParameter`);
+  }
+
+  return {
+    type: 'ObjectTypeSpreadProperty',
+    argument: (_param$argument$typeA = (_param$argument$typeA2 = param.argument.typeAnnotation) == null ? void 0 : _param$argument$typeA2.typeAnnotation) != null ? _param$argument$typeA : {
+      type: 'AnyTypeAnnotation',
+      loc: param.loc,
+      range: param.range,
+      parent: EMPTY_PARENT
+    },
+    loc: param.loc,
+    range: param.range,
+    parent: EMPTY_PARENT
+  };
+}
+
 function mapComponentParameter(param) {
   switch (param.type) {
     case 'RestElement':

package/dist/estree/StripComponentSyntax.js.flow

@@ -40,6 +40,8 @@ import type {
   Statement,
   AssignmentPattern,
   BindingName,
+  ObjectTypePropertySignature,
+  ObjectTypeSpreadProperty,
 } from 'hermes-estree';
 
 import {SimpleTransform} from '../transform/SimpleTransform';
@@ -100,6 +102,8 @@ function getComponentParameterName(
 }
 
 function createPropsTypeAnnotation(
+  propTypes: Array<ObjectTypePropertySignature>,
+  spread: ?ObjectTypeSpreadProperty,
   loc: ?SourceLocation,
   range: ?Range,
 ): TypeAnnotation {
@@ -113,6 +117,35 @@ function createPropsTypeAnnotation(
     parent: EMPTY_PARENT,
   });
 
+  // Optimize `{...Props}` -> `Props`
+  if (spread != null && propTypes.length === 0) {
+    return {
+      type: 'TypeAnnotation',
+      typeAnnotation: spread.argument,
+      ...createParamsTypeLoc(),
+    };
+  }
+
+  const typeProperties: Array<
+    ObjectTypePropertySignature | ObjectTypeSpreadProperty,
+  > = [...propTypes];
+
+  if (spread != null) {
+    // Spread needs to be the first type, as inline properties take precedence.
+    typeProperties.unshift(spread);
+  }
+
+  const propTypeObj = {
+    type: 'ObjectTypeAnnotation',
+    callProperties: [],
+    properties: typeProperties,
+    indexers: [],
+    internalSlots: [],
+    exact: false,
+    inexact: false,
+    ...createParamsTypeLoc(),
+  };
+
   return {
     type: 'TypeAnnotation',
     typeAnnotation: {
@@ -126,18 +159,7 @@ function createPropsTypeAnnotation(
       },
       typeParameters: {
         type: 'TypeParameterInstantiation',
-        params: [
-          {
-            type: 'ObjectTypeAnnotation',
-            callProperties: [],
-            properties: [],
-            indexers: [],
-            internalSlots: [],
-            exact: false,
-            inexact: true,
-            ...createParamsTypeLoc(),
-          },
-        ],
+        params: [propTypeObj],
         ...createParamsTypeLoc(),
       },
       ...createParamsTypeLoc(),
@@ -164,12 +186,7 @@ function mapComponentParameters(
   ) {
     const restElementArgument = params[0].argument;
     return {
-      props: nodeWith(restElementArgument, {
-        typeAnnotation: createPropsTypeAnnotation(
-          restElementArgument.typeAnnotation?.loc,
-          restElementArgument.typeAnnotation?.range,
-        ),
-      }),
+      props: restElementArgument,
       ref: null,
     };
   }
@@ -188,13 +205,36 @@ function mapComponentParameters(
     return true;
   });
 
+  const [propTypes, spread] = paramsWithoutRef.reduce<
+    [Array<ObjectTypePropertySignature>, ?ObjectTypeSpreadProperty],
+  >(
+    ([propTypes, spread], param) => {
+      switch (param.type) {
+        case 'RestElement': {
+          if (spread != null) {
+            throw createSyntaxError(
+              param,
+              `Invalid state, multiple rest elements found as Component Parameters`,
+            );
+          }
+          return [propTypes, mapComponentParameterRestElementType(param)];
+        }
+        case 'ComponentParameter': {
+          propTypes.push(mapComponentParameterType(param));
+          return [propTypes, spread];
+        }
+      }
+    },
+    [[], null],
+  );
+
   const propsProperties = paramsWithoutRef.flatMap(mapComponentParameter);
 
   let props = null;
   if (propsProperties.length === 0) {
     if (refParam == null) {
       throw new Error(
-        'TransformReactScriptForBabel: Invalid state, ref should always be set at this point if props are empty',
+        'StripComponentSyntax: Invalid state, ref should always be set at this point if props are empty',
       );
     }
     const emptyParamsLoc = {
@@ -208,6 +248,8 @@ function mapComponentParameters(
       name: '_$$empty_props_placeholder$$',
       optional: false,
       typeAnnotation: createPropsTypeAnnotation(
+        [],
+        null,
         emptyParamsLoc,
         emptyParamsRange,
       ),
@@ -221,6 +263,8 @@ function mapComponentParameters(
       type: 'ObjectPattern',
       properties: propsProperties,
       typeAnnotation: createPropsTypeAnnotation(
+        propTypes,
+        spread,
         {
           start: lastPropsProperty.loc.end,
           end: lastPropsProperty.loc.end,
@@ -247,6 +291,67 @@ function mapComponentParameters(
   };
 }
 
+function mapComponentParameterType(
+  param: ComponentParameter,
+): ObjectTypePropertySignature {
+  const typeAnnotation =
+    param.local.type === 'AssignmentPattern'
+      ? param.local.left.typeAnnotation
+      : param.local.typeAnnotation;
+  const optional =
+    param.local.type === 'AssignmentPattern'
+      ? true
+      : param.local.type === 'Identifier'
+      ? param.local.optional
+      : false;
+
+  return {
+    type: 'ObjectTypeProperty',
+    key: shallowCloneNode(param.name),
+    value: typeAnnotation?.typeAnnotation ?? {
+      type: 'AnyTypeAnnotation',
+      loc: param.local.loc,
+      range: param.local.range,
+      parent: EMPTY_PARENT,
+    },
+    kind: 'init',
+    optional,
+    method: false,
+    static: false,
+    proto: false,
+    variance: null,
+    loc: param.local.loc,
+    range: param.local.range,
+    parent: EMPTY_PARENT,
+  };
+}
+
+function mapComponentParameterRestElementType(
+  param: RestElement,
+): ObjectTypeSpreadProperty {
+  if (
+    param.argument.type !== 'Identifier' &&
+    param.argument.type !== 'ObjectPattern'
+  ) {
+    throw createSyntaxError(
+      param,
+      `Invalid ${param.argument.type} encountered in restParameter`,
+    );
+  }
+  return {
+    type: 'ObjectTypeSpreadProperty',
+    argument: param.argument.typeAnnotation?.typeAnnotation ?? {
+      type: 'AnyTypeAnnotation',
+      loc: param.loc,
+      range: param.range,
+      parent: EMPTY_PARENT,
+    },
+    loc: param.loc,
+    range: param.range,
+    parent: EMPTY_PARENT,
+  };
+}
+
 function mapComponentParameter(
   param: ComponentParameter | RestElement,
 ): Array<DestructuringObjectProperty | RestElement> {

package/dist/traverse/getVisitorKeys.js

@@ -19,6 +19,7 @@ var _ESTreeVisitorKeys = _interopRequireDefault(require("../generated/ESTreeVisi
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+// $FlowFixMe[deprecated-type]
 function isNode(thing) {
   return typeof thing === 'object' && thing != null && typeof thing.type === 'string';
 }

package/dist/traverse/getVisitorKeys.js.flow

@@ -15,6 +15,7 @@ import type {VisitorKeys as VisitorKeysType} from '../generated/ESTreeVisitorKey
 
 import FlowVisitorKeys from '../generated/ESTreeVisitorKeys';
 
+// $FlowFixMe[deprecated-type]
 export function isNode(thing: mixed): boolean %checks {
   return (
     typeof thing === 'object' && thing != null && typeof thing.type === 'string'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hermes-parser",
-  "version": "0.18.0",
+  "version": "0.18.2",
   "description": "A JavaScript parser built from the Hermes engine",
   "main": "dist/index.js",
   "license": "MIT",
@@ -9,7 +9,7 @@
     "url": "git@github.com:facebook/hermes.git"
   },
   "dependencies": {
-    "hermes-estree": "0.18.0"
+    "hermes-estree": "0.18.2"
   },
   "devDependencies": {
     "@babel/parser": "7.7.4",