@payloadcms/db-mongodb 3.0.0-canary.6659da8 → 3.0.0-canary.67aae47

package/dist/utilities/buildProjectionFromSelect.js

@@ -0,0 +1,171 @@
+import { deepCopyObjectSimple } from 'payload';
+import { fieldAffectsData, getSelectMode, tabHasName } from 'payload/shared';
+const addFieldToProjection = ({ adapter, databaseSchemaPath, field, projection, withinLocalizedField })=>{
+    const { config } = adapter.payload;
+    if (withinLocalizedField && config.localization) {
+        for (const locale of config.localization.localeCodes){
+            const localeDatabaseSchemaPath = databaseSchemaPath.replace('<locale>', locale);
+            projection[`${localeDatabaseSchemaPath}${field.name}`] = true;
+        }
+    } else {
+        projection[`${databaseSchemaPath}${field.name}`] = true;
+    }
+};
+const traverseFields = ({ adapter, databaseSchemaPath = '', fields, projection, select, selectAllOnCurrentLevel = false, selectMode, withinLocalizedField = false })=>{
+    for (const field of fields){
+        if (fieldAffectsData(field)) {
+            if (selectMode === 'include') {
+                if (select[field.name] === true || selectAllOnCurrentLevel) {
+                    addFieldToProjection({
+                        adapter,
+                        databaseSchemaPath,
+                        field,
+                        projection,
+                        withinLocalizedField
+                    });
+                    continue;
+                }
+                if (!select[field.name]) {
+                    continue;
+                }
+            }
+            if (selectMode === 'exclude') {
+                if (typeof select[field.name] === 'undefined') {
+                    addFieldToProjection({
+                        adapter,
+                        databaseSchemaPath,
+                        field,
+                        projection,
+                        withinLocalizedField
+                    });
+                    continue;
+                }
+                if (select[field.name] === false) {
+                    continue;
+                }
+            }
+        }
+        let fieldDatabaseSchemaPath = databaseSchemaPath;
+        let fieldWithinLocalizedField = withinLocalizedField;
+        if (fieldAffectsData(field)) {
+            fieldDatabaseSchemaPath = `${databaseSchemaPath}${field.name}.`;
+            if (field.localized) {
+                fieldDatabaseSchemaPath = `${fieldDatabaseSchemaPath}<locale>.`;
+                fieldWithinLocalizedField = true;
+            }
+        }
+        switch(field.type){
+            case 'collapsible':
+            case 'row':
+                traverseFields({
+                    adapter,
+                    databaseSchemaPath,
+                    fields: field.fields,
+                    projection,
+                    select,
+                    selectMode,
+                    withinLocalizedField
+                });
+                break;
+            case 'tabs':
+                traverseFields({
+                    adapter,
+                    databaseSchemaPath,
+                    fields: field.tabs.map((tab)=>({
+                            ...tab,
+                            type: 'tab'
+                        })),
+                    projection,
+                    select,
+                    selectMode,
+                    withinLocalizedField
+                });
+                break;
+            case 'group':
+            case 'tab':
+            case 'array':
+                {
+                    let fieldSelect;
+                    if (field.type === 'tab' && !tabHasName(field)) {
+                        fieldSelect = select;
+                    } else {
+                        fieldSelect = select[field.name];
+                    }
+                    if (field.type === 'array' && selectMode === 'include') {
+                        fieldSelect['id'] = true;
+                    }
+                    traverseFields({
+                        adapter,
+                        databaseSchemaPath: fieldDatabaseSchemaPath,
+                        fields: field.fields,
+                        projection,
+                        select: fieldSelect,
+                        selectMode,
+                        withinLocalizedField: fieldWithinLocalizedField
+                    });
+                    break;
+                }
+            case 'blocks':
+                {
+                    const blocksSelect = select[field.name];
+                    for (const block of field.blocks){
+                        if (selectMode === 'include' && blocksSelect[block.slug] === true || selectMode === 'exclude' && typeof blocksSelect[block.slug] === 'undefined') {
+                            traverseFields({
+                                adapter,
+                                databaseSchemaPath: fieldDatabaseSchemaPath,
+                                fields: block.fields,
+                                projection,
+                                select: {},
+                                selectAllOnCurrentLevel: true,
+                                selectMode: 'include',
+                                withinLocalizedField: fieldWithinLocalizedField
+                            });
+                            continue;
+                        }
+                        let blockSelectMode = selectMode;
+                        if (selectMode === 'exclude' && blocksSelect[block.slug] === false) {
+                            blockSelectMode = 'include';
+                        }
+                        if (typeof blocksSelect[block.slug] !== 'object') {
+                            blocksSelect[block.slug] = {};
+                        }
+                        if (blockSelectMode === 'include') {
+                            blocksSelect[block.slug]['id'] = true;
+                            blocksSelect[block.slug]['blockType'] = true;
+                        }
+                        traverseFields({
+                            adapter,
+                            databaseSchemaPath: fieldDatabaseSchemaPath,
+                            fields: block.fields,
+                            projection,
+                            select: blocksSelect[block.slug],
+                            selectMode: blockSelectMode,
+                            withinLocalizedField: fieldWithinLocalizedField
+                        });
+                    }
+                    break;
+                }
+            default:
+                break;
+        }
+    }
+};
+export const buildProjectionFromSelect = ({ adapter, fields, select })=>{
+    if (!select) {
+        return;
+    }
+    const projection = {
+        _id: true
+    };
+    traverseFields({
+        adapter,
+        fields,
+        projection,
+        // Clone to safely mutate it later
+        select: deepCopyObjectSimple(select),
+        selectMode: getSelectMode(select)
+    });
+    return projection;
+};
+
+//# sourceMappingURL=buildProjectionFromSelect.js.map

