Changes from oct-2024 to nov-2024

Author: StanislavPetrovIcs

.cargo/exported-functions

@@ -31,6 +31,7 @@ _copy
 _exists
 _make_dir
 _make_symlink
+_read_dir_stats
 _mv
 _read_dir
 _read_file
@@ -47,8 +48,12 @@ _git_read_dir
 _git_file_stat
 _git_file_exists
 _git_read_file
+_git_read_dir_stats
 _is_bare
 _is_init
 _find_refs_by_globs
 _set_head
+_list_merge_requests
+_create_or_update_merge_request
+_get_draft_merge_request
 _invalidate_repo_cache

.eslintrc

@@ -83,6 +83,7 @@
 		"@typescript-eslint/no-unsafe-assignment": "off",
 		"@typescript-eslint/no-unsafe-member-access": "off",
 		"@typescript-eslint/restrict-plus-operands": "off",
+		"@typescript-eslint/no-unsafe-enum-comparison": "off",
 		"@typescript-eslint/no-unused-vars": "warn",
 		"@typescript-eslint/restrict-template-expressions": "off",
 		"@typescript-eslint/no-unsafe-any": "off",

.gitignore

@@ -65,4 +65,4 @@ junit*.xml
 
 
 !apps/browser/wasm/dist
-
+apps/next/gramaxVersion.txt

Cargo.toml

@@ -1,5 +1,11 @@
 [workspace]
 resolver = "2"
