@midwayjs/decorator 3.0.0-beta.12 → 3.0.0-beta.16

package/dist/decorator/web/requestMapping.d.ts

@@ -22,10 +22,12 @@ export interface RouterOption {
     middleware?: MiddlewareParamArray;
     /**
      * router summary, for swagger
+     * @deprecated
      */
     summary?: string;
     /**
      * router description, for swagger
+     * @deprecated
      */
     description?: string;
     /**

package/dist/decoratorManager.d.ts

@@ -281,8 +281,21 @@ export declare function getMethodReturnTypes(target: any, methodName: string | s
  * create a custom property inject
  * @param decoratorKey
  * @param metadata
+ * @param impl default true, configuration need decoratorService.registerMethodHandler
  */
-export declare function createCustomPropertyDecorator(decoratorKey: string, metadata: any): PropertyDecorator;
-export declare function createCustomMethodDecorator(decoratorKey: string, metadata: any): MethodDecorator;
-export declare function createCustomParamDecorator(decoratorKey: string, metadata: any): ParameterDecorator;
+export declare function createCustomPropertyDecorator(decoratorKey: string, metadata: any, impl?: boolean): PropertyDecorator;
+/**
+ *
+ * @param decoratorKey
+ * @param metadata
+ * @param impl default true, configuration need decoratorService.registerMethodHandler
+ */
+export declare function createCustomMethodDecorator(decoratorKey: string, metadata: any, impl?: boolean): MethodDecorator;
+/**
+ *
+ * @param decoratorKey
+ * @param metadata
+ * @param impl default true, configuration need decoratorService.registerMethodHandler
+ */
+export declare function createCustomParamDecorator(decoratorKey: string, metadata: any, impl?: boolean): ParameterDecorator;
 //# sourceMappingURL=decoratorManager.d.ts.map

package/dist/decoratorManager.js

@@ -4,6 +4,7 @@ exports.createCustomParamDecorator = exports.createCustomMethodDecorator = expor
 require("reflect-metadata");
 const constant_1 = require("./constant");
 const util_1 = require("./util");
+const camelCase_1 = require("./util/camelCase");
 const debug = require('util').debuglog('midway:decorator');
 exports.PRELOAD_MODULE_KEY = 'INJECTION_PRELOAD_MODULE_KEY';
 exports.INJECT_CLASS_KEY_PREFIX = 'INJECTION_CLASS_META_DATA';
@@ -565,7 +566,7 @@ function saveProviderId(identifier, target) {
             id: identifier,
             originName: target.name,
             uuid,
-            name: (0, util_1.classNamed)(target.name),
+            name: (0, camelCase_1.camelCase)(target.name),
         }, target);
         debug(`save provide: ${target.name} -> ${uuid}`);
     }
@@ -650,28 +651,43 @@ exports.getMethodReturnTypes = getMethodReturnTypes;
  * create a custom property inject
  * @param decoratorKey
  * @param metadata
+ * @param impl default true, configuration need decoratorService.registerMethodHandler
  */
