Switch to type definitions from /x/deno_graph

Author: danopia

deps.ts

@@ -12,3 +12,9 @@ export * as entities from "https://deno.land/x/html_entities@v1.0/lib/xml-entiti
 
 export { SubProcess, type SubprocessErrorData } from "https://crux.land/4KsAxM#sub-process";
 export { filesize } from "https://crux.land/6wZ5Sz#filesize@v1";
+
+// maybe someday we actually use deno_graph's code too
+export type {
+  ModuleGraphJson,
+  ModuleJson,
+} from "https://deno.land/x/deno_graph@0.43.2/lib/types.d.ts";

feat/dependencies-of/compute.ts

@@ -1,5 +1,4 @@
-import { SubProcess } from "../../deps.ts";
-import { DenoInfo } from "../../lib/types.ts";
+import { ModuleGraphJson, SubProcess } from "../../deps.ts";
 import { computeDependencies } from "../../lib/module-map.ts";
 
 export async function computeGraph(
@@ -14,7 +13,7 @@ export async function computeGraph(
     env: { "NO_COLOR": "yas" },
     stdin: 'null',
     errorPrefix: /^error: /,
-  }).captureAllTextOutput()) as DenoInfo;
+  }).captureAllTextOutput()) as ModuleGraphJson;
 
   return computeDependencies(downloadData, args);
 }

lib/module-map.ts

@@ -1,5 +1,5 @@
-import { filesize } from "../deps.ts";
-import { CodeModule, DenoInfo, DenoModule } from "./types.ts";
+import { filesize, ModuleGraphJson, ModuleJson } from "../deps.ts";
+import { CodeModule } from "./types.ts";
 import * as registries from "./module-registries.ts";
 
 export class ModuleMap {
@@ -10,7 +10,7 @@ export class ModuleMap {
   constructor(
     public args: URLSearchParams,
     public redirects: Record<string,string>,
-    public rootNode: DenoModule,
+    public rootNode: ModuleJson,
   ) {
     this.registryOpts = {
       mainModule: rootNode.specifier,
@@ -41,7 +41,7 @@ export class ModuleMap {
     return moduleInfo;
   }
 
-  addFile(url: string, info: DenoModule, data: DenoInfo) {
+  addFile(url: string, info: ModuleJson, data: ModuleGraphJson) {
     if (info.error != null) {
       const module = this.grabModFor(url, '#error');
       if (!module.errors) module.errors = [];
@@ -58,7 +58,7 @@ export class ModuleMap {
     }
 
     const module = this.grabModFor(url);
-    module.totalSize += info.size;
+    module.totalSize += info.size ?? 0;
     module.files.push({
       url: url,
       deps: depEdges,
@@ -176,7 +176,7 @@ export class ModuleMap {
 
 }
 
-export function processDenoInfo(data: DenoInfo, args?: URLSearchParams) {
+export function processDenoInfo(data: ModuleGraphJson, args?: URLSearchParams) {
   // TODO: when are there multiple roots?
   const roots = data.roots.map(x => data.redirects[x] || x);
   const rootNode = data.modules.find(x => roots.includes(x.specifier));
@@ -193,7 +193,7 @@ export function processDenoInfo(data: DenoInfo, args?: URLSearchParams) {
   return map;
 }
 
-export function computeDependencies(data: DenoInfo, args: URLSearchParams) {
+export function computeDependencies(data: ModuleGraphJson, args: URLSearchParams) {
   const map = processDenoInfo(data, args);
 
   // Allow output different levels of processing
@@ -218,7 +218,7 @@ export function computeDependencies(data: DenoInfo, args: URLSearchParams) {
 if (import.meta.main) {
   const rawData = new TextDecoder().decode(await Deno.readAll(Deno.stdin));
   if (rawData[0] !== '{') throw new Error(`Expected JSON from "deno info --json"`);
-  const data = JSON.parse(rawData) as DenoInfo;
+  const data = JSON.parse(rawData) as ModuleGraphJson;
 
   const args = new URLSearchParams(Deno.args[0]);
 

lib/types.ts

@@ -9,47 +9,6 @@ export interface CodeModule {
   files: {
     url: string;
     deps: string[];
-    size: number;
+    size?: number;
   }[];
 };
-
-
-export interface DenoInfo {
-  roots:     string[];
-  modules:   DenoModule[];
-  redirects: Record<string,string>;
-}
-
-interface DenoModuleInfo {
-  size:         number;
-  mediaType:    DenoMediaType;
-  local:        string;
-  emit?:        string;
-  error:        undefined;
-}
-interface DenoModuleError {
-  error:        string;
-}
-export type DenoModule = {
-  specifier:        string;
-  dependencies?:    DenoDependency[];
-  typesDependency?: {
-    specifier:        string;
-    dependency:       { specifier: string }; // also the span
-  };
-} & (
-  | DenoModuleInfo
-  | DenoModuleError
-);
-
-export interface DenoDependency {
-  specifier: string;
-  code?:     { specifier: string }; // also the span
-  type?:     { specifier: string }; // also the span
-}
-
-export type DenoMediaType =
-| "TypeScript"
-| "JavaScript"
-| "Dts"
-;