tentative fix for macros broken by $capture_state

rixo · rixo · commit 989803d524e9 · 2020-02-29T02:07:07.000+01:00
diff --git a/src/compiler/compile/render_dom/index.ts b/src/compiler/compile/render_dom/index.ts
@@ -170,7 +170,9 @@ export default function dom(
 		const capturable_vars = component.vars.filter(v => !v.internal && !v.global && !v.name.startsWith('$$'));
 
 		if (capturable_vars.length > 0) {
-			capture_state = x`() => ({ ${capturable_vars.map(prop => p`${prop.name}`)} })`;
+			capture_state = x`() => ({ ${
+				capturable_vars.map(prop => `'${prop.name.replace("'", "\\'")}': ${prop.name}`).join(', ')
+			} })`;
 		}
 
 		const injectable_vars = capturable_vars.filter(v => !v.module && v.writable && v.name[0] !== '$');

Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,9 @@ export default function dom(`
`170`	`170`	`const capturable_vars = component.vars.filter(v => !v.internal && !v.global && !v.name.startsWith('$$'));`
`171`	`171`
`172`	`172`	`if (capturable_vars.length > 0) {`
`173`		- capture_state = x`() => ({ ${capturable_vars.map(prop => p`${prop.name}`)} })`;
	`173`	+ capture_state = x`() => ({ ${
	`174`	+ capturable_vars.map(prop => `'${prop.name.replace("'", "\\'")}': ${prop.name}`).join(', ')
	`175`	+ } })`;
`174`	`176`	`}`
`175`	`177`
`176`	`178`	`const injectable_vars = capturable_vars.filter(v => !v.module && v.writable && v.name[0] !== '$');`