@atomic-ehr/fhirpath 0.1.3 → 0.1.4

package/dist/{model-provider.common-CLcGjAiO.d.ts → model-provider.common-CN5LGOT5.d.ts}

@@ -983,7 +983,6 @@ declare class FHIRModelProviderBase implements ModelProvider<FHIRModelContext> {
     private primitiveTypesCache?;
     private resourceTypesCache?;
     private readonly typeMapping;
-    private readonly primitiveTypeMapping;
     constructor();
     prepare(): Promise<void>;
     initialize(): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomic-ehr/fhirpath",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "A TypeScript implementation of FHIRPath",
   "type": "module",
   "main": "./dist/index.node.js",

package/src/model-provider.common.ts

@@ -81,30 +81,6 @@ export class FHIRModelProviderBase implements ModelProvider<FHIRModelContext> {
     'Count': 'Quantity'
   };
   
-  // Map FHIR primitive names to FHIRPath type names
-  private readonly primitiveTypeMapping: Record<string, string> = {
-    'boolean': 'Boolean',
-    'string': 'String',
-    'integer': 'Integer',
-    'decimal': 'Decimal',
-    'date': 'Date',
-    'dateTime': 'DateTime',
-    'time': 'Time',
-    'instant': 'Instant',
-    'base64Binary': 'Base64Binary',
-    'uri': 'Uri',
-    'url': 'Url',
-    'canonical': 'Canonical',
-    'code': 'Code',
-    'oid': 'Oid',
-    'id': 'Id',
-    'markdown': 'Markdown',
-    'unsignedInt': 'UnsignedInt',
-    'positiveInt': 'PositiveInt',
-    'uuid': 'Uuid',
-    'xhtml': 'Xhtml'
-  };
-  
   constructor() {
     if (this.constructor === FHIRModelProviderBase) {
       throw new Error("FHIRModelProviderBase can't be instantiated directly.");
@@ -616,7 +592,9 @@ export class FHIRModelProviderBase implements ModelProvider<FHIRModelContext> {
     
     this.resourceTypesCache = resources
       .filter(r => r.resourceType === 'StructureDefinition')
-      .map(r => (r as unknown as StructureDefinition).name)
+      .map(r => r as unknown as StructureDefinition)
+      .filter(sd => sd.derivation !== 'constraint')
+      .map(sd => sd.name)
       .filter((name): name is string => !!name)
       .sort();
       
@@ -664,9 +642,7 @@ export class FHIRModelProviderBase implements ModelProvider<FHIRModelContext> {
       .map(r => (r as unknown as StructureDefinition).name)
       .filter((name): name is string => !!name);
     
-    this.primitiveTypesCache = fhirPrimitives
-      .map(name => this.primitiveTypeMapping[name] || name)
-      .sort();
+    this.primitiveTypesCache = fhirPrimitives.sort();
       
     return this.primitiveTypesCache || [];
   }