@nocobase/app-server 5.0.0-beta.2 → 5.0.0-beta.4
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.
- package/README.md +4 -0
- package/dist/database/index.d.ts +4 -1
- package/dist/database/index.d.ts.map +1 -1
- package/dist/database/index.js +3 -0
- package/dist/database/index.js.map +1 -1
- package/dist/database/migrator.d.ts +5 -0
- package/dist/database/migrator.d.ts.map +1 -1
- package/dist/database/migrator.js +2 -1
- package/dist/database/migrator.js.map +1 -1
- package/dist/database/plan.d.ts.map +1 -1
- package/dist/database/plan.js +9 -2
- package/dist/database/plan.js.map +1 -1
- package/dist/database/provider.d.ts.map +1 -1
- package/dist/database/provider.js +9 -2
- package/dist/database/provider.js.map +1 -1
- package/dist/database/seeder.d.ts +5 -0
- package/dist/database/seeder.d.ts.map +1 -1
- package/dist/database/seeder.js +2 -1
- package/dist/database/seeder.js.map +1 -1
- package/dist/database/task-hooks.d.ts +19 -0
- package/dist/database/task-hooks.d.ts.map +1 -0
- package/dist/database/task-hooks.js +22 -0
- package/dist/database/task-hooks.js.map +1 -0
- package/dist/database/tasks.d.ts +34 -4
- package/dist/database/tasks.d.ts.map +1 -1
- package/dist/database/tasks.js +182 -46
- package/dist/database/tasks.js.map +1 -1
- package/dist/database/types.d.ts +5 -0
- package/dist/database/types.d.ts.map +1 -1
- package/dist/drive/config.d.ts +6 -1
- package/dist/drive/config.d.ts.map +1 -1
- package/dist/drive/config.js +11 -1
- package/dist/drive/config.js.map +1 -1
- package/dist/plugins/define.d.ts.map +1 -1
- package/dist/plugins/define.js +8 -1
- package/dist/plugins/define.js.map +1 -1
- package/dist/plugins/inspect.d.ts +2 -0
- package/dist/plugins/inspect.d.ts.map +1 -1
- package/dist/plugins/inspect.js +69 -44
- package/dist/plugins/inspect.js.map +1 -1
- package/dist/plugins/resolve.d.ts.map +1 -1
- package/dist/plugins/resolve.js +36 -0
- package/dist/plugins/resolve.js.map +1 -1
- package/dist/plugins/types.d.ts +10 -1
- package/dist/plugins/types.d.ts.map +1 -1
- package/dist/runtime/definition.d.ts.map +1 -1
- package/dist/runtime/definition.js +2 -0
- package/dist/runtime/definition.js.map +1 -1
- package/dist/spa/provider.d.ts +2 -0
- package/dist/spa/provider.d.ts.map +1 -1
- package/dist/spa/provider.js +22 -4
- package/dist/spa/provider.js.map +1 -1
- package/package.json +3 -3
package/dist/plugins/inspect.js
CHANGED
|
@@ -41,48 +41,73 @@ export function inspectResolvedAppServerPlugins(resolved) {
|
|
|
41
41
|
scope: route.scope,
|
|
42
42
|
});
|
|
43
43
|
});
|
|
44
|
-
const
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
44
|
+
const databaseEntries = [
|
|
45
|
+
{
|
|
46
|
+
connection: undefined,
|
|
47
|
+
definition: plugin.definition.database,
|
|
48
|
+
metadata: plugin.metadata,
|
|
49
|
+
},
|
|
50
|
+
...Object.entries(plugin.definition.database?.connections ?? {}).map(([connection, definition]) => ({
|
|
51
|
+
connection,
|
|
52
|
+
definition: {
|
|
53
|
+
migrations: definition.migrations ?? `./database/${connection}/migrations`,
|
|
54
|
+
seeds: definition.seeds ?? `./database/${connection}/seeds`,
|
|
55
|
+
},
|
|
56
|
+
metadata: plugin.metadata.connections?.[connection],
|
|
57
|
+
})),
|
|
58
|
+
];
|
|
59
|
+
for (const entry of databaseEntries) {
|
|
60
|
+
const configuredMigrations = entry.definition?.migrations;
|
|
61
|
+
const configuredSeeds = entry.definition?.seeds;
|
|
62
|
+
if (configuredMigrations || configuredSeeds) {
|
|
63
|
+
database.push({
|
|
64
|
+
packageName: plugin.metadata.packageName,
|
|
65
|
+
...(entry.connection ? { connection: entry.connection } : {}),
|
|
66
|
+
...(configuredMigrations
|
|
67
|
+
? {
|
|
68
|
+
migrations: {
|
|
69
|
+
configured: configuredMigrations,
|
|
70
|
+
...(entry.metadata?.migrationsDirectory
|
|
71
|
+
? { resolved: entry.metadata?.migrationsDirectory }
|
|
72
|
+
: {}),
|
|
73
|
+
},
|
|
74
|
+
}
|
|
75
|
+
: {}),
|
|
76
|
+
...(configuredSeeds
|
|
77
|
+
? {
|
|
78
|
+
seeds: {
|
|
79
|
+
configured: configuredSeeds,
|
|
80
|
+
...(entry.metadata?.seedsDirectory
|
|
81
|
+
? { resolved: entry.metadata?.seedsDirectory }
|
|
82
|
+
: {}),
|
|
83
|
+
},
|
|
84
|
+
}
|
|
85
|
+
: {}),
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
if (configuredMigrations &&
|
|
89
|
+
!entry.metadata?.migrationsDirectory &&
|
|
90
|
+
(entry.connection === undefined ||
|
|
91
|
+
plugin.definition.database?.connections?.[entry.connection]
|
|
92
|
+
?.migrations)) {
|
|
93
|
+
issues.push({
|
|
94
|
+
code: 'SERVER_MIGRATIONS_DIRECTORY_MISSING',
|
|
95
|
+
severity: 'error',
|
|
96
|
+
packageName: plugin.metadata.packageName,
|
|
97
|
+
message: `${plugin.metadata.packageName} declares migrations at ${path.resolve(plugin.metadata.baseDir, configuredMigrations)}, but the directory could not be resolved.`,
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
if (configuredSeeds &&
|
|
101
|
+
!entry.metadata?.seedsDirectory &&
|
|
102
|
+
(entry.connection === undefined ||
|
|
103
|
+
plugin.definition.database?.connections?.[entry.connection]?.seeds)) {
|
|
104
|
+
issues.push({
|
|
105
|
+
code: 'SERVER_SEEDS_DIRECTORY_MISSING',
|
|
106
|
+
severity: 'error',
|
|
107
|
+
packageName: plugin.metadata.packageName,
|
|
108
|
+
message: `${plugin.metadata.packageName} declares seeds at ${path.resolve(plugin.metadata.baseDir, configuredSeeds)}, but the directory could not be resolved.`,
|
|
109
|
+
});
|
|
110
|
+
}
|
|
86
111
|
}
|
|
87
112
|
const configuredJobs = plugin.definition.queue?.jobs ?? [];
|
|
88
113
|
if (plugin.definition.queue) {
|
|
@@ -107,8 +132,8 @@ export function inspectResolvedAppServerPlugins(resolved) {
|
|
|
107
132
|
serviceProviders: plugin.definition.serviceProviders.length,
|
|
108
133
|
routes: plugin.definition.routes.length,
|
|
109
134
|
locales: plugin.definition.locales !== undefined,
|
|
110
|
-
migrations:
|
|
111
|
-
seeds:
|
|
135
|
+
migrations: databaseEntries.some((entry) => entry.definition?.migrations !== undefined),
|
|
136
|
+
seeds: databaseEntries.some((entry) => entry.definition?.seeds !== undefined),
|
|
112
137
|
jobLocations: configuredJobs.length,
|
|
113
138
|
},
|
|
114
139
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../src/plugins/inspect.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"inspect.js","sourceRoot":"","sources":["../../src/plugins/inspect.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,
|
|
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),
|
|
@@ -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;
|
|
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,MAAM,WAAW,GAAG,IAAI,GAAG,EAGxB,CAAC;IACJ,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,KAAK,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,IAAI,MAAM,CAAC,OAAO,CAC9C,MAAM,CAAC,WAAW,IAAI,EAAE,CACzB,EAAE,CAAC;YACF,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;YACtE,WAAW,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC9B,IAAI,WAAW,CAAC,mBAAmB;gBACjC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC;oBACrB,WAAW,EAAE,MAAM,CAAC,WAAW;oBAC/B,SAAS,EAAE,WAAW,CAAC,mBAAmB;iBAC3C,CAAC,CAAC;YACL,IAAI,WAAW,CAAC,cAAc;gBAC5B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;oBAChB,WAAW,EAAE,MAAM,CAAC,WAAW;oBAC/B,SAAS,EAAE,WAAW,CAAC,cAAc;iBACtC,CAAC,CAAC;QACP,CAAC;IACH,CAAC;IACD,OAAO;QACL,GAAG,CAAC,WAAW,CAAC,IAAI;YAClB,CAAC,CAAC,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,WAAW,CAAC,EAAE;YAClD,CAAC,CAAC,EAAE,CAAC;QACP,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;IAClD,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,EAAE,WAAW,CAAC;IACrD,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,EAAE,CAAC;QAClD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC;YAChC,MAAM,IAAI,KAAK,CACb,qCAAqC,IAAI,QAAQ,UAAU,CAAC,WAAW,GAAG,CAC3E,CAAC;IACN,CAAC;IAED,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,GAAG,CAAC,WAAW;YACb,CAAC,CAAC;gBACE,WAAW,EAAE,MAAM,CAAC,WAAW,CAC7B,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;oBAClD,IAAI;oBACJ;wBACE,mBAAmB,EAAE,4BAA4B,CAC/C,UAAU,CAAC,OAAO,EAClB,MAAM,CAAC,UAAU,IAAI,cAAc,IAAI,aAAa,CACrD;wBACD,cAAc,EAAE,4BAA4B,CAC1C,UAAU,CAAC,OAAO,EAClB,MAAM,CAAC,KAAK,IAAI,cAAc,IAAI,QAAQ,CAC3C;qBACF;iBACF,CAAC,CACH;aACF;YACH,CAAC,CAAC,EAAE,CAAC;QACP,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"}
|
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
|
|
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. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/plugins/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,KAAK,EACV,gBAAgB,EAChB,wBAAwB,EACzB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AACjC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAE1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC/D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAE5D,MAAM,WAAW,oBAAoB,CAAC,OAAO,GAAG,MAAM;IACpD,6IAA6I;IAC7I,QAAQ,CAAC,uBAAuB,CAAC,EAAE,SAAS,uBAAuB,EAAE,CAAC;IACtE,QAAQ,CAAC,cAAc,CAAC,EAAE,iBAAiB,CAAC;IAC5C,4EAA4E;IAC5E,QAAQ,CAAC,gBAAgB,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAChD,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,QAAQ,CAAC,IAAI,CAAC,EAAE,YAAY,GAAG,UAAU,CAAC;IAC1C,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,mGAAmG;IACnG,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC;IACrE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC;IACtB,QAAQ,CAAC,SAAS,EAAE,gBAAgB,CAAC;CACtC;AAED,MAAM,WAAW,4BAA4B,CAAC,OAAO,GAAG,MAAM;IAC5D,KAAK,GAAG,EAAE,oBAAoB,GAAG,wBAAwB,CAAC;IAC1D,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/plugins/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/runtime/definition.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"definition.d.ts","sourceRoot":"","sources":["../../src/runtime/definition.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { resolveDatabaseConfig } from '../database/resolve-config.js';
|
|
2
|
+
import { registerDriveConfig } from '../drive/config.js';
|
|
2
3
|
import { createConfigContext, createAppPaths, } from '../config/index.js';
|
|
3
4
|
import { resolveAppServerPlugins, } from '../plugins/index.js';
|
|
4
5
|
import { resolveAppScopeRuntime, } from './scope.js';
|
|
@@ -17,6 +18,7 @@ export async function resolveAppRuntime(definition, scope) {
|
|
|
17
18
|
const context = createAppRuntimeConfigContext(definition, scope, base);
|
|
18
19
|
const appConfig = definition.createAppConfig(context);
|
|
19
20
|
await appConfig.loadAll();
|
|
21
|
+
registerDriveConfig(appConfig);
|
|
20
22
|
const runtime = {
|
|
21
23
|
...base,
|
|
22
24
|
scope,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"definition.js","sourceRoot":"","sources":["../../src/runtime/definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"definition.js","sourceRoot":"","sources":["../../src/runtime/definition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AAKtE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAMzD,OAAO,EACL,mBAAmB,EACnB,cAAc,GAGf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,uBAAuB,GAIxB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EACL,sBAAsB,GAEvB,MAAM,YAAY,CAAC;AAiDpB,MAAM,UAAU,gBAAgB,CAC9B,UAAgC;IAEhC,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,GAAG,UAAU;QACb,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,CAAC,gBAAgB,CAAC,CAAC;QACjE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;KAC9C,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,UAAgC,EAChC,KAAe;IAEf,MAAM,QAAQ,GAAG,wBAAwB,CAAC,sBAAsB,CAAC,KAAK,CAAC,CAAC,CAAC;IACzE,MAAM,IAAI,GAAG,UAAU,CAAC,YAAY;QAClC,CAAC,CAAC,EAAE,GAAG,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,YAAY,CAAC,QAAQ,CAAC,EAAE;QAC3D,CAAC,CAAC,QAAQ,CAAC;IACb,MAAM,OAAO,GAAG,6BAA6B,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IACvE,MAAM,SAAS,GAAG,UAAU,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;IAC1B,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAE/B,MAAM,OAAO,GAAsB;QACjC,GAAG,IAAI;QACP,KAAK;QACL,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,gBAAgB,EAAE,UAAU,CAAC,gBAAgB;QAC7C,MAAM,EAAE,UAAU,CAAC,MAAM;QACzB,MAAM,EAAE,SAAS;QACjB,OAAO,EAAE,UAAU,CAAC,OAAO;KAC5B,CAAC;IACF,IAAI,UAAU,CAAC,cAAc,EAAE,CAAC;QAC9B,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;QACjE,IAAI,UAAU,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;YACvC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;YAClE,MAAM,OAAO,CAAC,MAAM,CAAC,sBAAsB,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACnE,CAAC;IACH,CAAC;IACD,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,CAAoB,UAAU,CAAC,CAAC;IACnE,IAAI,QAAQ,IAAI,QAAQ,CAAC,OAAO,KAAK,MAAM,EAAE,CAAC;QAC5C,MAAM,gBAAgB,GAAG,MAAM,qBAAqB,CAAC,QAAQ,CAAC,CAAC;QAC/D,OAAO,CAAC,MAAM,CAAC,aAAa,CAAC;YAC3B,QAAQ,EAAE;gBACR,OAAO,EAAE,gBAAgB,CAAC,OAAO;gBACjC,WAAW,EAAE,MAAM,CAAC,WAAW,CAC7B,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,WAAW,CAAC;qBACzC,MAAM,CACL,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,EAAE,CACrB,UAAU,CAAC,cAAc;oBACzB,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,cAAc,CAC7C;qBACA,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,EAAE,CAAC;oBAC3B,IAAI;oBACJ,EAAE,cAAc,EAAE,UAAU,CAAC,cAAc,EAAE;iBAC9C,CAAC,CACL;aACF;SACF,CAAC,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;GAKG;AACH,SAAS,wBAAwB,CAC/B,OAAgC;IAEhC,IAAI,OAAO,CAAC,IAAI,KAAK,YAAY,IAAI,OAAO,CAAC,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;QAC5E,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC;IACvD,OAAO,UAAU;QACf,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;QACzD,CAAC,CAAC,OAAO,CAAC;AACd,CAAC;AAED,SAAS,6BAA6B,CACpC,UAAgC,EAChC,KAAe,EACf,OAAgC;IAEhC,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC5C,MAAM,OAAO,GAAG,uBAAuB,CAAC,KAAK,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAE3E,OAAO;QACL,GAAG,mBAAmB,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC;QACnD,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,OAAO;QACP,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,UAAU,EAAE,KAAK,CAAC,UAAU;KAC7B,CAAC;AACJ,CAAC"}
|
package/dist/spa/provider.d.ts
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
|
+
import type { ServiceContainer } from '@nocobase/service-provider';
|
|
1
2
|
import { type AppRootRouteContribution } from '../router/index.js';
|
|
2
3
|
import { type AppConfigAccessor } from '../config/index.js';
|
|
3
4
|
export interface SpaRoutesApplication {
|
|
5
|
+
readonly container: Pick<ServiceContainer, 'resolve'>;
|
|
4
6
|
readonly config: AppConfigAccessor;
|
|
5
7
|
readonly mode: 'standalone' | 'embedded';
|
|
6
8
|
readonly publicBasePath: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/spa/provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/spa/provider.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAEnE,OAAO,EAEL,KAAK,wBAAwB,EAC9B,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAEL,KAAK,iBAAiB,EACvB,MAAM,oBAAoB,CAAC;AAM5B,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC,gBAAgB,EAAE,SAAS,CAAC,CAAC;IACtD,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,YAAY,GAAG,UAAU,CAAC;IACzC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,+FAA+F;IAC/F,QAAQ,CAAC,KAAK,EAAE;QAAE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC;CAC9C;AAED,eAAO,MAAM,aAAa,EAAE,wBAAwB,CAAC,oBAAoB,CA0CrE,CAAC"}
|
package/dist/spa/provider.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { existsSync, readFileSync } from 'node:fs';
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { Hono } from 'hono';
|
|
4
|
+
import { driveManagerToken } from '../drive/token.js';
|
|
4
5
|
import { defineRootRoutes, } from '../router/index.js';
|
|
5
6
|
import { registerSpaRoutes } from './routes.js';
|
|
6
7
|
import { createMountedOriginProxyHandler } from '../proxy/index.js';
|
|
@@ -11,6 +12,13 @@ export const spaRootRoutes = defineRootRoutes((app) => {
|
|
|
11
12
|
const spa = app.config.get('spa');
|
|
12
13
|
const apiUrl = joinBasePath(app.publicBasePath, '/api');
|
|
13
14
|
const appPackage = readAppPackage(app.paths.rootDir);
|
|
15
|
+
const drive = app.config.get('drive');
|
|
16
|
+
const manager = drive
|
|
17
|
+
? app.container.resolve(driveManagerToken)
|
|
18
|
+
: undefined;
|
|
19
|
+
const uploadLimits = drive && manager
|
|
20
|
+
? { default: drive.default, disks: manager.limits }
|
|
21
|
+
: undefined;
|
|
14
22
|
registerSpaRoutes(router, {
|
|
15
23
|
basePath: identity.internalBasePath,
|
|
16
24
|
publicBasePath: app.publicBasePath,
|
|
@@ -26,7 +34,7 @@ export const spaRootRoutes = defineRootRoutes((app) => {
|
|
|
26
34
|
publicConfig: () => createPublicConfig((app.config.publicValues?.() ?? {}),
|
|
27
35
|
// Read by path rather than through the definition, so these routes stay usable in an application composed
|
|
28
36
|
// without the i18n config registered. The browser falls back to its own default when nothing is published.
|
|
29
|
-
app.config.get('i18n.defaultLocale'), appPackage),
|
|
37
|
+
app.config.get('i18n.defaultLocale'), appPackage, uploadLimits),
|
|
30
38
|
});
|
|
31
39
|
return router;
|
|
32
40
|
});
|
|
@@ -48,11 +56,21 @@ function createClientConfig(configured, runtime) {
|
|
|
48
56
|
* `i18n.defaultLocale` the server does, rather than a separate client-side copy that could disagree with it, and shows
|
|
49
57
|
* the application's `displayName` and `version` from its own `package.json` rather than values baked in at build time.
|
|
50
58
|
*/
|
|
51
|
-
function createPublicConfig(published, defaultLocale, appPackage) {
|
|
59
|
+
function createPublicConfig(published, defaultLocale, appPackage, uploadLimits) {
|
|
60
|
+
// Project named disks to numeric limits only; never serialize storage configuration.
|
|
61
|
+
const withDrive = uploadLimits
|
|
62
|
+
? {
|
|
63
|
+
...published,
|
|
64
|
+
drive: {
|
|
65
|
+
...readConfigSection(published.drive),
|
|
66
|
+
uploadLimits,
|
|
67
|
+
},
|
|
68
|
+
}
|
|
69
|
+
: published;
|
|
52
70
|
const withLocale = defaultLocale === undefined
|
|
53
|
-
?
|
|
71
|
+
? withDrive
|
|
54
72
|
: {
|
|
55
|
-
...
|
|
73
|
+
...withDrive,
|
|
56
74
|
i18n: { ...readConfigSection(published.i18n), defaultLocale },
|
|
57
75
|
};
|
|
58
76
|
if (!appPackage.displayName && !appPackage.version)
|
package/dist/spa/provider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/spa/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/spa/provider.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.
|
|
3
|
+
"version": "5.0.0-beta.4",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"prettier": "@nocobase/dev-config/prettier",
|
|
6
6
|
"engines": {
|
|
@@ -123,7 +123,7 @@
|
|
|
123
123
|
"openapi-types": "^12.1.3",
|
|
124
124
|
"@nocobase/app-websocket": "^0.1.0-beta.1",
|
|
125
125
|
"@nocobase/config": "^0.1.0-beta.3",
|
|
126
|
-
"@nocobase/drive": "^0.1.0-beta.
|
|
126
|
+
"@nocobase/drive": "^0.1.0-beta.8",
|
|
127
127
|
"@nocobase/logging": "^0.1.0-beta.7",
|
|
128
128
|
"@nocobase/realtime": "^1.0.0-beta.2",
|
|
129
129
|
"@nocobase/secrets": "^0.1.0-beta.1",
|
|
@@ -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.
|
|
156
|
+
"@nocobase/db": "^1.0.0-beta.28",
|
|
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",
|