92a1d5804f
Pull-Requests (Diff-Modell add/modify/remove, GitHub-style 3-way
merge in der DB-Transaktion):
- POST /decks/:slug/pull-requests (auth) — neuer PR mit
diff.{add,modify,remove}; previousContentHash für modify identifiziert
die zu ersetzende Karte by content-hash, type bleibt aus dem alten
Eintrag (modify ist field-only Replace)
- GET /decks/:slug/pull-requests (optional-auth) — Liste mit Status-
Filter (open/merged/closed/rejected)
- GET /pull-requests/:id (optional-auth) — Detail
- POST /pull-requests/:id/close (auth) — Author oder Deck-Owner
- POST /pull-requests/:id/reject (auth) — nur Deck-Owner; getrennt
von close, damit der PR-Author klares Feedback hat
- POST /pull-requests/:id/merge (auth) — nur Deck-Owner; baut neue
card-list aus latest version + diff (removes weglassen, modifies
fields-replace, adds anhängen mit re-counted ord), schreibt
publicDeckVersions + publicDeckCards atomar in einer Drizzle-
Transaction, bumpt latestVersionId und setzt PR auf merged.
Default-Semver-Bump: minor (1.0.0 → 1.1.0). Authorenüberschreibbar
via mergeNote/newSemver-Body-Felder.
Card-Discussions (Threads pro card_content_hash, überleben
Versions-Bumps solange Karten-Inhalt bleibt):
- POST /decks/:slug/cards/:hash/discussions (auth) — neuer Thread
oder Reply (parent_id muss in derselben card_content_hash-Gruppe
leben → 422 sonst)
- GET /cards/:hash/discussions (optional-auth) — Liste sichtbarer
Comments, hidden gefiltert
- GET /decks/:slug/discussions/counts (optional-auth) — Bulk-Count
pro card_content_hash für Deck-Übersicht (kein N+1)
- POST /discussions/:id/hide (auth) — Soft-Hide (Author oder Deck-
Owner); kein Delete, Audit-Trail bleibt
Helpers:
- lib/marketplace/semver.ts — bumpMinor, isSemver, semverGreater
(klein, ohne Range-Logik). Wird von PRs + später vom decks.ts
publish-Flow konsumiert.
Bug-Fix:
- routes/marketplace/fork.ts hatte r.use('*', authMiddleware) am
Anfang. An dem /api/v1/marketplace-Mount-Punkt fängt das Wildcard
alle nachfolgenden Router-Mounts (PRs, Discussions) → anonymer
GET /pull-requests wurde mit 401 abgelehnt. Refactor auf per-
route authMiddleware (Pattern wie in subscriptions.ts und
engagement.ts seit R3). Lessons learned dokumentiert in der
STATUS.md-Zeile.
Verifikation:
- type-check 0 errors
- 11 neue Semver-Tests, 89 gesamt grün
- E2E-Smoke gegen lokale cards-api durch:
· Cardecky publisht v1.0.0 (Apatheia, Eudaimonia, Logos)
· Till's PR: modify Eudaimonia-Back, remove Logos, add Tugendlehre
· Till's Merge-Versuch → 403 (deck_owner_only)
· Cardecky merged → v1.1.0 atomar, card_count=3, ord-Reihenfolge:
[Apatheia, Eudaimonia-mit-neuem-Back, Tugendlehre]
· Re-Merge → 409 (pr_already_merged)
· Till's Discussion-Thread + Cardecky-Reply mit parent_id
· Cross-Card-parent abgelehnt → 422
· Hide → Comment verschwindet aus Liste, total von 2 auf 1
· Bulk-Counts liefert {hash → 2}
· Smart-Merge-Pull v1.0.0→v1.1.0 wertet PR-Merge korrekt aus
(changed=2 via Eudaimonia + Logos↔Tugendlehre ord-Heuristik)
Verbleibend: R5 Frontend-Routes (/explore, /d/[slug], /u/[slug],
/me/{published,subscribed,forks}), R6 voller UI-E2E.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
48 lines
1.3 KiB
TypeScript
48 lines
1.3 KiB
TypeScript
import { describe, expect, it } from 'vitest';
|
|
|
|
import { bumpMinor, isSemver, semverGreater } from '../src/lib/marketplace/semver.ts';
|
|
|
|
describe('isSemver', () => {
|
|
it('accepts strict X.Y.Z', () => {
|
|
expect(isSemver('1.0.0')).toBe(true);
|
|
expect(isSemver('0.0.1')).toBe(true);
|
|
expect(isSemver('123.456.789')).toBe(true);
|
|
});
|
|
it('rejects pre-releases', () => {
|
|
expect(isSemver('1.0.0-rc1')).toBe(false);
|
|
});
|
|
it('rejects 2-segment', () => {
|
|
expect(isSemver('1.0')).toBe(false);
|
|
});
|
|
});
|
|
|
|
describe('bumpMinor', () => {
|
|
it('1.2.3 → 1.3.0', () => {
|
|
expect(bumpMinor('1.2.3')).toBe('1.3.0');
|
|
});
|
|
it('0.9.99 → 0.10.0', () => {
|
|
expect(bumpMinor('0.9.99')).toBe('0.10.0');
|
|
});
|
|
it('invalid → 1.0.0', () => {
|
|
expect(bumpMinor('garbage')).toBe('1.0.0');
|
|
});
|
|
});
|
|
|
|
describe('semverGreater', () => {
|
|
it('major', () => {
|
|
expect(semverGreater('2.0.0', '1.99.99')).toBe(true);
|
|
});
|
|
it('minor', () => {
|
|
expect(semverGreater('1.2.0', '1.1.99')).toBe(true);
|
|
});
|
|
it('patch', () => {
|
|
expect(semverGreater('1.0.1', '1.0.0')).toBe(true);
|
|
});
|
|
it('equal is not greater', () => {
|
|
expect(semverGreater('1.0.0', '1.0.0')).toBe(false);
|
|
});
|
|
it('invalid input → false', () => {
|
|
expect(semverGreater('garbage', '1.0.0')).toBe(false);
|
|
expect(semverGreater('1.0.0', 'garbage')).toBe(false);
|
|
});
|
|
});
|