babelfhir-ts 1.5.14 → 1.5.16

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.14",
+  "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",