Merge pull request #19584 from emberjs/bugfix/hash-computed-chains-only

[BUGFIX lts] Ensure hash objects correctly entangle as dependencies v2
emberjs · Jun 21, 2021 · dec26de · dec26de
2 parents 55d012c + 03b20d8
commit dec26de
Show file tree

Hide file tree

Showing 4 changed files with 174 additions and 155 deletions.
diff --git a/package.json b/package.json
@@ -51,7 +51,7 @@
     "@babel/plugin-transform-block-scoping": "^7.8.3",
     "@babel/plugin-transform-object-assign": "^7.8.3",
     "@ember/edition-utils": "^1.2.0",
-    "@glimmer/vm-babel-plugins": "0.79.3",
+    "@glimmer/vm-babel-plugins": "0.79.4",
     "babel-plugin-debug-macros": "^0.3.3",
     "babel-plugin-filter-imports": "^4.0.0",
     "broccoli-concat": "^4.2.4",
@@ -76,19 +76,19 @@
   },
   "devDependencies": {
     "@babel/preset-env": "^7.9.5",
-    "@glimmer/compiler": "0.79.3",
-    "@glimmer/destroyable": "0.79.3",
+    "@glimmer/compiler": "0.79.4",
+    "@glimmer/destroyable": "0.79.4",
     "@glimmer/env": "^0.1.7",
-    "@glimmer/global-context": "0.79.3",
-    "@glimmer/interfaces": "0.79.3",
-    "@glimmer/manager": "0.79.3",
-    "@glimmer/node": "0.79.3",
-    "@glimmer/opcode-compiler": "0.79.3",
-    "@glimmer/owner": "0.79.3",
-    "@glimmer/program": "0.79.3",
-    "@glimmer/reference": "0.79.3",
-    "@glimmer/runtime": "0.79.3",
-    "@glimmer/validator": "0.79.3",
+    "@glimmer/global-context": "0.79.4",
+    "@glimmer/interfaces": "0.79.4",
+    "@glimmer/manager": "0.79.4",
+    "@glimmer/node": "0.79.4",
+    "@glimmer/opcode-compiler": "0.79.4",
+    "@glimmer/owner": "0.79.4",
+    "@glimmer/program": "0.79.4",
+    "@glimmer/reference": "0.79.4",
+    "@glimmer/runtime": "0.79.4",
+    "@glimmer/validator": "0.79.4",
     "@simple-dom/document": "^1.4.0",
     "@types/qunit": "^2.11.1",
     "@types/rsvp": "^4.0.3",

diff --git a/...@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js b/...@ember/-internals/glimmer/tests/integration/components/link-to/query-params-angle-test.js
@@ -350,6 +350,30 @@ moduleFor(
       assert.equal(theLink.attr('href'), '/?foo=ASL');
     }
 
+    async ['@test supplied QP properties can be bound in legacy components'](assert) {
+      expectDeprecation(/Passing the `@tagName` argument to/);
+
+      this.addTemplate(
+        'index',
+        `
+          <LinkTo @tagName="a" id="the-link" @query={{hash foo=this.boundThing}}>
+            Index
+          </LinkTo>
+        `
+      );
+
+      await this.visit('/');
+
+      let indexController = this.getController('index');
+      let theLink = this.$('#the-link');
+
+      assert.equal(theLink.attr('href'), '/?foo=OMG');
+
+      runTask(() => indexController.set('boundThing', 'ASL'));
+
+      assert.equal(theLink.attr('href'), '/?foo=ASL');
+    }
+
     async ['@test supplied QP properties can be bound (booleans)'](assert) {
       this.addTemplate(
         'index',

diff --git a/packages/@ember/-internals/metal/lib/chain-tags.ts b/packages/@ember/-internals/metal/lib/chain-tags.ts
@@ -1,6 +1,7 @@
 import { Meta, meta as metaFor, peekMeta } from '@ember/-internals/meta';
 import { isObject } from '@ember/-internals/utils';
 import { assert, deprecate } from '@ember/debug';
+import { isHashProxy } from '@glimmer/runtime';
 import { _WeakSet } from '@glimmer/util';
 import {
   combine,
@@ -16,7 +17,7 @@ import { tagForProperty } from './tags';
 
 export const CHAIN_PASS_THROUGH = new _WeakSet();
 
-export function finishLazyChains(meta: Meta, key: string, value: any) {
+export function finishLazyChains(meta: Meta, key: string, value: unknown): void {
   let lazyTags = meta.readableLazyChainsFor(key);
 
   if (lazyTags === undefined) {
@@ -173,20 +174,6 @@ function getChainTags(
 
     chainTags.push(propertyTag);
 
-    // If we're at the end of the path, processing the last segment, and it's
-    // not an alias, we should _not_ get the last value, since we already have
-    // its tag. There's no reason to access it and do more work.
-    if (segmentEnd === pathLength) {
-      // If the key was an alias, we should always get the next value in order to
-      // bootstrap the alias. This is because aliases, unlike other CPs, should
-      // always be in sync with the aliased value.
-      if (CHAIN_PASS_THROUGH.has(descriptor)) {
-        // tslint:disable-next-line: no-unused-expression
-        current[segment];
-      }
-      break;
-    }
-
     if (descriptor === undefined) {
       // If the descriptor is undefined, then its a normal property, so we should
       // lookup the value to chain off of like normal.
@@ -223,8 +210,16 @@ function getChainTags(
       }
     }
 
-    if (!isObject(current)) {
+    if (segmentEnd === pathLength || !isObject(current)) {
       // we've hit the end of the chain for now, break out
+
+      // If the last value is a HashProxy, then entangle all of its tags
+      if (isHashProxy(current)) {
+        for (let key in current) {
+          chainTags.push(tagForProperty(current, key));
+        }
+      }
+
       break;
     }