@uxf/resizer 11.11.3 → 11.32.0

package/index.js

@@ -58,8 +58,8 @@ const getQuality = ({ quality }) => (quality && quality !== "x" ? Number(quality
 const getWidth = ({ width }) => (width && width !== "x" ? Number(width) : undefined);
 const getHeight = ({ height }) => (height && height !== "x" ? Number(height) : undefined);
 const getBackground = ({ background }) => background === undefined ? undefined : background === "t" ? "transparent" : `#${background}`;
-const getFit = ({ fit }) => { var _a; return (fit ? (_a = FIT_OPTIONS[fit]) !== null && _a !== void 0 ? _a : "cover" : "cover"); };
-const getPosition = ({ position }) => { var _a; return (position ? (_a = POSITION_OPTIONS[position]) !== null && _a !== void 0 ? _a : "centre" : undefined); };
+const getFit = ({ fit }) => { var _a; return (fit ? ((_a = FIT_OPTIONS[fit]) !== null && _a !== void 0 ? _a : "cover") : "cover"); };
+const getPosition = ({ position }) => { var _a; return (position ? ((_a = POSITION_OPTIONS[position]) !== null && _a !== void 0 ? _a : "centre") : undefined); };
 const getWithoutEnlargement = ({ extension }) => extension !== "svg";
 const getTrim = ({ trim }) => (trim === undefined || trim === "nt" ? undefined : Number(trim));
 const resizerMiddleware = (config) => {

package/index.ts

@@ -38,8 +38,8 @@ const getWidth = ({ width }: any) => (width && width !== "x" ? Number(width) : u
 const getHeight = ({ height }: any) => (height && height !== "x" ? Number(height) : undefined);
 const getBackground = ({ background }: any) =>
     background === undefined ? undefined : background === "t" ? "transparent" : `#${background}`;
-const getFit = ({ fit }: any): keyof FitEnum => (fit ? FIT_OPTIONS[fit] ?? "cover" : "cover");
-const getPosition = ({ position }: any) => (position ? POSITION_OPTIONS[position] ?? "centre" : undefined);
+const getFit = ({ fit }: any): keyof FitEnum => (fit ? (FIT_OPTIONS[fit] ?? "cover") : "cover");
+const getPosition = ({ position }: any) => (position ? (POSITION_OPTIONS[position] ?? "centre") : undefined);
 const getWithoutEnlargement = ({ extension }: any) => extension !== "svg";
 const getTrim = ({ trim }: any) => (trim === undefined || trim === "nt" ? undefined : Number(trim));
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/resizer",
-  "version": "11.11.3",
+  "version": "11.32.0",
   "main": "index.js",
   "description": "UXF Resizer",
   "author": "UXFans <dev@uxf.cz>",
@@ -16,8 +16,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "express": "4.18.3",
-    "path-to-regexp": "6.2.1",
+    "express": "4.19.2",
+    "path-to-regexp": "6.2.2",
     "process": "0.11.10",
     "sharp": "0.32.6",
     "yargs": "17.7.2"

package/utils/get-source-filename.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSourceFilename = void 0;
+exports.getSourceFilename = getSourceFilename;
 const path_to_regexp_1 = require("path-to-regexp");
 const log_1 = require("./log");
 const parse_http_source_1 = require("./parse-http-source");
@@ -19,4 +19,3 @@ function getSourceFilename(source, params) {
     }
     return (0, path_to_regexp_1.compile)(source, {})(repairedParams);
 }
-exports.getSourceFilename = getSourceFilename;

package/utils/log.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.log = void 0;
+exports.log = log;
 function log(message) {
     // eslint-disable-next-line no-console
     console.log(message);
 }
-exports.log = log;

package/utils/parse-http-source.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseHttpSource = void 0;
+exports.parseHttpSource = parseHttpSource;
 function parseHttpSource(source) {
     var _a;
-    return (_a = /^(?<protocol>http|https):\/\/(?<domain>.*)\/(?<path>.*)$/.exec(source)) === null || _a === void 0 ? void 0 : _a.groups;
+    return (_a = /^(?<protocol>http|https):\/\/(?<domain>[^/]*)\/(?<path>.*)$/.exec(source)) === null || _a === void 0 ? void 0 : _a.groups;
 }
-exports.parseHttpSource = parseHttpSource;

package/utils/parse-http-source.test.js

@@ -12,6 +12,11 @@ test("parse source", () => {
         domain: "localhost:3000",
         path: ":filename+.:extension",
     });
+    expect((0, parse_http_source_1.parseHttpSource)("http://localhost:3000/test/:filename+.:extension")).toEqual({
+        protocol: "http",
+        domain: "localhost:3000",
+        path: "test/:filename+.:extension",
+    });
     expect((0, parse_http_source_1.parseHttpSource)("https://:url/:filename+.:extension")).toEqual({
         protocol: "https",
         domain: ":url",

package/utils/parse-http-source.test.ts

@@ -11,6 +11,11 @@ test("parse source", () => {
         domain: "localhost:3000",
         path: ":filename+.:extension",
     });
+    expect(parseHttpSource("http://localhost:3000/test/:filename+.:extension")).toEqual({
+        protocol: "http",
+        domain: "localhost:3000",
+        path: "test/:filename+.:extension",
+    });
     expect(parseHttpSource("https://:url/:filename+.:extension")).toEqual({
         protocol: "https",
         domain: ":url",

package/utils/parse-http-source.ts

@@ -5,5 +5,5 @@ interface Result {
 }
 
 export function parseHttpSource(source: string): Result | undefined {
-    return /^(?<protocol>http|https):\/\/(?<domain>.*)\/(?<path>.*)$/.exec(source)?.groups as Result | undefined;
+    return /^(?<protocol>http|https):\/\/(?<domain>[^/]*)\/(?<path>.*)$/.exec(source)?.groups as Result | undefined;
 }