Supporting .md extensions in routes

packages/core/src/Id.ts

@@ -6,12 +6,13 @@ export type Tagged =
   | PropertyId
   | TheoremId
   | { kind: 'trait'; space: number; property: number }
+  | { kind: 'unknown'; id: number }
 
 export type SpaceId = { kind: 'space'; id: number }
 export type PropertyId = { kind: 'property'; id: number }
 export type TheoremId = { kind: 'theorem'; id: number }
 
-const pattern = /^(?<prefix>[spti])0*(?<id>\d+)/i
+const pattern = /^(?<prefix>[spti])?0*(?<id>\d+)/i
 
 export function traitId({ space, property }: TraitId): string {
   return `${space}|${property}`
@@ -33,6 +34,9 @@ export function tag(input: string): Tagged | null {
   }
 
   const id = parseInt(match.groups.id)
+  if (!match.groups.prefix) {
+    return { kind: 'unknown', id }
+  }
   switch (match.groups.prefix.toUpperCase()) {
     case 'S':
       return { kind: 'space', id }

packages/core/test/Id.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from 'vitest'
-import { format, toInt, trim } from '../src/Id'
+import { format, toInt, trim, tag } from '../src/Id'
 
 describe('format', () => {
   it('pads the given character', () => {
@@ -16,25 +16,59 @@ describe('toInt', () => {
     expect(toInt('T000100')).toEqual(100)
   })
 
-  it('does not require a leading prefix', () => {
+  it('does not require leading zeros', () => {
     expect(toInt('P12')).toEqual(12)
   })
 
-  it('does not match unknown types', () => {
+  it('does not match nonexistent kinds', () => {
     expect(toInt('Z000100')).toEqual(0)
   })
+
+  it('matches unknown kind', () => {
+    expect(toInt('000123')).toEqual(123)
+  })
 })
 
 describe('trim', () => {
   it('trims down to the numeric content', () => {
     expect(trim('T000100')).toEqual('100')
   })
 
-  it('does not require a leading prefix', () => {
+  it('does not require leading zeros', () => {
     expect(trim('P12')).toEqual('12')
   })
 
-  it('does not match unknown types', () => {
+  it('returns self for nonexistent kinds', () => {
     expect(trim('Z000100')).toEqual('Z000100')
   })
+
+  it('matches unknown kind', () => {
+    expect(trim('000123')).toEqual('123')
+  })
+})
+
+describe('tag', () => {
+  it('tags spaces', () => {
+    expect(tag('S000100')?.kind).toEqual('space')
+  })
+
+  it('tags properties', () => {
+    expect(tag('P000100')?.kind).toEqual('property')
+  })
+
+  it('tags theorems', () => {
+    expect(tag('T000100')?.kind).toEqual('theorem')
+  })
+
+  it('tags unknowns', () => {
+    expect(tag('000100')?.kind).toEqual('unknown')
+  })
+
+  it('is null for nonexistent kinds', () => {
+    expect(tag('X000100')).toEqual(null)
+  })
+
+  it('allows lowercase', () => {
+    expect(tag('s000100')?.kind).toEqual('space')
+  })
 })

packages/core/vite.config.ts

@@ -17,10 +17,10 @@ export default defineConfig({
   },
   test: {
     coverage: {
-      lines: 91.04,
-      branches: 93.68,
-      statements: 91.04,
-      functions: 83.55,
+      lines: 91.19,
+      branches: 94.07,
+      statements: 91.19,
+      functions: 84.21,
       skipFull: true,
       thresholdAutoUpdate: true,
       exclude: ['src/Formula/Grammar.ts', 'test'],

packages/viewer/src/params/id.ts

@@ -0,0 +1,5 @@
+import type { ParamMatcher } from '@sveltejs/kit'
+
+export const match: ParamMatcher = param => {
+  return /^\w?(\d+)(.md)?$/.test(param)
+}