@uxf/resizer 2.2.0 → 2.2.1

package/.resizer-config.json

@@ -8,7 +8,7 @@
     "source": "/Users/vejvis/UXF/projects/resizer/example-upload/:namespace/:p1/:p2/:filename.:extension"
   },
   {
-    "route": "/generated/opentopo/:width(\\d+)_:height(\\d+)/:filename",
-    "source": "https://opentopo.app/:filename"
+    "route": "/generated/static/:width(\\d+)_:height(\\d+)/:filename(*).:extension.:toFormat",
+    "source": "https://www.uxf.cz/:filename+.:extension"
   }
 ]

package/README.md

@@ -29,8 +29,8 @@ You can use configuration file `.resizer-config.json` or environment variable `U
         "source": "/var/www/UXF/projects/resizer/example-upload/:namespace/:p1/:p2/:filename.:extension"
     },
     {
-        "route": "/generated/opentopo/:width(\\d+)_:height(\\d+)_:fit([a-z]+)/:filename",
-        "source": "https://opentopo.app/:filename"
+        "route": "/generated/static/:width(\\d+)_:height(\\d+)/:filename(*).:extension.:toExtension",
+        "source": "https://www.uxf.cz/:filename+"
     }
 ]
 ```

package/index.js

@@ -100,6 +100,21 @@ 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) {
@@ -107,20 +122,21 @@ var resizerMiddleware = function (config) {
         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 url, domain, sourceFilename, generatedFilename, generatedDirectory, params, sourceFile, _a, pipeline, trim;
+            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:
                         url = c.source.startsWith("http") ? new URL(c.source) : null;
                         domain = url === null || url === void 0 ? void 0 : url.origin;
-                        sourceFilename = (0, path_to_regexp_1.compile)((_b = url === null || url === void 0 ? void 0 : url.pathname) !== null && _b !== void 0 ? _b : c.source, {})(req.params);
+                        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);

package/package.json

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