package/dist/utilities/buildProjectionFromSelect.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/buildProjectionFromSelect.ts"],"sourcesContent":["import {\n  deepCopyObjectSimple,\n  type Field,\n  type FieldAffectingData,\n  type SelectMode,\n  type SelectType,\n  type TabAsField,\n} from 'payload'\nimport { fieldAffectsData, getSelectMode, tabHasName } from 'payload/shared'\n\nimport type { MongooseAdapter } from '../index.js'\n\nconst addFieldToProjection = ({\n  adapter,\n  databaseSchemaPath,\n  field,\n  projection,\n  withinLocalizedField,\n}: {\n  adapter: MongooseAdapter\n  databaseSchemaPath: string\n  field: FieldAffectingData\n  projection: Record<string, true>\n  withinLocalizedField: boolean\n}) => {\n  const { config } = adapter.payload\n\n  if (withinLocalizedField && config.localization) {\n    for (const locale of config.localization.localeCodes) {\n      const localeDatabaseSchemaPath = databaseSchemaPath.replace('<locale>', locale)\n      projection[`${localeDatabaseSchemaPath}${field.name}`] = true\n    }\n  } else {\n    projection[`${databaseSchemaPath}${field.name}`] = true\n  }\n}\n\nconst traverseFields = ({\n  adapter,\n  databaseSchemaPath = '',\n  fields,\n  projection,\n  select,\n  selectAllOnCurrentLevel = false,\n  selectMode,\n  withinLocalizedField = false,\n}: {\n  adapter: MongooseAdapter\n  databaseSchemaPath?: string\n  fields: (Field | TabAsField)[]\n  projection: Record<string, true>\n  select: SelectType\n  selectAllOnCurrentLevel?: boolean\n  selectMode: SelectMode\n  withinLocalizedField?: boolean\n}) => {\n  for (const field of fields) {\n    if (fieldAffectsData(field)) {\n      if (selectMode === 'include') {\n        if (select[field.name] === true || selectAllOnCurrentLevel) {\n          addFieldToProjection({\n            adapter,\n            databaseSchemaPath,\n            field,\n            projection,\n            withinLocalizedField,\n          })\n          continue\n        }\n\n        if (!select[field.name]) {\n          continue\n        }\n      }\n\n      if (selectMode === 'exclude') {\n        if (typeof select[field.name] === 'undefined') {\n          addFieldToProjection({\n            adapter,\n            databaseSchemaPath,\n            field,\n            projection,\n            withinLocalizedField,\n          })\n          continue\n        }\n\n        if (select[field.name] === false) {\n          continue\n        }\n      }\n    }\n\n    let fieldDatabaseSchemaPath = databaseSchemaPath\n    let fieldWithinLocalizedField = withinLocalizedField\n\n    if (fieldAffectsData(field)) {\n      fieldDatabaseSchemaPath = `${databaseSchemaPath}${field.name}.`\n\n      if (field.localized) {\n        fieldDatabaseSchemaPath = `${fieldDatabaseSchemaPath}<locale>.`\n        fieldWithinLocalizedField = true\n      }\n    }\n\n    switch (field.type) {\n      case 'collapsible':\n      case 'row':\n        traverseFields({\n          adapter,\n          databaseSchemaPath,\n          fields: field.fields,\n          projection,\n          select,\n          selectMode,\n          withinLocalizedField,\n        })\n        break\n\n      case 'tabs':\n        traverseFields({\n          adapter,\n          databaseSchemaPath,\n          fields: field.tabs.map((tab) => ({ ...tab, type: 'tab' })),\n          projection,\n          select,\n          selectMode,\n          withinLocalizedField,\n        })\n        break\n\n      case 'group':\n      case 'tab':\n      case 'array': {\n        let fieldSelect: SelectType\n\n        if (field.type === 'tab' && !tabHasName(field)) {\n          fieldSelect = select\n        } else {\n          fieldSelect = select[field.name] as SelectType\n        }\n\n        if (field.type === 'array' && selectMode === 'include') {\n          fieldSelect['id'] = true\n        }\n\n        traverseFields({\n          adapter,\n          databaseSchemaPath: fieldDatabaseSchemaPath,\n          fields: field.fields,\n          projection,\n          select: fieldSelect,\n          selectMode,\n          withinLocalizedField: fieldWithinLocalizedField,\n        })\n\n        break\n      }\n\n      case 'blocks': {\n        const blocksSelect = select[field.name] as SelectType\n\n        for (const block of field.blocks) {\n          if (\n            (selectMode === 'include' && blocksSelect[block.slug] === true) ||\n            (selectMode === 'exclude' && typeof blocksSelect[block.slug] === 'undefined')\n          ) {\n            traverseFields({\n              adapter,\n              databaseSchemaPath: fieldDatabaseSchemaPath,\n              fields: block.fields,\n              projection,\n              select: {},\n              selectAllOnCurrentLevel: true,\n              selectMode: 'include',\n              withinLocalizedField: fieldWithinLocalizedField,\n            })\n            continue\n          }\n\n          let blockSelectMode = selectMode\n\n          if (selectMode === 'exclude' && blocksSelect[block.slug] === false) {\n            blockSelectMode = 'include'\n          }\n\n          if (typeof blocksSelect[block.slug] !== 'object') {\n            blocksSelect[block.slug] = {}\n          }\n\n          if (blockSelectMode === 'include') {\n            blocksSelect[block.slug]['id'] = true\n            blocksSelect[block.slug]['blockType'] = true\n          }\n\n          traverseFields({\n            adapter,\n            databaseSchemaPath: fieldDatabaseSchemaPath,\n            fields: block.fields,\n            projection,\n            select: blocksSelect[block.slug] as SelectType,\n            selectMode: blockSelectMode,\n            withinLocalizedField: fieldWithinLocalizedField,\n          })\n        }\n\n        break\n      }\n\n      default:\n        break\n    }\n  }\n}\n\nexport const buildProjectionFromSelect = ({\n  adapter,\n  fields,\n  select,\n}: {\n  adapter: MongooseAdapter\n  fields: Field[]\n  select?: SelectType\n}): Record<string, true> | undefined => {\n  if (!select) {\n    return\n  }\n\n  const projection: Record<string, true> = {\n    _id: true,\n  }\n\n  traverseFields({\n    adapter,\n    fields,\n    projection,\n    // Clone to safely mutate it later\n    select: deepCopyObjectSimple(select),\n    selectMode: getSelectMode(select),\n  })\n\n  return projection\n}\n"],"names":["deepCopyObjectSimple","fieldAffectsData","getSelectMode","tabHasName","addFieldToProjection","adapter","databaseSchemaPath","field","projection","withinLocalizedField","config","payload","localization","locale","localeCodes","localeDatabaseSchemaPath","replace","name","traverseFields","fields","select","selectAllOnCurrentLevel","selectMode","fieldDatabaseSchemaPath","fieldWithinLocalizedField","localized","type","tabs","map","tab","fieldSelect","blocksSelect","block","blocks","slug","blockSelectMode","buildProjectionFromSelect","_id"],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"getDBName.d.ts","sourceRoot":"","sources":["../../src/utilities/getDBName.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAE/C,KAAK,IAAI,GAAG;IACV,MAAM,EAAE;QACN,MAAM,CAAC,EAAE,gBAAgB,CAAA;QACzB,QAAQ,CAAC,EAAE,gBAAgB,CAAA;QAC3B,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,IAAI,CAAC,EAAE,MAAM,CAAA;KACd,CAAA;IACD,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAA;IAC9B,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,SAAS,0DAKnB,IAAI,KAAG,MAiBT,CAAA"}
+{"version":3,"file":"getDBName.d.ts","sourceRoot":"","sources":["../../src/utilities/getDBName.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAE/C,KAAK,IAAI,GAAG;IACV,MAAM,EAAE;QACN,MAAM,CAAC,EAAE,gBAAgB,CAAA;QACzB,QAAQ,CAAC,EAAE,gBAAgB,CAAA;QAC3B,IAAI,CAAC,EAAE,MAAM,CAAA;QACb,IAAI,CAAC,EAAE,MAAM,CAAA;KACd,CAAA;IACD,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,MAAM,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAA;IAC9B,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,SAAS,0DAKnB,IAAI,KAAG,MAmBT,CAAA"}

package/dist/utilities/getDBName.js

@@ -12,7 +12,9 @@
     } else {
         result = name ?? slug;
     }
-    if (versions) result = `_${result}_versions`;
+    if (versions) {
+        result = `_${result}_versions`;
+    }
     return result;
 };
 

package/dist/utilities/getDBName.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/getDBName.ts"],"sourcesContent":["import type { DBIdentifierName } from 'payload'\n\ntype Args = {\n  config: {\n    dbName?: DBIdentifierName\n    enumName?: DBIdentifierName\n    name?: string\n    slug?: string\n  }\n  locales?: boolean\n  target?: 'dbName' | 'enumName'\n  versions?: boolean\n}\n\n/**\n * Used to name database enums and collections\n * Returns the collection or enum name for a given entity\n */\nexport const getDBName = ({\n  config: { name, slug },\n  config,\n  target = 'dbName',\n  versions = false,\n}: Args): string => {\n  let result: string\n  let custom = config[target]\n\n  if (!custom && target === 'enumName') {\n    custom = config['dbName']\n  }\n\n  if (custom) {\n    result = typeof custom === 'function' ? custom({}) : custom\n  } else {\n    result = name ?? slug\n  }\n\n  if (versions) result = `_${result}_versions`\n\n  return result\n}\n"],"names":["getDBName","config","name","slug","target","versions","result","custom"],"rangeMappings":";;;;;;;;;;;;;;;;","mappings":"AAcA;;;CAGC,GACD,OAAO,MAAMA,YAAY,CAAC,EACxBC,QAAQ,EAAEC,IAAI,EAAEC,IAAI,EAAE,EACtBF,MAAM,EACNG,SAAS,QAAQ,EACjBC,WAAW,KAAK,EACX;IACL,IAAIC;IACJ,IAAIC,SAASN,MAAM,CAACG,OAAO;IAE3B,IAAI,CAACG,UAAUH,WAAW,YAAY;QACpCG,SAASN,MAAM,CAAC,SAAS;IAC3B;IAEA,IAAIM,QAAQ;QACVD,SAAS,OAAOC,WAAW,aAAaA,OAAO,CAAC,KAAKA;IACvD,OAAO;QACLD,SAASJ,QAAQC;IACnB;IAEA,IAAIE,UAAUC,SAAS,CAAC,CAAC,EAAEA,OAAO,SAAS,CAAC;IAE5C,OAAOA;AACT,EAAC"}
+{"version":3,"sources":["../../src/utilities/getDBName.ts"],"sourcesContent":["import type { DBIdentifierName } from 'payload'\n\ntype Args = {\n  config: {\n    dbName?: DBIdentifierName\n    enumName?: DBIdentifierName\n    name?: string\n    slug?: string\n  }\n  locales?: boolean\n  target?: 'dbName' | 'enumName'\n  versions?: boolean\n}\n\n/**\n * Used to name database enums and collections\n * Returns the collection or enum name for a given entity\n */\nexport const getDBName = ({\n  config: { name, slug },\n  config,\n  target = 'dbName',\n  versions = false,\n}: Args): string => {\n  let result: string\n  let custom = config[target]\n\n  if (!custom && target === 'enumName') {\n    custom = config['dbName']\n  }\n\n  if (custom) {\n    result = typeof custom === 'function' ? custom({}) : custom\n  } else {\n    result = name ?? slug\n  }\n\n  if (versions) {\n    result = `_${result}_versions`\n  }\n\n  return result\n}\n"],"names":["getDBName","config","name","slug","target","versions","result","custom"],"mappings":"AAcA;;;CAGC,GACD,OAAO,MAAMA,YAAY,CAAC,EACxBC,QAAQ,EAAEC,IAAI,EAAEC,IAAI,EAAE,EACtBF,MAAM,EACNG,SAAS,QAAQ,EACjBC,WAAW,KAAK,EACX;IACL,IAAIC;IACJ,IAAIC,SAASN,MAAM,CAACG,OAAO;IAE3B,IAAI,CAACG,UAAUH,WAAW,YAAY;QACpCG,SAASN,MAAM,CAAC,SAAS;IAC3B;IAEA,IAAIM,QAAQ;QACVD,SAAS,OAAOC,WAAW,aAAaA,OAAO,CAAC,KAAKA;IACvD,OAAO;QACLD,SAASJ,QAAQC;IACnB;IAEA,IAAIE,UAAU;QACZC,SAAS,CAAC,CAAC,EAAEA,OAAO,SAAS,CAAC;IAChC;IAEA,OAAOA;AACT,EAAC"}

package/dist/utilities/handleError.d.ts

@@ -1,3 +1,7 @@
-declare const handleError: (error: any, req: any) => never;
-export default handleError;
+export declare const handleError: ({ collection, error, global, req, }: {
+    collection?: string;
+    error: any;
+    global?: string;
+    req: any;
+}) => never;
 //# sourceMappingURL=handleError.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"handleError.d.ts","sourceRoot":"","sources":["../../src/utilities/handleError.ts"],"names":[],"mappings":"AAGA,QAAA,MAAM,WAAW,iCAiBhB,CAAA;AAED,eAAe,WAAW,CAAA"}
+{"version":3,"file":"handleError.d.ts","sourceRoot":"","sources":["../../src/utilities/handleError.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,WAAW,wCAKrB;IACD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,MAAA;IACL,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,GAAG,MAAA;CACJ,UAqBA,CAAA"}

package/dist/utilities/handleError.js

@@ -1,20 +1,23 @@
 import httpStatus from 'http-status';
 import { APIError, ValidationError } from 'payload';
-const handleError = (error, req)=>{
+export const handleError = ({ collection, error, global, req })=>{
     // Handle uniqueness error from MongoDB
     if (error.code === 11000 && error.keyValue) {
-        throw new ValidationError([
-            {
-                field: Object.keys(error.keyValue)[0],
-                message: req.t('error:valueMustBeUnique')
-            }
-        ], req.t);
+        throw new ValidationError({
+            collection,
+            errors: [
+                {
+                    message: req.t('error:valueMustBeUnique'),
+                    path: Object.keys(error.keyValue)[0]
+                }
+            ],
+            global
+        }, req.t);
     } else if (error.code === 11000) {
         throw new APIError(req.t('error:valueMustBeUnique'), httpStatus.BAD_REQUEST);
     } else {
         throw error;
     }
 };
-export default handleError;
 
 //# sourceMappingURL=handleError.js.map

package/dist/utilities/handleError.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/handleError.ts"],"sourcesContent":["import httpStatus from 'http-status'\nimport { APIError, ValidationError } from 'payload'\n\nconst handleError = (error, req) => {\n  // Handle uniqueness error from MongoDB\n  if (error.code === 11000 && error.keyValue) {\n    throw new ValidationError(\n      [\n        {\n          field: Object.keys(error.keyValue)[0],\n          message: req.t('error:valueMustBeUnique'),\n        },\n      ],\n      req.t,\n    )\n  } else if (error.code === 11000) {\n    throw new APIError(req.t('error:valueMustBeUnique'), httpStatus.BAD_REQUEST)\n  } else {\n    throw error\n  }\n}\n\nexport default handleError\n"],"names":["httpStatus","APIError","ValidationError","handleError","error","req","code","keyValue","field","Object","keys","message","t","BAD_REQUEST"],"rangeMappings":";;;;;;;;;;;;;;;;;","mappings":"AAAA,OAAOA,gBAAgB,cAAa;AACpC,SAASC,QAAQ,EAAEC,eAAe,QAAQ,UAAS;AAEnD,MAAMC,cAAc,CAACC,OAAOC;IAC1B,uCAAuC;IACvC,IAAID,MAAME,IAAI,KAAK,SAASF,MAAMG,QAAQ,EAAE;QAC1C,MAAM,IAAIL,gBACR;YACE;gBACEM,OAAOC,OAAOC,IAAI,CAACN,MAAMG,QAAQ,CAAC,CAAC,EAAE;gBACrCI,SAASN,IAAIO,CAAC,CAAC;YACjB;SACD,EACDP,IAAIO,CAAC;IAET,OAAO,IAAIR,MAAME,IAAI,KAAK,OAAO;QAC/B,MAAM,IAAIL,SAASI,IAAIO,CAAC,CAAC,4BAA4BZ,WAAWa,WAAW;IAC7E,OAAO;QACL,MAAMT;IACR;AACF;AAEA,eAAeD,YAAW"}
+{"version":3,"sources":["../../src/utilities/handleError.ts"],"sourcesContent":["import httpStatus from 'http-status'\nimport { APIError, ValidationError } from 'payload'\n\nexport const handleError = ({\n  collection,\n  error,\n  global,\n  req,\n}: {\n  collection?: string\n  error\n  global?: string\n  req\n}) => {\n  // Handle uniqueness error from MongoDB\n  if (error.code === 11000 && error.keyValue) {\n    throw new ValidationError(\n      {\n        collection,\n        errors: [\n          {\n            message: req.t('error:valueMustBeUnique'),\n            path: Object.keys(error.keyValue)[0],\n          },\n        ],\n        global,\n      },\n      req.t,\n    )\n  } else if (error.code === 11000) {\n    throw new APIError(req.t('error:valueMustBeUnique'), httpStatus.BAD_REQUEST)\n  } else {\n    throw error\n  }\n}\n"],"names":["httpStatus","APIError","ValidationError","handleError","collection","error","global","req","code","keyValue","errors","message","t","path","Object","keys","BAD_REQUEST"],"mappings":"AAAA,OAAOA,gBAAgB,cAAa;AACpC,SAASC,QAAQ,EAAEC,eAAe,QAAQ,UAAS;AAEnD,OAAO,MAAMC,cAAc,CAAC,EAC1BC,UAAU,EACVC,KAAK,EACLC,MAAM,EACNC,GAAG,EAMJ;IACC,uCAAuC;IACvC,IAAIF,MAAMG,IAAI,KAAK,SAASH,MAAMI,QAAQ,EAAE;QAC1C,MAAM,IAAIP,gBACR;YACEE;YACAM,QAAQ;gBACN;oBACEC,SAASJ,IAAIK,CAAC,CAAC;oBACfC,MAAMC,OAAOC,IAAI,CAACV,MAAMI,QAAQ,CAAC,CAAC,EAAE;gBACtC;aACD;YACDH;QACF,GACAC,IAAIK,CAAC;IAET,OAAO,IAAIP,MAAMG,IAAI,KAAK,OAAO;QAC/B,MAAM,IAAIP,SAASM,IAAIK,CAAC,CAAC,4BAA4BZ,WAAWgB,WAAW;IAC7E,OAAO;QACL,MAAMX;IACR;AACF,EAAC"}

package/dist/utilities/sanitizeInternalFields.d.ts

@@ -1,3 +1,2 @@
-declare const sanitizeInternalFields: <T extends Record<string, unknown>>(incomingDoc: T) => T;
-export default sanitizeInternalFields;
+export declare const sanitizeInternalFields: <T extends Record<string, unknown>>(incomingDoc: T) => T;
 //# sourceMappingURL=sanitizeInternalFields.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"sanitizeInternalFields.d.ts","sourceRoot":"","sources":["../../src/utilities/sanitizeInternalFields.ts"],"names":[],"mappings":"AAEA,QAAA,MAAM,sBAAsB,mDAAoD,CAAC,KAAG,CAiBvE,CAAA;AAEb,eAAe,sBAAsB,CAAA"}
+{"version":3,"file":"sanitizeInternalFields.d.ts","sourceRoot":"","sources":["../../src/utilities/sanitizeInternalFields.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,sBAAsB,GAAI,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,eAAe,CAAC,KAAG,CAiB9E,CAAA"}

package/dist/utilities/sanitizeInternalFields.js

@@ -1,7 +1,7 @@
 const internalFields = [
     '__v'
 ];
-const sanitizeInternalFields = (incomingDoc)=>Object.entries(incomingDoc).reduce((newDoc, [key, val])=>{
+export const sanitizeInternalFields = (incomingDoc)=>Object.entries(incomingDoc).reduce((newDoc, [key, val])=>{
         if (key === '_id') {
             return {
                 ...newDoc,
@@ -16,6 +16,5 @@ const sanitizeInternalFields = (incomingDoc)=>Object.entries(incomingDoc).reduce
             [key]: val
         };
     }, {});
-export default sanitizeInternalFields;
 
 //# sourceMappingURL=sanitizeInternalFields.js.map

package/dist/utilities/sanitizeInternalFields.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utilities/sanitizeInternalFields.ts"],"sourcesContent":["const internalFields = ['__v']\n\nconst sanitizeInternalFields = <T extends Record<string, unknown>>(incomingDoc: T): T =>\n  Object.entries(incomingDoc).reduce((newDoc, [key, val]): T => {\n    if (key === '_id') {\n      return {\n        ...newDoc,\n        id: val,\n      }\n    }\n\n    if (internalFields.indexOf(key) > -1) {\n      return newDoc\n    }\n\n    return {\n      ...newDoc,\n      [key]: val,\n    }\n  }, {} as T)\n\nexport default sanitizeInternalFields\n"],"names":["internalFields","sanitizeInternalFields","incomingDoc","Object","entries","reduce","newDoc","key","val","id","indexOf"],"rangeMappings":";;;;;;;;;;;;;;;;;;","mappings":"AAAA,MAAMA,iBAAiB;IAAC;CAAM;AAE9B,MAAMC,yBAAyB,CAAoCC,cACjEC,OAAOC,OAAO,CAACF,aAAaG,MAAM,CAAC,CAACC,QAAQ,CAACC,KAAKC,IAAI;QACpD,IAAID,QAAQ,OAAO;YACjB,OAAO;gBACL,GAAGD,MAAM;gBACTG,IAAID;YACN;QACF;QAEA,IAAIR,eAAeU,OAAO,CAACH,OAAO,CAAC,GAAG;YACpC,OAAOD;QACT;QAEA,OAAO;YACL,GAAGA,MAAM;YACT,CAACC,IAAI,EAAEC;QACT;IACF,GAAG,CAAC;AAEN,eAAeP,uBAAsB"}
+{"version":3,"sources":["../../src/utilities/sanitizeInternalFields.ts"],"sourcesContent":["const internalFields = ['__v']\n\nexport const sanitizeInternalFields = <T extends Record<string, unknown>>(incomingDoc: T): T =>\n  Object.entries(incomingDoc).reduce((newDoc, [key, val]): T => {\n    if (key === '_id') {\n      return {\n        ...newDoc,\n        id: val,\n      }\n    }\n\n    if (internalFields.indexOf(key) > -1) {\n      return newDoc\n    }\n\n    return {\n      ...newDoc,\n      [key]: val,\n    }\n  }, {} as T)\n"],"names":["internalFields","sanitizeInternalFields","incomingDoc","Object","entries","reduce","newDoc","key","val","id","indexOf"],"mappings":"AAAA,MAAMA,iBAAiB;IAAC;CAAM;AAE9B,OAAO,MAAMC,yBAAyB,CAAoCC,cACxEC,OAAOC,OAAO,CAACF,aAAaG,MAAM,CAAC,CAACC,QAAQ,CAACC,KAAKC,IAAI;QACpD,IAAID,QAAQ,OAAO;YACjB,OAAO;gBACL,GAAGD,MAAM;gBACTG,IAAID;YACN;QACF;QAEA,IAAIR,eAAeU,OAAO,CAACH,OAAO,CAAC,GAAG;YACpC,OAAOD;QACT;QAEA,OAAO;YACL,GAAGA,MAAM;YACT,CAACC,IAAI,EAAEC;QACT;IACF,GAAG,CAAC,GAAO"}

package/dist/utilities/sanitizeRelationshipIDs.d.ts

@@ -0,0 +1,9 @@
+import type { Field, SanitizedConfig } from 'payload';
+type Args = {
+    config: SanitizedConfig;
+    data: Record<string, unknown>;
+    fields: Field[];
+};
+export declare const sanitizeRelationshipIDs: ({ config, data, fields, }: Args) => Record<string, unknown>;
+export {};
+//# sourceMappingURL=sanitizeRelationshipIDs.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"sanitizeRelationshipIDs.d.ts","sourceRoot":"","sources":["../../src/utilities/sanitizeRelationshipIDs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAoB,KAAK,EAAE,eAAe,EAA0B,MAAM,SAAS,CAAA;AAM/F,KAAK,IAAI,GAAG;IACV,MAAM,EAAE,eAAe,CAAA;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7B,MAAM,EAAE,KAAK,EAAE,CAAA;CAChB,CAAA;AAuGD,eAAO,MAAM,uBAAuB,8BAIjC,IAAI,KAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CA6B/B,CAAA"}

package/dist/utilities/sanitizeRelationshipIDs.js

@@ -0,0 +1,115 @@
+import { Types } from 'mongoose';
+import { APIError, traverseFields } from 'payload';
+import { fieldAffectsData } from 'payload/shared';
+function isValidRelationObject(value) {
+    return typeof value === 'object' && value !== null && 'relationTo' in value && 'value' in value;
+}
+const convertValue = ({ relatedCollection, value })=>{
+    const customIDField = relatedCollection.fields.find((field)=>fieldAffectsData(field) && field.name === 'id');
+    if (!customIDField) {
+        try {
+            return new Types.ObjectId(value);
+        } catch (error) {
+            throw new APIError(`Failed to create ObjectId from value: ${value}. Error: ${error.message}`, 400);
+        }
+    }
+    return value;
+};
+const sanitizeRelationship = ({ config, field, locale, ref, value })=>{
+    let relatedCollection;
+    let result = value;
+    const hasManyRelations = typeof field.relationTo !== 'string';
+    if (!hasManyRelations) {
+        relatedCollection = config.collections?.find(({ slug })=>slug === field.relationTo);
+    }
+    if (Array.isArray(value)) {
+        result = value.map((val)=>{
+            // Handle has many
+            if (relatedCollection && val && (typeof val === 'string' || typeof val === 'number')) {
+                return convertValue({
+                    relatedCollection,
+                    value: val
+                });
+            }
+            // Handle has many - polymorphic
+            if (isValidRelationObject(val)) {
+                const relatedCollectionForSingleValue = config.collections?.find(({ slug })=>slug === val.relationTo);
+                if (relatedCollectionForSingleValue) {
+                    return {
+                        relationTo: val.relationTo,
+                        value: convertValue({
+                            relatedCollection: relatedCollectionForSingleValue,
+                            value: val.value
+                        })
+                    };
+                }
+            }
+            return val;
+        });
+    }
+    // Handle has one - polymorphic
+    if (isValidRelationObject(value)) {
+        relatedCollection = config.collections?.find(({ slug })=>slug === value.relationTo);
+        if (relatedCollection) {
+            result = {
+                relationTo: value.relationTo,
+                value: convertValue({
+                    relatedCollection,
+                    value: value.value
+                })
+            };
+        }
+    }
+    // Handle has one
+    if (relatedCollection && value && (typeof value === 'string' || typeof value === 'number')) {
+        result = convertValue({
+            relatedCollection,
+            value
+        });
+    }
+    if (locale) {
+        ref[locale] = result;
+    } else {
+        ref[field.name] = result;
+    }
+};
+export const sanitizeRelationshipIDs = ({ config, data, fields })=>{
+    const sanitize = ({ field, ref })=>{
+        if (field.type === 'relationship' || field.type === 'upload') {
+            // handle localized relationships
+            if (config.localization && field.localized) {
+                const locales = config.localization.locales;
+                const fieldRef = ref[field.name];
+                for (const { code } of locales){
+                    if (ref[field.name]?.[code]) {
+                        const value = ref[field.name][code];
+                        sanitizeRelationship({
+                            config,
+                            field,
+                            locale: code,
+                            ref: fieldRef,
+                            value
+                        });
+                    }
+                }
+            } else {
+                // handle non-localized relationships
+                sanitizeRelationship({
+                    config,
+                    field,
+                    locale: undefined,
+                    ref,
+                    value: ref[field.name]
+                });
+            }
+        }
+    };
+    traverseFields({
+        callback: sanitize,
+        fields,
+        ref: data
+    });
+    return data;
+};
+
+//# sourceMappingURL=sanitizeRelationshipIDs.js.map

package/dist/utilities/sanitizeRelationshipIDs.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/utilities/sanitizeRelationshipIDs.ts"],"sourcesContent":["import type { CollectionConfig, Field, SanitizedConfig, TraverseFieldsCallback } from 'payload'\n\nimport { Types } from 'mongoose'\nimport { APIError, traverseFields } from 'payload'\nimport { fieldAffectsData } from 'payload/shared'\n\ntype Args = {\n  config: SanitizedConfig\n  data: Record<string, unknown>\n  fields: Field[]\n}\n\ninterface RelationObject {\n  relationTo: string\n  value: number | string\n}\n\nfunction isValidRelationObject(value: unknown): value is RelationObject {\n  return typeof value === 'object' && value !== null && 'relationTo' in value && 'value' in value\n}\n\nconst convertValue = ({\n  relatedCollection,\n  value,\n}: {\n  relatedCollection: CollectionConfig\n  value: number | string\n}): number | string | Types.ObjectId => {\n  const customIDField = relatedCollection.fields.find(\n    (field) => fieldAffectsData(field) && field.name === 'id',\n  )\n\n  if (!customIDField) {\n    try {\n      return new Types.ObjectId(value)\n    } catch (error) {\n      throw new APIError(\n        `Failed to create ObjectId from value: ${value}. Error: ${error.message}`,\n        400,\n      )\n    }\n  }\n\n  return value\n}\n\nconst sanitizeRelationship = ({ config, field, locale, ref, value }) => {\n  let relatedCollection: CollectionConfig | undefined\n  let result = value\n\n  const hasManyRelations = typeof field.relationTo !== 'string'\n\n  if (!hasManyRelations) {\n    relatedCollection = config.collections?.find(({ slug }) => slug === field.relationTo)\n  }\n\n  if (Array.isArray(value)) {\n    result = value.map((val) => {\n      // Handle has many\n      if (relatedCollection && val && (typeof val === 'string' || typeof val === 'number')) {\n        return convertValue({\n          relatedCollection,\n          value: val,\n        })\n      }\n\n      // Handle has many - polymorphic\n      if (isValidRelationObject(val)) {\n        const relatedCollectionForSingleValue = config.collections?.find(\n          ({ slug }) => slug === val.relationTo,\n        )\n\n        if (relatedCollectionForSingleValue) {\n          return {\n            relationTo: val.relationTo,\n            value: convertValue({\n              relatedCollection: relatedCollectionForSingleValue,\n              value: val.value,\n            }),\n          }\n        }\n      }\n\n      return val\n    })\n  }\n\n  // Handle has one - polymorphic\n  if (isValidRelationObject(value)) {\n    relatedCollection = config.collections?.find(({ slug }) => slug === value.relationTo)\n\n    if (relatedCollection) {\n      result = {\n        relationTo: value.relationTo,\n        value: convertValue({ relatedCollection, value: value.value }),\n      }\n    }\n  }\n\n  // Handle has one\n  if (relatedCollection && value && (typeof value === 'string' || typeof value === 'number')) {\n    result = convertValue({\n      relatedCollection,\n      value,\n    })\n  }\n  if (locale) {\n    ref[locale] = result\n  } else {\n    ref[field.name] = result\n  }\n}\n\nexport const sanitizeRelationshipIDs = ({\n  config,\n  data,\n  fields,\n}: Args): Record<string, unknown> => {\n  const sanitize: TraverseFieldsCallback = ({ field, ref }) => {\n    if (field.type === 'relationship' || field.type === 'upload') {\n      // handle localized relationships\n      if (config.localization && field.localized) {\n        const locales = config.localization.locales\n        const fieldRef = ref[field.name]\n        for (const { code } of locales) {\n          if (ref[field.name]?.[code]) {\n            const value = ref[field.name][code]\n            sanitizeRelationship({ config, field, locale: code, ref: fieldRef, value })\n          }\n        }\n      } else {\n        // handle non-localized relationships\n        sanitizeRelationship({\n          config,\n          field,\n          locale: undefined,\n          ref,\n          value: ref[field.name],\n        })\n      }\n    }\n  }\n\n  traverseFields({ callback: sanitize, fields, ref: data })\n\n  return data\n}\n"],"names":["Types","APIError","traverseFields","fieldAffectsData","isValidRelationObject","value","convertValue","relatedCollection","customIDField","fields","find","field","name","ObjectId","error","message","sanitizeRelationship","config","locale","ref","result","hasManyRelations","relationTo","collections","slug","Array","isArray","map","val","relatedCollectionForSingleValue","sanitizeRelationshipIDs","data","sanitize","type","localization","localized","locales","fieldRef","code","undefined","callback"],"mappings":"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"}

package/dist/withSession.d.ts

@@ -1,35 +1,11 @@
-/// <reference types="mongoose/types/aggregate.js" />
-/// <reference types="mongoose/types/callback.js" />
-/// <reference types="mongoose/types/collection.js" />
-/// <reference types="mongoose/types/connection.js" />
-/// <reference types="mongoose/types/cursor.js" />
-/// <reference types="mongoose/types/document.js" />
-/// <reference types="mongoose/types/error.js" />
-/// <reference types="mongoose/types/expressions.js" />
-/// <reference types="mongoose/types/helpers.js" />
-/// <reference types="mongoose/types/middlewares.js" />
-/// <reference types="mongoose/types/indexes.js" />
-/// <reference types="mongoose/types/models.js" />
-/// <reference types="mongoose/types/mongooseoptions.js" />
-/// <reference types="mongoose/types/pipelinestage.js" />
-/// <reference types="mongoose/types/populate.js" />
-/// <reference types="mongoose/types/query.js" />
-/// <reference types="mongoose/types/schemaoptions.js" />
-/// <reference types="mongoose/types/schematypes.js" />
-/// <reference types="mongoose/types/session.js" />
-/// <reference types="mongoose/types/types.js" />
-/// <reference types="mongoose/types/utility.js" />
-/// <reference types="mongoose/types/validation.js" />
-/// <reference types="mongoose/types/virtuals.js" />
-/// <reference types="mongoose/types/inferschematype.js" />
-/// <reference types="mongoose-paginate-v2" />
 import type { ClientSession } from 'mongoose';
+import type { PayloadRequest } from 'payload';
 import type { MongooseAdapter } from './index.js';
 /**
  * returns the session belonging to the transaction of the req.session if exists
  * @returns ClientSession
  */
-export declare function withSession(db: MongooseAdapter, transactionID?: number | string): {
+export declare function withSession(db: MongooseAdapter, req: PayloadRequest): Promise<{
     session: ClientSession;
-} | object;
+} | Record<string, never>>;
 //# sourceMappingURL=withSession.d.ts.map

package/dist/withSession.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withSession.d.ts","sourceRoot":"","sources":["../src/withSession.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAE7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAEjD;;;GAGG;AACH,wBAAgB,WAAW,CACzB,EAAE,EAAE,eAAe,EACnB,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,GAC9B;IAAE,OAAO,EAAE,aAAa,CAAA;CAAE,GAAG,MAAM,CAErC"}
+{"version":3,"file":"withSession.d.ts","sourceRoot":"","sources":["../src/withSession.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAEjD;;;GAGG;AACH,wBAAsB,WAAW,CAC/B,EAAE,EAAE,eAAe,EACnB,GAAG,EAAE,cAAc,GAClB,OAAO,CAAC;IAAE,OAAO,EAAE,aAAa,CAAA;CAAE,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAU7D"}

package/dist/withSession.js

@@ -1,10 +1,16 @@
 /**
  * returns the session belonging to the transaction of the req.session if exists
  * @returns ClientSession
- */ export function withSession(db, transactionID) {
-    return db.sessions[transactionID] ? {
-        session: db.sessions[transactionID]
-    } : {};
+ */ export async function withSession(db, req) {
+    let transactionID = req.transactionID;
+    if (transactionID instanceof Promise) {
+        transactionID = await req.transactionID;
+    }
+    if (req) {
+        return db.sessions[transactionID] ? {
+            session: db.sessions[transactionID]
+        } : {};
+    }
 }
 
 //# sourceMappingURL=withSession.js.map

package/dist/withSession.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/withSession.ts"],"sourcesContent":["import type { ClientSession } from 'mongoose'\n\nimport type { MongooseAdapter } from './index.js'\n\n/**\n * returns the session belonging to the transaction of the req.session if exists\n * @returns ClientSession\n */\nexport function withSession(\n  db: MongooseAdapter,\n  transactionID?: number | string,\n): { session: ClientSession } | object {\n  return db.sessions[transactionID] ? { session: db.sessions[transactionID] } : {}\n}\n"],"names":["withSession","db","transactionID","sessions","session"],"rangeMappings":";;;;;;;","mappings":"AAIA;;;CAGC,GACD,OAAO,SAASA,YACdC,EAAmB,EACnBC,aAA+B;IAE/B,OAAOD,GAAGE,QAAQ,CAACD,cAAc,GAAG;QAAEE,SAASH,GAAGE,QAAQ,CAACD,cAAc;IAAC,IAAI,CAAC;AACjF"}
+{"version":3,"sources":["../src/withSession.ts"],"sourcesContent":["import type { ClientSession } from 'mongoose'\nimport type { PayloadRequest } from 'payload'\n\nimport type { MongooseAdapter } from './index.js'\n\n/**\n * returns the session belonging to the transaction of the req.session if exists\n * @returns ClientSession\n */\nexport async function withSession(\n  db: MongooseAdapter,\n  req: PayloadRequest,\n): Promise<{ session: ClientSession } | Record<string, never>> {\n  let transactionID = req.transactionID\n\n  if (transactionID instanceof Promise) {\n    transactionID = await req.transactionID\n  }\n\n  if (req) {\n    return db.sessions[transactionID] ? { session: db.sessions[transactionID] } : {}\n  }\n}\n"],"names":["withSession","db","req","transactionID","Promise","sessions","session"],"mappings":"AAKA;;;CAGC,GACD,OAAO,eAAeA,YACpBC,EAAmB,EACnBC,GAAmB;IAEnB,IAAIC,gBAAgBD,IAAIC,aAAa;IAErC,IAAIA,yBAAyBC,SAAS;QACpCD,gBAAgB,MAAMD,IAAIC,aAAa;IACzC;IAEA,IAAID,KAAK;QACP,OAAOD,GAAGI,QAAQ,CAACF,cAAc,GAAG;YAAEG,SAASL,GAAGI,QAAQ,CAACF,cAAc;QAAC,IAAI,CAAC;IACjF;AACF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@payloadcms/db-mongodb",
-  "version": "3.0.0-canary.6659da8",
+  "version": "3.0.0-canary.67aae47",
   "description": "The officially supported MongoDB database adapter for Payload",
   "homepage": "https://payloadcms.com",
   "repository": {
@@ -14,8 +14,8 @@
   "exports": {
     ".": {
       "import": "./dist/index.js",
-      "require": "./dist/index.js",
-      "types": "./dist/index.d.ts"
+      "types": "./dist/index.d.ts",
+      "default": "./dist/index.js"
     }
   },
   "main": "./dist/index.js",
@@ -26,28 +26,29 @@
     "predefinedMigrations"
   ],
   "dependencies": {
-    "bson-objectid": "2.0.4",
-    "deepmerge": "4.3.1",
     "http-status": "1.6.2",
-    "mongoose": "6.12.3",
-    "mongoose-paginate-v2": "1.7.22",
+    "mongoose": "8.8.1",
+    "mongoose-aggregate-paginate-v2": "1.1.2",
+    "mongoose-paginate-v2": "1.8.5",
     "prompts": "2.4.2",
     "uuid": "10.0.0"
   },
   "devDependencies": {
-    "@types/mongoose-aggregate-paginate-v2": "1.0.9",
-    "mongodb": "4.17.1",
+    "@types/mongoose-aggregate-paginate-v2": "1.0.12",
+    "mongodb": "6.10.0",
     "mongodb-memory-server": "^9",
-    "payload": "3.0.0-canary.6659da8",
-    "@payloadcms/eslint-config": "1.1.1"
+    "@payloadcms/eslint-config": "3.0.0-beta.112",
+    "payload": "3.0.0-canary.67aae47"
   },
   "peerDependencies": {
-    "payload": "3.0.0-canary.6659da8"
+    "payload": "3.0.0-canary.67aae47"
   },
   "scripts": {
     "build": "pnpm build:types && pnpm build:swc",
     "build:swc": "swc ./src -d ./dist --config-file .swcrc-build --strip-leading-paths",
     "build:types": "tsc --emitDeclarationOnly --outDir dist",
-    "clean": "rimraf {dist,*.tsbuildinfo}"
+    "clean": "rimraf {dist,*.tsbuildinfo}",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix"
   }
 }