@granite-js/plugin-core 0.1.16 → 0.1.18

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @granite-js/plugin-core
 
+## 0.1.18
+
+### Patch Changes
+
+- @granite-js/utils@0.1.18
+
+## 0.1.17
+
+### Patch Changes
+
+- 9c415df: supports dynamic plugin config
+  - @granite-js/utils@0.1.17
+
 ## 0.1.16
 
 ### Patch Changes

package/dist/index.cjs

@@ -246,20 +246,27 @@ function mergeTransformer(source, target) {
 
 //#endregion
 //#region src/utils/mergeConfig.ts
-function mergeConfig(base, ...configs) {
+async function mergeConfig(base, ...configs) {
 	if (!(base || configs.length)) return void 0;
-	return configs.reduce((acc, curr) => ({
-		...acc,
-		...curr,
-		resolver: mergeResolver(acc?.resolver, curr?.resolver),
-		transformer: mergeTransformer(acc?.transformer, curr?.transformer),
-		esbuild: mergeEsbuild(acc?.esbuild, curr?.esbuild),
-		babel: mergeBabel(acc?.babel, curr?.babel),
-		swc: mergeSwc(acc?.swc, curr?.swc),
-		devServer: mergeDevServer(acc?.devServer, curr?.devServer),
-		metro: mergeMetro(acc?.metro, curr?.metro),
-		extra: mergeExtra(acc?.extra, curr?.extra)
-	}), base);
+	return configs.reduce(async (acc, curr) => {
+		const [resolvedAcc, resolvedCurr] = await Promise.all([acc, resolveDynamicConfig(curr)]);
+		return {
+			...resolvedAcc,
+			...resolvedCurr,
+			resolver: mergeResolver(resolvedAcc?.resolver, resolvedCurr?.resolver),
+			transformer: mergeTransformer(resolvedAcc?.transformer, resolvedCurr?.transformer),
+			esbuild: mergeEsbuild(resolvedAcc?.esbuild, resolvedCurr?.esbuild),
+			babel: mergeBabel(resolvedAcc?.babel, resolvedCurr?.babel),
+			swc: mergeSwc(resolvedAcc?.swc, resolvedCurr?.swc),
+			devServer: mergeDevServer(resolvedAcc?.devServer, resolvedCurr?.devServer),
+			metro: mergeMetro(resolvedAcc?.metro, resolvedCurr?.metro),
+			extra: mergeExtra(resolvedAcc?.extra, resolvedCurr?.extra)
+		};
+	}, resolveDynamicConfig(base));
+}
+async function resolveDynamicConfig(config) {
+	if (typeof config === "function") return await config();
+	return config;
 }
 
 //#endregion
@@ -333,6 +340,15 @@ function isBuildFailure(result) {
 	return !("bundle" in result);
 }
 
+//#endregion
+//#region src/utils/resolveConfig.ts
+const EMPTY_CONFIG = {};
+async function resolveConfig(config) {
+	const [base, ...rest] = config.pluginConfigs;
+	if (base == null) return EMPTY_CONFIG;
+	return mergeConfig(base, ...rest).then((config$1) => config$1 ?? EMPTY_CONFIG);
+}
+
 //#endregion
 //#region src/config/graniteGlobals.ts
 function prepareGraniteGlobalsScript(config) {
@@ -444,21 +460,17 @@ const defineConfig = async (config) => {
 		scheme,
 		host
 	});
-	const mergedConfig = mergeConfig(parsedConfig, ...[globalsScriptConfig, ...configs].filter(es_toolkit.isNotNil));
-	const { metro, devServer,...build } = mergedConfig ?? {};
 	return {
 		cwd,
 		appName,
 		entryFile,
 		outdir,
-		build,
-		devServer,
 		pluginHooks,
-		metro: {
-			...metro,
-			babelConfig: mergedConfig?.babel,
-			transformSync: mergedConfig?.transformer?.transformSync
-		}
+		pluginConfigs: [
+			parsedConfig,
+			globalsScriptConfig,
+			...configs
+		].filter(es_toolkit.isNotNil)
 	};
 };
 
@@ -467,13 +479,14 @@ const defineConfig = async (config) => {
 const MODULE_NAME = "granite";
 const loadConfig = async (options = {}) => {
 	let result;
-	if (options.configFile) result = await getConfigExplorer().load(path.default.resolve(options.root ?? (0, __granite_js_utils.getPackageRoot)(), options.configFile));
+	const resolveRoot = options.root ?? (0, __granite_js_utils.getPackageRoot)();
+	if (options.configFile) result = await getConfigExplorer().load(path.default.resolve(resolveRoot, options.configFile));
 	else result = await getConfigExplorer({ searchPlaces: [
 		`${MODULE_NAME}.config.ts`,
 		`${MODULE_NAME}.config.mts`,
 		`${MODULE_NAME}.config.js`,
 		`${MODULE_NAME}.config.cjs`
-	] }).search(options.root);
+	] }).search(resolveRoot);
 	(0, es_toolkit.assert)(result, "Config file not found");
 	const config = await result.config;
 	return config;
