add extension to return value

dfrankland · Aug 7, 2019 · cfaef0a · cfaef0a
1 parent d51340b
commit cfaef0a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/src/__tests__/react-amphtml.spec.tsx b/src/__tests__/react-amphtml.spec.tsx
@@ -64,11 +64,13 @@ describe('react-amphtml', (): void => {
     const ampScriptSources = ampScripts.getScripts();
 
     expect(ampScriptSources).toEqual(
-      expect.arrayContaining([
-        'https://cdn.ampproject.org/v0/amp-youtube-latest.js',
-        'https://cdn.ampproject.org/v0/amp-script-latest.js',
-        'https://cdn.ampproject.org/v0/amp-accordion-latest.js',
-      ]),
+      expect.arrayContaining(
+        [
+          'https://cdn.ampproject.org/v0/amp-youtube-latest.js',
+          'https://cdn.ampproject.org/v0/amp-script-latest.js',
+          'https://cdn.ampproject.org/v0/amp-accordion-latest.js',
+        ].map((src): any => expect.objectContaining({ src })),
+      ),
     );
   });
 
@@ -87,7 +89,9 @@ describe('react-amphtml', (): void => {
     const ampScriptsSources = ampScripts.getScripts();
     expect(ampScriptsSources).toEqual(
       expect.arrayContaining([
-        'https://cdn.ampproject.org/v0/amp-mustache-0.2.js',
+        expect.objectContaining({
+          src: 'https://cdn.ampproject.org/v0/amp-mustache-0.2.js',
+        }),
       ]),
     );
   });

diff --git a/src/setup/AmpScripts.tsx b/src/setup/AmpScripts.tsx
@@ -3,6 +3,11 @@ import { Script, ScriptProps } from '../amphtml/amphtml';
 import { getScriptSource } from '../amphtml/components/Script';
 import { AMP, AMP_SRCS, Formats } from '../constants';
 
+export interface ScriptSource {
+  src: string;
+  extension: string;
+}
+
 export default class AmpScripts {
   private scripts: Map<string, ScriptProps>;
 
@@ -28,10 +33,13 @@ export default class AmpScripts {
     this.scripts.set(extension, { specName: extension, version });
   }
 
-  public getScripts(): string[] {
+  public getScripts(): ScriptSource[] {
     return Array.from(this.scripts.values()).map(
-      ({ specName, version, src }): string => {
-        return getScriptSource({ extension: specName, version, src });
+      ({ specName, version, src }): ScriptSource => {
+        return {
+          src: getScriptSource({ extension: specName, version, src }),
+          extension: specName,
+        };
       },
     );
   }