tabshift/payloadcms
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

chore: corrects remaining mongodb adapter paths

Browse Source
This commit is contained in:
James
2023-07-31 15:57:59 -04:00
parent affd55f84e
commit 872b38d378
14 changed files with 60 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/db-mongodb/src/create.ts
View File

@@ -1,7 +1,7 @@
import { Create } from 'payload/dist/database/types';
import type { Document } from 'payload/types';
import { PayloadRequest } from 'payload/dist/express/types';
import type { MongooseAdapter } from '.';
import type { Document } from '../../../types';
import { PayloadRequest } from '../../../types';
import { withSession } from './withSession';
export const create: Create = async function create(

4
packages/db-mongodb/src/deleteOne.ts
View File

@@ -1,8 +1,8 @@
import { DeleteOne } from 'payload/dist/database/types';
import sanitizeInternalFields from 'payload/dist/utilities/sanitizeInternalFields';
import type { Document } from 'payload/types';
import { PayloadRequest } from 'payload/dist/express/types';
import type { MongooseAdapter } from '.';
import type { Document } from '../../../types';
import { PayloadRequest } from '../../../types';
import { withSession } from './withSession';
export const deleteOne: DeleteOne = async function deleteOne(

12
packages/db-mongodb/src/findGlobalVersions.ts
View File

@@ -1,12 +1,12 @@
import { PaginateOptions } from 'mongoose';
import type { FindGlobalVersions } from 'payload/dist/database/types';
import sanitizeInternalFields from 'payload/dist/utilities/sanitizeInternalFields';
import flattenWhereToOperators from 'payload/dist/database/flattenWhereToOperators';
import { buildVersionGlobalFields } from 'payload/dist/versions/buildGlobalFields';
import { PayloadRequest } from 'payload/dist/express/types';
import type { MongooseAdapter } from '.';
import type { FindGlobalVersions } from '../../types';
import sanitizeInternalFields from '../../../utilities/sanitizeInternalFields';
import flattenWhereToOperators from '../../flattenWhereToOperators';
import { buildSortParam } from './src/queries/buildSortParam';
import { buildVersionGlobalFields } from '../../../versions/buildGlobalFields';
import { buildSortParam } from './queries/buildSortParam';
import { withSession } from './withSession';
import { PayloadRequest } from '../../../express/types';
export const findGlobalVersions: FindGlobalVersions = async function findGlobalVersions(
this: MongooseAdapter,

8
packages/db-mongodb/src/findOne.ts
View File

@@ -1,9 +1,9 @@
import type { MongooseQueryOptions } from 'mongoose';
import type { FindOne } from 'payload/dist/database/types';
import type { Document } from 'payload/types';
import { PayloadRequest } from 'payload/dist/express/types';
import sanitizeInternalFields from 'payload/dist/utilities/sanitizeInternalFields';
import type { MongooseAdapter } from '.';
import type { FindOne } from '../../types';
import type { Document } from '../../../types';
import { PayloadRequest } from '../../../types';
import sanitizeInternalFields from '../../../utilities/sanitizeInternalFields';
import { withSession } from './withSession';
export const findOne: FindOne = async function findOne(

10
packages/db-mongodb/src/findVersions.ts
View File

@@ -1,11 +1,11 @@
import { PaginateOptions } from 'mongoose';
import type { FindVersions } from 'payload/dist/database/types';
import sanitizeInternalFields from 'payload/dist/utilities/sanitizeInternalFields';
import flattenWhereToOperators from 'payload/dist/database/flattenWhereToOperators';
import { PayloadRequest } from 'payload/dist/express/types';
import type { MongooseAdapter } from '.';
import type { FindVersions } from '../../types';
import sanitizeInternalFields from '../../../utilities/sanitizeInternalFields';
import flattenWhereToOperators from '../../flattenWhereToOperators';
import { buildSortParam } from './src/queries/buildSortParam';
import { buildSortParam } from './queries/buildSortParam';
import { withSession } from './withSession';
import { PayloadRequest } from '../../../express/types';
export const findVersions: FindVersions = async function findVersions(
this: MongooseAdapter,

7
packages/db-mongodb/src/init.ts
View File

@@ -70,13 +70,16 @@ export const init: Init = async function init(
versionModelName,
versionSchema,
) as CollectionModel;
this.payload.versions[collection.slug] = model;
// this.payload.versions[collection.slug] = model;
this.versions[collection.slug] = model;
}
const model = mongoose.model(collection.slug, schema) as CollectionModel;
this.collections[collection.slug] = model;
// TS expect error only needed until we launch 2.0.0
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-expect-error
this.payload.collections[collection.slug] = {
config: collection,
};
@@ -115,8 +118,6 @@ export const init: Init = async function init(
versionSchema,
) as CollectionModel;
this.versions[global.slug] = versionsModel;
this.payload.versions[global.slug] = versionsModel;
}
});
};

