* [Major] Introduce a new `Ref` and `Path` type
This introduces a new `Ref` and `Path` type, which try to be as lightweight and rigorous as possible. More description in the PR
* [Minor] Updated Syntax
* [Minor] Updated Type
* [Minor] Renamed file
* [Minor] Updated type
* [Minor] Updated Syntax
* [Major] Rename css classes for wiki links
Previously all the parts of a wiki link were tagged with `sb-wiki-link-page`. This didn't make a whole lot of sense. Also the tag `sb-wiki-link` was could never render, because of the way `HighlightStyle` works. Now every part of a wiki link will be tagged with `sb-wiki-link` (i.e. the link, the alias, the dimensions). Invalid and missing links will be styled separately in a later commit.
* [Minor] Adjust to new API
* [Minor] Small changes
* [Minor] Function and file renames
* [Major] Syscall adjusments
Change behavior of `getCurrentPath` to actually return what's now considered a `Path`. `getCurrentPage(Meta)` now also correctly returns for documents. We could consider a rename to get rid of the `page` association
* [Major] Rework `Client`
Mostly minor adjustments for the new API. Some major changes in `navigateWithinPage` and some unecessary checks removed now
* [Major] Errors on navigate
This now throws an error when the user tries to navigate to a link that is invalid
* [Major] Minor adjustments and remove some old bulk
This does the typicall adjustments to the new API. A thing to consider is that invalid links aren't indexed. Also removed old code about template and query stuff. And reused a regex instead of copy pasting it.
* [Minor] Cleanup editor ui
* [Minor] Adjust to new API
* [Minor] Adjust to new API and reduce ugly regex
* [Minor] New API
* [Minor] Rework link cm plugin
* [Major] Rework wiki links
A lot of code cleanup, reworked for new APIs and also introduces "invalid links"
* [Minor] Part of the editor ui rework
* [Major] Adjust to new API
This also removes the `looksLikePathWithExtension` check. I don't think it was necessary.
* [Minor] PArt of editor ui rewrite
* [Minor] Adjust to new API
* [Major] Adjust renderer to new API
Invalid links now link to `#`
* [Major] Rewrite navigator
This still needs major rework, currently in a "got it working" state
* [Minor] Adjust file name
* [Minor] Mistake during rebase
* [Minor] Navigate to end of header
* [Minor] Remove `tweakEditorDOM` and use proper CM extensions
* [Major] Heavily clean up the navigation code
* [Minor] Make `PageNavigator` closable again
* [Minor] Small fixes to reduce errors bubbling up
* [Minor] Show error message if navigate fails
* [Major] Remove legacy `navigate({ kind = ` syntax
This removes the old navigation syntax. It's still supported but the user will be warned then using it. I also added some validation to editor.navigate for user provided refs.
* [Minor] Make notifications errors
* [Minor] Don't fail if header isn't found
* [Minor] Typo
* [Major] Remove cleanPageRef
* [Minor] Small bug
* [Minor] Align behavior between render and editor
* [Major] Remove `PageRef`. Pretty sure it's obsolete
* [Major] Remove pos from header as it's an invalid ref
* [Minor] Align with original behavior
* [Minor] Get tests working again
* [Minor] check that indexPage is valid
* [Major] Rewrite `resolve.ts` file
* [Minor] More tests, more fixes
* [Minor] Don't just append .md this is weird
* [Minor] More edge cases
* [Minor] Version bumping hono somehow fixes the `/` case
* [Minor] Smaller TODOs
* [Major] We can be a littler looser on the restrictions
* [Major] Change header indexing, to index with pos
* [Minor] More fixes for headers
* [Minor] Rename for clarity
* [Minor] Change more regexes to named groups
* [Major] Inline content rewrite
* [Minor] Fix TODO
* [Minor] Bump index version
* [Major] New Space Primitive to check paths
* [Minor] Fix #1214
* [Minor] Fix #1169
* [Minor] Remove TODO
This check is probably not needed anymore. Unsure. May look into it later
* [Minor] small bug
* [Minor] Not a good rebase without me needing to fix it afterwards
* [Minor] Improve fallback for file upload
* [Minor] Some fixes on the for resolving
* [Minor] Removed doubled test case
* [Minor] Resolve #860
* [Minor] Turn flash notification into an error
* [Minor] Change handling of `.` paths
* [Minor] Show empty URL for index page
* [Minor] Push correct ref to history
* [Major] Capture mini editor events in capture phase
This fixes the issue were when pressing arrowup or arrowdown changed the cursor position inside the editor
* [Major] Add prefix to `FilterList`
This now fixes issues were if you had a prefixed page you con't properly search for it, because the search considered the prefix as part of the name
* [Minor] A little rigor for empty headers
* [Major] Fix #1404
* [Minor] `parseInt` returns `NaN` handle that
* [Minor] Use `fileName`
* [Minor] Fix comment
* [Minor] Fixes
* [Major] disallow `foo.png.md` and `/../`, etc. cases
* [Major] Change name of conflicted pages
* [Minor] Remove unecessary check
* [Minor] Remove some split code
* [Minor] Allow deletion of invalid files
* [Minor] Bug in the regex
* [Minor] Give some possibility of fixing incorrect names
* [Minor] Tiny bug with header completion
* [Major] Docs
* [Minor] Ignore errors for navigation inside of a page
This could be a problem when SB e.g. cached a scrollTop for a page, which, because e.g. the file is now deleted, doesn't exist anymore and thus CM throws an error, when trying to navigate
* Update conflicted copy regex in Maintenance.md
---------
Co-authored-by: Zef Hemel <zef@zef.me>
231 lines
6.4 KiB
TypeScript
231 lines
6.4 KiB
TypeScript
import { plugPrefix } from "../lib/spaces/constants.ts";
|
|
|
|
import type { EventHook } from "../web/hooks/event.ts";
|
|
import { safeRun } from "../lib/async.ts";
|
|
import { localDateString } from "../lib/dates.ts";
|
|
import type { DocumentMeta, FileMeta, PageMeta } from "../type/index.ts";
|
|
import type { SpacePrimitives } from "../lib/spaces/space_primitives.ts";
|
|
import {
|
|
getPathExtension,
|
|
type Path,
|
|
} from "@silverbulletmd/silverbullet/lib/ref";
|
|
|
|
const pageWatchInterval = 5000;
|
|
|
|
export class Space {
|
|
// We do watch files in the background to detect changes
|
|
// This set of pages should only ever contain 1 page
|
|
watchedFiles = new Set<string>();
|
|
watchInterval?: number;
|
|
|
|
// private initialPageListLoad = true;
|
|
private saving = false;
|
|
|
|
constructor(
|
|
readonly spacePrimitives: SpacePrimitives,
|
|
eventHook: EventHook,
|
|
) {
|
|
eventHook.addLocalListener("file:deleted", (fileName: string) => {
|
|
if (this.watchedFiles.has(fileName)) {
|
|
// Stop watching deleted files already
|
|
this.watchedFiles.delete(fileName);
|
|
}
|
|
});
|
|
setTimeout(() => {
|
|
// Next tick, to ensure that the space is initialized
|
|
this.updatePageList().catch(console.error);
|
|
});
|
|
}
|
|
|
|
public async updatePageList() {
|
|
// The only reason to do this is to trigger events
|
|
await this.spacePrimitives.fetchFileList();
|
|
}
|
|
|
|
async deletePage(name: string): Promise<void> {
|
|
await this.getPageMeta(name); // Check if page exists, if not throws Error
|
|
await this.spacePrimitives.deleteFile(`${name}.md`);
|
|
}
|
|
|
|
async getPageMeta(name: string): Promise<PageMeta> {
|
|
return fileMetaToPageMeta(
|
|
await this.spacePrimitives.getFileMeta(`${name}.md`),
|
|
);
|
|
}
|
|
|
|
async listPlugs(): Promise<FileMeta[]> {
|
|
const files = await this.deduplicatedFileList();
|
|
return files
|
|
.filter((fileMeta) =>
|
|
fileMeta.name.startsWith(plugPrefix) &&
|
|
fileMeta.name.endsWith(".plug.js")
|
|
);
|
|
}
|
|
|
|
async readPage(name: string): Promise<{ text: string; meta: PageMeta }> {
|
|
const pageData = await this.spacePrimitives.readFile(`${name}.md`);
|
|
return {
|
|
text: new TextDecoder().decode(pageData.data),
|
|
meta: fileMetaToPageMeta(pageData.meta),
|
|
};
|
|
}
|
|
|
|
async writePage(
|
|
name: string,
|
|
text: string,
|
|
selfUpdate?: boolean,
|
|
): Promise<PageMeta> {
|
|
try {
|
|
this.saving = true;
|
|
const pageMeta = fileMetaToPageMeta(
|
|
await this.spacePrimitives.writeFile(
|
|
`${name}.md`,
|
|
new TextEncoder().encode(text),
|
|
selfUpdate,
|
|
),
|
|
);
|
|
// Note: we don't do very elaborate cache invalidation work here, quite quickly the cache will be flushed anyway
|
|
return pageMeta;
|
|
} finally {
|
|
this.saving = false;
|
|
}
|
|
}
|
|
|
|
// We're listing all pages that don't start with a _
|
|
isListedPage(fileMeta: FileMeta): boolean {
|
|
return fileMeta.name.endsWith(".md") && !fileMeta.name.startsWith("_");
|
|
}
|
|
|
|
async fetchPageList(): Promise<PageMeta[]> {
|
|
return (await this.deduplicatedFileList())
|
|
.filter(this.isListedPage)
|
|
.map(fileMetaToPageMeta);
|
|
}
|
|
|
|
async fetchDocumentList(): Promise<DocumentMeta[]> {
|
|
return (await this.deduplicatedFileList()).flatMap((fileMeta) =>
|
|
!this.isListedPage(fileMeta) &&
|
|
!fileMeta.name.endsWith(".plug.js")
|
|
? [fileMetaToDocumentMeta(fileMeta)]
|
|
: []
|
|
);
|
|
}
|
|
|
|
async deduplicatedFileList(): Promise<FileMeta[]> {
|
|
const files = await this.spacePrimitives.fetchFileList();
|
|
const fileMap = new Map<string, FileMeta>();
|
|
for (const file of files) {
|
|
if (fileMap.has(file.name)) {
|
|
const existing = fileMap.get(file.name)!;
|
|
if (existing.lastModified < file.lastModified) {
|
|
fileMap.set(file.name, file);
|
|
}
|
|
} else {
|
|
fileMap.set(file.name, file);
|
|
}
|
|
}
|
|
return [...fileMap.values()];
|
|
}
|
|
|
|
/**
|
|
* Reads a document
|
|
* @param name path of the document
|
|
* @returns
|
|
*/
|
|
async readDocument(
|
|
name: string,
|
|
): Promise<{ data: Uint8Array; meta: DocumentMeta }> {
|
|
const file = await this.spacePrimitives.readFile(name);
|
|
return { data: file.data, meta: fileMetaToDocumentMeta(file.meta) };
|
|
}
|
|
|
|
async getDocumentMeta(name: string): Promise<DocumentMeta> {
|
|
return fileMetaToDocumentMeta(
|
|
await this.spacePrimitives.getFileMeta(name),
|
|
);
|
|
}
|
|
|
|
async writeDocument(
|
|
name: string,
|
|
data: Uint8Array,
|
|
selfUpdate?: boolean,
|
|
): Promise<DocumentMeta> {
|
|
return fileMetaToDocumentMeta(
|
|
await this.spacePrimitives.writeFile(name, data, selfUpdate),
|
|
);
|
|
}
|
|
|
|
deleteDocument(name: string): Promise<void> {
|
|
return this.spacePrimitives.deleteFile(name);
|
|
}
|
|
|
|
// Even though changes coming from a sync cycle will immediately trigger a reload
|
|
// there are scenarios in which other tabs run the sync, so we have to poll for changes
|
|
watch() {
|
|
if (this.watchInterval) {
|
|
clearInterval(this.watchInterval);
|
|
}
|
|
this.watchInterval = setInterval(() => {
|
|
safeRun(async () => {
|
|
if (this.saving) {
|
|
return;
|
|
}
|
|
for (const fileName of this.watchedFiles) {
|
|
await this.spacePrimitives.getFileMeta(fileName);
|
|
}
|
|
});
|
|
}, pageWatchInterval);
|
|
}
|
|
|
|
unwatch() {
|
|
if (this.watchInterval) {
|
|
clearInterval(this.watchInterval);
|
|
}
|
|
}
|
|
|
|
watchFile(fileName: string) {
|
|
this.watchedFiles.add(fileName);
|
|
}
|
|
|
|
unwatchFile(fileName: string) {
|
|
this.watchedFiles.delete(fileName);
|
|
}
|
|
}
|
|
|
|
export function fileMetaToPageMeta(fileMeta: FileMeta): PageMeta {
|
|
const name = fileMeta.name.substring(0, fileMeta.name.length - 3);
|
|
try {
|
|
return {
|
|
...fileMeta,
|
|
ref: name,
|
|
tag: "page",
|
|
tags: [],
|
|
name,
|
|
created: localDateString(new Date(fileMeta.created)),
|
|
lastModified: localDateString(new Date(fileMeta.lastModified)),
|
|
} as PageMeta;
|
|
} catch (e) {
|
|
console.error("Failed to convert fileMeta to pageMeta", fileMeta, e);
|
|
throw e;
|
|
}
|
|
}
|
|
|
|
export function fileMetaToDocumentMeta(
|
|
fileMeta: FileMeta,
|
|
): DocumentMeta {
|
|
try {
|
|
return {
|
|
...fileMeta,
|
|
ref: fileMeta.name,
|
|
tag: "document",
|
|
created: localDateString(new Date(fileMeta.created)),
|
|
lastModified: localDateString(new Date(fileMeta.lastModified)),
|
|
// Name is always equal to the path for documents
|
|
extension: getPathExtension(fileMeta.name as Path),
|
|
} as DocumentMeta;
|
|
} catch (e) {
|
|
console.error("Failed to convert fileMeta to documentMeta", fileMeta, e);
|
|
throw e;
|
|
}
|
|
}
|