babelfhir-ts 1.5.15 → 1.5.16

package/out/src/generator/emitters/validator/sliceValidatorGenerator.js

@@ -456,9 +456,9 @@ function generatePatternCodingValidation(slice, relPath, errorPath, sliceLabel,
         if (isNestedInOptionalSlice) {
             out.push(`
   // Required slice validation for ${relPath}:${sliceLabel} (nested in array: ${arrayParentPath}, parent slice is optional)
-  if ((resource as any).${arrayParentPath} && Array.isArray((resource as any).${arrayParentPath}) && (resource as any).${arrayParentPath}.length > 0) {
+  if (resource.${arrayParentPath} && Array.isArray(resource.${arrayParentPath}) && resource.${arrayParentPath}.length > 0) {
     const ${varName}Elements: Array<{ system?: string; code?: string }> = [];
-    for (const item of (resource as any).${arrayParentPath}) {
+    for (const item of resource.${arrayParentPath}) {
       const nestedArray = item.${optionalPath};
       if (nestedArray && Array.isArray(nestedArray)) {
         for (const coding of nestedArray) { if (${matchExpr.replace(/item\./g, 'coding.')}) ${varName}Elements.push(coding); }
@@ -473,9 +473,9 @@ function generatePatternCodingValidation(slice, relPath, errorPath, sliceLabel,
             out.push(`
   // Required slice validation for ${relPath}:${sliceLabel} (nested in array: ${arrayParentPath})
   // Only check when parent array exists — parent absence is reported by separate required-field checks
-  if ((resource as any).${arrayParentPath} && Array.isArray((resource as any).${arrayParentPath})) {
+  if (resource.${arrayParentPath} && Array.isArray(resource.${arrayParentPath})) {
     const ${varName}Elements: Array<{ system?: string; code?: string }> = [];
-    for (const item of (resource as any).${arrayParentPath}) {
+    for (const item of resource.${arrayParentPath}) {
       const nestedArray = item.${optionalPath};
       if (nestedArray && Array.isArray(nestedArray)) {
         for (const coding of nestedArray) { if (${matchExpr.replace(/item\./g, 'coding.')}) ${varName}Elements.push(coding); }
@@ -496,9 +496,9 @@ function generatePatternCodingValidation(slice, relPath, errorPath, sliceLabel,
             out.push(`
   // Required slice validation for ${relPath}:${sliceLabel}
   // Only check nested slice if parent field exists (parent absence is already reported separately)
-  if ((resource as any).${parentPath}) {
-    if ((resource as any).${optionalPath} && Array.isArray((resource as any).${optionalPath})) {
-      const ${varName}Elements = ((resource as any).${optionalPath} as Array<{ system?: string; code?: string }>).filter((item) => 
+  if (resource.${parentPath}) {
+    if (resource.${optionalPath} && Array.isArray(resource.${optionalPath})) {
+      const ${varName}Elements = (resource.${optionalPath} as Array<{ system?: string; code?: string }>).filter((item) => 
         ${matchExpr}
       );
       if (${varName}Elements.length < ${min}) {
@@ -512,8 +512,8 @@ function generatePatternCodingValidation(slice, relPath, errorPath, sliceLabel,
         else {
             out.push(`
   // Required slice validation for ${relPath}:${sliceLabel}
-  if ((resource as any).${optionalPath} && Array.isArray((resource as any).${optionalPath})) {
-    const ${varName}Elements = ((resource as any).${optionalPath} as Array<{ system?: string; code?: string }>).filter((item) => 
+  if (resource.${optionalPath} && Array.isArray(resource.${optionalPath})) {
+    const ${varName}Elements = (resource.${optionalPath} as Array<{ system?: string; code?: string }>).filter((item) => 
       ${matchExpr}
     );
     if (${varName}Elements.length < ${min}) {
@@ -627,8 +627,8 @@ function generateProfiledChildDelegation(slice, relPath, childFieldsWithFixedVal
                 out.push(`
   // Profiled sub-resource delegation for ${relPath}:${sliceLabel}.${childRelPath} → ${delegateName}
   {
-    if ((resource as any).${arrayParentPath} && Array.isArray((resource as any).${arrayParentPath})) {
-      for (const _parentItem of (resource as any).${arrayParentPath}) {
+    if (resource.${arrayParentPath} && Array.isArray(resource.${arrayParentPath})) {
+      for (const _parentItem of resource.${arrayParentPath}) {
         const _pi: any = _parentItem;
         const _nestedArr = _pi?.${remainingPath};
         if (_nestedArr && Array.isArray(_nestedArr)) {
@@ -775,9 +775,9 @@ function generateProfileDiscriminatorValidation(slice, relPath, errorPath, slice
     const { resourceType, profileUrls } = match;
     const max = typeof slice.max === 'number' && slice.max !== Infinity ? slice.max : undefined;
     const parentPath = relPath.includes('.') ? relPath.split('.').slice(0, -1).join('.') : '';
-    const accessor = parentPath ? `(resource as any)?.${parentPath.replace(/\./g, '?.')}` : `(resource as any).${relPath}`;
+    const accessor = parentPath ? `(resource as any)?.${parentPath.replace(/\./g, '?.')}` : `resource.${relPath}`;
     // For top-level entry slices, access resource.entry directly
-    const arrayAccessor = relPath === 'entry' || !relPath.includes('.') ? `(resource as any).${relPath}` : accessor;
+    const arrayAccessor = relPath === 'entry' || !relPath.includes('.') ? `resource.${relPath}` : accessor;
     // Resolve profiled validator for delegation
     let delegateInterfaceName;
     if (ctx.profileUrlToName && ctx.validatorImports) {

package/out/src/generator/index.js

@@ -102,12 +102,39 @@ function copyFhirAmbientDeclaration(outputDir) {
         log.warn(`Warning: ${dtsFileName} not found. Run: npm run generate:fhir-module`);
     }
 }
+/**
+ * Locate the `@types` directory that ships with babelfhir-ts itself (the one
+ * containing `@types/fhir`). The generated output imports base FHIR types via the
+ * ambient `fhir/r4` module, which aliases `fhir4.*` from `@types/fhir`. Under
+ * `--skip-install` the generated package's own dependencies (including
+ * `@types/fhir`) are never installed into its `node_modules`, so the output
+ * typecheck would resolve `fhir4.Observation` to an empty type and any validator
+ * accessing a base-inherited field not restated locally (e.g. `Observation.code`
+ * on a profile that only slices `code.coding`) would fail TS2339. Pointing
+ * `typeRoots` at babelfhir's own always-present `@types` makes the typecheck
+ * robust regardless of the output's install state.
+ */
+function resolveGeneratorTypeRoots() {
+    let dir = __generatorDir;
+    for (let i = 0; i < 6; i++) {
+        const atTypes = path.join(dir, 'node_modules', '@types');
+        if (fs.existsSync(path.join(atTypes, 'fhir')))
+            return [atTypes];
+        const parent = path.dirname(dir);
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    return [];
+}
 /** Compile TypeScript files to JavaScript with declaration files */
 async function compileTypeScriptToJS(dir) {
     return new Promise((resolve, reject) => {
         const tscCmd = process.platform === 'win32' ? 'tsc.cmd' : 'tsc';
         // Create a temporary tsconfig.json for compilation
-        // Paths are relative to tsconfig location (which is `dir` itself)
+        // Paths are relative to tsconfig location (which is `dir` itself); the
+        // generator's own @types (absolute) is appended so `@types/fhir` resolves
+        // even when the output's deps were skipped (see resolveGeneratorTypeRoots).
         const tsconfig = {
             compilerOptions: {
                 target: 'ES2020',
@@ -121,7 +148,7 @@ async function compileTypeScriptToJS(dir) {
                 allowSyntheticDefaultImports: true,
                 strict: true,
                 resolveJsonModule: true,
-                typeRoots: ['./node_modules/@types'],
+                typeRoots: ['./node_modules/@types', ...resolveGeneratorTypeRoots()],
                 types: ['node']
             },
             include: ['./**/*.ts'],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "babelfhir-ts",
-  "version": "1.5.15",
+  "version": "1.5.16",
   "description": "BabelFHIR-TS: generate TypeScript interfaces, validators, and helper classes from FHIR R4/R4B/R5 StructureDefinitions (profiles) directly inside package archives.",
   "type": "module",
   "main": "out/src/main.js",