vona-module-a-version 5.0.49 → 5.0.53

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 (4) hide show
  1. package/dist/.metadata/index.d.ts +3 -3
  2. package/dist/.metadata/locales.d.ts +1 -1
  3. package/dist/index.js +97 -154
  4. package/package.json +1 -1
package/dist/.metadata/index.d.ts CHANGED
@@ -38,9 +38,9 @@ export type EntityVersionInitMeta = TypeEntityMeta<EntityVersionInit, EntityVers
38
38
  export type EntityViewRecordMeta = TypeEntityMeta<EntityViewRecord, EntityViewRecordTableName>;
39
39
  declare module 'vona-module-a-orm' {
40
40
  interface ITableRecord {
41
- 'aVersion': never;
42
- 'aVersionInit': never;
43
- 'aViewRecord': never;
41
+ 'aVersion': EntityVersionMeta;
42
+ 'aVersionInit': EntityVersionInitMeta;
43
+ 'aViewRecord': EntityViewRecordMeta;
44
44
  }
45
45
  }
46
46
  declare module 'vona-module-a-version' {
package/dist/.metadata/locales.d.ts CHANGED
@@ -11,4 +11,4 @@ export declare const locales: {
11
11
  ModuleOld: string;
12
12
  };
13
13
  };
14
- export declare function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K): `a-version::${K}`;
14
+ export declare function $locale<K extends keyof (typeof locales)[TypeLocaleBase]>(key: K, ...args: any[]): import("vona").ILocaleMagic<`a-version::${K}`>;
package/dist/index.js CHANGED
@@ -1,6 +1,7 @@
1
- import { BeanInfo, $Class, BeanBase, BeanScopeBase } from 'vona';
1
+ import { $makeLocaleMagic, $Class, BeanInfo, BeanBase, BeanScopeBase } from 'vona';
2
+ import { __decorate, __metadata } from 'tslib';
2
3
  import { Api, v } from 'vona-module-a-openapiutils';
3
- import { Entity, EntityBaseSimple, Model, BeanModelBase } from 'vona-module-a-orm';
4
+ import { EntityBaseSimple, Entity, Model, BeanModelBase } from 'vona-module-a-orm';
4
5
  import chalk from 'chalk';
5
6
  import { DateTime } from 'luxon';
6
7
  import { Service, Scope } from 'vona-module-a-bean';
@@ -10,23 +11,6 @@ import { Meta } from 'vona-module-a-meta';
10
11
  import { Startup } from 'vona-module-a-startup';
11
12
  import { Hmr } from 'vona-module-a-hmr';
12
13
 
