@uxf/resizer 2.0.0 → 2.2.1

package/.resizer-config.json

@@ -1,15 +1,14 @@
 [
   {
     "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]+)_:extension.:toFormat",
-    "pathToSourceFile": "/Users/vejvis/UXF/projects/resizer/example-upload/:namespace/:p1/:p2/:filename.:extension"
+    "source": "/Users/vejvis/UXF/projects/resizer/example-upload/:namespace/:p1/:p2/:filename.:extension"
   },
   {
     "route": "/generated/:namespace/:p1/:p2/:filename([a-f0-9\\-]+)_:width(\\d+)_:height(\\d+)_:fit([a-z]+).:extension",
-    "pathToSourceFile": "/Users/vejvis/UXF/projects/resizer/example-upload/:namespace/:p1/:p2/:filename.:extension"
+    "source": "/Users/vejvis/UXF/projects/resizer/example-upload/:namespace/:p1/:p2/:filename.:extension"
   },
   {
-    "route": "/generated/opentopo/:width(\\d+)_:height(\\d+)_:fit([a-z]+)/:filename",
-    "pathToSourceFile": "/:filename",
-    "sourceDomain": "https://opentopo.app"
+    "route": "/generated/static/:width(\\d+)_:height(\\d+)/:filename(*).:extension.:toFormat",
+    "source": "https://www.uxf.cz/:filename+.:extension"
   }
 ]

package/README.md

@@ -22,16 +22,15 @@ You can use configuration file `.resizer-config.json` or environment variable `U
 [
     {
         "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]+)_:extension.:toFormat",
-        "pathToSourceFile": "/var/www/UXF/projects/resizer/example-upload/:namespace/:p1/:p2/:filename.:extension"
+        "source": "/var/www/UXF/projects/resizer/example-upload/:namespace/:p1/:p2/:filename.:extension"
     },
     {
         "route": "/generated/:namespace/:p1/:p2/:filename([a-f0-9\\-]+)_:width(\\d+)_:height(\\d+)_:fit([a-z]+).:extension",
-        "pathToSourceFile": "/var/www/UXF/projects/resizer/example-upload/:namespace/:p1/:p2/:filename.:extension"
+        "source": "/var/www/UXF/projects/resizer/example-upload/:namespace/:p1/:p2/:filename.:extension"
     },
     {
-        "route": "/generated/opentopo/:width(\\d+)_:height(\\d+)_:fit([a-z]+)/:filename",
-        "pathToSourceFile": "/:filename",
-        "sourceDomain": "https://opentopo.app"
+        "route": "/generated/static/:width(\\d+)_:height(\\d+)/:filename(*).:extension.:toExtension",
+        "source": "https://www.uxf.cz/:filename+"
     }
 ]
 ```
