-
Notifications
You must be signed in to change notification settings - Fork 1.2k
[0.82] E2Ex86 CI failure fix #15549
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.
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
Merged
+285
−19
Merged
[0.82] E2Ex86 CI failure fix #15549
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
7 changes: 7 additions & 0 deletions
7
change/@react-native-windows-codegen-8977b235-04fe-4aff-a06e-c6b3f481de6e.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "type": "prerelease", | ||
| "comment": "forking GenerateModuleCpp", | ||
| "packageName": "@react-native-windows/codegen", | ||
| "email": "66076509+vineethkuttan@users.noreply.github.com", | ||
| "dependentChangeType": "patch" | ||
| } |
7 changes: 7 additions & 0 deletions
7
change/react-native-windows-83578d60-30a3-4822-a835-4f85d5359b12.json
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| { | ||
| "type": "prerelease", | ||
| "comment": "forking GenerateModuleCpp", | ||
| "packageName": "react-native-windows", | ||
| "email": "66076509+vineethkuttan@users.noreply.github.com", | ||
| "dependentChangeType": "patch" | ||
| } |
245 changes: 245 additions & 0 deletions
245
packages/@react-native-windows/codegen/src/generators/GenerateModuleCpp.js
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,245 @@ | ||
| /** | ||
| * Copyright (c) Meta Platforms, Inc. and affiliates. | ||
| * | ||
| * This source code is licensed under the MIT license found in the | ||
| * LICENSE file in the root directory of this source tree. | ||
| * | ||
| * | ||
| * @format | ||
| */ | ||
|
|
||
| 'use strict'; | ||
|
|
||
| const path = require('path'); | ||
|
|
||
| // Load dependencies from @react-native/codegen | ||
| const rnPath = path.dirname(require.resolve('react-native/package.json')); | ||
| const rncodegenPath = path.dirname( | ||
| require.resolve('@react-native/codegen/package.json', {paths: [rnPath]}), | ||
| ); | ||
|
|
||
| const {unwrapNullable} = require( | ||
| path.resolve(rncodegenPath, 'lib/parsers/parsers-commons'), | ||
| ); | ||
| const {createAliasResolver, getModules} = require( | ||
| path.resolve(rncodegenPath, 'lib/generators/modules/Utils'), | ||
| ); | ||
| const HostFunctionTemplate = ({ | ||
| hasteModuleName, | ||
| methodName, | ||
| returnTypeAnnotation, | ||
| args, | ||
| }) => { | ||
| const isNullable = returnTypeAnnotation.type === 'NullableTypeAnnotation'; | ||
| const isVoid = returnTypeAnnotation.type === 'VoidTypeAnnotation'; | ||
| const methodCallArgs = [' rt', ...args].join(',\n '); | ||
| const methodCall = `static_cast<${hasteModuleName}CxxSpecJSI *>(&turboModule)->${methodName}(\n${methodCallArgs}\n )`; | ||
| return `static jsi::Value __hostFunction_${hasteModuleName}CxxSpecJSI_${methodName}(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {${isVoid ? `\n ${methodCall};` : isNullable ? `\n auto result = ${methodCall};` : ''} | ||
| return ${isVoid ? 'jsi::Value::undefined()' : isNullable ? 'result ? jsi::Value(std::move(*result)) : jsi::Value::null()' : methodCall}; | ||
| }`; | ||
| }; | ||
| const ModuleTemplate = ({ | ||
| hasteModuleName, | ||
| hostFunctions, | ||
| moduleName, | ||
| methods, | ||
| }) => { | ||
| return `${hostFunctions.join('\n')} | ||
|
|
||
| ${hasteModuleName}CxxSpecJSI::${hasteModuleName}CxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker) | ||
| : TurboModule("${moduleName}", jsInvoker) { | ||
| ${methods | ||
| .map(({methodName, paramCount}) => { | ||
| return ` methodMap_["${methodName}"] = MethodMetadata {${paramCount}, __hostFunction_${hasteModuleName}CxxSpecJSI_${methodName}};`; | ||
| }) | ||
| .join('\n')} | ||
| }`; | ||
| }; | ||
| const FileTemplate = ({libraryName, modules}) => { | ||
| return `/** | ||
| * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen). | ||
| * | ||
| * Do not edit this file as changes may cause incorrect behavior and will be lost | ||
| * once the code is regenerated. | ||
| * | ||
| * ${'@'}generated by codegen project: GenerateModuleCpp.js | ||
| */ | ||
|
|
||
| #include "${libraryName}JSI.h" | ||
|
|
||
| namespace facebook::react { | ||
|
|
||
| ${modules} | ||
|
|
||
|
|
||
| } // namespace facebook::react | ||
| `; | ||
| }; | ||
| function serializeArg(moduleName, arg, index, resolveAlias, enumMap) { | ||
| const {typeAnnotation: nullableTypeAnnotation, optional} = arg; | ||
| const [typeAnnotation, nullable] = unwrapNullable(nullableTypeAnnotation); | ||
| let realTypeAnnotation = typeAnnotation; | ||
| if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') { | ||
| realTypeAnnotation = resolveAlias(realTypeAnnotation.name); | ||
| } | ||
| function wrap(callback) { | ||
| const val = `args[${index}]`; | ||
| const expression = callback(val); | ||
|
|
||
| // param?: T | ||
| if (optional && !nullable) { | ||
| // throw new Error('are we hitting this case? ' + moduleName); | ||
| return `count <= ${index} || ${val}.isUndefined() ? std::nullopt : std::make_optional(${expression})`; | ||
| } | ||
|
|
||
| // param: ?T | ||
| // param?: ?T | ||
| if (nullable || optional) { | ||
| return `count <= ${index} || ${val}.isNull() || ${val}.isUndefined() ? std::nullopt : std::make_optional(${expression})`; | ||
| } | ||
|
|
||
| // param: T | ||
| //return `count <= ${index} ? throw jsi::JSError(rt, "Expected argument in position ${index} to be passed") : ${expression}`; | ||
| //Windows #15545 | ||
| return `(count > ${index} || (throw jsi::JSError(rt, "Expected argument in position ${index} to be passed"), false), ${expression})`; | ||
| //Windows | ||
| } | ||
| switch (realTypeAnnotation.type) { | ||
| case 'ReservedTypeAnnotation': | ||
| switch (realTypeAnnotation.name) { | ||
| case 'RootTag': | ||
| return wrap(val => `${val}.asNumber()`); | ||
| default: | ||
| realTypeAnnotation.name; | ||
| throw new Error( | ||
| `Unknown prop type for "${arg.name}, found: ${realTypeAnnotation.name}"`, | ||
| ); | ||
| } | ||
| case 'StringTypeAnnotation': | ||
| return wrap(val => `${val}.asString(rt)`); | ||
| case 'StringLiteralTypeAnnotation': | ||
| return wrap(val => `${val}.asString(rt)`); | ||
| case 'StringLiteralUnionTypeAnnotation': | ||
| return wrap(val => `${val}.asString(rt)`); | ||
| case 'BooleanTypeAnnotation': | ||
| return wrap(val => `${val}.asBool()`); | ||
| case 'EnumDeclaration': | ||
| switch (realTypeAnnotation.memberType) { | ||
| case 'NumberTypeAnnotation': | ||
| return wrap(val => `${val}.asNumber()`); | ||
| case 'StringTypeAnnotation': | ||
| return wrap(val => `${val}.asString(rt)`); | ||
| default: | ||
| throw new Error( | ||
| `Unknown enum type for "${arg.name}, found: ${realTypeAnnotation.type}"`, | ||
| ); | ||
| } | ||
| case 'NumberTypeAnnotation': | ||
| return wrap(val => `${val}.asNumber()`); | ||
| case 'FloatTypeAnnotation': | ||
| return wrap(val => `${val}.asNumber()`); | ||
| case 'DoubleTypeAnnotation': | ||
| return wrap(val => `${val}.asNumber()`); | ||
| case 'Int32TypeAnnotation': | ||
| return wrap(val => `${val}.asNumber()`); | ||
| case 'NumberLiteralTypeAnnotation': | ||
| return wrap(val => `${val}.asNumber()`); | ||
| case 'ArrayTypeAnnotation': | ||
| return wrap(val => `${val}.asObject(rt).asArray(rt)`); | ||
| case 'FunctionTypeAnnotation': | ||
| return wrap(val => `${val}.asObject(rt).asFunction(rt)`); | ||
| case 'GenericObjectTypeAnnotation': | ||
| return wrap(val => `${val}.asObject(rt)`); | ||
| case 'UnionTypeAnnotation': | ||
| switch (typeAnnotation.memberType) { | ||
| case 'NumberTypeAnnotation': | ||
| return wrap(val => `${val}.asNumber()`); | ||
| case 'ObjectTypeAnnotation': | ||
| return wrap(val => `${val}.asObject(rt)`); | ||
| case 'StringTypeAnnotation': | ||
| return wrap(val => `${val}.asString(rt)`); | ||
| default: | ||
| throw new Error( | ||
| `Unsupported union member type for param "${arg.name}, found: ${realTypeAnnotation.memberType}"`, | ||
| ); | ||
| } | ||
| case 'ObjectTypeAnnotation': | ||
| return wrap(val => `${val}.asObject(rt)`); | ||
| case 'MixedTypeAnnotation': | ||
| return wrap(val => `jsi::Value(rt, ${val})`); | ||
| default: | ||
| realTypeAnnotation.type; | ||
| throw new Error( | ||
| `Unknown prop type for "${arg.name}, found: ${realTypeAnnotation.type}"`, | ||
| ); | ||
| } | ||
| } | ||
| function serializePropertyIntoHostFunction( | ||
| moduleName, | ||
| hasteModuleName, | ||
| property, | ||
| resolveAlias, | ||
| enumMap, | ||
| ) { | ||
| const [propertyTypeAnnotation] = unwrapNullable(property.typeAnnotation); | ||
| return HostFunctionTemplate({ | ||
| hasteModuleName, | ||
| methodName: property.name, | ||
| returnTypeAnnotation: propertyTypeAnnotation.returnTypeAnnotation, | ||
| args: propertyTypeAnnotation.params.map((p, i) => | ||
| serializeArg(moduleName, p, i, resolveAlias, enumMap), | ||
| ), | ||
| }); | ||
| } | ||
| module.exports = { | ||
| generate( | ||
| libraryName, | ||
| schema, | ||
| packageName, | ||
| assumeNonnull = false, | ||
| headerPrefix, | ||
| ) { | ||
| const nativeModules = getModules(schema); | ||
| const modules = Object.keys(nativeModules) | ||
| .map(hasteModuleName => { | ||
| const nativeModule = nativeModules[hasteModuleName]; | ||
| const { | ||
| aliasMap, | ||
| enumMap, | ||
| spec: {methods}, | ||
| moduleName, | ||
| } = nativeModule; | ||
| const resolveAlias = createAliasResolver(aliasMap); | ||
| const hostFunctions = methods.map(property => | ||
| serializePropertyIntoHostFunction( | ||
| moduleName, | ||
| hasteModuleName, | ||
| property, | ||
| resolveAlias, | ||
| enumMap, | ||
| ), | ||
| ); | ||
| return ModuleTemplate({ | ||
| hasteModuleName, | ||
| hostFunctions, | ||
| moduleName, | ||
| methods: methods.map( | ||
| ({name: propertyName, typeAnnotation: nullableTypeAnnotation}) => { | ||
| const [{params}] = unwrapNullable(nullableTypeAnnotation); | ||
| return { | ||
| methodName: propertyName, | ||
| paramCount: params.length, | ||
| }; | ||
| }, | ||
| ), | ||
| }); | ||
| }) | ||
| .join('\n'); | ||
| const fileName = `${libraryName}JSI-generated.cpp`; | ||
| const replacedTemplate = FileTemplate({ | ||
| modules, | ||
| libraryName, | ||
| }); | ||
| return new Map([[fileName, replacedTemplate]]); | ||
| }, | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,12 @@ | ||
| { | ||
| "extends": "@rnw-scripts/ts-config", | ||
| "include": ["src"], | ||
| "exclude": ["node_modules"] | ||
| } | ||
| "compilerOptions": { | ||
| "allowJs": true | ||
| }, | ||
| "include": [ | ||
| "src" | ||
| ], | ||
| "exclude": [ | ||
| "node_modules" | ||
| ] | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
looks good to me!