@travetto/email-inky 5.0.0-rc.1 → 5.0.0-rc.11

package/jsx-runtime.ts

@@ -1,4 +1,4 @@
-import { ConcreteClass } from '@travetto/base';
+import { castTo, Class } from '@travetto/runtime';
 import { EmailTemplateModule, EmailTemplateLocation } from '@travetto/email';
 
 export type JSXChild = JSXElement | number | bigint | boolean | object | string;
@@ -13,7 +13,7 @@ let id = 0;
 
 /** Simple JSX Element */
 export interface JSXElement<
-  T extends string | ConcreteClass | JSXComponentFunction<P> = string | ConcreteClass | JSXComponentFunction,
+  T extends string | Class | JSXComponentFunction<P> = string | Class | JSXComponentFunction,
   P extends {} = {},
 > {
   [JSXRuntimeTag]?: { id: number };
@@ -57,23 +57,21 @@ declare global {
 
 let createFrag: Function | undefined = undefined;
 
-export function createElement<T extends string | ConcreteClass | JSXComponentFunction<P>, P extends {}>(
+export function createElement<T extends string | Class | JSXComponentFunction<P>, P extends {}>(
   type: T, props: P & JSXProps
 ): JSXElement<T, P> {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  type = (type === createFrag ? JSXFragmentType : type) as T;
+  type = castTo(type === createFrag ? JSXFragmentType : type);
   return { [JSXRuntimeTag]: { id: (id += 1) }, type, key: '', props };
 }
 
-export function createRootElement<T extends string | ConcreteClass | JSXComponentFunction<P>, P extends {}>(
+export function createRootElement<T extends string | Class | JSXComponentFunction<P>, P extends {}>(
   type: T, props: P & JSXProps
 ): JSXElement<T, P> {
   const res = createElement(type, props);
 
   Object.assign(res, {
     prepare(loc: EmailTemplateLocation): Promise<EmailTemplateModule> {
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      return import('@travetto/email-inky/src/wrapper').then(v => v.prepare(res as JSXElement, loc));
+      return import('@travetto/email-inky/src/wrapper').then(v => v.prepare(castTo(res), loc));
     }
   });
 

package/package.json

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

package/src/components.ts

@@ -1,5 +1,5 @@
 import { JSXElement, JSXComponentFunction as CompFn } from '@travetto/email-inky/jsx-runtime';
-import { TypedObject } from '@travetto/base';
+import { TypedObject } from '@travetto/runtime';
 
 const EMPTY: JSXElement = { type: '', key: '', props: {} };
 
@@ -49,8 +49,7 @@ export type JSXElements = { [K in keyof C]: JSXElementByFn<K>; };
 
 export const EMPTY_ELEMENT = EMPTY;
 
-// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-const invertedC = new Map<Function, string>(TypedObject.entries(c).map(p => [p[1], p[0]] as [CompFn, string]));
+const invertedC = new Map<Function, string>(TypedObject.entries(c).map(p => [p[1], p[0]] as const));
 
 export function getComponentName(fn: Function | string): string {
   if (typeof fn === 'string') {

package/src/render/common.ts

@@ -42,9 +42,8 @@ export const classStr = (existing: string | undefined, ...toAdd: string[]): stri
   return out.join(' ');
 };
 
-export const combinePropsToStr = (allowedProps: Set<string>, props: Record<string, unknown>, addClasses: string[] = []): string => {
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  const out = { ...props, className: classStr(props.className as string, ...addClasses) };
+export const combinePropsToStr = (allowedProps: Set<string>, props: { className?: string } & Record<string, unknown>, addClasses: string[] = []): string => {
+  const out = { ...props, className: classStr(props.className, ...addClasses) };
   return Object.entries(out)
     .filter(([k, v]) => allowedProps.has(k) && v !== undefined && v !== null && v !== '')
     .map(([k, v]) => [k === 'className' ? 'class' : k, v])

package/src/render/context.ts

@@ -1,5 +1,5 @@
 import { createElement } from '@travetto/email-inky/jsx-runtime';
-import { FileLoader } from '@travetto/base';
+import { castTo, FileLoader } from '@travetto/runtime';
 import { EmailTemplateLocation, EmailResourceLoader } from '@travetto/email';
 
 import { JSXElementByFn, c } from '../components';
@@ -25,8 +25,6 @@ export class RenderContext implements RenderContextInit {
    * Create a new element from a given JSX factory
    */
   createElement<K extends keyof typeof c>(name: K, props: JSXElementByFn<K>['props']): JSXElementByFn<K> {
-    // @ts-expect-error
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    return createElement(c[name], props) as JSXElementByFn<K>;
+    return castTo(createElement(castTo<Record<string, string>>(c)[name], props));
   }
 }

package/src/render/html.ts

@@ -89,10 +89,9 @@ export const Html: RenderProvider<RenderContext> = {
     const colCount = sibs.length || 1;
 
     if (parent) {
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      const pProps = parent?.props as { columnVisited: boolean };
-      if (!pProps.columnVisited) {
-        pProps.columnVisited = true;
+      const elParent: (typeof parent) & { columnVisited?: boolean } = parent;
+      if (!elParent.columnVisited) {
+        elParent.columnVisited = true;
         if (sibs.length) {
           sibs[0].props.className = classStr(sibs[0].props.className ?? '', 'first');
           sibs[sibs.length - 1].props.className = classStr(sibs[sibs.length - 1].props.className ?? '', 'last');

package/src/render/markdown.ts

@@ -1,6 +1,7 @@
 import { JSXElement } from '@travetto/email-inky/jsx-runtime';
 import { RenderProvider, RenderState } from '../types';
 import { RenderContext } from './context';
+import { castTo } from '@travetto/runtime';
 
 const visit = ({ recurse }: RenderState<JSXElement, RenderContext>): Promise<string> => recurse();
 const ignore = async ({ recurse: _ }: RenderState<JSXElement, RenderContext>): Promise<string> => '';
@@ -42,8 +43,7 @@ export const Markdown: RenderProvider<RenderContext> = {
   h2: async ({ recurse }) => `\n## ${await recurse()}\n\n`,
   h3: async ({ recurse }) => `\n### ${await recurse()}\n\n`,
   h4: async ({ recurse }) => `\n#### ${await recurse()}\n\n`,
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  a: async ({ recurse, props }) => `\n[${await recurse()}](${(props as { href: string }).href})\n`,
+  a: async ({ recurse, props }) => `\n[${await recurse()}](${(castTo<{ href: string }>(props)).href})\n`,
   Button: async ({ recurse, props }) => `\n[${await recurse()}](${props.href})\n`,
 
   InkyTemplate: visit,

package/src/render/renderer.ts

@@ -3,6 +3,7 @@ import { isJSXElement, JSXElement, createFragment, JSXFragmentType, JSXChild } f
 import { EMPTY_ELEMENT, getComponentName, JSXElementByFn, c } from '../components';
 import { RenderProvider, RenderState } from '../types';
 import { RenderContext, RenderContextInit } from './context';
+import { castTo } from '@travetto/runtime';
 
 /**
  * Inky Renderer
@@ -28,8 +29,7 @@ export class InkyRenderer {
       let final: JSXElement = node;
       // Render simple element if needed
       if (typeof node.type === 'function' && node.type !== JSXFragmentType) {
-        // @ts-expect-error
-        const out = node.type(node.props);
+        const out = castTo<Function>(node.type)(node.props);
         final = out !== EMPTY_ELEMENT ? out : final;
       }
 
@@ -70,8 +70,7 @@ export class InkyRenderer {
     // @ts-expect-error
   ): RenderState<JSXElementByFn<K>, RenderContext> {
     const el = ctx.createElement(key, props);
-    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    const newStack = [...state.stack, el] as JSXElement[];
+    const newStack: JSXElement[] = castTo([...state.stack, el]);
     return { ...state, el, props: el.props, recurse: () => this.#render(ctx, renderer, el.props.children ?? [], newStack) };
   }