@telorun/ide-support 0.4.1 → 0.4.4

package/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <img src="./assets/telo.png" alt="Telo" width="200" />
+  <img src="https://raw.githubusercontent.com/telorun/telo/main/assets/telo.png" alt="Telo" width="200" />
 </p>
 
 <h1 align="center">Telo</h1>
@@ -61,12 +61,12 @@ targets:
 kind: Telo.Import
 metadata:
   name: Http
-source: ../modules/http-server
+source: std/http-server@0.4.0
 ---
 kind: Telo.Import
 metadata:
   name: Sql
-source: ../modules/sql
+source: std/sql@0.2.3
 ---
 # SQLite database — swap driver/host/database for PostgreSQL with zero YAML changes
 kind: Sql.Connection

package/dist/completions/build.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/completions/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AA2B3E,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,gBAAgB,GAAG,SAAS,EACtC,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAY7B"}
+{"version":3,"file":"build.d.ts","sourceRoot":"","sources":["../../src/completions/build.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAsK3E,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,gBAAgB,GAAG,SAAS,EACtC,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,gBAAgB,EAAE,CAAC,CA2B7B"}

package/dist/completions/build.js

@@ -1,16 +1,137 @@
-import { detectContext } from "./detect-context.js";
+import { detectContext, lookupRefConstraint } from "./detect-context.js";
 import { importSourceCompletions } from "./import-source.js";
 import { propKeyCompletions } from "./prop-keys.js";
 import { CAPABILITY_VALUES } from "./valid-capabilities.js";
-function kindCompletions(registry) {
-    const kinds = new Set(registry
-        ? registry.validUserFacingKinds()
-        : ["Telo.Application", "Telo.Library", "Telo.Import", "Telo.Definition"]);
-    return Array.from(kinds).map((kind) => ({
-        label: kind,
-        kind: "class",
-        detail: "Telo resource kind",
-    }));
+/** Roughly extract `(kind, metadata.name)` pairs from a multi-doc YAML text.
+ *  This is intentionally lightweight: it scans for top-level `kind:` and the
+ *  first `name:` under a `metadata:` block per `---`-separated section, with
+ *  no full YAML parse. The output is consumed only for completion ranking,
+ *  so misses on edge-case manifests are acceptable; the analyzer remains
+ *  the source of truth for validation. */
+function extractInFileResources(text) {
+    const out = [];
+    const lines = text.split("\n");
+    let currentKind;
+    let currentName;
+    let inMetadata = false;
+    const flush = () => {
+        if (currentKind && currentName) {
+            out.push({ kind: currentKind, name: currentName });
+        }
+        currentKind = undefined;
+        currentName = undefined;
+        inMetadata = false;
+    };
+    for (const line of lines) {
+        if (line.trimEnd() === "---") {
+            flush();
+            continue;
+        }
+        const kindMatch = line.match(/^kind:\s*(\S+)/);
+        if (kindMatch) {
+            currentKind = kindMatch[1];
+            continue;
+        }
+        if (/^metadata:\s*$/.test(line)) {
+            inMetadata = true;
+            continue;
+        }
+        if (inMetadata) {
+            // Lines inside metadata are indented. Pick the first `name:` we see.
+            const nameMatch = line.match(/^\s+name:\s*(\S+)/);
+            if (nameMatch && !currentName) {
+                currentName = nameMatch[1];
+            }
+            // Leaving the metadata block — any line that is not indented marks
+            // the end of the block.
+            if (line.length > 0 && !/^\s/.test(line)) {
+                inMetadata = false;
+            }
+        }
+    }
+    flush();
+    return out;
+}
+/** Returns the resource records whose kind satisfies the slot. When the
+ *  slot has a registry-resolvable `x-telo-ref` constraint, results are
+ *  filtered to that abstract's implementations; otherwise (or when the
+ *  user already typed a sibling `kind:`) they're filtered by an exact
+ *  kind match. Falls back to listing every in-file resource so the
+ *  user still sees something rather than nothing when the registry
+ *  doesn't recognize the kind yet. */
+function refNameCompletions(text, refKind, refConstraint, registry, valueStartColumn) {
+    const resources = extractInFileResources(text);
+    let acceptable;
+    if (refKind) {
+        acceptable = new Set([refKind]);
+    }
+    else if (refConstraint && registry) {
+        const kinds = registry.userFacingKindsForRef(refConstraint);
+        if (kinds)
+            acceptable = new Set(kinds);
+    }
+    const seen = new Set();
+    const out = [];
+    for (const r of resources) {
+        if (acceptable && !acceptable.has(r.kind))
+            continue;
+        if (seen.has(r.name))
+            continue;
+        seen.add(r.name);
+        out.push({
+            label: r.name,
+            kind: "value",
+            detail: r.kind,
+            // Anchor the replace range to the value's start column so names with
+            // `.`, `-`, or `/` (legal in resource names) replace the whole typed
+            // prefix instead of the trailing word VS Code would pick by default.
+            replaceFromColumn: valueStartColumn,
+        });
+    }
+    return out;
+}
+/** Resolve the kinds that satisfy the `x-telo-ref` slot at `parentDocKind` +
+ *  `parentYamlPath`. Returns `undefined` (caller falls back to the full list)
+ *  when there's no constraint, the path doesn't resolve, or the ref can't
+ *  be resolved through the registry. */
+function refConstrainedKinds(registry, parentDocKind, parentYamlPath) {
+    const definition = registry.resolveDefinition(parentDocKind);
+    if (!definition?.schema)
+        return undefined;
+    const refString = lookupRefConstraint(definition.schema, parentYamlPath);
+    if (!refString)
+        return undefined;
+    return registry.userFacingKindsForRef(refString);
+}
+function kindCompletions(registry, docKind, yamlPath, valueStartColumn) {
+    let kinds;
+    if (registry && docKind && yamlPath && yamlPath.length > 0) {
+        const filtered = refConstrainedKinds(registry, docKind, yamlPath);
+        kinds = filtered ?? registry.validUserFacingKinds();
+    }
+    else if (registry) {
+        kinds = registry.validUserFacingKinds();
+    }
+    else {
+        kinds = ["Telo.Application", "Telo.Library", "Telo.Import", "Telo.Definition"];
+    }
+    const seen = new Set();
+    const results = [];
+    for (const kind of kinds) {
+        if (seen.has(kind))
+            continue;
+        seen.add(kind);
+        const item = { label: kind, kind: "class", detail: "Telo resource kind" };
+        // Anchor the replace range to the value's start column so kinds with `.`
+        // (e.g. `Sql.Connection`) cleanly overwrite the existing prefix. Without
+        // this, VS Code's default word boundary stops at the last `.` and a pick
+        // of `Sql.Connection` while the buffer reads `Sql.Co|` becomes
+        // `Sql.Sql.Connection`.
+        if (valueStartColumn !== undefined)
+            item.replaceFromColumn = valueStartColumn;
+        results.push(item);
+    }
+    return results;
 }
 function capabilityCompletions() {
     return CAPABILITY_VALUES.map((cap) => ({
@@ -23,10 +144,18 @@ export async function buildCompletions(text, line, character, registry, adapter)
     const ctx = detectContext(text, line, character);
     if (!ctx)
         return [];
-    if (ctx.type === "kind")
-        return kindCompletions(registry);
+    if (ctx.type === "kind") {
+        return kindCompletions(registry, ctx.docKind, ctx.yamlPath, ctx.valueStartColumn);
+    }
     if (ctx.type === "capability")
         return capabilityCompletions();
+    if (ctx.type === "ref-name") {
+        const definition = registry?.resolveDefinition(ctx.docKind);
+        const refConstraint = definition?.schema
+            ? lookupRefConstraint(definition.schema, ctx.yamlPath)
+            : undefined;
+        return refNameCompletions(text, ctx.refKind, refConstraint, registry, ctx.valueStartColumn);
+    }
     if (ctx.type === "field-value") {
         if (ctx.docKind === "Telo.Import" && ctx.field === "source") {
             return importSourceCompletions(ctx.prefix, ctx.valueStartColumn, adapter);

package/dist/completions/detect-context.d.ts

@@ -1,5 +1,17 @@
 export type CompletionCtx = {
     type: "kind";
+    /** Set for indented `kind:` lines. The enclosing docKind + the YAML
+     *  path to the parent of the `kind:` field (so the value slot's
+     *  schema node can be looked up to discover `x-telo-ref` constraints).
+     *  Absent for top-level `kind:` — there, no constraint applies. */
+    docKind?: string;
+    yamlPath?: string[];
+    /** Column where the kind value begins (after `kind:` + whitespace).
+     *  Editor hosts use this to anchor the replace range so completions
+     *  cleanly overwrite a kind that contains `.` (e.g. `Sql.Co|` →
+     *  selecting `Sql.Connection` must replace `Sql.Co`, not just `Co`,
+     *  which VS Code's default word range would). */
+    valueStartColumn: number;
 } | {
     type: "capability";
 } | {
@@ -7,6 +19,20 @@ export type CompletionCtx = {
     docKind: string;
     yamlPath: string[];
     existingKeys: Set<string>;
+} | {
+    /** Cursor sits on the value of an object-form ref's `name:` field
+     *  (e.g. `connection: { kind: Sql.Connection, name: |}`). Editor hosts
+     *  use `refKind` (from the sibling `kind:` line) to filter the in-doc
+     *  resource list to matching candidates. */
+    type: "ref-name";
+    docKind: string;
+    /** YAML path to the parent slot (e.g. `["connection"]`). The schema
+     *  at this path declares the `x-telo-ref` constraint. */
+    yamlPath: string[];
+    /** The kind value of the sibling `kind:` line, if present. */
+    refKind?: string;
+    prefix: string;
+    valueStartColumn: number;
 } | {
     type: "field-value";
     docKind: string;
@@ -21,22 +47,52 @@ export declare function findDocBounds(lines: string[], cursorLine: number): {
     end: number;
 };
 export declare function extractKindFromDoc(lines: string[], start: number, end: number): string | undefined;
-export declare function extractRootKeys(lines: string[], start: number, end: number): Set<string>;
-/** Walk backward from cursorLine to build the chain of parent YAML keys. */
+/** Collects every top-level key in the doc bounds, skipping `skipLine` so the
+ *  cursor's own line is treated as "being edited" — its key (if any) stays in
+ *  the suggestion list. Without this the user can't autocomplete an existing
+ *  key from its own line (e.g. `ver|sion:`). */
+export declare function extractRootKeys(lines: string[], start: number, end: number, skipLine?: number): Set<string>;
+/** Walk backward from cursorLine to build the chain of parent YAML keys.
+ *
+ *  List-item handling (`  - request:` style): the `-` marker sits at the
+ *  line's textual indent, but the key after it (`request`) lives at indent
+ *  `+2`. Whether that post-dash key joins the path depends on the cursor's
+ *  descent:
+ *    - When the cursor's current target indent is GREATER than the post-dash
+ *      key's column, the descent passes through that key (e.g. cursor inside
+ *      `request.method` at indent 6, key `request` at column 4) → push it.
+ *    - When the cursor's current target indent EQUALS the post-dash key's
+ *      column, the post-dash key is a sibling at the list-item level
+ *      (e.g. cursor on `handler:` at indent 4, key `request:` at column 4) →
+ *      skip it; descend straight to the array's parent.
+ *
+ *  In both cases the next walk step targets `lineIndent` so the `routes:` /
+ *  `steps:` parent of the array is captured. The schema walker auto-descends
+ *  arrays, so no `[]` marker is appended. */
 export declare function buildYamlPath(lines: string[], cursorLine: number, docStart: number, cursorIndent: number): string[];
-/** Extract sibling keys already present at `indent` within the doc bounds. */
-export declare function extractKeysAtIndent(lines: string[], start: number, end: number, indent: number): Set<string>;
-/** Navigate a JSON Schema hierarchy following `path`, auto-descending into array items. */
+/** Extract sibling keys already present at `indent` within the doc bounds.
+ *  `skipLine` lets the caller exclude the cursor's own line so a key being
+ *  edited (`ver|sion:`) doesn't filter itself out of the suggestion list. */
+export declare function extractKeysAtIndent(lines: string[], start: number, end: number, indent: number, skipLine?: number): Set<string>;
+/** Navigate a JSON Schema hierarchy following `path`, auto-descending into
+ *  array items and peeling `anyOf` / `oneOf` branches. When multiple peeled
+ *  branches define `properties`, returns a synthetic node whose `properties`
+ *  is the union (first-wins on key collision) and whose `required` is the
+ *  intersection — enough for propKeyCompletions to surface every key a value
+ *  at this slot can legally carry. */
 export declare function navigateSchema(schema: Record<string, any>, path: string[]): Record<string, any> | undefined;
-/**
- * For blank lines (and lines with only whitespace), infer the intended indent
- * from context rather than relying on the cursor column, which is often 0
- * even when the cursor is semantically inside a nested block.
- *
- * Strategy: look at the previous non-empty line.
- *   - If it ends with `:` (bare object key, no value) → cursor is one level deeper.
- *   - Otherwise → cursor is a sibling of that key (same indent).
- */
-export declare function inferIndentForBlankLine(lines: string[], cursorLine: number, docStart: number): number;
+/** Walks up and down from `cursorLine` looking for a sibling line at the
+ *  exact same indent whose key is `kind`. The value of the first such line
+ *  is returned (alias form, e.g. `"Sql.Connection"`). Used by ref-name
+ *  completion to discover what kind of resource the user is targeting in an
+ *  object-form ref. Walking stops at the first line with a strictly smaller
+ *  indent (that's the parent's structural boundary). */
+export declare function findSiblingKindValue(lines: string[], docStart: number, docEnd: number, cursorLine: number, indent: number): string | undefined;
+/** Looks up the `x-telo-ref` string carried by the schema node at `yamlPath`
+ *  inside `definitionSchema`. Checks both the property node directly and its
+ *  peeled `anyOf` / `oneOf` branches, since some library schemas place the
+ *  annotation at the property level and others inside a branch. Returns
+ *  `undefined` when the path doesn't resolve or no ref constraint is declared. */
+export declare function lookupRefConstraint(definitionSchema: Record<string, any>, yamlPath: string[]): string | undefined;
 export declare function detectContext(text: string, line: number, character: number): CompletionCtx | undefined;
 //# sourceMappingURL=detect-context.d.ts.map

package/dist/completions/detect-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"detect-context.d.ts","sourceRoot":"","sources":["../../src/completions/detect-context.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,GAChB;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,GACtB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAAE,GACpF;IACE,IAAI,EAAE,aAAa,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,sDAAsD;IACtD,MAAM,EAAE,MAAM,CAAC;IACf,mFAAmF;IACnF,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEN,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAgBjG;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAMlG;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAOxF;AAED,4EAA4E;AAC5E,wBAAgB,aAAa,CAC3B,KAAK,EAAE,MAAM,EAAE,EACf,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GACnB,MAAM,EAAE,CA2BV;AAED,8EAA8E;AAC9E,wBAAgB,mBAAmB,CACjC,KAAK,EAAE,MAAM,EAAE,EACf,KAAK,EAAE,MAAM,EACb,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,GACb,GAAG,CAAC,MAAM,CAAC,CAab;AAED,2FAA2F;AAC3F,wBAAgB,cAAc,CAC5B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC3B,IAAI,EAAE,MAAM,EAAE,GACb,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAgBjC;AAED;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAYrG;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,GAChB,aAAa,GAAG,SAAS,CAqD3B"}
+{"version":3,"file":"detect-context.d.ts","sourceRoot":"","sources":["../../src/completions/detect-context.ts"],"names":[],"mappings":"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"}