@useavalon/avalon 0.1.10 → 0.1.12
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 +54 -54
- package/dist/mod.js +1 -0
- package/dist/src/build/integration-bundler-plugin.js +1 -0
- package/dist/src/build/integration-config.js +1 -0
- package/dist/src/build/integration-detection-plugin.js +1 -0
- package/dist/src/build/integration-resolver-plugin.js +1 -0
- package/dist/src/build/island-manifest.js +1 -0
- package/dist/src/build/island-types-generator.js +5 -0
- package/dist/src/build/mdx-island-transform.js +2 -0
- package/dist/src/build/mdx-plugin.js +1 -0
- package/dist/src/build/page-island-transform.js +3 -0
- package/dist/src/build/prop-extractors/index.js +1 -0
- package/dist/src/build/prop-extractors/lit.js +1 -0
- package/dist/src/build/prop-extractors/qwik.js +1 -0
- package/dist/src/build/prop-extractors/solid.js +1 -0
- package/dist/src/build/prop-extractors/svelte.js +1 -0
- package/dist/src/build/prop-extractors/vue.js +1 -0
- package/dist/src/build/sidecar-file-manager.js +1 -0
- package/dist/src/build/sidecar-renderer.js +6 -0
- package/dist/src/client/adapters/index.js +1 -0
- package/dist/src/client/components.js +1 -0
- package/dist/src/client/css-hmr-handler.js +1 -0
- package/dist/src/client/framework-adapter.js +13 -0
- package/dist/src/client/hmr-coordinator.js +1 -0
- package/dist/src/client/hmr-error-overlay.js +214 -0
- package/dist/src/client/main.js +39 -0
- package/{src → dist/src}/client/types/framework-runtime.d.ts +68 -68
- package/{src → dist/src}/client/types/vite-hmr.d.ts +46 -46
- package/dist/src/client/types/vite-virtual-modules.d.ts +70 -0
- package/dist/src/components/Image.js +1 -0
- package/dist/src/components/IslandErrorBoundary.js +1 -0
- package/dist/src/components/LayoutDataErrorBoundary.js +1 -0
- package/dist/src/components/LayoutErrorBoundary.js +1 -0
- package/dist/src/components/PersistentIsland.js +1 -0
- package/dist/src/components/StreamingErrorBoundary.js +1 -0
- package/dist/src/components/StreamingLayout.js +29 -0
- package/dist/src/core/components/component-analyzer.js +1 -0
- package/dist/src/core/components/component-detection.js +5 -0
- package/dist/src/core/components/enhanced-framework-detector.js +1 -0
- package/dist/src/core/components/framework-registry.js +1 -0
- package/dist/src/core/content/mdx-processor.js +1 -0
- package/dist/src/core/integrations/index.js +1 -0
- package/dist/src/core/integrations/loader.js +1 -0
- package/dist/src/core/integrations/registry.js +1 -0
- package/dist/src/core/islands/island-persistence.js +1 -0
- package/dist/src/core/islands/island-state-serializer.js +1 -0
- package/dist/src/core/islands/persistent-island-context.js +1 -0
- package/dist/src/core/islands/use-persistent-state.js +1 -0
- package/dist/src/core/layout/enhanced-layout-resolver.js +1 -0
- package/dist/src/core/layout/layout-cache-manager.js +1 -0
- package/dist/src/core/layout/layout-composer.js +1 -0
- package/dist/src/core/layout/layout-data-loader.js +1 -0
- package/dist/src/core/layout/layout-discovery.js +1 -0
- package/dist/src/core/layout/layout-matcher.js +1 -0
- package/dist/src/core/layout/layout-types.js +1 -0
- package/dist/src/core/modules/framework-module-resolver.js +1 -0
- package/dist/src/islands/component-analysis.js +1 -0
- package/dist/src/islands/css-utils.js +17 -0
- package/dist/src/islands/discovery/index.js +1 -0
- package/dist/src/islands/discovery/registry.js +1 -0
- package/dist/src/islands/discovery/resolver.js +2 -0
- package/dist/src/islands/discovery/scanner.js +1 -0
- package/dist/src/islands/discovery/types.js +1 -0
- package/dist/src/islands/discovery/validator.js +18 -0
- package/dist/src/islands/discovery/watcher.js +1 -0
- package/dist/src/islands/framework-detection.js +1 -0
- package/dist/src/islands/integration-loader.js +1 -0
- package/dist/src/islands/island.js +1 -0
- package/dist/src/islands/render-cache.js +1 -0
- package/dist/src/islands/types.js +1 -0
- package/dist/src/islands/universal-css-collector.js +5 -0
- package/dist/src/islands/universal-head-collector.js +2 -0
- package/{src → dist/src}/layout-system.d.ts +592 -592
- package/dist/src/layout-system.js +1 -0
- package/dist/src/middleware/discovery.js +1 -0
- package/dist/src/middleware/executor.js +1 -0
- package/dist/src/middleware/index.js +1 -0
- package/dist/src/middleware/types.js +1 -0
- package/dist/src/nitro/build-config.js +1 -0
- package/dist/src/nitro/config.js +1 -0
- package/dist/src/nitro/error-handler.js +198 -0
- package/dist/src/nitro/index.js +1 -0
- package/dist/src/nitro/island-manifest.js +2 -0
- package/dist/src/nitro/middleware-adapter.js +1 -0
- package/dist/src/nitro/renderer.js +183 -0
- package/dist/src/nitro/route-discovery.js +1 -0
- package/dist/src/nitro/types.js +1 -0
- package/dist/src/render/collect-css.js +3 -0
- package/{src/render/error-pages.ts → dist/src/render/error-pages.js} +7 -38
- package/dist/src/render/isolated-ssr-renderer.js +1 -0
- package/dist/src/render/ssr.js +90 -0
- package/dist/src/schemas/api.js +1 -0
- package/dist/src/schemas/core.js +1 -0
- package/dist/src/schemas/index.js +1 -0
- package/dist/src/schemas/layout.js +1 -0
- package/dist/src/schemas/routing/index.js +1 -0
- package/dist/src/schemas/routing.js +1 -0
- package/dist/src/types/as-island.js +1 -0
- package/{src → dist/src}/types/image.d.ts +106 -106
- package/{src → dist/src}/types/index.d.ts +22 -22
- package/{src → dist/src}/types/island-jsx.d.ts +33 -33
- package/{src → dist/src}/types/island-prop.d.ts +20 -20
- package/dist/src/types/layout.js +1 -0
- package/{src → dist/src}/types/mdx.d.ts +6 -6
- package/dist/src/types/routing.js +1 -0
- package/dist/src/types/types.js +1 -0
- package/{src → dist/src}/types/urlpattern.d.ts +49 -49
- package/{src → dist/src}/types/vite-env.d.ts +11 -11
- package/dist/src/utils/dev-logger.js +12 -0
- package/dist/src/utils/fs.js +1 -0
- package/dist/src/vite-plugin/auto-discover.js +1 -0
- package/dist/src/vite-plugin/config.js +1 -0
- package/dist/src/vite-plugin/errors.js +1 -0
- package/dist/src/vite-plugin/image-optimization.js +45 -0
- package/dist/src/vite-plugin/integration-activator.js +1 -0
- package/dist/src/vite-plugin/island-sidecar-plugin.js +1 -0
- package/dist/src/vite-plugin/module-discovery.js +1 -0
- package/dist/src/vite-plugin/nitro-integration.js +42 -0
- package/dist/src/vite-plugin/plugin.js +1 -0
- package/dist/src/vite-plugin/types.js +1 -0
- package/dist/src/vite-plugin/validation.js +2 -0
- package/package.json +57 -26
- package/mod.ts +0 -302
- package/src/build/integration-bundler-plugin.ts +0 -116
- package/src/build/integration-config.ts +0 -168
- package/src/build/integration-detection-plugin.ts +0 -117
- package/src/build/integration-resolver-plugin.ts +0 -90
- package/src/build/island-manifest.ts +0 -269
- package/src/build/island-types-generator.ts +0 -476
- package/src/build/mdx-island-transform.ts +0 -464
- package/src/build/mdx-plugin.ts +0 -98
- package/src/build/page-island-transform.ts +0 -598
- package/src/build/prop-extractors/index.ts +0 -21
- package/src/build/prop-extractors/lit.ts +0 -140
- package/src/build/prop-extractors/qwik.ts +0 -16
- package/src/build/prop-extractors/solid.ts +0 -125
- package/src/build/prop-extractors/svelte.ts +0 -194
- package/src/build/prop-extractors/vue.ts +0 -111
- package/src/build/sidecar-file-manager.ts +0 -104
- package/src/build/sidecar-renderer.ts +0 -30
- package/src/client/adapters/index.js +0 -12
- package/src/client/adapters/index.ts +0 -13
- package/src/client/adapters/lit-adapter.js +0 -467
- package/src/client/adapters/lit-adapter.ts +0 -654
- package/src/client/adapters/preact-adapter.js +0 -223
- package/src/client/adapters/preact-adapter.ts +0 -331
- package/src/client/adapters/qwik-adapter.js +0 -259
- package/src/client/adapters/qwik-adapter.ts +0 -345
- package/src/client/adapters/react-adapter.js +0 -220
- package/src/client/adapters/react-adapter.ts +0 -353
- package/src/client/adapters/solid-adapter.js +0 -295
- package/src/client/adapters/solid-adapter.ts +0 -451
- package/src/client/adapters/svelte-adapter.js +0 -368
- package/src/client/adapters/svelte-adapter.ts +0 -524
- package/src/client/adapters/vue-adapter.js +0 -278
- package/src/client/adapters/vue-adapter.ts +0 -467
- package/src/client/components.js +0 -23
- package/src/client/components.ts +0 -35
- package/src/client/css-hmr-handler.js +0 -263
- package/src/client/css-hmr-handler.ts +0 -344
- package/src/client/framework-adapter.js +0 -283
- package/src/client/framework-adapter.ts +0 -462
- package/src/client/hmr-coordinator.js +0 -274
- package/src/client/hmr-coordinator.ts +0 -396
- package/src/client/hmr-error-overlay.js +0 -533
- package/src/client/main.js +0 -816
- package/src/client/types/vite-virtual-modules.d.ts +0 -60
- package/src/components/Image.tsx +0 -123
- package/src/components/IslandErrorBoundary.tsx +0 -145
- package/src/components/LayoutDataErrorBoundary.tsx +0 -141
- package/src/components/LayoutErrorBoundary.tsx +0 -127
- package/src/components/PersistentIsland.tsx +0 -52
- package/src/components/StreamingErrorBoundary.tsx +0 -233
- package/src/components/StreamingLayout.tsx +0 -538
- package/src/core/components/component-analyzer.ts +0 -192
- package/src/core/components/component-detection.ts +0 -508
- package/src/core/components/enhanced-framework-detector.ts +0 -500
- package/src/core/components/framework-registry.ts +0 -563
- package/src/core/content/mdx-processor.ts +0 -46
- package/src/core/integrations/index.ts +0 -19
- package/src/core/integrations/loader.ts +0 -125
- package/src/core/integrations/registry.ts +0 -175
- package/src/core/islands/island-persistence.ts +0 -325
- package/src/core/islands/island-state-serializer.ts +0 -258
- package/src/core/islands/persistent-island-context.tsx +0 -80
- package/src/core/islands/use-persistent-state.ts +0 -68
- package/src/core/layout/enhanced-layout-resolver.ts +0 -322
- package/src/core/layout/layout-cache-manager.ts +0 -485
- package/src/core/layout/layout-composer.ts +0 -357
- package/src/core/layout/layout-data-loader.ts +0 -516
- package/src/core/layout/layout-discovery.ts +0 -243
- package/src/core/layout/layout-matcher.ts +0 -299
- package/src/core/layout/layout-types.ts +0 -110
- package/src/core/modules/framework-module-resolver.ts +0 -273
- package/src/islands/component-analysis.ts +0 -213
- package/src/islands/css-utils.ts +0 -565
- package/src/islands/discovery/index.ts +0 -80
- package/src/islands/discovery/registry.ts +0 -340
- package/src/islands/discovery/resolver.ts +0 -477
- package/src/islands/discovery/scanner.ts +0 -386
- package/src/islands/discovery/types.ts +0 -117
- package/src/islands/discovery/validator.ts +0 -544
- package/src/islands/discovery/watcher.ts +0 -368
- package/src/islands/framework-detection.ts +0 -428
- package/src/islands/integration-loader.ts +0 -490
- package/src/islands/island.tsx +0 -565
- package/src/islands/render-cache.ts +0 -550
- package/src/islands/types.ts +0 -80
- package/src/islands/universal-css-collector.ts +0 -157
- package/src/islands/universal-head-collector.ts +0 -137
- package/src/layout-system.ts +0 -218
- package/src/middleware/discovery.ts +0 -268
- package/src/middleware/executor.ts +0 -315
- package/src/middleware/index.ts +0 -76
- package/src/middleware/types.ts +0 -99
- package/src/nitro/build-config.ts +0 -576
- package/src/nitro/config.ts +0 -483
- package/src/nitro/error-handler.ts +0 -636
- package/src/nitro/index.ts +0 -173
- package/src/nitro/island-manifest.ts +0 -584
- package/src/nitro/middleware-adapter.ts +0 -260
- package/src/nitro/renderer.ts +0 -1471
- package/src/nitro/route-discovery.ts +0 -439
- package/src/nitro/types.ts +0 -321
- package/src/render/collect-css.ts +0 -198
- package/src/render/isolated-ssr-renderer.ts +0 -654
- package/src/render/ssr.ts +0 -1030
- package/src/schemas/api.ts +0 -30
- package/src/schemas/core.ts +0 -64
- package/src/schemas/index.ts +0 -212
- package/src/schemas/layout.ts +0 -279
- package/src/schemas/routing/index.ts +0 -38
- package/src/schemas/routing.ts +0 -376
- package/src/types/as-island.ts +0 -20
- package/src/types/layout.ts +0 -285
- package/src/types/routing.ts +0 -555
- package/src/types/types.ts +0 -5
- package/src/utils/dev-logger.ts +0 -299
- package/src/utils/fs.ts +0 -151
- package/src/vite-plugin/auto-discover.ts +0 -551
- package/src/vite-plugin/config.ts +0 -266
- package/src/vite-plugin/errors.ts +0 -127
- package/src/vite-plugin/image-optimization.ts +0 -156
- package/src/vite-plugin/integration-activator.ts +0 -126
- package/src/vite-plugin/island-sidecar-plugin.ts +0 -176
- package/src/vite-plugin/module-discovery.ts +0 -189
- package/src/vite-plugin/nitro-integration.ts +0 -1354
- package/src/vite-plugin/plugin.ts +0 -401
- package/src/vite-plugin/types.ts +0 -327
- package/src/vite-plugin/validation.ts +0 -228
|
@@ -1,357 +0,0 @@
|
|
|
1
|
-
import { resolve, relative } from 'node:path';
|
|
2
|
-
import { statSync } from 'node:fs';
|
|
3
|
-
import process from 'node:process';
|
|
4
|
-
import { LayoutDiscovery } from './layout-discovery.ts';
|
|
5
|
-
import type {
|
|
6
|
-
ComponentType,
|
|
7
|
-
LayoutHandler,
|
|
8
|
-
LayoutConfig,
|
|
9
|
-
LayoutContext,
|
|
10
|
-
LayoutData,
|
|
11
|
-
LayoutDiscoveryOptions,
|
|
12
|
-
LayoutProps,
|
|
13
|
-
PageModule,
|
|
14
|
-
} from './layout-types.ts';
|
|
15
|
-
|
|
16
|
-
interface LayoutFileExport {
|
|
17
|
-
default: ComponentType<LayoutProps>;
|
|
18
|
-
layoutLoader?: (ctx: LayoutContext) => Promise<LayoutData>;
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
/**
|
|
22
|
-
* Converts an absolute file path to a valid ESM import specifier.
|
|
23
|
-
* Windows absolute paths (C:\...) are converted to file:// URLs.
|
|
24
|
-
*/
|
|
25
|
-
function toImportSpecifier(filePath: string): string {
|
|
26
|
-
if (/^[A-Za-z]:[\\/]/.test(filePath)) {
|
|
27
|
-
return `file:///${filePath.replaceAll('\\', '/')}`;
|
|
28
|
-
}
|
|
29
|
-
return filePath;
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
/**
|
|
33
|
-
* Checks whether a file exists at the given path using statSync.
|
|
34
|
-
*/
|
|
35
|
-
function fileExists(path: string): boolean {
|
|
36
|
-
try {
|
|
37
|
-
statSync(path);
|
|
38
|
-
return true;
|
|
39
|
-
} catch {
|
|
40
|
-
return false;
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
/**
|
|
45
|
-
* Converts a glob-style pattern (with *) to a RegExp.
|
|
46
|
-
*/
|
|
47
|
-
function globToRegex(pattern: string): RegExp {
|
|
48
|
-
return new RegExp(pattern.replaceAll('*', '.*'));
|
|
49
|
-
}
|
|
50
|
-
|
|
51
|
-
/**
|
|
52
|
-
* Layout composition control system that handles page-level layout customization.
|
|
53
|
-
* Provides support for skipLayouts, replaceLayout, onlyLayouts, and customLayout configurations.
|
|
54
|
-
*
|
|
55
|
-
* Requirements: 5.1, 5.2, 5.3, 5.4, 5.5
|
|
56
|
-
*/
|
|
57
|
-
export class LayoutComposer {
|
|
58
|
-
private readonly layoutDiscovery: LayoutDiscovery;
|
|
59
|
-
private readonly customLayoutCache = new Map<string, LayoutHandler>();
|
|
60
|
-
private developmentMode: boolean;
|
|
61
|
-
|
|
62
|
-
constructor(options: LayoutDiscoveryOptions) {
|
|
63
|
-
this.layoutDiscovery = new LayoutDiscovery(options);
|
|
64
|
-
this.developmentMode = options.developmentMode || false;
|
|
65
|
-
}
|
|
66
|
-
|
|
67
|
-
/**
|
|
68
|
-
* Resolves layouts for a route with page-level configuration applied
|
|
69
|
-
* Requirements: 5.1, 5.2, 5.3, 5.4, 5.5
|
|
70
|
-
*/
|
|
71
|
-
async resolveLayouts(routePath: string, pageModule: PageModule): Promise<LayoutHandler[]> {
|
|
72
|
-
try {
|
|
73
|
-
const layoutConfig = pageModule.layoutConfig;
|
|
74
|
-
|
|
75
|
-
if (!layoutConfig) {
|
|
76
|
-
return await this.layoutDiscovery.buildLayoutChain(new URL(`http://localhost${routePath}`));
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
if (layoutConfig.replaceLayout) {
|
|
80
|
-
if (this.developmentMode) {
|
|
81
|
-
console.log(`[LayoutComposer] Replacing all layouts for route: ${routePath}`);
|
|
82
|
-
}
|
|
83
|
-
return await this.handleReplaceLayout(routePath, layoutConfig);
|
|
84
|
-
}
|
|
85
|
-
|
|
86
|
-
const standardLayouts = await this.layoutDiscovery.buildLayoutChain(new URL(`http://localhost${routePath}`));
|
|
87
|
-
return await this.applyConfiguration(standardLayouts, layoutConfig);
|
|
88
|
-
} catch (error) {
|
|
89
|
-
if (this.developmentMode) {
|
|
90
|
-
console.warn(
|
|
91
|
-
`[LayoutComposer] Error resolving layouts for ${routePath}: ${
|
|
92
|
-
error instanceof Error ? error.message : String(error)
|
|
93
|
-
}`,
|
|
94
|
-
);
|
|
95
|
-
}
|
|
96
|
-
return await this.layoutDiscovery.buildLayoutChain(new URL(`http://localhost${routePath}`));
|
|
97
|
-
}
|
|
98
|
-
}
|
|
99
|
-
|
|
100
|
-
/**
|
|
101
|
-
* Applies layout configuration to a layout chain
|
|
102
|
-
* Requirements: 5.2, 5.3, 5.4, 5.5
|
|
103
|
-
*/
|
|
104
|
-
async applyConfiguration(layouts: LayoutHandler[], config: LayoutConfig): Promise<LayoutHandler[]> {
|
|
105
|
-
let resultLayouts = [...layouts];
|
|
106
|
-
|
|
107
|
-
if (config.onlyLayouts && config.onlyLayouts.length > 0) {
|
|
108
|
-
resultLayouts = await this.applyOnlyLayouts(resultLayouts, config.onlyLayouts);
|
|
109
|
-
}
|
|
110
|
-
|
|
111
|
-
if (config.skipLayouts && config.skipLayouts.length > 0) {
|
|
112
|
-
resultLayouts = this.applySkipLayouts(resultLayouts, config.skipLayouts);
|
|
113
|
-
}
|
|
114
|
-
|
|
115
|
-
if (config.customLayout) {
|
|
116
|
-
resultLayouts = await this.addCustomLayout(resultLayouts, config.customLayout);
|
|
117
|
-
}
|
|
118
|
-
|
|
119
|
-
return resultLayouts;
|
|
120
|
-
}
|
|
121
|
-
|
|
122
|
-
/** Handles replaceLayout: returns only custom layout or empty array */
|
|
123
|
-
private async handleReplaceLayout(_routePath: string, config: LayoutConfig): Promise<LayoutHandler[]> {
|
|
124
|
-
if (config.customLayout) {
|
|
125
|
-
const customHandler = await this.loadCustomLayout(config.customLayout);
|
|
126
|
-
return customHandler ? [customHandler] : [];
|
|
127
|
-
}
|
|
128
|
-
return [];
|
|
129
|
-
}
|
|
130
|
-
|
|
131
|
-
/** Checks if a layout matches a glob or exact path pattern */
|
|
132
|
-
private matchesLayoutPattern(layout: LayoutHandler, pattern: string): boolean {
|
|
133
|
-
if (pattern.includes('*')) {
|
|
134
|
-
const regex = globToRegex(pattern);
|
|
135
|
-
return regex.test(layout.path) || regex.test(relative(process.cwd(), layout.path));
|
|
136
|
-
}
|
|
137
|
-
return (
|
|
138
|
-
layout.path === pattern ||
|
|
139
|
-
layout.path.endsWith(pattern) ||
|
|
140
|
-
relative(process.cwd(), layout.path) === pattern ||
|
|
141
|
-
relative(process.cwd(), layout.path).endsWith(pattern)
|
|
142
|
-
);
|
|
143
|
-
}
|
|
144
|
-
|
|
145
|
-
/** Removes layouts matching skipLayouts patterns */
|
|
146
|
-
private applySkipLayouts(layouts: LayoutHandler[], skipLayouts: string[]): LayoutHandler[] {
|
|
147
|
-
return layouts.filter(layout => {
|
|
148
|
-
const shouldSkip = skipLayouts.some(pattern => this.matchesLayoutPattern(layout, pattern));
|
|
149
|
-
|
|
150
|
-
if (shouldSkip && this.developmentMode) {
|
|
151
|
-
console.log(`[LayoutComposer] Skipping layout: ${relative(process.cwd(), layout.path)}`);
|
|
152
|
-
}
|
|
153
|
-
|
|
154
|
-
return !shouldSkip;
|
|
155
|
-
});
|
|
156
|
-
}
|
|
157
|
-
|
|
158
|
-
/** Keeps only layouts matching onlyLayouts patterns */
|
|
159
|
-
private async applyOnlyLayouts(layouts: LayoutHandler[], onlyLayouts: string[]): Promise<LayoutHandler[]> {
|
|
160
|
-
const filteredLayouts: LayoutHandler[] = [];
|
|
161
|
-
|
|
162
|
-
for (const onlyPattern of onlyLayouts) {
|
|
163
|
-
const matchingLayouts = layouts.filter(layout => this.matchesLayoutPattern(layout, onlyPattern));
|
|
164
|
-
|
|
165
|
-
if (matchingLayouts.length > 0) {
|
|
166
|
-
filteredLayouts.push(...matchingLayouts);
|
|
167
|
-
if (this.developmentMode) {
|
|
168
|
-
console.log(
|
|
169
|
-
`[LayoutComposer] Kept layouts from onlyLayouts: ${matchingLayouts
|
|
170
|
-
.map(l => relative(process.cwd(), l.path))
|
|
171
|
-
.join(', ')}`,
|
|
172
|
-
);
|
|
173
|
-
}
|
|
174
|
-
} else {
|
|
175
|
-
// Not in standard chain — try loading as custom layout
|
|
176
|
-
const customHandler = await this.loadCustomLayout(onlyPattern);
|
|
177
|
-
if (customHandler) {
|
|
178
|
-
filteredLayouts.push(customHandler);
|
|
179
|
-
if (this.developmentMode) {
|
|
180
|
-
console.log(`[LayoutComposer] Added custom layout from onlyLayouts: ${onlyPattern}`);
|
|
181
|
-
}
|
|
182
|
-
}
|
|
183
|
-
}
|
|
184
|
-
}
|
|
185
|
-
|
|
186
|
-
filteredLayouts.sort((a, b) => a.priority - b.priority);
|
|
187
|
-
return filteredLayouts;
|
|
188
|
-
}
|
|
189
|
-
|
|
190
|
-
/** Adds a custom layout to the layout chain */
|
|
191
|
-
private async addCustomLayout(layouts: LayoutHandler[], customLayoutPath: string): Promise<LayoutHandler[]> {
|
|
192
|
-
try {
|
|
193
|
-
const customHandler = await this.loadCustomLayout(customLayoutPath);
|
|
194
|
-
if (!customHandler) {
|
|
195
|
-
if (this.developmentMode) {
|
|
196
|
-
console.warn(`[LayoutComposer] Failed to load custom layout: ${customLayoutPath}`);
|
|
197
|
-
}
|
|
198
|
-
return layouts;
|
|
199
|
-
}
|
|
200
|
-
|
|
201
|
-
const customLayoutWithPriority: LayoutHandler = {
|
|
202
|
-
...customHandler,
|
|
203
|
-
priority: Math.max(...layouts.map(l => l.priority), 0) + 10,
|
|
204
|
-
};
|
|
205
|
-
|
|
206
|
-
const resultLayouts = [...layouts, customLayoutWithPriority];
|
|
207
|
-
resultLayouts.sort((a, b) => a.priority - b.priority);
|
|
208
|
-
|
|
209
|
-
if (this.developmentMode) {
|
|
210
|
-
console.log(`[LayoutComposer] Added custom layout: ${relative(process.cwd(), customLayoutPath)}`);
|
|
211
|
-
}
|
|
212
|
-
|
|
213
|
-
return resultLayouts;
|
|
214
|
-
} catch (error) {
|
|
215
|
-
if (this.developmentMode) {
|
|
216
|
-
console.warn(
|
|
217
|
-
`[LayoutComposer] Error adding custom layout ${customLayoutPath}: ${
|
|
218
|
-
error instanceof Error ? error.message : String(error)
|
|
219
|
-
}`,
|
|
220
|
-
);
|
|
221
|
-
}
|
|
222
|
-
return layouts;
|
|
223
|
-
}
|
|
224
|
-
}
|
|
225
|
-
|
|
226
|
-
/**
|
|
227
|
-
* Resolves a layout path to an absolute path, trying multiple resolution strategies.
|
|
228
|
-
*/
|
|
229
|
-
private resolveLayoutPath(layoutPath: string): string {
|
|
230
|
-
if (layoutPath.startsWith('/') || layoutPath.startsWith('file://') || /^[A-Za-z]:[\\/]/.test(layoutPath)) {
|
|
231
|
-
return layoutPath;
|
|
232
|
-
}
|
|
233
|
-
|
|
234
|
-
const baseDir = this.layoutDiscovery.getOptions().baseDirectory;
|
|
235
|
-
const candidates = [
|
|
236
|
-
resolve(layoutPath),
|
|
237
|
-
resolve('src', layoutPath),
|
|
238
|
-
resolve('src/pages', layoutPath),
|
|
239
|
-
resolve('src/layouts', layoutPath),
|
|
240
|
-
resolve(baseDir, '..', layoutPath),
|
|
241
|
-
resolve(baseDir, layoutPath),
|
|
242
|
-
];
|
|
243
|
-
|
|
244
|
-
return candidates.find(p => fileExists(p)) || layoutPath;
|
|
245
|
-
}
|
|
246
|
-
|
|
247
|
-
/** Loads a custom layout from a file path */
|
|
248
|
-
private async loadCustomLayout(layoutPath: string): Promise<LayoutHandler | null> {
|
|
249
|
-
if (this.customLayoutCache.has(layoutPath)) {
|
|
250
|
-
return this.customLayoutCache.get(layoutPath)!;
|
|
251
|
-
}
|
|
252
|
-
|
|
253
|
-
try {
|
|
254
|
-
const resolvedPath = this.resolveLayoutPath(layoutPath);
|
|
255
|
-
|
|
256
|
-
if (!fileExists(resolvedPath)) {
|
|
257
|
-
if (this.developmentMode) {
|
|
258
|
-
console.warn(`[LayoutComposer] Custom layout file not found: ${resolvedPath}`);
|
|
259
|
-
}
|
|
260
|
-
return null;
|
|
261
|
-
}
|
|
262
|
-
|
|
263
|
-
const importPath = toImportSpecifier(resolvedPath);
|
|
264
|
-
const layoutModule = (await import(/* @vite-ignore */ importPath)) as LayoutFileExport;
|
|
265
|
-
|
|
266
|
-
if (!layoutModule.default || typeof layoutModule.default !== 'function') {
|
|
267
|
-
if (this.developmentMode) {
|
|
268
|
-
console.warn(`[LayoutComposer] Custom layout file does not export a default component: ${resolvedPath}`);
|
|
269
|
-
}
|
|
270
|
-
return null;
|
|
271
|
-
}
|
|
272
|
-
|
|
273
|
-
const handler: LayoutHandler = {
|
|
274
|
-
component: layoutModule.default,
|
|
275
|
-
loader: layoutModule.layoutLoader,
|
|
276
|
-
path: resolvedPath,
|
|
277
|
-
priority: 1000,
|
|
278
|
-
};
|
|
279
|
-
|
|
280
|
-
this.customLayoutCache.set(layoutPath, handler);
|
|
281
|
-
return handler;
|
|
282
|
-
} catch (error) {
|
|
283
|
-
if (this.developmentMode) {
|
|
284
|
-
console.warn(
|
|
285
|
-
`[LayoutComposer] Failed to load custom layout ${layoutPath}: ${
|
|
286
|
-
error instanceof Error ? error.message : String(error)
|
|
287
|
-
}`,
|
|
288
|
-
);
|
|
289
|
-
}
|
|
290
|
-
return null;
|
|
291
|
-
}
|
|
292
|
-
}
|
|
293
|
-
|
|
294
|
-
/** Validates layout configuration */
|
|
295
|
-
validateLayoutConfig(config: LayoutConfig): { valid: boolean; errors: string[] } {
|
|
296
|
-
const errors: string[] = [];
|
|
297
|
-
|
|
298
|
-
if (config.replaceLayout && config.onlyLayouts && config.onlyLayouts.length > 0) {
|
|
299
|
-
errors.push('replaceLayout and onlyLayouts cannot be used together');
|
|
300
|
-
}
|
|
301
|
-
|
|
302
|
-
if (config.replaceLayout && config.skipLayouts && config.skipLayouts.length > 0) {
|
|
303
|
-
errors.push('replaceLayout and skipLayouts cannot be used together');
|
|
304
|
-
}
|
|
305
|
-
|
|
306
|
-
if (config.skipLayouts && !Array.isArray(config.skipLayouts)) {
|
|
307
|
-
errors.push('skipLayouts must be an array of strings');
|
|
308
|
-
}
|
|
309
|
-
|
|
310
|
-
if (config.onlyLayouts && !Array.isArray(config.onlyLayouts)) {
|
|
311
|
-
errors.push('onlyLayouts must be an array of strings');
|
|
312
|
-
}
|
|
313
|
-
|
|
314
|
-
if (config.customLayout && typeof config.customLayout !== 'string') {
|
|
315
|
-
errors.push('customLayout must be a string path');
|
|
316
|
-
}
|
|
317
|
-
|
|
318
|
-
return { valid: errors.length === 0, errors };
|
|
319
|
-
}
|
|
320
|
-
|
|
321
|
-
/** Gets composition statistics for debugging */
|
|
322
|
-
getCompositionStats(): {
|
|
323
|
-
customLayoutCacheSize: number;
|
|
324
|
-
discoveryStats: { layoutCount: number; routeCacheCount: number };
|
|
325
|
-
} {
|
|
326
|
-
return {
|
|
327
|
-
customLayoutCacheSize: this.customLayoutCache.size,
|
|
328
|
-
discoveryStats: this.layoutDiscovery.getCacheStats(),
|
|
329
|
-
};
|
|
330
|
-
}
|
|
331
|
-
|
|
332
|
-
/** Clears all caches */
|
|
333
|
-
clearCache(): void {
|
|
334
|
-
this.customLayoutCache.clear();
|
|
335
|
-
this.layoutDiscovery.clearCache();
|
|
336
|
-
}
|
|
337
|
-
|
|
338
|
-
/** Clears custom layout cache */
|
|
339
|
-
clearCustomLayoutCache(): void {
|
|
340
|
-
this.customLayoutCache.clear();
|
|
341
|
-
}
|
|
342
|
-
|
|
343
|
-
/** Gets the underlying layout discovery instance */
|
|
344
|
-
getLayoutDiscovery(): LayoutDiscovery {
|
|
345
|
-
return this.layoutDiscovery;
|
|
346
|
-
}
|
|
347
|
-
|
|
348
|
-
/** Sets development mode */
|
|
349
|
-
setDevelopmentMode(enabled: boolean): void {
|
|
350
|
-
this.developmentMode = enabled;
|
|
351
|
-
}
|
|
352
|
-
|
|
353
|
-
/** Gets development mode status */
|
|
354
|
-
isDevelopmentMode(): boolean {
|
|
355
|
-
return this.developmentMode;
|
|
356
|
-
}
|
|
357
|
-
}
|