ipx 1.0.0-2 → 1.0.1

package/dist/cli.cjs

@@ -2,7 +2,7 @@
 
 const consola = require('consola');
 const listhen = require('listhen');
-const middleware = require('./shared/ipx.399255f0.cjs');
+const middleware = require('./shared/ipx.b2d1c1dd.cjs');
 require('defu');
 require('image-meta');
 require('ufo');
@@ -15,6 +15,10 @@ require('destr');
 require('etag');
 require('xss');
 
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
+
+const consola__default = /*#__PURE__*/_interopDefaultCompat(consola);
+
 async function main() {
   const ipx = middleware.createIPX({});
   const middleware$1 = middleware.createIPXMiddleware(ipx);
@@ -23,6 +27,6 @@ async function main() {
   });
 }
 main().catch((error) => {
-  consola.error(error);
+  consola__default.error(error);
   process.exit(1);
 });

package/dist/cli.d.ts

@@ -1 +1,2 @@
 
+export { }

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 import consola from 'consola';
 import { listen } from 'listhen';
-import { c as createIPX, a as createIPXMiddleware } from './shared/ipx.d1cfdfa2.mjs';
+import { c as createIPX, a as createIPXMiddleware } from './shared/ipx.5d237d4e.mjs';
 import 'defu';
 import 'image-meta';
 import 'ufo';

package/dist/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const middleware = require('./shared/ipx.399255f0.cjs');
+const middleware = require('./shared/ipx.b2d1c1dd.cjs');
 require('defu');
 require('image-meta');
 require('ufo');

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { c as createIPX, a as createIPXMiddleware, h as handleRequest } from './shared/ipx.d1cfdfa2.mjs';
+export { c as createIPX, a as createIPXMiddleware, h as handleRequest } from './shared/ipx.5d237d4e.mjs';
 import 'defu';
 import 'image-meta';
 import 'ufo';

package/dist/shared/{ipx.d1cfdfa2.mjs → ipx.5d237d4e.mjs}

