move conversions into their own file

arcjet · Aug 14, 2024 · d67ecf8 · d67ecf8
1 parent e00da21
commit d67ecf8
Show file tree

Hide file tree

Showing 6 changed files with 153 additions and 79 deletions.
diff --git a/analyze/convert.d.ts b/analyze/convert.d.ts
@@ -0,0 +1,14 @@
+import * as core from "./wasm/arcjet_analyze_js_req.component.js";
+import {
+  DetectedSensitiveInfoEntity,
+  SensitiveInfoEntity,
+} from "@arcjet/protocol";
+export declare function ConvertProtocolEntitiesToAnalyzeEntities(
+  entity: SensitiveInfoEntity,
+): core.SensitiveInfoEntity;
+export declare function ConvertDetectedSensitiveInfoEntityToAnalyzeEntity(
+  entity?: DetectedSensitiveInfoEntity,
+): core.SensitiveInfoEntity | undefined;
+export declare function ConvertAnalyzeEntitiesToProtocolEntities(
+  entity: core.SensitiveInfoEntity,
+): DetectedSensitiveInfoEntity;
diff --git a/analyze/convert.js b/analyze/convert.js
@@ -0,0 +1,56 @@
+function ConvertProtocolEntitiesToAnalyzeEntities(entity) {
+  if (entity === "email") {
+    return { tag: "email" };
+  }
+  if (entity === "phone-number") {
+    return { tag: "phone-number" };
+  }
+  if (entity === "ip-address") {
+    return { tag: "ip-address" };
+  }
+  if (entity === "credit-card-number") {
+    return { tag: "credit-card-number" };
+  }
+  return {
+    tag: "custom",
+    val: "custom",
+  };
+}
+function ConvertDetectedSensitiveInfoEntityToAnalyzeEntity(entity) {
+  if (entity === "email") {
+    return { tag: "email" };
+  }
+  if (entity === "phone-number") {
+    return { tag: "phone-number" };
+  }
+  if (entity === "credit-card-number") {
+    return { tag: "credit-card-number" };
+  }
+  if (entity === "ip-address") {
+    return { tag: "ip-address" };
+  }
+  if (entity === "custom") {
+    return { tag: "custom", val: "custom" };
+  }
+}
+function ConvertAnalyzeEntitiesToProtocolEntities(entity) {
+  if (entity.tag === "email") {
+    return "email";
+  }
+  if (entity.tag === "ip-address") {
+    return "ip-address";
+  }
+  if (entity.tag === "credit-card-number") {
+    return "credit-card-number";
+  }
+  if (entity.tag === "phone-number") {
+    return "phone-number";
+  }
+  return "custom";
+}
+
+export {
+  ConvertAnalyzeEntitiesToProtocolEntities,
+  ConvertDetectedSensitiveInfoEntityToAnalyzeEntity,
+  ConvertProtocolEntitiesToAnalyzeEntities,
+};
diff --git a/analyze/convert.ts b/analyze/convert.ts
@@ -0,0 +1,76 @@
+import * as core from "./wasm/arcjet_analyze_js_req.component.js";
+import {
+  DetectedSensitiveInfoEntity,
+  SensitiveInfoEntity,
+} from "@arcjet/protocol";
+
+export function ConvertProtocolEntitiesToAnalyzeEntities(
+  entity: SensitiveInfoEntity,
+): core.SensitiveInfoEntity {
+  if (entity === "email") {
+    return { tag: "email" };
+  }
+
+  if (entity === "phone-number") {
+    return { tag: "phone-number" };
+  }
+
+  if (entity === "ip-address") {
+    return { tag: "ip-address" };
+  }
+
+  if (entity === "credit-card-number") {
+    return { tag: "credit-card-number" };
+  }
+
+  return {
+    tag: "custom",
+    val: "custom",
+  };
+}
+
+export function ConvertDetectedSensitiveInfoEntityToAnalyzeEntity(
+  entity?: DetectedSensitiveInfoEntity,
+): core.SensitiveInfoEntity | undefined {
+  if (entity === "email") {
+    return { tag: "email" };
+  }
+
+  if (entity === "phone-number") {
+    return { tag: "phone-number" };
+  }
+
+  if (entity === "credit-card-number") {
+    return { tag: "credit-card-number" };
+  }
+
+  if (entity === "ip-address") {
+    return { tag: "ip-address" };
+  }
+
+  if (entity === "custom") {
+    return { tag: "custom", val: "custom" };
+  }
+}
+
+export function ConvertAnalyzeEntitiesToProtocolEntities(
+  entity: core.SensitiveInfoEntity,
+): DetectedSensitiveInfoEntity {
+  if (entity.tag === "email") {
+    return "email";
+  }
+
+  if (entity.tag === "ip-address") {
+    return "ip-address";
+  }
+
+  if (entity.tag === "credit-card-number") {
+    return "credit-card-number";
+  }
+
+  if (entity.tag === "phone-number") {
+    return "phone-number";
+  }
+
+  return "custom";
+}
diff --git a/analyze/edge-light.ts b/analyze/edge-light.ts
@@ -2,10 +2,8 @@ import type {
   ArcjetLogger,
   ArcjetRequestDetails,
   CustomDetect,
-  DetectedSensitiveInfoEntity,
   DetectSensitiveInfoResult,
   SensitiveInfoConfig,
-  SensitiveInfoEntity,
 } from "@arcjet/protocol";
 
 import * as core from "./wasm/arcjet_analyze_js_req.component.js";
