@nocobase/app-server 5.0.0-beta.2 → 5.0.0-beta.3

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 (42) hide show
  1. package/README.md +4 -0
  2. package/dist/database/index.d.ts +4 -1
  3. package/dist/database/index.d.ts.map +1 -1
  4. package/dist/database/index.js +3 -0
  5. package/dist/database/index.js.map +1 -1
  6. package/dist/database/migrator.d.ts +5 -0
  7. package/dist/database/migrator.d.ts.map +1 -1
  8. package/dist/database/migrator.js +2 -1
  9. package/dist/database/migrator.js.map +1 -1
  10. package/dist/database/plan.d.ts.map +1 -1
  11. package/dist/database/plan.js +9 -2
  12. package/dist/database/plan.js.map +1 -1
  13. package/dist/database/provider.d.ts.map +1 -1
  14. package/dist/database/provider.js +9 -2
  15. package/dist/database/provider.js.map +1 -1
  16. package/dist/database/seeder.d.ts +5 -0
  17. package/dist/database/seeder.d.ts.map +1 -1
  18. package/dist/database/seeder.js +2 -1
  19. package/dist/database/seeder.js.map +1 -1
  20. package/dist/database/task-hooks.d.ts +19 -0
  21. package/dist/database/task-hooks.d.ts.map +1 -0
  22. package/dist/database/task-hooks.js +22 -0
  23. package/dist/database/task-hooks.js.map +1 -0
  24. package/dist/database/tasks.d.ts +34 -4
  25. package/dist/database/tasks.d.ts.map +1 -1
  26. package/dist/database/tasks.js +182 -46
  27. package/dist/database/tasks.js.map +1 -1
  28. package/dist/database/types.d.ts +5 -0
  29. package/dist/database/types.d.ts.map +1 -1
  30. package/dist/plugins/define.d.ts.map +1 -1
  31. package/dist/plugins/define.js +8 -1
  32. package/dist/plugins/define.js.map +1 -1
  33. package/dist/plugins/inspect.d.ts +2 -0
  34. package/dist/plugins/inspect.d.ts.map +1 -1
  35. package/dist/plugins/inspect.js +69 -44
  36. package/dist/plugins/inspect.js.map +1 -1
  37. package/dist/plugins/resolve.d.ts.map +1 -1
  38. package/dist/plugins/resolve.js +36 -0
  39. package/dist/plugins/resolve.js.map +1 -1
  40. package/dist/plugins/types.d.ts +10 -1
  41. package/dist/plugins/types.d.ts.map +1 -1
  42. package/package.json +2 -2