@@ -500,4 +513,5 @@ exports.loadConfig = loadConfig;
 exports.mergeBuildConfigs = mergeBuildConfigs;
 exports.mergeConfig = mergeConfig;
 exports.pluginConfigSchema = pluginConfigSchema;
+exports.resolveConfig = resolveConfig;
 exports.resolvePlugins = resolvePlugins;

package/dist/index.d.cts

@@ -495,7 +495,7 @@ interface GranitePluginCore {
    */
   name: string;
   /**
-   * Dev handler
+   * Dev handler (granite dev command)
    */
   dev?: {
     order: 'pre';
@@ -505,7 +505,7 @@ interface GranitePluginCore {
     handler: GranitePluginDevPostHandler;
   };
   /**
-   * Build handler
+   * Build handler (granite build command)
    */
   build?: {
     order: 'pre';
@@ -514,12 +514,17 @@ interface GranitePluginCore {
     order: 'post';
     handler: GranitePluginBuildPostHandler;
   };
+  /**
+   * Plugin config
+   */
   config?: PluginConfig;
 }
-type PluginConfig = Omit<PluginBuildConfig, 'platform' | 'outfile'> & {
+type PluginConfig = StaticPluginConfig | DynamicPluginConfig;
+type StaticPluginConfig = Omit<PluginBuildConfig, 'platform' | 'outfile'> & {
   devServer?: DevServerConfig;
   metro?: PluginMetroConfig;
 };
+type DynamicPluginConfig = (() => StaticPluginConfig) | (() => Promise<StaticPluginConfig>);
 type PluginMetroConfig = Omit<AdditionalMetroConfig, 'babelConfig' | 'transformSync'> & MetroDevServerConfig;
 type PluginResolvable = GranitePlugin | GranitePluginCore | Promise<GranitePlugin> | Promise<GranitePluginCore>;
 type PluginInput = PluginResolvable | PluginInput[];
@@ -538,7 +543,7 @@ declare const flattenPlugins: (plugin: PluginInput) => Promise<GranitePluginCore
 //#region src/utils/resolvePlugins.d.ts
 declare function resolvePlugins(plugins: PluginInput): Promise<{
   plugins: GranitePluginCore[];
-  configs: PluginConfig[];
+  configs: (StaticPluginConfig | (() => StaticPluginConfig) | (() => Promise<StaticPluginConfig>))[];
   pluginHooks: {
     devServer: {
       preHandlers: GranitePluginDevPreHandler[];
@@ -553,7 +558,7 @@ declare function resolvePlugins(plugins: PluginInput): Promise<{
 
 //#endregion
 //#region src/utils/mergeConfig.d.ts
-declare function mergeConfig(base: PluginConfig, ...configs: PluginConfig[]): PluginConfig | undefined;
+declare function mergeConfig(base: PluginConfig, ...configs: PluginConfig[]): Promise<StaticPluginConfig | undefined>;
 
 //#endregion
 //#region src/utils/mergeBuildConfigs.d.ts
@@ -575,9 +580,13 @@ declare const pluginConfigSchema: z.ZodObject<{
 }, z.core.$strip>;
 type GraniteConfig = z.input<typeof pluginConfigSchema>;
 type ParsedGraniteConfig = z.output<typeof pluginConfigSchema>;
-type CompleteGraniteConfig = Pick<ParsedGraniteConfig, 'cwd' | 'appName' | 'entryFile' | 'outdir' | 'devServer' | 'metro'> & {
-  build: Omit<BuildConfig, 'platform' | 'entry' | 'outfile'>;
+type CompleteGraniteConfig = {
+  cwd: ParsedGraniteConfig['cwd'];
+  appName: ParsedGraniteConfig['appName'];
+  entryFile: ParsedGraniteConfig['entryFile'];
+  outdir: ParsedGraniteConfig['outdir'];
   pluginHooks: GranitePluginHooks;
+  pluginConfigs: PluginConfig[];
 };
 interface GranitePluginHooks {
   devServer: {
@@ -609,6 +618,10 @@ declare function createPluginContext(): PluginContext;
 declare function isBuildSuccess(result: BuildResult$1): result is BuildSuccessResult$1;
 declare function isBuildFailure(result: BuildResult$1): result is BuildFailureResult$1;
 
+//#endregion
+//#region src/utils/resolveConfig.d.ts
+declare function resolveConfig(config: CompleteGraniteConfig): Promise<StaticPluginConfig>;
+
 //#endregion
 //#region src/config/defineConfig.d.ts
 /**
@@ -684,4 +697,4 @@ interface LoadConfigOptions {
 declare const loadConfig: (options?: LoadConfigOptions) => Promise<CompleteGraniteConfig>;
 
 //#endregion
-export { AdditionalMetroConfig, AliasConfig, AliasResolver, BabelConfig, BuildConfig, BuildFailureResult, BuildResult, BuildSuccessResult, BundleData, CompleteGraniteConfig, DevServerConfig, EsbuildConfig, GraniteConfig, GranitePlugin, GranitePluginBuildPostHandler, GranitePluginBuildPreHandler, GranitePluginConfig, GranitePluginCore, GranitePluginDevHandlerArgs, GranitePluginDevPostHandler, GranitePluginDevPreHandler, GranitePluginHooks, GranitePluginPostHandlerArgs, GranitePluginPreHandlerArgs, MetroDevServerConfig, MetroMiddleware, Middleware, ParsedGraniteConfig, PluginBuildConfig, PluginConfig, PluginContext, PluginInput, PluginMetroConfig, PluginResolvable, ProtocolConfig, ResolveResult, ResolveResultWithOptions, ResolverConfig, SwcConfig, TransformAsync, TransformSync, TransformerConfig, createContext, createPluginContext, createPluginHooksDriver, defineConfig, flattenPlugins, isBuildFailure, isBuildSuccess, loadConfig, mergeBuildConfigs, mergeConfig, pluginConfigSchema, resolvePlugins };
+export { AdditionalMetroConfig, AliasConfig, AliasResolver, BabelConfig, BuildConfig, BuildFailureResult, BuildResult, BuildSuccessResult, BundleData, CompleteGraniteConfig, DevServerConfig, DynamicPluginConfig, EsbuildConfig, GraniteConfig, GranitePlugin, GranitePluginBuildPostHandler, GranitePluginBuildPreHandler, GranitePluginConfig, GranitePluginCore, GranitePluginDevHandlerArgs, GranitePluginDevPostHandler, GranitePluginDevPreHandler, GranitePluginHooks, GranitePluginPostHandlerArgs, GranitePluginPreHandlerArgs, MetroDevServerConfig, MetroMiddleware, Middleware, ParsedGraniteConfig, PluginBuildConfig, PluginConfig, PluginContext, PluginInput, PluginMetroConfig, PluginResolvable, ProtocolConfig, ResolveResult, ResolveResultWithOptions, ResolverConfig, StaticPluginConfig, SwcConfig, TransformAsync, TransformSync, TransformerConfig, createContext, createPluginContext, createPluginHooksDriver, defineConfig, flattenPlugins, isBuildFailure, isBuildSuccess, loadConfig, mergeBuildConfigs, mergeConfig, pluginConfigSchema, resolveConfig, resolvePlugins };

package/dist/index.d.ts

@@ -495,7 +495,7 @@ interface GranitePluginCore {
    */
   name: string;
   /**
-   * Dev handler
+   * Dev handler (granite dev command)
    */
   dev?: {
     order: 'pre';
@@ -505,7 +505,7 @@ interface GranitePluginCore {
     handler: GranitePluginDevPostHandler;
   };
   /**
-   * Build handler
+   * Build handler (granite build command)
    */
   build?: {
     order: 'pre';
@@ -514,12 +514,17 @@ interface GranitePluginCore {
     order: 'post';
     handler: GranitePluginBuildPostHandler;
   };
+  /**
+   * Plugin config
+   */
   config?: PluginConfig;
 }
-type PluginConfig = Omit<PluginBuildConfig, 'platform' | 'outfile'> & {
+type PluginConfig = StaticPluginConfig | DynamicPluginConfig;
+type StaticPluginConfig = Omit<PluginBuildConfig, 'platform' | 'outfile'> & {
   devServer?: DevServerConfig;
   metro?: PluginMetroConfig;
 };
+type DynamicPluginConfig = (() => StaticPluginConfig) | (() => Promise<StaticPluginConfig>);
 type PluginMetroConfig = Omit<AdditionalMetroConfig, 'babelConfig' | 'transformSync'> & MetroDevServerConfig;
 type PluginResolvable = GranitePlugin | GranitePluginCore | Promise<GranitePlugin> | Promise<GranitePluginCore>;
 type PluginInput = PluginResolvable | PluginInput[];
@@ -538,7 +543,7 @@ declare const flattenPlugins: (plugin: PluginInput) => Promise<GranitePluginCore
 //#region src/utils/resolvePlugins.d.ts
 declare function resolvePlugins(plugins: PluginInput): Promise<{
   plugins: GranitePluginCore[];
-  configs: PluginConfig[];
+  configs: (StaticPluginConfig | (() => StaticPluginConfig) | (() => Promise<StaticPluginConfig>))[];
   pluginHooks: {
     devServer: {
       preHandlers: GranitePluginDevPreHandler[];
@@ -553,7 +558,7 @@ declare function resolvePlugins(plugins: PluginInput): Promise<{
 
 //#endregion
 //#region src/utils/mergeConfig.d.ts
-declare function mergeConfig(base: PluginConfig, ...configs: PluginConfig[]): PluginConfig | undefined;
+declare function mergeConfig(base: PluginConfig, ...configs: PluginConfig[]): Promise<StaticPluginConfig | undefined>;
 
 //#endregion
 //#region src/utils/mergeBuildConfigs.d.ts
@@ -575,9 +580,13 @@ declare const pluginConfigSchema: z.ZodObject<{
 }, z.core.$strip>;
 type GraniteConfig = z.input<typeof pluginConfigSchema>;
 type ParsedGraniteConfig = z.output<typeof pluginConfigSchema>;
-type CompleteGraniteConfig = Pick<ParsedGraniteConfig, 'cwd' | 'appName' | 'entryFile' | 'outdir' | 'devServer' | 'metro'> & {
-  build: Omit<BuildConfig, 'platform' | 'entry' | 'outfile'>;
+type CompleteGraniteConfig = {
+  cwd: ParsedGraniteConfig['cwd'];
+  appName: ParsedGraniteConfig['appName'];
+  entryFile: ParsedGraniteConfig['entryFile'];
+  outdir: ParsedGraniteConfig['outdir'];
   pluginHooks: GranitePluginHooks;
+  pluginConfigs: PluginConfig[];
 };
 interface GranitePluginHooks {
   devServer: {
@@ -609,6 +618,10 @@ declare function createPluginContext(): PluginContext;
 declare function isBuildSuccess(result: BuildResult$1): result is BuildSuccessResult$1;
 declare function isBuildFailure(result: BuildResult$1): result is BuildFailureResult$1;
 
+//#endregion
+//#region src/utils/resolveConfig.d.ts
+declare function resolveConfig(config: CompleteGraniteConfig): Promise<StaticPluginConfig>;
+
 //#endregion
 //#region src/config/defineConfig.d.ts
 /**
@@ -684,4 +697,4 @@ interface LoadConfigOptions {
 declare const loadConfig: (options?: LoadConfigOptions) => Promise<CompleteGraniteConfig>;
 
 //#endregion
-export { AdditionalMetroConfig, AliasConfig, AliasResolver, BabelConfig, BuildConfig, BuildFailureResult, BuildResult, BuildSuccessResult, BundleData, CompleteGraniteConfig, DevServerConfig, EsbuildConfig, GraniteConfig, GranitePlugin, GranitePluginBuildPostHandler, GranitePluginBuildPreHandler, GranitePluginConfig, GranitePluginCore, GranitePluginDevHandlerArgs, GranitePluginDevPostHandler, GranitePluginDevPreHandler, GranitePluginHooks, GranitePluginPostHandlerArgs, GranitePluginPreHandlerArgs, MetroDevServerConfig, MetroMiddleware, Middleware, ParsedGraniteConfig, PluginBuildConfig, PluginConfig, PluginContext, PluginInput, PluginMetroConfig, PluginResolvable, ProtocolConfig, ResolveResult, ResolveResultWithOptions, ResolverConfig, SwcConfig, TransformAsync, TransformSync, TransformerConfig, createContext, createPluginContext, createPluginHooksDriver, defineConfig, flattenPlugins, isBuildFailure, isBuildSuccess, loadConfig, mergeBuildConfigs, mergeConfig, pluginConfigSchema, resolvePlugins };
+export { AdditionalMetroConfig, AliasConfig, AliasResolver, BabelConfig, BuildConfig, BuildFailureResult, BuildResult, BuildSuccessResult, BundleData, CompleteGraniteConfig, DevServerConfig, DynamicPluginConfig, EsbuildConfig, GraniteConfig, GranitePlugin, GranitePluginBuildPostHandler, GranitePluginBuildPreHandler, GranitePluginConfig, GranitePluginCore, GranitePluginDevHandlerArgs, GranitePluginDevPostHandler, GranitePluginDevPreHandler, GranitePluginHooks, GranitePluginPostHandlerArgs, GranitePluginPreHandlerArgs, MetroDevServerConfig, MetroMiddleware, Middleware, ParsedGraniteConfig, PluginBuildConfig, PluginConfig, PluginContext, PluginInput, PluginMetroConfig, PluginResolvable, ProtocolConfig, ResolveResult, ResolveResultWithOptions, ResolverConfig, StaticPluginConfig, SwcConfig, TransformAsync, TransformSync, TransformerConfig, createContext, createPluginContext, createPluginHooksDriver, defineConfig, flattenPlugins, isBuildFailure, isBuildSuccess, loadConfig, mergeBuildConfigs, mergeConfig, pluginConfigSchema, resolveConfig, resolvePlugins };

package/dist/index.js

@@ -223,20 +223,27 @@ function mergeTransformer(source, target) {
 
 //#endregion
 //#region src/utils/mergeConfig.ts
-function mergeConfig(base, ...configs) {
+async function mergeConfig(base, ...configs) {
 	if (!(base || configs.length)) return void 0;
-	return configs.reduce((acc, curr) => ({
-		...acc,
-		...curr,
-		resolver: mergeResolver(acc?.resolver, curr?.resolver),
-		transformer: mergeTransformer(acc?.transformer, curr?.transformer),
-		esbuild: mergeEsbuild(acc?.esbuild, curr?.esbuild),
-		babel: mergeBabel(acc?.babel, curr?.babel),
-		swc: mergeSwc(acc?.swc, curr?.swc),
-		devServer: mergeDevServer(acc?.devServer, curr?.devServer),
-		metro: mergeMetro(acc?.metro, curr?.metro),
-		extra: mergeExtra(acc?.extra, curr?.extra)
-	}), base);
+	return configs.reduce(async (acc, curr) => {
+		const [resolvedAcc, resolvedCurr] = await Promise.all([acc, resolveDynamicConfig(curr)]);
+		return {
+			...resolvedAcc,
+			...resolvedCurr,
+			resolver: mergeResolver(resolvedAcc?.resolver, resolvedCurr?.resolver),
+			transformer: mergeTransformer(resolvedAcc?.transformer, resolvedCurr?.transformer),
+			esbuild: mergeEsbuild(resolvedAcc?.esbuild, resolvedCurr?.esbuild),
+			babel: mergeBabel(resolvedAcc?.babel, resolvedCurr?.babel),
+			swc: mergeSwc(resolvedAcc?.swc, resolvedCurr?.swc),
+			devServer: mergeDevServer(resolvedAcc?.devServer, resolvedCurr?.devServer),
+			metro: mergeMetro(resolvedAcc?.metro, resolvedCurr?.metro),
+			extra: mergeExtra(resolvedAcc?.extra, resolvedCurr?.extra)
+		};
+	}, resolveDynamicConfig(base));
+}
+async function resolveDynamicConfig(config) {
+	if (typeof config === "function") return await config();
+	return config;
 }
 
 //#endregion
@@ -310,6 +317,15 @@ function isBuildFailure(result) {
 	return !("bundle" in result);
 }
 
+//#endregion
+//#region src/utils/resolveConfig.ts
+const EMPTY_CONFIG = {};
+async function resolveConfig(config) {
+	const [base, ...rest] = config.pluginConfigs;
+	if (base == null) return EMPTY_CONFIG;
+	return mergeConfig(base, ...rest).then((config$1) => config$1 ?? EMPTY_CONFIG);
+}
+
 //#endregion
 //#region src/config/graniteGlobals.ts
 function prepareGraniteGlobalsScript(config) {
@@ -421,21 +437,17 @@ const defineConfig = async (config) => {
 		scheme,
 		host
 	});
-	const mergedConfig = mergeConfig(parsedConfig, ...[globalsScriptConfig, ...configs].filter(isNotNil));
-	const { metro, devServer,...build } = mergedConfig ?? {};
 	return {
 		cwd,
 		appName,
 		entryFile,
 		outdir,
-		build,
-		devServer,
 		pluginHooks,
-		metro: {
-			...metro,
-			babelConfig: mergedConfig?.babel,
-			transformSync: mergedConfig?.transformer?.transformSync
-		}
+		pluginConfigs: [
+			parsedConfig,
+			globalsScriptConfig,
+			...configs
+		].filter(isNotNil)
 	};
 };
 
@@ -444,13 +456,14 @@ const defineConfig = async (config) => {
 const MODULE_NAME = "granite";
 const loadConfig = async (options = {}) => {
 	let result;
-	if (options.configFile) result = await getConfigExplorer().load(path.resolve(options.root ?? getPackageRoot(), options.configFile));
+	const resolveRoot = options.root ?? getPackageRoot();
+	if (options.configFile) result = await getConfigExplorer().load(path.resolve(resolveRoot, options.configFile));
 	else result = await getConfigExplorer({ searchPlaces: [
 		`${MODULE_NAME}.config.ts`,
 		`${MODULE_NAME}.config.mts`,
 		`${MODULE_NAME}.config.js`,
 		`${MODULE_NAME}.config.cjs`
-	] }).search(options.root);
+	] }).search(resolveRoot);
 	assert(result, "Config file not found");
 	const config = await result.config;
 	return config;
@@ -466,4 +479,4 @@ function getConfigExplorer(options) {
 }
 
 //#endregion
-export { createContext, createPluginContext, createPluginHooksDriver, defineConfig, flattenPlugins, isBuildFailure, isBuildSuccess, loadConfig, mergeBuildConfigs, mergeConfig, pluginConfigSchema, resolvePlugins };
+export { createContext, createPluginContext, createPluginHooksDriver, defineConfig, flattenPlugins, isBuildFailure, isBuildSuccess, loadConfig, mergeBuildConfigs, mergeConfig, pluginConfigSchema, resolveConfig, resolvePlugins };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@granite-js/plugin-core",
   "type": "module",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "The core plugin module for Granite",
   "scripts": {
     "prepack": "yarn build",
@@ -34,7 +34,7 @@
     "vitest": "^3.0.9"
   },
   "dependencies": {
-    "@granite-js/utils": "0.1.16",
+    "@granite-js/utils": "0.1.18",
     "@swc/core": "1.5.24",
     "@types/babel__core": "^7",
     "@types/connect": "^3",