svelte-origin 1.0.0-next.20 → 1.0.0-next.22

package/dist/aliases.d.ts

@@ -36,6 +36,7 @@ export declare function resolveAliases(config?: AliasConfig): ResolvedAliases;
  * - Exact matches: "$lib" -> "src/lib"
  * - Prefix matches: "$lib/utils" -> "src/lib/utils"
  * - Longest match wins: "$lib/components" before "$lib"
+ * - npm package imports via node_modules resolution
  */
 export declare function resolveImportPath(importPath: string, aliases: Record<string, string>, importerDir: string): string | null;
 /**

package/dist/cli.js

@@ -1975,6 +1975,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;
@@ -2005,13 +2006,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}
 	}`;
@@ -2238,7 +2257,83 @@ function transformStandaloneAttrsDefinition(content) {
 
 // src/transform/schema.ts
 function parseOriginSchemaFromSource(source, exportName) {
-  const exportPattern = new RegExp(`export\\s+const\\s+${exportName}\\s*=\\s*\\$origin\\s*\\(`, "s");
+  const sourceResult = parseSourceOrigin(source, exportName);
+  if (sourceResult)
+    return sourceResult;
+  const compiledResult = parseCompiledOrigin(source, exportName);
+  if (compiledResult)
+    return compiledResult;
+  return null;
+}
+function parseAttrsSchemaFromSource(source, exportName) {
+  const sourceResult = parseSourceAttrs(source, exportName);
+  if (sourceResult)
+    return sourceResult;
+  const compiledResult = parseCompiledAttrs(source, exportName);
+  if (compiledResult)
+    return compiledResult;
+  return null;
+}
+function parseSourceAttrs(source, exportName) {
+  const exportPattern = new RegExp(`export\\s+(?:const|var|let)\\s+${exportName}\\s*=\\s*\\$attrs\\s*\\(`, "s");
+  const match = exportPattern.exec(source);
+  if (!match)
+    return null;
+  const attrsStart = match.index + match[0].length - 1;
+  const attrsEnd = findMatchingBracket(source, attrsStart);
+  if (attrsEnd === -1)
+    return null;
+  let attrsContent = source.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(source, exportName) {
+  const exportPattern = new RegExp(`export\\s+(?:const|var|let)\\s+${exportName}\\s*=\\s*__createAttrs\\s*\\(\\s*\\{`, "s");
+  const match = exportPattern.exec(source);
+  if (!match)
+    return null;
+  const braceStart = match.index + match[0].length - 1;
+  const braceEnd = findMatchingBracket(source, braceStart, "{", "}");
+  if (braceEnd === -1)
+    return null;
+  const configContent = source.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(source, exportName) {
+  const exportPattern = new RegExp(`export\\s+(?:const|var|let)\\s+${exportName}\\s*=\\s*\\$origin\\s*\\(`, "s");
   const match = exportPattern.exec(source);
   if (!match)
     return null;
@@ -2262,6 +2357,13 @@ function parseOriginSchemaFromSource(source, 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;
@@ -2274,6 +2376,96 @@ function parseOriginSchemaFromSource(source, exportName) {
   const attrs = parseAttrsContent(attrsContent);
   return { attrs, parentNames };
 }
+function parseCompiledOrigin(source, exportName) {
+  const exportPattern = new RegExp(`export\\s+(?:const|var|let)\\s+${exportName}\\s*=\\s*__createOrigin\\s*\\(\\s*\\{`, "s");
+  const match = exportPattern.exec(source);
+  if (!match)
+    return null;
+  const braceStart = match.index + match[0].length - 1;
+  const braceEnd = findMatchingBracket(source, braceStart, "{", "}");
+  if (braceEnd === -1)
+    return null;
+  const configContent = source.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));
+  }
+  const propsRefMatch = configContent.match(/__propsRef\s*:\s*(\w+)/);
+  const propsRef = propsRefMatch ? propsRefMatch[1] : undefined;
+  return { attrs, parentNames, propsRef };
+}
+function parseCompiledAttrSchema(content) {
+  const result = [];
+  let pos = 0;
+  while (pos < content.length) {
+    while (pos < content.length && /[\s,]/.test(content[pos]))
+      pos++;
+    if (pos >= content.length)
+      break;
+    if (content.slice(pos, pos + 2) === "/*") {
+      const endComment = content.indexOf("*/", pos + 2);
+      if (endComment !== -1) {
+        pos = endComment + 2;
+        continue;
+      }
+    }
+    const keyMatch = content.slice(pos).match(/^(\w+)\s*:/);
+    if (!keyMatch)
+      break;
+    const key = keyMatch[1];
+    pos += keyMatch[0].length;
+    while (pos < content.length && /\s/.test(content[pos]))
+      pos++;
+    if (content[pos] !== "{")
+      break;
+    const valueStart = pos;
+    const valueEnd = findMatchingBracket(content, valueStart, "{", "}");
+    if (valueEnd === -1)
+      break;
+    const valueContent = content.slice(valueStart + 1, valueEnd);
+    let defaultValue = "undefined";
+    let bindable = false;
+    let hasDefault = false;
+    const defaultMatch = valueContent.match(/\bdefault\s*:\s*/);
+    if (defaultMatch) {
+      const defaultStart = defaultMatch.index + defaultMatch[0].length;
+      let depth = 0;
+      let i = defaultStart;
+      while (i < valueContent.length) {
+        const char = valueContent[i];
+        if (char === "{" || char === "(" || char === "[")
+          depth++;
+        else if (char === "}" || char === ")" || char === "]")
+          depth--;
+        else if (char === "," && depth === 0)
+          break;
+        i++;
+      }
+      defaultValue = valueContent.slice(defaultStart, i).trim();
+    }
+    const bindableMatch = valueContent.match(/\bbindable\s*:\s*(true|false)/);
+    if (bindableMatch) {
+      bindable = bindableMatch[1] === "true";
+    }
+    const hasDefaultMatch = valueContent.match(/\bhasDefault\s*:\s*(true|false)/);
+    if (hasDefaultMatch) {
+      hasDefault = hasDefaultMatch[1] === "true";
+    }
+    result.push({ key, defaultValue, bindable, hasDefault });
+    pos = valueEnd + 1;
+  }
+  return result;
+}
 function parseAttrsContent(content) {
   const result = [];
   const parts = splitByTopLevelCommas(content);

package/dist/index.js

@@ -3891,7 +3891,83 @@ function findMatchingBracket(source2, openIndex, openChar = "(", closeChar = ")"
 
 // src/transform/schema.ts
 function parseOriginSchemaFromSource(source2, exportName) {
-  const exportPattern = new RegExp(`export\\s+const\\s+${exportName}\\s*=\\s*\\$origin\\s*\\(`, "s");
+  const sourceResult = parseSourceOrigin(source2, exportName);
+  if (sourceResult)
+    return sourceResult;
+  const compiledResult = parseCompiledOrigin(source2, exportName);
+  if (compiledResult)
+    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);
   if (!match)
     return null;
@@ -3915,6 +3991,13 @@ function parseOriginSchemaFromSource(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;
@@ -3927,6 +4010,96 @@ function parseOriginSchemaFromSource(source2, exportName) {
   const attrs = parseAttrsContent(attrsContent);
   return { attrs, parentNames };
 }
+function parseCompiledOrigin(source2, exportName) {
+  const exportPattern = new RegExp(`export\\s+(?:const|var|let)\\s+${exportName}\\s*=\\s*__createOrigin\\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));
+  }
+  const propsRefMatch = configContent.match(/__propsRef\s*:\s*(\w+)/);
+  const propsRef = propsRefMatch ? propsRefMatch[1] : undefined;
+  return { attrs, parentNames, propsRef };
+}
+function parseCompiledAttrSchema(content) {
+  const result = [];
+  let pos = 0;
+  while (pos < content.length) {
+    while (pos < content.length && /[\s,]/.test(content[pos]))
+      pos++;
+    if (pos >= content.length)
+      break;
+    if (content.slice(pos, pos + 2) === "/*") {
+      const endComment = content.indexOf("*/", pos + 2);
+      if (endComment !== -1) {
+        pos = endComment + 2;
+        continue;
+      }
+    }
+    const keyMatch = content.slice(pos).match(/^(\w+)\s*:/);
+    if (!keyMatch)
+      break;
+    const key2 = keyMatch[1];
+    pos += keyMatch[0].length;
+    while (pos < content.length && /\s/.test(content[pos]))
+      pos++;
+    if (content[pos] !== "{")
+      break;
+    const valueStart = pos;
+    const valueEnd = findMatchingBracket(content, valueStart, "{", "}");
+    if (valueEnd === -1)
+      break;
+    const valueContent = content.slice(valueStart + 1, valueEnd);
+    let defaultValue = "undefined";
+    let bindable2 = false;
+    let hasDefault = false;
+    const defaultMatch = valueContent.match(/\bdefault\s*:\s*/);
+    if (defaultMatch) {
+      const defaultStart = defaultMatch.index + defaultMatch[0].length;
+      let depth = 0;
+      let i = defaultStart;
+      while (i < valueContent.length) {
+        const char = valueContent[i];
+        if (char === "{" || char === "(" || char === "[")
+          depth++;
+        else if (char === "}" || char === ")" || char === "]")
+          depth--;
+        else if (char === "," && depth === 0)
+          break;
+        i++;
+      }
+      defaultValue = valueContent.slice(defaultStart, i).trim();
+    }
+    const bindableMatch = valueContent.match(/\bbindable\s*:\s*(true|false)/);
+    if (bindableMatch) {
+      bindable2 = bindableMatch[1] === "true";
+    }
+    const hasDefaultMatch = valueContent.match(/\bhasDefault\s*:\s*(true|false)/);
+    if (hasDefaultMatch) {
+      hasDefault = hasDefaultMatch[1] === "true";
+    }
+    result.push({ key: key2, defaultValue, bindable: bindable2, hasDefault });
+    pos = valueEnd + 1;
+  }
+  return result;
+}
 function parseAttrsContent(content) {
   const result = [];
   const parts = splitByTopLevelCommas(content);
@@ -6063,6 +6236,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;
@@ -6093,13 +6267,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}
 	}`;