Skip to content

Commit accf287

Browse files
gfxgfx
committed
pure ESM-ify
1 parent 419736f commit accf287

38 files changed

+81
-76
lines changed

‎src/CachedKeyDecoder.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { utf8DecodeJs } from "./utils/utf8";
1+
import { utf8DecodeJs } from "./utils/utf8.ts";
22

33
const DEFAULT_MAX_KEY_LENGTH = 16;
44
const DEFAULT_MAX_LENGTH_PER_KEY = 16;

‎src/Decoder.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import "./utils/symbol.dispose";
2-
import { prettyByte } from "./utils/prettyByte";
3-
import { ExtensionCodec, ExtensionCodecType } from "./ExtensionCodec";
4-
import { getInt64, getUint64, UINT32_MAX } from "./utils/int";
5-
import { utf8Decode } from "./utils/utf8";
6-
import { ensureUint8Array } from "./utils/typedArrays";
7-
import { CachedKeyDecoder, KeyDecoder } from "./CachedKeyDecoder";
8-
import { DecodeError } from "./DecodeError";
9-
import type { ContextOf } from "./context";
1+
import "./utils/symbol.dispose.ts";
2+
import { prettyByte } from "./utils/prettyByte.ts";
3+
import { ExtensionCodec, ExtensionCodecType } from "./ExtensionCodec.ts";
4+
import { getInt64, getUint64, UINT32_MAX } from "./utils/int.ts";
5+
import { utf8Decode } from "./utils/utf8.ts";
6+
import { ensureUint8Array } from "./utils/typedArrays.ts";
7+
import { CachedKeyDecoder, KeyDecoder } from "./CachedKeyDecoder.ts";
8+
import { DecodeError } from "./DecodeError.ts";
9+
import type { ContextOf } from "./context.ts";
1010

