{"commit":{"authorEmail":"gsathya.ceg@gmail.com","revision":"bedf0cc6c50b4d738f4022e48188c0166e63bed8","authorName":"Sathya Gunasekaran","shortRevision":"bedf0cc6c5","authoredAt":"2023-05-31T13:54:58+01:00","subject":"[hir] Don't track ref.current as a valid dep"},"body":"","patch":"diff --git a\/compiler\/forget\/src\/HIR\/HIR.ts b\/compiler\/forget\/src\/HIR\/HIR.ts\nindex 80d405268a..661187ed90 100644\n--- a\/compiler\/forget\/src\/HIR\/HIR.ts\n+++ b\/compiler\/forget\/src\/HIR\/HIR.ts\n@@ -979,6 +979,14 @@ export function isPrimitiveType(id: Identifier): boolean {\n return id.type.kind === \"Primitive\";\n }\n \n+export function isRefValueType(id: Identifier): boolean {\n+ return id.type.kind === \"Object\" && id.type.shapeId === \"BuiltInRefValue\";\n+}\n+\n+export function isUseRefType(id: Identifier): boolean {\n+ return id.type.kind === \"Object\" && id.type.shapeId === \"BuiltInUseRefId\";\n+}\n+\n export function getHookKind(env: Environment, id: Identifier): HookKind | null {\n const idType = id.type;\n if (idType.kind === \"Function\") {\ndiff --git a\/compiler\/forget\/src\/ReactiveScopes\/PropagateScopeDependencies.ts b\/compiler\/forget\/src\/ReactiveScopes\/PropagateScopeDependencies.ts\nindex 05bb66b133..460d630d2c 100644\n--- a\/compiler\/forget\/src\/ReactiveScopes\/PropagateScopeDependencies.ts\n+++ b\/compiler\/forget\/src\/ReactiveScopes\/PropagateScopeDependencies.ts\n@@ -11,6 +11,7 @@ import {\n IdentifierId,\n InstructionId,\n InstructionKind,\n+ isUseRefType,\n makeInstructionId,\n Place,\n ReactiveFunction,\n@@ -314,6 +315,14 @@ class Context {\n \n \/\/ Checks if identifier is a valid dependency in the current scope\n #checkValidDependency(maybeDependency: ReactiveScopeDependency): boolean {\n+ \/\/ ref.current access is not a valid dep\n+ if (\n+ isUseRefType(maybeDependency.identifier) &&\n+ maybeDependency.path.at(0) === \"current\"\n+ ) {\n+ return false;\n+ }\n+\n const identifier = maybeDependency.identifier;\n \/\/ If this operand is used in a scope, has a dynamic value, and was defined\n \/\/ before this scope, then its a dependency of the scope.\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-field-not-added-to-dep.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-field-not-added-to-dep.expect.md\nnew file mode 100644\nindex 0000000000..7a630ff951\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-field-not-added-to-dep.expect.md\n@@ -0,0 +1,46 @@\n+\n+## Input\n+\n+```javascript\n+function VideoTab() {\n+ const ref = useRef();\n+ let x = () => {\n+ ref.current.x;\n+ };\n+\n+ return ;\n+}\n+\n+```\n+\n+## Code\n+\n+```javascript\n+import { unstable_useMemoCache as useMemoCache } from \"react\";\n+function VideoTab() {\n+ const $ = useMemoCache(3);\n+ const ref = useRef();\n+ let t0;\n+ if ($[0] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ t0 = () => {\n+ ref.current.x;\n+ };\n+ $[0] = t0;\n+ } else {\n+ t0 = $[0];\n+ }\n+ const x = t0;\n+ const c_1 = $[1] !== x;\n+ let t1;\n+ if (c_1) {\n+ t1 = ;\n+ $[1] = x;\n+ $[2] = t1;\n+ } else {\n+ t1 = $[2];\n+ }\n+ return t1;\n+}\n+\n+```\n+ \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-field-not-added-to-dep.js b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-field-not-added-to-dep.js\nnew file mode 100644\nindex 0000000000..53d4489d8c\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-field-not-added-to-dep.js\n@@ -0,0 +1,8 @@\n+function VideoTab() {\n+ const ref = useRef();\n+ let x = () => {\n+ ref.current.x;\n+ };\n+\n+ return ;\n+}\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-not-added-to-dep-2.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-not-added-to-dep-2.expect.md\nnew file mode 100644\nindex 0000000000..3edc16158e\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-not-added-to-dep-2.expect.md\n@@ -0,0 +1,45 @@\n+\n+## Input\n+\n+```javascript\n+function Foo({ a }) {\n+ const ref = useRef();\n+ const x = { a, val: ref.current };\n+\n+ return ;\n+}\n+\n+```\n+\n+## Code\n+\n+```javascript\n+import { unstable_useMemoCache as useMemoCache } from \"react\";\n+function Foo(t18) {\n+ const $ = useMemoCache(4);\n+ const { a } = t18;\n+ const ref = useRef();\n+ const c_0 = $[0] !== a;\n+ let t0;\n+ if (c_0) {\n+ t0 = { a, val: ref.current };\n+ $[0] = a;\n+ $[1] = t0;\n+ } else {\n+ t0 = $[1];\n+ }\n+ const x = t0;\n+ const c_2 = $[2] !== x;\n+ let t1;\n+ if (c_2) {\n+ t1 = ;\n+ $[2] = x;\n+ $[3] = t1;\n+ } else {\n+ t1 = $[3];\n+ }\n+ return t1;\n+}\n+\n+```\n+ \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-not-added-to-dep-2.js b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-not-added-to-dep-2.js\nnew file mode 100644\nindex 0000000000..80ced49a9d\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-not-added-to-dep-2.js\n@@ -0,0 +1,6 @@\n+function Foo({ a }) {\n+ const ref = useRef();\n+ const x = { a, val: ref.current };\n+\n+ return ;\n+}\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-not-added-to-dep.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-not-added-to-dep.expect.md\nnew file mode 100644\nindex 0000000000..9f8e8a776d\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-not-added-to-dep.expect.md\n@@ -0,0 +1,46 @@\n+\n+## Input\n+\n+```javascript\n+function VideoTab() {\n+ const ref = useRef();\n+ let x = () => {\n+ ref.current;\n+ };\n+\n+ return ;\n+}\n+\n+```\n+\n+## Code\n+\n+```javascript\n+import { unstable_useMemoCache as useMemoCache } from \"react\";\n+function VideoTab() {\n+ const $ = useMemoCache(3);\n+ const ref = useRef();\n+ let t0;\n+ if ($[0] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ t0 = () => {\n+ ref.current;\n+ };\n+ $[0] = t0;\n+ } else {\n+ t0 = $[0];\n+ }\n+ const x = t0;\n+ const c_1 = $[1] !== x;\n+ let t1;\n+ if (c_1) {\n+ t1 = ;\n+ $[1] = x;\n+ $[2] = t1;\n+ } else {\n+ t1 = $[2];\n+ }\n+ return t1;\n+}\n+\n+```\n+ \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-not-added-to-dep.js b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-not-added-to-dep.js\nnew file mode 100644\nindex 0000000000..f3d6f574fe\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-not-added-to-dep.js\n@@ -0,0 +1,8 @@\n+function VideoTab() {\n+ const ref = useRef();\n+ let x = () => {\n+ ref.current;\n+ };\n+\n+ return ;\n+}\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-optional-field-no-added-to-dep.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-optional-field-no-added-to-dep.expect.md\nnew file mode 100644\nindex 0000000000..6fe9a28cbb\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-optional-field-no-added-to-dep.expect.md\n@@ -0,0 +1,46 @@\n+\n+## Input\n+\n+```javascript\n+function VideoTab() {\n+ const ref = useRef();\n+ let x = () => {\n+ ref.current?.x;\n+ };\n+\n+ return ;\n+}\n+\n+```\n+\n+## Code\n+\n+```javascript\n+import { unstable_useMemoCache as useMemoCache } from \"react\";\n+function VideoTab() {\n+ const $ = useMemoCache(3);\n+ const ref = useRef();\n+ let t0;\n+ if ($[0] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ t0 = () => {\n+ ref.current?.x;\n+ };\n+ $[0] = t0;\n+ } else {\n+ t0 = $[0];\n+ }\n+ const x = t0;\n+ const c_1 = $[1] !== x;\n+ let t1;\n+ if (c_1) {\n+ t1 = ;\n+ $[1] = x;\n+ $[2] = t1;\n+ } else {\n+ t1 = $[2];\n+ }\n+ return t1;\n+}\n+\n+```\n+ \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-optional-field-no-added-to-dep.js b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-optional-field-no-added-to-dep.js\nnew file mode 100644\nindex 0000000000..92b26a8f9c\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-optional-field-no-added-to-dep.js\n@@ -0,0 +1,8 @@\n+function VideoTab() {\n+ const ref = useRef();\n+ let x = () => {\n+ ref.current?.x;\n+ };\n+\n+ return ;\n+}\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-write-not-added-to-dep.expect.md b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-write-not-added-to-dep.expect.md\nnew file mode 100644\nindex 0000000000..6b6b95e201\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-write-not-added-to-dep.expect.md\n@@ -0,0 +1,46 @@\n+\n+## Input\n+\n+```javascript\n+function VideoTab() {\n+ const ref = useRef();\n+ let x = () => {\n+ ref.current = 1;\n+ };\n+\n+ return ;\n+}\n+\n+```\n+\n+## Code\n+\n+```javascript\n+import { unstable_useMemoCache as useMemoCache } from \"react\";\n+function VideoTab() {\n+ const $ = useMemoCache(3);\n+ const ref = useRef();\n+ let t0;\n+ if ($[0] === Symbol.for(\"react.memo_cache_sentinel\")) {\n+ t0 = () => {\n+ ref.current = 1;\n+ };\n+ $[0] = t0;\n+ } else {\n+ t0 = $[0];\n+ }\n+ const x = t0;\n+ const c_1 = $[1] !== x;\n+ let t1;\n+ if (c_1) {\n+ t1 = ;\n+ $[1] = x;\n+ $[2] = t1;\n+ } else {\n+ t1 = $[2];\n+ }\n+ return t1;\n+}\n+\n+```\n+ \n\\ No newline at end of file\ndiff --git a\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-write-not-added-to-dep.js b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-write-not-added-to-dep.js\nnew file mode 100644\nindex 0000000000..00b85bb682\n--- \/dev\/null\n+++ b\/compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-write-not-added-to-dep.js\n@@ -0,0 +1,8 @@\n+function VideoTab() {\n+ const ref = useRef();\n+ let x = () => {\n+ ref.current = 1;\n+ };\n+\n+ return ;\n+}\n","files":[{"status":"M","path":"compiler\/forget\/src\/HIR\/HIR.ts"},{"status":"M","path":"compiler\/forget\/src\/ReactiveScopes\/PropagateScopeDependencies.ts"},{"status":"A","path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-field-not-added-to-dep.expect.md"},{"status":"A","path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-field-not-added-to-dep.js"},{"status":"A","path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-not-added-to-dep-2.expect.md"},{"status":"A","path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-not-added-to-dep-2.js"},{"status":"A","path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-not-added-to-dep.expect.md"},{"status":"A","path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-not-added-to-dep.js"},{"status":"A","path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-optional-field-no-added-to-dep.expect.md"},{"status":"A","path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-optional-field-no-added-to-dep.js"},{"status":"A","path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-write-not-added-to-dep.expect.md"},{"status":"A","path":"compiler\/forget\/src\/__tests__\/fixtures\/compiler\/ref-current-write-not-added-to-dep.js"}],"parents":["1d536af4f74b1a4ca7385e1caff091d4423d70ab"]}

dillon1000/react

Files changed