@eventcatalog/language-server 0.5.0 → 0.6.1

package/dist/resolvers/resolve.js

@@ -0,0 +1,485 @@
+import yaml from "js-yaml";
+import { isCatalogPath, } from "./types.js";
+import { parseSpec, extractService, messageToEc, channelToEc, containerToEc, serviceToEc, } from "./asyncapi.js";
+import { parseOpenApiSpec, extractOpenApiService, openApiServiceToEc, openApiMessageToEc, } from "./openapi.js";
+// Matches: import events { OrderCreated } from "./spec.yml"
+// Matches: import channels { orderEvents } from "./spec.yml"
+// Matches: import events { OrderCreated } from "https://example.com/spec.yml"
+// Also matches .json files for OpenAPI specs
+const SPEC_IMPORT_RE = /^\s*import\s+(events|commands|queries|channels)\s*\{([^}]*)\}\s*from\s*"([^"]+\.(?:ya?ml|json))"\s*(?:\/\/.*)?$/gm;
+// Matches: import OrderService from "./spec.yml"
+// A bare identifier (no braces, no resource type keyword) imports a full service
+// Also matches .json files for OpenAPI specs
+const SERVICE_IMPORT_RE = /^\s*import\s+([A-Z][a-zA-Z0-9_]*)\s+from\s*"([^"]+\.(?:ya?ml|json))"\s*(?:\/\/.*)?$/gm;
+// Matches: import events { OrderCreated } from "./my-catalog"
+// Matches: import services { OrderService } from "./my-catalog"
+// Matches: import containers { PaymentsDB } from "./my-catalog"
+// Catches any typed import whose path is NOT a spec file and NOT a URL (i.e., a directory path).
+// Uses the same shape as SPEC_IMPORT_RE but with a generic path capture.
+const CATALOG_IMPORT_RE = /^\s*import\s+(events|commands|queries|channels|services|containers)\s*\{([^}]*)\}\s*from\s*"([^"]+)"\s*(?:\/\/.*)?$/gm;
+/**
+ * Detect whether a spec document is AsyncAPI or OpenAPI based on its content.
+ */
+export function detectSpecType(content) {
+    try {
+        let doc;
+        try {
+            doc = JSON.parse(content);
+        }
+        catch {
+            doc = yaml.load(content);
+        }
+        if (!doc || typeof doc !== "object")
+            return "unknown";
+        if (doc.asyncapi)
+            return "asyncapi";
+        if (doc.openapi)
+            return "openapi";
+        return "unknown";
+    }
+    catch {
+        return "unknown";
+    }
+}
+function findImports(source) {
+    const imports = [];
+    SPEC_IMPORT_RE.lastIndex = 0;
+    let match;
+    while ((match = SPEC_IMPORT_RE.exec(source)) !== null) {
+        imports.push({
+            full: match[0],
+            resourceType: match[1],
+            importNames: match[2]
+                .split(",")
+                .map((s) => s.trim())
+                .filter(Boolean),
+            specPath: match[3],
+        });
+    }
+    return imports;
+}
+function findServiceImports(source) {
+    const imports = [];
+    SERVICE_IMPORT_RE.lastIndex = 0;
+    let match;
+    while ((match = SERVICE_IMPORT_RE.exec(source)) !== null) {
+        imports.push({
+            full: match[0],
+            serviceName: match[1],
+            specPath: match[2],
+        });
+    }
+    return imports;
+}
+function findCatalogImports(source) {
+    const imports = [];
+    CATALOG_IMPORT_RE.lastIndex = 0;
+    let match;
+    while ((match = CATALOG_IMPORT_RE.exec(source)) !== null) {
+        const specPath = match[3];
+        // Only keep matches that are catalog paths (not spec files, not URLs)
+        if (!isCatalogPath(specPath))
+            continue;
+        imports.push({
+            full: match[0],
+            resourceType: match[1],
+            importNames: match[2]
+                .split(",")
+                .map((s) => s.trim())
+                .filter(Boolean),
+            specPath,
+        });
+    }
+    return imports;
+}
+async function resolveCatalogImportToEc(imp, basePath, importingFile) {
+    // Dynamic imports to avoid pulling Node.js/SDK deps into browser builds
+    const { resolve, dirname, isAbsolute } = await import("node:path");
+    // Resolve relative paths against the importing file's directory when available,
+    // falling back to basePath for absolute paths or when the file is unknown.
+    let catalogDir;
+    if (importingFile && !isAbsolute(imp.specPath)) {
+        const fileDir = resolve(basePath, dirname(importingFile));
+        catalogDir = resolve(fileDir, imp.specPath);
+    }
+    else {
+        catalogDir = resolve(basePath, imp.specPath);
+    }
+    // Service imports use a different code path
+    if (imp.resourceType === "services") {
+        const { parseCatalogServices } = await import("./catalog.js");
+        const { services, errors } = await parseCatalogServices(catalogDir);
+        const ecDefs = imp.importNames.map((name) => {
+            const svc = services.get(name);
+            if (!svc) {
+                errors.push({
+                    message: `Service "${name}" not found in catalog "${imp.specPath}". Available: ${[...services.keys()].join(", ") || "(none)"}`,
+                    line: 1,
+                    column: 1,
+                });
+                return `// ERROR: Service "${name}" not found in catalog ${imp.specPath}`;
+            }
+            return serviceToEc(svc);
+        });
+        return { ec: ecDefs.join("\n\n"), errors };
+    }
+    // Channel imports use a dedicated resolver to capture address/protocol
+    if (imp.resourceType === "channels") {
+        const { parseCatalogChannels } = await import("./catalog.js");
+        const { channels, errors } = await parseCatalogChannels(catalogDir);
+        const ecDefs = imp.importNames.map((name) => {
+            const ch = channels.get(name);
+            if (!ch) {
+                errors.push({
+                    message: `Channel "${name}" not found in catalog "${imp.specPath}". Available: ${[...channels.keys()].join(", ") || "(none)"}`,
+                    line: 1,
+                    column: 1,
+                });
+                return `// ERROR: Channel "${name}" not found in catalog ${imp.specPath}`;
+            }
+            return channelToEc(ch);
+        });
+        return { ec: ecDefs.join("\n\n"), errors };
+    }
+    const { parseCatalogResources } = await import("./catalog.js");
+    const { messages, errors } = await parseCatalogResources(catalogDir, imp.resourceType);
+    const ecDefs = imp.importNames.map((name) => {
+        const msg = messages.get(name);
+        if (!msg) {
+            errors.push({
+                message: `"${name}" not found in catalog "${imp.specPath}". Available: ${[...messages.keys()].join(", ") || "(none)"}`,
+                line: 1,
+                column: 1,
+            });
+            return `// ERROR: "${name}" not found in catalog ${imp.specPath}`;
+        }
+        return imp.resourceType === "containers"
+            ? containerToEc(msg)
+            : messageToEc(msg, imp.resourceType);
+    });
+    return { ec: ecDefs.join("\n\n"), errors };
+}
+function resolveAsyncApiImportToEc(imp, specContent, cachedParsedSpecs) {
+    const errors = [];
+    const cacheKey = normalizeSpecKey(imp.specPath);
+    if (!cachedParsedSpecs.has(cacheKey)) {
+        const parsed = parseSpec(specContent);
+        cachedParsedSpecs.set(cacheKey, parsed);
+        errors.push(...parsed.errors);
+    }
+    const parsed = cachedParsedSpecs.get(cacheKey);
+    const isChannelImport = imp.resourceType === "channels";
+    const catalog = isChannelImport ? parsed.channels : parsed.messages;
+    const typeName = isChannelImport ? "Channel" : "Message";
+    const ecDefs = imp.importNames.map((name) => {
+        const resource = catalog.get(name);
+        if (!resource) {
+            errors.push({
+                message: `${typeName} "${name}" not found in AsyncAPI spec "${imp.specPath}". Available: ${[...catalog.keys()].join(", ") || "(none)"}`,
+                line: 1,
+                column: 1,
+            });
+            return `// ERROR: "${name}" not found in ${imp.specPath}`;
+        }
+        return isChannelImport
+            ? channelToEc(resource)
+            : messageToEc(resource, imp.resourceType);
+    });
+    return { ec: ecDefs.join("\n\n"), errors };
+}
+function resolveOpenApiImportToEc(imp, specContent, cachedParsedSpecs) {
+    const errors = [];
+    // OpenAPI does not support event or channel imports
+    if (imp.resourceType === "events") {
+        errors.push({
+            message: `OpenAPI specs contain commands and queries, not events. Use "import commands" or "import queries" instead for "${imp.specPath}".`,
+            line: 1,
+            column: 1,
+        });
+        return {
+            ec: `// ERROR: OpenAPI specs do not contain events`,
+            errors,
+        };
+    }
+    if (imp.resourceType === "channels") {
+        errors.push({
+            message: `OpenAPI specs do not contain channels for "${imp.specPath}".`,
+            line: 1,
+            column: 1,
+        });
+        return {
+            ec: `// ERROR: OpenAPI specs do not contain channels`,
+            errors,
+        };
+    }
+    const cacheKey = normalizeSpecKey(imp.specPath);
+    if (!cachedParsedSpecs.has(cacheKey)) {
+        const parsed = parseOpenApiSpec(specContent);
+        cachedParsedSpecs.set(cacheKey, parsed);
+        errors.push(...parsed.errors);
+    }
+    const parsed = cachedParsedSpecs.get(cacheKey);
+    // Map the import keyword to the expected message type
+    const expectedType = imp.resourceType === "commands" ? "command" : "query";
+    const ecDefs = imp.importNames.map((name) => {
+        const msg = parsed.messages.get(name);
+        if (!msg) {
+            errors.push({
+                message: `Message "${name}" not found in OpenAPI spec "${imp.specPath}". Available: ${[...parsed.messages.keys()].join(", ") || "(none)"}`,
+                line: 1,
+                column: 1,
+            });
+            return `// ERROR: "${name}" not found in ${imp.specPath}`;
+        }
+        // Enforce that the message type matches the import keyword
+        if (msg.messageType !== expectedType) {
+            errors.push({
+                message: `"${name}" is a ${msg.messageType} but was imported as "${imp.resourceType}" in "${imp.specPath}". Use "import ${msg.messageType === "command" ? "commands" : "queries"} { ${name} }" instead.`,
+                line: 1,
+                column: 1,
+            });
+            return `// ERROR: "${name}" is a ${msg.messageType}, not a ${expectedType}`;
+        }
+        return openApiMessageToEc(msg);
+    });
+    return { ec: ecDefs.join("\n\n"), errors };
+}
+function resolveServiceImportToEc(imp, specContent, specType) {
+    if (specType === "openapi") {
+        const { service, errors } = extractOpenApiService(specContent, imp.serviceName);
+        return { ec: openApiServiceToEc(service), errors };
+    }
+    // Default to AsyncAPI
+    const { service, errors } = extractService(specContent, imp.serviceName);
+    return { ec: serviceToEc(service), errors };
+}
+function isUrl(path) {
+    return path.startsWith("https://") || path.startsWith("http://");
+}
+function normalizeSpecKey(specPath) {
+    return isUrl(specPath) ? specPath : specPath.replace(/^\.\//, "");
+}
+function lookupLocalSpec(specPath, files) {
+    const normalizedPath = specPath.replace(/^\.\//, "");
+    return (files[specPath] ?? files[normalizedPath] ?? files[`./${normalizedPath}`]);
+}
+export function isSpecFile(filename) {
+    return (filename.endsWith(".yml") ||
+        filename.endsWith(".yaml") ||
+        filename.endsWith(".json"));
+}
+const SKIP = Symbol("skip");
+/**
+ * Core resolution logic shared by sync and async resolvers.
+ * Given a spec content lookup function, resolves all imports in .ec files.
+ * Auto-detects whether each spec is AsyncAPI or OpenAPI.
+ * Return `SKIP` from the callback to leave an import untouched;
+ * return `undefined` to replace it with an error comment.
+ */
+function resolveFileImports(files, getSpecContent) {
+    const errors = [];
+    const newFiles = {};
+    const cachedAsyncApiSpecs = new Map();
+    const cachedOpenApiSpecs = new Map();
+    const specTypeCache = new Map();
+    function getSpecType(specPath, content) {
+        const cacheKey = normalizeSpecKey(specPath);
+        if (!specTypeCache.has(cacheKey)) {
+            specTypeCache.set(cacheKey, detectSpecType(content));
+        }
+        return specTypeCache.get(cacheKey);
+    }
+    for (const [filename, source] of Object.entries(files)) {
+        if (isSpecFile(filename))
+            continue;
+        const imports = findImports(source);
+        const serviceImports = findServiceImports(source);
+        if (imports.length === 0 && serviceImports.length === 0) {
+            newFiles[filename] = source;
+            continue;
+        }
+        let result = source;
+        // Resolve resource imports (import events { ... } from "spec.yml")
+        for (const imp of imports) {
+            const specContent = getSpecContent(imp.specPath);
+            if (specContent === SKIP)
+                continue;
+            if (!specContent) {
+                result = result.replace(imp.full, `// ERROR: Spec file not available: ${imp.specPath}`);
+                continue;
+            }
+            const specType = getSpecType(imp.specPath, specContent);
+            let resolution;
+            if (specType === "openapi") {
+                resolution = resolveOpenApiImportToEc(imp, specContent, cachedOpenApiSpecs);
+            }
+            else {
+                resolution = resolveAsyncApiImportToEc(imp, specContent, cachedAsyncApiSpecs);
+            }
+            errors.push(...resolution.errors);
+            result = result.replace(imp.full, resolution.ec);
+        }
+        // Resolve service imports (import ServiceName from "spec.yml")
+        for (const imp of serviceImports) {
+            const specContent = getSpecContent(imp.specPath);
+            if (specContent === SKIP)
+                continue;
+            if (!specContent) {
+                result = result.replace(imp.full, `// ERROR: Spec file not available: ${imp.specPath}`);
+                continue;
+            }
+            const specType = getSpecType(imp.specPath, specContent);
+            const resolution = resolveServiceImportToEc(imp, specContent, specType);
+            errors.push(...resolution.errors);
+            result = result.replace(imp.full, resolution.ec);
+        }
+        newFiles[filename] = result;
+    }
+    return { files: newFiles, errors };
+}
+/**
+ * Resolve all spec imports in a set of files (sync, local files only).
+ * Scans .ec files for `import <type> { ... } from "*.yml"` and
+ * `import ServiceName from "*.yml"` statements, auto-detects whether
+ * each spec is AsyncAPI or OpenAPI, and replaces the imports with
+ * synthesized .ec definitions.
+ * Spec files (YAML/JSON) are excluded from the output.
+ * URL imports are left untouched - use resolveSpecImportsAsync for those.
+ */
+export function resolveSpecImports(files) {
+    const notFoundErrors = [];
+    const result = resolveFileImports(files, (specPath) => {
+        if (isUrl(specPath))
+            return SKIP;
+        const content = lookupLocalSpec(specPath, files);
+        if (!content) {
+            notFoundErrors.push({
+                message: `Spec file not found: "${specPath}"`,
+                line: 1,
+                column: 1,
+            });
+        }
+        return content;
+    });
+    return {
+        files: result.files,
+        errors: [...notFoundErrors, ...result.errors],
+    };
+}
+/**
+ * Resolve all spec imports including remote URLs (async).
+ * Fetches remote specs via the provided fetchFn, then resolves all imports.
+ * Auto-detects AsyncAPI vs OpenAPI from file content.
+ * For local file imports, looks them up in the files map.
+ * When basePath is provided, also resolves catalog directory imports
+ * (e.g., `import events { OrderCreated } from "./my-catalog"`).
+ */
+export async function resolveSpecImportsAsync(files, fetchFn, basePath) {
+    // Collect all unique remote URLs that need fetching
+    const urlsToFetch = new Set();
+    for (const [filename, source] of Object.entries(files)) {
+        if (isSpecFile(filename))
+            continue;
+        for (const imp of findImports(source)) {
+            if (isUrl(imp.specPath))
+                urlsToFetch.add(imp.specPath);
+        }
+        for (const imp of findServiceImports(source)) {
+            if (isUrl(imp.specPath))
+                urlsToFetch.add(imp.specPath);
+        }
+    }
+    // Fetch all remote specs in parallel
+    const fetchErrors = [];
+    const fetchedSpecs = new Map();
+    await Promise.all([...urlsToFetch].map(async (url) => {
+        try {
+            fetchedSpecs.set(url, await fetchFn(url));
+        }
+        catch (err) {
+            fetchErrors.push({
+                message: `Failed to fetch spec "${url}": ${String(err)}`,
+                line: 1,
+                column: 1,
+            });
+        }
+    }));
+    const notFoundErrors = [];
+    const result = resolveFileImports(files, (specPath) => {
+        if (isUrl(specPath))
+            return fetchedSpecs.get(specPath);
+        const content = lookupLocalSpec(specPath, files);
+        if (!content) {
+            notFoundErrors.push({
+                message: `Spec file not found: "${specPath}"`,
+                line: 1,
+                column: 1,
+            });
+        }
+        return content;
+    });
+    // Resolve catalog directory imports (import events { ... } from "./my-catalog")
+    // Only when basePath is provided (Node.js/VSCode context, not browser)
+    if (basePath) {
+        const catalogErrors = [];
+        // Collect files that have catalog imports so we can resolve them in parallel.
+        // The TTL cache in catalog.ts ensures that multiple imports pointing at
+        // the same catalog directory only trigger one SDK scan.
+        const filesToResolve = [];
+        for (const [filename, source] of Object.entries(result.files)) {
+            const catalogImports = findCatalogImports(source);
+            if (catalogImports.length > 0) {
+                filesToResolve.push({ filename, imports: catalogImports });
+            }
+        }
+        // Resolve all files and their imports in parallel.
+        // Imports within a file are also resolved concurrently since they may
+        // point at different catalog directories.
+        const catalogResolutions = new Map();
+        await Promise.all(filesToResolve.map(async ({ filename, imports }) => {
+            const resolutions = await Promise.all(imports.map(async (imp) => {
+                try {
+                    return await resolveCatalogImportToEc(imp, basePath, filename);
+                }
+                catch (err) {
+                    return {
+                        ec: `// ERROR: Failed to resolve catalog "${imp.specPath}": ${String(err)}`,
+                        errors: [
+                            {
+                                message: `Failed to resolve catalog "${imp.specPath}": ${String(err)}`,
+                                line: 1,
+                                column: 1,
+                            },
+                        ],
+                    };
+                }
+            }));
+            let resolved = result.files[filename];
+            for (let i = 0; i < imports.length; i++) {
+                catalogErrors.push(...resolutions[i].errors);
+                resolved = resolved.replace(imports[i].full, resolutions[i].ec);
+            }
+            catalogResolutions.set(filename, resolved);
+        }));
+        // Build output preserving the original file order from result.files
+        const resolvedFiles = {};
+        for (const filename of Object.keys(result.files)) {
+            resolvedFiles[filename] =
+                catalogResolutions.get(filename) ?? result.files[filename];
+        }
+        return {
+            files: resolvedFiles,
+            errors: [
+                ...fetchErrors,
+                ...notFoundErrors,
+                ...result.errors,
+                ...catalogErrors,
+            ],
+        };
+    }
+    return {
+        files: result.files,
+        errors: [...fetchErrors, ...notFoundErrors, ...result.errors],
+    };
+}
+//# sourceMappingURL=resolve.js.map

package/dist/resolvers/resolve.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/resolvers/resolve.ts"],"names":[],"mappings":"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"}

package/dist/resolvers/types.d.ts

@@ -1,12 +1,22 @@
-export type ResourceType = "events" | "commands" | "queries" | "channels";
+export type ResourceType = "events" | "commands" | "queries" | "channels" | "services" | "containers";
 export interface SpecMessage {
     name: string;
+    /** Human-readable display name (from catalog `name` field) */
+    displayName?: string;
     summary?: string;
     description?: string;
     version?: string;
+    /** HTTP method (from OpenAPI) */
+    method?: string;
+    /** API path (from OpenAPI) */
+    path?: string;
+    /** HTTP status codes (from OpenAPI) */
+    statusCodes?: number[];
 }
 export interface SpecChannel {
     name: string;
+    /** Human-readable display name (from catalog `name` field) */
+    displayName?: string;
     address?: string;
     protocol?: string;
     summary?: string;
@@ -16,6 +26,7 @@ export interface SpecOperation {
     action: "send" | "receive";
     channelName: string;
     messageName: string;
+    messageType?: "event" | "command" | "query";
     summary?: string;
 }
 export interface SpecService {
@@ -40,4 +51,9 @@ export interface SpecResolveResult {
  * Allows callers to provide their own fetch implementation (browser fetch, node-fetch, etc.)
  */
 export type FetchFn = (url: string) => Promise<string>;
+/**
+ * Check whether a path looks like a catalog directory (not a spec file, not a URL).
+ * Browser-safe — no Node.js dependencies.
+ */
+export declare function isCatalogPath(specPath: string): boolean;
 //# sourceMappingURL=types.d.ts.map

package/dist/resolvers/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/resolvers/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GAAG,QAAQ,GAAG,UAAU,GAAG,SAAS,GAAG,UAAU,CAAC;AAE1E,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,aAAa,EAAE,CAAC;IAC5B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,QAAQ,EAAE,WAAW,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,MAAM,EAAE,YAAY,EAAE,CAAC;CACxB;AAED;;;GAGG;AACH,MAAM,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/resolvers/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,GACpB,QAAQ,GACR,UAAU,GACV,SAAS,GACT,UAAU,GACV,UAAU,GACV,YAAY,CAAC;AAEjB,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,8DAA8D;IAC9D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,iCAAiC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,8BAA8B;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uCAAuC;IACvC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,8DAA8D;IAC9D,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO,CAAC;IAC5C,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,aAAa,EAAE,CAAC;IAC5B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,QAAQ,EAAE,WAAW,EAAE,CAAC;CACzB;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,iBAAiB;IAChC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC9B,MAAM,EAAE,YAAY,EAAE,CAAC;CACxB;AAED;;;GAGG;AACH,MAAM,MAAM,OAAO,GAAG,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAEvD;;;GAGG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAKvD"}

package/dist/resolvers/types.js

@@ -1,2 +1,12 @@
-export {};
+/**
+ * Check whether a path looks like a catalog directory (not a spec file, not a URL).
+ * Browser-safe — no Node.js dependencies.
+ */
+export function isCatalogPath(specPath) {
+    if (specPath.startsWith("http://") || specPath.startsWith("https://"))
+        return false;
+    if (/\.(?:ya?ml|json)$/i.test(specPath))
+        return false;
+    return true;
+}
 //# sourceMappingURL=types.js.map

package/dist/resolvers/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/resolvers/types.ts"],"names":[],"mappings":""}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/resolvers/types.ts"],"names":[],"mappings":"AAmEA;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,QAAgB;IAC5C,IAAI,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC,UAAU,CAAC,UAAU,CAAC;QACnE,OAAO,KAAK,CAAC;IACf,IAAI,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC;QAAE,OAAO,KAAK,CAAC;IACtD,OAAO,IAAI,CAAC;AACd,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eventcatalog/language-server",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -9,6 +9,10 @@
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js"
     },
+    "./browser": {
+      "types": "./dist/browser.d.ts",
+      "import": "./dist/browser.js"
+    },
     "./language-server": {
       "import": "./dist/main.js"
     }
@@ -34,7 +38,8 @@
     "vscode-languageclient": "^9.0.1",
     "vscode-languageserver": "^9.0.1",
     "vscode-languageserver-textdocument": "^1.0.12",
-    "vscode-uri": "^3.0.8"
+    "vscode-uri": "^3.0.8",
+    "@eventcatalog/sdk": "2.15.1"
   },
   "devDependencies": {
     "@astrojs/starlight": "^0.32.0",

package/specification/03-event.md

@@ -18,6 +18,7 @@ event <id> {
   // Annotations
   @badge(...)
   @repository(...)
+  @api(method: "...", path: "...", statusCodes: "...")
 }
 ```
 

package/specification/04-command.md

@@ -14,7 +14,10 @@ command <id> {
 
   channel <channel-ref>
 
-  // Same annotations as event
+  // Annotations (same as event)
+  @badge(...)
+  @repository(...)
+  @api(method: "...", path: "...", statusCodes: "...")
 }
 ```
 

package/specification/05-query.md

@@ -14,7 +14,10 @@ query <id> {
 
   channel <channel-ref>
 
-  // Same annotations as event
+  // Annotations (same as event)
+  @badge(...)
+  @repository(...)
+  @api(method: "...", path: "...", statusCodes: "...")
 }
 ```