@analogjs/platform 2.8.0-beta.9 → 2.8.0
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/AGENTS.md +5 -3
- package/package.json +3 -3
- package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.d.ts +5 -5
- package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.js +5 -5
- package/src/lib/nx-plugin/src/generators/app/versions/nx_18_X/versions.js.map +1 -1
- package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.d.ts +5 -5
- package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.js +5 -5
- package/src/lib/nx-plugin/src/utils/versions/ng_19_X/versions.js.map +1 -1
- package/src/lib/route-file-discovery.d.ts +3 -1
- package/src/lib/route-file-discovery.js +6 -2
- package/src/lib/route-manifest.d.ts +15 -1
- package/src/lib/route-manifest.js +59 -3
- package/src/lib/ssr/defer-streaming-plugin.d.ts +3 -35
- package/src/lib/ssr/defer-streaming-plugin.js +91 -74
- package/src/lib/typed-routes-plugin.js +50 -2
package/AGENTS.md
CHANGED
|
@@ -30,16 +30,18 @@ Routes are file-based. A file in `src/app/pages/` ending in `.page.ts` becomes a
|
|
|
30
30
|
|
|
31
31
|
Read route params with `inject(ActivatedRoute)` from `@angular/router`.
|
|
32
32
|
|
|
33
|
-
Define per-route metadata (title, meta tags, guards, resolvers) by exporting a `RouteMeta`:
|
|
33
|
+
Define per-route metadata (title, meta tags, guards, resolvers) by exporting a `routeMeta` that satisfies `RouteMeta`:
|
|
34
34
|
|
|
35
35
|
```ts
|
|
36
36
|
import { RouteMeta } from '@analogjs/router';
|
|
37
37
|
|
|
38
|
-
export const routeMeta
|
|
38
|
+
export const routeMeta = {
|
|
39
39
|
title: 'Products',
|
|
40
|
-
};
|
|
40
|
+
} satisfies RouteMeta;
|
|
41
41
|
```
|
|
42
42
|
|
|
43
|
+
Prefer `satisfies` over a `RouteMeta` annotation, which widens `data` and `resolve` types.
|
|
44
|
+
|
|
43
45
|
## Server & API routes
|
|
44
46
|
|
|
45
47
|
Server routes live in `src/server/routes/` and use [h3](https://h3.dev). API routes are conventionally under `src/server/routes/api/`.
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@analogjs/platform",
|
|
3
|
-
"version": "2.8.0
|
|
3
|
+
"version": "2.8.0",
|
|
4
4
|
"description": "The fullstack meta-framework for Angular",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"author": "Brandon Roberts <robertsbt@gmail.com>",
|
|
@@ -29,8 +29,8 @@
|
|
|
29
29
|
},
|
|
30
30
|
"dependencies": {
|
|
31
31
|
"nitropack": "^2.13.1",
|
|
32
|
-
"@analogjs/vite-plugin-angular": "^2.8.0
|
|
33
|
-
"@analogjs/vite-plugin-nitro": "^2.8.0
|
|
32
|
+
"@analogjs/vite-plugin-angular": "^2.8.0",
|
|
33
|
+
"@analogjs/vite-plugin-nitro": "^2.8.0",
|
|
34
34
|
"oxc-parser": "^0.121.0",
|
|
35
35
|
"vitefu": "^1.1.2"
|
|
36
36
|
},
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
export declare const V18_X_NX_DEVKIT = "^20.0.0";
|
|
2
2
|
export declare const V18_X_NX_ANGULAR = "^20.0.0";
|
|
3
|
-
export declare const V18_X_ANALOG_JS_CONTENT = "^2.8.0
|
|
4
|
-
export declare const V18_X_ANALOG_JS_ROUTER = "^2.8.0
|
|
3
|
+
export declare const V18_X_ANALOG_JS_CONTENT = "^2.8.0";
|
|
4
|
+
export declare const V18_X_ANALOG_JS_ROUTER = "^2.8.0";
|
|
5
5
|
export declare const V18_X_ANALOG_JS_TRPC = "~0.4.0";
|
|
6
|
-
export declare const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.8.0
|
|
7
|
-
export declare const V18_X_ANALOG_JS_VITEST_ANGULAR = "^2.8.0
|
|
6
|
+
export declare const V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.8.0";
|
|
7
|
+
export declare const V18_X_ANALOG_JS_VITEST_ANGULAR = "^2.8.0";
|
|
8
8
|
export declare const V18_X_TRPC_CLIENT = "^10.25.0";
|
|
9
9
|
export declare const V18_X_TRPC_SERVER = "^10.25.0";
|
|
10
10
|
export declare const V18_X_ISOMORPHIC_FETCH = "^3.0.0";
|
|
@@ -20,7 +20,7 @@ export declare const V18_X_TAILWINDCSS = "^4.1.4";
|
|
|
20
20
|
export declare const V18_X_TAILWINDCSS_VITE = "^4.1.4";
|
|
21
21
|
export declare const V18_X_POSTCSS = "^8.5.3";
|
|
22
22
|
export declare const V18_X_AUTOPREFIXER = "^10.4.0";
|
|
23
|
-
export declare const V18_X_ANALOG_JS_PLATFORM = "^2.8.0
|
|
23
|
+
export declare const V18_X_ANALOG_JS_PLATFORM = "^2.8.0";
|
|
24
24
|
export declare const V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = "^19.0.0";
|
|
25
25
|
export declare const V18_X_NX_VITE = "^21.0.0";
|
|
26
26
|
export declare const V18_X_NX_LINTER = "^21.0.0";
|
|
@@ -5,11 +5,11 @@ exports.V18_X_ZOD = exports.V18_X_VITEST = exports.V18_X_VITE_TSCONFIG_PATHS = e
|
|
|
5
5
|
// dependencies
|
|
6
6
|
exports.V18_X_NX_DEVKIT = '^20.0.0';
|
|
7
7
|
exports.V18_X_NX_ANGULAR = '^20.0.0';
|
|
8
|
-
exports.V18_X_ANALOG_JS_CONTENT = '^2.8.0
|
|
9
|
-
exports.V18_X_ANALOG_JS_ROUTER = '^2.8.0
|
|
8
|
+
exports.V18_X_ANALOG_JS_CONTENT = '^2.8.0';
|
|
9
|
+
exports.V18_X_ANALOG_JS_ROUTER = '^2.8.0';
|
|
10
10
|
exports.V18_X_ANALOG_JS_TRPC = '~0.4.0';
|
|
11
|
-
exports.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.8.0
|
|
12
|
-
exports.V18_X_ANALOG_JS_VITEST_ANGULAR = '^2.8.0
|
|
11
|
+
exports.V18_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.8.0';
|
|
12
|
+
exports.V18_X_ANALOG_JS_VITEST_ANGULAR = '^2.8.0';
|
|
13
13
|
exports.V18_X_TRPC_CLIENT = '^10.25.0';
|
|
14
14
|
exports.V18_X_TRPC_SERVER = '^10.25.0';
|
|
15
15
|
exports.V18_X_ISOMORPHIC_FETCH = '^3.0.0';
|
|
@@ -26,7 +26,7 @@ exports.V18_X_TAILWINDCSS_VITE = '^4.1.4';
|
|
|
26
26
|
exports.V18_X_POSTCSS = '^8.5.3';
|
|
27
27
|
exports.V18_X_AUTOPREFIXER = '^10.4.0';
|
|
28
28
|
// devDependencies
|
|
29
|
-
exports.V18_X_ANALOG_JS_PLATFORM = '^2.8.0
|
|
29
|
+
exports.V18_X_ANALOG_JS_PLATFORM = '^2.8.0';
|
|
30
30
|
exports.V18_X_ANGULAR_DEVKIT_BUILD_ANGULAR = '^19.0.0';
|
|
31
31
|
exports.V18_X_NX_VITE = '^21.0.0';
|
|
32
32
|
exports.V18_X_NX_LINTER = '^21.0.0';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../../../../../../../packages/nx-plugin/src/generators/app/versions/nx_18_X/versions.ts"],"names":[],"mappings":";;;AAAA,QAAQ;AACR,eAAe;AACF,QAAA,eAAe,GAAG,SAAS,CAAC;AAC5B,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,uBAAuB,GAAG,
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../../../../../../../packages/nx-plugin/src/generators/app/versions/nx_18_X/versions.ts"],"names":[],"mappings":";;;AAAA,QAAQ;AACR,eAAe;AACF,QAAA,eAAe,GAAG,SAAS,CAAC;AAC5B,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,oBAAoB,GAAG,QAAQ,CAAC;AAChC,QAAA,mCAAmC,GAAG,QAAQ,CAAC;AAC/C,QAAA,8BAA8B,GAAG,QAAQ,CAAC;AAC1C,QAAA,iBAAiB,GAAG,UAAU,CAAC;AAC/B,QAAA,iBAAiB,GAAG,UAAU,CAAC;AAC/B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,eAAe,GAAG,QAAQ,CAAC;AAC3B,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,YAAY,GAAG,SAAS,CAAC;AACzB,QAAA,2BAA2B,GAAG,QAAQ,CAAC;AACvC,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,iBAAiB,GAAG,QAAQ,CAAC;AAC7B,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,aAAa,GAAG,QAAQ,CAAC;AACzB,QAAA,kBAAkB,GAAG,SAAS,CAAC;AAE5C,kBAAkB;AACL,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,QAAA,kCAAkC,GAAG,SAAS,CAAC;AAC/C,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,eAAe,GAAG,SAAS,CAAC;AAC5B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,UAAU,GAAG,QAAQ,CAAC;AACtB,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AACrC,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,SAAS,GAAG,SAAS,CAAC"}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
export declare const V19_X_ANALOG_JS_ROUTER = "^2.8.0
|
|
2
|
-
export declare const V19_X_ANALOG_JS_CONTENT = "^2.8.0
|
|
1
|
+
export declare const V19_X_ANALOG_JS_ROUTER = "^2.8.0";
|
|
2
|
+
export declare const V19_X_ANALOG_JS_CONTENT = "^2.8.0";
|
|
3
3
|
export declare const V19_X_MARKED = "^15.0.7";
|
|
4
4
|
export declare const V19_X_MARKED_GFM_HEADING_ID = "^4.1.1";
|
|
5
5
|
export declare const V19_X_MARKED_HIGHLIGHT = "^2.2.1";
|
|
6
6
|
export declare const V19_X_MARKED_MANGLE = "^1.1.10";
|
|
7
7
|
export declare const V19_X_PRISMJS = "^1.29.0";
|
|
8
|
-
export declare const V19_X_ANALOG_JS_PLATFORM = "^2.8.0
|
|
9
|
-
export declare const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.8.0
|
|
10
|
-
export declare const V19_X_ANALOG_JS_VITEST_ANGULAR = "^2.8.0
|
|
8
|
+
export declare const V19_X_ANALOG_JS_PLATFORM = "^2.8.0";
|
|
9
|
+
export declare const V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = "^2.8.0";
|
|
10
|
+
export declare const V19_X_ANALOG_JS_VITEST_ANGULAR = "^2.8.0";
|
|
11
11
|
export declare const V19_X_NX_ANGULAR = "^22.0.0";
|
|
12
12
|
export declare const V19_X_NX_VITE = "^22.0.0";
|
|
13
13
|
export declare const V19_X_JSDOM = "^22.0.0";
|
|
@@ -2,17 +2,17 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.NX_X_LATEST_NX = exports.NX_X_LATEST_VITEST = exports.NX_X_LATEST_VITE = exports.V19_X_VITE = exports.V19_X_VITEST = exports.V19_X_VITE_TSCONFIG_PATHS = exports.V19_X_JSDOM = exports.V19_X_NX_VITE = exports.V19_X_NX_ANGULAR = exports.V19_X_ANALOG_JS_VITEST_ANGULAR = exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = exports.V19_X_ANALOG_JS_PLATFORM = exports.V19_X_PRISMJS = exports.V19_X_MARKED_MANGLE = exports.V19_X_MARKED_HIGHLIGHT = exports.V19_X_MARKED_GFM_HEADING_ID = exports.V19_X_MARKED = exports.V19_X_ANALOG_JS_CONTENT = exports.V19_X_ANALOG_JS_ROUTER = void 0;
|
|
4
4
|
// V19_X
|
|
5
|
-
exports.V19_X_ANALOG_JS_ROUTER = '^2.8.0
|
|
6
|
-
exports.V19_X_ANALOG_JS_CONTENT = '^2.8.0
|
|
5
|
+
exports.V19_X_ANALOG_JS_ROUTER = '^2.8.0';
|
|
6
|
+
exports.V19_X_ANALOG_JS_CONTENT = '^2.8.0';
|
|
7
7
|
exports.V19_X_MARKED = '^15.0.7';
|
|
8
8
|
exports.V19_X_MARKED_GFM_HEADING_ID = '^4.1.1';
|
|
9
9
|
exports.V19_X_MARKED_HIGHLIGHT = '^2.2.1';
|
|
10
10
|
exports.V19_X_MARKED_MANGLE = '^1.1.10';
|
|
11
11
|
exports.V19_X_PRISMJS = '^1.29.0';
|
|
12
12
|
// devDependencies
|
|
13
|
-
exports.V19_X_ANALOG_JS_PLATFORM = '^2.8.0
|
|
14
|
-
exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.8.0
|
|
15
|
-
exports.V19_X_ANALOG_JS_VITEST_ANGULAR = '^2.8.0
|
|
13
|
+
exports.V19_X_ANALOG_JS_PLATFORM = '^2.8.0';
|
|
14
|
+
exports.V19_X_ANALOG_JS_VITE_PLUGIN_ANGULAR = '^2.8.0';
|
|
15
|
+
exports.V19_X_ANALOG_JS_VITEST_ANGULAR = '^2.8.0';
|
|
16
16
|
exports.V19_X_NX_ANGULAR = '^22.0.0';
|
|
17
17
|
exports.V19_X_NX_VITE = '^22.0.0';
|
|
18
18
|
exports.V19_X_JSDOM = '^22.0.0';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/utils/versions/ng_19_X/versions.ts"],"names":[],"mappings":";;;AAAA,QAAQ;AACK,QAAA,sBAAsB,GAAG,
|
|
1
|
+
{"version":3,"file":"versions.js","sourceRoot":"","sources":["../../../../../../../../../../packages/nx-plugin/src/utils/versions/ng_19_X/versions.ts"],"names":[],"mappings":";;;AAAA,QAAQ;AACK,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,uBAAuB,GAAG,QAAQ,CAAC;AACnC,QAAA,YAAY,GAAG,SAAS,CAAC;AACzB,QAAA,2BAA2B,GAAG,QAAQ,CAAC;AACvC,QAAA,sBAAsB,GAAG,QAAQ,CAAC;AAClC,QAAA,mBAAmB,GAAG,SAAS,CAAC;AAChC,QAAA,aAAa,GAAG,SAAS,CAAC;AAEvC,kBAAkB;AACL,QAAA,wBAAwB,GAAG,QAAQ,CAAC;AACpC,QAAA,mCAAmC,GAAG,QAAQ,CAAC;AAC/C,QAAA,8BAA8B,GAAG,QAAQ,CAAC;AAC1C,QAAA,gBAAgB,GAAG,SAAS,CAAC;AAC7B,QAAA,aAAa,GAAG,SAAS,CAAC;AAC1B,QAAA,WAAW,GAAG,SAAS,CAAC;AACxB,QAAA,yBAAyB,GAAG,QAAQ,CAAC;AACrC,QAAA,YAAY,GAAG,QAAQ,CAAC;AACxB,QAAA,UAAU,GAAG,QAAQ,CAAC;AACtB,QAAA,gBAAgB,GAAG,QAAQ,CAAC;AAC5B,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAC9B,QAAA,cAAc,GAAG,SAAS,CAAC"}
|
|
@@ -4,10 +4,12 @@ export interface RouteFileDiscoveryOptions {
|
|
|
4
4
|
additionalPagesDirs: string[];
|
|
5
5
|
additionalContentDirs: string[];
|
|
6
6
|
}
|
|
7
|
+
export type RouteFileKind = 'route' | 'content' | 'server';
|
|
7
8
|
export interface RouteFileDiscovery {
|
|
8
9
|
getRouteFiles(): string[];
|
|
9
10
|
getContentFiles(): string[];
|
|
10
|
-
|
|
11
|
+
/** `server` marks page `.server.ts` files, which affect `load` types only. */
|
|
12
|
+
getDiscoveredFileKind(path: string): RouteFileKind | null;
|
|
11
13
|
updateDiscoveredFile(path: string, event: 'add' | 'change' | 'unlink'): void;
|
|
12
14
|
/**
|
|
13
15
|
* Returns true if the normalized filename was discovered from an app-local
|
|
@@ -50,6 +50,10 @@ export function createRouteFileDiscovery(options) {
|
|
|
50
50
|
additionalPagesRoots.some((dir) => isWithinDir(normalized, dir))) {
|
|
51
51
|
return 'route';
|
|
52
52
|
}
|
|
53
|
+
if (normalized.endsWith('.server.ts') &&
|
|
54
|
+
[`${root}/src/app/pages`, ...additionalPagesRoots].some((dir) => isWithinDir(normalized, dir))) {
|
|
55
|
+
return 'server';
|
|
56
|
+
}
|
|
53
57
|
return null;
|
|
54
58
|
}
|
|
55
59
|
function scanRouteFiles() {
|
|
@@ -119,7 +123,7 @@ export function createRouteFileDiscovery(options) {
|
|
|
119
123
|
updateDiscoveredFile(path, event) {
|
|
120
124
|
ensureInitialized();
|
|
121
125
|
const kind = getDiscoveredFileKind(path);
|
|
122
|
-
if (!kind) {
|
|
126
|
+
if (!kind || kind === 'server') {
|
|
123
127
|
return;
|
|
124
128
|
}
|
|
125
129
|
const normalizedPath = normalizePath_(path);
|
|
@@ -144,4 +148,4 @@ export function createRouteFileDiscovery(options) {
|
|
|
144
148
|
},
|
|
145
149
|
};
|
|
146
150
|
}
|
|
147
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
151
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUtZmlsZS1kaXNjb3ZlcnkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi9wYWNrYWdlcy9wbGF0Zm9ybS9zcmMvbGliL3JvdXRlLWZpbGUtZGlzY292ZXJ5LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxhQUFhLEVBQUUsTUFBTSxNQUFNLENBQUM7QUFDckMsT0FBTyxFQUFFLE9BQU8sRUFBRSxNQUFNLFdBQVcsQ0FBQztBQUNwQyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sWUFBWSxDQUFDO0FBNkJ0QyxNQUFNLFVBQVUsd0JBQXdCLENBQ3RDLE9BQWtDO0lBRWxDLE1BQU0sRUFBRSxJQUFJLEVBQUUsYUFBYSxFQUFFLG1CQUFtQixFQUFFLHFCQUFxQixFQUFFLEdBQ3ZFLE9BQU8sQ0FBQztJQUVWLElBQUksZUFBZSxHQUFHLElBQUksR0FBRyxFQUFVLENBQUM7SUFDeEMsSUFBSSxpQkFBaUIsR0FBRyxJQUFJLEdBQUcsRUFBVSxDQUFDO0lBQzFDLElBQUksa0JBQWtCLEdBQUcsSUFBSSxHQUFHLEVBQVUsQ0FBQztJQUMzQyxJQUFJLFdBQVcsR0FBRyxLQUFLLENBQUM7SUFDeEIsTUFBTSxPQUFPLEdBQUcsQ0FBQyxHQUFXLEVBQUUsRUFBRSxDQUM5QixXQUFXLENBQUMsR0FBRyxFQUFFLGFBQWEsQ0FBQztRQUM3QixDQUFDLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQztRQUNwQixDQUFDLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUM7WUFDbkIsQ0FBQyxDQUFDLGFBQWEsQ0FBQyxHQUFHLGFBQWEsR0FBRyxHQUFHLEVBQUUsQ0FBQztZQUN6QyxDQUFDLENBQUMsYUFBYSxDQUFDLE9BQU8sQ0FBQyxhQUFhLEVBQUUsR0FBRyxDQUFDLENBQUMsQ0FBQztJQUNuRCxNQUFNLG9CQUFvQixHQUFHLG1CQUFtQixDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztJQUM5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
|
|
@@ -33,6 +33,8 @@ export interface RouteEntry {
|
|
|
33
33
|
isCatchAll: boolean;
|
|
34
34
|
/** Whether the route contains an optional catch-all parameter */
|
|
35
35
|
isOptionalCatchAll: boolean;
|
|
36
|
+
/** Layout files that wrap this route, outermost first */
|
|
37
|
+
layouts: string[];
|
|
36
38
|
}
|
|
37
39
|
export interface RouteCollision {
|
|
38
40
|
fullPath: string;
|
|
@@ -46,6 +48,8 @@ export interface RouteManifest {
|
|
|
46
48
|
collisions: RouteCollision[];
|
|
47
49
|
/** Canonical route per fullPath — precomputed once to avoid redundant work. */
|
|
48
50
|
canonicalByFullPath: Map<string, RouteEntry>;
|
|
51
|
+
/** Full paths defined by more than one file, such as a layout and its index page. */
|
|
52
|
+
sharedFullPaths: Set<string>;
|
|
49
53
|
}
|
|
50
54
|
/**
|
|
51
55
|
* Converts a discovered filename to a route path pattern.
|
|
@@ -98,7 +102,17 @@ export declare function extractRouteParams(routePath: string): RouteParamInfo[];
|
|
|
98
102
|
* hard-coded path-substring heuristic with config-derived precedence.
|
|
99
103
|
*/
|
|
100
104
|
export declare function generateRouteManifest(filenames: string[], collisionPriority?: (filename: string) => number): RouteManifest;
|
|
105
|
+
/** Import specifiers for a page module's typed exports. */
|
|
106
|
+
export interface RouteModuleImports {
|
|
107
|
+
routeMeta?: string;
|
|
108
|
+
load?: string;
|
|
109
|
+
}
|
|
101
110
|
/**
|
|
102
111
|
* Generates the route-table section for the combined generated route module.
|
|
112
|
+
*
|
|
113
|
+
* `resolveModuleImports` adds `routeMeta` and `load` types for pages whose
|
|
114
|
+
* URL is defined by a single file, along with the `routeMeta` of the layouts
|
|
115
|
+
* that wrap them. URLs shared by several files, such as a layout and its
|
|
116
|
+
* index page, are ambiguous and only get params and query types.
|
|
103
117
|
*/
|
|
104
|
-
export declare function generateRouteTableDeclaration(manifest: RouteManifest): string;
|
|
118
|
+
export declare function generateRouteTableDeclaration(manifest: RouteManifest, resolveModuleImports?: (filename: string) => RouteModuleImports | undefined): string;
|
|
@@ -96,6 +96,7 @@ export function extractRouteParams(routePath) {
|
|
|
96
96
|
export function generateRouteManifest(filenames, collisionPriority) {
|
|
97
97
|
const routes = [];
|
|
98
98
|
const collisions = [];
|
|
99
|
+
const sharedFullPaths = new Set();
|
|
99
100
|
const seenByFullPath = new Map();
|
|
100
101
|
const getPriority = collisionPriority ?? getCollisionPriority;
|
|
101
102
|
// Prefer app-local route files over shared/external sources when two files
|
|
@@ -109,6 +110,16 @@ export function generateRouteManifest(filenames, collisionPriority) {
|
|
|
109
110
|
}
|
|
110
111
|
return a.localeCompare(b);
|
|
111
112
|
});
|
|
113
|
+
// Layout routes are a file and a folder with the same name, so users.page.ts
|
|
114
|
+
// wraps users/[id].page.ts but not users.[id].page.ts. Folders from all
|
|
115
|
+
// pages dirs share one tree.
|
|
116
|
+
const layoutByKey = new Map();
|
|
117
|
+
for (const filename of prioritizedFilenames) {
|
|
118
|
+
const key = toRouteFileKey(filename);
|
|
119
|
+
if (!filename.endsWith('.md') && !layoutByKey.has(key)) {
|
|
120
|
+
layoutByKey.set(key, filename);
|
|
121
|
+
}
|
|
122
|
+
}
|
|
112
123
|
for (const filename of prioritizedFilenames) {
|
|
113
124
|
const fullPath = filenameToRoutePath(filename);
|
|
114
125
|
const params = extractRouteParams(fullPath);
|
|
@@ -143,6 +154,7 @@ export function generateRouteManifest(filenames, collisionPriority) {
|
|
|
143
154
|
};
|
|
144
155
|
if (isLayoutIndexPair(winner.filename, filename) ||
|
|
145
156
|
isLayoutIndexPair(filename, winner.filename)) {
|
|
157
|
+
sharedFullPaths.add(fullPath);
|
|
146
158
|
continue;
|
|
147
159
|
}
|
|
148
160
|
collisions.push({
|
|
@@ -158,6 +170,13 @@ export function generateRouteManifest(filenames, collisionPriority) {
|
|
|
158
170
|
}
|
|
159
171
|
seenByFullPath.set(collisionKey, { filename, priority: currentPriority });
|
|
160
172
|
}
|
|
173
|
+
const segments = toRouteFileKey(filename).split('/');
|
|
174
|
+
const layouts = [];
|
|
175
|
+
for (let i = 1; i < segments.length; i++) {
|
|
176
|
+
const layout = layoutByKey.get(segments.slice(0, i).join('/'));
|
|
177
|
+
if (layout)
|
|
178
|
+
layouts.push(layout);
|
|
179
|
+
}
|
|
161
180
|
routes.push({
|
|
162
181
|
id,
|
|
163
182
|
path: fullPath,
|
|
@@ -171,6 +190,7 @@ export function generateRouteManifest(filenames, collisionPriority) {
|
|
|
171
190
|
isGroup: isPathlessLayout,
|
|
172
191
|
isCatchAll: params.some((param) => param.type === 'catchAll'),
|
|
173
192
|
isOptionalCatchAll: params.some((param) => param.type === 'optionalCatchAll'),
|
|
193
|
+
layouts,
|
|
174
194
|
});
|
|
175
195
|
}
|
|
176
196
|
routes.sort((a, b) => {
|
|
@@ -204,8 +224,16 @@ export function generateRouteManifest(filenames, collisionPriority) {
|
|
|
204
224
|
if (route.parentId) {
|
|
205
225
|
routeById.get(route.parentId)?.children.push(route.id);
|
|
206
226
|
}
|
|
227
|
+
if (routeByFullPath.get(route.fullPath) !== route) {
|
|
228
|
+
sharedFullPaths.add(route.fullPath);
|
|
229
|
+
}
|
|
207
230
|
}
|
|
208
|
-
return {
|
|
231
|
+
return {
|
|
232
|
+
routes,
|
|
233
|
+
collisions,
|
|
234
|
+
canonicalByFullPath: routeByFullPath,
|
|
235
|
+
sharedFullPaths,
|
|
236
|
+
};
|
|
209
237
|
}
|
|
210
238
|
function canonicalRoutesByFullPath(routes) {
|
|
211
239
|
const map = new Map();
|
|
@@ -228,6 +256,10 @@ function canonicalRoutesByFullPath(routes) {
|
|
|
228
256
|
}
|
|
229
257
|
return map;
|
|
230
258
|
}
|
|
259
|
+
/** A route file's path within its pages directory, e.g. `users/[id]`. */
|
|
260
|
+
function toRouteFileKey(filename) {
|
|
261
|
+
return filename.replace(/^.*?[\\/](?:routes|pages|content)[\\/]|\.page\.(?:js|ts|analog|ag)$|\.(?:ts|md|analog|ag)$/g, '');
|
|
262
|
+
}
|
|
231
263
|
function isPathlessLayoutId(id) {
|
|
232
264
|
const segments = id.split('/').filter(Boolean);
|
|
233
265
|
if (segments.length === 0)
|
|
@@ -255,20 +287,44 @@ function getCollisionPriority(filename) {
|
|
|
255
287
|
}
|
|
256
288
|
/**
|
|
257
289
|
* Generates the route-table section for the combined generated route module.
|
|
290
|
+
*
|
|
291
|
+
* `resolveModuleImports` adds `routeMeta` and `load` types for pages whose
|
|
292
|
+
* URL is defined by a single file, along with the `routeMeta` of the layouts
|
|
293
|
+
* that wrap them. URLs shared by several files, such as a layout and its
|
|
294
|
+
* index page, are ambiguous and only get params and query types.
|
|
258
295
|
*/
|
|
259
|
-
export function generateRouteTableDeclaration(manifest) {
|
|
296
|
+
export function generateRouteTableDeclaration(manifest, resolveModuleImports) {
|
|
260
297
|
const lines = [];
|
|
261
298
|
lines.push('/** @noprettier */');
|
|
262
299
|
lines.push('// This file is auto-generated by @analogjs/platform');
|
|
263
300
|
lines.push("import type {} from '@analogjs/router';");
|
|
264
301
|
lines.push("declare module '@analogjs/router' {");
|
|
265
302
|
lines.push(' interface AnalogRouteTable {');
|
|
303
|
+
const importType = (specifier, name) => `typeof import(${JSON.stringify(specifier)}).${name}`;
|
|
266
304
|
for (const route of manifest.canonicalByFullPath.values()) {
|
|
267
305
|
const paramsType = generateParamsType(route.params);
|
|
268
306
|
const queryType = 'Record<string, string | string[] | undefined>';
|
|
269
307
|
lines.push(` ${JSON.stringify(route.fullPath)}: {`);
|
|
270
308
|
lines.push(` params: ${paramsType};`);
|
|
271
309
|
lines.push(` query: ${queryType};`);
|
|
310
|
+
if (resolveModuleImports &&
|
|
311
|
+
route.kind === 'page' &&
|
|
312
|
+
!manifest.sharedFullPaths.has(route.fullPath)) {
|
|
313
|
+
const layoutRouteMeta = route.layouts.flatMap((layout) => {
|
|
314
|
+
const specifier = resolveModuleImports(layout)?.routeMeta;
|
|
315
|
+
return specifier ? [importType(specifier, 'routeMeta')] : [];
|
|
316
|
+
});
|
|
317
|
+
const imports = resolveModuleImports(route.filename);
|
|
318
|
+
if (layoutRouteMeta.length) {
|
|
319
|
+
lines.push(` layoutRouteMeta: [${layoutRouteMeta.join(', ')}];`);
|
|
320
|
+
}
|
|
321
|
+
if (imports?.routeMeta) {
|
|
322
|
+
lines.push(` routeMeta: ${importType(imports.routeMeta, 'routeMeta')};`);
|
|
323
|
+
}
|
|
324
|
+
if (imports?.load) {
|
|
325
|
+
lines.push(` load: ${importType(imports.load, 'load')};`);
|
|
326
|
+
}
|
|
327
|
+
}
|
|
272
328
|
lines.push(` };`);
|
|
273
329
|
}
|
|
274
330
|
lines.push(' }');
|
|
@@ -335,4 +391,4 @@ function computeLocalPath(fullPath, parentFullPath) {
|
|
|
335
391
|
const suffix = fullPath.slice(parentFullPath.length).replace(/^\/+/, '');
|
|
336
392
|
return suffix || '/';
|
|
337
393
|
}
|
|
338
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-manifest.js","sourceRoot":"","sources":["../../../../../packages/platform/src/lib/route-manifest.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAiDH;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,MAAM,UAAU,mBAAmB,CAAC,QAAgB;IAClD,IAAI,IAAI,GAAG,QAAQ,CAAC,OAAO,CACzB,6KAA6K,EAC7K,EAAE,CACH,CAAC;IAEF,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,0BAA0B,EAAE,CAAC,KAAK,EAAE,EAAE;QACxD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,4CAA4C;QAC5C,OAAO,MAAM,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC;IACvC,CAAC,CAAC,CAAC;IACH,wEAAwE;IACxE,yDAAyD;IACzD,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAC9D,4CAA4C;IAC5C,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACtE,OAAO,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACzD,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,iBAAiB,CAAC,QAAgB;IAChD,IAAI,IAAI,GAAG,QAAQ,CAAC,OAAO,CACzB,6KAA6K,EAC7K,EAAE,CACH,CAAC;IAEF,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,kCAAkC,EAAE,CAAC,KAAK,EAAE,EAAE;QAChE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,4CAA4C;QAC5C,OAAO,MAAM,QAAQ,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC;IACvC,CAAC,CAAC,CAAC;IACH,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;IAChC,4CAA4C;IAC5C,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEtE,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAEjD,OAAO,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAClC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,kBAAkB,CAAC,SAAiB;IAClD,MAAM,MAAM,GAAqB,EAAE,CAAC;IAEpC,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,QAAQ,CAAC,yBAAyB,CAAC,EAAE,CAAC;QAClE,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,kBAAkB,EAAE,CAAC,CAAC;IAC5D,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,QAAQ,CAAC,kCAAkC,CAAC,EAAE,CAAC;QAC3E,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;IACpD,CAAC;IACD,KAAK,MAAM,KAAK,IAAI,SAAS,CAAC,QAAQ,CAAC,kCAAkC,CAAC,EAAE,CAAC;QAC3E,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,qBAAqB,CACnC,SAAmB,EACnB,iBAAgD;IAEhD,MAAM,MAAM,GAAiB,EAAE,CAAC;IAChC,MAAM,UAAU,GAAqB,EAAE,CAAC;IACxC,MAAM,cAAc,GAAG,IAAI,GAAG,EAG3B,CAAC;IACJ,MAAM,WAAW,GAAG,iBAAiB,IAAI,oBAAoB,CAAC;IAE9D,2EAA2E;IAC3E,6EAA6E;IAC7E,yEAAyE;IACzE,MAAM,oBAAoB,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACxD,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QACjC,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;QACjC,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;YAC5B,OAAO,SAAS,GAAG,SAAS,CAAC;QAC/B,CAAC;QACD,OAAO,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IAEH,KAAK,MAAM,QAAQ,IAAI,oBAAoB,EAAE,CAAC;QAC5C,MAAM,QAAQ,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,kBAAkB,CAAC,QAAQ,CAAC,CAAC;QAC5C,MAAM,EAAE,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QACvC,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,EAAE,CAAC,CAAC;QAChD,4EAA4E;QAC5E,MAAM,UAAU,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACxD,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;QAE5D,MAAM,eAAe,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;QAE9C,sEAAsE;QACtE,yEAAyE;QACzE,wEAAwE;QACxE,gDAAgD;QAChD,IAAI,CAAC,gBAAgB,EAAE,CAAC;YACtB,IAAI,cAAc,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;gBACrC,MAAM,MAAM,GAAG,cAAc,CAAC,GAAG,CAAC,YAAY,CAAE,CAAC;gBACjD,IAAI,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBACjC,SAAS;gBACX,CAAC;gBACD,yDAAyD;gBACzD,gEAAgE;gBAChE,4DAA4D;gBAC5D,MAAM,iBAAiB,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;oBACjD,MAAM,OAAO,GAAG,yCAAyC,CAAC;oBAC1D,MAAM,QAAQ,GAAG,+BAA+B,CAAC;oBACjD,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;wBACxC,MAAM,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;wBACnC,MAAM,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;wBACvC,OAAO,GAAG,KAAK,MAAM,CAAC;oBACxB,CAAC;oBACD,OAAO,KAAK,CAAC;gBACf,CAAC,CAAC;gBACF,IACE,iBAAiB,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC;oBAC5C,iBAAiB,CAAC,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,EAC5C,CAAC;oBACD,SAAS;gBACX,CAAC;gBACD,UAAU,CAAC,IAAI,CAAC;oBACd,QAAQ;oBACR,QAAQ,EAAE,MAAM,CAAC,QAAQ;oBACzB,WAAW,EAAE,QAAQ;oBACrB,YAAY,EAAE,MAAM,CAAC,QAAQ,KAAK,eAAe;iBAClD,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CACV,8BAA8B,QAAQ,uBAAuB;oBAC3D,IAAI,MAAM,CAAC,QAAQ,UAAU,QAAQ,KAAK;oBAC1C,YAAY,MAAM,CAAC,QAAQ,4DAA4D,CAC1F,CAAC;gBACF,SAAS;YACX,CAAC;YACD,cAAc,CAAC,GAAG,CAAC,YAAY,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC,CAAC;QAC5E,CAAC;QAED,MAAM,CAAC,IAAI,CAAC;YACV,EAAE;YACF,IAAI,EAAE,QAAQ;YACd,QAAQ;YACR,MAAM;YACN,QAAQ;YACR,IAAI,EAAE,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM;YACnD,QAAQ,EAAE,IAAI;YACd,QAAQ,EAAE,EAAE;YACZ,OAAO,EAAE,EAAE,KAAK,QAAQ,IAAI,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC;YACjD,OAAO,EAAE,gBAAgB;YACzB,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC;YAC7D,kBAAkB,EAAE,MAAM,CAAC,IAAI,CAC7B,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,kBAAkB,CAC7C;SACF,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACnB,MAAM,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QACtC,MAAM,EAAE,GAAG,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QACtC,IAAI,EAAE,KAAK,EAAE;YAAE,OAAO,EAAE,GAAG,EAAE,CAAC;QAC9B,OAAO,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,yBAAyB,CAAC,MAAM,CAAC,CAAC;IAE1D,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAEpE,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,+DAA+D;QAC/D,6DAA6D;QAC7D,8DAA8D;QAC9D,iDAAiD;QACjD,gEAAgE;QAChE,kEAAkE;QAClE,0DAA0D;QAC1D,mEAAmE;QACnE,MAAM,eAAe,GAAG,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,gBAAgB,GAAG,eAAe;YACtC,CAAC,CAAC,qBAAqB,CAAC,KAAK,CAAC,EAAE,EAAE,SAAS,CAAC;YAC5C,CAAC,CAAC,SAAS,CAAC;QACd,MAAM,cAAc,GAAG,sBAAsB,CAC3C,KAAK,CAAC,QAAQ,EACd,eAAe,CAChB,CAAC;QACF,MAAM,MAAM,GAAG,gBAAgB,IAAI,cAAc,CAAC;QAClD,KAAK,CAAC,QAAQ,GAAG,MAAM,EAAE,EAAE,IAAI,IAAI,CAAC;QACpC,KAAK,CAAC,IAAI,GAAG,gBAAgB,CAAC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,IAAI,IAAI,CAAC,CAAC;IAC1E,CAAC;IAED,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACnB,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACzD,CAAC;IACH,CAAC;IAED,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,mBAAmB,EAAE,eAAe,EAAE,CAAC;AACtE,CAAC;AAED,SAAS,yBAAyB,CAChC,MAAoB;IAEpB,MAAM,GAAG,GAAG,IAAI,GAAG,EAAsB,CAAC;IAC1C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,MAAM,QAAQ,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACzC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACjC,CAAC;aAAM,IAAI,QAAQ,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YAC9C,8DAA8D;YAC9D,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;QACjC,CAAC;aAAM,IAAI,QAAQ,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;YAC7C,qEAAqE;YACrE,8DAA8D;YAC9D,IAAI,KAAK,CAAC,EAAE,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC;gBAC5C,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YACjC,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAS,kBAAkB,CAAC,EAAU;IACpC,MAAM,QAAQ,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC/C,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACxC,OAAO,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,cAAc,CAAC,IAAY;IAClC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;QAAE,OAAO,CAAC,CAAC;IACrC,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,CAAC,CAAC;IACpC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,OAAO,CAAC,CAAC;IACjC,OAAO,CAAC,CAAC;AACX,CAAC;AAED,SAAS,oBAAoB,CAAC,QAAgB;IAC5C,IACE,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC;QACpC,QAAQ,CAAC,QAAQ,CAAC,kBAAkB,CAAC;QACrC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC;QAChC,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC;QACjC,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,EAClC,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAED,OAAO,CAAC,CAAC;AACX,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,6BAA6B,CAAC,QAAuB;IACnE,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;IACjC,KAAK,CAAC,IAAI,CAAC,sDAAsD,CAAC,CAAC;IACnE,KAAK,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;IACtD,KAAK,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;IAClD,KAAK,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;IAE7C,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,mBAAmB,CAAC,MAAM,EAAE,EAAE,CAAC;QAC1D,MAAM,UAAU,GAAG,kBAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACpD,MAAM,SAAS,GAAG,+CAA+C,CAAC;QAElE,KAAK,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACvD,KAAK,CAAC,IAAI,CAAC,iBAAiB,UAAU,GAAG,CAAC,CAAC;QAC3C,KAAK,CAAC,IAAI,CAAC,gBAAgB,SAAS,GAAG,CAAC,CAAC;QACzC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAClB,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACf,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACzB,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEf,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,SAAS,kBAAkB,CAAC,MAAwB;IAClD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,uBAAuB,CAAC;IAExD,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;QAC/B,MAAM,GAAG,GAAG,iBAAiB,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACxE,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;YACf,KAAK,SAAS;gBACZ,OAAO,GAAG,GAAG,UAAU,CAAC;YAC1B,KAAK,UAAU;gBACb,OAAO,GAAG,GAAG,YAAY,CAAC;YAC5B,KAAK,kBAAkB;gBACrB,OAAO,GAAG,GAAG,aAAa,CAAC;QAC/B,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,KAAK,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AACrC,CAAC;AAED,SAAS,iBAAiB,CAAC,IAAY;IACrC,OAAO,4BAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,qBAAqB,CAC5B,EAAU,EACV,UAAmC;IAEnC,IAAI,EAAE,KAAK,GAAG,EAAE,CAAC;QACf,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,QAAQ,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAC/C,KAAK,IAAI,KAAK,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;QACzD,MAAM,SAAS,GAAG,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3D,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,sBAAsB,CAC7B,QAAgB,EAChB,gBAAyC;IAEzC,IAAI,QAAQ,KAAK,GAAG,EAAE,CAAC;QACrB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC9C,KAAK,IAAI,KAAK,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,KAAK,GAAG,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;QACzD,MAAM,SAAS,GAAG,GAAG,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3D,MAAM,KAAK,GAAG,gBAAgB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC9C,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,gBAAgB,CACvB,QAAgB,EAChB,cAA6B;IAE7B,IAAI,QAAQ,KAAK,GAAG,EAAE,CAAC;QACrB,OAAO,GAAG,CAAC;IACb,CAAC;IAED,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC3B,CAAC;IAED,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;IACzE,OAAO,MAAM,IAAI,GAAG,CAAC;AACvB,CAAC"}
|
|
394
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"route-manifest.js","sourceRoot":"","sources":["../../../../../packages/platform/src/lib/route-manifest.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,5 @@
|
|
|
1
1
|
import type { Plugin } from 'vite';
|
|
2
|
-
/**
|
|
3
|
-
* Minimum Angular major whose compiled `@angular/core` FESM matches the
|
|
4
|
-
* streaming patch anchors. Incremental hydration is a stable public API from
|
|
5
|
-
* v20 (`withIncrementalHydration`, `@publicApi 20.0`), but v20's FESM inlines
|
|
6
|
-
* the injection anchor's `DeferBlockStateEnd` profiler event to its numeric
|
|
7
|
-
* ordinal, whereas v21+ keeps the symbolic `ProfilerEvent.DeferBlockStateEnd`
|
|
8
|
-
* form the anchor matches on. Keying on the literal ordinal would be fragile
|
|
9
|
-
* (enum values shift between versions), so v21 is the floor.
|
|
10
|
-
*/
|
|
2
|
+
/** Minimum Angular major qualified for streaming; the actual runtime shape is checked below. */
|
|
11
3
|
export declare const MIN_STREAMING_ANGULAR_MAJOR = 21;
|
|
12
4
|
/**
|
|
13
5
|
* Whether the streaming SSR patch can be applied to the installed Angular.
|
|
@@ -16,33 +8,9 @@ export declare const MIN_STREAMING_ANGULAR_MAJOR = 21;
|
|
|
16
8
|
* build time and falls back to buffered rendering.
|
|
17
9
|
*/
|
|
18
10
|
export declare function streamingSupportedOnAngular(major: number | null): boolean;
|
|
19
|
-
/**
|
|
20
|
-
* Pure transform that injects the streaming-SSR per-block resolution hook into
|
|
21
|
-
* `@angular/core`'s compiled output. It is the same class of transform as
|
|
22
|
-
* `i18nDefRegistryPlugin` in ./ssr-build-plugin — a string patch of Angular's
|
|
23
|
-
* bundle applied only to SSR builds. Exported separately so it can be unit
|
|
24
|
-
* tested against a bundle string.
|
|
25
|
-
*
|
|
26
|
-
* Two edits, both keyed on single-occurrence anchors in the module that holds
|
|
27
|
-
* the defer runtime:
|
|
28
|
-
* 1. Inside `applyDeferBlockState`, fire `globalThis.__analogSsrDeferCapture`
|
|
29
|
-
* when a `@defer` block reaches `Complete` on the server, passing the
|
|
30
|
-
* block's live `lContainer` — this is the per-block resolution signal a
|
|
31
|
-
* streaming renderer consumes.
|
|
32
|
-
* 2. Expose `collectNativeNodesInLContainer` via `globalThis.__analogSsrInternals`
|
|
33
|
-
* so the renderer can serialize a block's subtree.
|
|
34
|
-
*
|
|
35
|
-
* Returns `null` when the module is not the one carrying the defer runtime, so
|
|
36
|
-
* it is a no-op on every other Angular module.
|
|
37
|
-
*/
|
|
11
|
+
/** Inject capture before the named defer function's final profiler call, preserving its original source. */
|
|
38
12
|
export declare function injectDeferStreamingHook(code: string): string | null;
|
|
39
|
-
/**
|
|
40
|
-
* Classify an `@angular/core` module for the streaming patch. The patch anchors
|
|
41
|
-
* on internal symbol names, so when Angular changes those the transform would
|
|
42
|
-
* otherwise become a silent no-op and streaming would degrade to buffered with
|
|
43
|
-
* no signal. This distinguishes "not the target module" (skip quietly) from
|
|
44
|
-
* "this IS the `@defer` runtime module but the anchors drifted" (worth warning).
|
|
45
|
-
*/
|
|
13
|
+
/** Inspect the named function's final profiler call without depending on enum ordinals. */
|
|
46
14
|
export declare function inspectAngularCoreModule(code: string): {
|
|
47
15
|
kind: 'not-target';
|
|
48
16
|
} | {
|
|
@@ -1,12 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
* streaming patch anchors. Incremental hydration is a stable public API from
|
|
4
|
-
* v20 (`withIncrementalHydration`, `@publicApi 20.0`), but v20's FESM inlines
|
|
5
|
-
* the injection anchor's `DeferBlockStateEnd` profiler event to its numeric
|
|
6
|
-
* ordinal, whereas v21+ keeps the symbolic `ProfilerEvent.DeferBlockStateEnd`
|
|
7
|
-
* form the anchor matches on. Keying on the literal ordinal would be fragile
|
|
8
|
-
* (enum values shift between versions), so v21 is the floor.
|
|
9
|
-
*/
|
|
1
|
+
import { parseSync } from 'oxc-parser';
|
|
2
|
+
/** Minimum Angular major qualified for streaming; the actual runtime shape is checked below. */
|
|
10
3
|
export const MIN_STREAMING_ANGULAR_MAJOR = 21;
|
|
11
4
|
/**
|
|
12
5
|
* Whether the streaming SSR patch can be applied to the installed Angular.
|
|
@@ -17,66 +10,80 @@ export const MIN_STREAMING_ANGULAR_MAJOR = 21;
|
|
|
17
10
|
export function streamingSupportedOnAngular(major) {
|
|
18
11
|
return major === null || major >= MIN_STREAMING_ANGULAR_MAJOR;
|
|
19
12
|
}
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
13
|
+
function analyzeDeferRuntime(code) {
|
|
14
|
+
if (!code.includes('function applyDeferBlockState('))
|
|
15
|
+
return { kind: 'not-target' };
|
|
16
|
+
const parsed = parseSync('angular-core.mjs', code);
|
|
17
|
+
if (parsed.errors.length)
|
|
18
|
+
return { kind: 'drifted', reason: 'invalid Angular core JavaScript' };
|
|
19
|
+
const fn = parsed.program.body.find((node) => node.type === 'FunctionDeclaration' &&
|
|
20
|
+
node.id?.name === 'applyDeferBlockState');
|
|
21
|
+
if (!fn || fn.type !== 'FunctionDeclaration' || !fn.body)
|
|
22
|
+
return { kind: 'not-target' };
|
|
23
|
+
const names = fn.params
|
|
24
|
+
.map((param) => (param.type === 'Identifier' ? param.name : ''))
|
|
25
|
+
.join(',');
|
|
26
|
+
if (names !== 'newState,lDetails,lContainer,tNode,hostLView')
|
|
27
|
+
return {
|
|
28
|
+
kind: 'drifted',
|
|
29
|
+
reason: 'changed applyDeferBlockState parameters',
|
|
30
|
+
};
|
|
31
|
+
const collector = parsed.program.body.some((node) => node.type === 'FunctionDeclaration' &&
|
|
32
|
+
node.id?.name === 'collectNativeNodesInLContainer');
|
|
33
|
+
if (!collector)
|
|
34
|
+
return {
|
|
35
|
+
kind: 'drifted',
|
|
36
|
+
reason: 'missing collectNativeNodesInLContainer',
|
|
37
|
+
};
|
|
38
|
+
const offset = profilerEndOffset(fn.body.body[fn.body.body.length - 1]);
|
|
39
|
+
return offset === undefined
|
|
40
|
+
? { kind: 'drifted', reason: 'missing DeferBlockStateEnd profiler anchor' }
|
|
41
|
+
: { kind: 'patchable', offset };
|
|
42
|
+
}
|
|
43
|
+
function profilerEndOffset(statement) {
|
|
44
|
+
if (statement?.type !== 'ExpressionStatement' ||
|
|
45
|
+
statement.expression.type !== 'CallExpression')
|
|
46
|
+
return;
|
|
47
|
+
const call = statement.expression;
|
|
48
|
+
if (call.callee.type !== 'Identifier' ||
|
|
49
|
+
call.callee.name !== 'profiler' ||
|
|
50
|
+
call.arguments.length !== 1)
|
|
51
|
+
return;
|
|
52
|
+
return isEndEvent(call.arguments[0]) ? statement.start : undefined;
|
|
53
|
+
}
|
|
54
|
+
function isEndEvent(event) {
|
|
55
|
+
if (event?.type === 'Literal')
|
|
56
|
+
return typeof event.value === 'number';
|
|
57
|
+
return (event?.type === 'MemberExpression' &&
|
|
58
|
+
!event.computed &&
|
|
59
|
+
event.object.type === 'Identifier' &&
|
|
60
|
+
event.object.name === 'ProfilerEvent' &&
|
|
61
|
+
event.property.type === 'Identifier' &&
|
|
62
|
+
event.property.name === 'DeferBlockStateEnd');
|
|
63
|
+
}
|
|
64
|
+
function patchDeferRuntime(code, offset) {
|
|
65
|
+
if (code.includes('globalThis.__analogSsrDeferCapture({'))
|
|
66
|
+
return code;
|
|
48
67
|
const capture = `try { if (newState === DeferBlockState.Complete && ` +
|
|
49
68
|
`typeof ngServerMode !== 'undefined' && ngServerMode && ` +
|
|
50
69
|
`typeof globalThis.__analogSsrDeferCapture === 'function') { ` +
|
|
51
70
|
`globalThis.__analogSsrDeferCapture({ ssrUniqueId: lDetails[SSR_UNIQUE_ID], lContainer, hostLView }); } } catch (e) {}\n `;
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
}
|
|
57
|
-
return out;
|
|
71
|
+
return (code.slice(0, offset) +
|
|
72
|
+
capture +
|
|
73
|
+
code.slice(offset) +
|
|
74
|
+
'\nglobalThis.__analogSsrInternals = Object.assign(globalThis.__analogSsrInternals || {}, { collectNativeNodesInLContainer });\n');
|
|
58
75
|
}
|
|
59
|
-
/**
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
76
|
+
/** Inject capture before the named defer function's final profiler call, preserving its original source. */
|
|
77
|
+
export function injectDeferStreamingHook(code) {
|
|
78
|
+
const info = analyzeDeferRuntime(code);
|
|
79
|
+
return info.kind === 'patchable'
|
|
80
|
+
? patchDeferRuntime(code, info.offset)
|
|
81
|
+
: null;
|
|
82
|
+
}
|
|
83
|
+
/** Inspect the named function's final profiler call without depending on enum ordinals. */
|
|
66
84
|
export function inspectAngularCoreModule(code) {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
}
|
|
70
|
-
const missing = [];
|
|
71
|
-
if (!code.includes('profiler(ProfilerEvent.DeferBlockStateEnd);')) {
|
|
72
|
-
missing.push('DeferBlockStateEnd profiler anchor');
|
|
73
|
-
}
|
|
74
|
-
if (!code.includes('function collectNativeNodesInLContainer(')) {
|
|
75
|
-
missing.push('collectNativeNodesInLContainer');
|
|
76
|
-
}
|
|
77
|
-
return missing.length === 0
|
|
78
|
-
? { kind: 'patchable' }
|
|
79
|
-
: { kind: 'drifted', reason: `missing ${missing.join(', ')}` };
|
|
85
|
+
const info = analyzeDeferRuntime(code);
|
|
86
|
+
return info.kind === 'patchable' ? { kind: 'patchable' } : info;
|
|
80
87
|
}
|
|
81
88
|
/**
|
|
82
89
|
* Vite plugin that applies {@link injectDeferStreamingHook} to `@angular/core`
|
|
@@ -90,11 +97,17 @@ export function inspectAngularCoreModule(code) {
|
|
|
90
97
|
* that falls back to buffered rendering.
|
|
91
98
|
*/
|
|
92
99
|
export function deferStreamingPlugin() {
|
|
93
|
-
|
|
94
|
-
|
|
100
|
+
const applied = new Set();
|
|
101
|
+
const warnedDrift = new Set();
|
|
95
102
|
return {
|
|
96
103
|
name: 'analogjs-defer-streaming',
|
|
97
104
|
enforce: 'post',
|
|
105
|
+
config() {
|
|
106
|
+
return {
|
|
107
|
+
ssr: { noExternal: ['@angular/core'] },
|
|
108
|
+
environments: { ssr: { optimizeDeps: { exclude: ['@angular/core'] } } },
|
|
109
|
+
};
|
|
110
|
+
},
|
|
98
111
|
transform: {
|
|
99
112
|
filter: {
|
|
100
113
|
id: /\/@angular\/core\//,
|
|
@@ -102,12 +115,13 @@ export function deferStreamingPlugin() {
|
|
|
102
115
|
handler(code, _id, options) {
|
|
103
116
|
if (!options?.ssr)
|
|
104
117
|
return;
|
|
105
|
-
const
|
|
118
|
+
const environment = this.environment.name;
|
|
119
|
+
const info = analyzeDeferRuntime(code);
|
|
106
120
|
if (info.kind === 'not-target')
|
|
107
121
|
return;
|
|
108
122
|
if (info.kind === 'drifted') {
|
|
109
|
-
if (!warnedDrift) {
|
|
110
|
-
warnedDrift
|
|
123
|
+
if (!warnedDrift.has(environment)) {
|
|
124
|
+
warnedDrift.add(environment);
|
|
111
125
|
this.warn(`experimental streaming SSR: found @angular/core's @defer runtime ` +
|
|
112
126
|
`but could not apply the resolution hook (${info.reason}). The ` +
|
|
113
127
|
`installed Angular version likely changed internals the patch ` +
|
|
@@ -115,15 +129,18 @@ export function deferStreamingPlugin() {
|
|
|
115
129
|
}
|
|
116
130
|
return;
|
|
117
131
|
}
|
|
118
|
-
const out =
|
|
119
|
-
|
|
120
|
-
return;
|
|
121
|
-
applied = true;
|
|
132
|
+
const out = patchDeferRuntime(code, info.offset);
|
|
133
|
+
applied.add(environment);
|
|
122
134
|
return { code: out };
|
|
123
135
|
},
|
|
124
136
|
},
|
|
125
137
|
buildEnd() {
|
|
126
|
-
|
|
138
|
+
// Require coverage from the SSR service. A later Nitro rebundle may
|
|
139
|
+
// also encounter Angular modules imported by endpoint handlers.
|
|
140
|
+
const environment = this.environment.name;
|
|
141
|
+
if (environment !== 'ssr')
|
|
142
|
+
return;
|
|
143
|
+
if (!applied.has(environment) && !warnedDrift.has(environment)) {
|
|
127
144
|
this.warn(`experimental streaming SSR is enabled but @angular/core's @defer ` +
|
|
128
145
|
`runtime module was never encountered during the SSR build, so the ` +
|
|
129
146
|
`resolution hook was not injected. Streaming will fall back to ` +
|
|
@@ -132,4 +149,4 @@ export function deferStreamingPlugin() {
|
|
|
132
149
|
},
|
|
133
150
|
};
|
|
134
151
|
}
|
|
135
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
152
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmZXItc3RyZWFtaW5nLXBsdWdpbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL3BsYXRmb3JtL3NyYy9saWIvc3NyL2RlZmVyLXN0cmVhbWluZy1wbHVnaW4udHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUFFLFNBQVMsRUFBaUMsTUFBTSxZQUFZLENBQUM7QUFFdEUsZ0dBQWdHO0FBQ2hHLE1BQU0sQ0FBQyxNQUFNLDJCQUEyQixHQUFHLEVBQUUsQ0FBQztBQUU5Qzs7Ozs7R0FLRztBQUNILE1BQU0sVUFBVSwyQkFBMkIsQ0FBQyxLQUFvQjtJQUM5RCxPQUFPLEtBQUssS0FBSyxJQUFJLElBQUksS0FBSyxJQUFJLDJCQUEyQixDQUFDO0FBQ2hFLENBQUM7QUFPRCxTQUFTLG1CQUFtQixDQUFDLElBQVk7SUFDdkMsSUFBSSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsZ0NBQWdDLENBQUM7UUFDbEQsT0FBTyxFQUFFLElBQUksRUFBRSxZQUFZLEVBQUUsQ0FBQztJQUNoQyxNQUFNLE1BQU0sR0FBRyxTQUFTLENBQUMsa0JBQWtCLEVBQUUsSUFBSSxDQUFDLENBQUM7SUFDbkQsSUFBSSxNQUFNLENBQUMsTUFBTSxDQUFDLE1BQU07UUFDdEIsT0FBTyxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsTUFBTSxFQUFFLGlDQUFpQyxFQUFFLENBQUM7SUFDeEUsTUFBTSxFQUFFLEdBQUcsTUFBTSxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUNqQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQ1AsSUFBSSxDQUFDLElBQUksS0FBSyxxQkFBcUI7UUFDbkMsSUFBSSxDQUFDLEVBQUUsRUFBRSxJQUFJLEtBQUssc0JBQXNCLENBQzNDLENBQUM7SUFDRixJQUFJLENBQUMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxJQUFJLEtBQUsscUJBQXFCLElBQUksQ0FBQyxFQUFFLENBQUMsSUFB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
|
|
@@ -35,8 +35,27 @@ export function typedRoutes(options = {}) {
|
|
|
35
35
|
if (command === 'build' && collisions.length) {
|
|
36
36
|
throw new Error(`[analog] Route collisions detected: ${collisions.map((c) => `${c.fullPath}: ${c.keptFile}, ${c.droppedFile}`).join('; ')}`);
|
|
37
37
|
}
|
|
38
|
-
const output = generateRouteTableDeclaration(manifest);
|
|
39
38
|
const outputPath = join(root, outFile);
|
|
39
|
+
const output = generateRouteTableDeclaration(manifest, (filename) => {
|
|
40
|
+
const pageFile = [
|
|
41
|
+
join(root, filename),
|
|
42
|
+
join(workspaceRoot, filename),
|
|
43
|
+
filename,
|
|
44
|
+
].find((file) => existsSync(file));
|
|
45
|
+
if (!pageFile)
|
|
46
|
+
return undefined;
|
|
47
|
+
const serverFile = pageFile.replace(/\.page\.ts$/, '.server.ts');
|
|
48
|
+
return {
|
|
49
|
+
routeMeta: hasNamedExport(pageFile, 'routeMeta')
|
|
50
|
+
? toImportSpecifier(dirname(outputPath), pageFile)
|
|
51
|
+
: undefined,
|
|
52
|
+
load: serverFile !== pageFile &&
|
|
53
|
+
existsSync(serverFile) &&
|
|
54
|
+
hasNamedExport(serverFile, 'load')
|
|
55
|
+
? toImportSpecifier(dirname(outputPath), serverFile)
|
|
56
|
+
: undefined,
|
|
57
|
+
};
|
|
58
|
+
});
|
|
40
59
|
const exists = existsSync(outputPath);
|
|
41
60
|
const current = exists ? readFileSync(outputPath, 'utf8') : '';
|
|
42
61
|
if (current !== output && !sameDeclarations(current, output)) {
|
|
@@ -88,6 +107,35 @@ export function typedRoutes(options = {}) {
|
|
|
88
107
|
},
|
|
89
108
|
};
|
|
90
109
|
}
|
|
110
|
+
function toImportSpecifier(fromDir, file) {
|
|
111
|
+
const specifier = normalizePath(relative(fromDir, file)).replace(/\.ts$/, '');
|
|
112
|
+
return specifier.startsWith('.') ? specifier : `./${specifier}`;
|
|
113
|
+
}
|
|
114
|
+
function hasNamedExport(file, name) {
|
|
115
|
+
const source = readFileSync(file, 'utf8');
|
|
116
|
+
if (!source.includes(name))
|
|
117
|
+
return false;
|
|
118
|
+
const { program, errors } = parseSync(file, source);
|
|
119
|
+
if (errors.length)
|
|
120
|
+
return false;
|
|
121
|
+
return program.body.some((statement) => {
|
|
122
|
+
if (statement.type !== 'ExportNamedDeclaration' ||
|
|
123
|
+
statement.exportKind === 'type') {
|
|
124
|
+
return false;
|
|
125
|
+
}
|
|
126
|
+
const declaration = statement.declaration;
|
|
127
|
+
if (declaration?.type === 'VariableDeclaration') {
|
|
128
|
+
return declaration.declarations.some((item) => item.id.type === 'Identifier' && item.id.name === name);
|
|
129
|
+
}
|
|
130
|
+
if (declaration?.type === 'FunctionDeclaration') {
|
|
131
|
+
return declaration.id?.name === name;
|
|
132
|
+
}
|
|
133
|
+
return statement.specifiers.some((specifier) => specifier.exportKind !== 'type' &&
|
|
134
|
+
(specifier.exported.type === 'Identifier'
|
|
135
|
+
? specifier.exported.name
|
|
136
|
+
: specifier.exported.value) === name);
|
|
137
|
+
});
|
|
138
|
+
}
|
|
91
139
|
function sameDeclarations(current, output) {
|
|
92
140
|
const left = parseSync('routeTree.gen.d.ts', current);
|
|
93
141
|
const right = parseSync('routeTree.gen.d.ts', output);
|
|
@@ -97,4 +145,4 @@ function sameDeclarations(current, output) {
|
|
|
97
145
|
return (JSON.stringify(left.program, withoutFormatting) ===
|
|
98
146
|
JSON.stringify(right.program, withoutFormatting));
|
|
99
147
|
}
|
|
100
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
148
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"typed-routes-plugin.js","sourceRoot":"","sources":["../../../../../packages/platform/src/lib/typed-routes-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,aAAa,EAAe,MAAM,MAAM,CAAC;AAElD,OAAO,EACL,wBAAwB,GAEzB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,qBAAqB,EACrB,6BAA6B,GAC9B,MAAM,qBAAqB,CAAC;AAe7B,MAAM,UAAU,WAAW,CAAC,UAAoC,EAAE;IAChE,MAAM,aAAa,GAAG,aAAa,CAAC,OAAO,CAAC,aAAa,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5E,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,IAAI,wBAAwB,CAAC;IAC5D,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/B,MAAM,IAAI,KAAK,CACb,0GAA0G,CAC3G,CAAC;IACJ,CAAC;IACD,IAAI,IAAY,CAAC;IACjB,IAAI,OAA0B,CAAC;IAC/B,IAAI,SAA6B,CAAC;IAElC,IAAI,eAA2C,CAAC;IAEhD,SAAS,mBAAmB;QAC1B,IAAI,CAAC,eAAe;YAAE,OAAO;QAC7B,MAAM,QAAQ,GAAG,eAAe,EAAE,CAAC;QACnC,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAC1D,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CACb,wDAAwD,QAAQ,GAAG,CACpE,CAAC;QACJ,CAAC;QACD,MAAM,UAAU,GAAG,aAAa,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;QACzD,IACE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,UAAU,CAAC,EACtE,CAAC;YACD,MAAM,WAAW,GAAG,aAAa,CAC/B,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,CAAC,CACxC,CAAC;YACF,MAAM,IAAI,KAAK,CACb,uDAAuD,QAAQ,UAAU,WAAW,8FAA8F,CACnL,CAAC;QACJ,CAAC;IACH,CAAC;IAED,SAAS,QAAQ;QACf,MAAM,QAAQ,GAAG,qBAAqB,CACpC,CAAC,GAAG,SAAS,CAAC,aAAa,EAAE,EAAE,GAAG,SAAS,CAAC,eAAe,EAAE,CAAC,EAC9D,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACvD,CAAC;QACF,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC,MAAM,CAC3C,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,YAAY,CACtC,CAAC;QACF,IAAI,OAAO,KAAK,OAAO,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CACb,uCAAuC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC5H,CAAC;QACJ,CAAC;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,6BAA6B,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE;YAClE,MAAM,QAAQ,GAAG;gBACf,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC;gBACpB,IAAI,CAAC,aAAa,EAAE,QAAQ,CAAC;gBAC7B,QAAQ;aACT,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;YACnC,IAAI,CAAC,QAAQ;gBAAE,OAAO,SAAS,CAAC;YAChC,MAAM,UAAU,GAAG,QAAQ,CAAC,OAAO,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;YACjE,OAAO;gBACL,SAAS,EAAE,cAAc,CAAC,QAAQ,EAAE,WAAW,CAAC;oBAC9C,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,QAAQ,CAAC;oBAClD,CAAC,CAAC,SAAS;gBACb,IAAI,EACF,UAAU,KAAK,QAAQ;oBACvB,UAAU,CAAC,UAAU,CAAC;oBACtB,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC;oBAChC,CAAC,CAAC,iBAAiB,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,UAAU,CAAC;oBACpD,CAAC,CAAC,SAAS;aAChB,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,UAAU,CAAC,UAAU,CAAC,CAAC;QACtC,MAAM,OAAO,GAAG,MAAM,CAAC,CAAC,CAAC,YAAY,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC/D,IAAI,OAAO,KAAK,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;YAC7D,IAAI,MAAM,IAAI,OAAO,KAAK,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,IAAI,IAAI,CAAC,EAAE,CAAC;gBACrE,MAAM,IAAI,KAAK,CACb,8BAA8B,OAAO,wDAAwD,CAC9F,CAAC;YACJ,CAAC;YACD,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACpD,aAAa,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI,EAAE,qBAAqB;QAC3B,MAAM,CAAC,MAAM,EAAE,GAAG;YAChB,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;YACtB,IAAI,GAAG,aAAa,CAAC,OAAO,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC;YACjE,SAAS,GAAG,wBAAwB,CAAC;gBACnC,IAAI;gBACJ,aAAa;gBACb,mBAAmB,EAAE,OAAO,CAAC,mBAAmB,IAAI,EAAE;gBACtD,qBAAqB,EAAE,OAAO,CAAC,qBAAqB,IAAI,EAAE;aAC3D,CAAC,CAAC;YACH,0DAA0D;YAC1D,QAAQ,EAAE,CAAC;QACb,CAAC;QACD,cAAc,CAAC,MAAM;YACnB,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAClC,CAAC,MAAM,EAAE,EAAE,CACT,MAAM,CAAC,IAAI,KAAK,+BAA+B;gBAC/C,MAAM,CAAC,IAAI,KAAK,4CAA4C,CAC/D,CAAC;YACF,eAAe,GAAG,QAAQ,EAAE,GAAG,EAAE,eAAe,CAAC;YACjD,IAAI,QAAQ,IAAI,CAAC,eAAe,EAAE,CAAC;gBACjC,MAAM,IAAI,KAAK,CACb,sHAAsH,CACvH,CAAC;YACJ,CAAC;YACD,mBAAmB,EAAE,CAAC;QACxB,CAAC;QACD,UAAU;YACR,SAAS,CAAC,KAAK,EAAE,CAAC;YAClB,QAAQ,EAAE,CAAC;YACX,mBAAmB,EAAE,CAAC;QACxB,CAAC;QACD,eAAe,CAAC,MAAM;YACpB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC;YACxC,KAAK,MAAM,KAAK,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAU,EAAE,CAAC;gBACzD,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,EAAE;oBAChC,IAAI,CAAC,SAAS,CAAC,qBAAqB,CAAC,IAAI,CAAC;wBAAE,OAAO;oBACnD,SAAS,CAAC,oBAAoB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;oBAC5C,QAAQ,EAAE,CAAC;gBACb,CAAC,CAAC,CAAC;YACL,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,OAAe,EAAE,IAAY;IACtD,MAAM,SAAS,GAAG,aAAa,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC9E,OAAO,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;AAClE,CAAC;AAED,SAAS,cAAc,CAAC,IAAY,EAAE,IAAY;IAChD,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC1C,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC;QAAE,OAAO,KAAK,CAAC;IACzC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACpD,IAAI,MAAM,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAChC,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE;QACrC,IACE,SAAS,CAAC,IAAI,KAAK,wBAAwB;YAC3C,SAAS,CAAC,UAAU,KAAK,MAAM,EAC/B,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QACD,MAAM,WAAW,GAAG,SAAS,CAAC,WAAW,CAAC;QAC1C,IAAI,WAAW,EAAE,IAAI,KAAK,qBAAqB,EAAE,CAAC;YAChD,OAAO,WAAW,CAAC,YAAY,CAAC,IAAI,CAClC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,YAAY,IAAI,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,IAAI,CACjE,CAAC;QACJ,CAAC;QACD,IAAI,WAAW,EAAE,IAAI,KAAK,qBAAqB,EAAE,CAAC;YAChD,OAAO,WAAW,CAAC,EAAE,EAAE,IAAI,KAAK,IAAI,CAAC;QACvC,CAAC;QACD,OAAO,SAAS,CAAC,UAAU,CAAC,IAAI,CAC9B,CAAC,SAAS,EAAE,EAAE,CACZ,SAAS,CAAC,UAAU,KAAK,MAAM;YAC/B,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,KAAK,YAAY;gBACvC,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI;gBACzB,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,IAAI,CACzC,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,OAAe,EAAE,MAAc;IACvD,MAAM,IAAI,GAAG,SAAS,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IACtD,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAC5D,MAAM,iBAAiB,GAAG,CAAC,GAAW,EAAE,KAAc,EAAE,EAAE,CACxD,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC;IACxE,OAAO,CACL,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC;QAC/C,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,iBAAiB,CAAC,CACjD,CAAC;AACJ,CAAC"}
|