@nestjs/schematics 12.0.0-alpha.4 → 12.0.0-alpha.5

package/dist/lib/class/class.factory.js

@@ -2,11 +2,18 @@ import { join, strings } from '@angular-devkit/core';
 import { apply, chain, filter, mergeWith, move, noop, SchematicsException, template, url, } from '@angular-devkit/schematics';
 import { normalizeToKebabOrSnakeCase } from '../../utils/formatting.js';
 import { NameParser } from '../../utils/name.parser.js';
-import { mergeSourceRoot } from '../../utils/source-root.helpers.js';
+import { isEsmProject, mergeSourceRoot, } from '../../utils/source-root.helpers.js';
 import { DEFAULT_LANGUAGE } from '../defaults.js';
 export function main(options) {
     options = transform(options);
-    return chain([mergeSourceRoot(options), mergeWith(generate(options))]);
+    return chain([
+        mergeSourceRoot(options),
+        (tree) => {
+            options.isEsm = isEsmProject(tree);
+            return tree;
+        },
+        mergeWith(generate(options)),
+    ]);
 }
 function transform(options) {
     const target = Object.assign({}, options);

package/dist/lib/class/files/ts/__name__.__specFileSuffix__.ts

@@ -1,4 +1,4 @@
-import { <%= classify(className) %> } from './<%= name %>';
+import { <%= classify(className) %> } from './<%= name %><%= isEsm ? '.js' : '' %>';
 
 describe('<%= classify(className) %>', () => {
   it('should be defined', () => {

package/dist/lib/controller/controller.factory.js

@@ -11,6 +11,7 @@ const ELEMENT_TYPE = 'controller';
 export function main(options) {
     options = transform(options);
     return (tree, context) => {
+        options.isEsm = isEsmProject(tree);
         return branchAndMerge(chain([
             mergeSourceRoot(options),
             mergeWith(generate(options)),

package/dist/lib/controller/files/ts/__name__.controller.__specFileSuffix__.ts

@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { <%= classify(name) %>Controller } from './<%= name %>.controller';
+import { <%= classify(name) %>Controller } from './<%= name %>.controller<%= isEsm ? '.js' : '' %>';
 
 describe('<%= classify(name) %>Controller', () => {
   let controller: <%= classify(name) %>Controller;

package/dist/lib/filter/files/ts/__name__.filter.__specFileSuffix__.ts

@@ -1,4 +1,4 @@
-import { <%= classify(name) %>Filter } from './<%= name %>.filter';
+import { <%= classify(name) %>Filter } from './<%= name %>.filter<%= isEsm ? '.js' : '' %>';
 
 describe('<%= classify(name) %>Filter', () => {
   it('should be defined', () => {

package/dist/lib/filter/filter.factory.js

@@ -2,10 +2,17 @@ import { join, strings } from '@angular-devkit/core';
 import { apply, chain, filter, mergeWith, move, noop, SchematicsException, template, url, } from '@angular-devkit/schematics';
 import { normalizeToKebabOrSnakeCase } from '../../utils/formatting.js';
 import { NameParser } from '../../utils/name.parser.js';
-import { mergeSourceRoot } from '../../utils/source-root.helpers.js';
+import { isEsmProject, mergeSourceRoot, } from '../../utils/source-root.helpers.js';
 export function main(options) {
     options = transform(options);
-    return chain([mergeSourceRoot(options), mergeWith(generate(options))]);
+    return chain([
+        mergeSourceRoot(options),
+        (tree) => {
+            options.isEsm = isEsmProject(tree);
+            return tree;
+        },
+        mergeWith(generate(options)),
+    ]);
 }
 function transform(options) {
     const target = Object.assign({}, options);

package/dist/lib/gateway/files/ts/__name__.gateway.__specFileSuffix__.ts

@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { <%= classify(name) %>Gateway } from './<%= name %>.gateway';
+import { <%= classify(name) %>Gateway } from './<%= name %>.gateway<%= isEsm ? '.js' : '' %>';
 
 describe('<%= classify(name) %>Gateway', () => {
   let gateway: <%= classify(name) %>Gateway;

package/dist/lib/gateway/gateway.factory.js

@@ -8,6 +8,7 @@ import { isEsmProject, mergeSourceRoot, } from '../../utils/source-root.helpers.
 export function main(options) {
     options = transform(options);
     return (tree, context) => {
+        options.isEsm = isEsmProject(tree);
         return branchAndMerge(chain([
             mergeSourceRoot(options),
             addDeclarationToModule(options),

package/dist/lib/guard/files/ts/__name__.guard.__specFileSuffix__.ts

@@ -1,4 +1,4 @@
-import { <%= classify(name) %>Guard } from './<%= name %>.guard';
+import { <%= classify(name) %>Guard } from './<%= name %>.guard<%= isEsm ? '.js' : '' %>';
 
 describe('<%= classify(name) %>Guard', () => {
   it('should be defined', () => {

package/dist/lib/guard/guard.factory.js

@@ -2,10 +2,17 @@ import { join, strings } from '@angular-devkit/core';
 import { apply, chain, filter, mergeWith, move, noop, SchematicsException, template, url, } from '@angular-devkit/schematics';
 import { normalizeToKebabOrSnakeCase } from '../../utils/formatting.js';
 import { NameParser } from '../../utils/name.parser.js';
-import { mergeSourceRoot } from '../../utils/source-root.helpers.js';
+import { isEsmProject, mergeSourceRoot, } from '../../utils/source-root.helpers.js';
 export function main(options) {
     options = transform(options);
-    return chain([mergeSourceRoot(options), mergeWith(generate(options))]);
+    return chain([
+        mergeSourceRoot(options),
+        (tree) => {
+            options.isEsm = isEsmProject(tree);
+            return tree;
+        },
+        mergeWith(generate(options)),
+    ]);
 }
 function transform(options) {
     const target = Object.assign({}, options);

package/dist/lib/interceptor/files/ts/__name__.interceptor.__specFileSuffix__.ts

@@ -1,4 +1,4 @@
-import { <%= classify(name) %>Interceptor } from './<%= name %>.interceptor';
+import { <%= classify(name) %>Interceptor } from './<%= name %>.interceptor<%= isEsm ? '.js' : '' %>';
 
 describe('<%= classify(name) %>Interceptor', () => {
   it('should be defined', () => {

package/dist/lib/interceptor/interceptor.factory.js

@@ -2,10 +2,17 @@ import { join, strings } from '@angular-devkit/core';
 import { apply, chain, filter, mergeWith, move, noop, SchematicsException, template, url, } from '@angular-devkit/schematics';
 import { normalizeToKebabOrSnakeCase } from '../../utils/formatting.js';
 import { NameParser } from '../../utils/name.parser.js';
-import { mergeSourceRoot } from '../../utils/source-root.helpers.js';
+import { isEsmProject, mergeSourceRoot, } from '../../utils/source-root.helpers.js';
 export function main(options) {
     options = transform(options);
-    return chain([mergeSourceRoot(options), mergeWith(generate(options))]);
+    return chain([
+        mergeSourceRoot(options),
+        (tree) => {
+            options.isEsm = isEsmProject(tree);
+            return tree;
+        },
+        mergeWith(generate(options)),
+    ]);
 }
 function transform(options) {
     const target = Object.assign({}, options);

package/dist/lib/library/files/ts/src/__name__.module.ts

@@ -1,5 +1,5 @@
 import { Module } from '@nestjs/common';
-import { <%= classify(name) %>Service } from './<%= name %>.service';
+import { <%= classify(name) %>Service } from './<%= name %>.service<%= isEsm ? '.js' : '' %>';
 
 @Module({
   providers: [<%= classify(name) %>Service],

package/dist/lib/library/files/ts/src/__name__.service.__specFileSuffix__.ts

@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { <%= classify(name) %>Service } from './<%= name %>.service';
+import { <%= classify(name) %>Service } from './<%= name %>.service<%= isEsm ? '.js' : '' %>';
 
 describe('<%= classify(name) %>Service', () => {
   let service: <%= classify(name) %>Service;

package/dist/lib/library/files/ts/src/index.ts

@@ -1,2 +1,2 @@
-export * from './<%= name %>.module';
-export * from './<%= name %>.service';
+export * from './<%= name %>.module<%= isEsm ? '.js' : '' %>';
+export * from './<%= name %>.service<%= isEsm ? '.js' : '' %>';

package/dist/lib/library/library.factory.js

@@ -4,6 +4,7 @@ import { parse } from 'jsonc-parser';
 import { createModuleNameMapper, inPlaceSortByKeys, normalizeToKebabOrSnakeCase, } from '../../utils/index.js';
 import { DEFAULT_LANGUAGE, DEFAULT_LIB_PATH, DEFAULT_PATH_NAME, PROJECT_TYPE, } from '../defaults.js';
 import { FileSystemReader } from '../readers/index.js';
+import { isEsmProject } from '../../utils/source-root.helpers.js';
 export function main(options) {
     options = transform(options);
     return chain([
@@ -11,6 +12,10 @@ export function main(options) {
         updatePackageJson(options),
         updateJestEndToEnd(options),
         updateTsConfig(options.name, options.prefix, options.path),
+        (tree) => {
+            options.isEsm = isEsmProject(tree);
+            return tree;
+        },
         branchAndMerge(mergeWith(generate(options))),
     ]);
 }
@@ -198,12 +203,14 @@ function addLibraryToCliOptions(projectRoot, projectName) {
     };
 }
 function generate(options) {
-    const path = join(options.path, options.name);
-    return apply(url(join('./files', options.language)), [
-        template({
-            ...strings,
-            ...options,
-        }),
-        move(path),
-    ]);
+    return (context) => {
+        const path = join(options.path, options.name);
+        return apply(url(join('./files', options.language)), [
+            template({
+                ...strings,
+                ...options,
+            }),
+            move(path),
+        ])(context);
+    };
 }

package/dist/lib/middleware/files/ts/__name__.middleware.__specFileSuffix__.ts

@@ -1,4 +1,4 @@
-import { <%= classify(name) %>Middleware } from './<%= name %>.middleware';
+import { <%= classify(name) %>Middleware } from './<%= name %>.middleware<%= isEsm ? '.js' : '' %>';
 
 describe('<%= classify(name) %>Middleware', () => {
   it('should be defined', () => {

package/dist/lib/middleware/middleware.factory.js

@@ -2,10 +2,17 @@ import { join, strings } from '@angular-devkit/core';
 import { apply, chain, filter, mergeWith, move, noop, SchematicsException, template, url, } from '@angular-devkit/schematics';
 import { normalizeToKebabOrSnakeCase } from '../../utils/formatting.js';
 import { NameParser } from '../../utils/name.parser.js';
-import { mergeSourceRoot } from '../../utils/source-root.helpers.js';
+import { isEsmProject, mergeSourceRoot, } from '../../utils/source-root.helpers.js';
 export function main(options) {
     options = transform(options);
-    return chain([mergeSourceRoot(options), mergeWith(generate(options))]);
+    return chain([
+        mergeSourceRoot(options),
+        (tree) => {
+            options.isEsm = isEsmProject(tree);
+            return tree;
+        },
+        mergeWith(generate(options)),
+    ]);
 }
 function transform(options) {
     const target = Object.assign({}, options);

package/dist/lib/pipe/files/ts/__name__.pipe.__specFileSuffix__.ts

@@ -1,4 +1,4 @@
-import { <%= classify(name) %>Pipe } from './<%= name %>.pipe';
+import { <%= classify(name) %>Pipe } from './<%= name %>.pipe<%= isEsm ? '.js' : '' %>';
 
 describe('<%= classify(name) %>Pipe', () => {
   it('should be defined', () => {

package/dist/lib/pipe/pipe.factory.js

@@ -2,10 +2,17 @@ import { join, strings } from '@angular-devkit/core';
 import { apply, chain, filter, mergeWith, move, noop, SchematicsException, template, url, } from '@angular-devkit/schematics';
 import { normalizeToKebabOrSnakeCase } from '../../utils/formatting.js';
 import { NameParser } from '../../utils/name.parser.js';
-import { mergeSourceRoot } from '../../utils/source-root.helpers.js';
+import { isEsmProject, mergeSourceRoot, } from '../../utils/source-root.helpers.js';
 export function main(options) {
     options = transform(options);
-    return chain([mergeSourceRoot(options), mergeWith(generate(options))]);
+    return chain([
+        mergeSourceRoot(options),
+        (tree) => {
+            options.isEsm = isEsmProject(tree);
+            return tree;
+        },
+        mergeWith(generate(options)),
+    ]);
 }
 function transform(options) {
     const target = Object.assign({}, options);

package/dist/lib/provider/files/ts/__name__.__specFileSuffix__.ts

@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { <%= classify(className) %> } from './<%= name %>';
+import { <%= classify(className) %> } from './<%= name %><%= isEsm ? '.js' : '' %>';
 
 describe('<%= classify(className) %>', () => {
   let provider: <%= classify(className) %>;

package/dist/lib/provider/provider.factory.js

@@ -8,6 +8,7 @@ import { isEsmProject, mergeSourceRoot, } from '../../utils/source-root.helpers.
 export function main(options) {
     options = transform(options);
     return (tree, context) => {
+        options.isEsm = isEsmProject(tree);
         return branchAndMerge(chain([
             mergeSourceRoot(options),
             addDeclarationToModule(options),

package/dist/lib/resolver/files/ts/__name__.resolver.__specFileSuffix__.ts

@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { <%= classify(name) %>Resolver } from './<%= name %>.resolver';
+import { <%= classify(name) %>Resolver } from './<%= name %>.resolver<%= isEsm ? '.js' : '' %>';
 
 describe('<%= classify(name) %>Resolver', () => {
   let resolver: <%= classify(name) %>Resolver;

package/dist/lib/resolver/resolver.factory.js

@@ -8,6 +8,7 @@ import { isEsmProject, mergeSourceRoot, } from '../../utils/source-root.helpers.
 export function main(options) {
     options = transform(options);
     return (tree, context) => {
+        options.isEsm = isEsmProject(tree);
         return branchAndMerge(chain([
             mergeSourceRoot(options),
             addDeclarationToModule(options),

package/dist/lib/resource/files/ts/__name__.controller.__specFileSuffix__.ts

@@ -1,6 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { <%= classify(name) %>Controller } from './<%= name %>.controller';
-import { <%= classify(name) %>Service } from './<%= name %>.service';
+import { <%= classify(name) %>Controller } from './<%= name %>.controller<%= isEsm ? '.js' : '' %>';
+import { <%= classify(name) %>Service } from './<%= name %>.service<%= isEsm ? '.js' : '' %>';
 
 describe('<%= classify(name) %>Controller', () => {
   let controller: <%= classify(name) %>Controller;

package/dist/lib/resource/files/ts/__name__.gateway.__specFileSuffix__.ts

@@ -1,6 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { <%= classify(name) %>Gateway } from './<%= name %>.gateway';
-import { <%= classify(name) %>Service } from './<%= name %>.service';
+import { <%= classify(name) %>Gateway } from './<%= name %>.gateway<%= isEsm ? '.js' : '' %>';
+import { <%= classify(name) %>Service } from './<%= name %>.service<%= isEsm ? '.js' : '' %>';
 
 describe('<%= classify(name) %>Gateway', () => {
   let gateway: <%= classify(name) %>Gateway;

package/dist/lib/resource/files/ts/__name__.resolver.__specFileSuffix__.ts

@@ -1,6 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { <%= classify(name) %>Resolver } from './<%= name %>.resolver';
-import { <%= classify(name) %>Service } from './<%= name %>.service';
+import { <%= classify(name) %>Resolver } from './<%= name %>.resolver<%= isEsm ? '.js' : '' %>';
+import { <%= classify(name) %>Service } from './<%= name %>.service<%= isEsm ? '.js' : '' %>';
 
 describe('<%= classify(name) %>Resolver', () => {
   let resolver: <%= classify(name) %>Resolver;

package/dist/lib/resource/files/ts/__name__.service.__specFileSuffix__.ts

@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { <%= classify(name) %>Service } from './<%= name %>.service';
+import { <%= classify(name) %>Service } from './<%= name %>.service<%= isEsm ? '.js' : '' %>';
 
 describe('<%= classify(name) %>Service', () => {
   let service: <%= classify(name) %>Service;

package/dist/lib/resource/resource.factory.js

@@ -11,6 +11,7 @@ import { isEsmProject, mergeSourceRoot, } from '../../utils/source-root.helpers.
 export function main(options) {
     options = transform(options);
     return (tree, context) => {
+        options.isEsm = isEsmProject(tree);
         return branchAndMerge(chain([
             addMappedTypesDependencyIfApplies(options),
             mergeSourceRoot(options),

package/dist/lib/service/files/ts/__name__.service.__specFileSuffix__.ts

@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { <%= classify(name) %>Service } from './<%= name %>.service';
+import { <%= classify(name) %>Service } from './<%= name %>.service<%= isEsm ? '.js' : '' %>';
 
 describe('<%= classify(name) %>Service', () => {
   let service: <%= classify(name) %>Service;

package/dist/lib/service/service.factory.js

@@ -11,6 +11,7 @@ function isNullOrUndefined(value) {
 export function main(options) {
     options = transform(options);
     return (tree, context) => {
+        options.isEsm = isEsmProject(tree);
         return branchAndMerge(chain([
             mergeSourceRoot(options),
             addDeclarationToModule(options),

package/dist/lib/sub-app/files/ts/src/__name__.controller.__specFileSuffix__.ts

@@ -1,6 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { <%= classify(name) %>Controller } from './<%= name %>.controller';
-import { <%= classify(name) %>Service } from './<%= name %>.service';
+import { <%= classify(name) %>Controller } from './<%= name %>.controller<%= isEsm ? '.js' : '' %>';
+import { <%= classify(name) %>Service } from './<%= name %>.service<%= isEsm ? '.js' : '' %>';
 
 describe('<%= classify(name) %>Controller', () => {
   let <%= camelize(name) %>Controller: <%= classify(name) %>Controller;

package/dist/lib/sub-app/files/ts/src/__name__.controller.ts

@@ -1,5 +1,5 @@
 import { Controller, Get } from '@nestjs/common';
-import { <%= classify(name) %>Service } from './<%= name %>.service';
+import { <%= classify(name) %>Service } from './<%= name %>.service<%= isEsm ? '.js' : '' %>';
 
 @Controller()
 export class <%= classify(name) %>Controller {

package/dist/lib/sub-app/files/ts/src/__name__.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
-import { <%= classify(name) %>Controller } from './<%= name %>.controller';
-import { <%= classify(name) %>Service } from './<%= name %>.service';
+import { <%= classify(name) %>Controller } from './<%= name %>.controller<%= isEsm ? '.js' : '' %>';
+import { <%= classify(name) %>Service } from './<%= name %>.service<%= isEsm ? '.js' : '' %>';
 
 @Module({
   imports: [],

package/dist/lib/sub-app/files/ts/src/main.ts

@@ -1,5 +1,5 @@
 import { NestFactory } from '@nestjs/core';
-import { <%= classify(name) %>Module } from './<%= name %>.module';
+import { <%= classify(name) %>Module } from './<%= name %>.module<%= isEsm ? '.js' : '' %>';
 
 async function bootstrap() {
   const app = await NestFactory.create(<%= classify(name) %>Module);

package/dist/lib/sub-app/files/ts/test/app.e2e-__specFileSuffix__.ts

@@ -1,7 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { INestApplication } from '@nestjs/common';
 import * as request from 'supertest';
-import { <%= classify(name)%>Module } from './../src/<%= name %>.module';
+import { <%= classify(name)%>Module } from './../src/<%= name %>.module<%= isEsm ? '.js' : '' %>';
 
 describe('<%= classify(name)%>Controller (e2e)', () => {
   let app: INestApplication;

package/dist/lib/sub-app/files/ts/tsconfig.app.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
-    "declaration": false,
+    "declaration": true,
     "outDir": "../../dist/apps/<%= name %>"
   },
   "include": ["src/**/*"],

package/dist/lib/sub-app/sub-app.factory.js

@@ -4,6 +4,7 @@ import { existsSync, readFileSync } from 'fs';
 import { parse, stringify } from 'comment-json';
 import { inPlaceSortByKeys, normalizeToKebabOrSnakeCase, } from '../../utils/index.js';
 import { DEFAULT_APPS_PATH, DEFAULT_APP_NAME, DEFAULT_DIR_ENTRY_APP, DEFAULT_LANGUAGE, DEFAULT_LIB_PATH, DEFAULT_PATH_NAME, PROJECT_TYPE, TEST_ENV, } from '../defaults.js';
+import { isEsmProject } from '../../utils/source-root.helpers.js';
 export function main(options) {
     const appName = getAppNameFromPackageJson();
     options = transform(options);
@@ -18,6 +19,10 @@ export function main(options) {
             ])(tree, context),
         addAppsToCliOptions(options.path, options.name, appName),
         addTsConfigReference(options.path, options.name),
+        (tree) => {
+            options.isEsm = isEsmProject(tree);
+            return tree;
+        },
         branchAndMerge(mergeWith(generate(options))),
     ]);
 }
@@ -285,12 +290,14 @@ function generateWorkspace(options, appName) {
     ]);
 }
 function generate(options) {
-    const path = join(options.path, options.name);
-    return apply(url(join('./files', options.language)), [
-        template({
-            ...strings,
-            ...options,
-        }),
-        move(path),
-    ]);
+    return (context) => {
+        const path = join(options.path, options.name);
+        return apply(url(join('./files', options.language)), [
+            template({
+                ...strings,
+                ...options,
+            }),
+            move(path),
+        ])(context);
+    };
 }

package/dist/lib/sub-app/workspace/ts/tsconfig.app.json

@@ -2,7 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "composite": true,
-    "declaration": false,
+    "declaration": true,
     "outDir": "../../dist/apps/<%= name %>"
   },
   "include": ["src/**/*"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/schematics",
-  "version": "12.0.0-alpha.4",
+  "version": "12.0.0-alpha.5",
   "description": "Nest - modern, fast, powerful node.js web framework (@schematics)",
   "type": "module",
   "main": "dist/index.js",