@lindorm/aes 0.6.4 → 0.7.0

package/dist/utils/parse-aes.js

@@ -1,26 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseAes = void 0;
-const is_1 = require("@lindorm/is");
-const errors_1 = require("../errors");
-const is_aes_1 = require("./is-aes");
-const encoded_aes_1 = require("#internal/utils/encoded-aes");
-const serialised_aes_1 = require("#internal/utils/serialised-aes");
-const tokenised_aes_1 = require("#internal/utils/tokenised-aes");
-const parseAes = (data) => {
-    if ((0, is_1.isString)(data) && (0, is_aes_1.isAesTokenised)(data)) {
-        return (0, tokenised_aes_1.parseTokenisedAesString)(data);
+import { isObject, isString } from "@lindorm/is";
+import { AesError } from "../errors/index.js";
+import { isAesBufferData, isAesSerialisedData, isAesTokenised } from "./is-aes.js";
+import { parseEncodedAesString } from "../internal/utils/encoded-aes.js";
+import { parseSerialisedAesRecord } from "../internal/utils/serialised-aes.js";
+import { parseTokenisedAesString } from "../internal/utils/tokenised-aes.js";
+export const parseAes = (data) => {
+    if (isString(data) && isAesTokenised(data)) {
+        return parseTokenisedAesString(data);
     }
-    if ((0, is_1.isString)(data) && !(0, is_aes_1.isAesTokenised)(data)) {
-        return (0, encoded_aes_1.parseEncodedAesString)(data);
+    if (isString(data) && !isAesTokenised(data)) {
+        return parseEncodedAesString(data);
     }
-    if ((0, is_1.isObject)(data) && (0, is_aes_1.isAesBufferData)(data)) {
+    if (isObject(data) && isAesBufferData(data)) {
         return data;
     }
-    if ((0, is_1.isObject)(data) && (0, is_aes_1.isAesSerialisedData)(data)) {
-        return (0, serialised_aes_1.parseSerialisedAesRecord)(data);
+    if (isObject(data) && isAesSerialisedData(data)) {
+        return parseSerialisedAesRecord(data);
     }
-    throw new errors_1.AesError("Invalid AES data");
+    throw new AesError("Invalid AES data");
 };
-exports.parseAes = parseAes;
 //# sourceMappingURL=parse-aes.js.map

package/dist/utils/parse-aes.js.map

@@ -1 +1 @@
-{"version":3,"file":"parse-aes.js","sourceRoot":"","sources":["../../src/utils/parse-aes.ts"],"names":[],"mappings":";;;AAAA,oCAAiD;AACjD,sCAAqC;AAMrC,qCAAgF;AAChF,6DAAoE;AACpE,mEAA0E;AAC1E,iEAAwE;AASjE,MAAM,QAAQ,GAAa,CAChC,IAA4D,EACvD,EAAE;IACP,IAAI,IAAA,aAAQ,EAAC,IAAI,CAAC,IAAI,IAAA,uBAAc,EAAC,IAAI,CAAC,EAAE,CAAC;QAC3C,OAAO,IAAA,uCAAuB,EAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,IAAA,aAAQ,EAAC,IAAI,CAAC,IAAI,CAAC,IAAA,uBAAc,EAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,OAAO,IAAA,mCAAqB,EAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,IAAA,aAAQ,EAAC,IAAI,CAAC,IAAI,IAAA,wBAAe,EAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,IAAA,aAAQ,EAAC,IAAI,CAAC,IAAI,IAAA,4BAAmB,EAAC,IAAI,CAAC,EAAE,CAAC;QAChD,OAAO,IAAA,yCAAwB,EAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,IAAI,iBAAQ,CAAC,kBAAkB,CAAC,CAAC;AACzC,CAAC,CAAC;AApBW,QAAA,QAAQ,YAoBnB"}
+{"version":3,"file":"parse-aes.js","sourceRoot":"","sources":["../../src/utils/parse-aes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAM9C,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACnF,OAAO,EAAE,qBAAqB,EAAE,MAAM,kCAAkC,CAAC;AACzE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qCAAqC,CAAC;AAC/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAS7E,MAAM,CAAC,MAAM,QAAQ,GAAa,CAChC,IAA4D,EACvD,EAAE;IACP,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3C,OAAO,uBAAuB,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,OAAO,qBAAqB,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,QAAQ,CAAC,IAAI,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;QAChD,OAAO,wBAAwB,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,IAAI,QAAQ,CAAC,kBAAkB,CAAC,CAAC;AACzC,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lindorm/aes",
-  "version": "0.6.4",
+  "version": "0.7.0",
   "license": "AGPL-3.0-or-later",
   "author": "Jonn Nilsson",
   "repository": {
@@ -11,36 +11,29 @@
   "publishConfig": {
     "access": "public"
   },
-  "main": "dist/index.js",
+  "type": "module",
   "typings": "dist/index.d.ts",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
       "default": "./dist/index.js"
     },
-    "./mocks": {
-      "types": "./dist/mocks/index.d.ts",
-      "default": "./dist/mocks/index.js"
-    }
-  },
-  "typesVersions": {
-    "*": {
-      "mocks": [
-        "dist/mocks/index.d.ts"
-      ]
+    "./mocks/jest": {
+      "types": "./dist/mocks/jest.d.ts",
+      "default": "./dist/mocks/jest.js"
+    },
+    "./mocks/vitest": {
+      "types": "./dist/mocks/vitest.d.ts",
+      "default": "./dist/mocks/vitest.js"
     }
   },
-  "imports": {
-    "#internal/*": "./dist/internal/*.js"
-  },
   "scripts": {
     "build": "rimraf dist && tsc -b ./tsconfig.build.json",
     "example": "ts-node example",
     "prettier": "prettier --write ./src/*",
-    "test": "jest",
-    "test:ci": "jest",
-    "test:interop": "NODE_OPTIONS='--experimental-vm-modules' jest --config jest.config.interop.mjs --no-coverage",
-    "test:watch": "jest --watch --",
+    "test": "vitest run",
+    "test:unit": "vitest run --exclude '**/*.integration.test.ts'",
+    "test:watch": "vitest",
     "typecheck": "tsc",
     "typecheck:watch": "tsc --watch",
     "update": "ncu -i",
@@ -48,16 +41,16 @@
     "verify": "npm run typecheck && npm run build && npm test"
   },
   "dependencies": {
-    "@lindorm/b64": "^0.1.9",
-    "@lindorm/errors": "^0.1.17",
-    "@lindorm/is": "^0.1.15",
-    "@lindorm/kryptos": "^0.6.0",
-    "@lindorm/utils": "^0.7.0"
+    "@lindorm/b64": "^0.2.0",
+    "@lindorm/errors": "^0.2.0",
+    "@lindorm/is": "^0.2.0",
+    "@lindorm/kryptos": "^0.8.0",
+    "@lindorm/types": "^0.6.0",
+    "@lindorm/utils": "^0.8.0"
   },
   "devDependencies": {
-    "@lindorm/types": "^0.5.0",
     "@noble/ciphers": "^2.1.1",
     "jose": "^6.2.1"
   },
-  "gitHead": "7a7ca458fd7765833aaf99bb9115abe802e01946"
+  "gitHead": "a2b0a53295aebda806b4057f34707e8583570265"
 }

package/vitest.config.mjs

@@ -0,0 +1,6 @@
+import { createVitestConfig } from "../../vitest.config.base.mjs";
+
+const config = createVitestConfig();
+config.test.include = ["src/**/*.test.ts", "__tests__/**/*.test.ts"];
+
+export default config;

package/dist/mocks/index.d.ts

@@ -1,2 +0,0 @@
-export { createMockAesKit, type MockAesKit } from "./mock-aes-kit";
-//# sourceMappingURL=index.d.ts.map

package/dist/mocks/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/mocks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC"}

package/dist/mocks/index.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMockAesKit = void 0;
-var mock_aes_kit_1 = require("./mock-aes-kit");
-Object.defineProperty(exports, "createMockAesKit", { enumerable: true, get: function () { return mock_aes_kit_1.createMockAesKit; } });
-//# sourceMappingURL=index.js.map

package/dist/mocks/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/mocks/index.ts"],"names":[],"mappings":";;;AAAA,+CAAmE;AAA1D,gHAAA,gBAAgB,OAAA"}

package/dist/mocks/mock-aes-kit.d.ts

@@ -1,4 +0,0 @@
-import { IAesKit } from "../interfaces";
-export type MockAesKit = jest.Mocked<IAesKit>;
-export declare const createMockAesKit: () => MockAesKit;
-//# sourceMappingURL=mock-aes-kit.d.ts.map

package/dist/mocks/mock-aes-kit.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"mock-aes-kit.d.ts","sourceRoot":"","sources":["../../src/mocks/mock-aes-kit.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAGxC,MAAM,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;AAQ9C,eAAO,MAAM,gBAAgB,QAAO,UAwElC,CAAC"}

package/dist/mocks/mock-aes-kit.js

@@ -1,74 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createMockAesKit = void 0;
-const kryptos_1 = require("@lindorm/kryptos");
-const encode = (data) => Buffer.from(JSON.stringify(data)).toString("base64url");
-const decode = (encoded) => JSON.parse(Buffer.from(encoded, "base64url").toString());
-const createMockAesKit = () => ({
-    kryptos: (0, kryptos_1.createMockKryptos)(),
-    encrypt: jest.fn().mockImplementation((data, mode) => {
-        const encoded = encode(data);
-        switch (mode) {
-            case "tokenised":
-                return `aes:${encoded}`;
-            case "serialised":
-                return {
-                    cek: undefined,
-                    ciphertext: encoded,
-                    header: encode({ alg: "dir", enc: "A256GCM", cty: "text/plain" }),
-                    iv: "mock_iv",
-                    tag: "mock_tag",
-                    v: "1",
-                };
-            case "record":
-                return {
-                    algorithm: "dir",
-                    authTag: Buffer.from("mock_tag"),
-                    content: Buffer.from(encoded),
-                    contentType: "text/plain",
-                    encryption: "A256GCM",
-                    initialisationVector: Buffer.from("mock_iv"),
-                    keyId: "mock_key_id",
-                    pbkdfIterations: undefined,
-                    pbkdfSalt: undefined,
-                    publicEncryptionIv: undefined,
-                    publicEncryptionJwk: undefined,
-                    publicEncryptionKey: undefined,
-                    publicEncryptionTag: undefined,
-                    version: "1",
-                };
-            case "encoded":
-            default:
-                return encoded;
-        }
-    }),
-    decrypt: jest.fn().mockImplementation((data) => {
-        if (typeof data === "string") {
-            if (data.startsWith("aes:")) {
-                return decode(data.slice(4));
-            }
-            return decode(data);
-        }
-        if (data.ciphertext) {
-            return decode(data.ciphertext);
-        }
-        if (Buffer.isBuffer(data.content)) {
-            return decode(data.content.toString());
-        }
-        return data;
-    }),
-    assert: jest.fn(),
-    verify: jest.fn().mockReturnValue(true),
-    prepareEncryption: jest.fn().mockReturnValue({
-        headerParams: {},
-        publicEncryptionKey: undefined,
-        encrypt: jest.fn().mockReturnValue({
-            authTag: Buffer.alloc(16),
-            content: Buffer.alloc(0),
-            contentType: "text/plain",
-            initialisationVector: Buffer.alloc(12),
-        }),
-    }),
-});
-exports.createMockAesKit = createMockAesKit;
-//# sourceMappingURL=mock-aes-kit.js.map

package/dist/mocks/mock-aes-kit.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"mock-aes-kit.js","sourceRoot":"","sources":["../../src/mocks/mock-aes-kit.ts"],"names":[],"mappings":"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"}

package/jest.config.interop.mjs

@@ -1,24 +0,0 @@
-import base from "../../jest.config.base.mjs";
-import packageJson from "./package.json" with { type: "json" };
-
-export default {
-  ...base,
-  displayName: `${packageJson.name}/interop`,
-  roots: ["<rootDir>/__tests__"],
-  extensionsToTreatAsEsm: [".ts"],
-  moduleNameMapper: {
-    "^(\\.{1,2}/.*)\\.js$": "$1",
-  },
-  transform: {
-    "^.+\\.tsx?$": [
-      "ts-jest",
-      {
-        useESM: true,
-        tsconfig: "tsconfig.interop.json",
-      },
-    ],
-  },
-  transformIgnorePatterns: ["node_modules/(?!(@noble/ciphers|jose)/)"],
-  collectCoverageFrom: [],
-  coverageThreshold: {},
-};

package/tsconfig.interop.json

@@ -1,13 +0,0 @@
-{
-  "extends": "../../tsconfig.json",
-  "compilerOptions": {
-    "module": "esnext",
-    "moduleResolution": "node",
-    "rootDir": ".",
-    "baseUrl": ".",
-    "paths": {
-      "#internal/*": ["./src/internal/*"]
-    }
-  },
-  "include": ["__tests__/**/*", "src/**/*"]
-}