feat(amplify-appsync-simulator): use mapper.map to convert to JavaString

aws-amplify · Jul 2, 2021 · 3e9b235 · 3e9b235
1 parent 5c9172a
commit 3e9b235
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 13 deletions.
diff --git a/packages/amplify-appsync-simulator/src/__tests__/velocity/value-mapper/map.test.ts b/packages/amplify-appsync-simulator/src/__tests__/velocity/value-mapper/map.test.ts
@@ -1,6 +1,7 @@
 import { JavaArray } from './../../../velocity/value-mapper/array';
 import { JavaMap } from '../../../velocity/value-mapper/map';
-import { toJavaString } from '../../../velocity/value-mapper/string';
+import { JavaString } from '../../../velocity/value-mapper/string';
+import { map as mapper } from '../../../velocity/value-mapper/mapper';
 
 describe('JavaMap', () => {
   let identityMapper = jest.fn().mockImplementation(val => val);
@@ -71,7 +72,7 @@ describe('JavaMap', () => {
   it('keySet returns a JavaArray with each element of type JavaString', () => {
     const obj = { foo: 'Foo Value', bar: 'Bar Value' };
     const map = new JavaMap(obj, identityMapper);
-    expect(map.keySet()).toEqual(new JavaArray([toJavaString('foo'), toJavaString('bar')], toJavaString));
+    expect(map.keySet()).toEqual(new JavaArray([new JavaString('foo'), new JavaString('bar')], mapper));
   });
 
   it('put', () => {

diff --git a/packages/amplify-appsync-simulator/src/__tests__/velocity/value-mapper/string.test.ts b/packages/amplify-appsync-simulator/src/__tests__/velocity/value-mapper/string.test.ts
@@ -1,4 +1,4 @@
-import { JavaString, toJavaString } from '../../../velocity/value-mapper/string';
+import { JavaString } from '../../../velocity/value-mapper/string';
 
 describe('JavaString', () => {
   it('replaceAll', () => {
@@ -131,8 +131,4 @@ describe('JavaString', () => {
     const str4 = new JavaString('foo bar      ');
     expect(str4.trim().toString()).toEqual('foo bar');
   });
-  it('toJavaString', () => {
-    const str = toJavaString('foo bar');
-    expect(str instanceof JavaString).toBeTruthy();
-  });
 });
diff --git a/packages/amplify-appsync-simulator/src/velocity/value-mapper/map.ts b/packages/amplify-appsync-simulator/src/velocity/value-mapper/map.ts
@@ -1,6 +1,6 @@
 import { JavaArray } from './array';
-import { toJavaString } from './string';
 import { toJSON } from './to-json';
+import { map } from './mapper';
 
 export class JavaMap {
   private map: Map<string, any>;
@@ -57,7 +57,8 @@ export class JavaMap {
   }
 
   keySet() {
-    return new JavaArray(Array.from(this.map.keys()).map(toJavaString), toJavaString);
+    console.log('keyset')
+    return map(Array.from(this.map.keys()));
   }
 
   put(key, value) {

diff --git a/packages/amplify-appsync-simulator/src/velocity/value-mapper/string.ts b/packages/amplify-appsync-simulator/src/velocity/value-mapper/string.ts
@@ -107,7 +107,3 @@ export class JavaString {
     return this.value && this.value.length;
   }
 }
-/**
- * Mapper function to convert string to JavaString
- */
-export const toJavaString = (value: string): JavaString => new JavaString(value);