tering-serieuze-types 2.5.0 → 2.6.1

package/dist/index.js

@@ -20,8 +20,7 @@ var __decorateClass = (decorators, target, key, kind) => {
   for (var i = decorators.length - 1, decorator; i >= 0; i--)
     if (decorator = decorators[i])
       result = (kind ? decorator(target, key, result) : decorator(result)) || result;
-  if (kind && result)
-    __defProp(target, key, result);
+  if (kind && result) __defProp(target, key, result);
   return result;
 };
 
@@ -62,6 +61,8 @@ module.exports = __toCommonJS(src_exports);
 
 // src/application.ts
 var import_swagger = require("@nestjs/swagger");
+var import_class_validator = require("class-validator");
+var import_class_transformer = require("class-transformer");
 var Application = class {
   name;
   icon;
@@ -77,40 +78,52 @@ var Application = class {
   custom;
 };
 __decorateClass([
-  (0, import_swagger.ApiProperty)({ type: String })
+  (0, import_swagger.ApiProperty)({ type: String }),
+  (0, import_class_validator.IsNotEmpty)()
 ], Application.prototype, "name", 2);
 __decorateClass([
-  (0, import_swagger.ApiProperty)({ type: String })
+  (0, import_swagger.ApiProperty)({ type: String }),
+  (0, import_class_validator.IsNotEmpty)()
 ], Application.prototype, "icon", 2);
 __decorateClass([
-  (0, import_swagger.ApiProperty)({ type: Boolean })
+  (0, import_swagger.ApiProperty)({ type: Boolean }),
+  (0, import_class_validator.IsBoolean)()
 ], Application.prototype, "isOpened", 2);
 __decorateClass([
-  (0, import_swagger.ApiProperty)({ type: Boolean })
+  (0, import_swagger.ApiProperty)({ type: Boolean }),
+  (0, import_class_validator.IsBoolean)()
 ], Application.prototype, "isMinimized", 2);
 __decorateClass([
-  (0, import_swagger.ApiProperty)({ type: Boolean })
+  (0, import_swagger.ApiProperty)({ type: Boolean }),
+  (0, import_class_validator.IsBoolean)()
 ], Application.prototype, "isMaximized", 2);
 __decorateClass([
-  (0, import_swagger.ApiProperty)({ type: Boolean })
+  (0, import_swagger.ApiProperty)({ type: Boolean }),
+  (0, import_class_validator.IsBoolean)()
 ], Application.prototype, "isAdminOnly", 2);
 __decorateClass([
-  (0, import_swagger.ApiProperty)({ type: Boolean })
+  (0, import_swagger.ApiProperty)({ type: Boolean }),
+  (0, import_class_validator.IsBoolean)()
 ], Application.prototype, "isDevOnly", 2);
 __decorateClass([
-  (0, import_swagger.ApiProperty)({ type: Number })
+  (0, import_swagger.ApiProperty)({ type: Number }),
+  (0, import_class_validator.IsNumber)()
 ], Application.prototype, "width", 2);
 __decorateClass([
-  (0, import_swagger.ApiProperty)({ type: Number })
+  (0, import_swagger.ApiProperty)({ type: Number }),
+  (0, import_class_validator.IsNumber)()
 ], Application.prototype, "height", 2);
 __decorateClass([
-  (0, import_swagger.ApiProperty)({ type: Number })
+  (0, import_swagger.ApiProperty)({ type: Number }),
+  (0, import_class_validator.IsNumber)()
 ], Application.prototype, "x", 2);
 __decorateClass([
-  (0, import_swagger.ApiProperty)({ type: Number })
+  (0, import_swagger.ApiProperty)({ type: Number }),
+  (0, import_class_validator.IsNumber)()
 ], Application.prototype, "y", 2);
 __decorateClass([
-  (0, import_swagger.ApiProperty)({ type: Object })
+  (0, import_swagger.ApiProperty)({ type: Object }),
+  (0, import_class_validator.IsOptional)()
 ], Application.prototype, "custom", 2);
 var WindowStateApplication = class extends (0, import_swagger.OmitType)(Application, ["icon", "isAdminOnly"]) {
 };
@@ -119,10 +132,13 @@ var WindowState = class {
   activeApplication;
 };
 __decorateClass([
-  (0, import_swagger.ApiProperty)({ type: [WindowStateApplication] })
+  (0, import_swagger.ApiProperty)({ type: [WindowStateApplication] }),
+  (0, import_class_validator.ValidateNested)({ each: true }),
+  (0, import_class_transformer.Type)(() => WindowStateApplication)
 ], WindowState.prototype, "applications", 2);
 __decorateClass([
-  (0, import_swagger.ApiProperty)({ type: String })
+  (0, import_swagger.ApiProperty)({ type: String }),
+  (0, import_class_validator.IsString)()
 ], WindowState.prototype, "activeApplication", 2);
 
 // src/authenticator.ts
@@ -144,7 +160,8 @@ var import_swagger5 = require("@nestjs/swagger");
 
 // src/user.ts
 var import_swagger4 = require("@nestjs/swagger");
-var import_class_validator = require("class-validator");
+var import_class_transformer2 = require("class-transformer");
+var import_class_validator2 = require("class-validator");
 
 // src/session.ts
 var import_swagger3 = require("@nestjs/swagger");
@@ -245,13 +262,14 @@ var User = class {
   apiTokens;
 };
 __decorateClass([
+  (0, import_class_validator2.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_validator.IsEmail)(),
+  (0, import_class_validator2.IsEmail)(),
   (0, import_swagger4.ApiProperty)({ type: String })
 ], User.prototype, "email", 2);
 __decorateClass([
@@ -271,7 +289,9 @@ __decorateClass([
   (0, import_swagger4.ApiProperty)()
 ], User.prototype, "isRegistering", 2);
 __decorateClass([
-  (0, import_swagger4.ApiProperty)({ type: WindowState })
+  (0, import_swagger4.ApiProperty)({ type: WindowState }),
+  (0, import_class_validator2.ValidateNested)(),
+  (0, import_class_transformer2.Type)(() => WindowState)
 ], User.prototype, "windowState", 2);
 __decorateClass([
   (0, import_swagger4.ApiProperty)({ type: () => [Button] })
@@ -301,7 +321,7 @@ var AddUserDto = class {
   email;
 };
 __decorateClass([
-  (0, import_class_validator.IsEmail)(),
+  (0, import_class_validator2.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"]) {
@@ -379,7 +399,7 @@ __decorateClass([
 ], Button.prototype, "ButtonHold", 2);
 
 // src/emulator.ts
-var import_class_validator2 = require("class-validator");
+var import_class_validator3 = require("class-validator");
 var import_swagger6 = require("@nestjs/swagger");
 var City = /* @__PURE__ */ ((City2) => {
   City2["Waalwijk"] = "Waalwijk";
@@ -391,11 +411,13 @@ var EmulateFireDepartmentDto = class {
 };
 __decorateClass([
   (0, import_swagger6.ApiProperty)({ enum: City }),
-  (0, import_class_validator2.IsEnum)(City)
+  (0, import_class_validator3.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 Jingle = class {
   folder;
   file;
@@ -404,10 +426,14 @@ var Jingle = class {
   mtime;
 };
 __decorateClass([
-  (0, import_swagger7.ApiProperty)({ type: String, example: "internet-gekkies" })
+  (0, import_swagger7.ApiProperty)({ type: String, example: "internet-gekkies" }),
+  (0, import_class_validator4.IsString)(),
+  (0, import_class_validator4.IsNotEmpty)()
 ], Jingle.prototype, "folder", 2);
 __decorateClass([
-  (0, import_swagger7.ApiProperty)({ type: String, example: "mand.mp3" })
+  (0, import_swagger7.ApiProperty)({ type: String, example: "mand.mp3" }),
+  (0, import_class_validator4.IsString)(),
+  (0, import_class_validator4.IsNotEmpty)()
 ], Jingle.prototype, "file", 2);
 __decorateClass([
   (0, import_swagger7.ApiProperty)({ type: [String], examples: ["internet", "gekkies", "mand"] })
@@ -423,10 +449,14 @@ var JingleFolder = class {
   jingles;
 };
 __decorateClass([
-  (0, import_swagger7.ApiProperty)({ type: String, example: "internet-gekkies" })
+  (0, import_swagger7.ApiProperty)({ type: String, example: "internet-gekkies" }),
+  (0, import_class_validator4.IsString)(),
+  (0, import_class_validator4.IsNotEmpty)()
 ], JingleFolder.prototype, "folder", 2);
 __decorateClass([
-  (0, import_swagger7.ApiProperty)({ type: [Jingle] })
+  (0, import_swagger7.ApiProperty)({ type: [Jingle] }),
+  (0, import_class_validator4.ValidateNested)({ each: true }),
+  (0, import_class_transformer3.Type)(() => Jingle)
 ], JingleFolder.prototype, "jingles", 2);
 var PlayJingleDto = class extends (0, import_swagger7.PickType)(Jingle, ["folder", "file"]) {
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tering-serieuze-types",
-  "version": "2.5.0",
+  "version": "2.6.1",
   "description": "Tering serieuze types",
   "author": "Frank",
   "repository": {
@@ -19,7 +19,7 @@
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^7.7.0",
     "@typescript-eslint/parser": "^7.7.0",
-    "esbuild": "^0.16.10",
+    "esbuild": "^0.23.1",
     "eslint": "^8.57.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^9.1.0",
@@ -29,6 +29,7 @@
   "dependencies": {
     "@nestjs/swagger": "^7.1.16",
     "@simplewebauthn/typescript-types": "^7.4.0",
-    "class-validator": "^0.13.2"
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.1"
   }
 }

package/src/application.ts

@@ -1,40 +1,54 @@
 import { ApiProperty, OmitType } from '@nestjs/swagger';
+import { IsBoolean, IsNotEmpty, IsNumber, IsOptional, IsString, ValidateNested } from 'class-validator';
+import { Type } from 'class-transformer';
 
 export class Application {
     @ApiProperty({ type: String })
+    @IsNotEmpty()
     name: string;
 
     @ApiProperty({ type: String })
+    @IsNotEmpty()
     icon: string;
 
     @ApiProperty({ type: Boolean })
+    @IsBoolean()
     isOpened: boolean;
 
     @ApiProperty({ type: Boolean })
+    @IsBoolean()
     isMinimized: boolean;
 
     @ApiProperty({ type: Boolean })
+    @IsBoolean()
     isMaximized: boolean;
 
     @ApiProperty({ type: Boolean })
+    @IsBoolean()
     isAdminOnly: boolean;
 
     @ApiProperty({ type: Boolean })
+    @IsBoolean()
     isDevOnly: boolean;
 
     @ApiProperty({ type: Number })
+    @IsNumber()
     width: number;
 
     @ApiProperty({ type: Number })
+    @IsNumber()
     height: number;
 
     @ApiProperty({ type: Number })
+    @IsNumber()
     x: number;
 
     @ApiProperty({ type: Number })
+    @IsNumber()
     y: number;
 
     @ApiProperty({ type: Object })
+    @IsOptional()
     custom: any;
 }
 
@@ -42,8 +56,11 @@ export class WindowStateApplication extends OmitType(Application, ['icon', 'isAd
 
 export class WindowState {
     @ApiProperty({ type: [WindowStateApplication] })
+    @ValidateNested({ each: true })
+    @Type(() => WindowStateApplication)
     applications: WindowStateApplication[];
 
     @ApiProperty({ type: String })
+    @IsString()
     activeApplication: string;
 }

package/src/jingle.ts

@@ -1,10 +1,16 @@
 import { ApiProperty, PickType } from '@nestjs/swagger';
+import { IsNotEmpty, IsString, ValidateNested } from 'class-validator';
+import { Type } from 'class-transformer';
 
 export class Jingle {
     @ApiProperty({ type: String, example: 'internet-gekkies' })
+    @IsString()
+    @IsNotEmpty()
     folder: string;
 
     @ApiProperty({ type: String, example: 'mand.mp3' })
+    @IsString()
+    @IsNotEmpty()
     file: string;
 
     @ApiProperty({ type: [String], examples: ['internet', 'gekkies', 'mand'] })
@@ -19,9 +25,13 @@ export class Jingle {
 
 export class JingleFolder {
     @ApiProperty({ type: String, example: 'internet-gekkies' })
+    @IsString()
+    @IsNotEmpty()
     folder: string;
 
     @ApiProperty({ type: [Jingle] })
+    @ValidateNested({ each: true })
+    @Type(() => Jingle)
     jingles: Jingle[];
 }
 

package/src/user.ts

@@ -1,11 +1,13 @@
 import { ApiProperty, PickType } from '@nestjs/swagger';
-import { IsEmail } from 'class-validator';
+import { Type } from 'class-transformer';
+import { IsEmail, IsNumberString, ValidateNested } from 'class-validator';
 import { Button } from './button';
 import { WindowState } from './application';
 import { type DbAuthenticator } from './authenticator';
 import { ApiToken, Session } from './session';
 
 export class User {
+    @IsNumberString()
     @ApiProperty({ type: Number })
     id: number;
 
@@ -34,6 +36,8 @@ export class User {
     isRegistering: Date | null;
 
     @ApiProperty({ type: WindowState })
+    @ValidateNested()
+    @Type(() => WindowState)
     windowState: WindowState;
 
     @ApiProperty({ type: () => [Button] })

package/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "target": "esnext",
     "moduleResolution": "NodeNext"