chore: update TypeScript and improve types (#1404)

* chore: update TypeScript and improve types

package.json

@@ -35,7 +35,7 @@
     "postcss-simple-vars": "^6.0.1",
     "postcss-value-parser": "^4.2.0",
     "prettier": "^2.6.2",
-    "typescript": "^4.6.4",
+    "typescript": "^4.7.2",
     "uvu": "^0.5.3"
   },
   "browserslist": {

packages/postcss-convert-values/src/lib/convert.js

@@ -37,7 +37,7 @@ function dropLeadingZero(number) {
 /**
  * @param {number} number
  * @param {string} originalUnit
- * @param {Map<string, number>} conversions
+ * @param {lengthConv | timeConv | angleConv} conversions
  * @return {string}
  */
 function transform(number, originalUnit, conversions) {

packages/postcss-discard-comments/src/index.js

@@ -76,11 +76,8 @@ function pluginCreator(opts = {}) {
           return;
         }
 
-        if (node.raws.between) {
-          node.raws.between = replaceComments(
-            /** @type {string} */ (node.raws.between),
-            list.space
-          );
+        if (typeof node.raws.between === 'string') {
+          node.raws.between = replaceComments(node.raws.between, list.space);
         }
 
         if (node.type === 'decl') {

packages/postcss-merge-rules/src/index.js

@@ -36,7 +36,7 @@ function indexOfDeclaration(array, decl) {
  */
 function intersect(a, b, not) {
   return a.filter((c) => {
-    const index = ~indexOfDeclaration(b, c);
+    const index = indexOfDeclaration(b, c) !== -1;
     return not ? !index : index;
   });
 }
@@ -74,21 +74,32 @@ function canMerge(ruleA, ruleB, browsers, compatibilityCache) {
     /** @type {any} */ (ruleA),
     /** @type {any} */ (ruleB)
   );
-  const { name } = /** @type {any} */ (ruleA).parent;
-  if (parent && name && name.includes('keyframes')) {
+  if (
+    parent &&
+    ruleA.parent &&
+    ruleA.parent.type === 'atrule' &&
+    /** @type {import('postcss').AtRule} */ (ruleA.parent).name.includes(
+      'keyframes'
+    )
+  ) {
     return false;
   }
   return parent && (selectors.every(noVendor) || sameVendor(a, b));
 }
 
+/**
+ * @param {import('postcss').ChildNode} node
+ * @return {node is import('postcss').Declaration}
+ */
+function isDeclaration(node) {
+  return node.type === 'decl';
+}
 /**
  * @param {import('postcss').Rule} rule
  * @return {import('postcss').Declaration[]}
  */
 function getDecls(rule) {
-  return /** @type {import('postcss').Declaration[]} */ (
-    rule.nodes.filter((node) => node.type === 'decl')
-  );
+  return rule.nodes.filter(isDeclaration);
 }
 
 /** @type {(...rules: import('postcss').Rule[]) => string} */
@@ -290,7 +301,7 @@ function partialMerge(first, second) {
    */
   function moveDecl(callback) {
     return (decl) => {
-      if (~indexOfDeclaration(intersection, decl)) {
+      if (indexOfDeclaration(intersection, decl) !== -1) {
         callback.call(this, decl);
       }
     };
@@ -359,17 +370,12 @@ function selectorMerger(browsers, compatibilityCache) {
     // e.g. a { color: blue } a { font-weight: bold }
     if (cache.selector === rule.selector) {
       const cached = getDecls(cache);
-      rule.walk((decl) => {
-        if (
-          ~indexOfDeclaration(
-            cached,
-            /** @type {import('postcss').Declaration} */ (decl)
-          )
-        ) {
-          decl.remove();
+      rule.walk((node) => {
+        if (node.type === 'decl' && indexOfDeclaration(cached, node) !== -1) {
+          node.remove();
           return;
         }
-        /** @type {import('postcss').Rule} */ (cache).append(decl);
+        /** @type {import('postcss').Rule} */ (cache).append(node);
       });
       rule.remove();
       return;