@streamscloud/kit 0.82.4 → 0.83.0

package/dist/core/files/file-validation-localization.d.ts

@@ -5,8 +5,8 @@ export declare class FileValidationLocalization {
     get audioOnly(): string;
     get maxSize(): (size: string) => string;
     get extensions(): (list: string) => string;
-    get maxDimensions(): (width: number, height: number) => string;
-    get minDimensions(): (width: number, height: number) => string;
+    get maxDimensions(): (longSide: number, shortSide: number) => string;
+    get minDimensions(): (longSide: number, shortSide: number) => string;
     get maxDuration(): (seconds: number) => string;
     get aspectRatio(): (ratios: string) => string;
     get aspectRatioRange(): (min: string, max: string) => string;

package/dist/core/files/file-validation-localization.js

@@ -63,12 +63,12 @@ const loc = {
         no: (list) => `Tillatte filtyper: ${list}`
     },
     maxDimensions: {
-        en: (width, height) => `Maximum dimensions: ${width}×${height}px`,
-        no: (width, height) => `Maks oppløsning: ${width}×${height}px`
+        en: (longSide, shortSide) => `Maximum dimensions: ${longSide}×${shortSide}px, either orientation`,
+        no: (longSide, shortSide) => `Maks oppløsning: ${longSide}×${shortSide}px, liggende eller stående`
     },
     minDimensions: {
-        en: (width, height) => `Minimum dimensions: ${width}×${height}px`,
-        no: (width, height) => `Min oppløsning: ${width}×${height}px`
+        en: (longSide, shortSide) => `Minimum dimensions: ${longSide}×${shortSide}px, either orientation`,
+        no: (longSide, shortSide) => `Min oppløsning: ${longSide}×${shortSide}px, liggende eller stående`
     },
     maxDuration: {
         en: (seconds) => `Maximum duration: ${seconds}s`,

package/dist/core/files/file-validation-rules.d.ts

@@ -21,13 +21,13 @@ export declare const FileRules: {
     AudioDuration: (maxSeconds: number, message?: string) => FileValidationRule;
     AudioOnly: (message?: string) => FileValidationRule;
     Extensions: (extensions: string[], message?: string) => FileValidationRule;
-    ImageDimensions: (max: {
-        width: number;
-        height: number;
+    ImageDimensions: (limits: {
+        max1: number;
+        max2: number;
     }, message?: string) => FileValidationRule;
-    ImageMinDimensions: (min: {
-        width: number;
-        height: number;
+    ImageMinDimensions: (limits: {
+        min1: number;
+        min2: number;
     }, message?: string) => FileValidationRule;
     MaxSize: (bytes: number, message?: string) => FileValidationRule;
     Mime: (accept: string, message?: string) => FileValidationRule;
@@ -43,9 +43,9 @@ export declare const FileRules: {
         max?: AspectRatioBound;
     }, message?: string, tolerancePercent?: number) => FileValidationRule;
     VideoOrientation: (orientation: VideoOrientationValue, message?: string, tolerancePercent?: number) => FileValidationRule;
-    VideoDimensions: (max: {
-        width: number;
-        height: number;
+    VideoDimensions: (limits: {
+        max1: number;
+        max2: number;
     }, message?: string) => FileValidationRule;
     VideoDuration: (maxSeconds: number, message?: string) => FileValidationRule;
 };

package/dist/core/files/file-validation-rules.js

@@ -55,6 +55,16 @@ const resolveBound = (value) => {
     return Number.isFinite(ratio) ? ratio : null;
 };
 const formatBound = (value) => (value === undefined ? '' : typeof value === 'number' ? String(value) : value);
+const toSides = (a, b) => ({ long: Math.max(a, b), short: Math.min(a, b) });
+const exceedsMax = (size, limits) => {
+    const actual = toSides(size.width, size.height);
+    const limit = toSides(limits.max1, limits.max2);
+    return actual.long > limit.long || actual.short > limit.short;
+};
+const maxDimensionsMessage = (limits) => {
+    const limit = toSides(limits.max1, limits.max2);
+    return messages.maxDimensions(limit.long, limit.short);
+};
 const formatExtensions = (extensions) => extensions.map((ext) => '.' + ext.replace(/^\./, '')).join(', ');
 const messages = new FileValidationLocalization();
 /**
@@ -96,13 +106,15 @@ export const FileRules = {
         const allowed = extensions.map((ext) => ext.replace(/^\./, '').toLowerCase());
         return allowed.includes(extension) ? null : (message ?? messages.extensions(formatExtensions(extensions)));
     },
-    ImageDimensions: (max, message) => async (file) => {
-        const { width, height } = await readImageDimensions(file);
-        return width > max.width || height > max.height ? (message ?? messages.maxDimensions(max.width, max.height)) : null;
+    ImageDimensions: (limits, message) => async (file) => {
+        const size = await readImageDimensions(file);
+        return exceedsMax(size, limits) ? (message ?? maxDimensionsMessage(limits)) : null;
     },
-    ImageMinDimensions: (min, message) => async (file) => {
+    ImageMinDimensions: (limits, message) => async (file) => {
         const { width, height } = await readImageDimensions(file);
-        return width < min.width || height < min.height ? (message ?? messages.minDimensions(min.width, min.height)) : null;
+        const actual = toSides(width, height);
+        const limit = toSides(limits.min1, limits.min2);
+        return actual.long < limit.long || actual.short < limit.short ? (message ?? messages.minDimensions(limit.long, limit.short)) : null;
     },
     MaxSize: (bytes, message) => (file) => file.size > bytes ? (message ?? messages.maxSize(StringHelper.toFileSizeString(bytes))) : null,
     Mime: (accept, message) => {
@@ -151,9 +163,9 @@ export const FileRules = {
         const ok = orientation === 'landscape' ? actual > 1 + margin : orientation === 'portrait' ? actual < 1 - margin : Math.abs(actual - 1) <= margin;
         return ok ? null : (message ?? messages.orientation(orientation));
     },
-    VideoDimensions: (max, message) => async (file) => {
-        const { width, height } = await readMedia(file);
-        return width > max.width || height > max.height ? (message ?? messages.maxDimensions(max.width, max.height)) : null;
+    VideoDimensions: (limits, message) => async (file) => {
+        const size = await readMedia(file);
+        return exceedsMax(size, limits) ? (message ?? maxDimensionsMessage(limits)) : null;
     },
     VideoDuration: (maxSeconds, message) => async (file) => {
         const durationSec = await readDuration(file);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@streamscloud/kit",
-  "version": "0.82.4",
+  "version": "0.83.0",
   "author": "StreamsCloud",
   "repository": {
     "type": "git",