payload 4.0.0-internal.bc5cf8c → 4.0.0-internal.bf4bcce

package/dist/cli/runtime/loadEnv.js

@@ -0,0 +1,58 @@
+import dotenv from 'dotenv';
+import dotenvExpand from 'dotenv-expand';
+import { existsSync } from 'fs';
+import nodePath from 'path';
+import { findUpSync } from '../../utilities/findUp.js';
+/**
+ * Loads env files in priority order (same as Next.js convention):
+ * .env.${NODE_ENV}.local, .env.local (not for test), .env.${NODE_ENV}, .env
+ */ function loadEnvFiles(dir, isDev) {
+    const nodeEnv = process.env.NODE_ENV || (isDev ? 'development' : 'production');
+    const envFiles = [
+        `.env.${nodeEnv}.local`,
+        ...nodeEnv !== 'test' ? [
+            '.env.local'
+        ] : [],
+        `.env.${nodeEnv}`,
+        '.env'
+    ];
+    let loaded = false;
+    for (const envFile of envFiles){
+        const filePath = nodePath.resolve(dir, envFile);
+        if (existsSync(filePath)) {
+            const result = dotenv.config({
+                path: filePath
+            });
+            if (result.parsed) {
+                dotenvExpand.expand(result);
+                loaded = true;
+            }
+        }
+    }
+    return loaded;
+}
+/**
+ * Try to find user's env files and load them.
+ * Supports .env, .env.local, .env.development, .env.production, etc.
+ * (same file priority as Next.js)
+ */ export function loadEnv(path) {
+    const isDev = process.env.NODE_ENV !== 'production';
+    if (path?.length) {
+        loadEnvFiles(path, isDev);
+        return;
+    }
+    const loaded = loadEnvFiles(process.cwd(), isDev);
+    if (!loaded) {
+        findUpSync({
+            // @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve
+            condition: (dir)=>{
+                if (loadEnvFiles(dir, isDev)) {
+                    return true;
+                }
+            },
+            dir: process.cwd()
+        });
+    }
+}
+
+//# sourceMappingURL=loadEnv.js.map

