@effect-app/cli 2.1.0-beta.23 → 2.1.0-beta.25

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 CHANGED
@@ -1,5 +1,32 @@
1
1
  # @effect-app/cli
2
2
 
3
+ ## 2.1.0-beta.25
4
+
5
+ ### Patch Changes
6
+
7
+ - 6138bc7: `effa sync-push`: propagate locally-deleted synced files. Previously, files removed from the consuming project were silently skipped (the loop bailed when `destAbs` didn't exist). Now they're recorded as deletions, `git rm`'d in the cache branch, and listed in the PR body alongside modifications.
8
+
9
+ ## 2.1.0-beta.24
10
+
11
+ ### Minor Changes
12
+
13
+ - 07dcd75: Add `effa sync` / `effa sync-diff` / `effa sync-push` subcommands for syncing content (architecture docs, e2e helpers, ts-plugins) from `effect-app/shared` into consuming projects per a project-side `.shared.json` lockfile.
14
+
15
+ - `effa sync` — clone/checkout the shared repo at the pinned ref into `~/.cache/effa/shared/<slug>`, then copy the artifact map's files into the project (honoring `exclude`).
16
+ - `effa sync-diff` — sha256 compare each tracked file against the cache copy; reports `M` (modified locally), `D` (missing from project), `E` (excluded).
17
+ - `effa sync-push [--pr] [-m msg] [--branch name]` — branch in the cache off the pinned ref, copy modified project files in, commit, push. Optional `--pr` opens a PR via `gh pr create`.
18
+
19
+ Lockfile shape:
20
+
21
+ ```json
22
+ {
23
+ "repo": "github.com/effect-app/shared",
24
+ "ref": "<sha>",
25
+ "artifacts": { "<src-in-shared>": "<dest-in-project>" },
26
+ "exclude": ["<src-path>"]
27
+ }
28
+ ```
29
+
3
30
  ## 2.1.0-beta.23
4
31
 
5
32
  ### Patch Changes
package/dist/index.js CHANGED
@@ -15,6 +15,7 @@ import { RunCommandService } from "./os-command.js";
15
15
  import { packages } from "./shared.js";
16
16
  import { patchArgvForWrapCommands } from "./argv-patch.js";
17
17
  import { syncEffectSubtree } from "./sync-effect-subtree.js";
18
+ import { syncDiff, syncPush, syncShared } from "./sync-shared.js";
18
19
  patchArgvForWrapCommands(process.argv);
19
20
  NodeRuntime.runMain(Effect
20
21
  .fn("effa-cli")(function* () {
@@ -477,6 +478,36 @@ NodeRuntime.runMain(Effect
477
478
  });
478
479
  }))
479
480
  .pipe(Command.withDescription("Sync the Effect subtree to the version pinned in package.json"));
481
+ const SharedLockfileFlag = Flag.file("lockfile").pipe(Flag.optional, Flag.withDescription("Path to lockfile (default: .shared.json)"));
482
+ const sync = Command
483
+ .make("sync", { lockfile: SharedLockfileFlag }, Effect.fn("effa-cli.sync")(function* ({ lockfile }) {
484
+ yield* syncShared({
485
+ lockfilePath: Option.getOrElse(lockfile, () => ".shared.json")
486
+ });
487
+ }))
488
+ .pipe(Command.withDescription("Sync shared docs / e2e helpers / plugins from effect-app/shared per .shared.json"));
489
+ const syncDiffCmd = Command
490
+ .make("sync-diff", { lockfile: SharedLockfileFlag }, Effect.fn("effa-cli.sync-diff")(function* ({ lockfile }) {
491
+ yield* syncDiff({
492
+ lockfilePath: Option.getOrElse(lockfile, () => ".shared.json")
493
+ });
494
+ }))
495
+ .pipe(Command.withDescription("Report drift between local synced files and the pinned shared ref"));
496
+ const syncPushCmd = Command
497
+ .make("sync-push", {
498
+ lockfile: SharedLockfileFlag,
499
+ message: Flag.string("message").pipe(Flag.withAlias("m"), Flag.optional, Flag.withDescription("Commit message for the push")),
500
+ branch: Flag.string("branch").pipe(Flag.optional, Flag.withDescription("Branch name in shared repo (default: auto-generated)")),
501
+ pr: Flag.boolean("pr").pipe(Flag.withDescription("Open a PR via `gh pr create` after pushing"))
502
+ }, Effect.fn("effa-cli.sync-push")(function* ({ branch, lockfile, message, pr }) {
503
+ yield* syncPush({
504
+ lockfilePath: Option.getOrElse(lockfile, () => ".shared.json"),
505
+ message: Option.getOrUndefined(message),
506
+ branch: Option.getOrUndefined(branch),
507
+ pr
508
+ });
509
+ }))
510
+ .pipe(Command.withDescription("Push locally-modified synced files to the shared repo on a new branch"));
480
511
  // configure CLI
481
512
  return yield* Command.run(Command
482
513
  .make("effa")
@@ -490,10 +521,13 @@ NodeRuntime.runMain(Effect
490
521
  packagejsonPackages,
491
522
  gist,
492
523
  nuke,
493
- syncEffect
524
+ syncEffect,
525
+ sync,
526
+ syncDiffCmd,
527
+ syncPushCmd
494
528
  ])), {
495
529
  version: "v1.0.0"
496
530
  });
497
531
  })()
498
532
  .pipe(Effect.scoped, Effect.provide(Layer.provideMerge(Layer.merge(GistHandler.Default, RunCommandService.Default), NodeServices.layer))));
