v2

sveltejs · Oct 19, 2022 · 1210641 · 1210641
1 parent 2759f65
commit 1210641
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/export-class/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/export-class/expectedv2.ts
@@ -7,5 +7,5 @@ async () => {};
 return { props: {Foo: Foo}, slots: {}, getters: {Foo: Foo}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['Foo'], __sveltets_1_with_any_event(render()))) {
-    get Foo() { return render().getters.Foo }
+    get Foo() { return this.$$prop_def.Foo }
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-with-$$props/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$Props-with-$$props/expectedv2.ts
@@ -16,5 +16,5 @@ $$props;};
 return { props: {...__sveltets_1_ensureRightProps<{}>(__sveltets_1_any("") as $$Props), ...__sveltets_1_ensureRightProps<Partial<$$Props>>({}), ...{} as unknown as $$Props, ...{c: c} as {c?: typeof c}}, slots: {}, getters: {c: c}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
-    get c() { return render().getters.c }
+    get c() { return this.$$prop_def.c }
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-dts/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics-dts/expectedv2.ts
@@ -37,5 +37,5 @@ export type InputEvents<A,B extends keyof A,C extends boolean> = ReturnType<__sv
 export type InputSlots<A,B extends keyof A,C extends boolean> = ReturnType<__sveltets_Render<A,B,C>['slots']>;
 
 export default class Input<A,B extends keyof A,C extends boolean> extends SvelteComponentTyped<InputProps<A,B,C>, InputEvents<A,B,C>, InputSlots<A,B,C>> {
-    get getA() { return render<A,B,C>().getters.getA }
+    get getA() { return this.$$prop_def.getA }
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-$$generics/expectedv2.ts
@@ -38,5 +38,5 @@ class __sveltets_Render<A,B extends keyof A,C extends boolean> {
 
 
 export default class Input__SvelteComponent_<A,B extends keyof A,C extends boolean> extends Svelte2TsxComponent<ReturnType<__sveltets_Render<A,B,C>['props']>, ReturnType<__sveltets_Render<A,B,C>['events']>, ReturnType<__sveltets_Render<A,B,C>['slots']>> {
-    get getA() { return render<A,B,C>().getters.getA }
+    get getA() { return this.$$prop_def.getA }
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/ts-export-const/expectedv2.ts
@@ -8,7 +8,7 @@ async () => {};
 return { props: {name: name , SOME: SOME , CONSTANT: CONSTANT} as {name?: string, SOME?: typeof SOME, CONSTANT?: typeof CONSTANT}, slots: {}, getters: {name: name, SOME: SOME, CONSTANT: CONSTANT}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_with_any_event(render())) {
-    get name() { return render().getters.name }
-    get SOME() { return render().getters.SOME }
-    get CONSTANT() { return render().getters.CONSTANT }
+    get name() { return this.$$prop_def.name }
+    get SOME() { return this.$$prop_def.SOME }
+    get CONSTANT() { return this.$$prop_def.CONSTANT }
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-not-present/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-not-present/expectedv2.ts
@@ -9,5 +9,5 @@ async () => { { svelteHTML.createElement("svelte:options", {});}
 return { props: {foo: foo , bar: bar}, slots: {}, getters: {bar: bar}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['foo','bar'], __sveltets_1_with_any_event(render()))) {
-    get bar() { return render().getters.bar }
+    get bar() { return this.$$prop_def.bar }
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-attr-present/expectedv2.ts
@@ -12,14 +12,14 @@ async () => {  { svelteHTML.createElement("svelte:options", {"accessors":true,})
 return { props: {foo: foo , foo2: foo2 , class: clazz , bar: bar}, slots: {}, getters: {bar: bar}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['foo','foo2','bar'], __sveltets_1_with_any_event(render()))) {
-    get bar() { return render().getters.bar }
-    get foo() { return render().props.foo }
+    get bar() { return this.$$prop_def.bar }
+    get foo() { return this.$$prop_def.foo }
     /**accessor*/
     set foo(_) {}
-    get foo2() { return render().props.foo2 }
+    get foo2() { return this.$$prop_def.foo2 }
     /**accessor*/
     set foo2(_) {}
-    get class() { return render().props.class }
+    get class() { return this.$$prop_def.class }
     /**accessor*/
     set class(_) {}
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-false/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-false/expectedv2.ts
@@ -9,5 +9,5 @@ async () => { { svelteHTML.createElement("svelte:options", {  "accessors":false,
 return { props: {foo: foo , bar: bar}, slots: {}, getters: {bar: bar}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['foo','bar'], __sveltets_1_with_any_event(render()))) {
-    get bar() { return render().getters.bar }
+    get bar() { return this.$$prop_def.bar }
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-mustachetag-true/expectedv2.ts
@@ -12,14 +12,14 @@ async () => { { svelteHTML.createElement("svelte:options", {  "accessors":true,}
 return { props: {foo: foo , foo2: foo2 , class: clazz , bar: bar}, slots: {}, getters: {bar: bar}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['foo','foo2','bar'], __sveltets_1_with_any_event(render()))) {
-    get bar() { return render().getters.bar }
-    get foo() { return render().props.foo }
+    get bar() { return this.$$prop_def.bar }
+    get foo() { return this.$$prop_def.foo }
     /**accessor*/
     set foo(_) {}
-    get foo2() { return render().props.foo2 }
+    get foo2() { return this.$$prop_def.foo2 }
     /**accessor*/
     set foo2(_) {}
-    get class() { return render().props.class }
+    get class() { return this.$$prop_def.class }
     /**accessor*/
     set class(_) {}
 }
diff --git a/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-no-svelte-options/expectedv2.ts b/packages/svelte2tsx/test/svelte2tsx/samples/uses-accessors-no-svelte-options/expectedv2.ts
@@ -8,5 +8,5 @@ async () => {};
 return { props: {foo: foo , bar: bar}, slots: {}, getters: {bar: bar}, events: {} }}
 
 export default class Input__SvelteComponent_ extends __sveltets_1_createSvelte2TsxComponent(__sveltets_1_partial(['foo','bar'], __sveltets_1_with_any_event(render()))) {
-    get bar() { return render().getters.bar }
+    get bar() { return this.$$prop_def.bar }
 }