agent-contracts 0.22.6 → 0.22.7

package/dist/index.d.ts

@@ -1247,7 +1247,7 @@ declare function mergeDsl(base: AnyRecord, project: AnyRecord): AnyRecord;
 interface ResolveResult {
     data: Record<string, unknown>;
     projectPath: string;
-    basePath?: string;
+    basePaths: string[];
 }
 declare function resolve(projectDirOrFile: string): Promise<ResolveResult>;
 

package/dist/index.js

@@ -50090,24 +50090,39 @@ function mergeDsl(base, project) {
 
 // src/resolver/resolve.ts
 import { dirname as dirname2, resolve as resolvePath } from "path";
-async function resolve3(projectDirOrFile) {
-  const absPath = resolvePath(projectDirOrFile);
-  const projectResult = await loadDsl(absPath);
-  const projectData = projectResult.data;
-  const extendsValue = projectData["extends"];
+async function resolveExtendsChain(data, filePath, seen) {
+  const extendsValue = data["extends"];
   if (typeof extendsValue !== "string") {
-    return {
-      data: projectData,
-      projectPath: projectResult.filePath
-    };
+    return { data, basePaths: [] };
   }
-  const projectDir = dirname2(projectResult.filePath);
+  const projectDir = dirname2(filePath);
   const baseResult = await resolveBase(extendsValue, projectDir);
-  const merged = mergeDsl(baseResult.data, projectData);
+  const basePath = baseResult.filePath;
+  if (seen.has(basePath)) {
+    throw new BaseResolveError(
+      `Circular extends detected: ${basePath}`
+    );
+  }
+  seen.add(basePath);
+  const { data: resolvedBase, basePaths: ancestorPaths } = await resolveExtendsChain(baseResult.data, basePath, seen);
+  const merged = mergeDsl(resolvedBase, data);
   return {
     data: merged,
+    basePaths: [...ancestorPaths, basePath]
+  };
+}
+async function resolve3(projectDirOrFile) {
+  const absPath = resolvePath(projectDirOrFile);
+  const projectResult = await loadDsl(absPath);
+  const { data, basePaths } = await resolveExtendsChain(
+    projectResult.data,
+    projectResult.filePath,
+    /* @__PURE__ */ new Set()
+  );
+  return {
+    data,
     projectPath: projectResult.filePath,
-    basePath: baseResult.filePath
+    basePaths
   };
 }