@boon4681/giri 0.0.2-alpha-8 → 0.0.3

package/dist/cli.js

@@ -410,9 +410,9 @@ var init_schema = __esm({
 
 // src/cli.ts
 var import_node_child_process = require("child_process");
-var import_node_fs10 = require("fs");
+var import_node_fs11 = require("fs");
 var import_promises4 = require("fs/promises");
-var import_node_path15 = require("path");
+var import_node_path16 = require("path");
 var prompts = __toESM(require("@clack/prompts"));
 
 // src/app.ts
@@ -1951,43 +1951,121 @@ async function syncProject(config, options = {}) {
 }
 
 // src/generator/watch.ts
-var import_node_fs8 = require("fs");
-var import_node_path13 = require("path");
+var import_node_fs9 = require("fs");
+var import_node_path14 = require("path");
 
-// src/loader/module-loader.ts
+// src/loader/import-graph.ts
+var import_node_fs8 = require("fs");
 var import_node_path12 = require("path");
+var import_typescript5 = __toESM(require("typescript"));
+var import_tinyglobby2 = require("tinyglobby");
+var RESOLVE_EXTS = [".ts", ".tsx", ".mts", ".cts", ".js", ".jsx", ".mjs", ".cjs"];
+var JS_EXT = /\.(?:c|m)?jsx?$/;
 var toSlash = (path) => path.split(import_node_path12.sep).join("/");
-var isProjectModule = (id, root) => {
-  return id.startsWith(root) && !id.includes(`${import_node_path12.sep}node_modules${import_node_path12.sep}`) && !id.includes(`${import_node_path12.sep}.giri${import_node_path12.sep}`);
-};
-var buildModuleGraph = (cwd) => {
-  const root = (0, import_node_path12.resolve)(cwd) + import_node_path12.sep;
+function probeFile(base) {
+  if ((0, import_node_fs8.existsSync)(base) && (0, import_node_fs8.statSync)(base).isFile()) {
+    return base;
+  }
+  for (const ext of RESOLVE_EXTS) {
+    const candidate = base + ext;
+    if ((0, import_node_fs8.existsSync)(candidate)) {
+      return candidate;
+    }
+  }
+  for (const ext of RESOLVE_EXTS) {
+    const candidate = (0, import_node_path12.join)(base, `index${ext}`);
+    if ((0, import_node_fs8.existsSync)(candidate)) {
+      return candidate;
+    }
+  }
+  return void 0;
+}
+function resolveSpecifier(specifier, fromFile, alias, cwd) {
+  let target;
+  if (specifier.startsWith(".")) {
+    target = (0, import_node_path12.resolve)((0, import_node_path12.dirname)(fromFile), specifier);
+  } else {
+    const aliased = resolveAliasRequest(specifier, alias, cwd);
+    if (aliased === void 0) {
+      return void 0;
+    }
+    target = aliased;
+  }
+  const resolved = probeFile(target);
+  if (resolved) {
+    return resolved;
+  }
+  if (JS_EXT.test(target)) {
+    return probeFile(target.replace(JS_EXT, ""));
+  }
+  return void 0;
+}
+function importSpecifiers(file) {
+  let source;
+  try {
+    source = import_typescript5.default.createSourceFile(file, (0, import_node_fs8.readFileSync)(file, "utf8"), import_typescript5.default.ScriptTarget.Latest, false);
+  } catch {
+    return [];
+  }
+  const specifiers = [];
+  const visit = (node) => {
+    if ((import_typescript5.default.isImportDeclaration(node) || import_typescript5.default.isExportDeclaration(node)) && node.moduleSpecifier && import_typescript5.default.isStringLiteral(node.moduleSpecifier)) {
+      specifiers.push(node.moduleSpecifier.text);
+    } else if (import_typescript5.default.isImportEqualsDeclaration(node) && import_typescript5.default.isExternalModuleReference(node.moduleReference) && import_typescript5.default.isStringLiteralLike(node.moduleReference.expression)) {
+      specifiers.push(node.moduleReference.expression.text);
+    } else if (import_typescript5.default.isCallExpression(node)) {
+      const isRequire = import_typescript5.default.isIdentifier(node.expression) && node.expression.text === "require";
+      const isDynamicImport = node.expression.kind === import_typescript5.default.SyntaxKind.ImportKeyword;
+      const [first] = node.arguments;
+      if ((isRequire || isDynamicImport) && first && import_typescript5.default.isStringLiteralLike(first)) {
+        specifiers.push(first.text);
+      }
+    }
+    import_typescript5.default.forEachChild(node, visit);
+  };
+  visit(source);
+  return specifiers;
+}
+async function buildImportGraph(config, cwd) {
+  const root = (0, import_node_path12.resolve)(cwd);
+  const outDir = (0, import_node_path12.resolve)(root, config.outDir ?? ".giri") + import_node_path12.sep;
+  const files = await (0, import_tinyglobby2.glob)("**/*.{ts,tsx,mts,cts,js,jsx,mjs,cjs}", {
+    cwd: root,
+    absolute: true,
+    onlyFiles: true,
+    ignore: ["**/node_modules/**"]
+  });
   const importers = /* @__PURE__ */ new Map();
   const nodes = /* @__PURE__ */ new Set();
-  for (const id of Object.keys(require.cache)) {
-    if (!isProjectModule(id, root)) {
-      continue;
-    }
-    const mod = require.cache[id];
-    if (!mod) {
+  for (const file of files) {
+    if (file.startsWith(outDir)) {
       continue;
     }
-    nodes.add(toSlash(id));
-    for (const child of mod.children) {
-      if (!isProjectModule(child.id, root)) {
+    for (const specifier of importSpecifiers(file)) {
+      const dep = resolveSpecifier(specifier, file, config.alias, root);
+      if (!dep || dep.startsWith(outDir)) {
         continue;
       }
-      nodes.add(toSlash(child.id));
-      const dep = toSlash(child.id);
-      let set = importers.get(dep);
+      const from = toSlash(file);
+      const to = toSlash(dep);
+      nodes.add(from);
+      nodes.add(to);
+      let set = importers.get(to);
       if (!set) {
         set = /* @__PURE__ */ new Set();
-        importers.set(dep, set);
+        importers.set(to, set);
       }
-      set.add(toSlash(id));
+      set.add(from);
     }
   }
   return { importers, nodes };
+}
+
+// src/loader/module-loader.ts
+var import_node_path13 = require("path");
+var toSlash2 = (path) => path.split(import_node_path13.sep).join("/");
+var isProjectModule = (id, root) => {
+  return id.startsWith(root) && !id.includes(`${import_node_path13.sep}node_modules${import_node_path13.sep}`) && !id.includes(`${import_node_path13.sep}.giri${import_node_path13.sep}`);
 };
 var collectDependents = (graph, start) => {
   const out = /* @__PURE__ */ new Set([start]);
@@ -2005,13 +2083,13 @@ var collectDependents = (graph, start) => {
 };
 var purgeModules = (files) => {
   for (const id of Object.keys(require.cache)) {
-    if (files.has(toSlash(id))) {
+    if (files.has(toSlash2(id))) {
       delete require.cache[id];
     }
   }
 };
 var purgeProjectModules = (cwd) => {
-  const root = (0, import_node_path12.resolve)(cwd) + import_node_path12.sep;
+  const root = (0, import_node_path13.resolve)(cwd) + import_node_path13.sep;
   for (const id of Object.keys(require.cache)) {
     if (isProjectModule(id, root)) {
       delete require.cache[id];
@@ -2019,9 +2097,9 @@ var purgeProjectModules = (cwd) => {
   }
 };
 var purgeGeneratedModules = (outDir) => {
-  const root = (0, import_node_path12.resolve)(outDir) + import_node_path12.sep;
+  const root = (0, import_node_path13.resolve)(outDir) + import_node_path13.sep;
   for (const id of Object.keys(require.cache)) {
-    if ((0, import_node_path12.resolve)(id).startsWith(root)) {
+    if ((0, import_node_path13.resolve)(id).startsWith(root)) {
       delete require.cache[id];
     }
   }
@@ -2048,8 +2126,8 @@ function createWatchUpdater(config, initial) {
     const key = route.file;
     try {
       const { createSchemaProgram: createSchemaProgram2, extractRouteResponses: extractRouteResponses2 } = await Promise.resolve().then(() => (init_schema(), schema_exports));
-      const appTypes = (0, import_node_path13.join)(paths.outDir, "types", "app.d.ts");
-      const program = createSchemaProgram2(paths, (0, import_node_fs8.existsSync)(appTypes) ? [key, appTypes] : [key]);
+      const appTypes = (0, import_node_path14.join)(paths.outDir, "types", "app.d.ts");
+      const program = createSchemaProgram2(paths, (0, import_node_fs9.existsSync)(appTypes) ? [key, appTypes] : [key]);
       data.responsesByFile.set(key, extractRouteResponses2(program, key));
     } catch {
     }
@@ -2080,15 +2158,15 @@ function createWatchUpdater(config, initial) {
       if (!filename) {
         return fullResync();
       }
-      const abs = (0, import_node_path13.resolve)((0, import_node_path13.dirname)(paths.routesDir), filename);
+      const abs = (0, import_node_path14.resolve)((0, import_node_path14.dirname)(paths.routesDir), filename);
       const file = slash(abs);
-      if (!(0, import_node_fs8.existsSync)(abs)) {
+      if (!(0, import_node_fs9.existsSync)(abs)) {
         return fullResync();
       }
-      if ((0, import_node_fs8.statSync)(abs).isDirectory()) {
+      if ((0, import_node_fs9.statSync)(abs).isDirectory()) {
         return "skip";
       }
-      const graph = buildModuleGraph(paths.cwd);
+      const graph = await buildImportGraph(config, paths.cwd);
       const isRoute = routes.some((candidate) => slash(candidate.file) === file);
       if (!graph.nodes.has(file) && !isRoute) {
         return fullResync();
@@ -2110,20 +2188,20 @@ function createWatchUpdater(config, initial) {
 }
 
 // src/lifecycle.ts
-var import_node_fs9 = require("fs");
-var import_node_path14 = require("path");
+var import_node_fs10 = require("fs");
+var import_node_path15 = require("path");
 var MAIN_EXTENSIONS2 = ["ts", "tsx", "mts", "cts", "js", "jsx", "mjs", "cjs"];
 function resolveMainFile(cwd) {
   for (const ext of MAIN_EXTENSIONS2) {
-    const file = (0, import_node_path14.join)(cwd, "src", `main.${ext}`);
-    if ((0, import_node_fs9.existsSync)(file)) {
+    const file = (0, import_node_path15.join)(cwd, "src", `main.${ext}`);
+    if ((0, import_node_fs10.existsSync)(file)) {
       return file;
     }
   }
   return void 0;
 }
 async function loadLifecycle(cwd = process.cwd()) {
-  const file = resolveMainFile((0, import_node_path14.resolve)(cwd));
+  const file = resolveMainFile((0, import_node_path15.resolve)(cwd));
   if (!file) {
     return {};
   }
@@ -2281,9 +2359,9 @@ function parseFlags(args) {
   return flags;
 }
 async function ensureGitignore(cwd) {
-  const file = (0, import_node_path15.join)(cwd, ".gitignore");
+  const file = (0, import_node_path16.join)(cwd, ".gitignore");
   const entry = ".giri";
-  if (!(0, import_node_fs10.existsSync)(file)) {
+  if (!(0, import_node_fs11.existsSync)(file)) {
     await (0, import_promises4.writeFile)(file, `${entry}
 `);
     return;
@@ -2295,8 +2373,8 @@ async function ensureGitignore(cwd) {
   }
 }
 async function ensureTsConfig(cwd) {
-  const file = (0, import_node_path15.join)(cwd, "tsconfig.json");
-  if ((0, import_node_fs10.existsSync)(file)) {
+  const file = (0, import_node_path16.join)(cwd, "tsconfig.json");
+  if ((0, import_node_fs11.existsSync)(file)) {
     return;
   }
   await (0, import_promises4.writeFile)(
@@ -2325,7 +2403,7 @@ async function ensureTsConfig(cwd) {
 async function missingDeps(cwd, candidates) {
   let pkg = {};
   try {
-    pkg = JSON.parse(await (0, import_promises4.readFile)((0, import_node_path15.join)(cwd, "package.json"), "utf8"));
+    pkg = JSON.parse(await (0, import_promises4.readFile)((0, import_node_path16.join)(cwd, "package.json"), "utf8"));
   } catch {
   }
   const present = /* @__PURE__ */ new Set();
@@ -2394,7 +2472,7 @@ async function selectAdapter(interactive) {
   return ADAPTERS.find((adapter) => adapter.value === picked) ?? null;
 }
 async function initProject(cwd, flags) {
-  if (!(0, import_node_fs10.existsSync)((0, import_node_path15.join)(cwd, "package.json"))) {
+  if (!(0, import_node_fs11.existsSync)((0, import_node_path16.join)(cwd, "package.json"))) {
     throw new Error(
       "No package.json found. Run `giri init` inside an existing project - set one up first (e.g. `npm init -y` and install typescript), then re-run."
     );
@@ -2419,13 +2497,13 @@ async function initProject(cwd, flags) {
     prompts.cancel(`The ${adapter.label} adapter isn't available yet - only Hono ships today.`);
     return;
   }
-  const configPath = (0, import_node_path15.join)(cwd, "giri.config.ts");
-  if (!(0, import_node_fs10.existsSync)(configPath)) {
+  const configPath = (0, import_node_path16.join)(cwd, "giri.config.ts");
+  if (!(0, import_node_fs11.existsSync)(configPath)) {
     await (0, import_promises4.writeFile)(configPath, configSource(adapter));
   }
-  const routePath = (0, import_node_path15.join)(cwd, "src", "routes", "+get.ts");
-  if (!(0, import_node_fs10.existsSync)(routePath)) {
-    await (0, import_promises4.mkdir)((0, import_node_path15.join)(cwd, "src", "routes"), { recursive: true });
+  const routePath = (0, import_node_path16.join)(cwd, "src", "routes", "+get.ts");
+  if (!(0, import_node_fs11.existsSync)(routePath)) {
+    await (0, import_promises4.mkdir)((0, import_node_path16.join)(cwd, "src", "routes"), { recursive: true });
     await (0, import_promises4.writeFile)(
       routePath,
       [
@@ -2510,8 +2588,8 @@ async function serveProject(config, flags) {
     const port = flags.port ?? cfg.server?.port ?? 3e3;
     const hostname = flags.hostname ?? cfg.server?.hostname;
     if (flags.watch) {
-      const srcDir = (0, import_node_path15.resolve)(current.paths.routesDir, "..");
-      if ((0, import_node_fs10.existsSync)(srcDir)) {
+      const srcDir = (0, import_node_path16.resolve)(current.paths.routesDir, "..");
+      if ((0, import_node_fs11.existsSync)(srcDir)) {
         let timer;
         let syncing = false;
         const changed = /* @__PURE__ */ new Set();
@@ -2541,7 +2619,7 @@ async function serveProject(config, flags) {
                 }
                 rebuild = true;
                 if (name) {
-                  dirtySet.add((0, import_node_path15.resolve)(srcDir, name));
+                  dirtySet.add((0, import_node_path16.resolve)(srcDir, name));
                 }
                 const rel = name ? `src/${name.replace(/\\/g, "/")}` : "src";
                 log2.change(outcome === "full" ? "sync" : "update", rel, bump(rel));
@@ -2599,11 +2677,11 @@ async function serveProject(config, flags) {
     };
   };
   await boot(config);
-  const configPath = flags.watch ? findConfigPath((0, import_node_path15.resolve)(process.cwd())) : void 0;
+  const configPath = flags.watch ? findConfigPath((0, import_node_path16.resolve)(process.cwd())) : void 0;
   if (configPath) {
     let timer;
     let restarting = false;
-    const configName = (0, import_node_path15.basename)(configPath);
+    const configName = (0, import_node_path16.basename)(configPath);
     const restart = async () => {
       if (restarting) {
         return;
@@ -2622,9 +2700,9 @@ async function serveProject(config, flags) {
         restarting = false;
       }
     };
-    const configWatcher = watch((0, import_node_path15.dirname)(configPath), { persistent: true });
+    const configWatcher = watch((0, import_node_path16.dirname)(configPath), { persistent: true });
     configWatcher.on("all", (_event, filename) => {
-      if (filename && (0, import_node_path15.basename)(filename.toString()) === configName) {
+      if (filename && (0, import_node_path16.basename)(filename.toString()) === configName) {
         clearTimeout(timer);
         timer = setTimeout(() => void restart(), 150);
       }
@@ -2653,7 +2731,7 @@ function registerShutdown(cleanup) {
 }
 async function main() {
   const [command = "help", ...args] = process.argv.slice(2);
-  const cwd = (0, import_node_path15.resolve)(process.cwd());
+  const cwd = (0, import_node_path16.resolve)(process.cwd());
   if (command === "help" || command === "--help" || command === "-h") {
     help();
     return;