@nestjs/cli 10.0.0-next.1 → 10.0.0-next.2

package/actions/build.action.js

@@ -68,7 +68,10 @@ class BuildAction extends abstract_action_1.AbstractAction {
             const pathToTsconfig = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'compilerOptions.tsConfigPath', appName, 'path', options);
             const { options: tsOptions } = this.tsConfigProvider.getByConfigFilename(pathToTsconfig);
             const outDir = tsOptions.outDir || defaults_1.defaultOutDir;
-            const builder = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'compilerOptions.builder', appName, 'builder', options);
+            const isWebpackEnabled = (0, get_value_or_default_1.getValueOrDefault)(configuration, 'compilerOptions.webpack', appName, 'webpack', options);
+            const builder = isWebpackEnabled
+                ? 'webpack'
+                : (0, get_value_or_default_1.getValueOrDefault)(configuration, 'compilerOptions.builder', appName, 'builder', options);
             yield this.workspaceUtils.deleteOutDirIfEnabled(configuration, appName, outDir);
             this.assetsManager.copyAssets(configuration, appName, outDir, watchAssetsMode);
             switch (builder) {

package/lib/compiler/defaults/swc-defaults.d.ts

@@ -1,5 +1,8 @@
 export declare const swcDefaultsFactory: () => {
     swcOptions: {
+        module: {
+            type: string;
+        };
         jsc: {
             target: string;
             parser: {
@@ -25,7 +28,6 @@ export declare const swcDefaultsFactory: () => {
         watch: boolean;
         copyFiles: boolean;
         includeDotfiles: boolean;
-        deleteDirOnStart: boolean;
         quiet: boolean;
     };
 };

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

@@ -4,16 +4,19 @@ exports.swcDefaultsFactory = void 0;
 const swcDefaultsFactory = () => {
     return {
         swcOptions: {
+            module: {
+                type: 'commonjs',
+            },
             jsc: {
                 target: 'es2021',
                 parser: {
-                    'syntax': 'typescript',
-                    'decorators': true,
-                    'dynamicImport': true,
+                    syntax: 'typescript',
+                    decorators: true,
+                    dynamicImport: true,
                 },
                 transform: {
-                    'legacyDecorator': true,
-                    'decoratorMetadata': true,
+                    legacyDecorator: true,
+                    decoratorMetadata: true,
                 },
                 keepClassNames: true,
                 baseUrl: './',
@@ -25,21 +28,10 @@ const swcDefaultsFactory = () => {
             outDir: 'dist',
             filenames: ['src'],
             sync: false,
-            extensions: [
-                '.js',
-                '.jsx',
-                '.es6',
-                '.es',
-                '.mjs',
-                '.ts',
-                '.tsx',
-                '.cts',
-                '.mts',
-            ],
+            extensions: ['.js', '.ts'],
             watch: false,
             copyFiles: false,
             includeDotfiles: false,
-            deleteDirOnStart: true,
             quiet: false,
         },
     };

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

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

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

@@ -0,0 +1 @@
+export * from './plugin-metadata-generator';

package/lib/compiler/plugins/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./plugin-metadata-generator"), exports);

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

@@ -5,6 +5,7 @@ export interface PluginMetadataGenerateOptions {
     outputDir: string;
     watch?: boolean;
     tsconfigPath?: string;
+    filename?: string;
     tsProgramRef?: ts.Program;
 }
 export declare class PluginMetadataGenerator {

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

@@ -9,21 +9,21 @@ class PluginMetadataGenerator {
         this.typeCheckerHost = new type_checker_host_1.TypeCheckerHost();
     }
     generate(options) {
-        const { tsconfigPath, visitors, tsProgramRef, outputDir, watch } = options;
+        const { tsconfigPath, visitors, tsProgramRef, outputDir, watch, filename } = options;
         if (visitors.length === 0) {
             return;
         }
         if (tsProgramRef) {
-            return this.traverseAndPrintMetadata(tsProgramRef, visitors, outputDir);
+            return this.traverseAndPrintMetadata(tsProgramRef, visitors, outputDir, filename);
         }
         this.typeCheckerHost.run(tsconfigPath, {
             watch,
             onSuccess: (program) => {
-                this.traverseAndPrintMetadata(program, visitors, outputDir);
+                this.traverseAndPrintMetadata(program, visitors, outputDir, filename);
             },
         });
     }
-    traverseAndPrintMetadata(programRef, visitors, outputDir) {
+    traverseAndPrintMetadata(programRef, visitors, outputDir, filename) {
         for (const sourceFile of programRef.getSourceFiles()) {
             if (!sourceFile.isDeclarationFile) {
                 visitors.forEach((visitor) => visitor.visit(programRef, sourceFile));
@@ -33,7 +33,10 @@ class PluginMetadataGenerator {
         visitors.forEach((visitor) => {
             collectedMetadata[visitor.key] = visitor.collect();
         });
-        this.pluginMetadataPrinter.print(collectedMetadata, outputDir);
+        this.pluginMetadataPrinter.print(collectedMetadata, {
+            outputDir,
+            filename,
+        });
     }
 }
 exports.PluginMetadataGenerator = PluginMetadataGenerator;

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

@@ -1,5 +1,10 @@
+import * as ts from 'typescript';
 import { DeepPluginMeta } from '../interfaces/readonly-visitor.interface';
+export interface PluginMetadataPrintOptions {
+    outputDir: string;
+    filename?: string;
+}
 export declare class PluginMetadataPrinter {
-    print(metadata: DeepPluginMeta, outputDir: string): void;
+    print(metadata: Record<string, Array<[ts.CallExpression, DeepPluginMeta]>>, options: PluginMetadataPrintOptions): void;
     private recursivelyCreatePropertyAssignment;
 }

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

@@ -6,7 +6,8 @@ const path_1 = require("path");
 const ts = require("typescript");
 const SERIALIZED_METADATA_FILENAME = 'metadata.ts';
 class PluginMetadataPrinter {
-    print(metadata, outputDir) {
+    print(metadata, options) {
+        var _a;
         const objectLiteralExpr = ts.factory.createObjectLiteralExpression(Object.keys(metadata).map((key) => this.recursivelyCreatePropertyAssignment(key, metadata[key])));
         const metadataCacheVariableStatement = ts.factory.createVariableStatement([ts.factory.createToken(ts.SyntaxKind.ExportKeyword)], ts.factory.createVariableDeclarationList([
             ts.factory.createVariableDeclaration(ts.factory.createIdentifier('metadataCache'), undefined, undefined, objectLiteralExpr),
@@ -16,12 +17,18 @@ class PluginMetadataPrinter {
         });
         const resultFile = ts.createSourceFile('file.ts', '', ts.ScriptTarget.Latest, 
         /*setParentNodes*/ false, ts.ScriptKind.TS);
-        const filename = (0, path_1.join)(outputDir, SERIALIZED_METADATA_FILENAME);
+        const filename = (0, path_1.join)(options.outputDir, (_a = options.filename) !== null && _a !== void 0 ? _a : SERIALIZED_METADATA_FILENAME);
         const eslintPrefix = `/* eslint-disable */\n`;
         (0, fs_1.writeFileSync)(filename, eslintPrefix +
             printer.printNode(ts.EmitHint.Unspecified, metadataCacheVariableStatement, resultFile));
     }
     recursivelyCreatePropertyAssignment(identifier, meta) {
+        if (Array.isArray(meta)) {
+            return ts.factory.createPropertyAssignment(ts.factory.createStringLiteral(identifier), ts.factory.createArrayLiteralExpression(meta.map(([importExpr, meta]) => ts.factory.createArrayLiteralExpression([
+                importExpr,
+                ts.factory.createObjectLiteralExpression(Object.keys(meta).map((key) => this.recursivelyCreatePropertyAssignment(key, meta[key]))),
+            ]))));
+        }
         return ts.factory.createPropertyAssignment(ts.factory.createStringLiteral(identifier), ts.isObjectLiteralExpression(meta)
             ? meta
             : ts.factory.createObjectLiteralExpression(Object.keys(meta).map((key) => this.recursivelyCreatePropertyAssignment(key, meta[key]))));

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

@@ -115,7 +115,7 @@ class SwcCompiler extends base_compiler_1.BaseCompiler {
         }
         catch (err) {
             console.error(ui_1.ERROR_PREFIX +
-                ' Failed to load "@swc/cli" package. Please, install it by running "npm i -D @swc/cli"');
+                ' Failed to load "@swc/cli" and "@swc/core" packages. Please, install them by running "npm i -D @swc/cli @swc/core".');
             throw err;
         }
     }

package/lib/index.d.ts

@@ -0,0 +1 @@
+export * from './compiler/plugins';

package/lib/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./compiler/plugins"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/cli",
-  "version": "10.0.0-next.1",
+  "version": "10.0.0-next.2",
   "description": "Nest - modern, fast, powerful node.js web framework (@cli)",
   "publishConfig": {
     "access": "public"
@@ -65,6 +65,7 @@
     "@commitlint/cli": "17.6.3",
     "@commitlint/config-angular": "17.6.3",
     "@swc/cli": "0.1.62",
+    "@swc/core": "1.3.62",
     "@types/inquirer": "8.2.6",
     "@types/jest": "29.5.1",
     "@types/node": "18.16.12",
@@ -90,11 +91,15 @@
     "**/*.{ts,json}": []
   },
   "peerDependencies": {
-    "@swc/cli": "^0.1.62"
+    "@swc/cli": "^0.1.62",
+    "@swc/core": "^1.3.62"
   },
   "peerDependenciesMeta": {
     "@swc/cli": {
       "optional": true
+    },
+    "@swc/core": {
+      "optional": true
     }
   }
 }