13
- function _applyDecoratedDescriptor(i, e, r, n, l) {
14
- var a = {};
15
- return Object.keys(n).forEach(function (i) {
16
- a[i] = n[i];
17
- }), a.enumerable = !!a.enumerable, a.configurable = !!a.configurable, ("value" in a || a.initializer) && (a.writable = true), a = r.slice().reverse().reduce(function (r, n) {
18
- return n(i, e, r) || r;
19
- }, a), void 0 === a.initializer ? (Object.defineProperty(i, e, a), null) : a;
20
- }
21
- function _initializerDefineProperty(e, i, r, l) {
22
- r && Object.defineProperty(e, i, {
23
- enumerable: r.enumerable,
24
- configurable: r.configurable,
25
- writable: r.writable,
26
- value: r.initializer ? r.initializer.call(l) : void 0
27
- });
28
- }
29
-
30
14
  var locale_en_us = {
31
15
  Module: 'Module',
32
16
  Version: 'Version',
@@ -43,112 +27,81 @@ const locales = {
43
27
  'en-us': locale_en_us,
44
28
  'zh-cn': locale_zh_cn
45
29
  };
46
- function $locale(key) {
47
- return `a-version::${key}`;
30
+ function $locale(key, ...args) {
31
+ return $makeLocaleMagic(`a-version::${key}`, ...args);
48
32
  }
49
33
 
50
- var _dec$e, _dec2$e, _dec3$2, _dec4$2, _dec5$2, _dec6$2, _class$e, _class2$2, _descriptor$2, _descriptor2$2;
51
- let EntityVersion = (_dec$e = Entity('aVersion'), _dec2$e = BeanInfo({
52
- module: "a-version"
53
- }), _dec3$2 = Api.field(v.title($locale('Module'))), _dec4$2 = Reflect.metadata("design:type", String), _dec5$2 = Api.field(v.title($locale('Version'))), _dec6$2 = Reflect.metadata("design:type", Number), _dec$e(_class$e = _dec2$e(_class$e = (_class2$2 = class EntityVersion extends $Class.omit(EntityBaseSimple, ['iid', 'deleted']) {
34
+ let EntityVersion = class EntityVersion extends $Class.omit(EntityBaseSimple, ['iid', 'deleted']) {
54
35
  constructor(...args) {
55
36
  super(...args);
56
- _initializerDefineProperty(this, "module", _descriptor$2, this);
57
- _initializerDefineProperty(this, "version", _descriptor2$2, this);
58
- }
59
- }, _descriptor$2 = _applyDecoratedDescriptor(_class2$2.prototype, "module", [_dec3$2, _dec4$2], {
60
- configurable: true,
61
- enumerable: true,
62
- writable: true,
63
- initializer: null
64
- }), _descriptor2$2 = _applyDecoratedDescriptor(_class2$2.prototype, "version", [_dec5$2, _dec6$2], {
65
- configurable: true,
66
- enumerable: true,
67
- writable: true,
68
- initializer: null
69
- }), _class2$2)) || _class$e) || _class$e);
70
-
71
- var _dec$d, _dec2$d, _dec3$1, _dec4$1, _dec5$1, _dec6$1, _dec7, _dec8, _class$d, _class2$1, _descriptor$1, _descriptor2$1, _descriptor3;
72
- let EntityVersionInit = (_dec$d = Entity('aVersionInit'), _dec2$d = BeanInfo({
37
+ this.module = void 0;
38
+ this.version = void 0;
39
+ }
40
+ };
41
+ __decorate([Api.field(v.title($locale('Module'))), __metadata("design:type", String)], EntityVersion.prototype, "module", void 0);
42
+ __decorate([Api.field(v.title($locale('Version'))), __metadata("design:type", Number)], EntityVersion.prototype, "version", void 0);
43
+ EntityVersion = __decorate([Entity('aVersion'), BeanInfo({
73
44
  module: "a-version"
74
- }), _dec3$1 = Api.field(), _dec4$1 = Reflect.metadata("design:type", String), _dec5$1 = Api.field(), _dec6$1 = Reflect.metadata("design:type", String), _dec7 = Api.field(), _dec8 = Reflect.metadata("design:type", Number), _dec$d(_class$d = _dec2$d(_class$d = (_class2$1 = class EntityVersionInit extends $Class.omit(EntityBaseSimple, ['iid', 'deleted']) {
45
+ })], EntityVersion);
46
+
47
+ let EntityVersionInit = class EntityVersionInit extends $Class.omit(EntityBaseSimple, ['iid', 'deleted']) {
75
48
  constructor(...args) {
76
49
  super(...args);
77
- _initializerDefineProperty(this, "instanceName", _descriptor$1, this);
78
- _initializerDefineProperty(this, "module", _descriptor2$1, this);
79
- _initializerDefineProperty(this, "version", _descriptor3, this);
80
- }
81
- }, _descriptor$1 = _applyDecoratedDescriptor(_class2$1.prototype, "instanceName", [_dec3$1, _dec4$1], {
82
- configurable: true,
83
- enumerable: true,
84
- writable: true,
85
- initializer: null
86
- }), _descriptor2$1 = _applyDecoratedDescriptor(_class2$1.prototype, "module", [_dec5$1, _dec6$1], {
87
- configurable: true,
88
- enumerable: true,
89
- writable: true,
90
- initializer: null
91
- }), _descriptor3 = _applyDecoratedDescriptor(_class2$1.prototype, "version", [_dec7, _dec8], {
92
- configurable: true,
93
- enumerable: true,
94
- writable: true,
95
- initializer: null
96
- }), _class2$1)) || _class$d) || _class$d);
97
-
98
- var _dec$c, _dec2$c, _dec3, _dec4, _dec5, _dec6, _class$c, _class2, _descriptor, _descriptor2;
99
- let EntityViewRecord = (_dec$c = Entity('aViewRecord'), _dec2$c = BeanInfo({
50
+ this.instanceName = void 0;
51
+ this.module = void 0;
52
+ this.version = void 0;
53
+ }
54
+ };
55
+ __decorate([Api.field(), __metadata("design:type", String)], EntityVersionInit.prototype, "instanceName", void 0);
56
+ __decorate([Api.field(), __metadata("design:type", String)], EntityVersionInit.prototype, "module", void 0);
57
+ __decorate([Api.field(), __metadata("design:type", Number)], EntityVersionInit.prototype, "version", void 0);
58
+ EntityVersionInit = __decorate([Entity('aVersionInit'), BeanInfo({
100
59
  module: "a-version"
101
- }), _dec3 = Api.field(), _dec4 = Reflect.metadata("design:type", String), _dec5 = Api.field(), _dec6 = Reflect.metadata("design:type", String), _dec$c(_class$c = _dec2$c(_class$c = (_class2 = class EntityViewRecord extends $Class.omit(EntityBaseSimple, ['iid']) {
60
+ })], EntityVersionInit);
61
+
62
+ let EntityViewRecord = class EntityViewRecord extends $Class.omit(EntityBaseSimple, ['iid']) {
102
63
  constructor(...args) {
103
64
  super(...args);
104
- _initializerDefineProperty(this, "viewName", _descriptor, this);
105
- _initializerDefineProperty(this, "viewSql", _descriptor2, this);
106
- }
107
- }, _descriptor = _applyDecoratedDescriptor(_class2.prototype, "viewName", [_dec3, _dec4], {
108
- configurable: true,
109
- enumerable: true,
110
- writable: true,
111
- initializer: null
112
- }), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "viewSql", [_dec5, _dec6], {
113
- configurable: true,
114
- enumerable: true,
115
- writable: true,
116
- initializer: null
117
- }), _class2)) || _class$c) || _class$c);
65
+ this.viewName = void 0;
66
+ this.viewSql = void 0;
67
+ }
68
+ };
69
+ __decorate([Api.field(), __metadata("design:type", String)], EntityViewRecord.prototype, "viewName", void 0);
70
+ __decorate([Api.field(), __metadata("design:type", String)], EntityViewRecord.prototype, "viewSql", void 0);
71
+ EntityViewRecord = __decorate([Entity('aViewRecord'), BeanInfo({
72
+ module: "a-version"
73
+ })], EntityViewRecord);
118
74
 