2
packages/db-mongodb/src/webpack.ts
View File

@@ -1,5 +1,5 @@
import path from 'path';
import type { Webpack } from '../../../types'; // Need to export this
import type { Webpack } from 'payload/dist/database/types';
export const webpack: Webpack = (config) => {
return {

1
packages/db-mongodb/tsconfig.json
View File

@@ -1,5 +1,6 @@
{
"compilerOptions": {
"declaration": true, /* Generates corresponding '.d.ts' file. */
"module": "commonjs", /* Specify what module code is generated. */
"rootDir": "./src", /* Specify the root folder within your source files. */
"outDir": "./dist", /* Specify an output folder for all emitted files. */

4
packages/db-postgres/package.json
View File

@@ -10,7 +10,7 @@
"build": "tsc"
},
"peerDependencies": {
"payload": "^1.11.7"
"payload": "^1.11.8"
},
"dependencies": {
"drizzle-orm": "^0.27.2",
@@ -18,7 +18,7 @@
},
"devDependencies": {
"@types/pg": "^8.10.2",
"payload": "^1.11.7",
"payload": "^1.11.8",
"typescript": "^4.9.4"
}
}

1
packages/db-postgres/tsconfig.json
View File

@@ -1,5 +1,6 @@
{
"compilerOptions": {
"declaration": true, /* Generates corresponding '.d.ts' file. */
"module": "commonjs", /* Specify what module code is generated. */
"rootDir": "./src", /* Specify the root folder within your source files. */
"outDir": "./dist", /* Specify an output folder for all emitted files. */

26
packages/db-postgres/yarn.lock
View File

@@ -2377,6 +2377,13 @@ connect-history-api-fallback@^1.6.0:
resolved "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
console-table-printer@^2.11.2:
version "2.11.2"
resolved "https://registry.npmjs.org/console-table-printer/-/console-table-printer-2.11.2.tgz#549757033a7e3cde7e26e030038c9392ce600ee5"
integrity sha512-uuUHie0sfPP542TKGzPFal0W1wo1beuKAqIZdaavcONx8OoqdnJRKjkinbRTOta4FaCa1RcIL+7mMJWX3pQGVg==
dependencies:
simple-wcswidth "^1.0.1"
content-disposition@0.5.4:
version "0.5.4"
resolved "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
@@ -4682,10 +4689,10 @@ pause@0.0.1:
resolved "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz#1d408b3fdb76923b9543d96fb4c9dfd535d9cb5d"
integrity sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==
payload@^1.11.7:
version "1.11.7"
resolved "https://registry.npmjs.org/payload/-/payload-1.11.7.tgz#a70c503e607133c4b0c56fe892e5228c6c50661f"
integrity sha512-pVImP0b8MA9VfcXDITqq8KlIVaFB81FMtt24TPrBfNqkG53cRFxnYiGRJS40p/CNVknCpSRGVBkdpKmVNQ07YQ==
payload@^1.11.8:
version "1.11.8"
resolved "https://registry.npmjs.org/payload/-/payload-1.11.8.tgz#8b924b131dccdddc1665fb777c7cf681017058b1"
integrity sha512-N5nYYdmY1L1iBqqrrB7frBJwTUx1+yEk4PLKvy3VkQKpegLqyjGLhAGl41H5JIzBGDUFhcOY1feRoG4kOLmFHw==
dependencies:
"@date-io/date-fns" "^2.16.0"
"@dnd-kit/core" "^6.0.7"
@@ -4702,6 +4709,7 @@ payload@^1.11.7:
compression "^1.7.4"
conf "^10.2.0"
connect-history-api-fallback "^1.6.0"
console-table-printer "^2.11.2"
css-loader "^5.2.7"
css-minimizer-webpack-plugin "^5.0.0"
dataloader "^2.1.0"
@@ -6144,6 +6152,11 @@ simple-swizzle@^0.2.2:
dependencies:
is-arrayish "^0.3.1"
simple-wcswidth@^1.0.1:
version "1.0.1"
resolved "https://registry.npmjs.org/simple-wcswidth/-/simple-wcswidth-1.0.1.tgz#8ab18ac0ae342f9d9b629604e54d2aa1ecb018b2"
integrity sha512-xMO/8eNREtaROt7tJvWJqHBDTMFN4eiQ5I4JRMuilwfnFcV5W9u7RUkueNkdw0jPqGMX36iCywelS5yilTuOxg==
sirv@^1.0.7:
version "1.0.19"
resolved "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49"
@@ -6572,6 +6585,11 @@ type@^2.7.2:
resolved "https://registry.npmjs.org/type/-/type-2.7.2.tgz#2376a15a3a28b1efa0f5350dcf72d24df6ef98d0"
integrity sha512-dzlvlNlt6AXU7EBSfpAscydQ7gXB+pPGsPnfJnZpiNJBDj7IaJzQlBZYGdEi4R9HmPdBv2XmWJ6YUtoTa7lmCw==
typescript@^4.9.4:
version "4.9.5"
resolved "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
universalify@^2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"

10
src/auth/types.ts
View File

@@ -1,7 +1,7 @@
import { Strategy } from 'passport';
import { DeepRequired } from 'ts-essentials';
import { PayloadRequest } from '../express/types';
import { Where, PayloadMongooseDocument } from '../types';
import { Where } from '../types';
import { Payload } from '../payload';
export type Permission = {
@@ -68,14 +68,6 @@ export type User = {
[key: string]: unknown
}
export interface UserDocument extends PayloadMongooseDocument {
setPassword: (pass: string) => Promise<void>
authenticate: (pass: string) => Promise<void>
resetPasswordExpiration: number
email: string
_verified?: boolean
}
type GenerateVerifyEmailHTML = (args: { req: PayloadRequest, token: string, user: any }) => Promise<string> | string
type GenerateVerifyEmailSubject = (args: { req: PayloadRequest, token: string, user: any }) => Promise<string> | string

8
src/types/index.ts
View File

@@ -1,6 +1,4 @@
import { Document as MongooseDocument } from 'mongoose';
import { TypeWithTimestamps } from '../collections/config/types';
import { FileData } from '../uploads/types';
export { PayloadRequest } from '../express/types';
@@ -32,12 +30,6 @@ export type Where = {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
export type Document = any;
export interface PayloadMongooseDocument extends MongooseDocument {
setLocale: (locale: string, fallback: string) => void;
filename?: string;
sizes?: FileData[];
}
export type Operation = 'create' | 'read' | 'update' | 'delete';
export type VersionOperations = 'readVersions';
export type AuthOperations = 'unlock';

9
test/buildConfigWithDefaults.ts
View File

@@ -1,3 +1,4 @@
import path from 'path';
import { Config, SanitizedConfig } from '../src/config/types';
import { buildConfig as buildPayloadConfig } from '../src/config/build';
import { mongooseAdapter } from '../packages/db-mongodb/src';
@@ -41,6 +42,14 @@ export function buildConfigWithDefaults(testConfig?: Partial<Config>): Promise<S
cache: process.env.NODE_ENV === 'test'
? { type: 'memory' }
: existingConfig.cache,
resolve: {
...existingConfig.resolve,
alias: {
...existingConfig.resolve?.alias,
[path.resolve(__dirname, '../packages/db-postgres/src/index')]: path.resolve(__dirname, '../packages/db-postgres/src/mock'),
[path.resolve(__dirname, '../packages/db-mongodb/src/index')]: path.resolve(__dirname, '../packages/db-mongodb/src/mock'),
},
},
};
},
};