@delali/narsil 0.4.1 → 0.4.2-next.273
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 +1 -1
- package/dist/adapters/filesystem.d.ts +1 -1
- package/dist/adapters/filesystem.mjs +9 -3
- package/dist/adapters/gcs.d.ts +1 -1
- package/dist/adapters/indexeddb.d.ts +6 -1
- package/dist/adapters/indexeddb.mjs +20 -26
- package/dist/adapters/memory.d.ts +1 -1
- package/dist/adapters/s3.d.ts +1 -1
- package/dist/{adapters-pljAqmrC.d.ts → adapters-8LcdNB77.d.ts} +18 -1
- package/dist/browser/{chunk-QAOVAYAG.mjs → chunk-56UNHLAF.mjs} +1 -1
- package/dist/browser/{chunk-GBJSEHVJ.mjs → chunk-EKISQBV2.mjs} +283 -244
- package/dist/browser/{chunk-YINZFPLT.mjs → chunk-VAPCFSMX.mjs} +1 -1
- package/dist/browser/{chunk-4E5APHTM.mjs → chunk-VIVG3OXM.mjs} +1 -1
- package/dist/browser/{durability-config-75NSFCQN.mjs → durability-config-UP3OTUMB.mjs} +34 -2
- package/dist/browser/{msgpack-leaf-44XNWSSY.mjs → msgpack-leaf-76Q5SZ5S.mjs} +23 -10
- package/dist/browser/{optional-reads-6LN3HMUH.mjs → optional-reads-NQO5DKM4.mjs} +18 -16
- package/dist/browser/{optional-writes-76DWMRQH.mjs → optional-writes-3HKIVZFU.mjs} +295 -106
- package/dist/browser/{segment-codec-leaf-A427QJUX.mjs → segment-codec-leaf-GXSRX5VT.mjs} +47 -30
- package/dist/browser/{storage-leaf-5UTR5K7J.mjs → storage-leaf-42IZEOJJ.mjs} +1473 -305
- package/dist/{capabilities-BOFFMx84.d.ts → capabilities-BoWiLNv7.d.ts} +76 -61
- package/dist/{chunk-Z7XSHKOF.mjs → chunk-35RWLUVY.mjs} +63 -144
- package/dist/{chunk-6GHX35ZM.mjs → chunk-43T3P3BE.mjs} +1 -1
- package/dist/{chunk-IL5DRCNU.mjs → chunk-4JLHHEBN.mjs} +1 -1
- package/dist/{chunk-DKIMHIBC.mjs → chunk-4YIVY3PB.mjs} +2 -2
- package/dist/{react-native/chunks/chunk-ZUJCUPVS.mjs → chunk-5SHWA6PE.mjs} +1 -1
- package/dist/{chunk-2K24MEYV.mjs → chunk-6LVQ3GLT.mjs} +3 -3
- package/dist/{chunk-DDUXEJXW.mjs → chunk-6SIEVWMG.mjs} +45 -22
- package/dist/{chunk-WM5KJSQV.mjs → chunk-ACNHJOGC.mjs} +1 -1
- package/dist/{chunk-755NM4PL.mjs → chunk-BWPVDIRN.mjs} +183 -21
- package/dist/{chunk-SMQPZHPS.mjs → chunk-C57GWAXN.mjs} +1 -1
- package/dist/{chunk-357KIU5E.mjs → chunk-DRZP5MSG.mjs} +5 -5
- package/dist/{chunk-MYN4K5IS.mjs → chunk-DZMD4OMD.mjs} +1 -1
- package/dist/{chunk-7P5YWDRQ.mjs → chunk-EY5U4P5V.mjs} +1 -1
- package/dist/{chunk-X3EQCQLP.mjs → chunk-EZJ6HBG7.mjs} +2 -2
- package/dist/{chunk-WC5KAWXQ.mjs → chunk-FE2XILWN.mjs} +4 -4
- package/dist/{chunk-CERPUGRK.mjs → chunk-G3KVEHIW.mjs} +2 -2
- package/dist/{chunk-B3MO37YF.mjs → chunk-GTGQLCEI.mjs} +1 -1
- package/dist/{chunk-MSJD74GN.mjs → chunk-H23FB267.mjs} +5 -5
- package/dist/{chunk-UNEEFTEU.mjs → chunk-HZ3OAUTL.mjs} +2 -1
- package/dist/{chunk-M3B7SGJB.mjs → chunk-KL4ORYJW.mjs} +6 -6
- package/dist/{chunk-WTMCGZ74.mjs → chunk-KXA77DPZ.mjs} +2 -2
- package/dist/{chunk-6I6OO6B2.mjs → chunk-LRIJ7U3T.mjs} +4 -4
- package/dist/{chunk-3IE3A74H.mjs → chunk-PNFP5THV.mjs} +3 -3
- package/dist/{react-native/chunks/chunk-4FUCRLSA.mjs → chunk-PQWK7KXS.mjs} +1 -1
- package/dist/{chunk-P4F4UWLC.mjs → chunk-PSO7V7VW.mjs} +17 -3
- package/dist/{chunk-OGYSPNL2.mjs → chunk-QNZJYMCF.mjs} +7 -7
- package/dist/{chunk-DBC4EJWB.mjs → chunk-R3PFPFME.mjs} +1 -1
- package/dist/{chunk-MSIN4NM3.mjs → chunk-S3JHYPH7.mjs} +6 -1
- package/dist/{chunk-MI6UZGUR.mjs → chunk-SPA7GXST.mjs} +3 -3
- package/dist/{chunk-PP3W5PQQ.mjs → chunk-WYH3QHBK.mjs} +698 -451
- package/dist/{chunk-D456ZFPQ.mjs → chunk-X5V25BPN.mjs} +2 -2
- package/dist/{chunk-GXCDWLQI.mjs → chunk-Y7GXGJFZ.mjs} +23 -10
- package/dist/{chunk-NCIGNQJE.mjs → chunk-YGRJLI2Z.mjs} +930 -387
- package/dist/{react-native/chunks/chunk-MMPBO4WR.mjs → chunk-ZO7VLAIT.mjs} +2 -2
- package/dist/{chunk-AXDB6KUQ.mjs → chunk-ZTB7AWTW.mjs} +4 -4
- package/dist/chunk-ZYEEOZTT.mjs +52 -0
- package/dist/{client-BhNxHtcZ.d.ts → client-B0NPZSKY.d.ts} +4 -4
- package/dist/client.d.ts +9 -9
- package/dist/client.mjs +2 -2
- package/dist/{config-P9zW3Zz7.d.ts → config-B3-sw887.d.ts} +3 -3
- package/dist/{config-BJSL7piq.d.ts → config-DL_nkguq.d.ts} +4 -4
- package/dist/{direct-executor-GWJXDFLD.mjs → direct-executor-7G57AYXH.mjs} +4 -4
- package/dist/distribution/coordinator/etcd.d.ts +3 -3
- package/dist/distribution/coordinator/etcd.mjs +33 -3
- package/dist/distribution/coordinator/in-memory.d.ts +3 -3
- package/dist/distribution/transport/grpc.mjs +4 -4
- package/dist/distribution/transport/in-memory.mjs +1 -1
- package/dist/distribution/transport/tcp.mjs +12 -7
- package/dist/distribution.d.ts +8 -8
- package/dist/distribution.mjs +167 -91
- package/dist/{durability-config-VWS2K24E.mjs → durability-config-HWKWP35M.mjs} +34 -2
- package/dist/embeddings/openai.d.ts +7 -3
- package/dist/embeddings/openai.mjs +37 -31
- package/dist/{engine-DoFnkRoF.d.ts → engine-DGG_yX0p.d.ts} +3 -3
- package/dist/{index-B_vmxpgW.d.ts → index-fX_FbuRT.d.ts} +1 -1
- package/dist/index.browser.mjs +3 -3
- package/dist/index.d.ts +7 -7
- package/dist/index.mjs +4 -4
- package/dist/index.react-native.mjs +4 -4
- package/dist/invalidation/broadcast-channel.d.ts +1 -1
- package/dist/invalidation/filesystem.d.ts +1 -1
- package/dist/invalidation/noop.d.ts +1 -1
- package/dist/{long-query-thread-GNTDYDOZ.mjs → long-query-thread-KPN7NSOC.mjs} +14 -14
- package/dist/msgpack-leaf-LIT7TKZW.mjs +9 -0
- package/dist/{optional-reads-UCS23AWP.mjs → optional-reads-ESDVS225.mjs} +18 -16
- package/dist/{optional-writes-2AHJCGTY.mjs → optional-writes-CSULLISE.mjs} +9 -8
- package/dist/{paged-partition-archive-GBAHDT55.mjs → paged-partition-archive-BKQADXOT.mjs} +13 -13
- package/dist/partial-words.browser.mjs +3 -3
- package/dist/partial-words.mjs +4 -4
- package/dist/pattern.browser.mjs +2 -2
- package/dist/pattern.mjs +2 -2
- package/dist/persistence/durability/checkpoint-worker.d.ts +2 -2
- package/dist/persistence/durability/checkpoint-worker.mjs +14 -14
- package/dist/{query-actions-IDCUA7UV.mjs → query-actions-HTSJKZRU.mjs} +4 -4
- package/dist/query-suggestions/merge-worker.mjs +7 -7
- package/dist/query-suggestions.browser.mjs +3 -3
- package/dist/query-suggestions.d.ts +3 -3
- package/dist/query-suggestions.mjs +5 -5
- package/dist/react-native/chunks/{chunk-MRH36RN3.mjs → chunk-AOLLV37A.mjs} +1 -1
- package/dist/react-native/chunks/{chunk-UO44MA5M.mjs → chunk-DN4FT62B.mjs} +23 -10
- package/dist/react-native/chunks/{chunk-TG56N5JC.mjs → chunk-EF4Y5C3Y.mjs} +2 -2
- package/dist/react-native/chunks/{chunk-HTBY4GON.mjs → chunk-ESVBC3AT.mjs} +1 -1
- package/dist/{chunk-F26DOOUH.mjs → react-native/chunks/chunk-H6LK5WCF.mjs} +1 -1
- package/dist/react-native/chunks/{chunk-LPX26NNL.mjs → chunk-JEYZQA4Z.mjs} +699 -451
- package/dist/react-native/chunks/{chunk-AJAH6X7W.mjs → chunk-KJQ3BUVM.mjs} +4 -4
- package/dist/{chunk-UHLFCGZ3.mjs → react-native/chunks/chunk-QYVRD6C5.mjs} +2 -2
- package/dist/react-native/chunks/{chunk-SCGBU47K.mjs → chunk-X3VY2YT4.mjs} +2 -2
- package/dist/{chunk-R2PJKSNL.mjs → react-native/chunks/chunk-ZF3VSGEI.mjs} +1 -1
- package/dist/react-native/chunks/{durability-config-FCSD4MXY.mjs → durability-config-HJETGZVB.mjs} +34 -2
- package/dist/react-native/chunks/msgpack-leaf-FOUPTT7J.mjs +7 -0
- package/dist/react-native/chunks/{optional-reads-4XCJ34QG.mjs → optional-reads-TN3PT6M4.mjs} +18 -16
- package/dist/react-native/chunks/{optional-writes-XYZVTBFB.mjs → optional-writes-MGFFGKYQ.mjs} +8 -7
- package/dist/react-native/chunks/{restore-queue-NOKQZJ2Z.mjs → restore-queue-MVJTP3E4.mjs} +7 -7
- package/dist/react-native/chunks/{segment-codec-leaf-3ZXBJVKH.mjs → segment-codec-leaf-PSWHL55A.mjs} +5 -5
- package/dist/react-native/chunks/{segment-merge-leaf-3Z7MMPWE.mjs → segment-merge-leaf-WOJWSDLW.mjs} +6 -6
- package/dist/react-native/chunks/{storage-leaf-KJOX3MMW.mjs → storage-leaf-ZUN6Y44X.mjs} +1481 -314
- package/dist/react-native/chunks/{store-leaf-QGLVSO5X.mjs → store-leaf-K5XG46FV.mjs} +6 -6
- package/dist/react-native/chunks/{suggestions-leaf-6GI5ZSW6.mjs → suggestions-leaf-KDPM3P27.mjs} +6 -6
- package/dist/react-native/chunks/{worker-copies-ALOD7TSP.mjs → worker-copies-FVFMBBH6.mjs} +5 -5
- package/dist/react-native/partial-words.mjs +4 -4
- package/dist/react-native/pattern.mjs +2 -2
- package/dist/react-native/query-suggestions.mjs +4 -4
- package/dist/react-native/sync.mjs +4 -4
- package/dist/react-native/synonyms.mjs +4 -4
- package/dist/react.d.ts +10 -10
- package/dist/react.mjs +0 -2
- package/dist/{rerank-HB6DU6GS.mjs → rerank-3QEJNMFH.mjs} +4 -4
- package/dist/rerankers/http.d.ts +1 -1
- package/dist/rerankers/http.mjs +19 -15
- package/dist/{restore-queue-VUQHGCXE.mjs → restore-queue-Q76Q4S35.mjs} +7 -7
- package/dist/{schema-CzG9OUw5.d.ts → schema-CFnQ-WI3.d.ts} +1 -1
- package/dist/{segment-codec-leaf-TW2FPAAT.mjs → segment-codec-leaf-BSDDR7DQ.mjs} +5 -5
- package/dist/{segment-merge-leaf-BS3QV5PZ.mjs → segment-merge-leaf-6TT66HC5.mjs} +5 -5
- package/dist/server.d.ts +86 -12
- package/dist/server.mjs +2243 -1918
- package/dist/{storage-leaf-5IG2HPNY.mjs → storage-leaf-R5JQ2X2M.mjs} +1193 -219
- package/dist/{store-leaf-ZWSOK2DV.mjs → store-leaf-NCGETZYY.mjs} +6 -6
- package/dist/{suggestions-leaf-MUZNKQVF.mjs → suggestions-leaf-TX3GTD6S.mjs} +8 -8
- package/dist/sync/filesystem.d.ts +4 -4
- package/dist/sync/filesystem.mjs +12 -12
- package/dist/sync/indexeddb.browser.mjs +1 -1
- package/dist/sync/indexeddb.d.ts +4 -4
- package/dist/sync/indexeddb.mjs +2 -2
- package/dist/sync.browser.mjs +4 -4
- package/dist/sync.d.ts +5 -5
- package/dist/sync.mjs +4 -4
- package/dist/synonyms.browser.mjs +3 -3
- package/dist/synonyms.mjs +4 -4
- package/dist/{tasks-DrLiolTG.d.ts → tasks-B2MDjPL0.d.ts} +4 -4
- package/dist/{thread-6ZBCENAP.mjs → thread-VLVPAUWC.mjs} +13 -13
- package/dist/{types-pS-mAJmX.d.ts → types-DGjk684l.d.ts} +2 -2
- package/dist/vector/search-worker.d.ts +2 -2
- package/dist/{worker-copies-32HWFUH7.mjs → worker-copies-NZSBQZKG.mjs} +7 -7
- package/dist/workers/entry.mjs +16 -16
- package/package.json +12 -12
- package/dist/chunk-HLPRHOSO.mjs +0 -17
- package/dist/msgpack-leaf-H5ZYW7S7.mjs +0 -9
- package/dist/react-native/chunks/msgpack-leaf-JMNGSTRW.mjs +0 -7
|
@@ -250,11 +250,12 @@ async function rebuildTextIndexes(manager, hooks, target) {
|
|
|
250
250
|
// src/serialization/msgpack-without-fields.ts
|
|
251
251
|
var FORBIDDEN_KEYS = /* @__PURE__ */ new Set(["__proto__", "constructor", "prototype"]);
|
|
252
252
|
var keyDecoder = new TextDecoder("utf-8", { fatal: true, ignoreBOM: true });
|
|
253
|
+
var walkedHeader = { headerBytes: 0, bodyBytes: 0, children: 0 };
|
|
253
254
|
function endOfValue(view, start) {
|
|
254
255
|
let offset = start;
|
|
255
256
|
let pending = 1;
|
|
256
257
|
while (pending > 0) {
|
|
257
|
-
const header = headerAt(view, offset);
|
|
258
|
+
const header = headerAt(view, offset, walkedHeader);
|
|
258
259
|
if (header === null) return null;
|
|
259
260
|
offset += header.headerBytes + header.bodyBytes;
|
|
260
261
|
if (offset > view.byteLength) return null;
|
|
@@ -323,6 +324,8 @@ function decodeMapWithoutFields(bytes, skippedFields) {
|
|
|
323
324
|
var encoder = new TextEncoder();
|
|
324
325
|
var PROTO_KEY_BYTES = encoder.encode("__proto__");
|
|
325
326
|
var MISSING = { found: false, value: void 0 };
|
|
327
|
+
var mapHeader = { headerBytes: 0, bodyBytes: 0, children: 0 };
|
|
328
|
+
var keyHeader = { headerBytes: 0, bodyBytes: 0, children: 0 };
|
|
326
329
|
var pathDecoder = null;
|
|
327
330
|
function encodePathSegments(segments) {
|
|
328
331
|
if (segments.length === 0) return null;
|
|
@@ -349,14 +352,12 @@ function sameBytes(bytes, start, end, target) {
|
|
|
349
352
|
}
|
|
350
353
|
return true;
|
|
351
354
|
}
|
|
352
|
-
function
|
|
353
|
-
if (!isStringTag(view.getUint8(offset))) return
|
|
354
|
-
|
|
355
|
-
|
|
356
|
-
const start = offset + header.headerBytes;
|
|
357
|
-
return { start, end: start + header.bodyBytes };
|
|
355
|
+
function keyEndAt(view, offset) {
|
|
356
|
+
if (!isStringTag(view.getUint8(offset))) return -1;
|
|
357
|
+
if (headerAt(view, offset, keyHeader) === null) return -1;
|
|
358
|
+
return offset + keyHeader.headerBytes + keyHeader.bodyBytes;
|
|
358
359
|
}
|
|
359
|
-
function readEncodedPath(bytes, segments, arrays) {
|
|
360
|
+
function readEncodedPath(bytes, segments, arrays, foundRead) {
|
|
360
361
|
const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
|
|
361
362
|
let start = 0;
|
|
362
363
|
let end = bytes.length;
|
|
@@ -368,20 +369,21 @@ function readEncodedPath(bytes, segments, arrays) {
|
|
|
368
369
|
if (isArrayTag(tag)) return arrays === "missing" ? MISSING : null;
|
|
369
370
|
return isScalarTag(tag) ? MISSING : null;
|
|
370
371
|
}
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
let offset = start +
|
|
372
|
+
if (headerAt(view, start, mapHeader) === null) return null;
|
|
373
|
+
const pairs = mapHeader.children / 2;
|
|
374
|
+
let offset = start + mapHeader.headerBytes;
|
|
374
375
|
let valueStart = -1;
|
|
375
376
|
let valueEnd = -1;
|
|
376
|
-
for (let pair = 0; pair <
|
|
377
|
+
for (let pair = 0; pair < pairs; pair++) {
|
|
377
378
|
if (offset >= end) return null;
|
|
378
|
-
const
|
|
379
|
-
if (
|
|
380
|
-
|
|
381
|
-
|
|
379
|
+
const keyEnd = keyEndAt(view, offset);
|
|
380
|
+
if (keyEnd < 0 || keyEnd > end) return null;
|
|
381
|
+
const keyStart = offset + keyHeader.headerBytes;
|
|
382
|
+
if (sameBytes(bytes, keyStart, keyEnd, PROTO_KEY_BYTES)) return null;
|
|
383
|
+
const next = endOfValue(view, keyEnd);
|
|
382
384
|
if (next === null || next > end) return null;
|
|
383
|
-
if (sameBytes(bytes,
|
|
384
|
-
valueStart =
|
|
385
|
+
if (sameBytes(bytes, keyStart, keyEnd, segments[depth])) {
|
|
386
|
+
valueStart = keyEnd;
|
|
385
387
|
valueEnd = next;
|
|
386
388
|
}
|
|
387
389
|
offset = next;
|
|
@@ -393,7 +395,8 @@ function readEncodedPath(bytes, segments, arrays) {
|
|
|
393
395
|
}
|
|
394
396
|
try {
|
|
395
397
|
pathDecoder ??= new Decoder();
|
|
396
|
-
|
|
398
|
+
foundRead.value = pathDecoder.decode(bytes.subarray(start, end));
|
|
399
|
+
return foundRead;
|
|
397
400
|
} catch {
|
|
398
401
|
return null;
|
|
399
402
|
}
|
|
@@ -489,20 +492,35 @@ function wrapEncodedDocumentTable(data) {
|
|
|
489
492
|
}
|
|
490
493
|
function createEncodedDocumentSource(count, byteLength, bytesAt, discardedFields) {
|
|
491
494
|
const discarded = (discardedFields ?? []).map((fieldPath) => fieldPath.split("."));
|
|
492
|
-
const touchesDiscarded = (path) =>
|
|
495
|
+
const touchesDiscarded = (path) => {
|
|
496
|
+
for (const discardedPath of discarded) {
|
|
497
|
+
if (sharesPrefix(discardedPath, path)) return true;
|
|
498
|
+
}
|
|
499
|
+
return false;
|
|
500
|
+
};
|
|
493
501
|
const docAt = (ordinal) => documentWithOwnBuffers(decodeStoredDocument(bytesAt(ordinal), discardedFields));
|
|
494
|
-
function projectedPathAt(ordinal, path) {
|
|
502
|
+
function projectedPathAt(ordinal, path, result) {
|
|
495
503
|
const segments = encodedProjectionPathOf(path);
|
|
496
504
|
if (segments === null) return { found: false, value: void 0 };
|
|
497
|
-
const read = touchesDiscarded(path) ? null : readEncodedPath(bytesAt(ordinal), segments, "missing");
|
|
505
|
+
const read = touchesDiscarded(path) ? null : readEncodedPath(bytesAt(ordinal), segments, "missing", result);
|
|
498
506
|
if (read === null) return readProjectedPath(docAt(ordinal), path);
|
|
499
|
-
|
|
507
|
+
if (!read.found) return read;
|
|
508
|
+
read.value = valueWithOwnBuffers(read.value);
|
|
509
|
+
return read;
|
|
510
|
+
}
|
|
511
|
+
function projectedAt(ordinal, projection) {
|
|
512
|
+
if (projection === void 0 || projection.kind === "full") return docAt(ordinal);
|
|
513
|
+
if (projection.kind === "none") return {};
|
|
514
|
+
if (projection.include === null) return cloneProjected(docAt(ordinal), projection);
|
|
515
|
+
const result = { found: true, value: void 0 };
|
|
516
|
+
return projectIncludedPaths(projection.include, projection.exclude, (path) => projectedPathAt(ordinal, path, result));
|
|
500
517
|
}
|
|
501
518
|
return {
|
|
502
519
|
count,
|
|
503
520
|
byteLength,
|
|
504
521
|
docAt,
|
|
505
|
-
readAt(ordinal) {
|
|
522
|
+
readAt(ordinal, fields) {
|
|
523
|
+
if (fields !== void 0) return projectedAt(ordinal, fields);
|
|
506
524
|
return decodeStoredDocument(bytesAt(ordinal), discardedFields);
|
|
507
525
|
},
|
|
508
526
|
fieldReader(fieldPath) {
|
|
@@ -511,16 +529,15 @@ function createEncodedDocumentSource(count, byteLength, bytesAt, discardedFields
|
|
|
511
529
|
if (segments === null) return () => void 0;
|
|
512
530
|
const decodesDocument = touchesDiscarded(path);
|
|
513
531
|
return (ordinal) => {
|
|
514
|
-
const read = decodesDocument ? null : readEncodedPath(bytesAt(ordinal), segments, "decode-document");
|
|
532
|
+
const read = decodesDocument ? null : readEncodedPath(bytesAt(ordinal), segments, "decode-document", { found: true, value: void 0 });
|
|
515
533
|
if (read !== null) return valueWithOwnBuffers(read.value);
|
|
516
534
|
return getNestedValue(docAt(ordinal), fieldPath);
|
|
517
535
|
};
|
|
518
536
|
},
|
|
519
|
-
projectedAt
|
|
520
|
-
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
return projectIncludedPaths(projection.include, projection.exclude, (path) => projectedPathAt(ordinal, path));
|
|
537
|
+
projectedAt,
|
|
538
|
+
copyForRollbackAt(ordinal) {
|
|
539
|
+
const bytes = bytesAt(ordinal).slice();
|
|
540
|
+
return () => documentWithOwnBuffers(decodeStoredDocument(bytes, discardedFields));
|
|
524
541
|
}
|
|
525
542
|
};
|
|
526
543
|
}
|