babelfhir-ts 1.0.13 → 1.0.14

package/out/generator/index.js

@@ -9,6 +9,7 @@ import { generateValidateProfileFunction } from './validatorGenerator';
 import { loadExamplesFromPackage, generateTestFile } from './testGenerator';
 import { generateValueSetTypeScript, generateValueSetRegistry } from './valueSetGenerator.js';
 import { logger } from '../logger';
+import fhirInterfaceNames from './fhirInterfaces.json';
 /** Ensure RandomSupport.ts exists in a generation output directory */
 function ensureRandomSupportFile(dir) {
     const filePath = path.join(dir, 'RandomSupport.ts');
@@ -63,12 +64,14 @@ async function processStructureDefinition(sd, ctx) {
     if (profileIdToName?.has(baseResource)) {
         baseResource = profileIdToName.get(baseResource);
     }
-    if (/^coverage_de_/.test(baseResource)) {
-        baseResource = 'Coverage';
+    // Generic fallback: if baseResource isn't a known FHIR type, prefer the declared SD type (core resource)
+    const isFhirType = (name) => !!name && (name === 'FhirResource' || fhirInterfaceNames.includes(name));
+    if (!isFhirType(baseResource) && sd.type && isFhirType(sd.type)) {
+        baseResource = sd.type;
     }
     const parsed = await parseStructureDefinition(sd, fhirSourceHint, valueSetCodesMap);
     if (!parsed.newFields.length) {
-        console.warn(`No new fields for ${interfaceName}, skipping.`);
+        logger.log(`No new SD fields for ${interfaceName}, skipping.`);
         return;
     }
     const aligned = alignFields(parsed.newFields, parsed.oldFields);

package/out/generator/interfaceGenerator.js

@@ -1518,12 +1518,7 @@ export function generateInterfaces(interfaceName, newFields, baseResource, baseF
     }
     if (baseResource && !isPrimitiveType(baseResource) && sanitizeIdentifier(baseResource) !== 'Base') {
         const sanitizedBase = sanitizeIdentifier(baseResource);
-        // Skip custom German coverage base pseudo-types that we cannot resolve
-        if (/^coverage_de_/.test(sanitizedBase)) {
-            // Treat as Coverage
-            imports.add('Coverage');
-        }
-        else if (!isFhirType(sanitizedBase)) {
+        if (!isFhirType(sanitizedBase)) {
             // Check if this profile exists in our generated files
             if (existingProfiles?.has(sanitizedBase)) {
                 customImports.add(sanitizedBase);
@@ -1583,10 +1578,7 @@ export function generateInterfaces(interfaceName, newFields, baseResource, baseF
                 if (baseResource && sanitizeIdentifier(baseResource) !== 'Base') {
                     const sanitizedBase = sanitizeIdentifier(baseResource);
                     // Ensure import of the base resource type
-                    if (/^coverage_de_/.test(sanitizedBase)) {
-                        imports.add('Coverage');
-                    }
-                    else if (!isFhirType(sanitizedBase)) {
+                    if (!isFhirType(sanitizedBase)) {
                         customImports.add(sanitizedBase);
                     }
                     else {

package/out/main.js

@@ -114,48 +114,94 @@ async function downloadPackage(packageSpec, registry) {
         throw error;
     }
 }
+function parseCliArgs(argv) {
+    const out = {
+        registry: 'https://packages.simplifier.net',
+        logLevel: 'none',
+        packageSpec: null,
+        flags: { noCache: false, noClasses: false, logLevel: 'none' },
+        positionals: []
+    };
+    for (let i = 0; i < argv.length; i++) {
+        const arg = argv[i];
+        if (arg === '--help' || arg === '-h' || arg === '--version' || arg === '-v' || arg === 'install') {
+            // Commands or special flags handled later as positionals to preserve order
+            out.positionals.push(arg);
+            continue;
+        }
+        if (arg === '--no-cache') {
+            out.flags.noCache = true;
+            continue;
+        }
+        if (arg === '--no-classes') {
+            out.flags.noClasses = true;
+            continue;
+        }
+        if (arg === '--log') {
+            const val = argv[i + 1];
+            if (!val || val.startsWith('-')) {
+                throw new Error('Missing value for --log');
+            }
+            if (!['none', 'console', 'file'].includes(val)) {
+                throw new Error(`Invalid --log value: ${val}. Must be: none, console, or file`);
+            }
+            out.logLevel = val;
+            out.flags.logLevel = out.logLevel;
+            i++;
+            continue;
+        }
+        if (arg === '--package') {
+            const val = argv[i + 1];
+            if (!val || val.startsWith('-'))
+                throw new Error('Missing value for --package');
+            out.packageSpec = val;
+            i++;
+            continue;
+        }
+        if (arg === '--registry') {
+            const val = argv[i + 1];
+            if (!val || val.startsWith('-'))
+                throw new Error('Missing value for --registry');
+            out.registry = val;
+            i++;
+            continue;
+        }
+        // Anything else that doesn't start with -- is positional
+        if (!arg.startsWith('--')) {
+            out.positionals.push(arg);
+            continue;
+        }
+        // Unknown --flag -> keep as positional to trigger usage error later
+        out.positionals.push(arg);
+    }
+    return out;
+}
 async function run() {
-    const args = process.argv.slice(2);
-    // Parse --registry flag
-    let registry = 'https://packages.simplifier.net';
-    const registryIndex = args.indexOf('--registry');
-    if (registryIndex !== -1 && args[registryIndex + 1]) {
-        registry = args[registryIndex + 1];
+    const argv = process.argv.slice(2);
+    let parsed;
+    try {
+        parsed = parseCliArgs(argv);
     }
-    // Parse --log flag
-    const logIndex = args.indexOf('--log');
-    const logLevel = logIndex !== -1 && args[logIndex + 1] ? args[logIndex + 1] : 'none';
-    if (!['none', 'console', 'file'].includes(logLevel)) {
-        console.error(`Invalid --log value: ${logLevel}. Must be: none, console, or file`);
+    catch (e) {
+        console.error(`Error: ${e.message}`);
+        printUsage();
         process.exit(1);
     }
-    // Parse --package flag
-    const packageIndex = args.indexOf('--package');
-    const packageSpec = packageIndex !== -1 && args[packageIndex + 1] ? args[packageIndex + 1] : null;
-    // Parse flags
-    const flags = {
-        noCache: args.includes('--no-cache'),
-        noClasses: args.includes('--no-classes'),
-        logLevel: logLevel
-    };
-    // Filter out flags to get positional arguments
-    const positionalArgs = args.filter(arg => !arg.startsWith('--') && !arg.startsWith('-'));
-    let firstArg = args.find(arg => !arg.startsWith('--') || arg === '--help' || arg === '--version');
-    const secondArg = positionalArgs[1];
+    const { registry, packageSpec, flags, positionals } = parsed;
     // Check for help flags
-    if (firstArg === '--help' || firstArg === '-h') {
+    if (positionals.includes('--help') || positionals.includes('-h')) {
         printUsage();
         process.exit(0);
     }
     // Check for version flag
-    if (firstArg === '--version' || firstArg === '-v') {
+    if (positionals.includes('--version') || positionals.includes('-v')) {
         console.log(`babelfhir-ts version ${packageJson.version}`);
         process.exit(0);
     }
     // Handle install command
-    if (firstArg === 'install') {
+    if (positionals[0] === 'install') {
         // Package can come from --package flag OR as positional argument after 'install'
-        const packageToInstall = packageSpec || secondArg;
+        const packageToInstall = packageSpec || positionals[1];
         if (!packageToInstall) {
             console.error('Error: install command requires a package name');
             console.error('Example: babelfhir-ts install de.gematik.isik-basismodul@3.1.0');
@@ -212,7 +258,7 @@ async function run() {
             if (flags.noCache) {
                 cleanupCache();
             }
-            console.log(`\n✓ Package ${secondArg} installed and ready to use!`);
+            console.log(`\n✓ Package ${packageToInstall} installed and ready to use!`);
             return;
         }
         catch (error) {
@@ -259,12 +305,11 @@ async function run() {
             process.exit(1);
         }
     }
-    if (!firstArg) {
+    if (positionals.length === 0) {
         // Default: attempt input -> output
         if (fs.existsSync('input') && fs.lstatSync('input').isDirectory()) {
-            firstArg = 'input';
             const outputDir = 'output';
-            await generateForDirectory(firstArg, outputDir, flags);
+            await generateForDirectory('input', outputDir, flags);
             console.log(`Batch generation complete. Output in: ${outputDir}`);
             if (flags.noCache) {
                 cleanupCache();
@@ -274,6 +319,8 @@ async function run() {
         printError();
         process.exit(1);
     }
+    const firstArg = positionals[0];
+    const secondArg = positionals[1];
     if (!fs.existsSync(firstArg)) {
         console.error(`Path does not exist: ${firstArg}`);
         console.error("Use --help for usage information");

package/package.json

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