@eggjs/tegg-orm-decorator 1.3.0 → 1.4.1

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.4.1](https://github.com/eggjs/tegg/compare/@eggjs/tegg-orm-decorator@1.4.0...@eggjs/tegg-orm-decorator@1.4.1) (2022-07-20)
+
+
+### Bug Fixes
+
+* use getMetaData for ModelMetadataUtil ([#44](https://github.com/eggjs/tegg/issues/44)) ([87a306c](https://github.com/eggjs/tegg/commit/87a306c4fba51fd519a47c0caaa79442643ea107))
+
+
+
+
+
+# [1.4.0](https://github.com/eggjs/tegg/compare/@eggjs/tegg-orm-decorator@1.3.1...@eggjs/tegg-orm-decorator@1.4.0) (2022-07-20)
+
+
+### Features
+
+* impl Inject Model ([#43](https://github.com/eggjs/tegg/issues/43)) ([ced2ce2](https://github.com/eggjs/tegg/commit/ced2ce2134964dcb410410c0192a34f77507c42d))
+
+
+
+
+
 # [1.3.0](https://github.com/eggjs/tegg/compare/v1.2.0...v1.3.0) (2022-07-01)
 
 **Note:** Version bump only for package @eggjs/tegg-orm-decorator

package/README.md

@@ -24,13 +24,13 @@ export class App extends Bone {
 ## Use Model
 
 ```ts
-import { ContextProto } from '@eggjs/tegg';
+import { ContextProto, Inject } from '@eggjs/tegg';
 import { App } from './model/App';
 
 @ContextProto()
 export class AppService {
-  // TODO impl inject Bone for context
-  App: typeof App = App;
+  @Inject()
+  App: typeof App;
 
   async createApp(data: {
     name: string;

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -22,4 +26,4 @@ __exportStar(require("./src/decorator/Attribute"), exports);
 __exportStar(require("./src/decorator/DataSource"), exports);
 __exportStar(require("./src/util/ModelInfoUtil"), exports);
 __exportStar(require("./src/util/ModelMetadataUtil"), exports);
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSw0REFBMEM7QUFDMUMsNERBQTBDO0FBQzFDLHdEQUFzQztBQUN0QyxxRUFBbUQ7QUFDbkQsaUVBQStDO0FBQy9DLGlFQUErQztBQUMvQyx3REFBc0M7QUFDdEMsd0RBQXNDO0FBQ3RDLDREQUEwQztBQUMxQyw2REFBMkM7QUFDM0MsMkRBQXlDO0FBQ3pDLCtEQUE2QyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7O0FBQUEsNERBQTBDO0FBQzFDLDREQUEwQztBQUMxQyx3REFBc0M7QUFDdEMscUVBQW1EO0FBQ25ELGlFQUErQztBQUMvQyxpRUFBK0M7QUFDL0Msd0RBQXNDO0FBQ3RDLHdEQUFzQztBQUN0Qyw0REFBMEM7QUFDMUMsNkRBQTJDO0FBQzNDLDJEQUF5QztBQUN6QywrREFBNkMifQ==

package/dist/src/decorator/Model.d.ts

@@ -2,4 +2,5 @@ import { EggProtoImplClass } from '@eggjs/core-decorator';
 export interface ModelParams {
     tableName?: string;
 }
+export declare const MODEL_PROTO_IMPL_TYPE = "MODEL_PROTO";
 export declare function Model(param?: ModelParams): (clazz: EggProtoImplClass) => void;

package/dist/src/decorator/Model.js

@@ -1,13 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Model = void 0;
+exports.Model = exports.MODEL_PROTO_IMPL_TYPE = void 0;
 const core_decorator_1 = require("@eggjs/core-decorator");
 const ModelInfoUtil_1 = require("../util/ModelInfoUtil");
+exports.MODEL_PROTO_IMPL_TYPE = 'MODEL_PROTO';
 function Model(param) {
     return function (clazz) {
         ModelInfoUtil_1.ModelInfoUtil.setIsModel(true, clazz);
         const func = (0, core_decorator_1.ContextProto)({
+            name: clazz.name,
             accessLevel: core_decorator_1.AccessLevel.PUBLIC,
+            protoImplType: exports.MODEL_PROTO_IMPL_TYPE,
         });
         if (param === null || param === void 0 ? void 0 : param.tableName) {
             ModelInfoUtil_1.ModelInfoUtil.setTableName(param.tableName, clazz);
@@ -16,4 +19,4 @@ function Model(param) {
     };
 }
 exports.Model = Model;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvZGVjb3JhdG9yL01vZGVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDBEQUFxRjtBQUNyRix5REFBc0Q7QUFNdEQsU0FBZ0IsS0FBSyxDQUFDLEtBQW1CO0lBQ3ZDLE9BQU8sVUFBUyxLQUF3QjtRQUN0Qyw2QkFBYSxDQUFDLFVBQVUsQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDdEMsTUFBTSxJQUFJLEdBQUcsSUFBQSw2QkFBWSxFQUFDO1lBQ3hCLFdBQVcsRUFBRSw0QkFBVyxDQUFDLE1BQU07U0FDaEMsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxLQUFLLGFBQUwsS0FBSyx1QkFBTCxLQUFLLENBQUUsU0FBUyxFQUFFO1lBQ3BCLDZCQUFhLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLENBQUM7U0FDcEQ7UUFDRCxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDZCxDQUFDLENBQUM7QUFDSixDQUFDO0FBWEQsc0JBV0MifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9kZWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvZGVjb3JhdG9yL01vZGVsLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7OztBQUFBLDBEQUFxRjtBQUNyRix5REFBc0Q7QUFNekMsUUFBQSxxQkFBcUIsR0FBRyxhQUFhLENBQUM7QUFFbkQsU0FBZ0IsS0FBSyxDQUFDLEtBQW1CO0lBQ3ZDLE9BQU8sVUFBUyxLQUF3QjtRQUN0Qyw2QkFBYSxDQUFDLFVBQVUsQ0FBQyxJQUFJLEVBQUUsS0FBSyxDQUFDLENBQUM7UUFDdEMsTUFBTSxJQUFJLEdBQUcsSUFBQSw2QkFBWSxFQUFDO1lBQ3hCLElBQUksRUFBRSxLQUFLLENBQUMsSUFBSTtZQUNoQixXQUFXLEVBQUUsNEJBQVcsQ0FBQyxNQUFNO1lBQy9CLGFBQWEsRUFBRSw2QkFBcUI7U0FDckMsQ0FBQyxDQUFDO1FBQ0gsSUFBSSxLQUFLLGFBQUwsS0FBSyx1QkFBTCxLQUFLLENBQUUsU0FBUyxFQUFFO1lBQ3BCLDZCQUFhLENBQUMsWUFBWSxDQUFDLEtBQUssQ0FBQyxTQUFTLEVBQUUsS0FBSyxDQUFDLENBQUM7U0FDcEQ7UUFDRCxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUM7SUFDZCxDQUFDLENBQUM7QUFDSixDQUFDO0FBYkQsc0JBYUMifQ==

package/dist/src/util/ModelMetadataUtil.d.ts

@@ -2,6 +2,6 @@ import { EggProtoImplClass } from '@eggjs/core-decorator';
 import { ModelMetadata } from '../model/ModelMetadata';
 export declare const MODEL_METADATA: unique symbol;
 export declare class ModelMetadataUtil {
-    static setControllerMetadata(clazz: EggProtoImplClass, metaData: ModelMetadata): void;
-    static getControllerMetadata(clazz: any): ModelMetadata | undefined;
+    static setModelMetadata(clazz: EggProtoImplClass, metaData: ModelMetadata): void;
+    static getModelMetadata(clazz: any): ModelMetadata | undefined;
 }

package/dist/src/util/ModelMetadataUtil.js

@@ -4,12 +4,12 @@ exports.ModelMetadataUtil = exports.MODEL_METADATA = void 0;
 const core_decorator_1 = require("@eggjs/core-decorator");
 exports.MODEL_METADATA = Symbol.for('EggPrototype#model#metadata');
 class ModelMetadataUtil {
-    static setControllerMetadata(clazz, metaData) {
+    static setModelMetadata(clazz, metaData) {
         core_decorator_1.MetadataUtil.defineMetaData(exports.MODEL_METADATA, metaData, clazz);
     }
-    static getControllerMetadata(clazz) {
-        return core_decorator_1.MetadataUtil.getOwnMetaData(exports.MODEL_METADATA, clazz);
+    static getModelMetadata(clazz) {
+        return core_decorator_1.MetadataUtil.getMetaData(exports.MODEL_METADATA, clazz);
     }
 }
 exports.ModelMetadataUtil = ModelMetadataUtil;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9kZWxNZXRhZGF0YVV0aWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbC9Nb2RlbE1ldGFkYXRhVXRpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwwREFBd0U7QUFHM0QsUUFBQSxjQUFjLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyw2QkFBNkIsQ0FBQyxDQUFDO0FBRXhFLE1BQWEsaUJBQWlCO0lBQzVCLE1BQU0sQ0FBQyxxQkFBcUIsQ0FBQyxLQUF3QixFQUFFLFFBQXVCO1FBQzVFLDZCQUFZLENBQUMsY0FBYyxDQUFDLHNCQUFjLEVBQUUsUUFBUSxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQy9ELENBQUM7SUFFRCxNQUFNLENBQUMscUJBQXFCLENBQUMsS0FBSztRQUNoQyxPQUFPLDZCQUFZLENBQUMsY0FBYyxDQUFDLHNCQUFjLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFDNUQsQ0FBQztDQUNGO0FBUkQsOENBUUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTW9kZWxNZXRhZGF0YVV0aWwuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbC9Nb2RlbE1ldGFkYXRhVXRpbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSwwREFBd0U7QUFHM0QsUUFBQSxjQUFjLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyw2QkFBNkIsQ0FBQyxDQUFDO0FBRXhFLE1BQWEsaUJBQWlCO0lBQzVCLE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQyxLQUF3QixFQUFFLFFBQXVCO1FBQ3ZFLDZCQUFZLENBQUMsY0FBYyxDQUFDLHNCQUFjLEVBQUUsUUFBUSxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQy9ELENBQUM7SUFFRCxNQUFNLENBQUMsZ0JBQWdCLENBQUMsS0FBSztRQUMzQixPQUFPLDZCQUFZLENBQUMsV0FBVyxDQUFDLHNCQUFjLEVBQUUsS0FBSyxDQUFDLENBQUM7SUFDekQsQ0FBQztDQUNGO0FBUkQsOENBUUMifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eggjs/tegg-orm-decorator",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "description": "tegg orm decorator",
   "main": "dist/index.js",
   "files": [
@@ -43,10 +43,10 @@
     "pluralize": "^8.0.0"
   },
   "peerDependencies": {
-    "leoric": "^1.6.7"
+    "leoric": "^2.6.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "22ef3a397c05de85ec2457c809c0df330fc24501"
+  "gitHead": "5da127fcf618ed89c4bf1beadc38bb2058f8426b"
 }