119
- var _dec$b, _dec2$b, _class$b;
120
- let ModelVersion = (_dec$b = Model({
75
+ let ModelVersion = class ModelVersion extends BeanModelBase {};
76
+ ModelVersion = __decorate([Model({
121
77
  entity: EntityVersion,
122
78
  disableInstance: true,
123
79
  disableDeleted: true
124
- }), _dec2$b = BeanInfo({
80
+ }), BeanInfo({
125
81
  module: "a-version"
126
- }), _dec$b(_class$b = _dec2$b(_class$b = class ModelVersion extends BeanModelBase {}) || _class$b) || _class$b);
82
+ })], ModelVersion);
127
83
 
128
- var _dec$a, _dec2$a, _class$a;
129
- let ModelVersionInit = (_dec$a = Model({
84
+ let ModelVersionInit = class ModelVersionInit extends BeanModelBase {};
85
+ ModelVersionInit = __decorate([Model({
130
86
  entity: EntityVersionInit,
131
87
  disableInstance: true,
132
88
  disableDeleted: true
133
- }), _dec2$a = BeanInfo({
89
+ }), BeanInfo({
134
90
  module: "a-version"
135
- }), _dec$a(_class$a = _dec2$a(_class$a = class ModelVersionInit extends BeanModelBase {}) || _class$a) || _class$a);
91
+ })], ModelVersionInit);
136
92
 