@@ -12,38 +12,38 @@ import xss from 'xss';
 
 const Handlers = {
   __proto__: null,
-  get quality () { return quality; },
-  get fit () { return fit; },
-  get position () { return position; },
+  get b () { return b; },
   get background () { return background; },
+  get blur () { return blur; },
+  get crop () { return crop; },
   get enlarge () { return enlarge; },
-  get width () { return width; },
-  get height () { return height; },
-  get resize () { return resize; },
-  get trim () { return trim; },
   get extend () { return extend; },
   get extract () { return extract; },
-  get rotate () { return rotate; },
+  get fit () { return fit; },
+  get flatten () { return flatten; },
   get flip () { return flip; },
   get flop () { return flop; },
-  get sharpen () { return sharpen; },
-  get median () { return median; },
-  get blur () { return blur; },
-  get flatten () { return flatten; },
   get gamma () { return gamma; },
+  get grayscale () { return grayscale; },
+  get h () { return h; },
+  get height () { return height; },
+  get median () { return median; },
+  get modulate () { return modulate; },
   get negate () { return negate; },
   get normalize () { return normalize; },
+  get pos () { return pos; },
+  get position () { return position; },
+  get q () { return q; },
+  get quality () { return quality; },
+  get resize () { return resize; },
+  get rotate () { return rotate; },
+  get s () { return s; },
+  get sharpen () { return sharpen; },
   get threshold () { return threshold; },
-  get modulate () { return modulate; },
   get tint () { return tint; },
-  get grayscale () { return grayscale; },
-  get crop () { return crop; },
-  get q () { return q; },
-  get b () { return b; },
+  get trim () { return trim; },
   get w () { return w; },
-  get h () { return h; },
-  get s () { return s; },
-  get pos () { return pos; }
+  get width () { return width; }
 };
 
 function getEnv(name, defaultValue) {
@@ -111,12 +111,14 @@ const createHTTPSource = (options) => {
   if (typeof _domains === "string") {
     _domains = _domains.split(",").map((s) => s.trim());
   }
-  const domains = new Set(_domains.map((d) => {
-    if (!HTTP_RE.test(d)) {
-      d = "http://" + d;
-    }
-    return new URL(d).hostname;
-  }).filter(Boolean));
+  const domains = new Set(
+    _domains.map((d) => {
+      if (!HTTP_RE.test(d)) {
+        d = "http://" + d;
+      }
+      return new URL(d).hostname;
+    }).filter(Boolean)
+  );
   return async (id, requestOptions) => {
     const hostname = new URL(id).hostname;
     if (!hostname) {
@@ -126,11 +128,16 @@ const createHTTPSource = (options) => {
       throw createError("Forbidden host", 403, hostname);
     }
     const response = await fetch(id, {
+      // @ts-ignore
       agent: id.startsWith("https") ? httpsAgent : httpAgent,
       ...options.fetchOptions
     });
     if (!response.ok) {
-      throw createError("Fetch error", response.status || 500, response.statusText);
+      throw createError(
+        "Fetch error",
+        response.status || 500,
+        response.statusText
+      );
     }
     let maxAge = options.maxAge;
     const _cacheControl = response.headers.get("cache-control");
@@ -148,7 +155,10 @@ const createHTTPSource = (options) => {
     return {
       mtime,
       maxAge,
-      getData: cachedPromise(() => response.arrayBuffer().then((ab) => Buffer.from(ab)))
+      // @ts-ignore
+      getData: cachedPromise(
+        () => response.arrayBuffer().then((ab) => Buffer.from(ab))
+      )
     };
   };
 };
@@ -224,13 +234,17 @@ const enlarge = {
 const width = {
   args: [VArg],
   apply: (context, pipe, width2) => {
-    return pipe.resize(width2, void 0, { withoutEnlargement: !context.enlarge });
+    return pipe.resize(width2, void 0, {
+      withoutEnlargement: !context.enlarge
+    });
   }
 };
 const height = {
   args: [VArg],
   apply: (context, pipe, height2) => {
-    return pipe.resize(void 0, height2, { withoutEnlargement: !context.enlarge });
+    return pipe.resize(void 0, height2, {
+      withoutEnlargement: !context.enlarge
+    });
   }
 };
 const resize = {
@@ -244,7 +258,10 @@ const resize = {
       height2 = width2;
     }
     if (!context.enlarge) {
-      const clamped = clampDimensionsPreservingAspectRatio(context.meta, { width: width2, height: height2 });
+      const clamped = clampDimensionsPreservingAspectRatio(context.meta, {
+        width: width2,
+        height: height2
+      });
       width2 = clamped.width;
       height2 = clamped.height;
     }
@@ -385,7 +402,14 @@ const h = height;
 const s = resize;
 const pos = position;
 
-const SUPPORTED_FORMATS = /* @__PURE__ */ new Set(["jpeg", "png", "webp", "avif", "tiff", "gif"]);
+const SUPPORTED_FORMATS = /* @__PURE__ */ new Set([
+  "jpeg",
+  "png",
+  "webp",
+  "avif",
+  "tiff",
+  "gif"
+]);
 function createIPX(userOptions) {
   const defaults = {
     dir: getEnv("IPX_DIR", "."),
@@ -396,7 +420,9 @@ function createIPX(userOptions) {
     sharp: {}
   };
   const options = defu(userOptions, defaults);
-  options.alias = Object.fromEntries(Object.entries(options.alias).map((e) => [withLeadingSlash(e[0]), e[1]]));
+  options.alias = Object.fromEntries(
+    Object.entries(options.alias).map((e) => [withLeadingSlash(e[0]), e[1]])
+  );
   const context = {
     sources: {}
   };
@@ -447,10 +473,16 @@ function createIPX(userOptions) {
         };
       }
       const animated = modifiers.animated !== void 0 || modifiers.a !== void 0 || format === "gif";
-      const Sharp = await import('sharp').then((r) => r.default || r);
+      const Sharp = await import('sharp').then(
+        (r) => r.default || r
+      );
       let sharp = Sharp(data, { animated });
       Object.assign(sharp.options, options.sharp);
-      const handlers = Object.entries(modifiers).map(([name, arguments_]) => ({ handler: getHandler(name), name, args: arguments_ })).filter((h) => h.handler).sort((a, b) => {
+      const handlers = Object.entries(modifiers).map(([name, arguments_]) => ({
+        handler: getHandler(name),
+        name,
+        args: arguments_
+      })).filter((h) => h.handler).sort((a, b) => {
         const aKey = (a.handler.order || a.name || "").toString();
         const bKey = (b.handler.order || b.name || "").toString();
         return aKey.localeCompare(bKey);
@@ -488,7 +520,10 @@ async function _handleRequest(request, ipx) {
     headers: {},
     body: ""
   };
-  const [modifiersString = "", ...idSegments] = request.url.slice(1).split("/");
+  const [modifiersString = "", ...idSegments] = request.url.slice(
+    1
+    /* leading slash */
+  ).split("/");
   const id = safeString(decode(idSegments.join("/")));
   if (!modifiersString) {
     throw createError("Modifiers are missing", 400, request.url);
@@ -546,7 +581,10 @@ function handleRequest(request, ipx) {
 }
 function createIPXMiddleware(ipx) {
   return function IPXMiddleware(request, res) {
-    return handleRequest({ url: request.url, headers: request.headers }, ipx).then((_res) => {
+    return handleRequest(
+      { url: request.url, headers: request.headers },
+      ipx
+    ).then((_res) => {
       res.statusCode = _res.statusCode;
       res.statusMessage = _res.statusMessage;
       for (const name in _res.headers) {

package/dist/shared/{ipx.399255f0.cjs → ipx.b2d1c1dd.cjs}

@@ -12,44 +12,52 @@ const destr = require('destr');
 const getEtag = require('etag');
 const xss = require('xss');
 
+function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
+
+const http__default = /*#__PURE__*/_interopDefaultCompat(http);
+const https__default = /*#__PURE__*/_interopDefaultCompat(https);
+const destr__default = /*#__PURE__*/_interopDefaultCompat(destr);
+const getEtag__default = /*#__PURE__*/_interopDefaultCompat(getEtag);
+const xss__default = /*#__PURE__*/_interopDefaultCompat(xss);
+
 const Handlers = {
   __proto__: null,
-  get quality () { return quality; },
-  get fit () { return fit; },
-  get position () { return position; },
+  get b () { return b; },
   get background () { return background; },
+  get blur () { return blur; },
+  get crop () { return crop; },
   get enlarge () { return enlarge; },
-  get width () { return width; },
-  get height () { return height; },
-  get resize () { return resize; },
-  get trim () { return trim; },
   get extend () { return extend; },
   get extract () { return extract; },
-  get rotate () { return rotate; },
+  get fit () { return fit; },
+  get flatten () { return flatten; },
   get flip () { return flip; },
   get flop () { return flop; },
-  get sharpen () { return sharpen; },
-  get median () { return median; },
-  get blur () { return blur; },
-  get flatten () { return flatten; },
   get gamma () { return gamma; },
+  get grayscale () { return grayscale; },
+  get h () { return h; },
+  get height () { return height; },
+  get median () { return median; },
+  get modulate () { return modulate; },
   get negate () { return negate; },
   get normalize () { return normalize; },
+  get pos () { return pos; },
+  get position () { return position; },
+  get q () { return q; },
+  get quality () { return quality; },
+  get resize () { return resize; },
+  get rotate () { return rotate; },
+  get s () { return s; },
+  get sharpen () { return sharpen; },
   get threshold () { return threshold; },
-  get modulate () { return modulate; },
   get tint () { return tint; },
-  get grayscale () { return grayscale; },
-  get crop () { return crop; },
-  get q () { return q; },
-  get b () { return b; },
+  get trim () { return trim; },
   get w () { return w; },
-  get h () { return h; },
-  get s () { return s; },
-  get pos () { return pos; }
+  get width () { return width; }
 };
 
 function getEnv(name, defaultValue) {
-  return destr(process.env[name]) ?? defaultValue;
+  return destr__default(process.env[name]) ?? defaultValue;
 }
 function cachedPromise(function_) {
   let p;
@@ -107,18 +115,20 @@ function isValidPath(fp) {
 
 const HTTP_RE = /^https?:\/\//;
 const createHTTPSource = (options) => {
-  const httpsAgent = new https.Agent({ keepAlive: true });
-  const httpAgent = new http.Agent({ keepAlive: true });
+  const httpsAgent = new https__default.Agent({ keepAlive: true });
+  const httpAgent = new http__default.Agent({ keepAlive: true });
   let _domains = options.domains || [];
   if (typeof _domains === "string") {
     _domains = _domains.split(",").map((s) => s.trim());
   }
-  const domains = new Set(_domains.map((d) => {
-    if (!HTTP_RE.test(d)) {
-      d = "http://" + d;
-    }
-    return new URL(d).hostname;
-  }).filter(Boolean));
+  const domains = new Set(
+    _domains.map((d) => {
+      if (!HTTP_RE.test(d)) {
+        d = "http://" + d;
+      }
+      return new URL(d).hostname;
+    }).filter(Boolean)
+  );
   return async (id, requestOptions) => {
     const hostname = new URL(id).hostname;
     if (!hostname) {
@@ -128,11 +138,16 @@ const createHTTPSource = (options) => {
       throw createError("Forbidden host", 403, hostname);
     }
     const response = await nodeFetchNative.fetch(id, {
+      // @ts-ignore
       agent: id.startsWith("https") ? httpsAgent : httpAgent,
       ...options.fetchOptions
     });
     if (!response.ok) {
-      throw createError("Fetch error", response.status || 500, response.statusText);
+      throw createError(
+        "Fetch error",
+        response.status || 500,
+        response.statusText
+      );
     }
     let maxAge = options.maxAge;
     const _cacheControl = response.headers.get("cache-control");
@@ -150,13 +165,16 @@ const createHTTPSource = (options) => {
     return {
       mtime,
       maxAge,
-      getData: cachedPromise(() => response.arrayBuffer().then((ab) => Buffer.from(ab)))
+      // @ts-ignore
+      getData: cachedPromise(
+        () => response.arrayBuffer().then((ab) => Buffer.from(ab))
+      )
     };
   };
 };
 
 function VArg(argument) {
-  return destr(argument);
+  return destr__default(argument);
 }
 function parseArgs(arguments_, mappers) {
   const vargs = arguments_.split("_");
@@ -226,13 +244,17 @@ const enlarge = {
 const width = {
   args: [VArg],
   apply: (context, pipe, width2) => {
-    return pipe.resize(width2, void 0, { withoutEnlargement: !context.enlarge });
+    return pipe.resize(width2, void 0, {
+      withoutEnlargement: !context.enlarge
+    });
   }
 };
 const height = {
   args: [VArg],
   apply: (context, pipe, height2) => {
-    return pipe.resize(void 0, height2, { withoutEnlargement: !context.enlarge });
+    return pipe.resize(void 0, height2, {
+      withoutEnlargement: !context.enlarge
+    });
   }
 };
 const resize = {
@@ -246,7 +268,10 @@ const resize = {
       height2 = width2;
     }
     if (!context.enlarge) {
-      const clamped = clampDimensionsPreservingAspectRatio(context.meta, { width: width2, height: height2 });
+      const clamped = clampDimensionsPreservingAspectRatio(context.meta, {
+        width: width2,
+        height: height2
+      });
       width2 = clamped.width;
       height2 = clamped.height;
     }
@@ -387,7 +412,14 @@ const h = height;
 const s = resize;
 const pos = position;
 
-const SUPPORTED_FORMATS = /* @__PURE__ */ new Set(["jpeg", "png", "webp", "avif", "tiff", "gif"]);
+const SUPPORTED_FORMATS = /* @__PURE__ */ new Set([
+  "jpeg",
+  "png",
+  "webp",
+  "avif",
+  "tiff",
+  "gif"
+]);
 function createIPX(userOptions) {
   const defaults = {
     dir: getEnv("IPX_DIR", "."),
@@ -398,7 +430,9 @@ function createIPX(userOptions) {
     sharp: {}
   };
   const options = defu.defu(userOptions, defaults);
-  options.alias = Object.fromEntries(Object.entries(options.alias).map((e) => [ufo.withLeadingSlash(e[0]), e[1]]));
+  options.alias = Object.fromEntries(
+    Object.entries(options.alias).map((e) => [ufo.withLeadingSlash(e[0]), e[1]])
+  );
   const context = {
     sources: {}
   };
@@ -449,10 +483,16 @@ function createIPX(userOptions) {
         };
       }
       const animated = modifiers.animated !== void 0 || modifiers.a !== void 0 || format === "gif";
-      const Sharp = await import('sharp').then((r) => r.default || r);
+      const Sharp = await import('sharp').then(
+        (r) => r.default || r
+      );
       let sharp = Sharp(data, { animated });
       Object.assign(sharp.options, options.sharp);
-      const handlers = Object.entries(modifiers).map(([name, arguments_]) => ({ handler: getHandler(name), name, args: arguments_ })).filter((h) => h.handler).sort((a, b) => {
+      const handlers = Object.entries(modifiers).map(([name, arguments_]) => ({
+        handler: getHandler(name),
+        name,
+        args: arguments_
+      })).filter((h) => h.handler).sort((a, b) => {
         const aKey = (a.handler.order || a.name || "").toString();
         const bKey = (b.handler.order || b.name || "").toString();
         return aKey.localeCompare(bKey);
@@ -490,7 +530,10 @@ async function _handleRequest(request, ipx) {
     headers: {},
     body: ""
   };
-  const [modifiersString = "", ...idSegments] = request.url.slice(1).split("/");
+  const [modifiersString = "", ...idSegments] = request.url.slice(
+    1
+    /* leading slash */
+  ).split("/");
   const id = safeString(ufo.decode(idSegments.join("/")));
   if (!modifiersString) {
     throw createError("Modifiers are missing", 400, request.url);
@@ -518,7 +561,7 @@ async function _handleRequest(request, ipx) {
     res.headers["Cache-Control"] = `max-age=${+source.maxAge}, public, s-maxage=${+source.maxAge}`;
   }
   const { data, format } = await img.data();
-  const etag = getEtag(data);
+  const etag = getEtag__default(data);
   res.headers.ETag = etag;
   if (etag && request.headers["if-none-match"] === etag) {
     res.statusCode = 304;
@@ -548,7 +591,10 @@ function handleRequest(request, ipx) {
 }
 function createIPXMiddleware(ipx) {
   return function IPXMiddleware(request, res) {
-    return handleRequest({ url: request.url, headers: request.headers }, ipx).then((_res) => {
+    return handleRequest(
+      { url: request.url, headers: request.headers },
+      ipx
+    ).then((_res) => {
       res.statusCode = _res.statusCode;
       res.statusMessage = _res.statusMessage;
       for (const name in _res.headers) {
@@ -563,7 +609,7 @@ function sanetizeReponse(res) {
     statusCode: res.statusCode || 200,
     statusMessage: res.statusMessage ? safeString(res.statusMessage) : "OK",
     headers: safeStringObject(res.headers || {}),
-    body: typeof res.body === "string" ? xss(safeString(res.body)) : res.body || ""
+    body: typeof res.body === "string" ? xss__default(safeString(res.body)) : res.body || ""
   };
 }
 function safeString(input) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ipx",
-  "version": "1.0.0-2",
+  "version": "1.0.1",
   "repository": "unjs/ipx",
   "license": "MIT",
   "exports": {
@@ -20,42 +20,41 @@
   "scripts": {
     "build": "unbuild",
     "dev": "nodemon",
-    "lint": "eslint --ext .ts .",
+    "lint": "eslint --ext .ts . && prettier -c src test",
+    "lint:fix": "eslint --ext .ts . --fix && prettier -w src test",
     "prepack": "pnpm build",
-    "release": "pnpm test && standard-version && git push --follow-tags && pnpm publish",
+    "release": "pnpm test && changelogen --release --push && npm publish",
     "start": "node bin/ipx.js",
     "test": "pnpm lint && vitest run --coverage"
   },
   "dependencies": {
-    "consola": "^2.15.3",
-    "defu": "^6.1.1",
-    "destr": "^1.2.1",
+    "consola": "^3.0.1",
+    "defu": "^6.1.2",
+    "destr": "^1.2.2",
     "etag": "^1.8.1",
     "image-meta": "^0.1.1",
-    "listhen": "^1.0.0",
-    "node-fetch-native": "^1.0.1",
-    "pathe": "^1.0.0",
-    "sharp": "^0.31.2",
-    "ufo": "^1.0.0",
+    "listhen": "^1.0.4",
+    "node-fetch-native": "^1.1.0",
+    "pathe": "^1.1.0",
+    "sharp": "^0.32.0",
+    "ufo": "^1.1.1",
     "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@nuxtjs/eslint-config-typescript": "^12.0.0",
     "@types/etag": "^1.8.1",
     "@types/is-valid-path": "^0.1.0",
-    "@types/node-fetch": "^2.6.2",
-    "@types/sharp": "^0.31.0",
-    "@vitest/coverage-c8": "^0.25.3",
-    "changelogen": "^0.4.0",
-    "eslint": "^8.28.0",
-    "eslint-config-unjs": "^0.0.2",
-    "jiti": "^1.16.0",
-    "nodemon": "^2.0.20",
+    "@types/sharp": "^0.31.1",
+    "@vitest/coverage-c8": "^0.30.1",
+    "changelogen": "^0.5.2",
+    "eslint": "^8.38.0",
+    "eslint-config-unjs": "^0.1.0",
+    "jiti": "^1.18.2",
+    "nodemon": "^2.0.22",
+    "prettier": "^2.8.7",
     "serve-handler": "^6.1.5",
-    "standard-version": "^9.5.0",
-    "typescript": "^4.9.3",
-    "unbuild": "^1.0.1",
-    "vitest": "^0.25.3"
+    "typescript": "^5.0.4",
+    "unbuild": "^1.2.0",
+    "vitest": "^0.30.1"
   },
-  "packageManager": "pnpm@7.17.0"
-}
+  "packageManager": "pnpm@8.2.0"
+}