@nx/nest 16.0.0-rc.0 → 16.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +7 -7
- package/src/generators/library/lib/add-exports-to-barrel.js +4 -1
- package/src/generators/library/lib/add-exports-to-barrel.js.map +1 -1
- package/src/generators/library/lib/create-files.js +1 -1
- package/src/generators/library/lib/create-files.js.map +1 -1
- package/src/generators/library/lib/normalize-options.d.ts +1 -1
- package/src/generators/library/lib/normalize-options.js +6 -7
- package/src/generators/library/lib/normalize-options.js.map +1 -1
- package/src/generators/library/schema.d.ts +1 -0
- package/src/generators/library/schema.json +5 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nx/nest",
|
|
3
|
-
"version": "16.0.0
|
|
3
|
+
"version": "16.0.0",
|
|
4
4
|
"private": false,
|
|
5
5
|
"description": "The Nx Plugin for Nest contains executors and generators for allowing your workspace to create powerful Nest best in class APIs.",
|
|
6
6
|
"repository": {
|
|
@@ -31,16 +31,16 @@
|
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
33
|
"@nestjs/schematics": "^9.0.0",
|
|
34
|
-
"@nrwl/nest": "16.0.0
|
|
35
|
-
"@nx/devkit": "16.0.0
|
|
36
|
-
"@nx/js": "16.0.0
|
|
37
|
-
"@nx/linter": "16.0.0
|
|
38
|
-
"@nx/node": "16.0.0
|
|
34
|
+
"@nrwl/nest": "16.0.0",
|
|
35
|
+
"@nx/devkit": "16.0.0",
|
|
36
|
+
"@nx/js": "16.0.0",
|
|
37
|
+
"@nx/linter": "16.0.0",
|
|
38
|
+
"@nx/node": "16.0.0",
|
|
39
39
|
"enquirer": "~2.3.6"
|
|
40
40
|
},
|
|
41
41
|
"publishConfig": {
|
|
42
42
|
"access": "public"
|
|
43
43
|
},
|
|
44
44
|
"types": "./index.d.ts",
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "f537a4caebbf6f65f5f5733fb9ad9c9167d4b504"
|
|
46
46
|
}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addExportsToBarrelFile = void 0;
|
|
4
4
|
const js_1 = require("@nx/js");
|
|
5
5
|
const ensure_typescript_1 = require("@nx/js/src/utils/typescript/ensure-typescript");
|
|
6
|
+
const ts = require("typescript");
|
|
6
7
|
let tsModule;
|
|
7
8
|
function addExportsToBarrelFile(tree, options) {
|
|
8
9
|
if (!tsModule) {
|
|
@@ -11,7 +12,9 @@ function addExportsToBarrelFile(tree, options) {
|
|
|
11
12
|
const indexPath = `${options.projectRoot}/src/index.ts`;
|
|
12
13
|
const indexContent = tree.read(indexPath, 'utf-8');
|
|
13
14
|
let sourceFile = tsModule.createSourceFile(indexPath, indexContent, tsModule.ScriptTarget.Latest, true);
|
|
14
|
-
|
|
15
|
+
// find the export in the source file
|
|
16
|
+
const exportStatement = sourceFile.statements.find((statement) => ts.isExportDeclaration(statement));
|
|
17
|
+
sourceFile = (0, js_1.removeChange)(tree, sourceFile, indexPath, 0, exportStatement.getFullText());
|
|
15
18
|
sourceFile = (0, js_1.addGlobal)(tree, sourceFile, indexPath, `export * from './lib/${options.fileName}.module';`);
|
|
16
19
|
if (options.service) {
|
|
17
20
|
sourceFile = (0, js_1.addGlobal)(tree, sourceFile, indexPath, `export * from './lib/${options.fileName}.service';`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-exports-to-barrel.js","sourceRoot":"","sources":["../../../../../../../packages/nest/src/generators/library/lib/add-exports-to-barrel.ts"],"names":[],"mappings":";;;AACA,+BAAiD;
|
|
1
|
+
{"version":3,"file":"add-exports-to-barrel.js","sourceRoot":"","sources":["../../../../../../../packages/nest/src/generators/library/lib/add-exports-to-barrel.ts"],"names":[],"mappings":";;;AACA,+BAAiD;AACjD,qFAAiF;AACjF,iCAAiC;AAGjC,IAAI,QAAqC,CAAC;AAE1C,SAAgB,sBAAsB,CACpC,IAAU,EACV,OAA0B;IAE1B,IAAI,CAAC,QAAQ,EAAE;QACb,QAAQ,GAAG,IAAA,oCAAgB,GAAE,CAAC;KAC/B;IACD,MAAM,SAAS,GAAG,GAAG,OAAO,CAAC,WAAW,eAAe,CAAC;IACxD,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IACnD,IAAI,UAAU,GAAG,QAAQ,CAAC,gBAAgB,CACxC,SAAS,EACT,YAAY,EACZ,QAAQ,CAAC,YAAY,CAAC,MAAM,EAC5B,IAAI,CACL,CAAC;IAEF,qCAAqC;IACrC,MAAM,eAAe,GAAG,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAC/D,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAClC,CAAC;IAEF,UAAU,GAAG,IAAA,iBAAY,EACvB,IAAI,EACJ,UAAU,EACV,SAAS,EACT,CAAC,EACD,eAAe,CAAC,WAAW,EAAE,CAC9B,CAAC;IACF,UAAU,GAAG,IAAA,cAAS,EACpB,IAAI,EACJ,UAAU,EACV,SAAS,EACT,wBAAwB,OAAO,CAAC,QAAQ,WAAW,CACpD,CAAC;IAEF,IAAI,OAAO,CAAC,OAAO,EAAE;QACnB,UAAU,GAAG,IAAA,cAAS,EACpB,IAAI,EACJ,UAAU,EACV,SAAS,EACT,wBAAwB,OAAO,CAAC,QAAQ,YAAY,CACrD,CAAC;KACH;IACD,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,UAAU,GAAG,IAAA,cAAS,EACpB,IAAI,EACJ,UAAU,EACV,SAAS,EACT,wBAAwB,OAAO,CAAC,QAAQ,eAAe,CACxD,CAAC;KACH;AACH,CAAC;AAnDD,wDAmDC"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.createFiles = void 0;
|
|
4
4
|
const devkit_1 = require("@nx/devkit");
|
|
5
5
|
function createFiles(tree, options) {
|
|
6
|
-
const substitutions = Object.assign(Object.assign(Object.assign({}, options), (0, devkit_1.names)(options.projectName)), { tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot) });
|
|
6
|
+
const substitutions = Object.assign(Object.assign(Object.assign({}, options), (0, devkit_1.names)(options.projectName)), { tmpl: '', offsetFromRoot: (0, devkit_1.offsetFromRoot)(options.projectRoot), fileName: options.fileName });
|
|
7
7
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'common'), options.projectRoot, substitutions);
|
|
8
8
|
if (options.controller) {
|
|
9
9
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', 'files', 'controller'), options.projectRoot, substitutions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-files.js","sourceRoot":"","sources":["../../../../../../../packages/nest/src/generators/library/lib/create-files.ts"],"names":[],"mappings":";;;AACA,uCAKoB;AAGpB,SAAgB,WAAW,CAAC,IAAU,EAAE,OAA0B;IAChE,MAAM,aAAa,iDACd,OAAO,GACP,IAAA,cAAK,EAAC,OAAO,CAAC,WAAW,CAAC,KAC7B,IAAI,EAAE,EAAE,EACR,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,
|
|
1
|
+
{"version":3,"file":"create-files.js","sourceRoot":"","sources":["../../../../../../../packages/nest/src/generators/library/lib/create-files.ts"],"names":[],"mappings":";;;AACA,uCAKoB;AAGpB,SAAgB,WAAW,CAAC,IAAU,EAAE,OAA0B;IAChE,MAAM,aAAa,iDACd,OAAO,GACP,IAAA,cAAK,EAAC,OAAO,CAAC,WAAW,CAAC,KAC7B,IAAI,EAAE,EAAE,EACR,cAAc,EAAE,IAAA,uBAAc,EAAC,OAAO,CAAC,WAAW,CAAC,EACnD,QAAQ,EAAE,OAAO,CAAC,QAAQ,GAC3B,CAAC;IACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,EACrD,OAAO,CAAC,WAAW,EACnB,aAAa,CACd,CAAC;IAEF,IAAI,OAAO,CAAC,UAAU,EAAE;QACtB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,CAAC,EACzD,OAAO,CAAC,WAAW,EACnB,aAAa,CACd,CAAC;QAEF,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;YACrC,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EACf,OAAO,CAAC,WAAW,EACnB,KAAK,EACL,KAAK,EACL,GAAG,aAAa,CAAC,QAAQ,qBAAqB,CAC/C,CACF,CAAC;SACH;KACF;IAED,IAAI,OAAO,CAAC,OAAO,EAAE;QACnB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,CAAC,EACtD,OAAO,CAAC,WAAW,EACnB,aAAa,CACd,CAAC;QAEF,IAAI,OAAO,CAAC,cAAc,KAAK,MAAM,EAAE;YACrC,IAAI,CAAC,MAAM,CACT,IAAA,0BAAiB,EACf,OAAO,CAAC,WAAW,EACnB,KAAK,EACL,KAAK,EACL,GAAG,aAAa,CAAC,QAAQ,kBAAkB,CAC5C,CACF,CAAC;SACH;KACF;AACH,CAAC;AAtDD,kCAsDC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { Tree } from '@nx/devkit';
|
|
2
1
|
import type { LibraryGeneratorSchema as JsLibraryGeneratorSchema } from '@nx/js/src/utils/schema';
|
|
2
|
+
import { Tree } from '@nx/devkit';
|
|
3
3
|
import type { LibraryGeneratorOptions, NormalizedOptions } from '../schema';
|
|
4
4
|
export declare function normalizeOptions(tree: Tree, options: LibraryGeneratorOptions): NormalizedOptions;
|
|
5
5
|
export declare function toJsLibraryGeneratorOptions(options: LibraryGeneratorOptions): JsLibraryGeneratorSchema;
|
|
@@ -1,21 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.toJsLibraryGeneratorOptions = exports.normalizeOptions = void 0;
|
|
4
|
-
const devkit_1 = require("@nx/devkit");
|
|
5
|
-
const devkit_2 = require("@nx/devkit");
|
|
6
4
|
const linter_1 = require("@nx/linter");
|
|
5
|
+
const devkit_1 = require("@nx/devkit");
|
|
7
6
|
function normalizeOptions(tree, options) {
|
|
8
7
|
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
9
8
|
const { layoutDirectory, projectDirectory } = (0, devkit_1.extractLayoutDirectory)(options.directory);
|
|
10
|
-
const { libsDir: defaultLibsDir, npmScope } = (0,
|
|
9
|
+
const { libsDir: defaultLibsDir, npmScope } = (0, devkit_1.getWorkspaceLayout)(tree);
|
|
11
10
|
const libsDir = layoutDirectory !== null && layoutDirectory !== void 0 ? layoutDirectory : defaultLibsDir;
|
|
12
|
-
const name = (0,
|
|
11
|
+
const name = (0, devkit_1.names)(options.name).fileName;
|
|
13
12
|
const fullProjectDirectory = projectDirectory
|
|
14
|
-
? `${(0,
|
|
13
|
+
? `${(0, devkit_1.names)(projectDirectory).fileName}/${name}`
|
|
15
14
|
: name;
|
|
16
15
|
const projectName = fullProjectDirectory.replace(new RegExp('/', 'g'), '-');
|
|
17
|
-
const fileName = projectName;
|
|
18
|
-
const projectRoot = (0,
|
|
16
|
+
const fileName = options.simpleName ? name : projectName;
|
|
17
|
+
const projectRoot = (0, devkit_1.joinPathFragments)(libsDir, fullProjectDirectory);
|
|
19
18
|
const parsedTags = options.tags
|
|
20
19
|
? options.tags.split(',').map((s) => s.trim())
|
|
21
20
|
: [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nest/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"normalize-options.js","sourceRoot":"","sources":["../../../../../../../packages/nest/src/generators/library/lib/normalize-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -128,6 +128,11 @@
|
|
|
128
128
|
"type": "boolean",
|
|
129
129
|
"default": false,
|
|
130
130
|
"x-priority": "internal"
|
|
131
|
+
},
|
|
132
|
+
"simpleName": {
|
|
133
|
+
"description": "Don't include the directory in the name of the module of the library.",
|
|
134
|
+
"type": "boolean",
|
|
135
|
+
"default": false
|
|
131
136
|
}
|
|
132
137
|
},
|
|
133
138
|
"additionalProperties": false,
|