|
1 | 1 | import type { RegistryConfig } from "@/registry/config"; |
2 | | -import { getRequireFn } from "@/utils/node"; |
3 | 2 | import type { Actions, ActorConfig } from "./config"; |
4 | 3 | import type { AnyDatabaseProvider } from "./database"; |
5 | | -import type { ActorInstance } from "./instance/mod"; |
| 4 | +import { ActorInstance } from "./instance/mod"; |
6 | 5 |
|
7 | 6 | export type AnyActorDefinition = ActorDefinition< |
8 | 7 | any, |
@@ -33,48 +32,11 @@ export class ActorDefinition< |
33 | 32 | return this.#config; |
34 | 33 | } |
35 | 34 |
|
36 | | - async instantiate(): Promise<ActorInstance<S, CP, CS, V, I, DB>> { |
37 | | - // Lazy import to avoid pulling server-only dependencies (traces, fdb-tuple, etc.) |
38 | | - // into browser bundles. This method is only called on the server. |
39 | | - // const requireFn = getRequireFn(); |
40 | | - // if (!requireFn) { |
41 | | - // throw new Error( |
42 | | - // "ActorDefinition.instantiate requires a Node.js environment", |
43 | | - // ); |
44 | | - // } |
45 | | - |
46 | | - try { |
47 | | - const { ActorInstance: ActorInstanceClass } = await import( |
48 | | - "./instance/mod" |
49 | | - ); |
50 | | - return new ActorInstanceClass(this.#config); |
51 | | - } catch (error) { |
52 | | - if (!isInstanceModuleNotFound(error)) { |
53 | | - throw error; |
54 | | - } |
55 | | - |
56 | | - try { |
57 | | - // In tests, register tsx so require() can resolve .ts files. |
58 | | - await getRequireFn()("tsx/cjs"); |
59 | | - } catch { |
60 | | - throw error; |
61 | | - } |
62 | | - |
63 | | - const { ActorInstance: ActorInstanceClass } = await import( |
64 | | - "./instance/mod" |
65 | | - ); |
66 | | - return new ActorInstanceClass(this.#config); |
67 | | - } |
| 35 | + instantiate(): ActorInstance<S, CP, CS, V, I, DB> { |
| 36 | + return new ActorInstance(this.#config); |
68 | 37 | } |
69 | 38 | } |
70 | 39 |
|
71 | | -function isInstanceModuleNotFound(error: unknown): boolean { |
72 | | - if (!error || typeof error !== "object") return false; |
73 | | - const err = error as { code?: string; message?: string }; |
74 | | - if (err.code !== "MODULE_NOT_FOUND") return false; |
75 | | - return (err.message ?? "").includes("./instance/mod"); |
76 | | -} |
77 | | - |
78 | 40 | export function lookupInRegistry( |
79 | 41 | config: RegistryConfig, |
80 | 42 | name: string, |
|
0 commit comments