Changes from apr-2024 to jun-2024

Author: StanislavPetrovIcs

.cargo/config.toml

@@ -6,7 +6,7 @@ rustflags = [
   "-Ctarget-feature=+atomics,+bulk-memory",
   "-Clink-args=-pthread -sPTHREAD_POOL_SIZE=3",
   "-Clink-args=--post-js apps/browser/wasm/js/post.js -o apps/browser/wasm/dist/gramax-wasm.js",
-  "-Clink-args=-sASSERTIONS=0 -sWASM=1 -sWASMFS=1 -sUSE_ZLIB=1 -sEXPORT_ES6=1 -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory -sALLOW_MEMORY_GROWTH=0 -sINITIAL_MEMORY=1500mb -sSTACK_SIZE=10mb",
+  "-Clink-args=-sASSERTIONS=0 -sWASM=1 -sWASMFS=1 -sUSE_ZLIB=1 -sEXPORT_ES6=1 -sMALLOC=emmalloc -sEXPORTED_RUNTIME_METHODS=FS,wasmMemory -sALLOW_MEMORY_GROWTH=1 -sMAXIMUM_MEMORY=4gb -sINITIAL_MEMORY=500mb -sSTACK_SIZE=15mb",
   "-Clink-args=-sDEFAULT_LIBRARY_FUNCS_TO_INCLUDE=$writeArrayToMemory",
   "-Clink-args=-sEXPORTED_FUNCTIONS=@.cargo/exported-functions",
 ]

.cargo/exported-functions

@@ -40,3 +40,4 @@ _rename
 _getstat
 _rmfile
 _write_file
+_graph_head_upstream_files

.vscode/settings.json

@@ -1,12 +1,13 @@
 {
 	// "rust-analyzer.cargo.target": "x86_64-pc-windows-msvc",
 	// "rust-analyzer.cargo.target": "x86_64-apple-darwin",
-	"rust-analyzer.cargo.target": "aarch64-apple-darwin",
+	// "rust-analyzer.cargo.target": "aarch64-apple-darwin",
 	// "rust-analyzer.cargo.target": "wasm32-unknown-emscripten",
 	// "rust-analyzer.cargo.target": "aarch64-linux-android",
 	// "rust-analyzer.cargo.target": "aarch64-apple-ios",
 
 	"rust-analyzer.check.allTargets": true,
+	"rust-analyzer.check.features": "all",
 
 	"editor.tabCompletion": "on",
 
@@ -49,8 +50,17 @@
 		"editor.defaultFormatter": "redhat.vscode-yaml"
 	},
 
+	"yaml.schemas": {
+		"https://gitlab.com/gitlab-org/gitlab/-/raw/master/app/assets/javascripts/editor/schema/ci.json": [
+			"/.ci/*.yml",
+			"/.ci/**/*.yml",
+			"/.gitlab-ci.yml"
+		]
+	},
+
 	"typescript.preferences.importModuleSpecifier": "non-relative",
 	"typescript.tsserver.experimental.enableProjectDiagnostics": true,
 
-	"cSpell.words": ["katex", "Markdoc", "prosemirror", "Renderable", "tiptap", "traptitech", "Bugsnag"]
+	"cSpell.words": ["katex", "Markdoc", "prosemirror", "Renderable", "tiptap", "traptitech", "Bugsnag"],
+	"typescript.tsdk": "node_modules/typescript/lib"
 }

Cargo.toml

@@ -13,6 +13,7 @@ members = [
   "rlibs/fs",
 
   "rbins/warp-spa",
+  "rlibs/test-utils",
 ]
 
 [workspace.package]
@@ -22,31 +23,27 @@ description = "Gramax"
 edition = "2021"
 
 [workspace.dependencies]
