@travetto/email-compiler 3.3.8 → 3.4.0-rc.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/email-compiler",
-  "version": "3.3.8",
+  "version": "3.4.0-rc.1",
   "description": "Email compiling module",
   "keywords": [
     "email",
@@ -26,19 +26,20 @@
     "directory": "module/email-compiler"
   },
   "dependencies": {
-    "@travetto/base": "^3.3.4",
-    "@travetto/config": "^3.3.5",
-    "@travetto/di": "^3.3.4",
-    "@travetto/email": "^3.3.5",
-    "@travetto/image": "^3.3.4",
-    "@types/inline-css": "^3.0.1",
+    "@travetto/base": "^3.4.0-rc.1",
+    "@travetto/config": "^3.4.0-rc.1",
+    "@travetto/di": "^3.4.0-rc.1",
+    "@travetto/email": "^3.4.0-rc.1",
+    "@travetto/image": "^3.4.0-rc.1",
+    "@travetto/worker": "^3.4.0-rc.1",
+    "@types/inline-css": "^3.0.2",
     "html-entities": "^2.4.0",
     "inline-css": "^4.0.2",
     "purgecss": "^5.0.0",
-    "sass": "^1.68.0"
+    "sass": "^1.69.5"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.3.6"
+    "@travetto/cli": "^3.4.0-rc.2"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/compiler.ts

@@ -1,19 +1,36 @@
 import fs from 'fs/promises';
 
-import { FileQueryProvider, TypedObject } from '@travetto/base';
+import { CompilerClient, FileQueryProvider, TypedObject } from '@travetto/base';
 import { EmailCompileSource, EmailCompiled, EmailCompileContext, MailUtil } from '@travetto/email';
 import { RootIndex, path } from '@travetto/manifest';
-import { DynamicFileLoader } from '@travetto/base/src/internal/file-loader';
+import { ManualAsyncIterator as Queue } from '@travetto/worker';
 
 import { EmailCompileUtil } from './util';
 
 const VALID_FILE = (file: string): boolean => /[.](scss|css|png|jpe?g|gif|ya?ml)$/.test(file) && !/[.]compiled[.]/.test(file);
 
+type WatchEvent = { action: 'create' | 'update' | 'delete', file: string, folder: string };
+
 /**
  * Email compilation support
  */
 export class EmailCompiler {
 
+  /**
+   * Watch folders as needed
+   */
+  static async #watchFolders(folders: string[], handler: (ev: WatchEvent) => void, signal: AbortSignal): Promise<void> {
+    const lib = await import('@parcel/watcher');
+    for (const src of folders) {
+      const cleanup = await lib.subscribe(src, async (err, events) => {
+        for (const ev of events) {
+          handler({ action: ev.type, file: path.toPosix(ev.path), folder: src });
+        }
+      });
+      signal.addEventListener('abort', () => cleanup.unsubscribe());
+    }
+  }
+
   /** Load Template */
   static async loadTemplate(file: string): Promise<EmailCompileContext> {
     const entry = RootIndex.getEntry(file);
@@ -37,8 +54,11 @@ export class EmailCompiler {
    */
   static findAllTemplates(mod?: string): string[] {
     return RootIndex
-      .findSupport({ filter: f => EmailCompileUtil.isTemplateFile(f) })
-      .filter(x => !mod || x.module === mod)
+      .find({
+        module: m => !mod ? m.roles.includes('std') : mod === m.name,
+        folder: f => f === 'support',
+        file: f => EmailCompileUtil.isTemplateFile(f.sourceFile)
+      })
       .map(x => x.sourceFile);
   }
 
@@ -94,7 +114,6 @@ export class EmailCompiler {
     return keys;
   }
 
-
   /**
    * Watch compilation
    */
@@ -106,14 +125,20 @@ export class EmailCompiler {
       )].map(x => path.resolve(RootIndex.getModule(x)!.sourcePath, 'resources'))
     );
 
-    const stream = all.watchFiles();
+    const ctrl = new AbortController();
+    const stream = new Queue<WatchEvent>([], ctrl.signal);
 
-    DynamicFileLoader.onLoadEvent((ev) => {
+    // watch resources
+    this.#watchFolders(all.paths, ev => stream.add(ev), ctrl.signal);
+
+    // Watch template files
+    new CompilerClient().onFileChange(ev => {
       const src = RootIndex.getEntry(ev.file);
       if (src && EmailCompileUtil.isTemplateFile(src.sourceFile)) {
-        stream.add({ ...ev, file: src.sourceFile });
+        setTimeout(() => stream.add({ ...ev, file: src.sourceFile }), 100); // Wait for it to be loaded
       }
     });
+
     for await (const { file, action } of stream) {
       if (action === 'delete') {
         continue;

package/support/cli.email_compile.ts

@@ -1,6 +1,6 @@
 import { RootRegistry } from '@travetto/registry';
 import { CliCommandShape, CliCommand, cliTpl } from '@travetto/cli';
-import { GlobalEnvConfig } from '@travetto/base';
+import { Env, GlobalEnvConfig } from '@travetto/base';
 
 import { EmailCompiler } from '../src/compiler';
 
@@ -17,11 +17,12 @@ export class EmailCompileCommand implements CliCommandShape {
     return {
       debug: false,
       dynamic: this.watch,
-      profiles: ['email-dev']
     };
   }
 
   async main(): Promise<void> {
+    Env.addToList('TRV_PROFILES', 'email-dev');
+
     await RootRegistry.init();
 
     // Let the engine template

package/support/cli.email_editor.ts

@@ -1,5 +1,5 @@
-import { GlobalEnvConfig } from '@travetto/base';
-import { CliCommand } from '@travetto/cli';
+import { Env, GlobalEnvConfig } from '@travetto/base';
+import { CliCommand, CliUtil } from '@travetto/cli';
 import { RootRegistry } from '@travetto/registry';
 
 import { EditorState } from './bin/editor';
@@ -12,12 +12,17 @@ export class EmailEditorCommand {
   envInit(): GlobalEnvConfig {
     return {
       envName: 'dev',
-      dynamic: true,
-      profiles: ['email-dev']
+      dynamic: true
     };
   }
 
   async main(): Promise<void> {
+    if (await CliUtil.runWithRestart(this)) {
+      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 { GlobalEnvConfig } from '@travetto/base';
+import { Env, GlobalEnvConfig } from '@travetto/base';
 
 import { EmailCompilationManager } from './bin/manager';
 import { EditorConfig } from './bin/config';
@@ -16,13 +16,12 @@ import { EmailCompiler } from '../src/compiler';
 export class EmailTestCommand implements CliCommandShape {
 
   envInit(): GlobalEnvConfig {
-    return {
-      envName: 'dev',
-      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);