sveld 0.22.4 → 0.22.5

package/lib/ComponentParser.js

@@ -485,7 +485,7 @@ class ComponentParser {
                             replace: false,
                         };
                         if (value === undefined)
-                            return {};
+                            return slot_props;
                         if (value[0]) {
                             const { type, expression, raw, start, end } = value[0];
                             if (type === "Text") {
@@ -606,9 +606,10 @@ class ComponentParser {
                     element: element,
                     description: event_description,
                 };
-                // Only preserve detail if it was explicitly set and is not "null"
-                // (null means no detail was specified in @event tag)
-                if (event.detail !== undefined && event.detail !== "null") {
+                // Preserve detail type if it was explicitly set in @event tag
+                // Note: "null" is a valid explicit type (e.g., @event {null} eventname)
+                // Only skip if detail is truly undefined or the string "undefined"
+                if (event.detail !== undefined && event.detail !== "undefined") {
                     forwardedEvent.detail = event.detail;
                 }
                 this.events.set(eventName, forwardedEvent);
@@ -639,16 +640,9 @@ class ComponentParser {
                         if (slot_props[key].replace && slot_props[key].value !== undefined) {
                             slot_props[key].value = this.props.get(slot_props[key].value)?.type;
                         }
-                        let propValue = slot_props[key].value;
-                        if (propValue === undefined) {
-                            propValue = "any";
-                        }
-                        else if (typeof propValue === "string" && propValue.startsWith("{")) {
-                            // If the value starts with {, it's a complex expression
-                            // Use 'any' to avoid invalid TypeScript syntax
-                            propValue = "any";
-                        }
-                        new_props.push(`${key}: ${propValue}`);
+                        if (slot_props[key].value === undefined)
+                            slot_props[key].value = "any";
+                        new_props.push(`${key}: ${slot_props[key].value}`);
                     });
                     const formatted_slot_props = new_props.length === 0 ? "{}" : `{ ${new_props.join(", ")} }`;
                     return { ...slot, slot_props: formatted_slot_props };

package/lib/writer/writer-ts-definitions.js

@@ -168,6 +168,108 @@ function genEventDef(def) {
             return detail;
         return `CustomEvent<${detail}>`;
     };
+    // Check if an event name is a standard DOM event that exists in WindowEventMap
+    const isStandardDomEvent = (eventName) => {
+        // Standard DOM events that should use WindowEventMap
+        const standardEvents = new Set([
+            // Mouse events
+            "click",
+            "dblclick",
+            "mousedown",
+            "mouseup",
+            "mousemove",
+            "mouseover",
+            "mouseout",
+            "mouseenter",
+            "mouseleave",
+            "contextmenu",
+            "wheel",
+            // Keyboard events
+            "keydown",
+            "keyup",
+            "keypress",
+            // Form events
+            "submit",
+            "change",
+            "input",
+            "focus",
+            "blur",
+            "focusin",
+            "focusout",
+            "reset",
+            "select",
+            // Touch events
+            "touchstart",
+            "touchend",
+            "touchmove",
+            "touchcancel",
+            // Drag events
+            "drag",
+            "dragstart",
+            "dragend",
+            "dragover",
+            "dragenter",
+            "dragleave",
+            "drop",
+            // Pointer events
+            "pointerdown",
+            "pointerup",
+            "pointermove",
+            "pointerover",
+            "pointerout",
+            "pointerenter",
+            "pointerleave",
+            "pointercancel",
+            "gotpointercapture",
+            "lostpointercapture",
+            // Media events
+            "play",
+            "pause",
+            "ended",
+            "volumechange",
+            "timeupdate",
+            "loadeddata",
+            "loadedmetadata",
+            "canplay",
+            "canplaythrough",
+            "seeking",
+            "seeked",
+            "playing",
+            "waiting",
+            "stalled",
+            "suspend",
+            "abort",
+            "error",
+            "emptied",
+            "ratechange",
+            "durationchange",
+            "loadstart",
+            "progress",
+            "loadend",
+            // Animation/Transition events
+            "animationstart",
+            "animationend",
+            "animationiteration",
+            "animationcancel",
+            "transitionstart",
+            "transitionend",
+            "transitionrun",
+            "transitioncancel",
+            // Other events
+            "scroll",
+            "resize",
+            "load",
+            "unload",
+            "beforeunload",
+            "cut",
+            "copy",
+            "paste",
+            "compositionstart",
+            "compositionupdate",
+            "compositionend",
+        ]);
+        return standardEvents.has(eventName);
+    };
     if (def.events.length === 0)
         return EMPTY_EVENTS;
     const events_map = def.events
@@ -181,18 +283,26 @@ function genEventDef(def) {
             eventType = createDispatchedEvent(event.detail);
         }
         else {
-            // For forwarded events, check if it's from a native HTML element or a component
-            // If element starts with uppercase, it's a component, so treat as CustomEvent
-            // Also check if the forwarded event has detail type information preserved
+            // For forwarded events, determine the type based on @event JSDoc and element/event type
             const elementName = typeof event.element === "string" ? event.element : event.element.name;
             const isComponent = elementName && /^[A-Z]/.test(elementName);
-            const hasDetail = event.detail && event.detail !== "undefined" && event.detail !== "null";
-            if (isComponent || hasDetail) {
+            const isStandardEvent = !isComponent || isStandardDomEvent(event.name);
+            // Check if there's an explicit non-null detail type from @event JSDoc
+            // Note: detail="null" on standard DOM events is treated as "not explicitly typed"
+            // because @event click (without {type}) defaults to null but shouldn't override WindowEventMap
+            const hasExplicitNonNullDetail = event.detail !== undefined && event.detail !== "undefined" && !(event.detail === "null" && isStandardEvent);
+            if (hasExplicitNonNullDetail) {
+                // If @event tag explicitly provides a non-null detail type, always use it (highest priority)
                 eventType = createDispatchedEvent(event.detail);
             }
-            else {
+            else if (isStandardEvent) {
+                // Standard DOM event (native element or standard event name) without explicit type
                 eventType = `${mapEvent()}["${event.name}"]`;
             }
+            else {
+                // Custom event from component with no explicit type or explicit null
+                eventType = event.detail === "null" ? createDispatchedEvent("null") : createDispatchedEvent();
+            }
         }
         return `${description}${clampKey(event.name)}: ${eventType};\n`;
     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sveld",
-  "version": "0.22.4",
+  "version": "0.22.5",
   "license": "Apache-2.0",
   "description": "Generate TypeScript definitions for your Svelte components.",
   "main": "./lib/index.js",