@uxf/resizer 11.125.0 → 11.129.0

package/src/utils/tools.test.ts

@@ -0,0 +1,48 @@
+import { getBackground, getFit, getHeight, getPosition, getQuality, getTrim, getWidth, Params } from "./tools";
+
+const minimal: Params = {
+    width: "146",
+    height: "100",
+    fit: undefined,
+    position: undefined,
+    background: undefined,
+    trim: undefined,
+    quality: undefined,
+    filename: "logo",
+    extension: "png",
+    toFormat: "avif",
+    p1: undefined,
+    p2: undefined,
+    namespace: undefined,
+};
+
+test("a route without the optional parameters falls back to defaults", () => {
+    expect(getWidth(minimal)).toBe(146);
+    expect(getHeight(minimal)).toBe(100);
+    expect(getFit(minimal)).toBe("cover");
+    expect(getPosition(minimal)).toBeUndefined();
+    expect(getBackground(minimal)).toBe("transparent");
+    expect(getTrim(minimal)).toBeUndefined();
+    expect(getQuality(minimal)).toBeUndefined();
+});
+
+test("explicit parameters are mapped", () => {
+    const params: Params = {
+        ...minimal,
+        width: "x",
+        fit: "cn",
+        position: "lt",
+        background: "t",
+        trim: "10",
+        quality: "75",
+    };
+
+    expect(getWidth(params)).toBeUndefined();
+    expect(getFit(params)).toBe("contain");
+    expect(getPosition(params)).toBe("left top");
+    expect(getBackground(params)).toBe("transparent");
+    expect(getTrim(params)).toBe(10);
+    expect(getQuality(params)).toBe(75);
+    expect(getBackground({ ...minimal, background: "ff0000" })).toBe("#ff0000");
+    expect(getTrim({ ...minimal, trim: "nt" })).toBeUndefined();
+});

package/src/utils/tools.ts

@@ -29,14 +29,14 @@ export const CONTENT_TYPES: Record<string, string | undefined> = {
     jpeg: "image/jpeg",
 };
 
