@baseplate-dev/project-builder-lib 0.2.6 → 0.3.1
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/dist/compiler/app-compiler-spec.d.ts +1 -1
- package/dist/compiler/app-compiler-spec.d.ts.map +1 -1
- package/dist/definition/apps/app-utils.d.ts +9 -1
- package/dist/definition/apps/app-utils.d.ts.map +1 -1
- package/dist/definition/apps/app-utils.js +13 -5
- package/dist/definition/apps/app-utils.js.map +1 -1
- package/dist/definition/plugins/plugin-utils.d.ts +18 -6
- package/dist/definition/plugins/plugin-utils.d.ts.map +1 -1
- package/dist/definition/plugins/plugin-utils.js +40 -13
- package/dist/definition/plugins/plugin-utils.js.map +1 -1
- package/dist/migrations/index.d.ts.map +1 -1
- package/dist/migrations/index.js +2 -0
- package/dist/migrations/index.js.map +1 -1
- package/dist/migrations/migration-017-rename-auth-plugin.d.ts +21 -0
- package/dist/migrations/migration-017-rename-auth-plugin.d.ts.map +1 -0
- package/dist/migrations/migration-017-rename-auth-plugin.js +60 -0
- package/dist/migrations/migration-017-rename-auth-plugin.js.map +1 -0
- package/dist/parser/parser.d.ts +10 -1
- package/dist/parser/parser.d.ts.map +1 -1
- package/dist/parser/parser.js +27 -2
- package/dist/parser/parser.js.map +1 -1
- package/dist/plugin-tools/plugin-loader.d.ts +13 -1
- package/dist/plugin-tools/plugin-loader.d.ts.map +1 -1
- package/dist/plugin-tools/plugin-loader.js +95 -36
- package/dist/plugin-tools/plugin-loader.js.map +1 -1
- package/dist/plugins/imports/index.d.ts +1 -0
- package/dist/plugins/imports/index.d.ts.map +1 -1
- package/dist/plugins/imports/index.js +1 -0
- package/dist/plugins/imports/index.js.map +1 -1
- package/dist/plugins/imports/loader.d.ts +2 -2
- package/dist/plugins/imports/loader.d.ts.map +1 -1
- package/dist/plugins/imports/loader.js +4 -4
- package/dist/plugins/imports/loader.js.map +1 -1
- package/dist/plugins/imports/types.d.ts +1 -1
- package/dist/plugins/imports/types.d.ts.map +1 -1
- package/dist/plugins/imports/utils.d.ts +21 -0
- package/dist/plugins/imports/utils.d.ts.map +1 -0
- package/dist/plugins/imports/utils.js +33 -0
- package/dist/plugins/imports/utils.js.map +1 -0
- package/dist/plugins/index.d.ts +0 -1
- package/dist/plugins/index.d.ts.map +1 -1
- package/dist/plugins/index.js +0 -1
- package/dist/plugins/index.js.map +1 -1
- package/dist/plugins/metadata/types.d.ts +17 -3
- package/dist/plugins/metadata/types.d.ts.map +1 -1
- package/dist/plugins/metadata/types.js +9 -1
- package/dist/plugins/metadata/types.js.map +1 -1
- package/dist/plugins/plugins.test-utils.d.ts.map +1 -1
- package/dist/plugins/plugins.test-utils.js +2 -1
- package/dist/plugins/plugins.test-utils.js.map +1 -1
- package/dist/plugins/spec/auth-config-spec.d.ts +0 -2
- package/dist/plugins/spec/auth-config-spec.d.ts.map +1 -1
- package/dist/plugins/spec/auth-config-spec.js.map +1 -1
- package/dist/plugins/spec/auth-model-config-spec.d.ts +15 -0
- package/dist/plugins/spec/auth-model-config-spec.d.ts.map +1 -0
- package/dist/plugins/spec/auth-model-config-spec.js +6 -0
- package/dist/plugins/spec/auth-model-config-spec.js.map +1 -0
- package/dist/plugins/spec/config-spec.d.ts +2 -2
- package/dist/plugins/spec/config-spec.d.ts.map +1 -1
- package/dist/plugins/spec/index.d.ts +1 -0
- package/dist/plugins/spec/index.d.ts.map +1 -1
- package/dist/plugins/spec/index.js +1 -0
- package/dist/plugins/spec/index.js.map +1 -1
- package/dist/plugins/spec/web-config-spec.d.ts +3 -3
- package/dist/plugins/spec/web-config-spec.d.ts.map +1 -1
- package/dist/plugins/spec/web-config-spec.js +6 -6
- package/dist/plugins/spec/web-config-spec.js.map +1 -1
- package/dist/schema/apps/index.d.ts +0 -1
- package/dist/schema/apps/index.d.ts.map +1 -1
- package/dist/schema/apps/index.js +0 -2
- package/dist/schema/apps/index.js.map +1 -1
- package/dist/schema/apps/web/admin/admin.d.ts +2 -2
- package/dist/schema/apps/web/admin/sections/crud.d.ts +1 -1
- package/dist/schema/apps/web/admin/sections/crud.js +1 -1
- package/dist/schema/apps/web/admin/sections/crud.js.map +1 -1
- package/dist/schema/apps/web/index.d.ts +1 -0
- package/dist/schema/apps/web/index.d.ts.map +1 -1
- package/dist/schema/apps/web/index.js +1 -0
- package/dist/schema/apps/web/index.js.map +1 -1
- package/dist/schema/apps/web/web-app.d.ts +1 -5
- package/dist/schema/apps/web/web-app.d.ts.map +1 -1
- package/dist/schema/apps/web/web-app.js +0 -5
- package/dist/schema/apps/web/web-app.js.map +1 -1
- package/dist/schema/project-definition.d.ts +2 -14
- package/dist/schema/project-definition.d.ts.map +1 -1
- package/dist/web/specs/admin-crud-input-web-spec.d.ts +2 -2
- package/dist/web/specs/admin-crud-input-web-spec.d.ts.map +1 -1
- package/dist/web/specs/model-transformer-web-spec.d.ts +2 -2
- package/dist/web/specs/model-transformer-web-spec.d.ts.map +1 -1
- package/package.json +9 -8
- package/dist/plugins/manifest/manifest.d.ts +0 -13
- package/dist/plugins/manifest/manifest.d.ts.map +0 -1
- package/dist/plugins/manifest/manifest.js +0 -6
- package/dist/plugins/manifest/manifest.js.map +0 -1
|
@@ -16,7 +16,7 @@ interface PluginAppCompilerOptions<TAppDefinition> {
|
|
|
16
16
|
definitionContainer: ProjectDefinitionContainer;
|
|
17
17
|
}
|
|
18
18
|
interface PluginAppCompiler<TAppDefinition = AppConfig> {
|
|
19
|
-
|
|
19
|
+
pluginKey: string;
|
|
20
20
|
appType: AppEntryType<TAppDefinition>;
|
|
21
21
|
compile: (options: PluginAppCompilerOptions<TAppDefinition>) => void;
|
|
22
22
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-compiler-spec.d.ts","sourceRoot":"","sources":["../../src/compiler/app-compiler-spec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAI3D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAC;AAClG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EACZ,iBAAiB,EAClB,MAAM,sBAAsB,CAAC;AAI9B,MAAM,WAAW,WAAW;IAC1B,oBAAoB,EAAE,CACpB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,KACtC,IAAI,CAAC;IACV,qBAAqB,EAAE,CACrB,SAAS,EAAE,MAAM,KACd,MAAM,CAAC,MAAM,EAAE,eAAe,GAAG,eAAe,EAAE,CAAC,CAAC;IACzD,eAAe,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,KAAK,IAAI,CAAC;IACrE,eAAe,EAAE,MAAM,OAAO,CAC5B,MAAM,CAAC,MAAM,EAAE,eAAe,GAAG,eAAe,EAAE,CAAC,CACpD,CAAC;CACH;AAED,wBAAgB,iBAAiB,IAAI,WAAW,CAsB/C;AAED,UAAU,wBAAwB,CAAC,cAAc;IAC/C,aAAa,EAAE,cAAc,CAAC;IAC9B,WAAW,EAAE,WAAW,CAAC;IACzB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,mBAAmB,EAAE,0BAA0B,CAAC;CACjD;AAED,UAAU,iBAAiB,CAAC,cAAc,GAAG,SAAS;IACpD,
|
|
1
|
+
{"version":3,"file":"app-compiler-spec.d.ts","sourceRoot":"","sources":["../../src/compiler/app-compiler-spec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAI3D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,iDAAiD,CAAC;AAClG,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,KAAK,EACV,SAAS,EACT,YAAY,EACZ,iBAAiB,EAClB,MAAM,sBAAsB,CAAC;AAI9B,MAAM,WAAW,WAAW;IAC1B,oBAAoB,EAAE,CACpB,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,KACtC,IAAI,CAAC;IACV,qBAAqB,EAAE,CACrB,SAAS,EAAE,MAAM,KACd,MAAM,CAAC,MAAM,EAAE,eAAe,GAAG,eAAe,EAAE,CAAC,CAAC;IACzD,eAAe,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,KAAK,IAAI,CAAC;IACrE,eAAe,EAAE,MAAM,OAAO,CAC5B,MAAM,CAAC,MAAM,EAAE,eAAe,GAAG,eAAe,EAAE,CAAC,CACpD,CAAC;CACH;AAED,wBAAgB,iBAAiB,IAAI,WAAW,CAsB/C;AAED,UAAU,wBAAwB,CAAC,cAAc;IAC/C,aAAa,EAAE,cAAc,CAAC;IAC9B,WAAW,EAAE,WAAW,CAAC;IACzB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,mBAAmB,EAAE,0BAA0B,CAAC;CACjD;AAED,UAAU,iBAAiB,CAAC,cAAc,GAAG,SAAS;IACpD,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IACtC,OAAO,EAAE,CAAC,OAAO,EAAE,wBAAwB,CAAC,cAAc,CAAC,KAAK,IAAI,CAAC;CACtE;AAED;;GAEG;AACH,MAAM,WAAW,eAAgB,SAAQ,wBAAwB;IAC/D,mBAAmB,EAAE,CAAC,cAAc,EAClC,QAAQ,EAAE,iBAAiB,CAAC,cAAc,CAAC,KACxC,IAAI,CAAC;IACV,eAAe,EAAE,CACf,OAAO,EAAE,YAAY,CAAC,OAAO,CAAC,KAC3B,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC;CACnC;AAED,wBAAgB,uBAAuB,IAAI,eAAe,CAezD;AAED;;GAEG;AACH,eAAO,MAAM,eAAe,4EAE1B,CAAC"}
|
|
@@ -1,11 +1,19 @@
|
|
|
1
|
-
import type { AppConfig, BackendAppConfig, ProjectDefinition } from '#src/schema/index.js';
|
|
1
|
+
import type { AppConfig, BackendAppConfig, BaseAppConfig, ProjectDefinition } from '#src/schema/index.js';
|
|
2
2
|
declare function byId(projectDefinition: ProjectDefinition, id: string): AppConfig;
|
|
3
3
|
declare function getBackendApp(projectDefinition: ProjectDefinition): BackendAppConfig;
|
|
4
|
+
/**
|
|
5
|
+
* Given an app config, get the relative directory of the app
|
|
6
|
+
*
|
|
7
|
+
* @param appConfig The app config
|
|
8
|
+
* @returns The directory of the app
|
|
9
|
+
*/
|
|
10
|
+
declare function getAppDirectory(appConfig: BaseAppConfig): string;
|
|
4
11
|
export declare function getBackendRelativePath(appConfig: AppConfig, backendApp: BackendAppConfig): string;
|
|
5
12
|
export declare const AppUtils: {
|
|
6
13
|
byId: typeof byId;
|
|
7
14
|
getBackendApp: typeof getBackendApp;
|
|
8
15
|
getBackendRelativePath: typeof getBackendRelativePath;
|
|
16
|
+
getAppDirectory: typeof getAppDirectory;
|
|
9
17
|
};
|
|
10
18
|
export {};
|
|
11
19
|
//# sourceMappingURL=app-utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-utils.d.ts","sourceRoot":"","sources":["../../../src/definition/apps/app-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EAClB,MAAM,sBAAsB,CAAC;AAI9B,iBAAS,IAAI,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,EAAE,EAAE,MAAM,GAAG,SAAS,CAMzE;AAED,iBAAS,aAAa,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,gBAAgB,CAY7E;AAED,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,gBAAgB,GAC3B,MAAM,
|
|
1
|
+
{"version":3,"file":"app-utils.d.ts","sourceRoot":"","sources":["../../../src/definition/apps/app-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,SAAS,EACT,gBAAgB,EAChB,aAAa,EACb,iBAAiB,EAClB,MAAM,sBAAsB,CAAC;AAI9B,iBAAS,IAAI,CAAC,iBAAiB,EAAE,iBAAiB,EAAE,EAAE,EAAE,MAAM,GAAG,SAAS,CAMzE;AAED,iBAAS,aAAa,CAAC,iBAAiB,EAAE,iBAAiB,GAAG,gBAAgB,CAY7E;AAED;;;;;GAKG;AACH,iBAAS,eAAe,CAAC,SAAS,EAAE,aAAa,GAAG,MAAM,CAIzD;AAED,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,gBAAgB,GAC3B,MAAM,CAOR;AAED,eAAO,MAAM,QAAQ;;;;;CAKpB,CAAC"}
|
|
@@ -14,17 +14,25 @@ function getBackendApp(projectDefinition) {
|
|
|
14
14
|
const backendApp = backendApps[0];
|
|
15
15
|
return backendApp;
|
|
16
16
|
}
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
/**
|
|
18
|
+
* Given an app config, get the relative directory of the app
|
|
19
|
+
*
|
|
20
|
+
* @param appConfig The app config
|
|
21
|
+
* @returns The directory of the app
|
|
22
|
+
*/
|
|
23
|
+
function getAppDirectory(appConfig) {
|
|
24
|
+
return appConfig.packageLocation
|
|
19
25
|
? appConfig.packageLocation
|
|
20
|
-
: `packages/${appConfig.name}
|
|
21
|
-
|
|
22
|
-
|
|
26
|
+
: `packages/${appConfig.name}`;
|
|
27
|
+
}
|
|
28
|
+
export function getBackendRelativePath(appConfig, backendApp) {
|
|
29
|
+
const backendRelativePath = computeRelativePath(getAppDirectory(appConfig), getAppDirectory(backendApp));
|
|
23
30
|
return backendRelativePath;
|
|
24
31
|
}
|
|
25
32
|
export const AppUtils = {
|
|
26
33
|
byId,
|
|
27
34
|
getBackendApp,
|
|
28
35
|
getBackendRelativePath,
|
|
36
|
+
getAppDirectory,
|
|
29
37
|
};
|
|
30
38
|
//# sourceMappingURL=app-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-utils.js","sourceRoot":"","sources":["../../../src/definition/apps/app-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"app-utils.js","sourceRoot":"","sources":["../../../src/definition/apps/app-utils.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAEzD,SAAS,IAAI,CAAC,iBAAoC,EAAE,EAAU;IAC5D,MAAM,MAAM,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IACnE,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,8BAA8B,EAAE,EAAE,CAAC,CAAC;IACtD,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,aAAa,CAAC,iBAAoC;IACzD,MAAM,WAAW,GAAG,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAC/C,CAAC,CAAC,EAAyB,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CACnD,CAAC;IAEF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvD,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACtE,CAAC;IAED,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;IAElC,OAAO,UAAU,CAAC;AACpB,CAAC;AAED;;;;;GAKG;AACH,SAAS,eAAe,CAAC,SAAwB;IAC/C,OAAO,SAAS,CAAC,eAAe;QAC9B,CAAC,CAAC,SAAS,CAAC,eAAe;QAC3B,CAAC,CAAC,YAAY,SAAS,CAAC,IAAI,EAAE,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,sBAAsB,CACpC,SAAoB,EACpB,UAA4B;IAE5B,MAAM,mBAAmB,GAAG,mBAAmB,CAC7C,eAAe,CAAC,SAAS,CAAC,EAC1B,eAAe,CAAC,UAAU,CAAC,CAC5B,CAAC;IAEF,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAED,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,IAAI;IACJ,aAAa;IACb,sBAAsB;IACtB,eAAe;CAChB,CAAC"}
|
|
@@ -1,14 +1,26 @@
|
|
|
1
|
+
import type { SchemaParserContext } from '#src/parser/types.js';
|
|
1
2
|
import type { PluginImplementationStore, PluginMetadataWithPaths } from '#src/plugins/index.js';
|
|
2
3
|
import type { BasePluginDefinition, ProjectDefinition } from '#src/schema/index.js';
|
|
3
|
-
declare function
|
|
4
|
-
declare function
|
|
5
|
-
declare function
|
|
4
|
+
declare function byKey(projectDefinition: ProjectDefinition, key: string): BasePluginDefinition | undefined;
|
|
5
|
+
declare function byKeyOrThrow(projectDefinition: ProjectDefinition, id: string): BasePluginDefinition;
|
|
6
|
+
declare function configByKey(projectDefinition: ProjectDefinition, key: string): unknown;
|
|
7
|
+
declare function configByKeyOrThrow(projectDefinition: ProjectDefinition, key: string): unknown;
|
|
6
8
|
declare function setPluginConfig(projectDefinition: ProjectDefinition, plugin: PluginMetadataWithPaths, pluginConfig: unknown, pluginImplementationStore: PluginImplementationStore): void;
|
|
9
|
+
/**
|
|
10
|
+
* Disables a plugin and all plugins that it manages recursively.
|
|
11
|
+
*
|
|
12
|
+
* @param projectDefinition The project definition to disable the plugin in
|
|
13
|
+
* @param pluginKey The ID of the plugin to disable
|
|
14
|
+
* @param context The schema parser context to use
|
|
15
|
+
*/
|
|
16
|
+
declare function disablePlugin(projectDefinition: ProjectDefinition, pluginKey: string, context: SchemaParserContext): void;
|
|
7
17
|
export declare const PluginUtils: {
|
|
8
|
-
|
|
9
|
-
|
|
18
|
+
byKey: typeof byKey;
|
|
19
|
+
byKeyOrThrow: typeof byKeyOrThrow;
|
|
20
|
+
configByKey: typeof configByKey;
|
|
10
21
|
setPluginConfig: typeof setPluginConfig;
|
|
11
|
-
|
|
22
|
+
configByKeyOrThrow: typeof configByKeyOrThrow;
|
|
23
|
+
disablePlugin: typeof disablePlugin;
|
|
12
24
|
};
|
|
13
25
|
export {};
|
|
14
26
|
//# sourceMappingURL=plugin-utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-utils.d.ts","sourceRoot":"","sources":["../../../src/definition/plugins/plugin-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,yBAAyB,EACzB,uBAAuB,EACxB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EACV,oBAAoB,EACpB,iBAAiB,EAClB,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin-utils.d.ts","sourceRoot":"","sources":["../../../src/definition/plugins/plugin-utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAChE,OAAO,KAAK,EACV,yBAAyB,EACzB,uBAAuB,EACxB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EACV,oBAAoB,EACpB,iBAAiB,EAClB,MAAM,sBAAsB,CAAC;AAQ9B,iBAAS,KAAK,CACZ,iBAAiB,EAAE,iBAAiB,EACpC,GAAG,EAAE,MAAM,GACV,oBAAoB,GAAG,SAAS,CAMlC;AAED,iBAAS,YAAY,CACnB,iBAAiB,EAAE,iBAAiB,EACpC,EAAE,EAAE,MAAM,GACT,oBAAoB,CAMtB;AAED,iBAAS,WAAW,CAClB,iBAAiB,EAAE,iBAAiB,EACpC,GAAG,EAAE,MAAM,GACV,OAAO,CAGT;AAED,iBAAS,kBAAkB,CACzB,iBAAiB,EAAE,iBAAiB,EACpC,GAAG,EAAE,MAAM,GACV,OAAO,CAGT;AAED,iBAAS,eAAe,CACtB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,uBAAuB,EAC/B,YAAY,EAAE,OAAO,EACrB,yBAAyB,EAAE,yBAAyB,GACnD,IAAI,CAyBN;AAED;;;;;;GAMG;AACH,iBAAS,aAAa,CACpB,iBAAiB,EAAE,iBAAiB,EACpC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,mBAAmB,GAC3B,IAAI,CAuBN;AAED,eAAO,MAAM,WAAW;;;;;;;CAOvB,CAAC"}
|
|
@@ -1,26 +1,30 @@
|
|
|
1
|
-
import { pluginConfigSpec } from '#src/plugins/index.js';
|
|
1
|
+
import { getPluginMetadataByKeyOrThrow, pluginConfigSpec, } from '#src/plugins/index.js';
|
|
2
2
|
import { pluginEntityType } from '#src/schema/index.js';
|
|
3
|
-
function
|
|
4
|
-
const pluginEntityId = pluginEntityType.idFromKey(
|
|
3
|
+
function byKey(projectDefinition, key) {
|
|
4
|
+
const pluginEntityId = pluginEntityType.idFromKey(key);
|
|
5
5
|
const plugin = projectDefinition.plugins?.find((m) => m.id === pluginEntityId);
|
|
6
|
-
return plugin
|
|
6
|
+
return plugin;
|
|
7
7
|
}
|
|
8
|
-
function
|
|
9
|
-
const plugin =
|
|
8
|
+
function byKeyOrThrow(projectDefinition, id) {
|
|
9
|
+
const plugin = byKey(projectDefinition, id);
|
|
10
10
|
if (!plugin) {
|
|
11
11
|
throw new Error(`Could not find plugin with ID ${id}`);
|
|
12
12
|
}
|
|
13
13
|
return plugin;
|
|
14
14
|
}
|
|
15
|
-
function
|
|
16
|
-
const def =
|
|
15
|
+
function configByKey(projectDefinition, key) {
|
|
16
|
+
const def = byKey(projectDefinition, key);
|
|
17
|
+
return def?.config;
|
|
18
|
+
}
|
|
19
|
+
function configByKeyOrThrow(projectDefinition, key) {
|
|
20
|
+
const def = byKeyOrThrow(projectDefinition, key);
|
|
17
21
|
return def.config;
|
|
18
22
|
}
|
|
19
23
|
function setPluginConfig(projectDefinition, plugin, pluginConfig, pluginImplementationStore) {
|
|
20
24
|
const plugins = projectDefinition.plugins ?? [];
|
|
21
|
-
const pluginEntityId = pluginEntityType.idFromKey(plugin.
|
|
25
|
+
const pluginEntityId = pluginEntityType.idFromKey(plugin.key);
|
|
22
26
|
const pluginConfigService = pluginImplementationStore.getPluginSpec(pluginConfigSpec);
|
|
23
|
-
const lastMigrationVersion = pluginConfigService.getLastMigrationVersion(plugin.
|
|
27
|
+
const lastMigrationVersion = pluginConfigService.getLastMigrationVersion(plugin.key);
|
|
24
28
|
projectDefinition.plugins = plugins.some((p) => p.id === pluginEntityId)
|
|
25
29
|
? plugins.map((p) => pluginEntityId === p.id ? { ...p, config: pluginConfig } : p)
|
|
26
30
|
: [
|
|
@@ -35,10 +39,33 @@ function setPluginConfig(projectDefinition, plugin, pluginConfig, pluginImplemen
|
|
|
35
39
|
},
|
|
36
40
|
];
|
|
37
41
|
}
|
|
42
|
+
/**
|
|
43
|
+
* Disables a plugin and all plugins that it manages recursively.
|
|
44
|
+
*
|
|
45
|
+
* @param projectDefinition The project definition to disable the plugin in
|
|
46
|
+
* @param pluginKey The ID of the plugin to disable
|
|
47
|
+
* @param context The schema parser context to use
|
|
48
|
+
*/
|
|
49
|
+
function disablePlugin(projectDefinition, pluginKey, context) {
|
|
50
|
+
// Get plugin metadata to be disabled
|
|
51
|
+
const pluginMetadata = getPluginMetadataByKeyOrThrow(context.pluginStore, pluginKey);
|
|
52
|
+
// Make sure we disable any plugins that are managed by this plugin
|
|
53
|
+
const managedPlugins = projectDefinition.plugins?.filter((p) => {
|
|
54
|
+
const managedPlugin = getPluginMetadataByKeyOrThrow(context.pluginStore, pluginEntityType.keyFromId(p.id));
|
|
55
|
+
return managedPlugin.managedBy === pluginMetadata.fullyQualifiedName;
|
|
56
|
+
});
|
|
57
|
+
if (managedPlugins) {
|
|
58
|
+
for (const p of managedPlugins)
|
|
59
|
+
disablePlugin(projectDefinition, p.id, context);
|
|
60
|
+
}
|
|
61
|
+
projectDefinition.plugins = projectDefinition.plugins?.filter((p) => p.id !== pluginEntityType.idFromKey(pluginKey));
|
|
62
|
+
}
|
|
38
63
|
export const PluginUtils = {
|
|
39
|
-
|
|
40
|
-
|
|
64
|
+
byKey,
|
|
65
|
+
byKeyOrThrow,
|
|
66
|
+
configByKey,
|
|
41
67
|
setPluginConfig,
|
|
42
|
-
|
|
68
|
+
configByKeyOrThrow,
|
|
69
|
+
disablePlugin,
|
|
43
70
|
};
|
|
44
71
|
//# sourceMappingURL=plugin-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-utils.js","sourceRoot":"","sources":["../../../src/definition/plugins/plugin-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"plugin-utils.js","sourceRoot":"","sources":["../../../src/definition/plugins/plugin-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/migrations/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/migrations/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAgBlD,eAAO,MAAM,iBAAiB,EAAE,eAAe,EAc9C,CAAC;AAEF,wBAAgB,8BAA8B,CAC5C,iBAAiB,EAAE,OAAO,GACzB,iBAAiB,IAAI,iBAAiB,CAMxC;AAED,qBAAa,oBAAqB,SAAQ,KAAK;IAC7C,SAAgB,aAAa,EAAE,MAAM,CAAC;IACtC,SAAgB,KAAK,EAAE,OAAO,CAAC;gBAEnB,aAAa,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;CAQlD;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,iBAAiB,GAAG;IAC9D,kBAAkB,EAAE,iBAAiB,CAAC;IACtC,iBAAiB,EAAE,eAAe,EAAE,CAAC;CACtC,CAoBA;AAED,wBAAgB,yBAAyB,IAAI,MAAM,CAElD"}
|
package/dist/migrations/index.js
CHANGED
|
@@ -10,6 +10,7 @@ import { migration013MoveGeneralSettings } from './migration-013-move-general-se
|
|
|
10
10
|
import { migration014MigratePluginIds } from './migration-014-migrate-plugin-ids.js';
|
|
11
11
|
import { migration015NullParentRefs } from './migration-015-null-parent-refs.js';
|
|
12
12
|
import { migration016WebAdminConfig } from './migration-016-web-admin-config.js';
|
|
13
|
+
import { migration017RenameAuthPlugin } from './migration-017-rename-auth-plugin.js';
|
|
13
14
|
export const SCHEMA_MIGRATIONS = [
|
|
14
15
|
migration005PrimaryUniqueRefs,
|
|
15
16
|
migration006IndividualServiceControllers,
|
|
@@ -23,6 +24,7 @@ export const SCHEMA_MIGRATIONS = [
|
|
|
23
24
|
migration014MigratePluginIds,
|
|
24
25
|
migration015NullParentRefs,
|
|
25
26
|
migration016WebAdminConfig,
|
|
27
|
+
migration017RenameAuthPlugin,
|
|
26
28
|
];
|
|
27
29
|
export function isMigrateableProjectDefinition(projectDefinition) {
|
|
28
30
|
return (typeof projectDefinition === 'object' &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/migrations/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AACvF,OAAO,EAAE,wCAAwC,EAAE,MAAM,mDAAmD,CAAC;AAC7G,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,+BAA+B,EAAE,MAAM,0CAA0C,CAAC;AAC3F,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,6BAA6B,EAAE,MAAM,wCAAwC,CAAC;AACvF,OAAO,EAAE,+BAA+B,EAAE,MAAM,0CAA0C,CAAC;AAC3F,OAAO,EAAE,4BAA4B,EAAE,MAAM,uCAAuC,CAAC;AACrF,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;AACjF,OAAO,EAAE,0BAA0B,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/migrations/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
interface OldConfig {
|
|
2
|
+
plugins?: {
|
|
3
|
+
id: string;
|
|
4
|
+
name: string;
|
|
5
|
+
packageName: string;
|
|
6
|
+
version: string;
|
|
7
|
+
config?: unknown;
|
|
8
|
+
}[];
|
|
9
|
+
}
|
|
10
|
+
interface NewConfig {
|
|
11
|
+
plugins?: {
|
|
12
|
+
id: string;
|
|
13
|
+
name: string;
|
|
14
|
+
packageName: string;
|
|
15
|
+
version: string;
|
|
16
|
+
config?: unknown;
|
|
17
|
+
}[];
|
|
18
|
+
}
|
|
19
|
+
export declare const migration017RenameAuthPlugin: import("./types.js").SchemaMigration<OldConfig, NewConfig>;
|
|
20
|
+
export {};
|
|
21
|
+
//# sourceMappingURL=migration-017-rename-auth-plugin.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"migration-017-rename-auth-plugin.d.ts","sourceRoot":"","sources":["../../src/migrations/migration-017-rename-auth-plugin.ts"],"names":[],"mappings":"AAEA,UAAU,SAAS;IACjB,OAAO,CAAC,EAAE;QACR,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,EAAE,CAAC;CACL;AAED,UAAU,SAAS;IACjB,OAAO,CAAC,EAAE;QACR,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,MAAM,CAAC;QACb,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,OAAO,CAAC;KAClB,EAAE,CAAC;CACL;AAED,eAAO,MAAM,4BAA4B,4DAkFvC,CAAC"}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
import { createSchemaMigration } from './types.js';
|
|
2
|
+
export const migration017RenameAuthPlugin = createSchemaMigration({
|
|
3
|
+
version: 17,
|
|
4
|
+
name: 'renameAuthPlugin',
|
|
5
|
+
description: 'Rename plugin plugin-auth_auth to plugin-auth_local-auth and auto-activate auth manager plugin',
|
|
6
|
+
migrate: (config) => {
|
|
7
|
+
if (!config.plugins) {
|
|
8
|
+
return config;
|
|
9
|
+
}
|
|
10
|
+
let plugins = [...config.plugins];
|
|
11
|
+
let renamedPlugin = null;
|
|
12
|
+
// Step 1: Rename plugin-auth_auth to plugin-auth_local-auth
|
|
13
|
+
plugins = plugins.map((plugin) => {
|
|
14
|
+
if (plugin.id === 'plugin:baseplate-dev_plugin-auth_auth') {
|
|
15
|
+
renamedPlugin = {
|
|
16
|
+
...plugin,
|
|
17
|
+
name: 'local-auth',
|
|
18
|
+
id: 'plugin:baseplate-dev_plugin-auth_local-auth',
|
|
19
|
+
};
|
|
20
|
+
return renamedPlugin;
|
|
21
|
+
}
|
|
22
|
+
return plugin;
|
|
23
|
+
});
|
|
24
|
+
// Step 2: Check for any auth implementation plugins
|
|
25
|
+
const authImplementationPlugins = plugins.filter((plugin) => plugin.id === 'plugin:baseplate-dev_plugin-auth_local-auth' ||
|
|
26
|
+
plugin.id === 'plugin:baseplate-dev_plugin-auth_auth0' ||
|
|
27
|
+
plugin.id === 'plugin:baseplate-dev_plugin-auth_placeholder-auth');
|
|
28
|
+
// Step 3: If any implementation plugins exist, create main auth plugin with ported config
|
|
29
|
+
if (authImplementationPlugins.length > 0) {
|
|
30
|
+
// Determine the primary implementation plugin (prioritize local-auth > auth0 > placeholder)
|
|
31
|
+
const primaryImplementationPlugin = authImplementationPlugins.find((p) => p.id === 'plugin:baseplate-dev_plugin-auth_local-auth') ??
|
|
32
|
+
authImplementationPlugins.find((p) => p.id === 'plugin:baseplate-dev_plugin-auth_auth0') ??
|
|
33
|
+
authImplementationPlugins.find((p) => p.id === 'plugin:baseplate-dev_plugin-auth_placeholder-auth');
|
|
34
|
+
if (primaryImplementationPlugin) {
|
|
35
|
+
// Extract implementation key from plugin ID
|
|
36
|
+
const implementationPluginKey = primaryImplementationPlugin.id.replace('plugin:', '');
|
|
37
|
+
// Port configuration from the implementation plugin
|
|
38
|
+
const implementationConfig = (primaryImplementationPlugin.config ??
|
|
39
|
+
{});
|
|
40
|
+
// Create main auth plugin with ported configuration
|
|
41
|
+
plugins.push({
|
|
42
|
+
id: 'plugin:baseplate-dev_plugin-auth_auth',
|
|
43
|
+
name: 'auth',
|
|
44
|
+
packageName: '@baseplate-dev/plugin-auth',
|
|
45
|
+
version: '1.0.0',
|
|
46
|
+
config: {
|
|
47
|
+
implementationPluginKey,
|
|
48
|
+
authFeatureRef: implementationConfig.authFeatureRef,
|
|
49
|
+
roles: implementationConfig.roles,
|
|
50
|
+
},
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
return {
|
|
55
|
+
...config,
|
|
56
|
+
plugins,
|
|
57
|
+
};
|
|
58
|
+
},
|
|
59
|
+
});
|
|
60
|
+
//# sourceMappingURL=migration-017-rename-auth-plugin.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"migration-017-rename-auth-plugin.js","sourceRoot":"","sources":["../../src/migrations/migration-017-rename-auth-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAsBnD,MAAM,CAAC,MAAM,4BAA4B,GAAG,qBAAqB,CAG/D;IACA,OAAO,EAAE,EAAE;IACX,IAAI,EAAE,kBAAkB;IACxB,WAAW,EACT,gGAAgG;IAClG,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;QAClB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,IAAI,OAAO,GAAG,CAAC,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QAClC,IAAI,aAAa,GAA+B,IAAI,CAAC;QAErD,4DAA4D;QAC5D,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YAC/B,IAAI,MAAM,CAAC,EAAE,KAAK,uCAAuC,EAAE,CAAC;gBAC1D,aAAa,GAAG;oBACd,GAAG,MAAM;oBACT,IAAI,EAAE,YAAY;oBAClB,EAAE,EAAE,6CAA6C;iBAClD,CAAC;gBACF,OAAO,aAAa,CAAC;YACvB,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,oDAAoD;QACpD,MAAM,yBAAyB,GAAG,OAAO,CAAC,MAAM,CAC9C,CAAC,MAAM,EAAE,EAAE,CACT,MAAM,CAAC,EAAE,KAAK,6CAA6C;YAC3D,MAAM,CAAC,EAAE,KAAK,wCAAwC;YACtD,MAAM,CAAC,EAAE,KAAK,mDAAmD,CACpE,CAAC;QAEF,0FAA0F;QAC1F,IAAI,yBAAyB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACzC,4FAA4F;YAC5F,MAAM,2BAA2B,GAC/B,yBAAyB,CAAC,IAAI,CAC5B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,6CAA6C,CAC9D;gBACD,yBAAyB,CAAC,IAAI,CAC5B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,wCAAwC,CACzD;gBACD,yBAAyB,CAAC,IAAI,CAC5B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,mDAAmD,CACpE,CAAC;YAEJ,IAAI,2BAA2B,EAAE,CAAC;gBAChC,4CAA4C;gBAC5C,MAAM,uBAAuB,GAAG,2BAA2B,CAAC,EAAE,CAAC,OAAO,CACpE,SAAS,EACT,EAAE,CACH,CAAC;gBAEF,oDAAoD;gBACpD,MAAM,oBAAoB,GAAG,CAAC,2BAA2B,CAAC,MAAM;oBAC9D,EAAE,CAA4B,CAAC;gBAEjC,oDAAoD;gBACpD,OAAO,CAAC,IAAI,CAAC;oBACX,EAAE,EAAE,uCAAuC;oBAC3C,IAAI,EAAE,MAAM;oBACZ,WAAW,EAAE,4BAA4B;oBACzC,OAAO,EAAE,OAAO;oBAChB,MAAM,EAAE;wBACN,uBAAuB;wBACvB,cAAc,EAAE,oBAAoB,CAAC,cAAc;wBACnD,KAAK,EAAE,oBAAoB,CAAC,KAAK;qBAClC;iBACF,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAED,OAAO;YACL,GAAG,MAAM;YACT,OAAO;SACR,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
|
package/dist/parser/parser.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { PluginStore } from '#src/plugins/imports/types.js';
|
|
2
|
-
import type { PluginImplementationStore } from '#src/plugins/index.js';
|
|
2
|
+
import type { PluginImplementationStore, PluginMetadataWithPaths } from '#src/plugins/index.js';
|
|
3
3
|
import type { ResolvedZodRefPayload } from '#src/references/types.js';
|
|
4
4
|
import type { ProjectDefinition, ProjectDefinitionSchema } from '#src/schema/project-definition.js';
|
|
5
5
|
import type { SchemaParserContext } from './types.js';
|
|
@@ -12,6 +12,15 @@ import type { SchemaParserContext } from './types.js';
|
|
|
12
12
|
* @returns The plugin implementation store
|
|
13
13
|
*/
|
|
14
14
|
export declare function createPluginImplementationStore(pluginStore: PluginStore, projectDefinition: unknown): PluginImplementationStore;
|
|
15
|
+
/**
|
|
16
|
+
* Creates a plugin implementation store with the given plugins added to the project definition.
|
|
17
|
+
*
|
|
18
|
+
* @param pluginStore The plugin store to use
|
|
19
|
+
* @param plugins The plugins to add to the project definition
|
|
20
|
+
* @param projectDefinition The project definition to use
|
|
21
|
+
* @returns The plugin implementation store
|
|
22
|
+
*/
|
|
23
|
+
export declare function createPluginImplementationStoreWithNewPlugins(pluginStore: PluginStore, plugins: PluginMetadataWithPaths[], projectDefinition: ProjectDefinition): PluginImplementationStore;
|
|
15
24
|
/**
|
|
16
25
|
* Creates a project definition schema with the given context.
|
|
17
26
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/parser/parser.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EAEV,yBAAyB,
|
|
1
|
+
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/parser/parser.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EAEV,yBAAyB,EACzB,uBAAuB,EAGxB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AACtE,OAAO,KAAK,EACV,iBAAiB,EACjB,uBAAuB,EACxB,MAAM,mCAAmC,CAAC;AAc3C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAOtD;;;;;;;GAOG;AACH,wBAAgB,+BAA+B,CAC7C,WAAW,EAAE,WAAW,EACxB,iBAAiB,EAAE,OAAO,GACzB,yBAAyB,CA2C3B;AAED;;;;;;;GAOG;AACH,wBAAgB,6CAA6C,CAC3D,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,uBAAuB,EAAE,EAClC,iBAAiB,EAAE,iBAAiB,GACnC,yBAAyB,CAqB3B;AAED;;;;;;GAMG;AACH,wBAAgB,wCAAwC,CACtD,iBAAiB,EAAE,OAAO,EAC1B,OAAO,EAAE,mBAAmB,GAC3B,uBAAuB,CAUzB;AAED,wBAAgB,iCAAiC,CAC/C,iBAAiB,EAAE,OAAO,EAC1B,OAAO,EAAE,mBAAmB,GAC3B,iBAAiB,CAMnB;AAED;;;;;;GAMG;AACH,wBAAgB,oCAAoC,CAClD,iBAAiB,EAAE,OAAO,EAC1B,OAAO,EAAE,mBAAmB,GAC3B;IACD,UAAU,EAAE,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;IACrD,WAAW,EAAE,yBAAyB,CAAC;CACxC,CAYA"}
|
package/dist/parser/parser.js
CHANGED
|
@@ -2,7 +2,7 @@ import { z } from 'zod';
|
|
|
2
2
|
import { initializePlugins } from '#src/plugins/imports/loader.js';
|
|
3
3
|
import { pluginConfigSpec } from '#src/plugins/index.js';
|
|
4
4
|
import { parseSchemaWithTransformedReferences } from '#src/references/parse-schema-with-references.js';
|
|
5
|
-
import { adminCrudInputSpec, createDefinitionSchemaParserContext, modelTransformerSpec, } from '#src/schema/index.js';
|
|
5
|
+
import { adminCrudInputSpec, createDefinitionSchemaParserContext, modelTransformerSpec, pluginEntityType, } from '#src/schema/index.js';
|
|
6
6
|
import { basePluginDefinitionSchema } from '#src/schema/plugins/definition.js';
|
|
7
7
|
import { createProjectDefinitionSchema } from '#src/schema/project-definition.js';
|
|
8
8
|
const COMMON_SPEC_IMPLEMENTATIONS = [pluginConfigSpec, modelTransformerSpec, adminCrudInputSpec];
|
|
@@ -46,13 +46,38 @@ export function createPluginImplementationStore(pluginStore, projectDefinition)
|
|
|
46
46
|
throw new Error(`Unable to find plugin ${pluginName}!`);
|
|
47
47
|
}
|
|
48
48
|
return {
|
|
49
|
-
|
|
49
|
+
key: plugin.metadata.key,
|
|
50
50
|
name: pluginName,
|
|
51
51
|
pluginModules: plugin.modules,
|
|
52
52
|
};
|
|
53
53
|
});
|
|
54
54
|
return initializePlugins(pluginsWithModules, specImplementations);
|
|
55
55
|
}
|
|
56
|
+
/**
|
|
57
|
+
* Creates a plugin implementation store with the given plugins added to the project definition.
|
|
58
|
+
*
|
|
59
|
+
* @param pluginStore The plugin store to use
|
|
60
|
+
* @param plugins The plugins to add to the project definition
|
|
61
|
+
* @param projectDefinition The project definition to use
|
|
62
|
+
* @returns The plugin implementation store
|
|
63
|
+
*/
|
|
64
|
+
export function createPluginImplementationStoreWithNewPlugins(pluginStore, plugins, projectDefinition) {
|
|
65
|
+
const newProjectDefinition = {
|
|
66
|
+
...projectDefinition,
|
|
67
|
+
plugins: [
|
|
68
|
+
...(projectDefinition.plugins ?? []),
|
|
69
|
+
...plugins
|
|
70
|
+
.filter((p) => !projectDefinition.plugins?.some((p2) => p2.id === pluginEntityType.idFromKey(p.key)))
|
|
71
|
+
.map((p) => ({
|
|
72
|
+
id: pluginEntityType.idFromKey(p.key),
|
|
73
|
+
version: p.version,
|
|
74
|
+
name: p.name,
|
|
75
|
+
packageName: p.packageName,
|
|
76
|
+
})),
|
|
77
|
+
],
|
|
78
|
+
};
|
|
79
|
+
return createPluginImplementationStore(pluginStore, newProjectDefinition);
|
|
80
|
+
}
|
|
56
81
|
/**
|
|
57
82
|
* Creates a project definition schema with the given context.
|
|
58
83
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/parser/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/parser/parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,20 @@
|
|
|
1
1
|
import type { PluginMetadataWithPaths } from '../plugins/index.js';
|
|
2
|
+
export declare class PluginLoaderError extends Error {
|
|
3
|
+
innerError?: unknown | undefined;
|
|
4
|
+
constructor(message: string, innerError?: unknown | undefined);
|
|
5
|
+
}
|
|
6
|
+
export interface LoadPluginsInPackageOptions {
|
|
7
|
+
/**
|
|
8
|
+
* Glob patterns to search for plugin.json files.
|
|
9
|
+
* Defaults to built plugins only.
|
|
10
|
+
* For development, can include both src and dist directories.
|
|
11
|
+
*/
|
|
12
|
+
pluginGlobs?: string[];
|
|
13
|
+
}
|
|
2
14
|
/**
|
|
3
15
|
* Finds the available plugins in a package.
|
|
4
16
|
*/
|
|
5
|
-
export declare function loadPluginsInPackage(pluginPackageDirectory: string, packageName: string): Promise<PluginMetadataWithPaths[]>;
|
|
17
|
+
export declare function loadPluginsInPackage(pluginPackageDirectory: string, packageName: string, options?: LoadPluginsInPackageOptions): Promise<PluginMetadataWithPaths[]>;
|
|
6
18
|
export declare function rewriteDistToSrc(directory: string): string;
|
|
7
19
|
interface GetModuleFederationTargetsOptions {
|
|
8
20
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin-loader.d.ts","sourceRoot":"","sources":["../../src/plugin-tools/plugin-loader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"plugin-loader.d.ts","sourceRoot":"","sources":["../../src/plugin-tools/plugin-loader.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAEV,uBAAuB,EACxB,MAAM,qBAAqB,CAAC;AA4B7B,qBAAa,iBAAkB,SAAQ,KAAK;IAGjC,UAAU,CAAC,EAAE,OAAO;gBAD3B,OAAO,EAAE,MAAM,EACR,UAAU,CAAC,EAAE,OAAO,YAAA;CAO9B;AA2MD,MAAM,WAAW,2BAA2B;IAC1C;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,sBAAsB,EAAE,MAAM,EAC9B,WAAW,EAAE,MAAM,EACnB,OAAO,GAAE,2BAAgC,GACxC,OAAO,CAAC,uBAAuB,EAAE,CAAC,CAwCpC;AA6BD,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAE1D;AAED,UAAU,iCAAiC;IACzC;;;OAGG;IACH,sBAAsB,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,KAAK,MAAM,CAAC;CACxD;AAED,wBAAsB,0BAA0B,CAC9C,sBAAsB,EAAE,MAAM,EAC9B,OAAO,GAAE,iCAAsC,GAC9C,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAuDjC"}
|