@luminix/core 1.0.1 → 1.0.3

package/dist/core.js

@@ -1,7 +1,7 @@
 var ce = Object.defineProperty;
 var de = (o, e, t) => e in o ? ce(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t;
 var g = (o, e, t) => de(o, typeof e != "symbol" ? e + "" : e, t);
-import { reader as pe, PropertyBag as _, EventSource as k, Collection as b, Query as S, Obj as p, Str as y, Reducible as re, isValidationError as ge, Macroable as ne, Client as me, ServiceProvider as ye, MakeFacade as M, Application as fe } from "@luminix/support";
+import { reader as pe, PropertyBag as _, EventSource as k, Collection as b, Query as S, Obj as p, Str as m, Reducible as re, isValidationError as ge, Macroable as ne, Client as ye, ServiceProvider as me, MakeFacade as M, Application as fe } from "@luminix/support";
 class we {
   constructor(e, t, r) {
     g(this, "_user");
@@ -15,8 +15,8 @@ class we {
       const u = document.createElement("input");
       u.type = "hidden", u.name = "_token", u.value = l, i.appendChild(u);
     }
-    const m = document.createElement("input");
-    m.type = "email", m.name = "email", m.value = e.email, i.appendChild(m);
+    const y = document.createElement("input");
+    y.type = "email", y.name = "email", y.value = e.email, i.appendChild(y);
     const c = document.createElement("input");
     if (c.type = "password", c.name = "password", c.value = e.password, i.appendChild(c), t) {
       const u = document.createElement("input");
@@ -153,7 +153,7 @@ class Me extends k {
       return this.bag.set(`where.${t}`, r), this;
     if (typeof r != "string")
       throw new Error(`Invalid operator ${r} provided for where clause.`);
-    const m = {
+    const y = {
       "=": "",
       "!=": "notEquals",
       ">": "greaterThan",
@@ -161,7 +161,7 @@ class Me extends k {
       "<": "lessThan",
       "<=": "lessThanOrEquals"
     }[r] || r;
-    return this.bag.set(`where.${t}:${m}`, i), this;
+    return this.bag.set(`where.${t}:${y}`, i), this;
   }
   with(t) {
     const r = this.bag.get("with", []);
@@ -182,7 +182,7 @@ class Me extends k {
     return this.bag.set("order_by", `${t}:${r}`), this;
   }
   searchBy(t) {
-    return this.bag.set("q", t), this;
+    return t === "" ? (this.bag.delete("q"), this) : (this.bag.set("q", t), this);
   }
   minified() {
     return this.bag.set("minified", 1), this;
@@ -208,8 +208,8 @@ class Me extends k {
       const l = await this.services.route.call(
         `luminix.${this.abstract}.index`,
         (u) => u.withQueryParameters(this.bag.all())
-      ), m = this.services.model.make(this.abstract), c = new b(l.json("data").map((u) => {
-        const s = new m(u);
+      ), y = this.services.model.make(this.abstract), c = new b(l.json("data").map((u) => {
+        const s = new y(u);
         return s.exists = !0, this.services.model.emit("fetch", {
           class: this.abstract,
           model: s,
@@ -278,10 +278,10 @@ class Me extends k {
     const t = this.services.config.get("luminix.backend.api.max_per_page", 150), r = await this.limit(t).exec(), i = r.meta.last_page;
     if (i === 1)
       return r.data;
-    const l = Array.from({ length: i - 1 }, (u, s) => s + 2), m = await Promise.all(
+    const l = Array.from({ length: i - 1 }, (u, s) => s + 2), y = await Promise.all(
       l.map((u) => this.limit(t).exec({ page: u }))
     ), c = new b(
-      m.reduce((u, s) => (u.push(...s.data), u), r.data).all()
+      y.reduce((u, s) => (u.push(...s.data), u), r.data).all()
     );
     return this.emit("success", {
       response: {
@@ -321,11 +321,11 @@ class N {
       throw new w("Relation.constructor()", "Model, Collection<Model> or null");
   }
   make(e) {
-    const t = this.getRelated();
     if (e === null || typeof e > "u") {
       this.set(null);
       return;
     }
+    const t = this.getRelated();
     if (this.isSingle()) {
       if (typeof e != "object" || Array.isArray(e))
         throw new TypeError("Relation.make() expects an object");
@@ -460,8 +460,8 @@ class oe extends (W = Error, F = Symbol.toStringTag, W) {
   }
 }
 function Se(o, e, t, r, i) {
-  var l, m, c;
-  return c = class extends (m = k, l = Symbol.toStringTag, m) {
+  var l, y, c;
+  return c = class extends (y = k, l = Symbol.toStringTag, y) {
     constructor(s = {}) {
       super();
       g(this, "_attributes", new _({}));
@@ -470,7 +470,7 @@ function Se(o, e, t, r, i) {
       g(this, "_changedKeys", []);
       g(this, "exists", !1);
       g(this, "wasRecentlyCreated", !1);
-      g(this, l, y.studly(i));
+      g(this, l, m.studly(i));
       this.makeRelations(), this.makeAttributes(s);
     }
     cast(s, n) {
@@ -501,8 +501,6 @@ function Se(o, e, t, r, i) {
       };
       if (this.fillable.filter(v).forEach((f) => {
         d[f] = null;
-      }), n && Object.keys(n).forEach((f) => {
-        this.relation(y.camel(f)).make(s[f]);
       }), !this.validateJsonObject(d)) {
         if (o.get("app.env", "production") === "production")
           throw new TypeError(`[Luminix] Invalid attributes for model "${i}"`);
@@ -512,7 +510,9 @@ function Se(o, e, t, r, i) {
           abstract: i
         });
       }
-      this._attributes.set(".", d), this._original = d, this._changedKeys.splice(0, this._changedKeys.length);
+      this._attributes.set(".", d), this._original = d, this._changedKeys.splice(0, this._changedKeys.length), n && Object.keys(n).forEach((f) => {
+        this.relation(m.camel(f)).make(s[f]);
+      });
     }
     makePrimaryKeyReplacer() {
       return {
@@ -632,13 +632,13 @@ function Se(o, e, t, r, i) {
     getAttribute(s) {
       let n = this._attributes.get(s, null);
       s in this.casts && (n = this.cast(n, this.casts[s]));
-      const a = t[`model${y.studly(i)}Get${y.studly(s)}Attribute`];
+      const a = t[`model${m.studly(i)}Get${m.studly(s)}Attribute`];
       if (typeof a != "function")
         throw new $("ModelFacade");
       return a.bind(t)(n, this);
     }
     setAttribute(s, n) {
-      const h = t[`model${y.studly(i)}Set${y.studly(s)}Attribute`].bind(t)(
+      const h = t[`model${m.studly(i)}Set${m.studly(s)}Attribute`].bind(t)(
         this.mutate(n, this.casts[s]),
         this
       );
@@ -665,7 +665,7 @@ function Se(o, e, t, r, i) {
     }
     fill(s) {
       const n = p.pick(s, ...this.fillable), a = Object.entries(n).reduce((h, [d, v]) => {
-        const f = t[`model${y.studly(i)}Set${y.studly(d)}Attribute`];
+        const f = t[`model${m.studly(i)}Set${m.studly(d)}Attribute`];
         if (typeof f != "function")
           throw new $("ModelFacade");
         return h[d] = f.bind(t)(
@@ -690,11 +690,11 @@ function Se(o, e, t, r, i) {
     dump() {
       e.info({
         ...this.toJson(),
-        [Symbol.toStringTag]: y.studly(i)
+        [Symbol.toStringTag]: m.studly(i)
       });
     }
     toJson() {
-      const s = Object.entries(this.relations).reduce((a, [h, d]) => (d.isLoaded() && (d.isSingle() ? a[y.snake(h)] = d.getLoadedItems().toJson() : d.isMultiple() && (a[y.snake(h)] = d.getLoadedItems().map((v) => v.toJson()).all())), a), {}), n = t[`model${y.studly(i)}Json`];
+      const s = Object.entries(this.relations).reduce((a, [h, d]) => (d.isLoaded() && (d.isSingle() ? a[m.snake(h)] = d.getLoadedItems().toJson() : d.isMultiple() && (a[m.snake(h)] = d.getLoadedItems().map((v) => v.toJson()).all())), a), {}), n = t[`model${m.studly(i)}Json`];
       if (typeof n != "function")
         throw new $("ModelFacade");
       return n.bind(t)({
@@ -709,8 +709,8 @@ function Se(o, e, t, r, i) {
       return i;
     }
     relation(s) {
-      if (s === y.camel(s))
-        return this.relations[y.snake(s)];
+      if (s === m.camel(s))
+        return this.relations[m.snake(s)];
     }
     getErrorBag(s) {
       return `${this.exists ? `${i}[${this.getKey()}].` : `${i}.`}${s}`;
@@ -922,14 +922,14 @@ function Se(o, e, t, r, i) {
     static plural() {
       return t.schema(i).displayName.plural;
     }
-  }, g(c, "name", y.studly(i)), c;
+  }, g(c, "name", m.studly(i)), c;
 }
 function _e(o, e, t) {
   var r, i;
   return class extends (i = t, r = Symbol.toStringTag, i) {
-    constructor(m = {}) {
-      super(m);
-      g(this, r, y.studly(e));
+    constructor(y = {}) {
+      super(y);
+      g(this, r, m.studly(e));
       return new Proxy(this, {
         get: (c, u) => {
           if (u === "__isModel")
@@ -940,10 +940,10 @@ function _e(o, e, t) {
             return c.getAttribute(u);
           if (Object.keys(c.relations).includes(u))
             return c.relations[u].getLoadedItems();
-          if (u.endsWith("Relation") && Object.keys(c.relations).includes(y.snake(u.slice(0, -8))))
+          if (u.endsWith("Relation") && Object.keys(c.relations).includes(m.snake(u.slice(0, -8))))
             return () => c.relation(u.slice(0, -8));
-          if (o.hasReducer(`model${y.studly(c.getType())}Get${y.studly(u)}Attribute`)) {
-            const s = o[`model${y.studly(c.getType())}Get${y.studly(u)}Attribute`];
+          if (o.hasReducer(`model${m.studly(c.getType())}Get${m.studly(u)}Attribute`)) {
+            const s = o[`model${m.studly(c.getType())}Get${m.studly(u)}Attribute`];
             if (typeof s != "function")
               throw new $("ModelFacade");
             return s.bind(o)(void 0, c);
@@ -1299,7 +1299,7 @@ class Oe extends (Z = k, Y = Symbol.toStringTag, Z) {
   }
   boot(t) {
     this._schema && Object.keys(this._schema).forEach((r) => {
-      const i = this[`model${y.studly(r)}`], l = this.model(
+      const i = this[`model${m.studly(r)}`], l = this.model(
         Se(
           t.make("config"),
           t.make("log"),
@@ -1308,8 +1308,8 @@ class Oe extends (Z = k, Y = Symbol.toStringTag, Z) {
           r
         ),
         r
-      ), m = i(l);
-      this._models[r] = _e(t.make("model"), r, m);
+      ), y = i(l);
+      this._models[r] = _e(t.make("model"), r, y);
     });
   }
   schema(t) {
@@ -1378,7 +1378,7 @@ class Ce {
         throw new $("RouteFacade");
       return this.replaceRouteParams(`/${i}`);
     }
-    const m = i.match(l), c = m ? m.map((h) => h.slice(1, -1)) : [], u = Object.keys(r), s = c.filter((h) => !u.includes(h)), n = u.filter((h) => !c.includes(h));
+    const y = i.match(l), c = y ? y.map((h) => h.slice(1, -1)) : [], u = Object.keys(r), s = c.filter((h) => !u.includes(h)), n = u.filter((h) => !c.includes(h));
     if (s.length > 0)
       throw new TypeError(`Missing values for parameter(s): ${s.join(", ")}`);
     if (n.length > 0)
@@ -1396,9 +1396,9 @@ class Ce {
   async call(e, t = (i) => i, r = "default") {
     if (typeof this.clientOptions != "function" || typeof this.clientError != "function")
       throw new $("RouteFacade");
-    const [i, l] = this.extractGenerator(e), [, ...m] = this.get(i), c = this.url(l ? [i, l] : i), u = t(this.http()), s = this.clientOptions({}, i);
+    const [i, l] = this.extractGenerator(e), [, ...y] = this.get(i), c = this.url(l ? [i, l] : i), u = t(this.http()), s = this.clientOptions({}, i);
     p.isEmpty(s) || u.withOptions(s);
-    const n = m[0] ?? s.method;
+    const n = y[0] ?? s.method;
     this.error.clear(r);
     const a = await u[n](c);
     if (ge(a)) {
@@ -1422,7 +1422,7 @@ class Ce {
 const Ie = re(Ce);
 class Pe {
   getClient() {
-    return new me();
+    return new ye();
   }
   baseUrl(e) {
     return this.getClient().baseUrl(e);
@@ -1477,7 +1477,7 @@ class Pe {
 }
 const Qe = ne(Pe);
 var se, ie;
-class Le extends (ie = ye, se = Symbol.toStringTag, ie) {
+class Le extends (ie = me, se = Symbol.toStringTag, ie) {
   constructor() {
     super(...arguments);
     g(this, se, "LuminixServiceProvider");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luminix/core",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "main": "dist/core.js",
   "module": "dist/core.js",
   "types": "types/index.d.ts",