@songtonyli/dsh-cli 0.1.81 → 0.1.82
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/bin/dsh.mjs +1 -1
- package/node_modules/@aws-sdk/core/dist-cjs/submodules/protocols/index.js +94 -1589
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/index.js +1 -7
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/AwsJsonRpcProtocol.js +1 -3
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/AwsRestJsonProtocol.js +1 -3
- package/node_modules/@aws-sdk/core/package.json +2 -2
- package/node_modules/@aws-sdk/credential-provider-env/package.json +3 -3
- package/node_modules/@aws-sdk/credential-provider-http/package.json +3 -3
- package/node_modules/@aws-sdk/credential-provider-ini/package.json +10 -10
- package/node_modules/@aws-sdk/credential-provider-login/package.json +4 -4
- package/node_modules/@aws-sdk/credential-provider-node/package.json +8 -8
- package/node_modules/@aws-sdk/credential-provider-process/package.json +3 -3
- package/node_modules/@aws-sdk/credential-provider-sso/package.json +5 -5
- package/node_modules/@aws-sdk/credential-provider-web-identity/package.json +4 -4
- package/node_modules/@aws-sdk/eventstream-handler-node/package.json +2 -2
- package/node_modules/@aws-sdk/middleware-eventstream/package.json +2 -2
- package/node_modules/@aws-sdk/middleware-websocket/package.json +3 -3
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/cognito-identity/index.js +1 -1
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/signin/index.js +1 -1
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sso/index.js +1 -1
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sso-oidc/index.js +1 -1
- package/node_modules/@aws-sdk/nested-clients/dist-cjs/submodules/sts/index.js +1 -1
- package/node_modules/@aws-sdk/nested-clients/package.json +3 -3
- package/node_modules/@aws-sdk/token-providers/dist-cjs/index.js +37 -19
- package/node_modules/@aws-sdk/token-providers/dist-es/fromSso.js +37 -19
- package/node_modules/@aws-sdk/token-providers/package.json +4 -4
- package/node_modules/@deepseek-ai/dsh-client-modules/lib/index.js +1 -1
- package/node_modules/@deepseek-ai/dsh-client-ui-sidebar/lib/client.js +1 -1
- package/node_modules/@deepseek-ai/dsh-subprocess-local/README.i18n.yaml +14 -14
- package/node_modules/@deepseek-ai/dsh-subprocess-local/README.md +7 -5
- package/node_modules/@deepseek-ai/dsh-subprocess-local/README.zh.md +7 -5
- package/node_modules/@deepseek-ai/dsh-subprocess-local/lib/index.js +15 -3
- package/node_modules/@deepseek-ai/dsh-subprocess-local/lib/runner-launch-f9xQyTek.js +1669 -0
- package/node_modules/@deepseek-ai/dsh-subprocess-local/lib/runner.js +1 -1
- package/node_modules/@deepseek-ai/dsh-tui-app/README.i18n.yaml +19 -16
- package/node_modules/@deepseek-ai/dsh-tui-app/README.md +25 -8
- package/node_modules/@deepseek-ai/dsh-tui-app/README.zh.md +25 -8
- package/node_modules/@deepseek-ai/dsh-tui-app/lib/index.js +325 -22
- package/node_modules/execa/lib/convert/duplex.js +8 -4
- package/node_modules/execa/lib/convert/readable.js +3 -8
- package/node_modules/execa/lib/convert/writable.js +6 -5
- package/node_modules/execa/lib/io/input-sync.js +2 -1
- package/node_modules/execa/lib/io/max-buffer.js +2 -1
- package/node_modules/execa/lib/io/output-sync.js +2 -1
- package/node_modules/execa/lib/methods/create.js +7 -0
- package/node_modules/execa/lib/methods/node.js +1 -1
- package/node_modules/execa/lib/methods/script.js +3 -3
- package/node_modules/execa/lib/resolve/all-async.js +2 -1
- package/node_modules/execa/lib/resolve/wait-subprocess.js +6 -0
- package/node_modules/execa/lib/stdio/handle-async.js +3 -2
- package/node_modules/execa/lib/stdio/handle.js +8 -3
- package/node_modules/execa/lib/transform/generator.js +7 -0
- package/node_modules/execa/lib/transform/run-sync.js +17 -5
- package/node_modules/execa/package.json +1 -1
- package/package.json +16 -16
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/JsonSettings.js +0 -1
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v1/JsonCodec.js +0 -20
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v1/JsonSettings.js +0 -1
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v1/JsonShapeDeserializer.js +0 -160
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v1/JsonShapeSerializer.js +0 -193
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v2/JsonBytesStringAdapter.js +0 -103
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v2/JsonCodec2.js +0 -20
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v2/JsonShapeDeserializer2.js +0 -200
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v2/JsonShapeSerializer2.js +0 -519
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/detectBufferParsing.js +0 -18
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/jsonReplacer.js +0 -46
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/jsonReviver.js +0 -121
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/needsReviver.js +0 -41
- package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/parseJsonBody.js +0 -89
|
@@ -142,10 +142,15 @@ const validateStreams = (stdioItems, isStdioArray) => {
|
|
|
142
142
|
}
|
|
143
143
|
};
|
|
144
144
|
|
|
145
|
-
//
|
|
145
|
+
// File descriptors can be passed as numbers or native objects with an `fd` property. Invalid descriptors can make `node:child_process` abort the current process with a fatal assertion instead of throwing.
|
|
146
146
|
const validateFileDescriptorStdio = ({type, value, optionName}) => {
|
|
147
|
-
if (type
|
|
148
|
-
|
|
147
|
+
if (type !== 'native') {
|
|
148
|
+
return;
|
|
149
|
+
}
|
|
150
|
+
|
|
151
|
+
const fileDescriptor = typeof value === 'number' ? value : value?.fd;
|
|
152
|
+
if (typeof fileDescriptor === 'number' && (!Number.isInteger(fileDescriptor) || fileDescriptor < 0 || fileDescriptor > MAX_FILE_DESCRIPTOR)) {
|
|
153
|
+
throw new TypeError(`The \`${optionName}\` option must be a non-negative 32-bit integer: got ${fileDescriptor}.`);
|
|
149
154
|
}
|
|
150
155
|
};
|
|
151
156
|
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import {Transform, getDefaultHighWaterMark} from 'node:stream';
|
|
2
|
+
import {Buffer} from 'node:buffer';
|
|
2
3
|
import {getStringEncoding} from '../arguments/encoding-option.js';
|
|
3
4
|
import {isAsyncGenerator} from '../stdio/type.js';
|
|
4
5
|
import {getSplitLinesGenerator, getAppendNewlineGenerator} from './split.js';
|
|
@@ -86,6 +87,12 @@ export const runGeneratorsSync = (chunks, stdioItems, encoding, isInput) => {
|
|
|
86
87
|
const reversedGenerators = isInput ? generators.reverse() : generators;
|
|
87
88
|
|
|
88
89
|
for (const {value, optionName} of reversedGenerators) {
|
|
90
|
+
// Byte-mode transforms encode strings before decoding them, like Transform's `decodeStrings` option.
|
|
91
|
+
if (!value.writableObjectMode) {
|
|
92
|
+
const stringEncoding = getStringEncoding(value.binary, encoding);
|
|
93
|
+
chunks = chunks.map(chunk => typeof chunk === 'string' ? Buffer.from(chunk, stringEncoding) : chunk);
|
|
94
|
+
}
|
|
95
|
+
|
|
89
96
|
const generators = addInternalGenerators(value, encoding, optionName);
|
|
90
97
|
chunks = runTransformSync(generators, chunks);
|
|
91
98
|
}
|
|
@@ -7,15 +7,27 @@ export const pushChunksSync = (getChunksSync, getChunksArguments, transformStrea
|
|
|
7
7
|
|
|
8
8
|
done();
|
|
9
9
|
} catch (error) {
|
|
10
|
-
done(error);
|
|
10
|
+
done(normalizeTransformError(error));
|
|
11
11
|
}
|
|
12
12
|
};
|
|
13
13
|
|
|
14
|
+
// Match `util.callbackify()` so falsy exceptions cannot be mistaken for callback success or missing errors.
|
|
15
|
+
const normalizeTransformError = error => error || Object.assign(new Error('Promise was rejected with falsy value'), {
|
|
16
|
+
code: 'ERR_FALSY_VALUE_REJECTION',
|
|
17
|
+
reason: error,
|
|
18
|
+
});
|
|
19
|
+
|
|
14
20
|
// Run synchronous generators with `execaSync()`
|
|
15
|
-
export const runTransformSync = (generators, chunks) =>
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
]
|
|
21
|
+
export const runTransformSync = (generators, chunks) => {
|
|
22
|
+
try {
|
|
23
|
+
return [
|
|
24
|
+
...chunks.flatMap(chunk => [...transformChunkSync(chunk, generators, 0)]),
|
|
25
|
+
...finalChunksSync(generators),
|
|
26
|
+
];
|
|
27
|
+
} catch (error) {
|
|
28
|
+
throw normalizeTransformError(error);
|
|
29
|
+
}
|
|
30
|
+
};
|
|
19
31
|
|
|
20
32
|
export const transformChunkSync = function * (chunk, generators, index) {
|
|
21
33
|
if (index === generators.length) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@songtonyli/dsh-cli",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.82",
|
|
4
4
|
"description": "The dsh terminal agent: an interactive TUI over the DeepSeek Harness, with its whole Node runtime bundled in one install.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -17,21 +17,21 @@
|
|
|
17
17
|
"@agentclientprotocol/sdk": "1.4.0",
|
|
18
18
|
"@anthropic-ai/sdk": "0.129.0",
|
|
19
19
|
"@aws-sdk/client-bedrock-runtime": "3.1127.0",
|
|
20
|
-
"@aws-sdk/core": "3.978.
|
|
21
|
-
"@aws-sdk/credential-provider-env": "3.972.
|
|
22
|
-
"@aws-sdk/credential-provider-http": "3.972.
|
|
23
|
-
"@aws-sdk/credential-provider-ini": "3.973.
|
|
24
|
-
"@aws-sdk/credential-provider-login": "3.972.
|
|
25
|
-
"@aws-sdk/credential-provider-node": "3.972.
|
|
26
|
-
"@aws-sdk/credential-provider-process": "3.972.
|
|
27
|
-
"@aws-sdk/credential-provider-sso": "3.973.
|
|
28
|
-
"@aws-sdk/credential-provider-web-identity": "3.972.
|
|
29
|
-
"@aws-sdk/eventstream-handler-node": "3.972.
|
|
30
|
-
"@aws-sdk/middleware-eventstream": "3.972.
|
|
31
|
-
"@aws-sdk/middleware-websocket": "3.972.
|
|
32
|
-
"@aws-sdk/nested-clients": "3.997.
|
|
20
|
+
"@aws-sdk/core": "3.978.4",
|
|
21
|
+
"@aws-sdk/credential-provider-env": "3.972.75",
|
|
22
|
+
"@aws-sdk/credential-provider-http": "3.972.77",
|
|
23
|
+
"@aws-sdk/credential-provider-ini": "3.973.20",
|
|
24
|
+
"@aws-sdk/credential-provider-login": "3.972.82",
|
|
25
|
+
"@aws-sdk/credential-provider-node": "3.972.87",
|
|
26
|
+
"@aws-sdk/credential-provider-process": "3.972.75",
|
|
27
|
+
"@aws-sdk/credential-provider-sso": "3.973.19",
|
|
28
|
+
"@aws-sdk/credential-provider-web-identity": "3.972.81",
|
|
29
|
+
"@aws-sdk/eventstream-handler-node": "3.972.37",
|
|
30
|
+
"@aws-sdk/middleware-eventstream": "3.972.32",
|
|
31
|
+
"@aws-sdk/middleware-websocket": "3.972.57",
|
|
32
|
+
"@aws-sdk/nested-clients": "3.997.49",
|
|
33
33
|
"@aws-sdk/signature-v4-multi-region": "3.996.48",
|
|
34
|
-
"@aws-sdk/token-providers": "3.
|
|
34
|
+
"@aws-sdk/token-providers": "3.1153.0",
|
|
35
35
|
"@aws-sdk/types": "3.974.6",
|
|
36
36
|
"@aws-sdk/xml-builder": "3.972.41",
|
|
37
37
|
"@aws/lambda-invoke-store": "0.3.0",
|
|
@@ -457,7 +457,7 @@
|
|
|
457
457
|
"etag": "1.8.1",
|
|
458
458
|
"eventsource": "3.0.7",
|
|
459
459
|
"eventsource-parser": "3.1.1",
|
|
460
|
-
"execa": "10.
|
|
460
|
+
"execa": "10.2.0",
|
|
461
461
|
"extend": "3.0.2",
|
|
462
462
|
"fast-deep-equal": "3.1.3",
|
|
463
463
|
"fast-sha256": "1.3.0",
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
import { SerdeContextConfig } from "../../ConfigurableSerdeContext";
|
|
2
|
-
import { JsonShapeDeserializer } from "./JsonShapeDeserializer";
|
|
3
|
-
import { JsonShapeSerializer } from "./JsonShapeSerializer";
|
|
4
|
-
export class JsonCodec extends SerdeContextConfig {
|
|
5
|
-
settings;
|
|
6
|
-
constructor(settings) {
|
|
7
|
-
super();
|
|
8
|
-
this.settings = settings;
|
|
9
|
-
}
|
|
10
|
-
createSerializer() {
|
|
11
|
-
const serializer = new JsonShapeSerializer(this.settings);
|
|
12
|
-
serializer.setSerdeContext(this.serdeContext);
|
|
13
|
-
return serializer;
|
|
14
|
-
}
|
|
15
|
-
createDeserializer() {
|
|
16
|
-
const deserializer = new JsonShapeDeserializer(this.settings);
|
|
17
|
-
deserializer.setSerdeContext(this.serdeContext);
|
|
18
|
-
return deserializer;
|
|
19
|
-
}
|
|
20
|
-
}
|
package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v1/JsonSettings.js
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
|
@@ -1,160 +0,0 @@
|
|
|
1
|
-
import { determineTimestampFormat } from "@smithy/core/protocols";
|
|
2
|
-
import { NormalizedSchema } from "@smithy/core/schema";
|
|
3
|
-
import { LazyJsonString, NumericValue, parseEpochTimestamp, parseRfc3339DateTimeWithOffset, parseRfc7231DateTime, } from "@smithy/core/serde";
|
|
4
|
-
import { fromBase64 } from "@smithy/core/serde";
|
|
5
|
-
import { SerdeContextConfig } from "../../ConfigurableSerdeContext";
|
|
6
|
-
import { UnionSerde } from "../../UnionSerde";
|
|
7
|
-
import { jsonReviver } from "../jsonReviver";
|
|
8
|
-
import { needsReviver } from "../needsReviver";
|
|
9
|
-
import { parseJsonBody } from "../parseJsonBody";
|
|
10
|
-
import { writeKey } from "../../writeKey";
|
|
11
|
-
export class JsonShapeDeserializer extends SerdeContextConfig {
|
|
12
|
-
settings;
|
|
13
|
-
constructor(settings) {
|
|
14
|
-
super();
|
|
15
|
-
this.settings = settings;
|
|
16
|
-
}
|
|
17
|
-
async read(schema, data) {
|
|
18
|
-
const reviver = needsReviver(schema) ? jsonReviver : undefined;
|
|
19
|
-
return this._read(schema, typeof data === "string" ? JSON.parse(data, reviver) : await parseJsonBody(data, this.serdeContext, schema));
|
|
20
|
-
}
|
|
21
|
-
readObject(schema, data) {
|
|
22
|
-
return this._read(schema, data);
|
|
23
|
-
}
|
|
24
|
-
_read(schema, value) {
|
|
25
|
-
const isObject = value !== null && typeof value === "object";
|
|
26
|
-
const ns = NormalizedSchema.of(schema);
|
|
27
|
-
if (isObject) {
|
|
28
|
-
if (ns.isStructSchema()) {
|
|
29
|
-
const record = value;
|
|
30
|
-
const union = ns.isUnionSchema();
|
|
31
|
-
const out = {};
|
|
32
|
-
let nameMap = void 0;
|
|
33
|
-
const { jsonName } = this.settings;
|
|
34
|
-
if (jsonName) {
|
|
35
|
-
nameMap = {};
|
|
36
|
-
}
|
|
37
|
-
let unionSerde;
|
|
38
|
-
if (union) {
|
|
39
|
-
unionSerde = new UnionSerde(record, out);
|
|
40
|
-
}
|
|
41
|
-
for (const [memberName, memberSchema] of ns.structIterator()) {
|
|
42
|
-
let fromKey = memberName;
|
|
43
|
-
if (jsonName) {
|
|
44
|
-
fromKey = memberSchema.getMergedTraits().jsonName ?? fromKey;
|
|
45
|
-
nameMap[fromKey] = memberName;
|
|
46
|
-
}
|
|
47
|
-
if (union) {
|
|
48
|
-
unionSerde.mark(fromKey);
|
|
49
|
-
}
|
|
50
|
-
if (record[fromKey] != null) {
|
|
51
|
-
out[memberName] = this._read(memberSchema, record[fromKey]);
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
|
-
if (union) {
|
|
55
|
-
unionSerde.writeUnknown();
|
|
56
|
-
}
|
|
57
|
-
else if (typeof record.__type === "string") {
|
|
58
|
-
for (const k in record) {
|
|
59
|
-
const v = record[k];
|
|
60
|
-
const t = jsonName ? (nameMap[k] ?? k) : k;
|
|
61
|
-
if (!(t in out)) {
|
|
62
|
-
out[t] = v;
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
return out;
|
|
67
|
-
}
|
|
68
|
-
if (Array.isArray(value) && ns.isListSchema()) {
|
|
69
|
-
const listMember = ns.getValueSchema();
|
|
70
|
-
const out = [];
|
|
71
|
-
for (const item of value) {
|
|
72
|
-
out.push(this._read(listMember, item));
|
|
73
|
-
}
|
|
74
|
-
return out;
|
|
75
|
-
}
|
|
76
|
-
if (ns.isMapSchema()) {
|
|
77
|
-
const mapMember = ns.getValueSchema();
|
|
78
|
-
const out = {};
|
|
79
|
-
for (const _k in value) {
|
|
80
|
-
if (_k === "__proto__") {
|
|
81
|
-
writeKey(out);
|
|
82
|
-
}
|
|
83
|
-
out[_k] = this._read(mapMember, value[_k]);
|
|
84
|
-
}
|
|
85
|
-
return out;
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
if (ns.isBlobSchema() && typeof value === "string") {
|
|
89
|
-
return fromBase64(value);
|
|
90
|
-
}
|
|
91
|
-
const mediaType = ns.getMergedTraits().mediaType;
|
|
92
|
-
if (ns.isStringSchema() && typeof value === "string" && mediaType) {
|
|
93
|
-
const isJson = mediaType === "application/json" || mediaType.endsWith("+json");
|
|
94
|
-
if (isJson) {
|
|
95
|
-
return LazyJsonString.from(value);
|
|
96
|
-
}
|
|
97
|
-
return value;
|
|
98
|
-
}
|
|
99
|
-
if (ns.isTimestampSchema() && value != null) {
|
|
100
|
-
const format = determineTimestampFormat(ns, this.settings);
|
|
101
|
-
switch (format) {
|
|
102
|
-
case 5:
|
|
103
|
-
return parseRfc3339DateTimeWithOffset(value);
|
|
104
|
-
case 6:
|
|
105
|
-
return parseRfc7231DateTime(value);
|
|
106
|
-
case 7:
|
|
107
|
-
return parseEpochTimestamp(value);
|
|
108
|
-
default:
|
|
109
|
-
console.warn("Missing timestamp format, parsing value with Date constructor:", value);
|
|
110
|
-
return new Date(value);
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
if (ns.isBigIntegerSchema() && (typeof value === "number" || typeof value === "string")) {
|
|
114
|
-
return BigInt(value);
|
|
115
|
-
}
|
|
116
|
-
if (ns.isBigDecimalSchema() && value != undefined) {
|
|
117
|
-
if (value instanceof NumericValue) {
|
|
118
|
-
return value;
|
|
119
|
-
}
|
|
120
|
-
const untyped = value;
|
|
121
|
-
if (untyped.type === "bigDecimal" && "string" in untyped) {
|
|
122
|
-
return new NumericValue(untyped.string, untyped.type);
|
|
123
|
-
}
|
|
124
|
-
return new NumericValue(String(value), "bigDecimal");
|
|
125
|
-
}
|
|
126
|
-
if (ns.isNumericSchema() && typeof value === "string") {
|
|
127
|
-
switch (value) {
|
|
128
|
-
case "Infinity":
|
|
129
|
-
return Infinity;
|
|
130
|
-
case "-Infinity":
|
|
131
|
-
return -Infinity;
|
|
132
|
-
case "NaN":
|
|
133
|
-
return NaN;
|
|
134
|
-
}
|
|
135
|
-
return value;
|
|
136
|
-
}
|
|
137
|
-
if (ns.isDocumentSchema()) {
|
|
138
|
-
if (isObject) {
|
|
139
|
-
const out = Array.isArray(value) ? [] : {};
|
|
140
|
-
for (const k in value) {
|
|
141
|
-
if (k === "__proto__") {
|
|
142
|
-
writeKey(out);
|
|
143
|
-
}
|
|
144
|
-
const v = value[k];
|
|
145
|
-
if (v instanceof NumericValue) {
|
|
146
|
-
out[k] = v;
|
|
147
|
-
}
|
|
148
|
-
else {
|
|
149
|
-
out[k] = this._read(ns, v);
|
|
150
|
-
}
|
|
151
|
-
}
|
|
152
|
-
return out;
|
|
153
|
-
}
|
|
154
|
-
else {
|
|
155
|
-
return structuredClone(value);
|
|
156
|
-
}
|
|
157
|
-
}
|
|
158
|
-
return value;
|
|
159
|
-
}
|
|
160
|
-
}
|
package/node_modules/@aws-sdk/core/dist-es/submodules/protocols/json/codec-v1/JsonShapeSerializer.js
DELETED
|
@@ -1,193 +0,0 @@
|
|
|
1
|
-
import { determineTimestampFormat } from "@smithy/core/protocols";
|
|
2
|
-
import { NormalizedSchema } from "@smithy/core/schema";
|
|
3
|
-
import { dateToUtcString, generateIdempotencyToken, LazyJsonString, NumericValue, toBase64 } from "@smithy/core/serde";
|
|
4
|
-
import { SerdeContextConfig } from "../../ConfigurableSerdeContext";
|
|
5
|
-
import { JsonReplacer } from "../jsonReplacer";
|
|
6
|
-
import { writeKey } from "../../writeKey";
|
|
7
|
-
export class JsonShapeSerializer extends SerdeContextConfig {
|
|
8
|
-
settings;
|
|
9
|
-
buffer;
|
|
10
|
-
useReplacer = false;
|
|
11
|
-
rootSchema;
|
|
12
|
-
constructor(settings) {
|
|
13
|
-
super();
|
|
14
|
-
this.settings = settings;
|
|
15
|
-
}
|
|
16
|
-
write(schema, value) {
|
|
17
|
-
this.rootSchema = NormalizedSchema.of(schema);
|
|
18
|
-
this.buffer = this._write(this.rootSchema, value);
|
|
19
|
-
}
|
|
20
|
-
flush() {
|
|
21
|
-
const { rootSchema, useReplacer } = this;
|
|
22
|
-
this.rootSchema = undefined;
|
|
23
|
-
this.useReplacer = false;
|
|
24
|
-
if (rootSchema?.isStructSchema() || rootSchema?.isDocumentSchema()) {
|
|
25
|
-
if (!useReplacer) {
|
|
26
|
-
return JSON.stringify(this.buffer);
|
|
27
|
-
}
|
|
28
|
-
const replacer = new JsonReplacer();
|
|
29
|
-
return replacer.replaceInJson(JSON.stringify(this.buffer, replacer.createReplacer(), 0));
|
|
30
|
-
}
|
|
31
|
-
return this.buffer;
|
|
32
|
-
}
|
|
33
|
-
writeDiscriminatedDocument(schema, value) {
|
|
34
|
-
this.write(schema, value);
|
|
35
|
-
if (typeof this.buffer === "object") {
|
|
36
|
-
this.buffer.__type = NormalizedSchema.of(schema).getName(true);
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
_write(schema, value, container) {
|
|
40
|
-
const isObject = value !== null && typeof value === "object";
|
|
41
|
-
const ns = NormalizedSchema.of(schema);
|
|
42
|
-
if (isObject) {
|
|
43
|
-
if (ns.isStructSchema()) {
|
|
44
|
-
const record = value;
|
|
45
|
-
const out = {};
|
|
46
|
-
const { jsonName } = this.settings;
|
|
47
|
-
let nameMap = void 0;
|
|
48
|
-
if (jsonName) {
|
|
49
|
-
nameMap = {};
|
|
50
|
-
}
|
|
51
|
-
let outCount = 0;
|
|
52
|
-
for (const [memberName, memberSchema] of ns.structIterator()) {
|
|
53
|
-
const serializableValue = this._write(memberSchema, record[memberName], ns);
|
|
54
|
-
if (serializableValue !== undefined) {
|
|
55
|
-
let targetKey = memberName;
|
|
56
|
-
if (jsonName) {
|
|
57
|
-
targetKey = memberSchema.getMergedTraits().jsonName ?? memberName;
|
|
58
|
-
nameMap[memberName] = targetKey;
|
|
59
|
-
}
|
|
60
|
-
out[targetKey] = serializableValue;
|
|
61
|
-
outCount++;
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
if (ns.isUnionSchema() && outCount === 0) {
|
|
65
|
-
const { $unknown } = record;
|
|
66
|
-
if (Array.isArray($unknown)) {
|
|
67
|
-
const [k, v] = $unknown;
|
|
68
|
-
if (k === "__proto__") {
|
|
69
|
-
writeKey(out);
|
|
70
|
-
}
|
|
71
|
-
out[k] = this._write(15, v);
|
|
72
|
-
}
|
|
73
|
-
}
|
|
74
|
-
else if (typeof record.__type === "string") {
|
|
75
|
-
for (const k in record) {
|
|
76
|
-
const v = record[k];
|
|
77
|
-
const targetKey = jsonName ? (nameMap[k] ?? k) : k;
|
|
78
|
-
if (!(targetKey in out)) {
|
|
79
|
-
out[targetKey] = this._write(15, v);
|
|
80
|
-
}
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
return out;
|
|
84
|
-
}
|
|
85
|
-
if (Array.isArray(value) && ns.isListSchema()) {
|
|
86
|
-
const listMember = ns.getValueSchema();
|
|
87
|
-
const out = [];
|
|
88
|
-
const sparse = !!ns.getMergedTraits().sparse;
|
|
89
|
-
for (const item of value) {
|
|
90
|
-
if (sparse || item != null) {
|
|
91
|
-
out.push(this._write(listMember, item));
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
return out;
|
|
95
|
-
}
|
|
96
|
-
if (ns.isMapSchema()) {
|
|
97
|
-
const mapMember = ns.getValueSchema();
|
|
98
|
-
const out = {};
|
|
99
|
-
const sparse = !!ns.getMergedTraits().sparse;
|
|
100
|
-
for (const _k in value) {
|
|
101
|
-
const _v = value[_k];
|
|
102
|
-
if (sparse || _v != null) {
|
|
103
|
-
if (_k === "__proto__") {
|
|
104
|
-
writeKey(out);
|
|
105
|
-
}
|
|
106
|
-
out[_k] = this._write(mapMember, _v);
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
return out;
|
|
110
|
-
}
|
|
111
|
-
if (value instanceof Uint8Array && ns.isBlobSchema()) {
|
|
112
|
-
if (ns === this.rootSchema) {
|
|
113
|
-
return value;
|
|
114
|
-
}
|
|
115
|
-
return (this.serdeContext?.base64Encoder ?? toBase64)(value);
|
|
116
|
-
}
|
|
117
|
-
if (value instanceof Date && (ns.isTimestampSchema() || ns.isDocumentSchema())) {
|
|
118
|
-
const format = determineTimestampFormat(ns, this.settings);
|
|
119
|
-
switch (format) {
|
|
120
|
-
case 5:
|
|
121
|
-
return value.toISOString().replace(".000Z", "Z");
|
|
122
|
-
case 6:
|
|
123
|
-
return dateToUtcString(value);
|
|
124
|
-
case 7:
|
|
125
|
-
return value.getTime() / 1000;
|
|
126
|
-
default:
|
|
127
|
-
console.warn("Missing timestamp format, using epoch seconds", value);
|
|
128
|
-
return value.getTime() / 1000;
|
|
129
|
-
}
|
|
130
|
-
}
|
|
131
|
-
if (value instanceof NumericValue) {
|
|
132
|
-
this.useReplacer = true;
|
|
133
|
-
}
|
|
134
|
-
}
|
|
135
|
-
if (value === null && container?.isStructSchema()) {
|
|
136
|
-
return void 0;
|
|
137
|
-
}
|
|
138
|
-
if (ns.isStringSchema()) {
|
|
139
|
-
if (typeof value === "undefined" && ns.isIdempotencyToken()) {
|
|
140
|
-
return generateIdempotencyToken();
|
|
141
|
-
}
|
|
142
|
-
const mediaType = ns.getMergedTraits().mediaType;
|
|
143
|
-
if (value != null && mediaType) {
|
|
144
|
-
const isJson = mediaType === "application/json" || mediaType.endsWith("+json");
|
|
145
|
-
if (isJson) {
|
|
146
|
-
return LazyJsonString.from(value);
|
|
147
|
-
}
|
|
148
|
-
}
|
|
149
|
-
return value;
|
|
150
|
-
}
|
|
151
|
-
if (typeof value === "number") {
|
|
152
|
-
if (Math.abs(value) === Infinity || isNaN(value)) {
|
|
153
|
-
return String(value);
|
|
154
|
-
}
|
|
155
|
-
return value;
|
|
156
|
-
}
|
|
157
|
-
if (typeof value === "string" && ns.isBlobSchema()) {
|
|
158
|
-
if (ns === this.rootSchema) {
|
|
159
|
-
return value;
|
|
160
|
-
}
|
|
161
|
-
return (this.serdeContext?.base64Encoder ?? toBase64)(value);
|
|
162
|
-
}
|
|
163
|
-
if (typeof value === "bigint") {
|
|
164
|
-
this.useReplacer = true;
|
|
165
|
-
}
|
|
166
|
-
if (ns.isDocumentSchema()) {
|
|
167
|
-
if (isObject) {
|
|
168
|
-
if (value instanceof Uint8Array) {
|
|
169
|
-
return (this.serdeContext?.base64Encoder ?? toBase64)(value);
|
|
170
|
-
}
|
|
171
|
-
const out = Array.isArray(value) ? [] : {};
|
|
172
|
-
for (const k in value) {
|
|
173
|
-
const v = value[k];
|
|
174
|
-
if (k === "__proto__") {
|
|
175
|
-
writeKey(out);
|
|
176
|
-
}
|
|
177
|
-
if (v instanceof NumericValue) {
|
|
178
|
-
this.useReplacer = true;
|
|
179
|
-
out[k] = v;
|
|
180
|
-
}
|
|
181
|
-
else {
|
|
182
|
-
out[k] = this._write(ns, v);
|
|
183
|
-
}
|
|
184
|
-
}
|
|
185
|
-
return out;
|
|
186
|
-
}
|
|
187
|
-
else {
|
|
188
|
-
return structuredClone(value);
|
|
189
|
-
}
|
|
190
|
-
}
|
|
191
|
-
return value;
|
|
192
|
-
}
|
|
193
|
-
}
|
|
@@ -1,103 +0,0 @@
|
|
|
1
|
-
import { toUtf8 } from "@smithy/core/serde";
|
|
2
|
-
export class JsonBytesStringAdapter extends Uint8Array {
|
|
3
|
-
string = null;
|
|
4
|
-
static allocUnsafe(bytes) {
|
|
5
|
-
if (typeof Buffer === "function") {
|
|
6
|
-
const buffer = Buffer.allocUnsafe(bytes);
|
|
7
|
-
return new JsonBytesStringAdapter(buffer.buffer, buffer.byteOffset, buffer.byteLength);
|
|
8
|
-
}
|
|
9
|
-
return new JsonBytesStringAdapter(bytes);
|
|
10
|
-
}
|
|
11
|
-
toString() {
|
|
12
|
-
return this.s();
|
|
13
|
-
}
|
|
14
|
-
valueOf() {
|
|
15
|
-
return this.s();
|
|
16
|
-
}
|
|
17
|
-
includes(searchString, position) {
|
|
18
|
-
if (typeof searchString === "string") {
|
|
19
|
-
return this.s().includes(searchString, position);
|
|
20
|
-
}
|
|
21
|
-
return Uint8Array.prototype.includes.call(this, searchString, position);
|
|
22
|
-
}
|
|
23
|
-
indexOf(searchString, position) {
|
|
24
|
-
if (typeof searchString === "string") {
|
|
25
|
-
return this.s().indexOf(searchString, position);
|
|
26
|
-
}
|
|
27
|
-
return Uint8Array.prototype.indexOf.call(this, searchString, position);
|
|
28
|
-
}
|
|
29
|
-
lastIndexOf(searchString, position) {
|
|
30
|
-
if (typeof searchString === "string") {
|
|
31
|
-
return this.s().lastIndexOf(searchString, position);
|
|
32
|
-
}
|
|
33
|
-
const fn = Uint8Array.prototype.lastIndexOf;
|
|
34
|
-
if (position !== undefined) {
|
|
35
|
-
return fn.call(this, searchString, position);
|
|
36
|
-
}
|
|
37
|
-
return fn.call(this, searchString);
|
|
38
|
-
}
|
|
39
|
-
startsWith(searchString, position) {
|
|
40
|
-
return this.s().startsWith(searchString, position);
|
|
41
|
-
}
|
|
42
|
-
endsWith(searchString, endPosition) {
|
|
43
|
-
return this.s().endsWith(searchString, endPosition);
|
|
44
|
-
}
|
|
45
|
-
match(regexp) {
|
|
46
|
-
return this.s().match(regexp);
|
|
47
|
-
}
|
|
48
|
-
replace(searchValue, replaceValue) {
|
|
49
|
-
return this.s().replace(searchValue, replaceValue);
|
|
50
|
-
}
|
|
51
|
-
search(regexp) {
|
|
52
|
-
return this.s().search(regexp);
|
|
53
|
-
}
|
|
54
|
-
split(separator, limit) {
|
|
55
|
-
return this.s().split(separator, limit);
|
|
56
|
-
}
|
|
57
|
-
substring(start, end) {
|
|
58
|
-
return this.s().substring(start, end);
|
|
59
|
-
}
|
|
60
|
-
trim() {
|
|
61
|
-
return this.s().trim();
|
|
62
|
-
}
|
|
63
|
-
trimStart() {
|
|
64
|
-
return this.s().trimStart();
|
|
65
|
-
}
|
|
66
|
-
trimEnd() {
|
|
67
|
-
return this.s().trimEnd();
|
|
68
|
-
}
|
|
69
|
-
charAt(pos) {
|
|
70
|
-
return this.s().charAt(pos);
|
|
71
|
-
}
|
|
72
|
-
charCodeAt(index) {
|
|
73
|
-
return this.s().charCodeAt(index);
|
|
74
|
-
}
|
|
75
|
-
padStart(maxLength, fillString) {
|
|
76
|
-
return this.s().padStart(maxLength, fillString);
|
|
77
|
-
}
|
|
78
|
-
padEnd(maxLength, fillString) {
|
|
79
|
-
return this.s().padEnd(maxLength, fillString);
|
|
80
|
-
}
|
|
81
|
-
repeat(count) {
|
|
82
|
-
return this.s().repeat(count);
|
|
83
|
-
}
|
|
84
|
-
toUpperCase() {
|
|
85
|
-
return this.s().toUpperCase();
|
|
86
|
-
}
|
|
87
|
-
toLowerCase() {
|
|
88
|
-
return this.s().toLowerCase();
|
|
89
|
-
}
|
|
90
|
-
s() {
|
|
91
|
-
if (this.string == null) {
|
|
92
|
-
const n = Date.now();
|
|
93
|
-
if (n > warned + 60_000) {
|
|
94
|
-
console.warn("@aws-sdk/core/protocols - WARN - JsonCodec2: you have called a string method on a Uint8Array request body. " +
|
|
95
|
-
"It has been automatically converted to string. In a future version this will throw an error.");
|
|
96
|
-
warned = n;
|
|
97
|
-
}
|
|
98
|
-
this.string = toUtf8(this);
|
|
99
|
-
}
|
|
100
|
-
return this.string;
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
var warned = 0;
|
|
@@ -1,20 +0,0 @@
|
|
|
1
|
-
import { SerdeContextConfig } from "../../ConfigurableSerdeContext";
|
|
2
|
-
import { JsonShapeDeserializer2 } from "./JsonShapeDeserializer2";
|
|
3
|
-
import { JsonShapeSerializer2 } from "./JsonShapeSerializer2";
|
|
4
|
-
export class JsonCodec2 extends SerdeContextConfig {
|
|
5
|
-
settings;
|
|
6
|
-
constructor(settings) {
|
|
7
|
-
super();
|
|
8
|
-
this.settings = settings;
|
|
9
|
-
}
|
|
10
|
-
createSerializer() {
|
|
11
|
-
const serializer = new JsonShapeSerializer2(this.settings);
|
|
12
|
-
serializer.setSerdeContext(this.serdeContext);
|
|
13
|
-
return serializer;
|
|
14
|
-
}
|
|
15
|
-
createDeserializer() {
|
|
16
|
-
const deserializer = new JsonShapeDeserializer2(this.settings);
|
|
17
|
-
deserializer.setSerdeContext(this.serdeContext);
|
|
18
|
-
return deserializer;
|
|
19
|
-
}
|
|
20
|
-
}
|