feat: support typescript format

src/generator.d.ts

@@ -1,5 +1,4 @@
 import { ImportMap } from '@jspm/import-map';
-import { NonRelativeModuleNameResolutionCache } from 'typescript';
 
 export type LogStream = () => AsyncGenerator<{ type: string, message: string }, never, unknown>;
 
@@ -46,7 +45,7 @@ export declare class Generator {
 }
 
 export interface ModuleAnalysis {
-  format: 'commonjs' | 'esm' | 'system';
+  format: 'commonjs' | 'esm' | 'system' | 'json' | 'typescript';
   staticDeps: string[];
   dynamicDeps: string[];
   cjsLazyDeps: string[] | null;

src/generator.ts

@@ -25,7 +25,7 @@ export interface GeneratorOptions {
 }
 
 export interface ModuleAnalysis {
-  format: 'commonjs' | 'esm' | 'system' | 'json';
+  format: 'commonjs' | 'esm' | 'system' | 'json' | 'typescript';
   staticDeps: string[];
   dynamicDeps: string[];
   cjsLazyDeps: string[] | null;

src/trace/analysis.ts

@@ -2,7 +2,7 @@ export interface Analysis {
   deps: string[];
   dynamicDeps: string[];
   cjsLazyDeps: string[] | null;
-  format: 'esm' | 'commonjs' | 'system' | 'json';
+  format: 'esm' | 'commonjs' | 'system' | 'json' | 'typescript';
   size: number;
 }
 

src/trace/resolver.ts

@@ -348,17 +348,24 @@ export class Resolver {
       default: throw new JspmError(`Invalid status code ${res.status} loading ${resolvedUrl}. ${res.statusText}`);
     }
     let source = await res.text();
-    // TODO: headers over extensions for non-file
+    // TODO: headers over extensions for non-file URLs
     try {
-      if (resolvedUrl.endsWith('.ts') || resolvedUrl.endsWith('.tsx') || resolvedUrl.endsWith('.jsx'))
+      if (resolvedUrl.endsWith('.ts') || resolvedUrl.endsWith('.tsx') || resolvedUrl.endsWith('.jsx')) {
         source = await parseTs(source);
-      if (resolvedUrl.endsWith('.json')) {
+        const [imports] = await parse(source) as any as [any[], string[]];
+        const esmAnalysis = createEsmAnalysis(imports, source, resolvedUrl);
+        esmAnalysis.format = 'typescript';
+        return esmAnalysis;
+
+      }
+      else if (resolvedUrl.endsWith('.json')) {
         try {
           JSON.parse(source);
           return { deps: [], dynamicDeps: [], cjsLazyDeps: null, size: source.length, format: 'json' };
         }
         catch {}
       }
+
       const [imports, exports] = await parse(source) as any as [any[], string[]];
       if (imports.every(impt => impt.d > 0) && !exports.length && resolvedUrl.startsWith('file:')) {
         // Support CommonJS package boundary checks for non-ESM on file: protocol only

src/trace/tracemap.ts

@@ -40,7 +40,7 @@ interface TraceEntry {
   // For cjs modules, the list of hoisted deps
   // this is needed for proper cycle handling
   cjsLazyDeps: Record<string, string | string[]>;
-  format: 'esm' | 'commonjs' | 'system' | 'json';
+  format: 'esm' | 'commonjs' | 'system' | 'json' | 'typescript';
 }
 
 // The tracemap fully drives the installer

test/resolve/ts.test.js

@@ -0,0 +1,13 @@
+import { Generator } from '@jspm/generator';
+import assert from 'assert';
+
+if (typeof document === 'undefined') {
+  const generator = new Generator({
+    mapUrl: import.meta.url,
+    defaultProvider: 'nodemodules'
+  });
+
+  await generator.traceInstall('./tspkg/main.ts');
+
+  assert.strictEqual(generator.getAnalysis(new URL('./tspkg/dep.ts', import.meta.url)).format, 'typescript');
+}

test/resolve/tspkg/dep.ts

@@ -0,0 +1 @@
+export var dep: string = 'dep';

test/resolve/tspkg/main.ts

@@ -0,0 +1,2 @@
+import './dep.ts';
+export var p: number = 5;