@@ -24,7 +22,7 @@ import {
   ConvertAnalyzeEntitiesToProtocolEntities,
   ConvertDetectedSensitiveInfoEntityToAnalyzeEntity,
   ConvertProtocolEntitiesToAnalyzeEntities,
-} from "./index.js";
+} from "./convert";
 
 const FREE_EMAIL_PROVIDERS = [
   "gmail.com",

diff --git a/analyze/index.ts b/analyze/index.ts
@@ -1,8 +1,6 @@
 import type {
   ArcjetLogger,
   ArcjetRequestDetails,
-  SensitiveInfoEntity,
-  DetectedSensitiveInfoEntity,
   DetectSensitiveInfoResult,
   CustomDetect,
   SensitiveInfoConfig,
@@ -16,6 +14,11 @@ import type {
   BotType,
   EmailValidationResult,
 } from "./wasm/arcjet_analyze_js_req.component.js";
+import {
+  ConvertAnalyzeEntitiesToProtocolEntities,
+  ConvertDetectedSensitiveInfoEntityToAnalyzeEntity,
+  ConvertProtocolEntitiesToAnalyzeEntities,
+} from "./convert";
 
 import { wasm as componentCoreWasm } from "./wasm/arcjet_analyze_js_req.component.core.wasm?js";
 import { wasm as componentCore2Wasm } from "./wasm/arcjet_analyze_js_req.component.core2.wasm?js";
@@ -34,77 +37,6 @@ interface AnalyzeContext {
   characteristics: string[];
 }
 
-export function ConvertProtocolEntitiesToAnalyzeEntities(
-  entity: SensitiveInfoEntity,
-): core.SensitiveInfoEntity {
-  if (entity === "email") {
-    return { tag: "email" };
-  }
-
-  if (entity === "phone-number") {
-    return { tag: "phone-number" };
-  }
-
-  if (entity === "ip-address") {
-    return { tag: "ip-address" };
-  }
-
-  if (entity === "credit-card-number") {
-    return { tag: "credit-card-number" };
-  }
-
-  return {
-    tag: "custom",
-    val: "custom",
-  };
-}
-
-export function ConvertDetectedSensitiveInfoEntityToAnalyzeEntity(
-  entity?: DetectedSensitiveInfoEntity,
-): core.SensitiveInfoEntity | undefined {
-  if (entity === "email") {
-    return { tag: "email" };
-  }
-
-  if (entity === "phone-number") {
-    return { tag: "phone-number" };
-  }
-
-  if (entity === "credit-card-number") {
-    return { tag: "credit-card-number" };
-  }
-
-  if (entity === "ip-address") {
-    return { tag: "ip-address" };
-  }
-
-  if (entity === "custom") {
-    return { tag: "custom", val: "custom" };
-  }
-}
-
-export function ConvertAnalyzeEntitiesToProtocolEntities(
-  entity: core.SensitiveInfoEntity,
-): DetectedSensitiveInfoEntity {
-  if (entity.tag === "email") {
-    return "email";
-  }
-
-  if (entity.tag === "ip-address") {
-    return "ip-address";
-  }
-
-  if (entity.tag === "credit-card-number") {
-    return "credit-card-number";
-  }
-
-  if (entity.tag === "phone-number") {
-    return "phone-number";
-  }
-
-  return "custom";
-}
-
 // TODO: Do we actually need this wasmCache or does `import` cache correctly?
 const wasmCache = new Map<string, WebAssembly.Module>();
 

diff --git a/analyze/workerd.ts b/analyze/workerd.ts
@@ -2,10 +2,8 @@ import type {
   ArcjetLogger,
   ArcjetRequestDetails,
   CustomDetect,
-  DetectedSensitiveInfoEntity,
   DetectSensitiveInfoResult,
   SensitiveInfoConfig,
-  SensitiveInfoEntity,
 } from "@arcjet/protocol";
 
 import * as core from "./wasm/arcjet_analyze_js_req.component.js";
@@ -24,7 +22,7 @@ import {
   ConvertAnalyzeEntitiesToProtocolEntities,
   ConvertDetectedSensitiveInfoEntityToAnalyzeEntity,
   ConvertProtocolEntitiesToAnalyzeEntities,
-} from "./index.js";
+} from "./convert";
 
 const FREE_EMAIL_PROVIDERS = [
   "gmail.com",