payload 3.0.0-beta.7 → 3.0.0-beta.71

package/dist/config/find.js

@@ -1,34 +1,28 @@
-import findUp from 'find-up';
-import fs from 'fs';
+import { findUpSync, pathExistsSync } from 'find-up';
+import { getTsconfig } from 'get-tsconfig';
 import path from 'path';
 /**
  * Returns the source and output paths from the nearest tsconfig.json file.
  * If no tsconfig.json file is found, returns the current working directory.
  * @returns An object containing the source and output paths.
  */ const getTSConfigPaths = ()=>{
-    const tsConfigPath = findUp.sync('tsconfig.json');
-    if (!tsConfigPath) {
-        return {
-            rootPath: process.cwd()
-        };
-    }
+    const tsConfigResult = getTsconfig();
+    const tsConfig = tsConfigResult.config;
+    const tsConfigDir = path.dirname(tsConfigResult.path);
     try {
-        // Read the file as a string and remove trailing commas
-        const rawTsConfig = fs.readFileSync(tsConfigPath, 'utf-8').replace(/,\s*\]/g, ']').replace(/,\s*\}/g, '}');
-        const tsConfig = JSON.parse(rawTsConfig);
-        const rootPath = process.cwd();
+        const rootConfigDir = path.resolve(tsConfigDir, tsConfig.compilerOptions.baseUrl || '');
         const srcPath = tsConfig.compilerOptions?.rootDir || path.resolve(process.cwd(), 'src');
         const outPath = tsConfig.compilerOptions?.outDir || path.resolve(process.cwd(), 'dist');
-        const tsConfigDir = path.dirname(tsConfigPath);
-        let configPath = tsConfig.compilerOptions?.paths?.['@payload-config']?.[0];
+        let configPath = path.resolve(rootConfigDir, tsConfig.compilerOptions?.paths?.['@payload-config']?.[0]);
         if (configPath) {
-            configPath = path.resolve(tsConfigDir, configPath);
+            configPath = path.resolve(rootConfigDir, configPath);
         }
         return {
             configPath,
             outPath,
-            rootPath,
-            srcPath
+            rootPath: rootConfigDir,
+            srcPath,
+            tsConfigPath: tsConfigResult.path
         };
     } catch (error) {
         console.error(`Error parsing tsconfig.json: ${error}`) // Do not throw the error, as we can still continue with the other config path finding methods
@@ -52,6 +46,10 @@ import path from 'path';
         return path.resolve(process.cwd(), process.env.PAYLOAD_CONFIG_PATH);
     }
     const { configPath, outPath, rootPath, srcPath } = getTSConfigPaths();
+    // if configPath is absolute file, not folder, return it
+    if (path.extname(configPath) === '.js' || path.extname(configPath) === '.ts') {
+        return configPath;
+    }
     const searchPaths = process.env.NODE_ENV === 'production' ? [
         configPath,
         outPath,
@@ -62,17 +60,16 @@ import path from 'path';
         srcPath,
         rootPath
     ];
