fix(data): restore RELATION_TYPE_PATTERNS, only remove issue ref from comment

erikhofer · claude · erikhofer · commit 2d372f35b085 · 2026-04-23T19:41:10.000+02:00
Co-Authored-By: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/packages/scope42-data/src/model/relation-patterns.test.ts b/packages/scope42-data/src/model/relation-patterns.test.ts
@@ -0,0 +1,63 @@
+import { RELATION_TYPE_PATTERNS } from './relation-patterns'
+
+const md = RELATION_TYPE_PATTERNS['markdown-link']
+const adoc = RELATION_TYPE_PATTERNS['asciidoc-link']
+const obs = RELATION_TYPE_PATTERNS['obsidian-link']
+
+describe('markdown-link pattern', () => {
+  test.each([
+    ['[x](foo.md)', 'foo.md'],
+    ['[](foo.md)', 'foo.md'],
+    ['[x](../a/b.md)', '../a/b.md'],
+    ['[A title](001 Foo.md)', '001 Foo.md']
+  ])('%s captures %s', (input, target) => {
+    const m = input.match(md)
+    expect(m).not.toBeNull()
+    expect(m![1]).toBe(target)
+  })
+
+  test.each(['[x]', '[x](foo)tail', 'head[x](foo)', 'plain text', '(foo.md)'])(
+    'rejects %s',
+    input => {
+      expect(md.test(input)).toBe(false)
+    }
+  )
+})
+
+describe('asciidoc-link pattern', () => {
+  test.each([
+    ['<<foo>>', 'foo'],
+    ['<<foo,Text>>', 'foo'],
+    ['<<foo bar>>', 'foo bar']
+  ])('%s captures %s', (input, target) => {
+    const m = input.match(adoc)
+    expect(m).not.toBeNull()
+    expect(m![1]).toBe(target)
+  })
+
+  test.each(['<<foo>>tail', '<< >>', '<<foo', 'head<<foo>>'])(
+    'rejects %s',
+    input => {
+      expect(adoc.test(input)).toBe(false)
+    }
+  )
+})
+
+describe('obsidian-link pattern', () => {
+  test.each([
+    ['[[issue-1]]', 'issue-1'],
+    ['[[issue-1|Alias]]', 'issue-1'],
+    ['[[a/b/c]]', 'a/b/c']
+  ])('%s captures %s', (input, target) => {
+    const m = input.match(obs)
+    expect(m).not.toBeNull()
+    expect(m![1]).toBe(target)
+  })
+
+  test.each(['[[]]', '[[a|b|c]]', '[[a]]tail', '[a]', 'foo'])(
+    'rejects %s',
+    input => {
+      expect(obs.test(input)).toBe(false)
+    }
+  )
+})
diff --git a/packages/scope42-data/src/model/relation-patterns.ts b/packages/scope42-data/src/model/relation-patterns.ts
@@ -1,6 +1,18 @@
+/**
+ * Built-in anchored regex patterns, one per supported relation-link syntax.
+ * A relation value must match the pattern in full; capture group 1 contains
+ * the relation target. These are consumed by the linter; this library does
+ * not apply them.
+ */
 export const RELATION_TYPES = [
   'markdown-link',
   'asciidoc-link',
   'obsidian-link'
 ] as const
 export type RelationType = (typeof RELATION_TYPES)[number]
+
+export const RELATION_TYPE_PATTERNS: Record<RelationType, RegExp> = {
+  'markdown-link': /^\[[^\]]*\]\(([^)]+)\)$/,
+  'asciidoc-link': /^<<(\S[^,>]*)(?:,[^>]*)?>>$/,
+  'obsidian-link': /^\[\[([^|\]]+)(?:\|[^|\]]+)?\]\]$/
+}
diff --git a/packages/scope42-data/src/model/workspace-config.test.ts b/packages/scope42-data/src/model/workspace-config.test.ts
@@ -13,8 +13,7 @@ describe('WorkspaceConfigSchema', () => {
     expect(parsed.exclude).toEqual([])
     expect(parsed.validation).toEqual({
       fileNamePattern: undefined,
-      relationPattern: undefined,
-      relationType: undefined
+      relationPattern: undefined
     })
   })
 
@@ -77,12 +76,13 @@ describe('WorkspaceConfigSchema', () => {
     expect(parsed.validation.relationPattern!.test('x')).toBe(true)
   })
 
-  test('relationType is preserved as-is', () => {
+  test('relationType produces the matching built-in pattern', () => {
     const parsed = WorkspaceConfigSchema.parse({
       ...minimal,
       validation: { relationType: 'markdown-link' }
     })
-    expect(parsed.validation.relationType).toBe('markdown-link')
+    expect(parsed.validation.relationPattern).toBeInstanceOf(RegExp)
+    expect(parsed.validation.relationPattern!.test('[x](foo.md)')).toBe(true)
   })
 
   test('rejects relationPattern and relationType together', () => {
diff --git a/packages/scope42-data/src/model/workspace-config.ts b/packages/scope42-data/src/model/workspace-config.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-redeclare */
 import { z } from 'zod'
-import { RELATION_TYPES } from './relation-patterns'
+import { RELATION_TYPES, RELATION_TYPE_PATTERNS } from './relation-patterns'
 
 // Parses a regex string and exposes a compiled RegExp. Invalid syntax is
 // reported as a Zod issue at parse time.
@@ -51,7 +51,15 @@ const ValidationConfig = ValidationConfigBase.refine(
     message: 'relationPattern and relationType are mutually exclusive',
     path: ['relationType']
   }
-)
+).transform((v: ValidationConfigInput) => ({
+  fileNamePattern: v.fileNamePattern,
+  // After transform, only relationPattern is exposed as a compiled RegExp.
+  // The user's original intent (pattern or type) is collapsed into a single
+  // effective RegExp.
+  relationPattern:
+    v.relationPattern ??
+    (v.relationType ? RELATION_TYPE_PATTERNS[v.relationType] : undefined)
+}))
 
 export const WorkspaceConfigSchema = z
   .object({
