Introduce deno workspace.

core/mod.ts

@@ -15,12 +15,12 @@ export type { RecipientContextParams } from "./src/interfaces/recipientContextPa
 export type { CipherSuiteSealResponse } from "./src/interfaces/responses.ts";
 export type { SenderContextParams } from "./src/interfaces/senderContextParams.ts";
 
-// export {
-//   KEM_USAGES,
-//   LABEL_DKP_PRK,
-//   LABEL_SK,
-// } from "./src/interfaces/dhkemPrimitives.ts";
-// export { SUITE_ID_HEADER_KEM } from "./src/interfaces/kemInterface.ts";
+export {
+  KEM_USAGES,
+  LABEL_DKP_PRK,
+  LABEL_SK,
+} from "./src/interfaces/dhkemPrimitives.ts";
+export { SUITE_ID_HEADER_KEM } from "./src/interfaces/kemInterface.ts";
 
 export { Aes128Gcm, Aes256Gcm } from "./src/aeads/aesGcm.ts";
 export { ExportOnly } from "./src/aeads/exportOnly.ts";

deno.json

@@ -1,10 +1,17 @@
 {
   "name": "@dajiaji/hpke",
   "version": "1.2.9",
+  "workspace": [
+    "./core",
+    "./x/chacha20poly1305",
+    "./x/dhkem-secp256k1",
+    "./x/dhkem-x25519",
+    "./x/dhkem-x448",
+    "./x/hybridkem-x25519-kyber768"
+  ],
   "exports": "./mod.ts",
   "imports": {
     "@deno/dnt": "jsr:@deno/dnt@^0.41.2",
-    "@hpke/core": "jsr:@hpke/core@^1.2.9",
     "@std/assert": "jsr:@std/[email protected]",
     "@std/testing": "jsr:@std/testing@^1.0.0"
   },
@@ -16,8 +23,7 @@
       "deno.lock",
       "mod.ts",
       "mod_core.ts",
-      "src/",
-      "x/chacha20poly1305/src/"
+      "src/"
     ],
     "exclude": [
       "core/LICENSE",

dnt.ts

@@ -32,6 +32,14 @@ await build({
   package: {
     name: "hpke-js",
     version: Deno.args[0],
+    workspaces: [
+      "core",
+      "x/chacha20poly1305",
+      "x/dhkem-secp256k1",
+      "x/dhkem-x25519",
+      "x/dhkem-x448",
+      "x/hybridkem-x25519-kyber768",
+    ],
     description:
       "A Hybrid Public Key Encryption (HPKE) module for various JavaScript runtimes",
     repository: {

import_map_for_dnt.json

@@ -1,7 +1,6 @@
 {
   "imports": {
     "@deno/dnt": "jsr:@deno/dnt@^0.41.2",
-    "@hpke/core": "npm:@hpke/core@^1.2.9",
     "@std/assert": "jsr:@std/[email protected]",
     "@std/testing": "jsr:@std/testing@^1.0.0"
   }

x/chacha20poly1305/deno.json

@@ -2,15 +2,10 @@
   "name": "@hpke/chacha20poly1305",
   "version": "1.2.9",
   "exports": "./mod.ts",
-  "imports": {
-    "@deno/dnt": "jsr:@deno/dnt@^0.41.2",
-    "@hpke/core": "jsr:@hpke/core@^1.2.9",
-    "@std/assert": "jsr:@std/[email protected]",
-    "@std/testing": "jsr:@std/testing@^1.0.0"
-  },
   "publish": {
     "exclude": [
       "dnt.ts",
+      "import_map.json",
       "samples/",
       "test/",
       "tsconfig.json"

x/chacha20poly1305/dnt.ts

@@ -10,7 +10,7 @@ await build({
   test: true,
   declaration: true,
   scriptModule: "umd",
-  importMap: "../../import_map_for_dnt.json",
+  importMap: "./import_map.json",
   compilerOptions: {
     lib: ["ES2022", "DOM"],
   },

x/chacha20poly1305/import_map.json

@@ -0,0 +1,8 @@
+{
+  "imports": {
+    "@deno/dnt": "jsr:@deno/dnt@^0.41.2",
+    "@hpke/core": "../../core/mod.ts",
+    "@std/assert": "jsr:@std/[email protected]",
+    "@std/testing": "jsr:@std/testing@^1.0.0"
+  }
+}

x/chacha20poly1305/test/chacha20poly1305.test.ts

@@ -1,15 +1,14 @@
 import { assertEquals } from "@std/assert";
 import { describe, it } from "@std/testing/bdd";
 
-import { AeadId } from "../../../core/src/identifiers.ts";
 import {
+  AeadId,
   CipherSuite,
   DhkemP256HkdfSha256,
   HkdfSha256,
-} from "../../../mod_core.ts";
+} from "@hpke/core";
 
 import { loadCrypto } from "../../../core/test/utils.ts";
-
 import { Chacha20Poly1305 } from "../mod.ts";
 
 describe("Chacha20Poly1305", () => {

x/dhkem-secp256k1/deno.json

@@ -2,14 +2,10 @@
   "name": "@hpke/dhkem-secp256k1",
   "version": "1.2.9",
   "exports": "./mod.ts",
-  "imports": {
-    "@deno/dnt": "jsr:@deno/dnt@^0.41.2",
-    "@std/assert": "jsr:@std/[email protected]",
-    "@std/testing": "jsr:@std/testing@^1.0.0"
-  },
   "publish": {
     "exclude": [
       "dnt.ts",
+      "import_map.json",
       "samples/",
       "test/",
       "tsconfig.json"

x/dhkem-secp256k1/dnt.ts

@@ -9,9 +9,9 @@ await build({
   test: true,
   declaration: true,
   scriptModule: "umd",
-  importMap: "./deno.json",
+  importMap: "./import_map.json",
   compilerOptions: {
-    lib: ["es2022", "dom"],
+    lib: ["ES2022", "DOM"],
   },
   shims: {
     deno: "dev",
@@ -59,5 +59,5 @@ await build({
 });
 
 // post build steps
-Deno.copyFileSync("../../LICENSE", "npm/LICENSE");
+Deno.copyFileSync("LICENSE", "npm/LICENSE");
 Deno.copyFileSync("README.md", "npm/README.md");

x/dhkem-secp256k1/import_map.json

@@ -0,0 +1,9 @@
+{
+  "imports": {
+    "@deno/dnt": "jsr:@deno/dnt@^0.41.2",
+    "@hpke/core": "../../core/mod.ts",
+    "@hpke/dhkem-x25519": "../dhkem-x25519/mod.ts",
+    "@std/assert": "jsr:@std/[email protected]",
+    "@std/testing": "jsr:@std/testing@^1.0.0"
+  }
+}

x/dhkem-secp256k1/src/dhkemSecp256k1.ts

@@ -1,5 +1,5 @@
-import { Dhkem, KemId } from "../../../mod_core.ts";
-import { HkdfSha256 } from "../../../x/dhkem-x25519/mod.ts";
+import { Dhkem, KemId } from "@hpke/core";
+import { HkdfSha256 } from "@hpke/dhkem-x25519";
 
 import { Secp256k1 } from "./secp256k1.ts";
 

x/dhkem-secp256k1/src/secp256k1.ts

@@ -1,7 +1,7 @@
 // @ts-ignore: for "npm:"
 import { secp256k1 } from "npm:@noble/[email protected]/secp256k1";
 
-import type { DhkemPrimitives, KdfInterface } from "../../../mod_core.ts";
+import type { DhkemPrimitives, KdfInterface } from "@hpke/core";
 
 import {
   DeriveKeyPairError,
@@ -12,7 +12,7 @@ import {
   NotSupportedError,
   SerializeError,
   XCryptoKey,
-} from "../../../mod_core.ts";
+} from "@hpke/core";
 
 const ALG_NAME = "ECDH";
 const EMPTY = new Uint8Array();

x/dhkem-x25519/deno.json

@@ -2,14 +2,10 @@
   "name": "@hpke/dhkem-x25519",
   "version": "1.2.9",
   "exports": "./mod.ts",
-  "imports": {
-    "@deno/dnt": "jsr:@deno/dnt@^0.41.2",
-    "@std/assert": "jsr:@std/[email protected]",
-    "@std/testing": "jsr:@std/testing@^1.0.0"
-  },
   "publish": {
     "exclude": [
       "dnt.ts",
+      "import_map.json",
       "samples/",
       "test/",
       "tsconfig.json"

x/dhkem-x25519/dnt.ts

@@ -9,9 +9,9 @@ await build({
   test: true,
   declaration: true,
   scriptModule: "umd",
-  importMap: "./deno.json",
+  importMap: "./import_map.json",
   compilerOptions: {
-    lib: ["es2022", "dom"],
+    lib: ["ES2022", "DOM"],
   },
   shims: {
     deno: "dev",
@@ -59,5 +59,5 @@ await build({
 });
 
 // post build steps
-Deno.copyFileSync("../../LICENSE", "npm/LICENSE");
+Deno.copyFileSync("LICENSE", "npm/LICENSE");
 Deno.copyFileSync("README.md", "npm/README.md");

x/dhkem-x25519/import_map.json

@@ -0,0 +1,8 @@
+{
+  "imports": {
+    "@deno/dnt": "jsr:@deno/dnt@^0.41.2",
+    "@hpke/core": "../../core/mod.ts",
+    "@std/assert": "jsr:@std/[email protected]",
+    "@std/testing": "jsr:@std/testing@^1.0.0"
+  }
+}

x/dhkem-x25519/src/dhkemX25519.ts

@@ -1,4 +1,5 @@
-import { Dhkem, KemId } from "../../../mod_core.ts";
+import { Dhkem, KemId } from "@hpke/core";
+
 import { HkdfSha256 } from "./hkdfSha256.ts";
 import { X25519 } from "./x25519.ts";
 

x/dhkem-x25519/src/hkdfSha256.ts

@@ -3,7 +3,7 @@ import { hmac } from "npm:@noble/[email protected]/hmac";
 // @ts-ignore: for "npm:"
 import { sha256 } from "npm:@noble/[email protected]/sha256";
 
-import { HkdfSha256Native } from "../../../mod_core.ts";
+import { HkdfSha256Native } from "@hpke/core";
 
 export class HkdfSha256 extends HkdfSha256Native {
   public override async extract(

x/dhkem-x25519/src/x25519.ts

@@ -1,7 +1,7 @@
 // @ts-ignore: for "npm:"
 import { x25519 } from "npm:@noble/[email protected]/ed25519";
 
-import type { DhkemPrimitives, KdfInterface } from "../../../mod_core.ts";
+import type { DhkemPrimitives, KdfInterface } from "@hpke/core";
 
 import {
   base64UrlToBytes,
@@ -13,7 +13,7 @@ import {
   NotSupportedError,
   SerializeError,
   XCryptoKey,
-} from "../../../mod_core.ts";
+} from "@hpke/core";
 
 const ALG_NAME = "X25519";
 const EMPTY = new Uint8Array();

x/dhkem-x25519/test/dhkem-x25519.test.ts

@@ -9,7 +9,8 @@ import {
   HkdfSha256,
   KdfId,
   KemId,
-} from "../../../core/mod.ts";
+} from "@hpke/core";
+
 import { loadCrypto } from "../../../core/test/utils.ts";
 import { DhkemX25519HkdfSha256 } from "../mod.ts";
 

x/dhkem-x448/deno.json

@@ -2,14 +2,10 @@
   "name": "@hpke/dhkem-x448",
   "version": "1.2.9",
   "exports": "./mod.ts",
-  "imports": {
-    "@deno/dnt": "jsr:@deno/dnt@^0.41.2",
-    "@std/assert": "jsr:@std/[email protected]",
-    "@std/testing": "jsr:@std/testing@^1.0.0"
-  },
   "publish": {
     "exclude": [
       "dnt.ts",
+      "import_map.json",
       "samples/",
       "test/",
       "tsconfig.json"

x/dhkem-x448/dnt.ts

@@ -9,9 +9,9 @@ await build({
   test: true,
   declaration: true,
   scriptModule: "umd",
-  importMap: "./deno.json",
+  importMap: "./import_map.json",
   compilerOptions: {
-    lib: ["es2022", "dom"],
+    lib: ["ES2022", "DOM"],
   },
   shims: {
     deno: "dev",
@@ -59,5 +59,5 @@ await build({
 });
 
 // post build steps
-Deno.copyFileSync("../../LICENSE", "npm/LICENSE");
+Deno.copyFileSync("LICENSE", "npm/LICENSE");
 Deno.copyFileSync("README.md", "npm/README.md");

x/dhkem-x448/import_map.json

@@ -0,0 +1,8 @@
+{
+  "imports": {
+    "@deno/dnt": "jsr:@deno/dnt@^0.41.2",
+    "@hpke/core": "../../core/mod.ts",
+    "@std/assert": "jsr:@std/[email protected]",
+    "@std/testing": "jsr:@std/testing@^1.0.0"
+  }
+}

x/dhkem-x448/src/dhkemX448.ts

@@ -1,4 +1,4 @@
-import { Dhkem, KemId } from "../../../mod_core.ts";
+import { Dhkem, KemId } from "@hpke/core";
 import { HkdfSha512 } from "./hkdfSha512.ts";
 import { X448 } from "./x448.ts";
 

x/dhkem-x448/src/hkdfSha512.ts

@@ -3,7 +3,7 @@ import { hmac } from "npm:@noble/[email protected]/hmac";
 // @ts-ignore: for "npm:"
 import { sha512 } from "npm:@noble/[email protected]/sha512";
 
-import { HkdfSha512Native } from "../../../mod_core.ts";
+import { HkdfSha512Native } from "@hpke/core";
 
 export class HkdfSha512 extends HkdfSha512Native {
   public override async extract(