feature(vite): new vite plugin + ttypescript plugin

ref #401 ref #413
deepkit · May 6, 2023 · eb54818 · eb54818
1 parent 1e84c15
commit eb54818
Show file tree

Hide file tree

Showing 25 changed files with 1,032 additions and 8 deletions.
diff --git a/packages/type-compiler/index.ts b/packages/type-compiler/index.ts
@@ -8,5 +8,15 @@
  * You should have received a copy of the MIT License along with this program.
  */
 
+import { declarationTransformer, transformer } from './src/compiler.js';
+import type { Program } from 'typescript';
+
 export * from './src/compiler.js';
 export * from './src/loader.js';
+
+export default function myTransformerPlugin(program: Program, opts: {}) {
+    return {
+        before: transformer,
+        afterDeclarations: declarationTransformer,
+    };
+}
diff --git a/packages/type-compiler/package.json b/packages/type-compiler/package.json
@@ -28,13 +28,14 @@
   "author": "Marc J. Schmidt <[email protected]>",
   "license": "MIT",
   "peerDependencies": {
-    "typescript": "^4.8.2"
+    "typescript": "^4.8.2 || ^5.0.0"
   },
   "devDependencies": {
     "@types/lz-string": "^1.3.34",
     "@types/micromatch": "^4.0.2"
   },
   "dependencies": {
+    "@deepkit/core": "^1.0.1-alpha.93",
     "@deepkit/type-spec": "^1.0.1-alpha.93",
     "@marcj/ts-clone-node": "^2.0.0",
     "@typescript/vfs": "^1.4.0",

diff --git a/packages/type-compiler/src/compiler.ts b/packages/type-compiler/src/compiler.ts
@@ -70,7 +70,7 @@ import type {
     UnionTypeNode,
     ParseConfigHost,
 } from 'typescript';
-import * as ts from 'typescript';
+import ts from 'typescript';
 
 import {
     ensureImportIsEmitted,
@@ -92,7 +92,7 @@ import stripJsonComments from 'strip-json-comments';
 import { MappedModifier, ReflectionOp, TypeNumberBrand } from '@deepkit/type-spec';
 import { Resolver } from './resolver.js';
 import { knownLibFilesForCompilerOptions } from '@typescript/vfs';
-import { contains } from 'micromatch';
+import * as micromatch from 'micromatch';
 import { isObject } from '@deepkit/core';
 
 const {
@@ -681,6 +681,9 @@ export class ReflectionTransformer implements CustomTransformer {
         }
 
         if (sourceFile.kind !== SyntaxKind.SourceFile) {
+            if ('undefined' === typeof require) {
+                throw new Error(`Invalid TypeScript library imported. SyntaxKind different ${sourceFile.kind} !== ${SyntaxKind.SourceFile}.`);
+            }
             const path = require.resolve('typescript');
             throw new Error(`Invalid TypeScript library imported. SyntaxKind different ${sourceFile.kind} !== ${SyntaxKind.SourceFile}. typescript package path: ${path}`);
         }
@@ -1913,7 +1916,7 @@ export class ReflectionTransformer implements CustomTransformer {
     protected isExcluded(filePath: string): boolean {
         if (!this.currentReflectionConfig.options.exclude) return false;
 
-        return contains(filePath, this.currentReflectionConfig.options.exclude, {
+        return micromatch.contains(filePath, this.currentReflectionConfig.options.exclude, {
             basename: true,
             cwd: this.currentReflectionConfig.baseDir
         });
@@ -2545,7 +2548,7 @@ export class ReflectionTransformer implements CustomTransformer {
     protected parseReflectionMode(mode: typeof reflectionModes[number] | '' | boolean | string | string[] | undefined, configPathDir: string): typeof reflectionModes[number] {
         if (Array.isArray(mode)) {
             if (!configPathDir) return 'never';
-            const matches = contains(this.sourceFile.fileName, mode, {
+            const matches = micromatch.contains(this.sourceFile.fileName, mode, {
                 cwd: configPathDir
             });
 

diff --git a/packages/type-compiler/src/loader.ts b/packages/type-compiler/src/loader.ts
@@ -1,5 +1,5 @@
 import type { CompilerOptions, SourceFile, TransformationContext } from 'typescript';
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { ReflectionTransformer } from './compiler.js';
 
 export class DeepkitLoader {

diff --git a/packages/type-compiler/src/reflection-ast.ts b/packages/type-compiler/src/reflection-ast.ts
@@ -30,7 +30,7 @@ import type {
     StringLiteralLike,
     SymbolTable,
 } from 'typescript';
-import * as ts from 'typescript';
+import ts from 'typescript';
 import { cloneNode as tsNodeClone, CloneNodeHook } from '@marcj/ts-clone-node';
 import { SourceFile } from './ts-types.js';
 

diff --git a/packages/type-compiler/src/resolver.ts b/packages/type-compiler/src/resolver.ts
@@ -8,7 +8,7 @@ import type {
     SourceFile,
     StringLiteral,
 } from 'typescript';
-import * as ts from 'typescript';
+import ts from 'typescript';
 
 const {
     createSourceFile,

diff --git a/packages/type-compiler/tsconfig.esm.json b/packages/type-compiler/tsconfig.esm.json
@@ -7,6 +7,9 @@
   "references": [
     {
       "path": "../type-spec/tsconfig.json"
+    },
+    {
+      "path": "../core/tsconfig.json"
     }
   ]
 }
diff --git a/packages/type-compiler/tsconfig.json b/packages/type-compiler/tsconfig.json
@@ -24,6 +24,9 @@
   "references": [
     {
       "path": "../type-spec/tsconfig.json"
+    },
+    {
+      "path": "../core/tsconfig.json"
     }
   ]
 }
diff --git a/packages/vite/.npmignore b/packages/vite/.npmignore
@@ -0,0 +1 @@
+tests
diff --git a/packages/vite/README.md b/packages/vite/README.md
@@ -0,0 +1 @@
+# Deepkit Vite Plugin
diff --git a/packages/vite/dist/.gitkeep b/packages/vite/dist/.gitkeep
diff --git a/packages/vite/index.ts b/packages/vite/index.ts
@@ -0,0 +1 @@
+export * from './src/plugin.js';