move computation of event def to event-handler

packages/svelte2tsx/src/nodes/event-handler.ts

@@ -1,4 +1,4 @@
-import { Node } from "estree-walker";
+import { Node } from 'estree-walker';
 
 export function createEventHandlerTransformer() {
     const events = new Map<string, string | string[]>();
@@ -16,7 +16,7 @@ export function createEventHandlerTransformer() {
 
         // pass-through/ bubble
         if (!node.expression) {
-            if (parent.type === "InlineComponent") {
+            if (parent.type === 'InlineComponent') {
                 handleEventHandlerBubble();
             } else {
                 events.set(
@@ -35,13 +35,29 @@ export function createEventHandlerTransformer() {
 
 function getEventDefExpressionForNonCompoent(eventName: string, ele: Node) {
     switch (ele.type) {
-        case "Element":
+        case 'Element':
             return `__sveltets_mapElementEvent('${eventName}')`;
-        case "Body":
+        case 'Body':
             return `__sveltets_mapBodyEvent('${eventName}')`;
-        case "Window":
+        case 'Window':
             return `__sveltets_mapWindowEvent('${eventName}')`;
         default:
             break;
     }
 }
+
+export function eventMapToString(events: Map<string, string | string[]>) {
+    return '{' +
+        Array.from(events.entries()).map(eventMapEntryToString).join(', ') +
+        '}';
+
+}
+
+function eventMapEntryToString([eventName, expression]: [
+    string,
+    string | string[]
+]) {
+    return `'${eventName}':${
+        Array.isArray(expression) ? `[${expression}]` : expression
+        }`;
+}

packages/svelte2tsx/src/svelte2tsx.ts

@@ -6,7 +6,7 @@ import { parseHtmlx } from './htmlxparser';
 import { convertHtmlxToJsx } from './htmlxtojsx';
 import { Node } from 'estree-walker';
 import * as ts from 'typescript';
-import { createEventHandlerTransformer } from './nodes/event-handler';
+import { createEventHandlerTransformer, eventMapToString } from './nodes/event-handler';
 import { findExortKeyword } from './utils/tsAst';
 import { ExportedNames, InstanceScriptProcessResult, CreateRenderFunctionPara } from './interfaces';
 import { createRenderFunctionGetterStr, createClassGetters } from './nodes/exportgetters';
@@ -968,23 +968,13 @@ function createRenderFunction({
             .join(', ') +
         '}';
 
-    const eventMapEntryToString = ([evnetName, expression]: [
-        string,
-        string | string[]
-    ]) =>
-        `'${evnetName}':${
-        Array.isArray(expression) ? `[${expression}]` : expression
-        }`;
-    const eventsDef =
-        "{" +
-        Array.from(events.entries()).map(eventMapEntryToString).join(", ") +
-        "}";
+
 
     const returnString =
         `\nreturn { props: ${createPropsStr(
             exportedNames
         )}, slots: ${slotsAsDef}, getters: ${createRenderFunctionGetterStr(getters)}` +
-        `, events: ${eventsDef} }}`;
+        `, events: ${eventMapToString(events)} }}`;
     str.append(returnString);
 }