@akanjs/language 3.1.2-rc.3 → 3.1.2-rc.4

package/README.ko.md

@@ -40,3 +40,44 @@ index.renameAt(fileName, offset, "inFeed", readText);
 키에서 만들어진 이름 전부와 모듈 dictionary의 키와 함께 바꾸는 편집을 돌려줍니다.
 
 ES module과 CommonJS로 배포하며, 런타임 의존성은 없습니다.
+
+## 언어 서버
+
+`akan-language-server --stdio`는 같은 색인을 LSP로 냅니다. Akan 확장이 있는 VS Code와 Cursor 말고 다른 에디터를
+위한 것입니다. TypeScript 서버 옆에 띄우면 에디터가 두 서버의 답을 합쳐 줍니다. 정의, hover, 참조를 답합니다.
+에디터의 루트나 그 위에서 가장 가까운, `apps/*`나 `libs/*`에 `akan.config.ts`가 있는 폴더를 색인합니다. 에디터가
+watched-file 등록을 지원하면 디스크에서 바뀐 파일도 다시 읽습니다.
+
+설치 절처럼 워크스페이스에 추가해서 bin이 `node_modules/.bin`에 들어가게 하세요. 그러면 `bunx --no-install`이 그
+사본을 실행하고, 레지스트리에서 받아 오지 않습니다.
+
+Neovim 0.11 이상:
+
+```lua
+vim.lsp.config("akan", {
+  cmd = function(dispatchers, config)
+    return vim.lsp.rpc.start({ "bunx", "--no-install", "akan-language-server", "--stdio" }, dispatchers, {
+      cwd = config.root_dir,
+    })
+  end,
+  filetypes = { "typescript", "typescriptreact" },
+  root_markers = { "bun.lock" },
+})
+vim.lsp.enable("akan")
+```
+
+Helix의 `languages.toml`:
+
+```toml
+[language-server.akan]
+command = "bunx"
+args = ["--no-install", "akan-language-server", "--stdio"]
+
+[[language]]
+name = "typescript"
+language-servers = ["typescript-language-server", "akan"]
+
+[[language]]
+name = "tsx"
+language-servers = ["typescript-language-server", "akan"]
+```

package/README.md

@@ -40,3 +40,45 @@ name resolves within its own app and every lib, never another app. `renameAt` re
 query key together with every name derived from it and its key in the module dictionary.
 
 The package ships as an ES module and as CommonJS, with no runtime dependency.
+
+## Language server
+
+`akan-language-server --stdio` serves the same index over LSP. It is for editors other than VS Code and Cursor,
+which have the Akan extension. Run it next to TypeScript's server, and the editor merges the two servers' answers. It
+answers definition, hover and references. It indexes the nearest folder at or above the editor's root whose `apps/*`
+or `libs/*` holds an `akan.config.ts`. It rereads files changed on disk when the editor supports watched-file
+registration.
+
+Add it to the workspace, as in Install, so the bin lands in `node_modules/.bin`. `bunx --no-install` then runs that
+copy and never fetches one from the registry.
+
+Neovim 0.11 or later:
+
+```lua
+vim.lsp.config("akan", {
+  cmd = function(dispatchers, config)
+    return vim.lsp.rpc.start({ "bunx", "--no-install", "akan-language-server", "--stdio" }, dispatchers, {
+      cwd = config.root_dir,
+    })
+  end,
+  filetypes = { "typescript", "typescriptreact" },
+  root_markers = { "bun.lock" },
+})
+vim.lsp.enable("akan")
+```
+
+Helix, in `languages.toml`:
+
+```toml
+[language-server.akan]
+command = "bunx"
+args = ["--no-install", "akan-language-server", "--stdio"]
+
+[[language]]
+name = "typescript"
+language-servers = ["typescript-language-server", "akan"]
+
+[[language]]
+name = "tsx"
+language-servers = ["typescript-language-server", "akan"]
+```

package/akanGraph.d.ts