-function createCustomPropertyDecorator(decoratorKey, metadata) {
+function createCustomPropertyDecorator(decoratorKey, metadata, impl = true) {
     return function (target, propertyName) {
         attachClassMetadata(constant_1.INJECT_CUSTOM_PROPERTY, {
             propertyName,
             key: decoratorKey,
             metadata,
+            impl,
         }, target, propertyName);
     };
 }
 exports.createCustomPropertyDecorator = createCustomPropertyDecorator;
-function createCustomMethodDecorator(decoratorKey, metadata) {
+/**
+ *
+ * @param decoratorKey
+ * @param metadata
+ * @param impl default true, configuration need decoratorService.registerMethodHandler
+ */
+function createCustomMethodDecorator(decoratorKey, metadata, impl = true) {
     return function (target, propertyName, descriptor) {
         attachClassMetadata(constant_1.INJECT_CUSTOM_METHOD, {
             propertyName,
             key: decoratorKey,
             metadata,
+            impl,
         }, target);
     };
 }
 exports.createCustomMethodDecorator = createCustomMethodDecorator;
-function createCustomParamDecorator(decoratorKey, metadata) {
+/**
+ *
+ * @param decoratorKey
+ * @param metadata
+ * @param impl default true, configuration need decoratorService.registerMethodHandler
+ */
+function createCustomParamDecorator(decoratorKey, metadata, impl = true) {
     return function (target, propertyName, parameterIndex) {
         // const parameterName = getParamNames(target[methodName])[parameterIndex];
         attachClassMetadata(constant_1.INJECT_CUSTOM_PARAM, {
@@ -679,6 +695,7 @@ function createCustomParamDecorator(decoratorKey, metadata) {
             parameterIndex,
             propertyName,
             metadata,
+            impl,
         }, target, propertyName, 'multi');
     };
 }

package/dist/index.d.ts

@@ -2,6 +2,7 @@ export * from './decorator';
 export * from './interface';
 export * from './constant';
 export * from './decoratorManager';
-export * from './util/index';
+export { TYPES, sleep, getParamNames, generateRandomId, merge, } from './util/index';
 export * from './util/format';
+export { camelCase, pascalCase } from './util/camelCase';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -10,10 +10,19 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.pascalCase = exports.camelCase = exports.merge = exports.generateRandomId = exports.getParamNames = exports.sleep = exports.TYPES = void 0;
 __exportStar(require("./decorator"), exports);
 __exportStar(require("./interface"), exports);
 __exportStar(require("./constant"), exports);
 __exportStar(require("./decoratorManager"), exports);
-__exportStar(require("./util/index"), exports);
+var index_1 = require("./util/index");
+Object.defineProperty(exports, "TYPES", { enumerable: true, get: function () { return index_1.TYPES; } });
+Object.defineProperty(exports, "sleep", { enumerable: true, get: function () { return index_1.sleep; } });
+Object.defineProperty(exports, "getParamNames", { enumerable: true, get: function () { return index_1.getParamNames; } });
+Object.defineProperty(exports, "generateRandomId", { enumerable: true, get: function () { return index_1.generateRandomId; } });
+Object.defineProperty(exports, "merge", { enumerable: true, get: function () { return index_1.merge; } });
 __exportStar(require("./util/format"), exports);
+var camelCase_1 = require("./util/camelCase");
+Object.defineProperty(exports, "camelCase", { enumerable: true, get: function () { return camelCase_1.camelCase; } });
+Object.defineProperty(exports, "pascalCase", { enumerable: true, get: function () { return camelCase_1.pascalCase; } });
 //# sourceMappingURL=index.js.map

package/dist/util/camelCase.d.ts

@@ -0,0 +1,3 @@
+export declare function camelCase(input: string): string;
+export declare function pascalCase(input: string): string;
+//# sourceMappingURL=camelCase.d.ts.map

package/dist/util/camelCase.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.pascalCase = exports.camelCase = void 0;
+const UPPERCASE = /[\p{Lu}]/u;
+const LOWERCASE = /[\p{Ll}]/u;
+const IDENTIFIER = /([\p{Alpha}\p{N}_]|$)/u;
+const SEPARATORS = /[_.\- ]+/;
+const LEADING_SEPARATORS = new RegExp('^' + SEPARATORS.source);
+const SEPARATORS_AND_IDENTIFIER = new RegExp(SEPARATORS.source + IDENTIFIER.source, 'gu');
+const NUMBERS_AND_IDENTIFIER = new RegExp('\\d+' + IDENTIFIER.source, 'gu');
+const preserveCamelCase = (string, toLowerCase, toUpperCase) => {
+    let isLastCharLower = false;
+    let isLastCharUpper = false;
+    let isLastLastCharUpper = false;
+    for (let i = 0; i < string.length; i++) {
+        const character = string[i];
+        if (isLastCharLower && UPPERCASE.test(character)) {
+            string = string.slice(0, i) + '-' + string.slice(i);
+            isLastCharLower = false;
+            isLastLastCharUpper = isLastCharUpper;
+            isLastCharUpper = true;
+            i++;
+        }
+        else if (isLastCharUpper &&
+            isLastLastCharUpper &&
+            LOWERCASE.test(character)) {
+            string = string.slice(0, i - 1) + '-' + string.slice(i - 1);
+            isLastLastCharUpper = isLastCharUpper;
+            isLastCharUpper = false;
+            isLastCharLower = true;
+        }
+        else {
+            isLastCharLower =
+                toLowerCase(character) === character &&
+                    toUpperCase(character) !== character;
+            isLastLastCharUpper = isLastCharUpper;
+            isLastCharUpper =
+                toUpperCase(character) === character &&
+                    toLowerCase(character) !== character;
+        }
+    }
+    return string;
+};
+const postProcess = (input, toUpperCase) => {
+    SEPARATORS_AND_IDENTIFIER.lastIndex = 0;
+    NUMBERS_AND_IDENTIFIER.lastIndex = 0;
+    return input
+        .replace(SEPARATORS_AND_IDENTIFIER, (_, identifier) => toUpperCase(identifier))
+        .replace(NUMBERS_AND_IDENTIFIER, m => toUpperCase(m));
+};
+function camelCaseOrigin(input, options) {
+    options = {
+        pascalCase: false,
+        ...options,
+    };
+    input = input.trim();
+    if (input.length === 0) {
+        return '';
+    }
+    const toLowerCase = string => string.toLowerCase();
+    const toUpperCase = string => string.toUpperCase();
+    if (input.length === 1) {
+        return options.pascalCase ? toUpperCase(input) : toLowerCase(input);
+    }
+    const hasUpperCase = input !== toLowerCase(input);
+    if (hasUpperCase) {
+        input = preserveCamelCase(input, toLowerCase, toUpperCase);
+    }
+    input = input.replace(LEADING_SEPARATORS, '');
+    input = toLowerCase(input);
+    if (options.pascalCase) {
+        input = toUpperCase(input.charAt(0)) + input.slice(1);
+    }
+    return postProcess(input, toUpperCase);
+}
+function camelCase(input) {
+    return camelCaseOrigin(input, {
+        pascalCase: false,
+    });
+}
+exports.camelCase = camelCase;
+function pascalCase(input) {
+    return camelCaseOrigin(input, {
+        pascalCase: true,
+    });
+}
+exports.pascalCase = pascalCase;
+//# sourceMappingURL=camelCase.js.map

package/dist/util/format.js

@@ -18,18 +18,18 @@ const MS = {
 };
 // crontab pre format
 const CRONTAB = {
-    EVERY_SECOND: '* * * * * ?',
-    EVERY_MINUTE: '0 * * * * ?',
-    EVERY_HOUR: '0 0 * * * ?',
-    EVERY_DAY: '0 0 0 * * ?',
-    EVERY_DAY_ZERO_FIFTEEN: '0 15 0 * * ?',
-    EVERY_DAY_ONE_FIFTEEN: '0 15 1 * * ?',
-    EVERY_PER_5_SECOND: '/5 * * * * ?',
-    EVERY_PER_10_SECOND: '/10 * * * * ?',
-    EVERY_PER_30_SECOND: '/30 * * * * ?',
-    EVERY_PER_5_MINUTE: '0 /5 * * * ?',
-    EVERY_PER_10_MINUTE: '0 /10 * * * ?',
-    EVERY_PER_30_MINUTE: '0 /30 * * * ?',
+    EVERY_SECOND: '* * * * * *',
+    EVERY_MINUTE: '0 * * * * *',
+    EVERY_HOUR: '0 0 * * * *',
+    EVERY_DAY: '0 0 0 * * *',
+    EVERY_DAY_ZERO_FIFTEEN: '0 15 0 * * *',
+    EVERY_DAY_ONE_FIFTEEN: '0 15 1 * * *',
+    EVERY_PER_5_SECOND: '*/5 * * * * *',
+    EVERY_PER_10_SECOND: '*/10 * * * * *',
+    EVERY_PER_30_SECOND: '*/30 * * * * *',
+    EVERY_PER_5_MINUTE: '0 */5 * * * *',
+    EVERY_PER_10_MINUTE: '0 */10 * * * *',
+    EVERY_PER_30_MINUTE: '0 */30 * * * *',
 };
 exports.FORMAT = {
     MS,

package/dist/util/index.d.ts

@@ -18,14 +18,25 @@ export declare function sleep(sleepTime?: number): Promise<void>;
  * @param func
  */
 export declare function getParamNames(func: any): string[];
-/**
- * 按照框架规则返回类名字
- * @param name 类名称
- */
-export declare function classNamed(name: string): string;
 /**
  * generate a lightweight random id, enough for ioc container
  */
 export declare function generateRandomId(): string;
 export declare function merge(target: any, src: any): any;
+export declare const TYPES: {
+    isClass: typeof isClass;
+    isAsyncFunction: typeof isAsyncFunction;
+    isGeneratorFunction: typeof isGeneratorFunction;
+    isPromise: typeof isPromise;
+    isFunction: typeof isFunction;
+    isObject: typeof isObject;
+    isNumber: typeof isNumber;
+    isProxy: typeof isProxy;
+    isMap: typeof isMap;
+    isSet: typeof isSet;
+    isRegExp: typeof isRegExp;
+    isUndefined: typeof isUndefined;
+    isNull: typeof isNull;
+    isNullOrUndefined: typeof isNullOrUndefined;
+};
 //# sourceMappingURL=index.d.ts.map

package/dist/util/index.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.merge = exports.generateRandomId = exports.classNamed = exports.getParamNames = exports.sleep = exports.isNullOrUndefined = exports.isNull = exports.isUndefined = exports.isRegExp = exports.isSet = exports.isMap = exports.isProxy = exports.isNumber = exports.isObject = exports.isFunction = exports.isPromise = exports.isGeneratorFunction = exports.isAsyncFunction = exports.isClass = void 0;
+exports.TYPES = exports.merge = exports.generateRandomId = exports.getParamNames = exports.sleep = exports.isNullOrUndefined = exports.isNull = exports.isUndefined = exports.isRegExp = exports.isSet = exports.isMap = exports.isProxy = exports.isNumber = exports.isObject = exports.isFunction = exports.isPromise = exports.isGeneratorFunction = exports.isAsyncFunction = exports.isClass = void 0;
 const util = require("util");
-const camelcase = require("camelcase");
 const crypto = require("crypto");
 const ToString = Function.prototype.toString;
 function fnBody(fn) {
@@ -102,14 +101,6 @@ function getParamNames(func) {
     return result;
 }
 exports.getParamNames = getParamNames;
-/**
- * 按照框架规则返回类名字
- * @param name 类名称
- */
-function classNamed(name) {
-    return camelcase(name);
-}
-exports.classNamed = classNamed;
 /**
  * generate a lightweight random id, enough for ioc container
  */
@@ -135,4 +126,20 @@ function merge(target, src) {
     throw new Error('can not merge meta that type of ' + typeof target);
 }
 exports.merge = merge;
+exports.TYPES = {
+    isClass,
+    isAsyncFunction,
+    isGeneratorFunction,
+    isPromise,
+    isFunction,
+    isObject,
+    isNumber,
+    isProxy,
+    isMap,
+    isSet,
+    isRegExp,
+    isUndefined,
+    isNull,
+    isNullOrUndefined,
+};
 //# sourceMappingURL=index.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@midwayjs/decorator",
-  "version": "3.0.0-beta.12",
+  "version": "3.0.0-beta.16",
   "description": "definition decorator for midway project",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
@@ -12,11 +12,10 @@
     "link": "npm link"
   },
   "dependencies": {
-    "camelcase": "^6.2.0",
     "reflect-metadata": "^0.1.13"
   },
   "devDependencies": {
-    "mm": "3"
+    "mm": "3.2.0"
   },
   "keywords": [
     "midway",
@@ -37,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1c46e53eb934248007eeb7fe3920f5ac24e272c6"
+  "gitHead": "43a32745ac45164dfef1494cba979f9652a6692b"
 }