aptechka 0.11.3 → 0.11.4

package/package.json

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

package/server-lib/optimizer/index.js

@@ -236,6 +236,10 @@ 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(
@@ -247,8 +251,14 @@ async function inputFiles({
             settings: {
               quality: 80,
               scale: 1,
+              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 {
@@ -263,8 +273,17 @@ 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);
+  }
+  return value;
+}
 async function optimizeImage(source) {
-  const { settings } = source;
+  const { settings, restrictions } = source;
   const content = await getBuffer(source.content);
   const ext = extname(settings.destinationPath).toLowerCase();
   const image = sharp(content);
@@ -272,24 +291,23 @@ 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);
   if (width && height) {
-    if (settings == null ? void 0 : settings.scale) {
-      image.resize(
-        Math.floor(width * settings.scale),
-        Math.floor(height * settings.scale)
-      );
+    if (scale) {
+      image.resize(Math.floor(width * scale), Math.floor(height * scale));
     }
   }
   if (ext === ".jpg" || ext === ".jpeg") {
     image.jpeg({
       mozjpeg: true,
-      quality: settings == null ? void 0 : settings.quality
+      quality
     });
   } else if (ext === ".png") {
     image.png({
       compressionLevel: 9,
       adaptiveFiltering: true,
-      quality: settings == null ? void 0 : settings.quality,
+      quality,
       effort: 8
     });
   }
@@ -300,7 +318,7 @@ async function optimizeImage(source) {
   });
   if (settings == null ? void 0 : settings.webp) {
     const buffer2 = await image.webp({
-      quality: settings.quality,
+      quality,
       effort: 5
     }).toBuffer();
     output.push({
@@ -321,19 +339,25 @@ async function optimizeImage(source) {
   return output;
 }
 async function optimizeVideo(source) {
-  const { settings } = source;
+  const { settings, restrictions } = 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);
   return FFmpeg({
     inputPath: settings.destinationPath,
     fileContent: buffer,
     instructions: (command) => {
       command.addOutputOption(
-        `-crf ${Math.round((100 - ((settings == null ? void 0 : settings.quality) || 80)) * 51 / 100)}`
+        `-crf ${Math.round((100 - quality) * 51 / 100)}`
       );
-      if (settings == null ? void 0 : settings.fps) {
-        command.fps(settings.fps);
+      if (fps) {
+        command.fps(fps);
       }
-      command.size(`${((settings == null ? void 0 : settings.scale) || 1) * 100}%`);
+      command.size(`${scale * 100}%`);
     }
   });
 }

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

@@ -0,0 +1,4 @@
+import { FaviconSource } from './types';
+import { Output } from '../utils';
+
+export declare function generateFavicon(source: Omit<FaviconSource, 'type'>): Promise<Output>;

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

@@ -0,0 +1,3 @@
+import { SequenceSource } from './types';
+
+export declare function generateSequence(source: Omit<SequenceSource, 'type'>): Promise<import('../utils').Output>;

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

@@ -0,0 +1,4 @@
+import { SpriteSource } from './types';
+import { Output } from '../utils';
+
+export declare function generateSprite(source: Omit<SpriteSource, 'type'>): Promise<Output>;

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

@@ -7,4 +7,4 @@ export { optimize, type OptimizeOptions, type OptimizeProgressCallback, type Opt
 export { optimizeImage } from './optimizeImage';
 export { optimizer } from './optimizer';
 export { optimizeVideo } from './optimizeVideo';
-export { type SourceSettings, type Source, type SkipSource, type ImageSource, type VideoSource, type FaviconSource, type SpriteSource, type SequenceSource, type KnownSource, ALLOWED_IMAGE_EXTENSIONS, ALLOWED_VIDEO_EXTENSIONS, } from './types';
+export { type SourceDefaultSettings, type Source, type SkipSource, type ImageSource, type VideoSource, type FaviconSource, type SpriteSource, type SequenceSource, type KnownSource, ALLOWED_IMAGE_EXTENSIONS, ALLOWED_VIDEO_EXTENSIONS, } from './types';

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

@@ -0,0 +1,4 @@
+import { ImageSource } from './types';
+import { Output } from '../utils';
+
+export declare function optimizeImage(source: Omit<ImageSource, 'type'>): Promise<Output>;

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

@@ -0,0 +1,3 @@
+import { VideoSource } from './types';
+
+export declare function optimizeVideo(source: Omit<VideoSource, 'type'>): Promise<import('../utils').Output>;

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

@@ -1,13 +1,20 @@
 import { FaviconOptions } from 'favicons';
 
-export type SourceSettings = {
+export type SourceDefaultSettings = {
     [key: string]: any;
 };
-export interface Source<B = Buffer | File, T extends string = string, S extends SourceSettings = {}> {
+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> = {
     content: B;
     type: T;
     settings: S;
-}
+} & (R extends undefined ? {} : {
+    restrictions?: Partial<R>;
+});
 export type SkipSource = Source<Buffer | File, 'skip', {
     destinationPath: string;
 }>;
@@ -17,12 +24,34 @@ 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/server/optimizer/utils.d.ts

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

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

@@ -1,4 +0,0 @@
-import { FaviconSource } from './types';
-import { Output } from '../utils';
-
-export declare function generateFavicon(source: FaviconSource): Promise<Output>;

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

@@ -1,3 +0,0 @@
-import { SequenceSource } from './types';
-
-export declare function generateSequence(source: SequenceSource): Promise<import('../utils').Output>;

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

@@ -1,4 +0,0 @@
-import { SpriteSource } from './types';
-import { Output } from '../utils';
-
-export declare function generateSprite(source: SpriteSource): Promise<Output>;

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

@@ -1,4 +0,0 @@
-import { ImageSource } from './types';
-import { Output } from '../utils';
-
-export declare function optimizeImage(source: ImageSource): Promise<Output>;

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

@@ -1,3 +0,0 @@
-import { VideoSource } from './types';
-
-export declare function optimizeVideo(source: VideoSource): Promise<import('../utils').Output>;