vona-module-a-version 5.0.13 → 5.0.15

package/dist/.metadata/index.d.ts

@@ -1,4 +1,5 @@
 import type { BeanScopeUtil, TypeLocaleBase, TypeModuleErrors, TypeModuleLocales } from 'vona';
+import type { TypeMetaEntity } from 'vona-module-a-database';
 import type { IDecoratorModelOptions } from 'vona-module-a-database';
 import type { EventOn } from 'vona-module-a-event';
 import type { TypeEntityOptionsFields } from 'vona-module-a-openapi';
@@ -45,44 +46,38 @@ export * from '../bean/meta.version.ts';
 export * from '../bean/startup.databaseInit.ts';
 declare module 'vona-module-a-database' {
     interface IEntityRecord {
-        'a-version:version': IEntityOptionsVersion;
-        'a-version:versionInit': IEntityOptionsVersionInit;
-        'a-version:viewRecord': IEntityOptionsViewRecord;
+        'a-version:version': Omit<IEntityOptionsVersion, '_fieldsMore_'>;
+        'a-version:versionInit': Omit<IEntityOptionsVersionInit, '_fieldsMore_'>;
+        'a-version:viewRecord': Omit<IEntityOptionsViewRecord, '_fieldsMore_'>;
     }
 }
 declare module 'vona-module-a-version' {
 }
 export interface IModuleEntity {
-    version: EntityVersion;
-    versionInit: EntityVersionInit;
-    viewRecord: EntityViewRecord;
+    version: TypeMetaEntity<EntityVersion>;
+    versionInit: TypeMetaEntity<EntityVersionInit>;
+    viewRecord: TypeMetaEntity<EntityViewRecord>;
 }
 /** entity: end */
 /** entity: begin */
 declare module 'vona-module-a-version' {
     interface EntityVersion {
         get $table(): 'aVersion';
-        $column: <K extends keyof Omit<EntityVersion, '$column' | '$columns' | '$table'>>(column: K) => K;
-        $columns: <K extends keyof Omit<EntityVersion, '$column' | '$columns' | '$table'>>(...columns: K[]) => K[];
     }
     interface EntityVersionInit {
         get $table(): 'aVersionInit';
-        $column: <K extends keyof Omit<EntityVersionInit, '$column' | '$columns' | '$table'>>(column: K) => K;
-        $columns: <K extends keyof Omit<EntityVersionInit, '$column' | '$columns' | '$table'>>(...columns: K[]) => K[];
     }
     interface EntityViewRecord {
         get $table(): 'aViewRecord';
-        $column: <K extends keyof Omit<EntityViewRecord, '$column' | '$columns' | '$table'>>(column: K) => K;
-        $columns: <K extends keyof Omit<EntityViewRecord, '$column' | '$columns' | '$table'>>(...columns: K[]) => K[];
     }
     interface IEntityOptionsVersion {
-        fields?: TypeEntityOptionsFields<EntityVersion, IEntityOptionsVersion['fieldsMore']>;
+        fields?: TypeEntityOptionsFields<EntityVersion, IEntityOptionsVersion['_fieldsMore_']>;
     }
     interface IEntityOptionsVersionInit {
-        fields?: TypeEntityOptionsFields<EntityVersionInit, IEntityOptionsVersionInit['fieldsMore']>;
+        fields?: TypeEntityOptionsFields<EntityVersionInit, IEntityOptionsVersionInit['_fieldsMore_']>;
     }
     interface IEntityOptionsViewRecord {
-        fields?: TypeEntityOptionsFields<EntityViewRecord, IEntityOptionsViewRecord['fieldsMore']>;
+        fields?: TypeEntityOptionsFields<EntityViewRecord, IEntityOptionsViewRecord['_fieldsMore_']>;
     }
 }
 export * from '../bean/startup.databaseName.ts';

package/dist/index.js

@@ -5,6 +5,7 @@ import fse from 'fs-extra';
 import { Meta } from 'vona-module-a-meta';
 import { Startup } from 'vona-module-a-startup';
 import { Entity, EntityBaseSimple, Model, BeanModelBase } from 'vona-module-a-database';
+import { Api } from 'vona-module-a-openapi';
 import chalk from 'chalk';
 import moment from 'moment';
 import { Service } from 'vona-module-a-web';
@@ -34,9 +35,9 @@ let MetaVersion = (_dec$a = Meta(), _dec2$a = BeanInfo({
           deleted: false,
           iid: false
         });
-        table.string(entity.$column('instanceName'), 255);
-        table.string(entity.$column('module'), 255);
-        table.integer(entity.$column('version'));
+        table.string(entity.instanceName, 255);
+        table.string(entity.module, 255);
+        table.integer(entity.version);
       });
       const entity2 = this.scope.entity.viewRecord;
       await this.bean.model.createTable(entity2.$table, table => {
@@ -44,8 +45,8 @@ let MetaVersion = (_dec$a = Meta(), _dec2$a = BeanInfo({
           deleted: true,
           iid: false
         });
-        table.string(entity2.$column('viewName'), 255);
-        table.text(entity2.$column('viewSql'));
+        table.string(entity2.viewName, 255);
+        table.text(entity2.viewSql);
       });
     }
   }
@@ -105,39 +106,91 @@ let Errors = /*#__PURE__*/function (Errors) {
   return Errors;
 }({});
 