package/dist/cli/runtime/loadEnv.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/cli/runtime/loadEnv.ts"],"sourcesContent":["import dotenv from 'dotenv'\nimport dotenvExpand from 'dotenv-expand'\nimport { existsSync } from 'fs'\nimport nodePath from 'path'\n\nimport { findUpSync } from '../../utilities/findUp.js'\n\n/**\n * Loads env files in priority order (same as Next.js convention):\n * .env.${NODE_ENV}.local, .env.local (not for test), .env.${NODE_ENV}, .env\n */\nfunction loadEnvFiles(dir: string, isDev: boolean): boolean {\n  const nodeEnv = process.env.NODE_ENV || (isDev ? 'development' : 'production')\n  const envFiles = [\n    `.env.${nodeEnv}.local`,\n    ...(nodeEnv !== 'test' ? ['.env.local'] : []),\n    `.env.${nodeEnv}`,\n    '.env',\n  ]\n\n  let loaded = false\n\n  for (const envFile of envFiles) {\n    const filePath = nodePath.resolve(dir, envFile)\n    if (existsSync(filePath)) {\n      const result = dotenv.config({ path: filePath })\n      if (result.parsed) {\n        dotenvExpand.expand(result)\n        loaded = true\n      }\n    }\n  }\n\n  return loaded\n}\n\n/**\n * Try to find user's env files and load them.\n * Supports .env, .env.local, .env.development, .env.production, etc.\n * (same file priority as Next.js)\n */\nexport function loadEnv(path?: string) {\n  const isDev = process.env.NODE_ENV !== 'production'\n\n  if (path?.length) {\n    loadEnvFiles(path, isDev)\n    return\n  }\n\n  const loaded = loadEnvFiles(process.cwd(), isDev)\n\n  if (!loaded) {\n    findUpSync({\n      // @ts-expect-error - vestiges of when tsconfig was not strict. Feel free to improve\n      condition: (dir) => {\n        if (loadEnvFiles(dir, isDev)) {\n          return true\n        }\n      },\n      dir: process.cwd(),\n    })\n  }\n}\n"],"names":["dotenv","dotenvExpand","existsSync","nodePath","findUpSync","loadEnvFiles","dir","isDev","nodeEnv","process","env","NODE_ENV","envFiles","loaded","envFile","filePath","resolve","result","config","path","parsed","expand","loadEnv","length","cwd","condition"],"mappings":"AAAA,OAAOA,YAAY,SAAQ;AAC3B,OAAOC,kBAAkB,gBAAe;AACxC,SAASC,UAAU,QAAQ,KAAI;AAC/B,OAAOC,cAAc,OAAM;AAE3B,SAASC,UAAU,QAAQ,4BAA2B;AAEtD;;;CAGC,GACD,SAASC,aAAaC,GAAW,EAAEC,KAAc;IAC/C,MAAMC,UAAUC,QAAQC,GAAG,CAACC,QAAQ,IAAKJ,CAAAA,QAAQ,gBAAgB,YAAW;IAC5E,MAAMK,WAAW;QACf,CAAC,KAAK,EAAEJ,QAAQ,MAAM,CAAC;WACnBA,YAAY,SAAS;YAAC;SAAa,GAAG,EAAE;QAC5C,CAAC,KAAK,EAAEA,SAAS;QACjB;KACD;IAED,IAAIK,SAAS;IAEb,KAAK,MAAMC,WAAWF,SAAU;QAC9B,MAAMG,WAAWZ,SAASa,OAAO,CAACV,KAAKQ;QACvC,IAAIZ,WAAWa,WAAW;YACxB,MAAME,SAASjB,OAAOkB,MAAM,CAAC;gBAAEC,MAAMJ;YAAS;YAC9C,IAAIE,OAAOG,MAAM,EAAE;gBACjBnB,aAAaoB,MAAM,CAACJ;gBACpBJ,SAAS;YACX;QACF;IACF;IAEA,OAAOA;AACT;AAEA;;;;CAIC,GACD,OAAO,SAASS,QAAQH,IAAa;IACnC,MAAMZ,QAAQE,QAAQC,GAAG,CAACC,QAAQ,KAAK;IAEvC,IAAIQ,MAAMI,QAAQ;QAChBlB,aAAac,MAAMZ;QACnB;IACF;IAEA,MAAMM,SAASR,aAAaI,QAAQe,GAAG,IAAIjB;IAE3C,IAAI,CAACM,QAAQ;QACXT,WAAW;YACT,oFAAoF;YACpFqB,WAAW,CAACnB;gBACV,IAAID,aAAaC,KAAKC,QAAQ;oBAC5B,OAAO;gBACT;YACF;YACAD,KAAKG,QAAQe,GAAG;QAClB;IACF;AACF"}

package/dist/cli/runtime/output.d.ts

@@ -0,0 +1,50 @@
+import { type Command } from 'commander';
+export type CLIErrorIssue = {
+    message: string;
+    path?: string;
+};
+export declare class CLICommandError extends Error {
+    code: string;
+    command?: string;
+    inputSchema?: Record<string, unknown>;
+    issues?: CLIErrorIssue[];
+    constructor({ cause, code, command, inputSchema, issues, message, }: {
+        cause?: unknown;
+        code?: string;
+        command?: string;
+        inputSchema?: Record<string, unknown>;
+        issues?: CLIErrorIssue[];
+        message: string;
+    });
+}
+export declare const isJSONOutput: (command?: Command) => boolean;
+/**
+ * Runs CLI work with one effective output mode, then restores the previous process state.
+ * JSON mode redirects diagnostic output and sets `PAYLOAD_CLI_JSON` so Payload loggers use stderr.
+ */
+export declare const withCLIOutputMode: <T>({ isJSON, run, }: {
+    isJSON: boolean;
+    run: () => Promise<T> | T;
+}) => Promise<T>;
+export declare const writeCLIJSON: ({ command, value }: {
+    command?: Command;
+    value: unknown;
+}) => void;
+export declare const getCLIErrorOutput: ({ command, error, }: {
+    command?: string;
+    error: unknown;
+}) => Record<string, unknown>;
+/**
+ * Formats a CLI failure and sets its exit code.
+ *
+ * Commander prints its own human-readable errors before throwing a `CommanderError`, so they
+ * are not printed again. Other errors are printed in full in human-readable mode to preserve
+ * their stack trace.
+ */
+export declare const handleCLIError: ({ cli, error }: {
+    cli?: Command;
+    error: unknown;
+}) => void;
+/** Wraps the CLI entry point so every failure uses the same output and exits cleanly. */
+export declare const withErrorHandling: (run: () => Promise<void>) => (() => Promise<void>);
+//# sourceMappingURL=output.d.ts.map

package/dist/cli/runtime/output.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"output.d.ts","sourceRoot":"","sources":["../../../src/cli/runtime/output.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAkB,MAAM,WAAW,CAAA;AAIxD,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CAAA;AAED,qBAAa,eAAgB,SAAQ,KAAK;IACxC,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrC,MAAM,CAAC,EAAE,aAAa,EAAE,CAAA;IAExB,YAAY,EACV,KAAK,EACL,IAAuB,EACvB,OAAO,EACP,WAAW,EACX,MAAM,EACN,OAAO,GACR,EAAE;QACD,KAAK,CAAC,EAAE,OAAO,CAAA;QACf,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,OAAO,CAAC,EAAE,MAAM,CAAA;QAChB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;QACrC,MAAM,CAAC,EAAE,aAAa,EAAE,CAAA;QACxB,OAAO,EAAE,MAAM,CAAA;KAChB,EAOA;CACF;AAED,eAAO,MAAM,YAAY,aAAc,OAAO,KAAG,OAkBhD,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAAU,CAAC,oBAGtC;IACD,MAAM,EAAE,OAAO,CAAA;IACf,GAAG,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;CAC1B,KAAG,OAAO,CAAC,CAAC,CAqBZ,CAAA;AAED,eAAO,MAAM,YAAY,uBAAwB;IAAE,OAAO,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,KAAG,IAYxF,CAAA;AAED,eAAO,MAAM,iBAAiB,wBAG3B;IACD,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,OAAO,CAAA;CACf,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CA6BzB,CAAA;AAED;;;;;;GAMG;AACH,eAAO,MAAM,cAAc,mBAAoB;IAAE,GAAG,CAAC,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,KAAG,IAelF,CAAA;AAED,yFAAyF;AACzF,eAAO,MAAM,iBAAiB,QACtB,MAAM,OAAO,CAAC,IAAI,CAAC,KAAG,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAQ/C,CAAA"}

package/dist/cli/runtime/output.js

@@ -0,0 +1,125 @@
+import { CommanderError } from 'commander';
+import { redirectOutputToStderr, writeToCLIStdout } from './redirectOutputToStderr.js';
+export class CLICommandError extends Error {
+    code;
+    command;
+    inputSchema;
+    issues;
+    constructor({ cause, code = 'COMMAND_FAILED', command, inputSchema, issues, message }){
+        super(message, {
+            cause
+        });
+        this.name = 'CLICommandError';
+        this.code = code;
+        this.command = command;
+        this.inputSchema = inputSchema;
+        this.issues = issues;
+    }
+}
+export const isJSONOutput = (command)=>{
+    if (command?.getOptionValueSourceWithGlobals('json') === 'cli') {
+        return Boolean(command.optsWithGlobals().json);
+    }
+    const separatorPosition = process.argv.indexOf('--', 2);
+    const payloadArguments = process.argv.slice(2, separatorPosition === -1 ? process.argv.length : separatorPosition);
+    const jsonPosition = payloadArguments.lastIndexOf('--json');
+    const noJSONPosition = payloadArguments.lastIndexOf('--no-json');
+    if (jsonPosition !== -1 || noJSONPosition !== -1) {
+        return jsonPosition > noJSONPosition;
+    }
+    return process.env.PAYLOAD_CLI_JSON !== undefined;
+};
+/**
+ * Runs CLI work with one effective output mode, then restores the previous process state.
+ * JSON mode redirects diagnostic output and sets `PAYLOAD_CLI_JSON` so Payload loggers use stderr.
+ */ export const withCLIOutputMode = async ({ isJSON, run })=>{
+    const previousJSONSetting = process.env.PAYLOAD_CLI_JSON;
+    const restoreOutput = isJSON ? redirectOutputToStderr() : undefined;
+    if (isJSON) {
+        process.env.PAYLOAD_CLI_JSON = '1';
+    } else {
+        delete process.env.PAYLOAD_CLI_JSON;
+    }
+    try {
+        return await run();
+    } finally{
+        restoreOutput?.();
+        if (previousJSONSetting === undefined) {
+            delete process.env.PAYLOAD_CLI_JSON;
+        } else {
+            process.env.PAYLOAD_CLI_JSON = previousJSONSetting;
+        }
+    }
+};
+export const writeCLIJSON = ({ command, value })=>{
+    const output = `${JSON.stringify(value, (_key, item)=>typeof item === 'bigint' ? item.toString() : item)}\n`;
+    const outputConfiguration = command?.configureOutput();
+    writeToCLIStdout({
+        output,
+        write: outputConfiguration?.writeOut ? (value)=>outputConfiguration.writeOut?.(value) : undefined
+    });
+};
+export const getCLIErrorOutput = ({ command, error })=>{
+    if (error instanceof CLICommandError) {
+        return {
+            command: error.command ?? command,
+            error: {
+                code: error.code,
+                message: error.message,
+                ...error.issues ? {
+                    issues: error.issues
+                } : {},
+                ...error.inputSchema ? {
+                    inputSchema: error.inputSchema
+                } : {}
+            },
+            success: false
+        };
+    }
+    const errorWithDetails = error;
+    return {
+        ...command ? {
+            command
+        } : {},
+        error: {
+            code: typeof errorWithDetails?.code === 'string' ? errorWithDetails.code : 'COMMAND_FAILED',
+            message: typeof errorWithDetails?.message === 'string' ? errorWithDetails.message : typeof error === 'string' ? error : 'Unknown error'
+        },
+        success: false
+    };
+};
+/**
+ * Formats a CLI failure and sets its exit code.
+ *
+ * Commander prints its own human-readable errors before throwing a `CommanderError`, so they
+ * are not printed again. Other errors are printed in full in human-readable mode to preserve
+ * their stack trace.
+ */ export const handleCLIError = ({ cli, error })=>{
+    const exitCode = error instanceof CommanderError ? error.exitCode : 1;
+    const shouldOutputJSON = isJSONOutput(cli);
+    if (shouldOutputJSON && exitCode !== 0) {
+        writeCLIJSON({
+            command: cli,
+            value: getCLIErrorOutput({
+                command: cli?.args[0],
+                error
+            })
+        });
+    } else if (!(error instanceof CommanderError)) {
+        // eslint-disable-next-line no-console
+        console.error(error);
+    }
+    process.exitCode = exitCode;
+};
+/** Wraps the CLI entry point so every failure uses the same output and exits cleanly. */ export const withErrorHandling = (run)=>async ()=>{
+        try {
+            await run();
+        } catch (error) {
+            handleCLIError({
+                error
+            });
+            process.exit(process.exitCode ?? 1);
+        }
+    };
+
+//# sourceMappingURL=output.js.map

package/dist/cli/runtime/output.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/cli/runtime/output.ts"],"sourcesContent":["import { type Command, CommanderError } from 'commander'\n\nimport { redirectOutputToStderr, writeToCLIStdout } from './redirectOutputToStderr.js'\n\nexport type CLIErrorIssue = {\n  message: string\n  path?: string\n}\n\nexport class CLICommandError extends Error {\n  code: string\n  command?: string\n  inputSchema?: Record<string, unknown>\n  issues?: CLIErrorIssue[]\n\n  constructor({\n    cause,\n    code = 'COMMAND_FAILED',\n    command,\n    inputSchema,\n    issues,\n    message,\n  }: {\n    cause?: unknown\n    code?: string\n    command?: string\n    inputSchema?: Record<string, unknown>\n    issues?: CLIErrorIssue[]\n    message: string\n  }) {\n    super(message, { cause })\n    this.name = 'CLICommandError'\n    this.code = code\n    this.command = command\n    this.inputSchema = inputSchema\n    this.issues = issues\n  }\n}\n\nexport const isJSONOutput = (command?: Command): boolean => {\n  if (command?.getOptionValueSourceWithGlobals('json') === 'cli') {\n    return Boolean(command.optsWithGlobals<{ json?: boolean }>().json)\n  }\n\n  const separatorPosition = process.argv.indexOf('--', 2)\n  const payloadArguments = process.argv.slice(\n    2,\n    separatorPosition === -1 ? process.argv.length : separatorPosition,\n  )\n  const jsonPosition = payloadArguments.lastIndexOf('--json')\n  const noJSONPosition = payloadArguments.lastIndexOf('--no-json')\n\n  if (jsonPosition !== -1 || noJSONPosition !== -1) {\n    return jsonPosition > noJSONPosition\n  }\n\n  return process.env.PAYLOAD_CLI_JSON !== undefined\n}\n\n/**\n * Runs CLI work with one effective output mode, then restores the previous process state.\n * JSON mode redirects diagnostic output and sets `PAYLOAD_CLI_JSON` so Payload loggers use stderr.\n */\nexport const withCLIOutputMode = async <T>({\n  isJSON,\n  run,\n}: {\n  isJSON: boolean\n  run: () => Promise<T> | T\n}): Promise<T> => {\n  const previousJSONSetting = process.env.PAYLOAD_CLI_JSON\n  const restoreOutput = isJSON ? redirectOutputToStderr() : undefined\n\n  if (isJSON) {\n    process.env.PAYLOAD_CLI_JSON = '1'\n  } else {\n    delete process.env.PAYLOAD_CLI_JSON\n  }\n\n  try {\n    return await run()\n  } finally {\n    restoreOutput?.()\n\n    if (previousJSONSetting === undefined) {\n      delete process.env.PAYLOAD_CLI_JSON\n    } else {\n      process.env.PAYLOAD_CLI_JSON = previousJSONSetting\n    }\n  }\n}\n\nexport const writeCLIJSON = ({ command, value }: { command?: Command; value: unknown }): void => {\n  const output = `${JSON.stringify(value, (_key, item) =>\n    typeof item === 'bigint' ? item.toString() : item,\n  )}\\n`\n  const outputConfiguration = command?.configureOutput()\n\n  writeToCLIStdout({\n    output,\n    write: outputConfiguration?.writeOut\n      ? (value) => outputConfiguration.writeOut?.(value)\n      : undefined,\n  })\n}\n\nexport const getCLIErrorOutput = ({\n  command,\n  error,\n}: {\n  command?: string\n  error: unknown\n}): Record<string, unknown> => {\n  if (error instanceof CLICommandError) {\n    return {\n      command: error.command ?? command,\n      error: {\n        code: error.code,\n        message: error.message,\n        ...(error.issues ? { issues: error.issues } : {}),\n        ...(error.inputSchema ? { inputSchema: error.inputSchema } : {}),\n      },\n      success: false,\n    }\n  }\n\n  const errorWithDetails = error as { code?: unknown; message?: unknown }\n\n  return {\n    ...(command ? { command } : {}),\n    error: {\n      code: typeof errorWithDetails?.code === 'string' ? errorWithDetails.code : 'COMMAND_FAILED',\n      message:\n        typeof errorWithDetails?.message === 'string'\n          ? errorWithDetails.message\n          : typeof error === 'string'\n            ? error\n            : 'Unknown error',\n    },\n    success: false,\n  }\n}\n\n/**\n * Formats a CLI failure and sets its exit code.\n *\n * Commander prints its own human-readable errors before throwing a `CommanderError`, so they\n * are not printed again. Other errors are printed in full in human-readable mode to preserve\n * their stack trace.\n */\nexport const handleCLIError = ({ cli, error }: { cli?: Command; error: unknown }): void => {\n  const exitCode = error instanceof CommanderError ? error.exitCode : 1\n  const shouldOutputJSON = isJSONOutput(cli)\n\n  if (shouldOutputJSON && exitCode !== 0) {\n    writeCLIJSON({\n      command: cli,\n      value: getCLIErrorOutput({ command: cli?.args[0], error }),\n    })\n  } else if (!(error instanceof CommanderError)) {\n    // eslint-disable-next-line no-console\n    console.error(error)\n  }\n\n  process.exitCode = exitCode\n}\n\n/** Wraps the CLI entry point so every failure uses the same output and exits cleanly. */\nexport const withErrorHandling =\n  (run: () => Promise<void>): (() => Promise<void>) =>\n  async () => {\n    try {\n      await run()\n    } catch (error) {\n      handleCLIError({ error })\n      process.exit(process.exitCode ?? 1)\n    }\n  }\n"],"names":["CommanderError","redirectOutputToStderr","writeToCLIStdout","CLICommandError","Error","code","command","inputSchema","issues","cause","message","name","isJSONOutput","getOptionValueSourceWithGlobals","Boolean","optsWithGlobals","json","separatorPosition","process","argv","indexOf","payloadArguments","slice","length","jsonPosition","lastIndexOf","noJSONPosition","env","PAYLOAD_CLI_JSON","undefined","withCLIOutputMode","isJSON","run","previousJSONSetting","restoreOutput","writeCLIJSON","value","output","JSON","stringify","_key","item","toString","outputConfiguration","configureOutput","write","writeOut","getCLIErrorOutput","error","success","errorWithDetails","handleCLIError","cli","exitCode","shouldOutputJSON","args","console","withErrorHandling","exit"],"mappings":"AAAA,SAAuBA,cAAc,QAAQ,YAAW;AAExD,SAASC,sBAAsB,EAAEC,gBAAgB,QAAQ,8BAA6B;AAOtF,OAAO,MAAMC,wBAAwBC;IACnCC,KAAY;IACZC,QAAgB;IAChBC,YAAqC;IACrCC,OAAwB;IAExB,YAAY,EACVC,KAAK,EACLJ,OAAO,gBAAgB,EACvBC,OAAO,EACPC,WAAW,EACXC,MAAM,EACNE,OAAO,EAQR,CAAE;QACD,KAAK,CAACA,SAAS;YAAED;QAAM;QACvB,IAAI,CAACE,IAAI,GAAG;QACZ,IAAI,CAACN,IAAI,GAAGA;QACZ,IAAI,CAACC,OAAO,GAAGA;QACf,IAAI,CAACC,WAAW,GAAGA;QACnB,IAAI,CAACC,MAAM,GAAGA;IAChB;AACF;AAEA,OAAO,MAAMI,eAAe,CAACN;IAC3B,IAAIA,SAASO,gCAAgC,YAAY,OAAO;QAC9D,OAAOC,QAAQR,QAAQS,eAAe,GAAuBC,IAAI;IACnE;IAEA,MAAMC,oBAAoBC,QAAQC,IAAI,CAACC,OAAO,CAAC,MAAM;IACrD,MAAMC,mBAAmBH,QAAQC,IAAI,CAACG,KAAK,CACzC,GACAL,sBAAsB,CAAC,IAAIC,QAAQC,IAAI,CAACI,MAAM,GAAGN;IAEnD,MAAMO,eAAeH,iBAAiBI,WAAW,CAAC;IAClD,MAAMC,iBAAiBL,iBAAiBI,WAAW,CAAC;IAEpD,IAAID,iBAAiB,CAAC,KAAKE,mBAAmB,CAAC,GAAG;QAChD,OAAOF,eAAeE;IACxB;IAEA,OAAOR,QAAQS,GAAG,CAACC,gBAAgB,KAAKC;AAC1C,EAAC;AAED;;;CAGC,GACD,OAAO,MAAMC,oBAAoB,OAAU,EACzCC,MAAM,EACNC,GAAG,EAIJ;IACC,MAAMC,sBAAsBf,QAAQS,GAAG,CAACC,gBAAgB;IACxD,MAAMM,gBAAgBH,SAAS9B,2BAA2B4B;IAE1D,IAAIE,QAAQ;QACVb,QAAQS,GAAG,CAACC,gBAAgB,GAAG;IACjC,OAAO;QACL,OAAOV,QAAQS,GAAG,CAACC,gBAAgB;IACrC;IAEA,IAAI;QACF,OAAO,MAAMI;IACf,SAAU;QACRE;QAEA,IAAID,wBAAwBJ,WAAW;YACrC,OAAOX,QAAQS,GAAG,CAACC,gBAAgB;QACrC,OAAO;YACLV,QAAQS,GAAG,CAACC,gBAAgB,GAAGK;QACjC;IACF;AACF,EAAC;AAED,OAAO,MAAME,eAAe,CAAC,EAAE7B,OAAO,EAAE8B,KAAK,EAAyC;IACpF,MAAMC,SAAS,GAAGC,KAAKC,SAAS,CAACH,OAAO,CAACI,MAAMC,OAC7C,OAAOA,SAAS,WAAWA,KAAKC,QAAQ,KAAKD,MAC7C,EAAE,CAAC;IACL,MAAME,sBAAsBrC,SAASsC;IAErC1C,iBAAiB;QACfmC;QACAQ,OAAOF,qBAAqBG,WACxB,CAACV,QAAUO,oBAAoBG,QAAQ,GAAGV,SAC1CP;IACN;AACF,EAAC;AAED,OAAO,MAAMkB,oBAAoB,CAAC,EAChCzC,OAAO,EACP0C,KAAK,EAIN;IACC,IAAIA,iBAAiB7C,iBAAiB;QACpC,OAAO;YACLG,SAAS0C,MAAM1C,OAAO,IAAIA;YAC1B0C,OAAO;gBACL3C,MAAM2C,MAAM3C,IAAI;gBAChBK,SAASsC,MAAMtC,OAAO;gBACtB,GAAIsC,MAAMxC,MAAM,GAAG;oBAAEA,QAAQwC,MAAMxC,MAAM;gBAAC,IAAI,CAAC,CAAC;gBAChD,GAAIwC,MAAMzC,WAAW,GAAG;oBAAEA,aAAayC,MAAMzC,WAAW;gBAAC,IAAI,CAAC,CAAC;YACjE;YACA0C,SAAS;QACX;IACF;IAEA,MAAMC,mBAAmBF;IAEzB,OAAO;QACL,GAAI1C,UAAU;YAAEA;QAAQ,IAAI,CAAC,CAAC;QAC9B0C,OAAO;YACL3C,MAAM,OAAO6C,kBAAkB7C,SAAS,WAAW6C,iBAAiB7C,IAAI,GAAG;YAC3EK,SACE,OAAOwC,kBAAkBxC,YAAY,WACjCwC,iBAAiBxC,OAAO,GACxB,OAAOsC,UAAU,WACfA,QACA;QACV;QACAC,SAAS;IACX;AACF,EAAC;AAED;;;;;;CAMC,GACD,OAAO,MAAME,iBAAiB,CAAC,EAAEC,GAAG,EAAEJ,KAAK,EAAqC;IAC9E,MAAMK,WAAWL,iBAAiBhD,iBAAiBgD,MAAMK,QAAQ,GAAG;IACpE,MAAMC,mBAAmB1C,aAAawC;IAEtC,IAAIE,oBAAoBD,aAAa,GAAG;QACtClB,aAAa;YACX7B,SAAS8C;YACThB,OAAOW,kBAAkB;gBAAEzC,SAAS8C,KAAKG,IAAI,CAAC,EAAE;gBAAEP;YAAM;QAC1D;IACF,OAAO,IAAI,CAAEA,CAAAA,iBAAiBhD,cAAa,GAAI;QAC7C,sCAAsC;QACtCwD,QAAQR,KAAK,CAACA;IAChB;IAEA9B,QAAQmC,QAAQ,GAAGA;AACrB,EAAC;AAED,uFAAuF,GACvF,OAAO,MAAMI,oBACX,CAACzB,MACD;QACE,IAAI;YACF,MAAMA;QACR,EAAE,OAAOgB,OAAO;YACdG,eAAe;gBAAEH;YAAM;YACvB9B,QAAQwC,IAAI,CAACxC,QAAQmC,QAAQ,IAAI;QACnC;IACF,EAAC"}

package/dist/cli/runtime/redirectOutputToStderr.d.ts

@@ -0,0 +1,8 @@
+/** Sends console calls and direct stdout writes to stderr until the returned function is called. */
+export declare const redirectOutputToStderr: () => (() => void);
+/** Writes the final CLI response to stdout even while diagnostic output is being redirected. */
+export declare const writeToCLIStdout: ({ output, write, }: {
+    output: string;
+    write?: (output: string) => void;
+}) => void;
+//# sourceMappingURL=redirectOutputToStderr.d.ts.map

package/dist/cli/runtime/redirectOutputToStderr.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"redirectOutputToStderr.d.ts","sourceRoot":"","sources":["../../../src/cli/runtime/redirectOutputToStderr.ts"],"names":[],"mappings":"AAIA,oGAAoG;AACpG,eAAO,MAAM,sBAAsB,QAAO,CAAC,MAAM,IAAI,CAepD,CAAA;AAED,gGAAgG;AAChG,eAAO,MAAM,gBAAgB,uBAG1B;IACD,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAA;CACjC,KAAG,IAeH,CAAA"}

package/dist/cli/runtime/redirectOutputToStderr.js

@@ -0,0 +1,31 @@
+import { Console } from 'node:console';
+const originalStdoutWrite = process.stdout.write.bind(process.stdout);
+/** Sends console calls and direct stdout writes to stderr until the returned function is called. */ export const redirectOutputToStderr = ()=>{
+    const previousConsole = globalThis.console;
+    const previousStdoutWrite = process.stdout.write.bind(process.stdout);
+    globalThis.console = new Console({
+        colorMode: false,
+        stderr: process.stderr,
+        stdout: process.stderr
+    });
+    process.stdout.write = process.stderr.write.bind(process.stderr);
+    return ()=>{
+        globalThis.console = previousConsole;
+        process.stdout.write = previousStdoutWrite;
+    };
+};
+/** Writes the final CLI response to stdout even while diagnostic output is being redirected. */ export const writeToCLIStdout = ({ output, write })=>{
+    if (!write) {
+        originalStdoutWrite(output);
+        return;
+    }
+    const redirectedStdoutWrite = process.stdout.write.bind(process.stdout);
+    process.stdout.write = originalStdoutWrite;
+    try {
+        write(output);
+    } finally{
+        process.stdout.write = redirectedStdoutWrite;
+    }
+};
+
+//# sourceMappingURL=redirectOutputToStderr.js.map

package/dist/cli/runtime/redirectOutputToStderr.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/cli/runtime/redirectOutputToStderr.ts"],"sourcesContent":["import { Console } from 'node:console'\n\nconst originalStdoutWrite = process.stdout.write.bind(process.stdout)\n\n/** Sends console calls and direct stdout writes to stderr until the returned function is called. */\nexport const redirectOutputToStderr = (): (() => void) => {\n  const previousConsole = globalThis.console\n  const previousStdoutWrite = process.stdout.write.bind(process.stdout)\n\n  globalThis.console = new Console({\n    colorMode: false,\n    stderr: process.stderr,\n    stdout: process.stderr,\n  })\n  process.stdout.write = process.stderr.write.bind(process.stderr)\n\n  return () => {\n    globalThis.console = previousConsole\n    process.stdout.write = previousStdoutWrite\n  }\n}\n\n/** Writes the final CLI response to stdout even while diagnostic output is being redirected. */\nexport const writeToCLIStdout = ({\n  output,\n  write,\n}: {\n  output: string\n  write?: (output: string) => void\n}): void => {\n  if (!write) {\n    originalStdoutWrite(output)\n    return\n  }\n\n  const redirectedStdoutWrite = process.stdout.write.bind(process.stdout)\n\n  process.stdout.write = originalStdoutWrite\n\n  try {\n    write(output)\n  } finally {\n    process.stdout.write = redirectedStdoutWrite\n  }\n}\n"],"names":["Console","originalStdoutWrite","process","stdout","write","bind","redirectOutputToStderr","previousConsole","globalThis","console","previousStdoutWrite","colorMode","stderr","writeToCLIStdout","output","redirectedStdoutWrite"],"mappings":"AAAA,SAASA,OAAO,QAAQ,eAAc;AAEtC,MAAMC,sBAAsBC,QAAQC,MAAM,CAACC,KAAK,CAACC,IAAI,CAACH,QAAQC,MAAM;AAEpE,kGAAkG,GAClG,OAAO,MAAMG,yBAAyB;IACpC,MAAMC,kBAAkBC,WAAWC,OAAO;IAC1C,MAAMC,sBAAsBR,QAAQC,MAAM,CAACC,KAAK,CAACC,IAAI,CAACH,QAAQC,MAAM;IAEpEK,WAAWC,OAAO,GAAG,IAAIT,QAAQ;QAC/BW,WAAW;QACXC,QAAQV,QAAQU,MAAM;QACtBT,QAAQD,QAAQU,MAAM;IACxB;IACAV,QAAQC,MAAM,CAACC,KAAK,GAAGF,QAAQU,MAAM,CAACR,KAAK,CAACC,IAAI,CAACH,QAAQU,MAAM;IAE/D,OAAO;QACLJ,WAAWC,OAAO,GAAGF;QACrBL,QAAQC,MAAM,CAACC,KAAK,GAAGM;IACzB;AACF,EAAC;AAED,8FAA8F,GAC9F,OAAO,MAAMG,mBAAmB,CAAC,EAC/BC,MAAM,EACNV,KAAK,EAIN;IACC,IAAI,CAACA,OAAO;QACVH,oBAAoBa;QACpB;IACF;IAEA,MAAMC,wBAAwBb,QAAQC,MAAM,CAACC,KAAK,CAACC,IAAI,CAACH,QAAQC,MAAM;IAEtED,QAAQC,MAAM,CAACC,KAAK,GAAGH;IAEvB,IAAI;QACFG,MAAMU;IACR,SAAU;QACRZ,QAAQC,MAAM,CAACC,KAAK,GAAGW;IACzB;AACF,EAAC"}

package/dist/collections/config/client.d.ts

@@ -1,14 +1,18 @@
 import type { I18nClient } from '@payloadcms/translations';
 import type { StaticDescription } from '../../admin/types.js';
-import type { ImportMap } from '../../bin/generateImportMap/index.js';
+import type { ImportMap } from '../../cli/commands/generateImportMap/generateImportMap.js';
 import type { LivePreviewConfig, ServerOnlyLivePreviewProperties, StaticLabel } from '../../config/types.js';
 import type { ClientField } from '../../fields/config/client.js';
 import type { ClientHierarchyConfig } from '../../hierarchy/types.js';
 import type { Payload } from '../../types/index.js';
+import type { SanitizedUploadConfig, UploadInstructionsCapability } from '../../uploads/types.js';
 import type { SanitizedCollectionConfig } from './types.js';
-export type ServerOnlyCollectionProperties = keyof Pick<SanitizedCollectionConfig, 'access' | 'custom' | 'endpoints' | 'flattenedFields' | 'hooks' | 'indexes' | 'joins' | 'polymorphicJoins' | 'sanitizedIndexes' | 'select'>;
+export type ServerOnlyCollectionProperties = keyof Pick<SanitizedCollectionConfig, 'access' | 'custom' | 'endpoints' | 'flattenedFields' | 'hooks' | 'indexes' | 'joins' | 'llmInstructions' | 'polymorphicJoins' | 'sanitizedIndexes' | 'select'>;
 export type ServerOnlyCollectionAdminProperties = keyof Pick<SanitizedCollectionConfig['admin'], 'baseFilter' | 'baseListFilter' | 'components' | 'formatDocURL' | 'hidden'>;
-export type ServerOnlyUploadProperties = keyof Pick<SanitizedCollectionConfig['upload'], 'admin' | 'adminThumbnail' | 'externalFileHeaderFilter' | 'handlers' | 'modifyResponseHeaders' | 'withMetadata'>;
+export type ServerOnlyUploadProperties = keyof Pick<SanitizedCollectionConfig['upload'], 'admin' | 'adminThumbnail' | 'externalFileHeaderFilter' | 'fileOperations' | 'handlers' | 'modifyResponseHeaders' | 'uploadInstructions'>;
+type ClientUploadConfig = {
+    uploadInstructions: Pick<UploadInstructionsCapability, 'useInAdmin'>;
+} & Omit<SanitizedUploadConfig, 'fileOperations' | 'uploadInstructions'>;
 export type ClientCollectionConfig = {
     admin: {
         description?: StaticDescription;
@@ -16,6 +20,7 @@ export type ClientCollectionConfig = {
         preview?: boolean;
     } & Omit<SanitizedCollectionConfig['admin'], 'components' | 'description' | 'formatDocURL' | 'joins' | 'livePreview' | 'preview' | ServerOnlyCollectionAdminProperties>;
     auth?: {
+        forgotPassword: Pick<SanitizedCollectionConfig['auth']['forgotPassword'], 'minRequestInterval'>;
         verify?: true;
     } & Omit<SanitizedCollectionConfig['auth'], 'forgotPassword' | 'strategies' | 'verify'>;
     fields: ClientField[];
@@ -24,17 +29,19 @@ export type ClientCollectionConfig = {
         plural: StaticLabel;
         singular: StaticLabel;
     };
-} & Omit<SanitizedCollectionConfig, 'admin' | 'auth' | 'fields' | 'hierarchy' | 'labels' | ServerOnlyCollectionProperties>;
+    upload: ClientUploadConfig;
+} & Omit<SanitizedCollectionConfig, 'admin' | 'auth' | 'fields' | 'hierarchy' | 'labels' | 'upload' | ServerOnlyCollectionProperties>;
 export declare const createClientCollectionConfig: ({ collection, defaultIDType, i18n, importMap, }: {
     collection: SanitizedCollectionConfig;
-    defaultIDType: Payload["config"]["db"]["defaultIDType"];
+    defaultIDType: Payload['config']['db']['defaultIDType'];
     i18n: I18nClient;
     importMap: ImportMap;
 }) => ClientCollectionConfig;
 export declare const createClientCollectionConfigs: ({ collections, defaultIDType, i18n, importMap, }: {
     collections: SanitizedCollectionConfig[];
-    defaultIDType: Payload["config"]["db"]["defaultIDType"];
+    defaultIDType: Payload['config']['db']['defaultIDType'];
     i18n: I18nClient;
     importMap: ImportMap;
 }) => ClientCollectionConfig[];
+export {};
 //# sourceMappingURL=client.d.ts.map

package/dist/collections/config/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/collections/config/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAa,MAAM,0BAA0B,CAAA;AAErE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAA;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sCAAsC,CAAA;AACrE,OAAO,KAAK,EACV,iBAAiB,EACjB,+BAA+B,EAC/B,WAAW,EACZ,MAAM,uBAAuB,CAAA;AAC9B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAA;AACrE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAEnD,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAA;AAI3D,MAAM,MAAM,8BAA8B,GAAG,MAAM,IAAI,CACrD,yBAAyB,EACvB,QAAQ,GACR,QAAQ,GACR,WAAW,GACX,iBAAiB,GACjB,OAAO,GACP,SAAS,GACT,OAAO,GACP,kBAAkB,GAClB,kBAAkB,GAClB,QAAQ,CACX,CAAA;AAED,MAAM,MAAM,mCAAmC,GAAG,MAAM,IAAI,CAC1D,yBAAyB,CAAC,OAAO,CAAC,EAClC,YAAY,GAAG,gBAAgB,GAAG,YAAY,GAAG,cAAc,GAAG,QAAQ,CAC3E,CAAA;AAED,MAAM,MAAM,0BAA0B,GAAG,MAAM,IAAI,CACjD,yBAAyB,CAAC,QAAQ,CAAC,EACjC,OAAO,GACP,gBAAgB,GAChB,0BAA0B,GAC1B,UAAU,GACV,uBAAuB,GACvB,cAAc,CACjB,CAAA;AAED,MAAM,MAAM,sBAAsB,GAAG;IACnC,KAAK,EAAE;QACL,WAAW,CAAC,EAAE,iBAAiB,CAAA;QAC/B,WAAW,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,+BAA+B,CAAC,CAAA;QACtE,OAAO,CAAC,EAAE,OAAO,CAAA;KAClB,GAAG,IAAI,CACN,yBAAyB,CAAC,OAAO,CAAC,EAChC,YAAY,GACZ,aAAa,GACb,cAAc,GACd,OAAO,GACP,aAAa,GACb,SAAS,GACT,mCAAmC,CACtC,CAAA;IACD,IAAI,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,IAAI,CAAA;KAAE,GAAG,IAAI,CAC7B,yBAAyB,CAAC,MAAM,CAAC,EACjC,gBAAgB,GAAG,YAAY,GAAG,QAAQ,CAC3C,CAAA;IACD,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,SAAS,CAAC,EAAE,qBAAqB,GAAG,KAAK,CAAA;IACzC,MAAM,EAAE;QACN,MAAM,EAAE,WAAW,CAAA;QACnB,QAAQ,EAAE,WAAW,CAAA;KACtB,CAAA;CACF,GAAG,IAAI,CACN,yBAAyB,EACzB,OAAO,GAAG,MAAM,GAAG,QAAQ,GAAG,WAAW,GAAG,QAAQ,GAAG,8BAA8B,CACtF,CAAA;AAqCD,eAAO,MAAM,4BAA4B,GAAI,iDAK1C;IACD,UAAU,EAAE,yBAAyB,CAAA;IACrC,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,CAAA;IACvD,IAAI,EAAE,UAAU,CAAA;IAChB,SAAS,EAAE,SAAS,CAAA;CACrB,KAAG,sBA0LH,CAAA;AAED,eAAO,MAAM,6BAA6B,GAAI,kDAK3C;IACD,WAAW,EAAE,yBAAyB,EAAE,CAAA;IACxC,aAAa,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,CAAA;IACvD,IAAI,EAAE,UAAU,CAAA;IAChB,SAAS,EAAE,SAAS,CAAA;CACrB,KAAG,sBAAsB,EAezB,CAAA"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/collections/config/client.ts"],"names":[],"mappings":"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"}

package/dist/collections/config/client.js

@@ -5,6 +5,7 @@ const serverOnlyCollectionProperties = [
     'endpoints',
     'custom',
     'joins',
+    'llmInstructions',
     'polymorphicJoins',
     'flattenedFields',
     'indexes',
@@ -15,9 +16,10 @@ const serverOnlyUploadProperties = [
     'admin',
     'adminThumbnail',
     'externalFileHeaderFilter',
+    'fileOperations',
     'handlers',
     'modifyResponseHeaders',
-    'withMetadata'
+    'uploadInstructions'
 ];
 const serverOnlyCollectionAdminProperties = [
     'hidden',
@@ -79,6 +81,9 @@ export const createClientCollectionConfig = ({ collection, defaultIDType, i18n,
                     break;
                 }
                 clientCollection.auth = {};
+                clientCollection.auth.forgotPassword = {
+                    minRequestInterval: collection.auth.forgotPassword.minRequestInterval
+                };
                 if (collection.auth.cookies) {
                     clientCollection.auth.cookies = collection.auth.cookies;
                 }
@@ -148,13 +153,17 @@ export const createClientCollectionConfig = ({ collection, defaultIDType, i18n,
                 if (!collection.upload) {
                     break;
                 }
-                clientCollection.upload = {};
+                clientCollection.upload = {
+                    uploadInstructions: {
+                        useInAdmin: collection.upload.uploadInstructions?.useInAdmin ?? false
+                    }
+                };
                 for(const uploadKey in collection.upload){
                     if (serverOnlyUploadProperties.includes(uploadKey)) {
                         continue;
                     }
-                    if (uploadKey === 'imageSizes') {
-                        clientCollection.upload.imageSizes = collection.upload.imageSizes?.map((size)=>{
+                    if (uploadKey === 'variants') {
+                        clientCollection.upload.variants = collection.upload.variants?.map((size)=>{
                             const sanitizedSize = {
                                 ...size
                             };

package/dist/collections/config/client.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/collections/config/client.ts"],"sourcesContent":["import type { I18nClient, TFunction } from '@payloadcms/translations'\n\nimport type { StaticDescription } from '../../admin/types.js'\nimport type { ImportMap } from '../../bin/generateImportMap/index.js'\nimport type {\n  LivePreviewConfig,\n  ServerOnlyLivePreviewProperties,\n  StaticLabel,\n} from '../../config/types.js'\nimport type { ClientField } from '../../fields/config/client.js'\nimport type { ClientHierarchyConfig } from '../../hierarchy/types.js'\nimport type { Payload } from '../../types/index.js'\nimport type { SanitizedUploadConfig } from '../../uploads/types.js'\nimport type { SanitizedCollectionConfig } from './types.js'\n\nimport { createClientFields } from '../../fields/config/client.js'\n\nexport type ServerOnlyCollectionProperties = keyof Pick<\n  SanitizedCollectionConfig,\n  | 'access'\n  | 'custom'\n  | 'endpoints'\n  | 'flattenedFields'\n  | 'hooks'\n  | 'indexes'\n  | 'joins'\n  | 'polymorphicJoins'\n  | 'sanitizedIndexes'\n  | 'select'\n>\n\nexport type ServerOnlyCollectionAdminProperties = keyof Pick<\n  SanitizedCollectionConfig['admin'],\n  'baseFilter' | 'baseListFilter' | 'components' | 'formatDocURL' | 'hidden'\n>\n\nexport type ServerOnlyUploadProperties = keyof Pick<\n  SanitizedCollectionConfig['upload'],\n  | 'admin'\n  | 'adminThumbnail'\n  | 'externalFileHeaderFilter'\n  | 'handlers'\n  | 'modifyResponseHeaders'\n  | 'withMetadata'\n>\n\nexport type ClientCollectionConfig = {\n  admin: {\n    description?: StaticDescription\n    livePreview?: Omit<LivePreviewConfig, ServerOnlyLivePreviewProperties>\n    preview?: boolean\n  } & Omit<\n    SanitizedCollectionConfig['admin'],\n    | 'components'\n    | 'description'\n    | 'formatDocURL'\n    | 'joins'\n    | 'livePreview'\n    | 'preview'\n    | ServerOnlyCollectionAdminProperties\n  >\n  auth?: { verify?: true } & Omit<\n    SanitizedCollectionConfig['auth'],\n    'forgotPassword' | 'strategies' | 'verify'\n  >\n  fields: ClientField[]\n  hierarchy?: ClientHierarchyConfig | false\n  labels: {\n    plural: StaticLabel\n    singular: StaticLabel\n  }\n} & Omit<\n  SanitizedCollectionConfig,\n  'admin' | 'auth' | 'fields' | 'hierarchy' | 'labels' | ServerOnlyCollectionProperties\n>\n\nconst serverOnlyCollectionProperties: Partial<ServerOnlyCollectionProperties>[] = [\n  'hooks',\n  'access',\n  'endpoints',\n  'custom',\n  'joins',\n  'polymorphicJoins',\n  'flattenedFields',\n  'indexes',\n  'sanitizedIndexes',\n  'select',\n  // `upload`\n  // `admin`\n  // are all handled separately\n]\n\nconst serverOnlyUploadProperties: Partial<ServerOnlyUploadProperties>[] = [\n  'admin',\n  'adminThumbnail',\n  'externalFileHeaderFilter',\n  'handlers',\n  'modifyResponseHeaders',\n  'withMetadata',\n]\n\nconst serverOnlyCollectionAdminProperties: Partial<ServerOnlyCollectionAdminProperties>[] = [\n  'hidden',\n  'baseFilter',\n  'baseListFilter',\n  'components',\n  'formatDocURL',\n  // 'preview' is handled separately\n  // `livePreview` is handled separately\n]\n\nexport const createClientCollectionConfig = ({\n  collection,\n  defaultIDType,\n  i18n,\n  importMap,\n}: {\n  collection: SanitizedCollectionConfig\n  defaultIDType: Payload['config']['db']['defaultIDType']\n  i18n: I18nClient\n  importMap: ImportMap\n}): ClientCollectionConfig => {\n  const clientCollection = {} as Partial<ClientCollectionConfig>\n\n  for (const key in collection) {\n    if (serverOnlyCollectionProperties.includes(key as any)) {\n      continue\n    }\n    switch (key) {\n      case 'admin':\n        if (!collection.admin) {\n          break\n        }\n\n        clientCollection.admin = {} as ClientCollectionConfig['admin']\n\n        for (const adminKey in collection.admin) {\n          if (serverOnlyCollectionAdminProperties.includes(adminKey as any)) {\n            continue\n          }\n\n          switch (adminKey) {\n            case 'description':\n              if (\n                typeof collection.admin.description === 'string' ||\n                typeof collection.admin.description === 'object'\n              ) {\n                if (collection.admin.description) {\n                  clientCollection.admin.description = collection.admin.description\n                }\n              } else if (typeof collection.admin.description === 'function') {\n                const description = collection.admin.description({ t: i18n.t as TFunction })\n\n                if (description) {\n                  clientCollection.admin.description = description\n                }\n              }\n              break\n\n            case 'livePreview':\n              clientCollection.admin.livePreview = {}\n\n              if (collection.admin.livePreview?.breakpoints) {\n                clientCollection.admin.livePreview.breakpoints =\n                  collection.admin.livePreview.breakpoints\n              }\n\n              break\n\n            case 'preview':\n              if (collection.admin.preview) {\n                clientCollection.admin.preview = true\n              }\n\n              break\n\n            default:\n              ;(clientCollection as any).admin[adminKey] =\n                collection.admin[adminKey as keyof SanitizedCollectionConfig['admin']]\n          }\n        }\n\n        break\n\n      case 'auth':\n        if (!collection.auth) {\n          break\n        }\n\n        clientCollection.auth = {} as { verify?: true } & SanitizedCollectionConfig['auth']\n\n        if (collection.auth.cookies) {\n          clientCollection.auth.cookies = collection.auth.cookies\n        }\n\n        if (collection.auth.depth !== undefined) {\n          // Check for undefined as it can be a number (0)\n          clientCollection.auth.depth = collection.auth.depth\n        }\n\n        if (collection.auth.disableLocalStrategy) {\n          clientCollection.auth.disableLocalStrategy = collection.auth.disableLocalStrategy\n        }\n\n        if (collection.auth.lockTime !== undefined) {\n          // Check for undefined as it can be a number (0)\n          clientCollection.auth.lockTime = collection.auth.lockTime\n        }\n\n        if (collection.auth.loginWithUsername) {\n          clientCollection.auth.loginWithUsername = collection.auth.loginWithUsername\n        }\n\n        if (collection.auth.maxLoginAttempts !== undefined) {\n          // Check for undefined as it can be a number (0)\n          clientCollection.auth.maxLoginAttempts = collection.auth.maxLoginAttempts\n        }\n\n        if (collection.auth.removeTokenFromResponses) {\n          clientCollection.auth.removeTokenFromResponses = collection.auth.removeTokenFromResponses\n        }\n\n        if (collection.auth.useAPIKey) {\n          clientCollection.auth.useAPIKey = collection.auth.useAPIKey\n        }\n\n        if (collection.auth.tokenExpiration) {\n          clientCollection.auth.tokenExpiration = collection.auth.tokenExpiration\n        }\n\n        if (collection.auth.verify) {\n          clientCollection.auth.verify = true\n        }\n\n        break\n\n      case 'fields':\n        clientCollection.fields = createClientFields({\n          defaultIDType,\n          fields: collection.fields,\n          i18n,\n          importMap,\n        })\n\n        break\n\n      case 'hierarchy': {\n        if (!collection.hierarchy || typeof collection.hierarchy !== 'object') {\n          clientCollection.hierarchy = false\n          break\n        }\n\n        // Strip slugify function as it can't cross server-client boundary\n        const { slugify: _slugify, ...clientHierarchy } = collection.hierarchy\n        clientCollection.hierarchy = clientHierarchy as ClientHierarchyConfig\n\n        break\n      }\n\n      case 'labels':\n        clientCollection.labels = {\n          plural:\n            typeof collection.labels.plural === 'function'\n              ? collection.labels.plural({ i18n, t: i18n.t as TFunction })\n              : collection.labels.plural,\n          singular:\n            typeof collection.labels.singular === 'function'\n              ? collection.labels.singular({ i18n, t: i18n.t as TFunction })\n              : collection.labels.singular,\n        }\n\n        break\n\n      case 'upload':\n        if (!collection.upload) {\n          break\n        }\n\n        clientCollection.upload = {} as SanitizedUploadConfig\n\n        for (const uploadKey in collection.upload) {\n          if (serverOnlyUploadProperties.includes(uploadKey as any)) {\n            continue\n          }\n\n          if (uploadKey === 'imageSizes') {\n            clientCollection.upload.imageSizes = collection.upload.imageSizes?.map((size) => {\n              const sanitizedSize = { ...size }\n              if ('generateImageName' in sanitizedSize) {\n                delete sanitizedSize.generateImageName\n              }\n              return sanitizedSize\n            })\n          } else {\n            ;(clientCollection.upload as any)[uploadKey] =\n              collection.upload[uploadKey as keyof SanitizedUploadConfig]\n          }\n        }\n\n        break\n\n      default:\n        ;(clientCollection as any)[key] = collection[key as keyof SanitizedCollectionConfig]\n    }\n  }\n\n  return clientCollection as ClientCollectionConfig\n}\n\nexport const createClientCollectionConfigs = ({\n  collections,\n  defaultIDType,\n  i18n,\n  importMap,\n}: {\n  collections: SanitizedCollectionConfig[]\n  defaultIDType: Payload['config']['db']['defaultIDType']\n  i18n: I18nClient\n  importMap: ImportMap\n}): ClientCollectionConfig[] => {\n  const clientCollections = new Array(collections.length)\n\n  for (let i = 0; i < collections.length; i++) {\n    const collection = collections[i]!\n\n    clientCollections[i] = createClientCollectionConfig({\n      collection,\n      defaultIDType,\n      i18n,\n      importMap,\n    })\n  }\n\n  return clientCollections\n}\n"],"names":["createClientFields","serverOnlyCollectionProperties","serverOnlyUploadProperties","serverOnlyCollectionAdminProperties","createClientCollectionConfig","collection","defaultIDType","i18n","importMap","clientCollection","key","includes","admin","adminKey","description","t","livePreview","breakpoints","preview","auth","cookies","depth","undefined","disableLocalStrategy","lockTime","loginWithUsername","maxLoginAttempts","removeTokenFromResponses","useAPIKey","tokenExpiration","verify","fields","hierarchy","slugify","_slugify","clientHierarchy","labels","plural","singular","upload","uploadKey","imageSizes","map","size","sanitizedSize","generateImageName","createClientCollectionConfigs","collections","clientCollections","Array","length","i"],"mappings":"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"}
+{"version":3,"sources":["../../../src/collections/config/client.ts"],"sourcesContent":["import type { I18nClient, TFunction } from '@payloadcms/translations'\n\nimport type { StaticDescription } from '../../admin/types.js'\nimport type { ImportMap } from '../../cli/commands/generateImportMap/generateImportMap.js'\nimport type {\n  LivePreviewConfig,\n  ServerOnlyLivePreviewProperties,\n  StaticLabel,\n} from '../../config/types.js'\nimport type { ClientField } from '../../fields/config/client.js'\nimport type { ClientHierarchyConfig } from '../../hierarchy/types.js'\nimport type { Payload } from '../../types/index.js'\nimport type { SanitizedUploadConfig, UploadInstructionsCapability } from '../../uploads/types.js'\nimport type { SanitizedCollectionConfig } from './types.js'\n\nimport { createClientFields } from '../../fields/config/client.js'\n\nexport type ServerOnlyCollectionProperties = keyof Pick<\n  SanitizedCollectionConfig,\n  | 'access'\n  | 'custom'\n  | 'endpoints'\n  | 'flattenedFields'\n  | 'hooks'\n  | 'indexes'\n  | 'joins'\n  | 'llmInstructions'\n  | 'polymorphicJoins'\n  | 'sanitizedIndexes'\n  | 'select'\n>\n\nexport type ServerOnlyCollectionAdminProperties = keyof Pick<\n  SanitizedCollectionConfig['admin'],\n  'baseFilter' | 'baseListFilter' | 'components' | 'formatDocURL' | 'hidden'\n>\n\nexport type ServerOnlyUploadProperties = keyof Pick<\n  SanitizedCollectionConfig['upload'],\n  | 'admin'\n  | 'adminThumbnail'\n  | 'externalFileHeaderFilter'\n  | 'fileOperations'\n  | 'handlers'\n  | 'modifyResponseHeaders'\n  | 'uploadInstructions'\n>\n\ntype ClientUploadConfig = {\n  uploadInstructions: Pick<UploadInstructionsCapability, 'useInAdmin'>\n} & Omit<SanitizedUploadConfig, 'fileOperations' | 'uploadInstructions'>\n\nexport type ClientCollectionConfig = {\n  admin: {\n    description?: StaticDescription\n    livePreview?: Omit<LivePreviewConfig, ServerOnlyLivePreviewProperties>\n    preview?: boolean\n  } & Omit<\n    SanitizedCollectionConfig['admin'],\n    | 'components'\n    | 'description'\n    | 'formatDocURL'\n    | 'joins'\n    | 'livePreview'\n    | 'preview'\n    | ServerOnlyCollectionAdminProperties\n  >\n  auth?: {\n    forgotPassword: Pick<SanitizedCollectionConfig['auth']['forgotPassword'], 'minRequestInterval'>\n    verify?: true\n  } & Omit<SanitizedCollectionConfig['auth'], 'forgotPassword' | 'strategies' | 'verify'>\n  fields: ClientField[]\n  hierarchy?: ClientHierarchyConfig | false\n  labels: {\n    plural: StaticLabel\n    singular: StaticLabel\n  }\n  upload: ClientUploadConfig\n} & Omit<\n  SanitizedCollectionConfig,\n  'admin' | 'auth' | 'fields' | 'hierarchy' | 'labels' | 'upload' | ServerOnlyCollectionProperties\n>\n\nconst serverOnlyCollectionProperties: Partial<ServerOnlyCollectionProperties>[] = [\n  'hooks',\n  'access',\n  'endpoints',\n  'custom',\n  'joins',\n  'llmInstructions',\n  'polymorphicJoins',\n  'flattenedFields',\n  'indexes',\n  'sanitizedIndexes',\n  'select',\n  // `upload`\n  // `admin`\n  // are all handled separately\n]\n\nconst serverOnlyUploadProperties: Partial<ServerOnlyUploadProperties>[] = [\n  'admin',\n  'adminThumbnail',\n  'externalFileHeaderFilter',\n  'fileOperations',\n  'handlers',\n  'modifyResponseHeaders',\n  'uploadInstructions',\n]\n\nconst serverOnlyCollectionAdminProperties: Partial<ServerOnlyCollectionAdminProperties>[] = [\n  'hidden',\n  'baseFilter',\n  'baseListFilter',\n  'components',\n  'formatDocURL',\n  // 'preview' is handled separately\n  // `livePreview` is handled separately\n]\n\nexport const createClientCollectionConfig = ({\n  collection,\n  defaultIDType,\n  i18n,\n  importMap,\n}: {\n  collection: SanitizedCollectionConfig\n  defaultIDType: Payload['config']['db']['defaultIDType']\n  i18n: I18nClient\n  importMap: ImportMap\n}): ClientCollectionConfig => {\n  const clientCollection = {} as Partial<ClientCollectionConfig>\n\n  for (const key in collection) {\n    if (serverOnlyCollectionProperties.includes(key as any)) {\n      continue\n    }\n    switch (key) {\n      case 'admin':\n        if (!collection.admin) {\n          break\n        }\n\n        clientCollection.admin = {} as ClientCollectionConfig['admin']\n\n        for (const adminKey in collection.admin) {\n          if (serverOnlyCollectionAdminProperties.includes(adminKey as any)) {\n            continue\n          }\n\n          switch (adminKey) {\n            case 'description':\n              if (\n                typeof collection.admin.description === 'string' ||\n                typeof collection.admin.description === 'object'\n              ) {\n                if (collection.admin.description) {\n                  clientCollection.admin.description = collection.admin.description\n                }\n              } else if (typeof collection.admin.description === 'function') {\n                const description = collection.admin.description({ t: i18n.t as TFunction })\n\n                if (description) {\n                  clientCollection.admin.description = description\n                }\n              }\n              break\n\n            case 'livePreview':\n              clientCollection.admin.livePreview = {}\n\n              if (collection.admin.livePreview?.breakpoints) {\n                clientCollection.admin.livePreview.breakpoints =\n                  collection.admin.livePreview.breakpoints\n              }\n\n              break\n\n            case 'preview':\n              if (collection.admin.preview) {\n                clientCollection.admin.preview = true\n              }\n\n              break\n\n            default:\n              ;(clientCollection as any).admin[adminKey] =\n                collection.admin[adminKey as keyof SanitizedCollectionConfig['admin']]\n          }\n        }\n\n        break\n\n      case 'auth':\n        if (!collection.auth) {\n          break\n        }\n\n        clientCollection.auth = {} as { verify?: true } & SanitizedCollectionConfig['auth']\n\n        clientCollection.auth.forgotPassword = {\n          minRequestInterval: collection.auth.forgotPassword.minRequestInterval,\n        }\n\n        if (collection.auth.cookies) {\n          clientCollection.auth.cookies = collection.auth.cookies\n        }\n\n        if (collection.auth.depth !== undefined) {\n          // Check for undefined as it can be a number (0)\n          clientCollection.auth.depth = collection.auth.depth\n        }\n\n        if (collection.auth.disableLocalStrategy) {\n          clientCollection.auth.disableLocalStrategy = collection.auth.disableLocalStrategy\n        }\n\n        if (collection.auth.lockTime !== undefined) {\n          // Check for undefined as it can be a number (0)\n          clientCollection.auth.lockTime = collection.auth.lockTime\n        }\n\n        if (collection.auth.loginWithUsername) {\n          clientCollection.auth.loginWithUsername = collection.auth.loginWithUsername\n        }\n\n        if (collection.auth.maxLoginAttempts !== undefined) {\n          // Check for undefined as it can be a number (0)\n          clientCollection.auth.maxLoginAttempts = collection.auth.maxLoginAttempts\n        }\n\n        if (collection.auth.removeTokenFromResponses) {\n          clientCollection.auth.removeTokenFromResponses = collection.auth.removeTokenFromResponses\n        }\n\n        if (collection.auth.useAPIKey) {\n          clientCollection.auth.useAPIKey = collection.auth.useAPIKey\n        }\n\n        if (collection.auth.tokenExpiration) {\n          clientCollection.auth.tokenExpiration = collection.auth.tokenExpiration\n        }\n\n        if (collection.auth.verify) {\n          clientCollection.auth.verify = true\n        }\n\n        break\n\n      case 'fields':\n        clientCollection.fields = createClientFields({\n          defaultIDType,\n          fields: collection.fields,\n          i18n,\n          importMap,\n        })\n\n        break\n\n      case 'hierarchy': {\n        if (!collection.hierarchy || typeof collection.hierarchy !== 'object') {\n          clientCollection.hierarchy = false\n          break\n        }\n\n        // Strip slugify function as it can't cross server-client boundary\n        const { slugify: _slugify, ...clientHierarchy } = collection.hierarchy\n        clientCollection.hierarchy = clientHierarchy as ClientHierarchyConfig\n\n        break\n      }\n\n      case 'labels':\n        clientCollection.labels = {\n          plural:\n            typeof collection.labels.plural === 'function'\n              ? collection.labels.plural({ i18n, t: i18n.t as TFunction })\n              : collection.labels.plural,\n          singular:\n            typeof collection.labels.singular === 'function'\n              ? collection.labels.singular({ i18n, t: i18n.t as TFunction })\n              : collection.labels.singular,\n        }\n\n        break\n\n      case 'upload':\n        if (!collection.upload) {\n          break\n        }\n\n        clientCollection.upload = {\n          uploadInstructions: {\n            useInAdmin: collection.upload.uploadInstructions?.useInAdmin ?? false,\n          },\n        } as ClientUploadConfig\n\n        for (const uploadKey in collection.upload) {\n          if (serverOnlyUploadProperties.includes(uploadKey as any)) {\n            continue\n          }\n\n          if (uploadKey === 'variants') {\n            clientCollection.upload.variants = collection.upload.variants?.map((size) => {\n              const sanitizedSize = { ...size }\n              if ('generateImageName' in sanitizedSize) {\n                delete sanitizedSize.generateImageName\n              }\n              return sanitizedSize\n            })\n          } else {\n            ;(clientCollection.upload as any)[uploadKey] =\n              collection.upload[uploadKey as keyof SanitizedUploadConfig]\n          }\n        }\n\n        break\n\n      default:\n        ;(clientCollection as any)[key] = collection[key as keyof SanitizedCollectionConfig]\n    }\n  }\n\n  return clientCollection as ClientCollectionConfig\n}\n\nexport const createClientCollectionConfigs = ({\n  collections,\n  defaultIDType,\n  i18n,\n  importMap,\n}: {\n  collections: SanitizedCollectionConfig[]\n  defaultIDType: Payload['config']['db']['defaultIDType']\n  i18n: I18nClient\n  importMap: ImportMap\n}): ClientCollectionConfig[] => {\n  const clientCollections = new Array(collections.length)\n\n  for (let i = 0; i < collections.length; i++) {\n    const collection = collections[i]!\n\n    clientCollections[i] = createClientCollectionConfig({\n      collection,\n      defaultIDType,\n      i18n,\n      importMap,\n    })\n  }\n\n  return clientCollections\n}\n"],"names":["createClientFields","serverOnlyCollectionProperties","serverOnlyUploadProperties","serverOnlyCollectionAdminProperties","createClientCollectionConfig","collection","defaultIDType","i18n","importMap","clientCollection","key","includes","admin","adminKey","description","t","livePreview","breakpoints","preview","auth","forgotPassword","minRequestInterval","cookies","depth","undefined","disableLocalStrategy","lockTime","loginWithUsername","maxLoginAttempts","removeTokenFromResponses","useAPIKey","tokenExpiration","verify","fields","hierarchy","slugify","_slugify","clientHierarchy","labels","plural","singular","upload","uploadInstructions","useInAdmin","uploadKey","variants","map","size","sanitizedSize","generateImageName","createClientCollectionConfigs","collections","clientCollections","Array","length","i"],"mappings":"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"}

package/dist/collections/config/defaults.d.ts

@@ -1,18 +1,16 @@
-import type { IncomingAuthType, LoginWithUsernameOptions } from '../../auth/types.js';
+import type { Auth, IncomingAuthType, LoginWithUsernameOptions } from '../../auth/types.js';
+import type { Access } from '../../config/types.js';
 import type { CollectionConfig } from './types.js';
+export declare const createInheritedReadVersionsAccess: (read: Access) => Access;
 /**
  * @deprecated - remove in 4.0. This is error-prone, as mutating this object will affect any objects that use the defaults as a base.
  */
 export declare const defaults: Partial<CollectionConfig>;
 export declare const addDefaultsToCollectionConfig: (collection: CollectionConfig) => CollectionConfig;
+export declare const addDefaultsToAuthConfig: (auth: IncomingAuthType) => Auth;
 /**
  * @deprecated - remove in 4.0. This is error-prone, as mutating this object will affect any objects that use the defaults as a base.
  */
-export declare const authDefaults: IncomingAuthType;
-export declare const addDefaultsToAuthConfig: (auth: IncomingAuthType) => IncomingAuthType;
-/**
- * @deprecated - remove in 4.0. This is error-prone, as mutating this object will affect any objects that use the defaults as a base.
- */
-export declare const loginWithUsernameDefaults: LoginWithUsernameOptions;
-export declare const addDefaultsToLoginWithUsernameConfig: (loginWithUsername: LoginWithUsernameOptions) => LoginWithUsernameOptions;
+export declare const loginWithUsernameDefaults: Required<LoginWithUsernameOptions>;
+export declare const addDefaultsToLoginWithUsernameConfig: (loginWithUsername: LoginWithUsernameOptions) => Required<LoginWithUsernameOptions>;
 //# sourceMappingURL=defaults.d.ts.map

package/dist/collections/config/defaults.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../../src/collections/config/defaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAA;AACrF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAIlD;;GAEG;AACH,eAAO,MAAM,QAAQ,EAAE,OAAO,CAAC,gBAAgB,CA8C9C,CAAA;AAED,eAAO,MAAM,6BAA6B,GAAI,YAAY,gBAAgB,KAAG,gBA0D5E,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,YAAY,EAAE,gBAY1B,CAAA;AAED,eAAO,MAAM,uBAAuB,GAAI,MAAM,gBAAgB,KAAG,gBAqBhE,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,wBAIvC,CAAA;AAED,eAAO,MAAM,oCAAoC,GAC/C,mBAAmB,wBAAwB,KAC1C,wBAM6B,CAAA"}
+{"version":3,"file":"defaults.d.ts","sourceRoot":"","sources":["../../../src/collections/config/defaults.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAA;AAC3F,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,KAAK,EAAE,gBAAgB,EAA6B,MAAM,YAAY,CAAA;AAW7E,eAAO,MAAM,iCAAiC,SAAU,MAAM,KAAG,MAK7D,CAAA;AAEJ;;GAEG;AACH,eAAO,MAAM,QAAQ,EAAE,OAAO,CAAC,gBAAgB,CAgD9C,CAAA;AAED,eAAO,MAAM,6BAA6B,eAAgB,gBAAgB,KAAG,gBAkE5E,CAAA;AAED,eAAO,MAAM,uBAAuB,SAAU,gBAAgB,KAAG,IA2BhE,CAAA;AAED;;GAEG;AACH,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,wBAAwB,CAIxE,CAAA;AAED,eAAO,MAAM,oCAAoC,sBAC5B,wBAAwB,KAC1C,QAAQ,CAAC,wBAAwB,CAQM,CAAA"}