metro 0.71.2 → 0.72.1

package/src/index.flow.js

@@ -355,22 +355,25 @@ exports.buildGraph = async function (
 
 exports.attachMetroCli = function (
   yargs,
-  { build = {}, serve = {}, dependencies = {} } = {}
+  // $FlowFixMe[prop-missing]
+  {
+  build = {},
+  serve = {},
+  dependencies = {}
+} = {} // prettier-ignore
 ) {
+  yargs.strict();
+
   if (build) {
-    const { command, description, builder, handler } = makeBuildCommand();
-    yargs.command(command, description, builder, handler);
+    yargs.command(makeBuildCommand());
   }
 
   if (serve) {
-    const { command, description, builder, handler } = makeServeCommand();
-    yargs.command(command, description, builder, handler);
+    yargs.command(makeServeCommand());
   }
 
   if (dependencies) {
-    const { command, description, builder, handler } =
-      makeDependenciesCommand();
-    yargs.command(command, description, builder, handler);
+    yargs.command(makeDependenciesCommand());
   }
 
   return yargs;

package/src/index.flow.js.flow

@@ -448,20 +448,23 @@ exports.attachMetroCli = function (
     serve: ServeCommandOptions,
     dependencies: any,
     ...
-  } = {},
+  }
+  // prettier-ignore
+  // $FlowFixMe[prop-missing]
+  = {},
 ): Yargs {
+  yargs.strict();
+
   if (build) {
-    const {command, description, builder, handler} = makeBuildCommand();
-    yargs.command(command, description, builder, handler);
+    yargs.command(makeBuildCommand());
   }
   if (serve) {
-    const {command, description, builder, handler} = makeServeCommand();
-    yargs.command(command, description, builder, handler);
+    yargs.command(makeServeCommand());
   }
   if (dependencies) {
-    const {command, description, builder, handler} = makeDependenciesCommand();
-    yargs.command(command, description, builder, handler);
+    yargs.command(makeDependenciesCommand());
   }
+
   return yargs;
 };
 

package/src/integration_tests/basic_bundle/require-context/conflict.js

@@ -0,0 +1,25 @@
+"use strict";
+
+var _utils = require("./utils");
+
+/**
+ * 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
+ *
+ */
+const normalModule = require("./subdir-conflict");
+
+const contextModule = require.context("./subdir-conflict");
+
+function main() {
+  return {
+    normalModule,
+    contextModule: (0, _utils.copyContextToObject)(contextModule),
+  };
+}
+
+module.exports = main();

package/src/integration_tests/basic_bundle/require-context/conflict.js.flow

@@ -0,0 +1,27 @@
+/**
+ * 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
+ * @flow strict-local
+ */
+
+import type {RequireWithContext} from './utils';
+
+import {copyContextToObject} from './utils';
+
+declare var require: RequireWithContext;
+
+const normalModule = require('./subdir-conflict');
+const contextModule = require.context('./subdir-conflict');
+
+function main() {
+  return {
+    normalModule,
+    contextModule: copyContextToObject(contextModule),
+  };
+}
+
+module.exports = (main(): mixed);

package/src/integration_tests/basic_bundle/require-context/empty.js

@@ -0,0 +1,29 @@
+"use strict";
+
+/**
+ * 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
+ *
+ */
+const empty = require.context("./no-such-dir");
+
+function main() {
+  try {
+    empty("./no-such-file.js");
+  } catch (e) {
+    return {
+      error: {
+        message: e.message,
+        code: e.code,
+      },
+    };
+  }
+
+  return null;
+}
+
+module.exports = main();

package/src/integration_tests/basic_bundle/require-context/empty.js.flow

@@ -0,0 +1,26 @@
+/**
+ * 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
+ * @flow strict-local
+ */
+
+import type {RequireWithContext} from './utils';
+
+declare var require: RequireWithContext;
+
+const empty = require.context('./no-such-dir');
+
+function main() {
+  try {
+    empty('./no-such-file.js');
+  } catch (e) {
+    return {error: {message: e.message, code: e.code}};
+  }
+  return null;
+}
+
+module.exports = (main(): mixed);

package/src/integration_tests/basic_bundle/require-context/matching.js

@@ -0,0 +1,26 @@
+"use strict";
+
+/**
+ * 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
+ *
+ */
+const ab = require.context("./subdir", false, /\/(a|b)\.js$/);
+
+const abc = require.context("./subdir", false);
+
+const abcd = require.context("./subdir", true);
+
+function main() {
+  return {
+    ab: ab.keys(),
+    abc: abc.keys(),
+    abcd: abcd.keys(),
+  };
+}
+
+module.exports = main();

