@uxf/core 10.0.0-beta.15 → 10.0.0-beta.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/core",
-  "version": "10.0.0-beta.15",
+  "version": "10.0.0-beta.25",
   "description": "UXF Core",
   "author": "Petr Vejvoda <vejvoda@uxf.cz>",
   "homepage": "https://gitlab.com/uxf-npm/core#readme",

package/utils/buildArray.d.ts

@@ -1,21 +1,9 @@
-export declare function buildArray<T>(): {
-    add: (data: T) => {
-        add: any;
-        when: (condition: boolean, data: T) => {
-            add: any;
-            when: any;
-            get: () => T[];
-        };
-        get: () => T[];
-    };
-    when: (condition: boolean, data: T) => {
-        add: (data: T) => {
-            add: any;
-            when: any;
-            get: () => T[];
-        };
-        when: any;
-        get: () => T[];
-    };
-    get: () => T[];
-};
+type Element<T> = T;
+type WhenFn<T> = (when: boolean, element: Element<T>) => ProxiedArray<T>;
+type AddFn<T> = (element: Element<T>) => ProxiedArray<T>;
+type ProxiedArray<T> = {
+    when: WhenFn<T>;
+    add: AddFn<T>;
+} & T[];
+export declare function buildArray<T = unknown>(initial?: T[]): ProxiedArray<T>;
+export {};

package/utils/buildArray.js

