tering-serieuze-types 2.7.2 → 2.9.0

package/dist/index.js

@@ -34,6 +34,7 @@ __export(src_exports, {
   BigBrotherItem: () => BigBrotherItem,
   Button: () => Button,
   City: () => City,
+  CustomApplicationProperties: () => CustomApplicationProperties,
   DeletePodDto: () => DeletePodDto,
   EmulateFireDepartmentDto: () => EmulateFireDepartmentDto,
   Jingle: () => Jingle,
@@ -63,6 +64,8 @@ module.exports = __toCommonJS(src_exports);
 var import_swagger = require("@nestjs/swagger");
 var import_class_validator = require("class-validator");
 var import_class_transformer = require("class-transformer");
+var CustomApplicationProperties = class {
+};
 var Application = class {
   name;
   icon;
@@ -122,8 +125,9 @@ __decorateClass([
   (0, import_class_validator.IsNumber)()
 ], Application.prototype, "y", 2);
 __decorateClass([
-  (0, import_swagger.ApiProperty)({ type: Object }),
-  (0, import_class_validator.IsOptional)()
+  (0, import_swagger.ApiProperty)({ type: CustomApplicationProperties }),
+  (0, import_class_validator.IsOptional)(),
+  (0, import_class_transformer.Type)(() => CustomApplicationProperties)
 ], Application.prototype, "custom", 2);
 var WindowStateApplication = class extends (0, import_swagger.OmitType)(Application, ["icon", "isAdminOnly"]) {
 };
@@ -160,11 +164,13 @@ var import_swagger5 = require("@nestjs/swagger");
 
 // src/user.ts
 var import_swagger4 = require("@nestjs/swagger");
-var import_class_transformer2 = require("class-transformer");
-var import_class_validator2 = require("class-validator");
+var import_class_transformer3 = require("class-transformer");
+var import_class_validator3 = require("class-validator");
 
 // src/session.ts
 var import_swagger3 = require("@nestjs/swagger");
+var import_class_transformer2 = require("class-transformer");
+var import_class_validator2 = require("class-validator");
 var TokenType = /* @__PURE__ */ ((TokenType2) => {
   TokenType2[TokenType2["Refresh"] = 0] = "Refresh";
   TokenType2[TokenType2["Access"] = 1] = "Access";
@@ -238,7 +244,9 @@ __decorateClass([
     type: Date,
     example: "2021-01-01T00:00:00.000Z",
     description: "Timestamp of the last time the session was used"
-  })
+  }),
+  (0, import_class_validator2.IsDate)(),
+  (0, import_class_transformer2.Type)(() => Date)
 ], Session.prototype, "lastUsed", 2);
 __decorateClass([
   (0, import_swagger3.ApiProperty)({ type: String, example: "Chrome on Windows", description: "Name of the session" })
@@ -262,14 +270,14 @@ var User = class {
   apiTokens;
 };
 __decorateClass([
-  (0, import_class_validator2.IsNumberString)(),
+  (0, import_class_validator3.IsNumberString)(),
   (0, import_swagger4.ApiProperty)({ type: Number })
 ], User.prototype, "id", 2);
 __decorateClass([
   (0, import_swagger4.ApiProperty)({ type: Number, nullable: true, default: null })
 ], User.prototype, "_id", 2);
 __decorateClass([
-  (0, import_class_validator2.IsEmail)(),
+  (0, import_class_validator3.IsEmail)(),
   (0, import_swagger4.ApiProperty)({ type: String })
 ], User.prototype, "email", 2);
 __decorateClass([
@@ -290,8 +298,8 @@ __decorateClass([
 ], User.prototype, "isRegistering", 2);
 __decorateClass([
   (0, import_swagger4.ApiProperty)({ type: WindowState }),
-  (0, import_class_validator2.ValidateNested)(),
-  (0, import_class_transformer2.Type)(() => WindowState)
+  (0, import_class_validator3.ValidateNested)(),
+  (0, import_class_transformer3.Type)(() => WindowState)
 ], User.prototype, "windowState", 2);
 __decorateClass([
   (0, import_swagger4.ApiProperty)({ type: () => [Button] })
@@ -300,7 +308,9 @@ __decorateClass([
   (0, import_swagger4.ApiProperty)({ type: String, default: "" })
 ], User.prototype, "lastSeenChangelogId", 2);
 __decorateClass([
-  (0, import_swagger4.ApiProperty)({ type: () => [Session] })
+  (0, import_swagger4.ApiProperty)({ type: () => [Session] }),
+  (0, import_class_validator3.ValidateNested)({ each: true }),
+  (0, import_class_transformer3.Type)(() => Session)
 ], User.prototype, "sessions", 2);
 __decorateClass([
   (0, import_swagger4.ApiProperty)({ type: () => [ApiToken] })
@@ -321,7 +331,7 @@ var AddUserDto = class {
   email;
 };
 __decorateClass([
-  (0, import_class_validator2.IsEmail)(),
+  (0, import_class_validator3.IsEmail)(),
   (0, import_swagger4.ApiProperty)({ type: String, example: "info@example.com" })
 ], AddUserDto.prototype, "email", 2);
 var RemoveUserDto = class extends (0, import_swagger4.PickType)(User, ["id"]) {
@@ -399,7 +409,7 @@ __decorateClass([
 ], Button.prototype, "ButtonHold", 2);
 
 // src/emulator.ts
-var import_class_validator3 = require("class-validator");
+var import_class_validator4 = require("class-validator");
 var import_swagger6 = require("@nestjs/swagger");
 var City = /* @__PURE__ */ ((City2) => {
   City2["Waalwijk"] = "Waalwijk";
@@ -411,13 +421,13 @@ var EmulateFireDepartmentDto = class {
 };
 __decorateClass([
   (0, import_swagger6.ApiProperty)({ enum: City }),
-  (0, import_class_validator3.IsEnum)(City)
+  (0, import_class_validator4.IsEnum)(City)
 ], EmulateFireDepartmentDto.prototype, "city", 2);
 
 // src/jingle.ts
 var import_swagger7 = require("@nestjs/swagger");
-var import_class_validator4 = require("class-validator");
-var import_class_transformer3 = require("class-transformer");
+var import_class_validator5 = require("class-validator");
+var import_class_transformer4 = require("class-transformer");
 var Jingle = class {
   folder;
   file;
@@ -427,13 +437,13 @@ var Jingle = class {
 };
 __decorateClass([
   (0, import_swagger7.ApiProperty)({ type: String, example: "internet-gekkies" }),
-  (0, import_class_validator4.IsString)(),
-  (0, import_class_validator4.IsNotEmpty)()
+  (0, import_class_validator5.IsString)(),
+  (0, import_class_validator5.IsNotEmpty)()
 ], Jingle.prototype, "folder", 2);
 __decorateClass([
   (0, import_swagger7.ApiProperty)({ type: String, example: "mand.mp3" }),
-  (0, import_class_validator4.IsString)(),
-  (0, import_class_validator4.IsNotEmpty)()
+  (0, import_class_validator5.IsString)(),
+  (0, import_class_validator5.IsNotEmpty)()
 ], Jingle.prototype, "file", 2);
 __decorateClass([
   (0, import_swagger7.ApiProperty)({ type: [String], examples: ["internet", "gekkies", "mand"] })
@@ -450,13 +460,13 @@ var JingleFolder = class {
 };
 __decorateClass([
   (0, import_swagger7.ApiProperty)({ type: String, example: "internet-gekkies" }),
-  (0, import_class_validator4.IsString)(),
-  (0, import_class_validator4.IsNotEmpty)()
+  (0, import_class_validator5.IsString)(),
+  (0, import_class_validator5.IsNotEmpty)()
 ], JingleFolder.prototype, "folder", 2);
 __decorateClass([
   (0, import_swagger7.ApiProperty)({ type: [Jingle] }),
-  (0, import_class_validator4.ValidateNested)({ each: true }),
-  (0, import_class_transformer3.Type)(() => Jingle)
+  (0, import_class_validator5.ValidateNested)({ each: true }),
+  (0, import_class_transformer4.Type)(() => Jingle)
 ], JingleFolder.prototype, "jingles", 2);
 var PlayJingleDto = class extends (0, import_swagger7.PickType)(Jingle, ["folder", "file"]) {
 };
@@ -527,6 +537,7 @@ var P2000Payload = class {
   BigBrotherItem,
   Button,
   City,
+  CustomApplicationProperties,
   DeletePodDto,
   EmulateFireDepartmentDto,
   Jingle,

package/interfaces/token.ts

@@ -1,7 +1,8 @@
 import { TokenType } from '../src';
 
 export interface TokenContent {
-    email: string;
+    email?: string;
+    userId?: number;
     type: TokenType;
     iat: number;
     exp: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tering-serieuze-types",
-  "version": "2.7.2",
+  "version": "2.9.0",
   "description": "Tering serieuze types",
   "author": "Frank",
   "repository": {

package/src/application.ts

@@ -2,6 +2,11 @@ import { ApiProperty, OmitType } from '@nestjs/swagger';
 import { IsBoolean, IsNotEmpty, IsNumber, IsOptional, IsString, ValidateNested } from 'class-validator';
 import { Type } from 'class-transformer';
 
+export class CustomApplicationProperties {
+    // eslint-disable-next-line no-undef
+    [key: string]: string | number | boolean | string[] | number[] | boolean[] | (number | string)[];
+}
+
 export class Application {
     @ApiProperty({ type: String })
     @IsNotEmpty()
@@ -47,9 +52,10 @@ export class Application {
     @IsNumber()
     y: number;
 
-    @ApiProperty({ type: Object })
+    @ApiProperty({ type: CustomApplicationProperties })
     @IsOptional()
-    custom: any;
+    @Type(() => CustomApplicationProperties)
+    custom: CustomApplicationProperties;
 }
 
 export class WindowStateApplication extends OmitType(Application, ['icon', 'isAdminOnly']) {}

package/src/session.ts

@@ -1,4 +1,6 @@
 import { ApiProperty } from '@nestjs/swagger';
+import { Type } from 'class-transformer';
+import { IsDate } from 'class-validator';
 import { User } from './user';
 
 export enum TokenType {
@@ -63,6 +65,8 @@ export class Session {
         example: '2021-01-01T00:00:00.000Z',
         description: 'Timestamp of the last time the session was used',
     })
+    @IsDate()
+    @Type(() => Date)
     lastUsed: Date;
 
     @ApiProperty({ type: String, example: 'Chrome on Windows', description: 'Name of the session' })

package/src/user.ts

@@ -49,6 +49,8 @@ export class User {
     authenticators: DbAuthenticator[];
 
     @ApiProperty({ type: () => [Session] })
+    @ValidateNested({ each: true })
+    @Type(() => Session)
     sessions: Session[];
 
     @ApiProperty({ type: () => [ApiToken] })