@react-native-windows/codegen 0.67.1 → 0.68.0

package/src/Cli.ts

@@ -7,7 +7,7 @@
 
 import yargs from 'yargs';
 import path from 'path';
-import fs from 'fs';
+import fs from '@react-native-windows/fs';
 import globby from 'globby';
 import {createNM2Generator} from './generators/GenerateNM2';
 // @ts-ignore
@@ -98,9 +98,11 @@ function checkFilesForChanges(
 
   const allExistingFiles = globby
     .sync(`${outputDir}/**`)
-    .map(_ => path.normalize(_))
+    .map((_) => path.normalize(_))
+    .sort();
+  const allGeneratedFiles = [...map.keys()]
+    .map((_) => path.normalize(_))
     .sort();
-  const allGeneratedFiles = [...map.keys()].map(_ => path.normalize(_)).sort();
 
   if (
     allExistingFiles.length !== allGeneratedFiles.length ||
@@ -130,7 +132,7 @@ function writeMapToFiles(map: Map<string, string>, outputDir: string) {
 
   // This ensures that we delete any generated files from modules that have been deleted
   const allExistingFiles = globby.sync(`${outputDir}/**`);
-  allExistingFiles.forEach(existingFile => {
+  allExistingFiles.forEach((existingFile) => {
     if (!map.has(path.normalize(existingFile))) {
       fs.unlinkSync(existingFile);
     }
@@ -207,18 +209,18 @@ function generate(
   );
 
   const generateNM2 = createNM2Generator({namespace: argv.namespace});
-  const generatorPropsH = require('react-native-tscodegen/lib/rncodegen/src/generators/components/GeneratePropsH')
-    .generate;
-  const generatorPropsCPP = require('react-native-tscodegen/lib/rncodegen/src/generators/components/GeneratePropsCPP')
-    .generate;
-  const generatorShadowNodeH = require('react-native-tscodegen/lib/rncodegen/src/generators/components/GenerateShadowNodeH')
-    .generate;
-  const generatorShadowNodeCPP = require('react-native-tscodegen/lib/rncodegen/src/generators/components/GenerateShadowNodeCPP')
-    .generate;
-  const generatorComponentDescriptorH = require('react-native-tscodegen/lib/rncodegen/src/generators/components/GenerateComponentDescriptorH')
-    .generate;
-  const generatorEventEmitterH = require('react-native-tscodegen/lib/rncodegen/src/generators/components/GenerateEventEmitterH')
-    .generate;
+  const generatorPropsH =
+    require('react-native-tscodegen/lib/rncodegen/src/generators/components/GeneratePropsH').generate;
+  const generatorPropsCPP =
+    require('react-native-tscodegen/lib/rncodegen/src/generators/components/GeneratePropsCPP').generate;
+  const generatorShadowNodeH =
+    require('react-native-tscodegen/lib/rncodegen/src/generators/components/GenerateShadowNodeH').generate;
+  const generatorShadowNodeCPP =
+    require('react-native-tscodegen/lib/rncodegen/src/generators/components/GenerateShadowNodeCPP').generate;
+  const generatorComponentDescriptorH =
+    require('react-native-tscodegen/lib/rncodegen/src/generators/components/GenerateComponentDescriptorH').generate;
+  const generatorEventEmitterH =
+    require('react-native-tscodegen/lib/rncodegen/src/generators/components/GenerateEventEmitterH').generate;
 
   normalizeFileMap(
     generateNM2(libraryName, schema, moduleSpecName),
@@ -228,7 +230,7 @@ function generate(
 
   if (
     Object.keys(schema.modules).some(
-      moduleName => schema.modules[moduleName].type === 'Component',
+      (moduleName) => schema.modules[moduleName].type === 'Component',
     )
   ) {
     const componentGenerators = [
@@ -240,7 +242,7 @@ function generate(
       generatorEventEmitterH,
     ];
 
-    componentGenerators.forEach(generator => {
+    componentGenerators.forEach((generator) => {
       const generated: Map<string, string> = generator(
         libraryName,
         schema,

package/src/generators/ObjectTypes.ts

@@ -39,10 +39,10 @@ export function translateField(
           `${baseAliasName}_element`,
         )}>`;
       } else {
-        return `React::JSValueArray`;
+        return `::React::JSValueArray`;
       }
     case 'GenericObjectTypeAnnotation':
-      return 'React::JSValue';
+      return '::React::JSValue';
     case 'ObjectTypeAnnotation':
       return getAnonymousAliasCppName(aliases, baseAliasName, type);
     case 'ReservedTypeAnnotation': {

package/src/generators/ParamTypes.ts

@@ -102,10 +102,10 @@ function translateParam(
             )}> const &`;
         }
       } else {
-        return decorateType('React::JSValueArray', target);
+        return decorateType('::React::JSValueArray', target);
       }
     case 'GenericObjectTypeAnnotation':
-      return decorateType('React::JSValue', target);
+      return decorateType('::React::JSValue', target);
     case 'ObjectTypeAnnotation':
       return decorateType(
         getAnonymousAliasCppName(aliases, baseAliasName, param),
@@ -194,7 +194,7 @@ export function translateSpecArgs(
   aliases: AliasMap,
   baseAliasName: string,
 ) {
-  return params.map(param => {
+  return params.map((param) => {
     const translatedParam = translateSpecFunctionParam(
       param,
       aliases,
@@ -209,7 +209,7 @@ export function translateArgs(
   aliases: AliasMap,
   baseAliasName: string,
 ) {
-  return params.map(param => {
+  return params.map((param) => {
     const translatedParam = translateFunctionParam(
       param,
       aliases,

package/src/generators/ReturnTypes.ts

@@ -45,10 +45,10 @@ function translateReturnType(
           `${baseAliasName}_element`,
         )}>`;
       } else {
-        return 'React::JSValueArray';
+        return '::React::JSValueArray';
       }
     case 'GenericObjectTypeAnnotation':
-      return 'React::JSValue';
+      return '::React::JSValue';
     case 'ObjectTypeAnnotation':
       return getAnonymousAliasCppName(aliases, baseAliasName, type);
     case 'ReservedTypeAnnotation': {

package/src/generators/ValidateConstants.ts

@@ -14,7 +14,7 @@ export function generateValidateConstants(
   aliases: AliasMap,
 ): [string, string] | undefined {
   const candidates = nativeModule.spec.properties.filter(
-    prop => prop.name === 'getConstants',
+    (prop) => prop.name === 'getConstants',
   );
   if (candidates.length === 0) {
     return undefined;

package/src/generators/ValidateMethods.ts

@@ -35,7 +35,7 @@ function getPossibleMethodSignatures(
   const args = translateArgs(funcType.params, aliases, baseAliasName);
   if (isMethodReturnPromise(funcType)) {
     // TODO: type of the promise could be provided in the future
-    args.push('React::ReactPromise<React::JSValue> &&result');
+    args.push('::React::ReactPromise<::React::JSValue> &&result');
   }
 
   // TODO: be much more exhastive on the possible method signatures that can be used..
@@ -65,7 +65,7 @@ function translatePossibleMethodSignatures(
   baseAliasName: string,
 ): string {
   return getPossibleMethodSignatures(prop, funcType, aliases, baseAliasName)
-    .map(sig => `"    ${sig}\\n"`)
+    .map((sig) => `"    ${sig}\\n"`)
     .join('\n          ');
 }
 
@@ -76,7 +76,7 @@ function renderProperties(
 ): string {
   // TODO: generate code for constants
   return properties
-    .filter(prop => prop.name !== 'getConstants')
+    .filter((prop) => prop.name !== 'getConstants')
     .map((prop, index) => {
       // TODO: prop.optional === true
       // TODO: prop.typeAnnotation.type === 'NullableTypeAnnotation'
@@ -100,7 +100,7 @@ function renderProperties(
 
       if (isMethodReturnPromise(funcType)) {
         // TODO: type of the promise could be provided in the future
-        traversedArgs.push('Promise<React::JSValue>');
+        traversedArgs.push('Promise<::React::JSValue>');
       }
 
       if (tuple) {