Merge pull request #1143 from hapifhir/gg-202302-fhirpath-where-cleverness

pick up types in FHIRPath when filtering references with .where(resol…

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/TypeDetails.java

@@ -38,6 +38,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.apache.poi.hpsf.Array;
 import org.hl7.fhir.exceptions.DefinitionException;
 import org.hl7.fhir.r5.context.IWorkerContext;
 import org.hl7.fhir.r5.model.ElementDefinition.ElementDefinitionBindingComponent;
@@ -141,6 +142,10 @@ public class TypeDetails {
     this.collectionStatus = collectionStatus;
     this.types.add(pt);
   }
+  
+  private TypeDetails() {
+  }
+  
   public String addType(String n) {
     ProfiledType pt = new ProfiledType(n);
     String res = pt.uri;
@@ -437,5 +442,15 @@ public class TypeDetails {
     }
     
   }
+  public TypeDetails copy() {
+    TypeDetails td = new TypeDetails();
+    td.types.addAll(types);
+    td.collectionStatus = collectionStatus;
+    if (targets != null ) {
+      td.targets = new HashSet<>();
+      td.targets.addAll(targets);
+    }
+    return td;
+  }
   
 }

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/BuildExtensions.java

@@ -3,9 +3,7 @@ package org.hl7.fhir.r5.utils;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 public class BuildExtensions extends ToolingExtensions {
 

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRLexer.java

@@ -2,9 +2,7 @@ package org.hl7.fhir.r5.utils;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.StringJoiner;
 
-import org.apache.poi.xssf.model.Comments;
 import org.hl7.fhir.exceptions.FHIRException;
 
 /*

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRPathEngine.java

@@ -44,9 +44,9 @@ import org.hl7.fhir.r5.model.ExpressionNode.CollectionStatus;
 import org.hl7.fhir.r5.model.ExpressionNode.Function;
 import org.hl7.fhir.r5.model.ExpressionNode.Kind;
 import org.hl7.fhir.r5.model.ExpressionNode.Operation;
-import org.hl7.fhir.r5.model.Property.PropertyMatcher;
 import org.hl7.fhir.r5.model.IntegerType;
 import org.hl7.fhir.r5.model.Property;
+import org.hl7.fhir.r5.model.Property.PropertyMatcher;
 import org.hl7.fhir.r5.model.Quantity;
 import org.hl7.fhir.r5.model.Resource;
 import org.hl7.fhir.r5.model.StringType;
@@ -3207,7 +3207,29 @@ public class FHIRPathEngine {
     case Count : 
       return new TypeDetails(CollectionStatus.SINGLETON, TypeDetails.FP_Integer);
     case Where : 
-      return focus;
+      // special case: where the focus is Reference, and the parameter to where is resolve() "is", we will suck up the target types
+      if (focus.hasType("Reference")) {
+        boolean canRestrictTargets = !exp.getParameters().isEmpty();
+        List<String> targets = new ArrayList<>();
+        if (canRestrictTargets) {
+          ExpressionNode p = exp.getParameters().get(0);
+          if (p.getKind() == Kind.Function && p.getName().equals("resolve") && p.getOperation() == Operation.Is) {
+            targets.add(p.getOpNext().getName());
+          } else {
+            canRestrictTargets = false;
+          }
+        }
+        if (canRestrictTargets) {
+          TypeDetails td = focus.copy();
+          td.getTargets().clear();
+          td.getTargets().addAll(targets);
+          return td;
+        } else {
+          return focus;
+        }
+      } else {
+        return focus;
+      }
     case Select : 
       return paramTypes.get(0);
     case All : 

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/GraphDefinitionEngine.java

@@ -2,34 +2,26 @@ package org.hl7.fhir.r5.utils;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import org.apache.xmlbeans.xml.stream.ReferenceResolver;
 import org.hl7.fhir.exceptions.FHIRException;
 import org.hl7.fhir.r5.context.IWorkerContext;
 import org.hl7.fhir.r5.model.Base;
 import org.hl7.fhir.r5.model.Bundle;
-import org.hl7.fhir.r5.model.Expression;
-import org.hl7.fhir.r5.model.ExpressionNode;
 import org.hl7.fhir.r5.model.Bundle.BundleEntryComponent;
+import org.hl7.fhir.r5.model.ExpressionNode;
 import org.hl7.fhir.r5.model.GraphDefinition;
 import org.hl7.fhir.r5.model.GraphDefinition.GraphDefinitionLinkComponent;
-import org.hl7.fhir.r5.model.Reference;
 import org.hl7.fhir.r5.model.Resource;
-import org.hl7.fhir.r5.model.StringType;
 import org.hl7.fhir.utilities.Utilities;
 import org.hl7.fhir.utilities.graphql.Argument;
 import org.hl7.fhir.utilities.graphql.EGraphEngine;
 import org.hl7.fhir.utilities.graphql.EGraphQLException;
-import org.hl7.fhir.utilities.graphql.GraphQLResponse;
 import org.hl7.fhir.utilities.graphql.IGraphQLStorageServices;
-import org.hl7.fhir.utilities.graphql.IGraphQLStorageServices.ReferenceResolution;
 import org.hl7.fhir.utilities.graphql.StringValue;
-import org.hl7.fhir.instance.model.api.IBaseResource;
 
 public class GraphDefinitionEngine {
 

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/GraphQLEngine.java

@@ -2,7 +2,10 @@ package org.hl7.fhir.r5.utils;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /*
   Copyright (c) 2011+, HL7, Inc.
@@ -38,10 +41,22 @@ import java.util.*;
 import org.hl7.fhir.exceptions.FHIRException;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.r5.context.IWorkerContext;
-import org.hl7.fhir.r5.model.*;
+import org.hl7.fhir.r5.model.BackboneElement;
+import org.hl7.fhir.r5.model.Base;
+import org.hl7.fhir.r5.model.Bundle;
 import org.hl7.fhir.r5.model.Bundle.BundleEntryComponent;
 import org.hl7.fhir.r5.model.Bundle.BundleLinkComponent;
 import org.hl7.fhir.r5.model.Bundle.LinkRelationTypes;
+import org.hl7.fhir.r5.model.CanonicalType;
+import org.hl7.fhir.r5.model.DomainResource;
+import org.hl7.fhir.r5.model.Element;
+import org.hl7.fhir.r5.model.ExpressionNode;
+import org.hl7.fhir.r5.model.IdType;
+import org.hl7.fhir.r5.model.IntegerType;
+import org.hl7.fhir.r5.model.Property;
+import org.hl7.fhir.r5.model.Reference;
+import org.hl7.fhir.r5.model.Resource;
+import org.hl7.fhir.r5.model.StringType;
 import org.hl7.fhir.utilities.Utilities;
 import org.hl7.fhir.utilities.graphql.Argument;
 import org.hl7.fhir.utilities.graphql.Argument.ArgumentListStatus;

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/GraphQLSchemaGenerator.java

@@ -1,5 +1,21 @@
 package org.hl7.fhir.r5.utils;
 
+import static java.util.Objects.requireNonNull;
+
+import java.io.BufferedWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 /*
   Copyright (c) 2011+, HL7, Inc.
   All rights reserved.
@@ -47,22 +63,6 @@ import org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionKind;
 import org.hl7.fhir.r5.model.StructureDefinition.TypeDerivationRule;
 import org.hl7.fhir.utilities.Utilities;
 
-import java.io.BufferedWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.EnumSet;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import static java.util.Objects.requireNonNull;
-
 public class GraphQLSchemaGenerator {
 
   private static final Set<String> JSON_NUMBER_TYPES = new HashSet<String>() {{

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/GuideParameterCode.java

@@ -1,7 +1,6 @@
 package org.hl7.fhir.r5.utils;
 
 import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.r5.model.Base;
 import org.hl7.fhir.r5.model.Configuration;
 import org.hl7.fhir.r5.model.EnumFactory;
 import org.hl7.fhir.r5.model.Enumeration;

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/JurisdictionLocales.java

@@ -1,7 +1,6 @@
 package org.hl7.fhir.r5.utils;
 
 import java.util.HashMap;
-import java.util.Locale;
 import java.util.Map;
 
 /**

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/LiquidEngine.java

@@ -1,6 +1,5 @@
 package org.hl7.fhir.r5.utils;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -38,21 +37,15 @@ import java.util.Map;
  */
 
 import org.hl7.fhir.exceptions.FHIRException;
-import org.hl7.fhir.exceptions.FHIRFormatError;
 import org.hl7.fhir.exceptions.PathEngineException;
 import org.hl7.fhir.r5.context.IWorkerContext;
-import org.hl7.fhir.r5.elementmodel.Element;
 import org.hl7.fhir.r5.model.Base;
 import org.hl7.fhir.r5.model.ExpressionNode;
-import org.hl7.fhir.r5.model.Resource;
 import org.hl7.fhir.r5.model.Tuple;
 import org.hl7.fhir.r5.model.TypeDetails;
 import org.hl7.fhir.r5.model.ValueSet;
-import org.hl7.fhir.r5.renderers.utils.BaseWrappers.BaseWrapper;
-import org.hl7.fhir.r5.renderers.utils.BaseWrappers.ResourceWrapper;
 import org.hl7.fhir.r5.utils.FHIRPathEngine.ExpressionNodeWithOffset;
 import org.hl7.fhir.r5.utils.FHIRPathEngine.IEvaluationContext;
-import org.hl7.fhir.r5.utils.LiquidEngine.ILiquidRenderingSupport;
 import org.hl7.fhir.utilities.Utilities;
 import org.hl7.fhir.utilities.xhtml.NodeType;
 import org.hl7.fhir.utilities.xhtml.XhtmlNode;

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/NPMPackageGenerator.java

@@ -67,8 +67,8 @@ import org.hl7.fhir.utilities.json.model.JsonObject;
 import org.hl7.fhir.utilities.json.model.JsonString;
 import org.hl7.fhir.utilities.json.parser.JsonParser;
 import org.hl7.fhir.utilities.npm.NpmPackageIndexBuilder;
-import org.hl7.fhir.utilities.npm.ToolsVersion;
 import org.hl7.fhir.utilities.npm.PackageGenerator.PackageType;
+import org.hl7.fhir.utilities.npm.ToolsVersion;
 
 public class NPMPackageGenerator {
 

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/PublicationHacker.java

@@ -1,7 +1,6 @@
 package org.hl7.fhir.r5.utils;
 
 import org.hl7.fhir.r5.context.IWorkerContext;
-import org.hl7.fhir.r5.model.ServiceRequest;
 import org.hl7.fhir.r5.model.StringType;
 import org.hl7.fhir.utilities.Utilities;
 import org.hl7.fhir.utilities.VersionUtilities;

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/R5Hacker.java

@@ -3,8 +3,8 @@ package org.hl7.fhir.r5.utils;
 import org.hl7.fhir.r5.context.IWorkerContext;
 import org.hl7.fhir.r5.model.CanonicalResource;
 import org.hl7.fhir.r5.model.ElementDefinition;
-import org.hl7.fhir.r5.model.StructureDefinition;
 import org.hl7.fhir.r5.model.Enumerations.BindingStrength;
+import org.hl7.fhir.r5.model.StructureDefinition;
 
 public class R5Hacker {
 

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ResourceFixer.java

@@ -2,9 +2,7 @@ package org.hl7.fhir.r5.utils;
 
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.util.HashSet;
 import java.util.Set;
 

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ResourceUtilities.java

@@ -1,7 +1,5 @@
 package org.hl7.fhir.r5.utils;
 
-import java.util.ArrayList;
-
 /*
   Copyright (c) 2011+, HL7, Inc.
   All rights reserved.
@@ -34,7 +32,6 @@ import java.util.ArrayList;
 
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Set;
 
 import org.hl7.fhir.r5.model.Base;
@@ -43,18 +40,11 @@ import org.hl7.fhir.r5.model.Bundle.BundleEntryComponent;
 import org.hl7.fhir.r5.model.Bundle.BundleLinkComponent;
 import org.hl7.fhir.r5.model.CanonicalResource;
 import org.hl7.fhir.r5.model.CodeableConcept;
-import org.hl7.fhir.r5.model.Coding;
-import org.hl7.fhir.r5.model.ContactPoint;
-import org.hl7.fhir.r5.model.ContactPoint.ContactPointSystem;
-import org.hl7.fhir.r5.model.DataType;
-import org.hl7.fhir.r5.model.ElementDefinition.ElementDefinitionBindingComponent;
-import org.hl7.fhir.r5.model.ElementDefinition.TypeRefComponent;
 import org.hl7.fhir.r5.model.Meta;
 import org.hl7.fhir.r5.model.OperationOutcome;
 import org.hl7.fhir.r5.model.OperationOutcome.IssueSeverity;
 import org.hl7.fhir.r5.model.OperationOutcome.OperationOutcomeIssueComponent;
 import org.hl7.fhir.r5.model.Property;
-import org.hl7.fhir.r5.model.Reference;
 import org.hl7.fhir.r5.model.Resource;
 import org.hl7.fhir.r5.model.ResourceType;
 import org.hl7.fhir.utilities.CommaSeparatedStringBuilder;

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/ToolingExtensions.java

@@ -64,7 +64,6 @@ POSSIBILITY OF SUCH DAMAGE.
  */
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -75,7 +74,6 @@ import org.fhir.ucum.Utilities;
 import org.hl7.fhir.exceptions.FHIRException;
 import org.hl7.fhir.r5.model.Base;
 import org.hl7.fhir.r5.model.BooleanType;
-import org.hl7.fhir.r5.model.CanonicalResource;
 import org.hl7.fhir.r5.model.CanonicalType;
 import org.hl7.fhir.r5.model.CodeSystem.ConceptDefinitionComponent;
 import org.hl7.fhir.r5.model.CodeType;
@@ -89,7 +87,6 @@ import org.hl7.fhir.r5.model.ElementDefinition;
 import org.hl7.fhir.r5.model.Extension;
 import org.hl7.fhir.r5.model.ExtensionHelper;
 import org.hl7.fhir.r5.model.Factory;
-import org.hl7.fhir.r5.model.Identifier;
 import org.hl7.fhir.r5.model.Integer64Type;
 import org.hl7.fhir.r5.model.IntegerType;
 import org.hl7.fhir.r5.model.MarkdownType;

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/TypesUtilities.java

@@ -36,7 +36,6 @@ import java.util.List;
 
 import org.hl7.fhir.utilities.Utilities;
 import org.hl7.fhir.utilities.VersionUtilities;
-import org.hl7.fhir.utilities.VersionUtilities.VersionURLInfo;
 
 
 public class TypesUtilities {

org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/XVerExtensionManager.java

@@ -7,7 +7,6 @@ import java.util.Map;
 
 import org.hl7.fhir.exceptions.FHIRException;
 import org.hl7.fhir.r5.context.IWorkerContext;
-import org.hl7.fhir.r5.model.Constants;
 import org.hl7.fhir.r5.model.ElementDefinition;
 import org.hl7.fhir.r5.model.ElementDefinition.TypeRefComponent;
 import org.hl7.fhir.r5.model.Enumerations.FHIRVersion;