fix(rxjs): removed unnecessary peer deps (#7427)

* fix(rxjs): removed unnecessary peer deps resolves #7426 * chore(rxjs.dev): fix types and unbreak build
ReactiveX · Jan 11, 2024 · 5b6f6ea · 5b6f6ea
1 parent 10e151e
commit 5b6f6ea
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 22 deletions.
diff --git a/apps/rxjs.dev/package.json b/apps/rxjs.dev/package.json
@@ -77,9 +77,10 @@
     "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "^2.0.3",
     "@types/lunr": "^2.3.3",
-    "@types/node": "^20.6.3",
+    "@types/node": "^20.11.0",
     "@types/svgo": "^1.3.3",
     "@types/trusted-types": "^2.0.7",
+    "@types/yamljs": "^0.2.34",
     "@typescript-eslint/eslint-plugin": "^6.9.0",
     "@typescript-eslint/parser": "^6.9.1",
     "archiver": "^3.0.0",

diff --git a/apps/rxjs.dev/tools/transforms/rxjs-decision-tree-generator/src/lib/decisionTreeReducer.ts b/apps/rxjs.dev/tools/transforms/rxjs-decision-tree-generator/src/lib/decisionTreeReducer.ts
@@ -28,7 +28,7 @@ export function decisionTreeReducer(tree: TreeNode[], apiList: FlattenedApiList,
 
     if (!curr.options) {
       // we found the function/operator we want to use
-      const apiNode: FlattenedApiNode = apiList[treeNode.label!];
+      const apiNode: FlattenedApiNode = apiList[treeNode.label! as keyof FlattenedApiList];
       if (!apiNode) {
         log.warn(`Decision Tree Generator - (reducer) - warning: Label does not exist in API List: ${treeNode.label}`);
       }

diff --git a/apps/rxjs.dev/tools/transforms/rxjs-decision-tree-generator/src/lib/helpers.ts b/apps/rxjs.dev/tools/transforms/rxjs-decision-tree-generator/src/lib/helpers.ts
@@ -1,3 +1,5 @@
+import { ApiListNode, TreeNodeRaw } from './interfaces';
+
 export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
 /**
@@ -20,7 +22,7 @@ export function isStable(stability: string): boolean {
  * @param {*} tree
  * @returns
  */
-export function treeNodeCount(tree) {
+export function treeNodeCount(tree: TreeNodeRaw[]) {
   return tree.reduce((acc: number, curr) => {
     let childSum: number;
     if (curr.children) {
@@ -39,23 +41,22 @@ export function treeNodeCount(tree) {
  * @param {*} tree
  * @returns
  */
-export function rawNodesWithMethodCount(tree) {
-  return tree.filter(node => {
+export function rawNodesWithMethodCount(tree: TreeNodeRaw[]): number {
+  return tree.filter((node) => {
     let childHadMethod = false;
 
     if (node.method) {
       return node;
     }
 
     if (node.children) {
-      childHadMethod = rawNodesWithMethodCount(node.children);
+      childHadMethod = rawNodesWithMethodCount(node.children) > 0;
     }
 
     return childHadMethod;
   }).length;
 }
 
-
 /**
  * Recursively count valid API references
  * Deprecated API refs are invalid
@@ -64,7 +65,7 @@ export function rawNodesWithMethodCount(tree) {
  * @param {*} apiList
  * @returns
  */
-export function validApiRefCount(apiList): number {
+export function validApiRefCount(apiList: ApiListNode[]): number {
   return apiList.reduce((acc, curr) => {
     const itemCount = curr.items.reduce((a, node) => {
       if (node.stability === 'deprecated') {

diff --git a/packages/rxjs/package.json b/packages/rxjs/package.json
@@ -193,9 +193,5 @@
       "pre-commit": "lint-staged",
       "commit-msg": "validate-commit-msg"
     }
-  },
-  "peerDependencies": {
-    "@types/node": "^20.6.3",
-    "typescript": "^5.2.2"
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -2817,12 +2817,12 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.63.tgz#1788fa8da838dbb5f9ea994b834278205db6ca2b"
   integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
 
-"@types/node@^20.6.3":
-  version "20.8.8"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.8.8.tgz#adee050b422061ad5255fc38ff71b2bb96ea2a0e"
-  integrity sha512-YRsdVxq6OaLfmR9Hy816IMp33xOBjfyOgUd77ehqg96CFywxAPbDbXvAsuN2KVg2HOT8Eh6uAfU+l4WffwPVrQ==
+"@types/node@^20.11.0":
+  version "20.11.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.0.tgz#8e0b99e70c0c1ade1a86c4a282f7b7ef87c9552f"
+  integrity sha512-o9bjXmDNcF7GbM4CNQpmi+TutCgap/K3w1JyKgxAjqx41zp9qlIAVFi0IhCNsJcXolEqLWhbFbEeL0PvYm4pcQ==
   dependencies:
-    undici-types "~5.25.1"
+    undici-types "~5.26.4"
 
 "@types/parse-json@^4.0.0":
   version "4.0.2"
@@ -2942,6 +2942,11 @@
     "@types/unist" "*"
     "@types/vfile-message" "*"
 
+"@types/yamljs@^0.2.34":
+  version "0.2.34"
+  resolved "https://registry.yarnpkg.com/@types/yamljs/-/yamljs-0.2.34.tgz#c10b1f31b173f2cc93342f27b0796c2eb5b3ae84"
+  integrity sha512-gJvfRlv9ErxdOv7ux7UsJVePtX54NAvQyd8ncoiFqK8G5aeHIfQfGH2fbruvjAQ9657HwAaO54waS+Dsk2QTUQ==
+
 "@typescript-eslint/eslint-plugin@^6.9.0":
   version "6.13.1"
   resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.13.1.tgz#f98bd887bf95551203c917e734d113bf8d527a0c"
@@ -15799,11 +15804,6 @@ undefsafe@^2.0.2:
   resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c"
   integrity sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==
 
-undici-types@~5.25.1:
-  version "5.25.3"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.25.3.tgz#e044115914c85f0bcbb229f346ab739f064998c3"
-  integrity sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA==
-
 undici-types@~5.26.4:
   version "5.26.5"
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"