package/src/integration_tests/basic_bundle/require-context/matching.js.flow

@@ -0,0 +1,27 @@
+/**
+ * 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
+ * @flow strict-local
+ */
+
+import type {RequireWithContext} from './utils';
+
+declare var require: RequireWithContext;
+
+const ab = require.context('./subdir', false, /\/(a|b)\.js$/);
+const abc = require.context('./subdir', false);
+const abcd = require.context('./subdir', true);
+
+function main() {
+  return {
+    ab: ab.keys(),
+    abc: abc.keys(),
+    abcd: abcd.keys(),
+  };
+}
+
+module.exports = (main(): mixed);

package/src/integration_tests/basic_bundle/require-context/mode-eager.js

@@ -0,0 +1,22 @@
+"use strict";
+
+var _utils = require("./utils");
+
+/**
+ * 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
+ *
+ */
+function main() {
+  return (0, _utils.awaitProperties)(
+    (0, _utils.copyContextToObject)(
+      require.context("./subdir", undefined, undefined, "eager")
+    )
+  );
+}
+
+module.exports = main();

package/src/integration_tests/basic_bundle/require-context/mode-eager.js.flow

@@ -0,0 +1,24 @@
+/**
+ * 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
+ * @flow strict-local
+ */
+
+import {copyContextToObject, awaitProperties} from './utils';
+import type {RequireWithContext} from './utils';
+
+declare var require: RequireWithContext;
+
+function main() {
+  return awaitProperties(
+    copyContextToObject(
+      require.context('./subdir', undefined, undefined, 'eager'),
+    ),
+  );
+}
+
+module.exports = (main(): mixed);

package/src/integration_tests/basic_bundle/require-context/mode-lazy-once.js

@@ -0,0 +1,22 @@
+"use strict";
+
+var _utils = require("./utils");
+
+/**
+ * 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
+ *
+ */
+function main() {
+  return (0, _utils.awaitProperties)(
+    (0, _utils.copyContextToObject)(
+      require.context("./subdir", undefined, undefined, "lazy-once")
+    )
+  );
+}
+
+module.exports = main();

package/src/integration_tests/basic_bundle/require-context/mode-lazy-once.js.flow

@@ -0,0 +1,24 @@
+/**
+ * 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
+ * @flow strict-local
+ */
+
+import {copyContextToObject, awaitProperties} from './utils';
+import type {RequireWithContext} from './utils';
+
+declare var require: RequireWithContext;
+
+function main() {
+  return awaitProperties(
+    copyContextToObject(
+      require.context('./subdir', undefined, undefined, 'lazy-once'),
+    ),
+  );
+}
+
+module.exports = (main(): mixed);

package/src/integration_tests/basic_bundle/require-context/mode-lazy.js

@@ -0,0 +1,22 @@
+"use strict";
+
+var _utils = require("./utils");
+
+/**
+ * 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
+ *
+ */
+function main() {
+  return (0, _utils.awaitProperties)(
+    (0, _utils.copyContextToObject)(
+      require.context("./subdir", undefined, undefined, "lazy")
+    )
+  );
+}
+
+module.exports = main();

package/src/integration_tests/basic_bundle/require-context/mode-lazy.js.flow

@@ -0,0 +1,24 @@
+/**
+ * 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
+ * @flow strict-local
+ */
+
+import {copyContextToObject, awaitProperties} from './utils';
+import type {RequireWithContext} from './utils';
+
+declare var require: RequireWithContext;
+
+function main() {
+  return awaitProperties(
+    copyContextToObject(
+      require.context('./subdir', undefined, undefined, 'lazy'),
+    ),
+  );
+}
+
+module.exports = (main(): mixed);

package/src/integration_tests/basic_bundle/require-context/mode-sync.js

@@ -0,0 +1,20 @@
+"use strict";
+
+var _utils = require("./utils");
+
+/**
+ * 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
+ *
+ */
+function main() {
+  return (0, _utils.copyContextToObject)(
+    require.context("./subdir", undefined, undefined, "sync")
+  );
+}
+
+module.exports = main();

package/src/integration_tests/basic_bundle/require-context/mode-sync.js.flow

@@ -0,0 +1,22 @@
+/**
+ * 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
+ * @flow strict-local
+ */
+
+import {copyContextToObject} from './utils';
+import type {RequireWithContext} from './utils';
+
+declare var require: RequireWithContext;
+
+function main() {
+  return copyContextToObject(
+    require.context('./subdir', undefined, undefined, 'sync'),
+  );
+}
+
+module.exports = (main(): mixed);

package/src/integration_tests/basic_bundle/require-context/subdir/a.js

