moleculer-decorators
Advanced tools
Comparing version 1.2.0 to 1.3.0
@@ -19,2 +19,2 @@ import { ServiceSchema, ActionSchema, ActionHandler, ServiceEventHandler, EventSchema } from "moleculer"; | ||
export declare function Action(options?: ActionOptions): (target: any, key: string, descriptor: PropertyDescriptor) => void; | ||
export declare function Service(options?: Options): Function; | ||
export declare function Service<T extends Options>(opts?: T): Function; |
"use strict"; | ||
var __importStar = (this && this.__importStar) || function (mod) { | ||
if (mod && mod.__esModule) return mod; | ||
var result = {}; | ||
if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k]; | ||
result["default"] = mod; | ||
return result; | ||
}; | ||
Object.defineProperty(exports, "__esModule", { value: true }); | ||
const _ = require("./util"); | ||
const _ = __importStar(require("./util")); | ||
const blacklist = [ | ||
@@ -12,3 +19,3 @@ "created", | ||
"broker", | ||
"logger" | ||
"logger", | ||
]; | ||
@@ -18,3 +25,3 @@ const blacklist2 = ["metadata", "settings", "mixins", "name", "version"].concat(blacklist); | ||
constructOverride: true, | ||
skipHandler: false | ||
skipHandler: false, | ||
}; | ||
@@ -48,6 +55,7 @@ function Method(target, key, descriptor) { | ||
const mockServiceBroker = new Object({ Promise }); | ||
function Service(options = {}) { | ||
function Service(opts = {}) { | ||
const options = opts || {}; | ||
return function (constructor) { | ||
let base = { | ||
name: "" | ||
name: "", | ||
}; | ||
@@ -58,3 +66,3 @@ const _options = Object.assign({}, defaultServiceOptions, options); | ||
writable: false, | ||
enumerable: true | ||
enumerable: true, | ||
}); | ||
@@ -94,3 +102,3 @@ if (options.name) { | ||
enumerable: true, | ||
configurable: true | ||
configurable: true, | ||
}); | ||
@@ -97,0 +105,0 @@ base["created"] = obj.created; |
{ | ||
"name": "moleculer-decorators", | ||
"version": "1.2.0", | ||
"version": "1.3.0", | ||
"description": "decorators for moleculer", | ||
@@ -44,3 +44,3 @@ "main": "dist/index.js", | ||
"moleculer-db": "^0.8.5", | ||
"moleculer-web": "^0.8.5", | ||
"moleculer-web": "^0.9.1", | ||
"nodemon": "^2.0.2", | ||
@@ -47,0 +47,0 @@ "reflect-metadata": "^0.1.13", |
@@ -7,3 +7,3 @@ import { | ||
ServiceEventHandler, | ||
EventSchema | ||
EventSchema, | ||
} from "moleculer"; | ||
@@ -20,3 +20,3 @@ import * as _ from "./util"; | ||
"broker", | ||
"logger" | ||
"logger", | ||
]; | ||
@@ -28,3 +28,3 @@ const blacklist2 = ["metadata", "settings", "mixins", "name", "version"].concat( | ||
constructOverride: true, | ||
skipHandler: false // not needed, just for clarity | ||
skipHandler: false, // not needed, just for clarity | ||
}; | ||
@@ -54,7 +54,7 @@ | ||
export function Event(options?: EventOptions) { | ||
return function(target, key: string, descriptor: PropertyDescriptor) { | ||
return function (target, key: string, descriptor: PropertyDescriptor) { | ||
(target.events || (target.events = {}))[key] = options | ||
? { | ||
...options, | ||
handler: descriptor.value | ||
handler: descriptor.value, | ||
} | ||
@@ -66,3 +66,3 @@ : descriptor.value; | ||
export function Action(options: ActionOptions = {}) { | ||
return function(target, key: string, descriptor: PropertyDescriptor) { | ||
return function (target, key: string, descriptor: PropertyDescriptor) { | ||
if (!options.skipHandler) { | ||
@@ -76,3 +76,3 @@ options.handler = descriptor.value; | ||
? { | ||
...options | ||
...options, | ||
} | ||
@@ -88,6 +88,7 @@ : options.skipHandler | ||
export function Service(options: Options = {}): Function { | ||
return function(constructor: Function) { | ||
export function Service<T extends Options>(opts: T = {} as T): Function { | ||
const options = opts || ({} as Options); | ||
return function (constructor: Function) { | ||
let base: ServiceSchema = { | ||
name: "" // will be overridden | ||
name: "", // will be overridden | ||
}; | ||
@@ -99,3 +100,3 @@ const _options = Object.assign({}, defaultServiceOptions, options); | ||
writable: false, | ||
enumerable: true | ||
enumerable: true, | ||
}); | ||
@@ -111,3 +112,3 @@ | ||
const vars = []; | ||
Object.getOwnPropertyNames(parentService).forEach(function(key) { | ||
Object.getOwnPropertyNames(parentService).forEach(function (key) { | ||
if (key === "constructor") { | ||
@@ -118,3 +119,3 @@ if (_options.constructOverride) { | ||
Object.getOwnPropertyNames(ServiceClass).forEach(function(key) { | ||
Object.getOwnPropertyNames(ServiceClass).forEach(function (key) { | ||
if ( | ||
@@ -166,3 +167,3 @@ blacklist.indexOf(key) === -1 && | ||
enumerable: true, | ||
configurable: true | ||
configurable: true, | ||
}); | ||
@@ -169,0 +170,0 @@ |
@@ -7,3 +7,3 @@ import { ServiceBroker } from "moleculer"; | ||
import custom from "./customServices/custom.service"; | ||
import * as request from "supertest"; | ||
import request from "supertest"; | ||
@@ -18,3 +18,3 @@ // Issues | ||
ServiceFactory: CustomService, | ||
logLevel: "warn" | ||
logLevel: "warn", | ||
}); | ||
@@ -21,0 +21,0 @@ |
@@ -13,2 +13,3 @@ { | ||
"removeComments": true, | ||
"esModuleInterop": true, | ||
"noLib": false, | ||
@@ -15,0 +16,0 @@ "preserveConstEnums": true, |
33053
802