-var _dec$6, _dec2$6, _class$6;
+function _applyDecoratedDescriptor(i, e, r, n, l) {
+  var a = {};
+  return Object.keys(n).forEach(function (i) {
+    a[i] = n[i];
+  }), a.enumerable = !!a.enumerable, a.configurable = !!a.configurable, ("value" in a || a.initializer) && (a.writable = true), a = r.slice().reverse().reduce(function (r, n) {
+    return n(i, e, r) || r;
+  }, a), void 0 === a.initializer ? (Object.defineProperty(i, e, a), null) : a;
+}
+function _initializerDefineProperty(e, i, r, l) {
+  r && Object.defineProperty(e, i, {
+    enumerable: r.enumerable,
+    configurable: r.configurable,
+    writable: r.writable,
+    value: r.initializer ? r.initializer.call(l) : void 0
+  });
+}
+
+var _dec$6, _dec2$6, _dec3$2, _dec4$2, _dec5$2, _dec6$2, _class$6, _class2$2, _descriptor$2, _descriptor2$2;
 let EntityVersion = (_dec$6 = Entity('aVersion'), _dec2$6 = BeanInfo({
   module: "a-version"
-}), _dec$6(_class$6 = _dec2$6(_class$6 = class EntityVersion extends ClassMapped.omit(EntityBaseSimple, ['iid', 'deleted']) {
+}), _dec3$2 = Api.field(), _dec4$2 = Reflect.metadata("design:type", String), _dec5$2 = Api.field(), _dec6$2 = Reflect.metadata("design:type", Number), _dec$6(_class$6 = _dec2$6(_class$6 = (_class2$2 = class EntityVersion extends ClassMapped.omit(EntityBaseSimple, ['iid', 'deleted']) {
   constructor(...args) {
     super(...args);
-    this.module = void 0;
-    this.version = void 0;
+    _initializerDefineProperty(this, "module", _descriptor$2, this);
+    _initializerDefineProperty(this, "version", _descriptor2$2, this);
   }
-}) || _class$6) || _class$6);
+}, _descriptor$2 = _applyDecoratedDescriptor(_class2$2.prototype, "module", [_dec3$2, _dec4$2], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor2$2 = _applyDecoratedDescriptor(_class2$2.prototype, "version", [_dec5$2, _dec6$2], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _class2$2)) || _class$6) || _class$6);
 
-var _dec$5, _dec2$5, _class$5;
+var _dec$5, _dec2$5, _dec3$1, _dec4$1, _dec5$1, _dec6$1, _dec7, _dec8, _class$5, _class2$1, _descriptor$1, _descriptor2$1, _descriptor3;
 let EntityVersionInit = (_dec$5 = Entity('aVersionInit'), _dec2$5 = BeanInfo({
   module: "a-version"
-}), _dec$5(_class$5 = _dec2$5(_class$5 = class EntityVersionInit extends ClassMapped.omit(EntityBaseSimple, ['iid', 'deleted']) {
+}), _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$5(_class$5 = _dec2$5(_class$5 = (_class2$1 = class EntityVersionInit extends ClassMapped.omit(EntityBaseSimple, ['iid', 'deleted']) {
   constructor(...args) {
     super(...args);
-    this.instanceName = void 0;
-    this.module = void 0;
-    this.version = void 0;
+    _initializerDefineProperty(this, "instanceName", _descriptor$1, this);
+    _initializerDefineProperty(this, "module", _descriptor2$1, this);
+    _initializerDefineProperty(this, "version", _descriptor3, this);
   }
-}) || _class$5) || _class$5);
+}, _descriptor$1 = _applyDecoratedDescriptor(_class2$1.prototype, "instanceName", [_dec3$1, _dec4$1], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor2$1 = _applyDecoratedDescriptor(_class2$1.prototype, "module", [_dec5$1, _dec6$1], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor3 = _applyDecoratedDescriptor(_class2$1.prototype, "version", [_dec7, _dec8], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _class2$1)) || _class$5) || _class$5);
 
-var _dec$4, _dec2$4, _class$4;
+var _dec$4, _dec2$4, _dec3, _dec4, _dec5, _dec6, _class$4, _class2, _descriptor, _descriptor2;
 let EntityViewRecord = (_dec$4 = Entity('aViewRecord'), _dec2$4 = BeanInfo({
   module: "a-version"
-}), _dec$4(_class$4 = _dec2$4(_class$4 = class EntityViewRecord extends ClassMapped.omit(EntityBaseSimple, ['iid']) {
+}), _dec3 = Api.field(), _dec4 = Reflect.metadata("design:type", String), _dec5 = Api.field(), _dec6 = Reflect.metadata("design:type", String), _dec$4(_class$4 = _dec2$4(_class$4 = (_class2 = class EntityViewRecord extends ClassMapped.omit(EntityBaseSimple, ['iid']) {
   constructor(...args) {
     super(...args);
-    this.viewName = void 0;
-    this.viewSql = void 0;
+    _initializerDefineProperty(this, "viewName", _descriptor, this);
+    _initializerDefineProperty(this, "viewSql", _descriptor2, this);
   }
-}) || _class$4) || _class$4);
+}, _descriptor = _applyDecoratedDescriptor(_class2.prototype, "viewName", [_dec3, _dec4], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _descriptor2 = _applyDecoratedDescriptor(_class2.prototype, "viewSql", [_dec5, _dec6], {
+  configurable: true,
+  enumerable: true,
+  writable: true,
+  initializer: null
+}), _class2)) || _class$4) || _class$4);
 
 var _dec$3, _dec2$3, _class$3;
 let ModelViewRecord = (_dec$3 = Model({
@@ -300,8 +353,8 @@ let ServiceVersion = (_dec$1 = Service(), _dec2$1 = BeanInfo({
             deleted: false,
             iid: false
           });
-          table.string(entity.$column('module'), 255);
-          table.integer(entity.$column('version'));
+          table.string(entity.module, 255);
+          table.integer(entity.version);
         });
       }
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-version",
   "type": "module",
-  "version": "5.0.13",
+  "version": "5.0.15",
   "vonaModule": {
     "fileVersion": 1,
     "dependencies": {},