@luminix/core 0.4.5 → 0.4.7

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 A, Collection as b, Query as T, Obj as p, Str as y, Reducible as re, isValidationError as ge, Macroable as ne, Client as ye, ServiceProvider as me, MakeFacade as M, Application as fe, Response as we } from "@luminix/support";
+import { reader as pe, PropertyBag as _, EventSource as A, Collection as b, Query as S, Obj as p, Str as y, Reducible as re, isValidationError as ge, Macroable as ne, Client as ye, ServiceProvider as me, MakeFacade as M, Application as fe, Response as we } from "@luminix/support";
 class ve {
   constructor(e, t, r) {
     g(this, "_user");
@@ -222,16 +222,16 @@ class Ee extends A {
           ...l.json(),
           data: c,
           links: {
-            first: `${s}?${T.merge(u, l.json("links").first).toString()}`,
-            last: `${s}?${T.merge(u, l.json("links").last).toString()}`,
-            next: l.json("links").next && `${s}?${T.merge(u, l.json("links").next ?? "").toString()}`,
-            prev: l.json("links").prev && `${s}?${T.merge(u, l.json("links").prev ?? "").toString()}`
+            first: `${s}?${S.merge(u, l.json("links").first).toString()}`,
+            last: `${s}?${S.merge(u, l.json("links").last).toString()}`,
+            next: l.json("links").next && `${s}?${S.merge(u, l.json("links").next ?? "").toString()}`,
+            prev: l.json("links").prev && `${s}?${S.merge(u, l.json("links").prev ?? "").toString()}`
           },
           meta: {
             ...l.json("meta"),
             links: l.json("meta").links.map((n) => ({
               ...n,
-              url: n.url && `${s}?${T.merge(u, n.url).toString()}`
+              url: n.url && `${s}?${S.merge(u, n.url).toString()}`
             }))
           }
         };
@@ -308,7 +308,7 @@ class $e extends (P = Error, I = Symbol.toStringTag, P) {
   }
 }
 var Q, L;
-class Se extends (L = Error, Q = Symbol.toStringTag, L) {
+class Te extends (L = Error, Q = Symbol.toStringTag, L) {
   constructor(t) {
     super(`[Luminix] Relation "${t}" is not supported`);
     g(this, Q, "UnsupportedRelationException");
@@ -349,7 +349,7 @@ class k {
       MorphToMany: ["MorphToMany"]
     }, this.parent, t, this.getRelated());
     if (!(t in r))
-      throw new Se(t);
+      throw new Te(t);
     for (const i in e) {
       const l = e[i];
       if ((l.model === this.parent.getType() || ["MorphOne", "MorphMany"].includes(t)) && r[t].includes(l.type))
@@ -446,7 +446,7 @@ class E extends (H = Error, D = Symbol.toStringTag, H) {
   }
 }
 var J, U;
-class Te extends (U = Error, J = Symbol.toStringTag, U) {
+class Se extends (U = Error, J = Symbol.toStringTag, U) {
   constructor() {
     super("[Luminix] Method not implemented.");
     g(this, J, "MethodNotImplementedException");
@@ -496,8 +496,8 @@ function _e(o, e, t, r, i) {
     }
     makeAttributes(s) {
       const { relations: n, attributes: a } = t.schema(i), h = Object.keys(n || {}), d = p.omit(s, ...h), v = (f) => {
-        const S = a.find((le) => le.name == f);
-        return S ? !(f in d) && S.nullable : !1;
+        const T = a.find((le) => le.name == f);
+        return T ? !(f in d) && T.nullable : !1;
       };
       if (this.fillable.filter(v).forEach((f) => {
         d[f] = null;
@@ -773,7 +773,7 @@ function _e(o, e, t, r, i) {
           return;
         const f = await r.call(
           this.getRouteForSave(),
-          (S) => n ? n(S.withData(v)) : S.withData(v),
+          (T) => n ? n(T.withData(v)) : T.withData(v),
           this.getErrorBag(d ? "update" : "store")
         );
         if (f.successful())
@@ -784,7 +784,7 @@ function _e(o, e, t, r, i) {
       }
     }
     async push() {
-      throw new Te();
+      throw new Se();
     }
     async delete() {
       try {
@@ -1299,8 +1299,9 @@ class Ke extends ae {
 }
 class je extends ue {
   query() {
-    const e = super.query(), t = this.guessInverseRelation();
-    return e.where(t + "_id", this.parent.getKey()), e.where(t + "_type", this.parent.getType()), e.lock(`where.${t}_id`), e.lock(`where.${t}_type`), e;
+    var r;
+    const e = super.query(), t = `${(r = this.meta.morphType) == null ? void 0 : r.slice(0, -5)}_id`;
+    return e.where(t, this.parent.getKey()), e.where(this.meta.morphType, this.parent.getType()), e.lock(`where.${t}`), e.lock(`where.${this.meta.morphType}`), e;
   }
 }
 var Y, Z;
@@ -1525,7 +1526,7 @@ class De extends (ie = me, se = Symbol.toStringTag, ie) {
       return new Pe(
         ((t = this.app.configuration.manifest) == null ? void 0 : t.routes) ?? {},
         this.app.make("error"),
-        () => this.app.make("http"),
+        () => this.app.make("http").getClient(),
         (r = this.app.configuration.app) == null ? void 0 : r.url
       );
     });

package/package.json

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

package/types/types/Model.d.ts

@@ -153,6 +153,7 @@ export interface RelationMetaData {
     type: 'HasOne' | 'HasMany' | 'BelongsTo' | 'BelongsToMany' | 'MorphOne' | 'MorphMany' | 'MorphTo' | 'MorphToMany' | 'MorphedByMany';
     foreignKey: string | null;
     name: string;
+    morphType?: string;
 }
 export interface ModelSchema {
     [abstract: string]: ModelSchemaAttributes;