cyberchef 9.32.1 → 9.33.0

package/.eslintrc.json

@@ -1,5 +1,5 @@
 {
-    "parser": "babel-eslint",
+    "parser": "@babel/eslint-parser",
     "parserOptions": {
         "ecmaVersion": 9,
         "ecmaFeatures": {

package/.nvmrc

@@ -1 +1 @@
-lts/dubnium
+17

package/CHANGELOG.md

@@ -13,6 +13,10 @@ All major and minor version changes will be documented in this file. Details of
 
 ## Details
 
+### [9.33.0] - 2022-03-25
+- Updated to support Node 17 [@n1474335] [@john19696] [@t-8ch] | [[#1326] [#1313] [#1244]
+- Improved CJS and ESM module support [@d98762625] | [#1037]
+
 ### [9.32.0] - 2021-08-18
 - 'Protobuf Encode' operation added and decode operation modified to allow decoding with full and partial schemas [@n1474335] | [dd18e52]
 
@@ -271,6 +275,7 @@ All major and minor version changes will be documented in this file. Details of
 
 
 
+[9.33.0]: https://github.com/gchq/CyberChef/releases/tag/v9.33.0
 [9.32.0]: https://github.com/gchq/CyberChef/releases/tag/v9.32.0
 [9.31.0]: https://github.com/gchq/CyberChef/releases/tag/v9.31.0
 [9.30.0]: https://github.com/gchq/CyberChef/releases/tag/v9.30.0
@@ -384,6 +389,8 @@ All major and minor version changes will be documented in this file. Details of
 [@dmfj]: https://github.com/dmfj
 [@mattnotmitt]: https://github.com/mattnotmitt
 [@Danh4]: https://github.com/Danh4
+[@john19696]: https://github.com/john19696
+[@t-8ch]: https://github.com/t-8ch
 
 [8ad18b]: https://github.com/gchq/CyberChef/commit/8ad18bc7db6d9ff184ba3518686293a7685bf7b7
 [9a33498]: https://github.com/gchq/CyberChef/commit/9a33498fed26a8df9c9f35f39a78a174bf50a513
@@ -466,6 +473,10 @@ All major and minor version changes will be documented in this file. Details of
 [#999]: https://github.com/gchq/CyberChef/pull/999
 [#1006]: https://github.com/gchq/CyberChef/pull/1006
 [#1022]: https://github.com/gchq/CyberChef/pull/1022
+[#1037]: https://github.com/gchq/CyberChef/pull/1037
 [#1045]: https://github.com/gchq/CyberChef/pull/1045
 [#1049]: https://github.com/gchq/CyberChef/pull/1049
-[#1083]: https://github.com/gchq/CyberChef/pull/1083
+[#1083]: https://github.com/gchq/CyberChef/pull/1083
+[#1244]: https://github.com/gchq/CyberChef/pull/1244
+[#1313]: https://github.com/gchq/CyberChef/pull/1313
+[#1326]: https://github.com/gchq/CyberChef/pull/1326

package/Gruntfile.js

@@ -6,6 +6,8 @@ const BundleAnalyzerPlugin = require("webpack-bundle-analyzer").BundleAnalyzerPl
 const glob = require("glob");
 const path = require("path");
 
+const nodeFlags = "--experimental-modules --experimental-json-modules --experimental-specifier-resolution=node --no-warnings --no-deprecation";
+
 /**
  * Grunt configuration for building the app in various formats.
  *
@@ -48,7 +50,7 @@ module.exports = function (grunt) {
 
     grunt.registerTask("testnodeconsumer",
         "A task which checks whether consuming CJS and ESM apps work with the CyberChef build",
-        ["exec:setupNodeConsumers", "exec:testCJSNodeConsumer", "exec:testESMNodeConsumer", "exec:testESMDeepImportNodeConsumer", "exec:teardownNodeConsumers"]);
+        ["exec:setupNodeConsumers", "exec:testCJSNodeConsumer", "exec:testESMNodeConsumer", "exec:teardownNodeConsumers"]);
 
     grunt.registerTask("default",
         "Lints the code base",
@@ -187,9 +189,6 @@ module.exports = function (grunt) {
             standalone: ["build/prod/CyberChef*.html"]
         },
         eslint: {
-            options: {
-                configFile: "./.eslintrc.json"
-            },
             configs: ["*.{js,mjs}"],
             core: ["src/core/**/*.{js,mjs}", "!src/core/vendor/**/*", "!src/core/operations/legacy/**/*"],
             web: ["src/web/**/*.{js,mjs}", "!src/web/static/**/*"],
@@ -349,15 +348,15 @@ module.exports = function (grunt) {
                 command: "git gc --prune=now --aggressive"
             },
             sitemap: {
-                command: "node --experimental-modules --no-warnings --no-deprecation src/web/static/sitemap.mjs > build/prod/sitemap.xml",
+                command: `node ${nodeFlags} src/web/static/sitemap.mjs > build/prod/sitemap.xml`,
                 sync: true
             },
             generateConfig: {
                 command: chainCommands([
                     "echo '\n--- Regenerating config files. ---'",
                     "echo [] > src/core/config/OperationConfig.json",
-                    "node --experimental-modules --no-warnings --no-deprecation src/core/config/scripts/generateOpsIndex.mjs",
-                    "node --experimental-modules --no-warnings --no-deprecation src/core/config/scripts/generateConfig.mjs",
+                    `node ${nodeFlags} src/core/config/scripts/generateOpsIndex.mjs`,
+                    `node ${nodeFlags} src/core/config/scripts/generateConfig.mjs`,
                     "echo '--- Config scripts finished. ---\n'"
                 ]),
                 sync: true
@@ -365,7 +364,7 @@ module.exports = function (grunt) {
             generateNodeIndex: {
                 command: chainCommands([
                     "echo '\n--- Regenerating node index ---'",
-                    "node --experimental-modules --no-warnings --no-deprecation src/node/config/scripts/generateNodeIndex.mjs",
+                    `node ${nodeFlags} src/node/config/scripts/generateNodeIndex.mjs`,
                     "echo '--- Node index generated. ---\n'"
                 ]),
                 sync: true
@@ -393,21 +392,14 @@ module.exports = function (grunt) {
             testCJSNodeConsumer: {
                 command: chainCommands([
                     `cd ${nodeConsumerTestPath}`,
-                    "node --no-warnings cjs-consumer.js",
+                    `node ${nodeFlags} cjs-consumer.js`,
                 ]),
                 stdout: false,
             },
             testESMNodeConsumer: {
                 command: chainCommands([
                     `cd ${nodeConsumerTestPath}`,
-                    "node --no-warnings --experimental-modules esm-consumer.mjs",
-                ]),
-                stdout: false,
-            },
-            testESMDeepImportNodeConsumer: {
-                command: chainCommands([
-                    `cd ${nodeConsumerTestPath}`,
-                    "node --no-warnings --experimental-modules esm-deep-import-consumer.mjs",
+                    `node ${nodeFlags} esm-consumer.mjs`,
                 ]),
                 stdout: false,
             },

package/babel.config.js

@@ -11,6 +11,7 @@ module.exports = function(api) {
         ],
         "plugins": [
             "dynamic-import-node",
+            "@babel/plugin-syntax-import-assertions",
             [
                 "babel-plugin-transform-builtin-extend", {
                     "globals": ["Error"]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cyberchef",
-  "version": "9.32.1",
+  "version": "9.33.0",
   "description": "The Cyber Swiss Army Knife for encryption, encoding, compression and data analysis.",
   "author": "n1474335 <n1474335@gmail.com>",
   "homepage": "https://gchq.github.io/CyberChef",
@@ -27,28 +27,34 @@
     "type": "git",
     "url": "https://github.com/gchq/CyberChef/"
   },
-  "main": "src/node/cjs.js",
-  "module": "src/node/index.mjs",
+  "main": "src/node/wrapper.js",
+  "exports": {
+    "import": "./src/node/index.mjs",
+    "require": "./src/node/wrapper.js"
+  },
   "bugs": "https://github.com/gchq/CyberChef/issues",
   "browserslist": [
     "Chrome >= 50",
     "Firefox >= 38",
-    "node >= 10"
+    "node >= 16"
   ],
   "devDependencies": {
-    "@babel/core": "^7.15.0",
-    "@babel/plugin-transform-runtime": "^7.15.0",
-    "@babel/preset-env": "^7.15.0",
+    "@babel/core": "^7.17.8",
+    "@babel/eslint-parser": "^7.17.0",
+    "@babel/plugin-syntax-import-assertions": "^7.16.7",
+    "@babel/plugin-transform-runtime": "^7.17.0",
+    "@babel/preset-env": "^7.16.11",
+    "@babel/runtime": "^7.17.8",
     "autoprefixer": "^10.3.1",
-    "babel-eslint": "^10.1.0",
-    "babel-loader": "^8.2.2",
+    "babel-loader": "^8.2.4",
     "babel-plugin-dynamic-import-node": "^2.3.3",
-    "chromedriver": "^92.0.1",
+    "chromedriver": "^99.0.0",
     "cli-progress": "^3.9.0",
     "colors": "^1.4.0",
     "copy-webpack-plugin": "^9.0.1",
+    "core-js": "^3.21.1",
     "css-loader": "5.2.7",
-    "eslint": "^7.32.0",
+    "eslint": "^8.11.0",
     "exports-loader": "^3.0.0",
     "file-loader": "^6.2.0",
     "grunt": "^1.4.1",
@@ -58,7 +64,7 @@
     "grunt-contrib-connect": "^3.0.0",
     "grunt-contrib-copy": "~1.0.0",
     "grunt-contrib-watch": "^1.1.0",
-    "grunt-eslint": "^23.0.0",
+    "grunt-eslint": "^24.0.0",
     "grunt-exec": "~3.0.0",
     "grunt-webpack": "^4.0.3",
     "grunt-zip": "^0.18.2",
@@ -66,7 +72,6 @@
     "imports-loader": "^3.0.0",
     "mini-css-extract-plugin": "1.3.7",
     "nightwatch": "^1.7.8",
-    "node-sass": "^5.0.0",
     "postcss": "^8.3.6",
     "postcss-css-variables": "^0.18.0",
     "postcss-import": "^14.0.2",
@@ -77,7 +82,7 @@
     "style-loader": "^3.2.1",
     "svg-url-loader": "^7.1.1",
     "url-loader": "^4.1.1",
-    "webpack": "^5.51.0",
+    "webpack": "^5.70.0",
     "webpack-bundle-analyzer": "^4.4.2",
     "webpack-dev-server": "3.11.2",
     "webpack-node-externals": "^3.0.0",
@@ -85,7 +90,6 @@
   },
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@babel/runtime": "^7.15.3",
     "arrive": "^2.4.1",
     "avsc": "^5.7.3",
     "babel-plugin-transform-builtin-extend": "1.1.2",
@@ -101,7 +105,6 @@
     "cbor": "5.0.1",
     "chi-squared": "^1.1.0",
     "codepage": "^1.15.0",
-    "core-js": "^3.16.2",
     "crypto-api": "^0.8.5",
     "crypto-browserify": "^3.12.0",
     "crypto-js": "^4.1.1",
@@ -111,7 +114,6 @@
     "diff": "^5.0.0",
     "es6-promisify": "^7.0.0",
     "escodegen": "^2.0.0",
-    "esm": "^3.2.25",
     "esprima": "^4.0.1",
     "exif-parser": "^0.1.12",
     "file-saver": "^2.0.5",
@@ -133,12 +135,13 @@
     "lodash": "^4.17.21",
     "loglevel": "^1.7.1",
     "loglevel-message-prefix": "^3.0.0",
-    "markdown-it": "^12.2.0",
+    "markdown-it": "^12.3.2",
     "moment": "^2.29.1",
     "moment-timezone": "^0.5.33",
     "ngeohash": "^0.6.3",
     "node-forge": "^0.10.0",
     "node-md6": "^0.1.0",
+    "node-sass": "^7.0.1",
     "nodom": "^2.4.0",
     "notepack.io": "^2.3.0",
     "nwmatcher": "^1.4.4",
@@ -168,14 +171,14 @@
   "scripts": {
     "start": "npx grunt dev",
     "build": "npx grunt prod",
-    "repl": "node src/node/repl.js",
-    "test": "npx grunt configTests && node --experimental-modules --no-warnings --no-deprecation tests/node/index.mjs && node --experimental-modules --no-warnings --no-deprecation tests/operations/index.mjs",
+    "repl": "node --experimental-modules --experimental-json-modules --experimental-specifier-resolution=node --no-warnings src/node/repl.mjs",
+    "test": "npx grunt configTests && node --experimental-modules --experimental-json-modules --no-warnings --no-deprecation tests/node/index.mjs && node --experimental-modules --experimental-json-modules --no-warnings --no-deprecation tests/operations/index.mjs",
     "test-node-consumer": "npx grunt testnodeconsumer",
     "testui": "npx grunt testui",
     "testuidev": "npx nightwatch --env=dev",
     "lint": "npx grunt lint",
     "postinstall": "npx grunt exec:fixCryptoApiImports",
-    "newop": "node --experimental-modules src/core/config/scripts/newOperation.mjs",
+    "newop": "node --experimental-modules --experimental-json-modules src/core/config/scripts/newOperation.mjs",
     "getheapsize": "node -e 'console.log(`node heap limit = ${require(\"v8\").getHeapStatistics().heap_size_limit / (1024 * 1024)} Mb`)'",
     "setheapsize": "export NODE_OPTIONS=--max_old_space_size=2048"
   }

package/src/core/ChefWorker.js

@@ -7,7 +7,7 @@
  */
 
 import Chef from "./Chef.mjs";
-import OperationConfig from "./config/OperationConfig.json";
+import OperationConfig from "./config/OperationConfig.json" assert {type: "json"};
 import OpModules from "./config/modules/OpModules.mjs";
 
 // Add ">" to the start of all log messages in the Chef Worker

package/src/core/Recipe.mjs

@@ -4,7 +4,7 @@
  * @license Apache-2.0
  */
 
-import OperationConfig from "./config/OperationConfig.json";
+import OperationConfig from "./config/OperationConfig.json" assert {type: "json"};
 import OperationError from "./errors/OperationError.mjs";
 import Operation from "./Operation.mjs";
 import DishError from "./errors/DishError.mjs";

package/src/core/config/modules/Bletchley.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import Bombe from "../../operations/Bombe.mjs";

package/src/core/config/modules/Charts.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import Entropy from "../../operations/Entropy.mjs";

package/src/core/config/modules/Ciphers.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import A1Z26CipherDecode from "../../operations/A1Z26CipherDecode.mjs";

package/src/core/config/modules/Code.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import CSSBeautify from "../../operations/CSSBeautify.mjs";

package/src/core/config/modules/Compression.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import Bzip2Compress from "../../operations/Bzip2Compress.mjs";

package/src/core/config/modules/Crypto.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import Adler32Checksum from "../../operations/Adler32Checksum.mjs";

package/src/core/config/modules/Default.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import ADD from "../../operations/ADD.mjs";

package/src/core/config/modules/Diff.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import Diff from "../../operations/Diff.mjs";

package/src/core/config/modules/Encodings.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import CitrixCTX1Decode from "../../operations/CitrixCTX1Decode.mjs";

package/src/core/config/modules/Hashing.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import BLAKE2b from "../../operations/BLAKE2b.mjs";

package/src/core/config/modules/Image.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import AddTextToImage from "../../operations/AddTextToImage.mjs";

package/src/core/config/modules/OCR.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import OpticalCharacterRecognition from "../../operations/OpticalCharacterRecognition.mjs";

package/src/core/config/modules/OpModules.mjs

@@ -4,7 +4,7 @@
 * Imports all modules for builds which do not load modules separately.
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import CiphersModule from "./Ciphers.mjs";

package/src/core/config/modules/PGP.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import GeneratePGPKeyPair from "../../operations/GeneratePGPKeyPair.mjs";

package/src/core/config/modules/Protobuf.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import ProtobufDecode from "../../operations/ProtobufDecode.mjs";

package/src/core/config/modules/PublicKey.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import HexToObjectIdentifier from "../../operations/HexToObjectIdentifier.mjs";

package/src/core/config/modules/Regex.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import ExtractDates from "../../operations/ExtractDates.mjs";

package/src/core/config/modules/Serialise.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import AvroToJSON from "../../operations/AvroToJSON.mjs";

package/src/core/config/modules/Shellcode.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import DisassembleX86 from "../../operations/DisassembleX86.mjs";

package/src/core/config/modules/URL.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import ParseURI from "../../operations/ParseURI.mjs";

package/src/core/config/modules/UserAgent.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import ParseUserAgent from "../../operations/ParseUserAgent.mjs";

package/src/core/config/modules/Yara.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateConfig.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import YARARules from "../../operations/YARARules.mjs";

package/src/core/errors/index.mjs

@@ -1,6 +1,6 @@
 import OperationError from "./OperationError.mjs";
 import DishError from "./DishError.mjs";
-import ExcludedOperationError from "./ExcludedOperationError";
+import ExcludedOperationError from "./ExcludedOperationError.mjs";
 
 export {
     OperationError,

package/src/core/lib/BitwiseOp.mjs

@@ -34,10 +34,10 @@ export function bitOp (input, key, func, nullPreserving, scheme) {
             !(nullPreserving && (o === 0 || o === k))) {
             switch (scheme) {
                 case "Input differential":
-                    key[i % key.length] = x;
+                    key[i % key.length] = o;
                     break;
                 case "Output differential":
-                    key[i % key.length] = o;
+                    key[i % key.length] = x;
                     break;
             }
         }

package/src/core/lib/Magic.mjs

@@ -1,4 +1,4 @@
-import OperationConfig from "../config/OperationConfig.json";
+import OperationConfig from "../config/OperationConfig.json" assert {type: "json"};
 import Utils, { isWorkerEnvironment } from "../Utils.mjs";
 import Recipe from "../Recipe.mjs";
 import Dish from "../Dish.mjs";

package/src/core/lib/Protobuf.mjs

@@ -141,7 +141,7 @@ class Protobuf {
         const messageNames = [];
         const fieldTypes = [];
         this.parsedProto.root.nestedArray.forEach(block => {
-            if (block.constructor.name === "Type") {
+            if (block instanceof protobuf.Type) {
                 messageNames.push(block.name);
                 this.parsedProto.root.nested[block.name].fieldsArray.forEach(field => {
                     fieldTypes.push(field.type);
@@ -152,12 +152,12 @@ class Protobuf {
         if (messageNames.length === 0) {
             this.mainMessageName = null;
         } else {
-            for (const name of messageNames) {
-                if (!fieldTypes.includes(name)) {
-                    this.mainMessageName = name;
-                    break;
-                }
-            }
+            // for (const name of messageNames) {
+            //     if (!fieldTypes.includes(name)) {
+            //         this.mainMessageName = name;
+            //         break;
+            //     }
+            // }
             this.mainMessageName = messageNames[0];
         }
     }
@@ -213,7 +213,7 @@ class Protobuf {
      */
     static appendTypesToFieldNames(schemaRoot) {
         for (const block of schemaRoot.nestedArray) {
-            if (block.constructor.name === "Type") {
+            if (block instanceof protobuf.Type) {
                 for (const [fieldName, fieldData] of Object.entries(block.fields)) {
                     schemaRoot.nested[block.name].remove(block.fields[fieldName]);
                     schemaRoot.nested[block.name].add(new protobuf.Field(`${fieldName} (${fieldData.type})`, fieldData.id, fieldData.type, fieldData.rule));
@@ -306,7 +306,7 @@ class Protobuf {
                 }
 
                 // Check for submessage fields
-                if (schemaField.resolvedType !== null && schemaField.resolvedType.constructor.name === "Type") {
+                if (schemaField.resolvedType instanceof protobuf.Type) {
                     const subMessageType = schemaMessage.fields[schemaFieldName].type;
                     const schemaSubMessage = this.parsedProto.root.nested[subMessageType];
                     const rawSubMessages = rawDecodedMessage[fieldName];

package/src/core/operations/index.mjs

@@ -2,7 +2,7 @@
 * THIS FILE IS AUTOMATICALLY GENERATED BY src/core/config/scripts/generateOpsIndex.mjs
 *
 * @author n1474335 [n1474335@gmail.com]
-* @copyright Crown Copyright 2021
+* @copyright Crown Copyright 2022
 * @license Apache-2.0
 */
 import A1Z26CipherDecode from "./A1Z26CipherDecode.mjs";

package/src/node/api.mjs

@@ -10,7 +10,7 @@
 
 import NodeDish from "./NodeDish.mjs";
 import NodeRecipe from "./NodeRecipe.mjs";
-import OperationConfig from "../core/config/OperationConfig.json";
+import OperationConfig from "../core/config/OperationConfig.json" assert {type: "json"};
 import { sanitise, removeSubheadingsFromArray, sentenceToCamelCase } from "./apiUtils.mjs";
 import ExcludedOperationError from "../core/errors/ExcludedOperationError.mjs";
 

package/src/node/config/scripts/generateNodeIndex.mjs

@@ -41,7 +41,7 @@ let code = `/**
 import NodeDish from "./NodeDish.mjs";
 import { _wrap, help, bake, _explainExcludedFunction } from "./api.mjs";
 import File from "./File.mjs";
-import { OperationError, DishError, ExcludedOperationError } from "../core/errors/index";
+import { OperationError, DishError, ExcludedOperationError } from "../core/errors/index.mjs";
 import {
     // import as core_ to avoid name clashes after wrap.
 `;
@@ -52,7 +52,7 @@ includedOperations.forEach((op) => {
 });
 
 code +=`
-} from "../core/operations/index";
+} from "../core/operations/index.mjs";
 
 global.File = File;
 

package/src/node/index.mjs

@@ -12,7 +12,7 @@
 import NodeDish from "./NodeDish.mjs";
 import { _wrap, help, bake, _explainExcludedFunction } from "./api.mjs";
 import File from "./File.mjs";
-import { OperationError, DishError, ExcludedOperationError } from "../core/errors/index";
+import { OperationError, DishError, ExcludedOperationError } from "../core/errors/index.mjs";
 import {
     // import as core_ to avoid name clashes after wrap.
     A1Z26CipherDecode as core_A1Z26CipherDecode,
@@ -370,7 +370,7 @@ import {
     ZlibDeflate as core_ZlibDeflate,
     ZlibInflate as core_ZlibInflate,
 
-} from "../core/operations/index";
+} from "../core/operations/index.mjs";
 
 global.File = File;
 

package/src/node/{repl.js → repl.mjs}

@@ -7,8 +7,8 @@
  * @license Apache-2.0
  */
 
-const chef = require("./cjs.js");
-const repl = require("repl");
+import chef from "./index.mjs";
+import repl from "repl";
 
 
 /* eslint no-console: ["off"] */

package/src/node/wrapper.js

@@ -0,0 +1,11 @@
+/**
+ * Export the main ESM module as CommonJS
+ *
+ *
+ * @author d98762656 [d98762625@gmail.com]
+ * @copyright Crown Copyright 2019
+ * @license Apache-2.0
+ */
+
+module.exports = (async () => await import("./index.mjs"))();
+module.exports.File = (async () => await import("./File.mjs"))();

package/src/web/index.js

@@ -17,8 +17,8 @@ import * as CanvasComponents from "../core/lib/CanvasComponents.mjs";
 
 // CyberChef
 import App from "./App.mjs";
-import Categories from "../core/config/Categories.json";
-import OperationConfig from "../core/config/OperationConfig.json";
+import Categories from "../core/config/Categories.json" assert {type: "json"};
+import OperationConfig from "../core/config/OperationConfig.json" assert {type: "json"};
 
 
 /**

package/src/web/static/sitemap.mjs

@@ -1,5 +1,5 @@
 import sm from "sitemap";
-import OperationConfig from "../../core/config/OperationConfig.json";
+import OperationConfig from "../../core/config/OperationConfig.json" assert {type: "json"};
 
 
 /**

package/tests/node/consumers/cjs-consumer.js

@@ -6,24 +6,27 @@
  * @license Apache-2.0
  */
 
-const chef = require("cyberchef");
 const assert = require("assert");
 
-const d = chef.bake("Testing, 1 2 3", [
-    chef.toHex,
-    chef.reverse,
-    {
-        op: chef.unique,
-        args: {
-            delimiter: "Space",
-        }
-    },
-    {
-        op: chef.multiply,
-        args: {
-            delimiter: "Space",
+require("cyberchef").then(chef => {
+
+    const d = chef.bake("Testing, 1 2 3", [
+        chef.toHex,
+        chef.reverse,
+        {
+            op: chef.unique,
+            args: {
+                delimiter: "Space",
+            }
+        },
+        {
+            op: chef.multiply,
+            args: {
+                delimiter: "Space",
+            }
         }
-    }
-]);
+    ]);
+
+    assert.equal(d.value, "630957449041920");
 
-assert.equal(d.value, "630957449041920");
+});

package/tests/node/consumers/esm-consumer.mjs

@@ -7,8 +7,28 @@
  */
 import assert from "assert";
 import chef from "cyberchef";
+import { bake, toHex, reverse, unique, multiply } from "cyberchef";
 
-const d = chef.bake("Testing, 1 2 3", [
+const a = bake("Testing, 1 2 3", [
+    toHex,
+    reverse,
+    {
+        op: unique,
+        args: {
+            delimiter: "Space",
+        }
+    },
+    {
+        op: multiply,
+        args: {
+            delimiter: "Space",
+        }
+    }
+]);
+
+assert.equal(a.value, "630957449041920");
+
+const b = chef.bake("Testing, 1 2 3", [
     chef.toHex,
     chef.reverse,
     {
@@ -25,4 +45,4 @@ const d = chef.bake("Testing, 1 2 3", [
     }
 ]);
 
-assert.equal(d.value, "630957449041920");
+assert.equal(b.value, "630957449041920");

package/tests/node/tests/Categories.mjs

@@ -1,6 +1,6 @@
 import TestRegister from "../../lib/TestRegister.mjs";
-import Categories from "../../../src/core/config/Categories.json";
-import OperationConfig from "../../../src/core/config/OperationConfig.json";
+import Categories from "../../../src/core/config/Categories.json" assert {type: "json"};
+import OperationConfig from "../../../src/core/config/OperationConfig.json" assert {type: "json"};
 import it from "../assertionHandler.mjs";
 import assert from "assert";
 

package/tests/node/tests/operations.mjs

@@ -32,7 +32,7 @@ import {
     CSSMinify,
     toBase64,
     toHex
-} from "../../../src/node/index";
+} from "../../../src/node/index.mjs";
 import chef from "../../../src/node/index.mjs";
 import TestRegister from "../../lib/TestRegister.mjs";
 import File from "../../../src/node/File.mjs";

package/tests/operations/tests/AvroToJSON.mjs

@@ -6,7 +6,7 @@
  * @license Apache-2.0
  */
 
-import TestRegister from "../../lib/TestRegister";
+import TestRegister from "../../lib/TestRegister.mjs";
 
 TestRegister.addTests([
     {

package/tests/operations/tests/BaconCipher.mjs

@@ -5,8 +5,8 @@
  * @copyright Karsten Silkenbäumer 2019
  * @license Apache-2.0
  */
-import TestRegister from "../../lib/TestRegister";
-import { BACON_ALPHABETS, BACON_TRANSLATIONS } from "../../../src/core/lib/Bacon";
+import TestRegister from "../../lib/TestRegister.mjs";
+import { BACON_ALPHABETS, BACON_TRANSLATIONS } from "../../../src/core/lib/Bacon.mjs";
 
 const alphabets = Object.keys(BACON_ALPHABETS);
 const translations = BACON_TRANSLATIONS;

package/src/node/cjs.js

@@ -1,13 +0,0 @@
-/**
- * Export the main ESM module as CommonJS
- *
- *
- * @author d98762656 [d98762625@gmail.com]
- * @copyright Crown Copyright 2019
- * @license Apache-2.0
- */
-
-/* eslint no-global-assign: ["off"] */
-require = require("esm")(module);
-module.exports = require("./index.mjs");
-module.exports.File = require("./File.mjs");

package/tests/node/consumers/esm-deep-import-consumer.mjs

@@ -1,28 +0,0 @@
-/**
- * Tests to ensure that a consuming app can use named imports from deep import patch
- *
- * @author d98762625 [d98762625@gmail.com]
- * @copyright Crown Copyright 2019
- * @license Apache-2.0
- */
-import assert from "assert";
-import { bake, toHex, reverse, unique, multiply } from "cyberchef/src/node/index.mjs";
-
-const d = bake("Testing, 1 2 3", [
-    toHex,
-    reverse,
-    {
-        op: unique,
-        args: {
-            delimiter: "Space",
-        }
-    },
-    {
-        op: multiply,
-        args: {
-            delimiter: "Space",
-        }
-    }
-]);
-
-assert.equal(d.value, "630957449041920");