From 71d262ee6036982ed242e17065f492e6b460c7ec Mon Sep 17 00:00:00 2001
From: Murhaf Elmasri <muhraf.elmasri@hypatia.tech>
Date: Tue, 21 Dec 2021 18:49:24 +0300
Subject: [PATCH 1/2] add isPrimitive function

---
 src/transform-inline/utils.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/transform-inline/utils.ts b/src/transform-inline/utils.ts
index d12dd06..a44a1be 100644
--- a/src/transform-inline/utils.ts
+++ b/src/transform-inline/utils.ts
@@ -1,3 +1,5 @@
+import ts = require('typescript');
+
 export function sliceSet<T>(set: Set<T>): T[] {
     const items: T[] = [];
     set.forEach((value) => items.push(value));
@@ -17,3 +19,15 @@ export function sliceMapValues<T, U>(map: Map<T, U>): U[] {
     map.forEach((value) => items.push(value));
     return items;
 }
+export function isPrimitive(flag: number) {
+  return (
+    ((ts.TypeFlags.Number |
+      ts.TypeFlags.String |
+      ts.TypeFlags.Boolean |
+      ts.TypeFlags.BooleanLiteral |
+      ts.TypeFlags.StringLiteral |
+      ts.TypeFlags.NumberLiteral) &
+      flag) !==
+    0
+  );
+}

From b67f8d414b54aa00654115f756175f41d7286a3d Mon Sep 17 00:00:00 2001
From: Murhaf Elmasri <muhraf.elmasri@hypatia.tech>
Date: Tue, 21 Dec 2021 18:50:00 +0300
Subject: [PATCH 2/2] edit  visitUnionOrIntersectionType

---
 src/transform-inline/visitor-type-check.ts | 34 ++++++++++++++++++++--
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/src/transform-inline/visitor-type-check.ts b/src/transform-inline/visitor-type-check.ts
index 8fe7a93..c2ebb1e 100644
--- a/src/transform-inline/visitor-type-check.ts
+++ b/src/transform-inline/visitor-type-check.ts
@@ -6,7 +6,7 @@ import * as VisitorKeyof from './visitor-keyof';
 import * as VisitorIndexedAccess from './visitor-indexed-access';
 import * as VisitorIsStringKeyof from './visitor-is-string-keyof';
 import * as VisitorTypeName from './visitor-type-name';
-import { sliceSet } from './utils';
+import { sliceSet,isPrimitive } from './utils';
 
 function visitDateType(type: ts.ObjectType, visitorContext: VisitorContext) {
     const name = VisitorTypeName.visitType(type, visitorContext, { type: 'type-check' });
@@ -501,8 +501,36 @@ function visitUnionOrIntersectionType(type: ts.UnionOrIntersectionType, visitorC
     if (tsutils.isIntersectionType(intersectionType)) {
         const name = VisitorTypeName.visitType(type, visitorContext, { type: 'type-check', superfluousPropertyCheck: visitorContext.options.disallowSuperfluousObjectProperties });
         return VisitorUtils.setFunctionIfNotExists(name, visitorContext, () => {
-            const functionNames = intersectionType.types.map((type) => visitType(type, { ...visitorContext, overrideDisallowSuperfluousObjectProperies: true }));
-            if (disallowSuperfluousPropertyCheck) {
+            let functionNames: string[] = [];
+            if (
+              intersectionType.types.length === 2 &&
+              ((intersectionType.types[0].flags & ts.TypeFlags.Object &&
+                isPrimitive(intersectionType.types[1].flags)) ||
+                (isPrimitive(intersectionType.types[0].flags) &&
+                  intersectionType.types[1].flags & ts.TypeFlags.Object))
+            ) {
+              intersectionType.types.forEach((type) => {
+                if (isPrimitive(type.flags)) {
+                  functionNames.push(
+                    visitType(
+                      type,
+                      Object.assign(Object.assign({}, visitorContext), {
+                        overrideDisallowSuperfluousObjectProperies: true
+                      })
+                    )
+                  );
+                }
+              });
+            } else {
+              functionNames = intersectionType.types.map((type) =>
+                visitType(
+                  type,
+                  Object.assign(Object.assign({}, visitorContext), {
+                    overrideDisallowSuperfluousObjectProperies: true
+                  })
+                )
+              );
+            }            if (disallowSuperfluousPropertyCheck) {
                 // Check object keys at intersection type level. https://github.com/woutervh-/typescript-is/issues/21
                 const keys = VisitorIsStringKeyof.visitType(type, visitorContext);
                 if (keys instanceof Set) {