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

package/dist/plugin.js

@@ -2249,6 +2249,79 @@ function transformStandaloneAttrsDefinition(content) {
 }`;
 }
 
+// src/transform/reserved-keywords.ts
+var RESERVED_KEYWORDS = new Set([
+  "break",
+  "case",
+  "catch",
+  "continue",
+  "debugger",
+  "default",
+  "delete",
+  "do",
+  "else",
+  "finally",
+  "for",
+  "function",
+  "if",
+  "in",
+  "instanceof",
+  "new",
+  "return",
+  "switch",
+  "this",
+  "throw",
+  "try",
+  "typeof",
+  "var",
+  "void",
+  "while",
+  "with",
+  "class",
+  "const",
+  "enum",
+  "export",
+  "extends",
+  "import",
+  "super",
+  "implements",
+  "interface",
+  "let",
+  "package",
+  "private",
+  "protected",
+  "public",
+  "static",
+  "yield",
+  "await",
+  "async",
+  "true",
+  "false",
+  "null",
+  "undefined",
+  "arguments",
+  "eval"
+]);
+function getInternalVarName(propName, forcePrefix = true) {
+  return `___${propName}`;
+}
+function generatePropDestructure(propName, defaultValue) {
+  const internalName = getInternalVarName(propName);
+  return `${propName}: ${internalName} = ${defaultValue}`;
+}
+function generatePropDestructureNoDefault(propName) {
+  const internalName = getInternalVarName(propName);
+  return `${propName}: ${internalName}`;
+}
+function generateGetter(propName) {
+  const internalName = getInternalVarName(propName);
+  return `get ${propName}() { return ${internalName} }`;
+}
+function generateSetter(propName) {
+  const internalName = getInternalVarName(propName);
+  return `set ${propName}(v) { ${internalName} = v }`;
+}
+
 // src/transform/schema.ts
 function parseOriginSchemaFromSource(source, exportName) {
   const sourceResult = parseSourceOrigin(source, exportName);
@@ -2587,14 +2660,14 @@ function generatePropsDestructuring(attrs, factoryName) {
   for (const attr of attrs) {
     if (attr.bindable) {
       if (attr.hasDefault) {
-        parts.push(`${attr.key} = $bindable(${attr.defaultValue})`);
+        parts.push(generatePropDestructure(attr.key, `$bindable(${attr.defaultValue})`));
       } else {
-        parts.push(`${attr.key} = $bindable()`);
+        parts.push(generatePropDestructure(attr.key, "$bindable()"));
       }
     } else if (attr.hasDefault) {
-      parts.push(`${attr.key} = ${attr.defaultValue}`);
+      parts.push(generatePropDestructure(attr.key, attr.defaultValue));
     } else {
-      parts.push(attr.key);
+      parts.push(generatePropDestructureNoDefault(attr.key));
     }
   }
   return `let { ${parts.join(", ")} }: $attrs.Of<typeof ${factoryName}> = $props()`;
@@ -2602,9 +2675,9 @@ function generatePropsDestructuring(attrs, factoryName) {
 function generateFactoryCallFromAttrs(factoryName, attrs) {
   const parts = [];
   for (const attr of attrs) {
-    parts.push(`get ${attr.key}() { return ${attr.key} }`);
+    parts.push(generateGetter(attr.key));
     if (attr.bindable) {
-      parts.push(`set ${attr.key}(v) { ${attr.key} = v }`);
+      parts.push(generateSetter(attr.key));
     }
   }
   return `${factoryName}({ ${parts.join(", ")} })`;
@@ -2738,7 +2811,10 @@ function transformAttrsOriginCallsSync(s, source, neededImports) {
   let firstFactoryExpr = null;
   let propsTypeDeclaration = null;
   let isFirstDeclaration = true;
-  const needsPropsInjection = declarations.length > 0 && !hasExistingPropsDeclaration(source);
+  const originInstances = new Map;
+  const existingPropsMatch = source.match(/let\s*\{([^}]*)\}\s*(?::\s*[^=]+)?\s*=\s*\$props\s*\(\s*\)/);
+  const hasExistingProps = !!existingPropsMatch;
+  const needsPropsInjection = declarations.length > 0 && !hasExistingPropsDeclaration(source) && !hasExistingProps;
   for (const decl of declarations) {
     const { varName, startIndex, macroOpenParen } = decl;
     const closeParenIndex = findMatchingBracket(source, macroOpenParen);
@@ -2759,20 +2835,47 @@ function transformAttrsOriginCallsSync(s, source, neededImports) {
       expansionLines.push(`type $$Props = $attrs.Of<${typeExpr}>`);
       propsTypeDeclaration = "";
     }
-    expansionLines.push(`let ___attrs: $$Props = $props()`, `let ${varName} = ${normalizedFactoryCall}(__attrsFor(${normalizedFactoryCall}, ___attrs))`);
+    if (hasExistingProps) {
+      const existingContent = existingPropsMatch[1];
+      const hasRestSpread = /\.\.\.\s*(\w+)\s*$/.test(existingContent);
+      if (!hasRestSpread && isFirstDeclaration) {
+        const restVarName = "___originAttrs";
+        const newContent = existingContent.trimEnd() ? `${existingContent.trimEnd()}, ...${restVarName}` : `...${restVarName}`;
+        const braceEnd = source.indexOf("}", existingPropsMatch.index + 5);
+        if (braceEnd !== -1) {
+          s.overwrite(existingPropsMatch.index + 5, braceEnd, ` ${newContent} `);
+        }
+        expansionLines.push(`let ${varName} = ${normalizedFactoryCall}(__attrsFor(${normalizedFactoryCall}, ${restVarName}))`);
+      } else {
+        const restMatch = existingContent.match(/\.\.\.\s*(\w+)\s*$/);
+        const restVar = restMatch ? restMatch[1] : "___originAttrs";
+        expansionLines.push(`let ${varName} = ${normalizedFactoryCall}(__attrsFor(${normalizedFactoryCall}, ${restVar}))`);
+      }
+    } else {
+      expansionLines.push(`let ___attrs: $$Props = $props()`, `let ${varName} = ${normalizedFactoryCall}(__attrsFor(${normalizedFactoryCall}, ___attrs))`);
+    }
     s.overwrite(startIndex, endIndex, expansionLines.join(`
 `));
+    originInstances.set(varName, {
+      varName,
+      factoryExpr,
+      startPos: startIndex,
+      endPos: endIndex
+    });
     neededImports.add("__attrsFor");
     changed = true;
     isFirstDeclaration = false;
   }
-  return { changed, propsTypeDeclaration };
+  return { changed, propsTypeDeclaration, originInstances };
 }
 async function transformAttrsOriginCalls(s, source, neededImports, schemaResolver) {
   const declarations = findVariableDeclarationsWithMacro(source, "$attrs.origin");
   let changed = false;
   let propsTypeDeclaration = null;
-  const needsPropsInjection = declarations.length > 0 && !hasExistingPropsDeclaration(source);
+  const originInstances = new Map;
+  const existingPropsMatch = source.match(/let\s*\{([^}]*)\}\s*(?::\s*[^=]+)?\s*=\s*\$props\s*\(\s*\)/);
+  const hasExistingProps = !!existingPropsMatch;
+  const needsPropsInjection = declarations.length > 0 && !hasExistingPropsDeclaration(source) && !hasExistingProps;
   const matches = [];
   for (const decl of declarations) {
     const { varName, startIndex, macroOpenParen } = decl;
@@ -2792,6 +2895,7 @@ async function transformAttrsOriginCalls(s, source, neededImports, schemaResolve
   }
   let firstFactoryExpr = null;
   let isFirstDeclaration = true;
+  let restVarInjected = false;
   for (const { varName, factoryExpr, startIndex, endIndex, isGeneric } of matches) {
     const expansionLines = [];
     let usesFallback = true;
@@ -2819,15 +2923,40 @@ async function transformAttrsOriginCalls(s, source, neededImports, schemaResolve
     }
     if (usesFallback) {
       const normalizedFactoryCall = normalizeFactoryCall(factoryExpr);
-      expansionLines.push(`let ___attrs: $$Props = $props()`, `let ${varName} = ${normalizedFactoryCall}(__attrsFor(${normalizedFactoryCall}, ___attrs))`);
+      if (hasExistingProps) {
+        const existingContent = existingPropsMatch[1];
+        const hasRestSpread = /\.\.\.\s*(\w+)\s*$/.test(existingContent);
+        if (!hasRestSpread && !restVarInjected) {
+          const restVarName = "___originAttrs";
+          const newContent = existingContent.trimEnd() ? `${existingContent.trimEnd()}, ...${restVarName}` : `...${restVarName}`;
+          const braceEnd = source.indexOf("}", existingPropsMatch.index + 5);
+          if (braceEnd !== -1) {
+            s.overwrite(existingPropsMatch.index + 5, braceEnd, ` ${newContent} `);
+            restVarInjected = true;
+          }
+          expansionLines.push(`let ${varName} = ${normalizedFactoryCall}(__attrsFor(${normalizedFactoryCall}, ${restVarName}))`);
+        } else {
+          const restMatch = existingContent.match(/\.\.\.\s*(\w+)\s*$/);
+          const restVar = restMatch ? restMatch[1] : "___originAttrs";
+          expansionLines.push(`let ${varName} = ${normalizedFactoryCall}(__attrsFor(${normalizedFactoryCall}, ${restVar}))`);
+        }
+      } else {
+        expansionLines.push(`let ___attrs: $$Props = $props()`, `let ${varName} = ${normalizedFactoryCall}(__attrsFor(${normalizedFactoryCall}, ___attrs))`);
+      }
       neededImports.add("__attrsFor");
     }
     s.overwrite(startIndex, endIndex, expansionLines.join(`
 `));
+    originInstances.set(varName, {
+      varName,
+      factoryExpr,
+      startPos: startIndex,
+      endPos: endIndex
+    });
     changed = true;
     isFirstDeclaration = false;
   }
-  return { changed, propsTypeDeclaration };
+  return { changed, propsTypeDeclaration, originInstances };
 }
 
 // src/transform/element-types.ts
@@ -2839,9 +2968,9 @@ function getElementTypeImport(element) {
 function generateReactiveAttrsWrapper(attrs) {
   const parts = [];
   for (const attr of attrs) {
-    parts.push(`get ${attr.key}() { return ${attr.key} }`);
+    parts.push(generateGetter(attr.key));
     if (attr.bindable) {
-      parts.push(`set ${attr.key}(v) { ${attr.key} = v }`);
+      parts.push(generateSetter(attr.key));
     }
   }
   return `{ ${parts.join(", ")} }`;
@@ -2851,14 +2980,14 @@ function generateAttrsForMerge(attrs) {
   for (const attr of attrs) {
     if (attr.bindable) {
       if (attr.hasDefault) {
-        parts.push(`${attr.key} = $bindable(${attr.defaultValue})`);
+        parts.push(generatePropDestructure(attr.key, `$bindable(${attr.defaultValue})`));
       } else {
-        parts.push(`${attr.key} = $bindable()`);
+        parts.push(generatePropDestructure(attr.key, "$bindable()"));
       }
     } else if (attr.hasDefault) {
-      parts.push(`${attr.key} = ${attr.defaultValue}`);
+      parts.push(generatePropDestructure(attr.key, attr.defaultValue));
     } else {
-      parts.push(attr.key);
+      parts.push(generatePropDestructureNoDefault(attr.key));
     }
   }
   return parts.join(", ");
@@ -3035,6 +3164,291 @@ async function transformAttrsForCalls(s, source, neededImports, schemaResolver)
   return changed;
 }
 
+// src/transform/origin-destructure-transform.ts
+function transformOriginDestructuring(s, source, originInstances) {
+  let changed = false;
+  const destructures = findOriginDestructures(source, originInstances);
+  for (const d of destructures.reverse()) {
+    const replacement = generateDestructureReplacement(d, originInstances);
+    if (replacement) {
+      s.overwrite(d.startPos, d.endPos, replacement);
+      changed = true;
+    }
+  }
+  return changed;
+}
+function findOriginDestructures(source, originInstances) {
+  const results = [];
+  const destructurePattern = /\b(let|const|var)\s*\{/g;
+  let match;
+  while ((match = destructurePattern.exec(source)) !== null) {
+    if (isInsideStringOrComment(source, match.index))
+      continue;
+    const declKeyword = match[1];
+    const braceStart = match.index + match[0].length - 1;
+    const braceEnd = findMatchingBracket(source, braceStart, "{", "}");
+    if (braceEnd === -1)
+      continue;
+    let i = braceEnd + 1;
+    while (i < source.length && /\s/.test(source[i]))
+      i++;
+    if (source[i] !== "=")
+      continue;
+    i++;
+    while (i < source.length && /\s/.test(source[i]))
+      i++;
+    const exprStart = i;
+    let sourceVar = "";
+    while (i < source.length && /[\w$]/.test(source[i])) {
+      sourceVar += source[i];
+      i++;
+    }
+    if (!sourceVar)
+      continue;
+    if (!originInstances.has(sourceVar))
+      continue;
+    let isPropsAccess = false;
+    const afterVarPos = i;
+    while (i < source.length && /\s/.test(source[i]))
+      i++;
+    if (source[i] === ".") {
+      i++;
+      while (i < source.length && /\s/.test(source[i]))
+        i++;
+      const propName = readIdentifier(source, i);
+      if (propName === "props") {
+        isPropsAccess = true;
+        i += propName.length;
+      } else {
+        continue;
+      }
+    }
+    let endPos = i;
+    while (endPos < source.length && /\s/.test(source[endPos]) && source[endPos] !== `
+`)
+      endPos++;
+    if (source[endPos] === ";")
+      endPos++;
+    if (source[endPos] === `
+`)
+      endPos++;
+    const patternContent = source.slice(braceStart + 1, braceEnd);
+    const parsed = parseDestructurePattern(patternContent, isPropsAccess);
+    results.push({
+      startPos: match.index,
+      endPos,
+      sourceVar,
+      isPropsAccess,
+      methods: parsed.methods,
+      props: parsed.props,
+      nestedPropsPattern: parsed.nestedProps
+    });
+  }
+  return results;
+}
+function parseDestructurePattern(content, isPropsAccess) {
+  const methods = [];
+  const props = [];
+  let nestedProps = null;
+  const parts = splitByTopLevelCommas2(content);
+  for (const part of parts) {
+    const trimmed = part.trim();
+    if (!trimmed)
+      continue;
+    const propsMatch = trimmed.match(/^props\s*:\s*\{/);
+    if (propsMatch) {
+      const braceStart = trimmed.indexOf("{");
+      const braceEnd = findMatchingBracket(trimmed, braceStart, "{", "}");
+      if (braceEnd !== -1) {
+        const nestedContent = trimmed.slice(braceStart + 1, braceEnd);
+        const nestedParts = splitByTopLevelCommas2(nestedContent);
+        const nestedPropsList = [];
+        for (const np of nestedParts) {
+          const parsed = parseDestructuredProp(np.trim());
+          if (parsed)
+            nestedPropsList.push(parsed);
+        }
+        nestedProps = {
+          startPos: 0,
+          endPos: 0,
+          props: nestedPropsList
+        };
+      }
+      continue;
+    }
+    if (isPropsAccess) {
+      const parsed = parseDestructuredProp(trimmed);
+      if (parsed)
+        props.push(parsed);
+    } else {
+      const parsed = parseDestructuredItem(trimmed);
+      if (parsed)
+        methods.push(parsed);
+    }
+  }
+  return { methods, props, nestedProps };
+}
+function parseDestructuredItem(part) {
+  const trimmed = part.trim();
+  if (!trimmed)
+    return null;
+  const colonIdx = findTopLevelColon(trimmed);
+  let key;
+  let alias = null;
+  let rest = trimmed;
+  if (colonIdx !== -1) {
+    key = trimmed.slice(0, colonIdx).trim();
+    rest = trimmed.slice(colonIdx + 1).trim();
+    const eqIdx2 = findTopLevelEquals(rest);
+    if (eqIdx2 !== -1) {
+      alias = rest.slice(0, eqIdx2).trim();
+      return {
+        key,
+        alias,
+        defaultValue: rest.slice(eqIdx2 + 1).trim()
+      };
+    } else {
+      alias = rest;
+      return { key, alias, defaultValue: null };
+    }
+  }
+  const eqIdx = findTopLevelEquals(trimmed);
+  if (eqIdx !== -1) {
+    key = trimmed.slice(0, eqIdx).trim();
+    return {
+      key,
+      alias: null,
+      defaultValue: trimmed.slice(eqIdx + 1).trim()
+    };
+  }
+  return { key: trimmed, alias: null, defaultValue: null };
+}
+function parseDestructuredProp(part) {
+  const item = parseDestructuredItem(part);
+  if (!item)
+    return null;
+  let isBindable = false;
+  let bindableDefault = null;
+  if (item.defaultValue) {
+    const bindableMatch = item.defaultValue.match(/^\$bindable\s*\(/);
+    if (bindableMatch) {
+      isBindable = true;
+      const parenStart = item.defaultValue.indexOf("(");
+      const parenEnd = findMatchingBracket(item.defaultValue, parenStart, "(", ")");
+      if (parenEnd !== -1) {
+        bindableDefault = item.defaultValue.slice(parenStart + 1, parenEnd).trim() || null;
+      }
+    }
+  }
+  return {
+    ...item,
+    isBindable,
+    bindableDefault
+  };
+}
+function generateDestructureReplacement(d, originInstances) {
+  const lines = [];
+  const instance = originInstances.get(d.sourceVar);
+  if (!instance)
+    return null;
+  for (const m of d.methods) {
+    const varName = m.alias || m.key;
+    if (m.defaultValue) {
+      lines.push(`let ${varName} = ${d.sourceVar}.${m.key}?.bind(${d.sourceVar}) ?? ${m.defaultValue}`);
+    } else {
+      lines.push(`let ${varName} = ${d.sourceVar}.${m.key}.bind(${d.sourceVar})`);
+    }
+  }
+  if (d.nestedPropsPattern) {
+    for (const p of d.nestedPropsPattern.props) {
+      lines.push(...generatePropAccessors(p, d.sourceVar));
+    }
+  }
+  if (d.isPropsAccess) {
+    for (const p of d.props) {
+      lines.push(...generatePropAccessors(p, d.sourceVar));
+    }
+  }
+  return lines.join(`
+`) + `
+`;
+}
+function generatePropAccessors(p, sourceVar) {
+  const lines = [];
+  const varName = p.alias || p.key;
+  if (p.isBindable) {
+    const defaultVal = p.bindableDefault || "undefined";
+    lines.push(`let ${varName} = $derived(${sourceVar}.props.${p.key} ?? ${defaultVal})`);
+  } else if (p.defaultValue) {
+    lines.push(`let ${varName} = $derived(${sourceVar}.props.${p.key} ?? ${p.defaultValue})`);
+  } else {
+    lines.push(`let ${varName} = $derived(${sourceVar}.props.${p.key})`);
+  }
+  return lines;
+}
+function splitByTopLevelCommas2(content) {
+  const parts = [];
+  let current = "";
+  let depth = 0;
+  for (let i = 0;i < content.length; i++) {
+    const char = content[i];
+    if (char === "{" || char === "(" || char === "[" || char === "<") {
+      depth++;
+      current += char;
+    } else if (char === "}" || char === ")" || char === "]" || char === ">") {
+      depth--;
+      current += char;
+    } else if (char === "," && depth === 0) {
+      parts.push(current);
+      current = "";
+    } else {
+      current += char;
+    }
+  }
+  if (current.trim()) {
+    parts.push(current);
+  }
+  return parts;
+}
+function findTopLevelColon(str) {
+  let depth = 0;
+  for (let i = 0;i < str.length; i++) {
+    const char = str[i];
+    if (char === "{" || char === "(" || char === "[" || char === "<")
+      depth++;
+    else if (char === "}" || char === ")" || char === "]" || char === ">")
+      depth--;
+    else if (char === ":" && depth === 0)
+      return i;
+  }
+  return -1;
+}
+function findTopLevelEquals(str) {
+  let depth = 0;
+  for (let i = 0;i < str.length; i++) {
+    const char = str[i];
+    if (char === "{" || char === "(" || char === "[" || char === "<")
+      depth++;
+    else if (char === "}" || char === ")" || char === "]" || char === ">")
+      depth--;
+    else if (char === "=" && depth === 0) {
+      if (str[i + 1] !== "=" && str[i + 1] !== ">") {
+        return i;
+      }
+    }
+  }
+  return -1;
+}
+function readIdentifier(str, start) {
+  let result = "";
+  let i = start;
+  while (i < str.length && /[\w$]/.test(str[i])) {
+    result += str[i];
+    i++;
+  }
+  return result;
+}
+
 // src/transform/core.ts
 function transformScript(source, options = {}) {
   if (options.schemaResolver) {
@@ -3057,6 +3471,9 @@ function transformScript(source, options = {}) {
     const result = transformAttrsOriginCallsSync(s, source, neededImports);
     changed = result.changed || changed;
     propsTypeDeclaration = result.propsTypeDeclaration;
+    if (result.originInstances.size > 0) {
+      changed = transformOriginDestructuring(s, source, result.originInstances) || changed;
+    }
   }
   if (isComponent) {
     changed = transformAttrsForCallsSync(s, source, neededImports) || changed;
@@ -3128,6 +3545,9 @@ async function transformScriptAsync(source, options) {
     const result = await transformAttrsOriginCalls(s, source, neededImports, schemaResolver);
     changed = result.changed || changed;
     propsTypeDeclaration = result.propsTypeDeclaration;
+    if (result.originInstances.size > 0) {
+      changed = transformOriginDestructuring(s, source, result.originInstances) || changed;
+    }
   }
   if (isComponent) {
     changed = await transformAttrsForCalls(s, source, neededImports, schemaResolver) || changed;
@@ -3198,6 +3618,9 @@ async function transformScriptContent(source, options) {
     const result = await transformAttrsOriginCalls(s, source, neededImports, schemaResolver);
     changed = result.changed || changed;
     propsTypeDeclaration = result.propsTypeDeclaration;
+    if (result.originInstances.size > 0) {
+      changed = transformOriginDestructuring(s, source, result.originInstances) || changed;
+    }
   }
   if (isComponent) {
     changed = await transformAttrsForCalls(s, source, neededImports, schemaResolver) || changed;