@nestjs/cli 10.0.0 → 10.0.2

package/.circleci/config.yml

@@ -21,7 +21,7 @@ jobs:
   build:
     working_directory: ~/nest
     docker:
-      - image: cimg/node:20.3
+      - image: cimg/node:20.2
     steps:
       - checkout
       - run:
@@ -43,7 +43,7 @@ jobs:
   unit_tests:
     working_directory: ~/nest
     docker:
-      - image: cimg/node:20.3
+      - image: cimg/node:20.2
     steps:
       - checkout
       - *restore-cache

package/lib/compiler/interfaces/readonly-visitor.interface.d.ts

@@ -4,6 +4,7 @@ export type DeepPluginMeta = ts.ObjectLiteralExpression | {
 };
 export interface ReadonlyVisitor {
     key: string;
+    typeImports: Record<string, string>;
     visit(program: ts.Program, sf: ts.SourceFile): void;
     collect(): Record<string, Array<[ts.CallExpression, DeepPluginMeta]>>;
 }

package/lib/compiler/plugins/plugin-metadata-generator.js

@@ -65,11 +65,16 @@ class PluginMetadataGenerator {
                 visitors.forEach((visitor) => visitor.visit(programRef, sourceFile));
             }
         }
+        let typeImports = {};
         const collectedMetadata = {};
         visitors.forEach((visitor) => {
             collectedMetadata[visitor.key] = visitor.collect();
+            typeImports = {
+                ...typeImports,
+                ...visitor.typeImports,
+            };
         });
-        this.pluginMetadataPrinter.print(collectedMetadata, {
+        this.pluginMetadataPrinter.print(collectedMetadata, typeImports, {
             outputDir,
             filename,
         });

package/lib/compiler/plugins/plugin-metadata-printer.d.ts

@@ -4,10 +4,14 @@ export interface PluginMetadataPrintOptions {
     outputDir: string;
     filename?: string;
 }
+type ComposedPluginMeta = Record<string, Record<string, Array<[ts.CallExpression, DeepPluginMeta]>>>;
 /**
  * Prints the metadata to a file.
  */
 export declare class PluginMetadataPrinter {
-    print(metadata: Record<string, Record<string, Array<[ts.CallExpression, DeepPluginMeta]>>>, options: PluginMetadataPrintOptions): void;
+    print(metadata: ComposedPluginMeta, typeImports: Record<string, string>, options: PluginMetadataPrintOptions): void;
     private recursivelyCreatePropertyAssignment;
+    private createTypeImportVariableStatement;
+    private createPropertyAssignment;
 }
+export {};

package/lib/compiler/plugins/plugin-metadata-printer.js

@@ -5,13 +5,17 @@ const fs_1 = require("fs");
 const path_1 = require("path");
 const ts = require("typescript");
 const SERIALIZED_METADATA_FILENAME = 'metadata.ts';
+const TYPE_IMPORT_VARIABLE_NAME = 't';
 /**
  * Prints the metadata to a file.
  */
 class PluginMetadataPrinter {
-    print(metadata, options) {
+    print(metadata, typeImports, options) {
         const objectLiteralExpr = ts.factory.createObjectLiteralExpression(Object.keys(metadata).map((key) => this.recursivelyCreatePropertyAssignment(key, metadata[key])));
-        const exportAssignment = ts.factory.createExportAssignment(undefined, undefined, objectLiteralExpr);
+        const exportAssignment = ts.factory.createExportAssignment(undefined, undefined, ts.factory.createArrowFunction([ts.factory.createToken(ts.SyntaxKind.AsyncKeyword)], undefined, [], undefined, ts.factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken), ts.factory.createBlock([
+            this.createTypeImportVariableStatement(typeImports),
+            ts.factory.createReturnStatement(objectLiteralExpr),
+        ], true)));
         const printer = ts.createPrinter({
             newLine: ts.NewLineKind.LineFeed,
         });
@@ -33,5 +37,16 @@ class PluginMetadataPrinter {
             ? meta
             : ts.factory.createObjectLiteralExpression(Object.keys(meta).map((key) => this.recursivelyCreatePropertyAssignment(key, meta[key]))));
     }
+    createTypeImportVariableStatement(typeImports) {
+        return ts.factory.createVariableStatement(undefined, ts.factory.createVariableDeclarationList([
+            ts.factory.createVariableDeclaration(ts.factory.createIdentifier(TYPE_IMPORT_VARIABLE_NAME), undefined, undefined, ts.factory.createObjectLiteralExpression(Object.keys(typeImports).map((ti) => this.createPropertyAssignment(ti, typeImports[ti])), true)),
+        ], ts.NodeFlags.Const |
+            ts.NodeFlags.AwaitContext |
+            ts.NodeFlags.ContextFlags |
+            ts.NodeFlags.TypeExcludesFlags));
+    }
+    createPropertyAssignment(identifier, target) {
+        return ts.factory.createPropertyAssignment(ts.factory.createComputedPropertyName(ts.factory.createStringLiteral(identifier)), ts.factory.createIdentifier(target));
+    }
 }
 exports.PluginMetadataPrinter = PluginMetadataPrinter;

package/lib/compiler/swc/swc-compiler.js

@@ -7,6 +7,7 @@ const chokidar = require("chokidar");
 const fs_1 = require("fs");
 const path_1 = require("path");
 const ui_1 = require("../../ui");
+const tree_kill_1 = require("../../utils/tree-kill");
 const base_compiler_1 = require("../base-compiler");
 const swc_defaults_1 = require("../defaults/swc-defaults");
 const plugin_metadata_generator_1 = require("../plugins/plugin-metadata-generator");
@@ -48,9 +49,10 @@ class SwcCompiler extends base_compiler_1.BaseCompiler {
                 configuration.sourceRoot ?? 'src',
                 JSON.stringify(configuration.compilerOptions.plugins ?? []),
             ];
-            (0, child_process_1.fork)((0, path_1.join)(__dirname, 'forked-type-checker.js'), args, {
+            const childProcessRef = (0, child_process_1.fork)((0, path_1.join)(__dirname, 'forked-type-checker.js'), args, {
                 cwd: process.cwd(),
             });
+            process.on('exit', () => childProcessRef && (0, tree_kill_1.treeKillSync)(childProcessRef.pid));
         }
         else {
             const { readonlyVisitors } = this.loadPlugins(configuration, tsConfigPath, appName);
@@ -109,7 +111,7 @@ class SwcCompiler extends base_compiler_1.BaseCompiler {
         catch (err) {
             console.error(ui_1.ERROR_PREFIX +
                 ' Failed to load "@swc/cli" and "@swc/core" packages. Please, install them by running "npm i -D @swc/cli @swc/core".');
-            throw err;
+            process.exit(1);
         }
     }
     getSwcRcFileContentIfExists() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/cli",
-  "version": "10.0.0",
+  "version": "10.0.2",
   "description": "Nest - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"
@@ -41,7 +41,7 @@
     "@angular-devkit/core": "16.1.0",
     "@angular-devkit/schematics": "16.1.0",
     "@angular-devkit/schematics-cli": "16.1.0",
-    "@nestjs/schematics": "^10.0.0",
+    "@nestjs/schematics": "^10.0.1",
     "chalk": "4.1.2",
     "chokidar": "3.5.3",
     "cli-table3": "0.6.3",