@mandujs/core 0.12.2 → 0.13.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/README.ko.md +304 -304
- package/README.md +653 -653
- package/package.json +1 -1
- package/src/brain/architecture/analyzer.ts +28 -26
- package/src/brain/doctor/analyzer.ts +1 -1
- package/src/bundler/build.ts +91 -91
- package/src/bundler/css.ts +302 -302
- package/src/bundler/dev.ts +0 -1
- package/src/change/history.ts +3 -3
- package/src/change/snapshot.ts +10 -9
- package/src/change/transaction.ts +2 -2
- package/src/client/Link.tsx +227 -227
- package/src/client/globals.ts +44 -44
- package/src/client/hooks.ts +267 -267
- package/src/client/index.ts +5 -5
- package/src/client/island.ts +8 -8
- package/src/client/router.ts +435 -435
- package/src/client/runtime.ts +23 -23
- package/src/client/serialize.ts +404 -404
- package/src/client/window-state.ts +101 -101
- package/src/config/mandu.ts +94 -96
- package/src/config/validate.ts +213 -215
- package/src/config/watcher.ts +311 -311
- package/src/constants.ts +40 -40
- package/src/content/content-layer.ts +314 -314
- package/src/content/content.test.ts +433 -433
- package/src/content/data-store.ts +245 -245
- package/src/content/digest.ts +133 -133
- package/src/content/index.ts +164 -164
- package/src/content/loader-context.ts +172 -172
- package/src/content/loaders/api.ts +216 -216
- package/src/content/loaders/file.ts +169 -169
- package/src/content/loaders/glob.ts +252 -252
- package/src/content/loaders/index.ts +34 -34
- package/src/content/loaders/types.ts +137 -137
- package/src/content/meta-store.ts +209 -209
- package/src/content/types.ts +282 -282
- package/src/content/watcher.ts +135 -135
- package/src/contract/client-safe.test.ts +42 -42
- package/src/contract/client-safe.ts +114 -114
- package/src/contract/client.ts +16 -16
- package/src/contract/define.ts +459 -459
- package/src/contract/handler.ts +10 -10
- package/src/contract/normalize.test.ts +276 -276
- package/src/contract/normalize.ts +404 -404
- package/src/contract/registry.test.ts +206 -206
- package/src/contract/registry.ts +568 -568
- package/src/contract/schema.ts +48 -48
- package/src/contract/types.ts +58 -58
- package/src/contract/validator.ts +32 -32
- package/src/devtools/ai/context-builder.ts +375 -375
- package/src/devtools/ai/index.ts +25 -25
- package/src/devtools/ai/mcp-connector.ts +465 -465
- package/src/devtools/client/catchers/error-catcher.ts +327 -327
- package/src/devtools/client/catchers/index.ts +18 -18
- package/src/devtools/client/catchers/network-proxy.ts +363 -363
- package/src/devtools/client/components/index.ts +39 -39
- package/src/devtools/client/components/kitchen-root.tsx +362 -362
- package/src/devtools/client/components/mandu-character.tsx +241 -241
- package/src/devtools/client/components/overlay.tsx +368 -368
- package/src/devtools/client/components/panel/errors-panel.tsx +259 -259
- package/src/devtools/client/components/panel/guard-panel.tsx +244 -244
- package/src/devtools/client/components/panel/index.ts +32 -32
- package/src/devtools/client/components/panel/islands-panel.tsx +304 -304
- package/src/devtools/client/components/panel/network-panel.tsx +292 -292
- package/src/devtools/client/components/panel/panel-container.tsx +259 -259
- package/src/devtools/client/filters/context-filters.ts +282 -282
- package/src/devtools/client/filters/index.ts +16 -16
- package/src/devtools/client/index.ts +63 -63
- package/src/devtools/client/persistence.ts +335 -335
- package/src/devtools/client/state-manager.ts +478 -478
- package/src/devtools/design-tokens.ts +263 -263
- package/src/devtools/hook/create-hook.ts +207 -207
- package/src/devtools/hook/index.ts +13 -13
- package/src/devtools/index.ts +439 -439
- package/src/devtools/init.ts +266 -266
- package/src/devtools/protocol.ts +237 -237
- package/src/devtools/server/index.ts +17 -17
- package/src/devtools/server/source-context.ts +444 -444
- package/src/devtools/types.ts +319 -319
- package/src/devtools/worker/index.ts +25 -25
- package/src/devtools/worker/redaction-worker.ts +222 -222
- package/src/devtools/worker/worker-manager.ts +409 -409
- package/src/error/classifier.ts +2 -2
- package/src/error/domains.ts +265 -265
- package/src/error/formatter.ts +32 -32
- package/src/error/result.ts +46 -46
- package/src/error/stack-analyzer.ts +5 -0
- package/src/error/types.ts +6 -6
- package/src/errors/extractor.ts +409 -409
- package/src/errors/index.ts +19 -19
- package/src/filling/auth.ts +308 -308
- package/src/filling/context.ts +569 -569
- package/src/filling/deps.ts +238 -238
- package/src/generator/contract-glue.ts +2 -1
- package/src/generator/generate.ts +12 -10
- package/src/generator/index.ts +3 -3
- package/src/generator/templates.ts +80 -79
- package/src/guard/analyzer.ts +360 -360
- package/src/guard/ast-analyzer.ts +806 -806
- package/src/guard/auto-correct.ts +1 -1
- package/src/guard/check.ts +128 -128
- package/src/guard/contract-guard.ts +9 -9
- package/src/guard/file-type.test.ts +24 -24
- package/src/guard/presets/atomic.ts +70 -70
- package/src/guard/presets/clean.ts +77 -77
- package/src/guard/presets/cqrs.test.ts +35 -14
- package/src/guard/presets/fsd.ts +79 -79
- package/src/guard/presets/hexagonal.ts +68 -68
- package/src/guard/presets/index.ts +291 -291
- package/src/guard/reporter.ts +445 -445
- package/src/guard/rules.ts +12 -12
- package/src/guard/statistics.ts +578 -578
- package/src/guard/suggestions.ts +358 -358
- package/src/guard/types.ts +348 -348
- package/src/guard/validator.ts +834 -834
- package/src/guard/watcher.ts +404 -404
- package/src/index.ts +1 -0
- package/src/intent/index.ts +310 -310
- package/src/island/index.ts +304 -304
- package/src/logging/index.ts +22 -22
- package/src/logging/transports.ts +365 -365
- package/src/paths.test.ts +47 -0
- package/src/paths.ts +47 -0
- package/src/plugins/index.ts +38 -38
- package/src/plugins/registry.ts +377 -377
- package/src/plugins/types.ts +363 -363
- package/src/report/build.ts +1 -1
- package/src/report/index.ts +1 -1
- package/src/router/fs-patterns.ts +387 -387
- package/src/router/fs-routes.ts +344 -401
- package/src/router/fs-scanner.ts +497 -497
- package/src/router/fs-types.ts +270 -278
- package/src/router/index.ts +81 -81
- package/src/runtime/boundary.tsx +232 -232
- package/src/runtime/compose.ts +222 -222
- package/src/runtime/lifecycle.ts +381 -381
- package/src/runtime/logger.test.ts +345 -345
- package/src/runtime/logger.ts +677 -677
- package/src/runtime/router.test.ts +476 -476
- package/src/runtime/router.ts +105 -105
- package/src/runtime/security.ts +155 -155
- package/src/runtime/server.ts +24 -24
- package/src/runtime/session-key.ts +328 -328
- package/src/runtime/ssr.ts +367 -367
- package/src/runtime/streaming-ssr.ts +1245 -1245
- package/src/runtime/trace.ts +144 -144
- package/src/seo/index.ts +214 -214
- package/src/seo/integration/ssr.ts +307 -307
- package/src/seo/render/basic.ts +427 -427
- package/src/seo/render/index.ts +143 -143
- package/src/seo/render/jsonld.ts +539 -539
- package/src/seo/render/opengraph.ts +191 -191
- package/src/seo/render/robots.ts +116 -116
- package/src/seo/render/sitemap.ts +137 -137
- package/src/seo/render/twitter.ts +126 -126
- package/src/seo/resolve/index.ts +353 -353
- package/src/seo/resolve/opengraph.ts +143 -143
- package/src/seo/resolve/robots.ts +73 -73
- package/src/seo/resolve/title.ts +94 -94
- package/src/seo/resolve/twitter.ts +73 -73
- package/src/seo/resolve/url.ts +97 -97
- package/src/seo/routes/index.ts +290 -290
- package/src/seo/types.ts +575 -575
- package/src/slot/validator.ts +39 -39
- package/src/spec/index.ts +3 -3
- package/src/spec/load.ts +76 -76
- package/src/spec/lock.ts +56 -56
- package/src/utils/bun.ts +8 -8
- package/src/utils/lru-cache.ts +75 -75
- package/src/utils/safe-io.ts +188 -188
- package/src/utils/string-safe.ts +298 -298
- package/src/watcher/rules.ts +5 -5
package/src/client/router.ts
CHANGED
|
@@ -1,435 +1,435 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Mandu Client-side Router 🧭
|
|
3
|
-
* SPA 스타일 네비게이션을 위한 클라이언트 라우터
|
|
4
|
-
*/
|
|
5
|
-
|
|
6
|
-
import type { ReactNode } from "react";
|
|
7
|
-
import {
|
|
8
|
-
getManduData,
|
|
9
|
-
getManduRoute,
|
|
10
|
-
getRouterListeners,
|
|
11
|
-
getRouterState as getWindowRouterState,
|
|
12
|
-
setRouterState as setWindowRouterState,
|
|
13
|
-
setServerData,
|
|
14
|
-
} from "./window-state";
|
|
15
|
-
import { LRUCache } from "../utils/lru-cache";
|
|
16
|
-
import { LIMITS } from "../constants";
|
|
17
|
-
|
|
18
|
-
// ========== Types ==========
|
|
19
|
-
|
|
20
|
-
export interface RouteInfo {
|
|
21
|
-
id: string;
|
|
22
|
-
pattern: string;
|
|
23
|
-
params: Record<string, string>;
|
|
24
|
-
}
|
|
25
|
-
|
|
26
|
-
export interface NavigationState {
|
|
27
|
-
state: "idle" | "loading";
|
|
28
|
-
location?: string;
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
export interface RouterState {
|
|
32
|
-
currentRoute: RouteInfo | null;
|
|
33
|
-
loaderData: unknown;
|
|
34
|
-
navigation: NavigationState;
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
export interface NavigateOptions {
|
|
38
|
-
/** history.replaceState 사용 여부 */
|
|
39
|
-
replace?: boolean;
|
|
40
|
-
/** 스크롤 위치 복원 여부 */
|
|
41
|
-
scroll?: boolean;
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
type RouterListener = (state: RouterState) => void;
|
|
45
|
-
|
|
46
|
-
function getGlobalRouterState(): RouterState {
|
|
47
|
-
if (typeof window === "undefined") {
|
|
48
|
-
return { currentRoute: null, loaderData: undefined, navigation: { state: "idle" } };
|
|
49
|
-
}
|
|
50
|
-
if (!getWindowRouterState()) {
|
|
51
|
-
// SSR에서 주입된 __MANDU_ROUTE__에서 초기화
|
|
52
|
-
const route = getManduRoute();
|
|
53
|
-
const data = getManduData();
|
|
54
|
-
|
|
55
|
-
setWindowRouterState({
|
|
56
|
-
currentRoute: route
|
|
57
|
-
? {
|
|
58
|
-
id: route.id,
|
|
59
|
-
pattern: route.pattern,
|
|
60
|
-
params: route.params || {},
|
|
61
|
-
}
|
|
62
|
-
: null,
|
|
63
|
-
loaderData: route && data?.[route.id]?.serverData,
|
|
64
|
-
navigation: { state: "idle" },
|
|
65
|
-
});
|
|
66
|
-
}
|
|
67
|
-
return getWindowRouterState()!;
|
|
68
|
-
}
|
|
69
|
-
|
|
70
|
-
function setGlobalRouterState(state: RouterState): void {
|
|
71
|
-
if (typeof window !== "undefined") {
|
|
72
|
-
setWindowRouterState(state);
|
|
73
|
-
}
|
|
74
|
-
}
|
|
75
|
-
|
|
76
|
-
function getGlobalListeners(): Set<RouterListener> {
|
|
77
|
-
return getRouterListeners();
|
|
78
|
-
}
|
|
79
|
-
|
|
80
|
-
// Getter for routerState (전역 상태 참조)
|
|
81
|
-
const getRouterStateInternal = () => getGlobalRouterState();
|
|
82
|
-
const setRouterStateInternal = (state: RouterState) => setGlobalRouterState(state);
|
|
83
|
-
const listeners = { get current() { return getGlobalListeners(); } };
|
|
84
|
-
|
|
85
|
-
/**
|
|
86
|
-
* 초기화: 서버에서 전달된 라우트 정보로 상태 설정
|
|
87
|
-
*/
|
|
88
|
-
function initializeFromServer(): void {
|
|
89
|
-
if (typeof window === "undefined") return;
|
|
90
|
-
|
|
91
|
-
const route = getManduRoute();
|
|
92
|
-
const data = getManduData();
|
|
93
|
-
|
|
94
|
-
if (route) {
|
|
95
|
-
// URL에서 실제 params 추출
|
|
96
|
-
const params = extractParamsFromPath(route.pattern, window.location.pathname);
|
|
97
|
-
|
|
98
|
-
setRouterStateInternal({
|
|
99
|
-
currentRoute: {
|
|
100
|
-
id: route.id,
|
|
101
|
-
pattern: route.pattern,
|
|
102
|
-
params,
|
|
103
|
-
},
|
|
104
|
-
loaderData: data?.[route.id]?.serverData,
|
|
105
|
-
navigation: { state: "idle" },
|
|
106
|
-
});
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
|
|
110
|
-
// ========== Pattern Matching ==========
|
|
111
|
-
|
|
112
|
-
interface CompiledPattern {
|
|
113
|
-
regex: RegExp;
|
|
114
|
-
paramNames: string[];
|
|
115
|
-
}
|
|
116
|
-
|
|
117
|
-
const patternCache = new LRUCache<string, CompiledPattern>(LIMITS.ROUTER_PATTERN_CACHE);
|
|
118
|
-
|
|
119
|
-
/**
|
|
120
|
-
* 패턴을 정규식으로 컴파일
|
|
121
|
-
*/
|
|
122
|
-
function compilePattern(pattern: string): CompiledPattern {
|
|
123
|
-
const cached = patternCache.get(pattern);
|
|
124
|
-
if (cached) return cached;
|
|
125
|
-
|
|
126
|
-
const paramNames: string[] = [];
|
|
127
|
-
const PARAM_PLACEHOLDER = "\x00PARAM\x00";
|
|
128
|
-
const paramMatches: string[] = [];
|
|
129
|
-
|
|
130
|
-
const withPlaceholders = pattern.replace(
|
|
131
|
-
/:([a-zA-Z_][a-zA-Z0-9_]*)/g,
|
|
132
|
-
(_, paramName) => {
|
|
133
|
-
paramMatches.push(paramName);
|
|
134
|
-
return PARAM_PLACEHOLDER;
|
|
135
|
-
}
|
|
136
|
-
);
|
|
137
|
-
|
|
138
|
-
const escaped = withPlaceholders.replace(/[.*+?^${}()|[\]\\\/]/g, "\\$&");
|
|
139
|
-
|
|
140
|
-
let paramIndex = 0;
|
|
141
|
-
const regexStr = escaped.replace(
|
|
142
|
-
new RegExp(PARAM_PLACEHOLDER.replace(/\x00/g, "\\x00"), "g"),
|
|
143
|
-
() => {
|
|
144
|
-
paramNames.push(paramMatches[paramIndex++]);
|
|
145
|
-
return "([^/]+)";
|
|
146
|
-
}
|
|
147
|
-
);
|
|
148
|
-
|
|
149
|
-
const compiled = {
|
|
150
|
-
regex: new RegExp(`^${regexStr}$`),
|
|
151
|
-
paramNames,
|
|
152
|
-
};
|
|
153
|
-
|
|
154
|
-
patternCache.set(pattern, compiled);
|
|
155
|
-
return compiled;
|
|
156
|
-
}
|
|
157
|
-
|
|
158
|
-
/**
|
|
159
|
-
* 패턴에서 파라미터 추출
|
|
160
|
-
*/
|
|
161
|
-
function extractParamsFromPath(
|
|
162
|
-
pattern: string,
|
|
163
|
-
pathname: string
|
|
164
|
-
): Record<string, string> {
|
|
165
|
-
const compiled = compilePattern(pattern);
|
|
166
|
-
const match = pathname.match(compiled.regex);
|
|
167
|
-
|
|
168
|
-
if (!match) return {};
|
|
169
|
-
|
|
170
|
-
const params: Record<string, string> = {};
|
|
171
|
-
compiled.paramNames.forEach((name, index) => {
|
|
172
|
-
params[name] = match[index + 1];
|
|
173
|
-
});
|
|
174
|
-
|
|
175
|
-
return params;
|
|
176
|
-
}
|
|
177
|
-
|
|
178
|
-
// ========== Navigation ==========
|
|
179
|
-
|
|
180
|
-
/**
|
|
181
|
-
* 페이지 네비게이션
|
|
182
|
-
*/
|
|
183
|
-
export async function navigate(
|
|
184
|
-
to: string,
|
|
185
|
-
options: NavigateOptions = {}
|
|
186
|
-
): Promise<void> {
|
|
187
|
-
const { replace = false, scroll = true } = options;
|
|
188
|
-
|
|
189
|
-
try {
|
|
190
|
-
const url = new URL(to, window.location.origin);
|
|
191
|
-
|
|
192
|
-
// 외부 URL은 일반 네비게이션
|
|
193
|
-
if (url.origin !== window.location.origin) {
|
|
194
|
-
window.location.href = to;
|
|
195
|
-
return;
|
|
196
|
-
}
|
|
197
|
-
|
|
198
|
-
// 로딩 상태 시작
|
|
199
|
-
setRouterStateInternal({
|
|
200
|
-
...getRouterStateInternal(),
|
|
201
|
-
navigation: { state: "loading", location: to },
|
|
202
|
-
});
|
|
203
|
-
notifyListeners();
|
|
204
|
-
|
|
205
|
-
// 데이터 fetch
|
|
206
|
-
const dataUrl = `${url.pathname}${url.search ? url.search + "&" : "?"}_data=1`;
|
|
207
|
-
const response = await fetch(dataUrl);
|
|
208
|
-
|
|
209
|
-
if (!response.ok) {
|
|
210
|
-
// 에러 시 full navigation fallback
|
|
211
|
-
window.location.href = to;
|
|
212
|
-
return;
|
|
213
|
-
}
|
|
214
|
-
|
|
215
|
-
const data = await response.json();
|
|
216
|
-
|
|
217
|
-
// History 업데이트
|
|
218
|
-
const historyState = { routeId: data.routeId, params: data.params };
|
|
219
|
-
if (replace) {
|
|
220
|
-
history.replaceState(historyState, "", to);
|
|
221
|
-
} else {
|
|
222
|
-
history.pushState(historyState, "", to);
|
|
223
|
-
}
|
|
224
|
-
|
|
225
|
-
// 상태 업데이트
|
|
226
|
-
setRouterStateInternal({
|
|
227
|
-
currentRoute: {
|
|
228
|
-
id: data.routeId,
|
|
229
|
-
pattern: data.pattern,
|
|
230
|
-
params: data.params,
|
|
231
|
-
},
|
|
232
|
-
loaderData: data.loaderData,
|
|
233
|
-
navigation: { state: "idle" },
|
|
234
|
-
});
|
|
235
|
-
|
|
236
|
-
// __MANDU_DATA__ 업데이트
|
|
237
|
-
setServerData(data.routeId, data.loaderData);
|
|
238
|
-
|
|
239
|
-
notifyListeners();
|
|
240
|
-
|
|
241
|
-
// 스크롤 복원
|
|
242
|
-
if (scroll) {
|
|
243
|
-
window.scrollTo(0, 0);
|
|
244
|
-
}
|
|
245
|
-
} catch (error) {
|
|
246
|
-
console.error("[Mandu Router] Navigation failed:", error);
|
|
247
|
-
// 에러 시 full navigation fallback
|
|
248
|
-
window.location.href = to;
|
|
249
|
-
}
|
|
250
|
-
}
|
|
251
|
-
|
|
252
|
-
/**
|
|
253
|
-
* 뒤로가기/앞으로가기 처리
|
|
254
|
-
*/
|
|
255
|
-
function handlePopState(event: PopStateEvent): void {
|
|
256
|
-
const state = event.state;
|
|
257
|
-
|
|
258
|
-
if (state?.routeId) {
|
|
259
|
-
// Mandu로 방문한 페이지 - 데이터 다시 fetch
|
|
260
|
-
navigate(window.location.pathname + window.location.search, {
|
|
261
|
-
replace: true,
|
|
262
|
-
scroll: false,
|
|
263
|
-
});
|
|
264
|
-
} else {
|
|
265
|
-
// 직접 URL 입력 등으로 방문한 페이지 - 상태만 업데이트
|
|
266
|
-
const route = getManduRoute();
|
|
267
|
-
setGlobalRouterState({
|
|
268
|
-
currentRoute: route ? {
|
|
269
|
-
id: route.id,
|
|
270
|
-
pattern: route.pattern,
|
|
271
|
-
params: route.params || {},
|
|
272
|
-
} : null,
|
|
273
|
-
loaderData: getGlobalRouterState().loaderData,
|
|
274
|
-
navigation: { state: "idle" },
|
|
275
|
-
});
|
|
276
|
-
notifyListeners();
|
|
277
|
-
}
|
|
278
|
-
}
|
|
279
|
-
|
|
280
|
-
// ========== State Management ==========
|
|
281
|
-
|
|
282
|
-
/**
|
|
283
|
-
* 리스너에게 상태 변경 알림
|
|
284
|
-
*/
|
|
285
|
-
function notifyListeners(): void {
|
|
286
|
-
const state = getRouterStateInternal();
|
|
287
|
-
for (const listener of listeners.current) {
|
|
288
|
-
try {
|
|
289
|
-
listener(state);
|
|
290
|
-
} catch (error) {
|
|
291
|
-
console.error("[Mandu Router] Listener error:", error);
|
|
292
|
-
}
|
|
293
|
-
}
|
|
294
|
-
}
|
|
295
|
-
|
|
296
|
-
/**
|
|
297
|
-
* 상태 변경 구독
|
|
298
|
-
*/
|
|
299
|
-
export function subscribe(listener: RouterListener): () => void {
|
|
300
|
-
listeners.current.add(listener);
|
|
301
|
-
return () => listeners.current.delete(listener);
|
|
302
|
-
}
|
|
303
|
-
|
|
304
|
-
/**
|
|
305
|
-
* 현재 라우터 상태 가져오기
|
|
306
|
-
*/
|
|
307
|
-
export function getRouterState(): RouterState {
|
|
308
|
-
return getRouterStateInternal();
|
|
309
|
-
}
|
|
310
|
-
|
|
311
|
-
/**
|
|
312
|
-
* 현재 라우트 정보 가져오기
|
|
313
|
-
*/
|
|
314
|
-
export function getCurrentRoute(): RouteInfo | null {
|
|
315
|
-
return getRouterStateInternal().currentRoute;
|
|
316
|
-
}
|
|
317
|
-
|
|
318
|
-
/**
|
|
319
|
-
* 현재 loader 데이터 가져오기
|
|
320
|
-
*/
|
|
321
|
-
export function getLoaderData<T = unknown>(): T | undefined {
|
|
322
|
-
return getRouterStateInternal().loaderData as T | undefined;
|
|
323
|
-
}
|
|
324
|
-
|
|
325
|
-
/**
|
|
326
|
-
* 네비게이션 상태 가져오기
|
|
327
|
-
*/
|
|
328
|
-
export function getNavigationState(): NavigationState {
|
|
329
|
-
return getRouterStateInternal().navigation;
|
|
330
|
-
}
|
|
331
|
-
|
|
332
|
-
// ========== Link Click Handler ==========
|
|
333
|
-
|
|
334
|
-
/**
|
|
335
|
-
* 링크 클릭 이벤트 핸들러 (이벤트 위임용)
|
|
336
|
-
*/
|
|
337
|
-
function handleLinkClick(event: MouseEvent): void {
|
|
338
|
-
// 기본 동작 조건 체크
|
|
339
|
-
if (
|
|
340
|
-
event.defaultPrevented ||
|
|
341
|
-
event.button !== 0 ||
|
|
342
|
-
event.metaKey ||
|
|
343
|
-
event.altKey ||
|
|
344
|
-
event.ctrlKey ||
|
|
345
|
-
event.shiftKey
|
|
346
|
-
) {
|
|
347
|
-
return;
|
|
348
|
-
}
|
|
349
|
-
|
|
350
|
-
// 가장 가까운 앵커 태그 찾기
|
|
351
|
-
const anchor = (event.target as HTMLElement).closest("a");
|
|
352
|
-
if (!anchor) return;
|
|
353
|
-
|
|
354
|
-
// data-mandu-link 속성이 있는 링크만 처리
|
|
355
|
-
if (!anchor.hasAttribute("data-mandu-link")) return;
|
|
356
|
-
|
|
357
|
-
const href = anchor.getAttribute("href");
|
|
358
|
-
if (!href) return;
|
|
359
|
-
|
|
360
|
-
// 외부 링크 체크
|
|
361
|
-
try {
|
|
362
|
-
const url = new URL(href, window.location.origin);
|
|
363
|
-
if (url.origin !== window.location.origin) return;
|
|
364
|
-
} catch {
|
|
365
|
-
return;
|
|
366
|
-
}
|
|
367
|
-
|
|
368
|
-
// 기본 동작 방지 및 Client-side 네비게이션
|
|
369
|
-
event.preventDefault();
|
|
370
|
-
navigate(href);
|
|
371
|
-
}
|
|
372
|
-
|
|
373
|
-
// ========== Prefetch ==========
|
|
374
|
-
|
|
375
|
-
const prefetchedUrls = new LRUCache<string, true>(LIMITS.ROUTER_PREFETCH_CACHE);
|
|
376
|
-
|
|
377
|
-
/**
|
|
378
|
-
* 페이지 데이터 미리 로드
|
|
379
|
-
*/
|
|
380
|
-
export async function prefetch(url: string): Promise<void> {
|
|
381
|
-
if (prefetchedUrls.has(url)) return;
|
|
382
|
-
|
|
383
|
-
try {
|
|
384
|
-
const dataUrl = `${url}${url.includes("?") ? "&" : "?"}_data=1`;
|
|
385
|
-
await fetch(dataUrl, { priority: "low" } as RequestInit);
|
|
386
|
-
prefetchedUrls.set(url, true);
|
|
387
|
-
} catch {
|
|
388
|
-
// Prefetch 실패는 무시
|
|
389
|
-
}
|
|
390
|
-
}
|
|
391
|
-
|
|
392
|
-
// ========== Initialization ==========
|
|
393
|
-
|
|
394
|
-
let initialized = false;
|
|
395
|
-
|
|
396
|
-
/**
|
|
397
|
-
* 라우터 초기화
|
|
398
|
-
*/
|
|
399
|
-
export function initializeRouter(): void {
|
|
400
|
-
if (typeof window === "undefined" || initialized) return;
|
|
401
|
-
|
|
402
|
-
initialized = true;
|
|
403
|
-
|
|
404
|
-
// 서버 데이터로 초기화
|
|
405
|
-
initializeFromServer();
|
|
406
|
-
|
|
407
|
-
// popstate 이벤트 리스너
|
|
408
|
-
window.addEventListener("popstate", handlePopState);
|
|
409
|
-
|
|
410
|
-
// 링크 클릭 이벤트 위임
|
|
411
|
-
document.addEventListener("click", handleLinkClick);
|
|
412
|
-
|
|
413
|
-
console.log("[Mandu Router] Initialized");
|
|
414
|
-
}
|
|
415
|
-
|
|
416
|
-
/**
|
|
417
|
-
* 라우터 정리
|
|
418
|
-
*/
|
|
419
|
-
export function cleanupRouter(): void {
|
|
420
|
-
if (typeof window === "undefined" || !initialized) return;
|
|
421
|
-
|
|
422
|
-
window.removeEventListener("popstate", handlePopState);
|
|
423
|
-
document.removeEventListener("click", handleLinkClick);
|
|
424
|
-
listeners.clear();
|
|
425
|
-
initialized = false;
|
|
426
|
-
}
|
|
427
|
-
|
|
428
|
-
// 자동 초기화 (DOM 준비 시)
|
|
429
|
-
if (typeof window !== "undefined") {
|
|
430
|
-
if (document.readyState === "loading") {
|
|
431
|
-
document.addEventListener("DOMContentLoaded", initializeRouter);
|
|
432
|
-
} else {
|
|
433
|
-
initializeRouter();
|
|
434
|
-
}
|
|
435
|
-
}
|
|
1
|
+
/**
|
|
2
|
+
* Mandu Client-side Router 🧭
|
|
3
|
+
* SPA 스타일 네비게이션을 위한 클라이언트 라우터
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
import type { ReactNode } from "react";
|
|
7
|
+
import {
|
|
8
|
+
getManduData,
|
|
9
|
+
getManduRoute,
|
|
10
|
+
getRouterListeners,
|
|
11
|
+
getRouterState as getWindowRouterState,
|
|
12
|
+
setRouterState as setWindowRouterState,
|
|
13
|
+
setServerData,
|
|
14
|
+
} from "./window-state";
|
|
15
|
+
import { LRUCache } from "../utils/lru-cache";
|
|
16
|
+
import { LIMITS } from "../constants";
|
|
17
|
+
|
|
18
|
+
// ========== Types ==========
|
|
19
|
+
|
|
20
|
+
export interface RouteInfo {
|
|
21
|
+
id: string;
|
|
22
|
+
pattern: string;
|
|
23
|
+
params: Record<string, string>;
|
|
24
|
+
}
|
|
25
|
+
|
|
26
|
+
export interface NavigationState {
|
|
27
|
+
state: "idle" | "loading";
|
|
28
|
+
location?: string;
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
export interface RouterState {
|
|
32
|
+
currentRoute: RouteInfo | null;
|
|
33
|
+
loaderData: unknown;
|
|
34
|
+
navigation: NavigationState;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
export interface NavigateOptions {
|
|
38
|
+
/** history.replaceState 사용 여부 */
|
|
39
|
+
replace?: boolean;
|
|
40
|
+
/** 스크롤 위치 복원 여부 */
|
|
41
|
+
scroll?: boolean;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
type RouterListener = (state: RouterState) => void;
|
|
45
|
+
|
|
46
|
+
function getGlobalRouterState(): RouterState {
|
|
47
|
+
if (typeof window === "undefined") {
|
|
48
|
+
return { currentRoute: null, loaderData: undefined, navigation: { state: "idle" } };
|
|
49
|
+
}
|
|
50
|
+
if (!getWindowRouterState()) {
|
|
51
|
+
// SSR에서 주입된 __MANDU_ROUTE__에서 초기화
|
|
52
|
+
const route = getManduRoute();
|
|
53
|
+
const data = getManduData();
|
|
54
|
+
|
|
55
|
+
setWindowRouterState({
|
|
56
|
+
currentRoute: route
|
|
57
|
+
? {
|
|
58
|
+
id: route.id,
|
|
59
|
+
pattern: route.pattern,
|
|
60
|
+
params: route.params || {},
|
|
61
|
+
}
|
|
62
|
+
: null,
|
|
63
|
+
loaderData: route && data?.[route.id]?.serverData,
|
|
64
|
+
navigation: { state: "idle" },
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
return getWindowRouterState()!;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
function setGlobalRouterState(state: RouterState): void {
|
|
71
|
+
if (typeof window !== "undefined") {
|
|
72
|
+
setWindowRouterState(state);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
function getGlobalListeners(): Set<RouterListener> {
|
|
77
|
+
return getRouterListeners();
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
// Getter for routerState (전역 상태 참조)
|
|
81
|
+
const getRouterStateInternal = () => getGlobalRouterState();
|
|
82
|
+
const setRouterStateInternal = (state: RouterState) => setGlobalRouterState(state);
|
|
83
|
+
const listeners = { get current() { return getGlobalListeners(); } };
|
|
84
|
+
|
|
85
|
+
/**
|
|
86
|
+
* 초기화: 서버에서 전달된 라우트 정보로 상태 설정
|
|
87
|
+
*/
|
|
88
|
+
function initializeFromServer(): void {
|
|
89
|
+
if (typeof window === "undefined") return;
|
|
90
|
+
|
|
91
|
+
const route = getManduRoute();
|
|
92
|
+
const data = getManduData();
|
|
93
|
+
|
|
94
|
+
if (route) {
|
|
95
|
+
// URL에서 실제 params 추출
|
|
96
|
+
const params = extractParamsFromPath(route.pattern, window.location.pathname);
|
|
97
|
+
|
|
98
|
+
setRouterStateInternal({
|
|
99
|
+
currentRoute: {
|
|
100
|
+
id: route.id,
|
|
101
|
+
pattern: route.pattern,
|
|
102
|
+
params,
|
|
103
|
+
},
|
|
104
|
+
loaderData: data?.[route.id]?.serverData,
|
|
105
|
+
navigation: { state: "idle" },
|
|
106
|
+
});
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
// ========== Pattern Matching ==========
|
|
111
|
+
|
|
112
|
+
interface CompiledPattern {
|
|
113
|
+
regex: RegExp;
|
|
114
|
+
paramNames: string[];
|
|
115
|
+
}
|
|
116
|
+
|
|
117
|
+
const patternCache = new LRUCache<string, CompiledPattern>(LIMITS.ROUTER_PATTERN_CACHE);
|
|
118
|
+
|
|
119
|
+
/**
|
|
120
|
+
* 패턴을 정규식으로 컴파일
|
|
121
|
+
*/
|
|
122
|
+
function compilePattern(pattern: string): CompiledPattern {
|
|
123
|
+
const cached = patternCache.get(pattern);
|
|
124
|
+
if (cached) return cached;
|
|
125
|
+
|
|
126
|
+
const paramNames: string[] = [];
|
|
127
|
+
const PARAM_PLACEHOLDER = "\x00PARAM\x00";
|
|
128
|
+
const paramMatches: string[] = [];
|
|
129
|
+
|
|
130
|
+
const withPlaceholders = pattern.replace(
|
|
131
|
+
/:([a-zA-Z_][a-zA-Z0-9_]*)/g,
|
|
132
|
+
(_, paramName) => {
|
|
133
|
+
paramMatches.push(paramName);
|
|
134
|
+
return PARAM_PLACEHOLDER;
|
|
135
|
+
}
|
|
136
|
+
);
|
|
137
|
+
|
|
138
|
+
const escaped = withPlaceholders.replace(/[.*+?^${}()|[\]\\\/]/g, "\\$&");
|
|
139
|
+
|
|
140
|
+
let paramIndex = 0;
|
|
141
|
+
const regexStr = escaped.replace(
|
|
142
|
+
new RegExp(PARAM_PLACEHOLDER.replace(/\x00/g, "\\x00"), "g"),
|
|
143
|
+
() => {
|
|
144
|
+
paramNames.push(paramMatches[paramIndex++]);
|
|
145
|
+
return "([^/]+)";
|
|
146
|
+
}
|
|
147
|
+
);
|
|
148
|
+
|
|
149
|
+
const compiled = {
|
|
150
|
+
regex: new RegExp(`^${regexStr}$`),
|
|
151
|
+
paramNames,
|
|
152
|
+
};
|
|
153
|
+
|
|
154
|
+
patternCache.set(pattern, compiled);
|
|
155
|
+
return compiled;
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
/**
|
|
159
|
+
* 패턴에서 파라미터 추출
|
|
160
|
+
*/
|
|
161
|
+
function extractParamsFromPath(
|
|
162
|
+
pattern: string,
|
|
163
|
+
pathname: string
|
|
164
|
+
): Record<string, string> {
|
|
165
|
+
const compiled = compilePattern(pattern);
|
|
166
|
+
const match = pathname.match(compiled.regex);
|
|
167
|
+
|
|
168
|
+
if (!match) return {};
|
|
169
|
+
|
|
170
|
+
const params: Record<string, string> = {};
|
|
171
|
+
compiled.paramNames.forEach((name, index) => {
|
|
172
|
+
params[name] = match[index + 1];
|
|
173
|
+
});
|
|
174
|
+
|
|
175
|
+
return params;
|
|
176
|
+
}
|
|
177
|
+
|
|
178
|
+
// ========== Navigation ==========
|
|
179
|
+
|
|
180
|
+
/**
|
|
181
|
+
* 페이지 네비게이션
|
|
182
|
+
*/
|
|
183
|
+
export async function navigate(
|
|
184
|
+
to: string,
|
|
185
|
+
options: NavigateOptions = {}
|
|
186
|
+
): Promise<void> {
|
|
187
|
+
const { replace = false, scroll = true } = options;
|
|
188
|
+
|
|
189
|
+
try {
|
|
190
|
+
const url = new URL(to, window.location.origin);
|
|
191
|
+
|
|
192
|
+
// 외부 URL은 일반 네비게이션
|
|
193
|
+
if (url.origin !== window.location.origin) {
|
|
194
|
+
window.location.href = to;
|
|
195
|
+
return;
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
// 로딩 상태 시작
|
|
199
|
+
setRouterStateInternal({
|
|
200
|
+
...getRouterStateInternal(),
|
|
201
|
+
navigation: { state: "loading", location: to },
|
|
202
|
+
});
|
|
203
|
+
notifyListeners();
|
|
204
|
+
|
|
205
|
+
// 데이터 fetch
|
|
206
|
+
const dataUrl = `${url.pathname}${url.search ? url.search + "&" : "?"}_data=1`;
|
|
207
|
+
const response = await fetch(dataUrl);
|
|
208
|
+
|
|
209
|
+
if (!response.ok) {
|
|
210
|
+
// 에러 시 full navigation fallback
|
|
211
|
+
window.location.href = to;
|
|
212
|
+
return;
|
|
213
|
+
}
|
|
214
|
+
|
|
215
|
+
const data = await response.json();
|
|
216
|
+
|
|
217
|
+
// History 업데이트
|
|
218
|
+
const historyState = { routeId: data.routeId, params: data.params };
|
|
219
|
+
if (replace) {
|
|
220
|
+
history.replaceState(historyState, "", to);
|
|
221
|
+
} else {
|
|
222
|
+
history.pushState(historyState, "", to);
|
|
223
|
+
}
|
|
224
|
+
|
|
225
|
+
// 상태 업데이트
|
|
226
|
+
setRouterStateInternal({
|
|
227
|
+
currentRoute: {
|
|
228
|
+
id: data.routeId,
|
|
229
|
+
pattern: data.pattern,
|
|
230
|
+
params: data.params,
|
|
231
|
+
},
|
|
232
|
+
loaderData: data.loaderData,
|
|
233
|
+
navigation: { state: "idle" },
|
|
234
|
+
});
|
|
235
|
+
|
|
236
|
+
// __MANDU_DATA__ 업데이트
|
|
237
|
+
setServerData(data.routeId, data.loaderData);
|
|
238
|
+
|
|
239
|
+
notifyListeners();
|
|
240
|
+
|
|
241
|
+
// 스크롤 복원
|
|
242
|
+
if (scroll) {
|
|
243
|
+
window.scrollTo(0, 0);
|
|
244
|
+
}
|
|
245
|
+
} catch (error) {
|
|
246
|
+
console.error("[Mandu Router] Navigation failed:", error);
|
|
247
|
+
// 에러 시 full navigation fallback
|
|
248
|
+
window.location.href = to;
|
|
249
|
+
}
|
|
250
|
+
}
|
|
251
|
+
|
|
252
|
+
/**
|
|
253
|
+
* 뒤로가기/앞으로가기 처리
|
|
254
|
+
*/
|
|
255
|
+
function handlePopState(event: PopStateEvent): void {
|
|
256
|
+
const state = event.state;
|
|
257
|
+
|
|
258
|
+
if (state?.routeId) {
|
|
259
|
+
// Mandu로 방문한 페이지 - 데이터 다시 fetch
|
|
260
|
+
navigate(window.location.pathname + window.location.search, {
|
|
261
|
+
replace: true,
|
|
262
|
+
scroll: false,
|
|
263
|
+
});
|
|
264
|
+
} else {
|
|
265
|
+
// 직접 URL 입력 등으로 방문한 페이지 - 상태만 업데이트
|
|
266
|
+
const route = getManduRoute();
|
|
267
|
+
setGlobalRouterState({
|
|
268
|
+
currentRoute: route ? {
|
|
269
|
+
id: route.id,
|
|
270
|
+
pattern: route.pattern,
|
|
271
|
+
params: route.params || {},
|
|
272
|
+
} : null,
|
|
273
|
+
loaderData: getGlobalRouterState().loaderData,
|
|
274
|
+
navigation: { state: "idle" },
|
|
275
|
+
});
|
|
276
|
+
notifyListeners();
|
|
277
|
+
}
|
|
278
|
+
}
|
|
279
|
+
|
|
280
|
+
// ========== State Management ==========
|
|
281
|
+
|
|
282
|
+
/**
|
|
283
|
+
* 리스너에게 상태 변경 알림
|
|
284
|
+
*/
|
|
285
|
+
function notifyListeners(): void {
|
|
286
|
+
const state = getRouterStateInternal();
|
|
287
|
+
for (const listener of listeners.current) {
|
|
288
|
+
try {
|
|
289
|
+
listener(state);
|
|
290
|
+
} catch (error) {
|
|
291
|
+
console.error("[Mandu Router] Listener error:", error);
|
|
292
|
+
}
|
|
293
|
+
}
|
|
294
|
+
}
|
|
295
|
+
|
|
296
|
+
/**
|
|
297
|
+
* 상태 변경 구독
|
|
298
|
+
*/
|
|
299
|
+
export function subscribe(listener: RouterListener): () => void {
|
|
300
|
+
listeners.current.add(listener);
|
|
301
|
+
return () => listeners.current.delete(listener);
|
|
302
|
+
}
|
|
303
|
+
|
|
304
|
+
/**
|
|
305
|
+
* 현재 라우터 상태 가져오기
|
|
306
|
+
*/
|
|
307
|
+
export function getRouterState(): RouterState {
|
|
308
|
+
return getRouterStateInternal();
|
|
309
|
+
}
|
|
310
|
+
|
|
311
|
+
/**
|
|
312
|
+
* 현재 라우트 정보 가져오기
|
|
313
|
+
*/
|
|
314
|
+
export function getCurrentRoute(): RouteInfo | null {
|
|
315
|
+
return getRouterStateInternal().currentRoute;
|
|
316
|
+
}
|
|
317
|
+
|
|
318
|
+
/**
|
|
319
|
+
* 현재 loader 데이터 가져오기
|
|
320
|
+
*/
|
|
321
|
+
export function getLoaderData<T = unknown>(): T | undefined {
|
|
322
|
+
return getRouterStateInternal().loaderData as T | undefined;
|
|
323
|
+
}
|
|
324
|
+
|
|
325
|
+
/**
|
|
326
|
+
* 네비게이션 상태 가져오기
|
|
327
|
+
*/
|
|
328
|
+
export function getNavigationState(): NavigationState {
|
|
329
|
+
return getRouterStateInternal().navigation;
|
|
330
|
+
}
|
|
331
|
+
|
|
332
|
+
// ========== Link Click Handler ==========
|
|
333
|
+
|
|
334
|
+
/**
|
|
335
|
+
* 링크 클릭 이벤트 핸들러 (이벤트 위임용)
|
|
336
|
+
*/
|
|
337
|
+
function handleLinkClick(event: MouseEvent): void {
|
|
338
|
+
// 기본 동작 조건 체크
|
|
339
|
+
if (
|
|
340
|
+
event.defaultPrevented ||
|
|
341
|
+
event.button !== 0 ||
|
|
342
|
+
event.metaKey ||
|
|
343
|
+
event.altKey ||
|
|
344
|
+
event.ctrlKey ||
|
|
345
|
+
event.shiftKey
|
|
346
|
+
) {
|
|
347
|
+
return;
|
|
348
|
+
}
|
|
349
|
+
|
|
350
|
+
// 가장 가까운 앵커 태그 찾기
|
|
351
|
+
const anchor = (event.target as HTMLElement).closest("a");
|
|
352
|
+
if (!anchor) return;
|
|
353
|
+
|
|
354
|
+
// data-mandu-link 속성이 있는 링크만 처리
|
|
355
|
+
if (!anchor.hasAttribute("data-mandu-link")) return;
|
|
356
|
+
|
|
357
|
+
const href = anchor.getAttribute("href");
|
|
358
|
+
if (!href) return;
|
|
359
|
+
|
|
360
|
+
// 외부 링크 체크
|
|
361
|
+
try {
|
|
362
|
+
const url = new URL(href, window.location.origin);
|
|
363
|
+
if (url.origin !== window.location.origin) return;
|
|
364
|
+
} catch {
|
|
365
|
+
return;
|
|
366
|
+
}
|
|
367
|
+
|
|
368
|
+
// 기본 동작 방지 및 Client-side 네비게이션
|
|
369
|
+
event.preventDefault();
|
|
370
|
+
navigate(href);
|
|
371
|
+
}
|
|
372
|
+
|
|
373
|
+
// ========== Prefetch ==========
|
|
374
|
+
|
|
375
|
+
const prefetchedUrls = new LRUCache<string, true>(LIMITS.ROUTER_PREFETCH_CACHE);
|
|
376
|
+
|
|
377
|
+
/**
|
|
378
|
+
* 페이지 데이터 미리 로드
|
|
379
|
+
*/
|
|
380
|
+
export async function prefetch(url: string): Promise<void> {
|
|
381
|
+
if (prefetchedUrls.has(url)) return;
|
|
382
|
+
|
|
383
|
+
try {
|
|
384
|
+
const dataUrl = `${url}${url.includes("?") ? "&" : "?"}_data=1`;
|
|
385
|
+
await fetch(dataUrl, { priority: "low" } as RequestInit);
|
|
386
|
+
prefetchedUrls.set(url, true);
|
|
387
|
+
} catch {
|
|
388
|
+
// Prefetch 실패는 무시
|
|
389
|
+
}
|
|
390
|
+
}
|
|
391
|
+
|
|
392
|
+
// ========== Initialization ==========
|
|
393
|
+
|
|
394
|
+
let initialized = false;
|
|
395
|
+
|
|
396
|
+
/**
|
|
397
|
+
* 라우터 초기화
|
|
398
|
+
*/
|
|
399
|
+
export function initializeRouter(): void {
|
|
400
|
+
if (typeof window === "undefined" || initialized) return;
|
|
401
|
+
|
|
402
|
+
initialized = true;
|
|
403
|
+
|
|
404
|
+
// 서버 데이터로 초기화
|
|
405
|
+
initializeFromServer();
|
|
406
|
+
|
|
407
|
+
// popstate 이벤트 리스너
|
|
408
|
+
window.addEventListener("popstate", handlePopState);
|
|
409
|
+
|
|
410
|
+
// 링크 클릭 이벤트 위임
|
|
411
|
+
document.addEventListener("click", handleLinkClick);
|
|
412
|
+
|
|
413
|
+
console.log("[Mandu Router] Initialized");
|
|
414
|
+
}
|
|
415
|
+
|
|
416
|
+
/**
|
|
417
|
+
* 라우터 정리
|
|
418
|
+
*/
|
|
419
|
+
export function cleanupRouter(): void {
|
|
420
|
+
if (typeof window === "undefined" || !initialized) return;
|
|
421
|
+
|
|
422
|
+
window.removeEventListener("popstate", handlePopState);
|
|
423
|
+
document.removeEventListener("click", handleLinkClick);
|
|
424
|
+
listeners.clear();
|
|
425
|
+
initialized = false;
|
|
426
|
+
}
|
|
427
|
+
|
|
428
|
+
// 자동 초기화 (DOM 준비 시)
|
|
429
|
+
if (typeof window !== "undefined") {
|
|
430
|
+
if (document.readyState === "loading") {
|
|
431
|
+
document.addEventListener("DOMContentLoaded", initializeRouter);
|
|
432
|
+
} else {
|
|
433
|
+
initializeRouter();
|
|
434
|
+
}
|
|
435
|
+
}
|