@uxf/resizer 2.3.1 → 2.3.3

package/.gitlab-ci.yml

@@ -3,7 +3,7 @@ stages:
   - release
 
 test:
-  image: node:16-buster-slim
+  image: node:18-buster-slim
   stage: test
   tags:
     - pluto-docker
@@ -15,7 +15,7 @@ test:
     - beta
 
 release:
-  image: node:16-buster-slim
+  image: node:18-buster-slim
   stage: release
   tags:
     - pluto-docker

package/README.md

@@ -21,7 +21,7 @@ You can use configuration file `.resizer-config.json` or environment variable `U
 ```json
 [
     {
-        "route": "/generated/:namespace/:p1/:p2/:filename([a-f0-9\\-]+)_:width(\\d+)_:height(\\d+)_:fit([a-z]+)_:position([a-z]+)_:background([a-z]+)_:trim([a-z]+)_:quality(\\d+)_:extension.:toFormat",
+        "route": "/generated/:namespace/:p1/:p2/:filename([a-f0-9\\-]+)_:width(\\d+)_:height(\\d+)_:fit([a-z]+)_:position([a-z]+)_:background([a-z]+)_:trim([a-z]+)_:quality(\\d+|x)_:extension.:toFormat",
         "source": "/var/www/UXF/projects/resizer/example-upload/:namespace/:p1/:p2/:filename.:extension"
     },
     {
@@ -43,23 +43,23 @@ You can use configuration file `.resizer-config.json` or environment variable `U
         "source": "https://uxf-base.uxf.dev/:filename+.:extension"
     },
     {
-        "route": "/generated/:namespace/:p1/:p2/:filename([a-f0-9\\-]+)_:width(\\d+|x)_:height(\\d+|x)_:fit([a-z]+)_:position([a-z]+)_:background([a-z]+)_:trim([a-z]+)_:quality(\\d+)_:extension.:toFormat",
+        "route": "/generated/:namespace/:p1/:p2/:filename([a-f0-9\\-]+)_:width(\\d+|x)_:height(\\d+|x)_:fit([a-z]+)_:position([a-z]+)_:background([a-z]+)_:trim([a-z]+)_:quality(\\d+|x)_:extension.:toFormat",
         "source": "https://s3.uxf.dev/${APP_NAME}-${APP_ENV}/:namespace/:p1/:p2/:filename.:extension"
     }
 ]
 ```
 
 ### Supported route parameters
-| Parameter name | Type                          | Default sharp value |
-|----------------|-------------------------------|---------------------|
-| width          | `number` or `x` (auto)        | `undefined`         |
-| height         | `number` or `x` (auto)        | `undefined`         |
-| fit            | `Fit`                         | cover               |
-| position       | `Position`                    |                     |
-| background     | `FFFFFF` or `t` (transparent) |                     |
-| toFormat       | `webp`, `png`, `avif`, `jpg`  | `jpg`               |
-| trim           | `number` or `nt` (not trim)   |                     |
-| quality        | `number` (min: 1, max: 100)   | 60                  |
+| Parameter name | Type                               | Default sharp value                    |
+|----------------|------------------------------------|----------------------------------------|
+| width          | `number` or `x` (auto)             | `undefined`                            |
+| height         | `number` or `x` (auto)             | `undefined`                            |
+| fit            | `Fit`                              | cover                                  |
+| position       | `Position`                         |                                        |
+| background     | `FFFFFF` or `t` (transparent)      |                                        |
+| toFormat       | `webp`, `png`, `avif`, `jpg`       | `jpg`                                  |
+| trim           | `number` or `nt` (not trim)        |                                        |
+| quality        | `number` (min: 1, max: 100) or `x` | default of sharp (avif: 50, other: 80) |
 
 #### Fit
 - `cv`: cover,

package/index.js

@@ -1,4 +1,27 @@
 "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 (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -46,6 +69,7 @@ var fs_1 = require("fs");
 var path_1 = require("path");
 var sharp_1 = __importDefault(require("sharp"));
 var path_to_regexp_1 = require("path-to-regexp");
+var fs = __importStar(require("fs"));
 var FIT_OPTIONS = {
     cv: "cover",
     f: "fill",
@@ -68,7 +92,7 @@ var POSITION_OPTIONS = {
 };
 var getQuality = function (_a) {
     var quality = _a.quality;
-    return (quality ? Number(quality) : 60);
+    return (quality && quality !== "x" ? Number(quality) : undefined);
 };
 var getWidth = function (_a) {
     var width = _a.width;
@@ -159,6 +183,10 @@ var resizerMiddleware = function (config) {
                         _d.label = 4;
                     case 4:
                         sourceFile = _a;
+                        if (params.toFormat === "svg") {
+                            fs.writeFileSync(generatedFilename, sourceFile);
+                            return [2 /*return*/, res.sendFile(generatedFilename)];
+                        }
                         return [4 /*yield*/, (0, sharp_1.default)(sourceFile)
                                 .rotate()
                                 .resize({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/resizer",
-  "version": "2.3.1",
+  "version": "2.3.3",
   "main": "index.js",
   "description": "UXF Resizer",
   "author": "UXFans <dev@uxf.cz>",