-export interface Params {
-    width: string;
-    height: string;
-    fit: string;
-    position: string;
-    background: string;
-    trim: string;
-    quality: string;
+export type Params = {
+    width: string | undefined;
+    height: string | undefined;
+    fit: string | undefined;
+    position: string | undefined;
+    background: string | undefined;
+    trim: string | undefined;
+    quality: string | undefined;
     filename: string;
     extension: string;
     toFormat: string;
@@ -44,13 +44,14 @@ export interface Params {
     p1: string | undefined;
     p2: string | undefined;
     namespace: string | undefined;
-}
+};
 
 export const getQuality = ({ quality }: Params) => (quality && quality !== "x" ? Number(quality) : undefined);
 export const getWidth = ({ width }: Params) => (width && width !== "x" ? Number(width) : undefined);
 export const getHeight = ({ height }: Params) => (height && height !== "x" ? Number(height) : undefined);
-export const getBackground = ({ background }: Params) => (background === "t" ? "transparent" : `#${background}`);
+export const getBackground = ({ background: bg }: Params) =>
+    bg === undefined || bg === "t" ? "transparent" : `#${bg}`;
 export const getFit = ({ fit }: Params): keyof FitEnum => (fit ? (FIT_OPTIONS[fit] ?? "cover") : "cover");
 export const getPosition = ({ position }: Params) => (position ? (POSITION_OPTIONS[position] ?? "centre") : undefined);
 export const getWithoutEnlargement = ({ extension }: Params) => extension !== "svg";
-export const getTrim = ({ trim }: Params) => (trim === "nt" ? undefined : Number(trim));
+export const getTrim = ({ trim }: Params) => (trim === undefined || trim === "nt" ? undefined : Number(trim));

package/src/middleware.d.ts

@@ -1,5 +0,0 @@
-export type Config = Array<{
-    route: string;
-    source: string;
-}>;
-export declare const resizerMiddleware: (config: Config) => import("express-serve-static-core").Router;

package/src/middleware.js

@@ -1,92 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resizerMiddleware = void 0;
-const express_1 = require("express");
-const fs = __importStar(require("fs"));
-const fs_1 = require("fs");
-const path_1 = require("path");
-const get_source_filename_1 = require("./utils/get-source-filename");
-const image_converter_1 = require("./utils/image-converter");
-const log_1 = require("./utils/log");
-const tools_1 = require("./utils/tools");
-const resizerMiddleware = (config) => {
-    const middleware = (0, express_1.Router)();
-    config.forEach((c, i) => {
-        (0, log_1.log)(`Config #${i + 1}:`);
-        (0, log_1.log)(`    Route:  ${c.route}`);
-        (0, log_1.log)(`    Source: ${c.source}`);
-        middleware.get(c.route, async (req, res) => {
-            var _a, _b;
-            try {
-                (0, log_1.log)("----------------------------------------");
-                const params = req.params;
-                const generatedFilename = ((_a = process.env.UXF_RESIZER_GENERATE_PATH) !== null && _a !== void 0 ? _a : process.cwd()) + req.path;
-                (0, log_1.log)(`Generated filename: ${generatedFilename}`);
-                if ((0, fs_1.existsSync)(generatedFilename)) {
-                    return res.sendFile(generatedFilename);
-                }
-                const generatedDirectory = (0, path_1.dirname)(generatedFilename);
-                if (!(0, fs_1.existsSync)(generatedDirectory)) {
-                    (0, fs_1.mkdirSync)(generatedDirectory, { recursive: true });
-                }
-                const sourceFilename = (0, get_source_filename_1.getSourceFilename)(c.source, params);
-                (0, log_1.log)(`Source filename:    ${sourceFilename}`);
-                const sourceFile = /^(http|https)/.test(sourceFilename)
-                    ? await fetch(sourceFilename).then((response) => response.arrayBuffer())
-                    : sourceFilename;
-                if (params.toFormat === "svg") {
-                    fs.writeFileSync(generatedFilename, sourceFile instanceof ArrayBuffer ? Buffer.from(sourceFile) : sourceFile);
-                    return res.sendFile(generatedFilename, {
-                        headers: {
-                            "Content-Type": "image/svg+xml",
-                        },
-                    });
-                }
-                const headers = {
-                    "Content-Type": (_b = tools_1.CONTENT_TYPES[params.toFormat]) !== null && _b !== void 0 ? _b : "image/jpeg",
-                };
-                await (0, image_converter_1.convertImage)(sourceFile, generatedFilename, params);
-                return res.sendFile(generatedFilename, { headers });
-            }
-            catch (e) {
-                (0, log_1.log)(e, "error");
-                return res.sendStatus(404);
-            }
-        });
-    });
-    return middleware;
-};
-exports.resizerMiddleware = resizerMiddleware;

package/src/middleware.ts

@@ -1,73 +0,0 @@
-import { Router } from "express";
-import * as fs from "fs";
-import { existsSync, mkdirSync } from "fs";
-import { dirname } from "path";
-import { getSourceFilename } from "./utils/get-source-filename";
-import { convertImage } from "./utils/image-converter";
-import { log } from "./utils/log";
-import { CONTENT_TYPES, Params } from "./utils/tools";
-
-export type Config = Array<{
-    route: string;
-    source: string;
-}>;
-
-export const resizerMiddleware = (config: Config) => {
-    const middleware = Router();
-
-    config.forEach((c, i) => {
-        log(`Config #${i + 1}:`);
-        log(`    Route:  ${c.route}`);
-        log(`    Source: ${c.source}`);
-
-        middleware.get(c.route, async (req, res) => {
-            try {
-                log("----------------------------------------");
-                const params = req.params as unknown as Params;
-
-                const generatedFilename = (process.env.UXF_RESIZER_GENERATE_PATH ?? process.cwd()) + req.path;
-                log(`Generated filename: ${generatedFilename}`);
-
-                if (existsSync(generatedFilename)) {
-                    return res.sendFile(generatedFilename);
-                }
-
-                const generatedDirectory = dirname(generatedFilename);
-                if (!existsSync(generatedDirectory)) {
-                    mkdirSync(generatedDirectory, { recursive: true });
-                }
-
-                const sourceFilename = getSourceFilename(c.source, params);
-                log(`Source filename:    ${sourceFilename}`);
-
-                const sourceFile = /^(http|https)/.test(sourceFilename)
-                    ? await fetch(sourceFilename).then((response) => response.arrayBuffer())
-                    : sourceFilename;
-
-                if (params.toFormat === "svg") {
-                    fs.writeFileSync(
-                        generatedFilename,
-                        sourceFile instanceof ArrayBuffer ? Buffer.from(sourceFile) : sourceFile,
-                    );
-                    return res.sendFile(generatedFilename, {
-                        headers: {
-                            "Content-Type": "image/svg+xml",
-                        },
-                    });
-                }
-
-                const headers = {
-                    "Content-Type": CONTENT_TYPES[params.toFormat] ?? "image/jpeg",
-                };
-
-                await convertImage(sourceFile, generatedFilename, params);
-                return res.sendFile(generatedFilename, { headers });
-            } catch (e) {
-                log(e, "error");
-                return res.sendStatus(404);
-            }
-        });
-    });
-
-    return middleware;
-};

package/src/utils/parse-http-source.d.ts

@@ -1,7 +0,0 @@
-interface Result {
-    protocol: string;
-    path: string;
-    domain: string;
-}
-export declare function parseHttpSource(source: string): Result | undefined;
-export {};

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

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-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;
-}

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

