@ibgib/vcs-gib 0.0.30 → 0.0.33
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/dist/AUTO-GENERATED-version.d.mts +1 -1
- package/dist/AUTO-GENERATED-version.mjs +1 -1
- package/dist/bootstrap/node-bootstrap.d.mts.map +1 -1
- package/dist/bootstrap/node-bootstrap.mjs +7 -21
- package/dist/bootstrap/node-bootstrap.mjs.map +1 -1
- package/dist/cli/commands/{add-cmd.d.mts → cli-add-cmd.d.mts} +3 -4
- package/dist/cli/commands/cli-add-cmd.d.mts.map +1 -0
- package/dist/cli/commands/cli-add-cmd.mjs +45 -0
- package/dist/cli/commands/cli-add-cmd.mjs.map +1 -0
- package/dist/cli/commands/{branch-cmd.d.mts → cli-branch-cmd.d.mts} +9 -9
- package/dist/cli/commands/cli-branch-cmd.d.mts.map +1 -0
- package/dist/cli/commands/cli-branch-cmd.mjs +59 -0
- package/dist/cli/commands/cli-branch-cmd.mjs.map +1 -0
- package/dist/cli/commands/cli-checkout-cmd.d.mts +20 -0
- package/dist/cli/commands/cli-checkout-cmd.d.mts.map +1 -0
- package/dist/cli/commands/cli-checkout-cmd.mjs +50 -0
- package/dist/cli/commands/cli-checkout-cmd.mjs.map +1 -0
- package/dist/cli/commands/cli-commit-cmd.d.mts +23 -0
- package/dist/cli/commands/cli-commit-cmd.d.mts.map +1 -0
- package/dist/cli/commands/cli-commit-cmd.mjs +52 -0
- package/dist/cli/commands/cli-commit-cmd.mjs.map +1 -0
- package/dist/cli/commands/{generate-comment-cmd.d.mts → cli-generate-comment-cmd.d.mts} +1 -1
- package/dist/cli/commands/cli-generate-comment-cmd.d.mts.map +1 -0
- package/dist/cli/commands/{generate-comment-cmd.mjs → cli-generate-comment-cmd.mjs} +11 -6
- package/dist/cli/commands/cli-generate-comment-cmd.mjs.map +1 -0
- package/dist/cli/commands/{init-cmd.d.mts → cli-init-cmd.d.mts} +3 -3
- package/dist/cli/commands/cli-init-cmd.d.mts.map +1 -0
- package/dist/cli/commands/cli-init-cmd.mjs +47 -0
- package/dist/cli/commands/cli-init-cmd.mjs.map +1 -0
- package/dist/cli/commands/{log-cmd.d.mts → cli-log-cmd.d.mts} +3 -4
- package/dist/cli/commands/cli-log-cmd.d.mts.map +1 -0
- package/dist/cli/commands/cli-log-cmd.mjs +90 -0
- package/dist/cli/commands/cli-log-cmd.mjs.map +1 -0
- package/dist/cli/commands/cli-merge-cmd.d.mts +22 -0
- package/dist/cli/commands/cli-merge-cmd.d.mts.map +1 -0
- package/dist/cli/commands/cli-merge-cmd.mjs +66 -0
- package/dist/cli/commands/cli-merge-cmd.mjs.map +1 -0
- package/dist/cli/commands/{reset-cmd.d.mts → cli-reset-cmd.d.mts} +2 -2
- package/dist/cli/commands/cli-reset-cmd.d.mts.map +1 -0
- package/dist/cli/commands/cli-reset-cmd.mjs +63 -0
- package/dist/cli/commands/cli-reset-cmd.mjs.map +1 -0
- package/dist/cli/commands/cli-restore-cmd.d.mts +23 -0
- package/dist/cli/commands/cli-restore-cmd.d.mts.map +1 -0
- package/dist/cli/commands/cli-restore-cmd.mjs +55 -0
- package/dist/cli/commands/cli-restore-cmd.mjs.map +1 -0
- package/dist/cli/commands/{status-cmd.d.mts → cli-status-cmd.d.mts} +3 -3
- package/dist/cli/commands/cli-status-cmd.d.mts.map +1 -0
- package/dist/cli/commands/cli-status-cmd.mjs +96 -0
- package/dist/cli/commands/cli-status-cmd.mjs.map +1 -0
- package/dist/cli/vcs-cli-main.d.mts.map +1 -1
- package/dist/cli/vcs-cli-main.mjs +18 -15
- package/dist/cli/vcs-cli-main.mjs.map +1 -1
- package/dist/cli/vcs-projection-helper.d.mts +23 -0
- package/dist/cli/vcs-projection-helper.d.mts.map +1 -0
- package/dist/cli/vcs-projection-helper.mjs +91 -0
- package/dist/cli/vcs-projection-helper.mjs.map +1 -0
- package/dist/cli/vcs-repo-helper.d.mts +19 -0
- package/dist/cli/vcs-repo-helper.d.mts.map +1 -0
- package/dist/cli/vcs-repo-helper.mjs +74 -0
- package/dist/cli/vcs-repo-helper.mjs.map +1 -0
- package/dist/test/test-helpers.d.mts +11 -2
- package/dist/test/test-helpers.d.mts.map +1 -1
- package/dist/test/test-helpers.mjs +35 -0
- package/dist/test/test-helpers.mjs.map +1 -1
- package/package.json +6 -6
- package/src/AUTO-GENERATED-version.mts +1 -1
- package/src/bootstrap/node-bootstrap.mts +7 -21
- package/src/bootstrap/node-bootstrap.respec.mts +2 -2
- package/src/cli/cli-arg-parser.respec.mts +2 -2
- package/src/cli/cli-e2e.respec.mts +12 -12
- package/src/cli/commands/branch-checkout-cmd.respec.mts +426 -412
- package/src/cli/commands/cli-add-cmd.mts +65 -0
- package/src/cli/commands/cli-branch-cmd.mts +87 -0
- package/src/cli/commands/cli-checkout-cmd.mts +72 -0
- package/src/cli/commands/cli-commit-cmd.mts +77 -0
- package/src/cli/commands/{generate-comment-cmd.mts → cli-generate-comment-cmd.mts} +12 -6
- package/src/cli/commands/cli-init-cmd.mts +78 -0
- package/src/cli/commands/cli-log-cmd.mts +126 -0
- package/src/cli/commands/cli-merge-cmd.mts +99 -0
- package/src/cli/commands/cli-reset-cmd.mts +94 -0
- package/src/cli/commands/cli-restore-cmd.mts +87 -0
- package/src/cli/commands/cli-status-cmd.mts +131 -0
- package/src/cli/commands/commit-log-cmd.respec.mts +85 -28
- package/src/cli/commands/init-cmd.respec.mts +3 -3
- package/src/cli/commands/reset-restore-cmd.respec.mts +9 -9
- package/src/cli/commands/status-add-cmd.respec.mts +21 -17
- package/src/cli/vcs-cli-main.mts +18 -15
- package/src/cli/vcs-projection-helper.mts +112 -0
- package/src/cli/vcs-repo-helper.mts +99 -0
- package/src/engine/branch/branch-space.respec.mts +23 -21
- package/src/engine/merge/b2tfs-sync-comments.respec.mts +11 -11
- package/src/test/test-helpers.mts +50 -2
- package/src/vcs-gib.respec.mts +25 -16
- package/tsconfig.test.tsbuildinfo +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/vcs-gib_test_output.md +58 -0
- package/dist/cli/commands/add-cmd.d.mts.map +0 -1
- package/dist/cli/commands/add-cmd.mjs +0 -346
- package/dist/cli/commands/add-cmd.mjs.map +0 -1
- package/dist/cli/commands/branch-cmd.d.mts.map +0 -1
- package/dist/cli/commands/branch-cmd.mjs +0 -238
- package/dist/cli/commands/branch-cmd.mjs.map +0 -1
- package/dist/cli/commands/checkout-cmd.d.mts +0 -21
- package/dist/cli/commands/checkout-cmd.d.mts.map +0 -1
- package/dist/cli/commands/checkout-cmd.mjs +0 -174
- package/dist/cli/commands/checkout-cmd.mjs.map +0 -1
- package/dist/cli/commands/commit-cmd.d.mts +0 -24
- package/dist/cli/commands/commit-cmd.d.mts.map +0 -1
- package/dist/cli/commands/commit-cmd.mjs +0 -449
- package/dist/cli/commands/commit-cmd.mjs.map +0 -1
- package/dist/cli/commands/generate-comment-cmd.d.mts.map +0 -1
- package/dist/cli/commands/generate-comment-cmd.mjs.map +0 -1
- package/dist/cli/commands/init-cmd.d.mts.map +0 -1
- package/dist/cli/commands/init-cmd.mjs +0 -119
- package/dist/cli/commands/init-cmd.mjs.map +0 -1
- package/dist/cli/commands/log-cmd.d.mts.map +0 -1
- package/dist/cli/commands/log-cmd.mjs +0 -349
- package/dist/cli/commands/log-cmd.mjs.map +0 -1
- package/dist/cli/commands/merge-cmd.d.mts +0 -36
- package/dist/cli/commands/merge-cmd.d.mts.map +0 -1
- package/dist/cli/commands/merge-cmd.mjs +0 -292
- package/dist/cli/commands/merge-cmd.mjs.map +0 -1
- package/dist/cli/commands/reset-cmd.d.mts.map +0 -1
- package/dist/cli/commands/reset-cmd.mjs +0 -93
- package/dist/cli/commands/reset-cmd.mjs.map +0 -1
- package/dist/cli/commands/restore-cmd.d.mts +0 -22
- package/dist/cli/commands/restore-cmd.d.mts.map +0 -1
- package/dist/cli/commands/restore-cmd.mjs +0 -115
- package/dist/cli/commands/restore-cmd.mjs.map +0 -1
- package/dist/cli/commands/status-cmd.d.mts.map +0 -1
- package/dist/cli/commands/status-cmd.mjs +0 -132
- package/dist/cli/commands/status-cmd.mjs.map +0 -1
- package/dist/engine/branch/branch-graph-helper.d.mts +0 -28
- package/dist/engine/branch/branch-graph-helper.d.mts.map +0 -1
- package/dist/engine/branch/branch-graph-helper.mjs +0 -81
- package/dist/engine/branch/branch-graph-helper.mjs.map +0 -1
- package/dist/engine/branch/branch-helper.d.mts +0 -40
- package/dist/engine/branch/branch-helper.d.mts.map +0 -1
- package/dist/engine/branch/branch-helper.mjs +0 -78
- package/dist/engine/branch/branch-helper.mjs.map +0 -1
- package/dist/engine/branch/branch-space-helper.d.mts +0 -23
- package/dist/engine/branch/branch-space-helper.d.mts.map +0 -1
- package/dist/engine/branch/branch-space-helper.mjs +0 -78
- package/dist/engine/branch/branch-space-helper.mjs.map +0 -1
- package/dist/engine/branch/branch-types.d.mts +0 -26
- package/dist/engine/branch/branch-types.d.mts.map +0 -1
- package/dist/engine/branch/branch-types.mjs +0 -7
- package/dist/engine/branch/branch-types.mjs.map +0 -1
- package/dist/engine/diff/line-diff-helper.d.mts +0 -76
- package/dist/engine/diff/line-diff-helper.d.mts.map +0 -1
- package/dist/engine/diff/line-diff-helper.mjs +0 -144
- package/dist/engine/diff/line-diff-helper.mjs.map +0 -1
- package/dist/engine/filter/glob-helper.d.mts +0 -51
- package/dist/engine/filter/glob-helper.d.mts.map +0 -1
- package/dist/engine/filter/glob-helper.mjs +0 -132
- package/dist/engine/filter/glob-helper.mjs.map +0 -1
- package/dist/engine/index/index-helper.d.mts +0 -113
- package/dist/engine/index/index-helper.d.mts.map +0 -1
- package/dist/engine/index/index-helper.mjs +0 -533
- package/dist/engine/index/index-helper.mjs.map +0 -1
- package/dist/engine/index/index-types.d.mts +0 -63
- package/dist/engine/index/index-types.d.mts.map +0 -1
- package/dist/engine/index/index-types.mjs +0 -7
- package/dist/engine/index/index-types.mjs.map +0 -1
- package/dist/engine/item/item-atom-helper.d.mts +0 -20
- package/dist/engine/item/item-atom-helper.d.mts.map +0 -1
- package/dist/engine/item/item-atom-helper.mjs +0 -30
- package/dist/engine/item/item-atom-helper.mjs.map +0 -1
- package/dist/engine/item/item-helper.d.mts +0 -94
- package/dist/engine/item/item-helper.d.mts.map +0 -1
- package/dist/engine/item/item-helper.mjs +0 -424
- package/dist/engine/item/item-helper.mjs.map +0 -1
- package/dist/engine/item/item-types.d.mts +0 -128
- package/dist/engine/item/item-types.d.mts.map +0 -1
- package/dist/engine/item/item-types.mjs +0 -16
- package/dist/engine/item/item-types.mjs.map +0 -1
- package/dist/engine/merge/b2tfs-3way-graft-strategy.d.mts +0 -74
- package/dist/engine/merge/b2tfs-3way-graft-strategy.d.mts.map +0 -1
- package/dist/engine/merge/b2tfs-3way-graft-strategy.mjs +0 -570
- package/dist/engine/merge/b2tfs-3way-graft-strategy.mjs.map +0 -1
- package/dist/engine/merge/b2tfs-3way-graft-types.d.mts +0 -34
- package/dist/engine/merge/b2tfs-3way-graft-types.d.mts.map +0 -1
- package/dist/engine/merge/b2tfs-3way-graft-types.mjs +0 -2
- package/dist/engine/merge/b2tfs-3way-graft-types.mjs.map +0 -1
- package/dist/engine/status/status-helper.d.mts +0 -90
- package/dist/engine/status/status-helper.d.mts.map +0 -1
- package/dist/engine/status/status-helper.mjs +0 -286
- package/dist/engine/status/status-helper.mjs.map +0 -1
- package/src/cli/commands/add-cmd.mts +0 -435
- package/src/cli/commands/branch-cmd.mts +0 -311
- package/src/cli/commands/checkout-cmd.mts +0 -227
- package/src/cli/commands/commit-cmd.mts +0 -557
- package/src/cli/commands/init-cmd.mts +0 -152
- package/src/cli/commands/log-cmd.mts +0 -449
- package/src/cli/commands/merge-cmd.mts +0 -363
- package/src/cli/commands/reset-cmd.mts +0 -128
- package/src/cli/commands/restore-cmd.mts +0 -155
- package/src/cli/commands/status-cmd.mts +0 -168
- package/src/engine/branch/branch-graph-helper.mts +0 -117
- package/src/engine/branch/branch-helper.mts +0 -112
- package/src/engine/branch/branch-space-helper.mts +0 -110
- package/src/engine/branch/branch-types.mts +0 -29
- package/src/engine/diff/line-diff-helper.mts +0 -210
- package/src/engine/diff/line-diff-helper.respec.mts +0 -84
- package/src/engine/filter/glob-helper.mts +0 -165
- package/src/engine/filter/glob-helper.respec.mts +0 -94
- package/src/engine/index/index-helper.mts +0 -705
- package/src/engine/index/index-types.mts +0 -66
- package/src/engine/item/item-atom-helper.mts +0 -30
- package/src/engine/item/item-helper.mts +0 -544
- package/src/engine/item/item-types.mts +0 -137
- package/src/engine/item/item.respec.mts +0 -92
- package/src/engine/merge/b2tfs-3way-graft-strategy.mts +0 -630
- package/src/engine/merge/b2tfs-3way-graft-strategy.respec.mts +0 -346
- package/src/engine/merge/b2tfs-3way-graft-types.mts +0 -34
- package/src/engine/status/status-helper.mts +0 -383
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"commit-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/commit-cmd.mts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAElC,OAAO,MAAM,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,KAAK,EAAE,MAAM,iDAAiD,CAAC;AAClG,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,IAAI,EAAE,MAAM,qCAAqC,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,qDAAqD,CAAC;AACzG,OAAO,EAAE,kBAAkB,EAAE,MAAM,wDAAwD,CAAC;AAG5F,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAqB,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAClG,OAAO,EAAE,6BAA6B,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAC9H,OAAO,EAAE,uBAAuB,EAAE,2BAA2B,EAAE,MAAM,uCAAuC,CAAC;AAE7G,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AAE5H,OAAO,EAAE,yBAAyB,EAAE,uBAAuB,EAAE,MAAM,uCAAuC,CAAC;AAG3G,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,MAAM,GAAG,cAAc,CAAC;AAC9B,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAiBjC,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EACnC,OAAO,GAAG,EAAE,EACZ,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,EACzB,aAAa,GAAG,SAAS,EACzB,KAAK,GAAG,KAAK,GAChB,GAAkB,EAAE;IACjB,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,gBAAgB,CAAC,IAAI,GAAG,CAAC;IAEjD,IAAI,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,kEAAkE,CAAC,CAAC;QACzF,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAE7C,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,MAAM,qBAAqB,CAAC;YAC7E,QAAQ,EAAE,YAAY;YACtB,aAAa;SAChB,CAAC,CAAC;QAEH,qBAAqB;QACrB,IAAI,CAAC;YACD,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;QAAC,MAAM,CAAC;YACL,MAAM,IAAI,KAAK,CAAC,sCAAsC,OAAO,wDAAwD,CAAC,CAAC;QAC3H,CAAC;QAED,uDAAuD;QACvD,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,CAAC,CAAC;QAC5E,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CAAC,mGAAmG,CAAC,CAAC;QACzH,CAAC;QAED,MAAM,UAAU,GAAG,2BAA2B,CAAC;YAC3C,SAAS,EAAE,YAAY;YACvB,QAAQ;YACR,UAAU;SACb,CAAC,CAAC;QACH,MAAM,iBAAiB,GAAG,UAAU,KAAK,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;QAElG,gDAAgD;QAChD,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE,GAAG,MAAM,sBAAsB,CAAC;YACxD,SAAS;YACT,OAAO;YACP,UAAU;SACb,CAAC,CAAC;QAEH,gCAAgC;QAChC,MAAM,cAAc,GAAiD,EAAE,GAAG,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,IAAI,EAAE,CAAC,EAAE,CAAC;QACjH,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;QACnD,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,0FAA0F,CAAC,CAAC;QAChH,CAAC;QAED,0BAA0B;QAC1B,IAAI,kBAAmD,CAAC;QACxD,IAAI,iBAAqC,CAAC;QAE1C,MAAM,WAAW,GAAG;YAChB,GAAG,CAAC,UAAU,CAAC,MAAM,EAAE,MAAM,IAAI,EAAE,CAAC;YACpC,GAAG,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,IAAI,EAAE,CAAC;SAC3C,CAAC;QAEF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzB,IAAI,YAAY,GAA0B,EAAE,CAAC;YAC7C,KAAK,MAAM,KAAK,IAAI,WAAW,EAAE,CAAC;gBAC9B,MAAM,MAAM,GAAG,MAAM,6BAA6B,CAAC;oBAC/C,IAAI,EAAE,KAAK;oBACX,KAAK,EAAE,WAAW;oBAClB,SAAS;iBACZ,CAAC,CAAC;gBACH,IAAI,MAAM,EAAE,CAAC;oBACT,YAAY,CAAC,IAAI,CAAC,MAA6B,CAAC,CAAC;gBACrD,CAAC;YACL,CAAC;YAED,kBAAkB,GAAG,YAAY,CAAC,QAAQ,CACtC,CAAC,CAAC,EAAE,EAAE,CAAE,CAAyB,EAAE,IAAI,EAAE,IAAI,KAAK,UAAU,CACxC,IAAK,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAyB,CAAC;YAEzE,IAAI,kBAAkB,EAAE,CAAC;gBACrB,iBAAiB,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,kBAAkB,EAAE,CAAC,CAAC;YACpE,CAAC;QACL,CAAC;QAED,MAAM,eAAe,GAAG,kBAAkB,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,kBAAkB,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAEzH,2FAA2F;QAC3F,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC;QACnD,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,oBAAoB,EAAE,GAAG,MAAM,8BAA8B,CAAC;YAC1F,eAAe;YACf,cAAc;YACd,KAAK,EAAE,WAAW;YAClB,SAAS;YACT,QAAQ;YACR,WAAW,EAAE,iBAAiB;SACjC,CAAC,CAAC;QAEH,IAAI,CAAC,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,KAAK,CAAC,CAAC,IAAI,oBAAoB,KAAK,CAAC,EAAE,CAAC;YAC1E,MAAM,IAAI,KAAK,CAAC,4GAA4G,CAAC,CAAC;QAClI,CAAC;QAED,4EAA4E;QAC5E,IAAI,WAA+B,CAAC;QACpC,IAAI,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvC,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC;gBACxC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE;gBACpB,WAAW,EAAE,IAAI;gBACjB,KAAK,EAAE,WAAW;aACrB,CAAC,CAAC;YACH,MAAM,YAAY,GAAG,UAAU,CAAC,QAA2B,CAAC;YAC5D,WAAW,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;YACpD,MAAM,SAAS,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;YAE9E,MAAM,gBAAgB,GAAG,WAAW,CAAC,MAAM,EAAE,OAAO,IAAI,EAAE,CAAC;YAC3D,MAAM,aAAa,GAAG,MAAM,oBAAoB,CAAC;gBAC7C,YAAY,EAAE,WAAW;gBACzB,cAAc,EAAE;oBACZ,OAAO,EAAE,CAAC,GAAG,gBAAgB,EAAE,WAAW,CAAC;iBAC9C;aACJ,CAAC,CAAC;YACH,MAAM,sBAAsB,CAAC,EAAE,YAAY,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;YAClF,MAAM,SAAS,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;YAExF,WAAW,GAAG,aAAa,CAAC,QAA6B,CAAC;YAC1D,WAAW,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;QACvD,CAAC;QAED,yDAAyD;QACzD,MAAM,UAAU,GAAG,kBAAkB,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC,MAAM,OAAO,EAAE,CAAC,CAAC;QACvE,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC;YAC3C,WAAW,EAAE,kBAAkB,IAAI,IAAI;YACvC,EAAE,EAAE,gBAAgB,UAAU,OAAO,UAAU,EAAE;YACjD,IAAI,EAAE;gBACF,GAAG,CAAC,kBAAkB,EAAE,IAAI,IAAI,EAAE,CAAC;gBACnC,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE,UAAU;gBAChB,SAAS,EAAE,qBAAqB;gBAChC,WAAW,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;gBACrC,cAAc;aACjB;YACD,MAAM,EAAE;gBACJ,UAAU,EAAE,CAAC,WAAW,CAAC;gBACzB,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACrD;SACJ,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,YAAY,CAAC,QAA+B,CAAC;QACpE,MAAM,aAAa,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,CAAC,CAAC;QAC9D,MAAM,sBAAsB,CAAC,EAAE,YAAY,EAAE,YAAY,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;QACjF,MAAM,SAAS,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;QAEhF,MAAM,YAAY,GAAG,0BAA0B,CAAC;YAC5C,OAAO,EAAE,WAAW,CAAC,IAAI,EAAE,YAAY,IAAI,WAAW,CAAC,IAAI,EAAE,IAAI,IAAI,uBAAuB,CAAC,UAAU,CAAC;YACxG,SAAS,EAAE,aAAa;SAC3B,CAAC,CAAC;QAEH,2DAA2D;QAC3D,MAAM,YAAY,GAAG,MAAM,qBAAqB,CAAC;YAC7C,KAAK,EAAE,WAAW;YAClB,SAAS;YACT,UAAU;YACV,YAAY,EAAE;gBACV,WAAW,EAAE,EAAE;gBACf,WAAW,EAAE,EAAE;aAClB;YACD,cAAc,EAAE;gBACZ,MAAM,EAAE,CAAC,YAAY,CAAC;gBACtB,UAAU,EAAE,CAAC,YAAY,CAAC;aAC7B;YACD,OAAO;SACV,CAAC,CAAC;QAEH,IAAI,UAAU,KAAK,WAAW,EAAE,CAAC;YAC7B,MAAM,UAAU,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;QACjE,CAAC;QAED,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;YAChF,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;YACxD,OAAO,CAAC,GAAG,CAAC,IAAI,UAAU,IAAI,QAAQ,KAAK,MAAM,wCAAwC,CAAC,CAAC;YAC3F,OAAO,CAAC,GAAG,CAAC,IAAI,cAAc,CAAC,MAAM,kBAAkB,CAAC,CAAC;QAC7D,CAAC;QAED,OAAO;YACH,UAAU,EAAE,aAAa;YACzB,WAAW;YACX,UAAU;YACV,cAAc;YACd,YAAY,EAAE,WAAW;SAC5B,CAAC;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,eAAe,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;QACvF,MAAM,KAAK,CAAC;IAChB,CAAC;YAAS,CAAC;QACP,MAAM,KAAK,CAAC,EAAE,CAAC,CAAC;QAChB,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,kDAAkD,CAAC,CAAC;QACzE,CAAC;IACL,CAAC;AACL,CAAC;AAED,yCAAyC;AACzC,KAAK,UAAU,8BAA8B,CAAC,EAC1C,eAAe,EACf,cAAc,EACd,KAAK,EACL,SAAS,EACT,QAAQ,EACR,WAAW,GAQd;IACG,IAAI,oBAAoB,GAAG,CAAC,CAAC;IAC7B,MAAM,cAAc,GAAG,IAAI,GAAG,EAAqF,CAAC;IAEpH,IAAI,eAAe,EAAE,CAAC;QAClB,MAAM,eAAe,GAAG,MAAM,6BAA6B,CAAC;YACxD,IAAI,EAAE,eAAe;YACrB,KAAK;YACL,SAAS;SACZ,CAAsB,CAAC;QAExB,IAAI,eAAe,EAAE,CAAC;YAClB,MAAM,yBAAyB,CAAC;gBAC5B,IAAI,EAAE,eAAe;gBACrB,KAAK;gBACL,SAAS;gBACT,cAAc,EAAE,EAAE;gBAClB,MAAM,EAAE,cAAc;aACzB,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,uBAAuB;IACvB,KAAK,MAAM,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;QAChE,cAAc,CAAC,GAAG,CAAC,OAAO,EAAE;YACxB,QAAQ,EAAE,SAAS,CAAC,QAAQ;YAC5B,MAAM,EAAE,SAAS,CAAC,MAAM,IAAI,MAAM;SACrC,CAAC,CAAC;IACP,CAAC;IAED,wEAAwE;IACxE,KAAK,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC;QACxD,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAAC,SAAS;QAAC,CAAC;QAE5C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,UAAU,GAAG,GAAG,KAAK,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAC3E,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,OAAO,IAAI,KAAK,CAAC,CAAC;QAEhE,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,IAAI,CAAC;YACD,WAAW,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QAC7D,CAAC;QAAC,MAAM,CAAC;YACL,gCAAgC;YAChC,SAAS;QACb,CAAC;QAED,IAAI,WAAW,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC;gBACxC,IAAI,EAAE,WAAW,CAAC,IAAI,EAAE;gBACxB,WAAW,EAAE,IAAI;gBACjB,KAAK;aACR,CAAC,CAAC;YACH,MAAM,YAAY,GAAG,UAAU,CAAC,QAA2B,CAAC;YAC5D,MAAM,WAAW,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;YAC1D,MAAM,SAAS,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;YACjE,oBAAoB,EAAE,CAAC;YAEvB,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,IAAK,MAAM,6BAA6B,CAAC;gBACrE,IAAI,EAAE,OAAO,CAAC,QAAQ;gBACtB,KAAK;gBACL,SAAS;aACZ,CAAuB,CAAC;YAEzB,IAAI,WAAW,EAAE,CAAC;gBACd,MAAM,gBAAgB,GAAG,WAAW,CAAC,MAAM,EAAE,OAAO,IAAI,EAAE,CAAC;gBAC3D,MAAM,cAAc,GAAG,MAAM,oBAAoB,CAAC;oBAC9C,YAAY,EAAE,WAAW;oBACzB,cAAc,EAAE;wBACZ,OAAO,EAAE,CAAC,GAAG,gBAAgB,EAAE,WAAW,CAAC;qBAC9C;iBACJ,CAAC,CAAC;gBACH,MAAM,sBAAsB,CAAC,EAAE,YAAY,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC,CAAC;gBACtE,MAAM,SAAS,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAE,cAAc,CAAC,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;gBAE5E,OAAO,CAAC,QAAQ,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,cAAc,CAAC,QAAQ,EAAE,CAAC,CAAC;gBACpE,OAAO,CAAC,IAAI,GAAG,cAAc,CAAC,QAA6B,CAAC;YAChE,CAAC;YAED,IAAI,CAAC;gBACD,MAAM,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;YACrC,CAAC;YAAC,MAAM,CAAC;gBACL,yBAAyB;YAC7B,CAAC;QACL,CAAC;IACL,CAAC;IAED,mDAAmD;IACnD,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC,CAAC;IACtD,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE,CAAC;QAChC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACjC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,6CAA6C;QAC1D,IAAI,gBAAgB,GAAG,EAAE,CAAC;QAC1B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACvB,gBAAgB,GAAG,gBAAgB,CAAC,CAAC,CAAC,GAAG,gBAAgB,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAC3E,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAAE,CAAC;gBACxC,cAAc,CAAC,GAAG,CAAC,gBAAgB,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;YAC7E,CAAC;QACL,CAAC;IACL,CAAC;IAED,+CAA+C;IAC/C,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;IACzC,cAAc,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACvB,KAAK,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC;QACxD,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;YAChD,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAChC,CAAC;IACL,CAAC;IAED,+EAA+E;IAC/E,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC3D,MAAM,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3C,OAAO,MAAM,GAAG,MAAM,CAAC;IAC3B,CAAC,CAAC,CAAC;IAEH,MAAM,kBAAkB,GAAG,IAAI,GAAG,EAAkB,CAAC;IACrD,IAAI,cAA6C,CAAC;IAClD,IAAI,cAAc,GAAW,EAAE,CAAC;IAEhC,KAAK,MAAM,aAAa,IAAI,aAAa,EAAE,CAAC;QACxC,MAAM,UAAU,GAAa,EAAE,CAAC;QAChC,KAAK,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,IAAI,cAAc,CAAC,OAAO,EAAE,EAAE,CAAC;YAC5D,IAAI,CAAC,WAAW,IAAI,WAAW,KAAK,aAAa,EAAE,CAAC;gBAChD,SAAS;YACb,CAAC;YACD,MAAM,aAAa,GAAG,0BAA0B,CAAC,WAAW,CAAC,CAAC;YAC9D,IAAI,aAAa,KAAK,aAAa,EAAE,CAAC;gBAClC,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;oBAC9B,MAAM,UAAU,GAAG,kBAAkB,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;oBACvD,IAAI,UAAU,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;wBACjD,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;oBAChC,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACJ,IAAI,OAAO,CAAC,QAAQ,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;wBAC7D,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;oBACtC,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;QAED,6DAA6D;QAC7D,MAAM,cAAc,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;QAC3F,MAAM,kBAAkB,GAAa,EAAE,CAAC;QAExC,IAAI,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;YAC1E,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;gBAC3B,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,yBAAyB,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC5D,MAAM,SAAS,GAAG,uBAAuB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;oBACvD,MAAM,sBAAsB,GAAG,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,aAAa,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;oBAE/G,IAAI,CAAC,sBAAsB,EAAE,CAAC;wBAC1B,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;wBAC/D,MAAM,cAAc,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;wBAElE,IAAI,cAAc,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BACnC,MAAM,UAAU,GAAG,MAAM,kBAAkB,CAAC;gCACxC,IAAI,EAAE,cAAc,CAAC,IAAI,EAAE;gCAC3B,WAAW,EAAE,IAAI;gCACjB,KAAK;6BACR,CAAC,CAAC;4BACH,MAAM,YAAY,GAAG,UAAU,CAAC,QAA2B,CAAC;4BAC5D,MAAM,KAAK,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,CAAC,CAAC;4BACpD,MAAM,SAAS,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAAC;4BACjE,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;4BAC/B,oBAAoB,EAAE,CAAC;wBAC3B,CAAC;wBAED,IAAI,CAAC;4BACD,MAAM,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC;wBACrC,CAAC;wBAAC,MAAM,CAAC;4BACL,sBAAsB;wBAC1B,CAAC;oBACL,CAAC;gBACL,CAAC;YACL,CAAC;QACL,CAAC;QAAC,MAAM,CAAC;YACL,+BAA+B;QACnC,CAAC;QAED,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;QAC3E,MAAM,QAAQ,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAE9E,MAAM,iBAAiB,GAAG,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;QAE5D,IAAI,SAAoC,CAAC;QAEzC,IAAI,iBAAiB,IAAI,iBAAiB,CAAC,IAAI,EAAE,CAAC;YAC9C,MAAM,aAAa,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,2BAA2B,CAAC,IAAI,EAAE,CAAC;YACzF,MAAM,kBAAkB,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9E,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,IAAI,EAAE,CAAC;YAEtE,SAAS,GAAG,MAAM,oBAAoB,CAAC;gBACnC,YAAY,EAAE,iBAAiB,CAAC,IAAI;gBACpC,YAAY,EAAE;oBACV,QAAQ;iBACX;gBACD,cAAc,EAAE;oBACZ,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,2BAA2B,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC/E,GAAG,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,gBAAgB,EAAE,GAAG,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBACtG;gBACD,cAAc,EAAE,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,2BAA2B,CAAC,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,SAAS;aACpH,CAAC,CAAC;QACP,CAAC;aAAM,CAAC;YACJ,SAAS,GAAG,MAAM,oBAAoB,CAAC;gBACnC,MAAM,EAAE,QAAQ;gBAChB,IAAI,EAAE,UAAU;gBAChB,IAAI,EAAE;oBACF,QAAQ;iBACX;gBACD,MAAM,EAAE;oBACJ,GAAG,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,2BAA2B,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;oBAC/E,GAAG,CAAC,kBAAkB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC5E;aACJ,CAAC,CAAC;QACP,CAAC;QAED,MAAM,UAAU,GAAG,SAAS,CAAC,QAA6B,CAAC;QAC3D,MAAM,UAAU,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC;QACvD,MAAM,sBAAsB,CAAC,EAAE,YAAY,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;QACjE,MAAM,SAAS,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC,CAAC;QAE/D,kBAAkB,CAAC,GAAG,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC;QAElD,IAAI,aAAa,KAAK,EAAE,EAAE,CAAC;YACvB,cAAc,GAAG,UAAU,CAAC;YAC5B,cAAc,GAAG,UAAU,CAAC;QAChC,CAAC;IACL,CAAC;IAED,OAAO,EAAE,WAAW,EAAE,cAAe,EAAE,WAAW,EAAE,cAAc,EAAE,oBAAoB,EAAE,CAAC;AAC/F,CAAC;AAED,SAAS,0BAA0B,CAAC,OAAe;IAC/C,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACjC,KAAK,CAAC,GAAG,EAAE,CAAC;IACZ,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC3B,CAAC;AAED,KAAK,UAAU,yBAAyB,CAAC,EACrC,IAAI,EACJ,KAAK,EACL,SAAS,EACT,cAAc,EACd,MAAM,GAOT;IACG,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QAAC,OAAO;IAAC,CAAC;IAEpC,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC;IAC7B,MAAM,QAAQ,GAAG,YAAY,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IAE/C,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAEvD,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;QACtB,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,2BAA2B,CAAC,IAAI,EAAE,CAAC;QACpE,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE,CAAC;YACjC,MAAM,SAAS,GAAG,MAAM,6BAA6B,CAAC;gBAClD,IAAI,EAAE,SAAS;gBACf,KAAK;gBACL,SAAS;aACZ,CAAsB,CAAC;YAExB,IAAI,SAAS,IAAI,SAAS,CAAC,IAAI,EAAE,CAAC;gBAC9B,MAAM,YAAY,GAAG,cAAc;oBAC/B,CAAC,CAAC,GAAG,cAAc,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE;oBAC5C,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;gBAC1B,MAAM,yBAAyB,CAAC;oBAC5B,IAAI,EAAE,SAAS;oBACf,KAAK;oBACL,SAAS;oBACT,cAAc,EAAE,YAAY;oBAC5B,MAAM;iBACT,CAAC,CAAC;YACP,CAAC;QACL,CAAC;IACL,CAAC;AACL,CAAC;AACD,4CAA4C"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"generate-comment-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/generate-comment-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAaH,MAAM,WAAW,sBAAsB;IACnC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,wBAAwB;IACrC,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,YAAY,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED,wBAAsB,yBAAyB,CAAC,EAC5C,SAAyB,EACzB,aAAyB,EACzB,KAAU,EACV,WAAqB,EACrB,KAAa,GAChB,GAAE,sBAA2B,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAqIjE"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"generate-comment-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/generate-comment-cmd.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"init-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/init-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAsBH,MAAM,WAAW,WAAW;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,wBAAsB,cAAc,CAAC,EACjC,SAAyB,EACzB,aAAyB,EACzB,iBAA0B,EAC1B,KAAa,GAChB,GAAE,WAAgB,GAAG,OAAO,CAAC,aAAa,CAAC,CAyG3C"}
|
|
@@ -1,119 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @module init-cmd
|
|
3
|
-
*
|
|
4
|
-
* Command handler for `vcs init [targetDir]`.
|
|
5
|
-
* Initializes local repository space, root B2tFS folder item, default branch, and in-band space index.
|
|
6
|
-
*/
|
|
7
|
-
import path from 'node:path';
|
|
8
|
-
import fs from 'node:fs/promises';
|
|
9
|
-
import { extractErrorMsg, getUUID } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
|
|
10
|
-
import { Factory_V1 } from '@ibgib/ts-gib/dist/V1/factory.mjs';
|
|
11
|
-
import { ROOT } from '@ibgib/ts-gib/dist/V1/constants.mjs';
|
|
12
|
-
import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
|
|
13
|
-
import { persistTransformResult } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
|
|
14
|
-
import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
|
|
15
|
-
import { getB2tFSItemIb } from '../../engine/item/item-atom-helper.mjs';
|
|
16
|
-
import { createB2tFSBranchIbGib, getB2tFSBranchSpaceName } from '../../engine/branch/branch-helper.mjs';
|
|
17
|
-
import { getOrCreateBranchSpace } from '../../engine/branch/branch-space-helper.mjs';
|
|
18
|
-
import { createB2tFSIndexIbGib, writeVcsIndexProjection } from '../../engine/index/index-helper.mjs';
|
|
19
|
-
import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
|
|
20
|
-
const lcFile = `[init-cmd]`;
|
|
21
|
-
const logalot = GLOBAL_LOG_A_LOT;
|
|
22
|
-
export async function executeInitCmd({ targetDir = process.cwd(), vcsFolderName = '.vcsgib', defaultBranchName = 'main', quiet = false, } = {}) {
|
|
23
|
-
const lc = `${lcFile}[${executeInitCmd.name}]`;
|
|
24
|
-
try {
|
|
25
|
-
if (logalot) {
|
|
26
|
-
console.log(`${lc} starting... (I: 8a9b10c11d12e13f14a15b16c17d18e1)`);
|
|
27
|
-
}
|
|
28
|
-
const absTargetDir = path.resolve(targetDir);
|
|
29
|
-
const vcsPath = path.join(absTargetDir, vcsFolderName);
|
|
30
|
-
// Create target repository folder if it doesn't exist
|
|
31
|
-
await fs.mkdir(absTargetDir, { recursive: true });
|
|
32
|
-
// Bootstrap Metaspace
|
|
33
|
-
const { metaspace } = await bootstrapVcsMetaspace({
|
|
34
|
-
repoPath: absTargetDir,
|
|
35
|
-
vcsFolderName,
|
|
36
|
-
defaultSpaceName: `vcs_${path.basename(absTargetDir).replace(/[^a-zA-Z0-9_\-]/g, '_')}`,
|
|
37
|
-
});
|
|
38
|
-
// Initialize b2s_main branch space
|
|
39
|
-
const { space: branchSpace, spaceId } = await getOrCreateBranchSpace({
|
|
40
|
-
metaspace,
|
|
41
|
-
vcsPath,
|
|
42
|
-
branchName: defaultBranchName,
|
|
43
|
-
});
|
|
44
|
-
const folderName = path.basename(absTargetDir) || 'root';
|
|
45
|
-
const rootNameHash = await getUUID();
|
|
46
|
-
// 1. Create root folder B2tFS item inside b2s_main space
|
|
47
|
-
const rootItemRes = await Factory_V1.firstGen({
|
|
48
|
-
parentIbGib: ROOT,
|
|
49
|
-
ib: getB2tFSItemIb('folder', folderName, rootNameHash),
|
|
50
|
-
data: {
|
|
51
|
-
name: folderName,
|
|
52
|
-
nameHash: rootNameHash,
|
|
53
|
-
fsType: 'folder',
|
|
54
|
-
diffTransactionId: await getUUID(),
|
|
55
|
-
uuid: await getUUID(),
|
|
56
|
-
classname: 'B2tFSItemIbGib_V1',
|
|
57
|
-
},
|
|
58
|
-
});
|
|
59
|
-
const rootItem = rootItemRes.newIbGib;
|
|
60
|
-
await persistTransformResult({ resTransform: rootItemRes, space: branchSpace });
|
|
61
|
-
await metaspace.registerNewIbGib({ ibGib: rootItem, space: branchSpace });
|
|
62
|
-
// 2. Create default branch pointing to root folder inside b2s_main space
|
|
63
|
-
const branchIbGib = await createB2tFSBranchIbGib({
|
|
64
|
-
branchName: defaultBranchName,
|
|
65
|
-
rootItem,
|
|
66
|
-
space: branchSpace,
|
|
67
|
-
metaspace,
|
|
68
|
-
});
|
|
69
|
-
const branchAddr = getIbGibAddr({ ibGib: branchIbGib });
|
|
70
|
-
// 3. Create space index meta object stored inside b2s_main space
|
|
71
|
-
const indexIbGib = await createB2tFSIndexIbGib({
|
|
72
|
-
spaceId,
|
|
73
|
-
activeSpaceId: getB2tFSBranchSpaceName(defaultBranchName),
|
|
74
|
-
activeBranch: defaultBranchName,
|
|
75
|
-
space: branchSpace,
|
|
76
|
-
metaspace,
|
|
77
|
-
branchAddr,
|
|
78
|
-
});
|
|
79
|
-
// 4. Write read-only projection file in .vcsgib/
|
|
80
|
-
await writeVcsIndexProjection({
|
|
81
|
-
vcsPath,
|
|
82
|
-
indexIbGib,
|
|
83
|
-
});
|
|
84
|
-
// Clean up legacy out-of-band state files if present
|
|
85
|
-
try {
|
|
86
|
-
await fs.rm(path.join(vcsPath, 'vcs_state.json'), { force: true });
|
|
87
|
-
}
|
|
88
|
-
catch {
|
|
89
|
-
// Ignore if missing
|
|
90
|
-
}
|
|
91
|
-
try {
|
|
92
|
-
await fs.rm(path.join(vcsPath, 'staging.json'), { force: true });
|
|
93
|
-
}
|
|
94
|
-
catch {
|
|
95
|
-
// Ignore if missing
|
|
96
|
-
}
|
|
97
|
-
if (!quiet) {
|
|
98
|
-
console.log(`Initialized empty ibgib repository in ${vcsPath} (I: 6c7d8e9f0a1b2c3d4e5f6a7b8c9d0e1f)`);
|
|
99
|
-
console.log(` Branch: ${defaultBranchName}`);
|
|
100
|
-
console.log(` Root Item: ${rootItem.ib}`);
|
|
101
|
-
}
|
|
102
|
-
return {
|
|
103
|
-
vcsPath,
|
|
104
|
-
spaceId,
|
|
105
|
-
branchName: defaultBranchName,
|
|
106
|
-
rootItemIb: rootItem.ib,
|
|
107
|
-
};
|
|
108
|
-
}
|
|
109
|
-
catch (error) {
|
|
110
|
-
console.error(`${lc} ${extractErrorMsg(error)} (E: 9b10c11d12e13f14a15b16c17d18e19f)`);
|
|
111
|
-
throw error;
|
|
112
|
-
}
|
|
113
|
-
finally {
|
|
114
|
-
if (logalot) {
|
|
115
|
-
console.log(`${lc} complete. (I: 0a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d)`);
|
|
116
|
-
}
|
|
117
|
-
}
|
|
118
|
-
}
|
|
119
|
-
//# sourceMappingURL=init-cmd.mjs.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"init-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/init-cmd.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"log-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/log-cmd.mts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAqBH,MAAM,WAAW,UAAU;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC1E;AAED,MAAM,WAAW,UAAU;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,UAAU,EAAE,CAAC;CACzB;AAED,wBAAsB,aAAa,CAAC,EAChC,SAAyB,EACzB,aAAyB,EACzB,QAAQ,EACR,WAAmB,EACnB,KAAa,GAChB,GAAE,UAAe,GAAG,OAAO,CAAC,YAAY,CAAC,CAqRzC"}
|
|
@@ -1,349 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @module log-cmd
|
|
3
|
-
*
|
|
4
|
-
* Command handler for `vcs log`.
|
|
5
|
-
* Reads active branch timeline from B2tFSIndexIbGib_V1 in localSpace,
|
|
6
|
-
* walks branch or item timeline history backward, and displays formatted commit and comment history.
|
|
7
|
-
*/
|
|
8
|
-
import path from 'node:path';
|
|
9
|
-
import fs from 'node:fs/promises';
|
|
10
|
-
import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
|
|
11
|
-
import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
|
|
12
|
-
import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
|
|
13
|
-
import { getOrCreateBranchSpace } from '../../engine/branch/branch-space-helper.mjs';
|
|
14
|
-
import { resolveContextualBranchName } from '../../engine/branch/branch-helper.mjs';
|
|
15
|
-
import { getIbGibWithMetaspaceFallback } from '../../engine/item/item-helper.mjs';
|
|
16
|
-
import { B2TFS_CHILD_ITEM_REL8N_NAME } from '../../engine/item/item-types.mjs';
|
|
17
|
-
import { getB2tFSIndexIbGib } from '../../engine/index/index-helper.mjs';
|
|
18
|
-
import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
|
|
19
|
-
const lcFile = `[log-cmd]`;
|
|
20
|
-
const logalot = GLOBAL_LOG_A_LOT;
|
|
21
|
-
export async function executeLogCmd({ targetDir = process.cwd(), vcsFolderName = '.vcsgib', filePath, allComments = false, quiet = false, } = {}) {
|
|
22
|
-
const lc = `${lcFile}[${executeLogCmd.name}]`;
|
|
23
|
-
try {
|
|
24
|
-
if (logalot) {
|
|
25
|
-
console.log(`${lc} starting executeLogCmd (I: 1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e)`);
|
|
26
|
-
}
|
|
27
|
-
const absTargetDir = path.resolve(targetDir);
|
|
28
|
-
const { metaspace, localSpace, vcsPath, repoRoot } = await bootstrapVcsMetaspace({
|
|
29
|
-
repoPath: absTargetDir,
|
|
30
|
-
vcsFolderName,
|
|
31
|
-
});
|
|
32
|
-
// Verify repo exists
|
|
33
|
-
try {
|
|
34
|
-
await fs.access(vcsPath);
|
|
35
|
-
}
|
|
36
|
-
catch {
|
|
37
|
-
throw new Error(`Not an ibgib repository (directory ${vcsPath} does not exist) (E: 2c3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f)`);
|
|
38
|
-
}
|
|
39
|
-
// 1. Fetch authoritative B2tFSIndexIbGib_V1 directly from localSpace
|
|
40
|
-
const indexIbGib = await getB2tFSIndexIbGib({ space: localSpace, vcsPath });
|
|
41
|
-
if (!indexIbGib) {
|
|
42
|
-
throw new Error(`Repository index B2tFSIndexIbGib_V1 not found in localSpace (E: 3d4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a)`);
|
|
43
|
-
}
|
|
44
|
-
const branchName = resolveContextualBranchName({
|
|
45
|
-
targetDir: absTargetDir,
|
|
46
|
-
repoRoot,
|
|
47
|
-
indexIbGib,
|
|
48
|
-
});
|
|
49
|
-
// Target active branch space b2s_<activeBranch>
|
|
50
|
-
const { space: activeSpace } = await getOrCreateBranchSpace({
|
|
51
|
-
metaspace,
|
|
52
|
-
vcsPath,
|
|
53
|
-
branchName,
|
|
54
|
-
});
|
|
55
|
-
// 2. Fetch active branch node address matching active branchName
|
|
56
|
-
const branchAddrs = indexIbGib.rel8ns?.branch || indexIbGib.rel8ns?.branch_tjp || [];
|
|
57
|
-
let currBranchAddr;
|
|
58
|
-
if (branchAddrs.length > 0) {
|
|
59
|
-
let branchIbGibs = [];
|
|
60
|
-
for (const bAddr of branchAddrs) {
|
|
61
|
-
const bIbGib = await getIbGibWithMetaspaceFallback({
|
|
62
|
-
addr: bAddr,
|
|
63
|
-
space: activeSpace,
|
|
64
|
-
metaspace,
|
|
65
|
-
});
|
|
66
|
-
if (bIbGib) {
|
|
67
|
-
branchIbGibs.push(bIbGib);
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
const matchingBranches = branchIbGibs.filter(b => b?.data?.name === branchName);
|
|
71
|
-
const activeBranchIbGib = matchingBranches.sort((a, b) => (b.data?.n || 0) - (a.data?.n || 0))[0]
|
|
72
|
-
|| branchIbGibs.at(-1);
|
|
73
|
-
if (activeBranchIbGib) {
|
|
74
|
-
currBranchAddr = getIbGibAddr({ ibGib: activeBranchIbGib });
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
const commits = [];
|
|
78
|
-
// #region File-Specific Log Mode (vcs log <filePath>)
|
|
79
|
-
if (filePath) {
|
|
80
|
-
const normalizedRelPath = path.relative(repoRoot, path.resolve(absTargetDir, filePath)).replace(/\\/g, '/');
|
|
81
|
-
// Find current root item
|
|
82
|
-
const branchIbGib = currBranchAddr
|
|
83
|
-
? await getIbGibWithMetaspaceFallback({ addr: currBranchAddr, space: activeSpace, metaspace })
|
|
84
|
-
: undefined;
|
|
85
|
-
const rootItemAddr = branchIbGib?.rel8ns?.b2tFS_item?.at(-1) || branchIbGib?.rel8ns?.b2tfs_item?.at(-1);
|
|
86
|
-
if (!rootItemAddr) {
|
|
87
|
-
throw new Error(`No root item found on branch ${branchName} (E: 4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b)`);
|
|
88
|
-
}
|
|
89
|
-
const targetItem = await logCmd_findItemByPath({
|
|
90
|
-
rootItemAddr,
|
|
91
|
-
targetRelPath: normalizedRelPath,
|
|
92
|
-
space: activeSpace,
|
|
93
|
-
metaspace,
|
|
94
|
-
});
|
|
95
|
-
if (!targetItem) {
|
|
96
|
-
throw new Error(`Path '${normalizedRelPath}' not found in active branch snapshot (E: 5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c)`);
|
|
97
|
-
}
|
|
98
|
-
// Walk target item timeline history backward
|
|
99
|
-
const visitedItemAddrs = new Set();
|
|
100
|
-
let currItem = targetItem;
|
|
101
|
-
while (currItem) {
|
|
102
|
-
const itemAddr = getIbGibAddr({ ibGib: currItem });
|
|
103
|
-
if (visitedItemAddrs.has(itemAddr)) {
|
|
104
|
-
break;
|
|
105
|
-
}
|
|
106
|
-
visitedItemAddrs.add(itemAddr);
|
|
107
|
-
const commentAddrs = currItem.rel8ns?.comment || [];
|
|
108
|
-
for (const cAddr of commentAddrs) {
|
|
109
|
-
const commentIbGib = await getIbGibWithMetaspaceFallback({
|
|
110
|
-
addr: cAddr,
|
|
111
|
-
space: activeSpace,
|
|
112
|
-
metaspace,
|
|
113
|
-
});
|
|
114
|
-
if (commentIbGib) {
|
|
115
|
-
commits.push({
|
|
116
|
-
commitAddr: itemAddr,
|
|
117
|
-
commentAddr: cAddr,
|
|
118
|
-
message: commentIbGib.data?.text || '',
|
|
119
|
-
timestamp: commentIbGib.data?.textTimestamp || commentIbGib.data?.timestamp || '',
|
|
120
|
-
author: 'vcs-user',
|
|
121
|
-
});
|
|
122
|
-
}
|
|
123
|
-
}
|
|
124
|
-
const pastAddr = currItem.rel8ns?.past?.at(0) || currItem.rel8ns?.ancestor?.at(0);
|
|
125
|
-
if (pastAddr) {
|
|
126
|
-
currItem = await getIbGibWithMetaspaceFallback({
|
|
127
|
-
addr: pastAddr,
|
|
128
|
-
space: activeSpace,
|
|
129
|
-
metaspace,
|
|
130
|
-
});
|
|
131
|
-
}
|
|
132
|
-
else {
|
|
133
|
-
currItem = undefined;
|
|
134
|
-
}
|
|
135
|
-
}
|
|
136
|
-
if (!quiet) {
|
|
137
|
-
console.log(`File: ${normalizedRelPath} (branch: ${branchName}) (I: 6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d)`);
|
|
138
|
-
if (commits.length === 0) {
|
|
139
|
-
console.log('No comments found for this file.');
|
|
140
|
-
}
|
|
141
|
-
else {
|
|
142
|
-
for (const commit of commits) {
|
|
143
|
-
console.log(`\nitem ${commit.commitAddr}`);
|
|
144
|
-
if (commit.timestamp) {
|
|
145
|
-
console.log(`Date: ${commit.timestamp}`);
|
|
146
|
-
}
|
|
147
|
-
console.log(`\n ${commit.message}\n`);
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
return {
|
|
152
|
-
branchName,
|
|
153
|
-
targetPath: normalizedRelPath,
|
|
154
|
-
commits,
|
|
155
|
-
};
|
|
156
|
-
}
|
|
157
|
-
// #endregion File-Specific Log Mode
|
|
158
|
-
// #region Standard Branch Log Mode
|
|
159
|
-
const visitedAddrs = new Set();
|
|
160
|
-
while (currBranchAddr && !visitedAddrs.has(currBranchAddr)) {
|
|
161
|
-
visitedAddrs.add(currBranchAddr);
|
|
162
|
-
const branchIbGib = await getIbGibWithMetaspaceFallback({
|
|
163
|
-
addr: currBranchAddr,
|
|
164
|
-
space: activeSpace,
|
|
165
|
-
metaspace,
|
|
166
|
-
});
|
|
167
|
-
if (!branchIbGib) {
|
|
168
|
-
break;
|
|
169
|
-
}
|
|
170
|
-
const rootItemAddr = branchIbGib.rel8ns?.b2tFS_item?.at(-1) || branchIbGib.rel8ns?.b2tfs_item?.at(-1);
|
|
171
|
-
let rootItem;
|
|
172
|
-
if (rootItemAddr) {
|
|
173
|
-
rootItem = await getIbGibWithMetaspaceFallback({
|
|
174
|
-
addr: rootItemAddr,
|
|
175
|
-
space: activeSpace,
|
|
176
|
-
metaspace,
|
|
177
|
-
});
|
|
178
|
-
}
|
|
179
|
-
let commentAddrs = [
|
|
180
|
-
...(branchIbGib.rel8ns?.comment || []),
|
|
181
|
-
...(rootItem?.rel8ns?.comment || []),
|
|
182
|
-
];
|
|
183
|
-
// Deduplicate
|
|
184
|
-
commentAddrs = Array.from(new Set(commentAddrs));
|
|
185
|
-
let message = '';
|
|
186
|
-
let timestamp = branchIbGib.data?.committedAt || '';
|
|
187
|
-
// If branch has a direct comment, use that first, otherwise use the last added comment on root item
|
|
188
|
-
let primaryCommentAddr = branchIbGib.rel8ns?.comment?.at(-1) || rootItem?.rel8ns?.comment?.at(-1) || commentAddrs.at(0);
|
|
189
|
-
if (primaryCommentAddr) {
|
|
190
|
-
const commentIbGib = await getIbGibWithMetaspaceFallback({
|
|
191
|
-
addr: primaryCommentAddr,
|
|
192
|
-
space: activeSpace,
|
|
193
|
-
metaspace,
|
|
194
|
-
});
|
|
195
|
-
if (commentIbGib?.data?.text) {
|
|
196
|
-
message = commentIbGib.data.text;
|
|
197
|
-
}
|
|
198
|
-
if (commentIbGib?.data?.textTimestamp || commentIbGib?.data?.timestamp) {
|
|
199
|
-
timestamp = commentIbGib.data.textTimestamp || commentIbGib.data.timestamp || timestamp;
|
|
200
|
-
}
|
|
201
|
-
}
|
|
202
|
-
const committedPaths = branchIbGib.data?.committedPaths || [];
|
|
203
|
-
const itemComments = [];
|
|
204
|
-
if (allComments && rootItem) {
|
|
205
|
-
await logCmd_collectAllItemComments({
|
|
206
|
-
item: rootItem,
|
|
207
|
-
space: activeSpace,
|
|
208
|
-
metaspace,
|
|
209
|
-
currentRelPath: '',
|
|
210
|
-
outComments: itemComments,
|
|
211
|
-
});
|
|
212
|
-
}
|
|
213
|
-
if (message || primaryCommentAddr || (committedPaths && committedPaths.length > 0)) {
|
|
214
|
-
commits.push({
|
|
215
|
-
branchAddr: currBranchAddr,
|
|
216
|
-
commitAddr: currBranchAddr,
|
|
217
|
-
commentAddr: primaryCommentAddr,
|
|
218
|
-
message: message || '(no commit message)',
|
|
219
|
-
timestamp,
|
|
220
|
-
author: 'vcs-user',
|
|
221
|
-
rootItemAddr,
|
|
222
|
-
committedPaths,
|
|
223
|
-
itemComments: itemComments.length > 0 ? itemComments : undefined,
|
|
224
|
-
});
|
|
225
|
-
}
|
|
226
|
-
// Move to previous branch node in timeline
|
|
227
|
-
currBranchAddr = branchIbGib.rel8ns?.past?.at(0) || branchIbGib.rel8ns?.ancestor?.at(0);
|
|
228
|
-
}
|
|
229
|
-
if (!quiet) {
|
|
230
|
-
console.log(`Branch: ${branchName} (I: 4e5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b)`);
|
|
231
|
-
if (commits.length === 0) {
|
|
232
|
-
console.log('No commits yet.');
|
|
233
|
-
}
|
|
234
|
-
else {
|
|
235
|
-
for (const commit of commits) {
|
|
236
|
-
console.log(`\ncommit ${commit.commitAddr}`);
|
|
237
|
-
console.log(`Author: ${commit.author}`);
|
|
238
|
-
console.log(`Date: ${commit.timestamp}`);
|
|
239
|
-
console.log(`\n ${commit.message}\n`);
|
|
240
|
-
if (commit.committedPaths && commit.committedPaths.length > 0) {
|
|
241
|
-
console.log(`Changed: ${commit.committedPaths.join(', ')}`);
|
|
242
|
-
}
|
|
243
|
-
if (commit.itemComments && commit.itemComments.length > 0) {
|
|
244
|
-
console.log('Item Comments:');
|
|
245
|
-
for (const ic of commit.itemComments) {
|
|
246
|
-
const label = ic.name ? `${ic.path} (${ic.name})` : ic.path;
|
|
247
|
-
console.log(` * [${label}]: ${ic.message}`);
|
|
248
|
-
}
|
|
249
|
-
}
|
|
250
|
-
}
|
|
251
|
-
}
|
|
252
|
-
}
|
|
253
|
-
return {
|
|
254
|
-
branchName,
|
|
255
|
-
commits,
|
|
256
|
-
};
|
|
257
|
-
// #endregion Standard Branch Log Mode
|
|
258
|
-
}
|
|
259
|
-
catch (error) {
|
|
260
|
-
console.error(`${lc} ${extractErrorMsg(error)} (E: 5f6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c)`);
|
|
261
|
-
throw error;
|
|
262
|
-
}
|
|
263
|
-
finally {
|
|
264
|
-
if (logalot) {
|
|
265
|
-
console.log(`${lc} complete. (I: 6a7b8c9d0e1f2a3b4c5d6e7f8a9b0c1d)`);
|
|
266
|
-
}
|
|
267
|
-
}
|
|
268
|
-
}
|
|
269
|
-
async function logCmd_findItemByPath({ rootItemAddr, targetRelPath, space, metaspace, }) {
|
|
270
|
-
const rootItem = await getIbGibWithMetaspaceFallback({
|
|
271
|
-
addr: rootItemAddr,
|
|
272
|
-
space,
|
|
273
|
-
metaspace,
|
|
274
|
-
});
|
|
275
|
-
if (!rootItem) {
|
|
276
|
-
return undefined;
|
|
277
|
-
}
|
|
278
|
-
if (!targetRelPath || targetRelPath === '.' || targetRelPath === '') {
|
|
279
|
-
return rootItem;
|
|
280
|
-
}
|
|
281
|
-
const segments = targetRelPath.split('/');
|
|
282
|
-
let currentItem = rootItem;
|
|
283
|
-
for (const segment of segments) {
|
|
284
|
-
if (currentItem.data?.fsType !== 'folder') {
|
|
285
|
-
return undefined;
|
|
286
|
-
}
|
|
287
|
-
const childAddrs = currentItem.rel8ns?.[B2TFS_CHILD_ITEM_REL8N_NAME] || [];
|
|
288
|
-
let nextItem;
|
|
289
|
-
for (const cAddr of childAddrs) {
|
|
290
|
-
const child = await getIbGibWithMetaspaceFallback({
|
|
291
|
-
addr: cAddr,
|
|
292
|
-
space,
|
|
293
|
-
metaspace,
|
|
294
|
-
});
|
|
295
|
-
if (child && child.data?.name === segment) {
|
|
296
|
-
nextItem = child;
|
|
297
|
-
break;
|
|
298
|
-
}
|
|
299
|
-
}
|
|
300
|
-
if (!nextItem) {
|
|
301
|
-
return undefined;
|
|
302
|
-
}
|
|
303
|
-
currentItem = nextItem;
|
|
304
|
-
}
|
|
305
|
-
return currentItem;
|
|
306
|
-
}
|
|
307
|
-
async function logCmd_collectAllItemComments({ item, space, metaspace, currentRelPath, outComments, }) {
|
|
308
|
-
if (!item || !item.data) {
|
|
309
|
-
return;
|
|
310
|
-
}
|
|
311
|
-
const itemComments = item.rel8ns?.comment || [];
|
|
312
|
-
for (const cAddr of itemComments) {
|
|
313
|
-
const commentIbGib = await getIbGibWithMetaspaceFallback({
|
|
314
|
-
addr: cAddr,
|
|
315
|
-
space,
|
|
316
|
-
metaspace,
|
|
317
|
-
});
|
|
318
|
-
if (commentIbGib && commentIbGib.data?.text) {
|
|
319
|
-
outComments.push({
|
|
320
|
-
path: currentRelPath || '(root)',
|
|
321
|
-
name: commentIbGib.data?.name,
|
|
322
|
-
message: commentIbGib.data.text,
|
|
323
|
-
});
|
|
324
|
-
}
|
|
325
|
-
}
|
|
326
|
-
if (item.data.fsType === 'folder') {
|
|
327
|
-
const childAddrs = item.rel8ns?.[B2TFS_CHILD_ITEM_REL8N_NAME] || [];
|
|
328
|
-
for (const childAddr of childAddrs) {
|
|
329
|
-
const childItem = await getIbGibWithMetaspaceFallback({
|
|
330
|
-
addr: childAddr,
|
|
331
|
-
space,
|
|
332
|
-
metaspace,
|
|
333
|
-
});
|
|
334
|
-
if (childItem && childItem.data) {
|
|
335
|
-
const childRel = currentRelPath
|
|
336
|
-
? `${currentRelPath}/${childItem.data.name}`
|
|
337
|
-
: childItem.data.name;
|
|
338
|
-
await logCmd_collectAllItemComments({
|
|
339
|
-
item: childItem,
|
|
340
|
-
space,
|
|
341
|
-
metaspace,
|
|
342
|
-
currentRelPath: childRel,
|
|
343
|
-
outComments,
|
|
344
|
-
});
|
|
345
|
-
}
|
|
346
|
-
}
|
|
347
|
-
}
|
|
348
|
-
}
|
|
349
|
-
//# sourceMappingURL=log-cmd.mjs.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"log-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/log-cmd.mts"],"names":[],"mappings":"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"}
|
|
@@ -1,36 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* @module merge-cmd
|
|
3
|
-
*
|
|
4
|
-
* Command handler for `vcs merge <branchName>`.
|
|
5
|
-
* Merges the incoming branch into the base (active/current) branch using
|
|
6
|
-
* SyncSagaCoordinator sync and 3-way graft merge strategy.
|
|
7
|
-
* Projects merged branch snapshot onto the base branch physical worktree path.
|
|
8
|
-
*
|
|
9
|
-
* ## Terminology (matches standard git usage)
|
|
10
|
-
*
|
|
11
|
-
* * **base** branch / space — the branch currently checked out, the one being
|
|
12
|
-
* merged INTO (analogous to `ours` / `HEAD` in git)
|
|
13
|
-
* * **incoming** branch / space — the branch whose changes are being merged IN
|
|
14
|
-
* (analogous to `theirs` / the topic branch in git)
|
|
15
|
-
*/
|
|
16
|
-
export interface MergeCmdOpts {
|
|
17
|
-
/** The incoming branch name — the branch whose changes will be merged in. */
|
|
18
|
-
incomingBranchName?: string;
|
|
19
|
-
targetDir?: string;
|
|
20
|
-
vcsFolderName?: string;
|
|
21
|
-
quiet?: boolean;
|
|
22
|
-
/** When true, emit diagnostic checkpoint logging (useful in tests). */
|
|
23
|
-
diagLog?: boolean;
|
|
24
|
-
}
|
|
25
|
-
export interface MergeCmdResult {
|
|
26
|
-
/** The base (current/active) branch name — merged into. */
|
|
27
|
-
baseBranch: string;
|
|
28
|
-
/** The incoming branch name — merged from. */
|
|
29
|
-
incomingBranch: string;
|
|
30
|
-
baseSpaceId: string;
|
|
31
|
-
incomingSpaceId: string;
|
|
32
|
-
mergedBranchAddr?: string;
|
|
33
|
-
worktreePath: string;
|
|
34
|
-
}
|
|
35
|
-
export declare function executeMergeCmd({ incomingBranchName, targetDir, vcsFolderName, quiet, diagLog, }?: MergeCmdOpts): Promise<MergeCmdResult>;
|
|
36
|
-
//# sourceMappingURL=merge-cmd.d.mts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"merge-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/merge-cmd.mts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AA6BH,MAAM,WAAW,YAAY;IACzB,6EAA6E;IAC7E,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,uEAAuE;IACvE,OAAO,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC3B,2DAA2D;IAC3D,UAAU,EAAE,MAAM,CAAC;IACnB,8CAA8C;IAC9C,cAAc,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;CACxB;AAED,wBAAsB,eAAe,CAAC,EAClC,kBAAkB,EAClB,SAAyB,EACzB,aAAyB,EACzB,KAAa,EACb,OAAe,GAClB,GAAE,YAAiB,GAAG,OAAO,CAAC,cAAc,CAAC,CAoS7C"}
|