[Codegen 94] move extendsForProp into parsers-commons#37052

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
siddarthkay wants to merge 1 commit into from
Closed

[Codegen 94] move extendsForProp into parsers-commons#37052

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
5 changes: 1 addition & 4 deletions packages/react-native-codegen/src/parsers/flow/components/componentsUtils.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
import type {ASTNode} from '../utils';
import type {NamedShape} from '../../../CodegenSchema.js';
const {getValueFromTypes} = require('../utils.js');
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';

function getProperties(
typeName: string,
Expand DownExpand Up@@ -499,9 +499,6 @@ function getSchemaInfo(
};
}

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;

module.exports = {
getProperties,
getSchemaInfo,
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 numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ function buildComponentSchema(

const propProperties = getProperties(propsTypeName, types);
const commandProperties = getCommandProperties(ast, parser);
const {extendsProps, props} = getProps(propProperties, types);
const {extendsProps, props} = getProps(propProperties, types, parser);

const options = getOptions(optionsExpression);
const events = getEvents(propProperties, types, parser);
Expand Down
23 changes: 13 additions & 10 deletions packages/react-native-codegen/src/parsers/flow/components/props.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,17 +15,15 @@ import type {
NamedShape,
PropTypeAnnotation,
} from '../../../CodegenSchema.js';
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';
import type {Parser} from '../../parser';

const {
flattenProperties,
getSchemaInfo,
getTypeAnnotation,
} = require('./componentsUtils.js');

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;

type ExtendsForProp = null | {
type: 'ReactNativeBuiltInType',
knownTypeName: 'ReactNativeCoreViewProps',
Expand DownExpand Up@@ -58,11 +56,13 @@ function buildPropSchema(
function extendsForProp(
prop: PropAST,
types: TypeDeclarationMap,
parser: Parser,
): ExtendsForProp {
if (!prop.argument) {
const argument = parser.argumentForProp(prop);
if (argument) {

@rshestrshestApr 26, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This now does exactly the opposite of what it used/supposed to do :)

It should instead be:

if (!argument) {

Otherwise this would break codegen completely, at least on our internal tests.

I am surprised, though, that CI on Github didn't catch this (the only failed test seems inside the app template and is unrelated).

I think we need a follow-up on that, CC @cipolleschi

@siddarthkay - note that I fixed this internally myself this time, to save one extra back and forth, but normally that would be your responsibility :)

@siddarthkaysiddarthkayApr 26, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @rshest ! This is probably the outcome of resolving multiple rebase conflicts. Thanks for catching and fixing it ❤️

@Pranav-yadavPranav-yadavApr 26, 2023•
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am surprised, though, that CI on Github didn't catch this (the only failed test seems inside the app template and is unrelated).

I think, those files don't have tests, but, other tests should have been failed; or may be the current test-suite doesn't test this specific case 🤔

console.log('null', prop);
}
const name = prop.argument.id.name;
const name = parser.nameForArgument(prop);

if (types[name] != null) {
// This type is locally defined in the file
Expand All@@ -84,21 +84,23 @@ function extendsForProp(
function removeKnownExtends(
typeDefinition: $ReadOnlyArray<PropAST>,
types: TypeDeclarationMap,
parser: Parser,
): $ReadOnlyArray<PropAST> {
return typeDefinition.filter(
prop =>
prop.type !== 'ObjectTypeSpreadProperty' ||
extendsForProp(prop, types) === null,
extendsForProp(prop, types, parser) === null,
);
}

function getExtendsProps(
typeDefinition: $ReadOnlyArray<PropAST>,
types: TypeDeclarationMap,
parser: Parser,
): $ReadOnlyArray<ExtendsPropsShape> {
return typeDefinition
.filter(prop => prop.type === 'ObjectTypeSpreadProperty')
.map(prop => extendsForProp(prop, types))
.map(prop => extendsForProp(prop, types, parser))
.filter(Boolean);
}
/**
Expand All@@ -108,18 +110,19 @@ function getExtendsProps(
function getProps(
typeDefinition: $ReadOnlyArray<PropAST>,
types: TypeDeclarationMap,
parser: Parser,
): {
props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
extendsProps: $ReadOnlyArray<ExtendsPropsShape>,
} {
const nonExtendsProps = removeKnownExtends(typeDefinition, types);
const nonExtendsProps = removeKnownExtends(typeDefinition, types, parser);
const props = flattenProperties(nonExtendsProps, types)
.map(property => buildPropSchema(property, types))
.filter(Boolean);

return {
props,
extendsProps: getExtendsProps(typeDefinition, types),
extendsProps: getExtendsProps(typeDefinition, types, parser),
};
}

Expand Down
10 changes: 9 additions & 1 deletion packages/react-native-codegen/src/parsers/flow/parser.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
} from '../../CodegenSchema';
import type {ParserType} from '../errors';
import type {Parser} from '../parser';
import type {ParserErrorCapturer, TypeDeclarationMap} from '../utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from '../utils';

const {flowTranslateTypeAnnotation} = require('./modules');

Expand DownExpand Up@@ -329,6 +329,14 @@ class FlowParser implements Parser {
convertKeywordToTypeAnnotation(keyword: string): string {
return keyword;
}

argumentForProp(prop: PropAST): $FlowFixMe {
return prop.argument;
}

nameForArgument(prop: PropAST): $FlowFixMe {
return prop.argument.id.name;
}
}

module.exports = {
Expand Down
16 changes: 15 additions & 1 deletion packages/react-native-codegen/src/parsers/parser.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import type {
NativeModuleEnumMap,
} from '../CodegenSchema';
import type {ParserType} from './errors';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from './utils';

/**
* This is the main interface for Parsers of various languages.
Expand DownExpand Up@@ -255,4 +255,18 @@ export interface Parser {
* @returns: converted TypeAnnotation to Keywords
*/
convertKeywordToTypeAnnotation(keyword: string): string;

/**
* Given a prop return its arguments.
* @parameter prop
* @returns: Arguments of the prop
*/
argumentForProp(prop: PropAST): $FlowFixMe;

/**
* Given a prop return its name.
* @parameter prop
* @returns: name property
*/
nameForArgument(prop: PropAST): $FlowFixMe;
}
10 changes: 9 additions & 1 deletion packages/react-native-codegen/src/parsers/parserMock.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
NativeModuleAliasMap,
NativeModuleEnumMap,
} from '../CodegenSchema';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, PropAST, TypeDeclarationMap} from './utils';

// $FlowFixMe[untyped-import] there's no flowtype flow-parser
const flowParser = require('flow-parser');
Expand DownExpand Up@@ -243,4 +243,12 @@ export class MockedParser implements Parser {
convertKeywordToTypeAnnotation(keyword: string): string {
return keyword;
}

argumentForProp(prop: PropAST): $FlowFixMe {
return prop.expression;
}

nameForArgument(prop: PropAST): $FlowFixMe {
return prop.expression.name;
}
}
38 changes: 37 additions & 1 deletion packages/react-native-codegen/src/parsers/parsers-commons.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ import type {

import type {Parser} from './parser';
import type {ParserType} from './errors';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from './utils';
import type {ComponentSchemaBuilderConfig} from './schema.js';

const {
Expand DownExpand Up@@ -69,6 +69,11 @@ export type CommandOptions = $ReadOnly<{
// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
type OptionsAST = Object;

type ExtendedPropResult = {
type: 'ReactNativeBuiltInType',
knownTypeName: 'ReactNativeCoreViewProps',
} | null;

function wrapModuleSchema(
nativeModuleSchema: NativeModuleSchema,
hasteModuleName: string,
Expand DownExpand Up@@ -817,6 +822,36 @@ function propertyNames(
.filter(Boolean);
}

function extendsForProp(
prop: PropAST,
types: TypeDeclarationMap,
parser: Parser,
): ExtendedPropResult {
const argument = parser.argumentForProp(prop);

if (!argument) {
console.log('null', prop);
}

const name = parser.nameForArgument(prop);

if (types[name] != null) {
// This type is locally defined in the file
return null;
}

switch (name) {
case 'ViewProps':
return {
type: 'ReactNativeBuiltInType',
knownTypeName: 'ReactNativeCoreViewProps',
};
default: {
throw new Error(`Unable to handle prop spread: ${name}`);
}
}
}

module.exports = {
wrapModuleSchema,
unwrapNullable,
Expand All@@ -836,4 +871,5 @@ module.exports = {
getCommandOptions,
getOptions,
getCommandTypeNameAndOptionsExpression,
extendsForProp,
};
5 changes: 1 addition & 4 deletions packages/react-native-codegen/src/parsers/typescript/components/componentsUtils.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ const {
parseTopLevelType,
flattenIntersectionType,
} = require('../parseTopLevelType');
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';

function getProperties(
typeName: string,
Expand DownExpand Up@@ -463,9 +463,6 @@ function getSchemaInfo(
};
}

// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
type PropAST = Object;

function verifyPropNotAlreadyDefined(
props: $ReadOnlyArray<PropAST>,
needleProp: PropAST,
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 numberDiff line numberDiff line change
Expand Up@@ -135,7 +135,7 @@ function buildComponentSchema(

const componentEventAsts: Array<PropsAST> = [];
categorizeProps(propProperties, types, componentEventAsts);
const {props, extendsProps} = getProps(propProperties, types);
const {props, extendsProps} = getProps(propProperties, types, parser);
const events = getEvents(componentEventAsts, types, parser);
const commands = getCommands(commandProperties, types);

Expand Down
34 changes: 6 additions & 28 deletions packages/react-native-codegen/src/parsers/typescript/components/props.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,17 +9,17 @@
*/

'use strict';

const {getSchemaInfo, getTypeAnnotation} = require('./componentsUtils.js');

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

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

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;
const {extendsForProp} = require('../../parsers-commons');

function buildPropSchema(
property: PropAST,
Expand DownExpand Up@@ -59,32 +59,10 @@ function isProp(name: string, typeAnnotation: $FlowFixMe): boolean {
return !isStyle;
}

function extendsForProp(prop: PropAST, types: TypeDeclarationMap) {
if (!prop.expression) {
console.log('null', prop);
}
const name = prop.expression.name;

if (types[name] != null) {
// This type is locally defined in the file
return null;
}

switch (name) {
case 'ViewProps':
return {
type: 'ReactNativeBuiltInType',
knownTypeName: 'ReactNativeCoreViewProps',
};
default: {
throw new Error(`Unable to handle prop spread: ${name}`);
}
}
}

function getProps(
typeDefinition: $ReadOnlyArray<PropAST>,
types: TypeDeclarationMap,
parser: Parser,
): {
props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
extendsProps: $ReadOnlyArray<ExtendsPropsShape>,
Expand All@@ -96,7 +74,7 @@ function getProps(
for (const prop of typeDefinition) {
// find extends
if (prop.type === 'TSExpressionWithTypeArguments') {
const extend = extendsForProp(prop, types);
const extend = extendsForProp(prop, types, parser);
if (extend) {
extendsProps.push(extend);
continue;
Expand Down
10 changes: 9 additions & 1 deletion packages/react-native-codegen/src/parsers/typescript/parser.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
} from '../../CodegenSchema';
import type {ParserType} from '../errors';
import type {Parser} from '../parser';
import type {ParserErrorCapturer, TypeDeclarationMap} from '../utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from '../utils';

const {typeScriptTranslateTypeAnnotation} = require('./modules');

Expand DownExpand Up@@ -328,6 +328,14 @@ class TypeScriptParser implements Parser {

return keyword;
}

argumentForProp(prop: PropAST): $FlowFixMe {
return prop.expression;
}

nameForArgument(prop: PropAST): $FlowFixMe {
return prop.expression.name;
}
}

module.exports = {
Expand Down
3 changes: 3 additions & 0 deletions packages/react-native-codegen/src/parsers/utils.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,9 @@ function extractNativeModuleName(filename: string): string {

export type ParserErrorCapturer = <T>(fn: () => T) => ?T;

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
export type PropAST = Object;

function createParserErrorCapturer(): [
Array<ParserError>,
ParserErrorCapturer,
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[Codegen 94] move extendsForProp into parsers-commons#37052

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

siddarthkay
wants to merge
1
commit into

from

 Closed


[Codegen 94] move extendsForProp into parsers-commons#37052
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


5 changes: 1 addition & 4 deletions
packages/react-native-codegen/src/parsers/flow/components/componentsUtils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
import type {ASTNode} from '../utils';
import type {NamedShape} from '../../../CodegenSchema.js';
const {getValueFromTypes} = require('../utils.js');
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';

function getProperties(
 typeName: string,
Expand DownExpand Up@@ -499,9 +499,6 @@ function getSchemaInfo(
 };
}

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;

module.exports = {
 getProperties,
 getSchemaInfo,
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 numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ function buildComponentSchema(

 const propProperties = getProperties(propsTypeName, types);
 const commandProperties = getCommandProperties(ast, parser);
 const {extendsProps, props} = getProps(propProperties, types);
 const {extendsProps, props} = getProps(propProperties, types, parser);

 const options = getOptions(optionsExpression);
 const events = getEvents(propProperties, types, parser);
Expand Down

23 changes: 13 additions & 10 deletions
packages/react-native-codegen/src/parsers/flow/components/props.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,17 +15,15 @@ import type {
 NamedShape,
 PropTypeAnnotation,
} from '../../../CodegenSchema.js';
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';
import type {Parser} from '../../parser';

const {
 flattenProperties,
 getSchemaInfo,
 getTypeAnnotation,
} = require('./componentsUtils.js');

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;

type ExtendsForProp = null | {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
Expand DownExpand Up@@ -58,11 +56,13 @@ function buildPropSchema(
function extendsForProp(
 prop: PropAST,
 types: TypeDeclarationMap,
 parser: Parser,
): ExtendsForProp {
 if (!prop.argument) {
 const argument = parser.argumentForProp(prop);
 if (argument) {
@rshestrshestApr 26, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This now does exactly the opposite of what it used/supposed to do :)
It should instead be:
if (!argument) {

Otherwise this would break codegen completely, at least on our internal tests.
I am surprised, though, that CI on Github didn't catch this (the only failed test seems inside the app template and is unrelated).
I think we need a follow-up on that, CC @cipolleschi
@siddarthkay - note that I fixed this internally myself this time, to save one extra back and forth, but normally that would be your responsibility :)
@siddarthkaysiddarthkayApr 26, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @rshest ! This is probably the outcome of resolving multiple rebase conflicts. Thanks for catching and fixing it ❤️
@Pranav-yadavPranav-yadavApr 26, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am surprised, though, that CI on Github didn't catch this (the only failed test seems inside the app template and is unrelated).
I think, those files don't have tests, but, other tests should have been failed; or may be the current test-suite doesn't test this specific case 🤔
 console.log('null', prop);
 }
 const name = prop.argument.id.name;
 const name = parser.nameForArgument(prop);

 if (types[name] != null) {
 // This type is locally defined in the file
Expand All@@ -84,21 +84,23 @@ function extendsForProp(
function removeKnownExtends(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): $ReadOnlyArray<PropAST> {
 return typeDefinition.filter(
 prop =>
 prop.type !== 'ObjectTypeSpreadProperty' ||
 extendsForProp(prop, types) === null,
 extendsForProp(prop, types, parser) === null,
 );
}

function getExtendsProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): $ReadOnlyArray<ExtendsPropsShape> {
 return typeDefinition
 .filter(prop => prop.type === 'ObjectTypeSpreadProperty')
 .map(prop => extendsForProp(prop, types))
 .map(prop => extendsForProp(prop, types, parser))
 .filter(Boolean);
}
/**
Expand All@@ -108,18 +110,19 @@ function getExtendsProps(
function getProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): {
 props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
 extendsProps: $ReadOnlyArray<ExtendsPropsShape>,
} {
 const nonExtendsProps = removeKnownExtends(typeDefinition, types);
 const nonExtendsProps = removeKnownExtends(typeDefinition, types, parser);
 const props = flattenProperties(nonExtendsProps, types)
 .map(property => buildPropSchema(property, types))
 .filter(Boolean);

 return {
 props,
 extendsProps: getExtendsProps(typeDefinition, types),
 extendsProps: getExtendsProps(typeDefinition, types, parser),
 };
}

Expand Down

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/flow/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
} from '../../CodegenSchema';
import type {ParserType} from '../errors';
import type {Parser} from '../parser';
import type {ParserErrorCapturer, TypeDeclarationMap} from '../utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from '../utils';

const {flowTranslateTypeAnnotation} = require('./modules');

Expand DownExpand Up@@ -329,6 +329,14 @@ class FlowParser implements Parser {
 convertKeywordToTypeAnnotation(keyword: string): string {
 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.argument;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.argument.id.name;
 }
}

module.exports = {
Expand Down

16 changes: 15 additions & 1 deletion
packages/react-native-codegen/src/parsers/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import type {
 NativeModuleEnumMap,
} from '../CodegenSchema';
import type {ParserType} from './errors';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from './utils';

/**
 * This is the main interface for Parsers of various languages.
Expand DownExpand Up@@ -255,4 +255,18 @@ export interface Parser {
 * @returns: converted TypeAnnotation to Keywords
 */
 convertKeywordToTypeAnnotation(keyword: string): string;

 /**
 * Given a prop return its arguments.
 * @parameter prop
 * @returns: Arguments of the prop
 */
 argumentForProp(prop: PropAST): $FlowFixMe;

 /**
 * Given a prop return its name.
 * @parameter prop
 * @returns: name property
 */
 nameForArgument(prop: PropAST): $FlowFixMe;
}

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/parserMock.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
 NativeModuleAliasMap,
 NativeModuleEnumMap,
} from '../CodegenSchema';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, PropAST, TypeDeclarationMap} from './utils';

// $FlowFixMe[untyped-import] there's no flowtype flow-parser
const flowParser = require('flow-parser');
Expand DownExpand Up@@ -243,4 +243,12 @@ export class MockedParser implements Parser {
 convertKeywordToTypeAnnotation(keyword: string): string {
 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.expression;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.expression.name;
 }
}

38 changes: 37 additions & 1 deletion
packages/react-native-codegen/src/parsers/parsers-commons.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ import type {

import type {Parser} from './parser';
import type {ParserType} from './errors';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from './utils';
import type {ComponentSchemaBuilderConfig} from './schema.js';

const {
Expand DownExpand Up@@ -69,6 +69,11 @@ export type CommandOptions = $ReadOnly<{
// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
type OptionsAST = Object;

type ExtendedPropResult = {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
} | null;

function wrapModuleSchema(
 nativeModuleSchema: NativeModuleSchema,
 hasteModuleName: string,
Expand DownExpand Up@@ -817,6 +822,36 @@ function propertyNames(
 .filter(Boolean);
}

function extendsForProp(
 prop: PropAST,
 types: TypeDeclarationMap,
 parser: Parser,
): ExtendedPropResult {
 const argument = parser.argumentForProp(prop);

 if (!argument) {
 console.log('null', prop);
 }

 const name = parser.nameForArgument(prop);

 if (types[name] != null) {
 // This type is locally defined in the file
 return null;
 }

 switch (name) {
 case 'ViewProps':
 return {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
 };
 default: {
 throw new Error(`Unable to handle prop spread: ${name}`);
 }
 }
}

module.exports = {
 wrapModuleSchema,
 unwrapNullable,
Expand All@@ -836,4 +871,5 @@ module.exports = {
 getCommandOptions,
 getOptions,
 getCommandTypeNameAndOptionsExpression,
 extendsForProp,
};

5 changes: 1 addition & 4 deletions
packages/react-native-codegen/src/parsers/typescript/components/componentsUtils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ const {
 parseTopLevelType,
 flattenIntersectionType,
} = require('../parseTopLevelType');
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';

function getProperties(
 typeName: string,
Expand DownExpand Up@@ -463,9 +463,6 @@ function getSchemaInfo(
 };
}

// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
type PropAST = Object;

function verifyPropNotAlreadyDefined(
 props: $ReadOnlyArray<PropAST>,
 needleProp: PropAST,
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 numberDiff line numberDiff line change
Expand Up@@ -135,7 +135,7 @@ function buildComponentSchema(

 const componentEventAsts: Array<PropsAST> = [];
 categorizeProps(propProperties, types, componentEventAsts);
 const {props, extendsProps} = getProps(propProperties, types);
 const {props, extendsProps} = getProps(propProperties, types, parser);
 const events = getEvents(componentEventAsts, types, parser);
 const commands = getCommands(commandProperties, types);

Expand Down

34 changes: 6 additions & 28 deletions
packages/react-native-codegen/src/parsers/typescript/components/props.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,17 +9,17 @@
 */

'use strict';

const {getSchemaInfo, getTypeAnnotation} = require('./componentsUtils.js');

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

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

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;
const {extendsForProp} = require('../../parsers-commons');

function buildPropSchema(
 property: PropAST,
Expand DownExpand Up@@ -59,32 +59,10 @@ function isProp(name: string, typeAnnotation: $FlowFixMe): boolean {
 return !isStyle;
}

function extendsForProp(prop: PropAST, types: TypeDeclarationMap) {
 if (!prop.expression) {
 console.log('null', prop);
 }
 const name = prop.expression.name;

 if (types[name] != null) {
 // This type is locally defined in the file
 return null;
 }

 switch (name) {
 case 'ViewProps':
 return {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
 };
 default: {
 throw new Error(`Unable to handle prop spread: ${name}`);
 }
 }
}

function getProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): {
 props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
 extendsProps: $ReadOnlyArray<ExtendsPropsShape>,
Expand All@@ -96,7 +74,7 @@ function getProps(
 for (const prop of typeDefinition) {
 // find extends
 if (prop.type === 'TSExpressionWithTypeArguments') {
 const extend = extendsForProp(prop, types);
 const extend = extendsForProp(prop, types, parser);
 if (extend) {
 extendsProps.push(extend);
 continue;
Expand Down

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/typescript/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
} from '../../CodegenSchema';
import type {ParserType} from '../errors';
import type {Parser} from '../parser';
import type {ParserErrorCapturer, TypeDeclarationMap} from '../utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from '../utils';

const {typeScriptTranslateTypeAnnotation} = require('./modules');

Expand DownExpand Up@@ -328,6 +328,14 @@ class TypeScriptParser implements Parser {

 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.expression;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.expression.name;
 }
}

module.exports = {
Expand Down

3 changes: 3 additions & 0 deletions
packages/react-native-codegen/src/parsers/utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,9 @@ function extractNativeModuleName(filename: string): string {

export type ParserErrorCapturer = <T>(fn: () => T) => ?T;

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
export type PropAST = Object;

function createParserErrorCapturer(): [
 Array<ParserError>,
 ParserErrorCapturer,
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Codegen 94] move extendsForProp into parsers-commons#37052

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

siddarthkay
wants to merge
1
commit into

from

 Closed


[Codegen 94] move extendsForProp into parsers-commons#37052
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


5 changes: 1 addition & 4 deletions
packages/react-native-codegen/src/parsers/flow/components/componentsUtils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
import type {ASTNode} from '../utils';
import type {NamedShape} from '../../../CodegenSchema.js';
const {getValueFromTypes} = require('../utils.js');
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';

function getProperties(
 typeName: string,
Expand DownExpand Up@@ -499,9 +499,6 @@ function getSchemaInfo(
 };
}

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;

module.exports = {
 getProperties,
 getSchemaInfo,
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 numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ function buildComponentSchema(

 const propProperties = getProperties(propsTypeName, types);
 const commandProperties = getCommandProperties(ast, parser);
 const {extendsProps, props} = getProps(propProperties, types);
 const {extendsProps, props} = getProps(propProperties, types, parser);

 const options = getOptions(optionsExpression);
 const events = getEvents(propProperties, types, parser);
Expand Down

23 changes: 13 additions & 10 deletions
packages/react-native-codegen/src/parsers/flow/components/props.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,17 +15,15 @@ import type {
 NamedShape,
 PropTypeAnnotation,
} from '../../../CodegenSchema.js';
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';
import type {Parser} from '../../parser';

const {
 flattenProperties,
 getSchemaInfo,
 getTypeAnnotation,
} = require('./componentsUtils.js');

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;

type ExtendsForProp = null | {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
Expand DownExpand Up@@ -58,11 +56,13 @@ function buildPropSchema(
function extendsForProp(
 prop: PropAST,
 types: TypeDeclarationMap,
 parser: Parser,
): ExtendsForProp {
 if (!prop.argument) {
 const argument = parser.argumentForProp(prop);
 if (argument) {
@rshestrshestApr 26, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This now does exactly the opposite of what it used/supposed to do :)
It should instead be:
if (!argument) {

Otherwise this would break codegen completely, at least on our internal tests.
I am surprised, though, that CI on Github didn't catch this (the only failed test seems inside the app template and is unrelated).
I think we need a follow-up on that, CC @cipolleschi
@siddarthkay - note that I fixed this internally myself this time, to save one extra back and forth, but normally that would be your responsibility :)
@siddarthkaysiddarthkayApr 26, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @rshest ! This is probably the outcome of resolving multiple rebase conflicts. Thanks for catching and fixing it ❤️
@Pranav-yadavPranav-yadavApr 26, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am surprised, though, that CI on Github didn't catch this (the only failed test seems inside the app template and is unrelated).
I think, those files don't have tests, but, other tests should have been failed; or may be the current test-suite doesn't test this specific case 🤔
 console.log('null', prop);
 }
 const name = prop.argument.id.name;
 const name = parser.nameForArgument(prop);

 if (types[name] != null) {
 // This type is locally defined in the file
Expand All@@ -84,21 +84,23 @@ function extendsForProp(
function removeKnownExtends(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): $ReadOnlyArray<PropAST> {
 return typeDefinition.filter(
 prop =>
 prop.type !== 'ObjectTypeSpreadProperty' ||
 extendsForProp(prop, types) === null,
 extendsForProp(prop, types, parser) === null,
 );
}

function getExtendsProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): $ReadOnlyArray<ExtendsPropsShape> {
 return typeDefinition
 .filter(prop => prop.type === 'ObjectTypeSpreadProperty')
 .map(prop => extendsForProp(prop, types))
 .map(prop => extendsForProp(prop, types, parser))
 .filter(Boolean);
}
/**
Expand All@@ -108,18 +110,19 @@ function getExtendsProps(
function getProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): {
 props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
 extendsProps: $ReadOnlyArray<ExtendsPropsShape>,
} {
 const nonExtendsProps = removeKnownExtends(typeDefinition, types);
 const nonExtendsProps = removeKnownExtends(typeDefinition, types, parser);
 const props = flattenProperties(nonExtendsProps, types)
 .map(property => buildPropSchema(property, types))
 .filter(Boolean);

 return {
 props,
 extendsProps: getExtendsProps(typeDefinition, types),
 extendsProps: getExtendsProps(typeDefinition, types, parser),
 };
}

Expand Down

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/flow/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
} from '../../CodegenSchema';
import type {ParserType} from '../errors';
import type {Parser} from '../parser';
import type {ParserErrorCapturer, TypeDeclarationMap} from '../utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from '../utils';

const {flowTranslateTypeAnnotation} = require('./modules');

Expand DownExpand Up@@ -329,6 +329,14 @@ class FlowParser implements Parser {
 convertKeywordToTypeAnnotation(keyword: string): string {
 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.argument;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.argument.id.name;
 }
}

module.exports = {
Expand Down

16 changes: 15 additions & 1 deletion
packages/react-native-codegen/src/parsers/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import type {
 NativeModuleEnumMap,
} from '../CodegenSchema';
import type {ParserType} from './errors';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from './utils';

/**
 * This is the main interface for Parsers of various languages.
Expand DownExpand Up@@ -255,4 +255,18 @@ export interface Parser {
 * @returns: converted TypeAnnotation to Keywords
 */
 convertKeywordToTypeAnnotation(keyword: string): string;

 /**
 * Given a prop return its arguments.
 * @parameter prop
 * @returns: Arguments of the prop
 */
 argumentForProp(prop: PropAST): $FlowFixMe;

 /**
 * Given a prop return its name.
 * @parameter prop
 * @returns: name property
 */
 nameForArgument(prop: PropAST): $FlowFixMe;
}

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/parserMock.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
 NativeModuleAliasMap,
 NativeModuleEnumMap,
} from '../CodegenSchema';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, PropAST, TypeDeclarationMap} from './utils';

// $FlowFixMe[untyped-import] there's no flowtype flow-parser
const flowParser = require('flow-parser');
Expand DownExpand Up@@ -243,4 +243,12 @@ export class MockedParser implements Parser {
 convertKeywordToTypeAnnotation(keyword: string): string {
 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.expression;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.expression.name;
 }
}

38 changes: 37 additions & 1 deletion
packages/react-native-codegen/src/parsers/parsers-commons.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ import type {

import type {Parser} from './parser';
import type {ParserType} from './errors';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from './utils';
import type {ComponentSchemaBuilderConfig} from './schema.js';

const {
Expand DownExpand Up@@ -69,6 +69,11 @@ export type CommandOptions = $ReadOnly<{
// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
type OptionsAST = Object;

type ExtendedPropResult = {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
} | null;

function wrapModuleSchema(
 nativeModuleSchema: NativeModuleSchema,
 hasteModuleName: string,
Expand DownExpand Up@@ -817,6 +822,36 @@ function propertyNames(
 .filter(Boolean);
}

function extendsForProp(
 prop: PropAST,
 types: TypeDeclarationMap,
 parser: Parser,
): ExtendedPropResult {
 const argument = parser.argumentForProp(prop);

 if (!argument) {
 console.log('null', prop);
 }

 const name = parser.nameForArgument(prop);

 if (types[name] != null) {
 // This type is locally defined in the file
 return null;
 }

 switch (name) {
 case 'ViewProps':
 return {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
 };
 default: {
 throw new Error(`Unable to handle prop spread: ${name}`);
 }
 }
}

module.exports = {
 wrapModuleSchema,
 unwrapNullable,
Expand All@@ -836,4 +871,5 @@ module.exports = {
 getCommandOptions,
 getOptions,
 getCommandTypeNameAndOptionsExpression,
 extendsForProp,
};

5 changes: 1 addition & 4 deletions
packages/react-native-codegen/src/parsers/typescript/components/componentsUtils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ const {
 parseTopLevelType,
 flattenIntersectionType,
} = require('../parseTopLevelType');
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';

function getProperties(
 typeName: string,
Expand DownExpand Up@@ -463,9 +463,6 @@ function getSchemaInfo(
 };
}

// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
type PropAST = Object;

function verifyPropNotAlreadyDefined(
 props: $ReadOnlyArray<PropAST>,
 needleProp: PropAST,
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 numberDiff line numberDiff line change
Expand Up@@ -135,7 +135,7 @@ function buildComponentSchema(

 const componentEventAsts: Array<PropsAST> = [];
 categorizeProps(propProperties, types, componentEventAsts);
 const {props, extendsProps} = getProps(propProperties, types);
 const {props, extendsProps} = getProps(propProperties, types, parser);
 const events = getEvents(componentEventAsts, types, parser);
 const commands = getCommands(commandProperties, types);

Expand Down

34 changes: 6 additions & 28 deletions
packages/react-native-codegen/src/parsers/typescript/components/props.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,17 +9,17 @@
 */

'use strict';

const {getSchemaInfo, getTypeAnnotation} = require('./componentsUtils.js');

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

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

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;
const {extendsForProp} = require('../../parsers-commons');

function buildPropSchema(
 property: PropAST,
Expand DownExpand Up@@ -59,32 +59,10 @@ function isProp(name: string, typeAnnotation: $FlowFixMe): boolean {
 return !isStyle;
}

function extendsForProp(prop: PropAST, types: TypeDeclarationMap) {
 if (!prop.expression) {
 console.log('null', prop);
 }
 const name = prop.expression.name;

 if (types[name] != null) {
 // This type is locally defined in the file
 return null;
 }

 switch (name) {
 case 'ViewProps':
 return {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
 };
 default: {
 throw new Error(`Unable to handle prop spread: ${name}`);
 }
 }
}

function getProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): {
 props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
 extendsProps: $ReadOnlyArray<ExtendsPropsShape>,
Expand All@@ -96,7 +74,7 @@ function getProps(
 for (const prop of typeDefinition) {
 // find extends
 if (prop.type === 'TSExpressionWithTypeArguments') {
 const extend = extendsForProp(prop, types);
 const extend = extendsForProp(prop, types, parser);
 if (extend) {
 extendsProps.push(extend);
 continue;
Expand Down

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/typescript/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
} from '../../CodegenSchema';
import type {ParserType} from '../errors';
import type {Parser} from '../parser';
import type {ParserErrorCapturer, TypeDeclarationMap} from '../utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from '../utils';

const {typeScriptTranslateTypeAnnotation} = require('./modules');

Expand DownExpand Up@@ -328,6 +328,14 @@ class TypeScriptParser implements Parser {

 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.expression;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.expression.name;
 }
}

module.exports = {
Expand Down

3 changes: 3 additions & 0 deletions
packages/react-native-codegen/src/parsers/utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,9 @@ function extractNativeModuleName(filename: string): string {

export type ParserErrorCapturer = <T>(fn: () => T) => ?T;

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
export type PropAST = Object;

function createParserErrorCapturer(): [
 Array<ParserError>,
 ParserErrorCapturer,
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Codegen 94] move extendsForProp into parsers-commons#37052

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

siddarthkay
wants to merge
1
commit into

from

 Closed


[Codegen 94] move extendsForProp into parsers-commons#37052
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


5 changes: 1 addition & 4 deletions
packages/react-native-codegen/src/parsers/flow/components/componentsUtils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
import type {ASTNode} from '../utils';
import type {NamedShape} from '../../../CodegenSchema.js';
const {getValueFromTypes} = require('../utils.js');
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';

function getProperties(
 typeName: string,
Expand DownExpand Up@@ -499,9 +499,6 @@ function getSchemaInfo(
 };
}

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;

module.exports = {
 getProperties,
 getSchemaInfo,
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 numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ function buildComponentSchema(

 const propProperties = getProperties(propsTypeName, types);
 const commandProperties = getCommandProperties(ast, parser);
 const {extendsProps, props} = getProps(propProperties, types);
 const {extendsProps, props} = getProps(propProperties, types, parser);

 const options = getOptions(optionsExpression);
 const events = getEvents(propProperties, types, parser);
Expand Down

23 changes: 13 additions & 10 deletions
packages/react-native-codegen/src/parsers/flow/components/props.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,17 +15,15 @@ import type {
 NamedShape,
 PropTypeAnnotation,
} from '../../../CodegenSchema.js';
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';
import type {Parser} from '../../parser';

const {
 flattenProperties,
 getSchemaInfo,
 getTypeAnnotation,
} = require('./componentsUtils.js');

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;

type ExtendsForProp = null | {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
Expand DownExpand Up@@ -58,11 +56,13 @@ function buildPropSchema(
function extendsForProp(
 prop: PropAST,
 types: TypeDeclarationMap,
 parser: Parser,
): ExtendsForProp {
 if (!prop.argument) {
 const argument = parser.argumentForProp(prop);
 if (argument) {
@rshestrshestApr 26, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This now does exactly the opposite of what it used/supposed to do :)
It should instead be:
if (!argument) {

Otherwise this would break codegen completely, at least on our internal tests.
I am surprised, though, that CI on Github didn't catch this (the only failed test seems inside the app template and is unrelated).
I think we need a follow-up on that, CC @cipolleschi
@siddarthkay - note that I fixed this internally myself this time, to save one extra back and forth, but normally that would be your responsibility :)
@siddarthkaysiddarthkayApr 26, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @rshest ! This is probably the outcome of resolving multiple rebase conflicts. Thanks for catching and fixing it ❤️
@Pranav-yadavPranav-yadavApr 26, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am surprised, though, that CI on Github didn't catch this (the only failed test seems inside the app template and is unrelated).
I think, those files don't have tests, but, other tests should have been failed; or may be the current test-suite doesn't test this specific case 🤔
 console.log('null', prop);
 }
 const name = prop.argument.id.name;
 const name = parser.nameForArgument(prop);

 if (types[name] != null) {
 // This type is locally defined in the file
Expand All@@ -84,21 +84,23 @@ function extendsForProp(
function removeKnownExtends(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): $ReadOnlyArray<PropAST> {
 return typeDefinition.filter(
 prop =>
 prop.type !== 'ObjectTypeSpreadProperty' ||
 extendsForProp(prop, types) === null,
 extendsForProp(prop, types, parser) === null,
 );
}

function getExtendsProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): $ReadOnlyArray<ExtendsPropsShape> {
 return typeDefinition
 .filter(prop => prop.type === 'ObjectTypeSpreadProperty')
 .map(prop => extendsForProp(prop, types))
 .map(prop => extendsForProp(prop, types, parser))
 .filter(Boolean);
}
/**
Expand All@@ -108,18 +110,19 @@ function getExtendsProps(
function getProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): {
 props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
 extendsProps: $ReadOnlyArray<ExtendsPropsShape>,
} {
 const nonExtendsProps = removeKnownExtends(typeDefinition, types);
 const nonExtendsProps = removeKnownExtends(typeDefinition, types, parser);
 const props = flattenProperties(nonExtendsProps, types)
 .map(property => buildPropSchema(property, types))
 .filter(Boolean);

 return {
 props,
 extendsProps: getExtendsProps(typeDefinition, types),
 extendsProps: getExtendsProps(typeDefinition, types, parser),
 };
}

Expand Down

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/flow/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
} from '../../CodegenSchema';
import type {ParserType} from '../errors';
import type {Parser} from '../parser';
import type {ParserErrorCapturer, TypeDeclarationMap} from '../utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from '../utils';

const {flowTranslateTypeAnnotation} = require('./modules');

Expand DownExpand Up@@ -329,6 +329,14 @@ class FlowParser implements Parser {
 convertKeywordToTypeAnnotation(keyword: string): string {
 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.argument;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.argument.id.name;
 }
}

module.exports = {
Expand Down

16 changes: 15 additions & 1 deletion
packages/react-native-codegen/src/parsers/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import type {
 NativeModuleEnumMap,
} from '../CodegenSchema';
import type {ParserType} from './errors';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from './utils';

/**
 * This is the main interface for Parsers of various languages.
Expand DownExpand Up@@ -255,4 +255,18 @@ export interface Parser {
 * @returns: converted TypeAnnotation to Keywords
 */
 convertKeywordToTypeAnnotation(keyword: string): string;

 /**
 * Given a prop return its arguments.
 * @parameter prop
 * @returns: Arguments of the prop
 */
 argumentForProp(prop: PropAST): $FlowFixMe;

 /**
 * Given a prop return its name.
 * @parameter prop
 * @returns: name property
 */
 nameForArgument(prop: PropAST): $FlowFixMe;
}

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/parserMock.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
 NativeModuleAliasMap,
 NativeModuleEnumMap,
} from '../CodegenSchema';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, PropAST, TypeDeclarationMap} from './utils';

// $FlowFixMe[untyped-import] there's no flowtype flow-parser
const flowParser = require('flow-parser');
Expand DownExpand Up@@ -243,4 +243,12 @@ export class MockedParser implements Parser {
 convertKeywordToTypeAnnotation(keyword: string): string {
 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.expression;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.expression.name;
 }
}

38 changes: 37 additions & 1 deletion
packages/react-native-codegen/src/parsers/parsers-commons.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ import type {

import type {Parser} from './parser';
import type {ParserType} from './errors';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from './utils';
import type {ComponentSchemaBuilderConfig} from './schema.js';

const {
Expand DownExpand Up@@ -69,6 +69,11 @@ export type CommandOptions = $ReadOnly<{
// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
type OptionsAST = Object;

type ExtendedPropResult = {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
} | null;

function wrapModuleSchema(
 nativeModuleSchema: NativeModuleSchema,
 hasteModuleName: string,
Expand DownExpand Up@@ -817,6 +822,36 @@ function propertyNames(
 .filter(Boolean);
}

function extendsForProp(
 prop: PropAST,
 types: TypeDeclarationMap,
 parser: Parser,
): ExtendedPropResult {
 const argument = parser.argumentForProp(prop);

 if (!argument) {
 console.log('null', prop);
 }

 const name = parser.nameForArgument(prop);

 if (types[name] != null) {
 // This type is locally defined in the file
 return null;
 }

 switch (name) {
 case 'ViewProps':
 return {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
 };
 default: {
 throw new Error(`Unable to handle prop spread: ${name}`);
 }
 }
}

module.exports = {
 wrapModuleSchema,
 unwrapNullable,
Expand All@@ -836,4 +871,5 @@ module.exports = {
 getCommandOptions,
 getOptions,
 getCommandTypeNameAndOptionsExpression,
 extendsForProp,
};

5 changes: 1 addition & 4 deletions
packages/react-native-codegen/src/parsers/typescript/components/componentsUtils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ const {
 parseTopLevelType,
 flattenIntersectionType,
} = require('../parseTopLevelType');
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';

function getProperties(
 typeName: string,
Expand DownExpand Up@@ -463,9 +463,6 @@ function getSchemaInfo(
 };
}

// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
type PropAST = Object;

function verifyPropNotAlreadyDefined(
 props: $ReadOnlyArray<PropAST>,
 needleProp: PropAST,
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 numberDiff line numberDiff line change
Expand Up@@ -135,7 +135,7 @@ function buildComponentSchema(

 const componentEventAsts: Array<PropsAST> = [];
 categorizeProps(propProperties, types, componentEventAsts);
 const {props, extendsProps} = getProps(propProperties, types);
 const {props, extendsProps} = getProps(propProperties, types, parser);
 const events = getEvents(componentEventAsts, types, parser);
 const commands = getCommands(commandProperties, types);

Expand Down

34 changes: 6 additions & 28 deletions
packages/react-native-codegen/src/parsers/typescript/components/props.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,17 +9,17 @@
 */

'use strict';

const {getSchemaInfo, getTypeAnnotation} = require('./componentsUtils.js');

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

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

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;
const {extendsForProp} = require('../../parsers-commons');

function buildPropSchema(
 property: PropAST,
Expand DownExpand Up@@ -59,32 +59,10 @@ function isProp(name: string, typeAnnotation: $FlowFixMe): boolean {
 return !isStyle;
}

function extendsForProp(prop: PropAST, types: TypeDeclarationMap) {
 if (!prop.expression) {
 console.log('null', prop);
 }
 const name = prop.expression.name;

 if (types[name] != null) {
 // This type is locally defined in the file
 return null;
 }

 switch (name) {
 case 'ViewProps':
 return {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
 };
 default: {
 throw new Error(`Unable to handle prop spread: ${name}`);
 }
 }
}

function getProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): {
 props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
 extendsProps: $ReadOnlyArray<ExtendsPropsShape>,
Expand All@@ -96,7 +74,7 @@ function getProps(
 for (const prop of typeDefinition) {
 // find extends
 if (prop.type === 'TSExpressionWithTypeArguments') {
 const extend = extendsForProp(prop, types);
 const extend = extendsForProp(prop, types, parser);
 if (extend) {
 extendsProps.push(extend);
 continue;
Expand Down

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/typescript/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
} from '../../CodegenSchema';
import type {ParserType} from '../errors';
import type {Parser} from '../parser';
import type {ParserErrorCapturer, TypeDeclarationMap} from '../utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from '../utils';

const {typeScriptTranslateTypeAnnotation} = require('./modules');

Expand DownExpand Up@@ -328,6 +328,14 @@ class TypeScriptParser implements Parser {

 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.expression;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.expression.name;
 }
}

module.exports = {
Expand Down

3 changes: 3 additions & 0 deletions
packages/react-native-codegen/src/parsers/utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,9 @@ function extractNativeModuleName(filename: string): string {

export type ParserErrorCapturer = <T>(fn: () => T) => ?T;

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
export type PropAST = Object;

function createParserErrorCapturer(): [
 Array<ParserError>,
 ParserErrorCapturer,
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[Codegen 94] move extendsForProp into parsers-commons#37052

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

siddarthkay
wants to merge
1
commit into

from

 Closed


[Codegen 94] move extendsForProp into parsers-commons#37052
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


5 changes: 1 addition & 4 deletions
packages/react-native-codegen/src/parsers/flow/components/componentsUtils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
import type {ASTNode} from '../utils';
import type {NamedShape} from '../../../CodegenSchema.js';
const {getValueFromTypes} = require('../utils.js');
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';

function getProperties(
 typeName: string,
Expand DownExpand Up@@ -499,9 +499,6 @@ function getSchemaInfo(
 };
}

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;

module.exports = {
 getProperties,
 getSchemaInfo,
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 numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ function buildComponentSchema(

 const propProperties = getProperties(propsTypeName, types);
 const commandProperties = getCommandProperties(ast, parser);
 const {extendsProps, props} = getProps(propProperties, types);
 const {extendsProps, props} = getProps(propProperties, types, parser);

 const options = getOptions(optionsExpression);
 const events = getEvents(propProperties, types, parser);
Expand Down

23 changes: 13 additions & 10 deletions
packages/react-native-codegen/src/parsers/flow/components/props.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,17 +15,15 @@ import type {
 NamedShape,
 PropTypeAnnotation,
} from '../../../CodegenSchema.js';
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';
import type {Parser} from '../../parser';

const {
 flattenProperties,
 getSchemaInfo,
 getTypeAnnotation,
} = require('./componentsUtils.js');

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;

type ExtendsForProp = null | {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
Expand DownExpand Up@@ -58,11 +56,13 @@ function buildPropSchema(
function extendsForProp(
 prop: PropAST,
 types: TypeDeclarationMap,
 parser: Parser,
): ExtendsForProp {
 if (!prop.argument) {
 const argument = parser.argumentForProp(prop);
 if (argument) {
@rshestrshestApr 26, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This now does exactly the opposite of what it used/supposed to do :)
It should instead be:
if (!argument) {

Otherwise this would break codegen completely, at least on our internal tests.
I am surprised, though, that CI on Github didn't catch this (the only failed test seems inside the app template and is unrelated).
I think we need a follow-up on that, CC @cipolleschi
@siddarthkay - note that I fixed this internally myself this time, to save one extra back and forth, but normally that would be your responsibility :)
@siddarthkaysiddarthkayApr 26, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @rshest ! This is probably the outcome of resolving multiple rebase conflicts. Thanks for catching and fixing it ❤️
@Pranav-yadavPranav-yadavApr 26, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am surprised, though, that CI on Github didn't catch this (the only failed test seems inside the app template and is unrelated).
I think, those files don't have tests, but, other tests should have been failed; or may be the current test-suite doesn't test this specific case 🤔
 console.log('null', prop);
 }
 const name = prop.argument.id.name;
 const name = parser.nameForArgument(prop);

 if (types[name] != null) {
 // This type is locally defined in the file
Expand All@@ -84,21 +84,23 @@ function extendsForProp(
function removeKnownExtends(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): $ReadOnlyArray<PropAST> {
 return typeDefinition.filter(
 prop =>
 prop.type !== 'ObjectTypeSpreadProperty' ||
 extendsForProp(prop, types) === null,
 extendsForProp(prop, types, parser) === null,
 );
}

function getExtendsProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): $ReadOnlyArray<ExtendsPropsShape> {
 return typeDefinition
 .filter(prop => prop.type === 'ObjectTypeSpreadProperty')
 .map(prop => extendsForProp(prop, types))
 .map(prop => extendsForProp(prop, types, parser))
 .filter(Boolean);
}
/**
Expand All@@ -108,18 +110,19 @@ function getExtendsProps(
function getProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): {
 props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
 extendsProps: $ReadOnlyArray<ExtendsPropsShape>,
} {
 const nonExtendsProps = removeKnownExtends(typeDefinition, types);
 const nonExtendsProps = removeKnownExtends(typeDefinition, types, parser);
 const props = flattenProperties(nonExtendsProps, types)
 .map(property => buildPropSchema(property, types))
 .filter(Boolean);

 return {
 props,
 extendsProps: getExtendsProps(typeDefinition, types),
 extendsProps: getExtendsProps(typeDefinition, types, parser),
 };
}

Expand Down

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/flow/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
} from '../../CodegenSchema';
import type {ParserType} from '../errors';
import type {Parser} from '../parser';
import type {ParserErrorCapturer, TypeDeclarationMap} from '../utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from '../utils';

const {flowTranslateTypeAnnotation} = require('./modules');

Expand DownExpand Up@@ -329,6 +329,14 @@ class FlowParser implements Parser {
 convertKeywordToTypeAnnotation(keyword: string): string {
 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.argument;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.argument.id.name;
 }
}

module.exports = {
Expand Down

16 changes: 15 additions & 1 deletion
packages/react-native-codegen/src/parsers/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import type {
 NativeModuleEnumMap,
} from '../CodegenSchema';
import type {ParserType} from './errors';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from './utils';

/**
 * This is the main interface for Parsers of various languages.
Expand DownExpand Up@@ -255,4 +255,18 @@ export interface Parser {
 * @returns: converted TypeAnnotation to Keywords
 */
 convertKeywordToTypeAnnotation(keyword: string): string;

 /**
 * Given a prop return its arguments.
 * @parameter prop
 * @returns: Arguments of the prop
 */
 argumentForProp(prop: PropAST): $FlowFixMe;

 /**
 * Given a prop return its name.
 * @parameter prop
 * @returns: name property
 */
 nameForArgument(prop: PropAST): $FlowFixMe;
}

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/parserMock.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
 NativeModuleAliasMap,
 NativeModuleEnumMap,
} from '../CodegenSchema';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, PropAST, TypeDeclarationMap} from './utils';

// $FlowFixMe[untyped-import] there's no flowtype flow-parser
const flowParser = require('flow-parser');
Expand DownExpand Up@@ -243,4 +243,12 @@ export class MockedParser implements Parser {
 convertKeywordToTypeAnnotation(keyword: string): string {
 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.expression;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.expression.name;
 }
}

38 changes: 37 additions & 1 deletion
packages/react-native-codegen/src/parsers/parsers-commons.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ import type {

import type {Parser} from './parser';
import type {ParserType} from './errors';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from './utils';
import type {ComponentSchemaBuilderConfig} from './schema.js';

const {
Expand DownExpand Up@@ -69,6 +69,11 @@ export type CommandOptions = $ReadOnly<{
// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
type OptionsAST = Object;

type ExtendedPropResult = {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
} | null;

function wrapModuleSchema(
 nativeModuleSchema: NativeModuleSchema,
 hasteModuleName: string,
Expand DownExpand Up@@ -817,6 +822,36 @@ function propertyNames(
 .filter(Boolean);
}

function extendsForProp(
 prop: PropAST,
 types: TypeDeclarationMap,
 parser: Parser,
): ExtendedPropResult {
 const argument = parser.argumentForProp(prop);

 if (!argument) {
 console.log('null', prop);
 }

 const name = parser.nameForArgument(prop);

 if (types[name] != null) {
 // This type is locally defined in the file
 return null;
 }

 switch (name) {
 case 'ViewProps':
 return {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
 };
 default: {
 throw new Error(`Unable to handle prop spread: ${name}`);
 }
 }
}

module.exports = {
 wrapModuleSchema,
 unwrapNullable,
Expand All@@ -836,4 +871,5 @@ module.exports = {
 getCommandOptions,
 getOptions,
 getCommandTypeNameAndOptionsExpression,
 extendsForProp,
};

5 changes: 1 addition & 4 deletions
packages/react-native-codegen/src/parsers/typescript/components/componentsUtils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ const {
 parseTopLevelType,
 flattenIntersectionType,
} = require('../parseTopLevelType');
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';

function getProperties(
 typeName: string,
Expand DownExpand Up@@ -463,9 +463,6 @@ function getSchemaInfo(
 };
}

// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
type PropAST = Object;

function verifyPropNotAlreadyDefined(
 props: $ReadOnlyArray<PropAST>,
 needleProp: PropAST,
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 numberDiff line numberDiff line change
Expand Up@@ -135,7 +135,7 @@ function buildComponentSchema(

 const componentEventAsts: Array<PropsAST> = [];
 categorizeProps(propProperties, types, componentEventAsts);
 const {props, extendsProps} = getProps(propProperties, types);
 const {props, extendsProps} = getProps(propProperties, types, parser);
 const events = getEvents(componentEventAsts, types, parser);
 const commands = getCommands(commandProperties, types);

Expand Down

34 changes: 6 additions & 28 deletions
packages/react-native-codegen/src/parsers/typescript/components/props.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,17 +9,17 @@
 */

'use strict';

const {getSchemaInfo, getTypeAnnotation} = require('./componentsUtils.js');

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

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

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;
const {extendsForProp} = require('../../parsers-commons');

function buildPropSchema(
 property: PropAST,
Expand DownExpand Up@@ -59,32 +59,10 @@ function isProp(name: string, typeAnnotation: $FlowFixMe): boolean {
 return !isStyle;
}

function extendsForProp(prop: PropAST, types: TypeDeclarationMap) {
 if (!prop.expression) {
 console.log('null', prop);
 }
 const name = prop.expression.name;

 if (types[name] != null) {
 // This type is locally defined in the file
 return null;
 }

 switch (name) {
 case 'ViewProps':
 return {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
 };
 default: {
 throw new Error(`Unable to handle prop spread: ${name}`);
 }
 }
}

function getProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): {
 props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
 extendsProps: $ReadOnlyArray<ExtendsPropsShape>,
Expand All@@ -96,7 +74,7 @@ function getProps(
 for (const prop of typeDefinition) {
 // find extends
 if (prop.type === 'TSExpressionWithTypeArguments') {
 const extend = extendsForProp(prop, types);
 const extend = extendsForProp(prop, types, parser);
 if (extend) {
 extendsProps.push(extend);
 continue;
Expand Down

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/typescript/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
} from '../../CodegenSchema';
import type {ParserType} from '../errors';
import type {Parser} from '../parser';
import type {ParserErrorCapturer, TypeDeclarationMap} from '../utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from '../utils';

const {typeScriptTranslateTypeAnnotation} = require('./modules');

Expand DownExpand Up@@ -328,6 +328,14 @@ class TypeScriptParser implements Parser {

 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.expression;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.expression.name;
 }
}

module.exports = {
Expand Down

3 changes: 3 additions & 0 deletions
packages/react-native-codegen/src/parsers/utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,9 @@ function extractNativeModuleName(filename: string): string {

export type ParserErrorCapturer = <T>(fn: () => T) => ?T;

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
export type PropAST = Object;

function createParserErrorCapturer(): [
 Array<ParserError>,
 ParserErrorCapturer,
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Codegen 94] move extendsForProp into parsers-commons#37052

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

siddarthkay
wants to merge
1
commit into

from

 Closed


[Codegen 94] move extendsForProp into parsers-commons#37052
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


5 changes: 1 addition & 4 deletions
packages/react-native-codegen/src/parsers/flow/components/componentsUtils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
import type {ASTNode} from '../utils';
import type {NamedShape} from '../../../CodegenSchema.js';
const {getValueFromTypes} = require('../utils.js');
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';

function getProperties(
 typeName: string,
Expand DownExpand Up@@ -499,9 +499,6 @@ function getSchemaInfo(
 };
}

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;

module.exports = {
 getProperties,
 getSchemaInfo,
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 numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ function buildComponentSchema(

 const propProperties = getProperties(propsTypeName, types);
 const commandProperties = getCommandProperties(ast, parser);
 const {extendsProps, props} = getProps(propProperties, types);
 const {extendsProps, props} = getProps(propProperties, types, parser);

 const options = getOptions(optionsExpression);
 const events = getEvents(propProperties, types, parser);
Expand Down

23 changes: 13 additions & 10 deletions
packages/react-native-codegen/src/parsers/flow/components/props.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,17 +15,15 @@ import type {
 NamedShape,
 PropTypeAnnotation,
} from '../../../CodegenSchema.js';
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';
import type {Parser} from '../../parser';

const {
 flattenProperties,
 getSchemaInfo,
 getTypeAnnotation,
} = require('./componentsUtils.js');

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;

type ExtendsForProp = null | {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
Expand DownExpand Up@@ -58,11 +56,13 @@ function buildPropSchema(
function extendsForProp(
 prop: PropAST,
 types: TypeDeclarationMap,
 parser: Parser,
): ExtendsForProp {
 if (!prop.argument) {
 const argument = parser.argumentForProp(prop);
 if (argument) {
@rshestrshestApr 26, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This now does exactly the opposite of what it used/supposed to do :)
It should instead be:
if (!argument) {

Otherwise this would break codegen completely, at least on our internal tests.
I am surprised, though, that CI on Github didn't catch this (the only failed test seems inside the app template and is unrelated).
I think we need a follow-up on that, CC @cipolleschi
@siddarthkay - note that I fixed this internally myself this time, to save one extra back and forth, but normally that would be your responsibility :)
@siddarthkaysiddarthkayApr 26, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @rshest ! This is probably the outcome of resolving multiple rebase conflicts. Thanks for catching and fixing it ❤️
@Pranav-yadavPranav-yadavApr 26, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am surprised, though, that CI on Github didn't catch this (the only failed test seems inside the app template and is unrelated).
I think, those files don't have tests, but, other tests should have been failed; or may be the current test-suite doesn't test this specific case 🤔
 console.log('null', prop);
 }
 const name = prop.argument.id.name;
 const name = parser.nameForArgument(prop);

 if (types[name] != null) {
 // This type is locally defined in the file
Expand All@@ -84,21 +84,23 @@ function extendsForProp(
function removeKnownExtends(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): $ReadOnlyArray<PropAST> {
 return typeDefinition.filter(
 prop =>
 prop.type !== 'ObjectTypeSpreadProperty' ||
 extendsForProp(prop, types) === null,
 extendsForProp(prop, types, parser) === null,
 );
}

function getExtendsProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): $ReadOnlyArray<ExtendsPropsShape> {
 return typeDefinition
 .filter(prop => prop.type === 'ObjectTypeSpreadProperty')
 .map(prop => extendsForProp(prop, types))
 .map(prop => extendsForProp(prop, types, parser))
 .filter(Boolean);
}
/**
Expand All@@ -108,18 +110,19 @@ function getExtendsProps(
function getProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): {
 props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
 extendsProps: $ReadOnlyArray<ExtendsPropsShape>,
} {
 const nonExtendsProps = removeKnownExtends(typeDefinition, types);
 const nonExtendsProps = removeKnownExtends(typeDefinition, types, parser);
 const props = flattenProperties(nonExtendsProps, types)
 .map(property => buildPropSchema(property, types))
 .filter(Boolean);

 return {
 props,
 extendsProps: getExtendsProps(typeDefinition, types),
 extendsProps: getExtendsProps(typeDefinition, types, parser),
 };
}

Expand Down

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/flow/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
} from '../../CodegenSchema';
import type {ParserType} from '../errors';
import type {Parser} from '../parser';
import type {ParserErrorCapturer, TypeDeclarationMap} from '../utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from '../utils';

const {flowTranslateTypeAnnotation} = require('./modules');

Expand DownExpand Up@@ -329,6 +329,14 @@ class FlowParser implements Parser {
 convertKeywordToTypeAnnotation(keyword: string): string {
 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.argument;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.argument.id.name;
 }
}

module.exports = {
Expand Down

16 changes: 15 additions & 1 deletion
packages/react-native-codegen/src/parsers/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import type {
 NativeModuleEnumMap,
} from '../CodegenSchema';
import type {ParserType} from './errors';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from './utils';

/**
 * This is the main interface for Parsers of various languages.
Expand DownExpand Up@@ -255,4 +255,18 @@ export interface Parser {
 * @returns: converted TypeAnnotation to Keywords
 */
 convertKeywordToTypeAnnotation(keyword: string): string;

 /**
 * Given a prop return its arguments.
 * @parameter prop
 * @returns: Arguments of the prop
 */
 argumentForProp(prop: PropAST): $FlowFixMe;

 /**
 * Given a prop return its name.
 * @parameter prop
 * @returns: name property
 */
 nameForArgument(prop: PropAST): $FlowFixMe;
}

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/parserMock.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
 NativeModuleAliasMap,
 NativeModuleEnumMap,
} from '../CodegenSchema';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, PropAST, TypeDeclarationMap} from './utils';

// $FlowFixMe[untyped-import] there's no flowtype flow-parser
const flowParser = require('flow-parser');
Expand DownExpand Up@@ -243,4 +243,12 @@ export class MockedParser implements Parser {
 convertKeywordToTypeAnnotation(keyword: string): string {
 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.expression;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.expression.name;
 }
}

38 changes: 37 additions & 1 deletion
packages/react-native-codegen/src/parsers/parsers-commons.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ import type {

import type {Parser} from './parser';
import type {ParserType} from './errors';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from './utils';
import type {ComponentSchemaBuilderConfig} from './schema.js';

const {
Expand DownExpand Up@@ -69,6 +69,11 @@ export type CommandOptions = $ReadOnly<{
// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
type OptionsAST = Object;

type ExtendedPropResult = {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
} | null;

function wrapModuleSchema(
 nativeModuleSchema: NativeModuleSchema,
 hasteModuleName: string,
Expand DownExpand Up@@ -817,6 +822,36 @@ function propertyNames(
 .filter(Boolean);
}

function extendsForProp(
 prop: PropAST,
 types: TypeDeclarationMap,
 parser: Parser,
): ExtendedPropResult {
 const argument = parser.argumentForProp(prop);

 if (!argument) {
 console.log('null', prop);
 }

 const name = parser.nameForArgument(prop);

 if (types[name] != null) {
 // This type is locally defined in the file
 return null;
 }

 switch (name) {
 case 'ViewProps':
 return {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
 };
 default: {
 throw new Error(`Unable to handle prop spread: ${name}`);
 }
 }
}

module.exports = {
 wrapModuleSchema,
 unwrapNullable,
Expand All@@ -836,4 +871,5 @@ module.exports = {
 getCommandOptions,
 getOptions,
 getCommandTypeNameAndOptionsExpression,
 extendsForProp,
};

5 changes: 1 addition & 4 deletions
packages/react-native-codegen/src/parsers/typescript/components/componentsUtils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ const {
 parseTopLevelType,
 flattenIntersectionType,
} = require('../parseTopLevelType');
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';

function getProperties(
 typeName: string,
Expand DownExpand Up@@ -463,9 +463,6 @@ function getSchemaInfo(
 };
}

// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
type PropAST = Object;

function verifyPropNotAlreadyDefined(
 props: $ReadOnlyArray<PropAST>,
 needleProp: PropAST,
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 numberDiff line numberDiff line change
Expand Up@@ -135,7 +135,7 @@ function buildComponentSchema(

 const componentEventAsts: Array<PropsAST> = [];
 categorizeProps(propProperties, types, componentEventAsts);
 const {props, extendsProps} = getProps(propProperties, types);
 const {props, extendsProps} = getProps(propProperties, types, parser);
 const events = getEvents(componentEventAsts, types, parser);
 const commands = getCommands(commandProperties, types);

Expand Down

34 changes: 6 additions & 28 deletions
packages/react-native-codegen/src/parsers/typescript/components/props.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,17 +9,17 @@
 */

'use strict';

const {getSchemaInfo, getTypeAnnotation} = require('./componentsUtils.js');

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

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

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;
const {extendsForProp} = require('../../parsers-commons');

function buildPropSchema(
 property: PropAST,
Expand DownExpand Up@@ -59,32 +59,10 @@ function isProp(name: string, typeAnnotation: $FlowFixMe): boolean {
 return !isStyle;
}

function extendsForProp(prop: PropAST, types: TypeDeclarationMap) {
 if (!prop.expression) {
 console.log('null', prop);
 }
 const name = prop.expression.name;

 if (types[name] != null) {
 // This type is locally defined in the file
 return null;
 }

 switch (name) {
 case 'ViewProps':
 return {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
 };
 default: {
 throw new Error(`Unable to handle prop spread: ${name}`);
 }
 }
}

function getProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): {
 props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
 extendsProps: $ReadOnlyArray<ExtendsPropsShape>,
Expand All@@ -96,7 +74,7 @@ function getProps(
 for (const prop of typeDefinition) {
 // find extends
 if (prop.type === 'TSExpressionWithTypeArguments') {
 const extend = extendsForProp(prop, types);
 const extend = extendsForProp(prop, types, parser);
 if (extend) {
 extendsProps.push(extend);
 continue;
Expand Down

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/typescript/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
} from '../../CodegenSchema';
import type {ParserType} from '../errors';
import type {Parser} from '../parser';
import type {ParserErrorCapturer, TypeDeclarationMap} from '../utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from '../utils';

const {typeScriptTranslateTypeAnnotation} = require('./modules');

Expand DownExpand Up@@ -328,6 +328,14 @@ class TypeScriptParser implements Parser {

 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.expression;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.expression.name;
 }
}

module.exports = {
Expand Down

3 changes: 3 additions & 0 deletions
packages/react-native-codegen/src/parsers/utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,9 @@ function extractNativeModuleName(filename: string): string {

export type ParserErrorCapturer = <T>(fn: () => T) => ?T;

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
export type PropAST = Object;

function createParserErrorCapturer(): [
 Array<ParserError>,
 ParserErrorCapturer,
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[Codegen 94] move extendsForProp into parsers-commons#37052

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

siddarthkay
wants to merge
1
commit into

from

 Closed


[Codegen 94] move extendsForProp into parsers-commons#37052
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


5 changes: 1 addition & 4 deletions
packages/react-native-codegen/src/parsers/flow/components/componentsUtils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
import type {ASTNode} from '../utils';
import type {NamedShape} from '../../../CodegenSchema.js';
const {getValueFromTypes} = require('../utils.js');
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';

function getProperties(
 typeName: string,
Expand DownExpand Up@@ -499,9 +499,6 @@ function getSchemaInfo(
 };
}

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;

module.exports = {
 getProperties,
 getSchemaInfo,
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 numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ function buildComponentSchema(

 const propProperties = getProperties(propsTypeName, types);
 const commandProperties = getCommandProperties(ast, parser);
 const {extendsProps, props} = getProps(propProperties, types);
 const {extendsProps, props} = getProps(propProperties, types, parser);

 const options = getOptions(optionsExpression);
 const events = getEvents(propProperties, types, parser);
Expand Down

23 changes: 13 additions & 10 deletions
packages/react-native-codegen/src/parsers/flow/components/props.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,17 +15,15 @@ import type {
 NamedShape,
 PropTypeAnnotation,
} from '../../../CodegenSchema.js';
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';
import type {Parser} from '../../parser';

const {
 flattenProperties,
 getSchemaInfo,
 getTypeAnnotation,
} = require('./componentsUtils.js');

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;

type ExtendsForProp = null | {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
Expand DownExpand Up@@ -58,11 +56,13 @@ function buildPropSchema(
function extendsForProp(
 prop: PropAST,
 types: TypeDeclarationMap,
 parser: Parser,
): ExtendsForProp {
 if (!prop.argument) {
 const argument = parser.argumentForProp(prop);
 if (argument) {
@rshestrshestApr 26, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This now does exactly the opposite of what it used/supposed to do :)
It should instead be:
if (!argument) {

Otherwise this would break codegen completely, at least on our internal tests.
I am surprised, though, that CI on Github didn't catch this (the only failed test seems inside the app template and is unrelated).
I think we need a follow-up on that, CC @cipolleschi
@siddarthkay - note that I fixed this internally myself this time, to save one extra back and forth, but normally that would be your responsibility :)
@siddarthkaysiddarthkayApr 26, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @rshest ! This is probably the outcome of resolving multiple rebase conflicts. Thanks for catching and fixing it ❤️
@Pranav-yadavPranav-yadavApr 26, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am surprised, though, that CI on Github didn't catch this (the only failed test seems inside the app template and is unrelated).
I think, those files don't have tests, but, other tests should have been failed; or may be the current test-suite doesn't test this specific case 🤔
 console.log('null', prop);
 }
 const name = prop.argument.id.name;
 const name = parser.nameForArgument(prop);

 if (types[name] != null) {
 // This type is locally defined in the file
Expand All@@ -84,21 +84,23 @@ function extendsForProp(
function removeKnownExtends(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): $ReadOnlyArray<PropAST> {
 return typeDefinition.filter(
 prop =>
 prop.type !== 'ObjectTypeSpreadProperty' ||
 extendsForProp(prop, types) === null,
 extendsForProp(prop, types, parser) === null,
 );
}

function getExtendsProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): $ReadOnlyArray<ExtendsPropsShape> {
 return typeDefinition
 .filter(prop => prop.type === 'ObjectTypeSpreadProperty')
 .map(prop => extendsForProp(prop, types))
 .map(prop => extendsForProp(prop, types, parser))
 .filter(Boolean);
}
/**
Expand All@@ -108,18 +110,19 @@ function getExtendsProps(
function getProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): {
 props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
 extendsProps: $ReadOnlyArray<ExtendsPropsShape>,
} {
 const nonExtendsProps = removeKnownExtends(typeDefinition, types);
 const nonExtendsProps = removeKnownExtends(typeDefinition, types, parser);
 const props = flattenProperties(nonExtendsProps, types)
 .map(property => buildPropSchema(property, types))
 .filter(Boolean);

 return {
 props,
 extendsProps: getExtendsProps(typeDefinition, types),
 extendsProps: getExtendsProps(typeDefinition, types, parser),
 };
}

Expand Down

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/flow/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
} from '../../CodegenSchema';
import type {ParserType} from '../errors';
import type {Parser} from '../parser';
import type {ParserErrorCapturer, TypeDeclarationMap} from '../utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from '../utils';

const {flowTranslateTypeAnnotation} = require('./modules');

Expand DownExpand Up@@ -329,6 +329,14 @@ class FlowParser implements Parser {
 convertKeywordToTypeAnnotation(keyword: string): string {
 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.argument;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.argument.id.name;
 }
}

module.exports = {
Expand Down

16 changes: 15 additions & 1 deletion
packages/react-native-codegen/src/parsers/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import type {
 NativeModuleEnumMap,
} from '../CodegenSchema';
import type {ParserType} from './errors';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from './utils';

/**
 * This is the main interface for Parsers of various languages.
Expand DownExpand Up@@ -255,4 +255,18 @@ export interface Parser {
 * @returns: converted TypeAnnotation to Keywords
 */
 convertKeywordToTypeAnnotation(keyword: string): string;

 /**
 * Given a prop return its arguments.
 * @parameter prop
 * @returns: Arguments of the prop
 */
 argumentForProp(prop: PropAST): $FlowFixMe;

 /**
 * Given a prop return its name.
 * @parameter prop
 * @returns: name property
 */
 nameForArgument(prop: PropAST): $FlowFixMe;
}

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/parserMock.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
 NativeModuleAliasMap,
 NativeModuleEnumMap,
} from '../CodegenSchema';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, PropAST, TypeDeclarationMap} from './utils';

// $FlowFixMe[untyped-import] there's no flowtype flow-parser
const flowParser = require('flow-parser');
Expand DownExpand Up@@ -243,4 +243,12 @@ export class MockedParser implements Parser {
 convertKeywordToTypeAnnotation(keyword: string): string {
 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.expression;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.expression.name;
 }
}

38 changes: 37 additions & 1 deletion
packages/react-native-codegen/src/parsers/parsers-commons.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ import type {

import type {Parser} from './parser';
import type {ParserType} from './errors';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from './utils';
import type {ComponentSchemaBuilderConfig} from './schema.js';

const {
Expand DownExpand Up@@ -69,6 +69,11 @@ export type CommandOptions = $ReadOnly<{
// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
type OptionsAST = Object;

type ExtendedPropResult = {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
} | null;

function wrapModuleSchema(
 nativeModuleSchema: NativeModuleSchema,
 hasteModuleName: string,
Expand DownExpand Up@@ -817,6 +822,36 @@ function propertyNames(
 .filter(Boolean);
}

function extendsForProp(
 prop: PropAST,
 types: TypeDeclarationMap,
 parser: Parser,
): ExtendedPropResult {
 const argument = parser.argumentForProp(prop);

 if (!argument) {
 console.log('null', prop);
 }

 const name = parser.nameForArgument(prop);

 if (types[name] != null) {
 // This type is locally defined in the file
 return null;
 }

 switch (name) {
 case 'ViewProps':
 return {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
 };
 default: {
 throw new Error(`Unable to handle prop spread: ${name}`);
 }
 }
}

module.exports = {
 wrapModuleSchema,
 unwrapNullable,
Expand All@@ -836,4 +871,5 @@ module.exports = {
 getCommandOptions,
 getOptions,
 getCommandTypeNameAndOptionsExpression,
 extendsForProp,
};

5 changes: 1 addition & 4 deletions
packages/react-native-codegen/src/parsers/typescript/components/componentsUtils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ const {
 parseTopLevelType,
 flattenIntersectionType,
} = require('../parseTopLevelType');
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';

function getProperties(
 typeName: string,
Expand DownExpand Up@@ -463,9 +463,6 @@ function getSchemaInfo(
 };
}

// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
type PropAST = Object;

function verifyPropNotAlreadyDefined(
 props: $ReadOnlyArray<PropAST>,
 needleProp: PropAST,
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 numberDiff line numberDiff line change
Expand Up@@ -135,7 +135,7 @@ function buildComponentSchema(

 const componentEventAsts: Array<PropsAST> = [];
 categorizeProps(propProperties, types, componentEventAsts);
 const {props, extendsProps} = getProps(propProperties, types);
 const {props, extendsProps} = getProps(propProperties, types, parser);
 const events = getEvents(componentEventAsts, types, parser);
 const commands = getCommands(commandProperties, types);

Expand Down

34 changes: 6 additions & 28 deletions
packages/react-native-codegen/src/parsers/typescript/components/props.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,17 +9,17 @@
 */

'use strict';

const {getSchemaInfo, getTypeAnnotation} = require('./componentsUtils.js');

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

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

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;
const {extendsForProp} = require('../../parsers-commons');

function buildPropSchema(
 property: PropAST,
Expand DownExpand Up@@ -59,32 +59,10 @@ function isProp(name: string, typeAnnotation: $FlowFixMe): boolean {
 return !isStyle;
}

function extendsForProp(prop: PropAST, types: TypeDeclarationMap) {
 if (!prop.expression) {
 console.log('null', prop);
 }
 const name = prop.expression.name;

 if (types[name] != null) {
 // This type is locally defined in the file
 return null;
 }

 switch (name) {
 case 'ViewProps':
 return {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
 };
 default: {
 throw new Error(`Unable to handle prop spread: ${name}`);
 }
 }
}

function getProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): {
 props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
 extendsProps: $ReadOnlyArray<ExtendsPropsShape>,
Expand All@@ -96,7 +74,7 @@ function getProps(
 for (const prop of typeDefinition) {
 // find extends
 if (prop.type === 'TSExpressionWithTypeArguments') {
 const extend = extendsForProp(prop, types);
 const extend = extendsForProp(prop, types, parser);
 if (extend) {
 extendsProps.push(extend);
 continue;
Expand Down

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/typescript/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
} from '../../CodegenSchema';
import type {ParserType} from '../errors';
import type {Parser} from '../parser';
import type {ParserErrorCapturer, TypeDeclarationMap} from '../utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from '../utils';

const {typeScriptTranslateTypeAnnotation} = require('./modules');

Expand DownExpand Up@@ -328,6 +328,14 @@ class TypeScriptParser implements Parser {

 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.expression;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.expression.name;
 }
}

module.exports = {
Expand Down

3 changes: 3 additions & 0 deletions
packages/react-native-codegen/src/parsers/utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,9 @@ function extractNativeModuleName(filename: string): string {

export type ParserErrorCapturer = <T>(fn: () => T) => ?T;

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
export type PropAST = Object;

function createParserErrorCapturer(): [
 Array<ParserError>,
 ParserErrorCapturer,
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[Codegen 94] move extendsForProp into parsers-commons#37052

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

siddarthkay
wants to merge
1
commit into

from

 Closed


[Codegen 94] move extendsForProp into parsers-commons#37052
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


5 changes: 1 addition & 4 deletions
packages/react-native-codegen/src/parsers/flow/components/componentsUtils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
import type {ASTNode} from '../utils';
import type {NamedShape} from '../../../CodegenSchema.js';
const {getValueFromTypes} = require('../utils.js');
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';

function getProperties(
 typeName: string,
Expand DownExpand Up@@ -499,9 +499,6 @@ function getSchemaInfo(
 };
}

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;

module.exports = {
 getProperties,
 getSchemaInfo,
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 numberDiff line numberDiff line change
Expand Up@@ -126,7 +126,7 @@ function buildComponentSchema(

 const propProperties = getProperties(propsTypeName, types);
 const commandProperties = getCommandProperties(ast, parser);
 const {extendsProps, props} = getProps(propProperties, types);
 const {extendsProps, props} = getProps(propProperties, types, parser);

 const options = getOptions(optionsExpression);
 const events = getEvents(propProperties, types, parser);
Expand Down

23 changes: 13 additions & 10 deletions
packages/react-native-codegen/src/parsers/flow/components/props.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,17 +15,15 @@ import type {
 NamedShape,
 PropTypeAnnotation,
} from '../../../CodegenSchema.js';
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';
import type {Parser} from '../../parser';

const {
 flattenProperties,
 getSchemaInfo,
 getTypeAnnotation,
} = require('./componentsUtils.js');

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;

type ExtendsForProp = null | {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
Expand DownExpand Up@@ -58,11 +56,13 @@ function buildPropSchema(
function extendsForProp(
 prop: PropAST,
 types: TypeDeclarationMap,
 parser: Parser,
): ExtendsForProp {
 if (!prop.argument) {
 const argument = parser.argumentForProp(prop);
 if (argument) {
@rshestrshestApr 26, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This now does exactly the opposite of what it used/supposed to do :)
It should instead be:
if (!argument) {

Otherwise this would break codegen completely, at least on our internal tests.
I am surprised, though, that CI on Github didn't catch this (the only failed test seems inside the app template and is unrelated).
I think we need a follow-up on that, CC @cipolleschi
@siddarthkay - note that I fixed this internally myself this time, to save one extra back and forth, but normally that would be your responsibility :)
@siddarthkaysiddarthkayApr 26, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @rshest ! This is probably the outcome of resolving multiple rebase conflicts. Thanks for catching and fixing it ❤️
@Pranav-yadavPranav-yadavApr 26, 2023•

edited

Loading

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am surprised, though, that CI on Github didn't catch this (the only failed test seems inside the app template and is unrelated).
I think, those files don't have tests, but, other tests should have been failed; or may be the current test-suite doesn't test this specific case 🤔
 console.log('null', prop);
 }
 const name = prop.argument.id.name;
 const name = parser.nameForArgument(prop);

 if (types[name] != null) {
 // This type is locally defined in the file
Expand All@@ -84,21 +84,23 @@ function extendsForProp(
function removeKnownExtends(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): $ReadOnlyArray<PropAST> {
 return typeDefinition.filter(
 prop =>
 prop.type !== 'ObjectTypeSpreadProperty' ||
 extendsForProp(prop, types) === null,
 extendsForProp(prop, types, parser) === null,
 );
}

function getExtendsProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): $ReadOnlyArray<ExtendsPropsShape> {
 return typeDefinition
 .filter(prop => prop.type === 'ObjectTypeSpreadProperty')
 .map(prop => extendsForProp(prop, types))
 .map(prop => extendsForProp(prop, types, parser))
 .filter(Boolean);
}
/**
Expand All@@ -108,18 +110,19 @@ function getExtendsProps(
function getProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): {
 props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
 extendsProps: $ReadOnlyArray<ExtendsPropsShape>,
} {
 const nonExtendsProps = removeKnownExtends(typeDefinition, types);
 const nonExtendsProps = removeKnownExtends(typeDefinition, types, parser);
 const props = flattenProperties(nonExtendsProps, types)
 .map(property => buildPropSchema(property, types))
 .filter(Boolean);

 return {
 props,
 extendsProps: getExtendsProps(typeDefinition, types),
 extendsProps: getExtendsProps(typeDefinition, types, parser),
 };
}

Expand Down

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/flow/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
} from '../../CodegenSchema';
import type {ParserType} from '../errors';
import type {Parser} from '../parser';
import type {ParserErrorCapturer, TypeDeclarationMap} from '../utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from '../utils';

const {flowTranslateTypeAnnotation} = require('./modules');

Expand DownExpand Up@@ -329,6 +329,14 @@ class FlowParser implements Parser {
 convertKeywordToTypeAnnotation(keyword: string): string {
 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.argument;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.argument.id.name;
 }
}

module.exports = {
Expand Down

16 changes: 15 additions & 1 deletion
packages/react-native-codegen/src/parsers/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,7 +22,7 @@ import type {
 NativeModuleEnumMap,
} from '../CodegenSchema';
import type {ParserType} from './errors';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from './utils';

/**
 * This is the main interface for Parsers of various languages.
Expand DownExpand Up@@ -255,4 +255,18 @@ export interface Parser {
 * @returns: converted TypeAnnotation to Keywords
 */
 convertKeywordToTypeAnnotation(keyword: string): string;

 /**
 * Given a prop return its arguments.
 * @parameter prop
 * @returns: Arguments of the prop
 */
 argumentForProp(prop: PropAST): $FlowFixMe;

 /**
 * Given a prop return its name.
 * @parameter prop
 * @returns: name property
 */
 nameForArgument(prop: PropAST): $FlowFixMe;
}

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/parserMock.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
 NativeModuleAliasMap,
 NativeModuleEnumMap,
} from '../CodegenSchema';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, PropAST, TypeDeclarationMap} from './utils';

// $FlowFixMe[untyped-import] there's no flowtype flow-parser
const flowParser = require('flow-parser');
Expand DownExpand Up@@ -243,4 +243,12 @@ export class MockedParser implements Parser {
 convertKeywordToTypeAnnotation(keyword: string): string {
 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.expression;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.expression.name;
 }
}

38 changes: 37 additions & 1 deletion
packages/react-native-codegen/src/parsers/parsers-commons.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ import type {

import type {Parser} from './parser';
import type {ParserType} from './errors';
import type {ParserErrorCapturer, TypeDeclarationMap} from './utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from './utils';
import type {ComponentSchemaBuilderConfig} from './schema.js';

const {
Expand DownExpand Up@@ -69,6 +69,11 @@ export type CommandOptions = $ReadOnly<{
// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
type OptionsAST = Object;

type ExtendedPropResult = {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
} | null;

function wrapModuleSchema(
 nativeModuleSchema: NativeModuleSchema,
 hasteModuleName: string,
Expand DownExpand Up@@ -817,6 +822,36 @@ function propertyNames(
 .filter(Boolean);
}

function extendsForProp(
 prop: PropAST,
 types: TypeDeclarationMap,
 parser: Parser,
): ExtendedPropResult {
 const argument = parser.argumentForProp(prop);

 if (!argument) {
 console.log('null', prop);
 }

 const name = parser.nameForArgument(prop);

 if (types[name] != null) {
 // This type is locally defined in the file
 return null;
 }

 switch (name) {
 case 'ViewProps':
 return {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
 };
 default: {
 throw new Error(`Unable to handle prop spread: ${name}`);
 }
 }
}

module.exports = {
 wrapModuleSchema,
 unwrapNullable,
Expand All@@ -836,4 +871,5 @@ module.exports = {
 getCommandOptions,
 getOptions,
 getCommandTypeNameAndOptionsExpression,
 extendsForProp,
};

5 changes: 1 addition & 4 deletions
packages/react-native-codegen/src/parsers/typescript/components/componentsUtils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -15,7 +15,7 @@ const {
 parseTopLevelType,
 flattenIntersectionType,
} = require('../parseTopLevelType');
import type {TypeDeclarationMap} from '../../utils';
import type {TypeDeclarationMap, PropAST} from '../../utils';

function getProperties(
 typeName: string,
Expand DownExpand Up@@ -463,9 +463,6 @@ function getSchemaInfo(
 };
}

// $FlowFixMe[unclear-type] TODO(T108222691): Use flow-types for @babel/parser
type PropAST = Object;

function verifyPropNotAlreadyDefined(
 props: $ReadOnlyArray<PropAST>,
 needleProp: PropAST,
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 numberDiff line numberDiff line change
Expand Up@@ -135,7 +135,7 @@ function buildComponentSchema(

 const componentEventAsts: Array<PropsAST> = [];
 categorizeProps(propProperties, types, componentEventAsts);
 const {props, extendsProps} = getProps(propProperties, types);
 const {props, extendsProps} = getProps(propProperties, types, parser);
 const events = getEvents(componentEventAsts, types, parser);
 const commands = getCommands(commandProperties, types);

Expand Down

34 changes: 6 additions & 28 deletions
packages/react-native-codegen/src/parsers/typescript/components/props.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,17 +9,17 @@
 */

'use strict';

const {getSchemaInfo, getTypeAnnotation} = require('./componentsUtils.js');

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

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

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
type PropAST = Object;
const {extendsForProp} = require('../../parsers-commons');

function buildPropSchema(
 property: PropAST,
Expand DownExpand Up@@ -59,32 +59,10 @@ function isProp(name: string, typeAnnotation: $FlowFixMe): boolean {
 return !isStyle;
}

function extendsForProp(prop: PropAST, types: TypeDeclarationMap) {
 if (!prop.expression) {
 console.log('null', prop);
 }
 const name = prop.expression.name;

 if (types[name] != null) {
 // This type is locally defined in the file
 return null;
 }

 switch (name) {
 case 'ViewProps':
 return {
 type: 'ReactNativeBuiltInType',
 knownTypeName: 'ReactNativeCoreViewProps',
 };
 default: {
 throw new Error(`Unable to handle prop spread: ${name}`);
 }
 }
}

function getProps(
 typeDefinition: $ReadOnlyArray<PropAST>,
 types: TypeDeclarationMap,
 parser: Parser,
): {
 props: $ReadOnlyArray<NamedShape<PropTypeAnnotation>>,
 extendsProps: $ReadOnlyArray<ExtendsPropsShape>,
Expand All@@ -96,7 +74,7 @@ function getProps(
 for (const prop of typeDefinition) {
 // find extends
 if (prop.type === 'TSExpressionWithTypeArguments') {
 const extend = extendsForProp(prop, types);
 const extend = extendsForProp(prop, types, parser);
 if (extend) {
 extendsProps.push(extend);
 continue;
Expand Down

10 changes: 9 additions & 1 deletion
packages/react-native-codegen/src/parsers/typescript/parser.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -23,7 +23,7 @@ import type {
} from '../../CodegenSchema';
import type {ParserType} from '../errors';
import type {Parser} from '../parser';
import type {ParserErrorCapturer, TypeDeclarationMap} from '../utils';
import type {ParserErrorCapturer, TypeDeclarationMap, PropAST} from '../utils';

const {typeScriptTranslateTypeAnnotation} = require('./modules');

Expand DownExpand Up@@ -328,6 +328,14 @@ class TypeScriptParser implements Parser {

 return keyword;
 }

 argumentForProp(prop: PropAST): $FlowFixMe {
 return prop.expression;
 }

 nameForArgument(prop: PropAST): $FlowFixMe {
 return prop.expression.name;
 }
}

module.exports = {
Expand Down

3 changes: 3 additions & 0 deletions
packages/react-native-codegen/src/parsers/utils.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,6 +34,9 @@ function extractNativeModuleName(filename: string): string {

export type ParserErrorCapturer = <T>(fn: () => T) => ?T;

// $FlowFixMe[unclear-type] there's no flowtype for ASTs
export type PropAST = Object;

function createParserErrorCapturer(): [
 Array<ParserError>,
 ParserErrorCapturer,
Expand Down