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

package/dist/decorator/common/objectDef.d.ts

@@ -1,5 +1,7 @@
 import { ScopeEnum } from '../../index';
 export declare function Init(): MethodDecorator;
 export declare function Destroy(): MethodDecorator;
-export declare function Scope(scope: ScopeEnum): ClassDecorator;
+export declare function Scope(scope: ScopeEnum, scopeOptions?: {
+    allowDowngrade?: boolean;
+}): ClassDecorator;
 //# sourceMappingURL=objectDef.d.ts.map

package/dist/decorator/common/objectDef.js

@@ -16,9 +16,9 @@ function Destroy() {
     };
 }
 exports.Destroy = Destroy;
-function Scope(scope) {
+function Scope(scope, scopeOptions) {
     return function (target) {
-        (0, index_1.saveObjectDefinition)(target, { scope });
+        (0, index_1.saveObjectDefinition)(target, { scope, ...scopeOptions });
     };
 }
 exports.Scope = Scope;

package/dist/index.d.ts

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

package/dist/index.js

@@ -10,19 +10,16 @@ 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;
+exports.FileUtils = exports.sleep = exports.Utils = exports.Types = void 0;
 __exportStar(require("./decorator"), exports);
 __exportStar(require("./interface"), exports);
 __exportStar(require("./constant"), exports);
 __exportStar(require("./decoratorManager"), exports);
 var index_1 = require("./util/index");
-Object.defineProperty(exports, "TYPES", { enumerable: true, get: function () { return index_1.TYPES; } });
+Object.defineProperty(exports, "Types", { enumerable: true, get: function () { return index_1.Types; } });
+Object.defineProperty(exports, "Utils", { enumerable: true, get: function () { return index_1.Utils; } });
 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; } });
+var fs_1 = require("./util/fs");
+Object.defineProperty(exports, "FileUtils", { enumerable: true, get: function () { return fs_1.FileUtils; } });
 __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/interface.d.ts

