@nx/plugin 16.2.0-beta.0 → 16.2.0-beta.2

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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/plugin",
3
- "version": "16.2.0-beta.0",
3
+ "version": "16.2.0-beta.2",
4
4
  "private": false,
5
5
  "description": "This plugin is used to create Nx plugins! It contains generators for generating common plugin features like generators, executors, migrations and more.",
6
6
  "repository": {
@@ -28,11 +28,11 @@
28
28
  "migrations": "./migrations.json"
29
29
  },
30
30
  "dependencies": {
31
- "@nrwl/nx-plugin": "16.2.0-beta.0",
32
- "@nx/devkit": "16.2.0-beta.0",
33
- "@nx/jest": "16.2.0-beta.0",
34
- "@nx/js": "16.2.0-beta.0",
35
- "@nx/linter": "16.2.0-beta.0",
31
+ "@nrwl/nx-plugin": "16.2.0-beta.2",
32
+ "@nx/devkit": "16.2.0-beta.2",
33
+ "@nx/jest": "16.2.0-beta.2",
34
+ "@nx/js": "16.2.0-beta.2",
35
+ "@nx/linter": "16.2.0-beta.2",
36
36
  "@phenomnomnominal/tsquery": "~5.0.1",
37
37
  "dotenv": "~10.0.0",
38
38
  "fs-extra": "^11.1.0",
@@ -41,5 +41,5 @@
41
41
  "publishConfig": {
42
42
  "access": "public"
43
43
  },
44
- "gitHead": "f7ba85e8ec9c074eaee81731a20aee7ea6dbc8aa"
44
+ "gitHead": "ed0136b1219aa66d327d1d9c4905786d0c1d920f"
45
45
  }
@@ -1,19 +1,19 @@
1
1
  import { createTreeWithEmptyWorkspace } from '@nx/devkit/testing';
2
2
  import { Tree, readProjectConfiguration } from '@nx/devkit';
3
3
 
4
- import generator from './generator';
5
- import { <%= className %>GeneratorSchema } from './schema';
4
+ import { <%= generatorFnName %> } from './generator';
5
+ import { <%= schemaInterfaceName %> } from './schema';
6
6
 
7
7
  describe('<%= name %> generator', () => {
8
8
  let tree: Tree;
9
- const options: <%= className %>GeneratorSchema = { name: 'test' };
9
+ const options: <%= schemaInterfaceName %> = { name: 'test' };
10
10
 
11
11
  beforeEach(() => {
12
12
  tree = createTreeWithEmptyWorkspace();
13
13
  });
14
14
 
15
15
  it('should run successfully', async () => {
16
- await generator(tree, options);
16
+ await <%= generatorFnName %>(tree, options);
17
17
  const config = readProjectConfiguration(tree, 'test');
18
18
  expect(config).toBeDefined();
19
19
  });
@@ -7,7 +7,7 @@ import {
7
7
  import * as path from 'path';
8
8
  import { <%= className %>GeneratorSchema } from './schema';
9
9
 
10
- export default async function (tree: Tree, options: <%= className %>GeneratorSchema) {
10
+ export async function <%= generatorFnName %> (tree: Tree, options: <%= schemaInterfaceName %>) {
11
11
  const projectRoot = `libs/${options.name}`;
12
12
  addProjectConfiguration(
13
13
  tree,
@@ -22,3 +22,5 @@ export default async function (tree: Tree, options: <%= className %>GeneratorSch
22
22
  generateFiles(tree, path.join(__dirname, 'files'), projectRoot, options);
23
23
  await formatFiles(tree);
24
24
  }
25
+
26
+ export default <%= generatorFnName %>;
@@ -8,7 +8,6 @@ const has_generator_1 = require("../../utils/has-generator");
8
8
  const generator_1 = require("../lint-checks/generator");
9
9
  function normalizeOptions(host, options) {
10
10
  const { npmScope } = (0, devkit_1.getWorkspaceLayout)(host);
11
- const { fileName, className } = (0, devkit_1.names)(options.name);
12
11
  const { root: projectRoot, sourceRoot: projectSourceRoot } = (0, devkit_1.readProjectConfiguration)(host, options.project);
13
12
  const npmPackageName = (0, devkit_1.readJson)(host, path.join(projectRoot, 'package.json')).name;
14
13
  let description;
@@ -18,9 +17,7 @@ function normalizeOptions(host, options) {
18
17
  else {
19
18
  description = `${options.name} generator`;
20
19
  }
21
- return Object.assign(Object.assign({}, options), { fileName,
22
- className,
23
- description,
20
+ return Object.assign(Object.assign(Object.assign({}, options), (0, devkit_1.names)(options.name)), { description,
24
21
  projectRoot,
25
22
  projectSourceRoot,
26
23
  npmScope,
@@ -31,7 +28,7 @@ function addFiles(host, options) {
31
28
  if (!host.exists(indexPath)) {
32
29
  host.write(indexPath, 'const variable = "<%= name %>";');
33
30
  }
34
- (0, devkit_1.generateFiles)(host, path.join(__dirname, './files/generator'), `${options.projectSourceRoot}/generators`, options);
31
+ (0, devkit_1.generateFiles)(host, path.join(__dirname, './files/generator'), `${options.projectSourceRoot}/generators`, Object.assign(Object.assign({}, options), { generatorFnName: `${options.propertyName}Generator`, schemaInterfaceName: `${options.className}GeneratorSchema` }));
35
32
  if (options.unitTestRunner === 'none') {
36
33
  host.delete(path.join(options.projectSourceRoot, 'generators', options.fileName, `generator.spec.ts`));
37
34
  }
@@ -1 +1 @@
1
- {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/generator/generator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/plugin/src/generators/generator/generator.ts"],"names":[],"mappings":"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"}