ts: make resourceType check predicates more type strict.

Author: ryukzak

examples/typescript-r4/fhir-types/hl7-fhir-r4-core/Account.ts

@@ -46,5 +46,5 @@ export interface Account extends DomainResource {
     type?: CodeableConcept;
 }
 export const isAccount = (resource: any): resource is Account => {
-    return resource && resource.resourceType === "Account";
+    return resource !== null && typeof resource === "object" && (resource as {resourceType: string}).resourceType === "Account";
 }

examples/typescript-r4/fhir-types/hl7-fhir-r4-core/ActivityDefinition.ts

@@ -127,5 +127,5 @@ export interface ActivityDefinition extends DomainResource {
     _version?: Element;
 }
 export const isActivityDefinition = (resource: any): resource is ActivityDefinition => {
-    return resource && resource.resourceType === "ActivityDefinition";
+    return resource !== null && typeof resource === "object" && (resource as {resourceType: string}).resourceType === "ActivityDefinition";
 }

examples/typescript-r4/fhir-types/hl7-fhir-r4-core/AdverseEvent.ts

@@ -55,5 +55,5 @@ export interface AdverseEvent extends DomainResource {
     suspectEntity?: AdverseEventSuspectEntity[];
 }
 export const isAdverseEvent = (resource: any): resource is AdverseEvent => {
-    return resource && resource.resourceType === "AdverseEvent";
+    return resource !== null && typeof resource === "object" && (resource as {resourceType: string}).resourceType === "AdverseEvent";
 }

examples/typescript-r4/fhir-types/hl7-fhir-r4-core/AllergyIntolerance.ts

@@ -64,5 +64,5 @@ export interface AllergyIntolerance extends DomainResource {
     verificationStatus?: CodeableConcept;
 }
 export const isAllergyIntolerance = (resource: any): resource is AllergyIntolerance => {
-    return resource && resource.resourceType === "AllergyIntolerance";
+    return resource !== null && typeof resource === "object" && (resource as {resourceType: string}).resourceType === "AllergyIntolerance";
 }

examples/typescript-r4/fhir-types/hl7-fhir-r4-core/Appointment.ts

@@ -60,5 +60,5 @@ export interface Appointment extends DomainResource {
     supportingInformation?: Reference<"Resource">[];
 }
 export const isAppointment = (resource: any): resource is Appointment => {
-    return resource && resource.resourceType === "Appointment";
+    return resource !== null && typeof resource === "object" && (resource as {resourceType: string}).resourceType === "Appointment";
 }

examples/typescript-r4/fhir-types/hl7-fhir-r4-core/AppointmentResponse.ts

@@ -29,5 +29,5 @@ export interface AppointmentResponse extends DomainResource {
     _start?: Element;
 }
 export const isAppointmentResponse = (resource: any): resource is AppointmentResponse => {
-    return resource && resource.resourceType === "AppointmentResponse";
+    return resource !== null && typeof resource === "object" && (resource as {resourceType: string}).resourceType === "AppointmentResponse";
 }

examples/typescript-r4/fhir-types/hl7-fhir-r4-core/AuditEvent.ts

@@ -79,5 +79,5 @@ export interface AuditEvent extends DomainResource {
     type: Coding;
 }
 export const isAuditEvent = (resource: any): resource is AuditEvent => {
-    return resource && resource.resourceType === "AuditEvent";
+    return resource !== null && typeof resource === "object" && (resource as {resourceType: string}).resourceType === "AuditEvent";
 }

examples/typescript-r4/fhir-types/hl7-fhir-r4-core/Basic.ts

@@ -23,5 +23,5 @@ export interface Basic extends DomainResource {
     subject?: Reference<"Resource">;
 }
 export const isBasic = (resource: any): resource is Basic => {
-    return resource && resource.resourceType === "Basic";
+    return resource !== null && typeof resource === "object" && (resource as {resourceType: string}).resourceType === "Basic";
 }

examples/typescript-r4/fhir-types/hl7-fhir-r4-core/Binary.ts

@@ -18,5 +18,5 @@ export interface Binary extends Resource {
     securityContext?: Reference<"Resource">;
 }
 export const isBinary = (resource: any): resource is Binary => {
-    return resource && resource.resourceType === "Binary";
+    return resource !== null && typeof resource === "object" && (resource as {resourceType: string}).resourceType === "Binary";
 }

examples/typescript-r4/fhir-types/hl7-fhir-r4-core/BiologicallyDerivedProduct.ts

@@ -63,5 +63,5 @@ export interface BiologicallyDerivedProduct extends DomainResource {
     storage?: BiologicallyDerivedProductStorage[];
 }
 export const isBiologicallyDerivedProduct = (resource: any): resource is BiologicallyDerivedProduct => {
-    return resource && resource.resourceType === "BiologicallyDerivedProduct";
+    return resource !== null && typeof resource === "object" && (resource as {resourceType: string}).resourceType === "BiologicallyDerivedProduct";
 }