Merge pull request #1269 from glimmerjs/bugfix/fix-get-helper-on-non-…

…objects [BUGFIX] Fix {{get}} when used on non-objects
glimmerjs · Feb 15, 2021 · 4b69798 · 4b69798
2 parents 1a54cba + 7ebdc05
commit 4b69798
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 7 deletions.
diff --git a/packages/@glimmer/integration-tests/lib/modes/env.ts b/packages/@glimmer/integration-tests/lib/modes/env.ts
@@ -114,7 +114,7 @@ setGlobalContext({
     let current: unknown = obj;
 
     for (let part of parts) {
-      if (typeof current === 'function' || (typeof current === 'object' && current !== null)) {
+      if (current !== null && current !== undefined) {
         current = (current as Record<string, unknown>)[part];
       }
     }

diff --git a/packages/@glimmer/integration-tests/test/helpers/get-test.ts b/packages/@glimmer/integration-tests/test/helpers/get-test.ts
@@ -406,6 +406,39 @@ class GetTest extends RenderTest {
     this.rerender({ age: 30 });
     this.assertHTML('miguelandrade30');
   }
+
+  @test
+  'should be able to get string length with a static key'() {
+    this.render(`[{{get this.name 'length'}}] [{{if true (get this.name 'length')}}]`, {
+      name: 'Tomster',
+    });
+
+    this.assertHTML('[7] [7]');
+    this.assertStableRerender();
+
+    this.rerender({ name: 'Zoey' });
+    this.assertHTML('[4] [4]');
+
+    this.rerender({ name: 'Tomster' });
+    this.assertHTML('[7] [7]');
+  }
+
+  @test
+  'should be able to get string length with a bound/dynamic key'() {
+    this.render(`[{{get this.name this.key}}] [{{if true (get this.name this.key)}}]`, {
+      name: 'Tomster',
+      key: 'length',
+    });
+
+    this.assertHTML('[7] [7]');
+    this.assertStableRerender();
+
+    this.rerender({ key: 'foo' });
+    this.assertHTML('[] []');
+
+    this.rerender({ name: 'Zoey', key: 'length' });
+    this.assertHTML('[4] [4]');
+  }
 }
 
 jitSuite(GetTest);
diff --git a/packages/@glimmer/runtime/lib/helpers/get.ts b/packages/@glimmer/runtime/lib/helpers/get.ts
@@ -1,6 +1,7 @@
 import { getPath, setPath } from '@glimmer/global-context';
 import { VMArguments } from '@glimmer/interfaces';
 import { createComputeRef, valueForRef } from '@glimmer/reference';
+import { isDict } from '@glimmer/util';
 import { internalHelper } from './internal-helper';
 
 /**
@@ -88,21 +89,17 @@ export default internalHelper((args: VMArguments) => {
     () => {
       let source = valueForRef(sourceRef);
 
-      if (isObject(source)) {
+      if (isDict(source)) {
         return getPath(source, String(valueForRef(pathRef)));
       }
     },
     (value) => {
       let source = valueForRef(sourceRef);
 
-      if (isObject(source)) {
+      if (isDict(source)) {
         return setPath(source, String(valueForRef(pathRef)), value);
       }
     },
     'get'
   );
 });
-
-function isObject(obj: unknown): obj is object {
-  return typeof obj === 'function' || (typeof obj === 'object' && obj !== null);
-}