@esportsplus/typescript 0.23.1 → 0.24.2

package/build/compiler/imports.js

@@ -18,7 +18,7 @@ const find = (sourceFile, packageName) => {
                 specifiers.set(propertyName, name);
             }
         }
-        imports.push({ end: stmt.end, specifiers, start: stmt.getStart() });
+        imports.push({ end: stmt.end, specifiers, start: stmt.getStart(sourceFile) });
     }
     return imports;
 };

package/build/compiler/plugins/index.d.ts

@@ -1,19 +1,24 @@
 declare const _default: {
     tsc: ({ analyze, transform }: import("../index.js").PluginDefinition) => (program: import("typescript").Program, context: import("../index.js").PluginContext) => {
-        analyze?: (sourceFile: import("typescript").SourceFile) => void;
+        analyze: ((sourceFile: import("typescript").SourceFile) => void) | undefined;
         transform: import("typescript").TransformerFactory<import("typescript").SourceFile>;
     };
-    vite: ({ analyze, name, onWatchChange, transform }: import("../index.js").VitePluginOptions) => ({ root }?: {
+    vite: ({ analyze, name, onWatchChange, transform }: {
+        analyze?: import("../index.js").AnalyzeFn;
+        name: string;
+        onWatchChange?: () => void;
+        transform: import("../index.js").TransformFn;
+    }) => ({ root }?: {
         root?: string;
     }) => {
-        configResolved(config: import("vite").ResolvedConfig): void;
-        enforce: string;
+        configResolved: (config: unknown) => void;
+        enforce: "pre";
         name: string;
-        transform(code: string, id: string): {
+        transform: (code: string, id: string) => {
             code: string;
             map: null;
         } | null;
-        watchChange(id: string): void;
+        watchChange: (id: string) => void;
     };
 };
 export default _default;

package/build/compiler/plugins/tsc.d.ts

@@ -1,8 +1,7 @@
 import type { PluginContext, PluginDefinition } from '../types.js';
 import { ts } from '../../index.js';
-type TscPluginFactory = (program: ts.Program, context: PluginContext) => {
-    analyze?: (sourceFile: ts.SourceFile) => void;
+declare const _default: ({ analyze, transform }: PluginDefinition) => (program: ts.Program, context: PluginContext) => {
+    analyze: ((sourceFile: ts.SourceFile) => void) | undefined;
     transform: ts.TransformerFactory<ts.SourceFile>;
 };
-declare const _default: ({ analyze, transform }: PluginDefinition) => TscPluginFactory;
 export default _default;

package/build/compiler/plugins/tsc.js

@@ -4,12 +4,12 @@ export default ({ analyze, transform }) => {
             analyze: analyze
                 ? (sourceFile) => analyze(sourceFile, program, context)
                 : undefined,
-            transform: () => {
+            transform: (() => {
                 return (sourceFile) => {
                     let result = transform(sourceFile, program, context);
                     return result.changed ? result.sourceFile : sourceFile;
                 };
-            }
+            })
         };
     };
 };

package/build/compiler/plugins/vite.d.ts

@@ -1,15 +1,21 @@
-import type { ResolvedConfig } from 'vite';
-import type { VitePluginOptions } from '../types.js';
-declare const _default: ({ analyze, name, onWatchChange, transform }: VitePluginOptions) => ({ root }?: {
-    root?: string;
-}) => {
-    configResolved(config: ResolvedConfig): void;
-    enforce: string;
+import type { AnalyzeFn, TransformFn } from '../types.js';
+type VitePlugin = {
+    configResolved: (config: unknown) => void;
+    enforce: 'pre';
     name: string;
-    transform(code: string, id: string): {
+    transform: (code: string, id: string) => {
         code: string;
         map: null;
     } | null;
-    watchChange(id: string): void;
+    watchChange: (id: string) => void;
+};
+type VitePluginOptions = {
+    analyze?: AnalyzeFn;
+    name: string;
+    onWatchChange?: () => void;
+    transform: TransformFn;
 };
+declare const _default: ({ analyze, name, onWatchChange, transform }: VitePluginOptions) => ({ root }?: {
+    root?: string;
+}) => VitePlugin;
 export default _default;

package/build/compiler/types.d.ts

@@ -22,10 +22,4 @@ type TransformResult = {
     code: string;
     sourceFile: ts.SourceFile;
 };
-type VitePluginOptions = {
-    analyze?: AnalyzeFn;
-    name: string;
-    onWatchChange?: () => void;
-    transform: TransformFn;
-};
-export type { AnalyzeFn, PluginContext, PluginDefinition, QuickCheckPattern, Range, Replacement, TransformFn, TransformResult, VitePluginOptions };
+export type { AnalyzeFn, PluginContext, PluginDefinition, QuickCheckPattern, Range, Replacement, TransformFn, TransformResult };

package/package.json

@@ -37,7 +37,7 @@
   },
   "type": "module",
   "types": "build/index.d.ts",
-  "version": "0.23.1",
+  "version": "0.24.2",
   "scripts": {
     "build": "tsc && tsc-alias",
     "-": "-"

package/src/compiler/imports.ts

@@ -46,7 +46,7 @@ const find = (sourceFile: ts.SourceFile, packageName: string): ImportInfo[] => {
             }
         }
 
-        imports.push({ end: stmt.end, specifiers, start: stmt.getStart() });
+        imports.push({ end: stmt.end, specifiers, start: stmt.getStart(sourceFile) });
     }
 
     return imports;

package/src/compiler/plugins/tsc.ts

@@ -2,25 +2,19 @@ import type { PluginContext, PluginDefinition } from '../types';
 import { ts } from '../..';
 
 
-type TscPluginFactory = (program: ts.Program, context: PluginContext) => {
-    analyze?: (sourceFile: ts.SourceFile) => void;
-    transform: ts.TransformerFactory<ts.SourceFile>;
-};
-
-
-export default ({ analyze, transform }: PluginDefinition): TscPluginFactory => {
+export default ({ analyze, transform }: PluginDefinition) => {
     return (program: ts.Program, context: PluginContext) => {
         return {
             analyze: analyze
                 ? (sourceFile: ts.SourceFile) => analyze(sourceFile, program, context)
                 : undefined,
-            transform: () => {
+            transform: (() => {
                 return (sourceFile) => {
                     let result = transform(sourceFile, program, context);
 
                     return result.changed ? result.sourceFile : sourceFile;
                 };
-            }
+            }) as ts.TransformerFactory<ts.SourceFile>
         };
     };
 }

package/src/compiler/plugins/vite.ts

@@ -1,9 +1,25 @@
 import type { ResolvedConfig } from 'vite';
-import type { PluginContext, VitePluginOptions } from '../types';
+import type { AnalyzeFn, PluginContext, TransformFn } from '../types';
 import { ts } from '../..';
 import program from '../program';
 
 
+type VitePlugin = {
+    configResolved: (config: unknown) => void;
+    enforce: 'pre';
+    name: string;
+    transform: (code: string, id: string) => { code: string; map: null } | null;
+    watchChange: (id: string) => void;
+};
+
+type VitePluginOptions = {
+    analyze?: AnalyzeFn;
+    name: string;
+    onWatchChange?: () => void;
+    transform: TransformFn;
+};
+
+
 const FILE_REGEX = /\.[tj]sx?$/;
 
 
@@ -11,10 +27,10 @@ let contexts = new Map<string, PluginContext>();
 
 
 export default ({ analyze, name, onWatchChange, transform }: VitePluginOptions) => {
-    return ({ root }: { root?: string } = {}) => {
+    return ({ root }: { root?: string } = {}): VitePlugin => {
         return {
-            configResolved(config: ResolvedConfig) {
-                root ??= config.root;
+            configResolved(config: unknown) {
+                root ??= (config as ResolvedConfig).root;
             },
             enforce: 'pre',
             name: `${name}/plugin-vite`,

package/src/compiler/types.ts

@@ -32,12 +32,11 @@ type TransformResult = {
     sourceFile: ts.SourceFile;
 };
 
-type VitePluginOptions = {
-    analyze?: AnalyzeFn;
-    name: string;
-    onWatchChange?: () => void;
-    transform: TransformFn;
-};
 
-
-export type { AnalyzeFn, PluginContext, PluginDefinition, QuickCheckPattern, Range, Replacement, TransformFn, TransformResult, VitePluginOptions };
+export type {
+    AnalyzeFn,
+    PluginContext, PluginDefinition,
+    QuickCheckPattern,
+    Range, Replacement,
+    TransformFn, TransformResult
+};