Skip to content

Commit 39be51c

Browse files
committed
update: add lodash types and refactor foam imports.
1 parent bea76e7 commit 39be51c

7 files changed

Lines changed: 53 additions & 6 deletions

File tree

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,6 +278,7 @@
278278
},
279279
"devDependencies": {
280280
"@types/http-string-parser": "^0.0.33",
281+
"@types/lodash": "^4.17.23",
281282
"@types/mocha": "^10.0.10",
282283
"@types/node": "~20.19.1",
283284
"@types/node-fetch": "^2.6.13",

pnpm-lock.yaml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/app/activate.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { registerCommands } from "./registerCommands";
66
import { registerCodeLens } from "./registerCodeLens";
77
import { registerTerminalUtils } from "../features/terminal";
88
import { registerDefinitionProvider } from "../features/definitions";
9-
import { Foam } from "foam-vscode/src/core/model/foam";
109

1110
function dependencyCheck(): boolean {
1211
const foamExtension = vscode.extensions.getExtension("foam.foam-vscode");

src/core/domain/foam.ts

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
export interface URI {
2+
path: string;
3+
getBasename(): string;
4+
}
5+
6+
export interface Resource {
7+
uri: URI;
8+
type: string;
9+
title: string;
10+
properties: Record<string, unknown> & {
11+
type?: string;
12+
};
13+
tags: unknown[];
14+
}
15+
16+
export interface Connection {
17+
source: URI;
18+
target: URI;
19+
}
20+
21+
export interface FoamWorkspace {
22+
list(): Resource[];
23+
getIdentifier(forResource: URI): string;
24+
}
25+
26+
export interface FoamGraph {
27+
getAllConnections(): Connection[];
28+
}
29+
30+
export interface Foam {
31+
workspace: FoamWorkspace;
32+
graph: FoamGraph;
33+
}

src/core/domain/index.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@ export {
1212
UserDumpFormat
1313
} from "./user";
1414

15+
export {
16+
Foam,
17+
FoamGraph,
18+
FoamWorkspace,
19+
Connection,
20+
Resource,
21+
URI
22+
} from "./foam";
23+
1524
import { UserCredential } from "./user";
1625
import { Host } from "./host";
1726

src/features/notes/reports/report.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
import { Foam } from "foam-vscode/src/core/model/foam";
2-
import type { Resource } from "foam-vscode/src/core/model/note";
3-
import { URI } from "foam-vscode/src/core/model/uri";
1+
import type { Foam, Resource, URI } from "../../../core";
42
import * as vscode from "vscode";
53

64
type Edge = { source: string; target: string };

src/platform/vscode/context.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
import { ExtensionContext } from "vscode";
22
import { UserCredential, Host } from "../../core";
3-
import { Foam } from "foam-vscode/src/core/model/foam";
3+
import type { Foam } from "../../core";
44
import * as vscode from "vscode";
55
import { logger } from "../../platform/vscode/logger";
6-
import { log } from "console";
76

87
export class Context {
98
private static _extContext: ExtensionContext;

0 commit comments

Comments
 (0)