vona-module-a-version 5.0.44 → 5.0.46

package/dist/index.js

@@ -1,8 +1,8 @@
 import { BeanInfo, $Class, BeanBase, BeanScopeBase } from 'vona';
-import { Api, v } from 'vona-module-a-openapi';
+import { Api, v } from 'vona-module-a-openapiutils';
 import { Entity, EntityBaseSimple, Model, BeanModelBase } from 'vona-module-a-orm';
 import chalk from 'chalk';
-import moment from 'moment';
+import { DateTime } from 'luxon';
 import { Service, Scope } from 'vona-module-a-bean';
 import { Event, BeanEventBase } from 'vona-module-a-event';
 import fse from 'fs-extra';
@@ -124,7 +124,7 @@ let ModelViewRecord = (_dec$8 = Model({
 
 var _dec$7, _dec2$7, _class$7;
 const __separator = '-';
-const __timeFormat = `YYYYMMDD${__separator}HHmmss`;
+const __timeFormat = `yyyyMMdd${__separator}HHmmss`;
 let ServiceDatabase = (_dec$7 = Service(), _dec2$7 = BeanInfo({
   module: "a-version"
 }), _dec$7(_class$7 = _dec2$7(_class$7 = class ServiceDatabase extends BeanBase {
@@ -150,22 +150,12 @@ let ServiceDatabase = (_dec$7 = Service(), _dec2$7 = BeanInfo({
   }
   async __fetchDatabases(client, instanceName, configInstanceBase) {
     const databasePrefix = this.getDatabasePrefix(instanceName, configInstanceBase);
-    // dbs
-    let dbs = await client.connection.schema.fetchDatabases(databasePrefix);
-    // filter
-    dbs = dbs.filter(db => {
-      const _time = db.name.substring(databasePrefix.length);
-      return _time.length === __timeFormat.length;
-    });
-    // ok
-    return dbs;
+    return await client.connection.schema.fetchDatabases(databasePrefix);
   }
   async __createDatabase(client, instanceName, configInstanceBase) {
     const databasePrefix = this.getDatabasePrefix(instanceName, configInstanceBase);
-    // create
-    const databaseName = `${databasePrefix}${moment().format(__timeFormat)}`;
-    await client.connection.schema.createDatabase(databaseName);
-    return databaseName;
+    const databaseName = `${databasePrefix}${DateTime.now().toFormat(__timeFormat)}`;
+    return await client.connection.schema.createDatabase(databaseName);
   }
   async __prepareDatabases(versionStart) {
     // default
@@ -196,7 +186,7 @@ let ServiceDatabase = (_dec$7 = Service(), _dec2$7 = BeanInfo({
     const client = this.bean.database.current.client;
     // get current database name
     let databaseName = client.getDatabaseName();
-    const isTestDatabase = databaseName.indexOf(databasePrefix) === 0;
+    const isTestDatabase = databaseName.includes(databasePrefix);
     // dev/debug db
     if (this.app.meta.isDev) {
       // if enable testDatabase

package/package.json

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