@travetto/email-compiler 7.1.4 → 8.0.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/email-compiler",
-  "version": "7.1.4",
+  "version": "8.0.0-alpha.1",
   "type": "module",
   "description": "Email compiling module",
   "keywords": [
@@ -27,20 +27,20 @@
     "directory": "module/email-compiler"
   },
   "dependencies": {
-    "@travetto/config": "^7.1.4",
-    "@travetto/di": "^7.1.4",
-    "@travetto/email": "^7.1.4",
-    "@travetto/image": "^7.1.4",
-    "@travetto/runtime": "^7.1.4",
-    "@travetto/worker": "^7.1.4",
+    "@travetto/config": "^8.0.0-alpha.1",
+    "@travetto/di": "^8.0.0-alpha.1",
+    "@travetto/email": "^8.0.0-alpha.1",
+    "@travetto/image": "^8.0.0-alpha.1",
+    "@travetto/runtime": "^8.0.0-alpha.1",
+    "@travetto/worker": "^8.0.0-alpha.1",
     "@types/inline-css": "^3.0.4",
     "html-entities": "^2.6.0",
     "inline-css": "^4.0.3",
-    "purgecss": "^7.0.2",
-    "sass": "^1.97.2"
+    "purgecss": "^8.0.0",
+    "sass": "^1.97.3"
   },
   "peerDependencies": {
-    "@travetto/cli": "^7.1.4"
+    "@travetto/cli": "^8.0.0-alpha.1"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/compiler.ts

@@ -1,8 +1,9 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
 
-import { TypedObject, RuntimeIndex, Runtime, BinaryUtil, ExecUtil } from '@travetto/runtime';
+import { TypedObject, RuntimeIndex, Runtime, ExecUtil } from '@travetto/runtime';
 import { type EmailCompiled, MailUtil, type EmailTemplateImport, type EmailTemplateModule } from '@travetto/email';
+import { ManifestFileUtil } from '@travetto/manifest';
 
 import { EmailCompileUtil } from './util.ts';
 
@@ -57,7 +58,7 @@ export class EmailCompiler {
     await Promise.all(TypedObject.keys(outs).map(async key => {
       if (message[key]) {
         const content = MailUtil.buildBrand(file, message[key], 'trv email:compile');
-        await BinaryUtil.bufferedFileWrite(outs[key], content);
+        await ManifestFileUtil.bufferedFileWrite(outs[key], content);
       } else {
         await fs.rm(outs[key], { force: true }); // Remove file if data not provided
       }

package/src/util.ts

@@ -1,10 +1,9 @@
-import { buffer as toBuffer } from 'node:stream/consumers';
 import path from 'node:path';
 import type { CompileResult, Options } from 'sass';
 
 import type { EmailCompiled, EmailTemplateModule, EmailTemplateResource } from '@travetto/email';
 import { ImageUtil } from '@travetto/image';
-import { RuntimeIndex } from '@travetto/runtime';
+import { BinaryUtil, CodecUtil, RuntimeIndex, type BinaryArray } from '@travetto/runtime';
 
 type Tokenized = {
   text: string;
@@ -144,26 +143,21 @@ export class EmailCompileUtil {
    */
   static async inlineImages(html: string, options: EmailTemplateResource): Promise<string> {
     const { tokens, finalize } = await this.tokenizeResources(html, HTML_CSS_IMAGE_URLS);
-    const pendingImages: [token: string, ext: string, stream: Buffer | Promise<Buffer>][] = [];
-
-    for (const [token, source] of tokens) {
-      const ext = path.extname(source);
-      if (/^[.](jpe?g|png)$/.test(ext)) {
-        const output = await ImageUtil.convert(
-          await options.loader.readStream(source),
-          { format: ext === '.png' ? 'png' : 'jpeg' }
-        );
-        const buffer = await toBuffer(output);
-        pendingImages.push([token, ext, buffer]);
+    const pendingImages = [...tokens.entries()].map(async ([token, source]) => {
+      const format = path.extname(source).substring(1);
+
+      let bytes: BinaryArray;
+      if (ImageUtil.isKnownExtension(format)) {
+        const stream = await options.loader.readBinaryStream(source);
+        const converted = await ImageUtil.convert(stream, { optimize: true, format });
+        bytes = await BinaryUtil.toBinaryArray(converted);
       } else {
-        pendingImages.push([token, ext, options.loader.read(source, true)]);
+        bytes = await options.loader.readBinaryArray(source);
       }
-    }
-
-    const imageMap = new Map(await Promise.all(pendingImages.map(async ([token, ext, data]) =>
-      [token, `data:image/${ext.replace('.', '')};base64,${data.toString('base64')}`] as const
-    )));
+      return [token, `data:image/${format};base64,${CodecUtil.toBase64String(bytes)}`] as const;
+    });
 
+    const imageMap = new Map(await Promise.all(pendingImages));
     return finalize(token => imageMap.get(token)!);
   }
 
@@ -191,7 +185,7 @@ export class EmailCompileUtil {
   static async applyStyles(html: string, options: EmailTemplateResource): Promise<string> {
     const styles = [
       options.globalStyles ?? '',
-      await options.loader.read('/email/main.scss').catch(() => '')
+      await options.loader.readText('/email/main.scss').catch(() => '')
     ]
       .filter(line => !!line)
       .join('\n');

package/support/bin/config.ts

@@ -1,7 +1,8 @@
 import fs from 'node:fs/promises';
 import { parse, stringify } from 'yaml';
 
-import { Runtime, BinaryUtil } from '@travetto/runtime';
+import { Runtime } from '@travetto/runtime';
+import { ManifestFileUtil } from '@travetto/manifest';
 
 import type { EditorConfigType } from './types.ts';
 
@@ -51,7 +52,7 @@ export class EditorConfig {
   static async ensureConfig(): Promise<string> {
     const resolved = Runtime.workspaceRelative(CONFIG_FILE);
     if (!(await fs.stat(resolved).catch(() => { }))) {
-      await BinaryUtil.bufferedFileWrite(resolved, this.getDefaultConfig());
+      await ManifestFileUtil.bufferedFileWrite(resolved, this.getDefaultConfig());
     }
     return resolved;
   }

package/support/bin/editor.ts

@@ -1,6 +1,6 @@
 import { Inject, Injectable } from '@travetto/di';
 import { MailUtil, type EmailCompiled, type MailInterpolator } from '@travetto/email';
-import { AppError, TypedObject, WatchUtil } from '@travetto/runtime';
+import { RuntimeError, TypedObject, WatchUtil } from '@travetto/runtime';
 
 import type { EditorSendService } from './send.ts';
 import { EditorConfig } from './config.ts';
@@ -63,7 +63,7 @@ export class EditorService {
    */
   async listen(): Promise<void> {
     if (!process.connected || !process.send) {
-      throw new AppError('Unable to run email editor, missing ipc channel');
+      throw new RuntimeError('Unable to run email editor, missing ipc channel');
     }
     process.on('message', async (request: EditorRequest) => {
       switch (request.type) {

package/support/cli.email_compile.ts

@@ -14,7 +14,7 @@ export class EmailCompileCommand implements CliCommandShape {
   /** Compile in watch mode */
   watch?: boolean;
 
-  preMain(): void {
+  finalize(): void {
     Env.DEBUG.set(false);
     Env.TRV_ROLE.set('build');
   }

package/support/cli.email_editor.ts

@@ -1,14 +1,17 @@
 import { Env } from '@travetto/runtime';
-import { CliCommand } from '@travetto/cli';
+import { CliCommand, CliProfilesFlag } from '@travetto/cli';
 import { Registry } from '@travetto/registry';
 import { DependencyRegistryIndex } from '@travetto/di';
 
 import { EditorService } from './bin/editor.ts';
 
 /** The email editor compilation service and output serving */
-@CliCommand({ with: { profiles: true } })
+@CliCommand()
 export class EmailEditorCommand {
 
+  @CliProfilesFlag()
+  profile: string[];
+
   preMain(): void {
     Env.TRV_ROLE.set('build');
   }

package/support/cli.email_test.ts

@@ -1,7 +1,7 @@
 import path from 'node:path';
 
 import { Registry } from '@travetto/registry';
-import { type CliCommandShape, CliCommand } from '@travetto/cli';
+import { type CliCommandShape, CliCommand, CliProfilesFlag } from '@travetto/cli';
 import { DependencyRegistryIndex } from '@travetto/di';
 import { Env } from '@travetto/runtime';
 
@@ -10,10 +10,13 @@ import { EditorService } from './bin/editor.ts';
 /**
  * CLI Entry point for running the email server
  */
-@CliCommand({ with: { profiles: true } })
+@CliCommand()
 export class EmailTestCommand implements CliCommandShape {
 
-  preMain(): void {
+  @CliProfilesFlag()
+  profile: string[];
+
+  finalize(): void {
     Env.TRV_ROLE.set('build');
   }