@travetto/email-compiler 3.4.0-rc.6 → 3.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/email-compiler",
-  "version": "3.4.0-rc.6",
+  "version": "3.4.0",
   "description": "Email compiling module",
   "keywords": [
     "email",
@@ -26,12 +26,12 @@
     "directory": "module/email-compiler"
   },
   "dependencies": {
-    "@travetto/base": "^3.4.0-rc.6",
-    "@travetto/config": "^3.4.0-rc.6",
-    "@travetto/di": "^3.4.0-rc.6",
-    "@travetto/email": "^3.4.0-rc.6",
-    "@travetto/image": "^3.4.0-rc.6",
-    "@travetto/worker": "^3.4.0-rc.6",
+    "@travetto/base": "^3.4.0",
+    "@travetto/config": "^3.4.0",
+    "@travetto/di": "^3.4.0",
+    "@travetto/email": "^3.4.0",
+    "@travetto/image": "^3.4.0",
+    "@travetto/worker": "^3.4.0",
     "@types/inline-css": "^3.0.2",
     "html-entities": "^2.4.0",
     "inline-css": "^4.0.2",
@@ -39,7 +39,7 @@
     "sass": "^1.69.5"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.4.0-rc.7"
+    "@travetto/cli": "^3.4.0"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/compiler.ts

@@ -1,6 +1,6 @@
 import fs from 'fs/promises';
 
-import { CompilerClient, FileResourceProvider, TypedObject } from '@travetto/base';
+import { CompilerClient, TypedObject } from '@travetto/base';
 import { EmailCompileSource, EmailCompiled, EmailCompileContext, MailUtil } from '@travetto/email';
 import { RootIndex, path } from '@travetto/manifest';
 import { ManualAsyncIterator as Queue } from '@travetto/worker';
@@ -118,9 +118,15 @@ export class EmailCompiler {
    * Watch compilation
    */
   static async * watchCompile(): AsyncIterable<string> {
-    const all = FileResourceProvider.resolveSearchPaths(
-      this.findAllTemplates().map(x => `${RootIndex.getEntry(x)!.module}#resources`)
-    );
+    const all = this.findAllTemplates()
+      .map(x => RootIndex.resolveModulePath(`${RootIndex.getEntry(x)!.module}#resources`))
+      .reduce<{ set: Set<string>, arr: string[] }>((a, v) => {
+        if (!a.set.has(v)) {
+          a.set.add(v);
+          a.arr.push(v);
+        }
+        return a;
+      }, { set: new Set(), arr: [] }).arr;
 
     const ctrl = new AbortController();
     const stream = new Queue<WatchEvent>([], ctrl.signal);

package/src/util.ts

@@ -1,7 +1,7 @@
 import util from 'util';
 import { Readable } from 'stream';
 
-import { FileResourceProvider, StreamUtil } from '@travetto/base';
+import { ResourceLoader, StreamUtil } from '@travetto/base';
 import {
   EmailTemplateImageConfig, EmailTemplateStyleConfig,
   EmailCompiled, EmailCompileContext
@@ -137,7 +137,7 @@ export class EmailCompileUtil {
   static async inlineImages(html: string, opts: EmailTemplateImageConfig): Promise<string> {
     const { tokens, finalize } = await this.tokenizeResources(html, this.#HTML_CSS_IMAGE_URLS);
     const pendingImages: [token: string, ext: string, stream: Readable | Promise<Readable>][] = [];
-    const resource = new FileResourceProvider({ includeCommon: true, paths: opts.search ?? [] });
+    const resource = new ResourceLoader(opts.search);
 
     for (const [token, src] of tokens) {
       const ext = path.extname(src);
@@ -183,7 +183,7 @@ export class EmailCompileUtil {
       styles.push(opts.global);
     }
 
-    const resource = new FileResourceProvider({ includeCommon: true, paths: opts.search ?? [] });
+    const resource = new ResourceLoader(opts.search);
     const main = await resource.read('/email/main.scss').then(d => d, () => '');
 
     if (main) {

package/support/cli.email_compile.ts

@@ -1,6 +1,6 @@
 import { RootRegistry } from '@travetto/registry';
 import { CliCommandShape, CliCommand, cliTpl } from '@travetto/cli';
-import { Env, GlobalEnvConfig } from '@travetto/base';
+import { Env, EnvInit } from '@travetto/base';
 
 import { EmailCompiler } from '../src/compiler';
 
@@ -13,16 +13,12 @@ export class EmailCompileCommand implements CliCommandShape {
   /** Compile in watch mode */
   watch?: boolean;
 
-  envInit(): GlobalEnvConfig {
-    return {
-      debug: false,
-      dynamic: this.watch,
-    };
+  envInit(): EnvInit {
+    Env.addToList('TRV_PROFILES', 'email-dev');
+    return { debug: false, dynamic: this.watch };
   }
 
   async main(): Promise<void> {
-    Env.addToList('TRV_PROFILES', 'email-dev');
-
     await RootRegistry.init();
 
     // Let the engine template

package/support/cli.email_editor.ts

@@ -1,4 +1,4 @@
-import { Env, GlobalEnvConfig } from '@travetto/base';
+import { Env, EnvInit } from '@travetto/base';
 import { CliCommand, CliUtil } from '@travetto/cli';
 import { RootRegistry } from '@travetto/registry';
 
@@ -9,11 +9,9 @@ import { EmailCompilationManager } from './bin/manager';
 @CliCommand()
 export class EmailEditorCommand {
 
-  envInit(): GlobalEnvConfig {
-    return {
-      envName: 'dev',
-      dynamic: true
-    };
+  envInit(): EnvInit {
+    Env.addToList('TRV_PROFILES', 'email-dev');
+    return { envName: 'dev', dynamic: true };
   }
 
   async main(): Promise<void> {
@@ -21,8 +19,6 @@ export class EmailEditorCommand {
       return;
     }
 
-    Env.addToList('TRV_PROFILES', 'email-dev');
-
     await RootRegistry.init();
     await new EditorState(await EmailCompilationManager.createInstance()).init();
   }

package/support/cli.email_test.ts

@@ -1,7 +1,7 @@
 import { path } from '@travetto/manifest';
 import { RootRegistry } from '@travetto/registry';
 import { CliCommandShape, CliCommand } from '@travetto/cli';
-import { Env, GlobalEnvConfig } from '@travetto/base';
+import { Env, EnvInit } from '@travetto/base';
 
 import { EmailCompilationManager } from './bin/manager';
 import { EditorConfig } from './bin/config';
@@ -15,13 +15,12 @@ import { EmailCompiler } from '../src/compiler';
 @CliCommand()
 export class EmailTestCommand implements CliCommandShape {
 
-  envInit(): GlobalEnvConfig {
+  envInit(): EnvInit {
+    Env.addToList('TRV_PROFILES', 'email-dev');
     return { envName: 'dev' };
   }
 
   async main(file: string, to: string): Promise<void> {
-    Env.addToList('TRV_PROFILES', 'email-dev');
-
     file = path.resolve(file);
     await RootRegistry.init();
     await EmailCompiler.compile(file, true);