-tauri-build = { git = "https://github.com/gram-ax/tauri.git", branch = "locked-version" }
-
-
-tauri = { git = "https://github.com/gram-ax/tauri.git", branch = "locked-version", features = [
+tauri = { version = "^2.0.0-beta", features = [
   "macos-private-api",
+  "unstable",
   "devtools",
 ] }
-tauri-plugin-dialog = { version = "^2.0.0-alpha", git = "https://github.com/gram-ax/tauri-plugins.git", branch = "locked-version" }
-tauri-plugin-log = { version = "^2.0.0-alpha", git = "https://github.com/gram-ax/tauri-plugins.git", branch = "locked-version" }
-tauri-plugin-updater = { version = "^2.0.0-alpha", git = "https://github.com/gram-ax/tauri-plugins.git", branch = "updater-chunk-timeout" }
-tauri-plugin-shell = { version = "^2.0.0-alpha", git = "https://github.com/gram-ax/tauri-plugins.git", branch = "locked-version" }
+tauri-plugin = { version = "^2.0.0-beta", features = ["build"] }
+tauri-build = "^2.0.0-beta"
+
+tauri-plugin-deep-link = "2.0.0-beta"
+tauri-plugin-dialog = "^2.0.0-beta"
+tauri-plugin-log = "^2.0.0-beta"
+tauri-plugin-updater = { version = "^2.0.0-beta", features = ["zip"] }
+tauri-plugin-shell = "^2.0.0-beta"
+
+serde = { version = "^1.0", features = ["derive"] }
+serde_json = "^1.0"
 
-serde = { version = "1.0.200", features = ["derive"] }
+log = "^0.4"
 
 [profile.release]
 codegen-units = 1
 lto = true
 incremental = false
 opt-level = "s"
-
-[patch.crates-io]
-tauri = { git = "https://github.com/gram-ax/tauri.git", branch = "locked-version", features = [
-  "macos-private-api",
-  "devtools",
-] }
-tauri-build = { git = "https://github.com/gram-ax/tauri.git", branch = "locked-version" }
-tauri-plugin-fs = { git = "https://github.com/gram-ax/tauri-plugins.git", branch = "locked-version" }
-wry = { git = "https://github.com/pashokitsme/wry.git", branch = "fix-proguard-v0.35.2" }

app/browser/app.ts

@@ -1,17 +1,15 @@
 import resolveModule from "@app/resolveModule/backend";
-import { getExecutingEnvironment } from "@app/resolveModule/env";
 import { ContextFactory } from "@core/Context/ContextFactory";
 import DiskFileProvider from "@core/FileProvider/DiskFileProvider/DiskFileProvider";
 import Path from "@core/FileProvider/Path/Path";
 import Hash from "@core/Hash/Hash";
-import Library from "@core/Library/Library";
-import deleteAnyFolderRule from "@core/Library/Rules/DeleteAnyFolderRule/DeleteAnyFolderRule";
 import PluginImporterType from "@core/Plugin/PluginImporter/logic/PluginImporterType";
 import PluginProvider from "@core/Plugin/logic/PluginProvider";
 import CustomArticlePresenter from "@core/SitePresenter/CustomArticlePresenter";
 import SitePresenterFactory from "@core/SitePresenter/SitePresenterFactory";
 import { TableDB } from "@core/components/tableDB/table";
 import VideoUrlRepository from "@core/components/video/videoUrlRepository";
+import YamlFileConfig from "@core/utils/YamlFileConfig";
 import Cache from "@ext/Cache";
 import { Encoder } from "@ext/Encoder/Encoder";
 import MailProvider from "@ext/MailProvider";
@@ -20,15 +18,16 @@ import RepositoryProvider from "@ext/git/core/Repository/RepositoryProvider";
 import HtmlParser from "@ext/html/HtmlParser";
 import FSLocalizationRules from "@ext/localization/core/rules/FSLocalizationRules";
 import BugsnagLogger from "@ext/loggers/BugsnagLogger";
+import ConsoleLogger from "@ext/loggers/ConsoleLogger";
 import Logger from "@ext/loggers/Logger";
 import MarkdownParser from "@ext/markdown/core/Parser/Parser";
 import ParserContextFactory from "@ext/markdown/core/Parser/ParserContext/ParserContextFactory";
 import MarkdownFormatter from "@ext/markdown/core/edit/logic/Formatter/Formatter";
 import AuthManager from "@ext/security/logic/AuthManager";
 import Sso from "@ext/security/logic/AuthProviders/Sso";
 import { TicketManager } from "@ext/security/logic/TicketManager/TicketManager";
-import { BrowserFileProvider } from "../../apps/browser/src/logic/FileProvider/BrowserFileProvider";
-import { AppConfig, getConfig } from "../config/AppConfig";
+import WorkspaceManager from "@ext/workspace/WorkspaceManager";
+import { AppConfig, getConfig, type AppGlobalConfig } from "../config/AppConfig";
 import Application from "../types/Application";
 
 const _init = async (config: AppConfig): Promise<Application> => {
@@ -40,53 +39,55 @@ const _init = async (config: AppConfig): Promise<Application> => {
 	await resolveModule("initWasm")?.(config.services.cors.url);
 
 	const rp = new RepositoryProvider({ corsProxy: config.services.cors.url });
-	const fp = new DiskFileProvider(config.paths.root);
-	await fp.validate();
 
-	const obsoleteFp = getExecutingEnvironment() == "browser" && new BrowserFileProvider(Path.empty);
+	const fileConfig = await YamlFileConfig.readFromFile<AppGlobalConfig>(
+		new DiskFileProvider(config.paths.data),
+		new Path("config.yaml"),
+	);
+
+	const wm = new WorkspaceManager(
+		(path) => new DiskFileProvider(path),
+		(fs) => FSLocalizationRules.bind(fs),
+		rp,
+		config,
+		fileConfig,
+	);
 
-	const libRules = getExecutingEnvironment() == "browser" ? [deleteAnyFolderRule] : [];
-	const lib = new Library(rp, config.isServerApp);
-	await lib.addFileProvider(fp, (fs) => FSLocalizationRules.bind(fs), libRules);
+	await wm.readWorkspaces();
 
 	const hashes = new Hash();
 	const tm = new ThemeManager();
 	const encoder = new Encoder();
-	const ticketManager = new TicketManager(lib, encoder, config.tokens.share);
+	const ticketManager = new TicketManager(wm, encoder, config.tokens.share);
 	const parser = new MarkdownParser();
 	const formatter = new MarkdownFormatter();
-	const tablesManager = new TableDB(parser, lib);
+	const tablesManager = new TableDB(parser, wm);
 	const customArticlePresenter = new CustomArticlePresenter();
+
 	const parserContextFactory = new ParserContextFactory(
 		config.paths.base,
-		fp,
+		wm,
 		tablesManager,
 		parser,
 		formatter,
 		config.services.sso.url,
 		config.services.diagramRenderer.url,
 	);
 	const htmlParser = new HtmlParser(parser, parserContextFactory);
-	const logger: Logger = new BugsnagLogger(config.bugsnagApiKey);
-	const sitePresenterFactory = new SitePresenterFactory(
-		lib,
-		parser,
-		parserContextFactory,
-		rp,
-		customArticlePresenter,
-	);
+	const logger: Logger = config.isProduction ? new BugsnagLogger(config) : new ConsoleLogger();
+	const sitePresenterFactory = new SitePresenterFactory(wm, parser, parserContextFactory, rp, customArticlePresenter);
+
 	const contextFactory = new ContextFactory(tm, config.tokens.cookie);
 
-	const cacheFileProvider = new DiskFileProvider(config.paths.userDataPath);
-	const cache = new Cache(cacheFileProvider);
-	const pluginProvider = new PluginProvider(lib, htmlParser, cache, PluginImporterType.browser);
+	const cache = new Cache(new DiskFileProvider(config.paths.cache));
+	const pluginProvider = new PluginProvider(wm, htmlParser, cache, PluginImporterType.browser);
 
 	return {
 		am,
 		tm,
 		mp,
 		sso,
-		lib,
+		wm,
 		vur,
 		rp,
 		cache,
@@ -102,7 +103,6 @@ const _init = async (config: AppConfig): Promise<Application> => {
 		parserContextFactory,
 		pluginProvider,
 		customArticlePresenter,
-		obsoleteFp,
 		conf: {
 			services: config.services,
 
@@ -115,6 +115,7 @@ const _init = async (config: AppConfig): Promise<Application> => {
 
 			bugsnagApiKey: config.bugsnagApiKey,
 			version: config.version,
+			buildVersion: config.buildVersion,
 		},
 	};
 };

app/commands/article/create.ts

@@ -16,9 +16,11 @@ const create: Command<{ ctx: Context; catalogName: string; parentPath?: Path },
 	middlewares: [new AuthorizeMiddleware(), new DesktopModeMiddleware(), new ReloadConfirmMiddleware()],
 
 	async do({ ctx, catalogName, parentPath }) {
-		const { formatter, lib, parser, parserContextFactory } = this._app;
-		const catalog = await lib.getCatalog(catalogName);
-		const fp = lib.getFileProviderByCatalog(catalog);
+		const { formatter, parser, parserContextFactory, wm } = this._app;
+		const workspace = wm.current();
+
+		const catalog = await workspace.getCatalog(catalogName);
+		const fp = workspace.getFileProvider();
 		const parentRef = fp.getItemRef(parentPath);
 
 		const markdown = "\n\n";

app/commands/article/editOn/app.ts

@@ -9,10 +9,10 @@ const app: Command<{ catalogName: string; articlePath: Path }, string> = Command
 	kind: ResponseKind.plain,
 
 	async do({ catalogName, articlePath }) {
-		const { lib } = this._app;
-		const catalog = await lib.getCatalog(catalogName);
+		const workspace = this._app.wm.current();
+		const catalog = await workspace.getCatalog(catalogName);
 		if (!catalog) return;
-		const fp = lib.getFileProviderByCatalog(catalog);
+		const fp = workspace.getFileProvider();
 		const itemRef = fp.getItemRef(articlePath);
 		const item = catalog.findArticleByItemRef(itemRef);
 		return RouterPathProvider.getPathname(await catalog.getPathnameData(item)).value;

app/commands/article/editOn/source.ts

@@ -8,11 +8,11 @@ const source: Command<{ catalogName: string; articlePath: Path }, string> = Comm
 	kind: ResponseKind.plain,
 
 	async do({ catalogName, articlePath }) {
-		const { lib } = this._app;
-		const catalog = await lib.getCatalog(catalogName);
+		const workspace = this._app.wm.current();
+		const catalog = await workspace.getCatalog(catalogName);
 		if (!catalog) return;
 		if (!articlePath.startsWith(catalog.getBasePath())) return;
-		const fp = lib.getFileProviderByCatalog(catalog);
+		const fp = workspace.getFileProvider();
 		const itemRef = fp.getItemRef(articlePath);
 		const path = catalog.getRelativeRepPath(itemRef);
 		const { gitVersionControl } = await catalog.repo.gvc.getGitVersionControlContainsItem(path);

app/commands/article/features/checkLastModified.ts

@@ -3,6 +3,7 @@ import { AuthorizeMiddleware } from "@core/Api/middleware/AuthorizeMiddleware";
 import Context from "@core/Context/Context";
 import Path from "@core/FileProvider/Path/Path";
 import { Article } from "@core/FileStructue/Article/Article";
+import FileStructueErrorCode from "@core/FileStructue/error/model/FileStructueErrorCode";
 import { ArticlePageData } from "@core/SitePresenter/SitePresenter";
 import DefaultError from "../../../../core/extensions/errorHandlers/logic/DefaultError";
 import { Command } from "../../../types/Command";
@@ -16,11 +17,12 @@ const checkLastModified: Command<{ ctx: Context; articlePath: Path; catalogName:
 		middlewares: [new AuthorizeMiddleware()],
 
 		async do({ ctx, articlePath, catalogName }) {
-			const { lib, sitePresenterFactory } = this._app;
-			const catalog = await lib.getCatalog(catalogName);
+			const { sitePresenterFactory, wm } = this._app;
+			const workspace = wm.current();
+			const catalog = await workspace.getCatalog(catalogName);
 			if (!catalog || !catalog.getRootCategory().items.length) return;
 
-			const fp = lib.getFileProviderByCatalog(catalog);
+			const fp = workspace.getFileProvider();
 			const itemRef = fp.getItemRef(articlePath);
 			const article = catalog.findItemByItemRef<Article>(itemRef);
 			if (!article || article.props.welcome) return;
@@ -30,7 +32,8 @@ const checkLastModified: Command<{ ctx: Context; articlePath: Path; catalogName:
 				const stat = await fp.getStat(article.ref.path);
 				res = await article.checkLastModified(stat.mtimeMs);
 			} catch (e) {
-				if (e?.code === "ENOENT") throw new DefaultError(null, e, { errorCode: e?.code });
+				if (e?.code === "ENOENT")
+					throw new DefaultError(null, e, { errorCode: FileStructueErrorCode.ArticleNotFoundError });
 			}
 
 			return res ? await sitePresenterFactory.fromContext(ctx).getArticlePageData(article, catalog) : null;

app/commands/article/features/getArticleHeadersByRelativePath.ts

@@ -0,0 +1,50 @@
+import { Command } from "@app/types/Command";
+import { ResponseKind } from "@app/types/ResponseKind";
+import { TitleItem } from "@core-ui/ContextServices/LinkTitleTooltip";
+import Context from "@core/Context/Context";
+import Path from "@core/FileProvider/Path/Path";
+import { Article } from "@core/FileStructue/Article/Article";
+import parseContent from "@core/FileStructue/Article/parseContent";
+import { getLevelTocItemsByRenderableTree } from "@ext/navigation/article/logic/createTocItems";
+
+const getArticleHeadersByRelativePath: Command<
+	{ ctx: Context; articlePath: Path; catalogName: string; articleRelativePath: Path },
+	TitleItem[]
+> = Command.create({
+	path: "article/features/getArticleHeadersByRelativePath",
+	kind: ResponseKind.json,
+
+	async do({ ctx, catalogName, articlePath, articleRelativePath }) {
+		const { parser, parserContextFactory, wm } = this._app;
+		const workspace = wm.current();
+		if (!articleRelativePath.value) return null;
+
+		const path = articlePath.parentDirectoryPath.join(articleRelativePath);
+		const catalog = await workspace.getCatalog(catalogName);
+		const article: Article = catalog.findItemByItemPath(path);
+		if (!article) return null;
+
+		await parseContent(article, catalog, ctx, parser, parserContextFactory);
+
+		const { renderTree } = article.parsedContent;
+		if (!renderTree || typeof renderTree === "string") return null;
+
+		const headersTocItem = getLevelTocItemsByRenderableTree(renderTree.children);
+		if (headersTocItem.length === 0) return [];
+
+		const minLevel = Math.min(...headersTocItem.map((node) => node.level));
+
+		return headersTocItem.map((headerItem) => {
+			return { level: headerItem.level - minLevel, url: headerItem.url, title: headerItem.title };
+		});
+	},
+
+	params(ctx, q) {
+		const catalogName = q.catalogName;
+		const articlePath = new Path(q.articlePath);
+		const articleRelativePath = new Path(q.articleRelativePath);
+		return { ctx, catalogName, articlePath, articleRelativePath };
+	},
+});
+
+export default getArticleHeadersByRelativePath;