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

package/dist/index.js

@@ -3473,34 +3473,22 @@ function __attrsFor(factory, rawAttrs) {
   const factoryWithSchema = factory;
   const schema = getMergedAttrSchema(factoryWithSchema);
   const wrapper = {};
-  const localValues = {};
-  const hasLocalValue = {};
   const defineExposedProp = (key2, info) => {
     if (Object.prototype.hasOwnProperty.call(wrapper, key2))
       return;
-    const base = {
+    const descriptor = {
       get() {
-        if (hasLocalValue[key2])
-          return localValues[key2];
         return rawAttrs[key2];
       },
       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);
+      descriptor.set = function(value) {
+        rawAttrs[key2] = value;
+      };
     }
+    Object.defineProperty(wrapper, key2, descriptor);
   };
   for (const [key2, info] of Object.entries(schema)) {
     const parentValue = rawAttrs[key2];
@@ -3521,8 +3509,6 @@ function __attrsFor(factory, rawAttrs) {
   return new Proxy(wrapper, {
     get(target, prop2) {
       if (typeof prop2 === "string" && prop2 in schema) {
-        if (hasLocalValue[prop2])
-          return localValues[prop2];
         return rawAttrs[prop2];
       }
       if (prop2 in target)
@@ -3531,15 +3517,11 @@ function __attrsFor(factory, rawAttrs) {
     },
     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 {}
+          rawAttrs[prop2] = value;
         }
         return true;
       }
@@ -3551,18 +3533,10 @@ function __attrsFor(factory, rawAttrs) {
       }
       try {
         rawAttrs[prop2] = value;
-      } catch {
-        if (typeof prop2 === "string") {
-          localValues[prop2] = value;
-          hasLocalValue[prop2] = true;
-        }
-      }
+      } catch {}
       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() {
@@ -3899,6 +3873,73 @@ function parseOriginSchemaFromSource(source2, exportName) {
     return compiledResult;
   return null;
 }
+function parseAttrsSchemaFromSource(source2, exportName) {
+  const sourceResult = parseSourceAttrs(source2, exportName);
+  if (sourceResult)
+    return sourceResult;
+  const compiledResult = parseCompiledAttrs(source2, exportName);
+  if (compiledResult)
+    return compiledResult;
+  return null;
+}
+function parseSourceAttrs(source2, exportName) {
+  const exportPattern = new RegExp(`export\\s+(?:const|var|let)\\s+${exportName}\\s*=\\s*\\$attrs\\s*\\(`, "s");
+  const match = exportPattern.exec(source2);
+  if (!match)
+    return null;
+  const attrsStart = match.index + match[0].length - 1;
+  const attrsEnd = findMatchingBracket(source2, attrsStart);
+  if (attrsEnd === -1)
+    return null;
+  let attrsContent = source2.slice(attrsStart + 1, attrsEnd).trim();
+  let parentNames = [];
+  if (attrsContent.startsWith("[")) {
+    const closeBracket = findMatchingBracket(attrsContent, 0, "[", "]");
+    if (closeBracket !== -1) {
+      const parentsContent = attrsContent.slice(1, closeBracket);
+      parentNames = parentsContent.split(",").map((p) => p.trim()).filter((p) => p && /^\w+$/.test(p));
+      let i = closeBracket + 1;
+      while (i < attrsContent.length && /[\s,]/.test(attrsContent[i]))
+        i++;
+      attrsContent = attrsContent.slice(i);
+    }
+  }
+  if (!attrsContent.startsWith("{")) {
+    return { attrs: [], parentNames };
+  }
+  const objEnd = findMatchingBracket(attrsContent, 0, "{", "}");
+  if (objEnd === -1)
+    return { attrs: [], parentNames };
+  const objContent = attrsContent.slice(1, objEnd);
+  const attrs = parseAttrsContent(objContent);
+  return { attrs, parentNames };
+}
+function parseCompiledAttrs(source2, exportName) {
+  const exportPattern = new RegExp(`export\\s+(?:const|var|let)\\s+${exportName}\\s*=\\s*__createAttrs\\s*\\(\\s*\\{`, "s");
+  const match = exportPattern.exec(source2);
+  if (!match)
+    return null;
+  const braceStart = match.index + match[0].length - 1;
+  const braceEnd = findMatchingBracket(source2, braceStart, "{", "}");
+  if (braceEnd === -1)
+    return null;
+  const configContent = source2.slice(braceStart + 1, braceEnd);
+  const schemaMatch = configContent.match(/__attrSchema\s*:\s*\{/);
+  if (!schemaMatch)
+    return { attrs: [], parentNames: [] };
+  const schemaStart = schemaMatch.index + schemaMatch[0].length - 1;
+  const schemaEnd = findMatchingBracket(configContent, schemaStart, "{", "}");
+  if (schemaEnd === -1)
+    return { attrs: [], parentNames: [] };
+  const schemaContent = configContent.slice(schemaStart + 1, schemaEnd);
+  const attrs = parseCompiledAttrSchema(schemaContent);
+  const parentsMatch = configContent.match(/__parents\s*:\s*\[([^\]]*)\]/);
+  let parentNames = [];
+  if (parentsMatch && parentsMatch[1].trim()) {
+    parentNames = parentsMatch[1].split(",").map((p) => p.trim()).filter((p) => p && /^\w+$/.test(p));
+  }
+  return { attrs, parentNames };
+}
 function parseSourceOrigin(source2, exportName) {
   const exportPattern = new RegExp(`export\\s+(?:const|var|let)\\s+${exportName}\\s*=\\s*\\$origin\\s*\\(`, "s");
   const match = exportPattern.exec(source2);
@@ -3924,6 +3965,13 @@ function parseSourceOrigin(source2, exportName) {
   }
   const attrsMatch = bodyContent.match(/(\w+)\s*:\s*\$attrs\s*\(\s*\{/);
   if (!attrsMatch) {
+    const externalRefMatch = bodyContent.match(/(?:props|attrs)\s*:\s*([A-Z]\w*)\b/);
+    if (externalRefMatch) {
+      const propsRef = externalRefMatch[1];
+      if (!["Object", "Array", "String", "Number", "Boolean"].includes(propsRef)) {
+        return { attrs: [], parentNames, propsRef };
+      }
+    }
     return { attrs: [], parentNames };
   }
   const attrsStart = attrsMatch.index;
@@ -3960,7 +4008,9 @@ function parseCompiledOrigin(source2, exportName) {
   if (parentsMatch && parentsMatch[1].trim()) {
     parentNames = parentsMatch[1].split(",").map((p) => p.trim()).filter((p) => p && /^\w+$/.test(p));
   }
-  return { attrs, parentNames };
+  const propsRefMatch = configContent.match(/__propsRef\s*:\s*(\w+)/);
+  const propsRef = propsRefMatch ? propsRefMatch[1] : undefined;
+  return { attrs, parentNames, propsRef };
 }
 function parseCompiledAttrSchema(content) {
   const result = [];
@@ -6160,6 +6210,7 @@ function transformOriginDefinition(content, svelteImports) {
   let attrsContent = "";
   let contentWithoutAttrs = bodyContent;
   let attrPropertyName = "props";
+  let propsRef = null;
   if (attrsMatch) {
     attrPropertyName = attrsMatch[1];
     const attrsStart = attrsMatch.index;
@@ -6190,13 +6241,31 @@ function transformOriginDefinition(content, svelteImports) {
       }
       contentWithoutAttrs = bodyContent.slice(0, attrsStart) + bodyContent.slice(cutEnd);
     }
+  } else {
+    const externalRefMatch = bodyContent.match(/(\w+)\s*:\s*(\w+)\s*,/);
+    if (externalRefMatch) {
+      const propName = externalRefMatch[1];
+      const refName = externalRefMatch[2];
+      if ((propName === "props" || propName === "attrs") && /^[A-Z]/.test(refName) && !["$state", "$derived", "$effect", "$bindable"].includes(refName)) {
+        attrPropertyName = propName;
+        propsRef = refName;
+        const refStart = externalRefMatch.index;
+        const refEnd = refStart + externalRefMatch[0].length;
+        contentWithoutAttrs = bodyContent.slice(0, refStart) + bodyContent.slice(refEnd);
+      }
+    }
   }
   const attrDetails = parseAttrsSource(attrsContent);
   const { body: createFnBody, attachments } = transformOriginBody(contentWithoutAttrs.trim(), parents, attrDetails, attrPropertyName, svelteImports);
   const parentsCode = parents.length > 0 ? `[${parents.join(", ")}]` : "undefined";
   let configCode = `{
 	__attrSchema: ${attrSchemaCode},
-	__parents: ${parentsCode},
+	__parents: ${parentsCode},`;
+  if (propsRef) {
+    configCode += `
+	__propsRef: ${propsRef},`;
+  }
+  configCode += `
 	__create: (__inputAttrs${parents.length > 0 ? ", __super" : ""}) => {
 ${createFnBody}
 	}`;
@@ -6566,7 +6635,34 @@ function getElementTypeImport(element2) {
 }
 
 // src/transform/attrs-for-transform.ts
-function transformAttrsForCalls(s, source2, neededImports) {
+function generateReactiveAttrsWrapper(attrs) {
+  const parts = [];
+  for (const attr2 of attrs) {
+    parts.push(`get ${attr2.key}() { return ${attr2.key} }`);
+    if (attr2.bindable) {
+      parts.push(`set ${attr2.key}(v) { ${attr2.key} = v }`);
+    }
+  }
+  return `{ ${parts.join(", ")} }`;
+}
+function generateAttrsForMerge(attrs) {
+  const parts = [];
+  for (const attr2 of attrs) {
+    if (attr2.bindable) {
+      if (attr2.hasDefault) {
+        parts.push(`${attr2.key} = $bindable(${attr2.defaultValue})`);
+      } else {
+        parts.push(`${attr2.key} = $bindable()`);
+      }
+    } else if (attr2.hasDefault) {
+      parts.push(`${attr2.key} = ${attr2.defaultValue}`);
+    } else {
+      parts.push(attr2.key);
+    }
+  }
+  return parts.join(", ");
+}
+function transformAttrsForCallsSync(s, source2, neededImports) {
   let changed = false;
   const existingPropsMatch = source2.match(/let\s*\{([^}]*)\}\s*(?::\s*[^=]+)?\s*=\s*\$props\s*\(\s*\)/);
   let restVarName = null;
@@ -6632,6 +6728,111 @@ function transformAttrsForCalls(s, source2, neededImports) {
   }
   return changed;
 }
+async function transformAttrsForCalls(s, source2, neededImports, schemaResolver) {
+  let changed = false;
+  const existingPropsMatch = source2.match(/let\s*\{([^}]*)\}\s*(?::\s*[^=]+)?\s*=\s*\$props\s*\(\s*\)/);
+  let restVarName = null;
+  let existingPropsStart = -1;
+  let existingDestructureContent = "";
+  if (existingPropsMatch) {
+    existingPropsStart = existingPropsMatch.index;
+    existingDestructureContent = existingPropsMatch[1];
+    const restMatch = existingDestructureContent.match(/\.\.\.\s*(\w+)\s*$/);
+    if (restMatch) {
+      restVarName = restMatch[1];
+    }
+  }
+  const declarations = findVariableDeclarationsWithMacro(source2, "$attrs.for");
+  for (const decl of declarations) {
+    const { varName, startIndex, macroOpenParen } = decl;
+    const closeParenIndex = findMatchingBracket(source2, macroOpenParen);
+    if (closeParenIndex === -1)
+      continue;
+    const arg = source2.slice(macroOpenParen + 1, closeParenIndex).trim();
+    const endIndex = closeParenIndex + 1;
+    const stringMatch = arg.match(/^['"](\w+)['"]$/);
+    if (stringMatch) {
+      const element2 = stringMatch[1];
+      const typeImport = getElementTypeImport(element2);
+      if (existingPropsMatch && existingPropsStart !== -1) {
+        if (!restVarName) {
+          restVarName = "___restAttrs";
+          const newDestructure = existingDestructureContent.trimEnd() ? `${existingDestructureContent.trimEnd()}, ...${restVarName}` : `...${restVarName}`;
+          const braceEnd = source2.indexOf("}", existingPropsStart + 5);
+          if (braceEnd !== -1) {
+            s.overwrite(existingPropsStart + 5, braceEnd, ` ${newDestructure} `);
+          }
+        }
+        s.overwrite(startIndex, endIndex, `let ${varName} = ${restVarName} as ${typeImport}`);
+      } else {
+        const expansion = `let { ...${varName} } = $props<${typeImport}>()`;
+        s.overwrite(startIndex, endIndex, expansion);
+      }
+    } else {
+      const factoryName = arg;
+      let transformed = false;
+      if (schemaResolver) {
+        const importPath = findImportPath(source2, factoryName);
+        if (importPath) {
+          const schema = await schemaResolver.resolve(importPath, factoryName);
+          if (schema && schema.attrs.length > 0) {
+            if (existingPropsMatch && existingPropsStart !== -1) {
+              const additionalAttrs = generateAttrsForMerge(schema.attrs);
+              const restMatch = existingDestructureContent.match(/,?\s*\.\.\.\s*(\w+)\s*$/);
+              let baseContent = existingDestructureContent;
+              let restPart = "";
+              if (restMatch) {
+                restPart = restMatch[0];
+                baseContent = existingDestructureContent.slice(0, restMatch.index);
+              }
+              const mergedDestructure = baseContent.trimEnd() ? `${baseContent.trimEnd()}, ${additionalAttrs}${restPart}` : `${additionalAttrs}${restPart}`;
+              const braceEnd = source2.indexOf("}", existingPropsStart + 5);
+              if (braceEnd !== -1) {
+                s.overwrite(existingPropsStart + 5, braceEnd, ` ${mergedDestructure} `);
+              }
+              const wrapper = generateReactiveAttrsWrapper(schema.attrs);
+              s.overwrite(startIndex, endIndex, `let ${varName} = __attrsFor(${factoryName}, ${wrapper})`);
+              transformed = true;
+            } else {
+              const propsDestructure = generatePropsDestructuring(schema.attrs, factoryName);
+              const wrapper = generateReactiveAttrsWrapper(schema.attrs);
+              const expansion = [
+                propsDestructure,
+                `let ${varName} = __attrsFor(${factoryName}, ${wrapper})`
+              ].join(`
+`);
+              s.overwrite(startIndex, endIndex, expansion);
+              transformed = true;
+            }
+          }
+        }
+      }
+      if (!transformed) {
+        if (existingPropsMatch && existingPropsStart !== -1) {
+          if (!restVarName) {
+            restVarName = "___restAttrs";
+            const newDestructure = existingDestructureContent.trimEnd() ? `${existingDestructureContent.trimEnd()}, ...${restVarName}` : `...${restVarName}`;
+            const braceEnd = source2.indexOf("}", existingPropsStart + 5);
+            if (braceEnd !== -1) {
+              s.overwrite(existingPropsStart + 5, braceEnd, ` ${newDestructure} `);
+            }
+          }
+          s.overwrite(startIndex, endIndex, `let ${varName} = __attrsFor(${factoryName}, ${restVarName})`);
+        } else {
+          const expansion = [
+            `let ___attrs: $attrs.Of<typeof ${factoryName}> = $props()`,
+            `let ${varName} = __attrsFor(${factoryName}, ___attrs)`
+          ].join(`
+`);
+          s.overwrite(startIndex, endIndex, expansion);
+        }
+      }
+      neededImports.add("__attrsFor");
+    }
+    changed = true;
+  }
+  return changed;
+}
 
 // src/transform/core.ts
 function transformScript(source2, options = {}) {
@@ -6657,7 +6858,7 @@ function transformScript(source2, options = {}) {
     propsTypeDeclaration = result.propsTypeDeclaration;
   }
   if (isComponent) {
-    changed = transformAttrsForCalls(s, source2, neededImports) || changed;
+    changed = transformAttrsForCallsSync(s, source2, neededImports) || changed;
   }
   const needsPropsInjection = propsTypeDeclaration && propsTypeDeclaration.length > 0;
   if (isComponent && (neededImports.size > 0 || needsPropsInjection)) {
@@ -6728,7 +6929,7 @@ async function transformScriptAsync(source2, options) {
     propsTypeDeclaration = result.propsTypeDeclaration;
   }
   if (isComponent) {
-    changed = transformAttrsForCalls(s, source2, neededImports) || changed;
+    changed = await transformAttrsForCalls(s, source2, neededImports, schemaResolver) || changed;
   }
   const needsPropsInjectionAsync = propsTypeDeclaration && propsTypeDeclaration.length > 0;
   if (isComponent && (neededImports.size > 0 || needsPropsInjectionAsync)) {
@@ -6798,7 +6999,7 @@ async function transformScriptContent(source2, options) {
     propsTypeDeclaration = result.propsTypeDeclaration;
   }
   if (isComponent) {
-    changed = transformAttrsForCalls(s, source2, neededImports) || changed;
+    changed = await transformAttrsForCalls(s, source2, neededImports, schemaResolver) || changed;
   }
   if (neededImports.size > 0) {
     const importStatement = generateRuntimeImport([...neededImports]);