payload 3.0.0-beta.2 → 3.0.0-beta.4

package/src/index.ts

@@ -52,7 +52,9 @@ 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 { 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'
 
@@ -340,8 +342,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,
       }
     })
 
@@ -473,6 +484,7 @@ type GeneratedTypes = {
   globals: {
     [slug: number | string | symbol]: GlobalTypeWithID & Record<string, unknown>
   }
+  user: TypeWithID & Record<string, unknown> & { collection: string }
 }
 
 type Payload = BasePayload<GeneratedTypes>

package/utilities.d.ts

@@ -14,13 +14,12 @@ export { fieldSchemaToJSON } from './dist/utilities/fieldSchemaToJSON.js';
 export { default as flattenTopLevelFields } from './dist/utilities/flattenTopLevelFields.js';
 export { formatLabels, formatNames, toWords } from './dist/utilities/formatLabels.js';
 export { getCollectionIDFieldTypes } from './dist/utilities/getCollectionIDFieldTypes.js';
-export { getIDType } from './dist/utilities/getIDType.js';
 export { getObjectDotNotation } from './dist/utilities/getObjectDotNotation.js';
 export { default as getUniqueListBy } from './dist/utilities/getUniqueListBy.js';
 export { isEntityHidden } from './dist/utilities/isEntityHidden.js';
 export { isNumber } from './dist/utilities/isNumber.js';
 export { isPlainObject } from './dist/utilities/isPlainObject.js';
-export { isPlainFunction, isReactComponent } from './dist/utilities/isReactComponent.js';
+export { isPlainFunction, isReactClientComponent, isReactComponent, isReactServerComponent, } from './dist/utilities/isReactComponent.js';
 export { isValidID } from './dist/utilities/isValidID.js';
 export { default as isolateObjectProperty } from './dist/utilities/isolateObjectProperty.js';
 export { mapAsync } from './dist/utilities/mapAsync.js';

package/utilities.js

@@ -14,13 +14,12 @@ export { fieldSchemaToJSON } from './dist/utilities/fieldSchemaToJSON.js';
 export { default as flattenTopLevelFields } from './dist/utilities/flattenTopLevelFields.js';
 export { formatLabels, formatNames, toWords } from './dist/utilities/formatLabels.js';
 export { getCollectionIDFieldTypes } from './dist/utilities/getCollectionIDFieldTypes.js';
-export { getIDType } from './dist/utilities/getIDType.js';
 export { getObjectDotNotation } from './dist/utilities/getObjectDotNotation.js';
 export { default as getUniqueListBy } from './dist/utilities/getUniqueListBy.js';
 export { isEntityHidden } from './dist/utilities/isEntityHidden.js';
 export { isNumber } from './dist/utilities/isNumber.js';
 export { isPlainObject } from './dist/utilities/isPlainObject.js';
-export { isPlainFunction, isReactComponent } from './dist/utilities/isReactComponent.js';
+export { isPlainFunction, isReactClientComponent, isReactComponent, isReactServerComponent } from './dist/utilities/isReactComponent.js';
 export { isValidID } from './dist/utilities/isValidID.js';
 export { default as isolateObjectProperty } from './dist/utilities/isolateObjectProperty.js';
 export { mapAsync } from './dist/utilities/mapAsync.js';

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"}

package/dist/utilities/getIDType.js

@@ -1,8 +0,0 @@
-export const getIDType = (idField, defaultIDType)=>{
-    if (idField) {
-        return idField.type === 'number' ? 'number' : 'text';
-    }
-    return defaultIDType || 'ObjectID';
-};
-
-//# sourceMappingURL=getIDType.js.map

package/dist/utilities/getIDType.js.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../src/utilities/getIDType.ts"],"sourcesContent":["import type { BaseDatabaseAdapter } from '../database/types.js'\nimport type { Field } from '../fields/config/types.js'\n\nexport const getIDType = (\n  idField: Field | null,\n  defaultIDType: BaseDatabaseAdapter['defaultIDType'] | null,\n): 'ObjectID' | 'number' | 'text' => {\n  if (idField) {\n    return idField.type === 'number' ? 'number' : 'text'\n  }\n  return defaultIDType || 'ObjectID'\n}\n"],"names":["getIDType","idField","defaultIDType","type"],"rangeMappings":";;;;;","mappings":"AAGA,OAAO,MAAMA,YAAY,CACvBC,SACAC;IAEA,IAAID,SAAS;QACX,OAAOA,QAAQE,IAAI,KAAK,WAAW,WAAW;IAChD;IACA,OAAOD,iBAAiB;AAC1B,EAAC"}