dinegg 2.15.0 → 2.15.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/lib/core/loader/DingAppWorkerLoader.js +26 -1
  2. package/lib/tshelper.js +23 -23
  3. package/package.json +2 -2
package/lib/core/loader/DingAppWorkerLoader.js CHANGED
@@ -157,6 +157,30 @@ class DingAppWorkerLoader extends egg.AppWorkerLoader {
157
157
  return new bootClass(this.app);
158
158
  });
159
159
  }
160
+ loadAllServiceClassToApp() {
161
+ const that = this;
162
+ function reduceControllerMethod(targetObj, serviceObj) {
163
+ if (Object.prototype.toString.call(serviceObj) !== "[object Object]") {
164
+ return;
165
+ }
166
+ const property = Object.keys(serviceObj);
167
+ property.forEach((item) => {
168
+ const ServiceClass = serviceObj[item];
169
+ if (ServiceClass instanceof Function) {
170
+ const className = ServiceClass[Symbol.for("#className")] || ServiceClass.name;
171
+ if (targetObj[className]) {
172
+ that.options.logger.warn("[dinegg app worker loader service banding] 警告，service类名重复，绑定将被覆盖！%s", className);
173
+ }
174
+ targetObj[className] = ServiceClass;
175
+ return;
176
+ }
177
+ reduceControllerMethod(targetObj, serviceObj[item]);
178
+ });
179
+ }
180
+ this.options.app._dineggServiceClasses = {};
181
+ reduceControllerMethod(this.options.app._dineggServiceClasses, this.options.app.mServiceClasses);
182
+ reduceControllerMethod(this.options.app._dineggServiceClasses, this.options.app.serviceClasses);
183
+ }
160
184
  loadConfig() {
161
185
  this.loadPlugin();
162
186
  super.loadConfig();
@@ -182,6 +206,7 @@ class DingAppWorkerLoader extends egg.AppWorkerLoader {
182
206
  isEnableModule && this.loadModuleService();
183
207
  this.loadService();
184
208
  isEnableModule && Object.assign(app.serviceClasses, app.mServiceClasses);
209
+ this.loadAllServiceClassToApp();
185
210
  this.loadMiddleware();
186
211
  isEnableModule && this.loadModuleController();
187
212
  this.loadController({ initializer: dineggControllerInitializer_1.default });
@@ -190,4 +215,4 @@ class DingAppWorkerLoader extends egg.AppWorkerLoader {
190
215
  }
191
216
  }
192
217
  exports.default = DingAppWorkerLoader;
193
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"DingAppWorkerLoader.js","sourceRoot":"","sources":["DingAppWorkerLoader.ts"],"names":[],"mappings":"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"}
218
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"DingAppWorkerLoader.js","sourceRoot":"","sources":["DingAppWorkerLoader.ts"],"names":[],"mappings":"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"}
package/lib/tshelper.js CHANGED
@@ -77,29 +77,29 @@ module.exports = (importsModules = []) => {
77
77
  // interfaceHandle: val => `ReturnType<typeof ${val}>`, // interface 预处理方法
78
78
  // trigger: ['add', 'unlink'], // 当接收到这些文件更改事件的时候，会触发 d.ts 的重新生成, 所有事件: ['add', 'unlink', 'change']
79
79
  },
