svelte-origin 1.0.0-next.24 → 1.0.0-next.25

package/LLM.md

@@ -102,8 +102,7 @@ function $origin<Parents extends OriginFactory[], T>(parents: Parents, definitio
 
 | Property | Description |
 |----------|-------------|
-| `props: $attrs({...})` | Props schema (becomes component props) |
-| `attrs: $attrs({...})` | Alternative name for props schema |
+| `props: $attrs({...})` | Props schema (recommended name) |
 | `_privateField` | Private state/method (not exposed on instance) |
 | `get propertyName()` | Derived value (use `$derived` inside) |
 | `methodName()` | Method accessible on the instance |
@@ -313,6 +312,99 @@ export const Timer = $origin({
 - Can return a cleanup function that runs when the component is destroyed
 - Useful for side effects, subscriptions, or DOM interactions
 
+## Origin Destructuring
+
+Destructure methods and props from origin instances with automatic handling.
+
+### Method Destructuring
+
+Methods are automatically bound to preserve `this` context:
+
+```svelte
+<script lang="ts">
+	import { Counter } from './counter.svelte'
+	let counter = $attrs.origin(Counter)
+	
+	// Destructure methods - automatically bound
+	let { increment, decrement } = counter
+	
+	// Transforms to:
+	// let increment = counter.increment.bind(counter)
+	// let decrement = counter.decrement.bind(counter)
+</script>
+
+<button onclick={increment}>+</button>
+<button onclick={decrement}>-</button>
+```
+
+### Props Destructuring
+
+Props are automatically wrapped in `$derived` for reactivity:
+
+```svelte
+<script lang="ts">
+	import { Counter } from './counter.svelte'
+	let counter = $attrs.origin(Counter)
+	
+	// Destructure props - automatically reactive
+	let { count, label } = counter.props
+	
+	// Transforms to:
+	// let count = $derived(counter.props.count)
+	// let label = $derived(counter.props.label)
+</script>
+
+<p>{label}: {count}</p>
+```
+
+### Nested Props Destructuring
+
+Combine method and props destructuring in a single pattern:
+
+```svelte
+<script lang="ts">
+	let { increment, props: { count, label } } = counter
+	
+	// Transforms to:
+	// let increment = counter.increment.bind(counter)
+	// let count = $derived(counter.props.count)
+	// let label = $derived(counter.props.label)
+</script>
+```
+
+### Aliases and Defaults
+
+```svelte
+<script lang="ts">
+	// Alias methods
+	let { increment: inc } = counter
+	
+	// Alias props with defaults
+	let { count: counterValue = 0 } = counter.props
+	
+	// Transforms to:
+	// let inc = counter.increment.bind(counter)
+	// let counterValue = $derived(counter.props.count ?? 0)
+</script>
+```
+
+### Coexistence with $props()
+
+When you have your own `$props()` and also use `$attrs.origin()`:
+
+```svelte
+<script lang="ts">
+	import { Counter } from './counter.svelte'
+	
+	let { myOwnProp = 'hello' } = $props()
+	let counter = $attrs.origin(Counter)
+	
+	// Transforms to:
+	// let { myOwnProp = 'hello', ...___originAttrs } = $props()
+	// let counter = Counter(__attrsFor(Counter, ___originAttrs))
+</script>
+```
+
 ## Attachments
 
 Origins can define **attachment methods** that run when an element is attached to the DOM. These are methods prefixed with `$` that receive the element and optionally return a cleanup function.
@@ -507,13 +599,13 @@ interface SvelteOriginFactory<TDef, TAllAttrs> {
 
 ```ts
 type SvelteOriginInstance<T> = {
-	props: ReactiveAttrs<T['props']>  // Or 'attrs' if that's what you named it
+	props: ReactiveAttrs<T['props']>
 	super?: ParentInstance
 	$attachments: SvelteOriginAttachments
 } & PublicMembers<T>
 ```
 
-**Note:** The `props`/`attrs` property name matches what you use in your origin definition.
+**Note:** The property name `props` is the recommended convention for the props schema.
 
 ## Common Patterns
 

package/README.md

@@ -121,8 +121,6 @@ svelteOrigin({
 
 Write origins in a file where runes are allowed (e.g. `.svelte.ts`).
 
-This README describes the **macro** style (preferred direction):
-
 ```ts
 // counter.svelte.ts
 export const Counter = $origin({
@@ -164,11 +162,11 @@ export const Counter = $origin({
 Notes:
 
 - `$origin(...)` is a **compile-time macro** provided by `svelte-origin` (not a Svelte rune)
-- `props: $attrs({...})` is also a macro in origin definitions
-	- this uses `$attrs` to avoid conflict with Svelte's `$props()` rune
-	- it compiles into the origin's prop schema and default/bindable handling
-	- the property name (`props`) is arbitrary—you can name it `attrs`, `options`, or anything else
-- `$bindable(...)` inside `props: $attrs({...})` is treated as a marker (macro) and compiles away
+- `props: $attrs({...})` defines the component props schema
+	- uses `$attrs` to avoid conflict with Svelte's `$props()` rune
+	- compiles into the origin's prop schema with defaults and bindable handling
+	- the property name (`props`) is the recommended convention
+- `$bindable(...)` inside `props: $attrs({...})` marks props for two-way binding
 - `$state`/`$derived` are real Svelte runes
 - Properties prefixed with `_` (like `_incrementCount`) are private and not exposed on the instance type
 
@@ -393,6 +391,62 @@ svelte-package && svelte-origin post-process [dist-dir]
 
 See `svelte-origin --help` for all options.
 
+## Origin Destructuring
+
+Destructure methods and props from origin instances with automatic handling:
+
+### Method Destructuring
+
+Methods are automatically bound to preserve `this` context:
+
+```svelte
+<script lang="ts">
+	import { Counter } from './counter.svelte'
+	let counter = $attrs.origin(Counter)
+	
+	// Destructure methods - automatically bound
+	let { increment, decrement } = counter
+</script>
+
+<button onclick={increment}>+</button>
+<button onclick={decrement}>-</button>
+```
+
+### Props Destructuring
+
+Props are automatically wrapped in `$derived` for reactivity:
+
+```svelte
+<script lang="ts">
+	import { Counter } from './counter.svelte'
+	let counter = $attrs.origin(Counter)
+	
+	// Destructure props - automatically reactive
+	let { count, label } = counter.props
+</script>
+
+<p>{label}: {count}</p>
+```
+
+### Nested Destructuring
+
+Combine method and props destructuring:
+
+```svelte
+<script lang="ts">
+	let { increment, props: { count, label } } = counter
+</script>
+```
+
+### Aliases and Defaults
+
+```svelte
+<script lang="ts">
+	let { increment: inc } = counter
+	let { count: counterValue = 0 } = counter.props
+</script>
+```
+
 ## Known limitations
 
 ### svelte-check type inference

package/dist/cli.js

@@ -1551,11 +1551,93 @@ function findPropsInjectionPosition(source) {
 }
 
 // src/transform/attrs-schema.ts
+function stripLeadingComments(str) {
+  let result = str.trim();
+  while (true) {
+    if (result.startsWith("/*")) {
+      const endComment = result.indexOf("*/");
+      if (endComment !== -1) {
+        result = result.slice(endComment + 2).trim();
+        continue;
+      }
+      break;
+    }
+    if (result.startsWith("//")) {
+      const endLine = result.indexOf(`
+`);
+      if (endLine !== -1) {
+        result = result.slice(endLine + 1).trim();
+        continue;
+      }
+      result = "";
+      break;
+    }
+    break;
+  }
+  return result;
+}
+function stripTrailingComments(str) {
+  let result = str.trim();
+  let i = 0;
+  let lastValidEnd = result.length;
+  while (i < result.length) {
+    const char = result[i];
+    if (char === '"' || char === "'" || char === "`") {
+      const quote = char;
+      i++;
+      while (i < result.length && result[i] !== quote) {
+        if (result[i] === "\\")
+          i++;
+        i++;
+      }
+      i++;
+      lastValidEnd = i;
+      continue;
+    }
+    if (char === "{" || char === "(" || char === "[") {
+      let depth = 1;
+      i++;
+      while (i < result.length && depth > 0) {
+        const c = result[i];
+        if (c === "{" || c === "(" || c === "[")
+          depth++;
+        else if (c === "}" || c === ")" || c === "]")
+          depth--;
+        else if (c === '"' || c === "'" || c === "`") {
+          const quote = c;
+          i++;
+          while (i < result.length && result[i] !== quote) {
+            if (result[i] === "\\")
+              i++;
+            i++;
+          }
+        }
+        i++;
+      }
+      lastValidEnd = i;
+      continue;
+    }
+    if (char === "/" && result[i + 1] === "*") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    if (char === "/" && result[i + 1] === "/") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    i++;
+    lastValidEnd = i;
+  }
+  return result;
+}
 function generateAttrSchemaFromSource(attrsSource) {
   const entries = [];
   const attrs = splitAttrsSource(attrsSource);
   for (const attr of attrs) {
-    const trimmed = attr.trim();
+    let trimmed = attr.trim();
+    if (!trimmed)
+      continue;
+    trimmed = stripLeadingComments(trimmed);
     if (!trimmed)
       continue;
     const colonIndex = trimmed.indexOf(":");
@@ -1563,6 +1645,7 @@ function generateAttrSchemaFromSource(attrsSource) {
       continue;
     const key = trimmed.slice(0, colonIndex).trim();
     let value = trimmed.slice(colonIndex + 1).trim();
+    value = stripTrailingComments(value);
     const asIndex = findTopLevelAs(value);
     if (asIndex !== -1) {
       value = value.slice(0, asIndex).trim();
@@ -1586,24 +1669,7 @@ function parseAttrsSource(attrsSource) {
     let trimmed = attr.trim();
     if (!trimmed)
       continue;
-    while (trimmed.startsWith("/*")) {
-      const endComment = trimmed.indexOf("*/");
-      if (endComment !== -1) {
-        trimmed = trimmed.slice(endComment + 2).trim();
-      } else {
-        break;
-      }
-    }
-    while (trimmed.startsWith("//")) {
-      const endLine = trimmed.indexOf(`
-`);
-      if (endLine !== -1) {
-        trimmed = trimmed.slice(endLine + 1).trim();
-      } else {
-        trimmed = "";
-        break;
-      }
-    }
+    trimmed = stripLeadingComments(trimmed);
     if (!trimmed)
       continue;
     const colonIndex = trimmed.indexOf(":");
@@ -1611,6 +1677,7 @@ function parseAttrsSource(attrsSource) {
       continue;
     const key = trimmed.slice(0, colonIndex).trim();
     let value = trimmed.slice(colonIndex + 1).trim();
+    value = stripTrailingComments(value);
     const asIndex = findTopLevelAs(value);
     if (asIndex !== -1) {
       value = value.slice(0, asIndex).trim();
@@ -2554,6 +2621,7 @@ function parseAttrsContent(content) {
       continue;
     const key = trimmed.slice(0, colonIndex).trim();
     let value = trimmed.slice(colonIndex + 1).trim();
+    value = stripTrailingComments2(value);
     const asIndex = findTopLevelAs(value);
     if (asIndex !== -1) {
       value = value.slice(0, asIndex).trim();
@@ -2661,6 +2729,56 @@ function stripComments(str) {
   }
   return result;
 }
+function stripTrailingComments2(str) {
+  let result = str.trim();
+  let i = 0;
+  while (i < result.length) {
+    const char = result[i];
+    if (char === '"' || char === "'" || char === "`") {
+      const quote = char;
+      i++;
+      while (i < result.length && result[i] !== quote) {
+        if (result[i] === "\\")
+          i++;
+        i++;
+      }
+      i++;
+      continue;
+    }
+    if (char === "{" || char === "(" || char === "[") {
+      let depth = 1;
+      i++;
+      while (i < result.length && depth > 0) {
+        const c = result[i];
+        if (c === "{" || c === "(" || c === "[")
+          depth++;
+        else if (c === "}" || c === ")" || c === "]")
+          depth--;
+        else if (c === '"' || c === "'" || c === "`") {
+          const quote = c;
+          i++;
+          while (i < result.length && result[i] !== quote) {
+            if (result[i] === "\\")
+              i++;
+            i++;
+          }
+        }
+        i++;
+      }
+      continue;
+    }
+    if (char === "/" && result[i + 1] === "*") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    if (char === "/" && result[i + 1] === "/") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    i++;
+  }
+  return result;
+}
 function generatePropsDestructuring(attrs, factoryName) {
   const parts = [];
   for (const attr of attrs) {

package/dist/index.js

@@ -4162,6 +4162,7 @@ function parseAttrsContent(content) {
       continue;
     const key2 = trimmed.slice(0, colonIndex).trim();
     let value = trimmed.slice(colonIndex + 1).trim();
+    value = stripTrailingComments(value);
     const asIndex = findTopLevelAs(value);
     if (asIndex !== -1) {
       value = value.slice(0, asIndex).trim();
@@ -4269,6 +4270,56 @@ function stripComments(str) {
   }
   return result;
 }
+function stripTrailingComments(str) {
+  let result = str.trim();
+  let i = 0;
+  while (i < result.length) {
+    const char = result[i];
+    if (char === '"' || char === "'" || char === "`") {
+      const quote = char;
+      i++;
+      while (i < result.length && result[i] !== quote) {
+        if (result[i] === "\\")
+          i++;
+        i++;
+      }
+      i++;
+      continue;
+    }
+    if (char === "{" || char === "(" || char === "[") {
+      let depth = 1;
+      i++;
+      while (i < result.length && depth > 0) {
+        const c = result[i];
+        if (c === "{" || c === "(" || c === "[")
+          depth++;
+        else if (c === "}" || c === ")" || c === "]")
+          depth--;
+        else if (c === '"' || c === "'" || c === "`") {
+          const quote = c;
+          i++;
+          while (i < result.length && result[i] !== quote) {
+            if (result[i] === "\\")
+              i++;
+            i++;
+          }
+        }
+        i++;
+      }
+      continue;
+    }
+    if (char === "/" && result[i + 1] === "*") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    if (char === "/" && result[i + 1] === "/") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    i++;
+  }
+  return result;
+}
 function generatePropsDestructuring(attrs, factoryName) {
   const parts = [];
   for (const attr2 of attrs) {
@@ -5859,11 +5910,93 @@ function findPropsInjectionPosition(source2) {
 }
 
 // src/transform/attrs-schema.ts
+function stripLeadingComments(str) {
+  let result = str.trim();
+  while (true) {
+    if (result.startsWith("/*")) {
+      const endComment = result.indexOf("*/");
+      if (endComment !== -1) {
+        result = result.slice(endComment + 2).trim();
+        continue;
+      }
+      break;
+    }
+    if (result.startsWith("//")) {
+      const endLine = result.indexOf(`
+`);
+      if (endLine !== -1) {
+        result = result.slice(endLine + 1).trim();
+        continue;
+      }
+      result = "";
+      break;
+    }
+    break;
+  }
+  return result;
+}
+function stripTrailingComments2(str) {
+  let result = str.trim();
+  let i = 0;
+  let lastValidEnd = result.length;
+  while (i < result.length) {
+    const char = result[i];
+    if (char === '"' || char === "'" || char === "`") {
+      const quote = char;
+      i++;
+      while (i < result.length && result[i] !== quote) {
+        if (result[i] === "\\")
+          i++;
+        i++;
+      }
+      i++;
+      lastValidEnd = i;
+      continue;
+    }
+    if (char === "{" || char === "(" || char === "[") {
+      let depth = 1;
+      i++;
+      while (i < result.length && depth > 0) {
+        const c = result[i];
+        if (c === "{" || c === "(" || c === "[")
+          depth++;
+        else if (c === "}" || c === ")" || c === "]")
+          depth--;
+        else if (c === '"' || c === "'" || c === "`") {
+          const quote = c;
+          i++;
+          while (i < result.length && result[i] !== quote) {
+            if (result[i] === "\\")
+              i++;
+            i++;
+          }
+        }
+        i++;
+      }
+      lastValidEnd = i;
+      continue;
+    }
+    if (char === "/" && result[i + 1] === "*") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    if (char === "/" && result[i + 1] === "/") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    i++;
+    lastValidEnd = i;
+  }
+  return result;
+}
 function generateAttrSchemaFromSource(attrsSource) {
   const entries = [];
   const attrs = splitAttrsSource(attrsSource);
   for (const attr2 of attrs) {
-    const trimmed = attr2.trim();
+    let trimmed = attr2.trim();
+    if (!trimmed)
+      continue;
+    trimmed = stripLeadingComments(trimmed);
     if (!trimmed)
       continue;
     const colonIndex = trimmed.indexOf(":");
@@ -5871,6 +6004,7 @@ function generateAttrSchemaFromSource(attrsSource) {
       continue;
     const key2 = trimmed.slice(0, colonIndex).trim();
     let value = trimmed.slice(colonIndex + 1).trim();
+    value = stripTrailingComments2(value);
     const asIndex = findTopLevelAs(value);
     if (asIndex !== -1) {
       value = value.slice(0, asIndex).trim();
@@ -5894,24 +6028,7 @@ function parseAttrsSource(attrsSource) {
     let trimmed = attr2.trim();
     if (!trimmed)
       continue;
-    while (trimmed.startsWith("/*")) {
-      const endComment = trimmed.indexOf("*/");
-      if (endComment !== -1) {
-        trimmed = trimmed.slice(endComment + 2).trim();
-      } else {
-        break;
-      }
-    }
-    while (trimmed.startsWith("//")) {
-      const endLine = trimmed.indexOf(`
-`);
-      if (endLine !== -1) {
-        trimmed = trimmed.slice(endLine + 1).trim();
-      } else {
-        trimmed = "";
-        break;
-      }
-    }
+    trimmed = stripLeadingComments(trimmed);
     if (!trimmed)
       continue;
     const colonIndex = trimmed.indexOf(":");
@@ -5919,6 +6036,7 @@ function parseAttrsSource(attrsSource) {
       continue;
     const key2 = trimmed.slice(0, colonIndex).trim();
     let value = trimmed.slice(colonIndex + 1).trim();
+    value = stripTrailingComments2(value);
     const asIndex = findTopLevelAs(value);
     if (asIndex !== -1) {
       value = value.slice(0, asIndex).trim();

package/dist/plugin.js

@@ -1545,11 +1545,93 @@ function findPropsInjectionPosition(source) {
 }
 
 // src/transform/attrs-schema.ts
+function stripLeadingComments(str) {
+  let result = str.trim();
+  while (true) {
+    if (result.startsWith("/*")) {
+      const endComment = result.indexOf("*/");
+      if (endComment !== -1) {
+        result = result.slice(endComment + 2).trim();
+        continue;
+      }
+      break;
+    }
+    if (result.startsWith("//")) {
+      const endLine = result.indexOf(`
+`);
+      if (endLine !== -1) {
+        result = result.slice(endLine + 1).trim();
+        continue;
+      }
+      result = "";
+      break;
+    }
+    break;
+  }
+  return result;
+}
+function stripTrailingComments(str) {
+  let result = str.trim();
+  let i = 0;
+  let lastValidEnd = result.length;
+  while (i < result.length) {
+    const char = result[i];
+    if (char === '"' || char === "'" || char === "`") {
+      const quote = char;
+      i++;
+      while (i < result.length && result[i] !== quote) {
+        if (result[i] === "\\")
+          i++;
+        i++;
+      }
+      i++;
+      lastValidEnd = i;
+      continue;
+    }
+    if (char === "{" || char === "(" || char === "[") {
+      let depth = 1;
+      i++;
+      while (i < result.length && depth > 0) {
+        const c = result[i];
+        if (c === "{" || c === "(" || c === "[")
+          depth++;
+        else if (c === "}" || c === ")" || c === "]")
+          depth--;
+        else if (c === '"' || c === "'" || c === "`") {
+          const quote = c;
+          i++;
+          while (i < result.length && result[i] !== quote) {
+            if (result[i] === "\\")
+              i++;
+            i++;
+          }
+        }
+        i++;
+      }
+      lastValidEnd = i;
+      continue;
+    }
+    if (char === "/" && result[i + 1] === "*") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    if (char === "/" && result[i + 1] === "/") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    i++;
+    lastValidEnd = i;
+  }
+  return result;
+}
 function generateAttrSchemaFromSource(attrsSource) {
   const entries = [];
   const attrs = splitAttrsSource(attrsSource);
   for (const attr of attrs) {
-    const trimmed = attr.trim();
+    let trimmed = attr.trim();
+    if (!trimmed)
+      continue;
+    trimmed = stripLeadingComments(trimmed);
     if (!trimmed)
       continue;
     const colonIndex = trimmed.indexOf(":");
@@ -1557,6 +1639,7 @@ function generateAttrSchemaFromSource(attrsSource) {
       continue;
     const key = trimmed.slice(0, colonIndex).trim();
     let value = trimmed.slice(colonIndex + 1).trim();
+    value = stripTrailingComments(value);
     const asIndex = findTopLevelAs(value);
     if (asIndex !== -1) {
       value = value.slice(0, asIndex).trim();
@@ -1580,24 +1663,7 @@ function parseAttrsSource(attrsSource) {
     let trimmed = attr.trim();
     if (!trimmed)
       continue;
-    while (trimmed.startsWith("/*")) {
-      const endComment = trimmed.indexOf("*/");
-      if (endComment !== -1) {
-        trimmed = trimmed.slice(endComment + 2).trim();
-      } else {
-        break;
-      }
-    }
-    while (trimmed.startsWith("//")) {
-      const endLine = trimmed.indexOf(`
-`);
-      if (endLine !== -1) {
-        trimmed = trimmed.slice(endLine + 1).trim();
-      } else {
-        trimmed = "";
-        break;
-      }
-    }
+    trimmed = stripLeadingComments(trimmed);
     if (!trimmed)
       continue;
     const colonIndex = trimmed.indexOf(":");
@@ -1605,6 +1671,7 @@ function parseAttrsSource(attrsSource) {
       continue;
     const key = trimmed.slice(0, colonIndex).trim();
     let value = trimmed.slice(colonIndex + 1).trim();
+    value = stripTrailingComments(value);
     const asIndex = findTopLevelAs(value);
     if (asIndex !== -1) {
       value = value.slice(0, asIndex).trim();
@@ -2548,6 +2615,7 @@ function parseAttrsContent(content) {
       continue;
     const key = trimmed.slice(0, colonIndex).trim();
     let value = trimmed.slice(colonIndex + 1).trim();
+    value = stripTrailingComments2(value);
     const asIndex = findTopLevelAs(value);
     if (asIndex !== -1) {
       value = value.slice(0, asIndex).trim();
@@ -2655,6 +2723,56 @@ function stripComments(str) {
   }
   return result;
 }
+function stripTrailingComments2(str) {
+  let result = str.trim();
+  let i = 0;
+  while (i < result.length) {
+    const char = result[i];
+    if (char === '"' || char === "'" || char === "`") {
+      const quote = char;
+      i++;
+      while (i < result.length && result[i] !== quote) {
+        if (result[i] === "\\")
+          i++;
+        i++;
+      }
+      i++;
+      continue;
+    }
+    if (char === "{" || char === "(" || char === "[") {
+      let depth = 1;
+      i++;
+      while (i < result.length && depth > 0) {
+        const c = result[i];
+        if (c === "{" || c === "(" || c === "[")
+          depth++;
+        else if (c === "}" || c === ")" || c === "]")
+          depth--;
+        else if (c === '"' || c === "'" || c === "`") {
+          const quote = c;
+          i++;
+          while (i < result.length && result[i] !== quote) {
+            if (result[i] === "\\")
+              i++;
+            i++;
+          }
+        }
+        i++;
+      }
+      continue;
+    }
+    if (char === "/" && result[i + 1] === "*") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    if (char === "/" && result[i + 1] === "/") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    i++;
+  }
+  return result;
+}
 function generatePropsDestructuring(attrs, factoryName) {
   const parts = [];
   for (const attr of attrs) {

package/dist/post-process.js

@@ -1549,11 +1549,93 @@ function findPropsInjectionPosition(source) {
 }
 
 // src/transform/attrs-schema.ts
+function stripLeadingComments(str) {
+  let result = str.trim();
+  while (true) {
+    if (result.startsWith("/*")) {
+      const endComment = result.indexOf("*/");
+      if (endComment !== -1) {
+        result = result.slice(endComment + 2).trim();
+        continue;
+      }
+      break;
+    }
+    if (result.startsWith("//")) {
+      const endLine = result.indexOf(`
+`);
+      if (endLine !== -1) {
+        result = result.slice(endLine + 1).trim();
+        continue;
+      }
+      result = "";
+      break;
+    }
+    break;
+  }
+  return result;
+}
+function stripTrailingComments(str) {
+  let result = str.trim();
+  let i = 0;
+  let lastValidEnd = result.length;
+  while (i < result.length) {
+    const char = result[i];
+    if (char === '"' || char === "'" || char === "`") {
+      const quote = char;
+      i++;
+      while (i < result.length && result[i] !== quote) {
+        if (result[i] === "\\")
+          i++;
+        i++;
+      }
+      i++;
+      lastValidEnd = i;
+      continue;
+    }
+    if (char === "{" || char === "(" || char === "[") {
+      let depth = 1;
+      i++;
+      while (i < result.length && depth > 0) {
+        const c = result[i];
+        if (c === "{" || c === "(" || c === "[")
+          depth++;
+        else if (c === "}" || c === ")" || c === "]")
+          depth--;
+        else if (c === '"' || c === "'" || c === "`") {
+          const quote = c;
+          i++;
+          while (i < result.length && result[i] !== quote) {
+            if (result[i] === "\\")
+              i++;
+            i++;
+          }
+        }
+        i++;
+      }
+      lastValidEnd = i;
+      continue;
+    }
+    if (char === "/" && result[i + 1] === "*") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    if (char === "/" && result[i + 1] === "/") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    i++;
+    lastValidEnd = i;
+  }
+  return result;
+}
 function generateAttrSchemaFromSource(attrsSource) {
   const entries = [];
   const attrs = splitAttrsSource(attrsSource);
   for (const attr of attrs) {
-    const trimmed = attr.trim();
+    let trimmed = attr.trim();
+    if (!trimmed)
+      continue;
+    trimmed = stripLeadingComments(trimmed);
     if (!trimmed)
       continue;
     const colonIndex = trimmed.indexOf(":");
@@ -1561,6 +1643,7 @@ function generateAttrSchemaFromSource(attrsSource) {
       continue;
     const key = trimmed.slice(0, colonIndex).trim();
     let value = trimmed.slice(colonIndex + 1).trim();
+    value = stripTrailingComments(value);
     const asIndex = findTopLevelAs(value);
     if (asIndex !== -1) {
       value = value.slice(0, asIndex).trim();
@@ -1584,24 +1667,7 @@ function parseAttrsSource(attrsSource) {
     let trimmed = attr.trim();
     if (!trimmed)
       continue;
-    while (trimmed.startsWith("/*")) {
-      const endComment = trimmed.indexOf("*/");
-      if (endComment !== -1) {
-        trimmed = trimmed.slice(endComment + 2).trim();
-      } else {
-        break;
-      }
-    }
-    while (trimmed.startsWith("//")) {
-      const endLine = trimmed.indexOf(`
-`);
-      if (endLine !== -1) {
-        trimmed = trimmed.slice(endLine + 1).trim();
-      } else {
-        trimmed = "";
-        break;
-      }
-    }
+    trimmed = stripLeadingComments(trimmed);
     if (!trimmed)
       continue;
     const colonIndex = trimmed.indexOf(":");
@@ -1609,6 +1675,7 @@ function parseAttrsSource(attrsSource) {
       continue;
     const key = trimmed.slice(0, colonIndex).trim();
     let value = trimmed.slice(colonIndex + 1).trim();
+    value = stripTrailingComments(value);
     const asIndex = findTopLevelAs(value);
     if (asIndex !== -1) {
       value = value.slice(0, asIndex).trim();
@@ -2552,6 +2619,7 @@ function parseAttrsContent(content) {
       continue;
     const key = trimmed.slice(0, colonIndex).trim();
     let value = trimmed.slice(colonIndex + 1).trim();
+    value = stripTrailingComments2(value);
     const asIndex = findTopLevelAs(value);
     if (asIndex !== -1) {
       value = value.slice(0, asIndex).trim();
@@ -2659,6 +2727,56 @@ function stripComments(str) {
   }
   return result;
 }
+function stripTrailingComments2(str) {
+  let result = str.trim();
+  let i = 0;
+  while (i < result.length) {
+    const char = result[i];
+    if (char === '"' || char === "'" || char === "`") {
+      const quote = char;
+      i++;
+      while (i < result.length && result[i] !== quote) {
+        if (result[i] === "\\")
+          i++;
+        i++;
+      }
+      i++;
+      continue;
+    }
+    if (char === "{" || char === "(" || char === "[") {
+      let depth = 1;
+      i++;
+      while (i < result.length && depth > 0) {
+        const c = result[i];
+        if (c === "{" || c === "(" || c === "[")
+          depth++;
+        else if (c === "}" || c === ")" || c === "]")
+          depth--;
+        else if (c === '"' || c === "'" || c === "`") {
+          const quote = c;
+          i++;
+          while (i < result.length && result[i] !== quote) {
+            if (result[i] === "\\")
+              i++;
+            i++;
+          }
+        }
+        i++;
+      }
+      continue;
+    }
+    if (char === "/" && result[i + 1] === "*") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    if (char === "/" && result[i + 1] === "/") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    i++;
+  }
+  return result;
+}
 function generatePropsDestructuring(attrs, factoryName) {
   const parts = [];
   for (const attr of attrs) {

package/dist/preprocess.js

@@ -1545,11 +1545,93 @@ function findPropsInjectionPosition(source) {
 }
 
 // src/transform/attrs-schema.ts
+function stripLeadingComments(str) {
+  let result = str.trim();
+  while (true) {
+    if (result.startsWith("/*")) {
+      const endComment = result.indexOf("*/");
+      if (endComment !== -1) {
+        result = result.slice(endComment + 2).trim();
+        continue;
+      }
+      break;
+    }
+    if (result.startsWith("//")) {
+      const endLine = result.indexOf(`
+`);
+      if (endLine !== -1) {
+        result = result.slice(endLine + 1).trim();
+        continue;
+      }
+      result = "";
+      break;
+    }
+    break;
+  }
+  return result;
+}
+function stripTrailingComments(str) {
+  let result = str.trim();
+  let i = 0;
+  let lastValidEnd = result.length;
+  while (i < result.length) {
+    const char = result[i];
+    if (char === '"' || char === "'" || char === "`") {
+      const quote = char;
+      i++;
+      while (i < result.length && result[i] !== quote) {
+        if (result[i] === "\\")
+          i++;
+        i++;
+      }
+      i++;
+      lastValidEnd = i;
+      continue;
+    }
+    if (char === "{" || char === "(" || char === "[") {
+      let depth = 1;
+      i++;
+      while (i < result.length && depth > 0) {
+        const c = result[i];
+        if (c === "{" || c === "(" || c === "[")
+          depth++;
+        else if (c === "}" || c === ")" || c === "]")
+          depth--;
+        else if (c === '"' || c === "'" || c === "`") {
+          const quote = c;
+          i++;
+          while (i < result.length && result[i] !== quote) {
+            if (result[i] === "\\")
+              i++;
+            i++;
+          }
+        }
+        i++;
+      }
+      lastValidEnd = i;
+      continue;
+    }
+    if (char === "/" && result[i + 1] === "*") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    if (char === "/" && result[i + 1] === "/") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    i++;
+    lastValidEnd = i;
+  }
+  return result;
+}
 function generateAttrSchemaFromSource(attrsSource) {
   const entries = [];
   const attrs = splitAttrsSource(attrsSource);
   for (const attr of attrs) {
-    const trimmed = attr.trim();
+    let trimmed = attr.trim();
+    if (!trimmed)
+      continue;
+    trimmed = stripLeadingComments(trimmed);
     if (!trimmed)
       continue;
     const colonIndex = trimmed.indexOf(":");
@@ -1557,6 +1639,7 @@ function generateAttrSchemaFromSource(attrsSource) {
       continue;
     const key = trimmed.slice(0, colonIndex).trim();
     let value = trimmed.slice(colonIndex + 1).trim();
+    value = stripTrailingComments(value);
     const asIndex = findTopLevelAs(value);
     if (asIndex !== -1) {
       value = value.slice(0, asIndex).trim();
@@ -1580,24 +1663,7 @@ function parseAttrsSource(attrsSource) {
     let trimmed = attr.trim();
     if (!trimmed)
       continue;
-    while (trimmed.startsWith("/*")) {
-      const endComment = trimmed.indexOf("*/");
-      if (endComment !== -1) {
-        trimmed = trimmed.slice(endComment + 2).trim();
-      } else {
-        break;
-      }
-    }
-    while (trimmed.startsWith("//")) {
-      const endLine = trimmed.indexOf(`
-`);
-      if (endLine !== -1) {
-        trimmed = trimmed.slice(endLine + 1).trim();
-      } else {
-        trimmed = "";
-        break;
-      }
-    }
+    trimmed = stripLeadingComments(trimmed);
     if (!trimmed)
       continue;
     const colonIndex = trimmed.indexOf(":");
@@ -1605,6 +1671,7 @@ function parseAttrsSource(attrsSource) {
       continue;
     const key = trimmed.slice(0, colonIndex).trim();
     let value = trimmed.slice(colonIndex + 1).trim();
+    value = stripTrailingComments(value);
     const asIndex = findTopLevelAs(value);
     if (asIndex !== -1) {
       value = value.slice(0, asIndex).trim();
@@ -2548,6 +2615,7 @@ function parseAttrsContent(content) {
       continue;
     const key = trimmed.slice(0, colonIndex).trim();
     let value = trimmed.slice(colonIndex + 1).trim();
+    value = stripTrailingComments2(value);
     const asIndex = findTopLevelAs(value);
     if (asIndex !== -1) {
       value = value.slice(0, asIndex).trim();
@@ -2655,6 +2723,56 @@ function stripComments(str) {
   }
   return result;
 }
+function stripTrailingComments2(str) {
+  let result = str.trim();
+  let i = 0;
+  while (i < result.length) {
+    const char = result[i];
+    if (char === '"' || char === "'" || char === "`") {
+      const quote = char;
+      i++;
+      while (i < result.length && result[i] !== quote) {
+        if (result[i] === "\\")
+          i++;
+        i++;
+      }
+      i++;
+      continue;
+    }
+    if (char === "{" || char === "(" || char === "[") {
+      let depth = 1;
+      i++;
+      while (i < result.length && depth > 0) {
+        const c = result[i];
+        if (c === "{" || c === "(" || c === "[")
+          depth++;
+        else if (c === "}" || c === ")" || c === "]")
+          depth--;
+        else if (c === '"' || c === "'" || c === "`") {
+          const quote = c;
+          i++;
+          while (i < result.length && result[i] !== quote) {
+            if (result[i] === "\\")
+              i++;
+            i++;
+          }
+        }
+        i++;
+      }
+      continue;
+    }
+    if (char === "/" && result[i + 1] === "*") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    if (char === "/" && result[i + 1] === "/") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    i++;
+  }
+  return result;
+}
 function generatePropsDestructuring(attrs, factoryName) {
   const parts = [];
   for (const attr of attrs) {

package/dist/vite-dts.js

@@ -499,6 +499,7 @@ function parseAttrsContent(content) {
       continue;
     const key = trimmed.slice(0, colonIndex).trim();
     let value = trimmed.slice(colonIndex + 1).trim();
+    value = stripTrailingComments(value);
     const asIndex = findTopLevelAs(value);
     if (asIndex !== -1) {
       value = value.slice(0, asIndex).trim();
@@ -606,6 +607,56 @@ function stripComments(str) {
   }
   return result;
 }
+function stripTrailingComments(str) {
+  let result = str.trim();
+  let i = 0;
+  while (i < result.length) {
+    const char = result[i];
+    if (char === '"' || char === "'" || char === "`") {
+      const quote = char;
+      i++;
+      while (i < result.length && result[i] !== quote) {
+        if (result[i] === "\\")
+          i++;
+        i++;
+      }
+      i++;
+      continue;
+    }
+    if (char === "{" || char === "(" || char === "[") {
+      let depth = 1;
+      i++;
+      while (i < result.length && depth > 0) {
+        const c = result[i];
+        if (c === "{" || c === "(" || c === "[")
+          depth++;
+        else if (c === "}" || c === ")" || c === "]")
+          depth--;
+        else if (c === '"' || c === "'" || c === "`") {
+          const quote = c;
+          i++;
+          while (i < result.length && result[i] !== quote) {
+            if (result[i] === "\\")
+              i++;
+            i++;
+          }
+        }
+        i++;
+      }
+      continue;
+    }
+    if (char === "/" && result[i + 1] === "*") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    if (char === "/" && result[i + 1] === "/") {
+      result = result.slice(0, i).trim();
+      break;
+    }
+    i++;
+  }
+  return result;
+}
 function generatePropsDestructuring(attrs, factoryName) {
   const parts = [];
   for (const attr of attrs) {

package/package.json

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