@@ -22,6 +22,7 @@ export interface ObjectDefinitionOptions {
     constructorArgs?: any[];
     namespace?: string;
     srcPath?: string;
+    allowDowngrade?: boolean;
 }
 export interface TagPropsMetadata {
     key: string | number | symbol;

package/dist/util/fs.d.ts

@@ -0,0 +1,5 @@
+export declare function exists(p: any): Promise<boolean>;
+export declare const FileUtils: {
+    exists: typeof exists;
+};
+//# sourceMappingURL=fs.d.ts.map

package/dist/util/fs.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileUtils = exports.exists = void 0;
+const fs_1 = require("fs");
+async function exists(p) {
+    return fs_1.promises
+        .access(p, fs_1.constants.F_OK)
+        .then(() => true)
+        .catch(() => false);
+}
+exports.exists = exists;
+exports.FileUtils = {
+    exists,
+};
+//# sourceMappingURL=fs.js.map

package/dist/util/index.d.ts

@@ -1,9 +1,13 @@
+import { camelCase, pascalCase } from './camelCase';
+import { randomUUID } from './uuid';
+export declare function isString(value: any): boolean;
 export declare function isClass(fn: any): boolean;
 export declare function isAsyncFunction(value: any): boolean;
 export declare function isGeneratorFunction(value: any): boolean;
 export declare function isPromise(value: any): boolean;
 export declare function isFunction(value: any): boolean;
 export declare function isObject(value: any): boolean;
+export declare function isPlainObject(obj: any): any;
 export declare function isNumber(value: any): boolean;
 export declare function isProxy(value: any): boolean;
 export declare function isMap(value: any): boolean;
@@ -19,17 +23,20 @@ export declare function sleep(sleepTime?: number): Promise<void>;
  */
 export declare function getParamNames(func: any): string[];
 /**
- * generate a lightweight random id, enough for ioc container
+ * generate a lightweight 32 bit random id, enough for ioc container
  */
 export declare function generateRandomId(): string;
 export declare function merge(target: any, src: any): any;
-export declare const TYPES: {
+export declare function toAsyncFunction<T extends (...args: any[]) => any>(method: T): (...args: Parameters<T>) => Promise<ReturnType<T>>;
+export declare const Types: {
     isClass: typeof isClass;
     isAsyncFunction: typeof isAsyncFunction;
     isGeneratorFunction: typeof isGeneratorFunction;
+    isString: typeof isString;
     isPromise: typeof isPromise;
     isFunction: typeof isFunction;
     isObject: typeof isObject;
+    isPlainObject: typeof isPlainObject;
     isNumber: typeof isNumber;
     isProxy: typeof isProxy;
     isMap: typeof isMap;
@@ -39,4 +46,14 @@ export declare const TYPES: {
     isNull: typeof isNull;
     isNullOrUndefined: typeof isNullOrUndefined;
 };
+export declare const Utils: {
+    sleep: typeof sleep;
+    getParamNames: typeof getParamNames;
+    generateRandomId: typeof generateRandomId;
+    merge: typeof merge;
+    camelCase: typeof camelCase;
+    pascalCase: typeof pascalCase;
+    randomUUID: typeof randomUUID;
+    toAsyncFunction: typeof toAsyncFunction;
+};
 //# sourceMappingURL=index.d.ts.map

package/dist/util/index.js

@@ -1,14 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.Utils = exports.Types = exports.toAsyncFunction = 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.isPlainObject = exports.isObject = exports.isFunction = exports.isPromise = exports.isGeneratorFunction = exports.isAsyncFunction = exports.isClass = exports.isString = void 0;
 const util = require("util");
 const crypto = require("crypto");
+const camelCase_1 = require("./camelCase");
+const uuid_1 = require("./uuid");
 const ToString = Function.prototype.toString;
+const hasOwn = Object.prototype.hasOwnProperty;
+const toStr = Object.prototype.toString;
 function fnBody(fn) {
     return ToString.call(fn)
         .replace(/^[^{]*{\s*/, '')
         .replace(/\s*}[^}]*$/, '');
 }
+function isString(value) {
+    return typeof value === 'string';
+}
+exports.isString = isString;
 function isClass(fn) {
     if (typeof fn !== 'function') {
         return false;
@@ -42,6 +50,27 @@ function isObject(value) {
     return value !== null && typeof value === 'object';
 }
 exports.isObject = isObject;
+function isPlainObject(obj) {
+    if (!obj || toStr.call(obj) !== '[object Object]') {
+        return false;
+    }
+    const hasOwnConstructor = hasOwn.call(obj, 'constructor');
+    const hasIsPrototypeOf = obj.constructor &&
+        obj.constructor.prototype &&
+        hasOwn.call(obj.constructor.prototype, 'isPrototypeOf');
+    // Not own constructor property must be Object
+    if (obj.constructor && !hasOwnConstructor && !hasIsPrototypeOf) {
+        return false;
+    }
+    // Own properties are enumerated firstly, so to speed up,
+    // if last one is own, then all properties are own.
+    let key;
+    for (key in obj) {
+        /**/
+    }
+    return typeof key === 'undefined' || hasOwn.call(obj, key);
+}
+exports.isPlainObject = isPlainObject;
 function isNumber(value) {
     return typeof value === 'number';
 }
@@ -102,7 +131,7 @@ function getParamNames(func) {
 }
 exports.getParamNames = getParamNames;
 /**
- * generate a lightweight random id, enough for ioc container
+ * generate a lightweight 32 bit random id, enough for ioc container
  */
 function generateRandomId() {
     // => f9b327e70bbcf42494ccb28b2d98e00e
@@ -126,13 +155,26 @@ function merge(target, src) {
     throw new Error('can not merge meta that type of ' + typeof target);
 }
 exports.merge = merge;
-exports.TYPES = {
+function toAsyncFunction(method) {
+    if (isAsyncFunction(method)) {
+        return method;
+    }
+    else {
+        return async function (...args) {
+            return Promise.resolve(method.call(this, ...args));
+        };
+    }
+}
+exports.toAsyncFunction = toAsyncFunction;
+exports.Types = {
     isClass,
     isAsyncFunction,
     isGeneratorFunction,
+    isString,
     isPromise,
     isFunction,
     isObject,
+    isPlainObject,
     isNumber,
     isProxy,
     isMap,
@@ -142,4 +184,14 @@ exports.TYPES = {
     isNull,
     isNullOrUndefined,
 };
+exports.Utils = {
+    sleep,
+    getParamNames,
+    generateRandomId,
+    merge,
+    camelCase: camelCase_1.camelCase,
+    pascalCase: camelCase_1.pascalCase,
+    randomUUID: uuid_1.randomUUID,
+    toAsyncFunction,
+};
 //# sourceMappingURL=index.js.map

package/dist/util/uuid.d.ts

@@ -0,0 +1,5 @@
+/**
+ * a easy uuid v4 generator
+ */
+export declare function randomUUID(): string;
+//# sourceMappingURL=uuid.d.ts.map

package/dist/util/uuid.js

@@ -0,0 +1,64 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.randomUUID = void 0;
+const crypto = require("crypto");
+/**
+ * code fork from https://github.com/uuidjs/uuid/blob/main/src/stringify.js
+ */
+const rnds8Pool = new Uint8Array(256); // # of random values to pre-allocate
+let poolPtr = rnds8Pool.length;
+function rng() {
+    if (poolPtr > rnds8Pool.length - 16) {
+        crypto.randomFillSync(rnds8Pool);
+        poolPtr = 0;
+    }
+    return rnds8Pool.slice(poolPtr, (poolPtr += 16));
+}
+/**
+ * Convert array of 16 byte values to UUID string format of the form:
+ * XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
+ */
+const byteToHex = [];
+for (let i = 0; i < 256; ++i) {
+    byteToHex.push((i + 0x100).toString(16).substr(1));
+}
+function unsafeStringify(arr, offset = 0) {
+    // Note: Be careful editing this code!  It's been tuned for performance
+    // and works in ways you may not expect. See https://github.com/uuidjs/uuid/pull/434
+    return (byteToHex[arr[offset + 0]] +
+        byteToHex[arr[offset + 1]] +
+        byteToHex[arr[offset + 2]] +
+        byteToHex[arr[offset + 3]] +
+        '-' +
+        byteToHex[arr[offset + 4]] +
+        byteToHex[arr[offset + 5]] +
+        '-' +
+        byteToHex[arr[offset + 6]] +
+        byteToHex[arr[offset + 7]] +
+        '-' +
+        byteToHex[arr[offset + 8]] +
+        byteToHex[arr[offset + 9]] +
+        '-' +
+        byteToHex[arr[offset + 10]] +
+        byteToHex[arr[offset + 11]] +
+        byteToHex[arr[offset + 12]] +
+        byteToHex[arr[offset + 13]] +
+        byteToHex[arr[offset + 14]] +
+        byteToHex[arr[offset + 15]]).toLowerCase();
+}
+/**
+ * a easy uuid v4 generator
+ */
+function randomUUID() {
+    // node > v14.17
+    if (crypto['randomUUID']) {
+        return crypto['randomUUID']();
+    }
+    const rnds = rng();
+    // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
+    rnds[6] = (rnds[6] & 0x0f) | 0x40;
+    rnds[8] = (rnds[8] & 0x3f) | 0x80;
+    return unsafeStringify(rnds);
+}
+exports.randomUUID = randomUUID;
+//# sourceMappingURL=uuid.js.map

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@midwayjs/decorator",
-  "version": "3.0.0-beta.16",
+  "version": "3.0.0-beta.17",
   "description": "definition decorator for midway project",
   "main": "dist/index",
   "typings": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "node --require=ts-node/register ../../node_modules/.bin/jest",
-    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --coverage --forceExit",
+    "test": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand",
+    "cov": "node --require=ts-node/register ../../node_modules/.bin/jest --runInBand --coverage --forceExit",
     "ci": "npm run test",
     "link": "npm link"
   },
@@ -36,5 +36,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "43a32745ac45164dfef1494cba979f9652a6692b"
+  "gitHead": "17a8b5bd3d0b0b21f24dd2f165b5df9097fc3ec4"
 }

package/dist/decorator/common/decide.d.ts

@@ -1 +0,0 @@
-//# sourceMappingURL=decide.d.ts.map

package/dist/decorator/common/decide.js

@@ -1,36 +0,0 @@
-// import { isAsyncFunction } from '../util';
-//
-// export function OnUndefined(data: Error | number) {
-//   return (target, key, descriptor: PropertyDescriptor) => {
-//     const oldMethod = descriptor.value;
-//     if (isAsyncFunction(oldMethod)) {
-//       descriptor.value = async (...args) => {
-//         const result = await oldMethod(...args);
-//         if(typeof result === 'undefined') {
-//
-//         }
-//       };
-//     } else {
-//       descriptor.value = () => {
-//
-//       };
-//     }
-//
-//     return descriptor;
-//   };
-// }
-//
-// export function OnNull(data: Error | number) {
-//   return (target, key, descriptor: PropertyDescriptor) => {
-//
-//     return descriptor;
-//   };
-// }
-//
-// export function OnEmpty(data: Error | number) {
-//   return (target, key, descriptor: PropertyDescriptor) => {
-//
-//     return descriptor;
-//   };
-// }
-//# sourceMappingURL=decide.js.map