@@ -0,0 +1,12 @@
+"use strict";
+
+/**
+ * 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
+ *
+ */
+module.exports = "a";

package/src/integration_tests/basic_bundle/require-context/subdir/a.js.flow

@@ -0,0 +1,11 @@
+/**
+ * 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
+ * @flow strict
+ */
+
+module.exports = 'a';

package/src/integration_tests/basic_bundle/require-context/subdir/b.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.default = void 0;
+
+/**
+ * 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
+ *
+ */
+var _default = "b";
+exports.default = _default;

package/src/integration_tests/basic_bundle/require-context/subdir/b.js.flow

@@ -0,0 +1,11 @@
+/**
+ * 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
+ * @flow strict
+ */
+
+export default 'b';

package/src/integration_tests/basic_bundle/require-context/subdir/c.js

@@ -0,0 +1,12 @@
+"use strict";
+
+/**
+ * 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
+ *
+ */
+module.exports = "c";

package/src/integration_tests/basic_bundle/require-context/subdir/c.js.flow

@@ -0,0 +1,11 @@
+/**
+ * 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
+ * @flow strict
+ */
+
+module.exports = 'c';

package/src/integration_tests/basic_bundle/require-context/subdir/nested/d.js

@@ -0,0 +1,12 @@
+"use strict";
+
+/**
+ * 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
+ *
+ */
+module.exports = "d";

package/src/integration_tests/basic_bundle/require-context/subdir/nested/d.js.flow

@@ -0,0 +1,11 @@
+/**
+ * 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
+ * @flow strict
+ */
+
+module.exports = 'd';

package/src/integration_tests/basic_bundle/require-context/subdir-conflict/index.js

@@ -0,0 +1,12 @@
+"use strict";
+
+/**
+ * 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
+ *
+ */
+module.exports = "contents of subdir-conflict/index.js";

package/src/integration_tests/basic_bundle/require-context/subdir-conflict/index.js.flow

@@ -0,0 +1,11 @@
+/**
+ * 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
+ * @flow strict
+ */
+
+module.exports = 'contents of subdir-conflict/index.js';

package/src/integration_tests/basic_bundle/require-context/utils.js

@@ -0,0 +1,29 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true,
+});
+exports.copyContextToObject = copyContextToObject;
+exports.awaitProperties = awaitProperties;
+
+/**
+ * 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
+ *
+ */
+function copyContextToObject(ctx) {
+  return Object.fromEntries(ctx.keys().map((key) => [key, ctx(key)]));
+}
+
+function awaitProperties(obj) {
+  const result = {};
+  return Promise.all(
+    Object.keys(obj).map((key) => {
+      return obj[key].then((value) => (result[key] = value));
+    })
+  ).then(() => result);
+}

package/src/integration_tests/basic_bundle/require-context/utils.js.flow

@@ -0,0 +1,44 @@
+/**
+ * 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
+ * @flow
+ */
+
+type ContextModule<T> = {
+  (key: string): T,
+  keys(): Array<string>,
+};
+
+export type RequireWithContext = {
+  (id: string): any,
+  resolve: (id: string, options?: {paths?: Array<string>, ...}) => string,
+  cache: any,
+  main: typeof module,
+  context<T>(
+    name: string,
+    recursive?: boolean,
+    filter?: RegExp,
+    mode?: 'sync' | 'eager' | 'lazy' | 'lazy-once',
+  ): ContextModule<T>,
+};
+
+export function copyContextToObject<T>(ctx: ContextModule<T>): {
+  [key: string]: T,
+} {
+  return Object.fromEntries(ctx.keys().map(key => [key, ctx(key)]));
+}
+
+export function awaitProperties<T>(
+  obj: $ReadOnly<{[key: string]: Promise<T>}>,
+): Promise<{[key: string]: T}> {
+  const result = {};
+  return Promise.all(
+    Object.keys(obj).map(key => {
+      return obj[key].then(value => (result[key] = value));
+    }),
+  ).then(() => result);
+}

package/src/lib/CountingSet.js

@@ -68,6 +68,7 @@ class CountingSet {
     }
   } // Iterate over unique entries
   // $FlowIssue[unsupported-syntax]
+  // $FlowFixMe[missing-local-annot]
 
   [Symbol.iterator]() {
     return this.values();

package/src/lib/CountingSet.js.flow

@@ -81,6 +81,7 @@ export default class CountingSet<T> implements ReadOnlyCountingSet<T> {
 
   // Iterate over unique entries
   // $FlowIssue[unsupported-syntax]
+  // $FlowFixMe[missing-local-annot]
   [Symbol.iterator](): Iterator<T> {
     return this.values();
   }