@@ -12,6 +12,7 @@ export interface AkanGraphSource {
     resolve: (fileName: string, identifier: TS.Identifier) => AkanTarget[];
     relative: (fileName: string) => string;
     ownerOf: (fileName: string) => string | null;
+    digests?: boolean;
 }
 export declare class GraphBuilder {
     #private;

package/akanGraphDiff.d.ts

@@ -0,0 +1,10 @@
+import type { AkanGraph, AkanGraphChange } from "akanjs/common/akanGraph.ts";
+export interface AkanGraphChanges extends AkanGraph {
+    summary: {
+        [change in AkanGraphChange]: number;
+    };
+}
+export declare class AkanGraphDiff {
+    #private;
+    static between(base: AkanGraph, head: AkanGraph): AkanGraphChanges;
+}

package/akanIndex.d.ts

@@ -33,7 +33,9 @@ export declare class AkanIndex {
     sourceKeysOf(givenName: string): AkanSourceKey[];
     sourceKeyAt(givenName: string, offset: number): AkanSourceKey | null;
     referencesAt(givenName: string, offset: number, readText: (fileName: string) => string | undefined): AkanSpan[];
-    graph(readText: (fileName: string) => string | undefined): AkanGraph;
+    graph(readText: (fileName: string) => string | undefined, { digests }?: {
+        digests?: boolean | undefined;
+    }): AkanGraph;
     renameTargetAt(givenName: string, offset: number): {
         family: AkanFamily;
         sourceKey: string;

package/index.cjs

@@ -39,6 +39,7 @@ var __export = (target, all) => {
 // pkgs/@akanjs/language/index.ts
 var exports_language = {};
 __export(exports_language, {
+  AkanGraphDiff: () => AkanGraphDiff,
   AkanIndex: () => AkanIndex,
   createAst: () => createAst,
   createFactReader: () => createFactReader,
@@ -46,6 +47,79 @@ __export(exports_language, {
 });
 module.exports = __toCommonJS(exports_language);
 
+// pkgs/@akanjs/language/akanGraphDiff.ts
+var edgeKeyOf = ({ from, to, kind, label }) => `${from}
+${to}
+${kind}
+${label ?? ""}`;
+var shapeOf = ({ type, array, optional, declaredIn }) => `${type ?? ""}${array ? "[]" : ""}${optional ? "?" : ""} ${declaredIn}`;
+var isEdited = (before, after) => before.digest !== undefined && after.digest !== undefined && before.digest !== after.digest;
+var byId = (a, b) => a.id < b.id ? -1 : a.id > b.id ? 1 : 0;
+
+class AkanGraphDiff {
+  static between(base, head) {
+    const baseNodes = new Map(base.nodes.map((node) => [node.id, node]));
+    const headNodes = new Map(head.nodes.map((node) => [node.id, node]));
+    const marked = new Map;
+    for (const node of head.nodes) {
+      const before = baseNodes.get(node.id);
+      const next = before ? AkanGraphDiff.#compare(before, node) : AkanGraphDiff.#mark(node, "added");
+      if (next)
+        marked.set(node.id, next);
+    }
+    for (const node of base.nodes)
+      if (!headNodes.has(node.id))
+        marked.set(node.id, AkanGraphDiff.#mark(node, "removed"));
+    const baseKeys = new Set(base.edges.map(edgeKeyOf));
+    const headKeys = new Set(head.edges.map(edgeKeyOf));
+    const edges = [
+      ...head.edges.flatMap((edge) => !baseKeys.has(edgeKeyOf(edge)) ? [{ ...edge, change: "added" }] : marked.has(edge.from) || marked.has(edge.to) ? [edge] : []),
+      ...base.edges.filter((edge) => !headKeys.has(edgeKeyOf(edge))).map((edge) => ({ ...edge, change: "removed" }))
+    ];
+    const context = edges.flatMap((edge) => [edge.from, edge.to]).filter((id) => !marked.has(id)).flatMap((id) => {
+      const node = headNodes.get(id) ?? baseNodes.get(id);
+      return node ? [node] : [];
+    });
+    const nodes = [...new Map([...marked.values(), ...context].map((node) => [node.id, node])).values()].map(AkanGraphDiff.#withoutDigest).sort(byId);
+    const summary = { added: 0, removed: 0, changed: 0 };
+    for (const node of marked.values())
+      if (node.change)
+        summary[node.change] += 1;
+    return { version: 1, nodes, edges, summary };
+  }
+  static #mark(node, change) {
+    return node.fields ? { ...node, change, fields: node.fields.map((field) => ({ ...field, change })) } : { ...node, change };
+  }
+  static #compare(before, after) {
+    const fields = AkanGraphDiff.#fieldsBetween(before.fields, after.fields);
+    const isChanged = isEdited(before, after) || before.label !== after.label || before.detail.join(`
+`) !== after.detail.join(`
+`) || (before.values ?? []).join(`
+`) !== (after.values ?? []).join(`
+`) || !!fields?.some((field) => field.change);
+    if (!isChanged)
+      return null;
+    return fields ? { ...after, change: "changed", fields } : { ...after, change: "changed" };
+  }
+  static #fieldsBetween(before, after) {
+    if (!before && !after)
+      return;
+    const previous = new Map((before ?? []).map((field) => [field.name, field]));
+    const names = new Set((after ?? []).map((field) => field.name));
+    return [
+      ...(after ?? []).map((field) => {
+        const old = previous.get(field.name);
+        if (!old)
+          return { ...field, change: "added" };
+        return shapeOf(old) === shapeOf(field) && !isEdited(old, field) ? field : { ...field, change: "changed" };
+      }),
+      ...(before ?? []).filter((field) => !names.has(field.name)).map((field) => ({ ...field, change: "removed" }))
+    ];
+  }
+  static #withoutDigest({ digest: _digest, ...node }) {
+    return node.fields ? { ...node, fields: node.fields.map(({ digest: _field, ...field }) => field) } : node;
+  }
+}
 // pkgs/@akanjs/language/akanGraph.ts
 var capitalize = (text) => text.charAt(0).toUpperCase() + text.slice(1);
 var lowerFirst = (text) => text.charAt(0).toLowerCase() + text.slice(1);
@@ -112,7 +186,7 @@ class GraphBuilder {
         const refName = lowerFirst(filter.name.slice(0, -"Filter".length));
         this.#addNode(this.#key("query", owner, refName), "query", owner, refName, "", filter.span);
         for (const query of filter.queries)
-          this.#addNode(this.#key("query", owner, refName, query.name), "query", owner, refName, query.name, query.span);
+          this.#digest(this.#addNode(this.#key("query", owner, refName, query.name), "query", owner, refName, query.name, query.span), this.#source.readText(file.fileName), query.extent);
       }
       for (const slice of file.slices) {
         const refName = slice.model;
@@ -189,6 +263,7 @@ class GraphBuilder {
   #addMember(kind, owner, refName, member, label, fileName, detail = []) {
     const id = this.#key(kind, owner, refName, member.name);
     const node = this.#addNode(id, kind, owner, refName, member.name, member.span, detail, label);
+    this.#digest(node, this.#source.readText(fileName), member.extent);
     this.#contexts.set(fileName, [
       ...this.#contexts.get(fileName) ?? [],
       { id, kind, owner, module: refName, extent: member.extent }
@@ -197,6 +272,22 @@ class GraphBuilder {
     this.#members.set(byName, [...this.#members.get(byName) ?? [], node]);
     return node;
   }
+  #hashOf(text, { start, end }) {
+    if (!this.#source.digests || text === undefined)
+      return null;
+    let hash = 2166136261;
+    for (let idx = start;idx < end; idx++) {
+      const code = text.charCodeAt(idx);
+      if (code !== 13)
+        hash = Math.imul(hash ^ code, 16777619);
+    }
+    return (hash >>> 0).toString(16).padStart(8, "0");
+  }
+  #digest(node, text, extent) {
+    const digest = node.digest ? null : this.#hashOf(text, extent);
+    if (digest)
+      node.digest = digest;
+  }
   #addEdge(from, to, kind, label, at) {
     if (from === to)
       return;
@@ -220,7 +311,8 @@ ${label ?? ""}`;
     this.#addEdge(node.id, id, "guard", role, node.at);
   }
   #moduleDirOf(fileName) {
-    return this.#source.relative(fileName).match(moduleDirPattern)?.[1] ?? null;
+    const dir = this.#source.relative(fileName).match(moduleDirPattern)?.[1] ?? null;
+    return dir?.startsWith("_") && !dir.startsWith("__") ? dir.slice(1) : dir;
   }
   #fieldsOf(constant, scope) {
     const fields = new Map;
@@ -234,17 +326,21 @@ ${label ?? ""}`;
         if (parentClass)
           visit(parentClass);
       }
-      for (const field of current.fields)
-        if (!fields.has(field.name))
-          fields.set(field.name, {
-            name: field.name,
-            type: field.type,
-            array: field.array,
-            optional: field.optional,
-            ref: null,
-            declaredIn: current.name,
-            at: this.#location(field.span)
-          });
+      for (const field of current.fields) {
+        if (fields.has(field.name))
+          continue;
+        const digest = this.#hashOf(this.#source.readText(field.span.fileName), field.extent);
+        fields.set(field.name, {
+          name: field.name,
+          type: field.type,
+          array: field.array,
+          optional: field.optional,
+          ref: null,
+          declaredIn: current.name,
+          at: this.#location(field.span),
+          ...digest ? { digest } : {}
+        });
+      }
     };
     visit(constant);
     return [...fields.values()];
@@ -307,8 +403,10 @@ st
     const targets = resolved.length ? resolved : this.#plainTargetsOf(chain, identifier.text, context, owner);
     if (!targets.length)
       return;
-    if (context.pending && !this.#nodes.has(context.id))
+    if (context.pending && !this.#nodes.has(context.id)) {
       this.#nodes.set(context.id, context.pending);
+      this.#digest(context.pending, source.text, context.extent);
+    }
     const own = targets.filter((id) => this.#nodes.get(id)?.owner === owner);
     const kind = context.kind === "component" ? "uses" : chain?.[0] === "fetch" ? "fetches" : "calls";
     const position = source.getLineAndCharacterOfPosition(identifier.getStart(source));
@@ -503,7 +601,7 @@ var createFactReader = (ts, ast) => {
   const objectKeys = (source, object) => (object?.properties ?? []).flatMap((property) => {
     const name = ast.propertyName(property);
     const node = keyName(property);
-    return name && node ? [{ name, span: spanOf(source, node) }] : [];
+    return name && node ? [{ name, span: spanOf(source, node), extent: extentOf(source, property) }] : [];
   });
   const sliceKeysOf = (source, builder) => (returnedObject(builder)?.properties ?? []).flatMap((property) => {
     if (!ts.isPropertyAssignment(property))
@@ -578,7 +676,13 @@ var createFactReader = (ts, ast) => {
       return [];
     const { root, methods } = ts.isPropertyAssignment(property) ? chainOf(property.initializer) : { root: null, methods: [] };
     return [
-      { name, span: spanOf(source, node), ...typeOf(root?.arguments[0]), optional: methods.includes("optional") }
+      {
+        name,
+        span: spanOf(source, node),
+        extent: extentOf(source, property),
+        ...typeOf(root?.arguments[0]),
+        optional: methods.includes("optional")
+      }
     ];
   });
   const constantOf = (source, name, call) => {
@@ -1196,8 +1300,9 @@ ${[...new Set(text.match(wordPattern))].join(`
   referencesAt(givenName, offset, readText) {
     return this.#usesOf(this.#sourceEntriesAt(pathOf(givenName), offset), readText).map((use) => use.span);
   }
-  graph(readText) {
+  graph(readText, { digests = false } = {}) {
     return new GraphBuilder({
+      digests,
       ts: this.#ts,
       facts: [...this.#facts].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([, facts]) => facts),
       files: [...this.#fileWords].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0),

package/index.d.ts

@@ -1,4 +1,5 @@
-export type { AkanGraph, AkanGraphEdge, AkanGraphEdgeKind, AkanGraphField, AkanGraphLocation, AkanGraphNode, AkanGraphNodeKind, } from "akanjs/common/akanGraph.ts";
+export type { AkanChangedFile, AkanChangeMap, AkanGraph, AkanGraphChange, AkanGraphEdge, AkanGraphEdgeKind, AkanGraphField, AkanGraphLocation, AkanGraphNode, AkanGraphNodeKind, } from "akanjs/common/akanGraph.ts";
+export { type AkanGraphChanges, AkanGraphDiff } from "./akanGraphDiff";
 export { type AkanHover, AkanIndex, type AkanIndexOptions, type AkanRenameEdit, type AkanSourceKey } from "./akanIndex";
 export { type AkanAst, createAst, type Ts } from "./ast";
 export { type AkanFactReader, type AkanSpan, type ConstantClassFact, createFactReader, type EndpointClassFact, type EndpointKeyFact, type EnumClassFact, type Extent, type FieldFact, type FileFacts, type FilterClassFact, type MemberFact, type ModuleClassFact, type NamedFact, ownerOf, type ServiceClassFact, type SliceClassFact, type SliceKeyFact, type StoreClassFact, } from "./moduleFacts";

package/index.js

@@ -1,3 +1,76 @@
+// pkgs/@akanjs/language/akanGraphDiff.ts
+var edgeKeyOf = ({ from, to, kind, label }) => `${from}
+${to}
+${kind}
+${label ?? ""}`;
+var shapeOf = ({ type, array, optional, declaredIn }) => `${type ?? ""}${array ? "[]" : ""}${optional ? "?" : ""} ${declaredIn}`;
+var isEdited = (before, after) => before.digest !== undefined && after.digest !== undefined && before.digest !== after.digest;
+var byId = (a, b) => a.id < b.id ? -1 : a.id > b.id ? 1 : 0;
+
+class AkanGraphDiff {
+  static between(base, head) {
+    const baseNodes = new Map(base.nodes.map((node) => [node.id, node]));
+    const headNodes = new Map(head.nodes.map((node) => [node.id, node]));
+    const marked = new Map;
+    for (const node of head.nodes) {
+      const before = baseNodes.get(node.id);
+      const next = before ? AkanGraphDiff.#compare(before, node) : AkanGraphDiff.#mark(node, "added");
+      if (next)
+        marked.set(node.id, next);
+    }
+    for (const node of base.nodes)
+      if (!headNodes.has(node.id))
+        marked.set(node.id, AkanGraphDiff.#mark(node, "removed"));
+    const baseKeys = new Set(base.edges.map(edgeKeyOf));
+    const headKeys = new Set(head.edges.map(edgeKeyOf));
+    const edges = [
+      ...head.edges.flatMap((edge) => !baseKeys.has(edgeKeyOf(edge)) ? [{ ...edge, change: "added" }] : marked.has(edge.from) || marked.has(edge.to) ? [edge] : []),
+      ...base.edges.filter((edge) => !headKeys.has(edgeKeyOf(edge))).map((edge) => ({ ...edge, change: "removed" }))
+    ];
+    const context = edges.flatMap((edge) => [edge.from, edge.to]).filter((id) => !marked.has(id)).flatMap((id) => {
+      const node = headNodes.get(id) ?? baseNodes.get(id);
+      return node ? [node] : [];
+    });
+    const nodes = [...new Map([...marked.values(), ...context].map((node) => [node.id, node])).values()].map(AkanGraphDiff.#withoutDigest).sort(byId);
+    const summary = { added: 0, removed: 0, changed: 0 };
+    for (const node of marked.values())
+      if (node.change)
+        summary[node.change] += 1;
+    return { version: 1, nodes, edges, summary };
+  }
+  static #mark(node, change) {
+    return node.fields ? { ...node, change, fields: node.fields.map((field) => ({ ...field, change })) } : { ...node, change };
+  }
+  static #compare(before, after) {
+    const fields = AkanGraphDiff.#fieldsBetween(before.fields, after.fields);
+    const isChanged = isEdited(before, after) || before.label !== after.label || before.detail.join(`
+`) !== after.detail.join(`
+`) || (before.values ?? []).join(`
+`) !== (after.values ?? []).join(`
+`) || !!fields?.some((field) => field.change);
+    if (!isChanged)
+      return null;
+    return fields ? { ...after, change: "changed", fields } : { ...after, change: "changed" };
+  }
+  static #fieldsBetween(before, after) {
+    if (!before && !after)
+      return;
+    const previous = new Map((before ?? []).map((field) => [field.name, field]));
+    const names = new Set((after ?? []).map((field) => field.name));
+    return [
+      ...(after ?? []).map((field) => {
+        const old = previous.get(field.name);
+        if (!old)
+          return { ...field, change: "added" };
+        return shapeOf(old) === shapeOf(field) && !isEdited(old, field) ? field : { ...field, change: "changed" };
+      }),
+      ...(before ?? []).filter((field) => !names.has(field.name)).map((field) => ({ ...field, change: "removed" }))
+    ];
+  }
+  static #withoutDigest({ digest: _digest, ...node }) {
+    return node.fields ? { ...node, fields: node.fields.map(({ digest: _field, ...field }) => field) } : node;
+  }
+}
 // pkgs/@akanjs/language/akanGraph.ts
 var capitalize = (text) => text.charAt(0).toUpperCase() + text.slice(1);
 var lowerFirst = (text) => text.charAt(0).toLowerCase() + text.slice(1);
@@ -64,7 +137,7 @@ class GraphBuilder {
         const refName = lowerFirst(filter.name.slice(0, -"Filter".length));
         this.#addNode(this.#key("query", owner, refName), "query", owner, refName, "", filter.span);
         for (const query of filter.queries)
-          this.#addNode(this.#key("query", owner, refName, query.name), "query", owner, refName, query.name, query.span);
+          this.#digest(this.#addNode(this.#key("query", owner, refName, query.name), "query", owner, refName, query.name, query.span), this.#source.readText(file.fileName), query.extent);
       }
       for (const slice of file.slices) {
         const refName = slice.model;
@@ -141,6 +214,7 @@ class GraphBuilder {
   #addMember(kind, owner, refName, member, label, fileName, detail = []) {
     const id = this.#key(kind, owner, refName, member.name);
     const node = this.#addNode(id, kind, owner, refName, member.name, member.span, detail, label);
+    this.#digest(node, this.#source.readText(fileName), member.extent);
     this.#contexts.set(fileName, [
       ...this.#contexts.get(fileName) ?? [],
       { id, kind, owner, module: refName, extent: member.extent }
@@ -149,6 +223,22 @@ class GraphBuilder {
     this.#members.set(byName, [...this.#members.get(byName) ?? [], node]);
     return node;
   }
+  #hashOf(text, { start, end }) {
+    if (!this.#source.digests || text === undefined)
+      return null;
+    let hash = 2166136261;
+    for (let idx = start;idx < end; idx++) {
+      const code = text.charCodeAt(idx);
+      if (code !== 13)
+        hash = Math.imul(hash ^ code, 16777619);
+    }
+    return (hash >>> 0).toString(16).padStart(8, "0");
+  }
+  #digest(node, text, extent) {
+    const digest = node.digest ? null : this.#hashOf(text, extent);
+    if (digest)
+      node.digest = digest;
+  }
   #addEdge(from, to, kind, label, at) {
     if (from === to)
       return;
@@ -172,7 +262,8 @@ ${label ?? ""}`;
     this.#addEdge(node.id, id, "guard", role, node.at);
   }
   #moduleDirOf(fileName) {
-    return this.#source.relative(fileName).match(moduleDirPattern)?.[1] ?? null;
+    const dir = this.#source.relative(fileName).match(moduleDirPattern)?.[1] ?? null;
+    return dir?.startsWith("_") && !dir.startsWith("__") ? dir.slice(1) : dir;
   }
   #fieldsOf(constant, scope) {
     const fields = new Map;
@@ -186,17 +277,21 @@ ${label ?? ""}`;
         if (parentClass)
           visit(parentClass);
       }
-      for (const field of current.fields)
-        if (!fields.has(field.name))
-          fields.set(field.name, {
-            name: field.name,
-            type: field.type,
-            array: field.array,
-            optional: field.optional,
-            ref: null,
-            declaredIn: current.name,
-            at: this.#location(field.span)
-          });
+      for (const field of current.fields) {
+        if (fields.has(field.name))
+          continue;
+        const digest = this.#hashOf(this.#source.readText(field.span.fileName), field.extent);
+        fields.set(field.name, {
+          name: field.name,
+          type: field.type,
+          array: field.array,
+          optional: field.optional,
+          ref: null,
+          declaredIn: current.name,
+          at: this.#location(field.span),
+          ...digest ? { digest } : {}
+        });
+      }
     };
     visit(constant);
     return [...fields.values()];
@@ -259,8 +354,10 @@ st
     const targets = resolved.length ? resolved : this.#plainTargetsOf(chain, identifier.text, context, owner);
     if (!targets.length)
       return;
-    if (context.pending && !this.#nodes.has(context.id))
+    if (context.pending && !this.#nodes.has(context.id)) {
       this.#nodes.set(context.id, context.pending);
+      this.#digest(context.pending, source.text, context.extent);
+    }
     const own = targets.filter((id) => this.#nodes.get(id)?.owner === owner);
     const kind = context.kind === "component" ? "uses" : chain?.[0] === "fetch" ? "fetches" : "calls";
     const position = source.getLineAndCharacterOfPosition(identifier.getStart(source));
@@ -455,7 +552,7 @@ var createFactReader = (ts, ast) => {
   const objectKeys = (source, object) => (object?.properties ?? []).flatMap((property) => {
     const name = ast.propertyName(property);
     const node = keyName(property);
-    return name && node ? [{ name, span: spanOf(source, node) }] : [];
+    return name && node ? [{ name, span: spanOf(source, node), extent: extentOf(source, property) }] : [];
   });
   const sliceKeysOf = (source, builder) => (returnedObject(builder)?.properties ?? []).flatMap((property) => {
     if (!ts.isPropertyAssignment(property))
@@ -530,7 +627,13 @@ var createFactReader = (ts, ast) => {
       return [];
     const { root, methods } = ts.isPropertyAssignment(property) ? chainOf(property.initializer) : { root: null, methods: [] };
     return [
-      { name, span: spanOf(source, node), ...typeOf(root?.arguments[0]), optional: methods.includes("optional") }
+      {
+        name,
+        span: spanOf(source, node),
+        extent: extentOf(source, property),
+        ...typeOf(root?.arguments[0]),
+        optional: methods.includes("optional")
+      }
     ];
   });
   const constantOf = (source, name, call) => {
@@ -1148,8 +1251,9 @@ ${[...new Set(text.match(wordPattern))].join(`
   referencesAt(givenName, offset, readText) {
     return this.#usesOf(this.#sourceEntriesAt(pathOf(givenName), offset), readText).map((use) => use.span);
   }
-  graph(readText) {
+  graph(readText, { digests = false } = {}) {
     return new GraphBuilder({
+      digests,
       ts: this.#ts,
       facts: [...this.#facts].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0).map(([, facts]) => facts),
       files: [...this.#fileWords].sort(([a], [b]) => a < b ? -1 : a > b ? 1 : 0),
@@ -1410,6 +1514,7 @@ ${dictionary.className}
   }
 }
 export {
+  AkanGraphDiff,
   AkanIndex,
   createAst,
   createFactReader,

package/moduleFacts.d.ts

@@ -31,6 +31,7 @@ export interface EndpointKeyFact extends MemberFact {
     argCount: number;
 }
 export interface FieldFact extends NamedFact {
+    extent: Extent;
     type: string | null;
     array: boolean;
     optional: boolean;
@@ -43,7 +44,7 @@ export interface EnumClassFact extends NamedFact {
     values: string[];
 }
 export interface FilterClassFact extends NamedFact {
-    queries: NamedFact[];
+    queries: MemberFact[];
 }
 export interface ModuleClassFact extends NamedFact {
     model: string | null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/language",
-  "version": "3.1.2-rc.3",
+  "version": "3.1.2-rc.4",
   "description": "Editor-independent Akan.js language core: resolves derived names (slices, queries, CRUD, form setters) back to the source key that produced them.",
   "sourceType": "module",
   "type": "module",
@@ -26,6 +26,9 @@
   "module": "./index.js",
   "types": "./index.d.ts",
   "sideEffects": false,
+  "bin": {
+    "akan-language-server": "./server.js"
+  },
   "exports": {
     ".": {
       "types": "./index.d.ts",