@travetto/email-compiler 3.3.0 → 3.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/email-compiler",
-  "version": "3.3.0",
+  "version": "3.3.2",
   "description": "Email compiling module",
   "keywords": [
     "email",

package/src/util.ts

@@ -20,8 +20,8 @@ type Tokenized = {
  */
 export class EmailCompileUtil {
   static #HTML_CSS_IMAGE_URLS = [
-    /(?<pre><img[^>]src=\s*["'])(?<src>[^"]+)/g,
-    /(?<pre>background(?:-image)?:\s*url[(]['"]?)(?<src>[^"')]+)/g
+    /(?<pre><img[^>]src=\s*["'])(?<src>[^"{}]+)/g,
+    /(?<pre>background(?:-image)?:\s*url[(]['"]?)(?<src>[^"'){}]+)/g
   ];
 
   static #EXT = /[.]email[.]tsx$/;
@@ -148,7 +148,7 @@ export class EmailCompileUtil {
 
     const imageMap = new Map(await Promise.all(pendingImages.map(async ([token, ext, stream]) => {
       const data = await StreamUtil.streamToBuffer(await stream);
-      return [token, `data:image/${ext};base64,${data.toString('base64')}`] as const;
+      return [token, `data:image/${ext.replace('.', '')};base64,${data.toString('base64')}`] as const;
     })));
 
     return finalize(token => imageMap.get(token)!);

package/support/bin/config.ts

@@ -1,6 +1,6 @@
 import fs from 'fs/promises';
 
-import { RootIndex, path } from '@travetto/manifest';
+import { IndexedModule, RootIndex, path } from '@travetto/manifest';
 import { YamlUtil } from '@travetto/yaml';
 
 interface ConfigType {
@@ -39,13 +39,18 @@ export class $EditorConfig {
     },
   };
 
+  #getEmailConfig(mod: IndexedModule): string {
+    return this.#configFile[mod.name] ??= path.resolve(mod.sourcePath, 'resources/email/dev.yml');
+  }
+
   /**
    *
    */
   async get(file: string): Promise<ConfigType> {
     try {
-      const mod = RootIndex.getModuleFromSource(file)!.name;
-      const content = await fs.readFile(this.#configFile[mod], 'utf8');
+      const mod = RootIndex.getModuleFromSource(file)!;
+      const resolved = this.#getEmailConfig(mod);
+      const content = await fs.readFile(resolved, 'utf8');
       return YamlUtil.parse<ConfigType>(content);
     } catch {
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
@@ -70,7 +75,7 @@ export class $EditorConfig {
   async ensureConfig(file: string): Promise<string> {
     console.log('Ensuring config', file);
     const mod = RootIndex.getModuleFromSource(file)!;
-    const resolved = this.#configFile[mod.name] ??= path.resolve(mod.sourcePath, 'resources/email/dev.yml');
+    const resolved = this.#getEmailConfig(mod);
     if (!(await fs.stat(resolved).catch(() => { }))) {
       await fs.mkdir(path.dirname(resolved), { recursive: true });
       await fs.writeFile(resolved, this.getDefaultConfig(), { encoding: 'utf8' });