svelte2tsx 0.4.10 → 0.4.11

package/index.d.ts

@@ -55,7 +55,7 @@ export function svelte2tsx(
     }
 ): SvelteCompiledToTsx
 
-export interface EmitDtsConig {
+export interface EmitDtsConfig {
     /**
      * Where to output the declaration files
      */
@@ -74,10 +74,14 @@ export interface EmitDtsConig {
     libRoot?: string;
 }
 
+// to make typo fix non-breaking, continue to export the old name but mark it as deprecated
+/**@deprecated*/
+export interface EmitDtsConig extends EmitDtsConfig {} /* eslint-disable-line @typescript-eslint/no-empty-interface */
+
 /**
  * Searches for a jsconfig or tsconfig starting at `root` and emits d.ts files
  * into `declarationDir` using the ambient file from `svelteShimsPath`.
  * Note: Handwritten `d.ts` files are not copied over; TypeScript does not
  * touch these files.
  */
-export function emitDts(config: EmitDtsConig): Promise<void>;
+export function emitDts(config: EmitDtsConfig): Promise<void>;

package/index.js

@@ -3767,9 +3767,6 @@ class ExportedNames {
             `\n    /**accessor*/\n    set ${name}(_) {}`)
             .join('');
     }
-    setUses$$Props() {
-        this.uses$$Props = true;
-    }
     /**
      * Marks a top level declaration as a possible export
      * which could be exported through `export { .. }` later.
@@ -3866,6 +3863,9 @@ class ExportedNames {
                 '...__sveltets_1_ensureRightProps<Partial<$$Props>>({' +
                 this.createReturnElements(lets, false).join(',') +
                 '}), ...{} as unknown as $$Props, ...{' +
+                // We add other exports of classes and functions here because
+                // they need to appear in the props object in order to properly
+                // type bind:xx but they are not needed to be part of $$Props
                 this.createReturnElements(others, false).join(', ') +
                 '} as {' +
                 this.createReturnElementsType(others).join(',') +
@@ -4861,7 +4861,7 @@ function processInstanceScriptContent(str, script, events, implicitStoreValues,
             uses$$SlotsInterface = true;
         }
         if (is$$PropsDeclaration(node)) {
-            exportedNames.setUses$$Props();
+            exportedNames.uses$$Props = true;
         }
         if (ts__namespace.isVariableStatement(node)) {
             exportedNames.handleVariableStatement(node, parent);
@@ -5072,7 +5072,7 @@ function addComponentExport(params) {
         addSimpleComponentExport(params);
     }
 }
-function addGenericsComponentExport({ strictEvents, uses$$propsOr$$restProps, exportedNames, componentDocumentation, fileName, mode, usesAccessors, str, generics }) {
+function addGenericsComponentExport({ strictEvents, canHaveAnyProp, exportedNames, componentDocumentation, fileName, mode, usesAccessors, str, generics }) {
     const genericsDef = generics.toDefinitionString();
     const genericsRef = generics.toReferencesString();
     const doc = componentDocumentation.getFormatted();
@@ -5083,7 +5083,7 @@ function addGenericsComponentExport({ strictEvents, uses$$propsOr$$restProps, ex
     let statement = `
 class __sveltets_Render${genericsDef} {
     props() {
-        return ${props(true, uses$$propsOr$$restProps, exportedNames, `render${genericsRef}()`)}.props;
+        return ${props(true, canHaveAnyProp, exportedNames, `render${genericsRef}()`)}.props;
     }
     events() {
         return ${events(strictEvents, `render${genericsRef}()`)}.events;
@@ -5112,8 +5112,8 @@ class __sveltets_Render${genericsDef} {
     }
     str.append(statement);
 }
-function addSimpleComponentExport({ strictEvents, isTsFile, uses$$propsOr$$restProps, exportedNames, componentDocumentation, fileName, mode, usesAccessors, str }) {
-    const propDef = props(isTsFile, uses$$propsOr$$restProps, exportedNames, events(strictEvents, 'render()'));
+function addSimpleComponentExport({ strictEvents, isTsFile, canHaveAnyProp, exportedNames, componentDocumentation, fileName, mode, usesAccessors, str }) {
+    const propDef = props(isTsFile, canHaveAnyProp, exportedNames, events(strictEvents, 'render()'));
     const doc = componentDocumentation.getFormatted();
     const className = fileName && classNameFromFilename(fileName, mode !== 'dts');
     let statement;
@@ -5151,13 +5151,13 @@ function addSimpleComponentExport({ strictEvents, isTsFile, uses$$propsOr$$restP
 function events(strictEvents, renderStr) {
     return strictEvents ? renderStr : `__sveltets_1_with_any_event(${renderStr})`;
 }
-function props(isTsFile, uses$$propsOr$$restProps, exportedNames, renderStr) {
+function props(isTsFile, canHaveAnyProp, exportedNames, renderStr) {
     if (isTsFile) {
-        return uses$$propsOr$$restProps ? `__sveltets_1_with_any(${renderStr})` : renderStr;
+        return canHaveAnyProp ? `__sveltets_1_with_any(${renderStr})` : renderStr;
     }
     else {
         const optionalProps = exportedNames.createOptionalPropsArray();
-        const partial = `__sveltets_1_partial${uses$$propsOr$$restProps ? '_with_any' : ''}`;
+        const partial = `__sveltets_1_partial${canHaveAnyProp ? '_with_any' : ''}`;
         return optionalProps.length > 0
             ? `${partial}([${optionalProps.join(',')}], ${renderStr})`
             : `${partial}(${renderStr})`;
@@ -5518,7 +5518,7 @@ function svelte2tsx(svelte, options = {}) {
     }
     addComponentExport({
         str,
-        uses$$propsOr$$restProps: uses$$props || uses$$restProps,
+        canHaveAnyProp: !exportedNames.uses$$Props && (uses$$props || uses$$restProps),
         strictEvents: events.hasStrictEvents(),
         isTsFile: options === null || options === void 0 ? void 0 : options.isTsFile,
         exportedNames,

package/index.mjs

@@ -3737,9 +3737,6 @@ class ExportedNames {
             `\n    /**accessor*/\n    set ${name}(_) {}`)
             .join('');
     }
-    setUses$$Props() {
-        this.uses$$Props = true;
-    }
     /**
      * Marks a top level declaration as a possible export
      * which could be exported through `export { .. }` later.
@@ -3836,6 +3833,9 @@ class ExportedNames {
                 '...__sveltets_1_ensureRightProps<Partial<$$Props>>({' +
                 this.createReturnElements(lets, false).join(',') +
                 '}), ...{} as unknown as $$Props, ...{' +
+                // We add other exports of classes and functions here because
+                // they need to appear in the props object in order to properly
+                // type bind:xx but they are not needed to be part of $$Props
                 this.createReturnElements(others, false).join(', ') +
                 '} as {' +
                 this.createReturnElementsType(others).join(',') +
@@ -4831,7 +4831,7 @@ function processInstanceScriptContent(str, script, events, implicitStoreValues,
             uses$$SlotsInterface = true;
         }
         if (is$$PropsDeclaration(node)) {
-            exportedNames.setUses$$Props();
+            exportedNames.uses$$Props = true;
         }
         if (ts.isVariableStatement(node)) {
             exportedNames.handleVariableStatement(node, parent);
@@ -5042,7 +5042,7 @@ function addComponentExport(params) {
         addSimpleComponentExport(params);
     }
 }
-function addGenericsComponentExport({ strictEvents, uses$$propsOr$$restProps, exportedNames, componentDocumentation, fileName, mode, usesAccessors, str, generics }) {
+function addGenericsComponentExport({ strictEvents, canHaveAnyProp, exportedNames, componentDocumentation, fileName, mode, usesAccessors, str, generics }) {
     const genericsDef = generics.toDefinitionString();
     const genericsRef = generics.toReferencesString();
     const doc = componentDocumentation.getFormatted();
@@ -5053,7 +5053,7 @@ function addGenericsComponentExport({ strictEvents, uses$$propsOr$$restProps, ex
     let statement = `
 class __sveltets_Render${genericsDef} {
     props() {
-        return ${props(true, uses$$propsOr$$restProps, exportedNames, `render${genericsRef}()`)}.props;
+        return ${props(true, canHaveAnyProp, exportedNames, `render${genericsRef}()`)}.props;
     }
     events() {
         return ${events(strictEvents, `render${genericsRef}()`)}.events;
@@ -5082,8 +5082,8 @@ class __sveltets_Render${genericsDef} {
     }
     str.append(statement);
 }
-function addSimpleComponentExport({ strictEvents, isTsFile, uses$$propsOr$$restProps, exportedNames, componentDocumentation, fileName, mode, usesAccessors, str }) {
-    const propDef = props(isTsFile, uses$$propsOr$$restProps, exportedNames, events(strictEvents, 'render()'));
+function addSimpleComponentExport({ strictEvents, isTsFile, canHaveAnyProp, exportedNames, componentDocumentation, fileName, mode, usesAccessors, str }) {
+    const propDef = props(isTsFile, canHaveAnyProp, exportedNames, events(strictEvents, 'render()'));
     const doc = componentDocumentation.getFormatted();
     const className = fileName && classNameFromFilename(fileName, mode !== 'dts');
     let statement;
@@ -5121,13 +5121,13 @@ function addSimpleComponentExport({ strictEvents, isTsFile, uses$$propsOr$$restP
 function events(strictEvents, renderStr) {
     return strictEvents ? renderStr : `__sveltets_1_with_any_event(${renderStr})`;
 }
-function props(isTsFile, uses$$propsOr$$restProps, exportedNames, renderStr) {
+function props(isTsFile, canHaveAnyProp, exportedNames, renderStr) {
     if (isTsFile) {
-        return uses$$propsOr$$restProps ? `__sveltets_1_with_any(${renderStr})` : renderStr;
+        return canHaveAnyProp ? `__sveltets_1_with_any(${renderStr})` : renderStr;
     }
     else {
         const optionalProps = exportedNames.createOptionalPropsArray();
-        const partial = `__sveltets_1_partial${uses$$propsOr$$restProps ? '_with_any' : ''}`;
+        const partial = `__sveltets_1_partial${canHaveAnyProp ? '_with_any' : ''}`;
         return optionalProps.length > 0
             ? `${partial}([${optionalProps.join(',')}], ${renderStr})`
             : `${partial}(${renderStr})`;
@@ -5488,7 +5488,7 @@ function svelte2tsx(svelte, options = {}) {
     }
     addComponentExport({
         str,
-        uses$$propsOr$$restProps: uses$$props || uses$$restProps,
+        canHaveAnyProp: !exportedNames.uses$$Props && (uses$$props || uses$$restProps),
         strictEvents: events.hasStrictEvents(),
         isTsFile: options === null || options === void 0 ? void 0 : options.isTsFile,
         exportedNames,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svelte2tsx",
-  "version": "0.4.10",
+  "version": "0.4.11",
   "description": "Convert Svelte components to TSX for type checking",
   "author": "David Pershouse",
   "license": "MIT",

package/svelte-jsx.d.ts

@@ -102,7 +102,7 @@ declare namespace svelte.JSX {
       onreset?: FormEventHandler<T> | undefined;
       onsubmit?: FormEventHandler<T> | undefined;
       oninvalid?: EventHandler<Event, T> | undefined;
-      onbeforeinput?: EventHandler<Event, T> | undefined;
+      onbeforeinput?: EventHandler<InputEvent, T> | undefined;
 
       // Image Events
       onload?: EventHandler | undefined;