137
- var _dec$9, _dec2$9, _class$9;
138
- let ModelViewRecord = (_dec$9 = Model({
93
+ let ModelViewRecord = class ModelViewRecord extends BeanModelBase {};
94
+ ModelViewRecord = __decorate([Model({
139
95
  entity: EntityViewRecord,
140
96
  disableDeleted: false,
141
97
  disableInstance: true
142
- }), _dec2$9 = BeanInfo({
98
+ }), BeanInfo({
143
99
  module: "a-version"
144
- }), _dec$9(_class$9 = _dec2$9(_class$9 = class ModelViewRecord extends BeanModelBase {}) || _class$9) || _class$9);
100
+ })], ModelViewRecord);
145
101
 
146
- var _dec$8, _dec2$8, _class$8;
147
102
  const __separator = '-';
148
103
  const __timeFormat = `yyyyMMdd${__separator}HHmmss`;
149
- let ServiceDatabase = (_dec$8 = Service(), _dec2$8 = BeanInfo({
150
- module: "a-version"
151
- }), _dec$8(_class$8 = _dec2$8(_class$8 = class ServiceDatabase extends BeanBase {
104
+ let ServiceDatabase = class ServiceDatabase extends BeanBase {
152
105
  get configDatabase() {
153
106
  return this.app.config.database;
154
107
  }
@@ -249,12 +202,12 @@ let ServiceDatabase = (_dec$8 = Service(), _dec2$8 = BeanInfo({
249
202
  this.$logger.silly(chalk.cyan(`database: ${databaseName}, pid: ${process.pid}`));
250
203
  }
251
204
  }
252
- }) || _class$8) || _class$8);
253
-
254
- var _dec$7, _dec2$7, _class$7;
255
- let ServiceVersion = (_dec$7 = Service(), _dec2$7 = BeanInfo({
205
+ };
206
+ ServiceDatabase = __decorate([Service(), BeanInfo({
256
207
  module: "a-version"
257
- }), _dec$7(_class$7 = _dec2$7(_class$7 = class ServiceVersion extends BeanBase {
208
+ })], ServiceDatabase);
209
+
210
+ let ServiceVersion = class ServiceVersion extends BeanBase {
258
211
  async instanceInitStartup(options) {
259
212
  const instanceBase = options?.configInstanceBase;
260
213
  await this.__instanceInit(this.ctx.instanceName, instanceBase);
@@ -299,7 +252,6 @@ let ServiceVersion = (_dec$7 = Service(), _dec2$7 = BeanInfo({
299
252
  instanceName
300
253
  });
301
254
  }
302
-
303
255
  // scene: null/init/test
304
256
  async __check(options) {
305
257
  options.result = {};
@@ -318,29 +270,24 @@ let ServiceVersion = (_dec$7 = Service(), _dec2$7 = BeanInfo({
318
270
  });
319
271
  }
320
272
  }
321
-
322
273
  // check all modules
323
274
  for (const module of this.app.meta.modulesArray) {
324
275
  this.$loggerChild('version').debug('check module: %s, scene:%s', module.info.relativeName, options.scene);
325
276
  await this.__checkModule(module.info.relativeName, options);
326
277
  }
327
-
328
278
  // version done
329
279
  await this.bean.executor.newCtx(async () => {
330
280
  await this.__done(options);
331
281
  }, {
332
282
  instanceName: options.instanceName
333
283
  });
334
-
335
284
  // ok
336
285
  return options.result;
337
286
  }
338
-
339
287
  // check module
340
288
  async __checkModule(moduleName, options) {
341
289
  // module
342
290
  const module = this.__getModule(moduleName);
343
-
344
291
  // fileVersionNew
345
292
  let fileVersionNew = 0;
346
293
  if (module.package.vonaModule && module.package.vonaModule.fileVersion) {
@@ -348,7 +295,6 @@ let ServiceVersion = (_dec$7 = Service(), _dec2$7 = BeanInfo({
348
295
  }
349
296
  if (fileVersionNew && ['update', 'init'].includes(options.scene)) {
350
297
  // update module or init module
351
-
352
298
  // -1: always
353
299
  if (fileVersionNew === -1) {
354
300
  await this.__updateModule(options, module, -1, -1);
@@ -369,7 +315,6 @@ let ServiceVersion = (_dec$7 = Service(), _dec2$7 = BeanInfo({
369
315
  fileVersionOld = res.version;
370
316
  }
371
317
  }
372
-
373
318
  // check if need update
374
319
  if (fileVersionOld > fileVersionNew) {
375
320
  this.scope.error.ModuleOld.throw(moduleName);
@@ -389,7 +334,6 @@ let ServiceVersion = (_dec$7 = Service(), _dec2$7 = BeanInfo({
389
334
  });
390
335
  }
391
336
  }
392
-
393
337
  // update module or init module
394
338
  async __updateModule(options, module, fileVersionOld, fileVersionNew) {
395
339
  if (fileVersionNew === -1) {
@@ -408,7 +352,6 @@ let ServiceVersion = (_dec$7 = Service(), _dec2$7 = BeanInfo({
408
352
  await this.__updateModule2(options, module, version);
409
353
  }
410
354
  }
411
-
412
355
  // log
413
356
  if (fileVersionOld !== fileVersionNew) {
414
357
  options.result[module.info.relativeName] = {
@@ -473,7 +416,6 @@ let ServiceVersion = (_dec$7 = Service(), _dec2$7 = BeanInfo({
473
416
  });
474
417
  }
475
418
  }
476
-
477
419
  // test module
478
420
  async __testModuleTransaction(module, version, options) {
479
421
  // bean
@@ -489,7 +431,6 @@ let ServiceVersion = (_dec$7 = Service(), _dec2$7 = BeanInfo({
489
431
  async __done(options) {
490
432
  await this.scope.event.versionDone.emit(options);
491
433
  }
492
-
493
434
  // get module
494
435
  __getModule(moduleName) {
495
436
  return this.app.meta.modules[moduleName];
@@ -500,17 +441,17 @@ let ServiceVersion = (_dec$7 = Service(), _dec2$7 = BeanInfo({
500
441
  if (!beanVersion && throwErrorIfEmpty) throw new Error(`meta.version not exists for ${moduleName}`);
501
442
  return beanVersion;
502
443
  }
503
- }) || _class$7) || _class$7);
504
-
505
- var _dec$6, _dec2$6, _class$6;
506
- let EventVersionDone = (_dec$6 = Event(), _dec2$6 = BeanInfo({
444
+ };
445
+ ServiceVersion = __decorate([Service(), BeanInfo({
507
446
  module: "a-version"
508
- }), _dec$6(_class$6 = _dec2$6(_class$6 = class EventVersionDone extends BeanEventBase {}) || _class$6) || _class$6);
447
+ })], ServiceVersion);
509
448
 
510
- var _dec$5, _dec2$5, _class$5;
511
- let MetaVersion = (_dec$5 = Meta(), _dec2$5 = BeanInfo({
449
+ let EventVersionDone = class EventVersionDone extends BeanEventBase {};
450
+ EventVersionDone = __decorate([Event(), BeanInfo({
512
451
  module: "a-version"
513
- }), _dec$5(_class$5 = _dec2$5(_class$5 = class MetaVersion extends BeanBase {
452
+ })], EventVersionDone);
453
+
454
+ let MetaVersion = class MetaVersion extends BeanBase {
514
455
  async update(options) {
515
456
  if (options.version === 1) {
516
457
  const entity = this.scope.entity.versionInit;
@@ -548,61 +489,63 @@ let MetaVersion = (_dec$5 = Meta(), _dec2$5 = BeanInfo({
548
489
  // remove
549
490
  await fse.remove(publicPath);
550
491
  }
551
- }) || _class$5) || _class$5);
552
-
553
- var _dec$4, _dec2$4, _class$4;
554
- let StartupDatabaseInit = (_dec$4 = Startup({
555
- debounce: true
556
- }), _dec2$4 = BeanInfo({
492
+ };
493
+ MetaVersion = __decorate([Meta(), BeanInfo({
557
494
  module: "a-version"
558
- }), _dec$4(_class$4 = _dec2$4(_class$4 = class StartupDatabaseInit extends BeanBase {
495
+ })], MetaVersion);
496
+
497
+ let StartupDatabaseInit = class StartupDatabaseInit extends BeanBase {
559
498
  async execute() {
560
499
  return await this.scope.service.database.databaseInitStartup();
561
500
  }
562
- }) || _class$4) || _class$4);
563
-
564
- var _dec$3, _dec2$3, _class$3;
565
- let StartupDatabaseName = (_dec$3 = Startup({
566
- dependencies: 'a-version:databaseInit'
567
- }), _dec2$3 = BeanInfo({
501
+ };
502
+ StartupDatabaseInit = __decorate([Startup({
503
+ debounce: true
504
+ }), BeanInfo({
568
505
  module: "a-version"
569
- }), _dec$3(_class$3 = _dec2$3(_class$3 = class StartupDatabaseName extends BeanBase {
506
+ })], StartupDatabaseInit);
507
+
508
+ let StartupDatabaseName = class StartupDatabaseName extends BeanBase {
570
509
  async execute() {
571
510
  return await this.scope.service.database.databaseNameStartup();
572
511
  }
573
- }) || _class$3) || _class$3);
574
-
575
- var _dec$2, _dec2$2, _class$2;
576
- let StartupInstanceInit = (_dec$2 = Startup({
577
- instance: true,
578
- debounce: true
579
- }), _dec2$2 = BeanInfo({
512
+ };
513
+ StartupDatabaseName = __decorate([Startup({
514
+ dependencies: 'a-version:databaseInit'
515
+ }), BeanInfo({
580
516
  module: "a-version"
581
- }), _dec$2(_class$2 = _dec2$2(_class$2 = class StartupInstanceInit extends BeanBase {
517
+ })], StartupDatabaseName);
518
+
519
+ let StartupInstanceInit = class StartupInstanceInit extends BeanBase {
582
520
  async execute(options) {
583
521
  const beanVersion = this.scope.service.version;
584
522
  return await beanVersion.instanceInitStartup(options);
585
523
  }
586
- }) || _class$2) || _class$2);
587
-
588
- var _dec$1, _dec2$1, _class$1;
589
- let HmrMetaVersion = (_dec$1 = Hmr(), _dec2$1 = BeanInfo({
524
+ };
525
+ StartupInstanceInit = __decorate([Startup({
526
+ instance: true,
527
+ debounce: true
528
+ }), BeanInfo({
590
529
  module: "a-version"
591
- }), _dec$1(_class$1 = _dec2$1(_class$1 = class HmrMetaVersion extends BeanBase {
530
+ })], StartupInstanceInit);
531
+
532
+ let HmrMetaVersion = class HmrMetaVersion extends BeanBase {
592
533
  async reload(_beanOptions) {
593
534
  this.app.bean.worker.reload();
594
535
  }
595
- }) || _class$1) || _class$1);
536
+ };
537
+ HmrMetaVersion = __decorate([Hmr(), BeanInfo({
538
+ module: "a-version"
539
+ })], HmrMetaVersion);
596
540
 
597
541
  const errors = {
598
542
  ModuleOld: 1001
599
543
  };
600
544
 
601
- var _dec, _dec2, _class;
602
- let ScopeModuleAVersion = (_dec = Scope(), _dec2 = BeanInfo({
545
+ let ScopeModuleAVersion = class ScopeModuleAVersion extends BeanScopeBase {};
546
+ ScopeModuleAVersion = __decorate([Scope(), BeanInfo({
603
547
  module: "a-version"
604
- }), _dec(_class = _dec2(_class = class ScopeModuleAVersion extends BeanScopeBase {}) || _class) || _class);
605
-
548
+ })], ScopeModuleAVersion);
606
549
  /** scope: end */
607
550
 
608
551
  export { $locale, EntityVersion, EntityVersionInit, EntityViewRecord, EventVersionDone, HmrMetaVersion, MetaVersion, ModelVersion, ModelVersionInit, ModelViewRecord, ScopeModuleAVersion, ServiceDatabase, ServiceVersion, StartupDatabaseInit, StartupDatabaseName, StartupInstanceInit, errors, locales };
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "vona-module-a-version",
3
3
  "type": "module",
4
- "version": "5.0.49",
4
+ "version": "5.0.53",
5
5
  "vonaModule": {
6
6
  "fileVersion": 1,
7
7
  "dependencies": {},