Merge pull request #1156 from embroider-build/macro-exception

fix exception in macros babel plugin
embroider-build · Mar 8, 2022 · cf9a93b · cf9a93b
2 parents 8ec7098 + b2ea3f3
commit cf9a93b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/packages/macros/src/babel/evaluate-json.ts b/packages/macros/src/babel/evaluate-json.ts
@@ -222,6 +222,9 @@ export class Evaluator {
 
     if (path.isObjectExpression()) {
       let props = assertArray(path.get('properties')).map(p => {
+        if (p.isSpreadElement()) {
+          return [{ confident: false }, { confident: false }];
+        }
         let key = assertNotArray(p.get('key'));
         let keyEvalValue = this.evaluateKey(key);
         let value = assertNotArray(p.get('value'));

diff --git a/packages/macros/tests/babel/eval.test.ts b/packages/macros/tests/babel/eval.test.ts
@@ -23,6 +23,11 @@ describe('evaluation', function () {
           expect(code).toMatch(`result = 42`);
         });
 
+        test('object literal non-nullish member access parses OK', () => {
+          let code = transform(`const result = { ...content\n}?.[0].content;`);
+          expect(code).toMatch(`const result = { ...content\n}?.[0].content;`);
+        });
+
         test('optional chaining nullish member access', () => {
           let code = transform(`const result = knownUndefinedValue?.x;`);
           expect(code).toMatch(`result = undefined`);