aptechka 0.11.4 → 0.11.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aptechka",
-  "version": "0.11.4",
+  "version": "0.11.5",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/denisavitski/aptechka.git"

package/server-lib/optimizer/index.js

@@ -1,7 +1,7 @@
 import { mkdir, readFile, readdir } from "fs/promises";
 import { dirname, join, sep, extname } from "path";
 import Ffmpeg from "fluent-ffmpeg";
-import { getTmpPath, outputFile, getFolderFiles, removeExtension, clear, getBuffer, replaceExtension, outputFiles } from "../utils/index.js";
+import { getTmpPath, outputFile, getFolderFiles, removeExtension, clear, getBuffer, clamp, replaceExtension, outputFiles } from "../utils/index.js";
 import favicons from "favicons";
 import { parse } from "node-html-parser";
 import { statSync } from "fs";
@@ -236,10 +236,6 @@ async function inputFiles({
               webp: false,
               destinationPath,
               ...(_d = settings == null ? void 0 : settings.image) == null ? void 0 : _d.call(settings, { destinationPath })
-            },
-            restrictions: {
-              quality: { min: 0, max: 100 },
-              scale: { min: 0, max: 1 }
             }
           });
         } else if (ALLOWED_VIDEO_EXTENSIONS.includes(
@@ -254,11 +250,6 @@ async function inputFiles({
               fps: 0,
               destinationPath,
               ...(_e = settings == null ? void 0 : settings.video) == null ? void 0 : _e.call(settings, { destinationPath })
-            },
-            restrictions: {
-              quality: { min: 0, max: 100 },
-              scale: { min: 0, max: 1 },
-              fps: { min: 0, max: 300 }
             }
           });
         } else {
@@ -273,17 +264,14 @@ async function inputFiles({
   }
   return sources;
 }
-function clamp(number, min = 0, max = 0) {
-  return Math.max(min, Math.min(number, max));
-}
-function getNumberSetting(value, restricstions) {
-  if (typeof value === "number" && restricstions) {
-    return clamp(value, restricstions.min, restricstions.max);
+function getNumberSetting(value, min, max) {
+  if (typeof value === "number") {
+    return clamp(value, min, max);
   }
   return value;
 }
 async function optimizeImage(source) {
-  const { settings, restrictions } = source;
+  const { settings } = source;
   const content = await getBuffer(source.content);
   const ext = extname(settings.destinationPath).toLowerCase();
   const image = sharp(content);
@@ -291,8 +279,8 @@ async function optimizeImage(source) {
   const width = meta.width;
   const height = meta.height;
   const output = [];
-  const scale = getNumberSetting(settings.scale, restrictions == null ? void 0 : restrictions.scale);
-  const quality = getNumberSetting(settings.quality, restrictions == null ? void 0 : restrictions.quality);
+  const scale = getNumberSetting(settings.scale, 0, 1);
+  const quality = getNumberSetting(settings.quality, 0, 100);
   if (width && height) {
     if (scale) {
       image.resize(Math.floor(width * scale), Math.floor(height * scale));
@@ -339,14 +327,11 @@ async function optimizeImage(source) {
   return output;
 }
 async function optimizeVideo(source) {
-  const { settings, restrictions } = source;
+  const { settings } = source;
   const buffer = await getBuffer(source.content);
-  const quality = getNumberSetting(
-    (settings == null ? void 0 : settings.quality) || 80,
-    restrictions == null ? void 0 : restrictions.quality
-  );
-  const fps = getNumberSetting((settings == null ? void 0 : settings.fps) || 0, restrictions == null ? void 0 : restrictions.fps);
-  const scale = getNumberSetting((settings == null ? void 0 : settings.scale) || 1, restrictions == null ? void 0 : restrictions.scale);
+  const quality = getNumberSetting((settings == null ? void 0 : settings.quality) || 80, 0, 100);
+  const fps = getNumberSetting((settings == null ? void 0 : settings.fps) || 0, 0, 300);
+  const scale = getNumberSetting((settings == null ? void 0 : settings.scale) || 1, 0, 1);
   return FFmpeg({
     inputPath: settings.destinationPath,
     fileContent: buffer,

package/server-lib/{server/optimizer → optimizer}/types.d.ts

@@ -6,15 +6,11 @@ export type SourceDefaultSettings = {
 export type SourceSetting = {
     value: any;
 };
-export type Source<B = Buffer | File, T extends string = string, S extends SourceDefaultSettings = {}, R extends Partial<{
-    [K in keyof S]: any;
-}> | undefined = undefined> = {
+export type Source<B = Buffer | File, T extends string = string, S extends SourceDefaultSettings = {}> = {
     content: B;
     type: T;
     settings: S;
-} & (R extends undefined ? {} : {
-    restrictions?: Partial<R>;
-});
+};
 export type SkipSource = Source<Buffer | File, 'skip', {
     destinationPath: string;
 }>;
@@ -24,34 +20,12 @@ export type ImageSource = Source<Buffer | File, 'image', {
     scale?: number;
     placeholder?: boolean;
     webp?: boolean;
-}, {
-    quality: {
-        min: 0;
-        max: 100;
-    };
-    scale: {
-        min: 0;
-        max: 1;
-    };
 }>;
 export type VideoSource = Source<Buffer | File, 'video', {
     destinationPath: string;
     quality?: number;
     scale?: number;
     fps?: number;
-}, {
-    quality: {
-        min: 0;
-        max: 100;
-    };
-    scale: {
-        min: 0;
-        max: 1;
-    };
-    fps: {
-        min: 0;
-        max: 300;
-    };
 }>;
 export type FaviconSource = Source<Buffer | File, 'favicon', {
     destinationPath: string;

package/server-lib/optimizer/utils.d.ts

@@ -0,0 +1 @@
+export declare function getNumberSetting<T extends number | undefined>(value: T, min: number, max: number): number | T;

package/server-lib/{server/utils → utils}/index.d.ts

@@ -1,4 +1,5 @@
 export { getBuffer } from './buffer';
 export { removeExtension, replaceExtension, getTmpPath } from './path';
 export { outputFile, outputFiles, clear, getFolderFiles } from './fs';
+export { clamp } from './math';
 export type { WriteFileData, OutputItem, Output } from './types';

package/server-lib/utils/index.js

@@ -49,7 +49,11 @@ async function getFolderFiles(folderPath) {
   }
   return files;
 }
+function clamp(number, min = 0, max = 0) {
+  return Math.max(min, Math.min(number, max));
+}
 export {
+  clamp,
   clear,
   getBuffer,
   getFolderFiles,

package/server-lib/utils/math.d.ts

@@ -0,0 +1 @@
+export declare function clamp(number: number, min?: number, max?: number): number;

package/server-lib/server/optimizer/utils.d.ts

@@ -1,4 +0,0 @@
-export declare function getNumberSetting<T extends number | undefined>(value: T, restricstions?: {
-    min: number;
-    max: number;
-}): number | T;