@moostjs/event-http 0.2.12 → 0.2.14

package/dist/index.cjs

@@ -472,7 +472,7 @@ function Query(name) {
             return value === '' && p.has(name) || value;
         }
         const json = jsonSearchParams();
-        return Object.keys(json).length ? json : undefined;
+        return Object.keys(json).length ? json : null;
     }, name || 'Query');
 }
 /**
@@ -481,7 +481,7 @@ function Query(name) {
  * @paramType string
  */
 function Url() {
-    return moost.Resolve(() => eventHttp.useRequest().url, 'url');
+    return moost.Resolve(() => eventHttp.useRequest().url || '', 'url');
 }
 /**
  * Get Requested HTTP Method
@@ -621,11 +621,12 @@ class Mate {
     }
     set(args, key, value, isArray) {
         var _a;
+        let level = 'CLASS';
         const newArgs = args.level === 'CLASS' ? { target: args.target }
-            : args.level === 'PROPERTY' ? { target: args.target, propKey: args.propKey }
+            : args.level === 'PROP' ? { target: args.target, propKey: args.propKey }
                 : args;
         let meta = Reflect.getOwnMetadata(this.workspace, newArgs.target, newArgs.propKey) || {};
-        if (newArgs.propKey && this.options.readReturnType && !meta.returnType) {
+        if (newArgs.propKey && this.options.readReturnType && !meta.returnType && args.descriptor) {
             meta.returnType = Reflect.getOwnMetadata('design:returntype', newArgs.target, newArgs.propKey);
         }
         if (newArgs.propKey && this.options.readType && !meta.type) {
@@ -638,12 +639,13 @@ class Mate {
             data.params = (_a = Reflect.getOwnMetadata('design:paramtypes', newArgs.target, newArgs.propKey)) === null || _a === void 0 ? void 0 : _a.map((f) => ({ type: f }));
         }
         if (typeof index === 'number') {
+            level = 'PARAM';
             data.params = data.params || [];
             data.params[index] = data.params[index] || {
                 type: undefined,
             };
             if (cb) {
-                data.params[index] = cb(data.params[index], args.propKey, typeof args.index === 'number' ? args.index : undefined);
+                data.params[index] = cb(data.params[index], level, args.propKey, typeof args.index === 'number' ? args.index : undefined);
             }
             else {
                 data = data.params[index];
@@ -660,6 +662,7 @@ class Mate {
                 return meta;
             });
         }
+        level = typeof index === 'number' ? 'PARAM' : newArgs.propKey && newArgs.descriptor ? 'METHOD' : newArgs.propKey ? 'PROP' : 'CLASS';
         if (typeof key !== 'function') {
             if (isArray) {
                 const newArray = (data[key] || []);
@@ -674,11 +677,11 @@ class Mate {
             }
         }
         else if (cb && typeof index !== 'number') {
-            meta = cb(data, args.propKey, typeof args.index === 'number' ? args.index : undefined);
+            meta = cb(data, level, args.propKey, typeof args.index === 'number' ? args.index : undefined);
         }
         Reflect.defineMetadata(this.workspace, meta, newArgs.target, newArgs.propKey);
     }
-    read(target, propKey, index) {
+    read(target, propKey) {
         const isConstr = isConstructor(target);
         const constructor = isConstr ? target : getConstructor(target);
         const proto = constructor.prototype;
@@ -689,17 +692,31 @@ class Mate {
             if (inheritFn) {
                 if (typeof propKey === 'string') {
                     const classMeta = Reflect.getOwnMetadata(this.workspace, constructor);
-                    shouldInherit = inheritFn(classMeta, propKey, ownMeta);
+                    shouldInherit = inheritFn(classMeta, ownMeta, 'PROP', propKey);
                 }
                 else {
-                    shouldInherit = inheritFn(ownMeta);
+                    shouldInherit = inheritFn(ownMeta, ownMeta, 'CLASS');
                 }
             }
             if (shouldInherit) {
                 const parent = Object.getPrototypeOf(constructor);
                 if (typeof parent === 'function' && parent !== fnProto && parent !== constructor) {
-                    const inheritedMeta = this.read(parent, propKey);
-                    ownMeta = { ...inheritedMeta, ...ownMeta, params: ownMeta === null || ownMeta === void 0 ? void 0 : ownMeta.params };
+                    const inheritedMeta = this.read(parent, propKey) || {};
+                    const ownParams = ownMeta === null || ownMeta === void 0 ? void 0 : ownMeta.params;
+                    ownMeta = { ...inheritedMeta, ...ownMeta };
+                    if (typeof propKey === 'string' && ownParams && (inheritedMeta === null || inheritedMeta === void 0 ? void 0 : inheritedMeta.params)) {
+                        for (let i = 0; i < ownParams.length; i++) {
+                            if (typeof (inheritedMeta === null || inheritedMeta === void 0 ? void 0 : inheritedMeta.params[i]) !== 'undefined') {
+                                const ownParam = ownParams[i];
+                                if (ownMeta.params && inheritFn && inheritFn(ownMeta, ownParam, 'PARAM', typeof propKey === 'string' ? propKey : undefined)) {
+                                    ownMeta.params[i] = {
+                                        ...inheritedMeta === null || inheritedMeta === void 0 ? void 0 : inheritedMeta.params[i],
+                                        ...ownParams[i],
+                                    };
+                                }
+                            }
+                        }
+                    }
                 }
             }
         }
@@ -724,6 +741,16 @@ class Mate {
             this.set(args, key, value, isArray);
         });
     }
+    decorateConditional(ccb) {
+        return ((target, propKey, descriptor) => {
+            const hasIndex = typeof descriptor === 'number';
+            const decoratorLevel = hasIndex ? 'PARAM' : propKey && descriptor ? 'METHOD' : propKey ? 'PROP' : 'CLASS';
+            const d = ccb(decoratorLevel);
+            if (d) {
+                d(target, propKey, descriptor);
+            }
+        });
+    }
     decorateClass(key, value, isArray) {
         return this.decorate(key, value, isArray, 'CLASS');
     }
@@ -735,6 +762,15 @@ const moostMate = new Mate(METADATA_WORKSPACE, {
     readType: true,
     readReturnType: true,
     collectPropKeys: true,
+    inherit(classMeta, targetMeta, level) {
+        if (level === 'CLASS') {
+            return !!(classMeta === null || classMeta === void 0 ? void 0 : classMeta.inherit);
+        }
+        if (level === 'PROP') {
+            return !!(targetMeta === null || targetMeta === void 0 ? void 0 : targetMeta.inherit) || !!((classMeta === null || classMeta === void 0 ? void 0 : classMeta.inherit) && !targetMeta);
+        }
+        return !!(targetMeta === null || targetMeta === void 0 ? void 0 : targetMeta.inherit);
+    },
 });
 function getMoostMate() {
     return moostMate;
@@ -806,7 +842,7 @@ resolvePipe.priority = TPipePriority.RESOLVE;
 ];
 
 const setHeaderInterceptor = (name, value, opts) => {
-    const fn = (before, after, onError) => {
+    const fn = (before, after) => {
         const h = eventHttp.useSetHeader(name);
         const status = eventHttp.useStatus();
         after(() => {
@@ -822,7 +858,7 @@ function SetHeader(...args) {
     return Intercept(setHeaderInterceptor(...args));
 }
 const setCookieInterceptor = (name, value, attrs) => {
-    const fn = (before, after, onError) => {
+    const fn = (before, after) => {
         const { setCookie, getCookie } = eventHttp.useSetCookies();
         after(() => {
             if (!getCookie(name)) {

package/dist/index.mjs

@@ -470,7 +470,7 @@ function Query(name) {
             return value === '' && p.has(name) || value;
         }
         const json = jsonSearchParams();
-        return Object.keys(json).length ? json : undefined;
+        return Object.keys(json).length ? json : null;
     }, name || 'Query');
 }
 /**
@@ -479,7 +479,7 @@ function Query(name) {
  * @paramType string
  */
 function Url() {
-    return Resolve(() => useRequest().url, 'url');
+    return Resolve(() => useRequest().url || '', 'url');
 }
 /**
  * Get Requested HTTP Method
@@ -619,11 +619,12 @@ class Mate {
     }
     set(args, key, value, isArray) {
         var _a;
+        let level = 'CLASS';
         const newArgs = args.level === 'CLASS' ? { target: args.target }
-            : args.level === 'PROPERTY' ? { target: args.target, propKey: args.propKey }
+            : args.level === 'PROP' ? { target: args.target, propKey: args.propKey }
                 : args;
         let meta = Reflect.getOwnMetadata(this.workspace, newArgs.target, newArgs.propKey) || {};
-        if (newArgs.propKey && this.options.readReturnType && !meta.returnType) {
+        if (newArgs.propKey && this.options.readReturnType && !meta.returnType && args.descriptor) {
             meta.returnType = Reflect.getOwnMetadata('design:returntype', newArgs.target, newArgs.propKey);
         }
         if (newArgs.propKey && this.options.readType && !meta.type) {
@@ -636,12 +637,13 @@ class Mate {
             data.params = (_a = Reflect.getOwnMetadata('design:paramtypes', newArgs.target, newArgs.propKey)) === null || _a === void 0 ? void 0 : _a.map((f) => ({ type: f }));
         }
         if (typeof index === 'number') {
+            level = 'PARAM';
             data.params = data.params || [];
             data.params[index] = data.params[index] || {
                 type: undefined,
             };
             if (cb) {
-                data.params[index] = cb(data.params[index], args.propKey, typeof args.index === 'number' ? args.index : undefined);
+                data.params[index] = cb(data.params[index], level, args.propKey, typeof args.index === 'number' ? args.index : undefined);
             }
             else {
                 data = data.params[index];
@@ -658,6 +660,7 @@ class Mate {
                 return meta;
             });
         }
+        level = typeof index === 'number' ? 'PARAM' : newArgs.propKey && newArgs.descriptor ? 'METHOD' : newArgs.propKey ? 'PROP' : 'CLASS';
         if (typeof key !== 'function') {
             if (isArray) {
                 const newArray = (data[key] || []);
@@ -672,11 +675,11 @@ class Mate {
             }
         }
         else if (cb && typeof index !== 'number') {
-            meta = cb(data, args.propKey, typeof args.index === 'number' ? args.index : undefined);
+            meta = cb(data, level, args.propKey, typeof args.index === 'number' ? args.index : undefined);
         }
         Reflect.defineMetadata(this.workspace, meta, newArgs.target, newArgs.propKey);
     }
-    read(target, propKey, index) {
+    read(target, propKey) {
         const isConstr = isConstructor(target);
         const constructor = isConstr ? target : getConstructor(target);
         const proto = constructor.prototype;
@@ -687,17 +690,31 @@ class Mate {
             if (inheritFn) {
                 if (typeof propKey === 'string') {
                     const classMeta = Reflect.getOwnMetadata(this.workspace, constructor);
-                    shouldInherit = inheritFn(classMeta, propKey, ownMeta);
+                    shouldInherit = inheritFn(classMeta, ownMeta, 'PROP', propKey);
                 }
                 else {
-                    shouldInherit = inheritFn(ownMeta);
+                    shouldInherit = inheritFn(ownMeta, ownMeta, 'CLASS');
                 }
             }
             if (shouldInherit) {
                 const parent = Object.getPrototypeOf(constructor);
                 if (typeof parent === 'function' && parent !== fnProto && parent !== constructor) {
-                    const inheritedMeta = this.read(parent, propKey);
-                    ownMeta = { ...inheritedMeta, ...ownMeta, params: ownMeta === null || ownMeta === void 0 ? void 0 : ownMeta.params };
+                    const inheritedMeta = this.read(parent, propKey) || {};
+                    const ownParams = ownMeta === null || ownMeta === void 0 ? void 0 : ownMeta.params;
+                    ownMeta = { ...inheritedMeta, ...ownMeta };
+                    if (typeof propKey === 'string' && ownParams && (inheritedMeta === null || inheritedMeta === void 0 ? void 0 : inheritedMeta.params)) {
+                        for (let i = 0; i < ownParams.length; i++) {
+                            if (typeof (inheritedMeta === null || inheritedMeta === void 0 ? void 0 : inheritedMeta.params[i]) !== 'undefined') {
+                                const ownParam = ownParams[i];
+                                if (ownMeta.params && inheritFn && inheritFn(ownMeta, ownParam, 'PARAM', typeof propKey === 'string' ? propKey : undefined)) {
+                                    ownMeta.params[i] = {
+                                        ...inheritedMeta === null || inheritedMeta === void 0 ? void 0 : inheritedMeta.params[i],
+                                        ...ownParams[i],
+                                    };
+                                }
+                            }
+                        }
+                    }
                 }
             }
         }
@@ -722,6 +739,16 @@ class Mate {
             this.set(args, key, value, isArray);
         });
     }
+    decorateConditional(ccb) {
+        return ((target, propKey, descriptor) => {
+            const hasIndex = typeof descriptor === 'number';
+            const decoratorLevel = hasIndex ? 'PARAM' : propKey && descriptor ? 'METHOD' : propKey ? 'PROP' : 'CLASS';
+            const d = ccb(decoratorLevel);
+            if (d) {
+                d(target, propKey, descriptor);
+            }
+        });
+    }
     decorateClass(key, value, isArray) {
         return this.decorate(key, value, isArray, 'CLASS');
     }
@@ -733,6 +760,15 @@ const moostMate = new Mate(METADATA_WORKSPACE, {
     readType: true,
     readReturnType: true,
     collectPropKeys: true,
+    inherit(classMeta, targetMeta, level) {
+        if (level === 'CLASS') {
+            return !!(classMeta === null || classMeta === void 0 ? void 0 : classMeta.inherit);
+        }
+        if (level === 'PROP') {
+            return !!(targetMeta === null || targetMeta === void 0 ? void 0 : targetMeta.inherit) || !!((classMeta === null || classMeta === void 0 ? void 0 : classMeta.inherit) && !targetMeta);
+        }
+        return !!(targetMeta === null || targetMeta === void 0 ? void 0 : targetMeta.inherit);
+    },
 });
 function getMoostMate() {
     return moostMate;
@@ -804,7 +840,7 @@ resolvePipe.priority = TPipePriority.RESOLVE;
 ];
 
 const setHeaderInterceptor = (name, value, opts) => {
-    const fn = (before, after, onError) => {
+    const fn = (before, after) => {
         const h = useSetHeader(name);
         const status = useStatus();
         after(() => {
@@ -820,7 +856,7 @@ function SetHeader(...args) {
     return Intercept(setHeaderInterceptor(...args));
 }
 const setCookieInterceptor = (name, value, attrs) => {
-    const fn = (before, after, onError) => {
+    const fn = (before, after) => {
         const { setCookie, getCookie } = useSetCookies();
         after(() => {
             if (!getCookie(name)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moostjs/event-http",
-  "version": "0.2.12",
+  "version": "0.2.14",
   "description": "@moostjs/event-http",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",
@@ -28,11 +28,11 @@
   },
   "homepage": "https://github.com/moostjs/moostjs/tree/main/packages/event-http#readme",
   "peerDependencies": {
-    "moost": "0.2.12",
-    "wooks": "^0.2.6",
-    "@wooksjs/event-core": "^0.2.6"
+    "moost": "0.2.14",
+    "wooks": "^0.2.7",
+    "@wooksjs/event-core": "^0.2.7"
   },
   "dependencies": {
-    "@wooksjs/event-http": "^0.2.6"
+    "@wooksjs/event-http": "^0.2.7"
   }
 }