aptechka 0.11.3 → 0.11.5

package/package.json

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

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

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

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

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

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

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

package/server-lib/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/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";
@@ -247,6 +247,7 @@ 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 })
             }
@@ -263,6 +264,12 @@ async function inputFiles({
   }
   return sources;
 }
+function getNumberSetting(value, min, max) {
+  if (typeof value === "number") {
+    return clamp(value, min, max);
+  }
+  return value;
+}
 async function optimizeImage(source) {
   const { settings } = source;
   const content = await getBuffer(source.content);
@@ -272,24 +279,23 @@ async function optimizeImage(source) {
   const width = meta.width;
   const height = meta.height;
   const output = [];
+  const scale = getNumberSetting(settings.scale, 0, 1);
+  const quality = getNumberSetting(settings.quality, 0, 100);
   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 +306,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({
@@ -323,17 +329,20 @@ async function optimizeImage(source) {
 async function optimizeVideo(source) {
   const { settings } = source;
   const buffer = await getBuffer(source.content);
+  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,
     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/optimizer/optimizeImage.d.ts

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

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

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

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

@@ -1,13 +1,16 @@
 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 = {}> = {
     content: B;
     type: T;
     settings: S;
-}
+};
 export type SkipSource = Source<Buffer | File, 'skip', {
     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/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;