Move chacha20poly1305 impl to x/chacha20poly1305.

Author: dajiaji

src/cipherSuite.ts

@@ -3,7 +3,7 @@ import type { KemInterface } from "../core/src/interfaces/kemInterface.ts";
 
 import { Aes128Gcm, Aes256Gcm } from "../core/src/aeads/aesGcm.ts";
 import { ExportOnly } from "../core/src/aeads/exportOnly.ts";
-import { Chacha20Poly1305 } from "./aeads/chacha20Poly1305.ts";
+import { Chacha20Poly1305 } from "../x/chacha20poly1305/src/chacha20Poly1305.ts";
 import { InvalidParamError } from "../core/src/errors.ts";
 import { HkdfSha256 } from "./kdfs/hkdfSha256.ts";
 import { HkdfSha384 } from "./kdfs/hkdfSha384.ts";

test/cipherSuiteNative.test.ts

@@ -9,7 +9,7 @@ import {
   KemId,
 } from "../mod.ts";
 import { Aes128Gcm, Aes256Gcm } from "../core/src/aeads/aesGcm.ts";
-import { Chacha20Poly1305 } from "../src/aeads/chacha20Poly1305.ts";
+import { Chacha20Poly1305 } from "../x/chacha20poly1305/mod.ts";
 import { ExportOnly } from "../core/src/aeads/exportOnly.ts";
 import { CipherSuiteNative } from "../core/src/cipherSuiteNative.ts";
 import {

x/chacha20poly1305/deno.json

@@ -4,9 +4,18 @@
   "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_for_dnt.json",
+      "samples/",
+      "test/"
+    ]
+  },
   "fmt": {
     "include": [
       "README.md",

x/chacha20poly1305/deno.lock

@@ -9,7 +9,7 @@ await build({
   test: true,
   declaration: true,
   scriptModule: "umd",
-  importMap: "./deno.json",
+  importMap: "./import_map_for_dnt.json",
   compilerOptions: {
     lib: ["es2022", "dom"],
   },

x/chacha20poly1305/dnt.ts

@@ -0,0 +1,9 @@
+{
+  "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/import_map_for_dnt.json

@@ -1 +1 @@
-export { Chacha20Poly1305 } from "../../src/aeads/chacha20Poly1305.ts";
+export { Chacha20Poly1305 } from "./src/chacha20Poly1305.ts";

x/chacha20poly1305/mod.ts

@@ -1,10 +1,8 @@
 // @ts-ignore: for "npm:"
 import { chacha20poly1305 } from "npm:@noble/[email protected]/chacha";
 
-import type { AeadEncryptionContext } from "../../core/src/interfaces/aeadEncryptionContext.ts";
-import type { AeadInterface } from "../../core/src/interfaces/aeadInterface.ts";
-
-import { AeadId } from "../../core/src/identifiers.ts";
+import type { AeadEncryptionContext, AeadInterface } from "@hpke/core";
+import { AeadId } from "@hpke/core";
 
 export class Chacha20Poly1305Context implements AeadEncryptionContext {
   private _key: Uint8Array;

src/aeads/chacha20Poly1305.ts renamed to x/chacha20poly1305/src/chacha20Poly1305.ts

@@ -6,6 +6,6 @@
   }, 
   "include": [
     "mod.ts",
-    "../../src/aeads/chacha20Poly1305.ts"
+    "./src/chacha20Poly1305.ts"
   ]
 }