@@ -65,28 +64,4 @@ You can use configuration file `.resizer-config.json` or environment variable `U
 - `r`: right
 - `rb`: right bottom
 - `rt`: right top
-- `t`: top
-
-## Help
-
-```
-Usage:
-uxf-resizer
-
-Environment variables:
-UXF_RESIZER_SOURCE_PATH - required
-UXF_RESIZER_GENERATE_PATH - required
-
-Options
-      --disable-namespace                             [boolean] [default: false]
-      --source-folder-depth     Depth of the source folder [number] [default: 2]
-      --generated-folder-depth  Depth of the generated folder
-                                                           [number] [default: 2]
-      --filename-regexp         Filename regexp (see:
-                                https://github.com/pillarjs/path-to-regexp)
-                                                                        [string]
-  -h, --help                    Show help                              [boolean]
-
-Options:
-      --version  Show version number                                   [boolean]
-```
+- `t`: top

package/index.js

@@ -68,11 +68,11 @@ var POSITION_OPTIONS = {
 };
 var getWidth = function (_a) {
     var width = _a.width;
-    return (width ? Number(width) : undefined);
+    return (width && width !== "x" ? Number(width) : undefined);
 };
 var getHeight = function (_a) {
     var height = _a.height;
-    return (height ? Number(height) : undefined);
+    return (height && height !== "x" ? Number(height) : undefined);
 };
 var getBackground = function (_a) {
     var background = _a.background;
@@ -100,29 +100,43 @@ function log(message) {
     // eslint-disable-next-line no-console
     console.log(message);
 }
+/**
+ * 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
+ */
+var repairParams = function (params) {
+    var obj = {};
+    Object.keys(params).forEach(function (key) {
+        var value = params[key];
+        obj[key] = value.includes("/") ? value.split("/") : value;
+    });
+    return obj;
+};
 var resizerMiddleware = function (config) {
     var middleware = (0, express_1.Router)();
     config.forEach(function (c, i) {
-        log("\nConfig #".concat(i + 1, ":"));
-        log("    Route:                  ".concat(c.route));
-        log("    Source file:            ".concat(c.pathToSourceFile));
-        if (c.sourceDomain) {
-            log("    Domain:                 ".concat(c.sourceDomain));
-        }
+        log("Config #".concat(i + 1, ":"));
+        log("    Route:  ".concat(c.route));
+        log("    Source: ".concat(c.source));
         middleware.get(c.route, function (req, res) { return __awaiter(void 0, void 0, void 0, function () {
-            var domain, sourceFilename, generatedFilename, generatedDirectory, params, sourceFile, _a, pipeline, trim;
-            var _b;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            var url, domain, repairedParams, sourceFilename, generatedFilename, generatedDirectory, params, sourceFile, _a, pipeline, trim;
+            var _b, _c;
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        domain = c.sourceDomain;
-                        sourceFilename = (0, path_to_regexp_1.compile)(c.pathToSourceFile, {})(req.params);
-                        generatedFilename = ((_b = process.env.UXF_RESIZER_GENERATE_PATH) !== null && _b !== void 0 ? _b : process.cwd()) + req.path;
+                        url = c.source.startsWith("http") ? new URL(c.source) : null;
+                        domain = url === null || url === void 0 ? void 0 : url.origin;
+                        repairedParams = repairParams(req.params);
+                        sourceFilename = (0, path_to_regexp_1.compile)((_b = url === null || url === void 0 ? void 0 : url.pathname) !== null && _b !== void 0 ? _b : c.source, {})(repairedParams);
+                        generatedFilename = ((_c = process.env.UXF_RESIZER_GENERATE_PATH) !== null && _c !== void 0 ? _c : process.cwd()) + req.path;
                         if ((0, fs_1.existsSync)(generatedFilename)) {
                             return [2 /*return*/, res.sendFile(generatedFilename)];
                         }
                         log("----------------------------------------");
-                        log(req.params);
+                        log(repairedParams);
                         log("Source filename:    ".concat(sourceFilename));
                         log("Generated filename: ".concat(generatedFilename));
                         generatedDirectory = (0, path_1.dirname)(generatedFilename);
@@ -132,13 +146,13 @@ var resizerMiddleware = function (config) {
                         params = req.params;
                         if (!domain) return [3 /*break*/, 3];
                         return [4 /*yield*/, (0, node_fetch_1.default)(domain + sourceFilename)];
-                    case 1: return [4 /*yield*/, (_c.sent()).buffer()];
+                    case 1: return [4 /*yield*/, (_d.sent()).buffer()];
                     case 2:
-                        _a = _c.sent();
+                        _a = _d.sent();
                         return [3 /*break*/, 4];
                     case 3:
                         _a = sourceFilename;
-                        _c.label = 4;
+                        _d.label = 4;
                     case 4:
                         sourceFile = _a;
                         return [4 /*yield*/, (0, sharp_1.default)(sourceFile)
@@ -153,7 +167,7 @@ var resizerMiddleware = function (config) {
                                 withoutEnlargement: getWithoutEnlargement(params),
                             })];
                     case 5:
-                        pipeline = _c.sent();
+                        pipeline = _d.sent();
                         trim = getTrim(params);
                         if (trim !== undefined) {
                             pipeline.trim(trim);

package/package.json

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