@adaptivestone/framework 5.3.3 → 5.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/AGENTS.md +58 -0
- package/CHANGELOG.md +123 -1
- package/CLAUDE.md +1 -0
- package/README.md +71 -1
- package/dist/codegen/astExtract.js +6 -1
- package/dist/codegen/astExtract.js.map +1 -1
- package/dist/codegen/emit.js +27 -26
- package/dist/codegen/emit.js.map +1 -1
- package/dist/config/auth.d.ts +4 -0
- package/dist/config/auth.js +2 -0
- package/dist/config/auth.js.map +1 -1
- package/dist/controllers/Auth.js +138 -60
- package/dist/controllers/Auth.js.map +1 -1
- package/dist/controllers/Auth.routes.gen.d.ts +18 -32
- package/dist/controllers/Home.routes.gen.d.ts +2 -4
- package/dist/controllers/index.js +4 -4
- package/dist/controllers/index.js.map +1 -1
- package/dist/helpers/translate.d.ts +11 -0
- package/dist/helpers/translate.js +14 -0
- package/dist/helpers/translate.js.map +1 -0
- package/dist/locales/en/translation.json +1 -27
- package/dist/locales/ru/translation.json +3 -7
- package/dist/models/User.d.ts +5 -11
- package/dist/models/User.js +16 -3
- package/dist/models/User.js.map +1 -1
- package/dist/models/UserOld.d.ts +3 -9
- package/dist/models/UserOld.js +8 -0
- package/dist/models/UserOld.js.map +1 -1
- package/dist/modules/BaseModel.d.ts +160 -58
- package/dist/modules/BaseModel.js.map +1 -1
- package/dist/server.d.ts +13 -3
- package/dist/server.js +2 -0
- package/dist/server.js.map +1 -1
- package/dist/services/cache/Cache.js +14 -7
- package/dist/services/cache/Cache.js.map +1 -1
- package/dist/services/http/HttpServer.d.ts +2 -5
- package/dist/services/http/HttpServer.js +9 -4
- package/dist/services/http/HttpServer.js.map +1 -1
- package/dist/services/http/middleware/AbstractMiddleware.d.ts +8 -0
- package/dist/services/http/middleware/AbstractMiddleware.js +11 -0
- package/dist/services/http/middleware/AbstractMiddleware.js.map +1 -1
- package/dist/services/http/middleware/Auth.js +1 -1
- package/dist/services/http/middleware/Auth.js.map +1 -1
- package/dist/services/http/middleware/I18n.js +6 -1
- package/dist/services/http/middleware/I18n.js.map +1 -1
- package/dist/services/http/middleware/RateLimiter.js +12 -2
- package/dist/services/http/middleware/RateLimiter.js.map +1 -1
- package/dist/services/http/middleware/RequestParser.js +38 -19
- package/dist/services/http/middleware/RequestParser.js.map +1 -1
- package/dist/services/http/middleware/Role.js +6 -2
- package/dist/services/http/middleware/Role.js.map +1 -1
- package/dist/services/http/routing/ExpressAdapter.js +17 -1
- package/dist/services/http/routing/ExpressAdapter.js.map +1 -1
- package/dist/services/http/routing/match.d.ts +1 -0
- package/dist/services/http/routing/match.js +9 -1
- package/dist/services/http/routing/match.js.map +1 -1
- package/dist/services/http/types.d.ts +70 -5
- package/dist/services/i18n/I18n.d.ts +16 -10
- package/dist/services/i18n/I18n.js +74 -6
- package/dist/services/i18n/I18n.js.map +1 -1
- package/dist/services/i18n/types.d.ts +44 -0
- package/dist/services/i18n/types.js +2 -0
- package/dist/services/i18n/types.js.map +1 -0
- package/dist/services/messaging/email/escapeHtml.d.ts +6 -0
- package/dist/services/messaging/email/escapeHtml.js +12 -0
- package/dist/services/messaging/email/escapeHtml.js.map +1 -0
- package/dist/services/messaging/email/templates/recovery/html.d.ts +3 -0
- package/dist/services/messaging/email/templates/recovery/html.js +20 -0
- package/dist/services/messaging/email/templates/recovery/html.js.map +1 -0
- package/dist/services/messaging/email/templates/recovery/subject.d.ts +3 -0
- package/dist/services/messaging/email/templates/recovery/subject.js +3 -0
- package/dist/services/messaging/email/templates/recovery/subject.js.map +1 -0
- package/dist/services/messaging/email/templates/recovery/text.d.ts +3 -0
- package/dist/services/messaging/email/templates/recovery/text.js +15 -0
- package/dist/services/messaging/email/templates/recovery/text.js.map +1 -0
- package/dist/services/messaging/email/templates/verification/html.d.ts +3 -0
- package/dist/services/messaging/email/templates/verification/html.js +23 -0
- package/dist/services/messaging/email/templates/verification/html.js.map +1 -0
- package/dist/services/messaging/email/templates/verification/subject.d.ts +3 -0
- package/dist/services/messaging/email/templates/verification/subject.js +3 -0
- package/dist/services/messaging/email/templates/verification/subject.js.map +1 -0
- package/dist/services/messaging/email/templates/verification/text.d.ts +3 -0
- package/dist/services/messaging/email/templates/verification/text.js +15 -0
- package/dist/services/messaging/email/templates/verification/text.js.map +1 -0
- package/dist/services/messaging/email/types.d.ts +28 -0
- package/dist/services/messaging/email/types.js +2 -0
- package/dist/services/messaging/email/types.js.map +1 -0
- package/dist/services/validate/ValidateService.d.ts +2 -2
- package/dist/services/validate/ValidateService.js.map +1 -1
- package/dist/services/validate/mergeValidatedOutputs.d.ts +19 -0
- package/dist/services/validate/mergeValidatedOutputs.js +43 -0
- package/dist/services/validate/mergeValidatedOutputs.js.map +1 -0
- package/dist/tests/assertions.d.ts +4 -2
- package/dist/tests/assertions.js.map +1 -1
- package/dist/tests/mocks.d.ts +7 -0
- package/dist/tests/mocks.js +9 -0
- package/dist/tests/mocks.js.map +1 -1
- package/dist/tests/setupNodeTest.js +7 -0
- package/dist/tests/setupNodeTest.js.map +1 -1
- package/dist/tests/testHelpers.d.ts +4 -12
- package/dist/tests/testHelpers.js +3 -1
- package/dist/tests/testHelpers.js.map +1 -1
- package/package.json +20 -8
- package/tsconfig.tests.json +14 -0
- package/dist/services/messaging/email/templates/.gitkeep +0 -0
- package/dist/services/messaging/email/templates/recovery/html.pug +0 -8
- package/dist/services/messaging/email/templates/recovery/subject.pug +0 -2
- package/dist/services/messaging/email/templates/recovery/text.pug +0 -3
- package/dist/services/messaging/email/templates/verification/html.pug +0 -10
- package/dist/services/messaging/email/templates/verification/subject.pug +0 -1
- package/dist/services/messaging/email/templates/verification/text.pug +0 -1
|
@@ -1,32 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"auth": {
|
|
3
|
-
"userProvided": "User not specified",
|
|
4
|
-
"passwordProvided": "Password must be provided",
|
|
5
|
-
"emailProvided": "Email must be provided",
|
|
6
|
-
"nickNameValid": "Nick name is not valid,only a-z,A-Z,0-9",
|
|
7
|
-
"nameValid": "Name is not valid",
|
|
8
|
-
"passwordRecoveryTokenProvided": "Password recovery token must be provided",
|
|
9
|
-
"passwordValid": "Password is not valid,only a-z,A-Z,0-9,!,@,#,$,%,ˆ,&,*,(,),_,+,{,},[,],<,>",
|
|
10
3
|
"passwordTooShort": "Password must be at least {{min}} characters",
|
|
11
|
-
"
|
|
12
|
-
"errorUPValid": "User/password not valid",
|
|
13
|
-
"messageSome": "Some server problem. Please try later",
|
|
14
|
-
"errorUExist": "User with such email isn't registered on this site",
|
|
15
|
-
"recoveryEmailSent": "If an account exists for this address, a recovery email has been sent.",
|
|
16
|
-
"verificationEmailSent": "If an account exists for this address, a verification email has been sent.",
|
|
17
|
-
"errorUAlready": "That user already exists",
|
|
18
|
-
"nicknameExists": "User with such nickname already exists",
|
|
19
|
-
"noAccessRights": "No access rights"
|
|
20
|
-
},
|
|
21
|
-
"email": {
|
|
22
|
-
"newPassword": "New password",
|
|
23
|
-
"verify": "Verify email",
|
|
24
|
-
"notVerified": "Your email is not verified",
|
|
25
|
-
"registered": "User with such an email already registered",
|
|
26
|
-
"alreadyVerifiedOrWrongToken": "Your email is already verified or your verification token is wrong",
|
|
27
|
-
"greeating": "Dear user",
|
|
28
|
-
"passwordChanged": "Password changed",
|
|
29
|
-
"passwordRecovery": "Recovery password",
|
|
30
|
-
"emailConfirm": "Email confirmation"
|
|
4
|
+
"messageSome": "Some server problem. Please try later"
|
|
31
5
|
}
|
|
32
6
|
}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
{
|
|
2
2
|
"auth": {
|
|
3
|
-
"userProvided": "Пользователь не указан",
|
|
4
3
|
"passwordProvided": "Нужно ввести пароль",
|
|
5
4
|
"emailProvided": "Нужно указать Email",
|
|
6
5
|
"nickNameValid": "Неверный формат ника,только a-z,A-Z,0-9",
|
|
@@ -11,20 +10,17 @@
|
|
|
11
10
|
"emailValid": "Неверный формат Email-а",
|
|
12
11
|
"errorUPValid": "Не правильно указаны емэйл или пароль",
|
|
13
12
|
"messageSome": "Проблемы с сервером. Пожалуйста попробуйте позже",
|
|
14
|
-
"errorUExist": "Пользователь с таким эмэйлом не зарегистрирован на этом сайте",
|
|
15
13
|
"recoveryEmailSent": "Если аккаунт с таким адресом существует, письмо для восстановления пароля отправлено.",
|
|
16
14
|
"verificationEmailSent": "Если аккаунт с таким адресом существует, письмо с подтверждением отправлено.",
|
|
17
|
-
"
|
|
18
|
-
"nicknameExists": "Пользователь с таким никнеймом уже существует",
|
|
19
|
-
"noAccessRights": "Нет прав доступа"
|
|
15
|
+
"nicknameExists": "Пользователь с таким никнеймом уже существует"
|
|
20
16
|
},
|
|
21
17
|
"email": {
|
|
22
|
-
"newPassword": "Новый пароль",
|
|
23
18
|
"verify": "Подтвердить емэйл",
|
|
19
|
+
"verifyInstructions": "Для подтверждения емэйла перейдите по ссылке:",
|
|
24
20
|
"notVerified": "Ваш емэйл не подтверждён",
|
|
25
21
|
"registered": "Пользователь с таким емэйлом уже зарегестрирован",
|
|
26
22
|
"alreadyVerifiedOrWrongToken": "Ваш емэйл уже подтверждён или ваш ключ подтверждения неверный",
|
|
27
|
-
"
|
|
23
|
+
"greeting": "Здравствуйте, пользователь",
|
|
28
24
|
"passwordChanged": "Пароль был изменен",
|
|
29
25
|
"passwordRecovery": "Восстановление пароля",
|
|
30
26
|
"emailConfirm": "Подтверждение Email"
|
package/dist/models/User.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type { TFunction } from 'i18next';
|
|
2
1
|
import type { HydratedDocument, Model, Schema } from 'mongoose';
|
|
3
2
|
import type { ExtractProperty, GetModelTypeFromClass, GetModelTypeLiteFromSchema } from '../modules/BaseModel.ts';
|
|
4
3
|
import { BaseModel } from '../modules/BaseModel.ts';
|
|
4
|
+
import type { TI18n } from '../services/i18n/types.ts';
|
|
5
5
|
/**
|
|
6
6
|
* Hash a token for storage/lookup. Tokens are high-entropy random values, so a
|
|
7
7
|
* fast hash (SHA-256) is correct here — brute-force is infeasible and a slow
|
|
@@ -233,7 +233,7 @@ declare class User extends BaseModel {
|
|
|
233
233
|
/**
|
|
234
234
|
* Send password recovery email
|
|
235
235
|
* @param {Object}
|
|
236
|
-
* @param {
|
|
236
|
+
* @param {TI18n}
|
|
237
237
|
* @param {string} i18n.language
|
|
238
238
|
* @returns {Promise<boolean>}
|
|
239
239
|
*/
|
|
@@ -241,14 +241,11 @@ declare class User extends BaseModel {
|
|
|
241
241
|
name?: {
|
|
242
242
|
nick?: string | null;
|
|
243
243
|
} | null;
|
|
244
|
-
}, i18n:
|
|
245
|
-
t: TFunction;
|
|
246
|
-
language: string;
|
|
247
|
-
}) => Promise<any>;
|
|
244
|
+
}, i18n: TI18n) => Promise<any>;
|
|
248
245
|
/**
|
|
249
246
|
* Send verification email
|
|
250
247
|
* @param {Object}
|
|
251
|
-
* @param {
|
|
248
|
+
* @param {TI18n} i18n
|
|
252
249
|
* @param {string} i18n.language
|
|
253
250
|
* @returns {Promise<boolean>}
|
|
254
251
|
*/
|
|
@@ -256,10 +253,7 @@ declare class User extends BaseModel {
|
|
|
256
253
|
name?: {
|
|
257
254
|
nick?: string | null;
|
|
258
255
|
} | null;
|
|
259
|
-
}, i18n:
|
|
260
|
-
t: TFunction;
|
|
261
|
-
language: string;
|
|
262
|
-
}) => Promise<any>; /**
|
|
256
|
+
}, i18n: TI18n) => Promise<any>; /**
|
|
263
257
|
* Get public user data
|
|
264
258
|
* @returns {Object}
|
|
265
259
|
*/
|
package/dist/models/User.js
CHANGED
|
@@ -139,7 +139,12 @@ class User extends BaseModel {
|
|
|
139
139
|
const newHash = await hashPassword(password);
|
|
140
140
|
// Direct update bypasses the pre-save hook, which would otherwise
|
|
141
141
|
// re-hash the already-hashed string and lock the user out.
|
|
142
|
-
await this.updateOne({ _id: data._id }, { password: newHash });
|
|
142
|
+
const upgrade = await this.updateOne({ _id: data._id, password: data.password }, { password: newHash });
|
|
143
|
+
// A password reset/change won the race. Never overwrite it or
|
|
144
|
+
// issue a session using the credentials read before that change.
|
|
145
|
+
if (upgrade.matchedCount === 0) {
|
|
146
|
+
return false;
|
|
147
|
+
}
|
|
143
148
|
}
|
|
144
149
|
catch (e) {
|
|
145
150
|
appInstance.logger?.error('Failed to upgrade password hash', e);
|
|
@@ -261,11 +266,15 @@ class User extends BaseModel {
|
|
|
261
266
|
/**
|
|
262
267
|
* Send password recovery email
|
|
263
268
|
* @param {Object}
|
|
264
|
-
* @param {
|
|
269
|
+
* @param {TI18n}
|
|
265
270
|
* @param {string} i18n.language
|
|
266
271
|
* @returns {Promise<boolean>}
|
|
267
272
|
*/
|
|
268
273
|
sendPasswordRecoveryEmail: async function (i18n) {
|
|
274
|
+
if (!this.email) {
|
|
275
|
+
appInstance.logger?.error('Cannot send password recovery email: user has no email address');
|
|
276
|
+
return false;
|
|
277
|
+
}
|
|
269
278
|
const passwordRecoveryToken = await userHelpers.generateUserPasswordRecoveryToken(this);
|
|
270
279
|
// speed optimisation
|
|
271
280
|
try {
|
|
@@ -287,11 +296,15 @@ class User extends BaseModel {
|
|
|
287
296
|
/**
|
|
288
297
|
* Send verification email
|
|
289
298
|
* @param {Object}
|
|
290
|
-
* @param {
|
|
299
|
+
* @param {TI18n} i18n
|
|
291
300
|
* @param {string} i18n.language
|
|
292
301
|
* @returns {Promise<boolean>}
|
|
293
302
|
*/
|
|
294
303
|
sendVerificationEmail: async function (i18n) {
|
|
304
|
+
if (!this.email) {
|
|
305
|
+
appInstance.logger?.error('Cannot send verification email: user has no email address');
|
|
306
|
+
return false;
|
|
307
|
+
}
|
|
295
308
|
const verificationToken = await userHelpers.generateUserVerificationToken(this);
|
|
296
309
|
// speed optimisation
|
|
297
310
|
try {
|
package/dist/models/User.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"User.js","sourceRoot":"","sources":["../../src/models/User.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"User.js","sourceRoot":"","sources":["../../src/models/User.ts"],"names":[],"mappings":"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"}
|
package/dist/models/UserOld.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import type { TFunction } from 'i18next';
|
|
2
1
|
import type { IAbstractModel, IAbstractModelMethods } from '../modules/AbstractModel.ts';
|
|
3
2
|
import AbstractModel from '../modules/AbstractModel.ts';
|
|
4
3
|
import type { IApp } from '../server.ts';
|
|
4
|
+
import type { TI18n } from '../services/i18n/types.ts';
|
|
5
5
|
interface IUser {
|
|
6
6
|
avatar: string;
|
|
7
7
|
name: {
|
|
@@ -168,10 +168,7 @@ declare class UserOld extends AbstractModel<IUser, IAbstractModelMethods<IUser>,
|
|
|
168
168
|
}, "getSuper" | "id"> & import("mongoose").HydratedDocumentOverrides<IAbstractModelMethods<IUser> & {
|
|
169
169
|
id: string;
|
|
170
170
|
}>>;
|
|
171
|
-
sendPasswordRecoveryEmail(this: InstanceType<UserOld['mongooseModel']>, i18n:
|
|
172
|
-
t: TFunction;
|
|
173
|
-
language: string;
|
|
174
|
-
}): Promise<any>;
|
|
171
|
+
sendPasswordRecoveryEmail(this: InstanceType<UserOld['mongooseModel']>, i18n: TI18n): Promise<any>;
|
|
175
172
|
static generateUserVerificationToken(userMongoose: InstanceType<UserOld['mongooseModel']>): Promise<{
|
|
176
173
|
token: string;
|
|
177
174
|
until: number;
|
|
@@ -183,9 +180,6 @@ declare class UserOld extends AbstractModel<IUser, IAbstractModelMethods<IUser>,
|
|
|
183
180
|
}, "getSuper" | "id"> & import("mongoose").HydratedDocumentOverrides<IAbstractModelMethods<IUser> & {
|
|
184
181
|
id: string;
|
|
185
182
|
}>>;
|
|
186
|
-
sendVerificationEmail(this: InstanceType<UserOld['mongooseModel']>, i18n:
|
|
187
|
-
t: TFunction;
|
|
188
|
-
language: string;
|
|
189
|
-
}): Promise<any>;
|
|
183
|
+
sendVerificationEmail(this: InstanceType<UserOld['mongooseModel']>, i18n: TI18n): Promise<any>;
|
|
190
184
|
}
|
|
191
185
|
export default UserOld;
|
package/dist/models/UserOld.js
CHANGED
|
@@ -153,6 +153,10 @@ class UserOld extends AbstractModel {
|
|
|
153
153
|
return result;
|
|
154
154
|
}
|
|
155
155
|
async sendPasswordRecoveryEmail(i18n) {
|
|
156
|
+
if (!this.email) {
|
|
157
|
+
this.getSuper().logger?.error('Cannot send password recovery email: user has no email address');
|
|
158
|
+
return false;
|
|
159
|
+
}
|
|
156
160
|
const passwordRecoveryToken = await UserOld.generateUserPasswordRecoveryToken(this);
|
|
157
161
|
// speed optimisation
|
|
158
162
|
try {
|
|
@@ -217,6 +221,10 @@ class UserOld extends AbstractModel {
|
|
|
217
221
|
// );
|
|
218
222
|
// }
|
|
219
223
|
async sendVerificationEmail(i18n) {
|
|
224
|
+
if (!this.email) {
|
|
225
|
+
this.getSuper().logger?.error('Cannot send verification email: user has no email address');
|
|
226
|
+
return false;
|
|
227
|
+
}
|
|
220
228
|
const verificationToken = await UserOld.generateUserVerificationToken(this);
|
|
221
229
|
// speed optimisation
|
|
222
230
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserOld.js","sourceRoot":"","sources":["../../src/models/UserOld.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"UserOld.js","sourceRoot":"","sources":["../../src/models/UserOld.ts"],"names":[],"mappings":"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"}
|
|
@@ -72,9 +72,18 @@ type TsOverrideFor<S, Surface extends TsOverrideSurface> = Surface extends 'hydr
|
|
|
72
72
|
* into it triggers a TS2615 circular mapped-type error — and it can carry no
|
|
73
73
|
* `__tsType` marker anyway, so stopping there is always correct.
|
|
74
74
|
*/
|
|
75
|
-
type IsLeafFieldDef<S> = S extends Schema ? true : S extends abstract new (...args: never) => unknown ? true : S extends
|
|
76
|
-
|
|
77
|
-
|
|
75
|
+
type IsLeafFieldDef<S, TypeKey extends string = 'type'> = S extends Schema ? true : S extends abstract new (...args: never[]) => unknown ? true : TypeKey extends keyof S ? S[TypeKey] extends Schema ? true : S[TypeKey] extends abstract new (...args: never[]) => unknown ? true : false : false;
|
|
76
|
+
type SchemaArrayElement<S, TypeKey extends string = 'type'> = NonNullable<S> extends readonly (infer E)[] ? E : TypeKey extends keyof NonNullable<S> ? NonNullable<S>[TypeKey] extends readonly (infer E)[] ? E : never : never;
|
|
77
|
+
type SchemaArrayElementWithIdMarker<S, TypeKey extends string = 'type'> = S extends {
|
|
78
|
+
readonly _id: false;
|
|
79
|
+
} ? SchemaArrayElement<S, TypeKey> & {
|
|
80
|
+
readonly _id: false;
|
|
81
|
+
} : SchemaArrayElement<S, TypeKey>;
|
|
82
|
+
type SchemaSingleNestedDefinition<S, TypeKey extends string = 'type'> = TypeKey extends keyof NonNullable<S> ? NonNullable<S>[TypeKey] extends infer Definition ? Definition extends Schema ? never : Definition extends abstract new (...args: never[]) => unknown ? never : Definition extends readonly unknown[] ? never : Definition extends object ? Definition : never : never : never;
|
|
83
|
+
type SingleNestedDefinitionOrSelf<S, TypeKey extends string = 'type'> = [
|
|
84
|
+
SchemaSingleNestedDefinition<S, TypeKey>
|
|
85
|
+
] extends [never] ? S : SchemaSingleNestedDefinition<S, TypeKey>;
|
|
86
|
+
type ApplyTsOverrideArray<DocField, ElementSchema, Surface extends TsOverrideSurface, TypeKey extends string = 'type'> = NonNullable<DocField> extends mongoose.Types.DocumentArray<infer Raw, infer Hydrated> ? IsLeafFieldDef<ElementSchema, TypeKey> extends true ? DocField : mongoose.Types.DocumentArray<ApplyTsOverrides<Raw, ElementSchema, 'raw', TypeKey>, ApplyTsOverrides<Hydrated, ElementSchema, 'hydrated', TypeKey> extends mongoose.Types.Subdocument ? ApplyTsOverrides<Hydrated, ElementSchema, 'hydrated', TypeKey> : Hydrated> | Extract<DocField, null | undefined> : NonNullable<DocField> extends readonly (infer Item)[] ? Item extends object ? IsLeafFieldDef<ElementSchema, TypeKey> extends true ? DocField : ApplyTsOverrides<Item, ElementSchema, Surface, TypeKey>[] | Exclude<DocField, readonly unknown[]> : DocField : DocField;
|
|
78
87
|
/**
|
|
79
88
|
* Walk an inferred document type alongside its schema and replace each field
|
|
80
89
|
* marked with {@link TsTypeOverride} by the override for the selected surface.
|
|
@@ -87,25 +96,9 @@ type IsLeafFieldDef<S> = S extends Schema ? true : S extends abstract new (...ar
|
|
|
87
96
|
* the `__tsType` key (not by `extends TsTypeOverride`, which an optional property
|
|
88
97
|
* would match on every field).
|
|
89
98
|
*/
|
|
90
|
-
export type ApplyTsOverrides<Doc, Schema, Surface extends TsOverrideSurface = 'raw'> = {
|
|
91
|
-
[K in keyof Doc]: K extends keyof Schema ? '__tsType' extends keyof Schema[K] ? TsOverrideFor<Schema[K], Surface> :
|
|
99
|
+
export type ApplyTsOverrides<Doc, Schema, Surface extends TsOverrideSurface = 'raw', TypeKey extends string = 'type'> = {
|
|
100
|
+
[K in keyof Doc]: K extends keyof Schema ? '__tsType' extends keyof Schema[K] ? TsOverrideFor<Schema[K], Surface> : [SchemaArrayElement<Schema[K], TypeKey>] extends [never] ? NonNullable<Schema[K]> extends object ? NonNullable<Doc[K]> extends object ? IsLeafFieldDef<NonNullable<Schema[K]>, TypeKey> extends true ? Doc[K] : ApplyTsOverrides<NonNullable<Doc[K]>, SingleNestedDefinitionOrSelf<NonNullable<Schema[K]>, TypeKey>, Surface, TypeKey> | Exclude<Doc[K], object> : Doc[K] : Doc[K] : ApplyTsOverrideArray<Doc[K], SchemaArrayElement<Schema[K], TypeKey>, Surface, TypeKey> : Doc[K];
|
|
92
101
|
};
|
|
93
|
-
/**
|
|
94
|
-
* The definition to recurse into for a nested field.
|
|
95
|
-
*
|
|
96
|
-
* A single-nested subdocument is declared `{ type: { … }, _id?: false }`, so its
|
|
97
|
-
* OWN keys are `type`/`_id` — recursing into the wrapper makes every inner key
|
|
98
|
-
* fail `K extends keyof Schema` and silently drops the override (the inner field
|
|
99
|
-
* keeps its plain inferred type). Unwrap to the inner definition so the keys line
|
|
100
|
-
* up with the inferred document. A plain nested path (`organizer: { name: … }`)
|
|
101
|
-
* has no `type` wrapper and recurses as itself.
|
|
102
|
-
*
|
|
103
|
-
* `HasTsOverride` needs no equivalent: it walks every key blindly, so it already
|
|
104
|
-
* sees markers through the wrapper.
|
|
105
|
-
*/
|
|
106
|
-
type SingleNestedDefinitionOrSelf<S> = [
|
|
107
|
-
SchemaSingleNestedDefinition<S>
|
|
108
|
-
] extends [never] ? S : SchemaSingleNestedDefinition<S>;
|
|
109
102
|
/**
|
|
110
103
|
* True when a schema carries at least one {@link TsTypeOverride} marker anywhere
|
|
111
104
|
* — at the top level, inside a nested object, or inside a subdocument array.
|
|
@@ -115,18 +108,12 @@ type SingleNestedDefinitionOrSelf<S> = [
|
|
|
115
108
|
* doc type is the plain Mongoose inference with no `ApplyTsOverrides<…>` wrapper
|
|
116
109
|
* in hovers and no extra compile work.
|
|
117
110
|
*/
|
|
118
|
-
type HasTsOverride<S> = S extends object ? '__tsType' extends keyof S ? true : IsLeafFieldDef<S> extends true ? false : S extends readonly (infer E)[] ? HasTsOverride<E> : true extends {
|
|
119
|
-
[K in keyof S]: HasTsOverride<S[K]>;
|
|
111
|
+
type HasTsOverride<S, TypeKey extends string = 'type'> = S extends object ? '__tsType' extends keyof S ? true : IsLeafFieldDef<S, TypeKey> extends true ? false : S extends readonly (infer E)[] ? HasTsOverride<E, TypeKey> : true extends {
|
|
112
|
+
[K in keyof S]: HasTsOverride<S[K], TypeKey>;
|
|
120
113
|
}[keyof S] ? true : false : false;
|
|
121
114
|
/** {@link ApplyTsOverrides} only when the schema actually has a marker;
|
|
122
115
|
* otherwise the inferred doc verbatim (a strict no-op, but without the wrapper). */
|
|
123
|
-
type MaybeApplyOverrides<Doc, Schema, Surface extends TsOverrideSurface = 'raw'> = HasTsOverride<Schema> extends true ? ApplyTsOverrides<Doc, Schema, Surface> : Doc;
|
|
124
|
-
type SchemaArrayElement<S> = NonNullable<S> extends readonly (infer E)[] ? E : NonNullable<S> extends {
|
|
125
|
-
readonly type: readonly (infer E)[];
|
|
126
|
-
} ? E : never;
|
|
127
|
-
type SchemaSingleNestedDefinition<S> = NonNullable<S> extends {
|
|
128
|
-
readonly type: infer Definition;
|
|
129
|
-
} ? Definition extends Schema ? never : Definition extends abstract new (...args: never[]) => unknown ? never : Definition extends readonly unknown[] ? never : Definition extends object ? Definition : never : never;
|
|
116
|
+
type MaybeApplyOverrides<Doc, Schema, Surface extends TsOverrideSurface = 'raw', TypeKey extends string = 'type'> = HasTsOverride<Schema, TypeKey> extends true ? ApplyTsOverrides<Doc, Schema, Surface, TypeKey> : Doc;
|
|
130
117
|
/**
|
|
131
118
|
* True for a *plain nested path* — an object of field definitions with no
|
|
132
119
|
* `type` key, e.g. `name: { first: String, last: String }`.
|
|
@@ -137,32 +124,100 @@ type SchemaSingleNestedDefinition<S> = NonNullable<S> extends {
|
|
|
137
124
|
* id. Anything with a `type` key, a leaf definition, or an array is therefore
|
|
138
125
|
* excluded here — same discriminator {@link SchemaSingleNestedDefinition} uses.
|
|
139
126
|
*/
|
|
140
|
-
type IsPlainNestedPath<S> = S extends object ? S extends readonly unknown[] ? false : IsLeafFieldDef<S> extends true ? false :
|
|
141
|
-
type HasDisabledSubdocumentId<S> = S extends {
|
|
127
|
+
type IsPlainNestedPath<S, TypeKey extends string = 'type'> = S extends object ? S extends readonly unknown[] ? false : IsLeafFieldDef<S, TypeKey> extends true ? false : TypeKey extends keyof S ? false : true : false;
|
|
128
|
+
type HasDisabledSubdocumentId<S, TypeKey extends string = 'type'> = S extends {
|
|
142
129
|
readonly _id: false;
|
|
143
|
-
} ? true : S extends object ? IsLeafFieldDef<S> extends true ? false : S extends readonly (infer E)[] ? HasDisabledSubdocumentId<E> : true extends {
|
|
144
|
-
[K in keyof S]: HasDisabledSubdocumentId<S[K]>;
|
|
130
|
+
} ? true : S extends object ? IsLeafFieldDef<S, TypeKey> extends true ? false : S extends readonly (infer E)[] ? HasDisabledSubdocumentId<E, TypeKey> : true extends {
|
|
131
|
+
[K in keyof S]: HasDisabledSubdocumentId<S[K], TypeKey>;
|
|
145
132
|
}[keyof S] ? true : false : false;
|
|
146
|
-
type CorrectRawSubdocumentElement<Doc, Schema> = Doc extends object ? Schema extends {
|
|
133
|
+
type CorrectRawSubdocumentElement<Doc, Schema, TypeKey extends string = 'type'> = Doc extends object ? Schema extends {
|
|
147
134
|
readonly _id: false;
|
|
148
|
-
} ? Omit<CorrectRawSubdocumentIds<Doc, Schema>, '_id'> : CorrectRawSubdocumentIds<Doc, Schema> : Doc;
|
|
149
|
-
/**
|
|
150
|
-
|
|
151
|
-
|
|
135
|
+
} ? Omit<CorrectRawSubdocumentIds<MaybeApplyOverrides<Doc, Schema, 'raw', TypeKey>, Schema, TypeKey>, '_id'> : CorrectRawSubdocumentIds<MaybeApplyOverrides<Doc, Schema, 'raw', TypeKey>, Schema, TypeKey> : Doc;
|
|
136
|
+
/** Resolve schema structure before mapping document fields. Keeping these
|
|
137
|
+
* steps separate avoids recursive generic instantiation in Mongoose model types.
|
|
138
|
+
* Custom-key array elements also need fresh inference: Mongoose 9.9.4 infers
|
|
139
|
+
* inline array elements using its default `type` key. */
|
|
140
|
+
type RawIdFields<Definition, TypeKey extends string> = {
|
|
141
|
+
[K in keyof Definition as TypeKey extends 'type' ? HasDisabledSubdocumentId<Definition[K], TypeKey> extends true ? K : never : IsLeafFieldDef<Definition[K], TypeKey> extends true ? never : K]: RawIdShape<Definition[K], TypeKey>;
|
|
152
142
|
};
|
|
153
|
-
type
|
|
143
|
+
type RawIdObject<Definition, TypeKey extends string> = {
|
|
144
|
+
fields: RawIdFields<Definition, TypeKey>;
|
|
145
|
+
removeId: Definition extends {
|
|
146
|
+
readonly _id: false;
|
|
147
|
+
} ? true : false;
|
|
148
|
+
};
|
|
149
|
+
type RawIdShape<Definition, TypeKey extends string> = [
|
|
150
|
+
SchemaArrayElement<Definition, TypeKey>
|
|
151
|
+
] extends [never] ? [SchemaSingleNestedDefinition<Definition, TypeKey>] extends [never] ? RawIdObject<Definition, TypeKey> : RawIdObject<SingleNestedDefinitionWithIdMarker<Definition, TypeKey>, TypeKey> : TypeKey extends 'type' ? {
|
|
152
|
+
array: RawIdObject<SchemaArrayElementWithIdMarker<Definition, TypeKey>, TypeKey>;
|
|
153
|
+
} : IsLeafFieldDef<SchemaArrayElement<Definition, TypeKey>, TypeKey> extends true ? object : {
|
|
154
|
+
array: RawIdObject<SchemaArrayElementWithIdMarker<Definition, TypeKey>, TypeKey>;
|
|
155
|
+
item: MaybeApplyOverrides<InferRawDocType<MutableSchemaForInference<SchemaArrayElement<Definition, TypeKey>>, {
|
|
156
|
+
typeKey: TypeKey;
|
|
157
|
+
}>, SchemaArrayElement<Definition, TypeKey>, 'raw', TypeKey>;
|
|
158
|
+
};
|
|
159
|
+
type ApplyRawIdFields<Doc, Fields> = {
|
|
160
|
+
[K in keyof Doc]: K extends keyof Fields ? ApplyRawIdShape<Doc[K], Fields[K]> : Doc[K];
|
|
161
|
+
};
|
|
162
|
+
type ApplyRawIdShape<Doc, Shape> = Doc extends readonly (infer Item)[] ? Shape extends {
|
|
163
|
+
array: infer Element;
|
|
164
|
+
} ? ApplyRawIdShape<Shape extends {
|
|
165
|
+
item: infer Inferred;
|
|
166
|
+
} ? Inferred : Item, Element>[] : Doc : Doc extends object ? Shape extends {
|
|
167
|
+
fields: infer Fields;
|
|
168
|
+
removeId: infer Remove;
|
|
169
|
+
} ? Remove extends true ? Omit<ApplyRawIdFields<Doc, Fields>, '_id'> : ApplyRawIdFields<Doc, Fields> : Doc : Doc;
|
|
170
|
+
/** Correct disabled IDs and custom-key array inference on the raw surface. */
|
|
171
|
+
type CorrectRawSubdocumentIds<Doc, Definition, TypeKey extends string = 'type'> = ApplyRawIdFields<Doc, RawIdFields<Definition, TypeKey>>;
|
|
172
|
+
type CorrectHydratedSubdocumentElement<Raw, Schema, TypeKey extends string = 'type'> = CorrectRawSubdocumentElement<Raw, Schema, TypeKey> extends infer CorrectedRaw ? CorrectHydratedSubdocumentIds<MaybeApplyOverrides<InferHydratedDocType<MutableSchemaForInference<Schema>, {
|
|
173
|
+
typeKey: TypeKey;
|
|
174
|
+
}>, Schema, 'hydrated', TypeKey>, Schema, TypeKey> extends infer Fields ? Schema extends {
|
|
154
175
|
readonly _id: false;
|
|
155
|
-
} ? mongoose.Types.Subdocument<
|
|
176
|
+
} ? mongoose.Types.Subdocument<undefined, unknown, CorrectedRaw> & Omit<Fields, '_id'> : mongoose.Types.Subdocument<ExtractProperty<Fields, '_id', mongoose.Types.ObjectId>, unknown, CorrectedRaw> & Fields : never : never;
|
|
177
|
+
/**
|
|
178
|
+
* The single-nested definition a subdocument is re-derived from, keeping an
|
|
179
|
+
* `_id: false` the *wrapper* carries.
|
|
180
|
+
*
|
|
181
|
+
* A subdocument spelled `field: { type: { … }, _id: false }` puts the marker
|
|
182
|
+
* next to `type`, so unwrapping to the inner definition loses it and the
|
|
183
|
+
* subdocument keeps an `_id` the runtime never generates. The
|
|
184
|
+
* `field: { type: { _id: false, … } }` spelling survives the unwrap on its own
|
|
185
|
+
* and needs no re-attachment.
|
|
186
|
+
*/
|
|
187
|
+
type SingleNestedDefinitionWithIdMarker<S, TypeKey extends string = 'type'> = S extends {
|
|
188
|
+
readonly _id: false;
|
|
189
|
+
} ? SchemaSingleNestedDefinition<S, TypeKey> & {
|
|
190
|
+
readonly _id: false;
|
|
191
|
+
} : SchemaSingleNestedDefinition<S, TypeKey>;
|
|
192
|
+
/** Inspect schema definitions before rebuilding a hydrated subdocument. Most
|
|
193
|
+
* arrays contain only leaf fields and need no correction or extra inference. */
|
|
194
|
+
type HasHydratedCorrection<Definition, TypeKey extends string> = Definition extends {
|
|
195
|
+
readonly _id: false;
|
|
196
|
+
} ? true : IsLeafFieldDef<Definition, TypeKey> extends true ? false : Definition extends object ? true extends {
|
|
197
|
+
[K in keyof Definition]: FieldNeedsHydratedCorrection<Definition[K], TypeKey>;
|
|
198
|
+
}[keyof Definition] ? true : false : false;
|
|
199
|
+
type FieldNeedsHydratedCorrection<Field, TypeKey extends string> = Field extends {
|
|
200
|
+
readonly _id: false;
|
|
201
|
+
} ? true : IsLeafFieldDef<Field, TypeKey> extends true ? false : [SchemaArrayElement<Field, TypeKey>] extends [never] ? [SchemaSingleNestedDefinition<Field, TypeKey>] extends [never] ? IsPlainNestedPath<Field, TypeKey> : HasHydratedCorrection<SchemaSingleNestedDefinition<Field, TypeKey>, TypeKey> : TypeKey extends 'type' ? HasHydratedCorrection<SchemaArrayElement<Field, TypeKey>, TypeKey> : IsLeafFieldDef<SchemaArrayElement<Field, TypeKey>, TypeKey> extends true ? false : true;
|
|
156
202
|
/**
|
|
157
203
|
* Preserve Mongoose's hydrated array APIs while respecting inline `_id: false`,
|
|
158
204
|
* and drop the `_id` Mongoose's hydrated inference adds to plain nested paths.
|
|
159
|
-
* Mongoose
|
|
160
|
-
* subdocument elements
|
|
161
|
-
*
|
|
162
|
-
*
|
|
205
|
+
* Mongoose otherwise exposes a phantom `_id: Types.ObjectId` on `_id: false`
|
|
206
|
+
* subdocument elements (verified up to 9.9.4 — the correction is still
|
|
207
|
+
* required), and intersects `{ _id: ObjectId }` onto every nested path — a
|
|
208
|
+
* field that never exists at runtime, and one that makes assigning the real
|
|
209
|
+
* runtime shape (`doc.name = { first: 'a' }`) a type error.
|
|
163
210
|
*/
|
|
164
|
-
type CorrectHydratedSubdocumentIds<Doc, Schema> = {
|
|
165
|
-
[K in keyof Doc]: K extends keyof Schema ? IsPlainNestedPath<NonNullable<Schema[K]
|
|
211
|
+
type CorrectHydratedSubdocumentIds<Doc, Schema, TypeKey extends string = 'type'> = {
|
|
212
|
+
[K in keyof Doc]: K extends keyof Schema ? IsPlainNestedPath<NonNullable<Schema[K]>, TypeKey> extends true ? NonNullable<Doc[K]> extends object ? ('_id' extends keyof NonNullable<Schema[K]> ? CorrectHydratedSubdocumentIds<NonNullable<Doc[K]>, NonNullable<Schema[K]>, TypeKey> : Omit<CorrectHydratedSubdocumentIds<NonNullable<Doc[K]>, NonNullable<Schema[K]>, TypeKey>, '_id'>) | Exclude<Doc[K], object> : Doc[K] : FieldNeedsHydratedCorrection<Schema[K], TypeKey> extends true ? [SchemaArrayElement<Schema[K], TypeKey>] extends [never] ? [SchemaSingleNestedDefinition<Schema[K], TypeKey>] extends [never] ? Doc[K] : NonNullable<Doc[K]> extends object ? CorrectHydratedSubdocumentElement<InferRawDocType<MutableSchemaForInference<SchemaSingleNestedDefinition<Schema[K], TypeKey>>, {
|
|
213
|
+
typeKey: TypeKey;
|
|
214
|
+
}>, SingleNestedDefinitionWithIdMarker<Schema[K], TypeKey>, TypeKey> | Exclude<Doc[K], object> : Doc[K] : NonNullable<Doc[K]> extends {
|
|
215
|
+
isMongooseDocumentArray: true;
|
|
216
|
+
} ? mongoose.Types.DocumentArray<CorrectRawSubdocumentElement<InferRawDocType<MutableSchemaForInference<SchemaArrayElement<Schema[K], TypeKey>>, {
|
|
217
|
+
typeKey: TypeKey;
|
|
218
|
+
}>, SchemaArrayElementWithIdMarker<Schema[K], TypeKey>, TypeKey>, CorrectHydratedSubdocumentElement<InferRawDocType<MutableSchemaForInference<SchemaArrayElement<Schema[K], TypeKey>>, {
|
|
219
|
+
typeKey: TypeKey;
|
|
220
|
+
}>, SchemaArrayElementWithIdMarker<Schema[K], TypeKey>, TypeKey>> | Extract<Doc[K], null | undefined> : Doc[K] : Doc[K] : Doc[K];
|
|
166
221
|
};
|
|
167
222
|
/**
|
|
168
223
|
* Remove readonly modifiers introduced by `as const` before handing a schema
|
|
@@ -189,17 +244,45 @@ type MutableSchemaForInference<T> = T extends SchemaInferenceAtomic ? T : T exte
|
|
|
189
244
|
} : T;
|
|
190
245
|
/** Schema options after applying the same framework defaults used at runtime. */
|
|
191
246
|
type EffectiveSchemaOptions<TOptions> = Merge<typeof defaultOptions, TOptions>;
|
|
247
|
+
type EffectiveTypeKey<TOptions> = EffectiveSchemaOptions<TOptions> extends {
|
|
248
|
+
typeKey: infer Key extends string;
|
|
249
|
+
} ? Key : 'type';
|
|
250
|
+
type TimestampSchema<TOptions> = {
|
|
251
|
+
[K in keyof WithTimestamps<EffectiveSchemaOptions<TOptions>>]: {
|
|
252
|
+
[P in keyof WithTimestamps<EffectiveSchemaOptions<TOptions>>[K] as P extends 'type' ? EffectiveTypeKey<TOptions> : P]: WithTimestamps<EffectiveSchemaOptions<TOptions>>[K][P];
|
|
253
|
+
};
|
|
254
|
+
};
|
|
255
|
+
type InferenceOptions<TOptions> = Omit<EffectiveSchemaOptions<TOptions>, 'timestamps'> & {
|
|
256
|
+
timestamps: false;
|
|
257
|
+
typeKey: EffectiveTypeKey<TOptions>;
|
|
258
|
+
};
|
|
192
259
|
type UnfinishedSchemaMember = any;
|
|
193
|
-
type InferredRawDocFromSchema<TSchema extends typeof BaseModel.modelSchema, TOptions> =
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
260
|
+
type InferredRawDocFromSchema<TSchema extends typeof BaseModel.modelSchema, TOptions> = TOptions extends {
|
|
261
|
+
typeKey: string;
|
|
262
|
+
} | {
|
|
263
|
+
_id: false;
|
|
264
|
+
} ? InferRawDocType<MutableSchemaForInference<TSchema> & TimestampSchema<TOptions>, InferenceOptions<TOptions>> : InferRawDocType<MutableSchemaForInference<TSchema> & WithTimestamps<EffectiveSchemaOptions<TOptions>>>;
|
|
265
|
+
type OverriddenRawDocFromSchema<TSchema extends typeof BaseModel.modelSchema, TOptions> = CorrectTopLevelRawId<CorrectRawSubdocumentIds<MaybeApplyOverrides<InferredRawDocFromSchema<TSchema, TOptions>, TSchema, 'raw', EffectiveTypeKey<TOptions>>, TSchema, EffectiveTypeKey<TOptions>>, TSchema, TOptions>;
|
|
266
|
+
type InferredHydratedDocFromSchema<TSchema extends typeof BaseModel.modelSchema, TOptions> = TOptions extends {
|
|
267
|
+
typeKey: string;
|
|
268
|
+
} | {
|
|
269
|
+
_id: false;
|
|
270
|
+
} ? InferHydratedDocType<MutableSchemaForInference<TSchema> & TimestampSchema<TOptions>, InferenceOptions<TOptions>> : InferHydratedDocType<MutableSchemaForInference<TSchema> & WithTimestamps<EffectiveSchemaOptions<TOptions>>>;
|
|
271
|
+
type OverriddenHydratedDocFromSchema<TSchema extends typeof BaseModel.modelSchema, TOptions> = MaybeApplyOverrides<InferredHydratedDocFromSchema<TSchema, TOptions>, TSchema, 'hydrated', EffectiveTypeKey<TOptions>> extends infer Doc ? HasHydratedCorrection<TSchema, EffectiveTypeKey<TOptions>> extends true ? CorrectHydratedSubdocumentIds<Doc, TSchema, EffectiveTypeKey<TOptions>> : Doc : never;
|
|
272
|
+
type HasDisabledTopLevelId<Definition, Options> = EffectiveSchemaOptions<Options> extends {
|
|
273
|
+
_id: false;
|
|
274
|
+
} ? '_id' extends keyof Definition ? false : true : false;
|
|
275
|
+
/** An optional undefined marker stops Mongoose's lean helpers reintroducing an ObjectId. */
|
|
276
|
+
type CorrectTopLevelRawId<Doc, Definition, Options> = HasDisabledTopLevelId<Definition, Options> extends true ? Doc & {
|
|
277
|
+
_id?: undefined;
|
|
278
|
+
} : Doc;
|
|
279
|
+
type CorrectTopLevelHydratedId<Doc, Definition, Options, Virtuals = object> = HasDisabledTopLevelId<Definition, Options> extends true ? Omit<Doc, '_id' | ('id' extends keyof Definition | keyof Virtuals ? never : 'id')> & {
|
|
280
|
+
_id?: undefined;
|
|
281
|
+
} : Doc;
|
|
197
282
|
/** Raw schema inference with per-field overrides and runtime-shape corrections. */
|
|
198
283
|
type OverriddenRawDoc<T extends typeof BaseModel> = OverriddenRawDocFromSchema<ExtractProperty<T, 'modelSchema'>, ExtractProperty<T, 'schemaOptions'>>;
|
|
199
284
|
type OverriddenHydratedDoc<T extends typeof BaseModel> = OverriddenHydratedDocFromSchema<ExtractProperty<T, 'modelSchema'>, ExtractProperty<T, 'schemaOptions'>>;
|
|
200
|
-
type HydratedDocumentFromClass<T extends typeof BaseModel> = HydratedDocument<OverriddenHydratedDoc<T>, VirtualType<ExtractProperty<T, 'modelVirtuals'>> & DocFacingMethods<ExtractProperty<T, 'modelInstanceMethods'
|
|
201
|
-
id: string;
|
|
202
|
-
}, object, VirtualType<ExtractProperty<T, 'modelVirtuals'>>, OverriddenRawDoc<T>, EffectiveSchemaOptions<ExtractProperty<T, 'schemaOptions'>>>;
|
|
285
|
+
type HydratedDocumentFromClass<T extends typeof BaseModel> = CorrectTopLevelHydratedId<HydratedDocument<OverriddenHydratedDoc<T>, VirtualType<ExtractProperty<T, 'modelVirtuals'>> & DocFacingMethods<ExtractProperty<T, 'modelInstanceMethods'>>, object, VirtualType<ExtractProperty<T, 'modelVirtuals'>>, OverriddenRawDoc<T>, EffectiveSchemaOptions<ExtractProperty<T, 'schemaOptions'>>>, ExtractProperty<T, 'modelSchema'>, ExtractProperty<T, 'schemaOptions'>, ExtractProperty<T, 'modelVirtuals'>>;
|
|
203
286
|
export type GetModelSchemaTypeFromClass<T extends typeof BaseModel> = Schema<OverriddenRawDoc<T>, // TRawDocType
|
|
204
287
|
Model<OverriddenRawDoc<T>, object, // TQueryHelpers
|
|
205
288
|
ExtractProperty<T, 'modelInstanceMethods'>, // TInstanceMethods
|
|
@@ -210,10 +293,29 @@ object, // TQueryHelpers
|
|
|
210
293
|
ExtractProperty<T, 'modelVirtuals'>, // TVirtuals
|
|
211
294
|
ExtractProperty<T, 'modelStatics'>, // TStaticMethods
|
|
212
295
|
ExtractProperty<T, 'schemaOptions'>>;
|
|
213
|
-
|
|
296
|
+
/**
|
|
297
|
+
* Project each declared virtual onto the value the document exposes for it: a
|
|
298
|
+
* getter's return type whatever arguments Mongoose passes it, otherwise the
|
|
299
|
+
* setter's input type plus `undefined` when there is no getter, and
|
|
300
|
+
* `unknown` for a virtual with neither — a populate virtual's shape is not
|
|
301
|
+
* knowable from the schema, so reading it must force a narrowing.
|
|
302
|
+
*/
|
|
303
|
+
type VirtualValue<V> = V extends {
|
|
304
|
+
get: (...args: never[]) => infer R;
|
|
305
|
+
} ? R : V extends {
|
|
306
|
+
set: (value: infer S, ...rest: never[]) => unknown;
|
|
307
|
+
} ? S | undefined : unknown;
|
|
308
|
+
type SetterVirtualKeys<T> = {
|
|
214
309
|
[P in keyof T]: T[P] extends {
|
|
215
|
-
|
|
216
|
-
} ?
|
|
310
|
+
set: (...args: never[]) => unknown;
|
|
311
|
+
} ? P : never;
|
|
312
|
+
}[keyof T];
|
|
313
|
+
export type VirtualType<T> = [SetterVirtualKeys<T>] extends [never] ? {
|
|
314
|
+
[P in keyof T]: VirtualValue<T[P]>;
|
|
315
|
+
} : {
|
|
316
|
+
[P in keyof T as P extends SetterVirtualKeys<T> ? never : P]: VirtualValue<T[P]>;
|
|
317
|
+
} & {
|
|
318
|
+
-readonly [P in keyof T as P extends SetterVirtualKeys<T> ? P : never]: VirtualValue<T[P]>;
|
|
217
319
|
};
|
|
218
320
|
/**
|
|
219
321
|
* Caller-facing view of instance methods: drop the authored `this` constraint
|
|
@@ -266,7 +368,7 @@ export type GetModelTypeLiteFromSchema<T extends typeof BaseModel.modelSchema, T
|
|
|
266
368
|
object, // TQueryHelpers
|
|
267
369
|
object, // TInstanceMethods (unfinished in this authoring context)
|
|
268
370
|
object, // TVirtuals (unfinished in this authoring context)
|
|
269
|
-
HydratedDocument<OverriddenHydratedDocFromSchema<T, TOptions>, object, object, object, OverriddenRawDocFromSchema<T, TOptions>, EffectiveSchemaOptions<TOptions>>, Schema<OverriddenRawDocFromSchema<T, TOptions>, UnfinishedSchemaMember, // TModelType: the owning class is unfinished here
|
|
371
|
+
CorrectTopLevelHydratedId<HydratedDocument<OverriddenHydratedDocFromSchema<T, TOptions>, object, object, object, OverriddenRawDocFromSchema<T, TOptions>, EffectiveSchemaOptions<TOptions>>, T, TOptions>, Schema<OverriddenRawDocFromSchema<T, TOptions>, UnfinishedSchemaMember, // TModelType: the owning class is unfinished here
|
|
270
372
|
UnfinishedSchemaMember, // TInstanceMethods: keep complete models assignable
|
|
271
373
|
UnfinishedSchemaMember, // TQueryHelpers
|
|
272
374
|
UnfinishedSchemaMember, // TVirtuals
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BaseModel.js","sourceRoot":"","sources":["../../src/modules/BaseModel.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"BaseModel.js","sourceRoot":"","sources":["../../src/modules/BaseModel.ts"],"names":[],"mappings":"AAOA,OAAO,QAAQ,EAAE,EAAc,MAAM,UAAU,CAAC;AAu4BhD,MAAM,CAAC,MAAM,cAAc,GAAG,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAW,CAAC;AAG7E,gFAAgF;AAChF,MAAM,OAAO,SAAS;IACpB,MAAM,KAAK,WAAW;QACpB,OAAO,EAAW,CAAC;IACrB,CAAC;IAED,MAAM,KAAK,aAAa;QACtB,OAAO,EAAW,CAAC;IACrB,CAAC;IAED,MAAM,KAAK,oBAAoB;QAC7B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,KAAK,aAAa;QACtB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,KAAK,YAAY;QACrB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,OAAe;QAC9B,iBAAiB;IACnB,CAAC;IAED,wDAAwD;IACjD,MAAM,CAAC,UAAU;QACtB,MAAM,MAAM,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE;YACnD,GAAG,cAAc;YACjB,GAAI,IAAI,CAAC,aAA+B;YACxC,OAAO,EAAE,IAAI,CAAC,oBAAoB;YAClC,OAAO,EAAE,IAAI,CAAC,YAAY;YAC1B,QAAQ,EAAE,IAAI,CAAC,aAAa;SAC7B,CAAmC,CAAC;QAErC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAEvB,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAClC,IAAI,CAAC,IAAI,EACT,MAAM,CACqB,CAAC;QAE9B,OAAO,aAAa,CAAC;IACvB,CAAC;CACF;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,wBAAwB,CAAC,SAAkB;IACzD,IAAI,OAAO,SAAS,KAAK,UAAU,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,IAAI,GAAG,SAA4D,CAAC;IAC1E,IAAI,OAAO,IAAI,CAAC,UAAU,KAAK,UAAU,EAAE,CAAC;QAC1C,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,+DAA+D;QAC/D,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
|