@nocobase/plugin-multi-app-manager 1.3.50-beta → 1.3.52

package/dist/externalVersion.js

@@ -8,18 +8,18 @@
  */
 
 module.exports = {
-  "@nocobase/client": "1.3.50-beta",
+  "@nocobase/client": "1.3.52",
   "antd": "5.12.8",
   "react": "18.2.0",
   "@formily/react": "2.3.0",
   "antd-style": "3.7.1",
   "react-router-dom": "6.21.0",
   "react-i18next": "11.18.6",
-  "@nocobase/database": "1.3.50-beta",
-  "@nocobase/server": "1.3.50-beta",
+  "@nocobase/database": "1.3.52",
+  "@nocobase/server": "1.3.52",
   "lodash": "4.17.21",
   "mysql2": "3.11.0",
   "pg": "8.11.3",
-  "@nocobase/utils": "1.3.50-beta",
+  "@nocobase/utils": "1.3.52",
   "@formily/shared": "2.3.2"
 };

package/dist/node_modules/mariadb/package.json

@@ -1 +1 @@
-{"name":"mariadb","version":"2.5.6","description":"fast mariadb/mysql connector.","main":"promise.js","types":"types/index.d.ts","directories":{"lib":"lib","test":"test"},"private":false,"scripts":{"test":"npm run test:types-prettier && npm run test:prettier && npm run test:types && npm run test:lint && npm run test:base","test:base":"mocha --no-parallel --timeout 5000 \"test/**/*.js\" ","test:lint":"eslint \"{lib,test}/**/*.js\" ","test:types":"eslint \"types/*.ts\" ","test:types-prettier":"prettier --write \"types/*.ts\"","test:prettier":"prettier --write \"{tools,lib,test,benchmarks}/**/*.js\"","coverage":"npm run coverage:test && npm run coverage:report","coverage:test":"nyc mocha --no-parallel --timeout 5000 \"test/**/*.js\"","coverage:report":"nyc report --reporter=text-lcov > coverage.lcov && codecov","benchmark":"node ./benchmarks/benchmarks.js","generate":"node ./tools/generate-mariadb.js"},"repository":{"type":"git","url":"git+https://github.com/mariadb-corporation/mariadb-connector-nodejs.git"},"keywords":["mariadb","mysql","client","driver","connector"],"files":["lib","types/index.d.ts","promise.js","callback.js"],"engines":{"node":">= 10.13"},"author":"Diego Dupin <diego.dupin@mariadb.com>","license":"LGPL-2.1-or-later","dependencies":{"@types/geojson":"^7946.0.8","@types/node":"^17.0.10","denque":"^2.0.1","iconv-lite":"^0.6.3","long":"^5.2.0","moment-timezone":"^0.5.34","please-upgrade-node":"^3.2.0"},"devDependencies":{"@typescript-eslint/eslint-plugin":"^5.10.0","@typescript-eslint/parser":"^5.10.0","benchmark":"^2.1.4","chai":"^4.3.4","codecov":"^3.8.2","chalk":"^4.1.2","dom-parser":"^0.1.6","error-stack-parser":"^2.0.6","eslint":"^8.7.0","eslint-config-prettier":"^8.3.0","eslint-plugin-markdown":"^2.2.1","eslint-plugin-prettier":"^4.0.0","mocha":"^9.2.0","mocha-lcov-reporter":"^1.3.0","nyc":"^15.1.0","prettier":"^2.5.1","typescript":"^4.5.5"},"bugs":{"url":"https://jira.mariadb.org/projects/CONJS/"},"homepage":"https://github.com/mariadb-corporation/mariadb-connector-nodejs#readme","_lastModified":"2024-11-14T04:02:20.443Z"}
+{"name":"mariadb","version":"2.5.6","description":"fast mariadb/mysql connector.","main":"promise.js","types":"types/index.d.ts","directories":{"lib":"lib","test":"test"},"private":false,"scripts":{"test":"npm run test:types-prettier && npm run test:prettier && npm run test:types && npm run test:lint && npm run test:base","test:base":"mocha --no-parallel --timeout 5000 \"test/**/*.js\" ","test:lint":"eslint \"{lib,test}/**/*.js\" ","test:types":"eslint \"types/*.ts\" ","test:types-prettier":"prettier --write \"types/*.ts\"","test:prettier":"prettier --write \"{tools,lib,test,benchmarks}/**/*.js\"","coverage":"npm run coverage:test && npm run coverage:report","coverage:test":"nyc mocha --no-parallel --timeout 5000 \"test/**/*.js\"","coverage:report":"nyc report --reporter=text-lcov > coverage.lcov && codecov","benchmark":"node ./benchmarks/benchmarks.js","generate":"node ./tools/generate-mariadb.js"},"repository":{"type":"git","url":"git+https://github.com/mariadb-corporation/mariadb-connector-nodejs.git"},"keywords":["mariadb","mysql","client","driver","connector"],"files":["lib","types/index.d.ts","promise.js","callback.js"],"engines":{"node":">= 10.13"},"author":"Diego Dupin <diego.dupin@mariadb.com>","license":"LGPL-2.1-or-later","dependencies":{"@types/geojson":"^7946.0.8","@types/node":"^17.0.10","denque":"^2.0.1","iconv-lite":"^0.6.3","long":"^5.2.0","moment-timezone":"^0.5.34","please-upgrade-node":"^3.2.0"},"devDependencies":{"@typescript-eslint/eslint-plugin":"^5.10.0","@typescript-eslint/parser":"^5.10.0","benchmark":"^2.1.4","chai":"^4.3.4","codecov":"^3.8.2","chalk":"^4.1.2","dom-parser":"^0.1.6","error-stack-parser":"^2.0.6","eslint":"^8.7.0","eslint-config-prettier":"^8.3.0","eslint-plugin-markdown":"^2.2.1","eslint-plugin-prettier":"^4.0.0","mocha":"^9.2.0","mocha-lcov-reporter":"^1.3.0","nyc":"^15.1.0","prettier":"^2.5.1","typescript":"^4.5.5"},"bugs":{"url":"https://jira.mariadb.org/projects/CONJS/"},"homepage":"https://github.com/mariadb-corporation/mariadb-connector-nodejs#readme","_lastModified":"2024-11-21T02:26:12.138Z"}

