refactor: core and table

Author: zjffun

packages/vscode-js-profile-core/src/cpu/layout.css renamed to packages/vscode-js-profile-core/src/common/layout.css

@@ -0,0 +1,44 @@
+/*---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------*/
+
+import { Protocol as Cdp } from 'devtools-protocol';
+import { ISourceLocation } from '../location-mapping';
+
+/**
+ * Category of call frames. Grouped into system, modules, and user code.
+ */
+export const enum Category {
+  System,
+  User,
+  Module,
+  Deemphasized,
+}
+
+export interface INode {
+  id: number;
+  category: Category;
+  callFrame: Cdp.Runtime.CallFrame;
+}
+
+export interface IGraphNode extends INode {
+  children: { [id: number]: IGraphNode };
+  childrenSize: number;
+  parent?: IGraphNode;
+}
+
+/**
+ * Categorizes the given call frame.
+ */
+export const categorize = (callFrame: Cdp.Runtime.CallFrame, src: ISourceLocation | undefined) => {
+  callFrame.functionName = callFrame.functionName || '(anonymous)';
+  if (callFrame.lineNumber < 0) {
+    return Category.System;
+  }
+
+  if (callFrame.url.includes('node_modules') || !src) {
+    return Category.Module;
+  }
+
+  return Category.User;
+};

packages/vscode-js-profile-core/src/common/model.ts

@@ -0,0 +1,28 @@
+/*---------------------------------------------------------
+ * Copyright (C) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------*/
+
+import { Protocol as Cdp } from 'devtools-protocol';
+import { ISourceLocation } from '../location-mapping';
+
+/**
+ * Request from the webview to open a document
+ */
+export interface IOpenDocumentMessage {
+  type: 'openDocument';
+  location?: ISourceLocation;
+  callFrame?: Cdp.Runtime.CallFrame;
+  toSide: boolean;
+}
+
+/**
+ * Reopens the current document with the given editor, optionally only if
+ * the given extension is installed.
+ */
+export interface IReopenWithEditor {
+  type: 'reopenWith';
+  viewType: string;
+  requireExtension?: string;
+}
+
+export type Message = IOpenDocumentMessage | IReopenWithEditor;

packages/vscode-js-profile-core/src/common/types.ts