80
- oldService: {
81
- directory: "app/service", // 监听目录
82
- // pattern: servicePattern, // 遍历的文件表达式，一般都不需要改这个
83
- // ignore: '', // 指定忽略某些文件的表达式，默认为空
84
- generator: "auto", // 生成器名称，取值为 class、auto、function、object
85
- // generator: genratorService, // 生成器名称，取值为 class、auto、function、object
86
- interface: "oIService", // interface 名称，如果不填的话，将会随机生成个 interface
87
- declareTo: 'Context.svs', // 指定定义到 egg 的某个类型下
88
- distName: "svs.d.ts", //读源码发现可以传入此参数实现自定义声明文件名称。解决了问题，无需自定义。
89
- watch: true, // 是否需要监听文件改动
90
- caseStyle: function (pathItem) {
91
- // 此处逻辑必须跟自定义加载器中的caseStyle自定义方法相一致，否则生成的d.ts无法对应。
92
- // pathItem = pathItem.replace(/.service$/, "");
93
- if (!/^[a-z][a-z0-9_-]*$/i.test(pathItem)) {
94
- throw new Error(`${pathItem} is not match 'a-z0-9_-' in ${pathItem}`);
95
- }
96
- pathItem = pathItem.replace(/[_-][a-z]/gi, (s) => s.substring(1).toUpperCase());
97
- const first = pathItem[0];
98
- return first.toLowerCase() + pathItem.substring(1);
99
- }, // 模块命名格式
100
- // interfaceHandle: val => `ReturnType<typeof ${val}>`, // interface 预处理方法
101
- // trigger: ['add', 'unlink'], // 当接收到这些文件更改事件的时候，会触发 d.ts 的重新生成, 所有事件: ['add', 'unlink', 'change']
102
- },
80
+ // oldService: {
81
+ // directory: "app/service", // 监听目录
82
+ // // pattern: servicePattern, // 遍历的文件表达式，一般都不需要改这个
83
+ // // ignore: '', // 指定忽略某些文件的表达式，默认为空
84
+ // generator: "auto", // 生成器名称，取值为 class、auto、function、object
85
+ // // generator: genratorService, // 生成器名称，取值为 class、auto、function、object
86
+ // interface: "oIService", // interface 名称，如果不填的话，将会随机生成个 interface
87
+ // declareTo: 'Context.svs', // 指定定义到 egg 的某个类型下
88
+ // distName: "svs.d.ts", //读源码发现可以传入此参数实现自定义声明文件名称。解决了问题，无需自定义。
89
+ // watch: true, // 是否需要监听文件改动
90
+ // caseStyle: function (pathItem) {
91
+ // // 此处逻辑必须跟自定义加载器中的caseStyle自定义方法相一致，否则生成的d.ts无法对应。
92
+ // // pathItem = pathItem.replace(/.service$/, "");
93
+ // if (!/^[a-z][a-z0-9_-]*$/i.test(pathItem)) {
94
+ // throw new Error(`${pathItem} is not match 'a-z0-9_-' in ${pathItem}`);
95
+ // }
96
+ // pathItem = pathItem.replace(/[_-][a-z]/gi, (s) => s.substring(1).toUpperCase());
97
+ // const first = pathItem[0];
98
+ // return first.toLowerCase() + pathItem.substring(1);
99
+ // }, // 模块命名格式
100
+ // // interfaceHandle: val => `ReturnType<typeof ${val}>`, // interface 预处理方法
101
+ // // trigger: ['add', 'unlink'], // 当接收到这些文件更改事件的时候，会触发 d.ts 的重新生成, 所有事件: ['add', 'unlink', 'change']
102
+ // },
103
103
  moduleController: {
104
104
  directory: "app/modules", // 监听目录
105
105
  pattern: controllerPattern, // 遍历的文件表达式，一般都不需要改这个
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "dinegg",
3
- "version": "2.15.0",
3
+ "version": "2.15.2",
4
4
  "description": "egg framework dinegg.",
5
5
  "dependencies": {
6
6
  "@diyaner/egg-sequelize": "^6.0.0",
@@ -33,7 +33,7 @@
33
33
  "test-decorator": "tsc && egg-bin test ./test/decorator.test.js && npm run clean:js",
34
34
  "test-appCache": "tsc && egg-bin test ./test/appCache.test.js && npm run clean:js",
35
35
  "tsc": "tsc",
36
- "clean:js": "ets clean",
36
+ "clean:js": "tsc -b --clean",
37
37
  "release": "tsc && npm publish && npm run clean:js",
38
38
  "cov": "egg-bin cov",
39
39
  "lint": "eslint . --resolve-plugins-relative-to .",