1111
export type DecoderOptions<ContextType = undefined> = Readonly<
1212
Partial<{

‎src/Encoder.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import "./utils/symbol.dispose";
2-
import { utf8Count, utf8Encode } from "./utils/utf8";
3-
import { ExtensionCodec, ExtensionCodecType } from "./ExtensionCodec";
4-
import { setInt64, setUint64 } from "./utils/int";
5-
import { ensureUint8Array } from "./utils/typedArrays";
6-
import type { ExtData } from "./ExtData";
7-
import type { ContextOf } from "./context";
1+
import "./utils/symbol.dispose.ts";
2+
import { utf8Count, utf8Encode } from "./utils/utf8.ts";
3+
import { ExtensionCodec, ExtensionCodecType } from "./ExtensionCodec.ts";
4+
import { setInt64, setUint64 } from "./utils/int.ts";
5+
import { ensureUint8Array } from "./utils/typedArrays.ts";
6+
import type { ExtData } from "./ExtData.ts";
7+
import type { ContextOf } from "./context.ts";
88

99
export const DEFAULT_MAX_DEPTH = 100;
1010
export const DEFAULT_INITIAL_BUFFER_SIZE = 2048;

‎src/ExtensionCodec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ExtensionCodec to handle MessagePack extensions
22

3-
import { ExtData } from "./ExtData";
4-
import { timestampExtension } from "./timestamp";
3+
import { ExtData } from "./ExtData.ts";
4+
import { timestampExtension } from "./timestamp.ts";
55

66
export type ExtensionDecoderType<ContextType> = (
77
data: Uint8Array,

‎src/decode.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { Decoder } from "./Decoder";
2-
import type { DecoderOptions } from "./Decoder";
3-
import type { SplitUndefined } from "./context";
1+
import { Decoder } from "./Decoder.ts";
2+
import type { DecoderOptions } from "./Decoder.ts";
3+
import type { SplitUndefined } from "./context.ts";
44

55
/**
66
* It decodes a single MessagePack object in a buffer.

‎src/decodeAsync.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { Decoder } from "./Decoder";
2-
import { ensureAsyncIterable } from "./utils/stream";
3-
import type { DecoderOptions } from "./Decoder";
4-
import type { ReadableStreamLike } from "./utils/stream";
5-
import type { SplitUndefined } from "./context";
1+
import { Decoder } from "./Decoder.ts";
2+
import { ensureAsyncIterable } from "./utils/stream.ts";
3+
import type { DecoderOptions } from "./Decoder.ts";
4+
import type { ReadableStreamLike } from "./utils/stream.ts";
5+
import type { SplitUndefined } from "./context.ts";
66

77
/**
88
* @throws {@link RangeError} if the buffer is incomplete, including the case where the buffer is empty.

‎src/encode.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { Encoder } from "./Encoder";
2-
import type { EncoderOptions } from "./Encoder";
3-
import type { SplitUndefined } from "./context";
1+
import { Encoder } from "./Encoder.ts";
2+
import type { EncoderOptions } from "./Encoder.ts";
3+
import type { SplitUndefined } from "./context.ts";
44

55
/**
66
* It encodes `value` in the MessagePack format and

‎src/index.ts

+12-12
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,33 @@
11
// Main Functions:
22

3-
import { encode } from "./encode";
3+
import { encode } from "./encode.ts";
44
export { encode };
55

6-
import { decode, decodeMulti } from "./decode";
6+
import { decode, decodeMulti } from "./decode.ts";
77
export { decode, decodeMulti };
88

9-
import { decodeAsync, decodeArrayStream, decodeMultiStream } from "./decodeAsync";
9+
import { decodeAsync, decodeArrayStream, decodeMultiStream } from "./decodeAsync.ts";
1010
export { decodeAsync, decodeArrayStream, decodeMultiStream };
1111

12-
import { Decoder } from "./Decoder";
12+
import { Decoder } from "./Decoder.ts";
1313
export { Decoder };
14-
import type { DecoderOptions } from "./Decoder";
14+
import type { DecoderOptions } from "./Decoder.ts";
1515
export type { DecoderOptions };
16-
import { DecodeError } from "./DecodeError";
16+
import { DecodeError } from "./DecodeError.ts";
1717
export { DecodeError };
1818

19-
import { Encoder } from "./Encoder";
19+
import { Encoder } from "./Encoder.ts";
2020
export { Encoder };
21-
import type { EncoderOptions } from "./Encoder";
21+
import type { EncoderOptions } from "./Encoder.ts";
2222
export type { EncoderOptions };
2323

2424
// Utilities for Extension Types:
2525

26-
import { ExtensionCodec } from "./ExtensionCodec";
26+
import { ExtensionCodec } from "./ExtensionCodec.ts";
2727
export { ExtensionCodec };
28-
import type { ExtensionCodecType, ExtensionDecoderType, ExtensionEncoderType } from "./ExtensionCodec";
28+
import type { ExtensionCodecType, ExtensionDecoderType, ExtensionEncoderType } from "./ExtensionCodec.ts";
2929
export type { ExtensionCodecType, ExtensionDecoderType, ExtensionEncoderType };
30-
import { ExtData } from "./ExtData";
30+
import { ExtData } from "./ExtData.ts";
3131
export { ExtData };
3232

3333
import {
@@ -37,7 +37,7 @@ import {
3737
decodeTimestampToTimeSpec,
3838
encodeTimestampExtension,
3939
decodeTimestampExtension,
40-
} from "./timestamp";
40+
} from "./timestamp.ts";
4141
export {
4242
EXT_TIMESTAMP,
4343
encodeDateToTimeSpec,

‎src/timestamp.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// https://github.com/msgpack/msgpack/blob/master/spec.md#timestamp-extension-type
2-
import { DecodeError } from "./DecodeError";
3-
import { getInt64, setInt64 } from "./utils/int";
2+
import { DecodeError } from "./DecodeError.ts";
3+
import { getInt64, setInt64 } from "./utils/int.ts";
44

55
export const EXT_TIMESTAMP = -1;
66

‎test/CachedKeyDecoder.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import assert from "assert";
2-
import { CachedKeyDecoder } from "../src/CachedKeyDecoder";
3-
import { utf8EncodeJs, utf8Count } from "../src/utils/utf8";
4-
import type { KeyDecoder } from "../src/CachedKeyDecoder";
2+
import { CachedKeyDecoder } from "../src/CachedKeyDecoder.ts";
3+
import { utf8EncodeJs, utf8Count } from "../src/utils/utf8.ts";
4+
import type { KeyDecoder } from "../src/CachedKeyDecoder.ts";
55

66
function tryDecode(keyDecoder: KeyDecoder, str: string): string {
77
const byteLength = utf8Count(str);

‎test/ExtensionCodec.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import assert from "assert";
22
import util from "util";
3-
import { encode, decode, ExtensionCodec, decodeAsync } from "../src/index";
3+
import { encode, decode, ExtensionCodec, decodeAsync } from "../src/index.ts";
44

55
describe("ExtensionCodec", () => {
66
context("timestamp", () => {

‎test/bigint64.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import assert from "assert";
2-
import { encode, decode } from "../src/index";
2+
import { encode, decode } from "../src/index.ts";
33

44
describe("useBigInt64: true", () => {
55
before(function () {

‎test/bun.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { expect, test } from "bun:test";
2-
import { encode, decode } from "../src/index";
2+
import { encode, decode } from "../src/index.ts";
33

44
test("Hello, world!", () => {
55
const encoded = encode("Hello, world!");

‎test/codec-bigint.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import assert from "assert";
2-
import { encode, decode, ExtensionCodec, DecodeError } from "../src/index";
2+
import { encode, decode, ExtensionCodec, DecodeError } from "../src/index.ts";
33

44
// There's a built-in `useBigInt64: true` option, but a custom codec might be
55
// better if you'd like to encode bigint to reduce the size of binaries.

‎test/codec-float.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import assert from "assert";
22
import * as ieee754 from "ieee754";
3-
import { decode } from "../src/index";
3+
import { decode } from "../src/index.ts";
44

55
const FLOAT32_TYPE = 0xca;
66
const FLOAT64_TYPE = 0xcb;

‎test/codec-int.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import assert from "assert";
2-
import { setInt64, getInt64, getUint64, setUint64 } from "../src/utils/int";
2+
import { setInt64, getInt64, getUint64, setUint64 } from "../src/utils/int.ts";
33

44
const INT64SPECS = {
55
ZERO: 0,

‎test/codec-timestamp.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
decodeTimestampExtension,
88
decodeTimestampToTimeSpec,
99
encodeTimestampExtension,
10-
} from "../src/index";
10+
} from "../src/index.ts";
1111

1212
const TIME = 1556636810389;
1313

‎test/decode-blob.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import assert from "assert";
2-
import { encode, decode, decodeAsync } from "../src/index";
2+
import { encode, decode, decodeAsync } from "../src/index.ts";
33

44
(typeof Blob !== "undefined" ? describe : describe.skip)("Blob", () => {
55
it("decodes it with `decode()`", async function () {

‎test/decode-max-length.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import assert from "assert";
2-
import { encode, decode, decodeAsync } from "../src/index";
3-
import type { DecoderOptions } from "../src/index";
2+
import { encode, decode, decodeAsync } from "../src/index.ts";
3+
import type { DecoderOptions } from "../src/index.ts";
44

55
describe("decode with max${Type}Length specified", () => {
66
async function* createStream<T>(input: T) {

‎test/decode-raw-strings.test.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import assert from "assert";
2-
import { encode, decode } from "../src/index";
3-
import type { DecoderOptions } from "../src/index";
2+
import { encode, decode } from "../src/index.ts";
3+
import type { DecoderOptions } from "../src/index.ts";
44

55
describe("decode with rawStrings specified", () => {
66
const options = { rawStrings: true } satisfies DecoderOptions;

‎test/decodeArrayStream.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import assert from "assert";
2-
import { encode, decodeArrayStream } from "../src/index";
2+
import { encode, decodeArrayStream } from "../src/index.ts";
33

44
describe("decodeArrayStream", () => {
55
const generateSampleObject = () => {

‎test/decodeAsync.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import assert from "assert";
2-
import { encode, decodeAsync } from "../src/index";
2+
import { encode, decodeAsync } from "../src/index.ts";
33

44
describe("decodeAsync", () => {
55
function wrapWithNoisyBuffer(byte: number) {

‎test/decodeMulti.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import assert from "assert";
2-
import { encode, decodeMulti } from "../src/index";
2+
import { encode, decodeMulti } from "../src/index.ts";
33

44
describe("decodeMulti", () => {
55
it("decodes multiple objects in a single binary", () => {

‎test/decodeMultiStream.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import assert from "assert";
2-
import { encode, decodeMultiStream } from "../src/index";
2+
import { encode, decodeMultiStream } from "../src/index.ts";
33

44
describe("decodeStream", () => {
55
it("decodes stream", async () => {

‎test/edge-cases.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// kind of hand-written fuzzing data
22
// any errors should not break Encoder/Decoder instance states
33
import assert from "assert";
4-
import { encode, decodeAsync, decode, Encoder, Decoder, decodeMulti, decodeMultiStream } from "../src/index";
4+
import { encode, decodeAsync, decode, Encoder, Decoder, decodeMulti, decodeMultiStream } from "../src/index.ts";
55

66
function testEncoder(encoder: Encoder): void {
77
const object = {

‎test/encode.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import assert from "assert";
2-
import { encode, decode } from "../src/index";
2+
import { encode, decode } from "../src/index.ts";
33

44
describe("encode", () => {
55
context("sortKeys", () => {

‎test/msgpack-ext.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import assert from "assert";
2-
import { encode, decode, ExtData } from "../src/index";
2+
import { encode, decode, ExtData } from "../src/index.ts";
33

44
function seq(n: number) {
55
const a: Array<number> = [];

‎test/msgpack-test-suite.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import assert from "assert";
22
import util from "util";
33
import { Exam } from "msgpack-test-js";
44
import { MsgTimestamp } from "msg-timestamp";
5-
import { encode, decode, ExtensionCodec, EXT_TIMESTAMP, encodeTimeSpecToTimestamp } from "../src/index";
5+
import { encode, decode, ExtensionCodec, EXT_TIMESTAMP, encodeTimeSpecToTimestamp } from "../src/index.ts";
66

77
const extensionCodec = new ExtensionCodec();
88
extensionCodec.register({

‎test/prototype-pollution.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { throws } from "assert";
2-
import { encode, decode, DecodeError } from "../src/index";
2+
import { encode, decode, DecodeError } from "../src/index.ts";
33

44
describe("prototype pollution", () => {
55
context("__proto__ exists as a map key", () => {

‎test/reuse-instances-with-extensions.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// https://github.com/msgpack/msgpack-javascript/issues/195
22

33
import { deepStrictEqual } from "assert";
4-
import { Encoder, Decoder, ExtensionCodec } from "../src/index";
4+
import { Encoder, Decoder, ExtensionCodec } from "../src/index.ts";
55

66
const MSGPACK_EXT_TYPE_BIGINT = 0;
77

‎test/reuse-instances.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { deepStrictEqual } from "assert";
2-
import { Encoder, Decoder, decode } from "../src/index";
2+
import { Encoder, Decoder, decode } from "../src/index.ts";
33

44
const createStream = async function* (...args: any) {
55
for (const item of args) {

‎test/whatwg-streams.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { deepStrictEqual } from "assert";
2-
import { decodeAsync, encode, decodeArrayStream } from "../src/index";
2+
import { decodeAsync, encode, decodeArrayStream } from "../src/index.ts";
33

44
const isReadableStreamConstructorAvailable: boolean = (() => {
55
try {

‎tools/fix-ext.mts

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ for (const file of files) {
1313
// .js => .mjs
1414
const content = fs.readFileSync(file).toString("utf-8");
1515
const newContent = content
16-
.replace(/\bfrom "(\.\.?\/[^"]+)(?:\.js)?";/g, `from "$1.${ext}";`)
17-
.replace(/\bimport "(\.\.?\/[^"]+)(?:\.js)?";/g, `import "$1.${ext}";`)
18-
.replace(/\brequire\("(\.\.?\/[^"]+)(?:\.js)?"\)/g, `require("$1.${ext}");`)
16+
.replace(/\bfrom "(\.\.?\/[^"]+)\.js";/g, `from "$1.${ext}";`)
17+
.replace(/\bimport "(\.\.?\/[^"]+)\.js";/g, `import "$1.${ext}";`)
18+
.replace(/\brequire\("(\.\.?\/[^"]+)\.js"\)/g, `require("$1.${ext}");`)
1919
.replace(/\/\/# sourceMappingURL=(.+)\.js\.map$/, `//# sourceMappingURL=$1.${ext}.map`);
2020
fs.writeFileSync(fileMjs, newContent);
2121
fs.unlinkSync(file);

‎tsconfig.dist.cjs.json

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"declaration": false,
77
"noEmitOnError": true,
88
"noEmit": false,
9+
"rewriteRelativeImportExtensions": true,
910
"incremental": false
1011
},
1112
"include": ["src/**/*.ts"]

‎tsconfig.dist.esm.json

+1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
"declaration": true,
77
"noEmitOnError": true,
88
"noEmit": false,
9+
"rewriteRelativeImportExtensions": true,
910
"incremental": false
1011
},
1112
"include": ["src/**/*.ts"]

‎tsconfig.dist.webpack.json

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
"module": "ESNext",
55
"noEmitOnError": true,
66
"noEmit": false,
7+
"allowImportingTsExtensions": false,
78
"outDir": "./build/webpack"
89
},
910
"include": ["src/**/*.ts"]

‎tsconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
"noPropertyAccessFromIndexSignature": true,
4242
"noImplicitOverride": true,
4343
"verbatimModuleSyntax": false,
44-
// "allowImportingTsExtensions": true,
44+
"allowImportingTsExtensions": true,
4545
"noEmit": true,
4646

4747
/* Module Resolution Options */

‎tsconfig.test-karma.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
"extends": "./tsconfig.json",
33
"compilerOptions": {
44
"module": "ESNext",
5-
"outDir": "./build/karma",
5+
"noEmitOnError": true,
66
"noEmit": false,
7+
"allowImportingTsExtensions": false,
8+
"outDir": "./build/karma",
79
"incremental": false
810
}
911
}

0 commit comments

Comments
 (0)