Compare commits

..
Author SHA1 Message Date
root-at-skic c262bb06a7 0.10.3: Sync button in the editor title bar
Every Archify page and .archify text editor gets a Sync button top right that opens the Sync menu: sign in, share, join, server address. archify.sync.titleButton hides it. The status bar entry stays.
2026-11-07 00:52:07 +02:00
root-at-skic 63f0633daa Merge pull request '0.10.2: leaving Source hides the YAML editor' (#33) from fix/source-pane-hide into main 2026-11-06 14:17:34 -08:00
root-at-skic ef272e4d96 0.10.2: leaving Source hides the YAML editor
Going back from Source to Model, Diagram or View left the editor on the page under the picture when nothing had been edited, since the page was only replaced after a re-render. The pane now hides whenever Source is off.
2026-11-06 23:58:24 +02:00
root-at-skic f6097b1d00 Merge pull request '0.10.1: Archify Sync in the status bar, server address as a setting' (#32) from feat/sync-status-bar into main 2026-11-06 13:38:12 -08:00
root-at-skic 9ccd67b2dd 0.10.1: Archify Sync in the status bar, server address as a setting
In workspaces with Archify files, Archify Sync sits in the status bar and
opens a menu: sign in, share, join, server address, settings. The new
archify.sync.server setting (empty by default) is used without asking,
and in workspace settings gives a project one server.
archify.sync.statusBar hides the entry.
2026-11-06 23:21:56 +02:00
root-at-skic d02c331155 Merge pull request '0.10.0: Archify Sync, optional live collaboration on a model' (#31) from feature/archify-sync into main 2026-11-06 12:57:46 -08:00
8 changed files with 152 additions and 16 deletions

No files matched your search

+13
View File
@@ -1,5 +1,18 @@
# Changelog # Changelog
## 0.10.3 — 2026-11-07
- **Sync button in the title bar.** Every Archify page (and `.archify` text editors) has a **Sync** button top right, next to *Open in Text Editor*: sign in, share a model, join one, set the server address. The status bar entry stays for those who show the status bar. `archify.sync.titleButton: false` hides the button.
## 0.10.2 — 2026-11-07
- Fixed: going back from **Source** to **Model**, **Diagram** or **View** left the YAML editor on the page under the picture when nothing had been edited. It now hides at once.
## 0.10.1 — 2026-11-06
- **Archify Sync is easier to find.** In workspaces with Archify files, **Archify Sync** sits in the status bar. Click it for a menu: sign in, share a model, join one, set the server address, open the settings. It shows the server you are signed in to, and the live state once a model is shared. `archify.sync.statusBar: false` hides it; nothing else changes without a server.
- **Server address as a setting.** `archify.sync.server` (empty by default, for example `https://archify.example.com`) is used by sign-in, share and the menu without asking. In the workspace settings it gives a whole project the same server. *Archify | Set Sync Server Address…* sets it.
## 0.10.0 — 2026-11-06 ## 0.10.0 — 2026-11-06
- **Archify Sync (optional).** Several people edit one model at once through a server you run yourself ([archify-vscode-ext-sync](https://gitea.lego-cloud.eu/vscode-extensions/archify-vscode-ext-sync)); the files stay ordinary files on each disk. Commands: *Sign in to Sync Server…*, *Share Model…*, *Copy Invite Link*, *Join Shared Model…*, *Publish Version…*, *Versions…*, *Stop Syncing Model…*. Sign-in through the browser (PKCE), sessions in VS Code's secret storage, an *Archify Sync* account provider. Edits from editors, pages, Git and agents go out at once; others' edits arrive in open editors with undo intact. Everything is kept on the machine first, so work goes on offline and merges later. Teammates' cursors show as named carets in the Source view and in VS Code's text editors, and stay on their word while others type. The status bar shows who is here; the model page gets a **Shared** section with people, the file each has open, and the latest versions with **Compare** and **Restore**. - **Archify Sync (optional).** Several people edit one model at once through a server you run yourself ([archify-vscode-ext-sync](https://gitea.lego-cloud.eu/vscode-extensions/archify-vscode-ext-sync)); the files stay ordinary files on each disk. Commands: *Sign in to Sync Server…*, *Share Model…*, *Copy Invite Link*, *Join Shared Model…*, *Publish Version…*, *Versions…*, *Stop Syncing Model…*. Sign-in through the browser (PKCE), sessions in VS Code's secret storage, an *Archify Sync* account provider. Edits from editors, pages, Git and agents go out at once; others' edits arrive in open editors with undo intact. Everything is kept on the machine first, so work goes on offline and merges later. Teammates' cursors show as named carets in the Source view and in VS Code's text editors, and stay on their word while others type. The status bar shows who is here; the model page gets a **Shared** section with people, the file each has open, and the latest versions with **Compare** and **Restore**.
+3 -1
View File
@@ -140,7 +140,9 @@ Optional. Without a sync server the extension works exactly as described above a
[Archify Sync](https://gitea.lego-cloud.eu/vscode-extensions/archify-vscode-ext-sync) is a small server you run yourself (one container and PostgreSQL; a Helm chart is included). With it, a model is edited by several people at once, like a shared document, and its files stay ordinary files on each person's disk, so Git, agents and every page of this extension keep working. [Archify Sync](https://gitea.lego-cloud.eu/vscode-extensions/archify-vscode-ext-sync) is a small server you run yourself (one container and PostgreSQL; a Helm chart is included). With it, a model is edited by several people at once, like a shared document, and its files stay ordinary files on each person's disk, so Git, agents and every page of this extension keep working.
- **Sign in.** *Archify | Sign in to Sync Server…* asks for the server's address and signs in through the browser; the session is kept in VS Code's secret storage and shows under **Accounts** as *Archify Sync*. A new server is set up first on its `/setup` page with the code from its log. - **Where.** The **Sync** button in the title bar of every Archify page (top right, next to *Open in Text Editor*) opens a menu: sign in, share a model, join one, the server address, settings. The same menu is **Archify Sync** in the status bar (in workspaces with Archify files) and *Archify | Sync…* in the Command Palette. `archify.sync.titleButton: false` and `archify.sync.statusBar: false` hide them.
- **Server address.** Set `archify.sync.server` once (Settings › Archify › Sync, or *Archify | Set Sync Server Address…*), for example `https://archify.example.com`. Put it in the workspace settings and everyone in the project uses the same server. Left empty, the address is asked for once and remembered.
- **Sign in.** *Archify | Sign in to Sync Server…* uses that address (or asks for it) and signs in through the browser; the session is kept in VS Code's secret storage and shows under **Accounts** as *Archify Sync*. A new server is set up first on its `/setup` page with the code from its log.
- **Share.** *Archify | Share Model…* (also on `main.archify` in the Explorer) puts the model on the server and writes a small `.archify-sync` file next to `main.archify`: the server and the model's id, no secrets. Commit it, and everyone who clones the repository and is a member opens the shared model. - **Share.** *Archify | Share Model…* (also on `main.archify` in the Explorer) puts the model on the server and writes a small `.archify-sync` file next to `main.archify`: the server and the model's id, no secrets. Commit it, and everyone who clones the repository and is a member opens the shared model.
- **Invite and join.** *Archify | Copy Invite Link* copies a link for the model; send it any way you like. Opening it (or *Archify | Join Shared Model…*) signs the person in, or up, and puts the files in an empty folder of their choice. - **Invite and join.** *Archify | Copy Invite Link* copies a link for the model; send it any way you like. Opening it (or *Archify | Join Shared Model…*) signs the person in, or up, and puts the files in an empty folder of their choice.
- **Live.** Edits in any editor, page, Source view, by Git or by an agent reach the others within a moment. Their edits arrive in your open editors with undo intact and are saved to disk; your own unsaved work stays unsaved. The status bar shows **Archify live · 3 here**; the model page gets a **Shared** section with who is here and in which file, and each diagram card says who has it open. In the Source view and in text editors, teammates' cursors show as coloured carets with their names. - **Live.** Edits in any editor, page, Source view, by Git or by an agent reach the others within a moment. Their edits arrive in your open editors with undo intact and are saved to disk; your own unsaved work stays unsaved. The status bar shows **Archify live · 3 here**; the model page gets a **Shared** section with who is here and in which file, and each diagram card says who has it open. In the Source view and in text editors, teammates' cursors show as coloured carets with their names.
+2 -2
View File
@@ -1,12 +1,12 @@
{ {
"name": "archify-vscode-ext", "name": "archify-vscode-ext",
"version": "0.10.0", "version": "0.10.3",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "archify-vscode-ext", "name": "archify-vscode-ext",
"version": "0.10.0", "version": "0.10.3",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"@codemirror/autocomplete": "^6.20.4", "@codemirror/autocomplete": "^6.20.4",
+30 -6
View File
@@ -2,7 +2,7 @@
"name": "archify-vscode-ext", "name": "archify-vscode-ext",
"displayName": "Archify Diagram Viewer", "displayName": "Archify Diagram Viewer",
"description": "Archify diagrams in VS Code. Write diagrams as .archify files in YAML: they open as the interactive diagram, with live updates, validation, templates and completion. Also previews Archify's own JSON files (*.architecture.json, …) and opens rendered Archify HTML.", "description": "Archify diagrams in VS Code. Write diagrams as .archify files in YAML: they open as the interactive diagram, with live updates, validation, templates and completion. Also previews Archify's own JSON files (*.architecture.json, …) and opens rendered Archify HTML.",
"version": "0.10.0", "version": "0.10.3",
"publisher": "root-at-skic", "publisher": "root-at-skic",
"license": "MIT", "license": "MIT",
"sponsor": { "sponsor": {
@@ -163,7 +163,12 @@
{ {
"command": "archify.sync.menu", "command": "archify.sync.menu",
"title": "Archify | Sync…", "title": "Archify | Sync…",
"icon": "$(broadcast)" "icon": "$(live-share)"
},
{
"command": "archify.sync.setServer",
"title": "Archify | Set Sync Server Address…",
"icon": "$(server)"
} }
], ],
"menus": { "menus": {
@@ -223,10 +228,6 @@
{ {
"command": "archify.sync.stop", "command": "archify.sync.stop",
"when": "archify.sync.active" "when": "archify.sync.active"
},
{
"command": "archify.sync.menu",
"when": "archify.sync.active"
} }
], ],
"editor/title": [ "editor/title": [
@@ -269,6 +270,11 @@
"command": "archify.openModelGraph", "command": "archify.openModelGraph",
"when": "archify.inModel && (archify.isDiagramSource || activeCustomEditorId == 'archify.diagram' || activeCustomEditorId == 'archify.registry' || activeCustomEditorId == 'archify.decision') && !notebookEditorFocused", "when": "archify.inModel && (archify.isDiagramSource || activeCustomEditorId == 'archify.diagram' || activeCustomEditorId == 'archify.registry' || activeCustomEditorId == 'archify.decision') && !notebookEditorFocused",
"group": "navigation@61" "group": "navigation@61"
},
{
"command": "archify.sync.menu",
"when": "config.archify.sync.titleButton && (archify.isDiagramSource || activeCustomEditorId == 'archify.diagram' || activeCustomEditorId == 'archify.registry' || activeCustomEditorId == 'archify.decision') && !notebookEditorFocused",
"group": "navigation@62"
} }
], ],
"explorer/context": [ "explorer/context": [
@@ -513,6 +519,24 @@
"type": "string", "type": "string",
"default": "", "default": "",
"description": "Node.js executable (18 or newer) used to run the renderer. Empty means the runtime bundled with VS Code." "description": "Node.js executable (18 or newer) used to run the renderer. Empty means the runtime bundled with VS Code."
},
"archify.sync.server": {
"type": "string",
"default": "",
"scope": "window",
"pattern": "^$|^https?://",
"patternErrorMessage": "An address such as https://archify.example.com",
"markdownDescription": "Address of your Archify Sync server, for example `https://archify.example.com`. *Sign in*, *Share Model* and the status bar use it without asking. Set it in the workspace settings so everyone in the project uses the same server. Empty: asked once and remembered. Archify Sync is optional; see the README."
},
"archify.sync.statusBar": {
"type": "boolean",
"default": true,
"markdownDescription": "Show **Archify Sync** in the status bar in workspaces with Archify files. Clicking it offers sign in, share, join and the server address. Shared models always show their state there."
},
"archify.sync.titleButton": {
"type": "boolean",
"default": true,
"markdownDescription": "Show the **Archify Sync** button in the title bar of Archify pages and `.archify` editors: sign in, share, join, server address. Archify Sync is optional; without a server the button only offers to set one up."
} }
} }
}, },
+76 -6
View File
@@ -23,6 +23,7 @@ export const SYNC_COMMANDS = [
'archify.sync.versions', 'archify.sync.versions',
'archify.sync.stop', 'archify.sync.stop',
'archify.sync.menu', 'archify.sync.menu',
'archify.sync.setServer',
] as const; ] as const;
const SKIP = '{**/node_modules/**,**/.git/**}'; const SKIP = '{**/node_modules/**,**/.git/**}';
@@ -38,6 +39,10 @@ export class SyncFeature implements vscode.Disposable, LiveProvider {
private readonly versionCache = new Map<string, { at: number; versions: Promise<Version[]> }>(); private readonly versionCache = new Map<string, { at: number; versions: Promise<Version[]> }>();
private readonly editorCursors: EditorCursors; private readonly editorCursors: EditorCursors;
private cursorTimer: ReturnType<typeof setTimeout> | undefined; private cursorTimer: ReturnType<typeof setTimeout> | undefined;
/** Servers with a session on this machine, for the status bar before any model is shared. */
private signedIn: string[] = [];
/** Whether the workspace has Archify files; elsewhere the entry stays hidden until a model is shared. */
private archifyHere = false;
constructor( constructor(
private readonly context: vscode.ExtensionContext, private readonly context: vscode.ExtensionContext,
@@ -62,8 +67,9 @@ export class SyncFeature implements vscode.Disposable, LiveProvider {
vscode.workspace.registerTextDocumentContentProvider(VERSION_SCHEME, this.content), vscode.workspace.registerTextDocumentContentProvider(VERSION_SCHEME, this.content),
this.auth.onDidChangeSessions(() => { this.auth.onDidChangeSessions(() => {
for (const space of this.spaces.values()) space.reconnect(); for (const space of this.spaces.values()) space.reconnect();
this.render(); void this.refreshSignedIn();
}), }),
vscode.workspace.onDidChangeConfiguration((e) => e.affectsConfiguration('archify.sync') && this.render()),
); );
this.editorCursors = new EditorCursors({ cursors: (file) => this.cursors(file), setCursor: (file, selection) => this.setCursorIn(file, selection) }); this.editorCursors = new EditorCursors({ cursors: (file) => this.cursors(file), setCursor: (file, selection) => this.setCursorIn(file, selection) });
this.disposables.push(this.editorCursors); this.disposables.push(this.editorCursors);
@@ -74,6 +80,12 @@ export class SyncFeature implements vscode.Disposable, LiveProvider {
async start(): Promise<void> { async start(): Promise<void> {
const found = await vscode.workspace.findFiles(`**/${LINK_FILE}`, SKIP, 50); const found = await vscode.workspace.findFiles(`**/${LINK_FILE}`, SKIP, 50);
await Promise.all(found.map((uri) => this.open(uri, 'open'))); await Promise.all(found.map((uri) => this.open(uri, 'open')));
this.archifyHere = (await vscode.workspace.findFiles('**/*.{archify,archify-registry,archify-decision}', SKIP, 1)).length > 0;
await this.refreshSignedIn();
}
private async refreshSignedIn(): Promise<void> {
this.signedIn = await this.auth.servers();
this.render(); this.render();
} }
@@ -127,8 +139,20 @@ export class SyncFeature implements vscode.Disposable, LiveProvider {
private render(): void { private render(): void {
const spaces = [...this.spaces.values()]; const spaces = [...this.spaces.values()];
if (!spaces.length) { if (!spaces.length) {
this.status.hide();
void vscode.commands.executeCommand('setContext', 'archify.sync.active', false); void vscode.commands.executeCommand('setContext', 'archify.sync.active', false);
// Nothing shared here yet: the way in, as before the sync bundle loaded.
if (!this.archifyHere || !vscode.workspace.getConfiguration('archify.sync').get<boolean>('statusBar', true)) {
this.status.hide();
return;
}
const hosts = this.signedIn.map((server) => new URL(server).host);
this.status.text = hosts.length ? `$(cloud) Archify Sync · ${hosts.join(', ')}` : '$(cloud) Archify Sync';
this.status.tooltip = hosts.length
? `Signed in to ${hosts.join(', ')}. Click to share a model, join one or sign out.`
: 'Archify Sync (optional): sign in, share a model with others or join one. Set the server under Settings › Archify › Sync.';
this.status.backgroundColor = undefined;
this.status.show();
this.bridge?.changed();
return; return;
} }
void vscode.commands.executeCommand('setContext', 'archify.sync.active', true); void vscode.commands.executeCommand('setContext', 'archify.sync.active', true);
@@ -300,6 +324,9 @@ export class SyncFeature implements vscode.Disposable, LiveProvider {
case 'archify.sync.menu': case 'archify.sync.menu':
await this.menu(); await this.menu();
break; break;
case 'archify.sync.setServer':
await this.setServer();
break;
} }
} catch (error) { } catch (error) {
this.report(error); this.report(error);
@@ -319,8 +346,13 @@ export class SyncFeature implements vscode.Disposable, LiveProvider {
else if (uri.path === '/join') await this.run('archify.sync.join', uri.toString(true)); else if (uri.path === '/join') await this.run('archify.sync.join', uri.toString(true));
} }
/** The server from the archify.sync.server setting, or asked for (and remembered). */
private async askServer(): Promise<string | undefined> { private async askServer(): Promise<string | undefined> {
const last = this.context.globalState.get<string>('archifySync.lastServer'); return configuredServer() ?? this.promptServer();
}
private async promptServer(): Promise<string | undefined> {
const last = configuredServer() ?? this.context.globalState.get<string>('archifySync.lastServer');
const value = await vscode.window.showInputBox({ const value = await vscode.window.showInputBox({
title: 'Archify | Sync server', title: 'Archify | Sync server',
prompt: 'The address of the Archify Sync server', prompt: 'The address of the Archify Sync server',
@@ -350,6 +382,16 @@ export class SyncFeature implements vscode.Disposable, LiveProvider {
return true; return true;
} }
/** Writes archify.sync.server: in the workspace when the workspace sets it, otherwise for the user. */
private async setServer(): Promise<void> {
const server = await this.promptServer();
if (!server) return;
const config = vscode.workspace.getConfiguration('archify.sync');
const inWorkspace = config.inspect<string>('server')?.workspaceValue !== undefined;
await config.update('server', server, inWorkspace ? vscode.ConfigurationTarget.Workspace : vscode.ConfigurationTarget.Global);
vscode.window.showInformationMessage(`Archify Sync: server set to ${new URL(server).host}${inWorkspace ? ' for this workspace' : ''}.`);
}
private async signInCommand(): Promise<void> { private async signInCommand(): Promise<void> {
const server = await this.askServer(); const server = await this.askServer();
if (!server || !(await this.checkServer(server))) return; if (!server || !(await this.checkServer(server))) return;
@@ -531,7 +573,10 @@ export class SyncFeature implements vscode.Disposable, LiveProvider {
private async menu(): Promise<void> { private async menu(): Promise<void> {
const spaces = [...this.spaces.values()]; const spaces = [...this.spaces.values()];
const signedOut = spaces.find((s) => s.state === 'signed-out'); const signedOut = spaces.find((s) => s.state === 'signed-out');
const items: (vscode.QuickPickItem & { run: () => Promise<void> })[] = []; const servers = await this.auth.servers();
const configured = configuredServer();
type Item = vscode.QuickPickItem & { run?: () => Promise<void> };
const items: Item[] = [];
if (signedOut) { if (signedOut) {
items.push({ items.push({
label: `$(account) Sign in to ${new URL(signedOut.link.server).host}`, label: `$(account) Sign in to ${new URL(signedOut.link.server).host}`,
@@ -539,16 +584,35 @@ export class SyncFeature implements vscode.Disposable, LiveProvider {
if (await this.checkServer(signedOut.link.server)) await this.auth.signIn(signedOut.link.server); if (await this.checkServer(signedOut.link.server)) await this.auth.signIn(signedOut.link.server);
}, },
}); });
} else if (!servers.length) {
items.push({
label: '$(account) Sign in…',
description: configured ? new URL(configured).host : 'asks for the server address',
run: () => this.signInCommand(),
});
} }
items.push( items.push(
{ label: '$(live-share) Share a model…', run: () => this.share(undefined) },
{ label: '$(link) Join a shared model…', description: 'with an invite link', run: () => this.join(undefined) },
);
if (spaces.length) {
items.push(
{ label: 'Shared models', kind: vscode.QuickPickItemKind.Separator },
{ label: '$(person-add) Copy invite link…', run: () => this.invite(undefined) }, { label: '$(person-add) Copy invite link…', run: () => this.invite(undefined) },
{ label: '$(tag) Publish version…', run: () => this.publish(undefined) }, { label: '$(tag) Publish version…', run: () => this.publish(undefined) },
{ label: '$(history) Versions…', run: () => this.run('archify.sync.versions') }, { label: '$(history) Versions…', run: () => this.run('archify.sync.versions') },
{ label: '$(output) Show log', run: async () => this.log.show() },
{ label: '$(debug-disconnect) Stop syncing a model…', run: () => this.stop(undefined) }, { label: '$(debug-disconnect) Stop syncing a model…', run: () => this.stop(undefined) },
); );
}
items.push(
{ label: 'Settings', kind: vscode.QuickPickItemKind.Separator },
{ label: '$(server) Server address…', description: configured ? new URL(configured).host : 'not set', run: () => this.setServer() },
{ label: '$(settings-gear) Open Sync settings', run: async () => void vscode.commands.executeCommand('workbench.action.openSettings', 'archify.sync') },
{ label: '$(output) Show log', run: async () => this.log.show() },
);
if (servers.length) items.push({ label: '$(sign-out) Sign out…', description: servers.map((s) => new URL(s).host).join(', '), run: () => this.signOut() });
const pick = await vscode.window.showQuickPick(items, { title: 'Archify Sync' }); const pick = await vscode.window.showQuickPick(items, { title: 'Archify Sync' });
await pick?.run(); await pick?.run?.();
} }
dispose(): void { dispose(): void {
@@ -560,6 +624,12 @@ export class SyncFeature implements vscode.Disposable, LiveProvider {
} }
} }
/** archify.sync.server when it holds a usable address. */
function configuredServer(): string | undefined {
const value = vscode.workspace.getConfiguration('archify.sync').get<string>('server', '').trim();
return value ? checkServerUrl(value).url : undefined;
}
/** The file behind the active tab when it is a custom editor (the Archify pages). */ /** The file behind the active tab when it is a custom editor (the Archify pages). */
function activeTabUri(): vscode.Uri | undefined { function activeTabUri(): vscode.Uri | undefined {
const input = vscode.window.tabGroups.activeTabGroup.activeTab?.input; const input = vscode.window.tabGroups.activeTabGroup.activeTab?.input;
+21
View File
@@ -16,6 +16,7 @@ const COMMANDS = [
'archify.sync.versions', 'archify.sync.versions',
'archify.sync.stop', 'archify.sync.stop',
'archify.sync.menu', 'archify.sync.menu',
'archify.sync.setServer',
] as const; ] as const;
/** /**
@@ -26,8 +27,26 @@ const COMMANDS = [
*/ */
export function registerSync(context: vscode.ExtensionContext, models: ModelService): vscode.Disposable[] { export function registerSync(context: vscode.ExtensionContext, models: ModelService): vscode.Disposable[] {
let feature: Promise<SyncFeature> | undefined; let feature: Promise<SyncFeature> | undefined;
// Until the sync bundle loads, this entry is the way in; then the bundle's own one takes over.
const entry = vscode.window.createStatusBarItem('archify.sync', vscode.StatusBarAlignment.Left, 50);
entry.name = 'Archify Sync';
entry.text = '$(cloud) Archify Sync';
entry.tooltip = 'Archify Sync (optional): sign in, share a model with others or join one. Set the server under Settings › Archify › Sync.';
entry.command = 'archify.sync.menu';
// Only where there are Archify files: the extension also starts for JSON and HTML.
let archifyHere = false;
const showEntry = () => {
const wanted = archifyHere && !feature && vscode.workspace.getConfiguration('archify.sync').get<boolean>('statusBar', true);
if (wanted) entry.show();
else entry.hide();
};
void Promise.resolve(vscode.workspace.findFiles('**/*.{archify,archify-registry,archify-decision}', '{**/node_modules/**,**/.git/**}', 1)).then((found) => {
archifyHere = found.length > 0;
showEntry();
});
const load = (): Promise<SyncFeature> => const load = (): Promise<SyncFeature> =>
(feature ??= (async () => { (feature ??= (async () => {
showEntry();
// A runtime path, so esbuild leaves the sync bundle out of this one. // A runtime path, so esbuild leaves the sync bundle out of this one.
const bundle = path.join(__dirname, 'sync.js'); const bundle = path.join(__dirname, 'sync.js');
const mod = require(bundle) as typeof import('./index'); const mod = require(bundle) as typeof import('./index');
@@ -44,6 +63,8 @@ export function registerSync(context: vscode.ExtensionContext, models: ModelServ
})(); })();
return [ return [
entry,
vscode.workspace.onDidChangeConfiguration((e) => e.affectsConfiguration('archify.sync.statusBar') && showEntry()),
liveBridge, liveBridge,
...COMMANDS.map((id) => ...COMMANDS.map((id) =>
vscode.commands.registerCommand(id, async (...args: unknown[]) => (await load()).run(id, ...args)), vscode.commands.registerCommand(id, async (...args: unknown[]) => (await load()).run(id, ...args)),
+1
View File
@@ -23,6 +23,7 @@ html.archify-source-on .container > :not(.header):not(#archify-source),
html.archify-source-on body > :not(.toolbar):not(.container):not(.archify-model-head):not(.archify-model-switch-row):not(#archify-source):not(script):not(style):not(.archify-modal-backdrop), html.archify-source-on body > :not(.toolbar):not(.container):not(.archify-model-head):not(.archify-model-switch-row):not(#archify-source):not(script):not(style):not(.archify-modal-backdrop),
html.archify-source-on #btn-3d, html.archify-source-on #btn-3d,
html.archify-source-on .archify-vscode-notice { display: none !important; } html.archify-source-on .archify-vscode-notice { display: none !important; }
html:not(.archify-source-on) #archify-source { display: none !important; }
.archify-source { display: flex; flex-direction: column; box-sizing: border-box; min-height: 260px; margin: 0.75rem 0 1rem; } .archify-source { display: flex; flex-direction: column; box-sizing: border-box; min-height: 260px; margin: 0.75rem 0 1rem; }
body > .archify-source { max-width: 1400px; margin: 0.75rem auto 1rem; padding: 0 2rem; } body > .archify-source { max-width: 1400px; margin: 0.75rem auto 1rem; padding: 0 2rem; }
.archify-source-editor { flex: 1; min-height: 0; overflow: hidden; border: 1px solid var(--panel-border, var(--vscode-editorWidget-border, rgba(128,128,128,.35))); border-radius: 0.75rem; .archify-source-editor { flex: 1; min-height: 0; overflow: hidden; border: 1px solid var(--panel-border, var(--vscode-editorWidget-border, rgba(128,128,128,.35))); border-radius: 0.75rem;
+6 -1
View File
@@ -489,7 +489,12 @@ export async function run(): Promise<void> {
await check('without a shared model, sync stays unloaded and its commands are there', async () => { await check('without a shared model, sync stays unloaded and its commands are there', async () => {
const commands = await vscode.commands.getCommands(true); const commands = await vscode.commands.getCommands(true);
for (const id of ['archify.sync.signIn', 'archify.sync.share', 'archify.sync.join']) assert.ok(commands.includes(id), `${id} is registered`); for (const id of ['archify.sync.signIn', 'archify.sync.share', 'archify.sync.join', 'archify.sync.menu', 'archify.sync.setServer']) assert.ok(commands.includes(id), `${id} is registered`);
// No server of anyone's built in: empty until the user sets one.
const config = vscode.workspace.getConfiguration('archify.sync');
assert.equal(config.get('server'), '');
assert.equal(config.get('statusBar'), true);
assert.equal(config.get('titleButton'), true);
// The extension host's module cache: dist/sync.js (Yjs, the WebSocket) is not loaded. // The extension host's module cache: dist/sync.js (Yjs, the WebSocket) is not loaded.
const loaded = Object.keys(require.cache).filter((file) => file.endsWith(`${path.sep}dist${path.sep}sync.js`)); const loaded = Object.keys(require.cache).filter((file) => file.endsWith(`${path.sep}dist${path.sep}sync.js`));
assert.deepEqual(loaded, [], 'the sync bundle is not loaded'); assert.deepEqual(loaded, [], 'the sync bundle is not loaded');