fix: reorganise imports

arcjet · Dec 13, 2024 · bd773ee · bd773ee
1 parent d1bf29a
commit bd773ee
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 50 deletions.
diff --git a/analyze-wasm/edge-light.ts b/analyze-wasm/edge-light.ts
@@ -1,5 +1,3 @@
-import type { ArcjetLogger } from "@arcjet/protocol";
-
 import { instantiate } from "./wasm/arcjet_analyze_js_req.component.js";
 import type {
   ImportObject,
@@ -18,11 +16,6 @@ import componentCoreWasm from "./wasm/arcjet_analyze_js_req.component.core.wasm?
 import componentCore2Wasm from "./wasm/arcjet_analyze_js_req.component.core2.wasm?module";
 import componentCore3Wasm from "./wasm/arcjet_analyze_js_req.component.core3.wasm?module";
 
-interface AnalyzeContext {
-  log: ArcjetLogger;
-  characteristics: string[];
-}
-
 type DetectSensitiveInfoFunction =
   typeof ArcjetJsReqSensitiveInformationIdentifier.detect;
 
@@ -40,10 +33,7 @@ async function moduleFromPath(path: string): Promise<WebAssembly.Module> {
   throw new Error(`Unknown path: ${path}`);
 }
 
-export async function initializeWasm(
-  context: AnalyzeContext,
-  coreImports: ImportObject,
-) {
+export async function initializeWasm(coreImports: ImportObject) {
   try {
     return instantiate(moduleFromPath, coreImports);
   } catch {
@@ -52,7 +42,6 @@ export async function initializeWasm(
 }
 
 export {
-  type AnalyzeContext,
   type BotConfig,
   type DetectedSensitiveInfoEntity,
   type SensitiveInfoEntity,

diff --git a/analyze-wasm/index.ts b/analyze-wasm/index.ts
@@ -1,5 +1,3 @@
-import type { ArcjetLogger } from "@arcjet/protocol";
-
 import { instantiate } from "./wasm/arcjet_analyze_js_req.component.js";
 import type {
   ImportObject,
@@ -18,11 +16,6 @@ import { wasm as componentCoreWasm } from "./wasm/arcjet_analyze_js_req.componen
 import { wasm as componentCore2Wasm } from "./wasm/arcjet_analyze_js_req.component.core2.wasm?js";
 import { wasm as componentCore3Wasm } from "./wasm/arcjet_analyze_js_req.component.core3.wasm?js";
 
-interface AnalyzeContext {
-  log: ArcjetLogger;
-  characteristics: string[];
-}
-
 type DetectSensitiveInfoFunction =
   typeof ArcjetJsReqSensitiveInformationIdentifier.detect;
 
@@ -63,7 +56,6 @@ export async function initializeWasm(coreImports: ImportObject) {
 }
 
 export {
-  type AnalyzeContext,
   type BotConfig,
   type DetectedSensitiveInfoEntity,
   type SensitiveInfoEntity,

diff --git a/analyze-wasm/package.json b/analyze-wasm/package.json
@@ -47,6 +47,7 @@
     "pretest": "npm run build",
     "test": "node --test"
   },
+  "dependencies": {},
   "devDependencies": {
     "@arcjet/eslint-config": "1.0.0-alpha.34",
     "@arcjet/rollup-config": "1.0.0-alpha.34",

diff --git a/analyze-wasm/workerd.ts b/analyze-wasm/workerd.ts
@@ -1,5 +1,3 @@
-import type { ArcjetLogger } from "@arcjet/protocol";
-
 import { instantiate } from "./wasm/arcjet_analyze_js_req.component.js";
 import type {
   ImportObject,
@@ -18,11 +16,6 @@ import componentCoreWasm from "./wasm/arcjet_analyze_js_req.component.core.wasm"
 import componentCore2Wasm from "./wasm/arcjet_analyze_js_req.component.core2.wasm";
 import componentCore3Wasm from "./wasm/arcjet_analyze_js_req.component.core3.wasm";
 
-interface AnalyzeContext {
-  log: ArcjetLogger;
-  characteristics: string[];
-}
-
 type DetectSensitiveInfoFunction =
   typeof ArcjetJsReqSensitiveInformationIdentifier.detect;
 
@@ -50,7 +43,6 @@ export async function initializeWasm(coreImports: ImportObject) {
 }
 
 export {
-  type AnalyzeContext,
   type BotConfig,
   type DetectedSensitiveInfoEntity,
   type SensitiveInfoEntity,

diff --git a/analyze/index.ts b/analyze/index.ts
@@ -1,6 +1,5 @@
 import { initializeWasm } from "@arcjet/analyze-wasm";
 import type {
-  AnalyzeContext,
   BotConfig,
   BotResult,
   DetectedSensitiveInfoEntity,
@@ -10,8 +9,14 @@ import type {
   SensitiveInfoEntities,
   SensitiveInfoEntity,
   SensitiveInfoResult,
+  ImportObject,
 } from "@arcjet/analyze-wasm";
-import type { ImportObject } from "@arcjet/analyze-wasm/wasm/arcjet_analyze_js_req.component";
+import type { ArcjetLogger } from "@arcjet/protocol";
+
+interface AnalyzeContext {
+  log: ArcjetLogger;
+  characteristics: string[];
+}
 
 type AnalyzeRequest = {
   ip?: string;

diff --git a/package-lock.json b/package-lock.json