Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/db.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,14 @@ export async function insertWorkspace(workspace: Workspace) {
await db.write();
}

export async function deleteWorkspace(workspacePath: string) {
const db = await getDb();
db.data.workspaces = db.data.workspaces.filter(
(v) => v.workspace !== workspacePath
);
await db.write();
}

export async function dropWorkspaces() {
const db = await getDb();
db.data.workspaces = [];
Expand Down
4 changes: 3 additions & 1 deletion src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { checkDir } from './operations/check-dir';
import { createWorkspace } from './operations/create-workspace';
import { getWorkspace } from './operations/get-workspace';
import { openWorkspace } from './operations/open-workspace';
import { validateWorkspace } from './operations/validate-workspace';

cli(
{
Expand All @@ -35,7 +36,8 @@ cli(
await checkDir(path);

const workspace = await getWorkspace(path);
if (workspace) {

if (workspace && (await validateWorkspace(workspace))) {
await openWorkspace(workspace);
} else {
const workspace = await createWorkspace(path);
Expand Down
4 changes: 4 additions & 0 deletions src/operations/get-workspace.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,9 @@ export async function getWorkspace(dir: string): Promise<string | undefined> {
(w) => w.path === filepath
)?.workspace;

if (!workspacePath) {
return;
}

return workspacePath;
}
21 changes: 21 additions & 0 deletions src/operations/validate-workspace.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { existsSync } from 'node:fs';

import { deleteWorkspace } from '../db';

/**
* validateor
* a. returns false if not a valid workspace there, and continue to subsquent steps
* b. throw error if unexpected, and stop process
*
* also, it's do much though, some extra operations.
*/
export async function validateWorkspace(workspace: string): Promise<boolean> {
// When user accidentally delete .code-workspace
if (!existsSync(workspace)) {
// delete from db and continue
await deleteWorkspace(workspace);
return false;
}

return true;
}
6 changes: 4 additions & 2 deletions test/operations/get-workspace.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { existsSync } from 'node:fs';
import { mkdir, readFile, rm } from 'node:fs/promises';
import { mkdir, rm } from 'node:fs/promises';
import { basename, resolve } from 'node:path';

import { afterEach, beforeEach, expect, test, vi } from 'vitest';
Expand Down Expand Up @@ -34,7 +34,9 @@ test('getWorkspace', async () => {
expect(await getWorkspace('dir-1')).toBeUndefined();

await createWorkspace('dir-1');
expect(await getWorkspace('dir-1')).toBe(

const workspace = await getWorkspace('dir-1');
expect(workspace).toBe(
resolve(mocks.testHomedir(), '.codew/workspaces/dir-1.code-workspace')
);
});
48 changes: 48 additions & 0 deletions test/operations/validate-workspace.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import { existsSync } from 'node:fs';
import { mkdir, rm } from 'node:fs/promises';
import { basename, resolve } from 'node:path';

import { afterEach, beforeEach, expect, test, vi } from 'vitest';

import { createWorkspace } from '../../src/operations/create-workspace';
import { validateWorkspace } from '../../src/operations/validate-workspace';

const mocks = vi.hoisted(() => {
return {
testHomedir: () => resolve('test-tmp', basename(import.meta.url)),
};
});

beforeEach(async () => {
if (existsSync(mocks.testHomedir())) {
await rm(mocks.testHomedir(), { recursive: true, force: true });
}
await mkdir(mocks.testHomedir(), { recursive: true });

vi.mock('node:os', () => {
return {
homedir: () => mocks.testHomedir(),
};
});
});

afterEach(async () => {
vi.restoreAllMocks();
});

test('validateWorkspace', async () => {
await createWorkspace('dir-1');

const codeWorkspace = resolve(
mocks.testHomedir(),
'.codew/workspaces/dir-1.code-workspace'
);

expect(await validateWorkspace(codeWorkspace)).toBe(true);

// // remove .code-workspace directly
await rm(codeWorkspace, { recursive: true, force: true });

expect(await validateWorkspace(codeWorkspace)).toBe(false);
expect(existsSync(codeWorkspace)).toBe(false);
});