Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/web/src/content.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const statutes = defineCollection({
current_through: z.string(),
classification: z.string(),
generated_at: z.string().optional(),
status: z.enum(['active', 'repealed', 'reserved', 'omitted', 'transferred', 'renumbered']).default('active'),
}),
});

Expand Down
11 changes: 6 additions & 5 deletions apps/web/src/pages/browse/[title]/[chapter].astro
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,12 @@ const base = import.meta.env.BASE_URL;
<ul class="divide-y divide-gray-200 rounded-lg border border-gray-200 dark:divide-gray-800 dark:border-gray-800">
{sortedSections.map((entry) => {
const sTitle = entry.data.title;
const isRepealed = sTitle.includes('Repealed');
const isReserved = sTitle.includes('Reserved');
const isOmitted = sTitle.includes('Omitted');
const isTransferred = sTitle.includes('Transferred') && !sTitle.includes('Transferred or reemployed');
const isRenumbered = sTitle.includes('Renumbered');
const status = entry.data.status ?? 'active';
const isRepealed = status === 'repealed' || sTitle.includes('Repealed');
const isReserved = status === 'reserved' || sTitle.includes('Reserved');
const isOmitted = status === 'omitted' || sTitle.includes('Omitted');
const isTransferred = status === 'transferred' || (sTitle.includes('Transferred') && !sTitle.includes('Transferred or reemployed'));
const isRenumbered = status === 'renumbered' || sTitle.includes('Renumbered');
const isInactive = isRepealed || isReserved || isOmitted || isTransferred || isRenumbered;
return (
<li>
Expand Down
13 changes: 7 additions & 6 deletions apps/web/src/pages/statute/[...slug].astro
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,13 @@ const formattedDate = generated_at
? new Date(generated_at).toLocaleDateString('en-US', { year: 'numeric', month: 'long', day: 'numeric' })
: undefined;

// Repealed / Reserved / Omitted / Transferred / Renumbered detection
const isRepealed = entry.data.title.includes('Repealed');
const isReserved = entry.data.title.includes('Reserved');
const isOmitted = entry.data.title.includes('Omitted');
const isTransferred = entry.data.title.includes('Transferred') && !entry.data.title.includes('Transferred or reemployed');
const isRenumbered = entry.data.title.includes('Renumbered');
// Section status — use frontmatter field with title-based fallback for pre-status data
const status = entry.data.status ?? 'active';
const isRepealed = status === 'repealed' || entry.data.title.includes('Repealed');
const isReserved = status === 'reserved' || entry.data.title.includes('Reserved');
const isOmitted = status === 'omitted' || entry.data.title.includes('Omitted');
const isTransferred = status === 'transferred' || (entry.data.title.includes('Transferred') && !entry.data.title.includes('Transferred or reemployed'));
const isRenumbered = status === 'renumbered' || entry.data.title.includes('Renumbered');
---

<BaseLayout
Expand Down
4 changes: 3 additions & 1 deletion packages/transformer/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ export {
nestingDepthFor,
reformatInlineLists,
FrontmatterSchema,
SectionStatusSchema,
detectSectionStatus,
} from './markdown-generator.js';
export type { Frontmatter, MarkdownFile } from './markdown-generator.js';
export type { Frontmatter, MarkdownFile, SectionStatus } from './markdown-generator.js';
export { USLM_ELEMENTS, USLM_NAMESPACE, INDENT_PER_LEVEL, MAX_NESTING_DEPTH } from './constants.js';
export { createLogger } from '@civic-source/shared';
export { extractTextFromNodes, findElements, getAttributes, getElementName } from './xml-utils.js';
23 changes: 22 additions & 1 deletion packages/transformer/src/markdown-generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@ import { z } from 'zod';
import { USLM_ELEMENTS, INDENT_PER_LEVEL, MAX_NESTING_DEPTH } from './constants.js';
import { extractTextFromNodes, findElements } from './xml-utils.js';

/** Section status — derived from heading text during transformation */
export const SectionStatusSchema = z.enum([
'active', 'repealed', 'reserved', 'omitted', 'transferred', 'renumbered',
]);

export type SectionStatus = z.infer<typeof SectionStatusSchema>;

/** Zod schema for YAML frontmatter validation */
export const FrontmatterSchema = z.object({
title: z.string().min(1),
Expand All @@ -11,10 +18,21 @@ export const FrontmatterSchema = z.object({
current_through: z.string().default('Unknown'),
classification: z.string().min(1),
generated_at: z.string().min(1),
status: SectionStatusSchema.default('active'),
});

export type Frontmatter = z.infer<typeof FrontmatterSchema>;

/** Detect section status from heading text */
export function detectSectionStatus(heading: string): SectionStatus {
if (heading.includes('Repealed')) return 'repealed';
if (heading.includes('Reserved')) return 'reserved';
if (heading.includes('Omitted')) return 'omitted';
if (heading.includes('Renumbered')) return 'renumbered';
if (heading.includes('Transferred') && !heading.includes('Transferred or reemployed')) return 'transferred';
return 'active';
}

/** A generated markdown file with its path and content */
export interface MarkdownFile {
/** Relative path: statutes/title-{n}/chapter-{n}/section-{n}.md */
Expand Down Expand Up @@ -139,6 +157,7 @@ export function generateFrontmatter(data: Frontmatter): string {
`current_through: "${data.current_through}"`,
`classification: "${data.classification}"`,
`generated_at: "${data.generated_at}"`,
`status: "${data.status}"`,
'---',
'',
];
Expand Down Expand Up @@ -282,14 +301,16 @@ export function generateMarkdownForSection(
const uscTitle = parseInt(titleNum, 10) || 0;
const chapterInt = parseInt(chapterNum, 10) || 0;

const sectionTitle = `Section ${sectionNum}${heading ? ' - ' + heading : ''}`;
const frontmatter = FrontmatterSchema.parse({
title: `Section ${sectionNum}${heading ? ' - ' + heading : ''}`,
title: sectionTitle,
usc_title: Math.max(uscTitle, 1),
usc_section: sectionNum,
chapter: chapterInt,
current_through: currentThrough || 'Unknown',
classification: `${titleNum} U.S.C. \u00A7 ${sectionNum}`,
generated_at: now,
status: detectSectionStatus(sectionTitle),
});

let body = generateSectionBody(sectionChildren);
Expand Down
Loading