Skip to content

Commit

Permalink
Merge pull request #1128 from samchon/revert-1124-feature/improve-tre…
Browse files Browse the repository at this point in the history
…e-shaking-build

Revert "refactor: improve tree-shaking in ESM target"
  • Loading branch information
samchon authored Jun 27, 2024
2 parents ad2ef66 + 42c536a commit e5add3e
Show file tree
Hide file tree
Showing 13 changed files with 359 additions and 347 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
"devDependencies": {
"@rollup/plugin-commonjs": "^26.0.1",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-terser": "^0.4.4",
"@rollup/plugin-typescript": "^11.1.6",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@types/inquirer": "^8.2.5",
Expand All @@ -104,6 +105,5 @@
"lib",
"src"
],
"private": true,
"sideEffects": false
}
"private": true
}
18 changes: 13 additions & 5 deletions rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
const typescript = require("@rollup/plugin-typescript");
const terser = require("@rollup/plugin-terser");
const nodeResolve = require("@rollup/plugin-node-resolve");
const commomnjs = require("@rollup/plugin-commonjs");

const outDir = "lib";

/** @type {import('rollup').RollupOptions} */
module.exports = {
input: "./src/index.ts",
output: {
preserveModules: true,
preserveModulesRoot: "src",
dir: outDir,
format: "esm",
entryFileNames: "[name].mjs",
Expand All @@ -20,8 +18,18 @@ module.exports = {
commomnjs(),
typescript({
tsconfig: "tsconfig.json",
module: "ESNext",
target: "ESNext",
module: "ES2020",
target: "ES2020",
}),
terser({
format: {
comments: "some",
beautify: true,
ecma: "2020",
},
compress: false,
mangle: false,
module: true,
}),
],
};
92 changes: 46 additions & 46 deletions src/functional.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,14 @@ function assertFunction<T extends (...args: any[]) => any>(
function assertFunction(): never {
halt("assertFunction");
}
const assertFunctionPure = /** #__PURE__*/ Object.assign<
const assertFunctionPure = /** @__PURE__ */ Object.assign<
typeof assertFunction,
{},
{}
>(
assertFunction,
/** #__PURE__*/ Namespace.assert("functional.assertFunction"),
/** #__PURE__*/ Namespace.functional.functionalAssert(),
/** @__PURE__ */ Namespace.assert("functional.assertFunction"),
/** @__PURE__ */ Namespace.functional.functionalAssert(),
);
export { assertFunctionPure as assertFunction };

Expand Down Expand Up @@ -104,14 +104,14 @@ function assertParameters<T extends (...args: any[]) => any>(
function assertParameters(): never {
halt("assertParameters");
}
const assertParametersPure = /** #__PURE__*/ Object.assign<
const assertParametersPure = /** @__PURE__ */ Object.assign<
typeof assertParameters,
{},
{}
>(
assertFunction,
/** #__PURE__*/ Namespace.assert("functional.assertFunction"),
/** #__PURE__*/ Namespace.functional.functionalAssert(),
/** @__PURE__ */ Namespace.assert("functional.assertFunction"),
/** @__PURE__ */ Namespace.functional.functionalAssert(),
);
export { assertParametersPure as assertParameters };

Expand Down Expand Up @@ -154,14 +154,14 @@ function assertReturn<T extends (...args: any[]) => any>(
function assertReturn(): never {
halt("assertReturn");
}
const assertReturnPure = /** #__PURE__*/ Object.assign<
const assertReturnPure = /** @__PURE__ */ Object.assign<
typeof assertReturn,
{},
{}
>(
assertReturn,
/** #__PURE__*/ Namespace.assert("functional.assertReturn"),
/** #__PURE__*/ Namespace.functional.functionalAssert(),
/** @__PURE__ */ Namespace.assert("functional.assertReturn"),
/** @__PURE__ */ Namespace.functional.functionalAssert(),
);
export { assertReturnPure as assertReturn };

Expand Down Expand Up @@ -209,14 +209,14 @@ function assertEqualsFunction<T extends (...args: any[]) => any>(
function assertEqualsFunction(): never {
halt("assertEqualsFunction");
}
const assertEqualsFunctionPure = /** #__PURE__*/ Object.assign<
const assertEqualsFunctionPure = /** @__PURE__ */ Object.assign<
typeof assertEqualsFunction,
{},
{}
>(
assertEqualsFunction,
/** #__PURE__*/ Namespace.assert("functional.assertEqualsFunction"),
/** #__PURE__*/ Namespace.functional.functionalAssert(),
/** @__PURE__ */ Namespace.assert("functional.assertEqualsFunction"),
/** @__PURE__ */ Namespace.functional.functionalAssert(),
);
export { assertEqualsFunctionPure as assertEqualsFunction };

Expand Down Expand Up @@ -260,14 +260,14 @@ function assertEqualsParameters<T extends (...args: any[]) => any>(
function assertEqualsParameters(): never {
halt("assertEqualsParameters");
}
const assertEqualsParametersPure = /** #__PURE__*/ Object.assign<
const assertEqualsParametersPure = /** @__PURE__ */ Object.assign<
typeof assertEqualsParameters,
{},
{}
>(
assertEqualsParameters,
/** #__PURE__*/ Namespace.assert("functional.assertEqualsParameters"),
/** #__PURE__*/ Namespace.functional.functionalAssert(),
/** @__PURE__ */ Namespace.assert("functional.assertEqualsParameters"),
/** @__PURE__ */ Namespace.functional.functionalAssert(),
);
export { assertEqualsParametersPure as assertEqualsParameters };

Expand Down Expand Up @@ -310,14 +310,14 @@ function assertEqualsReturn<T extends (...args: any[]) => any>(
function assertEqualsReturn(): never {
halt("assertEqualsReturn");
}
const assertEqualsReturnPure = /** #__PURE__*/ Object.assign<
const assertEqualsReturnPure = /** @__PURE__ */ Object.assign<
typeof assertEqualsReturn,
{},
{}
>(
assertEqualsReturn,
/** #__PURE__*/ Namespace.assert("functional.assertEqualsReturn"),
/** #__PURE__*/ Namespace.functional.functionalAssert(),
/** @__PURE__ */ Namespace.assert("functional.assertEqualsReturn"),
/** @__PURE__ */ Namespace.functional.functionalAssert(),
);
export { assertEqualsReturnPure as assertEqualsReturn };

Expand Down Expand Up @@ -360,9 +360,9 @@ function isFunction<T extends (...args: any[]) => any>(
function isFunction(): never {
halt("isFunction");
}
const isFunctionPure = /** #__PURE__*/ Object.assign<typeof isFunction, {}>(
const isFunctionPure = /** @__PURE__ */ Object.assign<typeof isFunction, {}>(
isFunction,
/** #__PURE__*/ Namespace.is(),
/** @__PURE__ */ Namespace.is(),
);
export { isFunctionPure as isFunction };

Expand Down Expand Up @@ -402,10 +402,10 @@ function isParameters<T extends (...args: any[]) => any>(
function isParameters(): never {
halt("isParameters");
}
const isParametersPure = /** #__PURE__*/ Object.assign<typeof isParameters, {}>(
isParameters,
/** #__PURE__*/ Namespace.is(),
);
const isParametersPure = /** @__PURE__ */ Object.assign<
typeof isParameters,
{}
>(isParameters, /** @__PURE__ */ Namespace.is());
export { isParametersPure as isParameters };

/**
Expand Down Expand Up @@ -444,9 +444,9 @@ function isReturn<T extends (...args: any[]) => any>(
function isReturn(): never {
halt("isReturn");
}
const isReturnPure = /** #__PURE__*/ Object.assign<typeof isReturn, {}>(
const isReturnPure = /** @__PURE__ */ Object.assign<typeof isReturn, {}>(
isReturn,
/** #__PURE__*/ Namespace.is(),
/** @__PURE__ */ Namespace.is(),
);
export { isReturnPure as isReturn };

Expand Down Expand Up @@ -485,10 +485,10 @@ function equalsFunction<T extends (...args: any[]) => any>(
function equalsFunction(): never {
halt("equalsFunction");
}
const equalsFunctionPure = /** #__PURE__*/ Object.assign<
const equalsFunctionPure = /** @__PURE__ */ Object.assign<
typeof equalsFunction,
{}
>(equalsFunction, /** #__PURE__*/ Namespace.is());
>(equalsFunction, /** @__PURE__ */ Namespace.is());
export { equalsFunctionPure as equalsFunction };

/**
Expand Down Expand Up @@ -523,10 +523,10 @@ function equalsParameters<T extends (...args: any[]) => any>(
function equalsParameters(): never {
halt("equalsParameters");
}
const equalsParametersPure = /** #__PURE__*/ Object.assign<
const equalsParametersPure = /** @__PURE__ */ Object.assign<
typeof equalsParameters,
{}
>(equalsParameters, /** #__PURE__*/ Namespace.is());
>(equalsParameters, /** @__PURE__ */ Namespace.is());
export { equalsParametersPure as equalsParameters };

/**
Expand Down Expand Up @@ -564,10 +564,10 @@ function equalsReturn<T extends (...args: any[]) => any>(
function equalsReturn(): never {
halt("equalsReturn");
}
const equalsReturnPure = /** #__PURE__*/ Object.assign<typeof equalsReturn, {}>(
equalsReturn,
/** #__PURE__*/ Namespace.is(),
);
const equalsReturnPure = /** @__PURE__ */ Object.assign<
typeof equalsReturn,
{}
>(equalsReturn, /** @__PURE__ */ Namespace.is());
export { equalsReturnPure as equalsReturn };

/* -----------------------------------------------------------
Expand Down Expand Up @@ -618,10 +618,10 @@ function validateFunction<T extends (...args: any[]) => any>(
function validateFunction(): never {
halt("validateFunction");
}
const validateFunctionPure = /** #__PURE__*/ Object.assign<
const validateFunctionPure = /** @__PURE__ */ Object.assign<
typeof validateFunction,
{}
>(validateFunction, /** #__PURE__*/ Namespace.validate());
>(validateFunction, /** @__PURE__ */ Namespace.validate());
export { validateFunctionPure as validateFunction };

/**
Expand Down Expand Up @@ -664,10 +664,10 @@ function validateParameters<T extends (...args: any[]) => any>(
function validateParameters(): never {
halt("validateReturn");
}
const validateParametersPure = /** #__PURE__*/ Object.assign<
const validateParametersPure = /** @__PURE__ */ Object.assign<
typeof validateParameters,
{}
>(validateParameters, /** #__PURE__*/ Namespace.validate());
>(validateParameters, /** @__PURE__ */ Namespace.validate());
export { validateParametersPure as validateParameters };

/**
Expand Down Expand Up @@ -710,10 +710,10 @@ function validateReturn<T extends (...args: any[]) => any>(
function validateReturn(): never {
halt("validateReturn");
}
const validateReturnPure = /** #__PURE__*/ Object.assign<
const validateReturnPure = /** @__PURE__ */ Object.assign<
typeof validateReturn,
{}
>(validateReturn, /** #__PURE__*/ Namespace.validate());
>(validateReturn, /** @__PURE__ */ Namespace.validate());
export { validateReturnPure as validateReturn };

/**
Expand Down Expand Up @@ -761,10 +761,10 @@ function validateEqualsFunction<T extends (...args: any[]) => any>(
function validateEqualsFunction(): never {
halt("validateEqualsFunction");
}
const validateEqualsFunctionPure = /** #__PURE__*/ Object.assign<
const validateEqualsFunctionPure = /** @__PURE__ */ Object.assign<
typeof validateEqualsFunction,
{}
>(validateEqualsFunction, /** #__PURE__*/ Namespace.validate());
>(validateEqualsFunction, /** @__PURE__ */ Namespace.validate());
export { validateEqualsFunctionPure as validateEqualsFunction };

/**
Expand Down Expand Up @@ -807,10 +807,10 @@ function validateEqualsParameters<T extends (...args: any[]) => any>(
function validateEqualsParameters(): never {
halt("validateEqualsParameters");
}
const validateEqualsParametersPure = /** #__PURE__*/ Object.assign<
const validateEqualsParametersPure = /** @__PURE__ */ Object.assign<
typeof validateEqualsParameters,
{}
>(validateEqualsParameters, /** #__PURE__*/ Namespace.validate());
>(validateEqualsParameters, /** @__PURE__ */ Namespace.validate());
export { validateEqualsParametersPure as validateEqualsParameters };

/**
Expand Down Expand Up @@ -853,10 +853,10 @@ function validateEqualsReturn<T extends (...args: any[]) => any>(
function validateEqualsReturn(): never {
halt("validateEqualsReturn");
}
const validateEqualsReturnPure = /** #__PURE__*/ Object.assign<
const validateEqualsReturnPure = /** @__PURE__ */ Object.assign<
typeof validateEqualsReturn,
{}
>(validateEqualsReturn, /** #__PURE__*/ Namespace.validate());
>(validateEqualsReturn, /** @__PURE__ */ Namespace.validate());
export { validateEqualsReturnPure as validateEqualsReturn };

/* -----------------------------------------------------------
Expand Down
8 changes: 4 additions & 4 deletions src/functional/$ProtobufReader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ export class $ProtobufReader {
}
}

const utf8 = /** #__PURE__*/ new TextDecoder();
const N01 = /** #__PURE__*/ BigInt(0x01);
const N7F = /** #__PURE__*/ BigInt(0x7f);
const N80 = /** #__PURE__*/ BigInt(0x80);
const utf8 = /** @__PURE__ */ new TextDecoder();
const N01 = /** @__PURE__ */ BigInt(0x01);
const N7F = /** @__PURE__ */ BigInt(0x7f);
const N80 = /** @__PURE__ */ BigInt(0x80);
4 changes: 2 additions & 2 deletions src/functional/$ProtobufSizer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -143,5 +143,5 @@ export class $ProtobufSizer implements IProtobufWriter {
}
}

const ND07 = /** #__PURE__*/ BigInt(7);
const NX7F = /** #__PURE__*/ BigInt(0x7f);
const ND07 = /** @__PURE__ */ BigInt(7);
const NX7F = /** @__PURE__ */ BigInt(0x7f);
12 changes: 6 additions & 6 deletions src/functional/$ProtobufWriter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@ export class $ProtobufWriter implements IProtobufWriter {
}
}

const utf8 = /** #__PURE__*/ new TextEncoder();
const utf8 = /** @__PURE__ */ new TextEncoder();

const ND01 = /** #__PURE__*/ BigInt(1);
const ND07 = /** #__PURE__*/ BigInt(7);
const ND63 = /** #__PURE__*/ BigInt(63);
const NX7F = /** #__PURE__*/ BigInt(0x7f);
const NX80 = /** #__PURE__*/ BigInt(0x80);
const ND01 = /** @__PURE__ */ BigInt(1);
const ND07 = /** @__PURE__ */ BigInt(7);
const ND63 = /** @__PURE__ */ BigInt(63);
const NX7F = /** @__PURE__ */ BigInt(0x7f);
const NX80 = /** @__PURE__ */ BigInt(0x80);
Loading

0 comments on commit e5add3e

Please sign in to comment.