package/dist/plugins/resolve.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/plugins/resolve.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAEhE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,KAAK,EAEV,gBAAgB,EAChB,iBAAiB,EACjB,wBAAwB,EACzB,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,8BAA8B;IAC7C,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAC;CACzC;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,gBAAgB,EAC/B,OAAO,GAAE,8BAAmC,GAC3C,wBAAwB,CAc1B;AAED,qFAAqF;AACrF,wBAAgB,kCAAkC,CAChD,QAAQ,EAAE,wBAAwB,GACjC,4BAA4B,CAO9B;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,SAAS,iBAAiB,EAAE,GACpC,eAAe,EAAE,CAWnB;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,SAAS,iBAAiB,EAAE,GACpC,UAAU,EAAE,CAWd;AAED,sFAAsF;AACtF,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,SAAS,iBAAiB,EAAE,GACpC,MAAM,EAAE,CAEV"}
1
+ {"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/plugins/resolve.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAEhE,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,KAAK,EAEV,gBAAgB,EAChB,iBAAiB,EACjB,wBAAwB,EACzB,MAAM,YAAY,CAAC;AAEpB,MAAM,WAAW,8BAA8B;IAC7C,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAC;CACzC;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,MAAM,EACf,aAAa,EAAE,gBAAgB,EAC/B,OAAO,GAAE,8BAAmC,GAC3C,wBAAwB,CAc1B;AAED,qFAAqF;AACrF,wBAAgB,kCAAkC,CAChD,QAAQ,EAAE,wBAAwB,GACjC,4BAA4B,CAgC9B;AAED,wBAAgB,4BAA4B,CAC1C,OAAO,EAAE,SAAS,iBAAiB,EAAE,GACpC,eAAe,EAAE,CAWnB;AAED,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,SAAS,iBAAiB,EAAE,GACpC,UAAU,EAAE,CAWd;AAED,sFAAsF;AACtF,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,SAAS,iBAAiB,EAAE,GACpC,MAAM,EAAE,CAEV"}
package/dist/plugins/resolve.js CHANGED
@@ -16,7 +16,27 @@ export function resolveAppServerPlugins(rootDir, serverPlugins, options = {}) {
16
16
  /** The application identity and plugin task sources that database planning needs. */
17
17
  export function createAppDatabaseTaskContributions(resolved) {
18
18
  const plugins = resolved.plugins.map((plugin) => plugin.metadata);
19
+ const connections = new Map();
20
+ for (const plugin of plugins) {
21
+ for (const [name, directories] of Object.entries(plugin.connections ?? {})) {
22
+ const target = connections.get(name) ?? { migrations: [], seeds: [] };
23
+ connections.set(name, target);
24
+ if (directories.migrationsDirectory)
25
+ target.migrations.push({
26
+ packageName: plugin.packageName,
27
+ directory: directories.migrationsDirectory,
28
+ });
29
+ if (directories.seedsDirectory)
30
+ target.seeds.push({
31
+ packageName: plugin.packageName,
32
+ directory: directories.seedsDirectory,
33
+ });
34
+ }
35
+ }
19
36
  return {
37
+ ...(connections.size
38
+ ? { connections: Object.fromEntries(connections) }
39
+ : {}),
20
40
  appPackageName: resolved.appPackageName,
21
41
  migrations: createPluginMigrationSources(plugins),
22
42
  seeds: createPluginSeedSources(plugins),
@@ -54,10 +74,26 @@ function resolvePlugin(definition) {
54
74
  const packageJsonPath = resolvePackageJson(definition.baseDir, definition.packageName);
55
75
  const packageJson = readJson(packageJsonPath);
56
76
  const packageRoot = path.dirname(packageJsonPath);
77
+ const connections = definition.database?.connections;
78
+ for (const name of Object.keys(connections ?? {})) {
79
+ if (!/^[a-zA-Z0-9_-]+$/.test(name))
80
+ throw new Error(`Invalid database connection name "${name}" in ${definition.packageName}.`);
81
+ }
57
82
  return {
58
83
  packageName: definition.packageName,
59
84
  version: typeof packageJson.version === 'string' ? packageJson.version : 'unknown',
60
85
  rootDir: packageRoot,
86
+ ...(connections
87
+ ? {
88
+ connections: Object.fromEntries(Object.entries(connections).map(([name, config]) => [
89
+ name,
90
+ {
91
+ migrationsDirectory: resolveOptionalDirectoryPath(definition.baseDir, config.migrations ?? `./database/${name}/migrations`),
92
+ seedsDirectory: resolveOptionalDirectoryPath(definition.baseDir, config.seeds ?? `./database/${name}/seeds`),
93
+ },
94
+ ])),
95
+ }
96
+ : {}),
61
97
  baseDir: definition.baseDir,
62
98
  migrationsDirectory: resolveOptionalDirectoryPath(definition.baseDir, definition.database?.migrations),
63
99
  seedsDirectory: resolveOptionalDirectoryPath(definition.baseDir, definition.database?.seeds),
package/dist/plugins/resolve.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/plugins/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,IAAI,MAAM,WAAW,CAAC;AAgB7B,MAAM,UAAU,uBAAuB,CACrC,OAAe,EACf,aAA+B,EAC/B,UAA0C,EAAE;IAE5C,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAC1D,MAAM,UAAU,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE9E,OAAO;QACL,cAAc,EACZ,OAAO,UAAU,CAAC,IAAI,KAAK,QAAQ;YACjC,CAAC,CAAC,UAAU,CAAC,IAAI;YACjB,CAAC,CAAC,CAAC,OAAO,CAAC,qBAAqB,IAAI,KAAK,CAAC;QAC9C,OAAO,EAAE,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAClD,UAAU;YACV,QAAQ,EAAE,aAAa,CAAC,UAAU,CAAC;SACpC,CAAC,CAAC;KACJ,CAAC;AACJ,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,kCAAkC,CAChD,QAAkC;IAElC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAClE,OAAO;QACL,cAAc,EAAE,QAAQ,CAAC,cAAc;QACvC,UAAU,EAAE,4BAA4B,CAAC,OAAO,CAAC;QACjD,KAAK,EAAE,uBAAuB,CAAC,OAAO,CAAC;KACxC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,OAAqC;IAErC,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAChC,MAAM,CAAC,mBAAmB;QACxB,CAAC,CAAC;YACE;gBACE,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,SAAS,EAAE,MAAM,CAAC,mBAAmB;aACtC;SACF;QACH,CAAC,CAAC,EAAE,CACP,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,OAAqC;IAErC,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAChC,MAAM,CAAC,cAAc;QACnB,CAAC,CAAC;YACE;gBACE,WAAW,EAAE,MAAM,CAAC,WAAW;gBAC/B,SAAS,EAAE,MAAM,CAAC,cAAc;aACjC;SACF;QACH,CAAC,CAAC,EAAE,CACP,CAAC;AACJ,CAAC;AAED,sFAAsF;AACtF,MAAM,UAAU,wBAAwB,CACtC,OAAqC;IAErC,OAAO,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,aAAa,CAAC,UAA2B;IAChD,IACE,OAAO,UAAU,CAAC,OAAO,KAAK,QAAQ;QACtC,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,OAAO,CAAC,EACpC,CAAC;QACD,MAAM,IAAI,KAAK,CACb,kBAAkB,UAAU,CAAC,WAAW,iCAAiC,CAC1E,CAAC;IACJ,CAAC;IACD,MAAM,eAAe,GAAG,kBAAkB,CACxC,UAAU,CAAC,OAAO,EAClB,UAAU,CAAC,WAAW,CACvB,CAAC;IACF,MAAM,WAAW,GAAG,QAAQ,CAAC,eAAe,CAAC,CAAC;IAC9C,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAElD,OAAO;QACL,WAAW,EAAE,UAAU,CAAC,WAAW;QACnC,OAAO,EACL,OAAO,WAAW,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;QAC3E,OAAO,EAAE,WAAW;QACpB,OAAO,EAAE,UAAU,CAAC,OAAO;QAC3B,mBAAmB,EAAE,4BAA4B,CAC/C,UAAU,CAAC,OAAO,EAClB,UAAU,CAAC,QAAQ,EAAE,UAAU,CAChC;QACD,cAAc,EAAE,4BAA4B,CAC1C,UAAU,CAAC,OAAO,EAClB,UAAU,CAAC,QAAQ,EAAE,KAAK,CAC3B;QACD,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;KAChC,CAAC;AACJ,CAAC;AAED,SAAS,4BAA4B,CACnC,OAAe,EACf,cAAkC;IAElC,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,mBAAmB,CAAC,cAAc,CAAC,CAAC;IACpC,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAC3D,OAAO,UAAU,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC;AAC7D,CAAC;AAED,SAAS,mBAAmB,CAAC,cAAsB;IACjD,IACE,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,CAAC;QAChC,cAAc,KAAK,IAAI;QACvB,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC7B,cAAc,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC7B,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EACxC,CAAC;QACD,MAAM,IAAI,KAAK,CACb,uBAAuB,cAAc,6DAA6D,CACnG,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,kBAAkB,CAAC,OAAe,EAAE,WAAmB;IAC9D,IAAI,SAAS,GAAG,OAAO,CAAC;IACxB,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QACvD,IAAI,UAAU,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;YACtE,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACvC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,IAAI,KAAK,CACb,kBAAkB,WAAW,iDAAiD,OAAO,IAAI,CAC1F,CAAC;QACJ,CAAC;QACD,SAAS,GAAG,MAAM,CAAC;IACrB,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,QAAgB;IAChC,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAA4B,CAAC;AAC/E,CAAC"}
1
+ {"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/plugins/resolve.ts"],"names":[],"mappings":"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"}
package/dist/plugins/types.d.ts CHANGED
@@ -32,10 +32,15 @@ export interface AppPluginProviderConstructor<TConfig = object> {
32
32
  new (app: AppPluginApplication): ServiceProviderLifecycle;
33
33
  readonly __config?: TConfig;
34
34
  }
35
- export interface AppServerPluginDatabaseContribution {
35
+ export interface AppServerDatabaseConnectionContribution {
36
36
  readonly migrations?: string;
37
37
  readonly seeds?: string;
38
38
  }
39
+ /** Flat tasks retain the default-connection contract; named tasks use App connection names. */
40
+ export interface AppServerPluginDatabaseContribution extends AppServerDatabaseConnectionContribution {
41
+ /** Empty entries use database/<connection>/{migrations,seeds} relative to baseDir. */
42
+ readonly connections?: Readonly<Record<string, AppServerDatabaseConnectionContribution>>;
43
+ }
39
44
  /**
40
45
  * @deprecated Job modules are no longer discovered: the field is accepted,
41
46
  * ignored, and reported once at startup. Register queue handlers with
@@ -80,6 +85,10 @@ export interface ResolvedAppPlugin {
80
85
  readonly baseDir: string;
81
86
  readonly version: string;
82
87
  readonly rootDir: string;
88
+ readonly connections?: Readonly<Record<string, {
89
+ readonly migrationsDirectory?: string;
90
+ readonly seedsDirectory?: string;
91
+ }>>;
83
92
  readonly migrationsDirectory?: string;
84
93
  readonly seedsDirectory?: string;
85
94
  /** @deprecated Always empty: Job modules are no longer discovered. */
package/dist/plugins/types.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/plugins/types.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/plugins/types.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nocobase/app-server",
3
- "version": "5.0.0-beta.2",
3
+ "version": "5.0.0-beta.3",
4
4
  "type": "module",
5
5
  "prettier": "@nocobase/dev-config/prettier",
6
6
  "engines": {
@@ -153,7 +153,7 @@
153
153
  "@nocobase/db-oceanbase": "^0.1.0-beta.4",
154
154
  "@nocobase/i18n": "^2.0.0-beta.2",
155
155
  "@nocobase/caching": "^1.0.0-beta.4",
156
- "@nocobase/db": "^1.0.0-beta.26",
156
+ "@nocobase/db": "^1.0.0-beta.27",
157
157
  "@nocobase/service-provider": "^0.0.2-beta.2",
158
158
  "@nocobase/queue": "^1.0.0-beta.11",
159
159
  "@nocobase/jobs": "^1.0.0-beta.6",