@travetto/email-inky 6.0.0-rc.1 → 6.0.0-rc.2

package/__index__.ts

@@ -1,2 +1,8 @@
-export * from './src/components';
-export * from './src/wrapper';
+export * from './src/components.ts';
+export * from './src/wrapper.ts';
+export * from './src/render/renderer.ts';
+export * from './src/render/html.ts';
+export * from './src/render/markdown.ts';
+export * from './src/render/subject.ts';
+export * from './src/render/context.ts';
+export * from './src/render/common.ts';

package/jsx-runtime.ts

@@ -29,32 +29,6 @@ export type ValidHtmlTags =
   'td' | 'tr' | 'th' | 'table' | 'thead' | 'tbody' |
   'span' | 'div' | 'center' | 'title';
 
-type BasicElements = { [K in ValidHtmlTags]: JSX.IntrinsicAttributes };
-
-declare global {
-  // eslint-disable-next-line @typescript-eslint/no-namespace
-  namespace JSX {
-    interface Element extends JSXElement { }
-    interface IntrinsicAttributes {
-      className?: string;
-      id?: string;
-      dir?: string;
-      name?: string;
-      src?: string | Function;
-      alt?: string;
-      href?: string;
-      title?: string;
-      height?: string;
-      target?: string;
-      width?: string;
-      style?: string;
-      align?: string;
-      valign?: string;
-    }
-    interface IntrinsicElements extends BasicElements { }
-  }
-}
-
 let createFrag: Function | undefined = undefined;
 
 export function createElement<T extends string | Class | JSXComponentFunction<P>, P extends {}>(
@@ -71,7 +45,7 @@ export function createRootElement<T extends string | Class | JSXComponentFunctio
 
   Object.assign(res, {
     prepare(loc: EmailTemplateLocation): Promise<EmailTemplateModule> {
-      return import('@travetto/email-inky/src/wrapper').then(v => v.prepare(castTo(res), loc));
+      return import('@travetto/email-inky').then(v => v.prepare(castTo(res), loc));
     }
   });
 
@@ -89,4 +63,27 @@ export function isJSXElement(el: unknown): el is JSXElement {
   return el !== undefined && el !== null && typeof el === 'object' && JSXRuntimeTag in el;
 }
 
-createFrag = Fragment;
+createFrag = Fragment;
+
+// eslint-disable-next-line @typescript-eslint/no-namespace
+export namespace JSX {
+  export interface Element extends JSXElement { }
+  export interface IntrinsicAttributes extends JSXProps {
+    className?: string;
+    id?: string;
+    dir?: string;
+    name?: string;
+    src?: string | Function;
+    alt?: string;
+    href?: string;
+    title?: string;
+    height?: string;
+    target?: string;
+    width?: string;
+    style?: string;
+    align?: string;
+    valign?: string;
+  }
+  type BasicElements = { [K in ValidHtmlTags]: IntrinsicAttributes };
+  export interface IntrinsicElements extends BasicElements { }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/email-inky",
-  "version": "6.0.0-rc.1",
+  "version": "6.0.0-rc.2",
   "description": "Email Inky templating module",
   "keywords": [
     "email",
@@ -27,14 +27,14 @@
     "directory": "module/email-inky"
   },
   "dependencies": {
-    "@travetto/config": "^6.0.0-rc.1",
-    "@travetto/di": "^6.0.0-rc.1",
-    "@travetto/email": "^6.0.0-rc.1",
-    "@travetto/runtime": "^6.0.0-rc.1",
+    "@travetto/config": "^6.0.0-rc.2",
+    "@travetto/di": "^6.0.0-rc.2",
+    "@travetto/email": "^6.0.0-rc.2",
+    "@travetto/runtime": "^6.0.0-rc.2",
     "foundation-emails": "^2.4.0"
   },
   "devDependencies": {
-    "@travetto/email-compiler": "^6.0.0-rc.1"
+    "@travetto/email-compiler": "^6.0.0-rc.2"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/render/context.ts

@@ -2,7 +2,7 @@ import { createElement } from '@travetto/email-inky/jsx-runtime';
 import { castTo, FileLoader } from '@travetto/runtime';
 import { EmailTemplateLocation, EmailResourceLoader } from '@travetto/email';
 
-import { JSXElementByFn, c } from '../components';
+import { JSXElementByFn, c } from '../components.ts';
 
 export type RenderContextInit = EmailTemplateLocation & { loader?: FileLoader, columnCount?: number };
 

package/src/render/html.ts

@@ -1,8 +1,8 @@
 import { JSXElement } from '@travetto/email-inky/jsx-runtime';
 
-import { RenderProvider, RenderState } from '../types';
-import { RenderContext } from './context';
-import { classStr, combinePropsToStr, getKids, isOfType, visit } from './common';
+import { RenderProvider, RenderState } from '../types.ts';
+import { RenderContext } from './context.ts';
+import { classStr, combinePropsToStr, getKids, isOfType, visit } from './common.ts';
 
 export const SUMMARY_STYLE = Object.entries({
   display: 'none',
@@ -75,8 +75,8 @@ export const Html: RenderProvider<RenderContext> = {
   a: async ({ recurse, props }) => `<a ${propsToStr(props)}>${await recurse()}</a>`,
 
   InkyTemplate: c => c.recurse(),
-  Title: async ({ recurse, el }) => `<title>${await recurse()}</title>`,
-  Summary: async ({ recurse, el }) => `<span id="summary" style="${SUMMARY_STYLE}">${await recurse()}</span>`,
+  Title: async ({ recurse }) => `<title>${await recurse()}</title>`,
+  Summary: async ({ recurse }) => `<span id="summary" style="${SUMMARY_STYLE}">${await recurse()}</span>`,
 
   Column: async ({ props, recurse, stack, el, context }): Promise<string> => {
 
@@ -159,7 +159,7 @@ export const Html: RenderProvider<RenderContext> = {
   </tbody>
 </table>`,
 
-  Button: async ({ recurse, el, props, createState }): Promise<string> => {
+  Button: async ({ recurse, props, createState }): Promise<string> => {
     const { href, target, ...rest } = props;
     let inner = await recurse();
     let expander = '';
@@ -280,7 +280,7 @@ export const Html: RenderProvider<RenderContext> = {
     `;
   },
 
-  Callout: async ({ recurse, el, props }): Promise<string> => {
+  Callout: async ({ recurse, props }): Promise<string> => {
 
     const innerProps: JSXElement['props'] = { className: props.className };
     delete props.className;

package/src/render/markdown.ts

@@ -1,16 +1,16 @@
 import { JSXElement } from '@travetto/email-inky/jsx-runtime';
 import { castTo } from '@travetto/runtime';
 
-import { RenderProvider, RenderState } from '../types';
-import { RenderContext } from './context';
+import { RenderProvider, RenderState } from '../types.ts';
+import { RenderContext } from './context.ts';
 
 const visit = ({ recurse }: RenderState<JSXElement, RenderContext>): Promise<string> => recurse();
-const ignore = async ({ recurse: _ }: RenderState<JSXElement, RenderContext>): Promise<string> => '';
+const ignore = async (_: RenderState<JSXElement, RenderContext>): Promise<string> => '';
 
 export const Markdown: RenderProvider<RenderContext> = {
   finalize: (text) => {
     text = text
-      .replace(/(\[[^\]]+\]\([^)]+\))([A-Za-z0-9$]+)/g, (_, link, v) => v === 's' ? _ : `${link} ${v}`)
+      .replace(/(\[[^\]]{1,100}\]\([^)]{1,1000}\))([A-Za-z0-9$]{1,100})/g, (all, link, v) => v === 's' ? all : `${link} ${v}`)
       .replace(/(\S)\n(#)/g, (_, l, r) => `${l}\n\n${r}`);
     return text;
   },
@@ -29,7 +29,7 @@ export const Markdown: RenderProvider<RenderContext> = {
   ul: async ({ recurse }) => `\n${await recurse()}`,
   ol: async ({ recurse }) => `\n${await recurse()}`,
   li: async ({ recurse, stack }) => {
-    const parent = stack.reverse().find(x => x.type === 'ol' || x.type === 'ul');
+    const parent = stack.toReversed().find(x => x.type === 'ol' || x.type === 'ul');
     const depth = stack.filter(x => x.type === 'ol' || x.type === 'ul').length;
     return `${'   '.repeat(depth)}${(parent && parent.type === 'ol') ? '1.' : '* '} ${await recurse()}\n`;
   },

package/src/render/renderer.ts

@@ -1,9 +1,9 @@
 import { isJSXElement, JSXElement, createFragment, JSXFragmentType, JSXChild } from '@travetto/email-inky/jsx-runtime';
 import { castTo } from '@travetto/runtime';
 
-import { EMPTY_ELEMENT, getComponentName, JSXElementByFn, c } from '../components';
-import { RenderProvider, RenderState } from '../types';
-import { RenderContext, RenderContextInit } from './context';
+import { EMPTY_ELEMENT, getComponentName, JSXElementByFn, c } from '../components.ts';
+import { RenderProvider, RenderState } from '../types.ts';
+import { RenderContext, RenderContextInit } from './context.ts';
 
 /**
  * Inky Renderer

package/src/render/subject.ts

@@ -1,13 +1,13 @@
 import { JSXElement } from '@travetto/email-inky/jsx-runtime';
 
-import { RenderProvider, RenderState } from '../types';
-import { RenderContext } from './context';
+import { RenderProvider, RenderState } from '../types.ts';
+import { RenderContext } from './context.ts';
 
 const empty = async (): Promise<string> => '';
 const visit = ({ recurse }: RenderState<JSXElement, RenderContext>): Promise<string> => recurse();
 
 export const Subject: RenderProvider<RenderContext> = {
-  finalize: (text, context, root) => text,
+  finalize: (text) => text,
 
   For: async ({ recurse, props }) => `{{#${props.attr}}}${await recurse()}{{/${props.attr}}}`,
   If: async ({ recurse, props }) => `{{#${props.attr}}}${await recurse()}{{/${props.attr}}}`,

package/src/types.ts

@@ -1,5 +1,5 @@
-import { JSXElement, ValidHtmlTags } from '../jsx-runtime';
-import { JSXElementByFn, c } from './components';
+import { JSXElement, ValidHtmlTags } from '../jsx-runtime.ts';
+import { JSXElementByFn, c } from './components.ts';
 
 export type Wrapper = Record<string, (cnt: string) => string>;
 

package/src/wrapper.ts

@@ -4,10 +4,10 @@ import { EmailTemplateModule, EmailTemplateLocation, EmailResourceLoader } from
 import { PackageUtil } from '@travetto/manifest';
 import { JSXElement } from '@travetto/email-inky/jsx-runtime';
 
-import { InkyRenderer } from './render/renderer';
-import { Html } from './render/html';
-import { Markdown } from './render/markdown';
-import { Subject } from './render/subject';
+import { InkyRenderer } from './render/renderer.ts';
+import { Html } from './render/html.ts';
+import { Markdown } from './render/markdown.ts';
+import { Subject } from './render/subject.ts';
 
 export async function prepare(node: JSXElement, loc: EmailTemplateLocation): Promise<EmailTemplateModule> {
   const ctx = {