@effect-app/cli 1.23.18 → 1.23.21
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/CHANGELOG.md +18 -0
- package/dist/index.js +140 -74
- package/eslint.config.mjs +1 -1
- package/package.json +3 -2
- package/src/index.ts +178 -93
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
# @effect-app/cli
|
|
2
2
|
|
|
3
|
+
## 1.23.21
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- f9aee77: some fixes
|
|
8
|
+
|
|
9
|
+
## 1.23.20
|
|
10
|
+
|
|
11
|
+
### Patch Changes
|
|
12
|
+
|
|
13
|
+
- f6a3328: export base eslint files so that we import them in projects
|
|
14
|
+
|
|
15
|
+
## 1.23.19
|
|
16
|
+
|
|
17
|
+
### Patch Changes
|
|
18
|
+
|
|
19
|
+
- 539e2f2: minor wiki command enhancements
|
|
20
|
+
|
|
3
21
|
## 1.23.18
|
|
4
22
|
|
|
5
23
|
### Patch Changes
|
package/dist/index.js
CHANGED
|
@@ -95,7 +95,7 @@ Effect
|
|
|
95
95
|
}
|
|
96
96
|
const allRejects = [...existingRejects, ...effectFilters];
|
|
97
97
|
yield* Effect.logInfo(`Excluding packages from update: ${allRejects.join(", ")}`);
|
|
98
|
-
const rejectArgs = allRejects.map(filter => `--reject "${filter}"`).join(" ");
|
|
98
|
+
const rejectArgs = allRejects.map((filter) => `--reject "${filter}"`).join(" ");
|
|
99
99
|
yield* runNodeCommandEC(`pnpm exec ncu -u ${rejectArgs}`);
|
|
100
100
|
yield* runNodeCommandEC(`pnpm -r exec ncu -u ${rejectArgs}`);
|
|
101
101
|
})();
|
|
@@ -275,7 +275,16 @@ Effect
|
|
|
275
275
|
// - skip "./index" to avoid conflicts with the main "." export
|
|
276
276
|
// - skip "/internal/" paths to keep internal modules private
|
|
277
277
|
...cur !== "./index" && !cur.includes("/internal/") && { [cur]: filteredExportEntries[cur] }
|
|
278
|
-
}), {})
|
|
278
|
+
}), {}),
|
|
279
|
+
// Preserve ESLint config exports for effect-app package
|
|
280
|
+
...(JSON.parse(yield* fs.readFileString(p + "/package.json", "utf-8")).name === "effect-app" && {
|
|
281
|
+
"./eslint.base.config": {
|
|
282
|
+
"default": "./src/eslint.base.config.mjs"
|
|
283
|
+
},
|
|
284
|
+
"./eslint.vue.config": {
|
|
285
|
+
"default": "./src/eslint.vue.config.mjs"
|
|
286
|
+
}
|
|
287
|
+
})
|
|
279
288
|
};
|
|
280
289
|
const pkgJson = JSON.parse(yield* fs.readFileString(p + "/package.json", "utf-8"));
|
|
281
290
|
pkgJson.exports = packageExports;
|
|
@@ -451,17 +460,33 @@ Effect
|
|
|
451
460
|
}), "Stopped monitoring package.json exports for all packages")
|
|
452
461
|
.pipe(Command.withDescription("Generate and update package.json exports mappings for all packages in monorepo"));
|
|
453
462
|
const wiki = Command
|
|
454
|
-
.make("wiki", {
|
|
455
|
-
|
|
456
|
-
|
|
463
|
+
.make("wiki", {}, Effect.fn("effa-cli.wiki")(function* () {
|
|
464
|
+
const action = yield* Prompt.select({
|
|
465
|
+
choices: [{
|
|
466
|
+
title: "sync",
|
|
467
|
+
description: "Initialize and update the documentation submodule",
|
|
468
|
+
value: "sync"
|
|
469
|
+
}, {
|
|
470
|
+
title: "update",
|
|
471
|
+
description: "Pull latest changes from remote, commit and push changes within the submodule",
|
|
472
|
+
value: "update"
|
|
473
|
+
}],
|
|
474
|
+
message: "Select wiki action"
|
|
475
|
+
});
|
|
476
|
+
const syncCommand = runNodeCommandEC("git submodule update --init --recursive --remote doc");
|
|
457
477
|
switch (action) {
|
|
458
478
|
case "sync": {
|
|
459
479
|
yield* Effect.logInfo("Initializing/updating git submodule for documentation...");
|
|
460
|
-
|
|
480
|
+
if ((yield* syncCommand) !== 0) {
|
|
481
|
+
return yield* Effect.fail(`Failed to sync submodule`);
|
|
482
|
+
}
|
|
483
|
+
break;
|
|
461
484
|
}
|
|
462
485
|
case "update": {
|
|
463
486
|
yield* Effect.logInfo("Pulling latest changes from remote submodule...");
|
|
464
|
-
yield*
|
|
487
|
+
if ((yield* syncCommand) !== 0) {
|
|
488
|
+
return yield* Effect.fail(`Failed to sync submodule`);
|
|
489
|
+
}
|
|
465
490
|
const commitMessage = yield* Prompt.text({
|
|
466
491
|
message: "Enter commit message:",
|
|
467
492
|
default: "update doc",
|
|
@@ -470,16 +495,65 @@ Effect
|
|
|
470
495
|
: Effect.fail("Commit message cannot be empty")
|
|
471
496
|
});
|
|
472
497
|
yield* Effect.logInfo("Committing and pushing changes in submodule...");
|
|
473
|
-
yield* runNodeCommandEC(`git -C doc add . && git -C doc commit -m '${commitMessage}' && git -C doc push`)
|
|
474
|
-
|
|
498
|
+
if ((yield* runNodeCommandEC(`git -C doc add . && git -C doc commit -m '${commitMessage}' && git -C doc push`)) === 0) {
|
|
499
|
+
yield* Effect.logInfo("Submodule updated and pushed successfully");
|
|
500
|
+
}
|
|
501
|
+
break;
|
|
475
502
|
}
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
|
|
503
|
+
default: {
|
|
504
|
+
action;
|
|
505
|
+
return yield* Effect.fail(`Unknown wiki action: ${action}. Available actions: sync, update`);
|
|
506
|
+
}
|
|
507
|
+
}
|
|
508
|
+
// check if references to submodule have changed in main repo
|
|
509
|
+
// and offer to commit these changes
|
|
510
|
+
const statusOutput = yield* runNodeCommand("git status --porcelain");
|
|
511
|
+
const hasSubmoduleChanges = statusOutput
|
|
512
|
+
.split("\n")
|
|
513
|
+
.some((line) => line.trim().endsWith("doc") && line.trim().startsWith("M "));
|
|
514
|
+
if (hasSubmoduleChanges) {
|
|
515
|
+
const shouldCommitSubmodule = yield* Prompt.confirm({
|
|
516
|
+
message: "Changes to the submodule detected in main repository. Commit these changes?",
|
|
517
|
+
initial: false
|
|
518
|
+
});
|
|
519
|
+
if (shouldCommitSubmodule) {
|
|
520
|
+
const mainCommitMessage = yield* Prompt.text({
|
|
521
|
+
message: "Enter commit message for main repository:",
|
|
522
|
+
default: "update doc submodule reference",
|
|
523
|
+
validate: (input) => input.trim().length > 0
|
|
524
|
+
? Effect.succeed(input.trim())
|
|
525
|
+
: Effect.fail("Commit message cannot be empty")
|
|
526
|
+
});
|
|
527
|
+
if ((yield* runNodeCommandEC(`git commit -m '${mainCommitMessage}' doc`)) === 0) {
|
|
528
|
+
yield* Effect.logInfo("Main repository updated with submodule changes successfully");
|
|
529
|
+
}
|
|
530
|
+
else {
|
|
531
|
+
yield* Effect.logError("Failed to commit submodule changes in main repository");
|
|
532
|
+
}
|
|
533
|
+
}
|
|
534
|
+
else {
|
|
535
|
+
yield* Effect.logInfo("Remember to commit the submodule changes in the main repository later.");
|
|
536
|
+
}
|
|
537
|
+
}
|
|
538
|
+
else {
|
|
539
|
+
yield* Effect.logInfo("No changes to the submodule detected in main repository.");
|
|
540
|
+
}
|
|
541
|
+
}))
|
|
542
|
+
.pipe(Command.withDescription(`Manage the documentation wiki git submodule with interactive action selection.
|
|
543
|
+
|
|
544
|
+
Available actions:
|
|
545
|
+
- sync: Initialize and update the documentation submodule from remote
|
|
546
|
+
- update: Pull latest changes, commit and push changes within the submodule
|
|
547
|
+
|
|
548
|
+
After any action, automatically detects and offers to commit submodule reference changes in the main repository.`));
|
|
549
|
+
const initWiki = Command
|
|
550
|
+
.make("init-wiki", {}, Effect.fn("effa-cli.initWiki")(function* ({}) {
|
|
551
|
+
yield* Effect.logInfo("⚠️ IMPORTANT: This is a one-time project setup command!");
|
|
552
|
+
// check if doc directory already exists in git index
|
|
553
|
+
const docInIndex = yield* runNodeCommand("git ls-files")
|
|
554
|
+
.pipe(Effect.map((output) => output.split("\n").some((line) => line.startsWith("doc/") || line === "doc")), Effect.catchAll(() => Effect.succeed(false)));
|
|
555
|
+
if (docInIndex) {
|
|
556
|
+
return yield* Effect.logError(`❌ ERROR: A 'doc' directory already exists in the git index!
|
|
483
557
|
|
|
484
558
|
This suggests the wiki submodule may have been initialized before, or there are conflicting files.
|
|
485
559
|
|
|
@@ -491,9 +565,9 @@ Required actions before proceeding:
|
|
|
491
565
|
5. Re-run this command
|
|
492
566
|
|
|
493
567
|
Operation cancelled for safety.`);
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
568
|
+
}
|
|
569
|
+
const confirmation = yield* Prompt.confirm({
|
|
570
|
+
message: `This command will initialize the wiki submodule for this project.
|
|
497
571
|
|
|
498
572
|
⚠️ WARNING: This is NOT the command to use for local submodule initialization!
|
|
499
573
|
|
|
@@ -505,63 +579,54 @@ This command should only be run ONCE in the entire project history by a project
|
|
|
505
579
|
For normal local development, use 'effa wiki sync' instead.
|
|
506
580
|
|
|
507
581
|
Are you sure you want to proceed with the one-time project setup?`,
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
511
|
-
|
|
512
|
-
}
|
|
513
|
-
yield* Effect.logInfo("Extracting project name from git remote...");
|
|
514
|
-
const remoteUrl = yield* runNodeCommand("git config --get remote.origin.url");
|
|
515
|
-
// Extract project name from URL (supports both SSH and HTTPS)
|
|
516
|
-
// Examples:
|
|
517
|
-
// - git@github.com:user/project-name.git -> project-name
|
|
518
|
-
// - https://github.com/user/project-name.git -> project-name
|
|
519
|
-
let detectedProjectName = remoteUrl
|
|
520
|
-
.split("/")
|
|
521
|
-
.pop()
|
|
522
|
-
?.replace(/\.git$/, "")
|
|
523
|
-
?.trim();
|
|
524
|
-
yield* detectedProjectName
|
|
525
|
-
? Effect.logInfo(`Detected project name from git remote: ${detectedProjectName}`)
|
|
526
|
-
: Effect.logWarning("Could not determine project name from git remote");
|
|
527
|
-
detectedProjectName = yield* Prompt.text({
|
|
528
|
-
message: detectedProjectName
|
|
529
|
-
? "Please confirm or modify the project name:"
|
|
530
|
-
: "Please enter the project name:",
|
|
531
|
-
...detectedProjectName && { default: detectedProjectName },
|
|
532
|
-
validate: (input) => input.trim().length > 0
|
|
533
|
-
? Effect.succeed(input.trim())
|
|
534
|
-
: Effect.fail("Project name cannot be empty")
|
|
535
|
-
});
|
|
536
|
-
yield* Effect.logInfo(`Using project name: ${detectedProjectName}`);
|
|
537
|
-
yield* Effect.logInfo("Creating .gitmodules file...");
|
|
538
|
-
yield* runNodeCommandEC(`echo '' >> .gitmodules`);
|
|
539
|
-
yield* runNodeCommandEC(`echo '[submodule "doc"]' >> .gitmodules`);
|
|
540
|
-
yield* runNodeCommandEC(`echo ' path = doc' >> .gitmodules`);
|
|
541
|
-
yield* runNodeCommandEC(`echo ' url = ../${detectedProjectName}.wiki.git' >> .gitmodules`);
|
|
542
|
-
yield* runNodeCommandEC(`echo ' branch = master' >> .gitmodules`);
|
|
543
|
-
yield* runNodeCommandEC(`echo ' update = merge' >> .gitmodules`);
|
|
544
|
-
yield* Effect.logInfo("Adding git submodule for documentation wiki...");
|
|
545
|
-
yield* runNodeCommandEC(`git submodule add -b master ../${detectedProjectName}.wiki.git doc`);
|
|
546
|
-
yield* Effect.logInfo("Committing wiki submodule addition...");
|
|
547
|
-
yield* runNodeCommandEC("git add . && git commit -am 'Add doc submodule'");
|
|
548
|
-
return yield* Effect.logInfo("Wiki submodule initialized successfully");
|
|
549
|
-
}
|
|
550
|
-
default: {
|
|
551
|
-
return yield* Effect.fail(`Unknown wiki action: ${action}. Available actions: sync, update`);
|
|
552
|
-
}
|
|
582
|
+
initial: false
|
|
583
|
+
});
|
|
584
|
+
if (!confirmation) {
|
|
585
|
+
return yield* Effect.logInfo("Operation cancelled. Use 'effa wiki sync' for normal wiki operations.");
|
|
553
586
|
}
|
|
587
|
+
yield* Effect.logInfo("Extracting project name from git remote...");
|
|
588
|
+
const remoteUrl = yield* runNodeCommand("git config --get remote.origin.url");
|
|
589
|
+
// extract project name from URL (supports both SSH and HTTPS)
|
|
590
|
+
//
|
|
591
|
+
// - git@github.com:user/project-name.git -> project-name
|
|
592
|
+
// - https://github.com/user/project-name.git -> project-name
|
|
593
|
+
let detectedProjectName = remoteUrl
|
|
594
|
+
.split("/")
|
|
595
|
+
.pop()
|
|
596
|
+
?.replace(/\.git$/, "")
|
|
597
|
+
?.trim();
|
|
598
|
+
yield* detectedProjectName
|
|
599
|
+
? Effect.logInfo(`Detected project name from git remote: ${detectedProjectName}`)
|
|
600
|
+
: Effect.logWarning("Could not determine project name from git remote");
|
|
601
|
+
detectedProjectName = yield* Prompt.text({
|
|
602
|
+
message: detectedProjectName
|
|
603
|
+
? "Please confirm or modify the project name:"
|
|
604
|
+
: "Please enter the project name:",
|
|
605
|
+
...detectedProjectName && { default: detectedProjectName },
|
|
606
|
+
validate: (input) => input.trim().length > 0
|
|
607
|
+
? Effect.succeed(input.trim())
|
|
608
|
+
: Effect.fail("Project name cannot be empty")
|
|
609
|
+
});
|
|
610
|
+
yield* Effect.logInfo(`Using project name: ${detectedProjectName}`);
|
|
611
|
+
yield* Effect.logInfo("Creating .gitmodules file...");
|
|
612
|
+
yield* runNodeCommandEC(`echo '' >> .gitmodules`);
|
|
613
|
+
yield* runNodeCommandEC(`echo '[submodule "doc"]' >> .gitmodules`);
|
|
614
|
+
yield* runNodeCommandEC(`echo ' path = doc' >> .gitmodules`);
|
|
615
|
+
yield* runNodeCommandEC(`echo ' url = ../${detectedProjectName}.wiki.git' >> .gitmodules`);
|
|
616
|
+
yield* runNodeCommandEC(`echo ' branch = master' >> .gitmodules`);
|
|
617
|
+
yield* runNodeCommandEC(`echo ' update = merge' >> .gitmodules`);
|
|
618
|
+
yield* Effect.logInfo("Adding git submodule for documentation wiki...");
|
|
619
|
+
yield* runNodeCommandEC(`git submodule add -b master ../${detectedProjectName}.wiki.git doc`);
|
|
620
|
+
yield* Effect.logInfo("Committing wiki submodule addition...");
|
|
621
|
+
yield* runNodeCommandEC("git add . && git commit -am 'Add doc submodule'");
|
|
622
|
+
return yield* Effect.logInfo("Wiki submodule initialized successfully");
|
|
554
623
|
}))
|
|
555
|
-
.pipe(Command.withDescription(
|
|
556
|
-
|
|
557
|
-
Available actions:
|
|
558
|
-
- sync: Initialize and update the documentation submodule (default)
|
|
559
|
-
- update: Pull latest changes from remote, commit and push changes within the submodule
|
|
560
|
-
- init-wiki: Set up the wiki submodule for the project (one-time setup)`));
|
|
561
|
-
const DryRunOption = Options.boolean("dry-run").pipe(Options.withDescription("Show what would be done without making changes"));
|
|
562
|
-
const PruneStoreOption = Options.boolean("store-prune").pipe(Options.withDescription("Prune the package manager store"));
|
|
624
|
+
.pipe(Command.withDescription("Set up the wiki submodule for the project (one-time setup)"));
|
|
563
625
|
const nuke = Command
|
|
564
|
-
.make("nuke", {
|
|
626
|
+
.make("nuke", {
|
|
627
|
+
dryRun: Options.boolean("dry-run").pipe(Options.withDescription("Show what would be done without making changes")),
|
|
628
|
+
storePrune: Options.boolean("store-prune").pipe(Options.withDescription("Prune the package manager store"))
|
|
629
|
+
}, Effect.fn("effa-cli.nuke")(function* ({ dryRun, storePrune }) {
|
|
565
630
|
yield* Effect.logInfo(dryRun ? "Performing dry run cleanup..." : "Performing nuclear cleanup...");
|
|
566
631
|
if (dryRun) {
|
|
567
632
|
yield* runNodeCommandEC("find . -depth \\( -type d \\( -name 'node_modules' -o -name '.nuxt' -o -name 'dist' -o -name '.output' -o -name '.nitro' -o -name '.cache' -o -name 'test-results' -o -name 'test-out' -o -name 'coverage' \\) -print \\) -o \\( -type f \\( -name '*.log' -o -name '*.tsbuildinfo' \\) -print \\)");
|
|
@@ -587,6 +652,7 @@ Available actions:
|
|
|
587
652
|
packagejson,
|
|
588
653
|
packagejsonPackages,
|
|
589
654
|
wiki,
|
|
655
|
+
initWiki,
|
|
590
656
|
nuke
|
|
591
657
|
])), {
|
|
592
658
|
name: "Effect-App CLI by jfet97 ❤️",
|
|
@@ -595,4 +661,4 @@ Available actions:
|
|
|
595
661
|
return yield* cli(process.argv);
|
|
596
662
|
})()
|
|
597
663
|
.pipe(Effect.scoped, Effect.provide(NodeContext.layer), NodeRuntime.runMain);
|
|
598
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
664
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/eslint.config.mjs
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import path from "node:path"
|
|
2
2
|
import { fileURLToPath } from "node:url"
|
|
3
|
-
import { augmentedConfig } from "
|
|
3
|
+
import { augmentedConfig } from "effect-app/eslint.base.config"
|
|
4
4
|
|
|
5
5
|
const __filename = fileURLToPath(import.meta.url)
|
|
6
6
|
const __dirname = path.dirname(__filename)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/cli",
|
|
3
|
-
"version": "1.23.
|
|
3
|
+
"version": "1.23.21",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
@@ -17,7 +17,8 @@
|
|
|
17
17
|
"@types/node": "~24.3.1",
|
|
18
18
|
"json5": "^2.2.3",
|
|
19
19
|
"typescript": "~5.9.2",
|
|
20
|
-
"vitest": "^3.2.4"
|
|
20
|
+
"vitest": "^3.2.4",
|
|
21
|
+
"effect-app": "3.3.4"
|
|
21
22
|
},
|
|
22
23
|
"typesVersions": {
|
|
23
24
|
"*": {
|
package/src/index.ts
CHANGED
|
@@ -119,7 +119,7 @@ Effect
|
|
|
119
119
|
|
|
120
120
|
const allRejects = [...existingRejects, ...effectFilters]
|
|
121
121
|
yield* Effect.logInfo(`Excluding packages from update: ${allRejects.join(", ")}`)
|
|
122
|
-
const rejectArgs = allRejects.map(filter => `--reject "${filter}"`).join(" ")
|
|
122
|
+
const rejectArgs = allRejects.map((filter) => `--reject "${filter}"`).join(" ")
|
|
123
123
|
|
|
124
124
|
yield* runNodeCommandEC(`pnpm exec ncu -u ${rejectArgs}`)
|
|
125
125
|
yield* runNodeCommandEC(`pnpm -r exec ncu -u ${rejectArgs}`)
|
|
@@ -377,7 +377,16 @@ Effect
|
|
|
377
377
|
...cur !== "./index" && !cur.includes("/internal/") && { [cur]: filteredExportEntries[cur] }
|
|
378
378
|
}),
|
|
379
379
|
{} as Record<string, unknown>
|
|
380
|
-
)
|
|
380
|
+
),
|
|
381
|
+
// Preserve ESLint config exports for effect-app package
|
|
382
|
+
...(JSON.parse(yield* fs.readFileString(p + "/package.json", "utf-8")).name === "effect-app" && {
|
|
383
|
+
"./eslint.base.config": {
|
|
384
|
+
"default": "./src/eslint.base.config.mjs"
|
|
385
|
+
},
|
|
386
|
+
"./eslint.vue.config": {
|
|
387
|
+
"default": "./src/eslint.vue.config.mjs"
|
|
388
|
+
}
|
|
389
|
+
})
|
|
381
390
|
}
|
|
382
391
|
|
|
383
392
|
const pkgJson = JSON.parse(yield* fs.readFileString(p + "/package.json", "utf-8"))
|
|
@@ -698,21 +707,39 @@ Effect
|
|
|
698
707
|
const wiki = Command
|
|
699
708
|
.make(
|
|
700
709
|
"wiki",
|
|
701
|
-
{
|
|
702
|
-
|
|
703
|
-
|
|
704
|
-
|
|
705
|
-
|
|
706
|
-
|
|
707
|
-
|
|
710
|
+
{},
|
|
711
|
+
Effect.fn("effa-cli.wiki")(function*() {
|
|
712
|
+
const action = yield* Prompt.select({
|
|
713
|
+
choices: [{
|
|
714
|
+
title: "sync",
|
|
715
|
+
description: "Initialize and update the documentation submodule",
|
|
716
|
+
value: "sync"
|
|
717
|
+
}, {
|
|
718
|
+
title: "update",
|
|
719
|
+
description: "Pull latest changes from remote, commit and push changes within the submodule",
|
|
720
|
+
value: "update"
|
|
721
|
+
}],
|
|
722
|
+
message: "Select wiki action"
|
|
723
|
+
})
|
|
724
|
+
|
|
725
|
+
const syncCommand = runNodeCommandEC("git submodule update --init --recursive --remote doc")
|
|
726
|
+
|
|
708
727
|
switch (action) {
|
|
709
728
|
case "sync": {
|
|
710
729
|
yield* Effect.logInfo("Initializing/updating git submodule for documentation...")
|
|
711
|
-
|
|
730
|
+
|
|
731
|
+
if ((yield* syncCommand) !== 0) {
|
|
732
|
+
return yield* Effect.fail(`Failed to sync submodule`)
|
|
733
|
+
}
|
|
734
|
+
|
|
735
|
+
break
|
|
712
736
|
}
|
|
713
737
|
case "update": {
|
|
714
738
|
yield* Effect.logInfo("Pulling latest changes from remote submodule...")
|
|
715
|
-
|
|
739
|
+
|
|
740
|
+
if ((yield* syncCommand) !== 0) {
|
|
741
|
+
return yield* Effect.fail(`Failed to sync submodule`)
|
|
742
|
+
}
|
|
716
743
|
|
|
717
744
|
const commitMessage = yield* Prompt.text({
|
|
718
745
|
message: "Enter commit message:",
|
|
@@ -724,22 +751,92 @@ Effect
|
|
|
724
751
|
})
|
|
725
752
|
|
|
726
753
|
yield* Effect.logInfo("Committing and pushing changes in submodule...")
|
|
727
|
-
yield* runNodeCommandEC(`git -C doc add . && git -C doc commit -m '${commitMessage}' && git -C doc push`)
|
|
728
754
|
|
|
729
|
-
|
|
755
|
+
if (
|
|
756
|
+
(yield* runNodeCommandEC(
|
|
757
|
+
`git -C doc add . && git -C doc commit -m '${commitMessage}' && git -C doc push`
|
|
758
|
+
)) === 0
|
|
759
|
+
) {
|
|
760
|
+
yield* Effect.logInfo("Submodule updated and pushed successfully")
|
|
761
|
+
}
|
|
762
|
+
|
|
763
|
+
break
|
|
764
|
+
}
|
|
765
|
+
default: {
|
|
766
|
+
action satisfies never
|
|
767
|
+
return yield* Effect.fail(`Unknown wiki action: ${action}. Available actions: sync, update`)
|
|
730
768
|
}
|
|
731
|
-
|
|
732
|
-
|
|
769
|
+
}
|
|
770
|
+
|
|
771
|
+
// check if references to submodule have changed in main repo
|
|
772
|
+
// and offer to commit these changes
|
|
773
|
+
const statusOutput = yield* runNodeCommand("git status --porcelain")
|
|
774
|
+
|
|
775
|
+
const hasSubmoduleChanges = statusOutput
|
|
776
|
+
.split("\n")
|
|
777
|
+
.some((line) => line.trim().endsWith("doc") && line.trim().startsWith("M "))
|
|
733
778
|
|
|
734
|
-
|
|
735
|
-
|
|
736
|
-
|
|
737
|
-
|
|
738
|
-
|
|
739
|
-
)
|
|
779
|
+
if (hasSubmoduleChanges) {
|
|
780
|
+
const shouldCommitSubmodule = yield* Prompt.confirm({
|
|
781
|
+
message: "Changes to the submodule detected in main repository. Commit these changes?",
|
|
782
|
+
initial: false
|
|
783
|
+
})
|
|
740
784
|
|
|
741
|
-
|
|
742
|
-
|
|
785
|
+
if (
|
|
786
|
+
shouldCommitSubmodule
|
|
787
|
+
) {
|
|
788
|
+
const mainCommitMessage = yield* Prompt.text({
|
|
789
|
+
message: "Enter commit message for main repository:",
|
|
790
|
+
default: "update doc submodule reference",
|
|
791
|
+
validate: (input) =>
|
|
792
|
+
input.trim().length > 0
|
|
793
|
+
? Effect.succeed(input.trim())
|
|
794
|
+
: Effect.fail("Commit message cannot be empty")
|
|
795
|
+
})
|
|
796
|
+
|
|
797
|
+
if (
|
|
798
|
+
(yield* runNodeCommandEC(
|
|
799
|
+
`git commit -m '${mainCommitMessage}' doc`
|
|
800
|
+
)) === 0
|
|
801
|
+
) {
|
|
802
|
+
yield* Effect.logInfo("Main repository updated with submodule changes successfully")
|
|
803
|
+
} else {
|
|
804
|
+
yield* Effect.logError("Failed to commit submodule changes in main repository")
|
|
805
|
+
}
|
|
806
|
+
} else {
|
|
807
|
+
yield* Effect.logInfo("Remember to commit the submodule changes in the main repository later.")
|
|
808
|
+
}
|
|
809
|
+
} else {
|
|
810
|
+
yield* Effect.logInfo("No changes to the submodule detected in main repository.")
|
|
811
|
+
}
|
|
812
|
+
})
|
|
813
|
+
)
|
|
814
|
+
.pipe(Command.withDescription(
|
|
815
|
+
`Manage the documentation wiki git submodule with interactive action selection.
|
|
816
|
+
|
|
817
|
+
Available actions:
|
|
818
|
+
- sync: Initialize and update the documentation submodule from remote
|
|
819
|
+
- update: Pull latest changes, commit and push changes within the submodule
|
|
820
|
+
|
|
821
|
+
After any action, automatically detects and offers to commit submodule reference changes in the main repository.`
|
|
822
|
+
))
|
|
823
|
+
|
|
824
|
+
const initWiki = Command
|
|
825
|
+
.make(
|
|
826
|
+
"init-wiki",
|
|
827
|
+
{},
|
|
828
|
+
Effect.fn("effa-cli.initWiki")(function*({}) {
|
|
829
|
+
yield* Effect.logInfo("⚠️ IMPORTANT: This is a one-time project setup command!")
|
|
830
|
+
|
|
831
|
+
// check if doc directory already exists in git index
|
|
832
|
+
const docInIndex = yield* runNodeCommand("git ls-files")
|
|
833
|
+
.pipe(
|
|
834
|
+
Effect.map((output) => output.split("\n").some((line) => line.startsWith("doc/") || line === "doc")),
|
|
835
|
+
Effect.catchAll(() => Effect.succeed(false))
|
|
836
|
+
)
|
|
837
|
+
|
|
838
|
+
if (docInIndex) {
|
|
839
|
+
return yield* Effect.logError(`❌ ERROR: A 'doc' directory already exists in the git index!
|
|
743
840
|
|
|
744
841
|
This suggests the wiki submodule may have been initialized before, or there are conflicting files.
|
|
745
842
|
|
|
@@ -751,10 +848,10 @@ Required actions before proceeding:
|
|
|
751
848
|
5. Re-run this command
|
|
752
849
|
|
|
753
850
|
Operation cancelled for safety.`)
|
|
754
|
-
|
|
851
|
+
}
|
|
755
852
|
|
|
756
|
-
|
|
757
|
-
|
|
853
|
+
const confirmation = yield* Prompt.confirm({
|
|
854
|
+
message: `This command will initialize the wiki submodule for this project.
|
|
758
855
|
|
|
759
856
|
⚠️ WARNING: This is NOT the command to use for local submodule initialization!
|
|
760
857
|
|
|
@@ -766,86 +863,73 @@ This command should only be run ONCE in the entire project history by a project
|
|
|
766
863
|
For normal local development, use 'effa wiki sync' instead.
|
|
767
864
|
|
|
768
865
|
Are you sure you want to proceed with the one-time project setup?`,
|
|
769
|
-
|
|
770
|
-
|
|
866
|
+
initial: false
|
|
867
|
+
})
|
|
771
868
|
|
|
772
|
-
|
|
773
|
-
|
|
774
|
-
|
|
869
|
+
if (!confirmation) {
|
|
870
|
+
return yield* Effect.logInfo("Operation cancelled. Use 'effa wiki sync' for normal wiki operations.")
|
|
871
|
+
}
|
|
775
872
|
|
|
776
|
-
|
|
777
|
-
|
|
778
|
-
|
|
779
|
-
|
|
780
|
-
|
|
781
|
-
|
|
782
|
-
|
|
783
|
-
|
|
784
|
-
|
|
785
|
-
|
|
786
|
-
|
|
787
|
-
|
|
788
|
-
|
|
789
|
-
|
|
790
|
-
|
|
791
|
-
|
|
792
|
-
|
|
793
|
-
|
|
794
|
-
|
|
795
|
-
|
|
796
|
-
|
|
797
|
-
|
|
798
|
-
|
|
799
|
-
|
|
800
|
-
|
|
801
|
-
|
|
802
|
-
|
|
873
|
+
yield* Effect.logInfo("Extracting project name from git remote...")
|
|
874
|
+
const remoteUrl = yield* runNodeCommand("git config --get remote.origin.url")
|
|
875
|
+
|
|
876
|
+
// extract project name from URL (supports both SSH and HTTPS)
|
|
877
|
+
//
|
|
878
|
+
// - git@github.com:user/project-name.git -> project-name
|
|
879
|
+
// - https://github.com/user/project-name.git -> project-name
|
|
880
|
+
let detectedProjectName = remoteUrl
|
|
881
|
+
.split("/")
|
|
882
|
+
.pop()
|
|
883
|
+
?.replace(/\.git$/, "")
|
|
884
|
+
?.trim()
|
|
885
|
+
|
|
886
|
+
yield* detectedProjectName
|
|
887
|
+
? Effect.logInfo(`Detected project name from git remote: ${detectedProjectName}`)
|
|
888
|
+
: Effect.logWarning("Could not determine project name from git remote")
|
|
889
|
+
|
|
890
|
+
detectedProjectName = yield* Prompt.text({
|
|
891
|
+
message: detectedProjectName
|
|
892
|
+
? "Please confirm or modify the project name:"
|
|
893
|
+
: "Please enter the project name:",
|
|
894
|
+
...detectedProjectName && { default: detectedProjectName },
|
|
895
|
+
validate: (input) =>
|
|
896
|
+
input.trim().length > 0
|
|
897
|
+
? Effect.succeed(input.trim())
|
|
898
|
+
: Effect.fail("Project name cannot be empty")
|
|
899
|
+
})
|
|
803
900
|
|
|
804
|
-
|
|
901
|
+
yield* Effect.logInfo(`Using project name: ${detectedProjectName}`)
|
|
805
902
|
|
|
806
|
-
|
|
807
|
-
|
|
808
|
-
|
|
809
|
-
|
|
810
|
-
|
|
811
|
-
|
|
812
|
-
|
|
903
|
+
yield* Effect.logInfo("Creating .gitmodules file...")
|
|
904
|
+
yield* runNodeCommandEC(`echo '' >> .gitmodules`)
|
|
905
|
+
yield* runNodeCommandEC(`echo '[submodule "doc"]' >> .gitmodules`)
|
|
906
|
+
yield* runNodeCommandEC(`echo ' path = doc' >> .gitmodules`)
|
|
907
|
+
yield* runNodeCommandEC(`echo ' url = ../${detectedProjectName}.wiki.git' >> .gitmodules`)
|
|
908
|
+
yield* runNodeCommandEC(`echo ' branch = master' >> .gitmodules`)
|
|
909
|
+
yield* runNodeCommandEC(`echo ' update = merge' >> .gitmodules`)
|
|
813
910
|
|
|
814
|
-
|
|
815
|
-
|
|
911
|
+
yield* Effect.logInfo("Adding git submodule for documentation wiki...")
|
|
912
|
+
yield* runNodeCommandEC(`git submodule add -b master ../${detectedProjectName}.wiki.git doc`)
|
|
816
913
|
|
|
817
|
-
|
|
818
|
-
|
|
914
|
+
yield* Effect.logInfo("Committing wiki submodule addition...")
|
|
915
|
+
yield* runNodeCommandEC("git add . && git commit -am 'Add doc submodule'")
|
|
819
916
|
|
|
820
|
-
|
|
821
|
-
}
|
|
822
|
-
default: {
|
|
823
|
-
return yield* Effect.fail(`Unknown wiki action: ${action}. Available actions: sync, update`)
|
|
824
|
-
}
|
|
825
|
-
}
|
|
917
|
+
return yield* Effect.logInfo("Wiki submodule initialized successfully")
|
|
826
918
|
})
|
|
827
919
|
)
|
|
828
|
-
.pipe(Command.withDescription(
|
|
829
|
-
`Manage the documentation wiki git submodule.
|
|
830
|
-
|
|
831
|
-
Available actions:
|
|
832
|
-
- sync: Initialize and update the documentation submodule (default)
|
|
833
|
-
- update: Pull latest changes from remote, commit and push changes within the submodule
|
|
834
|
-
- init-wiki: Set up the wiki submodule for the project (one-time setup)`
|
|
835
|
-
))
|
|
836
|
-
|
|
837
|
-
const DryRunOption = Options.boolean("dry-run").pipe(
|
|
838
|
-
Options.withDescription("Show what would be done without making changes")
|
|
839
|
-
)
|
|
840
|
-
|
|
841
|
-
const PruneStoreOption = Options.boolean("store-prune").pipe(
|
|
842
|
-
Options.withDescription("Prune the package manager store")
|
|
843
|
-
)
|
|
920
|
+
.pipe(Command.withDescription("Set up the wiki submodule for the project (one-time setup)"))
|
|
844
921
|
|
|
845
922
|
const nuke = Command
|
|
846
923
|
.make(
|
|
847
924
|
"nuke",
|
|
848
|
-
{
|
|
925
|
+
{
|
|
926
|
+
dryRun: Options.boolean("dry-run").pipe(
|
|
927
|
+
Options.withDescription("Show what would be done without making changes")
|
|
928
|
+
),
|
|
929
|
+
storePrune: Options.boolean("store-prune").pipe(
|
|
930
|
+
Options.withDescription("Prune the package manager store")
|
|
931
|
+
)
|
|
932
|
+
},
|
|
849
933
|
Effect.fn("effa-cli.nuke")(function*({ dryRun, storePrune }) {
|
|
850
934
|
yield* Effect.logInfo(dryRun ? "Performing dry run cleanup..." : "Performing nuclear cleanup...")
|
|
851
935
|
|
|
@@ -883,6 +967,7 @@ Available actions:
|
|
|
883
967
|
packagejson,
|
|
884
968
|
packagejsonPackages,
|
|
885
969
|
wiki,
|
|
970
|
+
initWiki,
|
|
886
971
|
nuke
|
|
887
972
|
])),
|
|
888
973
|
{
|