svelte-origin 1.0.0-next.15 → 1.0.0-next.17

package/dist/cli.js

@@ -1919,7 +1919,7 @@ function parseObjectMembers(source) {
 }
 
 // src/transform/origin-transform.ts
-function transformOriginCalls(s, source, neededImports) {
+function transformOriginCalls(s, source, neededImports, svelteImports) {
   const regex = /\$origin\s*\(/g;
   let match;
   let changed = false;
@@ -1935,14 +1935,14 @@ function transformOriginCalls(s, source, neededImports) {
       continue;
     }
     const definitionContent = source.slice(openParenIndex + 1, closeParenIndex);
-    const transformed = transformOriginDefinition(definitionContent);
+    const transformed = transformOriginDefinition(definitionContent, svelteImports);
     s.overwrite(startIndex, closeParenIndex + 1, `__createOrigin(${transformed})`);
     neededImports.add("__createOrigin");
     changed = true;
   }
   return changed;
 }
-function transformOriginDefinition(content) {
+function transformOriginDefinition(content, svelteImports) {
   let parents = [];
   let bodyContent = content.trim();
   let initCallback = null;
@@ -2007,7 +2007,7 @@ function transformOriginDefinition(content) {
     }
   }
   const attrDetails = parseAttrsSource(attrsContent);
-  const { body: createFnBody, attachments } = transformOriginBody(contentWithoutAttrs.trim(), parents, attrDetails, attrPropertyName);
+  const { body: createFnBody, attachments } = transformOriginBody(contentWithoutAttrs.trim(), parents, attrDetails, attrPropertyName, svelteImports);
   const parentsCode = parents.length > 0 ? `[${parents.join(", ")}]` : "undefined";
   let configCode = `{
 	__attrSchema: ${attrSchemaCode},
@@ -2027,22 +2027,48 @@ ${createFnBody}
 }`;
   return configCode;
 }
-function transformOriginBody(content, parents = [], attrDetails = [], propName = "props") {
+function transformOriginBody(content, parents = [], attrDetails = [], propName = "props", _svelteImports) {
   let body = content.trim();
   const hasParents = parents.length > 0;
-  const attrGettersSetters = [];
-  for (const attr of attrDetails) {
-    if (attr.hasDefault) {
-      attrGettersSetters.push(`get ${attr.key}() { return __inputAttrs.${attr.key} ?? ${attr.defaultValue} }`);
-    } else {
-      attrGettersSetters.push(`get ${attr.key}() { return __inputAttrs.${attr.key} }`);
+  const propsLines = [];
+  if (attrDetails.length > 0) {
+    const initialProps = [];
+    for (const attr of attrDetails) {
+      const defaultExpr = attr.hasDefault ? ` ?? ${attr.defaultValue}` : "";
+      initialProps.push(`${attr.key}: __inputAttrs.${attr.key}${defaultExpr}`);
+    }
+    propsLines.push(`let __props = $state({ ${initialProps.join(", ")} })`);
+    for (const attr of attrDetails) {
+      const defaultExpr = attr.hasDefault ? ` ?? ${attr.defaultValue}` : "";
+      const parentLast = `__last_parent_${attr.key}`;
+      const localLast = `__last_local_${attr.key}`;
+      propsLines.push(`let ${parentLast} = __inputAttrs.${attr.key}`, `let ${localLast} = __props.${attr.key}`, `$effect(() => {
+` + `			const __parent = __inputAttrs.${attr.key}
+` + `			const __local = __props.${attr.key}
+
+` + `			// Parent -> local
+` + `			if (__parent !== ${parentLast}) {
+` + `				${parentLast} = __parent
+` + `				if (__local !== __parent) {
+` + `					__props.${attr.key} = __parent${defaultExpr}
+` + `				}
+` + `				${localLast} = __props.${attr.key}
+` + `				return
+` + `			}
+
+` + `			// Local -> parent
+` + `			if (__local !== ${localLast}) {
+` + `				${localLast} = __local
+` + (attr.bindable ? `				try { __inputAttrs.${attr.key} = __local } catch {}
+				${parentLast} = __inputAttrs.${attr.key}
+` : "") + `			}
+` + `})`);
     }
-    attrGettersSetters.push(`set ${attr.key}(v) { __inputAttrs.${attr.key} = v }`);
+  } else {
+    propsLines.push("const __props = __inputAttrs");
   }
-  const propsObjectCode = attrGettersSetters.length > 0 ? `		const __props = {
-			${attrGettersSetters.join(`,
-			`)}
-		}` : `		const __props = __inputAttrs`;
+  const propsObjectCode = "\t\t" + propsLines.join(`
+		`);
   if (!body) {
     const baseMembers = [`get ${propName}() { return __props }`];
     if (hasParents)
@@ -2728,9 +2754,10 @@ function transformScript(source, options = {}) {
   const { isComponent = false } = options;
   let changed = false;
   const neededImports = new Set;
+  const svelteImports = new Set;
   let propsTypeDeclaration = null;
   if (!isComponent) {
-    changed = transformOriginCalls(s, source, neededImports) || changed;
+    changed = transformOriginCalls(s, source, neededImports, svelteImports) || changed;
     changed = transformStandaloneAttrsCalls(s, source, neededImports) || changed;
   }
   if (isComponent) {
@@ -2769,10 +2796,17 @@ function transformScript(source, options = {}) {
 `);
       }
     }
-  } else if (neededImports.size > 0) {
-    const importStatement = generateRuntimeImport([...neededImports]);
-    s.prepend(importStatement + `
+  } else if (neededImports.size > 0 || svelteImports.size > 0) {
+    if (neededImports.size > 0) {
+      const importStatement = generateRuntimeImport([...neededImports]);
+      s.prepend(importStatement + `
+`);
+    }
+    if (svelteImports.size > 0) {
+      const svelteImportStatement = `import { ${[...svelteImports].join(", ")} } from 'svelte'`;
+      s.prepend(svelteImportStatement + `
 `);
+    }
   }
   if (!changed) {
     return { code: source, changed: false };
@@ -2791,9 +2825,10 @@ async function transformScriptAsync(source, options) {
   const { isComponent = false, schemaResolver } = options;
   let changed = false;
   const neededImports = new Set;
+  const svelteImports = new Set;
   let propsTypeDeclaration = null;
   if (!isComponent) {
-    changed = transformOriginCalls(s, source, neededImports) || changed;
+    changed = transformOriginCalls(s, source, neededImports, svelteImports) || changed;
     changed = transformStandaloneAttrsCalls(s, source, neededImports) || changed;
   }
   if (isComponent) {
@@ -2832,10 +2867,17 @@ async function transformScriptAsync(source, options) {
 `);
       }
     }
-  } else if (neededImports.size > 0) {
-    const importStatement = generateRuntimeImport([...neededImports]);
-    s.prepend(importStatement + `
+  } else if (neededImports.size > 0 || svelteImports.size > 0) {
+    if (neededImports.size > 0) {
+      const importStatement = generateRuntimeImport([...neededImports]);
+      s.prepend(importStatement + `
+`);
+    }
+    if (svelteImports.size > 0) {
+      const svelteImportStatement = `import { ${[...svelteImports].join(", ")} } from 'svelte'`;
+      s.prepend(svelteImportStatement + `
 `);
+    }
   }
   if (!changed) {
     return { code: source, changed: false };
@@ -2854,9 +2896,10 @@ async function transformScriptContent(source, options) {
   const { isComponent = false, schemaResolver } = options;
   let changed = false;
   const neededImports = new Set;
+  const svelteImports = new Set;
   let propsTypeDeclaration = null;
   if (!isComponent) {
-    changed = transformOriginCalls(s, source, neededImports) || changed;
+    changed = transformOriginCalls(s, source, neededImports, svelteImports) || changed;
   }
   if (isComponent) {
     const result = await transformAttrsOriginCalls(s, source, neededImports, schemaResolver);
@@ -2869,11 +2912,22 @@ async function transformScriptContent(source, options) {
   if (neededImports.size > 0) {
     const importStatement = generateRuntimeImport([...neededImports]);
     s.prepend(importStatement + `
+`);
+  }
+  if (svelteImports.size > 0) {
+    const svelteImportStatement = `import { ${[...svelteImports].join(", ")} } from 'svelte'`;
+    s.prepend(svelteImportStatement + `
 `);
   }
   if (propsTypeDeclaration) {
     const afterImports = findPropsInjectionPosition(source);
-    const offset = neededImports.size > 0 ? generateRuntimeImport([...neededImports]).length + 1 : 0;
+    let offset = 0;
+    if (neededImports.size > 0) {
+      offset += generateRuntimeImport([...neededImports]).length + 1;
+    }
+    if (svelteImports.size > 0) {
+      offset += `import { ${[...svelteImports].join(", ")} } from 'svelte'`.length + 1;
+    }
     s.appendLeft(afterImports + offset, propsTypeDeclaration + `
 `);
   }

package/dist/index.js

@@ -3475,24 +3475,39 @@ function __attrsFor(factory, rawAttrs) {
   const wrapper = {};
   const localValues = {};
   const hasLocalValue = {};
-  for (const key2 of Object.keys(schema)) {
-    Object.defineProperty(wrapper, key2, {
+  const defineExposedProp = (key2, info) => {
+    if (Object.prototype.hasOwnProperty.call(wrapper, key2))
+      return;
+    const base = {
       get() {
-        if (hasLocalValue[key2]) {
+        if (hasLocalValue[key2])
           return localValues[key2];
-        }
         return rawAttrs[key2];
       },
-      set(value) {
-        localValues[key2] = value;
-        hasLocalValue[key2] = true;
-        try {
-          rawAttrs[key2] = value;
-        } catch {}
-      },
       enumerable: true,
       configurable: true
-    });
+    };
+    if (info.bindable) {
+      Object.defineProperty(wrapper, key2, {
+        ...base,
+        set(value) {
+          localValues[key2] = value;
+          hasLocalValue[key2] = true;
+          try {
+            rawAttrs[key2] = value;
+          } catch {}
+        }
+      });
+    } else {
+      Object.defineProperty(wrapper, key2, base);
+    }
+  };
+  for (const [key2, info] of Object.entries(schema)) {
+    const parentValue = rawAttrs[key2];
+    const shouldExpose = !info.bindable || !info.hasDefault || parentValue !== undefined;
+    if (shouldExpose) {
+      defineExposedProp(key2, info);
+    }
   }
   for (const sym of Object.getOwnPropertySymbols(rawAttrs)) {
     Object.defineProperty(wrapper, sym, {
@@ -3505,34 +3520,57 @@ function __attrsFor(factory, rawAttrs) {
   }
   return new Proxy(wrapper, {
     get(target, prop2) {
-      if (prop2 in target) {
-        return target[prop2];
+      if (typeof prop2 === "string" && prop2 in schema) {
+        if (hasLocalValue[prop2])
+          return localValues[prop2];
+        return rawAttrs[prop2];
       }
+      if (prop2 in target)
+        return target[prop2];
       return rawAttrs[prop2];
     },
     set(target, prop2, value) {
+      if (typeof prop2 === "string" && prop2 in schema) {
+        localValues[prop2] = value;
+        hasLocalValue[prop2] = true;
+        if (!Object.prototype.hasOwnProperty.call(wrapper, prop2)) {
+          defineExposedProp(prop2, schema[prop2]);
+        }
+        if (schema[prop2].bindable) {
+          try {
+            rawAttrs[prop2] = value;
+          } catch {}
+        }
+        return true;
+      }
       if (prop2 in target) {
-        target[prop2] = value;
+        try {
+          target[prop2] = value;
+        } catch {}
         return true;
       }
       try {
         rawAttrs[prop2] = value;
       } catch {
-        localValues[prop2] = value;
-        hasLocalValue[prop2] = true;
+        if (typeof prop2 === "string") {
+          localValues[prop2] = value;
+          hasLocalValue[prop2] = true;
+        }
       }
       return true;
     },
     has(target, prop2) {
+      if (typeof prop2 === "string" && prop2 in schema) {
+        return prop2 in target || hasLocalValue[prop2];
+      }
       return prop2 in target || prop2 in rawAttrs;
     },
     ownKeys() {
       return [...Object.keys(wrapper), ...Object.getOwnPropertySymbols(rawAttrs)];
     },
     getOwnPropertyDescriptor(target, prop2) {
-      if (prop2 in target) {
+      if (prop2 in target)
         return Object.getOwnPropertyDescriptor(target, prop2);
-      }
       return Object.getOwnPropertyDescriptor(rawAttrs, prop2);
     }
   });
@@ -5969,7 +6007,7 @@ function parseObjectMembers(source2) {
 }
 
 // src/transform/origin-transform.ts
-function transformOriginCalls(s, source2, neededImports) {
+function transformOriginCalls(s, source2, neededImports, svelteImports) {
   const regex = /\$origin\s*\(/g;
   let match;
   let changed = false;
@@ -5985,14 +6023,14 @@ function transformOriginCalls(s, source2, neededImports) {
       continue;
     }
     const definitionContent = source2.slice(openParenIndex + 1, closeParenIndex);
-    const transformed = transformOriginDefinition(definitionContent);
+    const transformed = transformOriginDefinition(definitionContent, svelteImports);
     s.overwrite(startIndex, closeParenIndex + 1, `__createOrigin(${transformed})`);
     neededImports.add("__createOrigin");
     changed = true;
   }
   return changed;
 }
-function transformOriginDefinition(content) {
+function transformOriginDefinition(content, svelteImports) {
   let parents = [];
   let bodyContent = content.trim();
   let initCallback = null;
@@ -6057,7 +6095,7 @@ function transformOriginDefinition(content) {
     }
   }
   const attrDetails = parseAttrsSource(attrsContent);
-  const { body: createFnBody, attachments } = transformOriginBody(contentWithoutAttrs.trim(), parents, attrDetails, attrPropertyName);
+  const { body: createFnBody, attachments } = transformOriginBody(contentWithoutAttrs.trim(), parents, attrDetails, attrPropertyName, svelteImports);
   const parentsCode = parents.length > 0 ? `[${parents.join(", ")}]` : "undefined";
   let configCode = `{
 	__attrSchema: ${attrSchemaCode},
@@ -6077,22 +6115,48 @@ ${createFnBody}
 }`;
   return configCode;
 }
-function transformOriginBody(content, parents = [], attrDetails = [], propName = "props") {
+function transformOriginBody(content, parents = [], attrDetails = [], propName = "props", _svelteImports) {
   let body = content.trim();
   const hasParents = parents.length > 0;
-  const attrGettersSetters = [];
-  for (const attr2 of attrDetails) {
-    if (attr2.hasDefault) {
-      attrGettersSetters.push(`get ${attr2.key}() { return __inputAttrs.${attr2.key} ?? ${attr2.defaultValue} }`);
-    } else {
-      attrGettersSetters.push(`get ${attr2.key}() { return __inputAttrs.${attr2.key} }`);
+  const propsLines = [];
+  if (attrDetails.length > 0) {
+    const initialProps = [];
+    for (const attr2 of attrDetails) {
+      const defaultExpr = attr2.hasDefault ? ` ?? ${attr2.defaultValue}` : "";
+      initialProps.push(`${attr2.key}: __inputAttrs.${attr2.key}${defaultExpr}`);
+    }
+    propsLines.push(`let __props = $state({ ${initialProps.join(", ")} })`);
+    for (const attr2 of attrDetails) {
+      const defaultExpr = attr2.hasDefault ? ` ?? ${attr2.defaultValue}` : "";
+      const parentLast = `__last_parent_${attr2.key}`;
+      const localLast = `__last_local_${attr2.key}`;
+      propsLines.push(`let ${parentLast} = __inputAttrs.${attr2.key}`, `let ${localLast} = __props.${attr2.key}`, `$effect(() => {
+` + `			const __parent = __inputAttrs.${attr2.key}
+` + `			const __local = __props.${attr2.key}
+
+` + `			// Parent -> local
+` + `			if (__parent !== ${parentLast}) {
+` + `				${parentLast} = __parent
+` + `				if (__local !== __parent) {
+` + `					__props.${attr2.key} = __parent${defaultExpr}
+` + `				}
+` + `				${localLast} = __props.${attr2.key}
+` + `				return
+` + `			}
+
+` + `			// Local -> parent
+` + `			if (__local !== ${localLast}) {
+` + `				${localLast} = __local
+` + (attr2.bindable ? `				try { __inputAttrs.${attr2.key} = __local } catch {}
+				${parentLast} = __inputAttrs.${attr2.key}
+` : "") + `			}
+` + `})`);
     }
-    attrGettersSetters.push(`set ${attr2.key}(v) { __inputAttrs.${attr2.key} = v }`);
+  } else {
+    propsLines.push("const __props = __inputAttrs");
   }
-  const propsObjectCode = attrGettersSetters.length > 0 ? `		const __props = {
-			${attrGettersSetters.join(`,
-			`)}
-		}` : `		const __props = __inputAttrs`;
+  const propsObjectCode = "\t\t" + propsLines.join(`
+		`);
   if (!body) {
     const baseMembers = [`get ${propName}() { return __props }`];
     if (hasParents)
@@ -6509,9 +6573,10 @@ function transformScript(source2, options = {}) {
   const { isComponent = false } = options;
   let changed = false;
   const neededImports = new Set;
+  const svelteImports = new Set;
   let propsTypeDeclaration = null;
   if (!isComponent) {
-    changed = transformOriginCalls(s, source2, neededImports) || changed;
+    changed = transformOriginCalls(s, source2, neededImports, svelteImports) || changed;
     changed = transformStandaloneAttrsCalls(s, source2, neededImports) || changed;
   }
   if (isComponent) {
@@ -6550,10 +6615,17 @@ function transformScript(source2, options = {}) {
 `);
       }
     }
-  } else if (neededImports.size > 0) {
-    const importStatement = generateRuntimeImport([...neededImports]);
-    s.prepend(importStatement + `
+  } else if (neededImports.size > 0 || svelteImports.size > 0) {
+    if (neededImports.size > 0) {
+      const importStatement = generateRuntimeImport([...neededImports]);
+      s.prepend(importStatement + `
+`);
+    }
+    if (svelteImports.size > 0) {
+      const svelteImportStatement = `import { ${[...svelteImports].join(", ")} } from 'svelte'`;
+      s.prepend(svelteImportStatement + `
 `);
+    }
   }
   if (!changed) {
     return { code: source2, changed: false };
@@ -6572,9 +6644,10 @@ async function transformScriptAsync(source2, options) {
   const { isComponent = false, schemaResolver } = options;
   let changed = false;
   const neededImports = new Set;
+  const svelteImports = new Set;
   let propsTypeDeclaration = null;
   if (!isComponent) {
-    changed = transformOriginCalls(s, source2, neededImports) || changed;
+    changed = transformOriginCalls(s, source2, neededImports, svelteImports) || changed;
     changed = transformStandaloneAttrsCalls(s, source2, neededImports) || changed;
   }
   if (isComponent) {
@@ -6613,10 +6686,17 @@ async function transformScriptAsync(source2, options) {
 `);
       }
     }
-  } else if (neededImports.size > 0) {
-    const importStatement = generateRuntimeImport([...neededImports]);
-    s.prepend(importStatement + `
+  } else if (neededImports.size > 0 || svelteImports.size > 0) {
+    if (neededImports.size > 0) {
+      const importStatement = generateRuntimeImport([...neededImports]);
+      s.prepend(importStatement + `
 `);
+    }
+    if (svelteImports.size > 0) {
+      const svelteImportStatement = `import { ${[...svelteImports].join(", ")} } from 'svelte'`;
+      s.prepend(svelteImportStatement + `
+`);
+    }
   }
   if (!changed) {
     return { code: source2, changed: false };
@@ -6635,9 +6715,10 @@ async function transformScriptContent(source2, options) {
   const { isComponent = false, schemaResolver } = options;
   let changed = false;
   const neededImports = new Set;
+  const svelteImports = new Set;
   let propsTypeDeclaration = null;
   if (!isComponent) {
-    changed = transformOriginCalls(s, source2, neededImports) || changed;
+    changed = transformOriginCalls(s, source2, neededImports, svelteImports) || changed;
   }
   if (isComponent) {
     const result = await transformAttrsOriginCalls(s, source2, neededImports, schemaResolver);
@@ -6650,11 +6731,22 @@ async function transformScriptContent(source2, options) {
   if (neededImports.size > 0) {
     const importStatement = generateRuntimeImport([...neededImports]);
     s.prepend(importStatement + `
+`);
+  }
+  if (svelteImports.size > 0) {
+    const svelteImportStatement = `import { ${[...svelteImports].join(", ")} } from 'svelte'`;
+    s.prepend(svelteImportStatement + `
 `);
   }
   if (propsTypeDeclaration) {
     const afterImports = findPropsInjectionPosition(source2);
-    const offset = neededImports.size > 0 ? generateRuntimeImport([...neededImports]).length + 1 : 0;
+    let offset = 0;
+    if (neededImports.size > 0) {
+      offset += generateRuntimeImport([...neededImports]).length + 1;
+    }
+    if (svelteImports.size > 0) {
+      offset += `import { ${[...svelteImports].join(", ")} } from 'svelte'`.length + 1;
+    }
     s.appendLeft(afterImports + offset, propsTypeDeclaration + `
 `);
   }

package/dist/plugin.js

@@ -1913,7 +1913,7 @@ function parseObjectMembers(source) {
 }
 
 // src/transform/origin-transform.ts
-function transformOriginCalls(s, source, neededImports) {
+function transformOriginCalls(s, source, neededImports, svelteImports) {
   const regex = /\$origin\s*\(/g;
   let match;
   let changed = false;
@@ -1929,14 +1929,14 @@ function transformOriginCalls(s, source, neededImports) {
       continue;
     }
     const definitionContent = source.slice(openParenIndex + 1, closeParenIndex);
-    const transformed = transformOriginDefinition(definitionContent);
+    const transformed = transformOriginDefinition(definitionContent, svelteImports);
     s.overwrite(startIndex, closeParenIndex + 1, `__createOrigin(${transformed})`);
     neededImports.add("__createOrigin");
     changed = true;
   }
   return changed;
 }
-function transformOriginDefinition(content) {
+function transformOriginDefinition(content, svelteImports) {
   let parents = [];
   let bodyContent = content.trim();
   let initCallback = null;
@@ -2001,7 +2001,7 @@ function transformOriginDefinition(content) {
     }
   }
   const attrDetails = parseAttrsSource(attrsContent);
-  const { body: createFnBody, attachments } = transformOriginBody(contentWithoutAttrs.trim(), parents, attrDetails, attrPropertyName);
+  const { body: createFnBody, attachments } = transformOriginBody(contentWithoutAttrs.trim(), parents, attrDetails, attrPropertyName, svelteImports);
   const parentsCode = parents.length > 0 ? `[${parents.join(", ")}]` : "undefined";
   let configCode = `{
 	__attrSchema: ${attrSchemaCode},
@@ -2021,22 +2021,48 @@ ${createFnBody}
 }`;
   return configCode;
 }
-function transformOriginBody(content, parents = [], attrDetails = [], propName = "props") {
+function transformOriginBody(content, parents = [], attrDetails = [], propName = "props", _svelteImports) {
   let body = content.trim();
   const hasParents = parents.length > 0;
-  const attrGettersSetters = [];
-  for (const attr of attrDetails) {
-    if (attr.hasDefault) {
-      attrGettersSetters.push(`get ${attr.key}() { return __inputAttrs.${attr.key} ?? ${attr.defaultValue} }`);
-    } else {
-      attrGettersSetters.push(`get ${attr.key}() { return __inputAttrs.${attr.key} }`);
+  const propsLines = [];
+  if (attrDetails.length > 0) {
+    const initialProps = [];
+    for (const attr of attrDetails) {
+      const defaultExpr = attr.hasDefault ? ` ?? ${attr.defaultValue}` : "";
+      initialProps.push(`${attr.key}: __inputAttrs.${attr.key}${defaultExpr}`);
+    }
+    propsLines.push(`let __props = $state({ ${initialProps.join(", ")} })`);
+    for (const attr of attrDetails) {
+      const defaultExpr = attr.hasDefault ? ` ?? ${attr.defaultValue}` : "";
+      const parentLast = `__last_parent_${attr.key}`;
+      const localLast = `__last_local_${attr.key}`;
+      propsLines.push(`let ${parentLast} = __inputAttrs.${attr.key}`, `let ${localLast} = __props.${attr.key}`, `$effect(() => {
+` + `			const __parent = __inputAttrs.${attr.key}
+` + `			const __local = __props.${attr.key}
+
+` + `			// Parent -> local
+` + `			if (__parent !== ${parentLast}) {
+` + `				${parentLast} = __parent
+` + `				if (__local !== __parent) {
+` + `					__props.${attr.key} = __parent${defaultExpr}
+` + `				}
+` + `				${localLast} = __props.${attr.key}
+` + `				return
+` + `			}
+
+` + `			// Local -> parent
+` + `			if (__local !== ${localLast}) {
+` + `				${localLast} = __local
+` + (attr.bindable ? `				try { __inputAttrs.${attr.key} = __local } catch {}
+				${parentLast} = __inputAttrs.${attr.key}
+` : "") + `			}
+` + `})`);
     }
-    attrGettersSetters.push(`set ${attr.key}(v) { __inputAttrs.${attr.key} = v }`);
+  } else {
+    propsLines.push("const __props = __inputAttrs");
   }
-  const propsObjectCode = attrGettersSetters.length > 0 ? `		const __props = {
-			${attrGettersSetters.join(`,
-			`)}
-		}` : `		const __props = __inputAttrs`;
+  const propsObjectCode = "\t\t" + propsLines.join(`
+		`);
   if (!body) {
     const baseMembers = [`get ${propName}() { return __props }`];
     if (hasParents)
@@ -2722,9 +2748,10 @@ function transformScript(source, options = {}) {
   const { isComponent = false } = options;
   let changed = false;
   const neededImports = new Set;
+  const svelteImports = new Set;
   let propsTypeDeclaration = null;
   if (!isComponent) {
-    changed = transformOriginCalls(s, source, neededImports) || changed;
+    changed = transformOriginCalls(s, source, neededImports, svelteImports) || changed;
     changed = transformStandaloneAttrsCalls(s, source, neededImports) || changed;
   }
   if (isComponent) {
@@ -2763,10 +2790,17 @@ function transformScript(source, options = {}) {
 `);
       }
     }
-  } else if (neededImports.size > 0) {
-    const importStatement = generateRuntimeImport([...neededImports]);
-    s.prepend(importStatement + `
+  } else if (neededImports.size > 0 || svelteImports.size > 0) {
+    if (neededImports.size > 0) {
+      const importStatement = generateRuntimeImport([...neededImports]);
+      s.prepend(importStatement + `
+`);
+    }
+    if (svelteImports.size > 0) {
+      const svelteImportStatement = `import { ${[...svelteImports].join(", ")} } from 'svelte'`;
+      s.prepend(svelteImportStatement + `
 `);
+    }
   }
   if (!changed) {
     return { code: source, changed: false };
@@ -2785,9 +2819,10 @@ async function transformScriptAsync(source, options) {
   const { isComponent = false, schemaResolver } = options;
   let changed = false;
   const neededImports = new Set;
+  const svelteImports = new Set;
   let propsTypeDeclaration = null;
   if (!isComponent) {
-    changed = transformOriginCalls(s, source, neededImports) || changed;
+    changed = transformOriginCalls(s, source, neededImports, svelteImports) || changed;
     changed = transformStandaloneAttrsCalls(s, source, neededImports) || changed;
   }
   if (isComponent) {
@@ -2826,10 +2861,17 @@ async function transformScriptAsync(source, options) {
 `);
       }
     }
-  } else if (neededImports.size > 0) {
-    const importStatement = generateRuntimeImport([...neededImports]);
-    s.prepend(importStatement + `
+  } else if (neededImports.size > 0 || svelteImports.size > 0) {
+    if (neededImports.size > 0) {
+      const importStatement = generateRuntimeImport([...neededImports]);
+      s.prepend(importStatement + `
+`);
+    }
+    if (svelteImports.size > 0) {
+      const svelteImportStatement = `import { ${[...svelteImports].join(", ")} } from 'svelte'`;
+      s.prepend(svelteImportStatement + `
 `);
+    }
   }
   if (!changed) {
     return { code: source, changed: false };
@@ -2848,9 +2890,10 @@ async function transformScriptContent(source, options) {
   const { isComponent = false, schemaResolver } = options;
   let changed = false;
   const neededImports = new Set;
+  const svelteImports = new Set;
   let propsTypeDeclaration = null;
   if (!isComponent) {
-    changed = transformOriginCalls(s, source, neededImports) || changed;
+    changed = transformOriginCalls(s, source, neededImports, svelteImports) || changed;
   }
   if (isComponent) {
     const result = await transformAttrsOriginCalls(s, source, neededImports, schemaResolver);
@@ -2863,11 +2906,22 @@ async function transformScriptContent(source, options) {
   if (neededImports.size > 0) {
     const importStatement = generateRuntimeImport([...neededImports]);
     s.prepend(importStatement + `
+`);
+  }
+  if (svelteImports.size > 0) {
+    const svelteImportStatement = `import { ${[...svelteImports].join(", ")} } from 'svelte'`;
+    s.prepend(svelteImportStatement + `
 `);
   }
   if (propsTypeDeclaration) {
     const afterImports = findPropsInjectionPosition(source);
-    const offset = neededImports.size > 0 ? generateRuntimeImport([...neededImports]).length + 1 : 0;
+    let offset = 0;
+    if (neededImports.size > 0) {
+      offset += generateRuntimeImport([...neededImports]).length + 1;
+    }
+    if (svelteImports.size > 0) {
+      offset += `import { ${[...svelteImports].join(", ")} } from 'svelte'`.length + 1;
+    }
     s.appendLeft(afterImports + offset, propsTypeDeclaration + `
 `);
   }

package/dist/post-process.js

@@ -1917,7 +1917,7 @@ function parseObjectMembers(source) {
 }
 
 // src/transform/origin-transform.ts
-function transformOriginCalls(s, source, neededImports) {
+function transformOriginCalls(s, source, neededImports, svelteImports) {
   const regex = /\$origin\s*\(/g;
   let match;
   let changed = false;
@@ -1933,14 +1933,14 @@ function transformOriginCalls(s, source, neededImports) {
       continue;
     }
     const definitionContent = source.slice(openParenIndex + 1, closeParenIndex);
-    const transformed = transformOriginDefinition(definitionContent);
+    const transformed = transformOriginDefinition(definitionContent, svelteImports);
     s.overwrite(startIndex, closeParenIndex + 1, `__createOrigin(${transformed})`);
     neededImports.add("__createOrigin");
     changed = true;
   }
   return changed;
 }
-function transformOriginDefinition(content) {
+function transformOriginDefinition(content, svelteImports) {
   let parents = [];
   let bodyContent = content.trim();
   let initCallback = null;
@@ -2005,7 +2005,7 @@ function transformOriginDefinition(content) {
     }
   }
   const attrDetails = parseAttrsSource(attrsContent);
-  const { body: createFnBody, attachments } = transformOriginBody(contentWithoutAttrs.trim(), parents, attrDetails, attrPropertyName);
+  const { body: createFnBody, attachments } = transformOriginBody(contentWithoutAttrs.trim(), parents, attrDetails, attrPropertyName, svelteImports);
   const parentsCode = parents.length > 0 ? `[${parents.join(", ")}]` : "undefined";
   let configCode = `{
 	__attrSchema: ${attrSchemaCode},
@@ -2025,22 +2025,48 @@ ${createFnBody}
 }`;
   return configCode;
 }
-function transformOriginBody(content, parents = [], attrDetails = [], propName = "props") {
+function transformOriginBody(content, parents = [], attrDetails = [], propName = "props", _svelteImports) {
   let body = content.trim();
   const hasParents = parents.length > 0;
-  const attrGettersSetters = [];
-  for (const attr of attrDetails) {
-    if (attr.hasDefault) {
-      attrGettersSetters.push(`get ${attr.key}() { return __inputAttrs.${attr.key} ?? ${attr.defaultValue} }`);
-    } else {
-      attrGettersSetters.push(`get ${attr.key}() { return __inputAttrs.${attr.key} }`);
+  const propsLines = [];
+  if (attrDetails.length > 0) {
+    const initialProps = [];
+    for (const attr of attrDetails) {
+      const defaultExpr = attr.hasDefault ? ` ?? ${attr.defaultValue}` : "";
+      initialProps.push(`${attr.key}: __inputAttrs.${attr.key}${defaultExpr}`);
+    }
+    propsLines.push(`let __props = $state({ ${initialProps.join(", ")} })`);
+    for (const attr of attrDetails) {
+      const defaultExpr = attr.hasDefault ? ` ?? ${attr.defaultValue}` : "";
+      const parentLast = `__last_parent_${attr.key}`;
+      const localLast = `__last_local_${attr.key}`;
+      propsLines.push(`let ${parentLast} = __inputAttrs.${attr.key}`, `let ${localLast} = __props.${attr.key}`, `$effect(() => {
+` + `			const __parent = __inputAttrs.${attr.key}
+` + `			const __local = __props.${attr.key}
+
+` + `			// Parent -> local
+` + `			if (__parent !== ${parentLast}) {
+` + `				${parentLast} = __parent
+` + `				if (__local !== __parent) {
+` + `					__props.${attr.key} = __parent${defaultExpr}
+` + `				}
+` + `				${localLast} = __props.${attr.key}
+` + `				return
+` + `			}
+
+` + `			// Local -> parent
+` + `			if (__local !== ${localLast}) {
+` + `				${localLast} = __local
+` + (attr.bindable ? `				try { __inputAttrs.${attr.key} = __local } catch {}
+				${parentLast} = __inputAttrs.${attr.key}
+` : "") + `			}
+` + `})`);
     }
-    attrGettersSetters.push(`set ${attr.key}(v) { __inputAttrs.${attr.key} = v }`);
+  } else {
+    propsLines.push("const __props = __inputAttrs");
   }
-  const propsObjectCode = attrGettersSetters.length > 0 ? `		const __props = {
-			${attrGettersSetters.join(`,
-			`)}
-		}` : `		const __props = __inputAttrs`;
+  const propsObjectCode = "\t\t" + propsLines.join(`
+		`);
   if (!body) {
     const baseMembers = [`get ${propName}() { return __props }`];
     if (hasParents)
@@ -2726,9 +2752,10 @@ function transformScript(source, options = {}) {
   const { isComponent = false } = options;
   let changed = false;
   const neededImports = new Set;
+  const svelteImports = new Set;
   let propsTypeDeclaration = null;
   if (!isComponent) {
-    changed = transformOriginCalls(s, source, neededImports) || changed;
+    changed = transformOriginCalls(s, source, neededImports, svelteImports) || changed;
     changed = transformStandaloneAttrsCalls(s, source, neededImports) || changed;
   }
   if (isComponent) {
@@ -2767,10 +2794,17 @@ function transformScript(source, options = {}) {
 `);
       }
     }
-  } else if (neededImports.size > 0) {
-    const importStatement = generateRuntimeImport([...neededImports]);
-    s.prepend(importStatement + `
+  } else if (neededImports.size > 0 || svelteImports.size > 0) {
+    if (neededImports.size > 0) {
+      const importStatement = generateRuntimeImport([...neededImports]);
+      s.prepend(importStatement + `
+`);
+    }
+    if (svelteImports.size > 0) {
+      const svelteImportStatement = `import { ${[...svelteImports].join(", ")} } from 'svelte'`;
+      s.prepend(svelteImportStatement + `
 `);
+    }
   }
   if (!changed) {
     return { code: source, changed: false };
@@ -2789,9 +2823,10 @@ async function transformScriptAsync(source, options) {
   const { isComponent = false, schemaResolver } = options;
   let changed = false;
   const neededImports = new Set;
+  const svelteImports = new Set;
   let propsTypeDeclaration = null;
   if (!isComponent) {
-    changed = transformOriginCalls(s, source, neededImports) || changed;
+    changed = transformOriginCalls(s, source, neededImports, svelteImports) || changed;
     changed = transformStandaloneAttrsCalls(s, source, neededImports) || changed;
   }
   if (isComponent) {
@@ -2830,10 +2865,17 @@ async function transformScriptAsync(source, options) {
 `);
       }
     }
-  } else if (neededImports.size > 0) {
-    const importStatement = generateRuntimeImport([...neededImports]);
-    s.prepend(importStatement + `
+  } else if (neededImports.size > 0 || svelteImports.size > 0) {
+    if (neededImports.size > 0) {
+      const importStatement = generateRuntimeImport([...neededImports]);
+      s.prepend(importStatement + `
+`);
+    }
+    if (svelteImports.size > 0) {
+      const svelteImportStatement = `import { ${[...svelteImports].join(", ")} } from 'svelte'`;
+      s.prepend(svelteImportStatement + `
 `);
+    }
   }
   if (!changed) {
     return { code: source, changed: false };
@@ -2852,9 +2894,10 @@ async function transformScriptContent(source, options) {
   const { isComponent = false, schemaResolver } = options;
   let changed = false;
   const neededImports = new Set;
+  const svelteImports = new Set;
   let propsTypeDeclaration = null;
   if (!isComponent) {
-    changed = transformOriginCalls(s, source, neededImports) || changed;
+    changed = transformOriginCalls(s, source, neededImports, svelteImports) || changed;
   }
   if (isComponent) {
     const result = await transformAttrsOriginCalls(s, source, neededImports, schemaResolver);
@@ -2867,11 +2910,22 @@ async function transformScriptContent(source, options) {
   if (neededImports.size > 0) {
     const importStatement = generateRuntimeImport([...neededImports]);
     s.prepend(importStatement + `
+`);
+  }
+  if (svelteImports.size > 0) {
+    const svelteImportStatement = `import { ${[...svelteImports].join(", ")} } from 'svelte'`;
+    s.prepend(svelteImportStatement + `
 `);
   }
   if (propsTypeDeclaration) {
     const afterImports = findPropsInjectionPosition(source);
-    const offset = neededImports.size > 0 ? generateRuntimeImport([...neededImports]).length + 1 : 0;
+    let offset = 0;
+    if (neededImports.size > 0) {
+      offset += generateRuntimeImport([...neededImports]).length + 1;
+    }
+    if (svelteImports.size > 0) {
+      offset += `import { ${[...svelteImports].join(", ")} } from 'svelte'`.length + 1;
+    }
     s.appendLeft(afterImports + offset, propsTypeDeclaration + `
 `);
   }

package/dist/preprocess.js

@@ -1913,7 +1913,7 @@ function parseObjectMembers(source) {
 }
 
 // src/transform/origin-transform.ts
-function transformOriginCalls(s, source, neededImports) {
+function transformOriginCalls(s, source, neededImports, svelteImports) {
   const regex = /\$origin\s*\(/g;
   let match;
   let changed = false;
@@ -1929,14 +1929,14 @@ function transformOriginCalls(s, source, neededImports) {
       continue;
     }
     const definitionContent = source.slice(openParenIndex + 1, closeParenIndex);
-    const transformed = transformOriginDefinition(definitionContent);
+    const transformed = transformOriginDefinition(definitionContent, svelteImports);
     s.overwrite(startIndex, closeParenIndex + 1, `__createOrigin(${transformed})`);
     neededImports.add("__createOrigin");
     changed = true;
   }
   return changed;
 }
-function transformOriginDefinition(content) {
+function transformOriginDefinition(content, svelteImports) {
   let parents = [];
   let bodyContent = content.trim();
   let initCallback = null;
@@ -2001,7 +2001,7 @@ function transformOriginDefinition(content) {
     }
   }
   const attrDetails = parseAttrsSource(attrsContent);
-  const { body: createFnBody, attachments } = transformOriginBody(contentWithoutAttrs.trim(), parents, attrDetails, attrPropertyName);
+  const { body: createFnBody, attachments } = transformOriginBody(contentWithoutAttrs.trim(), parents, attrDetails, attrPropertyName, svelteImports);
   const parentsCode = parents.length > 0 ? `[${parents.join(", ")}]` : "undefined";
   let configCode = `{
 	__attrSchema: ${attrSchemaCode},
@@ -2021,22 +2021,48 @@ ${createFnBody}
 }`;
   return configCode;
 }
-function transformOriginBody(content, parents = [], attrDetails = [], propName = "props") {
+function transformOriginBody(content, parents = [], attrDetails = [], propName = "props", _svelteImports) {
   let body = content.trim();
   const hasParents = parents.length > 0;
-  const attrGettersSetters = [];
-  for (const attr of attrDetails) {
-    if (attr.hasDefault) {
-      attrGettersSetters.push(`get ${attr.key}() { return __inputAttrs.${attr.key} ?? ${attr.defaultValue} }`);
-    } else {
-      attrGettersSetters.push(`get ${attr.key}() { return __inputAttrs.${attr.key} }`);
+  const propsLines = [];
+  if (attrDetails.length > 0) {
+    const initialProps = [];
+    for (const attr of attrDetails) {
+      const defaultExpr = attr.hasDefault ? ` ?? ${attr.defaultValue}` : "";
+      initialProps.push(`${attr.key}: __inputAttrs.${attr.key}${defaultExpr}`);
+    }
+    propsLines.push(`let __props = $state({ ${initialProps.join(", ")} })`);
+    for (const attr of attrDetails) {
+      const defaultExpr = attr.hasDefault ? ` ?? ${attr.defaultValue}` : "";
+      const parentLast = `__last_parent_${attr.key}`;
+      const localLast = `__last_local_${attr.key}`;
+      propsLines.push(`let ${parentLast} = __inputAttrs.${attr.key}`, `let ${localLast} = __props.${attr.key}`, `$effect(() => {
+` + `			const __parent = __inputAttrs.${attr.key}
+` + `			const __local = __props.${attr.key}
+
+` + `			// Parent -> local
+` + `			if (__parent !== ${parentLast}) {
+` + `				${parentLast} = __parent
+` + `				if (__local !== __parent) {
+` + `					__props.${attr.key} = __parent${defaultExpr}
+` + `				}
+` + `				${localLast} = __props.${attr.key}
+` + `				return
+` + `			}
+
+` + `			// Local -> parent
+` + `			if (__local !== ${localLast}) {
+` + `				${localLast} = __local
+` + (attr.bindable ? `				try { __inputAttrs.${attr.key} = __local } catch {}
+				${parentLast} = __inputAttrs.${attr.key}
+` : "") + `			}
+` + `})`);
     }
-    attrGettersSetters.push(`set ${attr.key}(v) { __inputAttrs.${attr.key} = v }`);
+  } else {
+    propsLines.push("const __props = __inputAttrs");
   }
-  const propsObjectCode = attrGettersSetters.length > 0 ? `		const __props = {
-			${attrGettersSetters.join(`,
-			`)}
-		}` : `		const __props = __inputAttrs`;
+  const propsObjectCode = "\t\t" + propsLines.join(`
+		`);
   if (!body) {
     const baseMembers = [`get ${propName}() { return __props }`];
     if (hasParents)
@@ -2722,9 +2748,10 @@ function transformScript(source, options = {}) {
   const { isComponent = false } = options;
   let changed = false;
   const neededImports = new Set;
+  const svelteImports = new Set;
   let propsTypeDeclaration = null;
   if (!isComponent) {
-    changed = transformOriginCalls(s, source, neededImports) || changed;
+    changed = transformOriginCalls(s, source, neededImports, svelteImports) || changed;
     changed = transformStandaloneAttrsCalls(s, source, neededImports) || changed;
   }
   if (isComponent) {
@@ -2763,10 +2790,17 @@ function transformScript(source, options = {}) {
 `);
       }
     }
-  } else if (neededImports.size > 0) {
-    const importStatement = generateRuntimeImport([...neededImports]);
-    s.prepend(importStatement + `
+  } else if (neededImports.size > 0 || svelteImports.size > 0) {
+    if (neededImports.size > 0) {
+      const importStatement = generateRuntimeImport([...neededImports]);
+      s.prepend(importStatement + `
+`);
+    }
+    if (svelteImports.size > 0) {
+      const svelteImportStatement = `import { ${[...svelteImports].join(", ")} } from 'svelte'`;
+      s.prepend(svelteImportStatement + `
 `);
+    }
   }
   if (!changed) {
     return { code: source, changed: false };
@@ -2785,9 +2819,10 @@ async function transformScriptAsync(source, options) {
   const { isComponent = false, schemaResolver } = options;
   let changed = false;
   const neededImports = new Set;
+  const svelteImports = new Set;
   let propsTypeDeclaration = null;
   if (!isComponent) {
-    changed = transformOriginCalls(s, source, neededImports) || changed;
+    changed = transformOriginCalls(s, source, neededImports, svelteImports) || changed;
     changed = transformStandaloneAttrsCalls(s, source, neededImports) || changed;
   }
   if (isComponent) {
@@ -2826,10 +2861,17 @@ async function transformScriptAsync(source, options) {
 `);
       }
     }
-  } else if (neededImports.size > 0) {
-    const importStatement = generateRuntimeImport([...neededImports]);
-    s.prepend(importStatement + `
+  } else if (neededImports.size > 0 || svelteImports.size > 0) {
+    if (neededImports.size > 0) {
+      const importStatement = generateRuntimeImport([...neededImports]);
+      s.prepend(importStatement + `
+`);
+    }
+    if (svelteImports.size > 0) {
+      const svelteImportStatement = `import { ${[...svelteImports].join(", ")} } from 'svelte'`;
+      s.prepend(svelteImportStatement + `
 `);
+    }
   }
   if (!changed) {
     return { code: source, changed: false };
@@ -2848,9 +2890,10 @@ async function transformScriptContent(source, options) {
   const { isComponent = false, schemaResolver } = options;
   let changed = false;
   const neededImports = new Set;
+  const svelteImports = new Set;
   let propsTypeDeclaration = null;
   if (!isComponent) {
-    changed = transformOriginCalls(s, source, neededImports) || changed;
+    changed = transformOriginCalls(s, source, neededImports, svelteImports) || changed;
   }
   if (isComponent) {
     const result = await transformAttrsOriginCalls(s, source, neededImports, schemaResolver);
@@ -2863,11 +2906,22 @@ async function transformScriptContent(source, options) {
   if (neededImports.size > 0) {
     const importStatement = generateRuntimeImport([...neededImports]);
     s.prepend(importStatement + `
+`);
+  }
+  if (svelteImports.size > 0) {
+    const svelteImportStatement = `import { ${[...svelteImports].join(", ")} } from 'svelte'`;
+    s.prepend(svelteImportStatement + `
 `);
   }
   if (propsTypeDeclaration) {
     const afterImports = findPropsInjectionPosition(source);
-    const offset = neededImports.size > 0 ? generateRuntimeImport([...neededImports]).length + 1 : 0;
+    let offset = 0;
+    if (neededImports.size > 0) {
+      offset += generateRuntimeImport([...neededImports]).length + 1;
+    }
+    if (svelteImports.size > 0) {
+      offset += `import { ${[...svelteImports].join(", ")} } from 'svelte'`.length + 1;
+    }
     s.appendLeft(afterImports + offset, propsTypeDeclaration + `
 `);
   }

package/dist/runtime/index.js

@@ -3475,24 +3475,39 @@ function __attrsFor(factory, rawAttrs) {
   const wrapper = {};
   const localValues = {};
   const hasLocalValue = {};
-  for (const key2 of Object.keys(schema)) {
-    Object.defineProperty(wrapper, key2, {
+  const defineExposedProp = (key2, info) => {
+    if (Object.prototype.hasOwnProperty.call(wrapper, key2))
+      return;
+    const base = {
       get() {
-        if (hasLocalValue[key2]) {
+        if (hasLocalValue[key2])
           return localValues[key2];
-        }
         return rawAttrs[key2];
       },
-      set(value) {
-        localValues[key2] = value;
-        hasLocalValue[key2] = true;
-        try {
-          rawAttrs[key2] = value;
-        } catch {}
-      },
       enumerable: true,
       configurable: true
-    });
+    };
+    if (info.bindable) {
+      Object.defineProperty(wrapper, key2, {
+        ...base,
+        set(value) {
+          localValues[key2] = value;
+          hasLocalValue[key2] = true;
+          try {
+            rawAttrs[key2] = value;
+          } catch {}
+        }
+      });
+    } else {
+      Object.defineProperty(wrapper, key2, base);
+    }
+  };
+  for (const [key2, info] of Object.entries(schema)) {
+    const parentValue = rawAttrs[key2];
+    const shouldExpose = !info.bindable || !info.hasDefault || parentValue !== undefined;
+    if (shouldExpose) {
+      defineExposedProp(key2, info);
+    }
   }
   for (const sym of Object.getOwnPropertySymbols(rawAttrs)) {
     Object.defineProperty(wrapper, sym, {
@@ -3505,34 +3520,57 @@ function __attrsFor(factory, rawAttrs) {
   }
   return new Proxy(wrapper, {
     get(target, prop2) {
-      if (prop2 in target) {
-        return target[prop2];
+      if (typeof prop2 === "string" && prop2 in schema) {
+        if (hasLocalValue[prop2])
+          return localValues[prop2];
+        return rawAttrs[prop2];
       }
+      if (prop2 in target)
+        return target[prop2];
       return rawAttrs[prop2];
     },
     set(target, prop2, value) {
+      if (typeof prop2 === "string" && prop2 in schema) {
+        localValues[prop2] = value;
+        hasLocalValue[prop2] = true;
+        if (!Object.prototype.hasOwnProperty.call(wrapper, prop2)) {
+          defineExposedProp(prop2, schema[prop2]);
+        }
+        if (schema[prop2].bindable) {
+          try {
+            rawAttrs[prop2] = value;
+          } catch {}
+        }
+        return true;
+      }
       if (prop2 in target) {
-        target[prop2] = value;
+        try {
+          target[prop2] = value;
+        } catch {}
         return true;
       }
       try {
         rawAttrs[prop2] = value;
       } catch {
-        localValues[prop2] = value;
-        hasLocalValue[prop2] = true;
+        if (typeof prop2 === "string") {
+          localValues[prop2] = value;
+          hasLocalValue[prop2] = true;
+        }
       }
       return true;
     },
     has(target, prop2) {
+      if (typeof prop2 === "string" && prop2 in schema) {
+        return prop2 in target || hasLocalValue[prop2];
+      }
       return prop2 in target || prop2 in rawAttrs;
     },
     ownKeys() {
       return [...Object.keys(wrapper), ...Object.getOwnPropertySymbols(rawAttrs)];
     },
     getOwnPropertyDescriptor(target, prop2) {
-      if (prop2 in target) {
+      if (prop2 in target)
         return Object.getOwnPropertyDescriptor(target, prop2);
-      }
       return Object.getOwnPropertyDescriptor(rawAttrs, prop2);
     }
   });

package/dist/transform/origin-transform.d.ts

@@ -48,4 +48,4 @@ export interface TransformOriginBodyResult {
  * })
  * ```
  */
-export declare function transformOriginCalls(s: MagicString, source: string, neededImports: Set<string>): boolean;
+export declare function transformOriginCalls(s: MagicString, source: string, neededImports: Set<string>, svelteImports?: Set<string>): boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "svelte-origin",
-	"version": "1.0.0-next.15",
+	"version": "1.0.0-next.17",
 	"description": "Compiler-assisted state and prop ergonomics for Svelte 5",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",