package/dist/server/server.d.ts

@@ -8,8 +8,10 @@
  */
 import { IDatabaseOptions, Transactionable } from '@nocobase/database';
 import Application, { Plugin } from '@nocobase/server';
+import { ApplicationModel } from '../server';
 export type AppDbCreator = (app: Application, options?: Transactionable & {
     context?: any;
+    applicationModel?: ApplicationModel;
 }) => Promise<void>;
 export type AppOptionsFactory = (appName: string, mainApp: Application) => any;
 export type SubAppUpgradeHandler = (mainApp: Application) => Promise<void>;

package/dist/server/server.js

@@ -78,7 +78,7 @@ const defaultSubAppUpgradeHandle = async (mainApp) => {
 };
 const defaultDbCreator = async (app) => {
   const databaseOptions = app.options.database;
-  const { host, port, username, password, dialect, database } = databaseOptions;
+  const { host, port, username, password, dialect, database, schema } = databaseOptions;
   if (dialect === "mysql") {
     const mysql = require("mysql2/promise");
     const connection = await mysql.createConnection({ host, port, user: username, password });
@@ -91,18 +91,22 @@ const defaultDbCreator = async (app) => {
     await connection.query(`CREATE DATABASE IF NOT EXISTS \`${database}\`;`);
     await connection.end();
   }
-  if (dialect === "postgres") {
+  if (["postgres", "kingbase"].includes(dialect)) {
     const { Client } = require("pg");
     const client = new Client({
       host,
       port,
       user: username,
       password,
-      database: "postgres"
+      database: dialect
     });
     await client.connect();
     try {
-      await client.query(`CREATE DATABASE "${database}"`);
+      if (process.env.USE_DB_SCHEMA_IN_SUBAPP === "true") {
+        await client.query(`CREATE SCHEMA IF NOT EXISTS ${schema}`);
+      } else {
+        await client.query(`CREATE DATABASE "${database}"`);
+      }
     } catch (e) {
       console.log(e);
     }
@@ -117,6 +121,8 @@ const defaultAppOptionsFactory = (appName, mainApp) => {
       const mainStorageDir = import_path.default.dirname(mainAppStorage);
       rawDatabaseOptions.storage = import_path.default.join(mainStorageDir, `${appName}.sqlite`);
     }
+  } else if (process.env.USE_DB_SCHEMA_IN_SUBAPP === "true" && ["postgres", "kingbase"].includes(rawDatabaseOptions.dialect)) {
+    rawDatabaseOptions.schema = appName;
   } else {
     rawDatabaseOptions.database = appName;
   }
@@ -170,11 +176,15 @@ class PluginMultiAppManagerServer extends import_server.Plugin {
         const subApp = model.registerToSupervisor(this.app, {
           appOptionsFactory: this.appOptionsFactory
         });
-        await this.appDbCreator(subApp, {
-          transaction,
-          context: options.context
-        });
-        const startPromise = subApp.runCommand("start", "--quickstart");
+        const quickstart = async () => {
+          await this.appDbCreator(subApp, {
+            transaction,
+            applicationModel: model,
+            context: options.context
+          });
+          await subApp.runCommand("start", "--quickstart");
+        };
+        const startPromise = quickstart();
         if ((_a = options == null ? void 0 : options.context) == null ? void 0 : _a.waitSubAppInstall) {
           await startPromise;
         }

package/package.json

@@ -4,7 +4,7 @@
   "displayName.zh-CN": "多应用管理器",
   "description": "Dynamically create multiple apps without separate deployments.",
   "description.zh-CN": "无需单独部署即可动态创建多个应用。",
-  "version": "1.3.50-beta",
+  "version": "1.3.52",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/multi-app-manager",
@@ -28,7 +28,7 @@
     "@nocobase/test": "1.x",
     "@nocobase/utils": "1.x"
   },
-  "gitHead": "ae3ceb799109d3a088d13f999e52b02af6df2457",
+  "gitHead": "90afbd90f915cf5df0ee6766ddbdf7803b3ab7ea",
   "keywords": [
     "system"
   ]