@ethlete/cli 3.0.0-next.27 → 3.0.0-next.28
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 +153 -0
- package/build-info.json +1 -1
- package/design/arrow-anchor.ts +55 -0
- package/design/define-call.ts +3 -0
- package/design/define-part.ts +28 -1
- package/design/web/frame.ts +28 -0
- package/package.json +1 -1
- package/src/lib/api/compose.js +3 -2
- package/src/lib/api/compose.js.map +1 -1
- package/src/lib/api/git.js +2 -1
- package/src/lib/api/git.js.map +1 -1
- package/src/lib/api/setup.js +2 -2
- package/src/lib/api/setup.js.map +1 -1
- package/src/lib/design/asset-shot.js +2 -2
- package/src/lib/design/asset-shot.js.map +1 -1
- package/src/lib/design/blank-png.d.ts +2 -0
- package/src/lib/design/blank-png.js +28 -0
- package/src/lib/design/blank-png.js.map +1 -0
- package/src/lib/design/cache-entry.d.ts +8 -0
- package/src/lib/design/cache-entry.js +30 -0
- package/src/lib/design/cache-entry.js.map +1 -0
- package/src/lib/design/calls-tsconfig.js +20 -13
- package/src/lib/design/calls-tsconfig.js.map +1 -1
- package/src/lib/design/calls.js +3 -3
- package/src/lib/design/calls.js.map +1 -1
- package/src/lib/design/changed-parts.d.ts +1 -1
- package/src/lib/design/check.d.ts +2 -0
- package/src/lib/design/check.js +91 -24
- package/src/lib/design/check.js.map +1 -1
- package/src/lib/design/code-hash.d.ts +30 -0
- package/src/lib/design/code-hash.js +118 -0
- package/src/lib/design/code-hash.js.map +1 -0
- package/src/lib/design/commit-hunks.d.ts +2 -2
- package/src/lib/design/commit-hunks.js +2 -2
- package/src/lib/design/design-command.js +131 -36
- package/src/lib/design/design-command.js.map +1 -1
- package/src/lib/design/{paths.d.ts → design-config.d.ts} +6 -28
- package/src/lib/design/design-config.js +35 -0
- package/src/lib/design/design-config.js.map +1 -0
- package/src/lib/design/design-lint.d.ts +68 -0
- package/src/lib/design/design-lint.js +183 -0
- package/src/lib/design/design-lint.js.map +1 -0
- package/src/lib/design/draw-ledger.d.ts +6 -0
- package/src/lib/design/draw-ledger.js +10 -0
- package/src/lib/design/draw-ledger.js.map +1 -1
- package/src/lib/design/force-interactions.d.ts +2 -0
- package/src/lib/design/force-interactions.js +4 -2
- package/src/lib/design/force-interactions.js.map +1 -1
- package/src/lib/design/generated-stylesheets.d.ts +1 -1
- package/src/lib/design/generated-stylesheets.js +2 -2
- package/src/lib/design/generated-stylesheets.js.map +1 -1
- package/src/lib/design/git-top.d.ts +5 -0
- package/src/lib/design/git-top.js +16 -0
- package/src/lib/design/git-top.js.map +1 -0
- package/src/lib/design/hooks-problem.d.ts +2 -0
- package/src/lib/design/hooks-problem.js +23 -0
- package/src/lib/design/hooks-problem.js.map +1 -0
- package/src/lib/design/index.d.ts +4 -1
- package/src/lib/design/index.js +4 -1
- package/src/lib/design/index.js.map +1 -1
- package/src/lib/design/is-running.d.ts +1 -0
- package/src/lib/design/is-running.js +14 -0
- package/src/lib/design/is-running.js.map +1 -0
- package/src/lib/design/legacy.js +3 -3
- package/src/lib/design/legacy.js.map +1 -1
- package/src/lib/design/mcp-command.js +5 -12
- package/src/lib/design/mcp-command.js.map +1 -1
- package/src/lib/design/merge-compare.js +3 -3
- package/src/lib/design/merge-compare.js.map +1 -1
- package/src/lib/design/motion-command.js +3 -3
- package/src/lib/design/motion-command.js.map +1 -1
- package/src/lib/design/new-call.js +3 -3
- package/src/lib/design/new-call.js.map +1 -1
- package/src/lib/design/old-shot-folders.d.ts +2 -0
- package/src/lib/design/old-shot-folders.js +26 -0
- package/src/lib/design/old-shot-folders.js.map +1 -0
- package/src/lib/design/package-root.d.ts +21 -0
- package/src/lib/design/package-root.js +79 -0
- package/src/lib/design/package-root.js.map +1 -0
- package/src/lib/design/parent-watch.d.ts +7 -0
- package/src/lib/design/parent-watch.js +23 -0
- package/src/lib/design/parent-watch.js.map +1 -0
- package/src/lib/design/part-marks.js +2 -2
- package/src/lib/design/part-marks.js.map +1 -1
- package/src/lib/design/phase-timing.d.ts +5 -0
- package/src/lib/design/phase-timing.js +27 -0
- package/src/lib/design/phase-timing.js.map +1 -0
- package/src/lib/design/physical-cores.d.ts +12 -0
- package/src/lib/design/physical-cores.js +43 -0
- package/src/lib/design/physical-cores.js.map +1 -0
- package/src/lib/design/product-command.js +4 -4
- package/src/lib/design/product-command.js.map +1 -1
- package/src/lib/design/push-status.d.ts +30 -0
- package/src/lib/design/push-status.js +122 -0
- package/src/lib/design/push-status.js.map +1 -0
- package/src/lib/design/ready-shots.d.ts +18 -35
- package/src/lib/design/ready-shots.js +46 -111
- package/src/lib/design/ready-shots.js.map +1 -1
- package/src/lib/design/render-packages.d.ts +3 -1
- package/src/lib/design/render-packages.js +6 -2
- package/src/lib/design/render-packages.js.map +1 -1
- package/src/lib/design/render-worker.js +23 -3
- package/src/lib/design/render-worker.js.map +1 -1
- package/src/lib/design/render.d.ts +24 -3
- package/src/lib/design/render.js +23 -9
- package/src/lib/design/render.js.map +1 -1
- package/src/lib/design/resident/client.d.ts +52 -0
- package/src/lib/design/resident/client.js +263 -0
- package/src/lib/design/resident/client.js.map +1 -0
- package/src/lib/design/resident/discovery.d.ts +21 -0
- package/src/lib/design/resident/discovery.js +63 -0
- package/src/lib/design/resident/discovery.js.map +1 -0
- package/src/lib/design/resident/resident-process.d.ts +19 -0
- package/src/lib/design/resident/resident-process.js +189 -0
- package/src/lib/design/resident/resident-process.js.map +1 -0
- package/src/lib/design/resident/server.d.ts +52 -0
- package/src/lib/design/resident/server.js +212 -0
- package/src/lib/design/resident/server.js.map +1 -0
- package/src/lib/design/run-abort.d.ts +9 -0
- package/src/lib/design/run-abort.js +45 -0
- package/src/lib/design/run-abort.js.map +1 -0
- package/src/lib/design/run-deadline.d.ts +19 -0
- package/src/lib/design/run-deadline.js +104 -0
- package/src/lib/design/run-deadline.js.map +1 -0
- package/src/lib/design/run-yield.d.ts +8 -0
- package/src/lib/design/run-yield.js +43 -0
- package/src/lib/design/run-yield.js.map +1 -0
- package/src/lib/design/serve-state.d.ts +15 -0
- package/src/lib/design/serve-state.js +56 -0
- package/src/lib/design/serve-state.js.map +1 -0
- package/src/lib/design/serve.d.ts +20 -2
- package/src/lib/design/serve.js +147 -43
- package/src/lib/design/serve.js.map +1 -1
- package/src/lib/design/server-identity.d.ts +5 -1
- package/src/lib/design/server-identity.js +4 -1
- package/src/lib/design/server-identity.js.map +1 -1
- package/src/lib/design/shot-board.d.ts +26 -0
- package/src/lib/design/shot-board.js +80 -0
- package/src/lib/design/shot-board.js.map +1 -0
- package/src/lib/design/shot-command.d.ts +1 -1
- package/src/lib/design/shot-command.js +12 -5
- package/src/lib/design/shot-command.js.map +1 -1
- package/src/lib/design/shot-store.d.ts +29 -3
- package/src/lib/design/shot-store.js +206 -36
- package/src/lib/design/shot-store.js.map +1 -1
- package/src/lib/design/shot.d.ts +12 -4
- package/src/lib/design/shot.js +98 -14
- package/src/lib/design/shot.js.map +1 -1
- package/src/lib/design/sketch-at.js +2 -1
- package/src/lib/design/sketch-at.js.map +1 -1
- package/src/lib/design/sketch-command.d.ts +13 -0
- package/src/lib/design/sketch-command.js +346 -73
- package/src/lib/design/sketch-command.js.map +1 -1
- package/src/lib/design/ssr-shims.d.ts +1 -0
- package/src/lib/design/ssr-shims.js +3 -3
- package/src/lib/design/ssr-shims.js.map +1 -1
- package/src/lib/design/stamp.d.ts +5 -0
- package/src/lib/design/stamp.js +6 -5
- package/src/lib/design/stamp.js.map +1 -1
- package/src/lib/design/status.d.ts +1 -1
- package/src/lib/design/status.js +15 -4
- package/src/lib/design/status.js.map +1 -1
- package/src/lib/design/studio-api.d.ts +7 -15
- package/src/lib/design/studio-api.js +39 -140
- package/src/lib/design/studio-api.js.map +1 -1
- package/src/lib/design/system/accepted-pictures.d.ts +15 -29
- package/src/lib/design/system/accepted-pictures.js +156 -134
- package/src/lib/design/system/accepted-pictures.js.map +1 -1
- package/src/lib/design/system/action-cache.d.ts +45 -0
- package/src/lib/design/system/action-cache.js +72 -0
- package/src/lib/design/system/action-cache.js.map +1 -0
- package/src/lib/design/system/action-lost.d.ts +8 -6
- package/src/lib/design/system/action-lost.js +13 -17
- package/src/lib/design/system/action-lost.js.map +1 -1
- package/src/lib/design/system/action-press.d.ts +7 -1
- package/src/lib/design/system/action-press.js +16 -4
- package/src/lib/design/system/action-press.js.map +1 -1
- package/src/lib/design/system/actions-command.d.ts +12 -5
- package/src/lib/design/system/actions-command.js +187 -66
- package/src/lib/design/system/actions-command.js.map +1 -1
- package/src/lib/design/system/actions.d.ts +27 -4
- package/src/lib/design/system/actions.js +59 -21
- package/src/lib/design/system/actions.js.map +1 -1
- package/src/lib/design/system/anti-alias.d.ts +2 -0
- package/src/lib/design/system/anti-alias.js +11 -0
- package/src/lib/design/system/anti-alias.js.map +1 -0
- package/src/lib/design/system/app-files.js +19 -3
- package/src/lib/design/system/app-files.js.map +1 -1
- package/src/lib/design/system/arrow-anchor.d.ts +9 -0
- package/src/lib/design/system/arrow-anchor.js +40 -0
- package/src/lib/design/system/arrow-anchor.js.map +1 -0
- package/src/lib/design/system/base-issues.d.ts +28 -0
- package/src/lib/design/system/base-issues.js +80 -0
- package/src/lib/design/system/base-issues.js.map +1 -0
- package/src/lib/design/system/base.d.ts +1 -1
- package/src/lib/design/system/base.js +2 -2
- package/src/lib/design/system/base.js.map +1 -1
- package/src/lib/design/system/baseline-history.d.ts +13 -0
- package/src/lib/design/system/baseline-history.js +40 -0
- package/src/lib/design/system/baseline-history.js.map +1 -0
- package/src/lib/design/system/bespoke-controls.d.ts +4 -1
- package/src/lib/design/system/bespoke-controls.js +72 -70
- package/src/lib/design/system/bespoke-controls.js.map +1 -1
- package/src/lib/design/system/build-ready-contract.d.ts +7 -1
- package/src/lib/design/system/build-ready-contract.js +7 -1
- package/src/lib/design/system/build-ready-contract.js.map +1 -1
- package/src/lib/design/system/build-running.d.ts +13 -0
- package/src/lib/design/system/build-running.js +48 -0
- package/src/lib/design/system/build-running.js.map +1 -0
- package/src/lib/design/system/check-record.d.ts +18 -0
- package/src/lib/design/system/check-record.js +47 -0
- package/src/lib/design/system/check-record.js.map +1 -0
- package/src/lib/design/system/check-rules.d.ts +1 -1
- package/src/lib/design/system/check-rules.js +19 -1
- package/src/lib/design/system/check-rules.js.map +1 -1
- package/src/lib/design/system/check-system.d.ts +25 -4
- package/src/lib/design/system/check-system.js +289 -121
- package/src/lib/design/system/check-system.js.map +1 -1
- package/src/lib/design/system/comments/inbox.d.ts +1 -1
- package/src/lib/design/system/compare-cache.d.ts +20 -0
- package/src/lib/design/system/compare-cache.js +92 -0
- package/src/lib/design/system/compare-cache.js.map +1 -0
- package/src/lib/design/system/compare-command.d.ts +82 -51
- package/src/lib/design/system/compare-command.js +362 -340
- package/src/lib/design/system/compare-command.js.map +1 -1
- package/src/lib/design/system/complete.d.ts +31 -1
- package/src/lib/design/system/complete.js +141 -27
- package/src/lib/design/system/complete.js.map +1 -1
- package/src/lib/design/system/decision-refs.d.ts +5 -0
- package/src/lib/design/system/decision-refs.js +21 -0
- package/src/lib/design/system/decision-refs.js.map +1 -0
- package/src/lib/design/system/design-hash.d.ts +22 -1
- package/src/lib/design/system/design-hash.js +63 -4
- package/src/lib/design/system/design-hash.js.map +1 -1
- package/src/lib/design/system/dom-command.d.ts +1 -1
- package/src/lib/design/system/dom-command.js +8 -5
- package/src/lib/design/system/dom-command.js.map +1 -1
- package/src/lib/design/system/drawn-open-points.d.ts +1 -1
- package/src/lib/design/system/dropped-props.d.ts +19 -5
- package/src/lib/design/system/dropped-props.js +133 -21
- package/src/lib/design/system/dropped-props.js.map +1 -1
- package/src/lib/design/system/grid-report.d.ts +5 -0
- package/src/lib/design/system/grid-report.js +78 -0
- package/src/lib/design/system/grid-report.js.map +1 -0
- package/src/lib/design/system/harness-build-cache.d.ts +17 -3
- package/src/lib/design/system/harness-build-cache.js +23 -10
- package/src/lib/design/system/harness-build-cache.js.map +1 -1
- package/src/lib/design/system/harness-inputs.d.ts +17 -0
- package/src/lib/design/system/harness-inputs.js +160 -0
- package/src/lib/design/system/harness-inputs.js.map +1 -0
- package/src/lib/design/system/harness-map.d.ts +1 -1
- package/src/lib/design/system/harness-server.d.ts +12 -1
- package/src/lib/design/system/harness-server.js +29 -19
- package/src/lib/design/system/harness-server.js.map +1 -1
- package/src/lib/design/system/harness-shot.d.ts +78 -0
- package/src/lib/design/system/harness-shot.js +349 -0
- package/src/lib/design/system/harness-shot.js.map +1 -0
- package/src/lib/design/system/harness-watch.d.ts +79 -0
- package/src/lib/design/system/harness-watch.js +334 -0
- package/src/lib/design/system/harness-watch.js.map +1 -0
- package/src/lib/design/system/implementation-baseline.d.ts +20 -0
- package/src/lib/design/system/implementation-baseline.js +44 -0
- package/src/lib/design/system/implementation-baseline.js.map +1 -0
- package/src/lib/design/system/leftover-gate-files.d.ts +2 -0
- package/src/lib/design/system/leftover-gate-files.js +15 -0
- package/src/lib/design/system/leftover-gate-files.js.map +1 -0
- package/src/lib/design/system/lib-build-lock.d.ts +18 -0
- package/src/lib/design/system/lib-build-lock.js +111 -0
- package/src/lib/design/system/lib-build-lock.js.map +1 -0
- package/src/lib/design/system/link-free.d.ts +12 -0
- package/src/lib/design/system/link-free.js +125 -0
- package/src/lib/design/system/link-free.js.map +1 -0
- package/src/lib/design/system/list-system.d.ts +4 -8
- package/src/lib/design/system/list-system.js +8 -78
- package/src/lib/design/system/list-system.js.map +1 -1
- package/src/lib/design/system/live-actions.d.ts +1 -1
- package/src/lib/design/system/live-actions.js +17 -8
- package/src/lib/design/system/live-actions.js.map +1 -1
- package/src/lib/design/system/live-compare.js +1 -1
- package/src/lib/design/system/live-compare.js.map +1 -1
- package/src/lib/design/system/live-uncovered.d.ts +7 -2
- package/src/lib/design/system/live-uncovered.js +44 -9
- package/src/lib/design/system/live-uncovered.js.map +1 -1
- package/src/lib/design/system/no-verdict.d.ts +13 -0
- package/src/lib/design/system/no-verdict.js +17 -0
- package/src/lib/design/system/no-verdict.js.map +1 -0
- package/src/lib/design/system/off-centre.d.ts +11 -0
- package/src/lib/design/system/off-centre.js +74 -0
- package/src/lib/design/system/off-centre.js.map +1 -0
- package/src/lib/design/system/open-points-cache.d.ts +11 -0
- package/src/lib/design/system/open-points-cache.js +27 -0
- package/src/lib/design/system/open-points-cache.js.map +1 -0
- package/src/lib/design/system/open-points-runner.d.ts +43 -0
- package/src/lib/design/system/open-points-runner.js +119 -0
- package/src/lib/design/system/open-points-runner.js.map +1 -0
- package/src/lib/design/system/open-points-worker.d.ts +1 -0
- package/src/lib/design/system/open-points-worker.js +28 -0
- package/src/lib/design/system/open-points-worker.js.map +1 -0
- package/src/lib/design/system/open-points.js +1 -1
- package/src/lib/design/system/open-points.js.map +1 -1
- package/src/lib/design/system/part-build-ready.d.ts +13 -7
- package/src/lib/design/system/part-build-ready.js +43 -15
- package/src/lib/design/system/part-build-ready.js.map +1 -1
- package/src/lib/design/system/part-compare.d.ts +18 -2
- package/src/lib/design/system/part-compare.js +147 -42
- package/src/lib/design/system/part-compare.js.map +1 -1
- package/src/lib/design/system/part-picture-cache.d.ts +23 -0
- package/src/lib/design/system/part-picture-cache.js +68 -0
- package/src/lib/design/system/part-picture-cache.js.map +1 -0
- package/src/lib/design/system/part-ready.d.ts +33 -7
- package/src/lib/design/system/part-ready.js +55 -17
- package/src/lib/design/system/part-ready.js.map +1 -1
- package/src/lib/design/system/part-task.d.ts +20 -0
- package/src/lib/design/system/part-task.js +53 -7
- package/src/lib/design/system/part-task.js.map +1 -1
- package/src/lib/design/system/pixel-cache.d.ts +16 -0
- package/src/lib/design/system/pixel-cache.js +79 -0
- package/src/lib/design/system/pixel-cache.js.map +1 -0
- package/src/lib/design/system/pointer-focus.d.ts +10 -2
- package/src/lib/design/system/pointer-focus.js +32 -9
- package/src/lib/design/system/pointer-focus.js.map +1 -1
- package/src/lib/design/system/prettier.js +4 -3
- package/src/lib/design/system/prettier.js.map +1 -1
- package/src/lib/design/system/problem.d.ts +6 -0
- package/src/lib/design/system/product.js +2 -2
- package/src/lib/design/system/product.js.map +1 -1
- package/src/lib/design/system/ready-command.d.ts +1 -1
- package/src/lib/design/system/ready-command.js +24 -4
- package/src/lib/design/system/ready-command.js.map +1 -1
- package/src/lib/design/system/record-settled.d.ts +24 -0
- package/src/lib/design/system/record-settled.js +50 -0
- package/src/lib/design/system/record-settled.js.map +1 -0
- package/src/lib/design/system/render-check.d.ts +18 -1
- package/src/lib/design/system/render-check.js +164 -104
- package/src/lib/design/system/render-check.js.map +1 -1
- package/src/lib/design/system/render-issue-key.d.ts +9 -0
- package/src/lib/design/system/render-issue-key.js +27 -0
- package/src/lib/design/system/render-issue-key.js.map +1 -0
- package/src/lib/design/system/resolve-product.d.ts +4 -1
- package/src/lib/design/system/resolve-product.js +14 -3
- package/src/lib/design/system/resolve-product.js.map +1 -1
- package/src/lib/design/system/rule-baseline.d.ts +53 -0
- package/src/lib/design/system/rule-baseline.js +124 -0
- package/src/lib/design/system/rule-baseline.js.map +1 -0
- package/src/lib/design/system/rule-skips.d.ts +20 -0
- package/src/lib/design/system/rule-skips.js +36 -0
- package/src/lib/design/system/rule-skips.js.map +1 -0
- package/src/lib/design/system/rules/canonical-class.d.ts +4 -0
- package/src/lib/design/system/rules/canonical-class.js +66 -13
- package/src/lib/design/system/rules/canonical-class.js.map +1 -1
- package/src/lib/design/system/rules/capability-place.d.ts +4 -2
- package/src/lib/design/system/rules/capability-place.js +15 -2
- package/src/lib/design/system/rules/capability-place.js.map +1 -1
- package/src/lib/design/system/rules/command-text.d.ts +7 -0
- package/src/lib/design/system/rules/command-text.js +72 -0
- package/src/lib/design/system/rules/command-text.js.map +1 -0
- package/src/lib/design/system/rules/design-coverage.d.ts +30 -0
- package/src/lib/design/system/rules/design-coverage.js +205 -0
- package/src/lib/design/system/rules/design-coverage.js.map +1 -0
- package/src/lib/design/system/rules/glued-interpolation.js +17 -1
- package/src/lib/design/system/rules/glued-interpolation.js.map +1 -1
- package/src/lib/design/system/rules/implements-unrendered.d.ts +13 -0
- package/src/lib/design/system/rules/implements-unrendered.js +63 -0
- package/src/lib/design/system/rules/implements-unrendered.js.map +1 -0
- package/src/lib/design/system/rules/motion.js +6 -0
- package/src/lib/design/system/rules/motion.js.map +1 -1
- package/src/lib/design/system/rules/native-title.js +13 -3
- package/src/lib/design/system/rules/native-title.js.map +1 -1
- package/src/lib/design/system/rules/option-values.d.ts +1 -1
- package/src/lib/design/system/rules/pending-state.d.ts +39 -0
- package/src/lib/design/system/rules/pending-state.js +289 -0
- package/src/lib/design/system/rules/pending-state.js.map +1 -0
- package/src/lib/design/system/rules/sdk-attribute-value.d.ts +10 -0
- package/src/lib/design/system/rules/sdk-attribute-value.js +78 -0
- package/src/lib/design/system/rules/sdk-attribute-value.js.map +1 -0
- package/src/lib/design/system/rules/sdk-private-var.d.ts +9 -0
- package/src/lib/design/system/rules/sdk-private-var.js +54 -0
- package/src/lib/design/system/rules/sdk-private-var.js.map +1 -0
- package/src/lib/design/system/rules/skips.d.ts +4 -0
- package/src/lib/design/system/rules/skips.js +27 -0
- package/src/lib/design/system/rules/skips.js.map +1 -0
- package/src/lib/design/system/rules/stale-replace.js +1 -0
- package/src/lib/design/system/rules/stale-replace.js.map +1 -1
- package/src/lib/design/system/rules/tailwind-classes.d.ts +1 -0
- package/src/lib/design/system/rules/tailwind-classes.js +11 -6
- package/src/lib/design/system/rules/tailwind-classes.js.map +1 -1
- package/src/lib/design/system/rules/token-selectors.js +10 -3
- package/src/lib/design/system/rules/token-selectors.js.map +1 -1
- package/src/lib/design/system/rules/unbound-input-known.d.ts +2 -0
- package/src/lib/design/system/rules/unbound-input-known.js +3 -6
- package/src/lib/design/system/rules/unbound-input-known.js.map +1 -1
- package/src/lib/design/system/rules/unbound-input.d.ts +2 -0
- package/src/lib/design/system/rules/unbound-input.js +12 -6
- package/src/lib/design/system/rules/unbound-input.js.map +1 -1
- package/src/lib/design/system/rules/undefined-class.js +11 -2
- package/src/lib/design/system/rules/undefined-class.js.map +1 -1
- package/src/lib/design/system/rules/utility-css.js +13 -1
- package/src/lib/design/system/rules/utility-css.js.map +1 -1
- package/src/lib/design/system/rules/visible-change.d.ts +1 -2
- package/src/lib/design/system/rules/visible-change.js +3 -3
- package/src/lib/design/system/rules/visible-change.js.map +1 -1
- package/src/lib/design/system/sdk-declarations.d.ts +10 -0
- package/src/lib/design/system/sdk-declarations.js +177 -0
- package/src/lib/design/system/sdk-declarations.js.map +1 -0
- package/src/lib/design/system/sdk-selectors.d.ts +18 -0
- package/src/lib/design/system/sdk-selectors.js +131 -0
- package/src/lib/design/system/sdk-selectors.js.map +1 -0
- package/src/lib/design/system/served-cache.d.ts +99 -0
- package/src/lib/design/system/served-cache.js +202 -0
- package/src/lib/design/system/served-cache.js.map +1 -0
- package/src/lib/design/system/settled-panes.d.ts +8 -3
- package/src/lib/design/system/settled-panes.js +10 -9
- package/src/lib/design/system/settled-panes.js.map +1 -1
- package/src/lib/design/system/sketch/baseline.d.ts +17 -1
- package/src/lib/design/system/sketch/baseline.js +48 -7
- package/src/lib/design/system/sketch/baseline.js.map +1 -1
- package/src/lib/design/system/sketch/check-format.js +3 -9
- package/src/lib/design/system/sketch/check-format.js.map +1 -1
- package/src/lib/design/system/sketch/clean-copy.d.ts +18 -0
- package/src/lib/design/system/sketch/clean-copy.js +104 -0
- package/src/lib/design/system/sketch/clean-copy.js.map +1 -0
- package/src/lib/design/system/sketch/cli-args.d.ts +1 -1
- package/src/lib/design/system/sketch/cli-args.js +2 -2
- package/src/lib/design/system/sketch/cli-args.js.map +1 -1
- package/src/lib/design/system/sketch/covered-diffs.d.ts +40 -0
- package/src/lib/design/system/sketch/covered-diffs.js +106 -0
- package/src/lib/design/system/sketch/covered-diffs.js.map +1 -0
- package/src/lib/design/system/sketch/edit-sketch.d.ts +14 -6
- package/src/lib/design/system/sketch/edit-sketch.js +87 -35
- package/src/lib/design/system/sketch/edit-sketch.js.map +1 -1
- package/src/lib/design/system/sketch/identical-renders.js +20 -14
- package/src/lib/design/system/sketch/identical-renders.js.map +1 -1
- package/src/lib/design/system/sketch/merge-commit.d.ts +20 -0
- package/src/lib/design/system/sketch/merge-commit.js +72 -0
- package/src/lib/design/system/sketch/merge-commit.js.map +1 -0
- package/src/lib/design/system/sketch/merge-runner.d.ts +20 -0
- package/src/lib/design/system/sketch/merge-runner.js +73 -0
- package/src/lib/design/system/sketch/merge-runner.js.map +1 -0
- package/src/lib/design/system/sketch/merge-step.d.ts +14 -2
- package/src/lib/design/system/sketch/merge-step.js +24 -12
- package/src/lib/design/system/sketch/merge-step.js.map +1 -1
- package/src/lib/design/system/sketch/merge-worker.d.ts +1 -0
- package/src/lib/design/system/sketch/merge-worker.js +14 -0
- package/src/lib/design/system/sketch/merge-worker.js.map +1 -0
- package/src/lib/design/system/sketch/merge.d.ts +10 -3
- package/src/lib/design/system/sketch/merge.js +180 -90
- package/src/lib/design/system/sketch/merge.js.map +1 -1
- package/src/lib/design/system/sketch/merged-parts.d.ts +0 -29
- package/src/lib/design/system/sketch/merged-parts.js +8 -56
- package/src/lib/design/system/sketch/merged-parts.js.map +1 -1
- package/src/lib/design/system/sketch/note-language.d.ts +7 -0
- package/src/lib/design/system/sketch/note-language.js +83 -0
- package/src/lib/design/system/sketch/note-language.js.map +1 -0
- package/src/lib/design/system/sketch/part-definition.d.ts +6 -0
- package/src/lib/design/system/sketch/part-definition.js +31 -1
- package/src/lib/design/system/sketch/part-definition.js.map +1 -1
- package/src/lib/design/system/sketch/rebase-port.js +47 -2
- package/src/lib/design/system/sketch/rebase-port.js.map +1 -1
- package/src/lib/design/system/sketch/sketch-check-cache.d.ts +11 -0
- package/src/lib/design/system/sketch/sketch-check-cache.js +22 -0
- package/src/lib/design/system/sketch/sketch-check-cache.js.map +1 -0
- package/src/lib/design/system/sketch/sketch-check-worker.js +6 -1
- package/src/lib/design/system/sketch/sketch-check-worker.js.map +1 -1
- package/src/lib/design/system/sketch/sketch-checker.d.ts +14 -1
- package/src/lib/design/system/sketch/sketch-checker.js +16 -6
- package/src/lib/design/system/sketch/sketch-checker.js.map +1 -1
- package/src/lib/design/system/sketch/sketch.d.ts +37 -6
- package/src/lib/design/system/sketch/sketch.js +101 -13
- package/src/lib/design/system/sketch/sketch.js.map +1 -1
- package/src/lib/design/system/sketch/stale-base.js +1 -1
- package/src/lib/design/system/sketch/stale-base.js.map +1 -1
- package/src/lib/design/system/sketch/unchanged-states.d.ts +7 -3
- package/src/lib/design/system/sketch/unchanged-states.js +25 -12
- package/src/lib/design/system/sketch/unchanged-states.js.map +1 -1
- package/src/lib/design/system/sketch/viewed-shots.d.ts +10 -2
- package/src/lib/design/system/sketch/viewed-shots.js +15 -22
- package/src/lib/design/system/sketch/viewed-shots.js.map +1 -1
- package/src/lib/design/system/skip-classes.d.ts +3 -0
- package/src/lib/design/system/skip-classes.js +17 -0
- package/src/lib/design/system/skip-classes.js.map +1 -0
- package/src/lib/design/system/slot-hosts.d.ts +38 -0
- package/src/lib/design/system/slot-hosts.js +93 -0
- package/src/lib/design/system/slot-hosts.js.map +1 -0
- package/src/lib/design/system/slow-checks.d.ts +4 -0
- package/src/lib/design/system/slow-checks.js +77 -24
- package/src/lib/design/system/slow-checks.js.map +1 -1
- package/src/lib/design/system/slow-run.d.ts +15 -5
- package/src/lib/design/system/slow-run.js +143 -84
- package/src/lib/design/system/slow-run.js.map +1 -1
- package/src/lib/design/system/stale-dist.d.ts +37 -1
- package/src/lib/design/system/stale-dist.js +58 -8
- package/src/lib/design/system/stale-dist.js.map +1 -1
- package/src/lib/design/system/stale-parts.d.ts +15 -0
- package/src/lib/design/system/stale-parts.js +67 -5
- package/src/lib/design/system/stale-parts.js.map +1 -1
- package/src/lib/design/system/system-command.js +3 -3
- package/src/lib/design/system/system-command.js.map +1 -1
- package/src/lib/design/system/system-modules.d.ts +4 -4
- package/src/lib/design/system/system-tsconfig.d.ts +9 -2
- package/src/lib/design/system/system-tsconfig.js +73 -13
- package/src/lib/design/system/system-tsconfig.js.map +1 -1
- package/src/lib/design/system/task-command.d.ts +3 -2
- package/src/lib/design/system/task-command.js +111 -73
- package/src/lib/design/system/task-command.js.map +1 -1
- package/src/lib/design/system/touched-parts.d.ts +1 -1
- package/src/lib/design/system/touched-parts.js +4 -5
- package/src/lib/design/system/touched-parts.js.map +1 -1
- package/src/lib/design/system/tracked-reads.d.ts +27 -0
- package/src/lib/design/system/tracked-reads.js +100 -0
- package/src/lib/design/system/tracked-reads.js.map +1 -0
- package/src/lib/design/system/unchanged-rows.d.ts +17 -8
- package/src/lib/design/system/unchanged-rows.js +90 -12
- package/src/lib/design/system/unchanged-rows.js.map +1 -1
- package/src/lib/design/system/uncommitted-decisions.d.ts +0 -2
- package/src/lib/design/system/uncommitted-decisions.js +3 -6
- package/src/lib/design/system/uncommitted-decisions.js.map +1 -1
- package/src/lib/design/system/visible-change-command.d.ts +13 -1
- package/src/lib/design/system/visible-change-command.js +10 -8
- package/src/lib/design/system/visible-change-command.js.map +1 -1
- package/src/lib/design/system/visible-change-parts.d.ts +1 -1
- package/src/lib/design/system/write-origin.d.ts +12 -0
- package/src/lib/design/system/write-origin.js +18 -0
- package/src/lib/design/system/write-origin.js.map +1 -0
- package/src/lib/design/system-use.js +4 -4
- package/src/lib/design/system-use.js.map +1 -1
- package/src/lib/design/thumb.d.ts +19 -3
- package/src/lib/design/thumb.js +71 -9
- package/src/lib/design/thumb.js.map +1 -1
- package/src/lib/design/timings-command.d.ts +22 -0
- package/src/lib/design/timings-command.js +175 -0
- package/src/lib/design/timings-command.js.map +1 -0
- package/src/lib/design/timings.d.ts +117 -0
- package/src/lib/design/timings.js +296 -0
- package/src/lib/design/timings.js.map +1 -0
- package/src/lib/design/typecheck.js +2 -2
- package/src/lib/design/typecheck.js.map +1 -1
- package/src/lib/design/vite-cache.d.ts +11 -0
- package/src/lib/design/vite-cache.js +61 -0
- package/src/lib/design/vite-cache.js.map +1 -0
- package/src/lib/design/warm-draw.d.ts +33 -0
- package/src/lib/design/warm-draw.js +74 -0
- package/src/lib/design/warm-draw.js.map +1 -0
- package/src/lib/design/warm-pages.d.ts +10 -2
- package/src/lib/design/warm-pages.js +6 -2
- package/src/lib/design/warm-pages.js.map +1 -1
- package/src/lib/design/work-root.d.ts +2 -0
- package/src/lib/design/work-root.js +8 -0
- package/src/lib/design/work-root.js.map +1 -0
- package/src/lib/plain-output.d.ts +27 -0
- package/src/lib/plain-output.js +66 -0
- package/src/lib/plain-output.js.map +1 -0
- package/src/lib/release.js +11 -3
- package/src/lib/release.js.map +1 -1
- package/src/lib/update/commits.js +2 -2
- package/src/lib/update/commits.js.map +1 -1
- package/src/lib/update/packages.js +4 -2
- package/src/lib/update/packages.js.map +1 -1
- package/src/lib/update/scan.js +8 -2
- package/src/lib/update/scan.js.map +1 -1
- package/src/lib/design/paths.js +0 -138
- package/src/lib/design/paths.js.map +0 -1
- package/src/lib/design/system/accept-command.d.ts +0 -41
- package/src/lib/design/system/accept-command.js +0 -139
- package/src/lib/design/system/accept-command.js.map +0 -1
- package/src/lib/design/system/go-batch.d.ts +0 -24
- package/src/lib/design/system/go-batch.js +0 -110
- package/src/lib/design/system/go-batch.js.map +0 -1
- package/src/lib/design/system/go-command.d.ts +0 -4
- package/src/lib/design/system/go-command.js +0 -64
- package/src/lib/design/system/go-command.js.map +0 -1
- package/src/lib/design/system/go-guard.d.ts +0 -26
- package/src/lib/design/system/go-guard.js +0 -70
- package/src/lib/design/system/go-guard.js.map +0 -1
- package/src/lib/design/system/go-step.d.ts +0 -13
- package/src/lib/design/system/go-step.js +0 -84
- package/src/lib/design/system/go-step.js.map +0 -1
- package/src/lib/design/system/part-go.d.ts +0 -70
- package/src/lib/design/system/part-go.js +0 -94
- package/src/lib/design/system/part-go.js.map +0 -1
- package/src/lib/design/system/tom-confirm.d.ts +0 -40
- package/src/lib/design/system/tom-confirm.js +0 -55
- package/src/lib/design/system/tom-confirm.js.map +0 -1
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.discardSketch = exports.mergeSketch = void 0;
|
|
3
|
+
exports.discardSketch = exports.mergeSketch = exports.mergeRefusalOf = void 0;
|
|
4
4
|
const child_process_1 = require("child_process");
|
|
5
|
+
const plain_output_1 = require("../../../plain-output");
|
|
5
6
|
const fs_1 = require("fs");
|
|
6
|
-
const os_1 = require("os");
|
|
7
7
|
const path_1 = require("path");
|
|
8
|
+
const design_config_1 = require("../../design-config");
|
|
9
|
+
const design_lint_1 = require("../../design-lint");
|
|
8
10
|
const check_system_1 = require("../check-system");
|
|
9
11
|
const comment_1 = require("../comments/comment");
|
|
10
12
|
const assets_1 = require("../assets");
|
|
@@ -18,16 +20,9 @@ const merge_shared_1 = require("./merge-shared");
|
|
|
18
20
|
const merged_parts_1 = require("./merged-parts");
|
|
19
21
|
const part_definition_1 = require("./part-definition");
|
|
20
22
|
const stale_base_1 = require("./stale-base");
|
|
21
|
-
const
|
|
23
|
+
const clean_copy_1 = require("./clean-copy");
|
|
22
24
|
const sketch_1 = require("./sketch");
|
|
23
|
-
const
|
|
24
|
-
const backup = (0, fs_1.mkdtempSync)((0, path_1.join)((0, os_1.tmpdir)(), 'ethlete-sketch-merge-'));
|
|
25
|
-
const held = entries.map(({ to }, index) => {
|
|
26
|
-
const copy = (0, path_1.resolve)(backup, String(index));
|
|
27
|
-
if ((0, fs_1.existsSync)(to))
|
|
28
|
-
(0, fs_1.cpSync)(to, copy, { recursive: true });
|
|
29
|
-
return { to, copy: (0, fs_1.existsSync)(copy) ? copy : null };
|
|
30
|
-
});
|
|
25
|
+
const replace = (entries) => {
|
|
31
26
|
for (const { from, to } of entries) {
|
|
32
27
|
(0, fs_1.rmSync)(to, { recursive: true, force: true });
|
|
33
28
|
if (from === null)
|
|
@@ -35,17 +30,25 @@ const swap = (entries) => {
|
|
|
35
30
|
(0, fs_1.mkdirSync)((0, path_1.dirname)(to), { recursive: true });
|
|
36
31
|
(0, fs_1.cpSync)(from, to, { recursive: true });
|
|
37
32
|
}
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
33
|
+
};
|
|
34
|
+
const changesOf = (before, after) => {
|
|
35
|
+
var _a;
|
|
36
|
+
const changes = new Map();
|
|
37
|
+
for (const [file, content] of after)
|
|
38
|
+
if (!((_a = before.get(file)) === null || _a === void 0 ? void 0 : _a.equals(content)))
|
|
39
|
+
changes.set(file, content);
|
|
40
|
+
for (const file of before.keys())
|
|
41
|
+
if (!after.has(file))
|
|
42
|
+
changes.set(file, null);
|
|
43
|
+
return changes;
|
|
44
|
+
};
|
|
45
|
+
const pruneEmptyDirs = (dir) => {
|
|
46
|
+
if (!(0, fs_1.existsSync)(dir) || !(0, fs_1.statSync)(dir).isDirectory())
|
|
47
|
+
return;
|
|
48
|
+
for (const name of (0, fs_1.readdirSync)(dir))
|
|
49
|
+
pruneEmptyDirs((0, path_1.resolve)(dir, name));
|
|
50
|
+
if ((0, fs_1.readdirSync)(dir).length === 0)
|
|
51
|
+
(0, fs_1.rmSync)(dir, { recursive: true, force: true });
|
|
49
52
|
};
|
|
50
53
|
const pickOf = (sketch) => {
|
|
51
54
|
const decision = sketch.decision;
|
|
@@ -92,28 +95,27 @@ const formatFiles = (target, files) => {
|
|
|
92
95
|
const bin = (0, prettier_1.prettierBinOf)(target);
|
|
93
96
|
if (!bin || files.length === 0)
|
|
94
97
|
return;
|
|
95
|
-
const formatted = (0,
|
|
98
|
+
const formatted = (0, plain_output_1.spawnPlain)([process.execPath, bin, '--write', '--ignore-unknown', '--log-level', 'warn', ...files], {
|
|
96
99
|
cwd: target,
|
|
97
|
-
encoding: 'utf8',
|
|
98
100
|
});
|
|
99
101
|
if (formatted.error || formatted.status !== 0)
|
|
100
102
|
console.warn(`Could not format the merged files: ${(formatted.stderr || ((_a = formatted.error) === null || _a === void 0 ? void 0 : _a.message) || '').trim()}`);
|
|
101
103
|
};
|
|
102
|
-
const
|
|
104
|
+
const dirtyAmongOf = (options) => {
|
|
105
|
+
if (options.paths.length === 0)
|
|
106
|
+
return [];
|
|
103
107
|
const root = (0, child_process_1.spawnSync)('git', ['rev-parse', '--show-toplevel'], { cwd: options.target, encoding: 'utf8' });
|
|
104
|
-
const status = (0, child_process_1.spawnSync)('git', ['status', '--porcelain', '-z', '--untracked-files=all', '--', options.
|
|
108
|
+
const status = (0, child_process_1.spawnSync)('git', ['status', '--porcelain', '-z', '--untracked-files=all', '--', ...options.paths], {
|
|
105
109
|
cwd: options.target,
|
|
106
110
|
encoding: 'utf8',
|
|
107
111
|
});
|
|
108
112
|
if (root.status !== 0 || status.status !== 0)
|
|
109
113
|
return [];
|
|
110
114
|
const top = root.stdout.trim();
|
|
115
|
+
const realTarget = (0, fs_1.realpathSync)(options.target);
|
|
111
116
|
const entries = status.stdout.split('\0').filter(Boolean);
|
|
112
117
|
const files = entries.flatMap((entry, index) => { var _a; return /^[RC]/.test(entry) ? [entry.slice(3)] : /^[RC]/.test((_a = entries[index - 1]) !== null && _a !== void 0 ? _a : '') ? [] : [entry.slice(3)]; });
|
|
113
|
-
return files
|
|
114
|
-
.map((file) => (0, path_1.resolve)(top, file))
|
|
115
|
-
.filter((file) => !options.ignored.some((path) => file === path || file.startsWith(`${path}/`)))
|
|
116
|
-
.map((file) => (0, path_1.relative)(options.target, file));
|
|
118
|
+
return [...new Set(files.map((file) => (0, path_1.relative)(realTarget, (0, path_1.resolve)(top, file))))];
|
|
117
119
|
};
|
|
118
120
|
const typeErrorFilesOf = (options) => options.failures
|
|
119
121
|
.filter((line) => line.startsWith('TYPE-ERROR'))
|
|
@@ -132,19 +134,9 @@ const withPrintedErrors = (run) => {
|
|
|
132
134
|
console.error = printError;
|
|
133
135
|
}
|
|
134
136
|
};
|
|
135
|
-
const
|
|
136
|
-
var _a, _b
|
|
137
|
-
const { target, config, product, sketch, note, replaceNote,
|
|
138
|
-
if (sketch.status !== 'ready')
|
|
139
|
-
return `${sketch.target} is ${sketch.status} - mark it ready before a merge: design sketch ready ${sketch.target} --by <model id> --product ${product.name}`;
|
|
140
|
-
const pick = pickOf(sketch);
|
|
141
|
-
if (typeof pick === 'string')
|
|
142
|
-
return pick;
|
|
143
|
-
const { variant } = pick;
|
|
144
|
-
const decision = { variant, decidedBy: (_a = options.decidedBy) !== null && _a !== void 0 ? _a : 'user', at: pick.at };
|
|
145
|
-
const rejected = (0, sketch_1.rejectedProblemOf)(sketch, variant);
|
|
146
|
-
if (rejected)
|
|
147
|
-
return rejected;
|
|
137
|
+
const checkedMergeOf = (options) => {
|
|
138
|
+
var _a, _b;
|
|
139
|
+
const { target, config, product, sketch, note, replaceNote, variant } = options;
|
|
148
140
|
const dir = (0, sketch_1.variantDirOf)(sketch, variant);
|
|
149
141
|
const { parts, problems } = (0, product_1.partFilesOf)(dir);
|
|
150
142
|
if (problems.length > 0)
|
|
@@ -172,7 +164,7 @@ const mergeOrReason = (options) => {
|
|
|
172
164
|
const mergedKeys = [...new Set([...sketch.targets, ...parts.map(resolve_product_1.partKeyOf)])];
|
|
173
165
|
const baseKeys = baseKeysOf({ product, sketch, keys: mergedKeys });
|
|
174
166
|
const base = product.base;
|
|
175
|
-
if (baseKeys.length > 0 && (!base || (0, base_1.isBuiltInBase)((
|
|
167
|
+
if (baseKeys.length > 0 && (!base || (0, base_1.isBuiltInBase)((_a = product.config.base) !== null && _a !== void 0 ? _a : '')))
|
|
176
168
|
return `${baseKeys.join(', ')} comes from the built-in base ${product.config.base} - only a sketch opened with --override merges it, as a product copy`;
|
|
177
169
|
const rootOf = (key) => (base && baseKeys.includes(key) ? base.dir : product.dir);
|
|
178
170
|
const removedKeys = baseKeys.filter((key) => { var _a; return ((_a = product.parts.find((part) => (0, resolve_product_1.partKeyOf)(part) === key)) === null || _a === void 0 ? void 0 : _a.origin) === 'overridden'; });
|
|
@@ -183,26 +175,13 @@ const mergeOrReason = (options) => {
|
|
|
183
175
|
return noted;
|
|
184
176
|
notedTargets.push(noted);
|
|
185
177
|
}
|
|
186
|
-
const inheritedKeys = notedTargets.flatMap((entry) => (entry.inherited ? [entry.key] : []));
|
|
187
178
|
const assetFiles = (0, assets_1.filesBelow)((0, path_1.resolve)(dir, assets_1.ASSETS_FOLDER));
|
|
188
179
|
const sharedChanges = (0, merge_shared_1.productSharedChangesOf)({ sketch, variant, product });
|
|
189
|
-
const
|
|
190
|
-
const baseProduct = base && baseKeys.length > 0 && base.configFile === product.configFile && ((_c = config.products) === null || _c === void 0 ? void 0 : _c[base.name])
|
|
180
|
+
const baseProduct = base && baseKeys.length > 0 && base.configFile === product.configFile && ((_b = config.products) === null || _b === void 0 ? void 0 : _b[base.name])
|
|
191
181
|
? (0, resolve_product_1.resolveProduct)({ target, name: base.name, config: base.config })
|
|
192
182
|
: null;
|
|
193
183
|
const known = [...(0, check_system_1.ruleLinesOf)(target, product), ...(baseProduct ? (0, check_system_1.ruleLinesOf)(target, baseProduct) : [])];
|
|
194
|
-
const
|
|
195
|
-
target,
|
|
196
|
-
productDir: product.dir,
|
|
197
|
-
ignored: [
|
|
198
|
-
(0, sketch_1.sketchesDirOf)(product.dir),
|
|
199
|
-
...uncommitted_decisions_1.ROOT_DECISION_FILES.map((file) => (0, path_1.resolve)(product.dir, file)),
|
|
200
|
-
...mergedKeys.map((key) => (0, path_1.resolve)(rootOf(key), key)),
|
|
201
|
-
],
|
|
202
|
-
});
|
|
203
|
-
if (dirty.length > 0)
|
|
204
|
-
return `${product.name} has uncommitted edits outside ${sketch.target}, so a failed check could not tell them from this merge - commit or revert them first: ${dirty.join(', ')}`;
|
|
205
|
-
const swapped = swap([
|
|
184
|
+
const entries = [
|
|
206
185
|
...notedTargets.flatMap(({ inherited, targetDir }) => inherited ? [{ from: (0, path_1.dirname)(inherited.file), to: targetDir }] : []),
|
|
207
186
|
...parts.map((part) => ({ from: (0, path_1.dirname)(part.file), to: (0, path_1.resolve)(rootOf((0, resolve_product_1.partKeyOf)(part)), part.layer, part.name) })),
|
|
208
187
|
...removedKeys.map((key) => ({ from: null, to: (0, path_1.resolve)(product.dir, key) })),
|
|
@@ -212,7 +191,11 @@ const mergeOrReason = (options) => {
|
|
|
212
191
|
to: (0, path_1.resolve)(product.dir, assets_1.ASSETS_FOLDER, (0, path_1.relative)((0, path_1.resolve)(dir, assets_1.ASSETS_FOLDER), file)),
|
|
213
192
|
})),
|
|
214
193
|
...sharedChanges,
|
|
215
|
-
]
|
|
194
|
+
];
|
|
195
|
+
const replaced = entries.map(({ to }) => to);
|
|
196
|
+
const touched = [...new Set([...replaced, ...mergedKeys.map((key) => (0, path_1.resolve)(rootOf(key), key))])];
|
|
197
|
+
const before = (0, clean_copy_1.contentsBelow)(touched);
|
|
198
|
+
replace(entries);
|
|
216
199
|
for (const { noteFile, noted } of notedTargets)
|
|
217
200
|
(0, fs_1.writeFileSync)(noteFile, noted);
|
|
218
201
|
for (const part of parts)
|
|
@@ -228,7 +211,6 @@ const mergeOrReason = (options) => {
|
|
|
228
211
|
const checked = [product.name, ...(baseProduct ? [baseProduct.name] : [])];
|
|
229
212
|
const { code, failures } = withPrintedErrors(() => (0, check_system_1.checkSystem)({ target, config, products: checked, known }));
|
|
230
213
|
if (code !== 0) {
|
|
231
|
-
swapped.restore();
|
|
232
214
|
const changed = [
|
|
233
215
|
...mergedKeys.map((key) => (0, path_1.resolve)(rootOf(key), key)),
|
|
234
216
|
...sharedChanges.map(({ to }) => to),
|
|
@@ -254,41 +236,149 @@ const mergeOrReason = (options) => {
|
|
|
254
236
|
...assetFiles.map((file) => (0, path_1.resolve)(product.dir, assets_1.ASSETS_FOLDER, (0, path_1.relative)((0, path_1.resolve)(dir, assets_1.ASSETS_FOLDER), file))),
|
|
255
237
|
];
|
|
256
238
|
formatFiles(target, [...new Set(written)]);
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
239
|
+
return {
|
|
240
|
+
mergedKeys,
|
|
241
|
+
baseKeys,
|
|
242
|
+
removedKeys,
|
|
243
|
+
mergedParts: [
|
|
244
|
+
...new Set([...notedTargets.flatMap((entry) => (entry.inherited ? [entry.key] : [])), ...parts.map(resolve_product_1.partKeyOf)]),
|
|
245
|
+
],
|
|
246
|
+
touchesShared: assetFiles.length > 0 || sharedChanges.length > 0,
|
|
247
|
+
replaced,
|
|
248
|
+
changes: changesOf(before, (0, clean_copy_1.contentsBelow)(touched)),
|
|
249
|
+
};
|
|
250
|
+
};
|
|
251
|
+
const clonedDirsOf = (options) => {
|
|
252
|
+
var _a;
|
|
253
|
+
const { product } = options;
|
|
254
|
+
const base = product.base && !(0, base_1.isBuiltInBase)((_a = product.config.base) !== null && _a !== void 0 ? _a : '') ? [product.base.dir] : [];
|
|
255
|
+
return [(0, path_1.resolve)(options.target, design_config_1.DESIGN_DIR), ...base];
|
|
256
|
+
};
|
|
257
|
+
const applyMerge = (options) => {
|
|
258
|
+
const { copy, checked } = options;
|
|
259
|
+
for (const [file, content] of checked.changes) {
|
|
260
|
+
const into = copy.inCheckout(file);
|
|
261
|
+
if (content === null) {
|
|
262
|
+
(0, fs_1.rmSync)(into, { force: true });
|
|
263
|
+
continue;
|
|
264
|
+
}
|
|
265
|
+
(0, fs_1.mkdirSync)((0, path_1.dirname)(into), { recursive: true });
|
|
266
|
+
(0, fs_1.writeFileSync)(into, content);
|
|
267
|
+
}
|
|
268
|
+
for (const path of checked.replaced) {
|
|
269
|
+
const into = copy.inCheckout(path);
|
|
270
|
+
if ((0, fs_1.existsSync)(path))
|
|
271
|
+
pruneEmptyDirs(into);
|
|
272
|
+
else
|
|
273
|
+
(0, fs_1.rmSync)(into, { recursive: true, force: true });
|
|
274
|
+
}
|
|
275
|
+
};
|
|
276
|
+
/** The checkout folder of the part an edit sketch replaces: its uncommitted edit is the sketch's own `new` variant, not a foreign edit. */
|
|
277
|
+
const editedPartDirOf = (options) => {
|
|
278
|
+
if (options.sketch.target !== `${(0, resolve_product_1.partKeyOf)(options.sketch)}@${merged_parts_1.EDIT_SKETCH}`)
|
|
279
|
+
return null;
|
|
280
|
+
const part = options.product.parts.find((candidate) => (0, resolve_product_1.partKeyOf)(candidate) === (0, resolve_product_1.partKeyOf)(options.sketch));
|
|
281
|
+
return part ? (0, path_1.dirname)(part.file) : null;
|
|
282
|
+
};
|
|
283
|
+
const isInside = (dir, path) => path === dir || path.startsWith(`${dir}/`);
|
|
284
|
+
/** Why `sketch` cannot be merged as it stands - not ready, no valid pick, or a rejected pick - or `null` when it can. */
|
|
285
|
+
const mergeRefusalOf = (options) => {
|
|
286
|
+
const { product, sketch } = options;
|
|
287
|
+
if (sketch.status !== 'ready')
|
|
288
|
+
return `${sketch.target} is ${sketch.status} - mark it ready before a merge: design sketch ready ${sketch.target} --by <model id> --product ${product.name}`;
|
|
289
|
+
const pick = pickOf(sketch);
|
|
290
|
+
if (typeof pick === 'string')
|
|
291
|
+
return pick;
|
|
292
|
+
return (0, sketch_1.rejectedProblemOf)(sketch, pick.variant);
|
|
293
|
+
};
|
|
294
|
+
exports.mergeRefusalOf = mergeRefusalOf;
|
|
295
|
+
const mergeOrReason = (options) => {
|
|
296
|
+
var _a, _b, _c, _d;
|
|
297
|
+
const { target, product, sketch, note, author } = options;
|
|
298
|
+
const refused = (0, exports.mergeRefusalOf)({ product, sketch });
|
|
299
|
+
if (refused !== null)
|
|
300
|
+
return refused;
|
|
301
|
+
const pick = pickOf(sketch);
|
|
302
|
+
if (typeof pick === 'string')
|
|
303
|
+
return pick;
|
|
304
|
+
const { variant } = pick;
|
|
305
|
+
const unlinted = (0, design_lint_1.lintGateLinesOf)({ target, productDir: product.dir, files: (0, design_lint_1.variantLintFilesOf)(sketch, [variant]) });
|
|
306
|
+
if (unlinted.length > 0)
|
|
307
|
+
return {
|
|
308
|
+
reason: `${unlinted.join('\n')}\n${sketch.target} variant ${variant} adds lint warnings - fix them before a merge`,
|
|
309
|
+
findings: unlinted,
|
|
310
|
+
};
|
|
311
|
+
const decision = { variant, decidedBy: (_a = options.decidedBy) !== null && _a !== void 0 ? _a : 'user', at: pick.at };
|
|
312
|
+
const copy = (0, clean_copy_1.cleanCopyOf)({ target, cloned: clonedDirsOf({ target, product }) });
|
|
313
|
+
try {
|
|
314
|
+
const config = (_b = (0, design_config_1.readConfig)(copy.root)) !== null && _b !== void 0 ? _b : options.config;
|
|
315
|
+
const entry = (_c = config.products) === null || _c === void 0 ? void 0 : _c[product.name];
|
|
316
|
+
if (!entry)
|
|
317
|
+
return `${product.name} is not in the committed config.json - commit it before a merge`;
|
|
318
|
+
const copied = (0, resolve_product_1.resolveProduct)({ target: copy.root, name: product.name, config: entry });
|
|
319
|
+
const copiedSketch = Object.assign(Object.assign({}, sketch), { dir: copy.inCopy(sketch.dir) });
|
|
320
|
+
(0, fs_1.rmSync)((0, sketch_1.sketchesDirOf)(copied.dir), { recursive: true, force: true });
|
|
321
|
+
(0, fs_1.cpSync)(sketch.dir, copiedSketch.dir, { recursive: true });
|
|
322
|
+
const edited = editedPartDirOf({ product, sketch });
|
|
323
|
+
if (edited) {
|
|
324
|
+
(0, fs_1.rmSync)(copy.inCopy(edited), { recursive: true, force: true });
|
|
325
|
+
(0, fs_1.cpSync)(edited, copy.inCopy(edited), { recursive: true });
|
|
326
|
+
}
|
|
327
|
+
const checked = checkedMergeOf(Object.assign(Object.assign({}, options), { target: copy.root, config, product: copied, sketch: copiedSketch, variant }));
|
|
328
|
+
if (typeof checked === 'string' || 'reason' in checked)
|
|
329
|
+
return checked;
|
|
330
|
+
const dirty = dirtyAmongOf({
|
|
331
|
+
target,
|
|
332
|
+
paths: [...checked.replaced, ...checked.changes.keys()]
|
|
333
|
+
.map((path) => copy.relativeOf(copy.inCheckout(path)))
|
|
334
|
+
.filter((path) => !edited || !isInside(copy.relativeOf(edited), path)),
|
|
335
|
+
});
|
|
336
|
+
if (dirty.length > 0)
|
|
337
|
+
return {
|
|
338
|
+
reason: `the merge of ${sketch.target} would overwrite uncommitted edits - commit or revert them first: ${dirty.join(', ')}`,
|
|
339
|
+
dirty,
|
|
340
|
+
};
|
|
341
|
+
const { mergedKeys, baseKeys, removedKeys } = checked;
|
|
342
|
+
const untouched = checked.touchesShared ? (0, merged_parts_1.unchangedMergedOf)({ product, except: mergedKeys }) : [];
|
|
343
|
+
applyMerge({ copy, checked });
|
|
344
|
+
const productKeys = mergedKeys.filter((key) => !baseKeys.includes(key));
|
|
345
|
+
if (productKeys.length > 0)
|
|
346
|
+
(0, merged_parts_1.recordMerged)({ product, parts: productKeys, decision });
|
|
347
|
+
if (product.base && baseKeys.length > 0) {
|
|
348
|
+
(0, merged_parts_1.recordMerged)({ product: { dir: product.base.dir, base: null }, parts: baseKeys, decision });
|
|
349
|
+
(0, merged_parts_1.forgetMerged)({ productDir: product.dir, parts: removedKeys });
|
|
350
|
+
}
|
|
351
|
+
const alsoChanged = (0, merged_parts_1.rerecordChangedMerged)({ product, before: untouched });
|
|
352
|
+
if (alsoChanged.length > 0)
|
|
353
|
+
console.log(`Asset or shared/ change also updates: ${alsoChanged.join(', ')}`);
|
|
354
|
+
(0, comment_1.resolveSketchEndComments)({
|
|
355
|
+
sketch,
|
|
356
|
+
parts: mergedKeys,
|
|
357
|
+
note: `resolved by the merge of ${sketch.target} variant ${variant}`,
|
|
358
|
+
});
|
|
359
|
+
(0, comment_1.addressSketchComments)({ sketch, reason: 'merge', author, note });
|
|
360
|
+
(0, sketch_1.removeSketchDir)(sketch.dir);
|
|
361
|
+
(0, sketch_1.clearSketchReport)({ checkout: target, sketch });
|
|
362
|
+
(0, after_merge_1.rebaseAfterMerge)({
|
|
363
|
+
target,
|
|
364
|
+
product: (0, resolve_product_1.resolveProduct)({ target, name: product.name, config: product.config }),
|
|
365
|
+
merged: sketch.targets,
|
|
366
|
+
before: (_d = sketch.baseline) !== null && _d !== void 0 ? _d : {},
|
|
367
|
+
}).forEach((line) => console.log(line));
|
|
368
|
+
return checked.mergedParts;
|
|
369
|
+
}
|
|
370
|
+
finally {
|
|
371
|
+
copy.drop();
|
|
264
372
|
}
|
|
265
|
-
const alsoChanged = (0, merged_parts_1.rerecordChangedMerged)({ product, before: untouched });
|
|
266
|
-
if (alsoChanged.length > 0)
|
|
267
|
-
console.log(`Asset or shared/ change also updates: ${alsoChanged.join(', ')}`);
|
|
268
|
-
(0, comment_1.resolveSketchEndComments)({
|
|
269
|
-
sketch,
|
|
270
|
-
parts: mergedKeys,
|
|
271
|
-
note: `resolved by the merge of ${sketch.target} variant ${variant}`,
|
|
272
|
-
});
|
|
273
|
-
(0, comment_1.addressSketchComments)({ sketch, reason: 'merge', author, note });
|
|
274
|
-
(0, fs_1.rmSync)(sketch.dir, { recursive: true, force: true });
|
|
275
|
-
(0, sketch_1.clearSketchReport)({ checkout: target, sketch });
|
|
276
|
-
const mergedParts = [...new Set([...inheritedKeys, ...parts.map(resolve_product_1.partKeyOf)])];
|
|
277
|
-
(0, after_merge_1.rebaseAfterMerge)({
|
|
278
|
-
target,
|
|
279
|
-
product: (0, resolve_product_1.resolveProduct)({ target, name: product.name, config: product.config }),
|
|
280
|
-
merged: sketch.targets,
|
|
281
|
-
before: sketch.baseline,
|
|
282
|
-
}).forEach((line) => console.log(line));
|
|
283
|
-
return mergedParts;
|
|
284
373
|
};
|
|
285
374
|
/**
|
|
286
375
|
* Merges the variant the user picked in a ready sketch into the product: copies each part it holds
|
|
287
376
|
* over the product's - a part the product takes from its base over the base's, unless the sketch was opened with
|
|
288
377
|
* `override`; `into-base` also removes the product copy and its `merged.json` entry - keeps the target's note (replaces it with `note`
|
|
289
378
|
* only with `replaceNote`; an empty one takes the variant note) and sets `madeBy` (the file's own plus the variant's authors) on the target, runs the check
|
|
290
|
-
* records each merged part's hash in `merged.json`, with the pick (variant, `decidedBy` - default `user` - and when), and deletes the sketch. With `override`, a target the product only takes from its base is copied into the product first.
|
|
291
|
-
*
|
|
379
|
+
* records each merged part's hash in `merged.json`, with the pick (variant, `decidedBy` - default `user` - and when), and deletes the sketch. With `override`, a target the product only takes from its base is copied into the product first. All of this
|
|
380
|
+
* runs in a clean copy of HEAD plus the sketch; only the result reaches the checkout, and a result that would overwrite
|
|
381
|
+
* a file with uncommitted edits refuses with that file in `dirty`. When the check fails, the checkout and the sketch stay as they were. Each file in the variant's `assets/` goes into the product's `assets/`. A file of the sketch's `shared/` folder whose path the product's `shared/` holds
|
|
292
382
|
* replaces it there; the rest goes into the target's folder when the target imports it, with its `@shared/` imports made relative; any other part that imports it stops the merge. Otherwise the addressed comments on its variants, and those on the merged parts that have no sketch, are resolved, and the open ones on its variants are addressed, by `author` or the user. Refuses without a
|
|
293
383
|
* pick, and when a part the variant replaces changed in the product since the sketch's baseline. Answers with the merged part keys, or with why nothing was merged - and, when a rebase
|
|
294
384
|
* would let it, the parts that changed (`[]` without a baseline).
|
|
@@ -305,7 +395,7 @@ const discardSketch = (options) => {
|
|
|
305
395
|
note: `resolved by the discard of ${options.sketch.target}`,
|
|
306
396
|
});
|
|
307
397
|
(0, comment_1.addressSketchComments)({ sketch: options.sketch, reason: 'discard', author: options.author });
|
|
308
|
-
(0,
|
|
398
|
+
(0, sketch_1.removeSketchDir)(options.sketch.dir);
|
|
309
399
|
(0, sketch_1.clearSketchReport)({ checkout: options.target, sketch: options.sketch });
|
|
310
400
|
return null;
|
|
311
401
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/lib/design/system/sketch/merge.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../../../../../libs/cli/src/lib/design/system/sketch/merge.ts"],"names":[],"mappings":"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"}
|
|
@@ -64,16 +64,6 @@ export declare const directEditsOf: (product: ResolvedProduct) => {
|
|
|
64
64
|
part: string;
|
|
65
65
|
sketch: string | null;
|
|
66
66
|
}[];
|
|
67
|
-
export declare const ACCEPTED_FILE = "accepted.json";
|
|
68
|
-
export type Acceptance = {
|
|
69
|
-
part: string;
|
|
70
|
-
by: string;
|
|
71
|
-
note: string;
|
|
72
|
-
hash: string;
|
|
73
|
-
at: string;
|
|
74
|
-
auto?: true;
|
|
75
|
-
};
|
|
76
|
-
export declare const readAccepted: (productDir: string) => Acceptance[];
|
|
77
67
|
/**
|
|
78
68
|
* Notes why a sketch merge went the way it did in the part's `merged.json` entry: the plan entry that let it go without
|
|
79
69
|
* a pick in Studio (`planRef`), the merge reason (`reason`), or both.
|
|
@@ -84,23 +74,4 @@ export declare const recordMergeReason: (options: {
|
|
|
84
74
|
planRef?: string;
|
|
85
75
|
reason?: string;
|
|
86
76
|
}) => void;
|
|
87
|
-
export type AcceptRefusal = {
|
|
88
|
-
reason: 'unknown-part' | 'open-sketch' | 'nothing-to-accept';
|
|
89
|
-
error: string;
|
|
90
|
-
};
|
|
91
|
-
/** Why a direct edit of a part cannot be accepted, or `null` when it can. */
|
|
92
|
-
export declare const acceptRefusalOf: (options: {
|
|
93
|
-
product: ResolvedProduct;
|
|
94
|
-
part: string;
|
|
95
|
-
}) => AcceptRefusal | null;
|
|
96
|
-
/**
|
|
97
|
-
* Records a direct edit of a merged part the user approved: writes the part's current hash to `merged.json` and
|
|
98
|
-
* logs who accepted it and why in `accepted.json`. Answers with why nothing was accepted, or `null`.
|
|
99
|
-
*/
|
|
100
|
-
export declare const acceptPart: (options: {
|
|
101
|
-
product: ResolvedProduct;
|
|
102
|
-
part: string;
|
|
103
|
-
by: string;
|
|
104
|
-
note: string;
|
|
105
|
-
}) => string | null;
|
|
106
77
|
export {};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.recordMergeReason = exports.directEditsOf = exports.EDIT_SKETCH = exports.changedOutsideSketchOf = exports.sketchedPartsOf = exports.rerecordChangedMerged = exports.unchangedMergedOf = exports.holderOf = exports.forgetMerged = exports.recordMerged = exports.readMergeNote = exports.readMergeDecision = exports.readMerged = exports.MERGED_FILE = void 0;
|
|
4
4
|
const fs_1 = require("fs");
|
|
5
5
|
const json_file_1 = require("../../../json-file");
|
|
6
6
|
const path_1 = require("path");
|
|
@@ -103,8 +103,10 @@ const unchangedMergedOf = (options) => {
|
|
|
103
103
|
const merged = (0, exports.readMerged)(product.dir);
|
|
104
104
|
return product.parts.flatMap((part) => {
|
|
105
105
|
const key = (0, resolve_product_1.partKeyOf)(part);
|
|
106
|
-
const
|
|
107
|
-
return part.origin !== 'base' && !except.includes(key) &&
|
|
106
|
+
const dir = (0, path_1.dirname)(part.file);
|
|
107
|
+
return part.origin !== 'base' && !except.includes(key) && (0, baseline_1.partHashHolds)({ product, dir, hash: merged[key] })
|
|
108
|
+
? [{ key, hash: (0, baseline_1.partHashOf)({ product, dir }) }]
|
|
109
|
+
: [];
|
|
108
110
|
});
|
|
109
111
|
};
|
|
110
112
|
exports.unchangedMergedOf = unchangedMergedOf;
|
|
@@ -132,12 +134,9 @@ exports.sketchedPartsOf = sketchedPartsOf;
|
|
|
132
134
|
*/
|
|
133
135
|
const changedOutsideSketchOf = (product) => {
|
|
134
136
|
const merged = (0, exports.readMerged)(product.dir);
|
|
135
|
-
const
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
merged[key] !== undefined &&
|
|
139
|
-
(0, baseline_1.partHashOf)({ product, dir: (0, path_1.dirname)(part.file) }) !== merged[key]);
|
|
140
|
-
});
|
|
137
|
+
const recorded = product.parts.filter((part) => part.origin !== 'base' && merged[(0, resolve_product_1.partKeyOf)(part)] !== undefined);
|
|
138
|
+
const holds = (0, baseline_1.partHashesHold)(product, recorded.map((part) => ({ dir: (0, path_1.dirname)(part.file), hash: merged[(0, resolve_product_1.partKeyOf)(part)] })));
|
|
139
|
+
const changed = recorded.filter((_, index) => !holds[index]);
|
|
141
140
|
if (changed.length === 0)
|
|
142
141
|
return [];
|
|
143
142
|
const sketched = (0, exports.sketchedPartsOf)(product);
|
|
@@ -158,21 +157,6 @@ const directEditsOf = (product) => {
|
|
|
158
157
|
return [...open, ...(0, exports.changedOutsideSketchOf)(product).map((part) => ({ part, sketch: null }))];
|
|
159
158
|
};
|
|
160
159
|
exports.directEditsOf = directEditsOf;
|
|
161
|
-
exports.ACCEPTED_FILE = 'accepted.json';
|
|
162
|
-
const readAccepted = (productDir) => {
|
|
163
|
-
const file = (0, path_1.resolve)(productDir, exports.ACCEPTED_FILE);
|
|
164
|
-
if (!(0, fs_1.existsSync)(file))
|
|
165
|
-
return [];
|
|
166
|
-
try {
|
|
167
|
-
const parsed = JSON.parse((0, fs_1.readFileSync)(file, 'utf8'));
|
|
168
|
-
return Array.isArray(parsed) ? parsed : [];
|
|
169
|
-
}
|
|
170
|
-
catch (_a) {
|
|
171
|
-
return [];
|
|
172
|
-
}
|
|
173
|
-
};
|
|
174
|
-
exports.readAccepted = readAccepted;
|
|
175
|
-
const logAcceptance = (productDir, entry) => (0, json_file_1.writeJsonFile)({ file: (0, path_1.resolve)(productDir, exports.ACCEPTED_FILE), value: [...(0, exports.readAccepted)(productDir), entry] });
|
|
176
160
|
/**
|
|
177
161
|
* Notes why a sketch merge went the way it did in the part's `merged.json` entry: the plan entry that let it go without
|
|
178
162
|
* a pick in Studio (`planRef`), the merge reason (`reason`), or both.
|
|
@@ -195,36 +179,4 @@ const recordMergeReason = (options) => {
|
|
|
195
179
|
writeEntries(product.dir, entries);
|
|
196
180
|
};
|
|
197
181
|
exports.recordMergeReason = recordMergeReason;
|
|
198
|
-
/** Why a direct edit of a part cannot be accepted, or `null` when it can. */
|
|
199
|
-
const acceptRefusalOf = (options) => {
|
|
200
|
-
const { product, part } = options;
|
|
201
|
-
if (!product.parts.some((candidate) => (0, resolve_product_1.partKeyOf)(candidate) === part))
|
|
202
|
-
return { reason: 'unknown-part', error: `NO PART "${part}" in ${product.name}` };
|
|
203
|
-
if ((0, exports.sketchedPartsOf)(product).has(part))
|
|
204
|
-
return {
|
|
205
|
-
reason: 'open-sketch',
|
|
206
|
-
error: `${part} has an open sketch - merge or discard it; a merge records the part`,
|
|
207
|
-
};
|
|
208
|
-
if (!(0, exports.changedOutsideSketchOf)(product).includes(part))
|
|
209
|
-
return { reason: 'nothing-to-accept', error: `${part} has no change outside a sketch - nothing to accept` };
|
|
210
|
-
return null;
|
|
211
|
-
};
|
|
212
|
-
exports.acceptRefusalOf = acceptRefusalOf;
|
|
213
|
-
/**
|
|
214
|
-
* Records a direct edit of a merged part the user approved: writes the part's current hash to `merged.json` and
|
|
215
|
-
* logs who accepted it and why in `accepted.json`. Answers with why nothing was accepted, or `null`.
|
|
216
|
-
*/
|
|
217
|
-
const acceptPart = (options) => {
|
|
218
|
-
var _a;
|
|
219
|
-
const { product, part, by, note } = options;
|
|
220
|
-
const refusal = (0, exports.acceptRefusalOf)({ product, part });
|
|
221
|
-
if (refusal)
|
|
222
|
-
return refusal.error;
|
|
223
|
-
(0, exports.recordMerged)({ product, parts: [part] });
|
|
224
|
-
const hash = (_a = (0, exports.readMerged)(product.dir)[part]) !== null && _a !== void 0 ? _a : '';
|
|
225
|
-
const entry = { part, by, note, hash, at: new Date().toISOString() };
|
|
226
|
-
logAcceptance(product.dir, entry);
|
|
227
|
-
return null;
|
|
228
|
-
};
|
|
229
|
-
exports.acceptPart = acceptPart;
|
|
230
182
|
//# sourceMappingURL=merged-parts.js.map
|