reworked based on code review

BitPatty · Oct 3, 2023 · 19eee79 · 19eee79
1 parent 1366ff7
commit 19eee79
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 35 deletions.
diff --git a/src/param-builder.ts b/src/param-builder.ts
@@ -75,7 +75,7 @@ export type BuildOptions = {
   /**
    * Whether to append the path in plain.
    *
-   * Defaults to false. If true, encodes the path to a  base64url
+   * Defaults to false. If false, encodes the path to a base64url
    */
   plain?: boolean;
 
@@ -167,7 +167,10 @@ class ParamBuilder {
     if (path && plain) mods.push('plain', path);
     else mods.push(encodeFilePath(path));
 
-    const extension = options?.addExtension ? this.getExtention(path) : '';
+    let extension = '';
+    if (!plain && options?.addExtension) {
+      extension = this.getExtension();
+    }
 
     const res = mods.join('/') + extension;
 
@@ -191,18 +194,11 @@ class ParamBuilder {
    * @param path The path to the target image, e.g. `https://example.com/foo.png`
    * @returns An extension if found, or an empty string
    */
-  private getExtention(path: string): string {
-    let extension = '';
-
+  private getExtension(): string {
     const formatString = this.modifiers.get('format');
-    if (formatString) {
-      extension = `.${formatString.split(':').pop()}`;
-    } else {
-      const parts = path.split('.');
-      if (parts.length) extension = `.${parts.pop()}`;
-    }
+    if (!formatString) return '';
 
-    return extension;
+    return `.${formatString.split(':').pop()}`;
   }
 
   /**

diff --git a/test/chain.test.ts b/test/chain.test.ts
@@ -58,19 +58,6 @@ describe('Chain', () => {
     );
   });
 
-  test('Add Extension from path', () => {
-    expect(
-      pb().build({
-        path: 'test.png',
-        addExtension: true,
-        signature: {
-          key: '73757065722d7365637265742d6b6579', // super-secret-key
-          salt: '73757065722d7365637265742d73616c74', // super-secret-salt
-        },
-      }),
-    ).toEqual('/zxikHGnHjfY5KF1eksnwFQvqNtQa0bAqDRDJBwPoMNY/dGVzdC5wbmc.png');
-  });
-
   test('Add Extension from format', () => {
     expect(
       pb()
@@ -88,18 +75,21 @@ describe('Chain', () => {
     );
   });
 
-  test('Add Extension fallback', () => {
+  test('Do not Add Extension if plain', () => {
     expect(
-      pb().build({
-        path: 'testwithoutextension',
-        addExtension: true,
-        signature: {
-          key: '73757065722d7365637265742d6b6579', // super-secret-key
-          salt: '73757065722d7365637265742d73616c74', // super-secret-salt
-        },
-      }),
+      pb()
+        .format('webp')
+        .build({
+          path: 'test.png',
+          addExtension: true,
+          plain: true,
+          signature: {
+            key: '73757065722d7365637265742d6b6579', // super-secret-key
+            salt: '73757065722d7365637265742d73616c74', // super-secret-salt
+          },
+        }),
     ).toEqual(
-      '/NZqsjnAakEL_WYW3m0jRJmfzbVojINSNJD_ygU9VzFY/dGVzdHdpdGhvdXRleHRlbnNpb24.testwithoutextension',
+      '/pJaBmZSqwN__JanbIGi_nT57o0sA4YPkhkfn-SKZTEk/f:webp/plain/test.png',
     );
   });
 });