@esportsplus/typescript 0.27.0 → 0.27.2

package/build/cli/tsc.js

@@ -4,6 +4,7 @@ import { pathToFileURL } from 'url';
 import path from 'path';
 import ts from 'typescript';
 import coordinator from '../compiler/coordinator.js';
+import { PACKAGE_NAME } from '../constants.js';
 const BACKSLASH_REGEX = /\\/g;
 let require = createRequire(import.meta.url), skipFlags = new Set(['--help', '--init', '--noEmit', '--showConfig', '--version', '-h', '-noEmit', '-v']);
 async function build(config, tsconfig, pluginConfigs) {
@@ -54,6 +55,9 @@ async function build(config, tsconfig, pluginConfigs) {
     }
     return runTscAlias(process.argv.slice(2)).then((code) => process.exit(code));
 }
+function isPlugin(value) {
+    return typeof value === 'object' && value !== null && 'transform' in value && typeof value.transform === 'function';
+}
 async function loadPlugins(configs, root) {
     let plugins = [], promises = [];
     for (let i = 0, n = configs.length; i < n; i++) {
@@ -69,8 +73,19 @@ async function loadPlugins(configs, root) {
             if (typeof plugin === 'function') {
                 plugin = plugin();
             }
-            if (!plugin || typeof plugin.transform !== 'function') {
-                console.error(`Plugin ${config.transform}: invalid plugin format, expected { transform: Function }`);
+            if (Array.isArray(plugin)) {
+                for (let j = 0, m = plugin.length; j < m; j++) {
+                    if (isPlugin(plugin[j])) {
+                        plugins.push(plugin[j]);
+                    }
+                    else {
+                        console.error(`${PACKAGE_NAME}: plugin ${config.transform}[${j}] uses an invalid plugin format`);
+                    }
+                }
+                return;
+            }
+            if (!isPlugin(plugin)) {
+                console.error(`${PACKAGE_NAME}: plugin ${config.transform} uses an invalid plugin format, expected { transform: Function } or Plugin[]`);
                 return;
             }
             plugins.push(plugin);
@@ -92,9 +107,9 @@ function main() {
     if (pluginConfigs.length === 0) {
         return passthrough();
     }
-    console.log(`Found ${pluginConfigs.length} transformer plugin(s), using coordinated build...`);
+    console.log(`${PACKAGE_NAME}: found ${pluginConfigs.length} transformer plugin(s), using coordinated build...`);
     build(config, tsconfig, pluginConfigs).catch((err) => {
-        console.error(err);
+        console.error(`${PACKAGE_NAME}: ${err}`);
         process.exit(1);
     });
 }

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

@@ -1,7 +1,5 @@
 declare const _default: {
-    tsc: (plugins: import("../index.js").Plugin[]) => (program: import("typescript").Program, shared: import("../index.js").SharedContext) => {
-        transform: import("typescript").TransformerFactory<import("typescript").SourceFile>;
-    };
+    tsc: (plugins: import("../index.js").Plugin[]) => () => import("../index.js").Plugin[];
     vite: ({ name, onWatchChange, plugins }: {
         name: string;
         onWatchChange?: () => void;

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

@@ -1,6 +1,3 @@
-import type { Plugin, SharedContext } from '../types.js';
-import type ts from 'typescript';
-declare const _default: (plugins: Plugin[]) => (program: ts.Program, shared: SharedContext) => {
-    transform: ts.TransformerFactory<ts.SourceFile>;
-};
+import type { Plugin } from '../types.js';
+declare const _default: (plugins: Plugin[]) => () => Plugin[];
 export default _default;

package/build/compiler/plugins/tsc.js

@@ -1,13 +1,3 @@
-import coordinator from '../coordinator.js';
 export default (plugins) => {
-    return (program, shared) => {
-        return {
-            transform: (() => {
-                return (sourceFile) => {
-                    let result = coordinator.transform(plugins, sourceFile.getFullText(), sourceFile, program, shared);
-                    return result.changed ? result.sourceFile : sourceFile;
-                };
-            })
-        };
-    };
+    return () => plugins;
 };

package/build/compiler/plugins/vite.js

@@ -10,7 +10,7 @@ export default ({ name, onWatchChange, plugins }) => {
                 root ??= config.root;
             },
             enforce: 'pre',
-            name: `${name}/plugin-vite`,
+            name: `${name}/compiler/vite`,
             transform(code, id) {
                 if (!FILE_REGEX.test(id) || id.includes('node_modules')) {
                     return null;

package/build/compiler/program.js

@@ -1,5 +1,6 @@
 import path from 'path';
 import ts from 'typescript';
+import { PACKAGE_NAME } from '../constants.js';
 let cache = new Map();
 function create(root) {
     let tsconfig = ts.findConfigFile(root, ts.sys.fileExists, 'tsconfig.json');
@@ -8,11 +9,11 @@ function create(root) {
     }
     let file = ts.readConfigFile(tsconfig, ts.sys.readFile);
     if (file.error) {
-        throw new Error(`Error reading tsconfig.json: ${file.error.messageText}`);
+        throw new Error(`${PACKAGE_NAME}: error reading tsconfig.json ${file.error.messageText}`);
     }
     let parsed = ts.parseJsonConfigFileContent(file.config, ts.sys, path.dirname(tsconfig));
     if (parsed.errors.length > 0) {
-        throw new Error(`Error parsing tsconfig.json: ${parsed.errors[0].messageText}`);
+        throw new Error(`${PACKAGE_NAME}: error parsing tsconfig.json ${parsed.errors[0].messageText}`);
     }
     return ts.createProgram({
         options: parsed.options,

package/build/constants.d.ts

@@ -0,0 +1,2 @@
+declare const PACKAGE_NAME = "@esportsplus/typescript";
+export { PACKAGE_NAME };

package/build/constants.js

@@ -0,0 +1,2 @@
+const PACKAGE_NAME = '@esportsplus/typescript';
+export { PACKAGE_NAME };

package/package.json

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

package/src/cli/tsc.ts

@@ -5,6 +5,7 @@ import path from 'path';
 import ts from 'typescript';
 import coordinator from '~/compiler/coordinator';
 import type { Plugin, SharedContext } from '~/compiler/types';
+import { PACKAGE_NAME } from '~/constants';
 
 
 type PluginConfig = {
@@ -109,6 +110,10 @@ async function build(config: object, tsconfig: string, pluginConfigs: PluginConf
     return runTscAlias(process.argv.slice(2)).then((code) => process.exit(code));
 }
 
+function isPlugin(value: unknown): value is Plugin {
+    return typeof value === 'object' && value !== null && 'transform' in value && typeof (value as Plugin).transform === 'function';
+}
+
 async function loadPlugins(configs: PluginConfig[], root: string): Promise<Plugin[]> {
     let plugins: Plugin[] = [],
         promises: Promise<void>[] = [];
@@ -132,8 +137,21 @@ async function loadPlugins(configs: PluginConfig[], root: string): Promise<Plugi
                     plugin = plugin();
                 }
 
-                if (!plugin || typeof plugin.transform !== 'function') {
-                    console.error(`Plugin ${config.transform}: invalid plugin format, expected { transform: Function }`);
+                if (Array.isArray(plugin)) {
+                    for (let j = 0, m = plugin.length; j < m; j++) {
+                        if (isPlugin(plugin[j])) {
+                            plugins.push(plugin[j]);
+                        }
+                        else {
+                            console.error(`${PACKAGE_NAME}: plugin ${config.transform}[${j}] uses an invalid plugin format`);
+                        }
+                    }
+
+                    return;
+                }
+
+                if (!isPlugin(plugin)) {
+                    console.error(`${PACKAGE_NAME}: plugin ${config.transform} uses an invalid plugin format, expected { transform: Function } or Plugin[]`);
                     return;
                 }
 
@@ -168,10 +186,10 @@ function main(): void {
         return passthrough();
     }
 
-    console.log(`Found ${pluginConfigs.length} transformer plugin(s), using coordinated build...`);
+    console.log(`${PACKAGE_NAME}: found ${pluginConfigs.length} transformer plugin(s), using coordinated build...`);
 
     build(config, tsconfig, pluginConfigs).catch((err) => {
-        console.error(err);
+        console.error(`${PACKAGE_NAME}: ${err}`);
         process.exit(1);
     });
 }

package/src/compiler/plugins/tsc.ts

@@ -1,24 +1,6 @@
-import type { Plugin, SharedContext } from '../types';
-import type ts from 'typescript';
-import coordinator from '../coordinator';
+import type { Plugin } from '../types';
 
 
 export default (plugins: Plugin[]) => {
-    return (program: ts.Program, shared: SharedContext) => {
-        return {
-            transform: (() => {
-                return (sourceFile: ts.SourceFile) => {
-                    let result = coordinator.transform(
-                            plugins,
-                            sourceFile.getFullText(),
-                            sourceFile,
-                            program,
-                            shared
-                        );
-
-                    return result.changed ? result.sourceFile : sourceFile;
-                };
-            }) as ts.TransformerFactory<ts.SourceFile>
-        };
-    };
+    return () => plugins;
 };

package/src/compiler/plugins/vite.ts

@@ -33,7 +33,7 @@ export default ({ name, onWatchChange, plugins }: VitePluginOptions) => {
                 root ??= (config as ResolvedConfig).root;
             },
             enforce: 'pre',
-            name: `${name}/plugin-vite`,
+            name: `${name}/compiler/vite`,
             transform(code: string, id: string) {
                 if (!FILE_REGEX.test(id) || id.includes('node_modules')) {
                     return null;

package/src/compiler/program.ts

@@ -1,5 +1,6 @@
 import path from 'path';
 import ts from 'typescript';
+import { PACKAGE_NAME } from '~/constants';
 
 
 let cache = new Map<string, ts.Program>();
@@ -15,7 +16,7 @@ function create(root: string): ts.Program {
     let file = ts.readConfigFile(tsconfig, ts.sys.readFile);
 
     if (file.error) {
-        throw new Error(`Error reading tsconfig.json: ${file.error.messageText}`);
+        throw new Error(`${PACKAGE_NAME}: error reading tsconfig.json ${file.error.messageText}`);
     }
 
     let parsed = ts.parseJsonConfigFileContent(
@@ -25,7 +26,7 @@ function create(root: string): ts.Program {
         );
 
     if (parsed.errors.length > 0) {
-        throw new Error(`Error parsing tsconfig.json: ${parsed.errors[0].messageText}`);
+        throw new Error(`${PACKAGE_NAME}: error parsing tsconfig.json ${parsed.errors[0].messageText}`);
     }
 
     return ts.createProgram({

package/src/constants.ts

@@ -0,0 +1,4 @@
+const PACKAGE_NAME = '@esportsplus/typescript';
+
+
+export { PACKAGE_NAME };