apeframework 0.0.0-dev.3 → 0.0.0-dev.4

package/logger/adapters/file/FileLogger.d.ts

@@ -1,11 +1,11 @@
-import { Severity } from '../../Severity';
-import type { Logger } from '../../Logger';
-declare class FileLogger implements Logger {
+import { Level } from '../../Level';
+import { Logger } from '../../Logger';
+declare class FileLogger extends Logger {
     private readonly logger;
     private readonly context;
     constructor(params: {
         path: string;
-        severity?: Severity;
+        level?: Level;
         context?: object;
     });
     trace(message: string, data?: unknown): void;
@@ -15,6 +15,6 @@ declare class FileLogger implements Logger {
     error(message: string, data?: unknown): void;
     fatal(message: string, data?: unknown): void;
     close(): Promise<void>;
-    private getData;
+    private getPayload;
 }
 export { FileLogger, };

package/logger/adapters/file/FileLogger.js

@@ -5,49 +5,49 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FileLogger = void 0;
 const pino_1 = __importDefault(require("pino"));
-const Severity_1 = require("../../Severity");
+const Level_1 = require("../../Level");
+const Logger_1 = require("../../Logger");
 const initFile_1 = require("./initFile");
-class FileLogger {
+class FileLogger extends Logger_1.Logger {
     logger;
     context;
     constructor(params) {
+        super();
         (0, initFile_1.initFile)(params.path);
         const stream = pino_1.default.destination(params.path);
         this.logger = (0, pino_1.default)({
-            enabled: params.severity !== Severity_1.Severity.OFF,
-            level: params.severity ?? Severity_1.Severity.INFO,
+            enabled: params.level !== Level_1.Level.OFF,
+            level: params.level ?? Level_1.Level.INFO,
             messageKey: 'message',
             formatters: {
                 level(label, number) {
                     return {
-                        level: number,
-                        severity: label,
+                        level: label,
+                        severity: number,
                     };
                 },
-                bindings: () => {
-                    return {};
-                },
+                bindings: () => { return {}; },
             },
         }, stream);
         this.context = params.context;
     }
     trace(message, data) {
-        this.logger.trace(this.getData(message, data));
+        this.logger.trace(this.getPayload(message, data));
     }
     debug(message, data) {
-        this.logger.debug(this.getData(message, data));
+        this.logger.debug(this.getPayload(message, data));
     }
     info(message, data) {
-        this.logger.info(this.getData(message, data));
+        this.logger.info(this.getPayload(message, data));
     }
     warn(message, data) {
-        this.logger.warn(this.getData(message, data));
+        this.logger.warn(this.getPayload(message, data));
     }
     error(message, data) {
-        this.logger.error(this.getData(message, data));
+        this.logger.error(this.getPayload(message, data));
     }
     fatal(message, data) {
-        this.logger.fatal(this.getData(message, data));
+        this.logger.fatal(this.getPayload(message, data));
     }
     async close() {
         return new Promise((resolve, reject) => {
@@ -59,11 +59,11 @@ class FileLogger {
             });
         });
     }
-    getData(message, data) {
+    getPayload(message, data) {
         return {
+            ...this.context,
             message,
             data,
-            ...this.context,
         };
     }
 }

package/logger/adapters/file/FileLogger.ts

@@ -1,37 +1,37 @@
 import pino from 'pino'
-import { Severity } from '../../Severity'
+import { Level } from '../../Level'
+import { Logger } from '../../Logger'
 import { initFile } from './initFile'
-import type { Logger } from '../../Logger'
 import type { Logger as PinoLogger } from 'pino'
 
-class FileLogger implements Logger {
+class FileLogger extends Logger {
   private readonly logger: PinoLogger
 
   private readonly context: object | undefined
 
   public constructor(params: {
     path: string,
-    severity?: Severity,
+    level?: Level,
     context?: object,
   }) {
+    super()
+
     initFile(params.path)
 
     const stream = pino.destination(params.path)
 
     this.logger = pino({
-      enabled: params.severity !== Severity.OFF,
-      level: params.severity ?? Severity.INFO,
+      enabled: params.level !== Level.OFF,
+      level: params.level ?? Level.INFO,
       messageKey: 'message',
       formatters: {
         level(label, number) {
           return {
-            level: number,
-            severity: label,
+            level: label,
+            severity: number,
           }
         },
-        bindings: () => {
-          return {}
-        },
+        bindings: () => { return {} },
       },
     }, stream)
 
@@ -39,27 +39,27 @@ class FileLogger implements Logger {
   }
 
   public trace(message: string, data?: unknown): void {
-    this.logger.trace(this.getData(message, data))
+    this.logger.trace(this.getPayload(message, data))
   }
 
   public debug(message: string, data?: unknown): void {
-    this.logger.debug(this.getData(message, data))
+    this.logger.debug(this.getPayload(message, data))
   }
 
   public info(message: string, data?: unknown): void {
-    this.logger.info(this.getData(message, data))
+    this.logger.info(this.getPayload(message, data))
   }
 
   public warn(message: string, data?: unknown): void {
-    this.logger.warn(this.getData(message, data))
+    this.logger.warn(this.getPayload(message, data))
   }
 
   public error(message: string, data?: unknown): void {
-    this.logger.error(this.getData(message, data))
+    this.logger.error(this.getPayload(message, data))
   }
 
   public fatal(message: string, data?: unknown): void {
-    this.logger.fatal(this.getData(message, data))
+    this.logger.fatal(this.getPayload(message, data))
   }
 
   public async close(): Promise<void> {
@@ -73,11 +73,11 @@ class FileLogger implements Logger {
     })
   }
 
-  private getData(message: string, data?: unknown): object {
+  private getPayload(message: string, data?: unknown): object {
     return {
+      ...this.context,
       message,
       data,
-      ...this.context,
     }
   }
 }

package/logger/adapters/noop/NoopLogger.d.ts

@@ -1,5 +1,5 @@
-import type { Logger } from '../../Logger';
-declare class NoopLogger implements Logger {
+import { Logger } from '../../Logger';
+declare class NoopLogger extends Logger {
     trace(): void;
     debug(): void;
     info(): void;

package/logger/adapters/noop/NoopLogger.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NoopLogger = void 0;
-class NoopLogger {
+const Logger_1 = require("../../Logger");
+class NoopLogger extends Logger_1.Logger {
     trace() { }
     debug() { }
     info() { }

package/logger/adapters/noop/NoopLogger.ts

@@ -1,6 +1,6 @@
-import type { Logger } from '../../Logger'
+import { Logger } from '../../Logger'
 
-class NoopLogger implements Logger {
+class NoopLogger extends Logger {
   public trace(): void { }
 
   public debug(): void { }

package/logger/adapters/stdio/StdioLogger.d.ts

@@ -1,11 +1,11 @@
-import { Severity } from '../../Severity';
-import type { Logger } from '../../Logger';
-declare class StdioLogger implements Logger {
+import { Level } from '../../Level';
+import { Logger } from '../../Logger';
+declare class StdioLogger extends Logger {
     private readonly logger;
     private readonly context;
     constructor(params?: {
         pretty?: boolean;
-        severity?: Severity;
+        level?: Level;
         context?: object;
     });
     trace(message: string, data?: unknown): void;
@@ -15,6 +15,6 @@ declare class StdioLogger implements Logger {
     error(message: string, data?: unknown): void;
     fatal(message: string, data?: unknown): void;
     close(): Promise<void>;
-    private getData;
+    private getPayload;
 }
 export { StdioLogger, };

package/logger/adapters/stdio/StdioLogger.js

@@ -6,49 +6,51 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StdioLogger = void 0;
 const pino_1 = __importDefault(require("pino"));
 const pino_pretty_1 = __importDefault(require("pino-pretty"));
-const Severity_1 = require("../../Severity");
-class StdioLogger {
+const Level_1 = require("../../Level");
+const Logger_1 = require("../../Logger");
+class StdioLogger extends Logger_1.Logger {
     logger;
     context;
     constructor(params) {
+        super();
         const stream = params?.pretty
             ? (0, pino_pretty_1.default)()
             : pino_1.default.destination(process.stdout.fd);
         this.logger = (0, pino_1.default)({
-            enabled: params?.severity !== Severity_1.Severity.OFF,
-            level: params?.severity ?? Severity_1.Severity.INFO,
+            enabled: params?.level !== Level_1.Level.OFF,
+            level: params?.level ?? Level_1.Level.INFO,
             messageKey: 'message',
             formatters: {
                 level(label, number) {
                     return {
-                        level: number,
-                        ...params?.pretty ? {} : { severity: label },
+                        level: label,
+                        ...params?.pretty
+                            ? {}
+                            : { severity: number },
                     };
                 },
-                bindings: () => {
-                    return {};
-                },
+                bindings: () => { return {}; },
             },
         }, stream);
         this.context = params?.context;
     }
     trace(message, data) {
-        this.logger.trace(this.getData(message, data));
+        this.logger.trace(this.getPayload(message, data));
     }
     debug(message, data) {
-        this.logger.debug(this.getData(message, data));
+        this.logger.debug(this.getPayload(message, data));
     }
     info(message, data) {
-        this.logger.info(this.getData(message, data));
+        this.logger.info(this.getPayload(message, data));
     }
     warn(message, data) {
-        this.logger.warn(this.getData(message, data));
+        this.logger.warn(this.getPayload(message, data));
     }
     error(message, data) {
-        this.logger.error(this.getData(message, data));
+        this.logger.error(this.getPayload(message, data));
     }
     fatal(message, data) {
-        this.logger.fatal(this.getData(message, data));
+        this.logger.fatal(this.getPayload(message, data));
     }
     async close() {
         return new Promise((resolve, reject) => {
@@ -60,11 +62,11 @@ class StdioLogger {
             });
         });
     }
-    getData(message, data) {
+    getPayload(message, data) {
         return {
+            ...this.context,
             message,
             data,
-            ...this.context,
         };
     }
 }

package/logger/adapters/stdio/StdioLogger.ts

@@ -1,37 +1,39 @@
 import pino from 'pino'
 import pretty from 'pino-pretty'
-import { Severity } from '../../Severity'
-import type { Logger } from '../../Logger'
+import { Level } from '../../Level'
+import { Logger } from '../../Logger'
 import type { Logger as PinoLogger } from 'pino'
 
-class StdioLogger implements Logger {
+class StdioLogger extends Logger {
   private readonly logger: PinoLogger
 
   private readonly context: object | undefined
 
   public constructor(params?: {
     pretty?: boolean,
-    severity?: Severity,
+    level?: Level,
     context?: object,
   }) {
+    super()
+
     const stream = params?.pretty
       ? pretty()
       : pino.destination(process.stdout.fd)
 
     this.logger = pino({
-      enabled: params?.severity !== Severity.OFF,
-      level: params?.severity ?? Severity.INFO,
+      enabled: params?.level !== Level.OFF,
+      level: params?.level ?? Level.INFO,
       messageKey: 'message',
       formatters: {
         level(label, number) {
           return {
-            level: number,
-            ...params?.pretty ? {} : { severity: label },
+            level: label,
+            ...params?.pretty
+              ? {}
+              : { severity: number },
           }
         },
-        bindings: () => {
-          return {}
-        },
+        bindings: () => { return {} },
       },
     }, stream)
 
@@ -39,27 +41,27 @@ class StdioLogger implements Logger {
   }
 
   public trace(message: string, data?: unknown): void {
-    this.logger.trace(this.getData(message, data))
+    this.logger.trace(this.getPayload(message, data))
   }
 
   public debug(message: string, data?: unknown): void {
-    this.logger.debug(this.getData(message, data))
+    this.logger.debug(this.getPayload(message, data))
   }
 
   public info(message: string, data?: unknown): void {
-    this.logger.info(this.getData(message, data))
+    this.logger.info(this.getPayload(message, data))
   }
 
   public warn(message: string, data?: unknown): void {
-    this.logger.warn(this.getData(message, data))
+    this.logger.warn(this.getPayload(message, data))
   }
 
   public error(message: string, data?: unknown): void {
-    this.logger.error(this.getData(message, data))
+    this.logger.error(this.getPayload(message, data))
   }
 
   public fatal(message: string, data?: unknown): void {
-    this.logger.fatal(this.getData(message, data))
+    this.logger.fatal(this.getPayload(message, data))
   }
 
   public async close(): Promise<void> {
@@ -73,11 +75,11 @@ class StdioLogger implements Logger {
     })
   }
 
-  private getData(message: string, data?: unknown): object {
+  private getPayload(message: string, data?: unknown): object {
     return {
+      ...this.context,
       message,
       data,
-      ...this.context,
     }
   }
 }

package/mailer/Event.d.ts

@@ -1,8 +1,8 @@
-import type { EventLocation } from './EventLocation';
-import type { EventMethod } from './EventMethod';
+import type { Location } from './Location';
+import type { Method } from './Method';
 interface Event {
     fileName?: string;
-    method: EventMethod;
+    method: Method;
     id?: string;
     start: Date;
     end: Date;
@@ -10,7 +10,7 @@ interface Event {
     name: string;
     description?: string;
     url?: string;
-    location?: EventLocation;
+    location?: Location;
     attachments?: string[];
 }
 export { type Event, };

package/mailer/Event.ts

@@ -1,9 +1,9 @@
-import type { EventLocation } from './EventLocation'
-import type { EventMethod } from './EventMethod'
+import type { Location } from './Location'
+import type { Method } from './Method'
 
 interface Event {
   fileName?: string,
-  method: EventMethod,
+  method: Method,
   id?: string,
   start: Date,
   end: Date,
@@ -11,7 +11,7 @@ interface Event {
   name: string,
   description?: string,
   url?: string,
-  location?: EventLocation,
+  location?: Location,
   attachments?: string[],
 }
 

package/mailer/{EventLocation.d.ts → Location.d.ts}

@@ -1,4 +1,4 @@
-interface EventLocation {
+interface Location {
     name: string;
     address?: string;
     geo?: {
@@ -6,4 +6,4 @@ interface EventLocation {
         longitude: number;
     };
 }
-export { type EventLocation, };
+export { type Location, };

package/mailer/Location.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/mailer/{EventLocation.ts → Location.ts}

@@ -1,4 +1,4 @@
-interface EventLocation {
+interface Location {
   name: string,
   address?: string,
   geo?: {
@@ -8,5 +8,5 @@ interface EventLocation {
 }
 
 export {
-  type EventLocation,
+  type Location,
 }

package/mailer/Mailer.d.ts

@@ -1,6 +1,7 @@
 import type { Mail } from './Mail';
-interface Mailer {
-    send: (mail: Mail) => Promise<string>;
-    close: () => Promise<void>;
+declare abstract class Mailer {
+    send(mail: Mail): Promise<string>;
+    abstract sendMail(mail: Mail): Promise<string>;
+    abstract close(): Promise<void>;
 }
-export { type Mailer, };
+export { Mailer, };

package/mailer/Mailer.js

@@ -1,2 +1,50 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Mailer = void 0;
+const validateAddressEmail_1 = require("./validateAddressEmail");
+const validateEventAttachmentUrl_1 = require("./validateEventAttachmentUrl");
+const validateEventGeolocation_1 = require("./validateEventGeolocation");
+const validateEventUrl_1 = require("./validateEventUrl");
+const validateListUrl_1 = require("./validateListUrl");
+class Mailer {
+    async send(mail) {
+        (0, validateAddressEmail_1.validateAddressEmail)(mail.from.email);
+        if (mail.sender) {
+            (0, validateAddressEmail_1.validateAddressEmail)(mail.sender.email);
+        }
+        if (mail.replyTo) {
+            (0, validateAddressEmail_1.validateAddressEmail)(mail.replyTo.email);
+        }
+        mail.to.forEach((address) => {
+            (0, validateAddressEmail_1.validateAddressEmail)(address.email);
+        });
+        if (mail.cc) {
+            mail.cc.forEach((address) => {
+                (0, validateAddressEmail_1.validateAddressEmail)(address.email);
+            });
+        }
+        if (mail.bcc) {
+            mail.bcc.forEach((address) => {
+                (0, validateAddressEmail_1.validateAddressEmail)(address.email);
+            });
+        }
+        if (mail.event?.url) {
+            (0, validateEventUrl_1.validateEventUrl)(mail.event.url);
+        }
+        if (mail.event?.location?.geo) {
+            (0, validateEventGeolocation_1.validateEventGeolocation)(mail.event.location.geo.latitude, mail.event.location.geo.longitude);
+        }
+        if (mail.event?.attachments) {
+            mail.event.attachments.forEach((attachment) => {
+                (0, validateEventAttachmentUrl_1.validateEventAttachmentUrl)(attachment);
+            });
+        }
+        if (mail.list) {
+            Object.entries(mail.list).forEach(([property, url]) => {
+                (0, validateListUrl_1.validateListUrl)(property, url);
+            });
+        }
+        return this.sendMail(mail);
+    }
+}
+exports.Mailer = Mailer;

package/mailer/Mailer.ts

@@ -1,10 +1,69 @@
+import { validateAddressEmail } from './validateAddressEmail'
+import { validateEventAttachmentUrl } from './validateEventAttachmentUrl'
+import { validateEventGeolocation } from './validateEventGeolocation'
+import { validateEventUrl } from './validateEventUrl'
+import { validateListUrl } from './validateListUrl'
 import type { Mail } from './Mail'
 
-interface Mailer {
-  send: (mail: Mail) => Promise<string>,
-  close: () => Promise<void>,
+abstract class Mailer {
+  public async send(mail: Mail): Promise<string> {
+    validateAddressEmail(mail.from.email)
+
+    if (mail.sender) {
+      validateAddressEmail(mail.sender.email)
+    }
+
+    if (mail.replyTo) {
+      validateAddressEmail(mail.replyTo.email)
+    }
+
+    mail.to.forEach((address) => {
+      validateAddressEmail(address.email)
+    })
+
+    if (mail.cc) {
+      mail.cc.forEach((address) => {
+        validateAddressEmail(address.email)
+      })
+    }
+
+    if (mail.bcc) {
+      mail.bcc.forEach((address) => {
+        validateAddressEmail(address.email)
+      })
+    }
+
+    if (mail.event?.url) {
+      validateEventUrl(mail.event.url)
+    }
+
+    if (mail.event?.location?.geo) {
+      validateEventGeolocation(
+        mail.event.location.geo.latitude,
+        mail.event.location.geo.longitude,
+      )
+    }
+
+    if (mail.event?.attachments) {
+      mail.event.attachments.forEach((attachment) => {
+        validateEventAttachmentUrl(attachment)
+      })
+    }
+
+    if (mail.list) {
+      Object.entries(mail.list).forEach(([property, url]: [string, string]) => {
+        validateListUrl(property, url)
+      })
+    }
+
+    return this.sendMail(mail)
+  }
+
+  public abstract sendMail(mail: Mail): Promise<string>
+
+  public abstract close(): Promise<void>
 }
 
 export {
-  type Mailer,
+  Mailer,
 }

package/mailer/Method.d.ts

@@ -0,0 +1,5 @@
+declare enum Method {
+    PUBLISH = "PUBLISH",
+    CANCEL = "CANCEL"
+}
+export { Method, };

package/mailer/Method.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Method = void 0;
+var Method;
+(function (Method) {
+    Method["PUBLISH"] = "PUBLISH";
+    Method["CANCEL"] = "CANCEL";
+})(Method || (exports.Method = Method = {}));

package/mailer/{EventMethod.ts → Method.ts}

@@ -1,8 +1,8 @@
-enum EventMethod {
+enum Method {
   PUBLISH = 'PUBLISH',
   CANCEL = 'CANCEL',
 }
 
 export {
-  EventMethod,
+  Method,
 }