Skip to content

Extracted TypeDeclarationMap from flow and typescript to a common file parsers/utils.js #34951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vinayharwani13 wants to merge 1 commit into from
Closed

Extracted TypeDeclarationMap from flow and typescript to a common file parsers/utils.js #34951

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/parsers/flow/components/commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import type {
NamedShape,
CommandTypeAnnotation,
} from '../../../CodegenSchema.js';
import type {TypeDeclarationMap} from '../utils.js';
import type {TypeDeclarationMap} from '../../utils';

const {getValueFromTypes} = require('../utils.js');

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/parsers/flow/components/componentsUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
'use strict';

import type {ASTNode} from '../utils';
import type {TypeDeclarationMap} from '../utils.js';
import type {NamedShape} from '../../../CodegenSchema.js';
const {getValueFromTypes} = require('../utils.js');
import type {TypeDeclarationMap} from '../../utils';

function getProperties(
typeName: string,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/parsers/flow/components/extends.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'use strict';

import type {ExtendsPropsShape} from '../../../CodegenSchema.js';
import type {TypeDeclarationMap} from '../utils.js';
import type {TypeDeclarationMap} from '../../utils';

function extendsForProp(prop: PropsAST, types: TypeDeclarationMap) {
if (!prop.argument) {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/parsers/flow/components/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

'use strict';
import type {TypeDeclarationMap} from '../utils';
import type {TypeDeclarationMap} from '../../utils';
import type {CommandOptions} from './options';
import type {ComponentSchemaBuilderConfig} from './schema.js';

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/parsers/flow/components/props.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const {
} = require('./componentsUtils.js');

import type {NamedShape, PropTypeAnnotation} from '../../../CodegenSchema.js';
import type {TypeDeclarationMap} from '../utils.js';
import type {TypeDeclarationMap} from '../../utils';

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/parsers/flow/components/states.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const {
} = require('./componentsUtils.js');

import type {StateTypeAnnotation, NamedShape} from '../../../CodegenSchema.js';
import type {TypeDeclarationMap} from '../utils.js';
import type {TypeDeclarationMap} from '../../utils';

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;
Expand Down
3 changes: 1 addition & 2 deletions packages/react-native-codegen/src/parsers/flow/modules/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ import type {
Nullable,
} from '../../../CodegenSchema.js';

import type {TypeDeclarationMap} from '../utils.js';
import type {ParserErrorCapturer} from '../../utils';
import type {ParserErrorCapturer, TypeDeclarationMap} from '../../utils';
import type {NativeModuleTypeAnnotation} from '../../../CodegenSchema.js';

const {
Expand Down
3 changes: 1 addition & 2 deletions packages/react-native-codegen/src/parsers/flow/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'use strict';

import type {TypeAliasResolutionStatus} from '../utils';
import type {TypeAliasResolutionStatus, TypeDeclarationMap} from '../utils';

/**
* This FlowFixMe is supposed to refer to an InterfaceDeclaration or TypeAlias
Expand All @@ -20,7 +20,6 @@ import type {TypeAliasResolutionStatus} from '../utils';
*
* TODO(T71778680): Flow type AST Nodes
*/
export type TypeDeclarationMap = {[declarationName: string]: $FlowFixMe};

function getTypes(ast: $FlowFixMe): TypeDeclarationMap {
return ast.body.reduce((types, node) => {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/parsers/typescript/components/commands.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import type {
NamedShape,
CommandTypeAnnotation,
} from '../../../CodegenSchema.js';
import type {TypeDeclarationMap} from '../utils.js';
import type {TypeDeclarationMap} from '../../utils';
const {parseTopLevelType} = require('../parseTopLevelType');

type EventTypeAST = Object;
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/parsers/typescript/components/componentsUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@

'use strict';
import type {ASTNode} from '../utils';
import type {TypeDeclarationMap} from '../utils.js';
import type {NamedShape} from '../../../CodegenSchema.js';
const {parseTopLevelType} = require('../parseTopLevelType');
import type {TypeDeclarationMap} from '../../utils';

function getProperties(
typeName: string,
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/parsers/typescript/components/events.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import type {
NamedShape,
EventTypeAnnotation,
} from '../../../CodegenSchema.js';
import type {TypeDeclarationMap} from '../../utils';
const {flattenProperties} = require('./componentsUtils');
const {parseTopLevelType} = require('../parseTopLevelType');
import type {TypeDeclarationMap} from '../utils.js';

function getPropertyType(
/* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/parsers/typescript/components/extends.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'use strict';

import type {ExtendsPropsShape} from '../../../CodegenSchema.js';
import type {TypeDeclarationMap} from '../utils.js';
import type {TypeDeclarationMap} from '../../utils';

function extendsForProp(prop: PropsAST, types: TypeDeclarationMap) {
if (!prop.expression) {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/parsers/typescript/components/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*/

'use strict';
import type {TypeDeclarationMap} from '../utils';
import type {TypeDeclarationMap} from '../../utils';
import type {CommandOptions} from './options';
import type {ComponentSchemaBuilderConfig} from './schema.js';

Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/parsers/typescript/components/props.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const {
} = require('./componentsUtils.js');

import type {NamedShape, PropTypeAnnotation} from '../../../CodegenSchema.js';
import type {TypeDeclarationMap} from '../utils.js';
import type {TypeDeclarationMap} from '../../utils';

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/parsers/typescript/components/states.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const {
} = require('./componentsUtils.js');

import type {StateTypeAnnotation, NamedShape} from '../../../CodegenSchema.js';
import type {TypeDeclarationMap} from '../utils.js';
import type {TypeDeclarationMap} from '../../utils';

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;
Expand Down
3 changes: 1 addition & 2 deletions packages/react-native-codegen/src/parsers/typescript/modules/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ import type {
Nullable,
} from '../../../CodegenSchema.js';

import type {TypeDeclarationMap} from '../utils.js';
import type {ParserErrorCapturer} from '../../utils';
import type {ParserErrorCapturer, TypeDeclarationMap} from '../../utils';
import type {NativeModuleTypeAnnotation} from '../../../CodegenSchema.js';

const {
Expand Down
2 changes: 1 addition & 1 deletion packages/react-native-codegen/src/parsers/typescript/parseTopLevelType.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

'use strict';

import type {TypeDeclarationMap} from './utils.js';
import type {TypeDeclarationMap} from '../utils';

export type LegalDefaultValues = string | number | boolean | null;

Expand Down
3 changes: 1 addition & 2 deletions packages/react-native-codegen/src/parsers/typescript/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,13 @@

'use strict';

import type {TypeAliasResolutionStatus} from '../utils';
import type {TypeAliasResolutionStatus, TypeDeclarationMap} from '../utils';

const {parseTopLevelType} = require('./parseTopLevelType');

/**
* TODO(T108222691): Use flow-types for @babel/parser
*/
export type TypeDeclarationMap = {[declarationName: string]: $FlowFixMe};

function getTypes(ast: $FlowFixMe): TypeDeclarationMap {
return ast.body.reduce((types, node) => {
Expand Down
2 changes: 2 additions & 0 deletions packages/react-native-codegen/src/parsers/utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ const {ParserError} = require('./errors');

const path = require('path');

export type TypeDeclarationMap = {[declarationName: string]: $FlowFixMe};

export type TypeAliasResolutionStatus =
| $ReadOnly<{
successful: true,
Expand Down