@travetto/email-compiler 6.0.0 → 7.0.0-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/email-compiler",
-  "version": "6.0.0",
+  "version": "7.0.0-rc.0",
   "description": "Email compiling module",
   "keywords": [
     "email",
@@ -26,20 +26,20 @@
     "directory": "module/email-compiler"
   },
   "dependencies": {
-    "@travetto/config": "^6.0.0",
-    "@travetto/di": "^6.0.0",
-    "@travetto/email": "^6.0.0",
-    "@travetto/image": "^6.0.0",
-    "@travetto/runtime": "^6.0.0",
-    "@travetto/worker": "^6.0.0",
-    "@types/inline-css": "^3.0.3",
+    "@travetto/config": "^7.0.0-rc.0",
+    "@travetto/di": "^7.0.0-rc.0",
+    "@travetto/email": "^7.0.0-rc.0",
+    "@travetto/image": "^7.0.0-rc.0",
+    "@travetto/runtime": "^7.0.0-rc.0",
+    "@travetto/worker": "^7.0.0-rc.0",
+    "@types/inline-css": "^3.0.4",
     "html-entities": "^2.6.0",
     "inline-css": "^4.0.3",
     "purgecss": "^7.0.2",
-    "sass": "^1.87.0"
+    "sass": "^1.94.2"
   },
   "peerDependencies": {
-    "@travetto/cli": "^6.0.0"
+    "@travetto/cli": "^7.0.0-rc.0"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/util.ts

@@ -13,29 +13,30 @@ type Tokenized = {
 
 const SUPPORT_SRC = /(?:support|src)\//;
 
+const HTML_CSS_IMAGE_URLS = [
+  /(?<pre><img[^>]src=\s{0,10}["'])(?<src>[^"{}]{1,1000})/g,
+  /(?<pre>background(?:-image)?:\s{0,10}url[(]['"]?)(?<src>[^"'){}]{1,1000})/g
+];
+
+const EXT = /[.]email[.]tsx$/;
+
 /**
  * Email compile tools
  */
 export class EmailCompileUtil {
-  static #HTML_CSS_IMAGE_URLS = [
-    /(?<pre><img[^>]src=\s{0,10}["'])(?<src>[^"{}]{1,1000})/g,
-    /(?<pre>background(?:-image)?:\s{0,10}url[(]['"]?)(?<src>[^"'){}]{1,1000})/g
-  ];
-
-  static #EXT = /[.]email[.]tsx$/;
 
   /**
    * Is file a template?
    */
   static isTemplateFile(file: string): boolean {
-    return this.#EXT.test(file);
+    return EXT.test(file);
   }
 
   /**
    * Generate singular output path given a file
    */
   static buildOutputPath(file: string, suffix: string, prefix?: string): string {
-    const res = (SUPPORT_SRC.test(file) ? file.split(SUPPORT_SRC)[1] : file).replace(this.#EXT, suffix);
+    const res = (SUPPORT_SRC.test(file) ? file.split(SUPPORT_SRC)[1] : file).replace(EXT, suffix);
     return prefix ? path.join(prefix, res) : res;
   }
 
@@ -133,7 +134,7 @@ export class EmailCompileUtil {
    * Inline image sources
    */
   static async inlineImages(html: string, opts: EmailTemplateResource): Promise<string> {
-    const { tokens, finalize } = await this.tokenizeResources(html, this.#HTML_CSS_IMAGE_URLS);
+    const { tokens, finalize } = await this.tokenizeResources(html, HTML_CSS_IMAGE_URLS);
     const pendingImages: [token: string, ext: string, stream: Buffer | Promise<Buffer>][] = [];
 
     for (const [token, src] of tokens) {

package/support/bin/send.ts

@@ -1,6 +1,7 @@
 import { MailService, EmailOptions, MailTransport } from '@travetto/email';
-import { DependencyRegistry, Injectable } from '@travetto/di';
+import { DependencyRegistryIndex, Injectable } from '@travetto/di';
 import { toConcrete } from '@travetto/runtime';
+import { Registry } from '@travetto/registry';
 
 import { EditorConfig } from './config.ts';
 
@@ -15,20 +16,24 @@ export class EditorSendService {
   async service(): Promise<MailService> {
     const MailTransportTarget = toConcrete<MailTransport>();
 
-    const transports = DependencyRegistry.getCandidateTypes(MailTransportTarget);
+    const transports = DependencyRegistryIndex.getCandidates(MailTransportTarget);
 
     if (!transports.length) {
       try {
         const { NodemailerTransport } = await import('@travetto/email-nodemailer');
         const senderConfig = await EditorConfig.get('sender');
         const cls = class { };
-        DependencyRegistry.registerFactory({
-          fn: () => new NodemailerTransport(senderConfig),
-          target: MailTransportTarget,
-          src: cls,
-          id: 'nodemailer',
+        DependencyRegistryIndex.getForRegister(cls).register({
+          candidates: {
+            factory: {
+              candidateType: MailTransportTarget,
+              factory: () => new NodemailerTransport(senderConfig),
+              class: cls,
+              method: 'factory',
+            }
+          }
         });
-        DependencyRegistry.install(cls, { curr: cls, type: 'added' });
+        Registry.process([{ type: 'added', curr: cls }]);
 
         this.ethereal = !!senderConfig.host?.includes('ethereal.email');
       } catch {
@@ -36,7 +41,7 @@ export class EditorSendService {
         throw new Error('A mail transport is currently needed to support sending emails.  Please install @travetto/email-nodemailer or any other compatible transport');
       }
     }
-    return await DependencyRegistry.getInstance(MailService);
+    return await DependencyRegistryIndex.getInstance(MailService);
   }
 
   /**

package/support/cli.email_compile.ts

@@ -1,4 +1,4 @@
-import { RootRegistry } from '@travetto/registry';
+import { Registry } from '@travetto/registry';
 import { CliCommandShape, CliCommand, cliTpl } from '@travetto/cli';
 import { Env, Runtime } from '@travetto/runtime';
 
@@ -20,7 +20,7 @@ export class EmailCompileCommand implements CliCommandShape {
   }
 
   async main(): Promise<void> {
-    await RootRegistry.init();
+    await Registry.init();
 
     // Let the engine template
     const all = await EmailCompiler.compileAll();

package/support/cli.email_editor.ts

@@ -1,7 +1,7 @@
 import { Env } from '@travetto/runtime';
 import { CliCommand, CliUtil } from '@travetto/cli';
-import { RootRegistry } from '@travetto/registry';
-import { DependencyRegistry } from '@travetto/di';
+import { Registry } from '@travetto/registry';
+import { DependencyRegistryIndex } from '@travetto/di';
 
 import { EditorService } from './bin/editor.ts';
 
@@ -19,8 +19,8 @@ export class EmailEditorCommand {
       return;
     }
 
-    await RootRegistry.init();
-    const service = await DependencyRegistry.getInstance(EditorService);
+    await Registry.init();
+    const service = await DependencyRegistryIndex.getInstance(EditorService);
     await service.listen();
   }
 }

package/support/cli.email_test.ts

@@ -1,8 +1,8 @@
 import path from 'node:path';
 
-import { RootRegistry } from '@travetto/registry';
+import { Registry } from '@travetto/registry';
 import { CliCommandShape, CliCommand } from '@travetto/cli';
-import { DependencyRegistry } from '@travetto/di';
+import { DependencyRegistryIndex } from '@travetto/di';
 import { Env } from '@travetto/runtime';
 
 import { EditorService } from './bin/editor.ts';
@@ -19,8 +19,8 @@ export class EmailTestCommand implements CliCommandShape {
 
   async main(file: string, to: string): Promise<void> {
     file = path.resolve(file);
-    await RootRegistry.init();
-    const editor = await DependencyRegistry.getInstance(EditorService);
+    await Registry.init();
+    const editor = await DependencyRegistryIndex.getInstance(EditorService);
     await editor.sendFile(file, to);
   }
 }