tungsten 0.4.12 → 0.4.13

package/dist/glob.js

@@ -0,0 +1,103 @@
+import { readdirSync } from 'fs';
+import { isAbsolute } from 'path';
+import slash from './slash.js';
+// globby's job for the patterns tungsten uses (`**`, `*`, `?`, `{a,b}`, `[…]`, `!` excludes):
+// a sync walk from each pattern's static prefix, matched with precompiled regexes. Results are
+// absolute forward-slash paths. Dot segments are skipped, node_modules is not - both as globby
+// did. Sync on purpose: node's fs.glob and a promise-per-directory walk both sat behind the
+// sync sass compile at startup (35ms standalone, ~380ms in dev), a sync walk cannot.
+const globChars = /[*?{[]/;
+function escapeRegExp(text) {
+  return text.replace(/[.+^$()|\\]/g, '\\$&');
+}
+// glob source -> regex source, no anchors
+function convert(pattern) {
+  let out = '';
+  for (let i = 0; i < pattern.length; i++) {
+    const char = pattern[i];
+    if (char === '*') {
+      if (pattern[i + 1] === '*') {
+        if (pattern[i + 2] === '/') {
+          out += '(?:[^/]*/)*';
+          i += 2;
+        } // any depth, including none
+        else {
+          out += '.*';
+          i += 1;
+        }
+      } else out += '[^/]*';
+    } else if (char === '?') {
+      out += '[^/]';
+    } else if (char === '{') {
+      const end = pattern.indexOf('}', i);
+      if (end === -1) {
+        out += '\\{';
+        continue;
+      }
+      out += `(?:${pattern.slice(i + 1, end).split(',').map(convert).join('|')})`;
+      i = end;
+    } else if (char === '[') {
+      const end = pattern.indexOf(']', i);
+      if (end === -1) {
+        out += '\\[';
+        continue;
+      }
+      const body = pattern.slice(i + 1, end);
+      out += `[${body.startsWith('!') ? '^' + body.slice(1) : body}]`;
+      i = end;
+    } else {
+      out += escapeRegExp(char ?? '');
+    }
+  }
+  return out;
+}
+export function globToRegExp(pattern) {
+  return new RegExp(`^${convert(pattern)}$`);
+}
+// the directory to walk: the segments before the first one holding a glob character
+function staticPrefix(pattern) {
+  const segments = pattern.split('/');
+  const firstGlob = segments.findIndex(segment => globChars.test(segment));
+  return (firstGlob === -1 ? segments.slice(0, -1) : segments.slice(0, firstGlob)).join('/');
+}
+function walk(dir, files = []) {
+  let entries;
+  try {
+    entries = readdirSync(dir, {
+      withFileTypes: true
+    });
+  } catch (error) {
+    if (error.code === 'ENOENT') return files; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- fs errors carry a code
+    throw error;
+  }
+  for (const entry of entries) {
+    if (entry.name.startsWith('.')) continue;
+    if (entry.isDirectory()) walk(`${dir}/${entry.name}`, files);else if (entry.isFile()) files.push(`${dir}/${entry.name}`);
+  }
+  return files;
+}
+export async function glob(patterns, options = {}) {
+  const cwd = slash(options.cwd ?? process.cwd());
+  const full = pattern => {
+    const normalised = slash(pattern);
+    return isAbsolute(normalised) ? normalised : `${cwd}/${normalised}`;
+  };
+  const list = (Array.isArray(patterns) ? patterns : [patterns]).map(slash);
+  const includes = list.filter(pattern => !pattern.startsWith('!')).map(full);
+  const excludes = list.filter(pattern => pattern.startsWith('!')).map(pattern => globToRegExp(full(pattern.slice(1))));
+  // one walk per distinct base, every include tested against each of its files
+  const byBase = new Map();
+  for (const pattern of includes) {
+    const base = staticPrefix(pattern);
+    byBase.set(base, [...(byBase.get(base) ?? []), globToRegExp(pattern)]);
+  }
+  const found = new Set();
+  for (const [base, matchers] of byBase) {
+    for (const file of walk(base)) {
+      if (!matchers.some(matcher => matcher.test(file))) continue;
+      if (excludes.some(matcher => matcher.test(file))) continue;
+      found.add(file);
+    }
+  }
+  return [...found];
+}

package/dist/helpers/getFetchCompatibleHeaders.js

@@ -11,10 +11,10 @@ export function getFetchCompatibleHeaders(req) {
     ...restHeaders
   } = req.headers;
   const headers = block(
-  // eslint-disable-line no-type-assertion/no-type-assertion -- this refers to the typecast at the end of this block: recast it as a record to avoid difficulty getting required values of partials
+  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- this refers to the typecast at the end of this block: recast it as a record to avoid difficulty getting required values of partials
   // Headers will all be strings, except for set-cookie, so we will override the types from @types/node here
   restHeaders,
-  // eslint-disable-line no-type-assertion/no-type-assertion -- countering bad typing in @types/node for 'http' incoming headers
+  // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- countering bad typing in @types/node for 'http' incoming headers
   header => header === undefined);
   return new Headers({
     ...headers

package/dist/hmr/applyHmrModule.js

@@ -32,18 +32,18 @@ export async function applyHmrModule(moduleExports, file) {
   for (const exportName in moduleExports) {
     const exported = moduleExports[exportName];
     if (typeof exported !== 'function') continue;
-    const NewType = exported; // eslint-disable-line no-type-assertion/no-type-assertion -- narrowed by typeof above, definitively a function/class value
+    const NewType = exported; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- narrowed by typeof above, definitively a function/class value
     const newKind = componentTypeKind(NewType);
     const newKey = componentTypeIdentityKey(NewType);
     currentIdentities.add(identityToken(newKind, newKey));
     // snapshot: hot-swapping unregisters the old instance and registers its replacement,
     // mutating registeredComponents mid-loop otherwise
     for (const component of [...instance.registeredComponents]) {
-      const anyComponent = component; // eslint-disable-line no-type-assertion/no-type-assertion -- every registered component is actually a class instance or FunctionElement stand-in
+      const anyComponent = component; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- every registered component is actually a class instance or FunctionElement stand-in
       if (liveComponentKind(anyComponent) !== newKind) continue;
       if (liveComponentIdentityKey(anyComponent) !== newKey) continue;
-      const swapped = AnyComponentIsFunctionComponentStandIn(anyComponent) ? await hotSwapFunctionComponent(anyComponent, NewType) // eslint-disable-line no-type-assertion/no-type-assertion -- newKind === 'function' guaranteed by the kind check above
-      : await hotSwapClassComponent(anyComponent, NewType); // eslint-disable-line no-type-assertion/no-type-assertion -- newKind === 'class' guaranteed by the kind check above
+      const swapped = AnyComponentIsFunctionComponentStandIn(anyComponent) ? await hotSwapFunctionComponent(anyComponent, NewType) // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- newKind === 'function' guaranteed by the kind check above
+      : await hotSwapClassComponent(anyComponent, NewType); // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- newKind === 'class' guaranteed by the kind check above
       if (swapped !== null) matchedCount++;
     }
   }
@@ -56,7 +56,7 @@ export async function applyHmrModule(moduleExports, file) {
         const kind = tokenKind(previousToken);
         const key = tokenKey(previousToken);
         const stillLive = [...instance.registeredComponents].some(component => {
-          const anyComponent = component; // eslint-disable-line no-type-assertion/no-type-assertion -- every registered component is actually a class instance or FunctionElement stand-in
+          const anyComponent = component; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- every registered component is actually a class instance or FunctionElement stand-in
           return liveComponentKind(anyComponent) === kind && liveComponentIdentityKey(anyComponent) === key;
         });
         if (stillLive) {

package/dist/hmr/componentIdentity.js

@@ -7,7 +7,7 @@ export function componentTypeKind(Type) {
   return AnyComponentTypeIsClassComponentType(Type) ? 'class' : 'function';
 }
 export function liveComponentType(component) {
-  return AnyComponentIsFunctionComponentStandIn(component) ? component.func : component.constructor; // eslint-disable-line no-type-assertion/no-type-assertion -- constructor of a TungstenBaseComponent instance is its component type
+  return AnyComponentIsFunctionComponentStandIn(component) ? component.func : component.constructor; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- constructor of a TungstenBaseComponent instance is its component type
 }
 export function liveComponentKind(component) {
   return AnyComponentIsFunctionComponentStandIn(component) ? 'function' : 'class';

package/dist/hmr/instanceRegistry.js

@@ -1,6 +1,6 @@
 export function setCurrentInstance(instance) {
-  globalThis.__tungstenHmrInstance = instance; // eslint-disable-line no-type-assertion/no-type-assertion -- narrowing globalThis to add one optional dev-only field
+  globalThis.__tungstenHmrInstance = instance; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- narrowing globalThis to add one optional dev-only field
 }
 export function getCurrentInstance() {
-  return globalThis.__tungstenHmrInstance; // eslint-disable-line no-type-assertion/no-type-assertion -- narrowing globalThis to add one optional dev-only field
+  return globalThis.__tungstenHmrInstance; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- narrowing globalThis to add one optional dev-only field
 }

package/dist/hooks/useReducer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useReducer.d.ts","sourceRoot":"","sources":["../../src/hooks/useReducer.ts"],"names":[],"mappings":"AAIA,wBAAgB,UAAU,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,GAAG,EAAE,UAAU,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,YAAY,EAAE,GAAG,KAAK,GAAG,SAiCtH"}
+{"version":3,"file":"useReducer.d.ts","sourceRoot":"","sources":["../../src/hooks/useReducer.ts"],"names":[],"mappings":"AAEA,wBAAgB,UAAU,CACtB,OAAO,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,KAAK,GAAG,EAAE,UAAU,EAAE,GAAG,EAC1D,IAAI,EAAE,CAAC,YAAY,EAAE,GAAG,KAAK,GAAG,SAkCnC"}

package/dist/hooks/useState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useState.d.ts","sourceRoot":"","sources":["../../src/hooks/useState.ts"],"names":[],"mappings":"AAOA,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,KAAK,IAAI,CAAA;AASrD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,GAAG,YAAY,EAAE,CAAC,SAAS,SAAS,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC,GACnG,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,IAAI,CAAC,CA4B/B"}
+{"version":3,"file":"useState.d.ts","sourceRoot":"","sources":["../../src/hooks/useState.ts"],"names":[],"mappings":"AAKA,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,KAAK,IAAI,CAAA;AAOrD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,GAAG,YAAY,EAAE,CAAC,SAAS,SAAS,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC,GACnG,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,KAAK,IAAI,CAAC,CAwB/B"}

package/dist/hooks/useState.js

@@ -1,7 +1,4 @@
 import { getCurrentComponent } from './getCurrentComponent.js';
-import { TungstenError, TungstenProductionError } from '../TungstenError.js';
-import { isDev } from '../isDev.js';
-const thisHook = 'useState';
 // overloads just so TS errs say defaultValue not args
 // export function useState<T extends undefined>(defaultValue?: T): [T, (newValue: T) => void]
 // export function useState<T>(defaultValue: T): [T, (newValue: T) => void]
@@ -9,10 +6,7 @@ const thisHook = 'useState';
 //     : [T, (newValue: T) => void] {
 export function useState(...defaultValue) {
   // what do we do here?
-  const c = getCurrentComponent();
-  if (c === undefined) {
-    if (isDev) throw new TungstenError(`Invalid call to ${thisHook} outside of a component`);else throw new TungstenProductionError();
-  }
+  const c = getCurrentComponent(); // throws outside a component
   const index = c.useStateIndex++;
   //console.log('c.state', c.state)
   //console.log('looking for'. indexOf.toString(), 'in component')
@@ -32,6 +26,6 @@ export function useState(...defaultValue) {
   } else {
     //console.log('useState initial run')
     c.state[index] = defaultValue[0];
-    return [defaultValue[0], update]; // eslint-disable-line no-type-assertion/no-type-assertion -- args[0] can only be undefined if T includes undefined 
+    return [defaultValue[0], update]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- args[0] can only be undefined if T includes undefined 
   }
 }

package/dist/hydrate/hydrate.d.ts

@@ -12,6 +12,6 @@ export type HydrateMeta = {
 };
 export declare function makeDefaultHydrateMeta(): HydrateMeta;
 export declare function hydrate(appRoutes: AppRoutes, RootComponent: TungstenBaseComponentType | null, instanceConfig: InstanceConfig): Promise<void>;
-export declare function hydrateRootComponent<ComponentType extends TungstenBaseComponentType<any, any>>(instance: Instance, RootComponent: ComponentType, domPointer: DomPointer, meta: HydrateMeta, props?: InstanceType<ComponentType>['props'], // eslint-disable-line no-type-assertion/no-type-assertion -- default only reached when Props is empty, same as the hardcoded {} this replaces
+export declare function hydrateRootComponent<ComponentType extends TungstenBaseComponentType<any, any>>(instance: Instance, RootComponent: ComponentType, domPointer: DomPointer, meta: HydrateMeta, props?: InstanceType<ComponentType>['props'], // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- default only reached when Props is empty, same as the hardcoded {} this replaces
 routeParams?: Record<string, string>, routeData?: unknown): Promise<InstanceType<ComponentType>>;
 //# sourceMappingURL=hydrate.d.ts.map

package/dist/hydrate/hydrate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hydrate.d.ts","sourceRoot":"","sources":["../../src/hydrate/hydrate.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAQnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAoBxD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAM7C,OAAO,EAAE,yBAAyB,EAAoD,MAAM,mBAAmB,CAAA;AAE/G,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAoBlD,OAAO,EAC4B,KAAK,uBAAuB,EAC9D,MAAM,oCAAoC,CAAA;AAQ3C,OAAO,0BAA0B,CAAA;AASjC,MAAM,MAAM,WAAW,GAAG;IACtB,UAAU,EAAE,OAAO,CAAA;IACnB,UAAU,EAAE,uBAAuB,EAAE,CAAA;IAGrC,WAAW,EAAE,OAAO,CAAA;CACvB,CAAA;AACD,wBAAgB,sBAAsB,IAAI,WAAW,CAEpD;AAID,wBAAsB,OAAO,CACzB,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,yBAAyB,GAAG,IAAI,EAC/C,cAAc,EAAE,cAAc,iBA2DjC;AAyBD,wBAAsB,oBAAoB,CACtC,aAAa,SAAS,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,EAEzD,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,WAAW,EAIjB,KAAK,GAAE,YAAY,CAAC,aAAa,CAAC,CAAC,OAAO,CAA8C,EAAE,8IAA8I;AACxO,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,SAAS,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CA6DtC"}
+{"version":3,"file":"hydrate.d.ts","sourceRoot":"","sources":["../../src/hydrate/hydrate.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAQnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AAmBxD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAM7C,OAAO,EAAE,yBAAyB,EAAoD,MAAM,mBAAmB,CAAA;AAE/G,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAmBlD,OAAO,EAC4B,KAAK,uBAAuB,EAC9D,MAAM,oCAAoC,CAAA;AAQ3C,OAAO,0BAA0B,CAAA;AASjC,MAAM,MAAM,WAAW,GAAG;IACtB,UAAU,EAAE,OAAO,CAAA;IACnB,UAAU,EAAE,uBAAuB,EAAE,CAAA;IAGrC,WAAW,EAAE,OAAO,CAAA;CACvB,CAAA;AACD,wBAAgB,sBAAsB,IAAI,WAAW,CAEpD;AAID,wBAAsB,OAAO,CACzB,SAAS,EAAE,SAAS,EACpB,aAAa,EAAE,yBAAyB,GAAG,IAAI,EAC/C,cAAc,EAAE,cAAc,iBA2DjC;AAyBD,wBAAsB,oBAAoB,CACtC,aAAa,SAAS,yBAAyB,CAAC,GAAG,EAAE,GAAG,CAAC,EAEzD,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,aAAa,EAC5B,UAAU,EAAE,UAAU,EACtB,IAAI,EAAE,WAAW,EAIjB,KAAK,GAAE,YAAY,CAAC,aAAa,CAAC,CAAC,OAAO,CAAM,EAAE,sJAAsJ;AACxM,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,SAAS,CAAC,EAAE,OAAO,GACpB,OAAO,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC,CA6DtC"}

package/dist/hydrate/hydrate.js

@@ -17,7 +17,6 @@ import { setCurrentComponent } from '../hooks/setCurrentComponent.js';
 import { clearCurrentComponent } from '../hooks/clearCurrentComponent.js';
 import { htmlEventHandlerKey } from '../htmlEventHandlerKey.js';
 import { packageNameCapitalized } from '../settings.js';
-import { todo } from '../todo.js';
 import { throwError } from '../throwError.js';
 import { $contentNull } from '../symbols.js';
 import { $props, $routeData, $routeParams, $type } from '../contentNodeSymbols.js';
@@ -107,7 +106,7 @@ routes) {
   } = matchedRouteInfo;
   if (key !== null) {
     if (!(key in routes)) throwError('hydrationRouting', `Route ${key} not found in routes ${routes}`);
-    const content = routes[key].content; // eslint-disable-line no-type-assertion/no-type-assertion -- we just checked
+    const content = routes[key].content; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- we just checked
     return {
       ...matchedRouteInfo,
       content
@@ -124,11 +123,11 @@ export async function hydrateRootComponent(instance, RootComponent, domPointer,
 // route data comes through the store instead - so the default reproduces that. A test
 // harness hydrating an arbitrary component (see testing/hydrateTestApp.ts) passes its own.
 props = {},
-// eslint-disable-line no-type-assertion/no-type-assertion -- default only reached when Props is empty, same as the hardcoded {} this replaces
+// eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- default only reached when Props is empty, same as the hardcoded {} this replaces
 routeParams, routeData) {
   debug('hydrateRootComponent');
   // matches createTungstenRootComponent's identical cast, the create-path equivalent of this function
-  // eslint-disable-next-line no-type-assertion/no-type-assertion
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   const element = new RootComponent({
     props,
     routeParams,
@@ -145,7 +144,7 @@ routeParams, routeData) {
   if (openingNode.nodeType !== Node.COMMENT_NODE) {
     throwError('hydrateFunctionComponent', 'expected to find a comment, but instead found ' + openingNode.toString() + ' type ' + openingNode.nodeType.toString());
   }
-  //const openingComment = openingNode as Comment // eslint-disable-line no-type-assertion/no-type-assertion
+  //const openingComment = openingNode as Comment // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
   domPointer.increment();
   const renderedTree = await hydrateNode(content, element, domPointer, instance, meta);
   debug('rendered tree after hydration', renderedTree);
@@ -153,7 +152,7 @@ routeParams, routeData) {
   if (closingNode.nodeType !== Node.COMMENT_NODE) {
     throwError('hydrateFunctionComponent', 'expected to find a comment, but instead found ' + closingNode.toString() + ' type ' + closingNode.nodeType.toString());
   }
-  //const closingComment = closingNode as Comment // eslint-disable-line no-type-assertion/no-type-assertion
+  //const closingComment = closingNode as Comment // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
   domPointer.increment();
   const domIndexCount = domPointer.index - domIndexStart;
   element.__domRegion = new DomRegion(domPointer.parent, domIndexStart, domIndexCount);
@@ -198,7 +197,7 @@ async function hydrateClassComponent(node, parentElement, domPointer, instance,
   if (openingNode.nodeType !== Node.COMMENT_NODE) {
     throwError('hydrateFunctionComponent', 'expected to find a comment, but instead found ' + openingNode.toString() + ' type ' + openingNode.nodeType.toString());
   }
-  const openingComment = openingNode; // eslint-disable-line no-type-assertion/no-type-assertion
+  const openingComment = openingNode; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
   domPointer.increment();
   //// InstantiateClassComponent???
   const element = new Component({
@@ -236,7 +235,7 @@ async function hydrateClassComponent(node, parentElement, domPointer, instance,
     if (closingNode.nodeType !== Node.COMMENT_NODE) {
       throwError('hydrateFunctionComponent', 'expected to find a comment, but instead found ' + closingNode.toString() + ' type ' + closingNode.nodeType.toString());
     }
-    const closingComment = closingNode; // eslint-disable-line no-type-assertion/no-type-assertion
+    const closingComment = closingNode; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
     domPointer.increment();
     const domIndexCount = domPointer.index - domIndexStart;
     debug('DOM region', domPointer.parent, domIndexStart, domIndexCount);
@@ -261,7 +260,7 @@ async function hydrateClassComponent(node, parentElement, domPointer, instance,
     if (closingNode.nodeType !== Node.COMMENT_NODE) {
       throwError('hydrateFunctionComponent', 'expected to find a comment, but instead found ' + closingNode.toString() + ' type ' + closingNode.nodeType.toString());
     }
-    const closingComment = closingNode; // eslint-disable-line no-type-assertion/no-type-assertion
+    const closingComment = closingNode; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
     domPointer.increment();
     const domIndexCount = domPointer.index - domIndexStart;
     debug('DOM region', domPointer.parent, domIndexStart, domIndexCount);
@@ -347,14 +346,14 @@ async function hydrateFunctionComponent(node, parentElement, domPointer, instanc
   if (openingNode.nodeType !== Node.COMMENT_NODE) {
     throwError('hydrateFunctionComponent', 'expected to find a comment, but instead found ' + openingNode.toString() + ' type ' + openingNode.nodeType.toString());
   }
-  const openingComment = openingNode; // eslint-disable-line no-type-assertion/no-type-assertion
+  const openingComment = openingNode; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
   domPointer.increment();
   const renderedTree = await hydrateNode(content, functionComponentStandIn, domPointer, instance, meta);
   const closingNode = domPointer.get();
   if (closingNode.nodeType !== Node.COMMENT_NODE) {
     throwError('hydrateFunctionComponent', 'expected to find a comment, but instead found ' + closingNode.toString() + ' type ' + closingNode.nodeType.toString());
   }
-  const closingComment = closingNode; // eslint-disable-line no-type-assertion/no-type-assertion
+  const closingComment = closingNode; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
   domPointer.increment();
   const domIndexCount = domPointer.index - domIndexStart;
   functionComponentStandIn.__domRegion = new DomRegion(domPointer.parent, domIndexStart, domIndexCount);
@@ -463,11 +462,11 @@ async function hydrateNodeSingle(node, parentElement, domPointer, instance, meta
     instance.persistentHeadChildren = persistentHeadChildren;
     debug('head node - skipping, because we add a lot to this during initial render, breaking matching');
     domPointer.increment();
-    //return { [$type]: $head, domNode: node as HTMLElement } // eslint-disable-line no-type-assertion/no-type-assertion
+    //return { [$type]: $head, domNode: node as HTMLElement } // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
     return {
       [$type]: 'head',
       domNode: node
-    }; // eslint-disable-line no-type-assertion/no-type-assertion
+    }; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
   }
   if (ContentNodeIsHtml(node)) {
     // HTML el
@@ -621,15 +620,18 @@ function hydrateAttributes(node, domNode, meta) {
       debug(`adding ${key} event handler for`, node);
       debug('domNode', domNode);
       const eventName = htmlEvents[key];
-      //domNode.addEventListener(eventName as keyof HTMLElementEventMap, eventListener)
-      todo('addAttributes() warning - ensure type safety of event name'); // 
-      todo('addAttributes() warning - ensure type safety of event listener'); //
       const handler = node[$props][key];
+      // JSX types the prop as a handler; a non-function is a spread of foreign props or a raw
+      // content tree, and addEventListener would throw a bare TypeError for it
+      if (isDev && typeof handler !== 'function') {
+        const tag = typeof node[$type] === 'string' ? node[$type] : '(component)';
+        throwError('hydrate', `<${tag}> ${key} is ${typeof handler}, not a function`);
+      }
       // // if its a button without type="submit", prevent default to stop it from submitting forms
       // const handler = (key === 'onClick' && node[$type] === 'button' && node[$props].type !== 'submit')
       //     ? (event: Event) => { event.preventDefault(); return (node[$props][key] as EventListener)(event) } 
       //     : node[$props][key] as EventListener
-      domNode.addEventListener(eventName, handler);
+      domNode.addEventListener(eventName, handler); // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- a function is all the DOM checks
       domNode[htmlEventHandlerKey(eventName)] = handler;
     } else if (key === 'bind' && ContentNodeElementIsHtml(node)) {
       const eventName = 'input';
@@ -673,7 +675,7 @@ function hydrateAttributes(node, domNode, meta) {
     } else if (key === 'bindChecked' && ContentNodeElementIsHtml(node)) {
       // not checking that el is bindable, don't think its necessary
       debug('binding checked');
-      const [bindObject, bindKey] = node[$props][key]; // eslint-disable-line no-type-assertion/no-type-assertion
+      const [bindObject, bindKey] = node[$props][key]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
       domNode.checked = bindObject[bindKey];
       const eventName = 'input';
       //let handler
@@ -684,7 +686,7 @@ function hydrateAttributes(node, domNode, meta) {
       //     }
       // } else {
       const handler = event => {
-        bindObject[bindKey] = event.target.checked; // eslint-disable-line no-type-assertion/no-type-assertion
+        bindObject[bindKey] = event.target.checked; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
       };
       //}
       domNode.addEventListener(eventName, handler);
@@ -695,23 +697,23 @@ function hydrateAttributes(node, domNode, meta) {
     } else if (key === 'bindRadio' && ContentNodeElementIsHtml(node)) {
       // not checking that el is bindable, don't think its necessary
       debug('binding radio');
-      const [bindObject, bindKey] = node[$props][key]; // eslint-disable-line no-type-assertion/no-type-assertion
+      const [bindObject, bindKey] = node[$props][key]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
       domNode.checked = node[$props].value === bindObject[bindKey];
       const eventName = 'change';
       //let handler
       // if ('filter' in node[$props]) {
-      //     const filterFunc = node[$props].filter as FilterCheckedFunc<any, any> // eslint-disable-line no-type-assertion/no-type-assertion
+      //     const filterFunc = node[$props].filter as FilterCheckedFunc<any, any> // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
       //     handler = async (event: HTMLElementEventMap['change']) => {
       //         console.log('radio changed handler')
-      //         bindObject[bindKey] = await filterFunc((event.target as HTMLCheckedBindableElement).checked, event) // eslint-disable-line no-type-assertion/no-type-assertion
+      //         bindObject[bindKey] = await filterFunc((event.target as HTMLCheckedBindableElement).checked, event) // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
       //     }
       // } else {
       const handler = event => {
         console.log('bound radio changed 1');
-        bindObject[bindKey] = event.target.value; // eslint-disable-line no-type-assertion/no-type-assertion
+        bindObject[bindKey] = event.target.value; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
       };
       //}
-      // eslint-disable-next-line no-type-assertion/no-type-assertion
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
       domNode.addEventListener(eventName, handler);
       domNode['onchange'] = handler;
       domNode[htmlEventHandlerKey(eventName)] = handler;

package/dist/hydrate/reconcileHydratedAttributes.js

@@ -16,13 +16,13 @@ function attributeValue(name, value) {
 function removeAttribute(domNode, name) {
   // checked is both an attribute and live state, and the attribute alone only
   // sets the default. Clear both, or the box stays ticked.
-  // eslint-disable-next-line no-type-assertion/no-type-assertion
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   if (name === 'checked') domNode.checked = false;
   domNode.removeAttribute(name);
 }
 function setAttribute(domNode, name, value) {
   domNode.setAttribute(name, value);
-  // eslint-disable-next-line no-type-assertion/no-type-assertion
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
   if (name === 'checked') domNode.checked = true;
 }
 /**

package/dist/makeFinalConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"makeFinalConfig.d.ts","sourceRoot":"","sources":["../src/makeFinalConfig.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACR,eAAe,EAAE,uBAAuB,EAAE,wBAAwB,EACrE,MAAM,sBAAsB,CAAA;AAG7B,wBAAgB,eAAe,CAC3B,UAAU,EAAE,eAAe,EAC3B,SAAS,GAAE,wBAAwB,GAAG,IAAW,GAClD,uBAAuB,CAiBzB"}
+{"version":3,"file":"makeFinalConfig.d.ts","sourceRoot":"","sources":["../src/makeFinalConfig.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACR,eAAe,EAAE,uBAAuB,EAAE,wBAAwB,EACrE,MAAM,sBAAsB,CAAA;AAG7B,wBAAgB,eAAe,CAC3B,UAAU,EAAE,eAAe,EAC3B,SAAS,GAAE,wBAAwB,GAAG,IAAW,GAClD,uBAAuB,CAiBzB"}

package/dist/makeFinalConfig.js

@@ -3,14 +3,14 @@ export function makeFinalConfig(userConfig, overrides = null) {
   const finalConfig = structuredClone(defaultConfig);
   for (const key in userConfig) {
     //if (Object.prototype.hasOwnProperty.call(userConfig, key)) { // github co-pilot suggestion, unsure if needed
-    finalConfig[key] = userConfig[key]; // eslint-disable-line no-type-assertion/no-type-assertion
+    finalConfig[key] = userConfig[key]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
     //}
   }
   // an override left undefined keeps the user config / default value
   for (const key in overrides) {
     const value = overrides[key];
     if (value === undefined) continue;
-    finalConfig[key] = value; // eslint-disable-line no-type-assertion/no-type-assertion
+    finalConfig[key] = value; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion
   }
   return finalConfig;
 }

package/dist/markOptionSelected.js

@@ -10,7 +10,7 @@ function collectOptionText(node) {
   }
   if (typeof node === 'string' || typeof node === 'number') return String(node);
   if (typeof node !== 'object') return '';
-  const element = node; // eslint-disable-line no-type-assertion/no-type-assertion -- content and rendering nodes are both { [$type], [$props] }
+  const element = node; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- content and rendering nodes are both { [$type], [$props] }
   if (element[$type] === 'script' || typeof element[$props]?.__html === 'string') return '';
   return collectOptionText(element[$props]?.children);
 }

package/dist/mergeConfigs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mergeConfigs.d.ts","sourceRoot":"","sources":["../src/mergeConfigs.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAI3D,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,CAU3H"}
+{"version":3,"file":"mergeConfigs.d.ts","sourceRoot":"","sources":["../src/mergeConfigs.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAc3D,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,eAAe,CAAC,GAAG,OAAO,CAAC,eAAe,CAAC,CAU3H"}

package/dist/mergeConfigs.js

@@ -1,5 +1,14 @@
-import cloneDeep from 'lodash.clonedeep';
-// can we use structured close?
+// plain data is copied, anything else (functions, class instances) kept by reference - config
+// carries babel plugins, which structuredClone would reject
+function cloneDeep(value) {
+  if (Array.isArray(value)) return value.map(cloneDeep); // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- array in, array out
+  if (typeof value === 'object' && value !== null && Object.getPrototypeOf(value) === Object.prototype) {
+    const copy = {};
+    for (const [key, entry] of Object.entries(value)) copy[key] = cloneDeep(entry);
+    return copy; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- same shape as the input
+  }
+  return value;
+}
 export function mergeConfigs(config1, config2) {
   const newConfig = cloneDeep(config1);
   for (const key in config2) {

package/dist/mutatingFunctions.js

@@ -2,14 +2,14 @@ export const arrayMutatingFunctions = ['push', 'pop', 'shift', 'unshift', 'sort'
 export const mapMutatingFunctions = ['set', 'delete', 'clear'];
 export const setMutatingFunctions = ['add', 'delete', 'clear'];
 export function KeyIsArrayMutatingFunction(key) {
-  // eslint-disable-next-line no-type-assertion/no-type-assertion -- weird TS issue, won't let us search in a const array
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- weird TS issue, won't let us search in a const array
   return arrayMutatingFunctions.includes(key);
 }
 export function KeyIsMapMutatingFunction(key) {
-  // eslint-disable-next-line no-type-assertion/no-type-assertion -- weird TS issue, won't let us search in a const array
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- weird TS issue, won't let us search in a const array
   return mapMutatingFunctions.includes(key);
 }
 export function KeyIsSetMutatingFunction(key) {
-  // eslint-disable-next-line no-type-assertion/no-type-assertion -- weird TS issue, won't let us search in a const array
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- weird TS issue, won't let us search in a const array
   return setMutatingFunctions.includes(key);
 }

package/dist/postcssPlugins/TransformCssNames.js

@@ -178,11 +178,11 @@ export const TransformCssNames = opts => {
               const pseudoClassRegex = /:([a-zA-Z0-9-_]+)(?:\((.*)\))?/;
               const results = pseudoClassRegex.exec(content);
               if (results === null) throwError('TransformCssNames -> walkRules', 'pseudo-class selector did not match pseudo-class regex');
-              const label = results[1]; // eslint-disable-line no-type-assertion/no-type-assertion -- typings are incorrect
+              const label = results[1]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- typings are incorrect
               // if it is :i(xxx) or :ignore(xxx), pass through the internal part
               // otherwise pass all through unaffected
               if (label === 'i' || label === 'ignore') {
-                const inner = results[2]; // eslint-disable-line no-type-assertion/no-type-assertion -- typings are incorrect
+                const inner = results[2]; // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- typings are incorrect
                 if (inner !== undefined && inner !== '') {
                   newSelectors.push(inner);
                 }

package/dist/rawHtml/parseHtml.js

@@ -134,7 +134,7 @@ export function parseHtml(html, options = {}) {
   const current = () => stack[stack.length - 1];
   const close = downTo => {
     while (stack.length > downTo) {
-      const element = stack.pop(); // eslint-disable-line no-type-assertion/no-type-assertion -- guarded by the loop
+      const element = stack.pop(); // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion -- guarded by the loop
       if (element.removal === 'drop') continue;
       if (element.removal === 'unwrap') current().children.push(...element.children);else current().children.push(toContentNode(element));
     }

package/dist/render/componentNodeToRenderingTree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"componentNodeToRenderingTree.d.ts","sourceRoot":"","sources":["../../src/render/componentNodeToRenderingTree.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,EACH,KAAK,sBAAsB,EAG9B,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAqD,KAAK,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAGhH,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAKjD,wBAAsB,4BAA4B,CAC9C,aAAa,EAAE,oBAAoB,EAAE,eAAe,EAAE,YAAY,GAAG,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,GACjH,OAAO,CAAC,sBAAsB,CAAC,CA6CjC"}
+{"version":3,"file":"componentNodeToRenderingTree.d.ts","sourceRoot":"","sources":["../../src/render/componentNodeToRenderingTree.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,EACH,KAAK,sBAAsB,EAG9B,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAqD,KAAK,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AAGhH,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAKjD,wBAAsB,4BAA4B,CAC9C,aAAa,EAAE,oBAAoB,EAAE,eAAe,EAAE,YAAY,GAAG,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,GACjH,OAAO,CAAC,sBAAsB,CAAC,CAmCjC"}

package/dist/render/componentNodeToRenderingTree.js

@@ -10,24 +10,13 @@ export async function componentNodeToRenderingTree(componentNode, parentComponen
   const render = componentNode[$type].render;
   //console.log('render', render)
   if (render) {
-    let location;
-    let placeholder = null;
-    if (typeof render === 'string') {
-      location = render;
+    // ComponentRenderInfo only knows the client location; the object form adds a placeholder
+    const placeholder = typeof render === 'object' && 'placeholder' in render ? render.placeholder : null;
+    const placeholderTree = await contentTreeToRenderingTree(placeholder, parentComponent, instance, noEscape);
+    if (ContentNodeComponentIsClassComponent(componentNode)) {
+      return makeRenderingNodeClassComponentFromContentNodeClassComponent(componentNode, null, placeholderTree, true);
     } else {
-      location = render.location;
-      if (typeof render === 'object' && 'placeholder') {
-        // not sure what this is
-        placeholder = render.placeholder;
-      }
-    }
-    if (location === 'client') {
-      const placeholderTree = await contentTreeToRenderingTree(placeholder, parentComponent, instance, noEscape);
-      if (ContentNodeComponentIsClassComponent(componentNode)) {
-        return makeRenderingNodeClassComponentFromContentNodeClassComponent(componentNode, null, placeholderTree, true);
-      } else {
-        return makeRenderingNodeFunctionComponentFromContentNodeFunctionComponent(componentNode, null, placeholderTree, true);
-      }
+      return makeRenderingNodeFunctionComponentFromContentNodeFunctionComponent(componentNode, null, placeholderTree, true);
     }
   }
   //console.log('componentRenderToTree component', component)

package/dist/render/contentToHtml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contentToHtml.d.ts","sourceRoot":"","sources":["../../src/render/contentToHtml.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,KAAK,EAAY,YAAY,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAEpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAMvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAI9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAA;AAGrE,wBAAsB,aAAa,CAC/B,eAAe,EAAE,eAAe,EAAE,mBAAmB,EAAE,aAAa,EACpE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EACxC,MAAM,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,YAAY,EACnE,iBAAiB,GAAE,sBAAkC,EAAE,GAAG,UAAQ,GACnE,OAAO,CAAC,MAAM,CAAC,CAuDjB"}
+{"version":3,"file":"contentToHtml.d.ts","sourceRoot":"","sources":["../../src/render/contentToHtml.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAA;AAClE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,KAAK,EAAY,YAAY,EAAE,MAAM,eAAe,CAAA;AAC3D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAA;AAIvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAA;AAG9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAA;AAGrE,wBAAsB,aAAa,CAC/B,eAAe,EAAE,eAAe,EAAE,mBAAmB,EAAE,aAAa,EACpE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EACxC,MAAM,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,YAAY,EACnE,iBAAiB,GAAE,sBAAkC,EAAE,GAAG,UAAQ,GACnE,OAAO,CAAC,MAAM,CAAC,CAuDjB"}

package/dist/render/contentToHtml.js

@@ -4,7 +4,7 @@ import { RenderingNodeIsElement } from '../RenderingNode.js';
 import { contentTreeToRenderingTree } from './contentTreeToRenderingTree.js';
 import { cliWarn } from 'tungsten/cliOutput.js';
 export async function contentToHtml(compilationInfo, clientImportAliases, content, instance, config, siteBasePathOverride, tungstenPublicEnv = undefined, dev = false) {
-  // const rootNode = { // eslint-disable-line no-type-assertion/no-type-assertion 
+  // const rootNode = { // eslint-disable-line @typescript-eslint/no-unsafe-type-assertion 
   //     [$type]: RootComponentClass,    // TypeScript needs some help to understand that { type: AnyComponentType }
   //     [$props]: {}                   // is equivalent to { type: ClassComponentTypeAny } | { type: FunctionComponentTypeAny } (type names simplified here)
   // } as ContentNodeComponent

package/dist/render/getFunctionBodyAsString.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getFunctionBodyAsString.d.ts","sourceRoot":"","sources":["../../src/render/getFunctionBodyAsString.ts"],"names":[],"mappings":"AAEA,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,QAAQ,UAcrD;AAID,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,CAgBlE"}
+{"version":3,"file":"getFunctionBodyAsString.d.ts","sourceRoot":"","sources":["../../src/render/getFunctionBodyAsString.ts"],"names":[],"mappings":"AAEA,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,QAAQ,UAcrD;AAID,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,GAAG,IAAI,CAYlE"}

package/dist/render/getFunctionBodyAsString.js

@@ -17,11 +17,8 @@ export function getFunctionBodyAsString(func) {
 export function getArrowFunctionBody(func) {
   // Not sure about this RegEx, probably from google
   const regex = /^(?:\s*\(?(?:\s*\w*\s*,?\s*)*\)?\s*?=>\s*){?([\s\S]*)}?$/;
-  const matches = func.toString().match(regex); // eslint-disable-line no-type-assertion/no-type-assertion -- regex has a capture group
-  if (!matches) {
-    return null;
-  }
-  const firstPass = matches[1];
+  const firstPass = func.toString().match(regex)?.[1];
+  if (firstPass === undefined) return null;
   // Needed because the RegExp doesn't handle the last '}'.
   const secondPass = (firstPass.match(/{/g) || []).length === (firstPass.match(/}/g) || []).length - 1 ? firstPass.slice(0, firstPass.lastIndexOf('}')) : firstPass;
   return secondPass;