fix(typescript): emit code/json not code facts; remove proto dependen…

…cy (#5494)
kythe · Jan 12, 2023 · 2996b79 · 2996b79
1 parent 0a9814e
commit 2996b79
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 39 deletions.
diff --git a/kythe/typescript/BUILD b/kythe/typescript/BUILD
@@ -25,9 +25,7 @@ ts_library(
     tsconfig = ":tsconfig",
     deps = [
         ":kythe",
-        "//kythe/proto:common_ts_proto",
         "@npm//@types/node",
-        "@npm//google-protobuf",
         "@npm//typescript",
     ],
 )

diff --git a/kythe/typescript/indexer.ts b/kythe/typescript/indexer.ts
@@ -20,8 +20,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as ts from 'typescript';
 
-import {MarkedSource} from '../proto/common_pb';
-import {EdgeKind, FactName, JSONEdge, JSONFact, makeOrdinalEdge, NodeKind, OrdinalEdge, Subkind, VName} from './kythe';
+import {EdgeKind, FactName, JSONEdge, JSONFact, JSONMarkedSource, makeOrdinalEdge, MarkedSourceKind, NodeKind, OrdinalEdge, Subkind, VName} from './kythe';
 import * as utf8 from './utf8';
 
 const LANGUAGE = 'typescript';
@@ -729,25 +728,6 @@ function fmtMarkedSource(s: string) {
   return s;
 }
 
-function makeMarkedSource({
-  kind,
-  preText,
-  postText,
-  childList,
-}: {
-  kind?: keyof typeof MarkedSource.Kind,
-  preText?: string,
-  postText?: string,
-  childList?: MarkedSource[]
-}): MarkedSource {
-  const ms = new MarkedSource();
-  if (kind !== undefined) ms.setKind(MarkedSource.Kind[kind]);
-  if (preText !== undefined) ms.setPreText(fmtMarkedSource(preText));
-  if (postText !== undefined) ms.setPostText(fmtMarkedSource(postText));
-  if (childList !== undefined) ms.setChildList(childList);
-  return ms;
-}
-
 function isNonNullableArray<T>(arr: Array<T>): arr is Array<NonNullable<T>> {
   return arr.findIndex(el => el === undefined || el === null) === -1;
 }
@@ -1712,7 +1692,7 @@ class Visitor {
       decl: ts.VariableDeclaration|ts.PropertyAssignment|
       ts.PropertyDeclaration|ts.BindingElement|ts.ShorthandPropertyAssignment,
       declVName: VName) {
-    const codeParts: MarkedSource[] = [];
+    const codeParts: JSONMarkedSource[] = [];
     const initializerList = decl.parent;
     let varDecl;
     const bindingPath: Array<string|number|undefined> = [];
@@ -1749,12 +1729,12 @@ class Visitor {
     }
     const ty = this.typeChecker.getTypeAtLocation(decl);
     const tyStr = this.typeChecker.typeToString(ty, decl);
-    codeParts.push(makeMarkedSource({kind: 'CONTEXT', preText: declKw}));
-    codeParts.push(makeMarkedSource({kind: 'BOX', preText: ' '}));
+    codeParts.push({kind: MarkedSourceKind.CONTEXT, pre_text: fmtMarkedSource(declKw)});
+    codeParts.push({kind: MarkedSourceKind.BOX, pre_text: ' '});
     codeParts.push(
-        makeMarkedSource({kind: 'IDENTIFIER', preText: decl.name.getText()}));
+      {kind: MarkedSourceKind.IDENTIFIER, pre_text: fmtMarkedSource(decl.name.getText())});
     codeParts.push(
-        makeMarkedSource({kind: 'TYPE', preText: ': ', postText: tyStr}));
+      {kind: MarkedSourceKind.TYPE, pre_text: ': ', post_text: fmtMarkedSource(tyStr)});
     if ('initializer' in varDecl && varDecl.initializer) {
       let init: ts.Node = varDecl.initializer;
 
@@ -1765,13 +1745,13 @@ class Visitor {
         init = narrowedInit || init;
       }
 
-      codeParts.push(makeMarkedSource({kind: 'BOX', preText: ' = '}));
+      codeParts.push({kind: MarkedSourceKind.BOX, pre_text: ' = '});
       codeParts.push(
-          makeMarkedSource({kind: 'INITIALIZER', preText: init.getText()}));
+        {kind: MarkedSourceKind.INITIALIZER, pre_text: fmtMarkedSource(init.getText())});
     }
 
-    const markedSource = makeMarkedSource({kind: 'BOX', childList: codeParts});
-    this.emitFact(declVName, FactName.CODE, markedSource.serializeBinary());
+    const markedSource = ({kind: MarkedSourceKind.BOX, child: codeParts});
+    this.emitFact(declVName, FactName.CODE_JSON, JSON.stringify(markedSource));
   }
 
   /**

diff --git a/kythe/typescript/kythe.ts b/kythe/typescript/kythe.ts
@@ -143,7 +143,7 @@ export enum NodeKind {
  */
 export enum FactName {
   BUILD_CONFIG = '/kythe/build/config',
-  CODE = '/kythe/code',
+  CODE_JSON = '/kythe/code/json',
   COMPLETE = '/kythe/complete',
   CONTEXT_URL = '/kythe/context/url',
   DETAILS = '/kythe/details',
@@ -232,3 +232,44 @@ export interface JSONEdge {
   edge_kind: EdgeKind|OrdinalEdge;
   fact_name: '/';
 }
+
+/*
+ * Kythe marked source Linkd expressed in the schema JSON-style encoding.
+ */
+export interface JSONLink {
+  definition: string[];
+}
+
+/*
+ * Enum corresponding to Kythe MarkedSource.Kind proto enum.
+ */
+export enum MarkedSourceKind {
+  BOX,
+  TYPE,
+  PARAMETER,
+  IDENTIFIER,
+  CONTEXT,
+  INITIALIZER,
+  PARAMETER_LOOKUP_BY_PARAM,
+  LOOKUP_BY_PARAM,
+  PARAMETER_LOOKUP_BY_PARAM_WITH_DEFAULTS,
+  LOOKUP_BY_TYPED,
+  PARAMETER_LOOKUP_BY_TPARAM,
+  LOOKUP_BY_TPARAM,
+}
+
+
+/*
+ * Kythe MarkedSource expressed in the schema JSON-style encoding.
+ */
+export interface JSONMarkedSource {
+  kind: MarkedSourceKind;
+  pre_text?: string;
+  child?: JSONMarkedSource[];
+  post_child_text?: string;
+  post_text?: string;
+  lookup_index?: number;
+  default_children_count?: number;
+  add_final_list_token?: boolean;
+  link?: JSONLink[];
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,7 +13,6 @@
     "jasmine-core": "^3.7.1"
   },
   "dependencies": {
-    "google-protobuf": "^3.15.6",
     "source-map-support": "^0.5.19",
     "typescript": "~3.8"
   },