@@ -1,26 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const parse_http_source_1 = require("./parse-http-source");
-test("parse source", () => {
-    expect((0, parse_http_source_1.parseHttpSource)("https://domain.uxf.dev/:filename+.:extension")).toEqual({
-        protocol: "https",
-        domain: "domain.uxf.dev",
-        path: ":filename+.:extension",
-    });
-    expect((0, parse_http_source_1.parseHttpSource)("http://localhost:3000/:filename+.:extension")).toEqual({
-        protocol: "http",
-        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",
-        path: ":filename+.:extension",
-    });
-    expect((0, parse_http_source_1.parseHttpSource)("/var/www/:filename+.:extension")).toBeUndefined();
-});

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

@@ -1,25 +0,0 @@
-import { parseHttpSource } from "./parse-http-source";
-
-test("parse source", () => {
-    expect(parseHttpSource("https://domain.uxf.dev/:filename+.:extension")).toEqual({
-        protocol: "https",
-        domain: "domain.uxf.dev",
-        path: ":filename+.:extension",
-    });
-    expect(parseHttpSource("http://localhost:3000/:filename+.:extension")).toEqual({
-        protocol: "http",
-        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",
-        path: ":filename+.:extension",
-    });
-    expect(parseHttpSource("/var/www/:filename+.:extension")).toBeUndefined();
-});

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

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

package/src/utils/repair-params.d.ts

@@ -1,8 +0,0 @@
-/**
- * TODO @vejvis HACK
- *
- * pro odchycení celé cesty i s lomítkama je potřeba udělat hack: /generated/:restPath(*) => restPath bude string
- * pro zpětné složení pomocí pathToRegexp::compile() se používá: /generated/:restPath+ => restPath musí být string[]
- * Tato funkce projde celý objekt a pokud v hodnotě atributu najde "/" tak tento atribut převede na pole
- */
-export declare const repairParams: (params: any) => any;

package/src/utils/repair-params.js

@@ -1,19 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.repairParams = void 0;
-/**
- * TODO @vejvis HACK
- *
- * pro odchycení celé cesty i s lomítkama je potřeba udělat hack: /generated/:restPath(*) => restPath bude string
- * pro zpětné složení pomocí pathToRegexp::compile() se používá: /generated/:restPath+ => restPath musí být string[]
- * Tato funkce projde celý objekt a pokud v hodnotě atributu najde "/" tak tento atribut převede na pole
- */
-const repairParams = (params) => {
-    const obj = {};
-    Object.keys(params).forEach((key) => {
-        const value = params[key];
-        obj[key] = value.includes("/") ? value.split("/") : value;
-    });
-    return obj;
-};
-exports.repairParams = repairParams;

package/src/utils/repair-params.ts

@@ -1,15 +0,0 @@
-/**
- * TODO @vejvis HACK
- *
- * pro odchycení celé cesty i s lomítkama je potřeba udělat hack: /generated/:restPath(*) => restPath bude string
- * pro zpětné složení pomocí pathToRegexp::compile() se používá: /generated/:restPath+ => restPath musí být string[]
- * Tato funkce projde celý objekt a pokud v hodnotě atributu najde "/" tak tento atribut převede na pole
- */
-export const repairParams = (params: any) => {
-    const obj: any = {};
-    Object.keys(params).forEach((key) => {
-        const value: string = params[key];
-        obj[key] = value.includes("/") ? value.split("/") : value;
-    });
-    return obj;
-};