call run in load

Author: xieyuheng

TODO.md

@@ -1,4 +1,3 @@
-call `run` in `load`
 rename `run/` to `load/`
 
 call `handleImport` after `handleDefine` -- to support circular imports

src/commands/runCommand.ts

@@ -1,7 +1,7 @@
 import { type Command } from "@xieyuheng/commander.js"
 import fs from "fs"
 import Path from "path"
-import { load, run } from "../lang/run/index.ts"
+import { load } from "../lang/run/index.ts"
 
 export const runCommand: Command = {
   name: "run",
@@ -19,8 +19,7 @@ export const runCommand: Command = {
     const url = createURL(String(commander.args[0]))
 
     try {
-      const mod = await load(url)
-      await run(mod)
+      await load(url)
     } catch (error) {
       if (error instanceof Error) {
         console.error(error.message)

src/lang/run/handleImport.ts

@@ -2,7 +2,6 @@ import { modDefine, modFind, modResolve } from "../mod/index.ts"
 import type { Mod } from "../mod/Mod.ts"
 import type { ImportEntry, Stmt } from "../stmt/Stmt.ts"
 import { globalLoadedMods } from "./globalLoadedMods.ts"
-import { run } from "./run.ts"
 
 export async function handleImport(mod: Mod, stmt: Stmt): Promise<void> {
   if (stmt.kind === "Import") {
@@ -29,8 +28,6 @@ async function importOne(
     throw new Error(`Mod is not loaded: ${path}`)
   }
 
-  await run(found.mod)
-
   const { name, rename } = entry
 
   const def = modFind(found.mod, name)

src/lang/run/index.ts

@@ -1,3 +1 @@
-export * from "./globalLoadedMods.ts"
 export * from "./load.ts"
-export * from "./run.ts"

src/lang/run/load.ts

@@ -3,6 +3,7 @@ import fs from "node:fs"
 import { createMod, modResolve, type Mod } from "../mod/index.ts"
 import { parseStmts } from "../parse/index.ts"
 import { globalLoadedMods } from "./globalLoadedMods.ts"
+import { run } from "./run.ts"
 
 export async function load(url: URL): Promise<Mod> {
   const found = globalLoadedMods.get(url.href)
@@ -24,6 +25,7 @@ export async function load(url: URL): Promise<Mod> {
       }
     }
 
+    await run(mod)
     return mod
   } catch (error) {
     if (error instanceof ParsingError) {