@sveltejs/kit 1.0.0-next.50 → 1.0.0-next.501
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +12 -9
- package/package.json +94 -67
- package/postinstall.js +38 -0
- package/scripts/special-types/$env+dynamic+private.md +10 -0
- package/scripts/special-types/$env+dynamic+public.md +8 -0
- package/scripts/special-types/$env+static+private.md +19 -0
- package/scripts/special-types/$env+static+public.md +7 -0
- package/scripts/special-types/$lib.md +5 -0
- package/src/cli.js +108 -0
- package/src/constants.js +7 -0
- package/src/core/adapt/builder.js +206 -0
- package/src/core/adapt/index.js +31 -0
- package/src/core/config/default-error.html +56 -0
- package/src/core/config/index.js +110 -0
- package/src/core/config/options.js +504 -0
- package/src/core/config/types.d.ts +1 -0
- package/src/core/env.js +121 -0
- package/src/core/generate_manifest/index.js +93 -0
- package/src/core/prerender/crawl.js +198 -0
- package/src/core/prerender/entities.js +2252 -0
- package/src/core/prerender/prerender.js +431 -0
- package/src/core/prerender/queue.js +80 -0
- package/src/core/sync/create_manifest_data/index.js +488 -0
- package/src/core/sync/create_manifest_data/types.d.ts +37 -0
- package/src/core/sync/sync.js +70 -0
- package/src/core/sync/utils.js +33 -0
- package/src/core/sync/write_ambient.js +53 -0
- package/src/core/sync/write_client_manifest.js +106 -0
- package/src/core/sync/write_matchers.js +25 -0
- package/src/core/sync/write_root.js +91 -0
- package/src/core/sync/write_tsconfig.js +195 -0
- package/src/core/sync/write_types/index.js +678 -0
- package/src/core/utils.js +70 -0
- package/src/exports/hooks/index.js +1 -0
- package/src/exports/hooks/sequence.js +44 -0
- package/src/exports/index.js +45 -0
- package/src/exports/node/index.js +173 -0
- package/src/exports/node/polyfills.js +41 -0
- package/src/exports/vite/build/build_server.js +378 -0
- package/src/exports/vite/build/build_service_worker.js +90 -0
- package/src/exports/vite/build/utils.js +180 -0
- package/src/exports/vite/dev/index.js +577 -0
- package/src/exports/vite/graph_analysis/index.js +277 -0
- package/src/exports/vite/graph_analysis/types.d.ts +5 -0
- package/src/exports/vite/graph_analysis/utils.js +30 -0
- package/src/exports/vite/index.js +598 -0
- package/src/exports/vite/preview/index.js +189 -0
- package/src/exports/vite/types.d.ts +3 -0
- package/src/exports/vite/utils.js +157 -0
- package/src/runtime/app/env.js +1 -0
- package/src/runtime/app/environment.js +11 -0
- package/src/runtime/app/forms.js +114 -0
- package/src/runtime/app/navigation.js +23 -0
- package/src/runtime/app/paths.js +1 -0
- package/src/runtime/app/stores.js +102 -0
- package/src/runtime/client/ambient.d.ts +30 -0
- package/src/runtime/client/client.js +1585 -0
- package/src/runtime/client/fetcher.js +107 -0
- package/src/runtime/client/parse.js +60 -0
- package/src/runtime/client/singletons.js +21 -0
- package/src/runtime/client/start.js +37 -0
- package/src/runtime/client/types.d.ts +84 -0
- package/src/runtime/client/utils.js +159 -0
- package/src/runtime/components/error.svelte +16 -0
- package/{assets → src/runtime}/components/layout.svelte +0 -0
- package/src/runtime/control.js +98 -0
- package/src/runtime/env/dynamic/private.js +1 -0
- package/src/runtime/env/dynamic/public.js +1 -0
- package/src/runtime/env-private.js +6 -0
- package/src/runtime/env-public.js +6 -0
- package/src/runtime/env.js +6 -0
- package/src/runtime/hash.js +16 -0
- package/src/runtime/paths.js +11 -0
- package/src/runtime/server/cookie.js +127 -0
- package/src/runtime/server/data/index.js +136 -0
- package/src/runtime/server/endpoint.js +90 -0
- package/src/runtime/server/index.js +340 -0
- package/src/runtime/server/page/actions.js +243 -0
- package/src/runtime/server/page/crypto.js +239 -0
- package/src/runtime/server/page/csp.js +250 -0
- package/src/runtime/server/page/fetch.js +301 -0
- package/src/runtime/server/page/index.js +304 -0
- package/src/runtime/server/page/load_data.js +112 -0
- package/src/runtime/server/page/render.js +342 -0
- package/src/runtime/server/page/respond_with_error.js +104 -0
- package/src/runtime/server/page/serialize_data.js +87 -0
- package/src/runtime/server/page/types.d.ts +41 -0
- package/src/runtime/server/utils.js +179 -0
- package/src/utils/array.js +9 -0
- package/src/utils/error.js +22 -0
- package/src/utils/escape.js +46 -0
- package/src/utils/filesystem.js +137 -0
- package/src/utils/functions.js +16 -0
- package/src/utils/http.js +55 -0
- package/src/utils/misc.js +1 -0
- package/src/utils/promises.js +17 -0
- package/src/utils/routing.js +117 -0
- package/src/utils/unit_test.js +11 -0
- package/src/utils/url.js +142 -0
- package/svelte-kit.js +1 -1
- package/types/ambient.d.ts +426 -0
- package/types/index.d.ts +444 -0
- package/types/internal.d.ts +378 -0
- package/types/private.d.ts +224 -0
- package/CHANGELOG.md +0 -484
- package/assets/components/error.svelte +0 -13
- package/assets/runtime/app/env.js +0 -5
- package/assets/runtime/app/navigation.js +0 -44
- package/assets/runtime/app/paths.js +0 -1
- package/assets/runtime/app/stores.js +0 -93
- package/assets/runtime/chunks/utils.js +0 -22
- package/assets/runtime/internal/singletons.js +0 -23
- package/assets/runtime/internal/start.js +0 -779
- package/assets/runtime/paths.js +0 -12
- package/dist/chunks/index.js +0 -3516
- package/dist/chunks/index2.js +0 -587
- package/dist/chunks/index3.js +0 -246
- package/dist/chunks/index4.js +0 -528
- package/dist/chunks/index5.js +0 -763
- package/dist/chunks/index6.js +0 -322
- package/dist/chunks/standard.js +0 -99
- package/dist/chunks/utils.js +0 -83
- package/dist/cli.js +0 -550
- package/dist/ssr.js +0 -2588
- package/types.d.ts +0 -89
- package/types.internal.d.ts +0 -191
|
@@ -0,0 +1,70 @@
|
|
|
1
|
+
import path from 'path';
|
|
2
|
+
import colors from 'kleur';
|
|
3
|
+
import { fileURLToPath } from 'url';
|
|
4
|
+
import { posixify } from '../utils/filesystem.js';
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Resolved path of the `runtime` directory
|
|
8
|
+
*
|
|
9
|
+
* TODO Windows issue:
|
|
10
|
+
* Vite or sth else somehow sets the driver letter inconsistently to lower or upper case depending on the run environment.
|
|
11
|
+
* In playwright debug mode run through VS Code this a root-to-lowercase conversion is needed in order for the tests to run.
|
|
12
|
+
* If we do this conversion in other cases it has the opposite effect though and fails.
|
|
13
|
+
*/
|
|
14
|
+
export const runtime_directory = posixify(fileURLToPath(new URL('../runtime', import.meta.url)));
|
|
15
|
+
|
|
16
|
+
/** Prefix for the `runtime` directory, for use with import declarations */
|
|
17
|
+
export const runtime_prefix = posixify_path(runtime_directory);
|
|
18
|
+
|
|
19
|
+
/**
|
|
20
|
+
* This allows us to import SvelteKit internals that aren't exposed via `pkg.exports` in a
|
|
21
|
+
* way that works whether `@sveltejs/kit` is installed inside the project's `node_modules`
|
|
22
|
+
* or in a workspace root
|
|
23
|
+
*/
|
|
24
|
+
export const runtime_base = runtime_directory.startsWith(process.cwd())
|
|
25
|
+
? `/${path.relative('.', runtime_directory)}`
|
|
26
|
+
: `/@fs${
|
|
27
|
+
// Windows/Linux separation - Windows starts with a drive letter, we need a / in front there
|
|
28
|
+
runtime_directory.startsWith('/') ? '' : '/'
|
|
29
|
+
}${runtime_directory}`;
|
|
30
|
+
|
|
31
|
+
/** @param {string} str */
|
|
32
|
+
function posixify_path(str) {
|
|
33
|
+
const parsed = path.parse(str);
|
|
34
|
+
return `/${parsed.dir.slice(parsed.root.length).split(path.sep).join('/')}/${parsed.base}`;
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
function noop() {}
|
|
38
|
+
|
|
39
|
+
/** @param {{ verbose: boolean }} opts */
|
|
40
|
+
export function logger({ verbose }) {
|
|
41
|
+
/** @type {import('types').Logger} */
|
|
42
|
+
const log = (msg) => console.log(msg.replace(/^/gm, ' '));
|
|
43
|
+
|
|
44
|
+
/** @param {string} msg */
|
|
45
|
+
const err = (msg) => console.error(msg.replace(/^/gm, ' '));
|
|
46
|
+
|
|
47
|
+
log.success = (msg) => log(colors.green(`✔ ${msg}`));
|
|
48
|
+
log.error = (msg) => err(colors.bold().red(msg));
|
|
49
|
+
log.warn = (msg) => log(colors.bold().yellow(msg));
|
|
50
|
+
|
|
51
|
+
log.minor = verbose ? (msg) => log(colors.grey(msg)) : noop;
|
|
52
|
+
log.info = verbose ? log : noop;
|
|
53
|
+
|
|
54
|
+
return log;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
/** @param {import('types').ManifestData} manifest_data */
|
|
58
|
+
export function get_mime_lookup(manifest_data) {
|
|
59
|
+
/** @type {Record<string, string>} */
|
|
60
|
+
const mime = {};
|
|
61
|
+
|
|
62
|
+
manifest_data.assets.forEach((asset) => {
|
|
63
|
+
if (asset.type) {
|
|
64
|
+
const ext = path.extname(asset.file);
|
|
65
|
+
mime[ext] = asset.type;
|
|
66
|
+
}
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
return mime;
|
|
70
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { sequence } from './sequence.js';
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @param {...import('types').Handle} handlers
|
|
3
|
+
* @returns {import('types').Handle}
|
|
4
|
+
*/
|
|
5
|
+
export function sequence(...handlers) {
|
|
6
|
+
const length = handlers.length;
|
|
7
|
+
if (!length) return ({ event, resolve }) => resolve(event);
|
|
8
|
+
|
|
9
|
+
return ({ event, resolve }) => {
|
|
10
|
+
return apply_handle(0, event, {});
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* @param {number} i
|
|
14
|
+
* @param {import('types').RequestEvent} event
|
|
15
|
+
* @param {import('types').ResolveOptions | undefined} parent_options
|
|
16
|
+
* @returns {import('types').MaybePromise<Response>}
|
|
17
|
+
*/
|
|
18
|
+
function apply_handle(i, event, parent_options) {
|
|
19
|
+
const handle = handlers[i];
|
|
20
|
+
|
|
21
|
+
return handle({
|
|
22
|
+
event,
|
|
23
|
+
resolve: (event, options) => {
|
|
24
|
+
/** @param {{ html: string, done: boolean }} opts */
|
|
25
|
+
const transformPageChunk = async ({ html, done }) => {
|
|
26
|
+
if (options?.transformPageChunk) {
|
|
27
|
+
html = (await options.transformPageChunk({ html, done })) ?? '';
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
if (parent_options?.transformPageChunk) {
|
|
31
|
+
html = (await parent_options.transformPageChunk({ html, done })) ?? '';
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
return html;
|
|
35
|
+
};
|
|
36
|
+
|
|
37
|
+
return i < length - 1
|
|
38
|
+
? apply_handle(i + 1, event, { transformPageChunk })
|
|
39
|
+
: resolve(event, { transformPageChunk });
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
};
|
|
44
|
+
}
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import { HttpError, Redirect, ValidationError } from '../runtime/control.js';
|
|
2
|
+
|
|
3
|
+
// For some reason we need to type the params as well here,
|
|
4
|
+
// JSdoc doesn't seem to like @type with function overloads
|
|
5
|
+
/**
|
|
6
|
+
* @type {import('@sveltejs/kit').error}
|
|
7
|
+
* @param {number} status
|
|
8
|
+
* @param {any} message
|
|
9
|
+
*/
|
|
10
|
+
export function error(status, message) {
|
|
11
|
+
return new HttpError(status, message);
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
/** @type {import('@sveltejs/kit').redirect} */
|
|
15
|
+
export function redirect(status, location) {
|
|
16
|
+
if (isNaN(status) || status < 300 || status > 399) {
|
|
17
|
+
throw new Error('Invalid status code');
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
return new Redirect(status, location);
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
/** @type {import('@sveltejs/kit').json} */
|
|
24
|
+
export function json(data, init) {
|
|
25
|
+
// TODO deprecate this in favour of `Response.json` when it's
|
|
26
|
+
// more widely supported
|
|
27
|
+
const headers = new Headers(init?.headers);
|
|
28
|
+
if (!headers.has('content-type')) {
|
|
29
|
+
headers.set('content-type', 'application/json');
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
return new Response(JSON.stringify(data), {
|
|
33
|
+
...init,
|
|
34
|
+
headers
|
|
35
|
+
});
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
/**
|
|
39
|
+
* Generates a `ValidationError` object.
|
|
40
|
+
* @param {number} status
|
|
41
|
+
* @param {Record<string, any> | undefined} [data]
|
|
42
|
+
*/
|
|
43
|
+
export function invalid(status, data) {
|
|
44
|
+
return new ValidationError(status, data);
|
|
45
|
+
}
|
|
@@ -0,0 +1,173 @@
|
|
|
1
|
+
import * as set_cookie_parser from 'set-cookie-parser';
|
|
2
|
+
import { error } from '../index.js';
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* @param {import('http').IncomingMessage} req
|
|
6
|
+
* @param {number} [body_size_limit]
|
|
7
|
+
*/
|
|
8
|
+
function get_raw_body(req, body_size_limit) {
|
|
9
|
+
const h = req.headers;
|
|
10
|
+
|
|
11
|
+
if (!h['content-type']) {
|
|
12
|
+
return null;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
const content_length = Number(h['content-length']);
|
|
16
|
+
|
|
17
|
+
// check if no request body
|
|
18
|
+
if (
|
|
19
|
+
(req.httpVersionMajor === 1 && isNaN(content_length) && h['transfer-encoding'] == null) ||
|
|
20
|
+
content_length === 0
|
|
21
|
+
) {
|
|
22
|
+
return null;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
let length = content_length;
|
|
26
|
+
|
|
27
|
+
if (body_size_limit) {
|
|
28
|
+
if (!length) {
|
|
29
|
+
length = body_size_limit;
|
|
30
|
+
} else if (length > body_size_limit) {
|
|
31
|
+
throw error(
|
|
32
|
+
413,
|
|
33
|
+
`Received content-length of ${length}, but only accept up to ${body_size_limit} bytes.`
|
|
34
|
+
);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
if (req.destroyed) {
|
|
39
|
+
const readable = new ReadableStream();
|
|
40
|
+
readable.cancel();
|
|
41
|
+
return readable;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
let size = 0;
|
|
45
|
+
let cancelled = false;
|
|
46
|
+
|
|
47
|
+
return new ReadableStream({
|
|
48
|
+
start(controller) {
|
|
49
|
+
req.on('error', (error) => {
|
|
50
|
+
cancelled = true;
|
|
51
|
+
controller.error(error);
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
req.on('end', () => {
|
|
55
|
+
if (cancelled) return;
|
|
56
|
+
controller.close();
|
|
57
|
+
});
|
|
58
|
+
|
|
59
|
+
req.on('data', (chunk) => {
|
|
60
|
+
if (cancelled) return;
|
|
61
|
+
|
|
62
|
+
size += chunk.length;
|
|
63
|
+
if (size > length) {
|
|
64
|
+
cancelled = true;
|
|
65
|
+
controller.error(
|
|
66
|
+
error(
|
|
67
|
+
413,
|
|
68
|
+
`request body size exceeded ${
|
|
69
|
+
content_length ? "'content-length'" : 'BODY_SIZE_LIMIT'
|
|
70
|
+
} of ${length}`
|
|
71
|
+
)
|
|
72
|
+
);
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
controller.enqueue(chunk);
|
|
77
|
+
|
|
78
|
+
if (controller.desiredSize === null || controller.desiredSize <= 0) {
|
|
79
|
+
req.pause();
|
|
80
|
+
}
|
|
81
|
+
});
|
|
82
|
+
},
|
|
83
|
+
|
|
84
|
+
pull() {
|
|
85
|
+
req.resume();
|
|
86
|
+
},
|
|
87
|
+
|
|
88
|
+
cancel(reason) {
|
|
89
|
+
cancelled = true;
|
|
90
|
+
req.destroy(reason);
|
|
91
|
+
}
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
/** @type {import('@sveltejs/kit/node').getRequest} */
|
|
96
|
+
export async function getRequest({ request, base, bodySizeLimit }) {
|
|
97
|
+
let headers = /** @type {Record<string, string>} */ (request.headers);
|
|
98
|
+
if (request.httpVersionMajor === 2) {
|
|
99
|
+
// we need to strip out the HTTP/2 pseudo-headers because node-fetch's
|
|
100
|
+
// Request implementation doesn't like them
|
|
101
|
+
// TODO is this still true with Node 18
|
|
102
|
+
headers = Object.assign({}, headers);
|
|
103
|
+
delete headers[':method'];
|
|
104
|
+
delete headers[':path'];
|
|
105
|
+
delete headers[':authority'];
|
|
106
|
+
delete headers[':scheme'];
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
return new Request(base + request.url, {
|
|
110
|
+
method: request.method,
|
|
111
|
+
headers,
|
|
112
|
+
body: get_raw_body(request, bodySizeLimit)
|
|
113
|
+
});
|
|
114
|
+
}
|
|
115
|
+
|
|
116
|
+
/** @type {import('@sveltejs/kit/node').setResponse} */
|
|
117
|
+
export async function setResponse(res, response) {
|
|
118
|
+
const headers = Object.fromEntries(response.headers);
|
|
119
|
+
|
|
120
|
+
if (response.headers.has('set-cookie')) {
|
|
121
|
+
const header = /** @type {string} */ (response.headers.get('set-cookie'));
|
|
122
|
+
const split = set_cookie_parser.splitCookiesString(header);
|
|
123
|
+
|
|
124
|
+
// @ts-expect-error
|
|
125
|
+
headers['set-cookie'] = split;
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
res.writeHead(response.status, headers);
|
|
129
|
+
|
|
130
|
+
if (!response.body) {
|
|
131
|
+
res.end();
|
|
132
|
+
return;
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
const reader = response.body.getReader();
|
|
136
|
+
|
|
137
|
+
if (res.destroyed) {
|
|
138
|
+
reader.cancel();
|
|
139
|
+
return;
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
const cancel = (/** @type {Error|undefined} */ error) => {
|
|
143
|
+
res.off('close', cancel);
|
|
144
|
+
res.off('error', cancel);
|
|
145
|
+
|
|
146
|
+
// If the reader has already been interrupted with an error earlier,
|
|
147
|
+
// then it will appear here, it is useless, but it needs to be catch.
|
|
148
|
+
reader.cancel(error).catch(() => {});
|
|
149
|
+
if (error) res.destroy(error);
|
|
150
|
+
};
|
|
151
|
+
|
|
152
|
+
res.on('close', cancel);
|
|
153
|
+
res.on('error', cancel);
|
|
154
|
+
|
|
155
|
+
next();
|
|
156
|
+
async function next() {
|
|
157
|
+
try {
|
|
158
|
+
for (;;) {
|
|
159
|
+
const { done, value } = await reader.read();
|
|
160
|
+
|
|
161
|
+
if (done) break;
|
|
162
|
+
|
|
163
|
+
if (!res.write(value)) {
|
|
164
|
+
res.once('drain', next);
|
|
165
|
+
return;
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
res.end();
|
|
169
|
+
} catch (error) {
|
|
170
|
+
cancel(error instanceof Error ? error : new Error(String(error)));
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import { fetch, Response, Request, Headers } from 'undici';
|
|
2
|
+
import { ReadableStream, TransformStream, WritableStream } from 'stream/web';
|
|
3
|
+
import { Readable } from 'stream';
|
|
4
|
+
import { Request as NodeFetchRequest, FormData } from 'node-fetch';
|
|
5
|
+
import { webcrypto as crypto } from 'crypto';
|
|
6
|
+
|
|
7
|
+
/** @type {Record<string, any>} */
|
|
8
|
+
const globals = {
|
|
9
|
+
crypto,
|
|
10
|
+
fetch,
|
|
11
|
+
Response,
|
|
12
|
+
// TODO remove the superclass as soon as Undici supports formData
|
|
13
|
+
// https://github.com/nodejs/undici/issues/974
|
|
14
|
+
Request: class extends Request {
|
|
15
|
+
// @ts-expect-error
|
|
16
|
+
formData() {
|
|
17
|
+
return new NodeFetchRequest(this.url, {
|
|
18
|
+
method: this.method,
|
|
19
|
+
headers: this.headers,
|
|
20
|
+
body: this.body && Readable.from(this.body)
|
|
21
|
+
}).formData();
|
|
22
|
+
}
|
|
23
|
+
},
|
|
24
|
+
Headers,
|
|
25
|
+
ReadableStream,
|
|
26
|
+
TransformStream,
|
|
27
|
+
WritableStream,
|
|
28
|
+
FormData
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
// exported for dev/preview and node environments
|
|
32
|
+
export function installPolyfills() {
|
|
33
|
+
for (const name in globals) {
|
|
34
|
+
Object.defineProperty(globalThis, name, {
|
|
35
|
+
enumerable: true,
|
|
36
|
+
configurable: true,
|
|
37
|
+
writable: true,
|
|
38
|
+
value: globals[name]
|
|
39
|
+
});
|
|
40
|
+
}
|
|
41
|
+
}
|