fix(amplify-velocity-template): support 'get' and 'set' of array vars

The implementation of set and get methods of an array in velocity is not working like in the real
environment.

fix is based on shepherdwind/velocity.js#133

fix aws-amplify#5741

packages/amplify-velocity-template/src/compile/references.js

@@ -83,7 +83,7 @@ module.exports = function(Velocity, utils) {
         function(key) {
           this.config.unescape[key] = true;
         },
-        this
+        this,
       );
     },
 
@@ -132,7 +132,7 @@ module.exports = function(Velocity, utils) {
             // 第三个参数，返回后面的参数ast
             ret = this.getAttributes(property, ret, ast);
           },
-          this
+          this,
         );
       }
 
@@ -164,7 +164,7 @@ module.exports = function(Velocity, utils) {
 
           return false;
         },
-        this
+        this,
       );
 
       return {
@@ -226,20 +226,23 @@ module.exports = function(Velocity, utils) {
       var id = property.id;
       var ret = '';
 
-      // getter 处理
-      if (id.indexOf('get') === 0 && !(id in baseRef)) {
-        if (id.length === 3) {
-          // get('address')
-          ret = getter(baseRef, this.getLiteral(property.args[0]));
-        } else {
-          // getAddress()
-          ret = getter(baseRef, id.slice(3));
-        }
+      // get(xxx)
+      if (id === 'get' && !(id in baseRef)) {
+        return getter(baseRef, this.getLiteral(property.args[0]));
+      }
 
-        return ret;
+      if (id === 'set' && !(id in baseRef)) {
+        baseRef[this.getLiteral(property.args[0])] = this.getLiteral(property.args[1]);
+        return '';
+      }
+
+      // getter for example: getAddress()
+      if (id.indexOf('get') === 0 && !(id in baseRef)) {
+        return getter(baseRef, id.slice(3));
+      }
 
-        // setter 处理
-      } else if (id.indexOf('set') === 0 && !baseRef[id]) {
+      // setter 处理
+      if (id.indexOf('set') === 0 && !baseRef[id]) {
         baseRef[id.slice(3)] = this.getLiteral(property.args[0]);
         // $page.setName(123)
         baseRef.toString = function() {
@@ -263,6 +266,24 @@ module.exports = function(Velocity, utils) {
         return (baseRef[this.getLiteral(property.args[0])] = this.getLiteral(property.args[1]));
       } else if (id === 'add' && !baseRef[id] && typeof baseRef.push === 'function') {
         return baseRef.push(this.getLiteral(property.args[0]));
+      } else if (id === 'remove') {
+        if (utils.isArray(baseRef)) {
+          if (typeof index === 'number') {
+            var index = this.getLiteral(property.args[0]);
+          } else {
+            var index = baseRef.indexOf(this.getLiteral(property.args[0]));
+          }
+
+          ret = baseRef[index];
+          baseRef.splice(index, 1);
+          return ret;
+        } else if (utils.isObject(baseRef)) {
+          ret = baseRef[this.getLiteral(property.args[0])];
+          delete baseRef[this.getLiteral(property.args[0])];
+          return ret;
+        }
+
+        return undefined;
       } else if (id === 'subList' && !baseRef[id]) {
         return baseRef.slice(this.getLiteral(property.args[0]), this.getLiteral(property.args[1]));
       } else {
@@ -274,7 +295,7 @@ module.exports = function(Velocity, utils) {
           function(exp) {
             args.push(this.getLiteral(exp));
           },
-          this
+          this,
         );
 
         if (ret && ret.call) {
@@ -291,10 +312,10 @@ module.exports = function(Velocity, utils) {
           } catch (e) {
             var pos = ast.pos;
             var text = Velocity.Helper.getRefText(ast);
-            var err = ' on ' + text + ' at Line number ' + pos.first_line + ':' + pos.first_column;
+            var err = ' on ' + text + ' at L/N ' + pos.first_line + ':' + pos.first_column;
             e.name = '';
             e.message += err;
-            throw e;
+            throw new Error(e);
           }
         } else {
           this._throw(ast, property, 'TypeError');

packages/amplify-velocity-template/tests/compile.js

@@ -29,7 +29,7 @@ describe('Compile', function() {
             address: 'bar',
             Address: 'foo',
           },
-        })
+        }),
       );
 
       assert.equal('bar bar', render(vm1, { customer: { address: 'bar' } }));
@@ -40,7 +40,7 @@ describe('Compile', function() {
             Address: 'bar',
             address: 'foo',
           },
-        })
+        }),
       );
     });
 
@@ -52,7 +52,7 @@ describe('Compile', function() {
           foo: function() {
             return { bar: 'hello' };
           },
-        })
+        }),
       );
 
       assert.equal(
@@ -61,7 +61,7 @@ describe('Compile', function() {
           foo: function() {
             return 'foo';
           },
-        })
+        }),
       );
     });
 
@@ -214,7 +214,7 @@ describe('Compile', function() {
             values.push(value);
             return 'foo';
           },
-        }
+        },
       );
       assert.deepEqual(values, ['bar']);
       assert.equal(ret.trim(), 'foo');
@@ -471,7 +471,7 @@ describe('Compile', function() {
 
       assert.throws(function() {
         compile.render(context);
-      }, /Line number 3:0/);
+      }, /L\/N 3:0/);
     });
 
     it('print error stack of user-defined macro', function() {
@@ -601,7 +601,7 @@ describe('Compile', function() {
         '\nThis content is ignored. $val\n',
         render(vm, {
           val: 'foo',
-        })
+        }),
       );
     });
 
@@ -611,7 +611,7 @@ describe('Compile', function() {
         'This content is ignored. $val\na',
         render(vm, {
           val: 'foo',
-        })
+        }),
       );
     });
   });
@@ -639,7 +639,7 @@ describe('Compile', function() {
             },
           },
         }).trim(),
-        expected
+        expected,
       );
     });
   });
@@ -770,7 +770,7 @@ describe('Compile', function() {
             key3: { key4: 'value4' },
           },
         }),
-        expected
+        expected,
       );
     });