payload 3.0.0-alpha.61 → 3.0.0-alpha.63

package/dist/utilities/telemetry/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utilities/telemetry/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAM7D,MAAM,MAAM,SAAS,GAAG;IACtB,KAAK,EAAE,MAAM,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,WAAW,EAAE,MAAM,CAAA;IACnB,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;IAChD,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,KAAK,cAAc,GAAG,cAAc,GAAG,eAAe,CAAA;AAEtD,KAAK,IAAI,GAAG;IACV,KAAK,EAAE,cAAc,CAAA;IACrB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,SAAS,uBAA8B,IAAI,KAAG,QAAQ,IAAI,CAwBtE,CAAA;AAsDD,eAAO,MAAM,iBAAiB,gBAAiB,WAAW,KAAG,MAE5D,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utilities/telemetry/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AACnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAM7D,MAAM,MAAM,SAAS,GAAG;IACtB,MAAM,EAAE,IAAI,GAAG,MAAM,CAAA;IACrB,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,OAAO,CAAA;IACb,OAAO,EAAE,MAAM,CAAA;IACf,WAAW,EAAE,MAAM,CAAA;IACnB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACvC,cAAc,EAAE,MAAM,CAAA;IACtB,SAAS,EAAE,MAAM,CAAA;CAClB,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,YAAY,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;IAChD,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,KAAK,cAAc,GAAG,cAAc,GAAG,eAAe,CAAA;AAEtD,KAAK,IAAI,GAAG;IACV,KAAK,EAAE,cAAc,CAAA;IACrB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAID,eAAO,MAAM,SAAS,uBAA8B,IAAI,KAAG,QAAQ,IAAI,CAsCtE,CAAA;AA4DD,eAAO,MAAM,iBAAiB,gBAAiB,WAAW,KAAG,MAE5D,CAAA"}

package/dist/utilities/telemetry/index.js

@@ -1,4 +1,5 @@
 import { execSync } from 'child_process';
+import ciInfo from 'ci-info';
 import ConfImport from 'conf';
 import { randomBytes } from 'crypto';
 import findUp from 'find-up';
@@ -7,17 +8,34 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import { oneWayHash } from './oneWayHash.js';
 const Conf = ConfImport.default || ConfImport;