499
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,kDAAkD;AAClD,qCAAqC;AACrC,8CAA8C;AAC9C,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACjE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAA;AAErE,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AACnC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,4BAA4B,EAAE,MAAM,cAAc,CAAA;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAA;AACvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,OAAO,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAA;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAE5D,wBAAwB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAEtC,WAAW,CAAC,OAAO,CACjB,MAAM;KACH,EAAE,CAAC,UAAU,CAAC,CAAC,QAAQ,CAAC;IACvB,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAA;IACvC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;IAC7B,MAAM,qBAAqB,GAAG,KAAK,CAAC,CAAC,4BAA4B,CAAA;IACjE,MAAM,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAA;IAEnD,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAC,CAAA;IAE9E;;;OAGG;IACH,MAAM,uBAAuB,GAAG,MAAM,CAAC,EAAE,CAAC,qCAAqC,CAAC,CAAC,QAAQ,CAAC;QACxF,MAAM,OAAO,GAAG,CAAC,YAAY,EAAE,eAAe,CAAC,CAAA;QAC/C,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC7B,KAAK,CAAC,CAAC,cAAc,CAAC,8BAA8B,MAAM,GAAG,CAAC,CAAA;YAC9D,KAAK,CAAC,CAAC,cAAc,CAAC,iCAAiC,MAAM,GAAG,CAAC,CAAA;QACnE,CAAC;IACH,CAAC,CAAC,EAAE,CAAA;IAEJ;;;;OAIG;IACH,MAAM,oBAAoB,GAAG,MAAM,CAAC,EAAE,CAAC,kCAAkC,CAAC,CAAC,QAAQ,CAAC;QAClF,MAAM,aAAa,GAAG,CAAC,QAAQ,EAAE,WAAW,EAAE,gBAAgB,CAAC,CAAA;QAC/D,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE,CAAC;YACnC,KAAK,CAAC,CAAC,cAAc,CAAC,8BAA8B,MAAM,GAAG,CAAC,CAAA;YAC9D,KAAK,CAAC,CAAC,cAAc,CAAC,iCAAiC,MAAM,GAAG,CAAC,CAAA;QACnE,CAAC;IACH,CAAC,CAAC,EAAE,CAAA;IAEJ;;;;;OAKG;IACH,MAAM,cAAc,GAAG,MAAM,CAAC,EAAE,CAAC,yCAAyC,CAAC,CAAC,QAAQ,CAAC;QACnF,MAAM,aAAa,GAAG,CAAC,QAAQ,EAAE,WAAW,EAAE,gBAAgB,EAAE,YAAY,EAAE,eAAe,CAAC,CAAA;QAE9F,iEAAiE;QACjE,IAAI,eAAe,GAAa,EAAE,CAAA;QAClC,MAAM,SAAS,GAAG,eAAe,CAAA;QAEjC,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YAChC,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA;YACxD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;YACtC,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;gBAChD,eAAe,GAAG,KAAK,CAAC,MAAM,CAAA;YAChC,CAAC;QACH,CAAC;QAED,MAAM,UAAU,GAAG,CAAC,GAAG,eAAe,EAAE,GAAG,aAAa,CAAC,CAAA;QACzD,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,mCAAmC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QACjF,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;QAE/E,KAAK,CAAC,CAAC,cAAc,CAAC,oBAAoB,UAAU,EAAE,CAAC,CAAA;QACvD,KAAK,CAAC,CAAC,cAAc,CAAC,uBAAuB,UAAU,EAAE,CAAC,CAAA;IAC5D,CAAC,CAAC,EAAE,CAAA;IAEJ;;;;;;;OAOG;IACH,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC,iBAAyB;QACxE,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,sCAAsC,CAAC,CAAA;QAE7D,MAAM,eAAe,GAAG,gBAAgB,CAAA;QACxC,MAAM,kBAAkB,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,eAAe,CAAC,CAAA;QACpE,MAAM,eAAe,GAAG,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAA;QACrE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;QAEzC,MAAM,WAAW,GAAG;YAClB,GAAG,EAAE,CAAC,WAAW;YACjB,kCAAkC,EAAE,OAAO,GAAG,iBAAiB,GAAG,gCAAgC;YAClG,YAAY,EAAE,OAAO,GAAG,iBAAiB,GAAG,sBAAsB;YAClE,mBAAmB,EAAE,OAAO,GAAG,iBAAiB,GAAG,iBAAiB;YACpE,iBAAiB,EAAE,OAAO,GAAG,iBAAiB,GAAG,eAAe;YAChE,4BAA4B,EAAE,OAAO,GAAG,iBAAiB,GAAG,0BAA0B;YACtF,kCAAkC,EAAE,OAAO,GAAG,iBAAiB,GAAG,gCAAgC;YAClG,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;gBAC5B,GAAG,CAAC,CAAC,CAAC,GAAG,QAAQ,iBAAiB,iBAAiB,CAAC,EAAE,CAAA;gBACtD,OAAO,GAAG,CAAA;YACZ,CAAC,EAAE,EAA4B,CAAC;SACjC,CAAA;QAED,EAAE,CAAC,WAAW,GAAG,WAAW,CAAA;QAE5B,KAAK,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,eAAe,CAAC,CAAA;QACzF,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,kDAAkD,CAAC,CAAA;QAEzE,KAAK,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;QAE/B,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,oCAAoC,CAAC,CAAA;IAC7D,CAAC,CAAC,CAAA;IAEF;;;;;;OAMG;IACH,MAAM,cAAc,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;QAChD,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,wCAAwC,CAAC,CAAA;QAE/D,MAAM,eAAe,GAAG,gBAAgB,CAAA;QACxC,MAAM,kBAAkB,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,eAAe,CAAC,CAAA;QACpE,MAAM,eAAe,GAAG,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAA;QACrE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;QAEzC,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,WAAqC,CAAC,CAAC,MAAM,CACzF,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE;YACd,IAAI,CAAC,CAAC,UAAU,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,YAAY,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAAE,OAAO,GAAG,CAAA;YAC1F,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA;YACV,OAAO,GAAG,CAAA;QACZ,CAAC,EACD,EAA4B,CAC7B,CAAA;QAED,EAAE,CAAC,WAAW,GAAG,mBAAmB,CAAA;QAEpC,KAAK,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,eAAe,CAAC,CAAA;QACzF,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,uDAAuD,CAAC,CAAA;QAE9E,KAAK,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA;QAC/B,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,sCAAsC,CAAC,CAAA;IAC/D,CAAC,CAAC,EAAE,CAAA;IAEJ;;;;;;;OAOG;IACH,MAAM,mBAAmB,GAAG,MAAM,CAAC,EAAE,CAAC,0CAA0C,CAAC,CAC/E,QAAQ,CAAC,EAAC,SAAiB;QACzB,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,uCAAuC,SAAS,EAAE,CAAC,CAAA;QAEzE,MAAM,WAAW,GAAG,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QAEvC,KAAK,CAAC,CAAC,WAAW;aACf,IAAI,CACH,MAAM,CAAC,UAAU,CACf,MAAM,CAAC,EAAE,CAAC,0CAA0C,CAAC,CAAC,QAAQ,CAAC,EAAC,KAAK;YACnE,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YACvC,MAAM,QAAQ,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;YAChD,MAAM,YAAY,GAAG,QAAQ,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAA;YAEtE,IAAI,CAAC,YAAY;gBAAE,OAAM;YAEzB,IAAI,CAAC,GAAG,CAAC,CAAA;YACT,MAAM,aAAa,GAAG,SAAS,CAAC,UAAU,EAAE,CAAA;YAE5C,OAAO,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC;gBAChC,MAAM,cAAc,GAAG,CAAC,gBAAgB,EAAE,WAAW,CAAC;qBACnD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;gBAEzE,MAAM,aAAa,GAAa,EAAE,CAAA;gBAClC,KAAK,MAAM,IAAI,IAAI,cAAc,EAAE,CAAC;oBAClC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;oBACrC,IAAI,MAAM;wBAAE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBACtC,CAAC;gBAED,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC7B,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CACnB,+BAA+B,KAAK,CAAC,IAAI,mBAAmB,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACvF,CAAA;oBAED,MAAM,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;oBAClE,KAAK,CAAC,CAAC,cAAc,CAAC,+BAA+B,UAAU,EAAE,CAAC,CAAA;oBAClE,MAAK;gBACP,CAAC;gBACD,CAAC,EAAE,CAAA;YACL,CAAC;QACH,CAAC,CAAC,CACH,EACD,MAAM,CAAC,OAAO,CACZ,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,wCAAwC,SAAS,EAAE,CAAC,CAAC,CAC/F,EACD,MAAM,CAAC,UAAU,CAClB,CAAA;IACL,CAAC,CACF,CAAA;IAED;;;;;;;;OAQG;IACH,MAAM,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC,yCAAyC,CAAC,CAC7E,QAAQ,CAAC,EAAC,SAAiB,EAAE,SAAiB;QAC5C,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,uCAAuC,SAAS,OAAO,SAAS,EAAE,CAAC,CAAA;QAEzF,MAAM,WAAW,GAAG,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QAEvC,KAAK,CAAC,CAAC,WAAW;aACf,IAAI,CACH,MAAM,CAAC,UAAU,CACf,MAAM,CAAC,EAAE,CAAC,qDAAqD,CAAC,CAAC,QAAQ,CAAC,EAAC,KAAK;YAC9E,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAAE,OAAM;YAE1C,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,yBAAyB,KAAK,CAAC,IAAI,aAAa,SAAS,EAAE,CAAC,CAAA;YAElF,KAAK,CAAC,CAAC,cAAc,CAAC,sBAAsB,SAAS,GAAG,CAAC,CAAA;QAC3D,CAAC,CAAC,CACH,EACD,MAAM,CAAC,OAAO,CACZ,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CACvB,MAAM,CAAC,OAAO,CAAC,uCAAuC,SAAS,OAAO,SAAS,EAAE,CAAC,CACnF,CACF,EACD,MAAM,CAAC,UAAU,CAClB,CAAA;IACL,CAAC,CACF,CAAA;IAED;;;;;;;OAOG;IACH,MAAM,cAAc,GAAG,MAAM,CAAC,EAAE,CAAC,qCAAqC,CAAC,CACrE,QAAQ,CAAC,EAAC,SAAiB;QACzB,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,yCAAyC,SAAS,EAAE,CAAC,CAAA;QAE3E,MAAM,SAAS,GAAG,SAAS,GAAG,WAAW,CAAA;QAEzC,MAAM,QAAQ,GAAG,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAA;QAEjD,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YAChC,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,CAAA;QACzD,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,cAAc,SAAS,iBAAiB,CAAC,CAAA;QACpE,CAAC;QAED,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,QAAQ,CAAC,MAAM,mBAAmB,SAAS,EAAE,CAAC,CAAA;QAEhF,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAA;IAC/D,CAAC,CACF,CAAA;IAED;;;;;;;;;OASG;IACH,MAAM,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC,6BAA6B,CAAC,CACjE,QAAQ,CAAC,EAAC,QAAgB,EAAE,CAAS,EAAE,MAAM,GAAG,CAAC;QAC/C,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,0BAA0B,CAAC,EAAE,CAAC,CAAA;QAEpD,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,qBAAqB,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAA;QAE9E,oDAAoD;QACpD,IAAI,cAAc,KAAK,EAAE,EAAE,CAAC;YAC1B,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,8BAA8B,CAAC,8BAA8B,CAAC,CAAA;YACpF,OAAM;QACR,CAAC;QAED,MAAM,mBAAmB,GAAG,IAAI,CAAC,KAAK,CACpC,KAAK,cAAc,IAAI,CAIxB,CAAA;QAED,MAAM,qBAAqB,GAAG,MAAM;YAClC,CAAC,CAAC,MAAM;iBACL,IAAI,CAAC,mBAAmB,CAAC;gBAC1B,qFAAqF;iBACpF,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC;iBAC7D,MAAM,CACL,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;gBACZ,IAAI,CAAC,GAAG,CAAC,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAA;gBACpC,OAAO,IAAI,CAAA;YACb,CAAC,EACD,EAA6B,CAC9B;YACH,CAAC,CAAC,mBAAmB,CAAA;QAEvB,MAAM,cAAc,GAAG;YACrB,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,GAAG,eAAe,CAAC,CAAC;mBACtC;oBACD,GAAG,EAAE;wBACH,OAAO,EAAE,mBAAmB;wBAC5B,SAAS,EAAE,iBAAiB;qBAC7B;iBACF,CAAC;YACJ,GAAG,MAAM;iBACN,IAAI,CAAC,qBAAqB,CAAC;iBAC3B,MAAM,CACL,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;gBACZ,iEAAiE;gBACjE,+DAA+D;gBAC/D,6DAA6D;gBAC7D,IAAI,GAAG,KAAK,SAAS,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;oBACrD,IAAI,CAAC,GAAG,CAAC,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAA;gBACxC,CAAC;gBACD,OAAO,IAAI,CAAA;YACb,CAAC,EACD,EAA6B,CAC9B;SACJ,CAAA;QAED,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,GAAG,eAAe,EAAE,OAAO,CAAC,CAAA;QAC7E,MAAM,eAAe,GAAG,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAA;QACjE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;QAE1C,OAAO,CAAC,OAAO,GAAG,cAAc,CAAA;QAEhC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,oCAAoC,CAAC,EAAE,CAAC,CAAA;QAE9D,OAAO,KAAK,CAAC,CAAC,EAAE,CAAC,eAAe,CAC9B,CAAC,GAAG,eAAe,EACnB,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,eAAe,CACnD,CAAA;IACH,CAAC,CACF,CAAA;IAED;;;;;;;OAOG;IACH,MAAM,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC,6BAA6B,CAAC,CACjE,QAAQ,CAAC,EAAC,QAAgB,EAAE,SAAiB,EAAE,MAAM,GAAG,CAAC;QACvD,KAAK,CAAC,CAAC,kBAAkB,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;QAEtD,MAAM,OAAO,GAAG,SAAS,KAAK,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,SAAS,MAAM,CAAA;QAEhE,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;YACjC,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,oBAAoB,OAAO,uCAAuC,CAAC,CAAA;YAC5F,OAAM;QACR,CAAC;QAED,MAAM,WAAW,GAAG,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAErC,KAAK,CAAC,CAAC,WAAW,CAAC,IAAI,CACrB,MAAM,CAAC,UAAU,CACf,MAAM,CAAC,EAAE,CAAC,yCAAyC,CAAC,CAAC,QAAQ,CAAC,EAAC,CAAC;YAC9D,KAAK,CAAC,CAAC,kBAAkB,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,CAAA;QACxD,CAAC,CAAC,CACH,EACD,MAAM,CAAC,OAAO,CACZ,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,wCAAwC,SAAS,EAAE,CAAC,CAAC,CAC/F,EACD,MAAM,CAAC,UAAU,CAClB,CAAA;IACH,CAAC,CACF,CAAA;IAED;;OAEG;IAEH,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAC3C,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EACnB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,eAAe,CAClB,4FAA4F,CAC7F,CACF,CAAA;IAED,6BAA6B;IAC7B,MAAM,SAAS,GAAG,QAAQ;SACvB,MAAM,CAAC,MAAM,CAAC;SACd,IAAI,CACH,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EACnB,QAAQ,CAAC,QAAQ,EACjB,QAAQ,CAAC,eAAe,CACtB,4FAA4F,CAC7F,CACF,CAAA;IAEH;;;;;;;;;;OAUG;IACH,MAAM,mBAAmB,GAAG,CAC1B,IAAU,EACV,MAAc,EACd,OAA8C,EAC9C,iBAA0B,EAC1B,EAAE,CACF,OAAO,CAAC,IAAI,CACV,IAAI,EACJ,EAAE,GAAG,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,SAAS,EAAE,EAC9C,MAAM,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC,QAAQ,CAAC,EAAC,CAAC;QAC/C,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,GAAG,EAAE,GAAG,CAG1B,CAAA;QAED,IAAI,iBAAiB,EAAE,CAAC;YACtB,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAA;QACrE,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAA;QAE9C,KAAK,CAAC,CAAC,OAAO,CAAC,GAAU,CAAC,CAAA;QAE1B,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YAC9B,MAAM,GAAG,GAAW,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC;gBACjD,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC;gBAC5B,CAAC,CAAC,UAAU,CAAC,KAAe,CAAA;YAE9B,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,2BAA2B,GAAG,EAAE,CAAC,CAAA;YACvD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;YAC3C,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;gBACnB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAA;YACzD,CAAC;QACH,CAAC;QAED,OAAM;IACR,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAC5B,CAAA;IAEH,MAAM,iBAAiB,GAAG,QAAQ;SAC/B,SAAS,CAAC,sBAAsB,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;SACtD,IAAI,CACH,QAAQ,CAAC,WAAW,CAAC,uBAAuB,CAAC,EAC7C,QAAQ,CAAC,eAAe,CAAC,uCAAuC,CAAC,CAClE,CAAA;IAEH,MAAM,IAAI,GAAG,OAAO;SACjB,IAAI,CACH,MAAM,EACN,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,EACxC,MAAM,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,EAAC,EAAE,iBAAiB,EAAE;QACxD,OAAO,KAAK,CAAC,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAA;IAC/C,CAAC,CAAC,CACH;SACA,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,uDAAuD,CAAC,CAAC,CAAA;IAEzF,MAAM,MAAM,GAAG,OAAO;SACnB,IAAI,CACH,QAAQ,EACR,EAAE,EACF,MAAM,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,EAAC,EAAE;QACvC,OAAO,KAAK,CAAC,CAAC,cAAc,CAAA;IAC9B,CAAC,CAAC,CACH;SACA,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,sEAAsE,CAAC,CAAC,CAAA;IAExG,MAAM,EAAE,GAAG,OAAO;SACf,IAAI,CACH,IAAI,EACJ,EAAE,EACF,MAAM,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,QAAQ,CAAC,EAAC,EAAE;QACnC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,0CAA0C,CAAC,CAAA;QAEjE,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;YACpC,OAAO,EAAE;gBACP;oBACE,KAAK,EAAE,YAAY;oBACnB,WAAW,EAAE,iCAAiC;oBAC9C,KAAK,EAAE,YAAY;iBACpB;gBACD;oBACE,KAAK,EAAE,QAAQ;oBACf,WAAW,EAAE,6BAA6B;oBAC1C,KAAK,EAAE,QAAQ;iBAChB;gBACD;oBACE,KAAK,EAAE,MAAM;oBACb,WAAW,EAAE,4CAA4C;oBACzD,KAAK,EAAE,MAAM;iBACd;aACF;YACD,OAAO,EAAE,kBAAkB;SAC5B,CAAC,CAAA;QAEF,QAAQ,QAAQ,EAAE,CAAC;YACjB,KAAK,YAAY;gBACf,OAAO,KAAK,CAAC,CAAC,uBAAuB,CAAC,IAAI,CACxC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CACzC,CAAA;YAEH,KAAK,QAAQ;gBACX,OAAO,KAAK,CAAC,CAAC,oBAAoB,CAAC,IAAI,CACrC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CACzC,CAAA;YACH,KAAK,MAAM;gBACT,OAAO,KAAK,CAAC,CAAC,oBAAoB,CAAC,IAAI,CACrC,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC,EACvC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CACzC,CAAA;QACL,CAAC;IACH,CAAC,CAAC,CACH;SACA,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,0CAA0C,CAAC,CAAC,CAAA;IAE5E,MAAM,EAAE,GAAG,OAAO;SACf,IAAI,CACH,IAAI,EACJ,EAAE,EACF,MAAM,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC,QAAQ,CAAC,EAAC,EAAE;QAChD,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,sEAAsE,CAAC,CAAA;QAE7F,OAAO,KAAK,CAAC,CAAC,cAAc,CAAC,IAAI,CAC/B,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC,CACzC,CAAA;IACH,CAAC,CAAC,CACH;SACA,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,iEAAiE,CAAC,CAAC,CAAA;IAEnG,MAAM,UAAU,GAAG,mBAAmB,CACpC,aAAa,EACb,EAAE,EACF,MAAM,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC,QAAQ,CAAC,EAAC,EAAE;QAC5C,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,iCAAiC,CAAC,CAAA;QAExD,MAAM,IAAI,GAAG,CAAC,WAAW,CAAC,CAAA;QAE1B,MAAM,YAAY,GAAa,EAAE,CAAA;QACjC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;YACvC,IAAI,SAAS,EAAE,CAAC;gBACd,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;YACxB,CAAC;iBAAM,CAAC;gBACN,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,aAAa,GAAG,4BAA4B,CAAC,CAAA;YACxE,CAAC;QACH,CAAC;QAED,MAAM,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAA;QAC/D,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAA;IAC/D,CAAC,CAAC,EACF,gCAAgC,CACjC;SACE,IAAI,CACH,OAAO,CAAC,eAAe,CACrB,oEAAoE,CACrE,CACF,CAAA;IAEH,MAAM,WAAW,GAAG,mBAAmB,CACrC,aAAa,EACb,EAAE,EACF,MAAM,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC,QAAQ,CAAC,EAAC,EAAE;QAC5C,oDAAoD;QACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAE/B,OAAO,KAAK,CAAC,CAAC,kBAAkB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAA;IACjD,CAAC,CAAC,EACF,8CAA8C,CAC/C;SACE,IAAI,CACH,OAAO,CAAC,eAAe,CAAC,qFAAqF,CAAC,CAC/G,CAAA;IAEH,MAAM,mBAAmB,GAAG,mBAAmB,CAC7C,sBAAsB,EACtB,EAAE,EACF,MAAM,CAAC,EAAE,CAAC,+BAA+B,CAAC,CAAC,QAAQ,CAAC,EAAC,EAAE;QACrD,oDAAoD;QACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAE/B,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAA;QAEnD,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QACpD,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,6BAA6B,CAAC,CAAA;QAChE,CAAC;QAED,8BAA8B;QAC9B,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,aAAa,CAAC,WAAW,CAAC,CAAA;QAExD,MAAM,aAAa,GAAa,EAAE,CAAA;QAElC,2DAA2D;QAC3D,KAAK,MAAM,WAAW,IAAI,WAAW,EAAE,CAAC;YACtC,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;YACvD,MAAM,iBAAiB,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC,CAAA;YAClF,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC,CAAA;YAEjE,MAAM,aAAa,GAAG,KAAK;mBACtB,WAAW,CAAC,QAAQ,CAAC,sBAAsB,CAAC;mBAC5C,WAAW,CAAC,QAAQ,CAAC,sBAAsB,CAAC;mBAC5C,WAAW,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAA;YAE3C,IAAI,iBAAiB,IAAI,SAAS,IAAI,CAAC,aAAa,EAAE,CAAC;gBACrD,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;YACjC,CAAC;QACH,CAAC;QAED,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,aAAa,CAAC,MAAM,qBAAqB,CAAC,CAAA;QAEzE,mCAAmC;QACnC,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CACf,aAAa,CAAC,GAAG,CACf,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAC,WAAW;YACrC,MAAM,mBAAmB,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAA;YAChE,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,mBAAmB,EAAE,CAAC,CAAA;YACxD,OAAO,KAAK,CAAC,CAAC,kBAAkB,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAA;QACjE,CAAC,CAAC,CACH,CACF,CAAA;QAED,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,mCAAmC,CAAC,CAAA;IAC5D,CAAC,CAAC,EACF,0DAA0D,CAC3D;SACE,IAAI,CACH,OAAO,CAAC,eAAe,CAAC,gFAAgF,CAAC,CAC1G,CAAA;IAEH,MAAM,IAAI,GAAG,OAAO;SACjB,IAAI,CACH,MAAM,EACN;QACE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,CAC9B,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,EAC9B,IAAI,CAAC,eAAe,CAAC,iCAAiC,CAAC,CACxD;KACF,EACD,MAAM,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,EAAC,EAAE,MAAM,EAAE;QAC7C,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,WAAW,CAAA;QAC7B,OAAO,KAAK,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC;YACvB,QAAQ,EAAE,MAAM;SACjB,CAAC,CAAA;IACJ,CAAC,CAAC,CACH;SACA,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,gEAAgE,CAAC,CAAC,CAAA;IAElG,MAAM,IAAI,GAAG,OAAO;SACjB,IAAI,CACH,MAAM,EACN;QACE,MAAM,EAAE,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAClC,IAAI,CAAC,eAAe,CAAC,gDAAgD,CAAC,CACvE;QACD,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,IAAI,CAC1C,IAAI,CAAC,eAAe,CAAC,iCAAiC,CAAC,CACxD;KACF,EACD,MAAM,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,EAAC,EAAE,MAAM,EAAE,UAAU,EAAE;QACzD,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAC,CAAC,+BAA+B,CAAC,CAAA;QAEjG,IAAI,MAAM,EAAE,CAAC;YACX,KAAK,CAAC,CAAC,cAAc,CACnB,oSAAoS,CACrS,CAAA;QACH,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,CAAC,cAAc,CACnB,mTAAmT,CACpT,CAAA;YAED,IAAI,UAAU,EAAE,CAAC;gBACf,KAAK,CAAC,CAAC,cAAc,CACnB,kBAAkB,CACnB,CAAA;YACH,CAAC;QACH,CAAC;QAED,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,6BAA6B,CAAC,CAAA;IACtD,CAAC,CAAC,CACH;SACA,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,+EAA+E,CAAC,CAAC,CAAA;IAEjH,MAAM,UAAU,GAAG,OAAO;SACvB,IAAI,CACH,aAAa,EACb;QACE,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,IAAI,CACtC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EACnB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,eAAe,CAClB,4EAA4E,CAC7E,CACF;QACD,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAChC,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,eAAe,CAAC,wCAAwC,CAAC,CAC/D;QACD,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,IAAI,CAChC,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,eAAe,CAAC,wCAAwC,CAAC,CAC/D;QACD,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CACvC,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,eAAe,CAClB,wEAAwE,CACzE,CACF;KACF,EACD,MAAM,CAAC,EAAE,CAAC,sBAAsB,CAAC,CAAC,QAAQ,CAAC,EAAC,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE;QAClF,KAAK,CAAC,CAAC,iBAAiB,CAAC;YACvB,aAAa,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,EAAE;gBACrC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,cAAc,CAAC;gBAC9B,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;aACjD,CAAC;YACF,aAAa,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC;YAC7D,UAAU,EAAE,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC;YACzD,SAAS,EAAE,MAAM,CAAC,SAAS,CAAC,SAAS,EAAE,GAAG,EAAE,CAAC,8CAA8C,CAAC;SAC7F,CAAC,CAAA;IACJ,CAAC,CAAC,CACH;SACA,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,+DAA+D,CAAC,CAAC,CAAA;IAEjG,gBAAgB;IAChB,OAAO,KAAK,CAAC,CAAC,OAAO,CAAC,GAAG,CACvB,OAAO;SACJ,IAAI,CAAC,MAAM,CAAC;SACZ,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC;QAC5B,EAAE;QACF,EAAE;QACF,IAAI;QACJ,MAAM;QACN,UAAU;QACV,WAAW;QACX,mBAAmB;QACnB,IAAI;QACJ,IAAI;QACJ,UAAU;KACX,CAAC,CAAC,EACL;QACE,OAAO,EAAE,QAAQ;KAClB,CACF,CAAA;AACH,CAAC,CAAC,EAAE;KACH,IAAI,CACH,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,OAAO,CACZ,KAAK,CAAC,YAAY,CAChB,KAAK,CAAC,KAAK,CACT,WAAW,CAAC,OAAO,EACnB,iBAAiB,CAAC,OAAO,CAC1B,EACD,YAAY,CAAC,KAAK,CACnB,CACF,CACF,CACJ,CAAA"}
533
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,56 @@
1
+ import * as Effect from "effect/Effect";
2
+ import * as FileSystem from "effect/FileSystem";
3
+ import * as Path from "effect/Path";
4
+ import { RunCommandService } from "./os-command.js";
5
+ /**
6
+ * Project-side lockfile shape (`.shared.json`).
7
+ *
8
+ * `artifacts` maps SOURCE path (inside the shared repo) to DEST path (inside the
9
+ * consuming project). `exclude` lists source-relative paths to skip during sync.
10
+ */
11
+ export interface SharedLockfile {
12
+ readonly repo: string;
13
+ readonly ref: string;
14
+ readonly artifacts: Record<string, string>;
15
+ readonly exclude?: ReadonlyArray<string>;
16
+ readonly synced_at?: string;
17
+ }
18
+ /**
19
+ * Pull artifacts from the shared repo into the consuming project according to
20
+ * `.shared.json`. Idempotent — running twice without changes is a no-op.
21
+ *
22
+ * MVP: overwrites destination files. Caller is expected to inspect `git status`
23
+ * after sync to review local changes. Conflict handling lands in a follow-up.
24
+ */
25
+ export declare const syncShared: (opts?: {
26
+ lockfilePath?: string;
27
+ } | undefined) => Effect.Effect<void, Error | import("effect/PlatformError").PlatformError, FileSystem.FileSystem | Path.Path | RunCommandService>;
28
+ /**
29
+ * Compare project files to cache files. Reports each file as one of:
30
+ * M modified locally (project differs from cache)
31
+ * A added locally (project has file, cache does not — for tracked artifacts)
32
+ * D deleted locally (cache has file, project does not)
33
+ * E excluded (skipped by lockfile)
34
+ *
35
+ * Files that match cache exactly are not listed.
36
+ */
37
+ export declare const syncDiff: (opts?: {
38
+ lockfilePath?: string;
39
+ } | undefined) => Effect.Effect<void, Error | import("effect/PlatformError").PlatformError, FileSystem.FileSystem | Path.Path | RunCommandService>;
40
+ /**
41
+ * Push locally-modified synced files back to the shared repo on a new branch.
42
+ * Optionally opens a PR via `gh pr create`.
43
+ *
44
+ * Workflow:
45
+ * 1. Ensure cache fresh at pinned ref.
46
+ * 2. Detect modified files via hash compare (project vs cache).
47
+ * 3. Create new branch in cache, copy modified files in, commit, push.
48
+ * 4. Optionally run `gh pr create` if `--pr` set.
49
+ */
50
+ export declare const syncPush: (opts?: {
51
+ lockfilePath?: string | undefined;
52
+ message?: string | undefined;
53
+ branch?: string | undefined;
54
+ pr?: boolean | undefined;
55
+ } | undefined) => Effect.Effect<void, Error | import("effect/PlatformError").PlatformError, FileSystem.FileSystem | Path.Path | RunCommandService>;
56
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic3luYy1zaGFyZWQuZC50cyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9zeW5jLXNoYXJlZC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssTUFBTSxNQUFNLGVBQWUsQ0FBQTtBQUN2QyxPQUFPLEtBQUssVUFBVSxNQUFNLG1CQUFtQixDQUFBO0FBQy9DLE9BQU8sS0FBSyxJQUFJLE1BQU0sYUFBYSxDQUFBO0FBQ25DLE9BQU8sRUFBRSxpQkFBaUIsRUFBRSxNQUFNLGlCQUFpQixDQUFBO0FBRW5EOzs7OztHQUtHO0FBQ0gsTUFBTSxXQUFXLGNBQWM7SUFDN0IsUUFBUSxDQUFDLElBQUksRUFBRSxNQUFNLENBQUE7SUFDckIsUUFBUSxDQUFDLEdBQUcsRUFBRSxNQUFNLENBQUE7SUFDcEIsUUFBUSxDQUFDLFNBQVMsRUFBRSxNQUFNLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxDQUFBO0lBQzFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsRUFBRSxhQUFhLENBQUMsTUFBTSxDQUFDLENBQUE7SUFDeEMsUUFBUSxDQUFDLFNBQVMsQ0FBQyxFQUFFLE1BQU0sQ0FBQTtDQUM1QjtBQTRGRDs7Ozs7O0dBTUc7QUFDSCxlQUFPLE1BQU0sVUFBVTttQkFBc0QsTUFBTTtrSkFvQ2pGLENBQUE7QUFFRjs7Ozs7Ozs7R0FRRztBQUNILGVBQU8sTUFBTSxRQUFRO21CQUFzRCxNQUFNO2tKQTZDL0UsQ0FBQTtBQUVGOzs7Ozs7Ozs7R0FTRztBQUNILGVBQU8sTUFBTSxRQUFRO21CQUNKLE1BQU0sR0FBRyxTQUFTO2NBQ3ZCLE1BQU0sR0FBRyxTQUFTO2FBQ25CLE1BQU0sR0FBRyxTQUFTO1NBQ3RCLE9BQU8sR0FBRyxTQUFTO2tKQW1FeEIsQ0FBQSJ9
@@ -0,0 +1 @@
1
+ {"version":3,"file":"sync-shared.d.ts","sourceRoot":"","sources":["../src/sync-shared.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AACnC,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAEnD;;;;;GAKG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAC1C,QAAQ,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAA;IACxC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAC5B;AA4FD;;;;;;GAMG;AACH,eAAO,MAAM,UAAU;mBAAsD,MAAM;kJAoCjF,CAAA;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,QAAQ;mBAAsD,MAAM;kJAiD/E,CAAA;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,QAAQ;mBACJ,MAAM,GAAG,SAAS;cACvB,MAAM,GAAG,SAAS;aACnB,MAAM,GAAG,SAAS;SACtB,OAAO,GAAG,SAAS;kJAiFxB,CAAA"}
@@ -0,0 +1,227 @@
1
+ import * as Effect from "effect/Effect";
2
+ import * as FileSystem from "effect/FileSystem";
3
+ import * as Path from "effect/Path";
4
+ import { RunCommandService } from "./os-command.js";
5
+ const sanitizeRepoSlug = (repo) => repo.replace(/[^A-Za-z0-9_.-]+/g, "_");
6
+ const repoCloneUrl = (repo) => {
7
+ if (repo.startsWith("http") || repo.startsWith("git@"))
8
+ return repo;
9
+ // "github.com/effect-app/shared" → "git@github.com:effect-app/shared.git"
10
+ const m = repo.match(/^github\.com\/(.+?)\/(.+?)$/);
11
+ if (m)
12
+ return `git@github.com:${m[1]}/${m[2]}.git`;
13
+ return repo;
14
+ };
15
+ const joinPosix = (a, b) => a.endsWith("/") ? a + b : a + "/" + b;
16
+ const readLockfile = Effect.fnUntraced(function* (lockfilePath) {
17
+ const fs = yield* FileSystem.FileSystem;
18
+ if (!(yield* fs.exists(lockfilePath))) {
19
+ return yield* Effect.fail(new Error(`No ${lockfilePath} found in current directory.`));
20
+ }
21
+ const content = yield* fs.readFileString(lockfilePath);
22
+ return { content, lockfile: JSON.parse(content) };
23
+ });
24
+ const ensureCache = Effect.fnUntraced(function* (lockfile) {
25
+ const fs = yield* FileSystem.FileSystem;
26
+ const path = yield* Path.Path;
27
+ const { runGetExitCode } = yield* RunCommandService;
28
+ const home = process.env["HOME"] ?? process.env["USERPROFILE"];
29
+ if (!home)
30
+ return yield* Effect.fail(new Error("Cannot resolve home directory."));
31
+ const cacheRoot = path.join(home, ".cache", "effa", "shared");
32
+ const cachePath = path.join(cacheRoot, sanitizeRepoSlug(lockfile.repo));
33
+ const cloneUrl = repoCloneUrl(lockfile.repo);
34
+ if (!(yield* fs.exists(cachePath))) {
35
+ yield* runGetExitCode(`mkdir -p ${JSON.stringify(cacheRoot)}`);
36
+ yield* runGetExitCode(`git clone ${JSON.stringify(cloneUrl)} ${JSON.stringify(cachePath)}`);
37
+ }
38
+ else {
39
+ yield* runGetExitCode("git fetch --all --tags --prune", cachePath);
40
+ }
41
+ yield* runGetExitCode(`git checkout ${JSON.stringify(lockfile.ref)}`, cachePath);
42
+ return cachePath;
43
+ });
44
+ /**
45
+ * Walk artifact files. For each file in the artifact map (respecting excludes),
46
+ * yields `{ srcRel, srcAbs, destAbs }`.
47
+ */
48
+ const walkArtifacts = Effect.fnUntraced(function* (lockfile, cachePath) {
49
+ const fs = yield* FileSystem.FileSystem;
50
+ const path = yield* Path.Path;
51
+ const { runGetString } = yield* RunCommandService;
52
+ const excludeSet = new Set(lockfile.exclude ?? []);
53
+ const results = [];
54
+ for (const [srcRel, destRel] of Object.entries(lockfile.artifacts)) {
55
+ const srcAbs = path.join(cachePath, srcRel);
56
+ const destAbs = path.resolve(destRel);
57
+ if (!(yield* fs.exists(srcAbs)))
58
+ continue;
59
+ const stat = yield* fs.stat(srcAbs);
60
+ if (stat.type === "File") {
61
+ results.push({ srcRel, srcAbs, destAbs, excluded: excludeSet.has(srcRel) });
62
+ continue;
63
+ }
64
+ const fileList = yield* runGetString(`find ${JSON.stringify(srcAbs)} -type f`);
65
+ for (const fileAbs of fileList.split("\n").filter((l) => l.trim() !== "")) {
66
+ const relInArtifact = path.relative(srcAbs, fileAbs);
67
+ const srcRelFull = joinPosix(srcRel, relInArtifact);
68
+ const destFileAbs = path.join(destAbs, relInArtifact);
69
+ results.push({
70
+ srcRel: srcRelFull,
71
+ srcAbs: fileAbs,
72
+ destAbs: destFileAbs,
73
+ excluded: excludeSet.has(srcRelFull)
74
+ });
75
+ }
76
+ }
77
+ return results;
78
+ });
79
+ /**
80
+ * Pull artifacts from the shared repo into the consuming project according to
81
+ * `.shared.json`. Idempotent — running twice without changes is a no-op.
82
+ *
83
+ * MVP: overwrites destination files. Caller is expected to inspect `git status`
84
+ * after sync to review local changes. Conflict handling lands in a follow-up.
85
+ */
86
+ export const syncShared = Effect.fnUntraced(function* (opts = {}) {
87
+ const fs = yield* FileSystem.FileSystem;
88
+ const path = yield* Path.Path;
89
+ const { runGetExitCode } = yield* RunCommandService;
90
+ const lockfilePath = opts.lockfilePath ?? ".shared.json";
91
+ const { content: lockfileContent, lockfile } = yield* readLockfile(lockfilePath);
92
+ yield* Effect.logInfo(`Syncing from ${lockfile.repo} @ ${lockfile.ref}`);
93
+ const cachePath = yield* ensureCache(lockfile);
94
+ yield* Effect.logInfo(`Cache: ${cachePath}`);
95
+ const files = yield* walkArtifacts(lockfile, cachePath);
96
+ let copied = 0;
97
+ let skipped = 0;
98
+ for (const { srcRel, srcAbs, destAbs, excluded } of files) {
99
+ if (excluded) {
100
+ yield* Effect.logInfo(` exclude ${srcRel}`);
101
+ skipped++;
102
+ continue;
103
+ }
104
+ yield* runGetExitCode(`mkdir -p ${JSON.stringify(path.dirname(destAbs))}`);
105
+ yield* runGetExitCode(`cp ${JSON.stringify(srcAbs)} ${JSON.stringify(destAbs)}`);
106
+ copied++;
107
+ }
108
+ const today = new Date().toISOString().slice(0, 10);
109
+ const trailingNewline = lockfileContent.endsWith("\n") ? "\n" : "";
110
+ const updated = { ...lockfile, synced_at: today };
111
+ yield* fs.writeFileString(lockfilePath, JSON.stringify(updated, null, 2) + trailingNewline);
112
+ yield* Effect.logInfo(`Sync complete: ${copied} copied, ${skipped} excluded.`);
113
+ yield* Effect.logInfo("Review changes with: git status");
114
+ });
115
+ /**
116
+ * Compare project files to cache files. Reports each file as one of:
117
+ * M modified locally (project differs from cache)
118
+ * A added locally (project has file, cache does not — for tracked artifacts)
119
+ * D deleted locally (cache has file, project does not)
120
+ * E excluded (skipped by lockfile)
121
+ *
122
+ * Files that match cache exactly are not listed.
123
+ */
124
+ export const syncDiff = Effect.fnUntraced(function* (opts = {}) {
125
+ const fs = yield* FileSystem.FileSystem;
126
+ const { runGetString } = yield* RunCommandService;
127
+ const lockfilePath = opts.lockfilePath ?? ".shared.json";
128
+ const { lockfile } = yield* readLockfile(lockfilePath);
129
+ yield* Effect.logInfo(`Diffing against ${lockfile.repo} @ ${lockfile.ref}`);
130
+ const cachePath = yield* ensureCache(lockfile);
131
+ const files = yield* walkArtifacts(lockfile, cachePath);
132
+ const changes = [];
133
+ for (const { srcRel, srcAbs, destAbs, excluded } of files) {
134
+ if (excluded) {
135
+ changes.push({ kind: "E", srcRel, destPath: destAbs });
136
+ continue;
137
+ }
138
+ if (!(yield* fs.exists(destAbs))) {
139
+ changes.push({ kind: "D", srcRel, destPath: destAbs });
140
+ continue;
141
+ }
142
+ const srcHash = (yield* runGetString(`sha256sum ${JSON.stringify(srcAbs)}`)).split(" ")[0];
143
+ const destHash = (yield* runGetString(`sha256sum ${JSON.stringify(destAbs)}`)).split(" ")[0];
144
+ if (srcHash !== destHash) {
145
+ changes.push({ kind: "M", srcRel, destPath: destAbs });
146
+ }
147
+ }
148
+ if (changes.length === 0) {
149
+ yield* Effect.logInfo("In sync. No diff.");
150
+ return;
151
+ }
152
+ for (const { kind, srcRel, destPath } of changes) {
153
+ yield* Effect.logInfo(`${kind} ${srcRel} -> ${destPath}`);
154
+ }
155
+ yield* Effect.logInfo("");
156
+ yield* Effect.logInfo(`Summary: ${changes.filter((c) => c.kind === "M").length} modified, ${changes
157
+ .filter((c) => c.kind === "D")
158
+ .length} missing in project, ${changes.filter((c) => c.kind === "E").length} excluded.`);
159
+ });
160
+ /**
161
+ * Push locally-modified synced files back to the shared repo on a new branch.
162
+ * Optionally opens a PR via `gh pr create`.
163
+ *
164
+ * Workflow:
165
+ * 1. Ensure cache fresh at pinned ref.
166
+ * 2. Detect modified files via hash compare (project vs cache).
167
+ * 3. Create new branch in cache, copy modified files in, commit, push.
168
+ * 4. Optionally run `gh pr create` if `--pr` set.
169
+ */
170
+ export const syncPush = Effect.fnUntraced(function* (opts = {}) {
171
+ const { runGetExitCode, runGetString } = yield* RunCommandService;
172
+ const lockfilePath = opts.lockfilePath ?? ".shared.json";
173
+ const { lockfile } = yield* readLockfile(lockfilePath);
174
+ const cachePath = yield* ensureCache(lockfile);
175
+ const files = yield* walkArtifacts(lockfile, cachePath);
176
+ const fs = yield* FileSystem.FileSystem;
177
+ const modified = [];
178
+ const deleted = [];
179
+ for (const { srcRel, srcAbs, destAbs, excluded } of files) {
180
+ if (excluded)
181
+ continue;
182
+ if (!(yield* fs.exists(destAbs))) {
183
+ deleted.push({ srcRel, srcAbs });
184
+ continue;
185
+ }
186
+ const srcHash = (yield* runGetString(`sha256sum ${JSON.stringify(srcAbs)}`)).split(" ")[0];
187
+ const destHash = (yield* runGetString(`sha256sum ${JSON.stringify(destAbs)}`)).split(" ")[0];
188
+ if (srcHash !== destHash) {
189
+ modified.push({ srcRel, srcAbs, destAbs });
190
+ }
191
+ }
192
+ if (modified.length === 0 && deleted.length === 0) {
193
+ yield* Effect.logInfo("No local modifications to push.");
194
+ return;
195
+ }
196
+ yield* Effect.logInfo(`Pushing ${modified.length} modified, ${deleted.length} deleted file(s):`);
197
+ for (const { srcRel } of modified) {
198
+ yield* Effect.logInfo(` M ${srcRel}`);
199
+ }
200
+ for (const { srcRel } of deleted) {
201
+ yield* Effect.logInfo(` D ${srcRel}`);
202
+ }
203
+ const branch = opts.branch
204
+ ?? `sync/from-${sanitizeRepoSlug(process.cwd().split("/").pop() ?? "project")}-${new Date().toISOString().slice(0, 10)}`;
205
+ const message = opts.message ?? "sync: propagate local edits";
206
+ // Stash anything in cache (defensive), create branch from pinned ref.
207
+ yield* runGetExitCode(`git stash --include-untracked || true`, cachePath);
208
+ yield* runGetExitCode(`git checkout -B ${JSON.stringify(branch)} ${JSON.stringify(lockfile.ref)}`, cachePath);
209
+ for (const { srcAbs, destAbs } of modified) {
210
+ yield* runGetExitCode(`cp ${JSON.stringify(destAbs)} ${JSON.stringify(srcAbs)}`);
211
+ }
212
+ for (const { srcAbs } of deleted) {
213
+ yield* runGetExitCode(`git rm -f ${JSON.stringify(srcAbs)}`, cachePath);
214
+ }
215
+ yield* runGetExitCode(`git add -A`, cachePath);
216
+ yield* runGetExitCode(`git -c commit.gpgsign=false commit -m ${JSON.stringify(message)}`, cachePath);
217
+ yield* runGetExitCode(`git push -u origin ${JSON.stringify(branch)}`, cachePath);
218
+ if (opts.pr) {
219
+ yield* runGetExitCode(`gh pr create --title ${JSON.stringify(message)} --body ${JSON.stringify(`Propagated from project at ${process.cwd()}.\n\nFiles:\n${[
220
+ ...modified.map((m) => `- M ${m.srcRel}`),
221
+ ...deleted.map((d) => `- D ${d.srcRel}`)
222
+ ].join("\n")}`)} --head ${JSON.stringify(branch)}`, cachePath);
223
+ }
224
+ yield* Effect.logInfo(`Pushed branch ${branch} to shared repo.`);
225
+ yield* Effect.logInfo(opts.pr ? "PR opened." : "Open a PR with: gh pr create (from the cache dir)");
226
+ });
227
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"sync-shared.js","sourceRoot":"","sources":["../src/sync-shared.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect-app/cli",
3
- "version": "2.1.0-beta.23",
3
+ "version": "2.1.0-beta.25",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "bin": {
@@ -20,7 +20,7 @@
20
20
  "json5": "^2.2.3",
21
21
  "typescript": "npm:@typescript/native-preview@beta",
22
22
  "vitest": "^4.1.5",
23
- "effect-app": "4.0.0-beta.244"
23
+ "effect-app": "4.0.0-beta.246"
24
24
  },
25
25
  "typesVersions": {
26
26
  "*": {
@@ -57,6 +57,10 @@
57
57
  "./sync-effect-subtree": {
58
58
  "types": "./dist/sync-effect-subtree.d.ts",
59
59
  "default": "./dist/sync-effect-subtree.js"
60
+ },
61
+ "./sync-shared": {
62
+ "types": "./dist/sync-shared.d.ts",
63
+ "default": "./dist/sync-shared.js"
60
64
  }
61
65
  },
62
66
  "gitHead": "bd8e27eea3eff97db8739d577d67e7336c078d28",
package/src/index.ts CHANGED
@@ -17,6 +17,7 @@ import { packages } from "./shared.js"
17
17
 
18
18
  import { patchArgvForWrapCommands } from "./argv-patch.js"
19
19
  import { syncEffectSubtree } from "./sync-effect-subtree.js"
20
+ import { syncDiff, syncPush, syncShared } from "./sync-shared.js"
20
21
 
21
22
  patchArgvForWrapCommands(process.argv)
22
23
 
@@ -751,6 +752,66 @@ NodeRuntime.runMain(
751
752
  )
752
753
  .pipe(Command.withDescription("Sync the Effect subtree to the version pinned in package.json"))
753
754
 
755
+ const SharedLockfileFlag = Flag.file("lockfile").pipe(
756
+ Flag.optional,
757
+ Flag.withDescription("Path to lockfile (default: .shared.json)")
758
+ )
759
+
760
+ const sync = Command
761
+ .make(
762
+ "sync",
763
+ { lockfile: SharedLockfileFlag },
764
+ Effect.fn("effa-cli.sync")(function*({ lockfile }) {
765
+ yield* syncShared({
766
+ lockfilePath: Option.getOrElse(lockfile, () => ".shared.json")
767
+ })
768
+ })
769
+ )
770
+ .pipe(
771
+ Command.withDescription("Sync shared docs / e2e helpers / plugins from effect-app/shared per .shared.json")
772
+ )
773
+
774
+ const syncDiffCmd = Command
775
+ .make(
776
+ "sync-diff",
777
+ { lockfile: SharedLockfileFlag },
778
+ Effect.fn("effa-cli.sync-diff")(function*({ lockfile }) {
779
+ yield* syncDiff({
780
+ lockfilePath: Option.getOrElse(lockfile, () => ".shared.json")
781
+ })
782
+ })
783
+ )
784
+ .pipe(Command.withDescription("Report drift between local synced files and the pinned shared ref"))
785
+
786
+ const syncPushCmd = Command
787
+ .make(
788
+ "sync-push",
789
+ {
790
+ lockfile: SharedLockfileFlag,
791
+ message: Flag.string("message").pipe(
792
+ Flag.withAlias("m"),
793
+ Flag.optional,
794
+ Flag.withDescription("Commit message for the push")
795
+ ),
796
+ branch: Flag.string("branch").pipe(
797
+ Flag.optional,
798
+ Flag.withDescription("Branch name in shared repo (default: auto-generated)")
799
+ ),
800
+ pr: Flag.boolean("pr").pipe(
801
+ Flag.withDescription("Open a PR via `gh pr create` after pushing")
802
+ )
803
+ },
804
+ Effect.fn("effa-cli.sync-push")(function*({ branch, lockfile, message, pr }) {
805
+ yield* syncPush({
806
+ lockfilePath: Option.getOrElse(lockfile, () => ".shared.json"),
807
+ message: Option.getOrUndefined(message),
808
+ branch: Option.getOrUndefined(branch),
809
+ pr
810
+ })
811
+ })
812
+ )
813
+ .pipe(Command.withDescription("Push locally-modified synced files to the shared repo on a new branch"))
814
+
754
815
  // configure CLI
755
816
  return yield* Command.run(
756
817
  Command
@@ -765,7 +826,10 @@ NodeRuntime.runMain(
765
826
  packagejsonPackages,
766
827
  gist,
767
828
  nuke,
768
- syncEffect
829
+ syncEffect,
830
+ sync,
831
+ syncDiffCmd,
832
+ syncPushCmd
769
833
  ])),
770
834
  {
771
835
  version: "v1.0.0"
@@ -0,0 +1,310 @@
1
+ import * as Effect from "effect/Effect"
2
+ import * as FileSystem from "effect/FileSystem"
3
+ import * as Path from "effect/Path"
4
+ import { RunCommandService } from "./os-command.js"
5
+
6
+ /**
7
+ * Project-side lockfile shape (`.shared.json`).
8
+ *
9
+ * `artifacts` maps SOURCE path (inside the shared repo) to DEST path (inside the
10
+ * consuming project). `exclude` lists source-relative paths to skip during sync.
11
+ */
12
+ export interface SharedLockfile {
13
+ readonly repo: string
14
+ readonly ref: string
15
+ readonly artifacts: Record<string, string>
16
+ readonly exclude?: ReadonlyArray<string>
17
+ readonly synced_at?: string
18
+ }
19
+
20
+ const sanitizeRepoSlug = (repo: string) => repo.replace(/[^A-Za-z0-9_.-]+/g, "_")
21
+
22
+ const repoCloneUrl = (repo: string) => {
23
+ if (repo.startsWith("http") || repo.startsWith("git@")) return repo
24
+ // "github.com/effect-app/shared" → "git@github.com:effect-app/shared.git"
25
+ const m = repo.match(/^github\.com\/(.+?)\/(.+?)$/)
26
+ if (m) return `git@github.com:${m[1]}/${m[2]}.git`
27
+ return repo
28
+ }
29
+
30
+ const joinPosix = (a: string, b: string) => a.endsWith("/") ? a + b : a + "/" + b
31
+
32
+ const readLockfile = Effect.fnUntraced(function*(lockfilePath: string) {
33
+ const fs = yield* FileSystem.FileSystem
34
+ if (!(yield* fs.exists(lockfilePath))) {
35
+ return yield* Effect.fail(new Error(`No ${lockfilePath} found in current directory.`))
36
+ }
37
+ const content = yield* fs.readFileString(lockfilePath)
38
+ return { content, lockfile: JSON.parse(content) as SharedLockfile }
39
+ })
40
+
41
+ const ensureCache = Effect.fnUntraced(function*(lockfile: SharedLockfile) {
42
+ const fs = yield* FileSystem.FileSystem
43
+ const path = yield* Path.Path
44
+ const { runGetExitCode } = yield* RunCommandService
45
+
46
+ const home = process.env["HOME"] ?? process.env["USERPROFILE"]
47
+ if (!home) return yield* Effect.fail(new Error("Cannot resolve home directory."))
48
+
49
+ const cacheRoot = path.join(home, ".cache", "effa", "shared")
50
+ const cachePath = path.join(cacheRoot, sanitizeRepoSlug(lockfile.repo))
51
+ const cloneUrl = repoCloneUrl(lockfile.repo)
52
+
53
+ if (!(yield* fs.exists(cachePath))) {
54
+ yield* runGetExitCode(`mkdir -p ${JSON.stringify(cacheRoot)}`)
55
+ yield* runGetExitCode(`git clone ${JSON.stringify(cloneUrl)} ${JSON.stringify(cachePath)}`)
56
+ } else {
57
+ yield* runGetExitCode("git fetch --all --tags --prune", cachePath)
58
+ }
59
+
60
+ yield* runGetExitCode(`git checkout ${JSON.stringify(lockfile.ref)}`, cachePath)
61
+
62
+ return cachePath
63
+ })
64
+
65
+ /**
66
+ * Walk artifact files. For each file in the artifact map (respecting excludes),
67
+ * yields `{ srcRel, srcAbs, destAbs }`.
68
+ */
69
+ const walkArtifacts = Effect.fnUntraced(function*(
70
+ lockfile: SharedLockfile,
71
+ cachePath: string
72
+ ) {
73
+ const fs = yield* FileSystem.FileSystem
74
+ const path = yield* Path.Path
75
+ const { runGetString } = yield* RunCommandService
76
+
77
+ const excludeSet = new Set(lockfile.exclude ?? [])
78
+ const results: Array<{ srcRel: string; srcAbs: string; destAbs: string; excluded: boolean }> = []
79
+
80
+ for (const [srcRel, destRel] of Object.entries(lockfile.artifacts)) {
81
+ const srcAbs = path.join(cachePath, srcRel)
82
+ const destAbs = path.resolve(destRel)
83
+
84
+ if (!(yield* fs.exists(srcAbs))) continue
85
+
86
+ const stat = yield* fs.stat(srcAbs)
87
+
88
+ if (stat.type === "File") {
89
+ results.push({ srcRel, srcAbs, destAbs, excluded: excludeSet.has(srcRel) })
90
+ continue
91
+ }
92
+
93
+ const fileList = yield* runGetString(`find ${JSON.stringify(srcAbs)} -type f`)
94
+ for (const fileAbs of fileList.split("\n").filter((l) => l.trim() !== "")) {
95
+ const relInArtifact = path.relative(srcAbs, fileAbs)
96
+ const srcRelFull = joinPosix(srcRel, relInArtifact)
97
+ const destFileAbs = path.join(destAbs, relInArtifact)
98
+ results.push({
99
+ srcRel: srcRelFull,
100
+ srcAbs: fileAbs,
101
+ destAbs: destFileAbs,
102
+ excluded: excludeSet.has(srcRelFull)
103
+ })
104
+ }
105
+ }
106
+
107
+ return results
108
+ })
109
+
110
+ /**
111
+ * Pull artifacts from the shared repo into the consuming project according to
112
+ * `.shared.json`. Idempotent — running twice without changes is a no-op.
113
+ *
114
+ * MVP: overwrites destination files. Caller is expected to inspect `git status`
115
+ * after sync to review local changes. Conflict handling lands in a follow-up.
116
+ */
117
+ export const syncShared = Effect.fnUntraced(function*(opts: { lockfilePath?: string } = {}) {
118
+ const fs = yield* FileSystem.FileSystem
119
+ const path = yield* Path.Path
120
+ const { runGetExitCode } = yield* RunCommandService
121
+
122
+ const lockfilePath = opts.lockfilePath ?? ".shared.json"
123
+ const { content: lockfileContent, lockfile } = yield* readLockfile(lockfilePath)
124
+
125
+ yield* Effect.logInfo(`Syncing from ${lockfile.repo} @ ${lockfile.ref}`)
126
+
127
+ const cachePath = yield* ensureCache(lockfile)
128
+ yield* Effect.logInfo(`Cache: ${cachePath}`)
129
+
130
+ const files = yield* walkArtifacts(lockfile, cachePath)
131
+
132
+ let copied = 0
133
+ let skipped = 0
134
+
135
+ for (const { srcRel, srcAbs, destAbs, excluded } of files) {
136
+ if (excluded) {
137
+ yield* Effect.logInfo(` exclude ${srcRel}`)
138
+ skipped++
139
+ continue
140
+ }
141
+ yield* runGetExitCode(`mkdir -p ${JSON.stringify(path.dirname(destAbs))}`)
142
+ yield* runGetExitCode(`cp ${JSON.stringify(srcAbs)} ${JSON.stringify(destAbs)}`)
143
+ copied++
144
+ }
145
+
146
+ const today = new Date().toISOString().slice(0, 10)
147
+ const trailingNewline = lockfileContent.endsWith("\n") ? "\n" : ""
148
+ const updated = { ...lockfile, synced_at: today }
149
+ yield* fs.writeFileString(lockfilePath, JSON.stringify(updated, null, 2) + trailingNewline)
150
+
151
+ yield* Effect.logInfo(`Sync complete: ${copied} copied, ${skipped} excluded.`)
152
+ yield* Effect.logInfo("Review changes with: git status")
153
+ })
154
+
155
+ /**
156
+ * Compare project files to cache files. Reports each file as one of:
157
+ * M modified locally (project differs from cache)
158
+ * A added locally (project has file, cache does not — for tracked artifacts)
159
+ * D deleted locally (cache has file, project does not)
160
+ * E excluded (skipped by lockfile)
161
+ *
162
+ * Files that match cache exactly are not listed.
163
+ */
164
+ export const syncDiff = Effect.fnUntraced(function*(opts: { lockfilePath?: string } = {}) {
165
+ const fs = yield* FileSystem.FileSystem
166
+ const { runGetString } = yield* RunCommandService
167
+
168
+ const lockfilePath = opts.lockfilePath ?? ".shared.json"
169
+ const { lockfile } = yield* readLockfile(lockfilePath)
170
+
171
+ yield* Effect.logInfo(`Diffing against ${lockfile.repo} @ ${lockfile.ref}`)
172
+
173
+ const cachePath = yield* ensureCache(lockfile)
174
+ const files = yield* walkArtifacts(lockfile, cachePath)
175
+
176
+ const changes: Array<{ kind: "M" | "D" | "E"; srcRel: string; destPath: string }> = []
177
+
178
+ for (const { srcRel, srcAbs, destAbs, excluded } of files) {
179
+ if (excluded) {
180
+ changes.push({ kind: "E", srcRel, destPath: destAbs })
181
+ continue
182
+ }
183
+
184
+ if (!(yield* fs.exists(destAbs))) {
185
+ changes.push({ kind: "D", srcRel, destPath: destAbs })
186
+ continue
187
+ }
188
+
189
+ const srcHash = (yield* runGetString(`sha256sum ${JSON.stringify(srcAbs)}`)).split(" ")[0]
190
+ const destHash = (yield* runGetString(`sha256sum ${JSON.stringify(destAbs)}`)).split(" ")[0]
191
+
192
+ if (srcHash !== destHash) {
193
+ changes.push({ kind: "M", srcRel, destPath: destAbs })
194
+ }
195
+ }
196
+
197
+ if (changes.length === 0) {
198
+ yield* Effect.logInfo("In sync. No diff.")
199
+ return
200
+ }
201
+
202
+ for (const { kind, srcRel, destPath } of changes) {
203
+ yield* Effect.logInfo(`${kind} ${srcRel} -> ${destPath}`)
204
+ }
205
+ yield* Effect.logInfo("")
206
+ yield* Effect.logInfo(
207
+ `Summary: ${changes.filter((c) => c.kind === "M").length} modified, ${
208
+ changes
209
+ .filter((c) => c.kind === "D")
210
+ .length
211
+ } missing in project, ${changes.filter((c) => c.kind === "E").length} excluded.`
212
+ )
213
+ })
214
+
215
+ /**
216
+ * Push locally-modified synced files back to the shared repo on a new branch.
217
+ * Optionally opens a PR via `gh pr create`.
218
+ *
219
+ * Workflow:
220
+ * 1. Ensure cache fresh at pinned ref.
221
+ * 2. Detect modified files via hash compare (project vs cache).
222
+ * 3. Create new branch in cache, copy modified files in, commit, push.
223
+ * 4. Optionally run `gh pr create` if `--pr` set.
224
+ */
225
+ export const syncPush = Effect.fnUntraced(function*(opts: {
226
+ lockfilePath?: string | undefined
227
+ message?: string | undefined
228
+ branch?: string | undefined
229
+ pr?: boolean | undefined
230
+ } = {}) {
231
+ const { runGetExitCode, runGetString } = yield* RunCommandService
232
+
233
+ const lockfilePath = opts.lockfilePath ?? ".shared.json"
234
+ const { lockfile } = yield* readLockfile(lockfilePath)
235
+
236
+ const cachePath = yield* ensureCache(lockfile)
237
+ const files = yield* walkArtifacts(lockfile, cachePath)
238
+
239
+ const fs = yield* FileSystem.FileSystem
240
+ const modified: Array<{ srcRel: string; srcAbs: string; destAbs: string }> = []
241
+ const deleted: Array<{ srcRel: string; srcAbs: string }> = []
242
+
243
+ for (const { srcRel, srcAbs, destAbs, excluded } of files) {
244
+ if (excluded) continue
245
+ if (!(yield* fs.exists(destAbs))) {
246
+ deleted.push({ srcRel, srcAbs })
247
+ continue
248
+ }
249
+ const srcHash = (yield* runGetString(`sha256sum ${JSON.stringify(srcAbs)}`)).split(" ")[0]
250
+ const destHash = (yield* runGetString(`sha256sum ${JSON.stringify(destAbs)}`)).split(" ")[0]
251
+ if (srcHash !== destHash) {
252
+ modified.push({ srcRel, srcAbs, destAbs })
253
+ }
254
+ }
255
+
256
+ if (modified.length === 0 && deleted.length === 0) {
257
+ yield* Effect.logInfo("No local modifications to push.")
258
+ return
259
+ }
260
+
261
+ yield* Effect.logInfo(`Pushing ${modified.length} modified, ${deleted.length} deleted file(s):`)
262
+ for (const { srcRel } of modified) {
263
+ yield* Effect.logInfo(` M ${srcRel}`)
264
+ }
265
+ for (const { srcRel } of deleted) {
266
+ yield* Effect.logInfo(` D ${srcRel}`)
267
+ }
268
+
269
+ const branch = opts.branch
270
+ ?? `sync/from-${sanitizeRepoSlug(process.cwd().split("/").pop() ?? "project")}-${
271
+ new Date().toISOString().slice(0, 10)
272
+ }`
273
+
274
+ const message = opts.message ?? "sync: propagate local edits"
275
+
276
+ // Stash anything in cache (defensive), create branch from pinned ref.
277
+ yield* runGetExitCode(`git stash --include-untracked || true`, cachePath)
278
+ yield* runGetExitCode(`git checkout -B ${JSON.stringify(branch)} ${JSON.stringify(lockfile.ref)}`, cachePath)
279
+
280
+ for (const { srcAbs, destAbs } of modified) {
281
+ yield* runGetExitCode(`cp ${JSON.stringify(destAbs)} ${JSON.stringify(srcAbs)}`)
282
+ }
283
+ for (const { srcAbs } of deleted) {
284
+ yield* runGetExitCode(`git rm -f ${JSON.stringify(srcAbs)}`, cachePath)
285
+ }
286
+
287
+ yield* runGetExitCode(`git add -A`, cachePath)
288
+ yield* runGetExitCode(
289
+ `git -c commit.gpgsign=false commit -m ${JSON.stringify(message)}`,
290
+ cachePath
291
+ )
292
+ yield* runGetExitCode(`git push -u origin ${JSON.stringify(branch)}`, cachePath)
293
+
294
+ if (opts.pr) {
295
+ yield* runGetExitCode(
296
+ `gh pr create --title ${JSON.stringify(message)} --body ${
297
+ JSON.stringify(`Propagated from project at ${process.cwd()}.\n\nFiles:\n${
298
+ [
299
+ ...modified.map((m) => `- M ${m.srcRel}`),
300
+ ...deleted.map((d) => `- D ${d.srcRel}`)
301
+ ].join("\n")
302
+ }`)
303
+ } --head ${JSON.stringify(branch)}`,
304
+ cachePath
305
+ )
306
+ }
307
+
308
+ yield* Effect.logInfo(`Pushed branch ${branch} to shared repo.`)
309
+ yield* Effect.logInfo(opts.pr ? "PR opened." : "Open a PR with: gh pr create (from the cache dir)")
310
+ })