@@ -1,28 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildArray = void 0;
-function get(array) {
-    return () => {
-        return array;
-    };
-}
-function add(array) {
-    return (data) => {
-        array.push(data);
-        // eslint-disable-next-line @typescript-eslint/no-use-before-define
-        return { add: add(array), when: when(array), get: get(array) };
-    };
-}
-function when(array) {
-    return (condition, data) => {
-        if (condition) {
-            array.push(data);
-        }
-        return { add: add(array), when: when(array), get: get(array) };
-    };
-}
-function buildArray() {
-    const array = [];
-    return { add: add(array), when: when(array), get: get(array) };
+function buildArray(initial) {
+    const initialArray = (initial ? [...initial] : []);
+    const proxiedArray = new Proxy(initialArray, {
+        get: (target, prop, receiver) => {
+            if ("add" === prop) {
+                return (element) => {
+                    target.push(element);
+                    return proxiedArray;
+                };
+            }
+            if ("when" === prop) {
+                return (when, element) => {
+                    if (when) {
+                        target.push(element);
+                    }
+                    return proxiedArray;
+                };
+            }
+            return Reflect.get(target, prop, receiver);
+        },
+    });
+    return proxiedArray;
 }
 exports.buildArray = buildArray;

package/utils/buildArray.test.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const buildArray_1 = require("./buildArray");
 test("buildArray", () => {
-    expect((0, buildArray_1.buildArray)().get()).toStrictEqual([]);
-    expect((0, buildArray_1.buildArray)().add("uxf").get()).toStrictEqual(["uxf"]);
-    expect((0, buildArray_1.buildArray)().add("ux").add("fans").get()).toStrictEqual(["ux", "fans"]);
-    expect((0, buildArray_1.buildArray)().add("ux").when(true, "fans").get()).toStrictEqual(["ux", "fans"]);
-    expect((0, buildArray_1.buildArray)().add("ux").when(false, "fans").get()).toStrictEqual(["ux"]);
+    expect((0, buildArray_1.buildArray)()).toStrictEqual([]);
+    expect((0, buildArray_1.buildArray)().add("uxf")).toStrictEqual(["uxf"]);
+    expect((0, buildArray_1.buildArray)().add("ux").add("fans")).toStrictEqual(["ux", "fans"]);
+    expect((0, buildArray_1.buildArray)().add("ux").when(true, "fans")).toStrictEqual(["ux", "fans"]);
+    expect((0, buildArray_1.buildArray)().add("ux").when(false, "fans")).toStrictEqual(["ux"]);
 });

package/utils/image.d.ts

@@ -6,6 +6,8 @@ export type Quality = number | Record<Format, number>;
 export declare function getSvgImgUrl(src: ImageSource): string | undefined;
 export declare function getImgQuality(quality: Quality | undefined, format: Format): number | undefined;
 export declare function getImgUniqueIdentifier(src: ImageSource): string | undefined;
+export declare function getImgElementHeight(src: ImageSource, width: number | undefined, height: number | undefined): number | undefined;
+export declare function getImgElementWidth(src: ImageSource, width: number | undefined, height: number | undefined): number | undefined;
 export declare function getImgSrcSet(src?: ImageSource, width?: Dimension, height?: Dimension, options?: ResizerImageProps): string | undefined;
 interface ImageSourcesProps {
     breakpointIndex?: number;

package/utils/image.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImgSources = exports.getImgSrcSet = exports.getImgUniqueIdentifier = exports.getImgQuality = exports.getSvgImgUrl = void 0;
+exports.ImgSources = exports.getImgSrcSet = exports.getImgElementWidth = exports.getImgElementHeight = exports.getImgUniqueIdentifier = exports.getImgQuality = exports.getSvgImgUrl = void 0;
 const file_1 = require("./file");
 const resizer_1 = require("./resizer");
 const react_1 = __importDefault(require("react"));
@@ -41,6 +41,20 @@ function getImgUniqueIdentifier(src) {
     return typeof src === "string" ? src : (_b = (_a = toImageResponse(src)) === null || _a === void 0 ? void 0 : _a.uuid) !== null && _b !== void 0 ? _b : (_c = toStaticImageData(src)) === null || _c === void 0 ? void 0 : _c.src;
 }
 exports.getImgUniqueIdentifier = getImgUniqueIdentifier;
+function getImgElementHeight(src, width, height) {
+    var _a, _b;
+    return typeof src === "string"
+        ? height
+        : height !== null && height !== void 0 ? height : (Math.floor((((_a = src.height) !== null && _a !== void 0 ? _a : 0) / ((_b = src.width) !== null && _b !== void 0 ? _b : 0)) * (width || 0)) || undefined);
+}
+exports.getImgElementHeight = getImgElementHeight;
+function getImgElementWidth(src, width, height) {
+    var _a, _b;
+    return typeof src === "string"
+        ? width
+        : width !== null && width !== void 0 ? width : (Math.floor(((_a = src.width) !== null && _a !== void 0 ? _a : 0) / ((_b = src.height) !== null && _b !== void 0 ? _b : 0)) * (height || 0) || undefined);
+}
+exports.getImgElementWidth = getImgElementWidth;
 const HIDPI_SIZES = [3, 2, 1];
 function getImgSrcSet(src, width, height, options = {}) {
     var _a, _b;
@@ -72,7 +86,7 @@ function getImgSrcSet(src, width, height, options = {}) {
         w = w || staticImageData.width;
     }
     if (typeof h === "number" || typeof w === "number") {
-        return HIDPI_SIZES.map((size) => (0, resizer_1.resizerImageUrl)(src, w * size, h * size, {
+        return HIDPI_SIZES.map((size) => (0, resizer_1.resizerImageUrl)(src, typeof w === "number" ? w * size : "auto", typeof h === "number" ? h * size : "auto", {
             toFormat,
             ...options,
         }) + (size > 1 ? ` ${size}x` : "")).join(", ");

package/utils/resizer.js

@@ -48,7 +48,7 @@ const resizerStaticImageUrl = (src, width = "auto", height = "auto", props = {},
 };
 const resizerImageUrl = (source, width = "auto", height = "auto", props = {}, version = 1) => {
     var _a, _b;
-    if (source === null || source === undefined) {
+    if (source === null || source === undefined || source === "") {
         return undefined;
     }
     if (typeof source === "string" || "src" in source) {