@nestjs/cli 10.0.1 → 10.0.3

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/actions/build.action.js

@@ -76,6 +76,7 @@ class BuildAction extends abstract_action_1.AbstractAction {
         await swc.run(configuration, pathToTsconfig, appName, {
             watch: watchMode,
             typeCheck: (0, get_value_or_default_1.getValueOrDefault)(configuration, 'compilerOptions.typeCheck', appName, 'typeCheck', options),
+            assetsManager: this.assetsManager,
         }, onSuccess);
     }
     runWebpack(configuration, appName, inputs, pathToTsconfig, debug, watchMode, onSuccess) {

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.d.ts

@@ -1,9 +1,11 @@
 import { Configuration } from '../../configuration';
+import { AssetsManager } from '../assets-manager';
 import { BaseCompiler } from '../base-compiler';
 import { PluginsLoader } from '../plugins/plugins-loader';
 export type SwcCompilerExtras = {
     watch: boolean;
     typeCheck: boolean;
+    assetsManager: AssetsManager;
 };
 export declare class SwcCompiler extends BaseCompiler {
     private readonly pluginMetadataGenerator;

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

@@ -38,7 +38,12 @@ class SwcCompiler extends base_compiler_1.BaseCompiler {
                 await this.runTypeChecker(configuration, tsConfigPath, appName, extras);
             }
             await this.runSwc(swcOptions, extras);
-            onSuccess?.();
+            if (onSuccess) {
+                onSuccess();
+            }
+            else {
+                extras.assetsManager?.closeWatchers();
+            }
         }
     }
     runTypeChecker(configuration, tsConfigPath, appName, extras) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/cli",
-  "version": "10.0.1",
+  "version": "10.0.3",
   "description": "Nest - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"