Prepare for TS DefinitelyTyped#34927 (DefinitelyTyped#40365)

* Update mergerino/mergerino-tests.ts * Update styled-system__css/styled-system__css-tests.ts * Update xml/index.d.ts
smor · Nov 15, 2019 · 71381a8 · 71381a8
1 parent 12c3ce0
commit 71381a8
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 33 deletions.
diff --git a/types/mergerino/mergerino-tests.ts b/types/mergerino/mergerino-tests.ts
@@ -170,16 +170,16 @@ function deepMergeWithArr() {
     const newState = merge(state, { deep: { arr: { 1: 20 } } });
 }
 
-// ToDo: It shoudn't be allowed, but it occurs when I use "infer" to get array type
-function arrayObjectPatchNonExisitngProperty() {
-    interface State {
-        arr: Array<{
-            prop: boolean;
-        }>;
-    }
-    const state: State = { arr: [{ prop: true }] };
-    const newState = merge(state, { arr: { 0: { prop: false, nonExists: 42 } } });
-}
+// Excess property checking for this example only works in TypeScript 3.8 and later
+// function arrayObjectPatchNonExisitngProperty() {
+//     interface State {
+//         arr: Array<{
+//             prop: boolean;
+//         }>;
+//     }
+//     const state: State = { arr: [{ prop: true }] };
+//     const newState = merge(state, { arr: { 0: { prop: false, nonExists: 42 } } });  // $ExpectError
+// }
 
 function topLevelFunctionPatch() {
     type State =

diff --git a/types/styled-system__css/styled-system__css-tests.ts b/types/styled-system__css/styled-system__css-tests.ts
@@ -33,27 +33,30 @@ export const themeWithVariants: Theme = {
     fontWeights: {
         bold: 600,
     },
-    buttons: {
-        primary: {
-            display: 'block',
-            p: 3,
-            fontWeight: 'bold',
-            color: 'white',
-            bg: 'primary',
-            borderRadius: 2,
-        },
-    },
-    text: {
-        caps: {
-            fontSize: [1, 2],
-            letterSpacing: '0.1em',
-            textTransform: 'uppercase',
-        },
-        title: {
-            fontSize: [3, 4],
-            letterSpacing: ['-0.01em', '-0.02em'],
-        },
-    },
+    // The following is commented out because in doesn't adhere to the Theme type, but
+    // this wasn't detected until TypeScript 3.8. Either the example or the Theme type
+    // needs to be changed.
+    // buttons: {
+    //     primary: {
+    //         display: 'block',
+    //         p: 3,
+    //         fontWeight: 'bold',
+    //         color: 'white',
+    //         bg: 'primary',
+    //         borderRadius: 2,
+    //     },
+    // },
+    // text: {
+    //     caps: {
+    //         fontSize: [1, 2],
+    //         letterSpacing: '0.1em',
+    //         textTransform: 'uppercase',
+    //     },
+    //     title: {
+    //         fontSize: [3, 4],
+    //         letterSpacing: ['-0.01em', '-0.02em'],
+    //     },
+    // },
 };
 
 // returns a function

diff --git a/types/xml/index.d.ts b/types/xml/index.d.ts
@@ -24,7 +24,7 @@ interface Option {
 }
 
 interface XmlAttrs {
-  [attr: string]: string;
+  [attr: string]: XmlAtom;
 }
 interface XmlDescArray {
   [index: number]: { _attr: XmlAttrs } | XmlObject;
@@ -34,7 +34,7 @@ interface ElementObject {
   close(xmlObject?: XmlObject): void;
 }
 
-type XmlAtom = string | number | boolean;
+type XmlAtom = string | number | boolean | null;
 type XmlDesc = { _attr: XmlAttrs } | { _cdata: string } | { _attr: XmlAttrs, _cdata: string } | XmlAtom | XmlAtom[] | XmlDescArray;
 type XmlObject = { [tag: string]: ElementObject | XmlDesc } | XmlDesc;