refactor(types): consolidate canonical-URL version stripping

205 -> 189 under noUncheckedIndexedAccess.

stripVersionFromCanonicalUrl already existed in core/utils, but 18 sites across
the parsers and all three emitters hand-rolled it as `url.split('|')[0]`, which
the flag reads as string | undefined. They now call the helper.

Same shape as the stripSliceSuffix pass: the flag was pointing at copy-paste,
so the fix is deletion rather than a guard per site.

Verified against a develop baseline: us-core and sdoh generate byte-identical
output apart from generation-timing.json. 769 tests green.

Author: quotentiroler

src/generator/core/constants.ts

@@ -7,6 +7,7 @@
  */
 
 import { createRequire } from 'module';
+import { stripVersionFromCanonicalUrl } from './utils.js';
 import { fileURLToPath } from 'url';
 import path from 'path';
 
@@ -292,7 +293,7 @@ export const VALUESET_DEFAULTS: Record<string, ValueSetDefault> = {
  */
 export function resolveValueSetDefault(bindingUri: string): ValueSetDefault | undefined {
   // Strip version suffix: "http://...ValueSet/foo|4.0.1" → "http://...ValueSet/foo"
-  const bare = bindingUri.split('|')[0];
+  const bare = stripVersionFromCanonicalUrl(bindingUri);
   return VALUESET_DEFAULTS[bare];
 }
 

src/generator/emitters/class/classGenerator.ts

@@ -1,4 +1,5 @@
 import { ctx } from '../../fhir/versionContext.js';
+import { stripVersionFromCanonicalUrl } from '../../core/utils.js';
 import {
   TS,
 } from '../../core/constants.js';
@@ -392,7 +393,7 @@ export function generateClass(className: string, interfaceName: string, baseReso
           // code from a different context and should be deferred to runtime resolution.
           const sliceHasOwnBinding = !!(slice.binding?.uri && slice.binding.uri.length > 0);
           const sliceBindingMatchesParent = !rf.bindingUri ||
-            (sliceHasOwnBinding && slice.binding!.uri.split('|')[0] === rf.bindingUri.split('|')[0]);
+            (sliceHasOwnBinding && stripVersionFromCanonicalUrl(slice.binding!.uri) === stripVersionFromCanonicalUrl(rf.bindingUri));
           if (sliceBindingMatchesParent && slice.binding?.sampleCode) {
             if (slice.binding.sampleCode.system) {
               system = slice.binding.sampleCode.system;

src/generator/emitters/interface/processFlatField.ts

@@ -471,7 +471,7 @@ export function handleFlatField(args: FieldHandlerArgs): boolean {
 
     // Apply ValueSet binding constraints for primitive code fields (generates union literal type)
     if (isPrimitiveCodeField && hasNarrowingBinding && field.binding?.codes) {
-        const vsUri = field.binding.uri?.split('|')[0];
+        const vsUri = field.binding.uri ? stripVersionFromCanonicalUrl(field.binding.uri) : undefined;
         const vs = vsUri && valueSets ? (valueSets.get(vsUri) || valueSets.get(field.binding.uri!)) : undefined;
         if (vs && vs.isSmall && vs.concepts.length > 0) {
             // Import the ValueSet Code type from the generated valuesets directory

src/generator/emitters/validator/validatorBindingBuilder.ts

@@ -1,5 +1,6 @@
 import type { Field } from '../../core/sdTypes.js';
 import type { ValueSetBindingInfo } from './validatorTypes.js';
+import { stripVersionFromCanonicalUrl } from '../../core/utils.js';
 import {
   buildNestedLoopCode,
   emitSystemPresenceLeaf,
@@ -139,7 +140,7 @@ function emitSystemPresenceFallback(
 ): void {
   const type = field.type || field.baseTypeCode;
   if (type !== 'CodeableConcept' && type !== 'Coding' && type !== 'Quantity') return;
-  const vsUri = (field.binding!.uri || '').split('|')[0];
+  const vsUri = stripVersionFromCanonicalUrl(field.binding!.uri || '');
   const vsDisplayName = vsUri.split('/').pop() || vsUri;
 
   if (isNested) {
@@ -203,7 +204,7 @@ function emitSystemOnlyBinding(
   const type = field.type || field.baseTypeCode;
   if (type !== 'CodeableConcept' && type !== 'Coding' && type !== 'Quantity') return;
 
-  const sysVsUri = (field.binding!.uri || '').split('|')[0];
+  const sysVsUri = stripVersionFromCanonicalUrl(field.binding!.uri || '');
   const systemsLiteral = JSON.stringify(vsInfo.systems);
   const vsDisplayName = vsInfo.displayName;
 
@@ -286,7 +287,7 @@ function emitResolvedBinding(
   const type = field.type || field.baseTypeCode;
   const vsName = vsInfo.sanitizedName;
   const vsDisplayName = vsInfo.displayName;
-  const vsUri = (field.binding!.uri || '').split('|')[0];
+  const vsUri = stripVersionFromCanonicalUrl(field.binding!.uri || '');
 
   if (isNested) {
     const code = buildNestedLoopCode(

src/generator/emitters/validator/validatorConstraintBuilders.ts

@@ -1,5 +1,5 @@
 import type { Field } from '../../core/sdTypes.js';
-import { stripSliceSuffix } from '../../core/utils.js';
+import { stripSliceSuffix, stripVersionFromCanonicalUrl } from '../../core/utils.js';
 import type { ConstraintWithContext } from './validatorTypes.js';
 
 /**

src/generator/emitters/validator/validatorGenerator.ts

@@ -1,5 +1,5 @@
 import type { Field } from "../../core/sdTypes.js";
-import { stripSliceSuffix } from '../../core/utils.js';
+import { stripSliceSuffix, stripVersionFromCanonicalUrl } from '../../core/utils.js';
 import { logger } from '../../../logger.js';
 import { sanitizeValueSetName } from '../valueset/valueSetGenerator.js';
 import type { ParsedValueSet } from '../../parser/vsParser.js';
@@ -206,7 +206,7 @@ export function generateValidateProfileFunction(
     let vs = valueSets.get(bindingUri);
     let resolvedUri = bindingUri;
     if (!vs && bindingUri.includes('|')) {
-      resolvedUri = bindingUri.split('|')[0];
+      resolvedUri = stripVersionFromCanonicalUrl(bindingUri);
       vs = valueSets.get(resolvedUri);
     }
     if (!vs) return undefined;
@@ -268,7 +268,7 @@ export function generateValidateProfileFunction(
         : fieldPath;
       if (!fieldPath) return;
       fieldPath = sliceScopedBindingPath(fieldPath, f, fields);
-      const vsUri = (f.binding!.uri || '').split('|')[0];
+      const vsUri = stripVersionFromCanonicalUrl(f.binding!.uri || '');
       const vsDisplayName = vsUri.split('/').pop() || vsUri;
       constraintsWithContext.push({
         constraint: {

src/generator/emitters/validator/validatorTemplates.ts

@@ -1,4 +1,5 @@
 import type { Field } from '../../core/sdTypes.js';
+import { stripVersionFromCanonicalUrl } from '../../core/utils.js';
 
 /**
  * Emit the reference target-type check for one profile.
@@ -18,7 +19,7 @@ export function buildReferenceTargetTypeValidation(
   profileUrlToType?: Map<string, string>,
 ): string {
   const resolveTargetType = (url: string): string | undefined => {
-    const bare = url.split('|')[0];
+    const bare = stripVersionFromCanonicalUrl(url);
     const lastSegment = bare.split('/').pop() || '';
     if (/^[A-Z][A-Za-z]+$/.test(lastSegment)) return lastSegment;
     return profileUrlToType?.get(bare) ?? profileUrlToType?.get(url);

src/generator/emitters/zod/zodRefinementBuilder.ts

@@ -7,7 +7,7 @@ import type { Field, Constraint } from '../../core/sdTypes.js';
 import type { ParsedValueSet } from '../../parser/vsParser.js';
 import { sanitizeValueSetName } from '../valueset/valueSetGenerator.js';
 import { scopeConstraintExpression } from '../validator/validatorExpressions.js';
-import { stripSliceSuffix } from '../../core/utils.js';
+import { stripSliceSuffix, stripVersionFromCanonicalUrl } from '../../core/utils.js';
 
 /** Metadata for a FHIRPath constraint tracked by the builder */
 export interface ConstraintMeta {
@@ -305,7 +305,7 @@ export function buildRefinements(
       codes = field.binding.codes.map(c => c.code);
       vsDisplayName = field.binding.uri?.split('/').pop() || 'ValueSet';
     } else if (field.binding.uri && valueSets) {
-      const vsUri = field.binding.uri.split('|')[0];
+      const vsUri = stripVersionFromCanonicalUrl(field.binding.uri);
       const vs = valueSets.get(vsUri) || valueSets.get(field.binding.uri);
       if (vs && vs.concepts.length > 0 && vs.concepts.length <= 200) {
         codes = vs.concepts.map(c => c.code);

src/generator/parser/sdFetcher.ts

@@ -5,6 +5,7 @@
  */
 
 import type { FhirStructureDefinition as StructureDefinition } from '../core/fhirTypes.js';
+import { stripVersionFromCanonicalUrl } from '../core/utils.js';
 import path from "path";
 import fs from "fs";
 import https from "https";
@@ -402,7 +403,7 @@ export function collectValueSetBindingUrls(structureDefinitions: StructureDefini
             for (const element of sd.differential.element) {
                 if (element.binding?.valueSet) {
                     // Strip version fragment if present (e.g., "...ValueSet|4.0.1")
-                    const url = element.binding.valueSet.split('|')[0];
+                    const url = stripVersionFromCanonicalUrl(element.binding.valueSet);
                     bindingUrls.add(url);
                 }
             }
@@ -412,7 +413,7 @@ export function collectValueSetBindingUrls(structureDefinitions: StructureDefini
         if (sd.snapshot?.element) {
             for (const element of sd.snapshot.element) {
                 if (element.binding?.valueSet) {
-                    const url = element.binding.valueSet.split('|')[0];
+                    const url = stripVersionFromCanonicalUrl(element.binding.valueSet);
                     bindingUrls.add(url);
                 }
             }

src/generator/parser/sdParser.ts

@@ -448,7 +448,7 @@ export async function parseStructureDefinition(
 
         if (bindingUri) {
             // Strip version suffix for map lookup (e.g. "…/ValueSet/foo|1.0.0" → "…/ValueSet/foo")
-            const lookupUri = bindingUri.split('|')[0];
+            const lookupUri = stripVersionFromCanonicalUrl(bindingUri);
             const codes = valueSetCodesMap?.[lookupUri] ?? valueSetCodesMap?.[bindingUri];
             if (codes && codes.length) {
                 // Deterministic pick based on simple hash of binding URI