Ignore other options when onlyPresets is true

Author: 11bit

src/methods/generateImageInfoUrl.test.ts

@@ -98,4 +98,20 @@ describe("generateImageInfoUrl", () => {
       )
     ).toEqual("/test:test2/plain/https://example.com/host/pic.png");
   });
+
+  it("should ignore other options with `onlyPresets` setting", () => {
+    expect(
+      generateUrl(
+        { value: "https://example.com/host/pic.png", type: "plain" },
+        {
+          preset: ["test", "test2"],
+          crop: {
+            width: 100,
+            height: 100,
+          },
+        },
+        { onlyPresets: true }
+      )
+    ).toEqual("/test:test2/plain/https://example.com/host/pic.png");
+  });
 });

src/methods/generateImageInfoUrl.ts

@@ -14,6 +14,9 @@ export type URLImageInfo = {
   type: "plain" | "base64" | "encrypted";
 };
 
+const allModules = Object.values(optionModules);
+const presetOnlyModule = [optionModules.preset];
+
 const generateImageInfoUrl = (
   url: URLImageInfo,
   options?: OptionsImageInfo,
@@ -29,7 +32,9 @@ const generateImageInfoUrl = (
 
   let optsPart = "";
   if (options) {
-    for (const [, optionModule] of Object.entries(optionModules)) {
+    const modules = settings?.onlyPresets ? presetOnlyModule : allModules;
+
+    for (const optionModule of modules) {
       if (optionModule.test(options)) {
         optsPart += "/";
         optsPart += optionModule.build(options, settings);

src/methods/generateUrl.test.ts

@@ -70,4 +70,27 @@ describe("generateUrl", () => {
       "/bl:5/el:t/ex:t:nowe::5/f:webp/h:150/q:80/w:150/z:1.5/plain/https://example.com/host/pic.png"
     );
   });
+
+  it("should work with `onlyPresets` setting", () => {
+    expect(
+      generateUrl(
+        { value: "https://example.com/host/pic.png", type: "plain" },
+        {
+          preset: ["preset1", "preset2"],
+          width: 150,
+          height: 150,
+          format: "webp",
+          quality: 80,
+          enlarge: "t",
+          extend: {
+            extend: 1,
+            gravity: { type: "nowe", y_offset: 5 },
+          },
+          blur: 5,
+          zoom: 1.5,
+        },
+        { onlyPresets: true }
+      )
+    ).toEqual("/preset1:preset2/plain/https://example.com/host/pic.png");
+  });
 });

src/methods/generateUrl.ts

@@ -10,6 +10,9 @@ const correctUrlTypes = {
   encrypted: true,
 };
 
+const allModules = Object.values(optionModules);
+const presetOnlyModule = [optionModules.preset];
+
 const generateUrl = (
   url: URLImageInfo,
   options?: Options,
@@ -25,7 +28,9 @@ const generateUrl = (
 
   let optsPart = "";
   if (options) {
-    for (const [, optionModule] of Object.entries(optionModules)) {
+    const modules = settings?.onlyPresets ? presetOnlyModule : allModules;
+
+    for (const optionModule of modules) {
       if (optionModule.test(options)) {
         optsPart += "/";
         optsPart += optionModule.build(options, settings);