@react-native/codegen 0.73.0-nightly-20230807-2bf59c764 → 0.73.0-nightly-20230823-0b6e9bf0d

package/lib/cli/combine/combine-js-to-schema-cli.js

@@ -14,6 +14,7 @@
 const combine = require('./combine-js-to-schema');
 const fs = require('fs');
 const glob = require('glob');
+const path = require('path');
 const _require = require('./combine-utils'),
   parseArgs = _require.parseArgs,
   filterJSFile = _require.filterJSFile;
@@ -24,9 +25,14 @@ const _parseArgs = parseArgs(process.argv),
 const allFiles = [];
 fileList.forEach(file => {
   if (fs.lstatSync(file).isDirectory()) {
+    const filePattern = path.sep === '\\' ? file.replace(/\\/g, '/') : file;
     const dirFiles = glob
-      .sync(`${file}/**/*.{js,ts,tsx}`, {
+      .sync(`${filePattern}/**/*.{js,ts,tsx}`, {
         nodir: true,
+        // TODO: This will remove the need of slash substitution above for Windows,
+        // but it requires glob@v9+; with the package currenlty relying on
+        // glob@7.1.1; and flow-typed repo not having definitions for glob@9+.
+        // windowsPathsNoEscape: true,
       })
       .filter(element => filterJSFile(element, platform));
     allFiles.push(...dirFiles);

package/lib/cli/combine/combine-js-to-schema-cli.js.flow

@@ -14,6 +14,7 @@
 const combine = require('./combine-js-to-schema');
 const fs = require('fs');
 const glob = require('glob');
+const path = require('path');
 const {parseArgs, filterJSFile} = require('./combine-utils');
 
 const {platform, outfile, fileList} = parseArgs(process.argv);
@@ -21,9 +22,14 @@ const {platform, outfile, fileList} = parseArgs(process.argv);
 const allFiles = [];
 fileList.forEach(file => {
   if (fs.lstatSync(file).isDirectory()) {
+    const filePattern = path.sep === '\\' ? file.replace(/\\/g, '/') : file;
     const dirFiles = glob
-      .sync(`${file}/**/*.{js,ts,tsx}`, {
+      .sync(`${filePattern}/**/*.{js,ts,tsx}`, {
         nodir: true,
+        // TODO: This will remove the need of slash substitution above for Windows,
+        // but it requires glob@v9+; with the package currenlty relying on
+        // glob@7.1.1; and flow-typed repo not having definitions for glob@9+.
+        // windowsPathsNoEscape: true,
       })
       .filter(element => filterJSFile(element, platform));
     allFiles.push(...dirFiles);

package/lib/parsers/flow/components/events.js

@@ -17,7 +17,8 @@ const _require = require('../../error-utils'),
 const _require2 = require('../../parsers-commons'),
   getEventArgument = _require2.getEventArgument,
   buildPropertiesForEvent = _require2.buildPropertiesForEvent,
-  handleEventHandler = _require2.handleEventHandler;
+  handleEventHandler = _require2.handleEventHandler,
+  emitBuildEventSchema = _require2.emitBuildEventSchema;
 const _require3 = require('../../parsers-primitives'),
   emitBoolProp = _require3.emitBoolProp,
   emitDoubleProp = _require3.emitDoubleProp,
@@ -227,35 +228,18 @@ function buildEventSchema(types, property, parser) {
     name,
   );
   const nonNullableBubblingType = throwIfBubblingTypeIsNull(bubblingType, name);
-  if (paperTopLevelNameDeprecated != null) {
-    return {
-      name,
-      optional,
-      bubblingType: nonNullableBubblingType,
-      paperTopLevelNameDeprecated,
-      typeAnnotation: {
-        type: 'EventTypeAnnotation',
-        argument: getEventArgument(
-          nonNullableArgumentProps,
-          parser,
-          getPropertyType,
-        ),
-      },
-    };
-  }
-  return {
+  const argument = getEventArgument(
+    nonNullableArgumentProps,
+    parser,
+    getPropertyType,
+  );
+  return emitBuildEventSchema(
+    paperTopLevelNameDeprecated,
     name,
     optional,
-    bubblingType: nonNullableBubblingType,
-    typeAnnotation: {
-      type: 'EventTypeAnnotation',
-      argument: getEventArgument(
-        nonNullableArgumentProps,
-        parser,
-        getPropertyType,
-      ),
-    },
-  };
+    nonNullableBubblingType,
+    argument,
+  );
 }
 
 // $FlowFixMe[unclear-type] there's no flowtype for ASTs

package/lib/parsers/flow/components/events.js.flow

@@ -27,6 +27,7 @@ const {
   getEventArgument,
   buildPropertiesForEvent,
   handleEventHandler,
+  emitBuildEventSchema,
 } = require('../../parsers-commons');
 const {
   emitBoolProp,
@@ -245,36 +246,19 @@ function buildEventSchema(
   );
   const nonNullableBubblingType = throwIfBubblingTypeIsNull(bubblingType, name);
 
-  if (paperTopLevelNameDeprecated != null) {
-    return {
-      name,
-      optional,
-      bubblingType: nonNullableBubblingType,
-      paperTopLevelNameDeprecated,
-      typeAnnotation: {
-        type: 'EventTypeAnnotation',
-        argument: getEventArgument(
-          nonNullableArgumentProps,
-          parser,
-          getPropertyType,
-        ),
-      },
-    };
-  }
+  const argument = getEventArgument(
+    nonNullableArgumentProps,
+    parser,
+    getPropertyType,
+  );
 
-  return {
+  return emitBuildEventSchema(
+    paperTopLevelNameDeprecated,
     name,
     optional,
-    bubblingType: nonNullableBubblingType,
-    typeAnnotation: {
-      type: 'EventTypeAnnotation',
-      argument: getEventArgument(
-        nonNullableArgumentProps,
-        parser,
-        getPropertyType,
-      ),
-    },
-  };
+    nonNullableBubblingType,
+    argument,
+  );
 }
 
 // $FlowFixMe[unclear-type] there's no flowtype for ASTs

package/lib/parsers/parsers-commons.js

@@ -1035,6 +1035,35 @@ function handleEventHandler(
       );
   }
 }
+function emitBuildEventSchema(
+  paperTopLevelNameDeprecated,
+  name,
+  optional,
+  nonNullableBubblingType,
+  argument,
+) {
+  if (paperTopLevelNameDeprecated != null) {
+    return {
+      name,
+      optional,
+      bubblingType: nonNullableBubblingType,
+      paperTopLevelNameDeprecated,
+      typeAnnotation: {
+        type: 'EventTypeAnnotation',
+        argument: argument,
+      },
+    };
+  }
+  return {
+    name,
+    optional,
+    bubblingType: nonNullableBubblingType,
+    typeAnnotation: {
+      type: 'EventTypeAnnotation',
+      argument: argument,
+    },
+  };
+}
 module.exports = {
   wrapModuleSchema,
   unwrapNullable,
@@ -1064,4 +1093,5 @@ module.exports = {
   buildPropertiesForEvent,
   verifyPropNotAlreadyDefined,
   handleEventHandler,
+  emitBuildEventSchema,
 };

package/lib/parsers/parsers-commons.js.flow

@@ -26,6 +26,7 @@ import type {
   PropTypeAnnotation,
   EventTypeAnnotation,
   ObjectTypeAnnotation,
+  EventTypeShape,
 } from '../CodegenSchema.js';
 
 import type {Parser} from './parser';
@@ -1125,6 +1126,37 @@ function handleEventHandler(
   }
 }
 
+function emitBuildEventSchema(
+  paperTopLevelNameDeprecated: $FlowFixMe,
+  name: $FlowFixMe,
+  optional: $FlowFixMe,
+  nonNullableBubblingType: 'direct' | 'bubble',
+  argument: ObjectTypeAnnotation<EventTypeAnnotation>,
+): ?EventTypeShape {
+  if (paperTopLevelNameDeprecated != null) {
+    return {
+      name,
+      optional,
+      bubblingType: nonNullableBubblingType,
+      paperTopLevelNameDeprecated,
+      typeAnnotation: {
+        type: 'EventTypeAnnotation',
+        argument: argument,
+      },
+    };
+  }
+
+  return {
+    name,
+    optional,
+    bubblingType: nonNullableBubblingType,
+    typeAnnotation: {
+      type: 'EventTypeAnnotation',
+      argument: argument,
+    },
+  };
+}
+
 module.exports = {
   wrapModuleSchema,
   unwrapNullable,
@@ -1154,4 +1186,5 @@ module.exports = {
   buildPropertiesForEvent,
   verifyPropNotAlreadyDefined,
   handleEventHandler,
+  emitBuildEventSchema,
 };

package/lib/parsers/typescript/components/events.js

@@ -21,7 +21,8 @@ const _require3 = require('../../error-utils'),
 const _require4 = require('../../parsers-commons'),
   getEventArgument = _require4.getEventArgument,
   buildPropertiesForEvent = _require4.buildPropertiesForEvent,
-  handleEventHandler = _require4.handleEventHandler;
+  handleEventHandler = _require4.handleEventHandler,
+  emitBuildEventSchema = _require4.emitBuildEventSchema;
 const _require5 = require('../../parsers-primitives'),
   emitBoolProp = _require5.emitBoolProp,
   emitDoubleProp = _require5.emitDoubleProp,
@@ -236,35 +237,18 @@ function buildEventSchema(types, property, parser) {
     name,
   );
   const nonNullableBubblingType = throwIfBubblingTypeIsNull(bubblingType, name);
-  if (paperTopLevelNameDeprecated != null) {
-    return {
-      name,
-      optional,
-      bubblingType: nonNullableBubblingType,
-      paperTopLevelNameDeprecated,
-      typeAnnotation: {
-        type: 'EventTypeAnnotation',
-        argument: getEventArgument(
-          nonNullableArgumentProps,
-          parser,
-          getPropertyType,
-        ),
-      },
-    };
-  }
-  return {
+  const argument = getEventArgument(
+    nonNullableArgumentProps,
+    parser,
+    getPropertyType,
+  );
+  return emitBuildEventSchema(
+    paperTopLevelNameDeprecated,
     name,
     optional,
-    bubblingType: nonNullableBubblingType,
-    typeAnnotation: {
-      type: 'EventTypeAnnotation',
-      argument: getEventArgument(
-        nonNullableArgumentProps,
-        parser,
-        getPropertyType,
-      ),
-    },
-  };
+    nonNullableBubblingType,
+    argument,
+  );
 }
 function getEvents(eventTypeAST, types, parser) {
   return eventTypeAST

package/lib/parsers/typescript/components/events.js.flow

@@ -28,6 +28,7 @@ const {
   getEventArgument,
   buildPropertiesForEvent,
   handleEventHandler,
+  emitBuildEventSchema,
 } = require('../../parsers-commons');
 const {
   emitBoolProp,
@@ -259,36 +260,19 @@ function buildEventSchema(
   );
   const nonNullableBubblingType = throwIfBubblingTypeIsNull(bubblingType, name);
 
-  if (paperTopLevelNameDeprecated != null) {
-    return {
-      name,
-      optional,
-      bubblingType: nonNullableBubblingType,
-      paperTopLevelNameDeprecated,
-      typeAnnotation: {
-        type: 'EventTypeAnnotation',
-        argument: getEventArgument(
-          nonNullableArgumentProps,
-          parser,
-          getPropertyType,
-        ),
-      },
-    };
-  }
+  const argument = getEventArgument(
+    nonNullableArgumentProps,
+    parser,
+    getPropertyType,
+  );
 
-  return {
+  return emitBuildEventSchema(
+    paperTopLevelNameDeprecated,
     name,
     optional,
-    bubblingType: nonNullableBubblingType,
-    typeAnnotation: {
-      type: 'EventTypeAnnotation',
-      argument: getEventArgument(
-        nonNullableArgumentProps,
-        parser,
-        getPropertyType,
-      ),
-    },
-  };
+    nonNullableBubblingType,
+    argument,
+  );
 }
 
 function getEvents(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/codegen",
-  "version": "0.73.0-nightly-20230807-2bf59c764",
+  "version": "0.73.0-nightly-20230823-0b6e9bf0d",
   "description": "Code generation tools for React Native",
   "license": "MIT",
   "repository": {