+default-members = [
+  "crates/git",
+  "crates/fs",
+  "crates/bugsnag",
+  "crates/test-utils",
+]
 members = [
   "apps/tauri/plugins/plugin-gramax-fs",
   "apps/tauri/plugins/plugin-gramax-git",
@@ -10,12 +16,6 @@ members = [
   "apps/next/crates/next-gramax-git",
 
   "rbins/warp-spa",
-
-  "crates/git",
-  "crates/fs",
-  "crates/bugsnag",
-
-  "crates/test-utils",
 ]
 
 [workspace.package]
@@ -37,8 +37,9 @@ tauri-plugin-shell = "^2.0.0"
 tauri-plugin-window-state = "^2.0.0"
 
 serde = { version = "^1.0", features = ["derive"] }
+serde_yml = "^0.0"
 serde_json = "^1.0"
-reqwest = { version = "^0.12", features = ["blocking"] }
+reqwest = { version = "^0.12", features = ["blocking", "json"] }
 log = "^0.4"
 
 rstest = "^0.23"
@@ -47,4 +48,13 @@ rstest = "^0.23"
 codegen-units = 1
 lto = true
 incremental = false
-opt-level = "s"
+opt-level = 2
+
+[profile.development]
+inherits = "release"
+incremental = false
+lto = false
+codegen-units = 256
+opt-level = 1
+debug = "full"
+debug-assertions = false

app/browser/app.ts

@@ -4,7 +4,8 @@ import DiskFileProvider from "@core/FileProvider/DiskFileProvider/DiskFileProvid
 import MountFileProvider from "@core/FileProvider/MountFileProvider/MountFileProvider";
 import Path from "@core/FileProvider/Path/Path";
 import FileStructureEventHandlers from "@core/FileStructue/events/FileStuctureEventHandlers";
-import Hash from "@core/Hash/Hash";
+import HashItemProvider from "@core/Hash/HashItemProvider";
+import { XxHash } from "@core/Hash/Hasher";
 import ResourceUpdaterFactory from "@core/Resource/ResourceUpdaterFactory";
 import CustomArticlePresenter from "@core/SitePresenter/CustomArticlePresenter";
 import SitePresenterFactory from "@core/SitePresenter/SitePresenterFactory";
@@ -15,7 +16,9 @@ import Cache from "@ext/Cache";
 import { Encoder } from "@ext/Encoder/Encoder";
 import MailProvider from "@ext/MailProvider";
 import ThemeManager from "@ext/Theme/ThemeManager";
+import EnterpriseManager from "@ext/enterprise/EnterpriseManager";
 import RepositoryProvider from "@ext/git/core/Repository/RepositoryProvider";
+import RepositoryProviderEventHandlers from "@ext/git/core/Repository/events/RepositoryProviderEventHandlers";
 import HtmlParser from "@ext/html/HtmlParser";
 import BugsnagLogger from "@ext/loggers/BugsnagLogger";
 import ConsoleLogger from "@ext/loggers/ConsoleLogger";
@@ -30,6 +33,7 @@ import { IndexDataProvider } from "@ext/serach/IndexDataProvider";
 import Searcher from "@ext/serach/Searcher";
 import SourceDataProvider from "@ext/storage/logic/SourceDataProvider/logic/SourceDataProvider";
 import WorkspaceManager from "@ext/workspace/WorkspaceManager";
+import setWorkerProxy from "../../apps/browser/src/logic/setWorkerProxy";
 import { AppConfig, getConfig, type AppGlobalConfig } from "../config/AppConfig";
 import Application from "../types/Application";
 
@@ -39,26 +43,36 @@ const _init = async (config: AppConfig): Promise<Application> => {
 	const vur: VideoUrlRepository = null;
 
 	await resolveModule("initWasm")?.(config.services.gitProxy.url);
+	await XxHash.init();
 
 	const fileConfig = await YamlFileConfig.readFromFile<AppGlobalConfig>(
 		new DiskFileProvider(config.paths.data),
 		new Path("config.yaml"),
 	);
 
 	const rp = new RepositoryProvider();
+
+	const em = new EnterpriseManager(config.enterprise, fileConfig);
+
 	const wm = new WorkspaceManager(
 		(path) => MountFileProvider.fromDefault(new Path(path)),
-		(fs) => new FileStructureEventHandlers(fs).mount(fs),
+		(fs) => {
+			new FileStructureEventHandlers(fs).mount();
+			new RepositoryProviderEventHandlers(fs, rp).mount();
+		},
 		rp,
 		config,
 		fileConfig,
 	);
+
 	const sdp = new SourceDataProvider(wm);
 	rp.addSourceDataProvider(sdp);
 
 	await wm.readWorkspaces();
+	const services = wm.maybeCurrent()?.config()?.services ?? config.services;
+	setWorkerProxy(services.gitProxy.url);
 
-	const hashes = new Hash();
+	const hashes = new HashItemProvider();
 	const tm = new ThemeManager();
 	const encoder = new Encoder();
 	const ticketManager = new TicketManager(wm, encoder, config.tokens.share);
@@ -84,9 +98,9 @@ const _init = async (config: AppConfig): Promise<Application> => {
 		tm,
 		mp,
 		wm,
-		vur,
+		em,
 		rp,
-		cache,
+		vur,
 		logger,
 		parser,
 		hashes,
@@ -101,22 +115,20 @@ const _init = async (config: AppConfig): Promise<Application> => {
 		resourceUpdaterFactory,
 		customArticlePresenter,
 		conf: {
+			services,
+			logo: config.logo,
+
 			basePath: config.paths.base,
 			disableSeo: config.disableSeo,
 
 			isRelease: config.isRelease,
 			isReadOnly: config.isReadOnly,
 			isProduction: config.isProduction,
 
+			metrics: config.metrics,
 			version: config.version,
 			buildVersion: config.buildVersion,
 			bugsnagApiKey: config.bugsnagApiKey,
-			yandexMetricCounter: config.yandexMetricCounter,
-			
-			services: config.services,
-			enterprise: config.enterprise,
-			
-			logo: config.logo,
 		},
 	};
 };

app/commands/article/create.ts

@@ -17,16 +17,12 @@ const create: Command<{ ctx: Context; catalogName: string; parentPath?: Path },
 		const { resourceUpdaterFactory, wm } = this._app;
 		const workspace = wm.current();
 
-		const catalog = await workspace.getCatalog(catalogName);
+		const catalog = await workspace.getCatalog(catalogName, ctx);
 		const fp = workspace.getFileProvider();
 		const parentRef = fp.getItemRef(parentPath);
 
 		const markdown = "\n\n";
-		const article = await catalog.createArticle(
-			resourceUpdaterFactory.withContext(ctx),
-			markdown,
-			parentPath ? parentRef : null,
-		);
+		const article = await catalog.createArticle(resourceUpdaterFactory, markdown, parentPath ? parentRef : null);
 
 		return await catalog.getPathname(article);
 	},

app/commands/article/editOn/app.ts

@@ -10,7 +10,7 @@ const app: Command<{ catalogName: string; articlePath: Path }, string> = Command
 
 	async do({ catalogName, articlePath }) {
 		const workspace = this._app.wm.current();
-		const catalog = await workspace.getCatalog(catalogName);
+		const catalog = await workspace.getContextlessCatalog(catalogName);
 		if (!catalog) return;
 		const item = catalog.findItemByItemPath(articlePath);
 		return RouterPathProvider.getPathname(await catalog.getPathnameData(item)).value;

app/commands/article/editOn/source.ts

@@ -9,12 +9,12 @@ const source: Command<{ catalogName: string; articlePath: Path }, string> = Comm
 
 	async do({ catalogName, articlePath }) {
 		const workspace = this._app.wm.current();
-		const catalog = await workspace.getCatalog(catalogName);
+		const catalog = await workspace.getContextlessCatalog(catalogName);
 		if (!catalog) return;
-		if (!articlePath.startsWith(catalog.getBasePath())) return;
+		if (!articlePath.startsWith(catalog.basePath)) return;
 		const fp = workspace.getFileProvider();
 		const itemRef = fp.getItemRef(articlePath);
-		const path = catalog.getRelativeRepPath(itemRef);
+		const path = catalog.getRepositoryRelativePath(itemRef);
 		const { gitVersionControl } = await catalog.repo.gvc.getGitVersionControlContainsItem(path);
 
 		return await catalog.repo.storage.getFileLink(path, await gitVersionControl.getCurrentBranch());

app/commands/article/features/checkLastModified.ts

@@ -19,7 +19,7 @@ const checkLastModified: Command<{ ctx: Context; articlePath: Path; catalogName:
 		async do({ ctx, articlePath, catalogName }) {
 			const { sitePresenterFactory, wm } = this._app;
 			const workspace = wm.current();
-			const catalog = await workspace.getCatalog(catalogName);
+			const catalog = await workspace.getContextlessCatalog(catalogName);
 			if (!catalog || !catalog.getRootCategory().items.length) return;
 
 			const fp = workspace.getFileProvider();
@@ -29,6 +29,7 @@ const checkLastModified: Command<{ ctx: Context; articlePath: Path; catalogName:
 			let res = false;
 
 			try {
+				if (article.props.shouldBeCreated) return null;
 				const stat = await fp.getStat(article.ref.path);
 				res = await article.checkLastModified(stat.mtimeMs);
 			} catch (e) {

app/commands/article/features/getArticleHeadersByRelativePath.ts

@@ -24,7 +24,7 @@ const getArticleHeadersByRelativePath: Command<
 		const workspace = wm.current();
 
 		const path = articlePath.parentDirectoryPath.join(articleRelativePath);
-		const catalog = await workspace.getCatalog(catalogName);
+		const catalog = await workspace.getCatalog(catalogName, ctx);
 		const article: Article = catalog.findItemByItemPath(path);
 		if (!article) return [];