+let baseEvent = null;
 export const sendEvent = async ({ event, payload })=>{
-    if (payload.config.telemetry !== false) {
-        try {
-            const packageJSON = await getPackageJSON();
-            const baseEvent = {
+    try {
+        const packageJSON = await getPackageJSON();
+        // Only generate the base event once
+        if (!baseEvent) {
+            baseEvent = {
+                ciName: ciInfo.isCI ? ciInfo.name : null,
                 envID: getEnvID(),
+                isCI: ciInfo.isCI,
                 nodeEnv: process.env.NODE_ENV || 'development',
                 nodeVersion: process.version,
+                payloadPackages: getPayloadPackages(packageJSON),
                 payloadVersion: getPayloadVersion(packageJSON),
                 projectID: getProjectID(payload, packageJSON)
             };
+        }
+        if (process.env.PAYLOAD_TELEMETRY_DEBUG) {
+            payload.logger.info({
+                event: {
+                    ...baseEvent,
+                    ...event
+                },
+                msg: 'Telemetry Event'
+            });
+            return;
+        }
+        if (payload.config.telemetry !== false) {
             await fetch('https://telemetry.payloadcms.com/events', {
                 body: JSON.stringify({
                     ...baseEvent,
@@ -28,9 +46,9 @@ export const sendEvent = async ({ event, payload })=>{
                 },
                 method: 'post'
             });
-        } catch (_) {
-        // Eat any errors in sending telemetry event
         }
+    } catch (_) {
+    // Eat any errors in sending telemetry event
     }
 };
 /**
@@ -62,6 +80,14 @@ const getGitID = (payload)=>{
         return null;
     }
 };
+const getPayloadPackages = (packageJSON)=>{
+    return Object.keys(packageJSON.dependencies || {}).reduce((acc, key)=>{
+        return key.startsWith('@payloadcms/') ? {
+            ...acc,
+            [key]: packageJSON.dependencies[key]
+        } : acc;
+    }, {});
+};
 const getPackageJSON = async ()=>{
     const filename = fileURLToPath(import.meta.url);
     const dirname = path.dirname(filename);

package/dist/utilities/telemetry/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/utilities/telemetry/index.ts"],"sourcesContent":["import { execSync } from 'child_process'\nimport ConfImport from 'conf'\nimport { randomBytes } from 'crypto'\nimport findUp from 'find-up'\nimport fs from 'fs'\nimport path from 'path'\nimport { fileURLToPath } from 'url'\n\nimport type { Payload } from '../../types/index.js'\nimport type { AdminInitEvent } from './events/adminInit.js'\nimport type { ServerInitEvent } from './events/serverInit.js'\n\nimport { oneWayHash } from './oneWayHash.js'\n\nconst Conf = (ConfImport.default || ConfImport) as unknown as typeof ConfImport.default\n\nexport type BaseEvent = {\n  envID: string\n  nodeEnv: string\n  nodeVersion: string\n  payloadVersion: string\n  projectID: string\n}\n\ntype PackageJSON = {\n  dependencies: Record<string, string | undefined>\n  name: string\n}\n\ntype TelemetryEvent = AdminInitEvent | ServerInitEvent\n\ntype Args = {\n  event: TelemetryEvent\n  payload: Payload\n}\n\nexport const sendEvent = async ({ event, payload }: Args): Promise<void> => {\n  if (payload.config.telemetry !== false) {\n    try {\n      const packageJSON = await getPackageJSON()\n\n      const baseEvent: BaseEvent = {\n        envID: getEnvID(),\n        nodeEnv: process.env.NODE_ENV || 'development',\n        nodeVersion: process.version,\n        payloadVersion: getPayloadVersion(packageJSON),\n        projectID: getProjectID(payload, packageJSON),\n      }\n\n      await fetch('https://telemetry.payloadcms.com/events', {\n        body: JSON.stringify({ ...baseEvent, ...event }),\n        headers: {\n          'Content-Type': 'application/json',\n        },\n        method: 'post',\n      })\n    } catch (_) {\n      // Eat any errors in sending telemetry event\n    }\n  }\n}\n\n/**\n * This is a quasi-persistent identifier used to dedupe recurring events. It's\n * generated from random data and completely anonymous.\n */\nconst getEnvID = (): string => {\n  const conf = new Conf()\n  const ENV_ID = 'envID'\n\n  const val = conf.get(ENV_ID)\n  if (val) {\n    return val as string\n  }\n\n  const generated = randomBytes(32).toString('hex')\n  conf.set(ENV_ID, generated)\n  return generated\n}\n\nconst getProjectID = (payload: Payload, packageJSON: PackageJSON): string => {\n  const projectID =\n    getGitID(payload) ||\n    getPackageJSONID(payload, packageJSON) ||\n    payload.config.serverURL ||\n    process.cwd()\n  return oneWayHash(projectID, payload.secret)\n}\n\nconst getGitID = (payload: Payload) => {\n  try {\n    const originBuffer = execSync('git config --local --get remote.origin.url', {\n      stdio: 'pipe',\n      timeout: 1000,\n    })\n\n    return oneWayHash(String(originBuffer).trim(), payload.secret)\n  } catch (_) {\n    return null\n  }\n}\n\nconst getPackageJSON = async (): Promise<PackageJSON> => {\n  const filename = fileURLToPath(import.meta.url)\n  const dirname = path.dirname(filename)\n  const packageJsonPath = await findUp('package.json', { cwd: dirname })\n  const jsonContent: PackageJSON = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'))\n  return jsonContent\n}\n\nconst getPackageJSONID = (payload: Payload, packageJSON: PackageJSON): string => {\n  return oneWayHash(packageJSON.name, payload.secret)\n}\n\nexport const getPayloadVersion = (packageJSON: PackageJSON): string => {\n  return packageJSON?.dependencies?.payload ?? ''\n}\n"],"names":["execSync","ConfImport","randomBytes","findUp","fs","path","fileURLToPath","oneWayHash","Conf","default","sendEvent","event","payload","config","telemetry","packageJSON","getPackageJSON","baseEvent","envID","getEnvID","nodeEnv","process","env","NODE_ENV","nodeVersion","version","payloadVersion","getPayloadVersion","projectID","getProjectID","fetch","body","JSON","stringify","headers","method","_","conf","ENV_ID","val","get","generated","toString","set","getGitID","getPackageJSONID","serverURL","cwd","secret","originBuffer","stdio","timeout","String","trim","filename","url","dirname","packageJsonPath","jsonContent","parse","readFileSync","name","dependencies"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,SAASA,QAAQ,QAAQ,gBAAe;AACxC,OAAOC,gBAAgB,OAAM;AAC7B,SAASC,WAAW,QAAQ,SAAQ;AACpC,OAAOC,YAAY,UAAS;AAC5B,OAAOC,QAAQ,KAAI;AACnB,OAAOC,UAAU,OAAM;AACvB,SAASC,aAAa,QAAQ,MAAK;AAMnC,SAASC,UAAU,QAAQ,kBAAiB;AAE5C,MAAMC,OAAQP,WAAWQ,OAAO,IAAIR;AAsBpC,OAAO,MAAMS,YAAY,OAAO,EAAEC,KAAK,EAAEC,OAAO,EAAQ;IACtD,IAAIA,QAAQC,MAAM,CAACC,SAAS,KAAK,OAAO;QACtC,IAAI;YACF,MAAMC,cAAc,MAAMC;YAE1B,MAAMC,YAAuB;gBAC3BC,OAAOC;gBACPC,SAASC,QAAQC,GAAG,CAACC,QAAQ,IAAI;gBACjCC,aAAaH,QAAQI,OAAO;gBAC5BC,gBAAgBC,kBAAkBZ;gBAClCa,WAAWC,aAAajB,SAASG;YACnC;YAEA,MAAMe,MAAM,2CAA2C;gBACrDC,MAAMC,KAAKC,SAAS,CAAC;oBAAE,GAAGhB,SAAS;oBAAE,GAAGN,KAAK;gBAAC;gBAC9CuB,SAAS;oBACP,gBAAgB;gBAClB;gBACAC,QAAQ;YACV;QACF,EAAE,OAAOC,GAAG;QACV,4CAA4C;QAC9C;IACF;AACF,EAAC;AAED;;;CAGC,GACD,MAAMjB,WAAW;IACf,MAAMkB,OAAO,IAAI7B;IACjB,MAAM8B,SAAS;IAEf,MAAMC,MAAMF,KAAKG,GAAG,CAACF;IACrB,IAAIC,KAAK;QACP,OAAOA;IACT;IAEA,MAAME,YAAYvC,YAAY,IAAIwC,QAAQ,CAAC;IAC3CL,KAAKM,GAAG,CAACL,QAAQG;IACjB,OAAOA;AACT;AAEA,MAAMZ,eAAe,CAACjB,SAAkBG;IACtC,MAAMa,YACJgB,SAAShC,YACTiC,iBAAiBjC,SAASG,gBAC1BH,QAAQC,MAAM,CAACiC,SAAS,IACxBzB,QAAQ0B,GAAG;IACb,OAAOxC,WAAWqB,WAAWhB,QAAQoC,MAAM;AAC7C;AAEA,MAAMJ,WAAW,CAAChC;IAChB,IAAI;QACF,MAAMqC,eAAejD,SAAS,8CAA8C;YAC1EkD,OAAO;YACPC,SAAS;QACX;QAEA,OAAO5C,WAAW6C,OAAOH,cAAcI,IAAI,IAAIzC,QAAQoC,MAAM;IAC/D,EAAE,OAAOZ,GAAG;QACV,OAAO;IACT;AACF;AAEA,MAAMpB,iBAAiB;IACrB,MAAMsC,WAAWhD,cAAc,YAAYiD,GAAG;IAC9C,MAAMC,UAAUnD,KAAKmD,OAAO,CAACF;IAC7B,MAAMG,kBAAkB,MAAMtD,OAAO,gBAAgB;QAAE4C,KAAKS;IAAQ;IACpE,MAAME,cAA2B1B,KAAK2B,KAAK,CAACvD,GAAGwD,YAAY,CAACH,iBAAiB;IAC7E,OAAOC;AACT;AAEA,MAAMb,mBAAmB,CAACjC,SAAkBG;IAC1C,OAAOR,WAAWQ,YAAY8C,IAAI,EAAEjD,QAAQoC,MAAM;AACpD;AAEA,OAAO,MAAMrB,oBAAoB,CAACZ;IAChC,OAAOA,aAAa+C,cAAclD,WAAW;AAC/C,EAAC"}
+{"version":3,"sources":["../../../src/utilities/telemetry/index.ts"],"sourcesContent":["import { execSync } from 'child_process'\nimport ciInfo from 'ci-info'\nimport ConfImport from 'conf'\nimport { randomBytes } from 'crypto'\nimport findUp from 'find-up'\nimport fs from 'fs'\nimport path from 'path'\nimport { fileURLToPath } from 'url'\n\nimport type { Payload } from '../../types/index.js'\nimport type { AdminInitEvent } from './events/adminInit.js'\nimport type { ServerInitEvent } from './events/serverInit.js'\n\nimport { oneWayHash } from './oneWayHash.js'\n\nconst Conf = (ConfImport.default || ConfImport) as unknown as typeof ConfImport.default\n\nexport type BaseEvent = {\n  ciName: null | string\n  envID: string\n  isCI: boolean\n  nodeEnv: string\n  nodeVersion: string\n  payloadPackages: Record<string, string>\n  payloadVersion: string\n  projectID: string\n}\n\ntype PackageJSON = {\n  dependencies: Record<string, string | undefined>\n  name: string\n}\n\ntype TelemetryEvent = AdminInitEvent | ServerInitEvent\n\ntype Args = {\n  event: TelemetryEvent\n  payload: Payload\n}\n\nlet baseEvent: BaseEvent | null = null\n\nexport const sendEvent = async ({ event, payload }: Args): Promise<void> => {\n  try {\n    const packageJSON = await getPackageJSON()\n\n    // Only generate the base event once\n    if (!baseEvent) {\n      baseEvent = {\n        ciName: ciInfo.isCI ? ciInfo.name : null,\n        envID: getEnvID(),\n        isCI: ciInfo.isCI,\n        nodeEnv: process.env.NODE_ENV || 'development',\n        nodeVersion: process.version,\n        payloadPackages: getPayloadPackages(packageJSON),\n        payloadVersion: getPayloadVersion(packageJSON),\n        projectID: getProjectID(payload, packageJSON),\n      }\n    }\n\n    if (process.env.PAYLOAD_TELEMETRY_DEBUG) {\n      payload.logger.info({\n        event: { ...baseEvent, ...event },\n        msg: 'Telemetry Event',\n      })\n      return\n    }\n\n    if (payload.config.telemetry !== false) {\n      await fetch('https://telemetry.payloadcms.com/events', {\n        body: JSON.stringify({ ...baseEvent, ...event }),\n        headers: {\n          'Content-Type': 'application/json',\n        },\n        method: 'post',\n      })\n    }\n  } catch (_) {\n    // Eat any errors in sending telemetry event\n  }\n}\n\n/**\n * This is a quasi-persistent identifier used to dedupe recurring events. It's\n * generated from random data and completely anonymous.\n */\nconst getEnvID = (): string => {\n  const conf = new Conf()\n  const ENV_ID = 'envID'\n\n  const val = conf.get(ENV_ID)\n  if (val) {\n    return val as string\n  }\n\n  const generated = randomBytes(32).toString('hex')\n  conf.set(ENV_ID, generated)\n  return generated\n}\n\nconst getProjectID = (payload: Payload, packageJSON: PackageJSON): string => {\n  const projectID =\n    getGitID(payload) ||\n    getPackageJSONID(payload, packageJSON) ||\n    payload.config.serverURL ||\n    process.cwd()\n  return oneWayHash(projectID, payload.secret)\n}\n\nconst getGitID = (payload: Payload) => {\n  try {\n    const originBuffer = execSync('git config --local --get remote.origin.url', {\n      stdio: 'pipe',\n      timeout: 1000,\n    })\n\n    return oneWayHash(String(originBuffer).trim(), payload.secret)\n  } catch (_) {\n    return null\n  }\n}\n\nconst getPayloadPackages = (packageJSON: PackageJSON): Record<string, string> => {\n  return Object.keys(packageJSON.dependencies || {}).reduce((acc, key) => {\n    return key.startsWith('@payloadcms/') ? { ...acc, [key]: packageJSON.dependencies[key] } : acc\n  }, {})\n}\n\nconst getPackageJSON = async (): Promise<PackageJSON> => {\n  const filename = fileURLToPath(import.meta.url)\n  const dirname = path.dirname(filename)\n  const packageJsonPath = await findUp('package.json', { cwd: dirname })\n  const jsonContent: PackageJSON = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'))\n  return jsonContent\n}\n\nconst getPackageJSONID = (payload: Payload, packageJSON: PackageJSON): string => {\n  return oneWayHash(packageJSON.name, payload.secret)\n}\n\nexport const getPayloadVersion = (packageJSON: PackageJSON): string => {\n  return packageJSON?.dependencies?.payload ?? ''\n}\n"],"names":["execSync","ciInfo","ConfImport","randomBytes","findUp","fs","path","fileURLToPath","oneWayHash","Conf","default","baseEvent","sendEvent","event","payload","packageJSON","getPackageJSON","ciName","isCI","name","envID","getEnvID","nodeEnv","process","env","NODE_ENV","nodeVersion","version","payloadPackages","getPayloadPackages","payloadVersion","getPayloadVersion","projectID","getProjectID","PAYLOAD_TELEMETRY_DEBUG","logger","info","msg","config","telemetry","fetch","body","JSON","stringify","headers","method","_","conf","ENV_ID","val","get","generated","toString","set","getGitID","getPackageJSONID","serverURL","cwd","secret","originBuffer","stdio","timeout","String","trim","Object","keys","dependencies","reduce","acc","key","startsWith","filename","url","dirname","packageJsonPath","jsonContent","parse","readFileSync"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

package/dist/versions/saveVersion.js

@@ -112,7 +112,7 @@ export const saveVersion = async ({ id, autosave, collection, docWithLocales: do
     createdVersion.createdAt = result.createdAt;
     createdVersion.updatedAt = result.updatedAt;
     createdVersion = sanitizeInternalFields(createdVersion);
-    createdVersion.id = id;
+    createdVersion.id = result.parent;
     return createdVersion;
 };
 

package/dist/versions/saveVersion.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/versions/saveVersion.ts"],"sourcesContent":["import type { SanitizedCollectionConfig, TypeWithID } from '../collections/config/types.js'\nimport type { SanitizedGlobalConfig } from '../globals/config/types.js'\nimport type { Payload } from '../index.js'\nimport type { PayloadRequest } from '../types/index.js'\n\nimport { deepCopyObject } from '../utilities/deepCopyObject.js'\nimport sanitizeInternalFields from '../utilities/sanitizeInternalFields.js'\nimport { enforceMaxVersions } from './enforceMaxVersions.js'\n\ntype Args = {\n  autosave?: boolean\n  collection?: SanitizedCollectionConfig\n  docWithLocales: any\n  draft?: boolean\n  global?: SanitizedGlobalConfig\n  id?: number | string\n  payload: Payload\n  req?: PayloadRequest\n}\n\nexport const saveVersion = async ({\n  id,\n  autosave,\n  collection,\n  docWithLocales: doc,\n  draft,\n  global,\n  payload,\n  req,\n}: Args): Promise<TypeWithID> => {\n  let result\n  let createNewVersion = true\n  const now = new Date().toISOString()\n  const versionData = deepCopyObject(doc)\n  if (draft) versionData._status = 'draft'\n  if (versionData._id) delete versionData._id\n\n  try {\n    if (autosave) {\n      let docs\n      const findVersionArgs = {\n        limit: 1,\n        pagination: false,\n        req,\n        sort: '-updatedAt',\n      }\n      if (collection) {\n        ;({ docs } = await payload.db.findVersions({\n          ...findVersionArgs,\n          collection: collection.slug,\n          req,\n          where: {\n            parent: {\n              equals: id,\n            },\n          },\n        }))\n      } else {\n        ;({ docs } = await payload.db.findGlobalVersions({\n          ...findVersionArgs,\n          global: global.slug,\n          req,\n        }))\n      }\n      const [latestVersion] = docs\n\n      // overwrite the latest version if it's set to autosave\n      if (latestVersion?.autosave === true) {\n        createNewVersion = false\n\n        const data: Record<string, unknown> = {\n          createdAt: new Date(latestVersion.createdAt).toISOString(),\n          updatedAt: draft ? now : new Date(doc.updatedAt).toISOString(),\n          version: versionData,\n        }\n\n        const updateVersionArgs = {\n          id: latestVersion.id,\n          req,\n          versionData: data as TypeWithID,\n        }\n\n        if (collection) {\n          result = await payload.db.updateVersion({\n            ...updateVersionArgs,\n            collection: collection.slug,\n            req,\n          })\n        } else {\n          result = await payload.db.updateGlobalVersion({\n            ...updateVersionArgs,\n            global: global.slug,\n            req,\n          })\n        }\n      }\n    }\n\n    if (createNewVersion) {\n      if (collection) {\n        result = await payload.db.createVersion({\n          autosave: Boolean(autosave),\n          collectionSlug: collection.slug,\n          createdAt: doc?.createdAt ? new Date(doc.createdAt).toISOString() : now,\n          parent: collection ? id : undefined,\n          req,\n          updatedAt: draft ? now : new Date(doc.updatedAt).toISOString(),\n          versionData,\n        })\n      }\n\n      if (global) {\n        result = await payload.db.createGlobalVersion({\n          autosave: Boolean(autosave),\n          createdAt: doc?.createdAt ? new Date(doc.createdAt).toISOString() : now,\n          globalSlug: global.slug,\n          parent: collection ? id : undefined,\n          req,\n          updatedAt: draft ? now : new Date(doc.updatedAt).toISOString(),\n          versionData,\n        })\n      }\n    }\n  } catch (err) {\n    let errorMessage: string\n\n    if (collection)\n      errorMessage = `There was an error while saving a version for the ${collection.labels.singular} with ID ${id}.`\n    if (global)\n      errorMessage = `There was an error while saving a version for the global ${global.label}.`\n    payload.logger.error(errorMessage)\n    payload.logger.error(err)\n  }\n\n  let max = 100\n\n  if (collection && typeof collection.versions.maxPerDoc === 'number')\n    max = collection.versions.maxPerDoc\n  if (global && typeof global.versions.max === 'number') max = global.versions.max\n\n  if (createNewVersion && max > 0) {\n    await enforceMaxVersions({\n      id,\n      collection,\n      global,\n      max,\n      payload,\n      req,\n    })\n  }\n\n  let createdVersion = result.version\n  createdVersion.createdAt = result.createdAt\n  createdVersion.updatedAt = result.updatedAt\n\n  createdVersion = sanitizeInternalFields(createdVersion)\n  createdVersion.id = id\n\n  return createdVersion\n}\n"],"names":["deepCopyObject","sanitizeInternalFields","enforceMaxVersions","saveVersion","id","autosave","collection","docWithLocales","doc","draft","global","payload","req","result","createNewVersion","now","Date","toISOString","versionData","_status","_id","docs","findVersionArgs","limit","pagination","sort","db","findVersions","slug","where","parent","equals","findGlobalVersions","latestVersion","data","createdAt","updatedAt","version","updateVersionArgs","updateVersion","updateGlobalVersion","createVersion","Boolean","collectionSlug","undefined","createGlobalVersion","globalSlug","err","errorMessage","labels","singular","label","logger","error","max","versions","maxPerDoc","createdVersion"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}
+{"version":3,"sources":["../../src/versions/saveVersion.ts"],"sourcesContent":["import type { SanitizedCollectionConfig, TypeWithID } from '../collections/config/types.js'\nimport type { SanitizedGlobalConfig } from '../globals/config/types.js'\nimport type { Payload } from '../index.js'\nimport type { PayloadRequest } from '../types/index.js'\n\nimport { deepCopyObject } from '../utilities/deepCopyObject.js'\nimport sanitizeInternalFields from '../utilities/sanitizeInternalFields.js'\nimport { enforceMaxVersions } from './enforceMaxVersions.js'\n\ntype Args = {\n  autosave?: boolean\n  collection?: SanitizedCollectionConfig\n  docWithLocales: any\n  draft?: boolean\n  global?: SanitizedGlobalConfig\n  id?: number | string\n  payload: Payload\n  req?: PayloadRequest\n}\n\nexport const saveVersion = async ({\n  id,\n  autosave,\n  collection,\n  docWithLocales: doc,\n  draft,\n  global,\n  payload,\n  req,\n}: Args): Promise<TypeWithID> => {\n  let result\n  let createNewVersion = true\n  const now = new Date().toISOString()\n  const versionData = deepCopyObject(doc)\n  if (draft) versionData._status = 'draft'\n  if (versionData._id) delete versionData._id\n\n  try {\n    if (autosave) {\n      let docs\n      const findVersionArgs = {\n        limit: 1,\n        pagination: false,\n        req,\n        sort: '-updatedAt',\n      }\n      if (collection) {\n        ;({ docs } = await payload.db.findVersions({\n          ...findVersionArgs,\n          collection: collection.slug,\n          req,\n          where: {\n            parent: {\n              equals: id,\n            },\n          },\n        }))\n      } else {\n        ;({ docs } = await payload.db.findGlobalVersions({\n          ...findVersionArgs,\n          global: global.slug,\n          req,\n        }))\n      }\n      const [latestVersion] = docs\n\n      // overwrite the latest version if it's set to autosave\n      if (latestVersion?.autosave === true) {\n        createNewVersion = false\n\n        const data: Record<string, unknown> = {\n          createdAt: new Date(latestVersion.createdAt).toISOString(),\n          updatedAt: draft ? now : new Date(doc.updatedAt).toISOString(),\n          version: versionData,\n        }\n\n        const updateVersionArgs = {\n          id: latestVersion.id,\n          req,\n          versionData: data as TypeWithID,\n        }\n\n        if (collection) {\n          result = await payload.db.updateVersion({\n            ...updateVersionArgs,\n            collection: collection.slug,\n            req,\n          })\n        } else {\n          result = await payload.db.updateGlobalVersion({\n            ...updateVersionArgs,\n            global: global.slug,\n            req,\n          })\n        }\n      }\n    }\n\n    if (createNewVersion) {\n      if (collection) {\n        result = await payload.db.createVersion({\n          autosave: Boolean(autosave),\n          collectionSlug: collection.slug,\n          createdAt: doc?.createdAt ? new Date(doc.createdAt).toISOString() : now,\n          parent: collection ? id : undefined,\n          req,\n          updatedAt: draft ? now : new Date(doc.updatedAt).toISOString(),\n          versionData,\n        })\n      }\n\n      if (global) {\n        result = await payload.db.createGlobalVersion({\n          autosave: Boolean(autosave),\n          createdAt: doc?.createdAt ? new Date(doc.createdAt).toISOString() : now,\n          globalSlug: global.slug,\n          parent: collection ? id : undefined,\n          req,\n          updatedAt: draft ? now : new Date(doc.updatedAt).toISOString(),\n          versionData,\n        })\n      }\n    }\n  } catch (err) {\n    let errorMessage: string\n\n    if (collection)\n      errorMessage = `There was an error while saving a version for the ${collection.labels.singular} with ID ${id}.`\n    if (global)\n      errorMessage = `There was an error while saving a version for the global ${global.label}.`\n    payload.logger.error(errorMessage)\n    payload.logger.error(err)\n  }\n\n  let max = 100\n\n  if (collection && typeof collection.versions.maxPerDoc === 'number')\n    max = collection.versions.maxPerDoc\n  if (global && typeof global.versions.max === 'number') max = global.versions.max\n\n  if (createNewVersion && max > 0) {\n    await enforceMaxVersions({\n      id,\n      collection,\n      global,\n      max,\n      payload,\n      req,\n    })\n  }\n\n  let createdVersion = result.version\n  createdVersion.createdAt = result.createdAt\n  createdVersion.updatedAt = result.updatedAt\n\n  createdVersion = sanitizeInternalFields(createdVersion)\n  createdVersion.id = result.parent\n\n  return createdVersion\n}\n"],"names":["deepCopyObject","sanitizeInternalFields","enforceMaxVersions","saveVersion","id","autosave","collection","docWithLocales","doc","draft","global","payload","req","result","createNewVersion","now","Date","toISOString","versionData","_status","_id","docs","findVersionArgs","limit","pagination","sort","db","findVersions","slug","where","parent","equals","findGlobalVersions","latestVersion","data","createdAt","updatedAt","version","updateVersionArgs","updateVersion","updateGlobalVersion","createVersion","Boolean","collectionSlug","undefined","createGlobalVersion","globalSlug","err","errorMessage","labels","singular","label","logger","error","max","versions","maxPerDoc","createdVersion"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload",
-  "version": "3.0.0-alpha.61",
+  "version": "3.0.0-alpha.63",
   "description": "Node, React and MongoDB Headless CMS and Application Framework",
   "license": "MIT",
   "main": "./dist/index.js",
@@ -26,6 +26,7 @@
     "@swc-node/sourcemap-support": "^0.5.0",
     "@types/probe-image-size": "^7.2.4",
     "bson-objectid": "2.0.4",
+    "ci-info": "^4.0.0",
     "conf": "10.2.0",
     "console-table-printer": "2.11.2",
     "dataloader": "2.2.2",
@@ -35,21 +36,29 @@
     "find-up": "4.1.0",
     "get-tsconfig": "^4.7.2",
     "http-status": "1.6.2",
+    "image-size": "^1.1.1",
     "joi": "^17.12.1",
     "json-schema-to-typescript": "11.0.3",
     "jsonwebtoken": "9.0.1",
     "minimist": "1.2.8",
     "mkdirp": "1.0.4",
     "monaco-editor": "0.38.0",
-    "nodemailer": "6.9.10",
     "pino": "8.15.0",
     "pino-pretty": "10.2.0",
     "pluralize": "8.0.0",
-    "probe-image-size": "^7.2.3",
     "sanitize-filename": "1.6.3",
     "scheduler": "0.23.0",
     "scmp": "2.1.0",
-    "@payloadcms/translations": "3.0.0-alpha.61"
+    "uuid": "^9.0.1",
+    "@payloadcms/translations": "3.0.0-alpha.63"
+  },
+  "peerDependencies": {
+    "@swc/core": "^1.4.13"
+  },
+  "peerDependenciesMeta": {
+    "@swc/core": {
+      "optional": true
+    }
   },
   "devDependencies": {
     "@monaco-editor/react": "4.5.1",
@@ -97,7 +106,7 @@
     "@payloadcms/eslint-config": "1.1.1"
   },
   "engines": {
-    "node": ">=18.17.0"
+    "node": ">=18.20.2"
   },
   "files": [
     "bin.js",
@@ -156,7 +165,7 @@
   },
   "sideEffects": false,
   "scripts": {
-    "build": "pnpm copyfiles && pnpm build:swc && pnpm build:types && tsx ../../scripts/exportPointerFiles.ts ../packages/payload dist/exports",
+    "build": "pnpm copyfiles && pnpm build:swc && pnpm build:types",
     "build:swc": "swc ./src -d ./dist --config-file .swcrc",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
     "build:watch": "nodemon --watch 'src/**' --ext 'ts,tsx' --exec \"pnpm build:tsc\"",

package/src/index.ts

@@ -1,6 +1,5 @@
 import type { ExecutionResult, GraphQLSchema, ValidationRule } from 'graphql'
 import type { OperationArgs, Request as graphQLRequest } from 'graphql-http'
-import type { SendMailOptions } from 'nodemailer'
 import type pino from 'pino'
 
 import crypto from 'crypto'
@@ -16,6 +15,7 @@ import type { Result as LoginResult } from './auth/operations/login.js'
 import type { Result as ResetPasswordResult } from './auth/operations/resetPassword.js'
 import type { AuthStrategy } from './auth/types.js'
 import type { BulkOperationResult, Collection, TypeWithID } from './collections/config/types.js'
+import type { Options as CountOptions } from './collections/operations/local/count.js'
 import type { Options as CreateOptions } from './collections/operations/local/create.js'
 import type {
   ByIDOptions as DeleteByIDOptions,
@@ -33,9 +33,9 @@ import type {
   ManyOptions as UpdateManyOptions,
   Options as UpdateOptions,
 } from './collections/operations/local/update.js'
-import type { EmailOptions, InitOptions, SanitizedConfig } from './config/types.js'
+import type { InitOptions, SanitizedConfig } from './config/types.js'
 import type { BaseDatabaseAdapter, PaginatedDocs } from './database/types.js'
-import type { BuildEmailResult } from './email/types.js'
+import type { InitializedEmailAdapter } from './email/types.js'
 import type { TypeWithID as GlobalTypeWithID, Globals } from './globals/config/types.js'
 import type { Options as FindGlobalOptions } from './globals/operations/local/findOne.js'
 import type { Options as FindGlobalVersionByIDOptions } from './globals/operations/local/findVersionByID.js'
@@ -49,10 +49,10 @@ import { APIKeyAuthentication } from './auth/strategies/apiKey.js'
 import { JWTAuthentication } from './auth/strategies/jwt.js'
 import localOperations from './collections/operations/local/index.js'
 import { validateSchema } from './config/validate.js'
-import buildEmail from './email/build.js'
-import { defaults as emailDefaults } from './email/defaults.js'
-import sendEmail from './email/sendEmail.js'
+import { consoleEmailAdapter } from './email/consoleEmailAdapter.js'
+import { fieldAffectsData } from './exports/types.js'
 import localGlobalOperations from './globals/operations/local/index.js'
+import flattenFields from './utilities/flattenTopLevelFields.js'
 import Logger from './utilities/logger.js'
 import { serverInit as serverInitTelemetry } from './utilities/telemetry/events/serverInit.js'
 
@@ -79,6 +79,18 @@ export class BasePayload<TGeneratedTypes extends GeneratedTypes> {
 
   config: SanitizedConfig
 
+  /**
+   * @description Performs count operation
+   * @param options
+   * @returns count of documents satisfying query
+   */
+  count = async <T extends keyof TGeneratedTypes['collections']>(
+    options: CountOptions<T>,
+  ): Promise<{ totalDocs: number }> => {
+    const { count } = localOperations
+    return count(this, options)
+  }
+
   /**
    * @description Performs create operation
    * @param options
@@ -90,7 +102,6 @@ export class BasePayload<TGeneratedTypes extends GeneratedTypes> {
     const { create } = localOperations
     return create<T>(this, options)
   }
-
   db: DatabaseAdapter
 
   decrypt = decrypt
@@ -102,9 +113,7 @@ export class BasePayload<TGeneratedTypes extends GeneratedTypes> {
     return duplicate<T>(this, options)
   }
 
-  email: BuildEmailResult
-
-  emailOptions: EmailOptions
+  email: InitializedEmailAdapter
 
   // TODO: re-implement or remove?
   // errorHandler: ErrorHandler
@@ -253,7 +262,7 @@ export class BasePayload<TGeneratedTypes extends GeneratedTypes> {
 
   secret: string
 
-  sendEmail: (message: SendMailOptions) => Promise<unknown>
+  sendEmail: InitializedEmailAdapter['sendEmail']
 
   types: {
     arrayTypes: any
@@ -340,8 +349,17 @@ export class BasePayload<TGeneratedTypes extends GeneratedTypes> {
     }
 
     this.config.collections.forEach((collection) => {
+      const customID = flattenFields(collection.fields).find(
+        (field) => fieldAffectsData(field) && field.name === 'id',
+      )
+
+      let customIDType
+
+      if (customID?.type === 'number' || customID?.type === 'text') customIDType = customID.type
+
       this.collections[collection.slug] = {
         config: collection,
+        customIDType,
       }
     })
 
@@ -356,17 +374,21 @@ export class BasePayload<TGeneratedTypes extends GeneratedTypes> {
       await this.db.connect()
     }
 
-    // Configure email service
-    const emailOptions = options.email ? { ...options.email } : this.config.email
-    if (options.email && this.config.email) {
+    // Load email adapter
+    if (this.config.email instanceof Promise) {
+      const awaitedAdapter = await this.config.email
+      this.email = awaitedAdapter({ payload: this })
+    } else if (this.config.email) {
+      this.email = this.config.email({ payload: this })
+    } else {
       this.logger.warn(
-        'Email options provided in both init options and config. Using init options.',
+        `No email adapter provided. Email will be written to console. More info at https://payloadcms.com/docs/email/overview.`,
       )
+
+      this.email = consoleEmailAdapter({ payload: this })
     }
 
-    this.emailOptions = emailOptions ?? emailDefaults
-    this.email = buildEmail(this.emailOptions, this.logger)
-    this.sendEmail = sendEmail.bind(this)
+    this.sendEmail = this.email['sendEmail']
 
     serverInitTelemetry(this)
 
@@ -473,6 +495,8 @@ type GeneratedTypes = {
   globals: {
     [slug: number | string | symbol]: GlobalTypeWithID & Record<string, unknown>
   }
+  locale: null | string
+  user: TypeWithID & Record<string, unknown> & { collection: string }
 }
 
 type Payload = BasePayload<GeneratedTypes>

package/auth.d.ts

@@ -1,6 +0,0 @@
-export * from './dist/auth/index.js';
-export { default as executeAccess } from './dist/auth/executeAccess.js';
-export { executeAuthStrategies } from './dist/auth/executeAuthStrategies.js';
-export { getAccessResults } from './dist/auth/getAccessResults.js';
-export type { AuthStrategyFunction, AuthStrategyFunctionArgs, CollectionPermission, FieldPermissions, GlobalPermission, IncomingAuthType, Permission, Permissions, User, VerifyConfig, } from './dist/auth/types.js';
-//# sourceMappingURL=auth.d.ts.map

package/auth.js

@@ -1,6 +0,0 @@
-export * from './dist/auth/index.js';
-export { default as executeAccess } from './dist/auth/executeAccess.js';
-export { executeAuthStrategies } from './dist/auth/executeAuthStrategies.js';
-export { getAccessResults } from './dist/auth/getAccessResults.js';
-
-//# sourceMappingURL=auth.js.map

package/config.d.ts

@@ -1,14 +0,0 @@
-export { buildConfig } from './dist/config/build.js';
-export * from './dist/config/types.js';
-export type { FieldTypes } from './dist/admin/forms/FieldTypes.js';
-export { createClientCollectionConfig } from './dist/collections/config/client.js';
-export { defaults as collectionDefaults } from './dist/collections/config/defaults.js';
-export { createClientConfig } from './dist/config/client.js';
-export { defaults } from './dist/config/defaults.js';
-export { sanitizeConfig } from './dist/config/sanitize.js';
-export { baseBlockFields } from './dist/fields/baseFields/baseBlockFields.js';
-export { baseIDField } from './dist/fields/baseFields/baseIDField.js';
-export { createClientFieldConfig } from './dist/fields/config/client.js';
-export { sanitizeFields } from './dist/fields/config/sanitize.js';
-export { createClientGlobalConfig } from './dist/globals/config/client.js';
-//# sourceMappingURL=config.d.ts.map

package/config.js

@@ -1,14 +0,0 @@
-export { buildConfig } from './dist/config/build.js';
-export * from './dist/config/types.js';
-export { createClientCollectionConfig } from './dist/collections/config/client.js';
-export { defaults as collectionDefaults } from './dist/collections/config/defaults.js';
-export { createClientConfig } from './dist/config/client.js';
-export { defaults } from './dist/config/defaults.js';
-export { sanitizeConfig } from './dist/config/sanitize.js';
-export { baseBlockFields } from './dist/fields/baseFields/baseBlockFields.js';
-export { baseIDField } from './dist/fields/baseFields/baseIDField.js';
-export { createClientFieldConfig } from './dist/fields/config/client.js';
-export { sanitizeFields } from './dist/fields/config/sanitize.js';
-export { createClientGlobalConfig } from './dist/globals/config/client.js';
-
-//# sourceMappingURL=config.js.map

package/database.d.ts

@@ -1,23 +0,0 @@
-export type { BaseDatabaseAdapter, BeginTransaction, CommitTransaction, Connect, Create, CreateArgs, CreateGlobal, CreateGlobalArgs, CreateGlobalVersion, CreateGlobalVersionArgs, CreateMigration, CreateVersion, CreateVersionArgs, DBIdentifierName, DatabaseAdapterResult as DatabaseAdapterObj, DeleteMany, DeleteManyArgs, DeleteOne, DeleteOneArgs, DeleteVersions, DeleteVersionsArgs, Destroy, Find, FindArgs, FindGlobal, FindGlobalArgs, FindGlobalVersions, FindGlobalVersionsArgs, FindOne, FindOneArgs, FindVersions, FindVersionsArgs, Init, Migration, MigrationData, PaginatedDocs, QueryDrafts, QueryDraftsArgs, RollbackTransaction, Transaction, TypeWithVersion, UpdateGlobal, UpdateGlobalArgs, UpdateGlobalVersion, UpdateGlobalVersionArgs, UpdateOne, UpdateOneArgs, UpdateVersion, UpdateVersionArgs, } from './dist/database/types.js';
-export * from './dist/database/queryValidation/types.js';
-export { combineQueries } from './dist/database/combineQueries.js';
-export { createDatabaseAdapter } from './dist/database/createDatabaseAdapter.js';
-export { default as flattenWhereToOperators } from './dist/database/flattenWhereToOperators.js';
-export { getLocalizedPaths } from './dist/database/getLocalizedPaths.js';
-export { createMigration } from './dist/database/migrations/createMigration.js';
-export { getMigrations } from './dist/database/migrations/getMigrations.js';
-export { migrate } from './dist/database/migrations/migrate.js';
-export { migrateDown } from './dist/database/migrations/migrateDown.js';
-export { migrateRefresh } from './dist/database/migrations/migrateRefresh.js';
-export { migrateReset } from './dist/database/migrations/migrateReset.js';
-export { migrateStatus } from './dist/database/migrations/migrateStatus.js';
-export { migrationTemplate } from './dist/database/migrations/migrationTemplate.js';
-export { migrationsCollection } from './dist/database/migrations/migrationsCollection.js';
-export { readMigrationFiles } from './dist/database/migrations/readMigrationFiles.js';
-export type { EntityPolicies, PathToQuery } from './dist/database/queryValidation/types.js';
-export { validateQueryPaths } from './dist/database/queryValidation/validateQueryPaths.js';
-export { validateSearchParam } from './dist/database/queryValidation/validateSearchParams.js';
-export { commitTransaction } from './dist/utilities/commitTransaction.js';
-export { initTransaction } from './dist/utilities/initTransaction.js';
-export { killTransaction } from './dist/utilities/killTransaction.js';
-//# sourceMappingURL=database.d.ts.map

package/database.js

@@ -1,22 +0,0 @@
-export * from './dist/database/queryValidation/types.js';
-export { combineQueries } from './dist/database/combineQueries.js';
-export { createDatabaseAdapter } from './dist/database/createDatabaseAdapter.js';
-export { default as flattenWhereToOperators } from './dist/database/flattenWhereToOperators.js';
-export { getLocalizedPaths } from './dist/database/getLocalizedPaths.js';
-export { createMigration } from './dist/database/migrations/createMigration.js';
-export { getMigrations } from './dist/database/migrations/getMigrations.js';
-export { migrate } from './dist/database/migrations/migrate.js';
-export { migrateDown } from './dist/database/migrations/migrateDown.js';
-export { migrateRefresh } from './dist/database/migrations/migrateRefresh.js';
-export { migrateReset } from './dist/database/migrations/migrateReset.js';
-export { migrateStatus } from './dist/database/migrations/migrateStatus.js';
-export { migrationTemplate } from './dist/database/migrations/migrationTemplate.js';
-export { migrationsCollection } from './dist/database/migrations/migrationsCollection.js';
-export { readMigrationFiles } from './dist/database/migrations/readMigrationFiles.js';
-export { validateQueryPaths } from './dist/database/queryValidation/validateQueryPaths.js';
-export { validateSearchParam } from './dist/database/queryValidation/validateSearchParams.js';
-export { commitTransaction } from './dist/utilities/commitTransaction.js';
-export { initTransaction } from './dist/utilities/initTransaction.js';
-export { killTransaction } from './dist/utilities/killTransaction.js';
-
-//# sourceMappingURL=database.js.map

package/dist/email/build.d.ts

@@ -1,5 +0,0 @@
-import type { Logger } from 'pino';
-import type { EmailOptions } from '../config/types.js';
-import type { BuildEmailResult } from './types.js';
-export default function buildEmail(emailConfig: EmailOptions | undefined, logger: Logger): BuildEmailResult;
-//# sourceMappingURL=build.d.ts.map

package/dist/email/build.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/email/build.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAA;AAIlC,OAAO,KAAK,EAAE,YAAY,EAAkB,MAAM,oBAAoB,CAAA;AACtE,OAAO,KAAK,EAAE,gBAAgB,EAAoB,MAAM,YAAY,CAAA;AA+CpE,wBAA8B,UAAU,CACtC,WAAW,EAAE,YAAY,GAAG,SAAS,EACrC,MAAM,EAAE,MAAM,GACb,gBAAgB,CAoBlB"}

package/dist/email/build.js

@@ -1,63 +0,0 @@
-import nodemailer from 'nodemailer';
-import { hasTransport, hasTransportOptions } from '../config/types.js';
-import { InvalidConfiguration } from '../errors/index.js';
-import mockHandler from './mockHandler.js';
-async function handleTransport(transport, email, logger) {
-    try {
-        await transport.verify();
-    } catch (err) {
-        logger.error(`There is an error with the email configuration you have provided. ${err}`);
-    }
-    return {
-        ...email,
-        transport
-    };
-}
-const ensureConfigHasFrom = (emailConfig)=>{
-    if (!emailConfig?.fromName || !emailConfig?.fromAddress) {
-        throw new InvalidConfiguration('Email fromName and fromAddress must be configured when transport is configured');
-    }
-};
-const handleMockAccount = async (emailConfig, logger)=>{
-    let mockAccount;
-    try {
-        mockAccount = await mockHandler(emailConfig);
-        const { account: { pass, user, web } } = mockAccount;
-        if (emailConfig?.logMockCredentials) {
-            logger.info('E-mail configured with mock configuration');
-            logger.info(`Log into mock email provider at ${web}`);
-            logger.info(`Mock email account username: ${user}`);
-            logger.info(`Mock email account password: ${pass}`);
-        }
-    } catch (err) {
-        logger.error({
-            err,
-            msg: 'There was a problem setting up the mock email handler'
-        });
-    }
-    return mockAccount;
-};
-export default async function buildEmail(emailConfig, logger) {
-    if (!emailConfig) {
-        return handleMockAccount(emailConfig, logger);
-    }
-    if (hasTransport(emailConfig) && emailConfig.transport) {
-        ensureConfigHasFrom(emailConfig);
-        const email = {
-            ...emailConfig
-        };
-        const { transport } = emailConfig;
-        return handleTransport(transport, email, logger);
-    }
-    if (hasTransportOptions(emailConfig) && emailConfig.transportOptions) {
-        ensureConfigHasFrom(emailConfig);
-        const email = {
-            ...emailConfig
-        };
-        const transport = nodemailer.createTransport(emailConfig.transportOptions);
-        return handleTransport(transport, email, logger);
-    }
-    return handleMockAccount(emailConfig, logger);
-}
-
-//# sourceMappingURL=build.js.map

package/dist/email/build.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/email/build.ts"],"sourcesContent":["import type { Transporter } from 'nodemailer'\nimport type { Logger } from 'pino'\n\nimport nodemailer from 'nodemailer'\n\nimport type { EmailOptions, EmailTransport } from '../config/types.js'\nimport type { BuildEmailResult, MockEmailHandler } from './types.js'\n\nimport { hasTransport, hasTransportOptions } from '../config/types.js'\nimport { InvalidConfiguration } from '../errors/index.js'\nimport mockHandler from './mockHandler.js'\n\nasync function handleTransport(\n  transport: Transporter,\n  email: EmailTransport,\n  logger: Logger,\n): BuildEmailResult {\n  try {\n    await transport.verify()\n  } catch (err) {\n    logger.error(`There is an error with the email configuration you have provided. ${err}`)\n  }\n\n  return { ...email, transport }\n}\n\nconst ensureConfigHasFrom = (emailConfig: EmailOptions) => {\n  if (!emailConfig?.fromName || !emailConfig?.fromAddress) {\n    throw new InvalidConfiguration(\n      'Email fromName and fromAddress must be configured when transport is configured',\n    )\n  }\n}\n\nconst handleMockAccount = async (emailConfig: EmailOptions, logger: Logger) => {\n  let mockAccount: MockEmailHandler\n  try {\n    mockAccount = await mockHandler(emailConfig)\n    const {\n      account: { pass, user, web },\n    } = mockAccount\n    if (emailConfig?.logMockCredentials) {\n      logger.info('E-mail configured with mock configuration')\n      logger.info(`Log into mock email provider at ${web}`)\n      logger.info(`Mock email account username: ${user}`)\n      logger.info(`Mock email account password: ${pass}`)\n    }\n  } catch (err) {\n    logger.error({ err, msg: 'There was a problem setting up the mock email handler' })\n  }\n  return mockAccount\n}\n\nexport default async function buildEmail(\n  emailConfig: EmailOptions | undefined,\n  logger: Logger,\n): BuildEmailResult {\n  if (!emailConfig) {\n    return handleMockAccount(emailConfig, logger)\n  }\n\n  if (hasTransport(emailConfig) && emailConfig.transport) {\n    ensureConfigHasFrom(emailConfig)\n    const email = { ...emailConfig }\n    const { transport }: { transport: Transporter } = emailConfig\n    return handleTransport(transport, email, logger)\n  }\n\n  if (hasTransportOptions(emailConfig) && emailConfig.transportOptions) {\n    ensureConfigHasFrom(emailConfig)\n    const email = { ...emailConfig } as EmailTransport\n    const transport = nodemailer.createTransport(emailConfig.transportOptions)\n    return handleTransport(transport, email, logger)\n  }\n\n  return handleMockAccount(emailConfig, logger)\n}\n"],"names":["nodemailer","hasTransport","hasTransportOptions","InvalidConfiguration","mockHandler","handleTransport","transport","email","logger","verify","err","error","ensureConfigHasFrom","emailConfig","fromName","fromAddress","handleMockAccount","mockAccount","account","pass","user","web","logMockCredentials","info","msg","buildEmail","transportOptions","createTransport"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;","mappings":"AAGA,OAAOA,gBAAgB,aAAY;AAKnC,SAASC,YAAY,EAAEC,mBAAmB,QAAQ,qBAAoB;AACtE,SAASC,oBAAoB,QAAQ,qBAAoB;AACzD,OAAOC,iBAAiB,mBAAkB;AAE1C,eAAeC,gBACbC,SAAsB,EACtBC,KAAqB,EACrBC,MAAc;IAEd,IAAI;QACF,MAAMF,UAAUG,MAAM;IACxB,EAAE,OAAOC,KAAK;QACZF,OAAOG,KAAK,CAAC,CAAC,kEAAkE,EAAED,IAAI,CAAC;IACzF;IAEA,OAAO;QAAE,GAAGH,KAAK;QAAED;IAAU;AAC/B;AAEA,MAAMM,sBAAsB,CAACC;IAC3B,IAAI,CAACA,aAAaC,YAAY,CAACD,aAAaE,aAAa;QACvD,MAAM,IAAIZ,qBACR;IAEJ;AACF;AAEA,MAAMa,oBAAoB,OAAOH,aAA2BL;IAC1D,IAAIS;IACJ,IAAI;QACFA,cAAc,MAAMb,YAAYS;QAChC,MAAM,EACJK,SAAS,EAAEC,IAAI,EAAEC,IAAI,EAAEC,GAAG,EAAE,EAC7B,GAAGJ;QACJ,IAAIJ,aAAaS,oBAAoB;YACnCd,OAAOe,IAAI,CAAC;YACZf,OAAOe,IAAI,CAAC,CAAC,gCAAgC,EAAEF,IAAI,CAAC;YACpDb,OAAOe,IAAI,CAAC,CAAC,6BAA6B,EAAEH,KAAK,CAAC;YAClDZ,OAAOe,IAAI,CAAC,CAAC,6BAA6B,EAAEJ,KAAK,CAAC;QACpD;IACF,EAAE,OAAOT,KAAK;QACZF,OAAOG,KAAK,CAAC;YAAED;YAAKc,KAAK;QAAwD;IACnF;IACA,OAAOP;AACT;AAEA,eAAe,eAAeQ,WAC5BZ,WAAqC,EACrCL,MAAc;IAEd,IAAI,CAACK,aAAa;QAChB,OAAOG,kBAAkBH,aAAaL;IACxC;IAEA,IAAIP,aAAaY,gBAAgBA,YAAYP,SAAS,EAAE;QACtDM,oBAAoBC;QACpB,MAAMN,QAAQ;YAAE,GAAGM,WAAW;QAAC;QAC/B,MAAM,EAAEP,SAAS,EAAE,GAA+BO;QAClD,OAAOR,gBAAgBC,WAAWC,OAAOC;IAC3C;IAEA,IAAIN,oBAAoBW,gBAAgBA,YAAYa,gBAAgB,EAAE;QACpEd,oBAAoBC;QACpB,MAAMN,QAAQ;YAAE,GAAGM,WAAW;QAAC;QAC/B,MAAMP,YAAYN,WAAW2B,eAAe,CAACd,YAAYa,gBAAgB;QACzE,OAAOrB,gBAAgBC,WAAWC,OAAOC;IAC3C;IAEA,OAAOQ,kBAAkBH,aAAaL;AACxC"}

package/dist/email/mockHandler.d.ts

@@ -1,5 +0,0 @@
-import type { EmailOptions } from '../config/types.js';
-import type { MockEmailHandler } from './types.js';
-declare const mockEmailHandler: (emailConfig: EmailOptions) => Promise<MockEmailHandler>;
-export default mockEmailHandler;
-//# sourceMappingURL=mockHandler.d.ts.map

package/dist/email/mockHandler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"mockHandler.d.ts","sourceRoot":"","sources":["../../src/email/mockHandler.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAIlD,QAAA,MAAM,gBAAgB,gBAAuB,YAAY,KAAG,QAAQ,gBAAgB,CAoBnF,CAAA;AAED,eAAe,gBAAgB,CAAA"}

package/dist/email/mockHandler.js

@@ -1,24 +0,0 @@
-import nodemailer from 'nodemailer';
-import { defaults as emailDefaults } from './defaults.js';
-const mockEmailHandler = async (emailConfig)=>{
-    const testAccount = await nodemailer.createTestAccount();
-    const smtpOptions = {
-        ...emailConfig,
-        auth: {
-            pass: testAccount.pass,
-            user: testAccount.user
-        },
-        fromAddress: emailConfig?.fromAddress || emailDefaults.fromAddress,
-        fromName: emailConfig?.fromName || emailDefaults.fromName,
-        host: 'smtp.ethereal.email',
-        port: 587,
-        secure: false
-    };
-    return {
-        account: testAccount,
-        transport: nodemailer.createTransport(smtpOptions)
-    };
-};
-export default mockEmailHandler;
-
-//# sourceMappingURL=mockHandler.js.map

package/dist/email/mockHandler.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/email/mockHandler.ts"],"sourcesContent":["import nodemailer from 'nodemailer'\n\nimport type { EmailOptions } from '../config/types.js'\nimport type { MockEmailHandler } from './types.js'\n\nimport { defaults as emailDefaults } from './defaults.js'\n\nconst mockEmailHandler = async (emailConfig: EmailOptions): Promise<MockEmailHandler> => {\n  const testAccount = await nodemailer.createTestAccount()\n\n  const smtpOptions = {\n    ...emailConfig,\n    auth: {\n      pass: testAccount.pass,\n      user: testAccount.user,\n    },\n    fromAddress: emailConfig?.fromAddress || emailDefaults.fromAddress,\n    fromName: emailConfig?.fromName || emailDefaults.fromName,\n    host: 'smtp.ethereal.email',\n    port: 587,\n    secure: false,\n  }\n\n  return {\n    account: testAccount,\n    transport: nodemailer.createTransport(smtpOptions),\n  }\n}\n\nexport default mockEmailHandler\n"],"names":["nodemailer","defaults","emailDefaults","mockEmailHandler","emailConfig","testAccount","createTestAccount","smtpOptions","auth","pass","user","fromAddress","fromName","host","port","secure","account","transport","createTransport"],"rangeMappings":";;;;;;;;;;;;;;;;;;;;;","mappings":"AAAA,OAAOA,gBAAgB,aAAY;AAKnC,SAASC,YAAYC,aAAa,QAAQ,gBAAe;AAEzD,MAAMC,mBAAmB,OAAOC;IAC9B,MAAMC,cAAc,MAAML,WAAWM,iBAAiB;IAEtD,MAAMC,cAAc;QAClB,GAAGH,WAAW;QACdI,MAAM;YACJC,MAAMJ,YAAYI,IAAI;YACtBC,MAAML,YAAYK,IAAI;QACxB;QACAC,aAAaP,aAAaO,eAAeT,cAAcS,WAAW;QAClEC,UAAUR,aAAaQ,YAAYV,cAAcU,QAAQ;QACzDC,MAAM;QACNC,MAAM;QACNC,QAAQ;IACV;IAEA,OAAO;QACLC,SAASX;QACTY,WAAWjB,WAAWkB,eAAe,CAACX;IACxC;AACF;AAEA,eAAeJ,iBAAgB"}

package/dist/utilities/getIDType.d.ts

@@ -1,4 +0,0 @@
-import type { BaseDatabaseAdapter } from '../database/types.js';
-import type { Field } from '../fields/config/types.js';
-export declare const getIDType: (idField: Field | null, defaultIDType: BaseDatabaseAdapter['defaultIDType'] | null) => 'ObjectID' | 'number' | 'text';
-//# sourceMappingURL=getIDType.d.ts.map

package/dist/utilities/getIDType.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"getIDType.d.ts","sourceRoot":"","sources":["../../src/utilities/getIDType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAC/D,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAA;AAEtD,eAAO,MAAM,SAAS,YACX,KAAK,GAAG,IAAI,iBACN,mBAAmB,CAAC,eAAe,CAAC,GAAG,IAAI,KACzD,UAAU,GAAG,QAAQ,GAAG,MAK1B,CAAA"}