@einja/dev-cli 0.1.16 → 0.1.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +3 -1
- package/dist/commands/task-loop/index.d.ts.map +1 -1
- package/dist/commands/task-loop/index.js +19 -4
- package/dist/commands/task-loop/index.js.map +1 -1
- package/dist/commands/task-loop/lib/branch-selector.d.ts +13 -0
- package/dist/commands/task-loop/lib/branch-selector.d.ts.map +1 -0
- package/dist/commands/task-loop/lib/branch-selector.js +93 -0
- package/dist/commands/task-loop/lib/branch-selector.js.map +1 -0
- package/dist/commands/task-loop/lib/dependency-resolver.d.ts.map +1 -1
- package/dist/commands/task-loop/lib/dependency-resolver.js +4 -2
- package/dist/commands/task-loop/lib/dependency-resolver.js.map +1 -1
- package/dist/commands/task-loop/lib/dependency-resolver.test.js +494 -0
- package/dist/commands/task-loop/lib/dependency-resolver.test.js.map +1 -1
- package/dist/commands/task-loop/lib/worktree-utils.d.ts +30 -0
- package/dist/commands/task-loop/lib/worktree-utils.d.ts.map +1 -0
- package/dist/commands/task-loop/lib/worktree-utils.js +85 -0
- package/dist/commands/task-loop/lib/worktree-utils.js.map +1 -0
- package/dist/commands/task-loop/lib/worktree-utils.test.d.ts +2 -0
- package/dist/commands/task-loop/lib/worktree-utils.test.d.ts.map +1 -0
- package/dist/commands/task-loop/lib/worktree-utils.test.js +190 -0
- package/dist/commands/task-loop/lib/worktree-utils.test.js.map +1 -0
- package/dist/lib/preset-update/file-copier.d.ts +7 -1
- package/dist/lib/preset-update/file-copier.d.ts.map +1 -1
- package/dist/lib/preset-update/file-copier.js +37 -2
- package/dist/lib/preset-update/file-copier.js.map +1 -1
- package/dist/lib/sync/category-validator.d.ts +1 -1
- package/dist/lib/sync/category-validator.d.ts.map +1 -1
- package/dist/lib/sync/category-validator.js +1 -1
- package/dist/lib/sync/category-validator.js.map +1 -1
- package/dist/lib/sync/category-validator.test.js +3 -3
- package/dist/lib/sync/category-validator.test.js.map +1 -1
- package/dist/lib/sync/file-filter.d.ts.map +1 -1
- package/dist/lib/sync/file-filter.js +24 -0
- package/dist/lib/sync/file-filter.js.map +1 -1
- package/dist/lib/sync/file-filter.test.js +39 -0
- package/dist/lib/sync/file-filter.test.js.map +1 -1
- package/package.json +1 -1
- package/presets/default/.envrc +30 -0
- package/scaffolds/steering/README.md +1 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worktree-utils.d.ts","sourceRoot":"","sources":["../../../../src/commands/task-loop/lib/worktree-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AASD;;;;;;;;;GASG;AACH,wBAAsB,0BAA0B,CAC9C,SAAS,EAAE,MAAM,EACjB,YAAY,SAAQ,EACpB,UAAU,SAAI,EACd,YAAY,SAAM,GACjB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAsCxB;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,iBAAiB,CAoBtE"}
|
|
@@ -0,0 +1,85 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Git worktree 関連のユーティリティ関数
|
|
3
|
+
*/
|
|
4
|
+
import { execFileSync, execSync } from "node:child_process";
|
|
5
|
+
import { existsSync } from "node:fs";
|
|
6
|
+
import { join } from "node:path";
|
|
7
|
+
/**
|
|
8
|
+
* 指定ミリ秒待機する
|
|
9
|
+
*/
|
|
10
|
+
function sleep(ms) {
|
|
11
|
+
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
12
|
+
}
|
|
13
|
+
/**
|
|
14
|
+
* attempt.id からワークツリーパスを取得
|
|
15
|
+
* --porcelain オプションで安定したパースを実現
|
|
16
|
+
*
|
|
17
|
+
* @param attemptId - Vibe-KanbanのattemptID
|
|
18
|
+
* @param branchPrefix - ブランチ名のプレフィックス(デフォルト: "vk/")
|
|
19
|
+
* @param maxRetries - 最大リトライ回数(デフォルト: 3)
|
|
20
|
+
* @param retryDelayMs - リトライ間隔(デフォルト: 500ms)
|
|
21
|
+
* @returns ワークツリーのパス。見つからない場合は null
|
|
22
|
+
*/
|
|
23
|
+
export async function getWorktreePathByAttemptId(attemptId, branchPrefix = "vk/", maxRetries = 3, retryDelayMs = 500) {
|
|
24
|
+
const branchName = `${branchPrefix}${attemptId}`;
|
|
25
|
+
for (let i = 0; i < maxRetries; i++) {
|
|
26
|
+
try {
|
|
27
|
+
// --porcelain で機械可読な形式を取得
|
|
28
|
+
const output = execSync("git worktree list --porcelain", { encoding: "utf-8" });
|
|
29
|
+
const blocks = output.trim().split("\n\n");
|
|
30
|
+
for (const block of blocks) {
|
|
31
|
+
const lines = block.split("\n");
|
|
32
|
+
let worktreePath = null;
|
|
33
|
+
let branch = null;
|
|
34
|
+
for (const line of lines) {
|
|
35
|
+
if (line.startsWith("worktree ")) {
|
|
36
|
+
worktreePath = line.slice("worktree ".length);
|
|
37
|
+
}
|
|
38
|
+
if (line.startsWith("branch refs/heads/")) {
|
|
39
|
+
branch = line.slice("branch refs/heads/".length);
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
if (branch === branchName && worktreePath) {
|
|
43
|
+
return worktreePath;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
catch (_a) {
|
|
48
|
+
// git コマンド失敗時は次のリトライへ
|
|
49
|
+
}
|
|
50
|
+
// ワークツリー作成直後は反映されていない可能性があるためリトライ
|
|
51
|
+
if (i < maxRetries - 1) {
|
|
52
|
+
await sleep(retryDelayMs);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
return null;
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* 指定パスで direnv allow を実行
|
|
59
|
+
* .envrc が存在する場合のみ実行
|
|
60
|
+
*
|
|
61
|
+
* @param worktreePath - ワークツリーのパス
|
|
62
|
+
* @returns 実行結果
|
|
63
|
+
*/
|
|
64
|
+
export function runDirenvAllow(worktreePath) {
|
|
65
|
+
var _a;
|
|
66
|
+
// .envrc が存在しない場合はスキップ
|
|
67
|
+
if (!existsSync(join(worktreePath, ".envrc"))) {
|
|
68
|
+
return { success: true }; // .envrc がないので成功扱い
|
|
69
|
+
}
|
|
70
|
+
try {
|
|
71
|
+
// execFileSync を使用してシェルインジェクションを防止
|
|
72
|
+
execFileSync("direnv", ["allow", worktreePath], {
|
|
73
|
+
cwd: worktreePath,
|
|
74
|
+
stdio: "pipe",
|
|
75
|
+
});
|
|
76
|
+
return { success: true };
|
|
77
|
+
}
|
|
78
|
+
catch (error) {
|
|
79
|
+
const stderr = error instanceof Error && "stderr" in error
|
|
80
|
+
? (_a = error.stderr) === null || _a === void 0 ? void 0 : _a.toString()
|
|
81
|
+
: undefined;
|
|
82
|
+
return { success: false, error: stderr || "direnv allow failed" };
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
//# sourceMappingURL=worktree-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worktree-utils.js","sourceRoot":"","sources":["../../../../src/commands/task-loop/lib/worktree-utils.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAUjC;;GAEG;AACH,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,CAAC,KAAK,UAAU,0BAA0B,CAC9C,SAAiB,EACjB,YAAY,GAAG,KAAK,EACpB,UAAU,GAAG,CAAC,EACd,YAAY,GAAG,GAAG;IAElB,MAAM,UAAU,GAAG,GAAG,YAAY,GAAG,SAAS,EAAE,CAAC;IAEjD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC;QACpC,IAAI,CAAC;YACH,0BAA0B;YAC1B,MAAM,MAAM,GAAG,QAAQ,CAAC,+BAA+B,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;YAChF,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAE3C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBAC3B,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAChC,IAAI,YAAY,GAAkB,IAAI,CAAC;gBACvC,IAAI,MAAM,GAAkB,IAAI,CAAC;gBAEjC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;oBACzB,IAAI,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;wBACjC,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;oBAChD,CAAC;oBACD,IAAI,IAAI,CAAC,UAAU,CAAC,oBAAoB,CAAC,EAAE,CAAC;wBAC1C,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;oBACnD,CAAC;gBACH,CAAC;gBAED,IAAI,MAAM,KAAK,UAAU,IAAI,YAAY,EAAE,CAAC;oBAC1C,OAAO,YAAY,CAAC;gBACtB,CAAC;YACH,CAAC;QACH,CAAC;QAAC,WAAM,CAAC;YACP,sBAAsB;QACxB,CAAC;QAED,kCAAkC;QAClC,IAAI,CAAC,GAAG,UAAU,GAAG,CAAC,EAAE,CAAC;YACvB,MAAM,KAAK,CAAC,YAAY,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,cAAc,CAAC,YAAoB;;IACjD,uBAAuB;IACvB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC;QAC9C,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,mBAAmB;IAC/C,CAAC;IAED,IAAI,CAAC;QACH,mCAAmC;QACnC,YAAY,CAAC,QAAQ,EAAE,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE;YAC9C,GAAG,EAAE,YAAY;YACjB,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;QACH,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,MAAM,GACV,KAAK,YAAY,KAAK,IAAI,QAAQ,IAAI,KAAK;YACzC,CAAC,CAAC,MAAC,KAA6B,CAAC,MAAM,0CAAE,QAAQ,EAAE;YACnD,CAAC,CAAC,SAAS,CAAC;QAChB,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,IAAI,qBAAqB,EAAE,CAAC;IACpE,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worktree-utils.test.d.ts","sourceRoot":"","sources":["../../../../src/commands/task-loop/lib/worktree-utils.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,190 @@
|
|
|
1
|
+
import { beforeEach, describe, expect, it, vi } from "vitest";
|
|
2
|
+
import { getWorktreePathByAttemptId, runDirenvAllow } from "./worktree-utils.js";
|
|
3
|
+
// node:child_process のモック
|
|
4
|
+
vi.mock("node:child_process", () => ({
|
|
5
|
+
execSync: vi.fn(),
|
|
6
|
+
execFileSync: vi.fn(),
|
|
7
|
+
}));
|
|
8
|
+
// node:fs のモック
|
|
9
|
+
vi.mock("node:fs", () => ({
|
|
10
|
+
existsSync: vi.fn(),
|
|
11
|
+
}));
|
|
12
|
+
import { execFileSync, execSync } from "node:child_process";
|
|
13
|
+
import { existsSync } from "node:fs";
|
|
14
|
+
describe("worktree-utils", () => {
|
|
15
|
+
beforeEach(() => {
|
|
16
|
+
// 各テスト前にモックをリセット
|
|
17
|
+
vi.clearAllMocks();
|
|
18
|
+
});
|
|
19
|
+
describe("getWorktreePathByAttemptId", () => {
|
|
20
|
+
it("porcelain形式の出力をパースし、ブランチ名が一致するワークツリーパスを返す", async () => {
|
|
21
|
+
// Given: git worktree list --porcelain の出力
|
|
22
|
+
const porcelainOutput = `worktree /path/to/main
|
|
23
|
+
HEAD abc123def456
|
|
24
|
+
branch refs/heads/main
|
|
25
|
+
|
|
26
|
+
worktree /path/to/worktree1
|
|
27
|
+
HEAD def456abc789
|
|
28
|
+
branch refs/heads/vk/attempt-123
|
|
29
|
+
|
|
30
|
+
worktree /path/to/worktree2
|
|
31
|
+
HEAD 789abc456def
|
|
32
|
+
branch refs/heads/feature/test
|
|
33
|
+
`;
|
|
34
|
+
vi.mocked(execSync).mockReturnValue(porcelainOutput);
|
|
35
|
+
// When: attempt-123 のワークツリーパスを取得
|
|
36
|
+
const result = await getWorktreePathByAttemptId("attempt-123");
|
|
37
|
+
// Then: 正しいパスが返る
|
|
38
|
+
expect(result).toBe("/path/to/worktree1");
|
|
39
|
+
expect(execSync).toHaveBeenCalledWith("git worktree list --porcelain", {
|
|
40
|
+
encoding: "utf-8",
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
|
+
it("複数のワークツリーがある場合、正しいブランチのものを選択する", async () => {
|
|
44
|
+
// Given: 複数のワークツリーを含む出力
|
|
45
|
+
const porcelainOutput = `worktree /path/to/main
|
|
46
|
+
HEAD abc123def456
|
|
47
|
+
branch refs/heads/main
|
|
48
|
+
|
|
49
|
+
worktree /path/to/vk-attempt-456
|
|
50
|
+
HEAD def456abc789
|
|
51
|
+
branch refs/heads/vk/attempt-456
|
|
52
|
+
|
|
53
|
+
worktree /path/to/vk-attempt-789
|
|
54
|
+
HEAD 789abc456def
|
|
55
|
+
branch refs/heads/vk/attempt-789
|
|
56
|
+
`;
|
|
57
|
+
vi.mocked(execSync).mockReturnValue(porcelainOutput);
|
|
58
|
+
// When: attempt-789 のワークツリーパスを取得
|
|
59
|
+
const result = await getWorktreePathByAttemptId("attempt-789");
|
|
60
|
+
// Then: attempt-789 に対応するパスが返る
|
|
61
|
+
expect(result).toBe("/path/to/vk-attempt-789");
|
|
62
|
+
});
|
|
63
|
+
it("ブランチが見つからない場合、nullを返す", async () => {
|
|
64
|
+
// Given: 対象のブランチが存在しない出力
|
|
65
|
+
const porcelainOutput = `worktree /path/to/main
|
|
66
|
+
HEAD abc123def456
|
|
67
|
+
branch refs/heads/main
|
|
68
|
+
|
|
69
|
+
worktree /path/to/worktree1
|
|
70
|
+
HEAD def456abc789
|
|
71
|
+
branch refs/heads/vk/attempt-123
|
|
72
|
+
`;
|
|
73
|
+
vi.mocked(execSync).mockReturnValue(porcelainOutput);
|
|
74
|
+
// When: 存在しないattempt-999のワークツリーパスを取得
|
|
75
|
+
const result = await getWorktreePathByAttemptId("attempt-999");
|
|
76
|
+
// Then: nullが返る
|
|
77
|
+
expect(result).toBeNull();
|
|
78
|
+
});
|
|
79
|
+
it("gitコマンドが失敗した場合、リトライして最終的にnullを返す", async () => {
|
|
80
|
+
// Given: execSyncが常に失敗する
|
|
81
|
+
vi.mocked(execSync).mockImplementation(() => {
|
|
82
|
+
throw new Error("git command failed");
|
|
83
|
+
});
|
|
84
|
+
// When: ワークツリーパスを取得(maxRetries=3, retryDelayMs=10で高速化)
|
|
85
|
+
const result = await getWorktreePathByAttemptId("attempt-123", "vk/", 3, 10);
|
|
86
|
+
// Then: nullが返り、3回リトライされる
|
|
87
|
+
expect(result).toBeNull();
|
|
88
|
+
expect(execSync).toHaveBeenCalledTimes(3);
|
|
89
|
+
});
|
|
90
|
+
it("1回目は失敗し2回目で成功した場合、正しいパスを返す", async () => {
|
|
91
|
+
// Given: 1回目は失敗、2回目以降は成功
|
|
92
|
+
vi.mocked(execSync)
|
|
93
|
+
.mockImplementationOnce(() => {
|
|
94
|
+
throw new Error("git command failed");
|
|
95
|
+
})
|
|
96
|
+
.mockReturnValue(`worktree /path/to/worktree1
|
|
97
|
+
HEAD def456abc789
|
|
98
|
+
branch refs/heads/vk/attempt-123
|
|
99
|
+
`);
|
|
100
|
+
// When: ワークツリーパスを取得(retryDelayMs=10で高速化)
|
|
101
|
+
const result = await getWorktreePathByAttemptId("attempt-123", "vk/", 3, 10);
|
|
102
|
+
// Then: 正しいパスが返る
|
|
103
|
+
expect(result).toBe("/path/to/worktree1");
|
|
104
|
+
expect(execSync).toHaveBeenCalledTimes(2);
|
|
105
|
+
});
|
|
106
|
+
it("空の出力の場合、nullを返す", async () => {
|
|
107
|
+
// Given: 空の出力
|
|
108
|
+
vi.mocked(execSync).mockReturnValue("");
|
|
109
|
+
// When: ワークツリーパスを取得
|
|
110
|
+
const result = await getWorktreePathByAttemptId("attempt-123");
|
|
111
|
+
// Then: nullが返る
|
|
112
|
+
expect(result).toBeNull();
|
|
113
|
+
});
|
|
114
|
+
it("ワークツリーパスは存在するがブランチ情報がない場合、nullを返す", async () => {
|
|
115
|
+
// Given: ブランチ情報がない出力
|
|
116
|
+
const porcelainOutput = `worktree /path/to/worktree1
|
|
117
|
+
HEAD def456abc789
|
|
118
|
+
`;
|
|
119
|
+
vi.mocked(execSync).mockReturnValue(porcelainOutput);
|
|
120
|
+
// When: ワークツリーパスを取得
|
|
121
|
+
const result = await getWorktreePathByAttemptId("attempt-123");
|
|
122
|
+
// Then: nullが返る(ブランチ情報がないため)
|
|
123
|
+
expect(result).toBeNull();
|
|
124
|
+
});
|
|
125
|
+
});
|
|
126
|
+
describe("runDirenvAllow", () => {
|
|
127
|
+
it(".envrcが存在しない場合、成功を返す", () => {
|
|
128
|
+
// Given: .envrcファイルが存在しない
|
|
129
|
+
vi.mocked(existsSync).mockReturnValue(false);
|
|
130
|
+
// When: direnv allowを実行
|
|
131
|
+
const result = runDirenvAllow("/path/to/worktree");
|
|
132
|
+
// Then: 成功が返る
|
|
133
|
+
expect(result.success).toBe(true);
|
|
134
|
+
expect(execFileSync).not.toHaveBeenCalled();
|
|
135
|
+
});
|
|
136
|
+
it(".envrcが存在する場合、direnvコマンドを実行し成功を返す", () => {
|
|
137
|
+
// Given: .envrcファイルが存在し、direnvコマンドが成功する
|
|
138
|
+
vi.mocked(existsSync).mockReturnValue(true);
|
|
139
|
+
vi.mocked(execFileSync).mockReturnValue("");
|
|
140
|
+
// When: direnv allowを実行
|
|
141
|
+
const result = runDirenvAllow("/path/to/worktree");
|
|
142
|
+
// Then: 成功が返り、正しいコマンドが実行される
|
|
143
|
+
expect(result.success).toBe(true);
|
|
144
|
+
expect(execFileSync).toHaveBeenCalledWith("direnv", ["allow", "/path/to/worktree"], {
|
|
145
|
+
cwd: "/path/to/worktree",
|
|
146
|
+
stdio: "pipe",
|
|
147
|
+
});
|
|
148
|
+
});
|
|
149
|
+
it("direnvコマンドが失敗した場合、エラーを返す", () => {
|
|
150
|
+
// Given: .envrcファイルが存在し、direnvコマンドが失敗する
|
|
151
|
+
vi.mocked(existsSync).mockReturnValue(true);
|
|
152
|
+
const mockError = new Error("direnv failed");
|
|
153
|
+
mockError.stderr = Buffer.from("permission denied");
|
|
154
|
+
vi.mocked(execFileSync).mockImplementation(() => {
|
|
155
|
+
throw mockError;
|
|
156
|
+
});
|
|
157
|
+
// When: direnv allowを実行
|
|
158
|
+
const result = runDirenvAllow("/path/to/worktree");
|
|
159
|
+
// Then: エラーが返る
|
|
160
|
+
expect(result.success).toBe(false);
|
|
161
|
+
expect(result.error).toBe("permission denied");
|
|
162
|
+
});
|
|
163
|
+
it("direnvコマンドが失敗しstderrがない場合、デフォルトエラーメッセージを返す", () => {
|
|
164
|
+
// Given: .envrcファイルが存在し、direnvコマンドがstderrなしで失敗する
|
|
165
|
+
vi.mocked(existsSync).mockReturnValue(true);
|
|
166
|
+
vi.mocked(execFileSync).mockImplementation(() => {
|
|
167
|
+
throw new Error("unknown error");
|
|
168
|
+
});
|
|
169
|
+
// When: direnv allowを実行
|
|
170
|
+
const result = runDirenvAllow("/path/to/worktree");
|
|
171
|
+
// Then: デフォルトエラーメッセージが返る
|
|
172
|
+
expect(result.success).toBe(false);
|
|
173
|
+
expect(result.error).toBe("direnv allow failed");
|
|
174
|
+
});
|
|
175
|
+
it("パスにスペースが含まれる場合も正しく処理される", () => {
|
|
176
|
+
// Given: スペースを含むパスで.envrcが存在
|
|
177
|
+
vi.mocked(existsSync).mockReturnValue(true);
|
|
178
|
+
vi.mocked(execFileSync).mockReturnValue("");
|
|
179
|
+
// When: direnv allowを実行
|
|
180
|
+
const result = runDirenvAllow("/path/to/my worktree");
|
|
181
|
+
// Then: パスが配列要素として正しく渡される
|
|
182
|
+
expect(result.success).toBe(true);
|
|
183
|
+
expect(execFileSync).toHaveBeenCalledWith("direnv", ["allow", "/path/to/my worktree"], {
|
|
184
|
+
cwd: "/path/to/my worktree",
|
|
185
|
+
stdio: "pipe",
|
|
186
|
+
});
|
|
187
|
+
});
|
|
188
|
+
});
|
|
189
|
+
});
|
|
190
|
+
//# sourceMappingURL=worktree-utils.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worktree-utils.test.js","sourceRoot":"","sources":["../../../../src/commands/task-loop/lib/worktree-utils.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,12 @@ export declare class FileCopier {
|
|
|
11
11
|
* プロジェクト → CLIプリセットのディレクトリマッピング定義
|
|
12
12
|
*/
|
|
13
13
|
private readonly directoryMappings;
|
|
14
|
+
/**
|
|
15
|
+
* 単一ファイルマッピング
|
|
16
|
+
*
|
|
17
|
+
* ディレクトリではなく個別ファイルのマッピング
|
|
18
|
+
*/
|
|
19
|
+
private readonly singleFileMappings;
|
|
14
20
|
/**
|
|
15
21
|
* プリセットへファイルをコピー
|
|
16
22
|
*
|
|
@@ -40,7 +46,7 @@ export declare class FileCopier {
|
|
|
40
46
|
*
|
|
41
47
|
* 以下の条件でスキップします:
|
|
42
48
|
* - _プレフィックスで始まるファイル
|
|
43
|
-
* - .DS_Store
|
|
49
|
+
* - .DS_Store等の隠しファイル(ただし単一ファイルマッピングで定義されたファイルは除く)
|
|
44
50
|
*
|
|
45
51
|
* @param filePath - ファイルパス(相対パス)
|
|
46
52
|
* @returns スキップする場合true
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-copier.d.ts","sourceRoot":"","sources":["../../../src/lib/preset-update/file-copier.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAEV,WAAW,EACX,UAAU,EAEV,UAAU,EACX,MAAM,8BAA8B,CAAC;AAwBtC;;;;GAIG;AACH,qBAAa,UAAU;IACrB;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAyChC;IAEF;;;;;OAKG;IACG,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAgE7D;;;;;OAKG;IACG,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"file-copier.d.ts","sourceRoot":"","sources":["../../../src/lib/preset-update/file-copier.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAEV,WAAW,EACX,UAAU,EAEV,UAAU,EACX,MAAM,8BAA8B,CAAC;AAwBtC;;;;GAIG;AACH,qBAAa,UAAU;IACrB;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAyChC;IAEF;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAMjC;IAEF;;;;;OAKG;IACG,YAAY,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;IAgE7D;;;;;OAKG;IACG,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IA8CjE;;;;;;;;OAQG;IACH,OAAO,CAAC,aAAa;IAwCrB;;;;;;;;;OASG;IACH,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAqBrC;;;;;;;;;OASG;IACH,OAAO,CAAC,wBAAwB;CAwBjC"}
|
|
@@ -54,6 +54,18 @@ export class FileCopier {
|
|
|
54
54
|
category: "docs",
|
|
55
55
|
},
|
|
56
56
|
];
|
|
57
|
+
/**
|
|
58
|
+
* 単一ファイルマッピング
|
|
59
|
+
*
|
|
60
|
+
* ディレクトリではなく個別ファイルのマッピング
|
|
61
|
+
*/
|
|
62
|
+
this.singleFileMappings = [
|
|
63
|
+
{
|
|
64
|
+
source: ".envrc",
|
|
65
|
+
destination: ".envrc",
|
|
66
|
+
category: "env",
|
|
67
|
+
},
|
|
68
|
+
];
|
|
57
69
|
}
|
|
58
70
|
/**
|
|
59
71
|
* プリセットへファイルをコピー
|
|
@@ -122,6 +134,7 @@ export class FileCopier {
|
|
|
122
134
|
*/
|
|
123
135
|
async scanSourceFiles(projectRoot) {
|
|
124
136
|
const sourceFiles = [];
|
|
137
|
+
// ディレクトリマッピングの処理
|
|
125
138
|
for (const mapping of this.directoryMappings) {
|
|
126
139
|
const sourceDir = join(projectRoot, mapping.source);
|
|
127
140
|
// ソースディレクトリが存在しない場合はスキップ
|
|
@@ -137,6 +150,19 @@ export class FileCopier {
|
|
|
137
150
|
sourceFiles.push(Object.assign(Object.assign({}, file), { category: mapping.category }));
|
|
138
151
|
}
|
|
139
152
|
}
|
|
153
|
+
// 単一ファイルマッピングの処理
|
|
154
|
+
for (const mapping of this.singleFileMappings) {
|
|
155
|
+
const sourcePath = join(projectRoot, mapping.source);
|
|
156
|
+
// ソースファイルが存在しない場合はスキップ
|
|
157
|
+
if (!existsSync(sourcePath)) {
|
|
158
|
+
continue;
|
|
159
|
+
}
|
|
160
|
+
sourceFiles.push({
|
|
161
|
+
relativePath: mapping.source,
|
|
162
|
+
absolutePath: sourcePath,
|
|
163
|
+
category: mapping.category,
|
|
164
|
+
});
|
|
165
|
+
}
|
|
140
166
|
return sourceFiles;
|
|
141
167
|
}
|
|
142
168
|
/**
|
|
@@ -182,7 +208,7 @@ export class FileCopier {
|
|
|
182
208
|
*
|
|
183
209
|
* 以下の条件でスキップします:
|
|
184
210
|
* - _プレフィックスで始まるファイル
|
|
185
|
-
* - .DS_Store
|
|
211
|
+
* - .DS_Store等の隠しファイル(ただし単一ファイルマッピングで定義されたファイルは除く)
|
|
186
212
|
*
|
|
187
213
|
* @param filePath - ファイルパス(相対パス)
|
|
188
214
|
* @returns スキップする場合true
|
|
@@ -193,6 +219,10 @@ export class FileCopier {
|
|
|
193
219
|
if (fileName.startsWith("_")) {
|
|
194
220
|
return true;
|
|
195
221
|
}
|
|
222
|
+
// 単一ファイルマッピングで定義されたファイルはスキップしない
|
|
223
|
+
if (this.singleFileMappings.some((m) => m.source === filePath)) {
|
|
224
|
+
return false;
|
|
225
|
+
}
|
|
196
226
|
// .で始まるファイル(隠しファイル)はスキップ
|
|
197
227
|
if (fileName.startsWith(".")) {
|
|
198
228
|
return true;
|
|
@@ -210,7 +240,12 @@ export class FileCopier {
|
|
|
210
240
|
* @returns コピー先の絶対パス
|
|
211
241
|
*/
|
|
212
242
|
calculateDestinationPath(sourceFile, preset) {
|
|
213
|
-
//
|
|
243
|
+
// 単一ファイルマッピングをチェック
|
|
244
|
+
const singleFileMapping = this.singleFileMappings.find((m) => m.source === sourceFile.relativePath);
|
|
245
|
+
if (singleFileMapping) {
|
|
246
|
+
return join(preset.path, singleFileMapping.destination);
|
|
247
|
+
}
|
|
248
|
+
// ディレクトリマッピングを探す
|
|
214
249
|
const mapping = this.directoryMappings.find((m) => sourceFile.relativePath.startsWith(m.source));
|
|
215
250
|
if (!mapping) {
|
|
216
251
|
throw new Error(`マッピングが見つかりません: ${sourceFile.relativePath}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-copier.js","sourceRoot":"","sources":["../../../src/lib/preset-update/file-copier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AA+B9D;;;;GAIG;AACH,MAAM,OAAO,UAAU;IAAvB;QACE;;;;WAIG;QACc,sBAAiB,GAAuB;YACvD;gBACE,MAAM,EAAE,kBAAkB;gBAC1B,WAAW,EAAE,wBAAwB;gBACrC,QAAQ,EAAE,UAAU;aACrB;YACD;gBACE,MAAM,EAAE,gBAAgB;gBACxB,WAAW,EAAE,sBAAsB;gBACnC,QAAQ,EAAE,QAAQ;aACnB;YACD;gBACE,MAAM,EAAE,gBAAgB;gBACxB,WAAW,EAAE,gBAAgB;gBAC7B,QAAQ,EAAE,QAAQ;aACnB;YACD;gBACE,MAAM,EAAE,eAAe;gBACvB,WAAW,EAAE,eAAe;gBAC5B,QAAQ,EAAE,OAAO;aAClB;YACD;gBACE,MAAM,EAAE,qBAAqB;gBAC7B,WAAW,EAAE,qBAAqB;gBAClC,QAAQ,EAAE,MAAM;aACjB;YACD;gBACE,MAAM,EAAE,sBAAsB;gBAC9B,WAAW,EAAE,sBAAsB;gBACnC,QAAQ,EAAE,MAAM;aACjB;YACD;gBACE,MAAM,EAAE,yBAAyB;gBACjC,WAAW,EAAE,yBAAyB;gBACtC,QAAQ,EAAE,MAAM;aACjB;YACD;gBACE,MAAM,EAAE,oBAAoB;gBAC5B,WAAW,EAAE,oBAAoB;gBACjC,QAAQ,EAAE,MAAM;aACjB;SACF,CAAC;
|
|
1
|
+
{"version":3,"file":"file-copier.js","sourceRoot":"","sources":["../../../src/lib/preset-update/file-copier.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"category-validator.d.ts","sourceRoot":"","sources":["../../../src/lib/sync/category-validator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;GAEG;AACH,eAAO,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"category-validator.d.ts","sourceRoot":"","sources":["../../../src/lib/sync/category-validator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;GAEG;AACH,eAAO,MAAM,gBAAgB,mEAAoE,CAAC;AAElG;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAW,wBAAwB;IACvC,oBAAoB;IACpB,KAAK,EAAE,OAAO,CAAC;IACf,kBAAkB;IAClB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,kBAAkB;IAClB,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,cAAc,EAAE,MAAM,GAAG,wBAAwB,CAuBnF;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,iBAAiB,EAAE,MAAM,EAAE,GAAG,MAAM,CAKhF"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
/**
|
|
6
6
|
* 有効なカテゴリのリスト
|
|
7
7
|
*/
|
|
8
|
-
export const VALID_CATEGORIES = ["commands", "agents", "skills", "hooks", "docs"];
|
|
8
|
+
export const VALID_CATEGORIES = ["commands", "agents", "skills", "hooks", "docs", "env"];
|
|
9
9
|
/**
|
|
10
10
|
* カテゴリ文字列をパースしてバリデーションする
|
|
11
11
|
* @param categoryString カンマ区切りのカテゴリ文字列(例: "commands,agents")
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"category-validator.js","sourceRoot":"","sources":["../../../src/lib/sync/category-validator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"category-validator.js","sourceRoot":"","sources":["../../../src/lib/sync/category-validator.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;GAEG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,UAAU,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,CAAU,CAAC;AAmBlG;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,cAAsB;IACvD,cAAc;IACd,MAAM,UAAU,GAAG,cAAc;SAC9B,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;SACxB,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;IAE/B,MAAM,eAAe,GAAa,EAAE,CAAC;IACrC,MAAM,iBAAiB,GAAa,EAAE,CAAC;IAEvC,KAAK,MAAM,QAAQ,IAAI,UAAU,EAAE,CAAC;QAClC,IAAI,gBAAgB,CAAC,QAAQ,CAAC,QAAyB,CAAC,EAAE,CAAC;YACzD,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACjC,CAAC;aAAM,CAAC;YACN,iBAAiB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED,OAAO;QACL,KAAK,EAAE,iBAAiB,CAAC,MAAM,KAAK,CAAC;QACrC,eAAe;QACf,iBAAiB;KAClB,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,4BAA4B,CAAC,iBAA2B;IACtE,MAAM,WAAW,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjD,MAAM,SAAS,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAE9C,OAAO,YAAY,WAAW,+BAA+B,SAAS,EAAE,CAAC;AAC3E,CAAC"}
|
|
@@ -62,18 +62,18 @@ describe("category-validator", () => {
|
|
|
62
62
|
const message = createValidationErrorMessage(["invalid-category"]);
|
|
63
63
|
expect(message).toContain("無効なカテゴリ: invalid-category");
|
|
64
64
|
expect(message).toContain("有効なカテゴリは以下のいずれかです:");
|
|
65
|
-
expect(message).toContain("commands, agents, skills, hooks, docs");
|
|
65
|
+
expect(message).toContain("commands, agents, skills, hooks, docs, env");
|
|
66
66
|
});
|
|
67
67
|
it("複数の無効なカテゴリのエラーメッセージを生成する", () => {
|
|
68
68
|
const message = createValidationErrorMessage(["invalid1", "invalid2", "invalid3"]);
|
|
69
69
|
expect(message).toContain("無効なカテゴリ: invalid1, invalid2, invalid3");
|
|
70
70
|
expect(message).toContain("有効なカテゴリは以下のいずれかです:");
|
|
71
|
-
expect(message).toContain("commands, agents, skills, hooks, docs");
|
|
71
|
+
expect(message).toContain("commands, agents, skills, hooks, docs, env");
|
|
72
72
|
});
|
|
73
73
|
});
|
|
74
74
|
describe("VALID_CATEGORIES", () => {
|
|
75
75
|
it("全ての有効なカテゴリが定義されている", () => {
|
|
76
|
-
expect(VALID_CATEGORIES).toEqual(["commands", "agents", "skills", "hooks", "docs"]);
|
|
76
|
+
expect(VALID_CATEGORIES).toEqual(["commands", "agents", "skills", "hooks", "docs", "env"]);
|
|
77
77
|
});
|
|
78
78
|
});
|
|
79
79
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"category-validator.test.js","sourceRoot":"","sources":["../../../src/lib/sync/category-validator.test.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"category-validator.test.js","sourceRoot":"","sources":["../../../src/lib/sync/category-validator.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-filter.d.ts","sourceRoot":"","sources":["../../../src/lib/sync/file-filter.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"file-filter.d.ts","sourceRoot":"","sources":["../../../src/lib/sync/file-filter.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAmBnE;;;GAGG;AACH,qBAAa,UAAU;IACrB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,YAAY,CAA0C;gBAElD,WAAW,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM;IAKrD;;OAEG;IACG,eAAe,CAAC,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IA6EvE;;OAEG;IACH,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,kBAAkB,CAAC,EAAE,MAAM,EAAE,GAAG,OAAO;IA8BvE;;OAEG;IACH,gBAAgB,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE;IAIzE;;OAEG;IACH,mBAAmB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IA4BpD;;OAEG;YACW,aAAa;IAe3B;;OAEG;IACH,OAAO,CAAC,cAAc;IAatB;;OAEG;IACH,OAAO,CAAC,YAAY;CAuBrB"}
|
|
@@ -11,6 +11,7 @@ const CATEGORY_MAPPING = {
|
|
|
11
11
|
skills: ".claude/skills",
|
|
12
12
|
hooks: ".claude/hooks",
|
|
13
13
|
docs: "docs/einja",
|
|
14
|
+
env: ".",
|
|
14
15
|
};
|
|
15
16
|
/**
|
|
16
17
|
* einja-プレフィックスでフィルタリングが必要なカテゴリ
|
|
@@ -40,6 +41,22 @@ export class FileFilter {
|
|
|
40
41
|
if (!categoryPath) {
|
|
41
42
|
continue;
|
|
42
43
|
}
|
|
44
|
+
// envカテゴリは.envrcファイルのみを対象とする特別処理
|
|
45
|
+
if (category === "env") {
|
|
46
|
+
const envrcPath = ".envrc";
|
|
47
|
+
const templatePath = path.join(this.templateRoot, envrcPath);
|
|
48
|
+
const projectPath = path.join(this.projectRoot, envrcPath);
|
|
49
|
+
if (await fs.pathExists(templatePath)) {
|
|
50
|
+
const exists = await fs.pathExists(projectPath);
|
|
51
|
+
targets.push({
|
|
52
|
+
path: envrcPath,
|
|
53
|
+
category,
|
|
54
|
+
templatePath,
|
|
55
|
+
exists,
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
continue;
|
|
59
|
+
}
|
|
43
60
|
const templateDirPath = path.join(this.templateRoot, categoryPath);
|
|
44
61
|
if (!(await fs.pathExists(templateDirPath))) {
|
|
45
62
|
continue;
|
|
@@ -116,6 +133,13 @@ export class FileFilter {
|
|
|
116
133
|
*/
|
|
117
134
|
getCategoryFromPath(filePath) {
|
|
118
135
|
for (const [category, categoryPath] of Object.entries(CATEGORY_MAPPING)) {
|
|
136
|
+
// envカテゴリは.envrcファイルのみを対象とする特別処理
|
|
137
|
+
if (category === "env") {
|
|
138
|
+
if (filePath === ".envrc") {
|
|
139
|
+
return category;
|
|
140
|
+
}
|
|
141
|
+
continue;
|
|
142
|
+
}
|
|
119
143
|
if (filePath.startsWith(categoryPath)) {
|
|
120
144
|
// einja-プレフィックスフィルタリングが必要なカテゴリの場合
|
|
121
145
|
if (EINJA_PREFIX_CATEGORIES.includes(category)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-filter.js","sourceRoot":"","sources":["../../../src/lib/sync/file-filter.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,UAAU,CAAC;AAC1B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,MAAM,MAAM,QAAQ,CAAC;AAG5B;;GAEG;AACH,MAAM,gBAAgB,GAA2B;IAC/C,QAAQ,EAAE,wBAAwB;IAClC,MAAM,EAAE,sBAAsB;IAC9B,MAAM,EAAE,gBAAgB;IACxB,KAAK,EAAE,eAAe;IACtB,IAAI,EAAE,YAAY;
|
|
1
|
+
{"version":3,"file":"file-filter.js","sourceRoot":"","sources":["../../../src/lib/sync/file-filter.ts"],"names":[],"mappings":"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"}
|