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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxf/core",
-  "version": "10.0.0-beta.15",
+  "version": "10.0.0-beta.22",
   "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"]);
 });