@rxap/plugin-library 16.1.0-dev.0 → 16.1.0-dev.10
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/CHANGELOG.md +66 -0
- package/README.md +29 -1
- package/executors.json +5 -0
- package/generators.json +10 -0
- package/package.json +21 -24
- package/src/executors/check-version/executor.js +14 -2
- package/src/executors/check-version/executor.js.map +1 -1
- package/src/executors/node-modules-linking/executor.d.ts +5 -0
- package/src/executors/node-modules-linking/executor.js +57 -0
- package/src/executors/node-modules-linking/executor.js.map +1 -0
- package/src/executors/node-modules-linking/schema.d.ts +1 -0
- package/src/executors/node-modules-linking/schema.json +9 -0
- package/src/executors/readme/executor.js.map +1 -1
- package/src/executors/run-generator/executor.js +19 -4
- package/src/executors/run-generator/executor.js.map +1 -1
- package/src/generators/bundle-json-schema/generator.js +98 -22
- package/src/generators/bundle-json-schema/generator.js.map +1 -1
- package/src/generators/expose-as-schematic/generator.js +2 -3
- package/src/generators/expose-as-schematic/generator.js.map +1 -1
- package/src/generators/fix-dependencies/generator.d.ts +3 -2
- package/src/generators/fix-dependencies/generator.js +31 -22
- package/src/generators/fix-dependencies/generator.js.map +1 -1
- package/src/generators/index-export/generator.js +16 -7
- package/src/generators/index-export/generator.js.map +1 -1
- package/src/generators/index-json-schema/generator.d.ts +10 -0
- package/src/generators/index-json-schema/generator.js +124 -0
- package/src/generators/index-json-schema/generator.js.map +1 -0
- package/src/generators/index-json-schema/index.d.ts +2 -0
- package/src/generators/index-json-schema/index.js +8 -0
- package/src/generators/index-json-schema/index.js.map +1 -0
- package/src/generators/index-json-schema/schema.d.ts +3 -0
- package/src/generators/index-json-schema/schema.json +13 -0
- package/src/generators/init/generator.d.ts +1 -0
- package/src/generators/init/generator.js +14 -66
- package/src/generators/init/generator.js.map +1 -1
- package/src/generators/init/init-project.d.ts +3 -0
- package/src/generators/init/init-project.js +28 -0
- package/src/generators/init/init-project.js.map +1 -0
- package/src/generators/init/init-workspace.d.ts +3 -0
- package/src/generators/init/init-workspace.js +16 -0
- package/src/generators/init/init-workspace.js.map +1 -0
- package/src/generators/init/schema.d.ts +2 -0
- package/src/generators/init/schema.json +8 -1
- package/src/generators/init/update-default-project-targets.d.ts +2 -0
- package/src/generators/init/update-default-project-targets.js +29 -0
- package/src/generators/init/update-default-project-targets.js.map +1 -0
- package/src/generators/init/update-project-tags.d.ts +2 -0
- package/src/generators/init/update-project-tags.js +22 -0
- package/src/generators/init/update-project-tags.js.map +1 -0
- package/src/generators/init/update-project-targets.d.ts +3 -0
- package/src/generators/init/update-project-targets.js +14 -0
- package/src/generators/init/update-project-targets.js.map +1 -0
- package/src/generators/init-buildable/generator.js +6 -19
- package/src/generators/init-buildable/generator.js.map +1 -1
- package/src/generators/init-buildable/init-project.d.ts +3 -0
- package/src/generators/init-buildable/init-project.js +10 -0
- package/src/generators/init-buildable/init-project.js.map +1 -0
- package/src/generators/init-buildable/init-workspace.d.ts +3 -0
- package/src/generators/init-buildable/init-workspace.js +10 -0
- package/src/generators/init-buildable/init-workspace.js.map +1 -0
- package/src/generators/init-buildable/update-general-target-defaults.d.ts +2 -0
- package/src/generators/init-buildable/update-general-target-defaults.js +15 -0
- package/src/generators/init-buildable/update-general-target-defaults.js.map +1 -0
- package/src/generators/init-buildable/update-project-targets.d.ts +2 -0
- package/src/generators/init-buildable/update-project-targets.js +14 -0
- package/src/generators/init-buildable/update-project-targets.js.map +1 -0
- package/src/generators/init-plugin/generator.js +6 -41
- package/src/generators/init-plugin/generator.js.map +1 -1
- package/src/generators/init-plugin/init-project.d.ts +3 -0
- package/src/generators/init-plugin/init-project.js +15 -0
- package/src/generators/init-plugin/init-project.js.map +1 -0
- package/src/generators/init-plugin/init-workspace.d.ts +3 -0
- package/src/generators/init-plugin/init-workspace.js +10 -0
- package/src/generators/init-plugin/init-workspace.js.map +1 -0
- package/src/generators/init-plugin/update-general-target-defaults.d.ts +2 -0
- package/src/generators/init-plugin/update-general-target-defaults.js +16 -0
- package/src/generators/init-plugin/update-general-target-defaults.js.map +1 -0
- package/src/generators/init-plugin/update-package-json.d.ts +2 -0
- package/src/generators/init-plugin/update-package-json.js +18 -0
- package/src/generators/init-plugin/update-package-json.js.map +1 -0
- package/src/generators/init-plugin/update-project-targets.d.ts +2 -0
- package/src/generators/init-plugin/update-project-targets.js +22 -0
- package/src/generators/init-plugin/update-project-targets.js.map +1 -0
- package/src/generators/init-publishable/generator.js +6 -100
- package/src/generators/init-publishable/generator.js.map +1 -1
- package/src/generators/init-publishable/init-project.d.ts +3 -0
- package/src/generators/init-publishable/init-project.js +32 -0
- package/src/generators/init-publishable/init-project.js.map +1 -0
- package/src/generators/init-publishable/init-workspace.d.ts +3 -0
- package/src/generators/init-publishable/init-workspace.js +10 -0
- package/src/generators/init-publishable/init-workspace.js.map +1 -0
- package/src/generators/init-publishable/update-general-target-defaults.d.ts +2 -0
- package/src/generators/init-publishable/update-general-target-defaults.js +31 -0
- package/src/generators/init-publishable/update-general-target-defaults.js.map +1 -0
- package/src/generators/init-publishable/update-project-package-json.d.ts +3 -0
- package/src/generators/init-publishable/update-project-package-json.js +57 -0
- package/src/generators/init-publishable/update-project-package-json.js.map +1 -0
- package/src/generators/init-publishable/update-project-targets.d.ts +2 -0
- package/src/generators/init-publishable/update-project-targets.js +24 -0
- package/src/generators/init-publishable/update-project-targets.js.map +1 -0
- package/src/index.d.ts +2 -0
- package/src/index.js +5 -1
- package/src/index.js.map +1 -1
|
@@ -6,10 +6,62 @@ const json_schema_ref_parser_1 = tslib_1.__importDefault(require("@apidevtools/j
|
|
|
6
6
|
const utilities_1 = require("@rxap/utilities");
|
|
7
7
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
8
8
|
const path_1 = require("path");
|
|
9
|
+
const generator_1 = require("../index-json-schema/generator");
|
|
10
|
+
/**
|
|
11
|
+
* Remove the definitions and $id and $schema properties from the schema and normalize the $ref properties to only have
|
|
12
|
+
* the prefix '#/definitions/' before the definition name
|
|
13
|
+
* @param tree
|
|
14
|
+
* @param projectSourceRoot
|
|
15
|
+
* @param $ref
|
|
16
|
+
*/
|
|
17
|
+
function loadCleanDefinition(tree, projectSourceRoot, { $ref }) {
|
|
18
|
+
const filePath = (0, path_1.join)(projectSourceRoot, $ref);
|
|
19
|
+
if (!tree.exists(filePath)) {
|
|
20
|
+
throw new Error(`The file '${filePath}' does not exist!`);
|
|
21
|
+
}
|
|
22
|
+
const schema = JSON.parse(tree.read(filePath).toString());
|
|
23
|
+
return cleanupDefinition(schema);
|
|
24
|
+
}
|
|
25
|
+
function cleanupDefinition(schema) {
|
|
26
|
+
if (schema['definitions']) {
|
|
27
|
+
schema['definitions'] = Object.entries(schema['definitions']).reduce((acc, [key, value]) => {
|
|
28
|
+
if (!value['$ref']) {
|
|
29
|
+
acc[key] = cleanupDefinition(value);
|
|
30
|
+
}
|
|
31
|
+
return acc;
|
|
32
|
+
}, {});
|
|
33
|
+
if (Object.keys(schema['definitions']).length === 0) {
|
|
34
|
+
delete schema['definitions'];
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
if (schema['$schema']) {
|
|
38
|
+
delete schema['$schema'];
|
|
39
|
+
}
|
|
40
|
+
if (schema['$id']) {
|
|
41
|
+
delete schema['$id'];
|
|
42
|
+
}
|
|
43
|
+
for (const { key, value, propertyPath, parent } of (0, utilities_1.EachProperty)(schema)) {
|
|
44
|
+
if (key === '$ref') {
|
|
45
|
+
if (typeof value === 'string') {
|
|
46
|
+
(parent !== null && parent !== void 0 ? parent : schema)[key] = value.replace(/^#\/definitions\//, '#/definitions/');
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
return schema;
|
|
51
|
+
}
|
|
52
|
+
function getCleanDefinitionMap(tree, projectSourceRoot, definitions) {
|
|
53
|
+
const resolvedDefinitions = {};
|
|
54
|
+
for (const [key, definition] of Object.entries(definitions)) {
|
|
55
|
+
resolvedDefinitions[key] = loadCleanDefinition(tree, projectSourceRoot, definition);
|
|
56
|
+
}
|
|
57
|
+
return resolvedDefinitions;
|
|
58
|
+
}
|
|
9
59
|
function bundleJsonSchemaGenerator(tree, options) {
|
|
60
|
+
var _a;
|
|
10
61
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
11
62
|
const projectSourceRoot = (0, workspace_utilities_1.GetProjectSourceRoot)(tree, options.project);
|
|
12
63
|
const workspaceRoot = tree.root;
|
|
64
|
+
const definitions = getCleanDefinitionMap(tree, projectSourceRoot, (0, generator_1.GenerateDefinitionsMap)(tree, options));
|
|
13
65
|
for (const file of (0, workspace_utilities_1.SearchFile)(tree, projectSourceRoot)) {
|
|
14
66
|
if (file.path.endsWith('template.schema.json')) {
|
|
15
67
|
const relativePathFromProjectSourceRoot = (0, path_1.dirname)((0, path_1.relative)(projectSourceRoot, file.path));
|
|
@@ -35,10 +87,16 @@ function bundleJsonSchemaGenerator(tree, options) {
|
|
|
35
87
|
}
|
|
36
88
|
}
|
|
37
89
|
});
|
|
38
|
-
removeProperty(bundledSchema, 'definitions');
|
|
39
|
-
removeProperty(bundledSchema, '$id');
|
|
40
|
-
removeProperty(bundledSchema, '$schema');
|
|
90
|
+
// removeProperty(bundledSchema, 'definitions');
|
|
91
|
+
// removeProperty(bundledSchema, '$id');
|
|
92
|
+
// removeProperty(bundledSchema, '$schema');
|
|
93
|
+
bundledSchema['definitions'] = Object.assign(Object.assign({}, bundledSchema['definitions']), definitions);
|
|
41
94
|
fixNestaedDefinitions(bundledSchema);
|
|
95
|
+
for (const [, definition] of Object.entries(bundledSchema['definitions'])) {
|
|
96
|
+
cleanupDefinition(definition);
|
|
97
|
+
}
|
|
98
|
+
(_a = bundledSchema['definitions']) !== null && _a !== void 0 ? _a : (bundledSchema['definitions'] = {});
|
|
99
|
+
bundledSchema['definitions'] = Object.entries(bundledSchema['definitions']).sort(([a], [b]) => a.localeCompare(b)).reduce((acc, [key, value]) => (Object.assign(Object.assign({}, acc), { [key]: value })), {});
|
|
42
100
|
tree.write(file.path.replace('template.schema.json', 'schema.json'), JSON.stringify(bundledSchema, null, 2));
|
|
43
101
|
}
|
|
44
102
|
}
|
|
@@ -59,29 +117,47 @@ function removeProperty(obj, propertyName) {
|
|
|
59
117
|
(0, utilities_1.RemoveFromObject)(obj, propertyPath);
|
|
60
118
|
}
|
|
61
119
|
}
|
|
62
|
-
function
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
const nestedDefinitions = [];
|
|
69
|
-
for (const { key, value } of (0, utilities_1.EachProperty)(definition)) {
|
|
70
|
-
if (key === '$ref') {
|
|
71
|
-
nestedDefinitions.push(value);
|
|
120
|
+
function getUsedDefinitions(item) {
|
|
121
|
+
const usedDefinitions = [];
|
|
122
|
+
for (const { key, value, parent } of (0, utilities_1.EachProperty)(item)) {
|
|
123
|
+
if (key === '$ref') {
|
|
124
|
+
if (typeof value !== 'string') {
|
|
125
|
+
throw new Error(`The value of the key '$ref' in definition '${key}' is not a string!`);
|
|
72
126
|
}
|
|
127
|
+
usedDefinitions.push(value.replace(/^#\/definitions\//, ''));
|
|
73
128
|
}
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
129
|
+
}
|
|
130
|
+
return usedDefinitions;
|
|
131
|
+
}
|
|
132
|
+
function fixNestaedDefinitions(schema) {
|
|
133
|
+
var _a;
|
|
134
|
+
const usedDefinitions = [];
|
|
135
|
+
// create a list of used refs excluding the definitions
|
|
136
|
+
for (const [key, item] of Object.entries(schema !== null && schema !== void 0 ? schema : {})) {
|
|
137
|
+
if (key === 'definitions') {
|
|
138
|
+
continue;
|
|
139
|
+
}
|
|
140
|
+
if (typeof item !== 'object') {
|
|
141
|
+
continue;
|
|
142
|
+
}
|
|
143
|
+
(0, utilities_1.CoerceArrayItems)(usedDefinitions, getUsedDefinitions(item));
|
|
144
|
+
}
|
|
145
|
+
let removeList = Object.keys(schema.definitions).filter((key) => !usedDefinitions.includes(key));
|
|
146
|
+
let removeListLength = 0;
|
|
147
|
+
do {
|
|
148
|
+
removeListLength = removeList.length;
|
|
149
|
+
// check for each definition that will not be removed if it is using another definition that should be removed
|
|
150
|
+
// if yes remove this from the list of definitions to remove
|
|
151
|
+
for (const [key, item] of Object.entries((_a = schema.definitions) !== null && _a !== void 0 ? _a : {})) {
|
|
152
|
+
if (removeList.includes(key)) {
|
|
153
|
+
continue;
|
|
82
154
|
}
|
|
155
|
+
(0, utilities_1.CoerceArrayItems)(usedDefinitions, getUsedDefinitions(item));
|
|
83
156
|
}
|
|
84
|
-
|
|
157
|
+
removeList = removeList.filter((key) => !usedDefinitions.includes(key));
|
|
158
|
+
} while (removeListLength !== removeList.length);
|
|
159
|
+
for (const key of removeList) {
|
|
160
|
+
delete schema.definitions[key];
|
|
85
161
|
}
|
|
86
162
|
}
|
|
87
163
|
exports.default = bundleJsonSchemaGenerator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/bundle-json-schema/generator.ts"],"names":[],"mappings":";;;;AAAA,yGAA6D;AAE7D,+
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/bundle-json-schema/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,11 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.exposeAsSchematicGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
|
-
const plugin_utilities_1 = require("@rxap/plugin-utilities");
|
|
7
6
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
8
7
|
const path_1 = require("path");
|
|
9
8
|
function skipProject(tree, options, project, projectName) {
|
|
10
|
-
if ((0,
|
|
9
|
+
if ((0, workspace_utilities_1.SkipNonGeneratorsProject)(tree, options, project, projectName)) {
|
|
11
10
|
return true;
|
|
12
11
|
}
|
|
13
12
|
return false;
|
|
@@ -20,7 +19,7 @@ function exposeAsSchematicGenerator(tree, options) {
|
|
|
20
19
|
continue;
|
|
21
20
|
}
|
|
22
21
|
console.log(`expose as schematic for project: ${projectName}`);
|
|
23
|
-
(0,
|
|
22
|
+
(0, workspace_utilities_1.UpdateGenerators)(tree, project, (generators) => {
|
|
24
23
|
var _a;
|
|
25
24
|
(_a = generators.schematics) !== null && _a !== void 0 ? _a : (generators.schematics = {});
|
|
26
25
|
for (const [name, generator] of Object.entries(generators.generators)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/expose-as-schematic/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAIoB;AACpB,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/expose-as-schematic/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAIoB;AACpB,mEAImC;AACnC,+BAGc;AAGd,SAAS,WAAW,CAClB,IAAU,EACV,OAAyC,EACzC,OAA6B,EAC7B,WAAmB;IAGnB,IAAI,IAAA,8CAAwB,EAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;QACjE,OAAO,IAAI,CAAC;KACb;IAED,OAAO,KAAK,CAAC;AAEf,CAAC;AAED,SAAsB,0BAA0B,CAC9C,IAAU,EACV,OAAyC;;QAEzC,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;QAEvD,KAAK,MAAM,CAAE,WAAW,EAAE,OAAO,CAAE,IAAI,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE;YAElE,IAAI,WAAW,CAAC,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE;gBACpD,SAAS;aACV;YAED,OAAO,CAAC,GAAG,CAAC,oCAAqC,WAAY,EAAE,CAAC,CAAC;YAEjE,IAAA,sCAAgB,EAAC,IAAI,EAAE,OAAO,EAAE,CAAC,UAAU,EAAE,EAAE;;gBAE7C,MAAA,UAAU,CAAC,UAAU,oCAArB,UAAU,CAAC,UAAU,GAAK,EAAE,EAAC;gBAE7B,KAAK,MAAM,CAAE,IAAI,EAAE,SAAS,CAAE,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;oBACvE,IAAI,CAAC,KAAK,CACR,IAAA,WAAI,EAAC,OAAO,CAAC,IAAI,EAAE,IAAA,cAAO,EAAC,SAAS,CAAC,MAAM,CAAC,EAAE,UAAU,CAAC,EACzD,yKAAyK,CAC1K,CAAC;oBACF,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG;wBAC5B,OAAO,EAAE,GAAI,IAAA,cAAO,EAAC,SAAS,CAAC,MAAM,CAAE,QAAQ;wBAC/C,MAAM,EAAE,SAAS,CAAC,MAAM;wBACxB,WAAW,EAAE,SAAS,CAAC,WAAW;qBACnC,CAAC;iBACH;gBAED,OAAO,UAAU,CAAC;YAEpB,CAAC,CAAC,CAAC;YAEH,MAAM,IAAA,8CAAwB,EAAC,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE;gBACnD,WAAW,CAAC,YAAY,CAAC,GAAG,WAAW,CAAC,YAAY,CAAC,CAAC;YACxD,CAAC,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC;SAErB;IACH,CAAC;CAAA;AAvCD,gEAuCC;AAED,kBAAe,0BAA0B,CAAC"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { Tree } from '@nx/devkit';
|
|
2
2
|
import { ProjectPackageJson } from '@rxap/plugin-utilities';
|
|
3
|
+
import { Dependency } from '@rxap/workspace-utilities';
|
|
3
4
|
import { FixDependenciesGeneratorSchema } from './schema';
|
|
4
|
-
export declare function resolveLatestPackageVersion(packageName: string): Promise<string>;
|
|
5
|
+
export declare function resolveLatestPackageVersion(packageName: string): Promise<string | null>;
|
|
5
6
|
export declare function replaceLatestPackageVersionForProject(tree: Tree, projectName: string): Promise<void>;
|
|
6
|
-
export declare function removePackageFromDependencies(packageName: string, dependencies:
|
|
7
|
+
export declare function removePackageFromDependencies(packageName: string, dependencies: Dependency | undefined): void;
|
|
7
8
|
export declare function removeSelfReferenceFromDependencies(projectName: string, { dependencies, peerDependencies, devDependencies, optionalDependencies, }: ProjectPackageJson): void;
|
|
8
9
|
/**
|
|
9
10
|
* This generator tries to fix the dependencies in the project.json of the project
|
|
@@ -4,7 +4,6 @@ exports.fixDependenciesGenerator = exports.removeSelfReferenceFromDependencies =
|
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
5
|
const devkit_1 = require("@nx/devkit");
|
|
6
6
|
const generator_ts_morph_1 = require("@rxap/generator-ts-morph");
|
|
7
|
-
const generator_utilities_1 = require("@rxap/generator-utilities");
|
|
8
7
|
const node_utilities_1 = require("@rxap/node-utilities");
|
|
9
8
|
const ts_morph_1 = require("@rxap/ts-morph");
|
|
10
9
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
@@ -145,17 +144,17 @@ const PACKAGE_ADD_BLACK_LIST = [
|
|
|
145
144
|
'axios',
|
|
146
145
|
];
|
|
147
146
|
function addDependedProjects(projectGraph, tree, packageName, projectRoot, dependencies) {
|
|
148
|
-
const projectName = (0,
|
|
147
|
+
const projectName = (0, workspace_utilities_1.PackageNameToProjectName)(packageName);
|
|
149
148
|
const dependedProjectList = resolveProjectDependencies(projectGraph, projectName);
|
|
150
149
|
for (const dependedProject of dependedProjectList) {
|
|
151
|
-
const dependedPackageName = (0,
|
|
150
|
+
const dependedPackageName = (0, workspace_utilities_1.ProjectNameToPackageName)(dependedProject);
|
|
152
151
|
if (!dependencies[dependedPackageName]) {
|
|
153
152
|
dependencies[dependedPackageName] = findBasePackageVersion(tree, dependedPackageName, projectRoot);
|
|
154
153
|
}
|
|
155
154
|
}
|
|
156
155
|
}
|
|
157
|
-
function fixPeerDependenciesWithTsMorphProject(projectGraph, tree, projectRoot,
|
|
158
|
-
var _a;
|
|
156
|
+
function fixPeerDependenciesWithTsMorphProject(projectGraph, tree, projectRoot, packageJson) {
|
|
157
|
+
var _a, _b, _c;
|
|
159
158
|
const project = (0, ts_morph_1.CreateProject)();
|
|
160
159
|
(0, generator_ts_morph_1.AddDir)(tree, projectRoot, project, (fileName, path) => !path.includes('node_modules') &&
|
|
161
160
|
fileName.endsWith('.ts') &&
|
|
@@ -166,6 +165,9 @@ function fixPeerDependenciesWithTsMorphProject(projectGraph, tree, projectRoot,
|
|
|
166
165
|
const changedPackageList = [];
|
|
167
166
|
const removedPackageList = [];
|
|
168
167
|
const unknownPackageList = [];
|
|
168
|
+
(_a = packageJson.peerDependencies) !== null && _a !== void 0 ? _a : (packageJson.peerDependencies = {});
|
|
169
|
+
(_b = packageJson.dependencies) !== null && _b !== void 0 ? _b : (packageJson.dependencies = {});
|
|
170
|
+
const { dependencies, peerDependencies, } = packageJson;
|
|
169
171
|
for (const packageName of Object.keys(peerDependencies)) {
|
|
170
172
|
if (!packageList.includes(packageName) && !PACKAGE_REMOVE_BLACK_LIST.includes(packageName)) {
|
|
171
173
|
removedPackageList.push(`${packageName}@${peerDependencies[packageName]} from peerDependencies`);
|
|
@@ -179,9 +181,9 @@ function fixPeerDependenciesWithTsMorphProject(projectGraph, tree, projectRoot,
|
|
|
179
181
|
}
|
|
180
182
|
}
|
|
181
183
|
for (const packageName of packageList) {
|
|
182
|
-
if ((0,
|
|
184
|
+
if ((0, workspace_utilities_1.HasProjectWithPackageName)(packageName)) {
|
|
183
185
|
if (!dependencies[packageName]) {
|
|
184
|
-
peerDependencies[packageName] = (
|
|
186
|
+
peerDependencies[packageName] = (_c = peerDependencies[packageName]) !== null && _c !== void 0 ? _c : '*';
|
|
185
187
|
}
|
|
186
188
|
}
|
|
187
189
|
else {
|
|
@@ -211,35 +213,38 @@ function fixPeerDependenciesWithTsMorphProject(projectGraph, tree, projectRoot,
|
|
|
211
213
|
unknownPackageList,
|
|
212
214
|
};
|
|
213
215
|
}
|
|
214
|
-
function fixDevDependenciesWithTsMorphProject(projectGraph, tree, projectRoot,
|
|
216
|
+
function fixDevDependenciesWithTsMorphProject(projectGraph, tree, projectRoot, packageJson) {
|
|
217
|
+
var _a;
|
|
215
218
|
const project = (0, ts_morph_1.CreateProject)();
|
|
216
219
|
(0, generator_ts_morph_1.AddDir)(tree, projectRoot, project, (fileName, path) => !path.includes('node_modules') &&
|
|
217
220
|
fileName.endsWith('.ts') &&
|
|
218
221
|
!TESTING_FOLDERS.map(folder => (0, path_1.join)(projectRoot, folder)).some(folder => path.includes(folder)) &&
|
|
219
222
|
TESTING_FILE_EXTENSIONS.some(ext => fileName.endsWith(ext)));
|
|
220
223
|
const packageList = getPackageListFromSourceFiles(project);
|
|
224
|
+
(_a = packageJson.devDependencies) !== null && _a !== void 0 ? _a : (packageJson.devDependencies = {});
|
|
225
|
+
const { dependencies, peerDependencies, devDependencies, } = packageJson;
|
|
221
226
|
const addedPackageList = [];
|
|
222
227
|
const changedPackageList = [];
|
|
223
228
|
const removedPackageList = [];
|
|
224
229
|
const unknownPackageList = [];
|
|
225
230
|
for (const packageName of Object.keys(devDependencies)) {
|
|
226
231
|
if (!packageList.includes(packageName) &&
|
|
227
|
-
!peerDependencies[packageName] &&
|
|
232
|
+
!(peerDependencies === null || peerDependencies === void 0 ? void 0 : peerDependencies[packageName]) &&
|
|
228
233
|
!PACKAGE_REMOVE_BLACK_LIST.includes(packageName)) {
|
|
229
234
|
removedPackageList.push(`${packageName}@${devDependencies[packageName]} from devDependencies`);
|
|
230
235
|
delete devDependencies[packageName];
|
|
231
236
|
}
|
|
232
237
|
}
|
|
233
238
|
for (const packageName of packageList) {
|
|
234
|
-
if ((0,
|
|
235
|
-
if (!peerDependencies[packageName] && !dependencies[packageName]) {
|
|
239
|
+
if ((0, workspace_utilities_1.HasProjectWithPackageName)(packageName)) {
|
|
240
|
+
if (!(peerDependencies === null || peerDependencies === void 0 ? void 0 : peerDependencies[packageName]) && !(dependencies === null || dependencies === void 0 ? void 0 : dependencies[packageName])) {
|
|
236
241
|
devDependencies[packageName] = '*';
|
|
237
242
|
}
|
|
238
243
|
}
|
|
239
244
|
else {
|
|
240
|
-
if (!peerDependencies[packageName] && !dependencies[packageName]) {
|
|
245
|
+
if (!(peerDependencies === null || peerDependencies === void 0 ? void 0 : peerDependencies[packageName]) && !(dependencies === null || dependencies === void 0 ? void 0 : dependencies[packageName])) {
|
|
241
246
|
const version = findBasePackageVersion(tree, packageName, projectRoot);
|
|
242
|
-
if (devDependencies[packageName]) {
|
|
247
|
+
if (devDependencies === null || devDependencies === void 0 ? void 0 : devDependencies[packageName]) {
|
|
243
248
|
if (devDependencies[packageName] !== version) {
|
|
244
249
|
changedPackageList.push(`${packageName}@${devDependencies[packageName]} -> ${version}`);
|
|
245
250
|
devDependencies[packageName] = version;
|
|
@@ -268,7 +273,7 @@ function loadAvailablePackageVersion(tree, projectRoot) {
|
|
|
268
273
|
PACKAGE_VERSION_MAP[projectRoot] = {};
|
|
269
274
|
function updateMap(dependencies) {
|
|
270
275
|
for (const [packageName, version] of Object.entries(dependencies !== null && dependencies !== void 0 ? dependencies : {})) {
|
|
271
|
-
if (version !== '*' && !(0,
|
|
276
|
+
if (version !== '*' && !(0, workspace_utilities_1.HasProjectWithPackageName)(packageName)) {
|
|
272
277
|
if (!PACKAGE_VERSION_MAP[packageName]) {
|
|
273
278
|
PACKAGE_VERSION_MAP[projectRoot][packageName] = version;
|
|
274
279
|
}
|
|
@@ -328,7 +333,7 @@ function printReport({ addedPackageList, changedPackageList, removedPackageList,
|
|
|
328
333
|
}
|
|
329
334
|
}
|
|
330
335
|
function skipProject(tree, options, project, projectName) {
|
|
331
|
-
if ((0,
|
|
336
|
+
if ((0, workspace_utilities_1.SkipNonPublishableProject)(tree, options, project, projectName)) {
|
|
332
337
|
return true;
|
|
333
338
|
}
|
|
334
339
|
return false;
|
|
@@ -339,14 +344,18 @@ function resolveLatestPackageVersion(packageName) {
|
|
|
339
344
|
if (RESOLVED_PACKAGE_VERSION_MAP[packageName]) {
|
|
340
345
|
return RESOLVED_PACKAGE_VERSION_MAP[packageName];
|
|
341
346
|
}
|
|
342
|
-
|
|
347
|
+
const latestVersion = yield (0, node_utilities_1.GetLatestPackageVersion)(packageName);
|
|
348
|
+
if (latestVersion) {
|
|
349
|
+
RESOLVED_PACKAGE_VERSION_MAP[packageName] = latestVersion;
|
|
350
|
+
}
|
|
351
|
+
return latestVersion;
|
|
343
352
|
});
|
|
344
353
|
}
|
|
345
354
|
exports.resolveLatestPackageVersion = resolveLatestPackageVersion;
|
|
346
355
|
function replaceLatestPackageVersionForProject(tree, projectName) {
|
|
347
356
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
348
357
|
console.log(`Replace latest package version for project ${projectName}`);
|
|
349
|
-
const projectRoot = (0,
|
|
358
|
+
const projectRoot = (0, workspace_utilities_1.GetProjectRoot)(tree, projectName);
|
|
350
359
|
const packageJson = JSON.parse(tree.read((0, path_1.join)(projectRoot, 'package.json')).toString('utf-8'));
|
|
351
360
|
const dependencies = packageJson.dependencies;
|
|
352
361
|
const peerDependencies = packageJson.peerDependencies;
|
|
@@ -357,7 +366,7 @@ function replaceLatestPackageVersionForProject(tree, projectName) {
|
|
|
357
366
|
for (const [packageName, version] of Object.entries(dependencies !== null && dependencies !== void 0 ? dependencies : {})) {
|
|
358
367
|
if (version === 'latest') {
|
|
359
368
|
const resolvedVersion = yield resolveLatestPackageVersion(packageName);
|
|
360
|
-
if (resolvedVersion !== 'latest') {
|
|
369
|
+
if (resolvedVersion !== 'latest' && resolvedVersion) {
|
|
361
370
|
dependencies[packageName] = resolvedVersion;
|
|
362
371
|
console.log(`Replace latest version of ${packageName} with ${resolvedVersion}`);
|
|
363
372
|
}
|
|
@@ -374,13 +383,13 @@ function replaceLatestPackageVersionForProject(tree, projectName) {
|
|
|
374
383
|
}
|
|
375
384
|
exports.replaceLatestPackageVersionForProject = replaceLatestPackageVersionForProject;
|
|
376
385
|
function removePackageFromDependencies(packageName, dependencies) {
|
|
377
|
-
if (dependencies[packageName]) {
|
|
386
|
+
if (dependencies === null || dependencies === void 0 ? void 0 : dependencies[packageName]) {
|
|
378
387
|
delete dependencies[packageName];
|
|
379
388
|
}
|
|
380
389
|
}
|
|
381
390
|
exports.removePackageFromDependencies = removePackageFromDependencies;
|
|
382
391
|
function removeSelfReferenceFromDependencies(projectName, { dependencies, peerDependencies, devDependencies, optionalDependencies, }) {
|
|
383
|
-
const packageName = (0,
|
|
392
|
+
const packageName = (0, workspace_utilities_1.ProjectNameToPackageName)(projectName);
|
|
384
393
|
removePackageFromDependencies(packageName, dependencies);
|
|
385
394
|
removePackageFromDependencies(packageName, peerDependencies);
|
|
386
395
|
removePackageFromDependencies(packageName, devDependencies);
|
|
@@ -429,7 +438,7 @@ function fixDependenciesGenerator(tree, options) {
|
|
|
429
438
|
}
|
|
430
439
|
}
|
|
431
440
|
const projectGraph = yield (0, devkit_1.createProjectGraphAsync)();
|
|
432
|
-
(0,
|
|
441
|
+
(0, workspace_utilities_1.LoadProjectToPackageMapping)(tree, projectGraph);
|
|
433
442
|
const unknownPackageMap = {};
|
|
434
443
|
const latestTsLibVersion = yield resolveLatestPackageVersion('tslib');
|
|
435
444
|
for (const [projectName, project] of (0, devkit_1.getProjects)(tree).entries()) {
|
|
@@ -444,7 +453,7 @@ function fixDependenciesGenerator(tree, options) {
|
|
|
444
453
|
(_b = packageJson.peerDependencies) !== null && _b !== void 0 ? _b : (packageJson.peerDependencies = {});
|
|
445
454
|
(_c = packageJson.devDependencies) !== null && _c !== void 0 ? _c : (packageJson.devDependencies = {});
|
|
446
455
|
(_d = packageJson.optionalDependencies) !== null && _d !== void 0 ? _d : (packageJson.optionalDependencies = {});
|
|
447
|
-
if (!packageJson.dependencies['tslib']) {
|
|
456
|
+
if (!packageJson.dependencies['tslib'] && latestTsLibVersion) {
|
|
448
457
|
packageJson.dependencies['tslib'] = latestTsLibVersion;
|
|
449
458
|
}
|
|
450
459
|
loadAvailablePackageVersion(tree, projectRoot);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/fix-dependencies/generator.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/fix-dependencies/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.indexExportGenerator = void 0;
|
|
4
4
|
const tslib_1 = require("tslib");
|
|
5
|
+
// rxap-no-index-export
|
|
5
6
|
const devkit_1 = require("@nx/devkit");
|
|
6
|
-
const generator_utilities_1 = require("@rxap/generator-utilities");
|
|
7
7
|
const workspace_utilities_1 = require("@rxap/workspace-utilities");
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
function generateIndexFile(tree, sourceRoot) {
|
|
10
10
|
const libRoot = (0, path_1.join)(sourceRoot, 'lib');
|
|
11
11
|
let filePathList = [];
|
|
12
|
-
for (const { path, isFile } of (0,
|
|
12
|
+
for (const { path, isFile } of (0, workspace_utilities_1.VisitTree)(tree, libRoot)) {
|
|
13
13
|
if (isFile &&
|
|
14
14
|
path.endsWith('.ts') &&
|
|
15
15
|
!path.endsWith('.spec.ts') &&
|
|
@@ -17,11 +17,15 @@ function generateIndexFile(tree, sourceRoot) {
|
|
|
17
17
|
!path.endsWith('.stories.ts') &&
|
|
18
18
|
!path.endsWith('.d.ts')) {
|
|
19
19
|
const content = tree.read(path, 'utf-8');
|
|
20
|
-
if (content.match(/^export /gm)) {
|
|
20
|
+
if (content === null || content === void 0 ? void 0 : content.match(/^export /gm)) {
|
|
21
21
|
filePathList.push(path);
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
24
|
}
|
|
25
|
+
filePathList = filePathList.filter(path => {
|
|
26
|
+
const content = tree.read(path, 'utf-8');
|
|
27
|
+
return content && !content.split('\n')[0].match(/rxap-no-index-export/);
|
|
28
|
+
});
|
|
25
29
|
filePathList = filePathList.map(path => path.replace(new RegExp(`^${libRoot}/`), ''));
|
|
26
30
|
const map = new Map();
|
|
27
31
|
for (const filePath of filePathList) {
|
|
@@ -51,10 +55,10 @@ function generateIndexFile(tree, sourceRoot) {
|
|
|
51
55
|
if (!rootIndexFile) {
|
|
52
56
|
rootIndexFile = 'export {};';
|
|
53
57
|
}
|
|
54
|
-
(0,
|
|
58
|
+
(0, workspace_utilities_1.CoerceFile)(tree, (0, path_1.join)(sourceRoot, 'index.ts'), rootIndexFile, true);
|
|
55
59
|
}
|
|
56
60
|
function skipProject(tree, options, project, projectName) {
|
|
57
|
-
if ((0,
|
|
61
|
+
if ((0, workspace_utilities_1.SkipNonLibraryProject)(tree, options, project, projectName)) {
|
|
58
62
|
return true;
|
|
59
63
|
}
|
|
60
64
|
return false;
|
|
@@ -67,12 +71,17 @@ function indexExportGenerator(tree, options) {
|
|
|
67
71
|
continue;
|
|
68
72
|
}
|
|
69
73
|
console.log('generate index file for project: ', projectName);
|
|
70
|
-
for (const { path } of (0, workspace_utilities_1.SearchFile)(tree, (0,
|
|
74
|
+
for (const { path } of (0, workspace_utilities_1.SearchFile)(tree, (0, workspace_utilities_1.GetProjectRoot)(tree, projectName))) {
|
|
71
75
|
if (path.endsWith('ng-package.json')) {
|
|
72
76
|
generateIndexFile(tree, (0, path_1.join)((0, path_1.dirname)(path), 'src'));
|
|
73
77
|
}
|
|
74
78
|
}
|
|
75
|
-
|
|
79
|
+
const projectSourceRoot = (0, workspace_utilities_1.GetProjectSourceRoot)(tree, projectName);
|
|
80
|
+
if (!projectSourceRoot) {
|
|
81
|
+
console.warn(`no source root found for project: ${projectName}`);
|
|
82
|
+
continue;
|
|
83
|
+
}
|
|
84
|
+
generateIndexFile(tree, projectSourceRoot);
|
|
76
85
|
}
|
|
77
86
|
});
|
|
78
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/index-export/generator.ts"],"names":[],"mappings":";;;;AAAA,uCAGoB;AACpB,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/plugin/library/src/generators/index-export/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { Tree } from '@nx/devkit';
|
|
2
|
+
import { IndexJsonSchemaGeneratorSchema } from './schema';
|
|
3
|
+
export declare function GenerateSchematicDefinitionsMap(tree: Tree, options: IndexJsonSchemaGeneratorSchema, basePath?: string): Record<string, {
|
|
4
|
+
$ref: string;
|
|
5
|
+
}>;
|
|
6
|
+
export declare function GenerateDefinitionsMap(tree: Tree, options: IndexJsonSchemaGeneratorSchema, basePath?: string): Record<string, {
|
|
7
|
+
$ref: string;
|
|
8
|
+
}>;
|
|
9
|
+
export declare function indexJsonSchemaGenerator(tree: Tree, options: IndexJsonSchemaGeneratorSchema): Promise<void>;
|
|
10
|
+
export default indexJsonSchemaGenerator;
|