@enactprotocol/shared 2.2.2 → 2.3.1

package/tests/resolver.test.ts

@@ -1,6 +1,7 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
 import { existsSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
+import { addAlias, addToolToRegistry, removeAlias } from "../src/registry";
 import {
   ToolResolveError,
   getToolPath,
@@ -24,7 +25,7 @@ describe("tool resolver", () => {
 
     // Create a project-level tool
     writeFileSync(
-      join(PROJECT_ENACT_DIR, "tools", "test", "project-tool", "enact.yaml"),
+      join(PROJECT_ENACT_DIR, "tools", "test", "project-tool", "skill.yaml"),
       `
 name: test/project-tool
 description: A project-level test tool
@@ -36,7 +37,7 @@ version: "1.0.0"
     // Create a direct tool directory for path-based resolution
     mkdirSync(join(TEST_DIR, "direct-tool"), { recursive: true });
     writeFileSync(
-      join(TEST_DIR, "direct-tool", "enact.yaml"),
+      join(TEST_DIR, "direct-tool", "skill.yaml"),
       `
 name: test/direct-tool
 description: A directly referenced tool
@@ -73,11 +74,11 @@ Documentation here.
   describe("utility functions", () => {
     describe("normalizeToolName", () => {
       test("lowercases name", () => {
-        expect(normalizeToolName("Acme/Utils/Greeter")).toBe("acme/utils/greeter");
+        expect(normalizeToolName("Acme/Greeter")).toBe("acme/greeter");
       });
 
       test("converts backslashes to forward slashes", () => {
-        expect(normalizeToolName("acme\\utils\\greeter")).toBe("acme/utils/greeter");
+        expect(normalizeToolName("acme\\greeter")).toBe("acme/greeter");
       });
 
       test("trims whitespace", () => {
@@ -87,7 +88,11 @@ Documentation here.
 
     describe("toolNameToPath", () => {
       test("returns path-like string", () => {
-        expect(toolNameToPath("acme/utils/greeter")).toBe("acme/utils/greeter");
+        expect(toolNameToPath("acme/greeter")).toBe("acme/greeter");
+      });
+
+      test("strips @ prefix for disk paths", () => {
+        expect(toolNameToPath("@acme/greeter")).toBe("acme/greeter");
       });
 
       test("normalizes backslashes", () => {
@@ -141,7 +146,7 @@ Documentation here.
     });
 
     test("resolves tool from manifest file directly", () => {
-      const manifestPath = join(TEST_DIR, "direct-tool", "enact.yaml");
+      const manifestPath = join(TEST_DIR, "direct-tool", "skill.yaml");
       const result = resolveToolFromPath(manifestPath);
 
       expect(result.manifest.name).toBe("test/direct-tool");
@@ -269,4 +274,83 @@ Documentation here.
       expect(error.searchedLocations).toEqual(["/path/1", "/path/2"]);
     });
   });
+
+  describe("alias resolution", () => {
+    test("resolves tool via alias", () => {
+      // Set up an alias for the project tool
+      addToolToRegistry("test/project-tool", "1.0.0", "project", PROJECT_DIR);
+      addAlias("pt", "test/project-tool", "project", PROJECT_DIR);
+
+      try {
+        // Resolve using the alias (no slashes = potential alias)
+        const result = resolveTool("pt", { startDir: PROJECT_DIR });
+        expect(result.manifest.name).toBe("test/project-tool");
+        expect(result.location).toBe("project");
+      } finally {
+        // Clean up
+        removeAlias("pt", "project", PROJECT_DIR);
+        rmSync(join(PROJECT_ENACT_DIR, "tools.json"), { force: true });
+      }
+    });
+
+    test("alias resolution is case-insensitive (normalized to lowercase)", () => {
+      addToolToRegistry("test/project-tool", "1.0.0", "project", PROJECT_DIR);
+      addAlias("mytool", "test/project-tool", "project", PROJECT_DIR);
+
+      try {
+        // Lowercase alias should work
+        const result = resolveTool("mytool", { startDir: PROJECT_DIR });
+        expect(result.manifest.name).toBe("test/project-tool");
+
+        // Uppercase alias should also work (normalized to lowercase)
+        const upperResult = resolveTool("MYTOOL", { startDir: PROJECT_DIR });
+        expect(upperResult.manifest.name).toBe("test/project-tool");
+
+        // Mixed case should also work
+        const mixedResult = resolveTool("MyTool", { startDir: PROJECT_DIR });
+        expect(mixedResult.manifest.name).toBe("test/project-tool");
+      } finally {
+        removeAlias("mytool", "project", PROJECT_DIR);
+        rmSync(join(PROJECT_ENACT_DIR, "tools.json"), { force: true });
+      }
+    });
+
+    test("full tool names bypass alias resolution", () => {
+      addToolToRegistry("test/project-tool", "1.0.0", "project", PROJECT_DIR);
+      // Create an alias that would conflict if checked
+      addAlias("test/project-tool", "some/other-tool", "project", PROJECT_DIR);
+
+      try {
+        // Full name with slashes should resolve directly, not via alias
+        const result = resolveTool("test/project-tool", { startDir: PROJECT_DIR });
+        expect(result.manifest.name).toBe("test/project-tool");
+      } finally {
+        removeAlias("test/project-tool", "project", PROJECT_DIR);
+        rmSync(join(PROJECT_ENACT_DIR, "tools.json"), { force: true });
+      }
+    });
+
+    test("tryResolveTool works with aliases", () => {
+      addToolToRegistry("test/project-tool", "1.0.0", "project", PROJECT_DIR);
+      addAlias("try-alias", "test/project-tool", "project", PROJECT_DIR);
+
+      try {
+        const result = tryResolveTool("try-alias", { startDir: PROJECT_DIR });
+        expect(result).not.toBeNull();
+        expect(result?.manifest.name).toBe("test/project-tool");
+      } finally {
+        removeAlias("try-alias", "project", PROJECT_DIR);
+        rmSync(join(PROJECT_ENACT_DIR, "tools.json"), { force: true });
+      }
+    });
+
+    test("non-existent alias returns null from tryResolveTool", () => {
+      const result = tryResolveTool("nonexistent-alias", {
+        startDir: PROJECT_DIR,
+        skipUser: true,
+        skipCache: true,
+      });
+      expect(result).toBeNull();
+    });
+  });
 });