-    // eslint-disable-next-line no-restricted-syntax
     for (const searchPath of searchPaths){
         if (!searchPath) continue;
-        const configPath = findUp.sync((dir)=>{
+        const configPath = findUpSync((dir)=>{
             const tsPath = path.join(dir, 'payload.config.ts');
-            const hasTS = findUp.sync.exists(tsPath);
+            const hasTS = pathExistsSync(tsPath);
             if (hasTS) {
                 return tsPath;
             }
             const jsPath = path.join(dir, 'payload.config.js');
-            const hasJS = findUp.sync.exists(jsPath);
+            const hasJS = pathExistsSync(jsPath);
             if (hasJS) {
                 return jsPath;
             }
@@ -87,7 +84,7 @@ import path from 'path';
     // If no config file is found in the directories defined by tsconfig.json,
     // try searching in the 'src' and 'dist' directory as a last resort, as they are most commonly used
     if (process.env.NODE_ENV === 'production') {
-        const distConfigPath = findUp.sync([
+        const distConfigPath = findUpSync([
             'payload.config.js',
             'payload.config.ts'
         ], {
@@ -95,7 +92,7 @@ import path from 'path';
         });
         if (distConfigPath) return distConfigPath;
     } else {
-        const srcConfigPath = findUp.sync([
+        const srcConfigPath = findUpSync([
             'payload.config.js',
             'payload.config.ts'
         ], {

package/dist/config/find.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/config/find.ts"],"sourcesContent":["import findUp from 'find-up'\nimport fs from 'fs'\nimport path from 'path'\n\n/**\n * Returns the source and output paths from the nearest tsconfig.json file.\n * If no tsconfig.json file is found, returns the current working directory.\n * @returns An object containing the source and output paths.\n */\nconst getTSConfigPaths = (): {\n  configPath?: string\n  outPath?: string\n  rootPath?: string\n  srcPath?: string\n} => {\n  const tsConfigPath = findUp.sync('tsconfig.json')\n\n  if (!tsConfigPath) {\n    return {\n      rootPath: process.cwd(),\n    }\n  }\n\n  try {\n    // Read the file as a string and remove trailing commas\n    const rawTsConfig = fs\n      .readFileSync(tsConfigPath, 'utf-8')\n      .replace(/,\\s*\\]/g, ']')\n      .replace(/,\\s*\\}/g, '}')\n\n    const tsConfig = JSON.parse(rawTsConfig)\n\n    const rootPath = process.cwd()\n    const srcPath = tsConfig.compilerOptions?.rootDir || path.resolve(process.cwd(), 'src')\n    const outPath = tsConfig.compilerOptions?.outDir || path.resolve(process.cwd(), 'dist')\n    const tsConfigDir = path.dirname(tsConfigPath)\n    let configPath = tsConfig.compilerOptions?.paths?.['@payload-config']?.[0]\n    if (configPath) {\n      configPath = path.resolve(tsConfigDir, configPath)\n    }\n    return {\n      configPath,\n      outPath,\n      rootPath,\n      srcPath,\n    }\n  } catch (error) {\n    console.error(`Error parsing tsconfig.json: ${error}`) // Do not throw the error, as we can still continue with the other config path finding methods\n    return {\n      rootPath: process.cwd(),\n    }\n  }\n}\n\n/**\n * Searches for a Payload configuration file.\n * @returns The absolute path to the Payload configuration file.\n * @throws An error if no configuration file is found.\n */\nexport const findConfig = (): string => {\n  // If the developer has specified a config path,\n  // format it if relative and use it directly if absolute\n  if (process.env.PAYLOAD_CONFIG_PATH) {\n    if (path.isAbsolute(process.env.PAYLOAD_CONFIG_PATH)) {\n      return process.env.PAYLOAD_CONFIG_PATH\n    }\n\n    return path.resolve(process.cwd(), process.env.PAYLOAD_CONFIG_PATH)\n  }\n\n  const { configPath, outPath, rootPath, srcPath } = getTSConfigPaths()\n\n  const searchPaths =\n    process.env.NODE_ENV === 'production'\n      ? [configPath, outPath, srcPath, rootPath]\n      : [configPath, srcPath, rootPath]\n\n  // eslint-disable-next-line no-restricted-syntax\n  for (const searchPath of searchPaths) {\n    if (!searchPath) continue\n\n    const configPath = findUp.sync(\n      (dir) => {\n        const tsPath = path.join(dir, 'payload.config.ts')\n        const hasTS = findUp.sync.exists(tsPath)\n\n        if (hasTS) {\n          return tsPath\n        }\n\n        const jsPath = path.join(dir, 'payload.config.js')\n        const hasJS = findUp.sync.exists(jsPath)\n\n        if (hasJS) {\n          return jsPath\n        }\n\n        return undefined\n      },\n      { cwd: searchPath },\n    )\n\n    if (configPath) {\n      return configPath\n    }\n  }\n\n  // If no config file is found in the directories defined by tsconfig.json,\n  // try searching in the 'src' and 'dist' directory as a last resort, as they are most commonly used\n  if (process.env.NODE_ENV === 'production') {\n    const distConfigPath = findUp.sync(['payload.config.js', 'payload.config.ts'], {\n      cwd: path.resolve(process.cwd(), 'dist'),\n    })\n\n    if (distConfigPath) return distConfigPath\n  } else {\n    const srcConfigPath = findUp.sync(['payload.config.js', 'payload.config.ts'], {\n      cwd: path.resolve(process.cwd(), 'src'),\n    })\n\n    if (srcConfigPath) return srcConfigPath\n  }\n\n  throw new Error(\n    'Error: cannot find Payload config. Please create a configuration file located at the root of your current working directory called \"payload.config.js\" or \"payload.config.ts\".',\n  )\n}\n"],"names":["findUp","fs","path","getTSConfigPaths","tsConfigPath","sync","rootPath","process","cwd","rawTsConfig","readFileSync","replace","tsConfig","JSON","parse","srcPath","compilerOptions","rootDir","resolve","outPath","outDir","tsConfigDir","dirname","configPath","paths","error","console","findConfig","env","PAYLOAD_CONFIG_PATH","isAbsolute","searchPaths","NODE_ENV","searchPath","dir","tsPath","join","hasTS","exists","jsPath","hasJS","undefined","distConfigPath","srcConfigPath","Error"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../src/config/find.ts"],"sourcesContent":["import { findUpSync, pathExistsSync } from 'find-up'\nimport { getTsconfig } from 'get-tsconfig'\nimport path from 'path'\n\n/**\n * Returns the source and output paths from the nearest tsconfig.json file.\n * If no tsconfig.json file is found, returns the current working directory.\n * @returns An object containing the source and output paths.\n */\nconst getTSConfigPaths = (): {\n  configPath?: string\n  outPath?: string\n  rootPath?: string\n  srcPath?: string\n  tsConfigPath?: string\n} => {\n  const tsConfigResult = getTsconfig()\n  const tsConfig = tsConfigResult.config\n  const tsConfigDir = path.dirname(tsConfigResult.path)\n\n  try {\n    const rootConfigDir = path.resolve(tsConfigDir, tsConfig.compilerOptions.baseUrl || '')\n    const srcPath = tsConfig.compilerOptions?.rootDir || path.resolve(process.cwd(), 'src')\n    const outPath = tsConfig.compilerOptions?.outDir || path.resolve(process.cwd(), 'dist')\n    let configPath = path.resolve(\n      rootConfigDir,\n      tsConfig.compilerOptions?.paths?.['@payload-config']?.[0],\n    )\n\n    if (configPath) {\n      configPath = path.resolve(rootConfigDir, configPath)\n    }\n    return {\n      configPath,\n      outPath,\n      rootPath: rootConfigDir,\n      srcPath,\n      tsConfigPath: tsConfigResult.path,\n    }\n  } catch (error) {\n    console.error(`Error parsing tsconfig.json: ${error}`) // Do not throw the error, as we can still continue with the other config path finding methods\n    return {\n      rootPath: process.cwd(),\n    }\n  }\n}\n\n/**\n * Searches for a Payload configuration file.\n * @returns The absolute path to the Payload configuration file.\n * @throws An error if no configuration file is found.\n */\nexport const findConfig = (): string => {\n  // If the developer has specified a config path,\n  // format it if relative and use it directly if absolute\n  if (process.env.PAYLOAD_CONFIG_PATH) {\n    if (path.isAbsolute(process.env.PAYLOAD_CONFIG_PATH)) {\n      return process.env.PAYLOAD_CONFIG_PATH\n    }\n\n    return path.resolve(process.cwd(), process.env.PAYLOAD_CONFIG_PATH)\n  }\n\n  const { configPath, outPath, rootPath, srcPath } = getTSConfigPaths()\n\n  // if configPath is absolute file, not folder, return it\n  if (path.extname(configPath) === '.js' || path.extname(configPath) === '.ts') {\n    return configPath\n  }\n\n  const searchPaths =\n    process.env.NODE_ENV === 'production'\n      ? [configPath, outPath, srcPath, rootPath]\n      : [configPath, srcPath, rootPath]\n\n  for (const searchPath of searchPaths) {\n    if (!searchPath) continue\n\n    const configPath = findUpSync(\n      (dir) => {\n        const tsPath = path.join(dir, 'payload.config.ts')\n        const hasTS = pathExistsSync(tsPath)\n\n        if (hasTS) {\n          return tsPath\n        }\n\n        const jsPath = path.join(dir, 'payload.config.js')\n        const hasJS = pathExistsSync(jsPath)\n\n        if (hasJS) {\n          return jsPath\n        }\n\n        return undefined\n      },\n      { cwd: searchPath },\n    )\n\n    if (configPath) {\n      return configPath\n    }\n  }\n\n  // If no config file is found in the directories defined by tsconfig.json,\n  // try searching in the 'src' and 'dist' directory as a last resort, as they are most commonly used\n  if (process.env.NODE_ENV === 'production') {\n    const distConfigPath = findUpSync(['payload.config.js', 'payload.config.ts'], {\n      cwd: path.resolve(process.cwd(), 'dist'),\n    })\n\n    if (distConfigPath) return distConfigPath\n  } else {\n    const srcConfigPath = findUpSync(['payload.config.js', 'payload.config.ts'], {\n      cwd: path.resolve(process.cwd(), 'src'),\n    })\n\n    if (srcConfigPath) return srcConfigPath\n  }\n\n  throw new Error(\n    'Error: cannot find Payload config. Please create a configuration file located at the root of your current working directory called \"payload.config.js\" or \"payload.config.ts\".',\n  )\n}\n"],"names":["findUpSync","pathExistsSync","getTsconfig","path","getTSConfigPaths","tsConfigResult","tsConfig","config","tsConfigDir","dirname","rootConfigDir","resolve","compilerOptions","baseUrl","srcPath","rootDir","process","cwd","outPath","outDir","configPath","paths","rootPath","tsConfigPath","error","console","findConfig","env","PAYLOAD_CONFIG_PATH","isAbsolute","extname","searchPaths","NODE_ENV","searchPath","dir","tsPath","join","hasTS","jsPath","hasJS","undefined","distConfigPath","srcConfigPath","Error"],"mappings":"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"}

package/dist/config/sanitize.d.ts

@@ -1,3 +1,3 @@
 import type { Config, SanitizedConfig } from './types.js';
-export declare const sanitizeConfig: (incomingConfig: Config) => SanitizedConfig;
+export declare const sanitizeConfig: (incomingConfig: Config) => Promise<SanitizedConfig>;
 //# sourceMappingURL=sanitize.d.ts.map

package/dist/config/sanitize.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sanitize.d.ts","sourceRoot":"","sources":["../../src/config/sanitize.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,MAAM,EAGN,eAAe,EAChB,MAAM,YAAY,CAAA;AAmCnB,eAAO,MAAM,cAAc,mBAAoB,MAAM,KAAG,eAsEvD,CAAA"}
+{"version":3,"file":"sanitize.d.ts","sourceRoot":"","sources":["../../src/config/sanitize.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,MAAM,EAGN,eAAe,EAChB,MAAM,YAAY,CAAA;AAsCnB,eAAO,MAAM,cAAc,mBAA0B,MAAM,KAAG,OAAO,CAAC,eAAe,CAgIpF,CAAA"}

package/dist/config/sanitize.js

@@ -1,13 +1,13 @@
 import { en } from '@payloadcms/translations/languages/en';
-import merge from 'deepmerge';
+import { deepMergeSimple } from '@payloadcms/translations/utilities';
 import { defaultUserCollection } from '../auth/defaultUser.js';
-import sanitizeCollection from '../collections/config/sanitize.js';
+import { sanitizeCollection } from '../collections/config/sanitize.js';
 import { migrationsCollection } from '../database/migrations/migrationsCollection.js';
 import { InvalidConfiguration } from '../errors/index.js';
-import sanitizeGlobals from '../globals/config/sanitize.js';
+import { sanitizeGlobals } from '../globals/config/sanitize.js';
 import getPreferencesCollection from '../preferences/preferencesCollection.js';
 import checkDuplicateCollections from '../utilities/checkDuplicateCollections.js';
-import { isPlainObject } from '../utilities/isPlainObject.js';
+import { deepMergeWithReactComponents } from '../utilities/deepMerge.js';
 import { defaults } from './defaults.js';
 const sanitizeAdminConfig = (configToSanitize)=>{
     const sanitizedConfig = {
@@ -23,18 +23,23 @@ const sanitizeAdminConfig = (configToSanitize)=>{
             sanitizedConfig.collections.push(defaultUserCollection);
         }
     }
-    if (!sanitizedConfig.collections.find(({ slug })=>slug === sanitizedConfig.admin.user)) {
+    const userCollection = sanitizedConfig.collections.find(({ slug })=>slug === sanitizedConfig.admin.user);
+    if (!userCollection || !userCollection.auth) {
         throw new InvalidConfiguration(`${sanitizedConfig.admin.user} is not a valid admin user collection`);
     }
     return sanitizedConfig;
 };
-export const sanitizeConfig = (incomingConfig)=>{
-    const configWithDefaults = merge(defaults, incomingConfig, {
-        isMergeableObject: isPlainObject
-    });
+export const sanitizeConfig = async (incomingConfig)=>{
+    const configWithDefaults = deepMergeWithReactComponents(defaults, incomingConfig);
     if (!configWithDefaults?.serverURL) {
         configWithDefaults.serverURL = '';
     }
+    if (process.env.NEXT_BASE_PATH) {
+        if (!incomingConfig?.routes?.api) {
+            // check for incomingConfig, as configWithDefaults will always have a default value for routes.api
+            configWithDefaults.routes.api = process.env.NEXT_BASE_PATH + '/api';
+        }
+    }
     const config = sanitizeAdminConfig(configWithDefaults);
     if (config.localization && config.localization.locales?.length > 0) {
         // clone localization config so to not break everything
@@ -62,24 +67,57 @@ export const sanitizeConfig = (incomingConfig)=>{
                 }));
         }
     }
-    config.i18n = {
+    const i18nConfig = {
         fallbackLanguage: 'en',
         supportedLanguages: {
             en
         },
-        translations: {},
-        ...incomingConfig?.i18n ?? {}
+        translations: {}
     };
-    configWithDefaults.collections.push(getPreferencesCollection(configWithDefaults));
+    if (incomingConfig?.i18n) {
+        i18nConfig.supportedLanguages = incomingConfig.i18n?.supportedLanguages || i18nConfig.supportedLanguages;
+        const supportedLangKeys = Object.keys(i18nConfig.supportedLanguages);
+        const fallbackLang = incomingConfig.i18n?.fallbackLanguage || i18nConfig.fallbackLanguage;
+        i18nConfig.fallbackLanguage = supportedLangKeys.includes(fallbackLang) ? fallbackLang : supportedLangKeys[0];
+        i18nConfig.translations = incomingConfig.i18n?.translations || i18nConfig.translations;
+    }
+    config.i18n = i18nConfig;
+    configWithDefaults.collections.push(getPreferencesCollection(config));
     configWithDefaults.collections.push(migrationsCollection);
-    config.collections = config.collections.map((collection)=>sanitizeCollection(configWithDefaults, collection));
+    const richTextSanitizationPromises = [];
+    for(let i = 0; i < config.collections.length; i++){
+        config.collections[i] = await sanitizeCollection(config, config.collections[i], richTextSanitizationPromises);
+    }
     checkDuplicateCollections(config.collections);
     if (config.globals.length > 0) {
-        config.globals = sanitizeGlobals(config);
+        config.globals = await sanitizeGlobals(config, richTextSanitizationPromises);
     }
     if (config.serverURL !== '') {
         config.csrf.push(config.serverURL);
     }
+    // Get deduped list of upload adapters
+    if (!config.upload) config.upload = {
+        adapters: []
+    };
+    config.upload.adapters = Array.from(new Set(config.collections.map((c)=>c.upload?.adapter).filter(Boolean)));
+    // Pass through the email config as is so adapters don't break
+    if (incomingConfig.email) config.email = incomingConfig.email;
+    /*
+    Execute richText sanitization
+   */ if (typeof incomingConfig.editor === 'function') {
+        config.editor = await incomingConfig.editor({
+            config: config,
+            isRoot: true
+        });
+        if (config.editor.i18n && Object.keys(config.editor.i18n).length >= 0) {
+            config.i18n.translations = deepMergeSimple(config.i18n.translations, config.editor.i18n);
+        }
+    }
+    const promises = [];
+    for (const sanitizeFunction of richTextSanitizationPromises){
+        promises.push(sanitizeFunction(config));
+    }
+    await Promise.all(promises);
     return config;
 };
 

package/dist/config/sanitize.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/config/sanitize.ts"],"sourcesContent":["import { en } from '@payloadcms/translations/languages/en'\nimport merge from 'deepmerge'\n\nimport type {\n  Config,\n  LocalizationConfigWithLabels,\n  LocalizationConfigWithNoLabels,\n  SanitizedConfig,\n} from './types.js'\n\nimport { defaultUserCollection } from '../auth/defaultUser.js'\nimport sanitizeCollection from '../collections/config/sanitize.js'\nimport { migrationsCollection } from '../database/migrations/migrationsCollection.js'\nimport { InvalidConfiguration } from '../errors/index.js'\nimport sanitizeGlobals from '../globals/config/sanitize.js'\nimport getPreferencesCollection from '../preferences/preferencesCollection.js'\nimport checkDuplicateCollections from '../utilities/checkDuplicateCollections.js'\nimport { isPlainObject } from '../utilities/isPlainObject.js'\nimport { defaults } from './defaults.js'\n\nconst sanitizeAdminConfig = (configToSanitize: Config): Partial<SanitizedConfig> => {\n  const sanitizedConfig = { ...configToSanitize }\n\n  // add default user collection if none provided\n  if (!sanitizedConfig?.admin?.user) {\n    const firstCollectionWithAuth = sanitizedConfig.collections.find(({ auth }) => Boolean(auth))\n    if (firstCollectionWithAuth) {\n      sanitizedConfig.admin.user = firstCollectionWithAuth.slug\n    } else {\n      sanitizedConfig.admin.user = defaultUserCollection.slug\n      sanitizedConfig.collections.push(defaultUserCollection)\n    }\n  }\n\n  if (!sanitizedConfig.collections.find(({ slug }) => slug === sanitizedConfig.admin.user)) {\n    throw new InvalidConfiguration(\n      `${sanitizedConfig.admin.user} is not a valid admin user collection`,\n    )\n  }\n\n  return sanitizedConfig as Partial<SanitizedConfig>\n}\n\nexport const sanitizeConfig = (incomingConfig: Config): SanitizedConfig => {\n  const configWithDefaults: Config = merge(defaults, incomingConfig, {\n    isMergeableObject: isPlainObject,\n  }) as Config\n\n  if (!configWithDefaults?.serverURL) {\n    configWithDefaults.serverURL = ''\n  }\n\n  const config: Partial<SanitizedConfig> = sanitizeAdminConfig(configWithDefaults)\n\n  if (config.localization && config.localization.locales?.length > 0) {\n    // clone localization config so to not break everything\n    const firstLocale = config.localization.locales[0]\n    if (typeof firstLocale === 'string') {\n      config.localization.localeCodes = [\n        ...(config.localization as unknown as LocalizationConfigWithNoLabels).locales,\n      ]\n\n      // is string[], so convert to Locale[]\n      config.localization.locales = (\n        config.localization as unknown as LocalizationConfigWithNoLabels\n      ).locales.map((locale) => ({\n        code: locale,\n        label: locale,\n        rtl: false,\n        toString: () => locale,\n      }))\n    } else {\n      // is Locale[], so convert to string[] for localeCodes\n      config.localization.localeCodes = config.localization.locales.reduce((locales, locale) => {\n        locales.push(locale.code)\n        return locales\n      }, [] as string[])\n\n      config.localization.locales = (\n        config.localization as LocalizationConfigWithLabels\n      ).locales.map((locale) => ({\n        ...locale,\n        toString: () => locale.code,\n      }))\n    }\n  }\n\n  config.i18n = {\n    fallbackLanguage: 'en',\n    supportedLanguages: {\n      en,\n    },\n    translations: {},\n    ...(incomingConfig?.i18n ?? {}),\n  }\n\n  configWithDefaults.collections.push(getPreferencesCollection(configWithDefaults))\n  configWithDefaults.collections.push(migrationsCollection)\n\n  config.collections = config.collections.map((collection) =>\n    sanitizeCollection(configWithDefaults, collection),\n  )\n  checkDuplicateCollections(config.collections)\n\n  if (config.globals.length > 0) {\n    config.globals = sanitizeGlobals(config as SanitizedConfig)\n  }\n\n  if (config.serverURL !== '') {\n    config.csrf.push(config.serverURL)\n  }\n\n  return config as SanitizedConfig\n}\n"],"names":["en","merge","defaultUserCollection","sanitizeCollection","migrationsCollection","InvalidConfiguration","sanitizeGlobals","getPreferencesCollection","checkDuplicateCollections","isPlainObject","defaults","sanitizeAdminConfig","configToSanitize","sanitizedConfig","admin","user","firstCollectionWithAuth","collections","find","auth","Boolean","slug","push","sanitizeConfig","incomingConfig","configWithDefaults","isMergeableObject","serverURL","config","localization","locales","length","firstLocale","localeCodes","map","locale","code","label","rtl","toString","reduce","i18n","fallbackLanguage","supportedLanguages","translations","collection","globals","csrf"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../src/config/sanitize.ts"],"sourcesContent":["import type { AcceptedLanguages } from '@payloadcms/translations'\n\nimport { en } from '@payloadcms/translations/languages/en'\nimport { deepMergeSimple } from '@payloadcms/translations/utilities'\n\nimport type {\n  Config,\n  LocalizationConfigWithLabels,\n  LocalizationConfigWithNoLabels,\n  SanitizedConfig,\n} from './types.js'\n\nimport { defaultUserCollection } from '../auth/defaultUser.js'\nimport { sanitizeCollection } from '../collections/config/sanitize.js'\nimport { migrationsCollection } from '../database/migrations/migrationsCollection.js'\nimport { InvalidConfiguration } from '../errors/index.js'\nimport { sanitizeGlobals } from '../globals/config/sanitize.js'\nimport getPreferencesCollection from '../preferences/preferencesCollection.js'\nimport checkDuplicateCollections from '../utilities/checkDuplicateCollections.js'\nimport { deepMergeWithReactComponents } from '../utilities/deepMerge.js'\nimport { defaults } from './defaults.js'\n\nconst sanitizeAdminConfig = (configToSanitize: Config): Partial<SanitizedConfig> => {\n  const sanitizedConfig = { ...configToSanitize }\n\n  // add default user collection if none provided\n  if (!sanitizedConfig?.admin?.user) {\n    const firstCollectionWithAuth = sanitizedConfig.collections.find(({ auth }) => Boolean(auth))\n    if (firstCollectionWithAuth) {\n      sanitizedConfig.admin.user = firstCollectionWithAuth.slug\n    } else {\n      sanitizedConfig.admin.user = defaultUserCollection.slug\n      sanitizedConfig.collections.push(defaultUserCollection)\n    }\n  }\n\n  const userCollection = sanitizedConfig.collections.find(\n    ({ slug }) => slug === sanitizedConfig.admin.user,\n  )\n  if (!userCollection || !userCollection.auth) {\n    throw new InvalidConfiguration(\n      `${sanitizedConfig.admin.user} is not a valid admin user collection`,\n    )\n  }\n\n  return sanitizedConfig as unknown as Partial<SanitizedConfig>\n}\n\nexport const sanitizeConfig = async (incomingConfig: Config): Promise<SanitizedConfig> => {\n  const configWithDefaults: Config = deepMergeWithReactComponents(defaults, incomingConfig)\n\n  if (!configWithDefaults?.serverURL) {\n    configWithDefaults.serverURL = ''\n  }\n\n  if (process.env.NEXT_BASE_PATH) {\n    if (!incomingConfig?.routes?.api) {\n      // check for incomingConfig, as configWithDefaults will always have a default value for routes.api\n      configWithDefaults.routes.api = process.env.NEXT_BASE_PATH + '/api'\n    }\n  }\n\n  const config: Partial<SanitizedConfig> = sanitizeAdminConfig(configWithDefaults)\n\n  if (config.localization && config.localization.locales?.length > 0) {\n    // clone localization config so to not break everything\n    const firstLocale = config.localization.locales[0]\n    if (typeof firstLocale === 'string') {\n      config.localization.localeCodes = [\n        ...(config.localization as unknown as LocalizationConfigWithNoLabels).locales,\n      ]\n\n      // is string[], so convert to Locale[]\n      config.localization.locales = (\n        config.localization as unknown as LocalizationConfigWithNoLabels\n      ).locales.map((locale) => ({\n        code: locale,\n        label: locale,\n        rtl: false,\n        toString: () => locale,\n      }))\n    } else {\n      // is Locale[], so convert to string[] for localeCodes\n      config.localization.localeCodes = config.localization.locales.reduce((locales, locale) => {\n        locales.push(locale.code)\n        return locales\n      }, [] as string[])\n\n      config.localization.locales = (\n        config.localization as LocalizationConfigWithLabels\n      ).locales.map((locale) => ({\n        ...locale,\n        toString: () => locale.code,\n      }))\n    }\n  }\n\n  const i18nConfig: SanitizedConfig['i18n'] = {\n    fallbackLanguage: 'en',\n    supportedLanguages: {\n      en,\n    },\n    translations: {},\n  }\n\n  if (incomingConfig?.i18n) {\n    i18nConfig.supportedLanguages =\n      incomingConfig.i18n?.supportedLanguages || i18nConfig.supportedLanguages\n\n    const supportedLangKeys = <AcceptedLanguages[]>Object.keys(i18nConfig.supportedLanguages)\n    const fallbackLang = incomingConfig.i18n?.fallbackLanguage || i18nConfig.fallbackLanguage\n\n    i18nConfig.fallbackLanguage = supportedLangKeys.includes(fallbackLang)\n      ? fallbackLang\n      : supportedLangKeys[0]\n    i18nConfig.translations =\n      (incomingConfig.i18n?.translations as SanitizedConfig['i18n']['translations']) ||\n      i18nConfig.translations\n  }\n\n  config.i18n = i18nConfig\n\n  configWithDefaults.collections.push(getPreferencesCollection(config as unknown as Config))\n  configWithDefaults.collections.push(migrationsCollection)\n\n  const richTextSanitizationPromises: Array<(config: SanitizedConfig) => Promise<void>> = []\n  for (let i = 0; i < config.collections.length; i++) {\n    config.collections[i] = await sanitizeCollection(\n      config as unknown as Config,\n      config.collections[i],\n      richTextSanitizationPromises,\n    )\n  }\n\n  checkDuplicateCollections(config.collections)\n\n  if (config.globals.length > 0) {\n    config.globals = await sanitizeGlobals(\n      config as unknown as Config,\n      richTextSanitizationPromises,\n    )\n  }\n\n  if (config.serverURL !== '') {\n    config.csrf.push(config.serverURL)\n  }\n\n  // Get deduped list of upload adapters\n  if (!config.upload) config.upload = { adapters: [] }\n  config.upload.adapters = Array.from(\n    new Set(config.collections.map((c) => c.upload?.adapter).filter(Boolean)),\n  )\n\n  // Pass through the email config as is so adapters don't break\n  if (incomingConfig.email) config.email = incomingConfig.email\n\n  /*\n    Execute richText sanitization\n   */\n  if (typeof incomingConfig.editor === 'function') {\n    config.editor = await incomingConfig.editor({\n      config: config as SanitizedConfig,\n      isRoot: true,\n    })\n    if (config.editor.i18n && Object.keys(config.editor.i18n).length >= 0) {\n      config.i18n.translations = deepMergeSimple(config.i18n.translations, config.editor.i18n)\n    }\n  }\n\n  const promises: Promise<void>[] = []\n  for (const sanitizeFunction of richTextSanitizationPromises) {\n    promises.push(sanitizeFunction(config as SanitizedConfig))\n  }\n  await Promise.all(promises)\n\n  return config as SanitizedConfig\n}\n"],"names":["en","deepMergeSimple","defaultUserCollection","sanitizeCollection","migrationsCollection","InvalidConfiguration","sanitizeGlobals","getPreferencesCollection","checkDuplicateCollections","deepMergeWithReactComponents","defaults","sanitizeAdminConfig","configToSanitize","sanitizedConfig","admin","user","firstCollectionWithAuth","collections","find","auth","Boolean","slug","push","userCollection","sanitizeConfig","incomingConfig","configWithDefaults","serverURL","process","env","NEXT_BASE_PATH","routes","api","config","localization","locales","length","firstLocale","localeCodes","map","locale","code","label","rtl","toString","reduce","i18nConfig","fallbackLanguage","supportedLanguages","translations","i18n","supportedLangKeys","Object","keys","fallbackLang","includes","richTextSanitizationPromises","i","globals","csrf","upload","adapters","Array","from","Set","c","adapter","filter","email","editor","isRoot","promises","sanitizeFunction","Promise","all"],"mappings":"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"}