@react-navigation/core 7.0.0-alpha.1 → 7.0.0-alpha.3

package/src/validatePathConfig.tsx

@@ -1,28 +1,72 @@
-const formatToList = (items: string[]) =>
-  items.map((key) => `- ${key}`).join('\n');
+const formatToList = (items: Record<string, string>) =>
+  Object.entries(items)
+    .map(([key, value]) => `- ${key} (${value})`)
+    .join('\n');
 
-export function validatePathConfig(config: any, root = true) {
-  const validKeys = ['initialRouteName', 'screens'];
+export function validatePathConfig(config: unknown, root = true) {
+  const validation = {
+    path: 'string',
+    initialRouteName: 'string',
+    screens: 'object',
+    ...(root
+      ? null
+      : {
+          exact: 'boolean',
+          stringify: 'object',
+          parse: 'object',
+        }),
+  };
 
-  if (!root) {
-    validKeys.push('path', 'exact', 'stringify', 'parse');
+  if (typeof config !== 'object' || config === null) {
+    throw new Error(
+      `Expected the configuration to be an object, but got ${JSON.stringify(
+        config
+      )}.`
+    );
   }
 
-  const invalidKeys = Object.keys(config).filter(
-    (key) => !validKeys.includes(key)
+  const validationErrors = Object.fromEntries(
+    Object.keys(config)
+      .map((key) => {
+        if (key in validation) {
+          const type = validation[key as keyof typeof validation];
+          // @ts-expect-error: we know the key exists
+          const value = config[key];
+
+          if (typeof value !== type) {
+            return [key, `expected '${type}', got '${typeof value}'`];
+          }
+        } else {
+          return [key, 'extraneous'];
+        }
+
+        return null;
+      })
+      .filter(Boolean) as [string, string][]
   );
 
-  if (invalidKeys.length) {
+  if (Object.keys(validationErrors).length) {
     throw new Error(
       `Found invalid properties in the configuration:\n${formatToList(
-        invalidKeys
-      )}\n\nDid you forget to specify them under a 'screens' property?\n\nYou can only specify the following properties:\n${formatToList(
-        validKeys
-      )}\n\nSee https://reactnavigation.org/docs/configuring-links for more details on how to specify a linking configuration.`
+        validationErrors
+      )}\n\nYou can only specify the following properties:\n${formatToList(
+        validation
+      )}\n\nIf you want to specify configuration for screens, you need to specify them under a 'screens' property.\n\nSee https://reactnavigation.org/docs/configuring-links for more details on how to specify a linking configuration.`
+    );
+  }
+
+  if (
+    root &&
+    'path' in config &&
+    typeof config.path === 'string' &&
+    config.path.includes(':')
+  ) {
+    throw new Error(
+      `Found invalid path '${config.path}'. The 'path' in the top-level configuration cannot contain patterns for params.`
     );
   }
 
-  if (config.screens) {
+  if ('screens' in config && config.screens) {
     Object.entries(config.screens).forEach(([_, value]) => {
       if (typeof value !== 'string') {
         validatePathConfig(value, false);

package/lib/commonjs/fromEntries.js

@@ -1,18 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.fromEntries = fromEntries;
-// Object.fromEntries is not available in older iOS versions
-function fromEntries(entries) {
-  return entries.reduce((acc, _ref) => {
-    let [k, v] = _ref;
-    if (acc.hasOwnProperty(k)) {
-      throw new Error(`A value for key '${k}' already exists in the object.`);
-    }
-    acc[k] = v;
-    return acc;
-  }, {});
-}
-//# sourceMappingURL=fromEntries.js.map

package/lib/commonjs/fromEntries.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["fromEntries","entries","reduce","acc","k","v","hasOwnProperty","Error"],"sourceRoot":"../../src","sources":["fromEntries.tsx"],"mappings":";;;;;;AAAA;AACO,SAASA,WAAW,CAAsBC,OAA4B,EAAE;EAC7E,OAAOA,OAAO,CAACC,MAAM,CAAC,CAACC,GAAG,WAAa;IAAA,IAAX,CAACC,CAAC,EAAEC,CAAC,CAAC;IAChC,IAAIF,GAAG,CAACG,cAAc,CAACF,CAAC,CAAC,EAAE;MACzB,MAAM,IAAIG,KAAK,CAAE,oBAAmBH,CAAE,iCAAgC,CAAC;IACzE;IAEAD,GAAG,CAACC,CAAC,CAAC,GAAGC,CAAC;IACV,OAAOF,GAAG;EACZ,CAAC,EAAE,CAAC,CAAC,CAAiB;AACxB"}

package/lib/module/fromEntries.js

@@ -1,12 +0,0 @@
-// Object.fromEntries is not available in older iOS versions
-export function fromEntries(entries) {
-  return entries.reduce((acc, _ref) => {
-    let [k, v] = _ref;
-    if (acc.hasOwnProperty(k)) {
-      throw new Error(`A value for key '${k}' already exists in the object.`);
-    }
-    acc[k] = v;
-    return acc;
-  }, {});
-}
-//# sourceMappingURL=fromEntries.js.map

package/lib/module/fromEntries.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["fromEntries","entries","reduce","acc","k","v","hasOwnProperty","Error"],"sourceRoot":"../../src","sources":["fromEntries.tsx"],"mappings":"AAAA;AACA,OAAO,SAASA,WAAW,CAAsBC,OAA4B,EAAE;EAC7E,OAAOA,OAAO,CAACC,MAAM,CAAC,CAACC,GAAG,WAAa;IAAA,IAAX,CAACC,CAAC,EAAEC,CAAC,CAAC;IAChC,IAAIF,GAAG,CAACG,cAAc,CAACF,CAAC,CAAC,EAAE;MACzB,MAAM,IAAIG,KAAK,CAAE,oBAAmBH,CAAE,iCAAgC,CAAC;IACzE;IAEAD,GAAG,CAACC,CAAC,CAAC,GAAGC,CAAC;IACV,OAAOF,GAAG;EACZ,CAAC,EAAE,CAAC,CAAC,CAAiB;AACxB"}

package/lib/typescript/src/fromEntries.d.ts

@@ -1,2 +0,0 @@
-export declare function fromEntries<K extends string, V>(entries: (readonly [K, V])[]): Record<K, V>;
-//# sourceMappingURL=fromEntries.d.ts.map

package/lib/typescript/src/fromEntries.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"fromEntries.d.ts","sourceRoot":"","sources":["../../../src/fromEntries.tsx"],"names":[],"mappings":"AACA,wBAAgB,WAAW,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,gBAS5E"}

package/src/fromEntries.tsx

@@ -1,11 +0,0 @@
-// Object.fromEntries is not available in older iOS versions
-export function fromEntries<K extends string, V>(entries: (readonly [K, V])[]) {
-  return entries.reduce((acc, [k, v]) => {
-    if (acc.hasOwnProperty(k)) {
-      throw new Error(`A value for key '${k}' already exists in the object.`);
-    }
-
-    acc[k] = v;
-    return acc;
-  }, {} as Record<K, V>);
-}