@@ -2,7 +2,8 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 
-import { ILocation, IProfileModel, IComputedNode, IGraphNode, Category } from './model';
+import { Category } from '../common/model';
+import { IComputedNode, IGraphNode, ILocation, IProfileModel } from './model';
 
 export class BottomUpNode implements IGraphNode {
   public static root() {

packages/vscode-js-profile-core/src/cpu/bottomUpGraph.ts

@@ -4,16 +4,18 @@
 
 import * as vscode from 'vscode';
 import { bundlePage } from '../bundlePage';
+import { Message } from '../common/types';
 import { openLocation } from '../open-location';
 import { ProfileAnnotations } from '../profileAnnotations';
 import { ProfileCodeLensProvider } from '../profileCodeLensProvider';
 import { ReadonlyCustomDocument } from '../readonly-custom-document';
 import { reopenWithEditor } from '../reopenWithEditor';
 import { buildModel, IProfileModel } from './model';
-import { ICpuProfileRaw, Message } from './types';
+import { ICpuProfileRaw } from './types';
 
 export class CpuProfileEditorProvider
-  implements vscode.CustomEditorProvider<ReadonlyCustomDocument<IProfileModel>> {
+  implements vscode.CustomEditorProvider<ReadonlyCustomDocument<IProfileModel>>
+{
   public readonly onDidChangeCustomDocument = new vscode.EventEmitter<never>().event;
 
   constructor(

packages/vscode-js-profile-core/src/cpu/editorProvider.ts

@@ -4,8 +4,8 @@
 import { ComponentType, Fragment, FunctionComponent, h } from 'preact';
 import { useMemo, useState } from 'preact/hooks';
 import { richFilter, RichFilterComponent } from '../client/rich-filter';
+import styles from '../common/layout.css';
 import { IDataSource, IQueryResults } from '../ql';
-import styles from './layout.css';
 
 export interface IBodyProps<T> {
   data: IQueryResults<T>;

packages/vscode-js-profile-core/src/cpu/layout.tsx

@@ -3,19 +3,10 @@
  *--------------------------------------------------------*/
 
 import { Protocol as Cdp } from 'devtools-protocol';
-import { ICpuProfileRaw, IAnnotationLocation } from './types';
+import { categorize, INode } from '../common/model';
+import { addRelativeDiskPath, ISourceLocation } from '../location-mapping';
 import { maybeFileUrlToPath } from '../path';
-import { ISourceLocation, addRelativeDiskPath } from '../location-mapping';
-
-/**
- * Category of call frames. Grouped into system, modules, and user code.
- */
-export const enum Category {
-  System,
-  User,
-  Module,
-  Deemphasized,
-}
+import { IAnnotationLocation, ICpuProfileRaw } from './types';
 
 /**
  * One measured node in the call stack. Contains the time it spent in itself,
@@ -34,13 +25,10 @@ export interface IComputedNode {
 /**
  * One location in the source. Multiple nodes can reference a single location.
  */
-export interface ILocation {
-  id: number;
+export interface ILocation extends INode {
   selfTime: number;
   aggregateTime: number;
   ticks: number;
-  category: Category;
-  callFrame: Cdp.Runtime.CallFrame;
   src?: ISourceLocation;
 }
 
@@ -102,22 +90,6 @@ const getBestLocation = (
   return candidates[0];
 };
 
-/**
- * Categorizes the given call frame.
- */
-const categorize = (callFrame: Cdp.Runtime.CallFrame, src: ISourceLocation | undefined) => {
-  callFrame.functionName = callFrame.functionName || '(anonymous)';
-  if (callFrame.lineNumber < 0) {
-    return Category.System;
-  }
-
-  if (callFrame.url.includes('node_modules') || !src) {
-    return Category.Module;
-  }
-
-  return Category.User;
-};
-
 /**
  * Ensures that all profile nodes have a location ID, setting them if they
  * aren't provided by default.

packages/vscode-js-profile-core/src/cpu/model.ts

@@ -49,25 +49,3 @@ export interface ICpuProfileRaw extends Cdp.Profiler.Profile {
   $vscode?: IJsDebugAnnotations;
   nodes: IProfileNode[];
 }
-
-/**
- * Request from the webview to open a document
- */
-export interface IOpenDocumentMessage {
-  type: 'openDocument';
-  location?: ISourceLocation;
-  callFrame?: Cdp.Runtime.CallFrame;
-  toSide: boolean;
-}
-
-/**
- * Reopens the current document with the given editor, optionally only if
- * the given extension is installed.
- */
-export interface IReopenWithEditor {
-  type: 'reopenWith';
-  viewType: string;
-  requireExtension?: string;
-}
-
-export type Message = IOpenDocumentMessage | IReopenWithEditor;

packages/vscode-js-profile-core/src/cpu/types.ts

@@ -5,7 +5,7 @@
 import { ITreeNode } from './model';
 
 /**
- * Gets the human-readable label for the given location.
+ * Gets the human-readable label for the given node.
  */
 export const getNodeText = (node: ITreeNode) => {
   if (!node.callFrame.url) {

packages/vscode-js-profile-core/src/heap/display.ts

@@ -4,12 +4,13 @@
 
 import * as vscode from 'vscode';
 import { bundlePage } from '../bundlePage';
-import { ProfileAnnotations } from '../profileAnnotations';
+import { Message } from '../common/types';
+import { openLocation } from '../open-location';
 import { ProfileCodeLensProvider } from '../profileCodeLensProvider';
 import { ReadonlyCustomDocument } from '../readonly-custom-document';
 import { reopenWithEditor } from '../reopenWithEditor';
 import { buildModel, IProfileModel } from './model';
-import { IHeapProfileRaw, Message } from './types';
+import { IHeapProfileRaw } from './types';
 
 export class HeapProfileEditorProvider
   implements vscode.CustomEditorProvider<ReadonlyCustomDocument<IProfileModel>>
@@ -30,7 +31,8 @@ export class HeapProfileEditorProvider
     const raw: IHeapProfileRaw = JSON.parse(new TextDecoder().decode(content));
     const document = new ReadonlyCustomDocument(uri, buildModel(raw));
 
-    const annotations = new ProfileAnnotations();
+    // TODO: annotations
+    // const annotations = new ProfileAnnotations();
     // const rootPath = document.userData.rootPath;
     // for (const location of document.userData.locations) {
     //   annotations.add(rootPath, location);
@@ -50,12 +52,12 @@ export class HeapProfileEditorProvider
     webviewPanel.webview.onDidReceiveMessage((message: Message) => {
       switch (message.type) {
         case 'openDocument':
-          // openLocation({
-          //   rootPath: document.userData?.rootPath,
-          //   viewColumn: message.toSide ? vscode.ViewColumn.Beside : vscode.ViewColumn.Active,
-          //   callFrame: message.callFrame,
-          //   location: message.location,
-          // });
+          openLocation({
+            rootPath: undefined,
+            viewColumn: message.toSide ? vscode.ViewColumn.Beside : vscode.ViewColumn.Active,
+            callFrame: message.callFrame,
+            location: message.location,
+          });
           return;
         case 'reopenWith':
           reopenWithEditor(document.uri, message.viewType, message.requireExtension);