svelte2tsx 0.6.18 → 0.6.20

package/index.js

@@ -5279,7 +5279,7 @@ function getLineOffsets(text) {
 
 class Generics {
     constructor(str, astOffset, script) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         this.str = str;
         this.astOffset = astOffset;
         this.definitions = [];
@@ -5288,13 +5288,26 @@ class Generics {
         this.genericsAttr = script.attributes.find((attr) => attr.name === 'generics');
         const generics = (_b = (_a = this.genericsAttr) === null || _a === void 0 ? void 0 : _a.value[0]) === null || _b === void 0 ? void 0 : _b.raw;
         if (generics) {
-            this.definitions = generics.split(',').map((g) => g.trim());
-            this.references = this.definitions.map((def) => def.split(/\s/)[0]);
+            const typeParameters = this.getGenericTypeParameters(generics);
+            this.definitions = (_c = typeParameters === null || typeParameters === void 0 ? void 0 : typeParameters.map((param) => param.getText())) !== null && _c !== void 0 ? _c : [];
+            this.references = (_d = typeParameters === null || typeParameters === void 0 ? void 0 : typeParameters.map((param) => param.name.getText())) !== null && _d !== void 0 ? _d : [];
         }
         else {
             this.genericsAttr = undefined;
         }
     }
+    getGenericTypeParameters(rawGenericsAttr) {
+        const sourceFile = ts.createSourceFile('index.ts', `<${rawGenericsAttr}>() => {}`, ts.ScriptTarget.Latest, true);
+        const firstStatement = sourceFile.statements[0];
+        if (!firstStatement || !ts.isExpressionStatement(firstStatement)) {
+            return;
+        }
+        const arrowFunction = firstStatement.expression;
+        if (!ts.isArrowFunction(arrowFunction)) {
+            return;
+        }
+        return arrowFunction.typeParameters;
+    }
     addIfIsGeneric(node) {
         var _a, _b;
         if (ts.isTypeAliasDeclaration(node) && this.is$$GenericType(node.type)) {

package/index.mjs

@@ -5259,7 +5259,7 @@ function getLineOffsets(text) {
 
 class Generics {
     constructor(str, astOffset, script) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         this.str = str;
         this.astOffset = astOffset;
         this.definitions = [];
@@ -5268,13 +5268,26 @@ class Generics {
         this.genericsAttr = script.attributes.find((attr) => attr.name === 'generics');
         const generics = (_b = (_a = this.genericsAttr) === null || _a === void 0 ? void 0 : _a.value[0]) === null || _b === void 0 ? void 0 : _b.raw;
         if (generics) {
-            this.definitions = generics.split(',').map((g) => g.trim());
-            this.references = this.definitions.map((def) => def.split(/\s/)[0]);
+            const typeParameters = this.getGenericTypeParameters(generics);
+            this.definitions = (_c = typeParameters === null || typeParameters === void 0 ? void 0 : typeParameters.map((param) => param.getText())) !== null && _c !== void 0 ? _c : [];
+            this.references = (_d = typeParameters === null || typeParameters === void 0 ? void 0 : typeParameters.map((param) => param.name.getText())) !== null && _d !== void 0 ? _d : [];
         }
         else {
             this.genericsAttr = undefined;
         }
     }
+    getGenericTypeParameters(rawGenericsAttr) {
+        const sourceFile = ts.createSourceFile('index.ts', `<${rawGenericsAttr}>() => {}`, ts.ScriptTarget.Latest, true);
+        const firstStatement = sourceFile.statements[0];
+        if (!firstStatement || !ts.isExpressionStatement(firstStatement)) {
+            return;
+        }
+        const arrowFunction = firstStatement.expression;
+        if (!ts.isArrowFunction(arrowFunction)) {
+            return;
+        }
+        return arrowFunction.typeParameters;
+    }
     addIfIsGeneric(node) {
         var _a, _b;
         if (ts.isTypeAliasDeclaration(node) && this.is$$GenericType(node.type)) {

package/package.json

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

package/svelte-jsx-v4.d.ts

@@ -219,6 +219,7 @@ declare namespace svelteHTML {
     // Svelte specific
     'svelte:window': HTMLProps<'svelte:window', HTMLAttributes>;
     'svelte:body': HTMLProps<'svelte:body', HTMLAttributes>;
+    'svelte:document': HTMLProps<'svelte:document', HTMLAttributes>;
     'svelte:fragment': { slot?: string };
     'svelte:options': { [name: string]: any };
     'svelte:head': { [name: string]: any };

package/svelte-jsx.d.ts

@@ -238,6 +238,7 @@ declare namespace svelteHTML {
     // Svelte specific
     'svelte:window': HTMLProps<'svelte:window', HTMLAttributes>;
     'svelte:body': HTMLProps<'svelte:body', HTMLAttributes>;
+    'svelte:document': HTMLProps<'svelte:document', HTMLAttributes>;
     'svelte:fragment': { slot?: string };
     'svelte:options': { [name: string]: any };
     'svelte:head': { [name: string]: any };

package/svelte-shims-v4.d.ts

@@ -100,8 +100,6 @@ declare function __sveltets_2_with_any_event<Props = {}, Events = {}, Slots = {}
 declare function __sveltets_2_store_get<T = any>(store: SvelteStore<T>): T
 declare function __sveltets_2_store_get<Store extends SvelteStore<any> | undefined | null>(store: Store): Store extends SvelteStore<infer T> ? T : Store;
 declare function __sveltets_2_any(dummy: any): any;
-// declare function __sveltets_1_empty(...dummy: any[]): {};
-// declare function __sveltets_1_componentType(): AConstructorTypeOf<import("svelte").SvelteComponentTyped<any, any, any>>
 declare function __sveltets_2_invalidate<T>(getValue: () => T): T
 
 declare function __sveltets_2_mapWindowEvent<K extends keyof HTMLBodyElementEventMap>(
@@ -129,16 +127,16 @@ declare function __sveltets_2_unionType<T1, T2, T3>(t1: T1, t2: T2, t3: T3): T1
 declare function __sveltets_2_unionType<T1, T2, T3, T4>(t1: T1, t2: T2, t3: T3, t4: T4): T1 | T2 | T3 | T4;
 declare function __sveltets_2_unionType(...types: any[]): any;
 
-declare function __sveltets_2_createSvelte2TsxComponent<Props, Events, Slots>(
+declare function __sveltets_2_createSvelte2TsxComponent<Props extends {}, Events extends {}, Slots extends {}>(
     render: {props: Props, events: Events, slots: Slots }
-): SvelteComponentConstructor<import("svelte").SvelteComponentTyped<Props, Events, Slots>,import('svelte').ComponentConstructorOptions<Props>>;
+): SvelteComponentConstructor<import("svelte").SvelteComponent<Props, Events, Slots>,import('svelte').ComponentConstructorOptions<Props>>;
 
 declare function __sveltets_2_unwrapArr<T>(arr: ArrayLike<T>): T
 declare function __sveltets_2_unwrapPromiseLike<T>(promise: PromiseLike<T> | T): T
 
 // v2
 declare function __sveltets_2_createCreateSlot<Slots = Record<string, Record<string, any>>>(): <SlotName extends keyof Slots>(slotName: SlotName, attrs: Slots[SlotName]) => Record<string, any>;
-declare function __sveltets_2_createComponentAny(props: Record<string, any>): import("svelte").SvelteComponentTyped<any, any, any>;
+declare function __sveltets_2_createComponentAny(props: Record<string, any>): import("svelte").SvelteComponent<any, any, any>;
 
 declare function __sveltets_2_any(...dummy: any[]): any;
 declare function __sveltets_2_empty(...dummy: any[]): {};
@@ -214,11 +212,11 @@ declare type ATypedSvelteComponent = {
 /**
  * Ambient type only used for intellisense, DO NOT USE IN YOUR PROJECT.
  * 
- * If you're looking for the type of a Svelte Component, use `SvelteComponentTyped` and `ComponentType` instead:
+ * If you're looking for the type of a Svelte Component, use `SvelteComponent` and `ComponentType` instead:
  *
  * ```ts
- * import type { ComponentType, SvelteComponentTyped } from "svelte";
- * let myComponentConstructor: ComponentType<SvelteComponentTyped> = ..;
+ * import type { ComponentType, SvelteComponent } from "svelte";
+ * let myComponentConstructor: ComponentType<SvelteComponent> = ..;
  * ```
  */
 declare type ConstructorOfATypedSvelteComponent = new (args: {target: any, props?: any}) => ATypedSvelteComponent