Refactor/fix tests (#342)

YousefED · web-flow · commit 8792978d7d73 · 2023-07-11T16:43:15.000+02:00
* fix tests, use funcs from vscode-lib

* small fixes
diff --git a/packages/editor/src/app/documentRenderers/project/ProjectContainer.tsx b/packages/editor/src/app/documentRenderers/project/ProjectContainer.tsx
@@ -13,7 +13,8 @@ import { BaseResource } from "../../../store/BaseResource";
 import { DocConnection } from "../../../store/DocConnection";
 import ProjectResource from "../../../store/ProjectResource";
 import { SessionStore } from "../../../store/local/SessionStore";
-import { ChildReference } from "../../../store/referenceDefinitions/child";
+
+import { ChildReference } from "@typecell-org/shared";
 import styles from "./ProjectContainer.module.css";
 import SidebarTree from "./directoryNavigation/SidebarTree";
 
diff --git a/packages/editor/src/app/documentRenderers/project/directoryNavigation/SidebarTree.tsx b/packages/editor/src/app/documentRenderers/project/directoryNavigation/SidebarTree.tsx
@@ -18,7 +18,8 @@ import {
 import { Identifier } from "../../../../identifiers/Identifier";
 import { DocConnection } from "../../../../store/DocConnection";
 import { SessionStore } from "../../../../store/local/SessionStore";
-import { ChildReference } from "../../../../store/referenceDefinitions/child";
+
+import { ChildReference } from "@typecell-org/shared";
 import styles from "./SidebarTree.module.css";
 
 const RenderItem =
diff --git a/packages/editor/src/runtime/compiler/compilers/MonacoCompiler.ts b/packages/editor/src/runtime/compiler/compilers/MonacoCompiler.ts
@@ -1,6 +1,6 @@
 import type * as monaco from "monaco-editor";
+import { hash } from "vscode-lib";
 import { TypeCellCodeModel } from "../../../models/TypeCellCodeModel";
-import { hash } from "../../../util/hash";
 
 let mainWorker: WorkerType;
 
@@ -132,7 +132,7 @@ async function _compile(
   monacoInstance: typeof monaco
 ) {
   const tscode = model.getValue();
-  const hsh = hash(tscode) + "";
+  const hsh = hash.stringHash(tscode, 0) + "";
 
   if (ENABLE_CACHE) {
     const cached = getCachedItem(model);
diff --git a/packages/editor/src/runtime/extensions/visualizer/TypeChecker.test.ts b/packages/editor/src/runtime/extensions/visualizer/TypeChecker.test.ts
@@ -2,6 +2,7 @@ import fetch from "cross-fetch";
 import * as monaco from "monaco-editor/esm/vs/editor/editor.api.js";
 import "monaco-editor/esm/vs/language/typescript/monaco.contribution.js";
 import { expect, it } from "vitest";
+import { async } from "vscode-lib";
 import * as Y from "yjs";
 import { TypeCellCodeModel } from "../../../models/TypeCellCodeModel";
 import SourceModelCompiler from "../../compiler/SourceModelCompiler";
@@ -57,7 +58,7 @@ it(
     //   getTypeCellResolver("docid", "testEngine", false, monaco)
     // );
 
-    await new Promise((resolve) => setTimeout(resolve, 1000));
+    await async.timeout(1000);
     const typeChecker = new TypeChecker(
       "mx:mx.typecell.org/@owner/doc",
       monaco
diff --git a/packages/editor/src/store/BaseResource.test.ts b/packages/editor/src/store/BaseResource.test.ts
@@ -3,6 +3,7 @@
  */
 
 import { enableMobxBindings } from "@syncedstore/yjs-reactive-bindings";
+import { ChildReference } from "@typecell-org/shared";
 import * as mobx from "mobx";
 import { beforeEach, describe, expect, it } from "vitest";
 import { async, uri } from "vscode-lib";
@@ -14,7 +15,7 @@ import {
 } from "./BaseResource";
 import { InboxResource } from "./InboxResource";
 import { InboxValidator } from "./InboxValidatorStore";
-import { ChildReference } from "./referenceDefinitions/child";
+
 enableMobxBindings(mobx);
 type Username = string;
 type DocId = string;
diff --git a/packages/editor/src/store/BaseResource.ts b/packages/editor/src/store/BaseResource.ts
@@ -1,17 +1,17 @@
 import { makeYDocObservable } from "@syncedstore/yjs-reactive-bindings";
-import { generateKeyBetween } from "fractional-indexing";
-import type * as Y from "yjs";
-import { createID, getState } from "yjs";
-import { Identifier } from "../identifiers/Identifier";
-import { DocumentResource } from "./DocumentResource";
-import { InboxResource } from "./InboxResource";
 import {
   Ref,
   ReferenceDefinition,
   createRef,
   getHashForReference,
   validateRef,
-} from "./Ref";
+} from "@typecell-org/shared/src/Ref";
+import { generateKeyBetween } from "fractional-indexing";
+import type * as Y from "yjs";
+import { createID, getState } from "yjs";
+import { Identifier } from "../identifiers/Identifier";
+import { DocumentResource } from "./DocumentResource";
+import { InboxResource } from "./InboxResource";
 import { Remote } from "./yjs-sync/remote/Remote";
 
 export type BaseResourceExternalManager = {
diff --git a/packages/editor/src/store/DocConnection.browsertest.ts b/packages/editor/src/store/DocConnection.browsertest.ts
@@ -2,6 +2,7 @@
 import { HocuspocusProviderWebsocket } from "@hocuspocus/provider";
 
 import { enableMobxBindings } from "@syncedstore/yjs-reactive-bindings";
+import { ForkReference } from "@typecell-org/shared";
 import { createWsProvider } from "@typecell-org/shared-test";
 import { expect } from "chai";
 import * as mobx from "mobx";
@@ -11,7 +12,6 @@ import { loginAsNewRandomUser } from "../../tests/util/loginUtil";
 import { SupabaseSessionStore } from "../app/supabase-auth/SupabaseSessionStore";
 import { DocConnection } from "./DocConnection";
 import { InboxValidator } from "./InboxValidatorStore";
-import { ForkReference } from "./referenceDefinitions/fork";
 
 async function initSessionStore(name: string) {
   const sessionStore = new SupabaseSessionStore(false);
@@ -94,7 +94,6 @@ describe("DocConnection tests", () => {
 
     const fork = await bobResource.fork();
 
-    // await new Promise((resolve) => setTimeout(resolve, 1000));
     expect(fork.ydoc.getMap("test").get("hello")).to.equal("from bob");
 
     bobResource = await bobDoc.waitForDoc(); // TODO: we should be able to keep using the old resource
diff --git a/packages/editor/src/store/DocConnection.ts b/packages/editor/src/store/DocConnection.ts
@@ -10,13 +10,13 @@ import {
 import { lifecycle } from "vscode-lib";
 import { BaseResource } from "./BaseResource";
 
+import { ForkReference } from "@typecell-org/shared";
 import * as Y from "yjs";
 import { parseIdentifier } from "../identifiers";
 import { Identifier } from "../identifiers/Identifier";
 import { TypeCellIdentifier } from "../identifiers/TypeCellIdentifier";
 import { InboxResource } from "./InboxResource";
 import { SessionStore } from "./local/SessionStore";
-import { ForkReference } from "./referenceDefinitions/fork";
 import { SyncManager } from "./yjs-sync/SyncManager";
 
 const cache = new ObservableMap<string, DocConnection>();
diff --git a/packages/editor/src/store/InboxResource.ts b/packages/editor/src/store/InboxResource.ts
@@ -1,11 +1,11 @@
+import { ReferenceDefinition } from "@typecell-org/shared/src/Ref";
 import * as Y from "yjs";
 import { Identifier } from "../identifiers/Identifier";
 import {
   BaseResource,
   BaseResourceExternalManager,
   UnimplementedBaseResourceExternalManager,
 } from "./BaseResource";
-import { ReferenceDefinition } from "./Ref";
 
 export type RefInboxMessage<T extends ReferenceDefinition> = {
   message_type: "ref";
diff --git a/packages/editor/src/store/InboxValidatorStore.ts b/packages/editor/src/store/InboxValidatorStore.ts
@@ -1,10 +1,10 @@
+import { ReferenceDefinition } from "@typecell-org/shared/src/Ref";
 import { autorun } from "mobx";
 import { lifecycle } from "vscode-lib";
 import * as Y from "yjs";
 import { UnreachableCaseError } from "../util/UnreachableCaseError";
 import { BaseResource } from "./BaseResource";
 import { InboxResource, RefInboxMessage } from "./InboxResource";
-import { ReferenceDefinition } from "./Ref";
 
 /*
  * References are bi-directional links between documents.
diff --git a/packages/editor/src/store/yjs-sync/remote/FetchRemote.ts b/packages/editor/src/store/yjs-sync/remote/FetchRemote.ts
@@ -1,14 +1,14 @@
 import { makeObservable, observable, runInAction } from "mobx";
 import { path, strings } from "vscode-lib";
 
+import { ChildReference } from "@typecell-org/shared";
 import _ from "lodash";
 import * as Y from "yjs";
 import { filesToTreeNodes } from "../../../app/documentRenderers/project/directoryNavigation/treeNodeUtil";
 import { HttpsIdentifier } from "../../../identifiers/HttpsIdentifier";
 import { getIdentifierWithAppendedPath } from "../../../identifiers/paths/identifierPathHelpers";
 import { markdownToYDoc } from "../../../integrations/markdown/import";
 import ProjectResource from "../../ProjectResource";
-import { ChildReference } from "../../referenceDefinitions/child";
 import { Remote } from "./Remote";
 
 export default class FetchRemote extends Remote {
diff --git a/packages/editor/src/store/yjs-sync/remote/FilebridgeRemote.ts b/packages/editor/src/store/yjs-sync/remote/FilebridgeRemote.ts
@@ -9,7 +9,8 @@ import { getIdentifierWithAppendedPath } from "../../../identifiers/paths/identi
 import { xmlFragmentToMarkdown } from "../../../integrations/markdown/export";
 import { markdownToXmlFragment } from "../../../integrations/markdown/import";
 import ProjectResource from "../../ProjectResource";
-import { ChildReference } from "../../referenceDefinitions/child";
+
+import { ChildReference } from "@typecell-org/shared";
 import { Remote } from "./Remote";
 
 function isEmptyDoc(doc: Y.Doc) {
diff --git a/packages/editor/src/store/yjs-sync/remote/TypeCellRemote.ts b/packages/editor/src/store/yjs-sync/remote/TypeCellRemote.ts
@@ -9,7 +9,7 @@ import {
   observable,
   runInAction,
 } from "mobx";
-import { uuid } from "vscode-lib";
+import { hash, uuid } from "vscode-lib";
 import * as awarenessProtocol from "y-protocols/awareness";
 import * as Y from "yjs";
 import { SupabaseSessionStore } from "../../../app/supabase-auth/SupabaseSessionStore";
@@ -19,10 +19,6 @@ import { Remote } from "./Remote";
 
 let wsProviders = new Map<string, HocuspocusProviderWebsocket | undefined>();
 
-function toHex(arr: Uint8Array) {
-  return [...arr].map((x) => x.toString(16).padStart(2, "0") as any).join("");
-}
-
 function getWSProvider(session: SupabaseSessionStore) {
   if (!session.userPrefix) {
     throw new Error("no user available on create document");
@@ -127,7 +123,7 @@ export class TypeCellRemote extends Remote {
       id: uuid.generateUuid(),
       created_at: date,
       updated_at: date,
-      data: "\\x" + toHex(data),
+      data: "\\x" + hash.toHexString(data),
       nano_id: this.identifier.documentId,
       public_access_level: this.identifier.documentId.endsWith("/.inbox")
         ? "write"
diff --git a/packages/editor/src/util/hash.ts b/packages/editor/src/util/hash.ts
diff --git a/packages/editor/tests/util/startMatrixServer.ts b/packages/editor/tests/util/startMatrixServer.ts
@@ -1,5 +1,6 @@
 import * as cp from "child_process";
 import fetch from "cross-fetch";
+import { async } from "vscode-lib";
 
 export const MATRIX_HOME_URL = new URL("http://localhost:8888/_matrix/static/");
 
@@ -27,9 +28,7 @@ async function waitForMatrixStart() {
       console.log("Matrix has started!");
       return;
     }
-    await new Promise((resolve) => {
-      setTimeout(resolve, 2000);
-    });
+    await async.timeout(2000);
   }
 }
 
diff --git a/packages/server/package.json b/packages/server/package.json
@@ -39,7 +39,7 @@
     "build": "npm run clean && tsc -p tsconfig.json",
     "watch": "tsc --watch",
     "test-watch": "vitest watch",
-    "unittest:vitest": "vitest run --coverage ",
+    "unittest:vitest": "vitest run ",
     "unittest:playwright": "playwright-test '**/*.browsertest.ts'",
     "test": "npm run unittest:vitest && npm run unittest:playwright",
     "gentypes": "./supabase.sh gen types typescript --local --schema public > ../shared/src/schema.ts"
diff --git a/packages/server/src/hocuspocus/extension-supabase/SupabaseHocuspocus.ts b/packages/server/src/hocuspocus/extension-supabase/SupabaseHocuspocus.ts
@@ -10,6 +10,7 @@ import {
   onLoadDocumentPayload,
   storePayload,
 } from "@hocuspocus/server";
+import { ChildReference } from "@typecell-org/shared";
 import {
   createAnonClient,
   createServiceClient,
@@ -183,7 +184,11 @@ export class SupabaseHocuspocus extends Database {
     const serviceClient = await createServiceClient();
 
     const refs = [...tr.doc.getMap("refs").values()]
-      .filter((r) => r.namespace === "typecell" && r.type === "childOf") // TODO: use ChildReference
+      .filter(
+        (r) =>
+          r.namespace === ChildReference.namespace &&
+          r.type === ChildReference.type
+      )
       .map((r) => r.target as string);
 
     const refsIds = await serviceClient
@@ -241,7 +246,6 @@ export class SupabaseHocuspocus extends Database {
   private refListenersByDocument = new WeakMap<Y.Doc, any>();
 
   async afterLoadDocument(data: onLoadDocumentPayload): Promise<any> {
-    console.log("afterLoadDocument", data.documentName);
     if (this.refListenersByDocument.has(data.document)) {
       throw new Error("unexpected: refListener already set");
     }
diff --git a/packages/server/src/hocuspocus/extension-supabase/hocuspocus.test.ts b/packages/server/src/hocuspocus/extension-supabase/hocuspocus.test.ts
diff --git a/packages/server/src/hocuspocus/extension-supabase/util.test.ts b/packages/server/src/hocuspocus/extension-supabase/util.test.ts
diff --git a/packages/shared/src/Ref.ts b/packages/shared/src/Ref.ts
diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts
diff --git a/packages/shared/src/referenceDefinitions/child.ts b/packages/shared/src/referenceDefinitions/child.ts
diff --git a/packages/shared/src/referenceDefinitions/fork.ts b/packages/shared/src/referenceDefinitions/fork.ts
