@o3r/schematics 13.0.0-prerelease.2 → 13.0.0-prerelease.4
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 +6 -6
- package/schematics/ng-add/index.d.ts.map +1 -1
- package/schematics/ng-add/index.js +5 -18
- package/schematics/ng-add/schema.d.ts +2 -4
- package/schematics/ng-add/schema.d.ts.map +1 -1
- package/src/rule-factories/ng-add/ng-add.helpers.d.ts +23 -1
- package/src/rule-factories/ng-add/ng-add.helpers.d.ts.map +1 -1
- package/src/rule-factories/ng-add/ng-add.helpers.js +47 -0
- package/src/rule-factories/ng-add/ng-add.helpers.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/schematics",
|
|
3
|
-
"version": "13.0.0-prerelease.
|
|
3
|
+
"version": "13.0.0-prerelease.4",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -29,8 +29,8 @@
|
|
|
29
29
|
"@angular-devkit/core": "^20.0.0",
|
|
30
30
|
"@angular-devkit/schematics": "^20.0.0",
|
|
31
31
|
"@angular/cli": "^20.0.0",
|
|
32
|
-
"@o3r/core": "^13.0.0-prerelease.
|
|
33
|
-
"@o3r/telemetry": "^13.0.0-prerelease.
|
|
32
|
+
"@o3r/core": "^13.0.0-prerelease.4",
|
|
33
|
+
"@o3r/telemetry": "^13.0.0-prerelease.4",
|
|
34
34
|
"@schematics/angular": "^20.0.0",
|
|
35
35
|
"eslint": "^9.14.0",
|
|
36
36
|
"rxjs": "^7.8.1",
|
|
@@ -96,9 +96,9 @@
|
|
|
96
96
|
"@nx/eslint-plugin": "~21.3.11",
|
|
97
97
|
"@nx/jest": "~21.3.11",
|
|
98
98
|
"@nx/js": "~21.3.11",
|
|
99
|
-
"@o3r/build-helpers": "^13.0.0-prerelease.
|
|
100
|
-
"@o3r/telemetry": "^13.0.0-prerelease.
|
|
101
|
-
"@o3r/test-helpers": "^13.0.0-prerelease.
|
|
99
|
+
"@o3r/build-helpers": "^13.0.0-prerelease.4",
|
|
100
|
+
"@o3r/telemetry": "^13.0.0-prerelease.4",
|
|
101
|
+
"@o3r/test-helpers": "^13.0.0-prerelease.4",
|
|
102
102
|
"@schematics/angular": "~20.0.0",
|
|
103
103
|
"@stylistic/eslint-plugin": "~5.2.0",
|
|
104
104
|
"@swc/helpers": "~0.5.0",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,IAAI,EACL,MAAM,4BAA4B,CAAC;AAKpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA+BlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
|
|
@@ -23,24 +23,11 @@ const devDependenciesToInstall = [
|
|
|
23
23
|
* @param options schematics options
|
|
24
24
|
*/
|
|
25
25
|
function ngAddFn(options) {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
const externalDependenciesInfo = (0, public_api_1.getExternalDependenciesInfo)({
|
|
32
|
-
devDependenciesToInstall,
|
|
33
|
-
dependenciesToInstall,
|
|
34
|
-
o3rPackageJsonPath: packageJsonPath,
|
|
35
|
-
projectType: workspaceProject?.projectType,
|
|
36
|
-
projectPackageJson
|
|
37
|
-
}, context.logger);
|
|
38
|
-
return (0, public_api_1.setupDependencies)({
|
|
39
|
-
projectName: options.projectName,
|
|
40
|
-
dependencies: externalDependenciesInfo,
|
|
41
|
-
skipInstall: false
|
|
42
|
-
});
|
|
43
|
-
};
|
|
26
|
+
const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
|
|
27
|
+
return (0, public_api_1.ngAddDependenciesRule)({
|
|
28
|
+
...options,
|
|
29
|
+
skipInstall: false
|
|
30
|
+
}, packageJsonPath, { dependenciesToInstall, devDependenciesToInstall });
|
|
44
31
|
}
|
|
45
32
|
/**
|
|
46
33
|
* Add Otter schematics to an Angular Project
|
|
@@ -1,6 +1,4 @@
|
|
|
1
|
-
import type { SchematicOptionObject } from '../../src/public_api';
|
|
2
|
-
export interface NgAddSchematicsSchema extends SchematicOptionObject {
|
|
3
|
-
/** Project name */
|
|
4
|
-
projectName?: string | undefined;
|
|
1
|
+
import type { NgAddOptions, SchematicOptionObject } from '../../src/public_api';
|
|
2
|
+
export interface NgAddSchematicsSchema extends Omit<NgAddOptions, 'skipInstall'>, SchematicOptionObject {
|
|
5
3
|
}
|
|
6
4
|
//# sourceMappingURL=schema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,WAAW,qBAAsB,SAAQ,
|
|
1
|
+
{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/schema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,qBAAqB,EACtB,MAAM,sBAAsB,CAAC;AAE9B,MAAM,WAAW,qBAAsB,SAAQ,IAAI,CAAC,YAAY,EAAE,aAAa,CAAC,EAAE,qBAAqB;CAAG"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type Rule } from '@angular-devkit/schematics';
|
|
1
|
+
import { type Rule, type SchematicContext, type Tree } from '@angular-devkit/schematics';
|
|
2
2
|
import type { NgAddPackageOptions } from '../../tasks/index';
|
|
3
3
|
/**
|
|
4
4
|
* Install via `ng add` a list of npm packages.
|
|
@@ -9,4 +9,26 @@ import type { NgAddPackageOptions } from '../../tasks/index';
|
|
|
9
9
|
export declare function ngAddPackages(packages: string[], options?: Omit<NgAddPackageOptions, 'version'> & {
|
|
10
10
|
version?: string | (string | undefined)[];
|
|
11
11
|
}, packageJsonPath?: string): Rule;
|
|
12
|
+
export interface NgAddOptions {
|
|
13
|
+
/** Project name */
|
|
14
|
+
projectName?: string | undefined;
|
|
15
|
+
/** Use a pinned version for otter packages */
|
|
16
|
+
exactO3rVersion?: boolean;
|
|
17
|
+
/** Skip the install process */
|
|
18
|
+
skipInstall?: boolean;
|
|
19
|
+
}
|
|
20
|
+
interface DependencyToAdd {
|
|
21
|
+
dependenciesToInstall?: string[];
|
|
22
|
+
devDependenciesToInstall?: string[];
|
|
23
|
+
additionalNgAddToRun?: string[];
|
|
24
|
+
}
|
|
25
|
+
type GetDependencyToAdd = (options: NgAddOptions, tree: Tree, context: SchematicContext) => DependencyToAdd | Promise<DependencyToAdd>;
|
|
26
|
+
/**
|
|
27
|
+
* Add dependencies to the project during ng add process
|
|
28
|
+
* @param options
|
|
29
|
+
* @param packageJsonPath
|
|
30
|
+
* @param deps
|
|
31
|
+
*/
|
|
32
|
+
export declare function ngAddDependenciesRule(options: NgAddOptions, packageJsonPath: string, deps: DependencyToAdd | GetDependencyToAdd | Promise<DependencyToAdd>): Rule;
|
|
33
|
+
export {};
|
|
12
34
|
//# sourceMappingURL=ng-add.helpers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ng-add.helpers.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/ng-add.helpers.ts"],"names":[],"mappings":"AAMA,OAAO,EAIL,KAAK,IAAI,
|
|
1
|
+
{"version":3,"file":"ng-add.helpers.d.ts","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/ng-add.helpers.ts"],"names":[],"mappings":"AAMA,OAAO,EAIL,KAAK,IAAI,EAET,KAAK,gBAAgB,EACrB,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAUpC,OAAO,KAAK,EACV,mBAAmB,EACpB,MAAM,mBAAmB,CAAC;AA6B3B;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC,GAAG;IAAE,OAAO,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,CAAA;CAAE,EAAE,eAAe,SAAkB,GAAG,IAAI,CA8GzL;AAED,MAAM,WAAW,YAAY;IAC3B,mBAAmB;IACnB,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAEjC,8CAA8C;IAC9C,eAAe,CAAC,EAAE,OAAO,CAAC;IAE1B,+BAA+B;IAC/B,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,UAAU,eAAe;IACvB,qBAAqB,CAAC,EAAE,MAAM,EAAE,CAAC;IACjC,wBAAwB,CAAC,EAAE,MAAM,EAAE,CAAC;IACpC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;CACjC;AAED,KAAK,kBAAkB,GAAG,CAAC,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,gBAAgB,KAAK,eAAe,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAEvI;;;;;GAKG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,YAAY,EACrB,eAAe,EAAE,MAAM,EACvB,IAAI,EAAE,eAAe,GAAG,kBAAkB,GAAG,OAAO,CAAC,eAAe,CAAC,GACpE,IAAI,CA8CN"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ngAddPackages = ngAddPackages;
|
|
4
|
+
exports.ngAddDependenciesRule = ngAddDependenciesRule;
|
|
4
5
|
const node_fs_1 = require("node:fs");
|
|
5
6
|
const path = require("node:path");
|
|
6
7
|
const schematics_1 = require("@angular-devkit/schematics");
|
|
7
8
|
const tasks_1 = require("@angular-devkit/schematics/tasks");
|
|
8
9
|
const dependencies_1 = require("@schematics/angular/utility/dependencies");
|
|
9
10
|
const index_1 = require("../../utility/index");
|
|
11
|
+
const dependencies_2 = require("./dependencies");
|
|
10
12
|
const getNgAddSchema = (packageName, context) => {
|
|
11
13
|
try {
|
|
12
14
|
const collection = context.engine.createCollection(packageName);
|
|
@@ -134,4 +136,49 @@ function ngAddPackages(packages, options, packageJsonPath = '/package.json') {
|
|
|
134
136
|
}
|
|
135
137
|
]);
|
|
136
138
|
}
|
|
139
|
+
/**
|
|
140
|
+
* Add dependencies to the project during ng add process
|
|
141
|
+
* @param options
|
|
142
|
+
* @param packageJsonPath
|
|
143
|
+
* @param deps
|
|
144
|
+
*/
|
|
145
|
+
function ngAddDependenciesRule(options, packageJsonPath, deps) {
|
|
146
|
+
return async (tree, context) => {
|
|
147
|
+
const { dependenciesToInstall = [], devDependenciesToInstall = [], additionalNgAddToRun = [] } = await (typeof deps === 'function' ? deps(options, tree, context) : deps);
|
|
148
|
+
const depsInfo = (0, index_1.getO3rPeerDeps)(packageJsonPath);
|
|
149
|
+
const workspaceProject = options.projectName ? (0, index_1.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
|
|
150
|
+
const projectDirectory = workspaceProject?.root || '.';
|
|
151
|
+
const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
|
|
152
|
+
depsInfo.o3rPeerDeps.push(...additionalNgAddToRun.filter((dep) => !depsInfo.o3rPeerDeps.includes(dep)));
|
|
153
|
+
const internalDependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
|
|
154
|
+
acc[dep] = {
|
|
155
|
+
inManifest: [{
|
|
156
|
+
range: `${options.exactO3rVersion ? '' : '~'}${depsInfo.packageVersion}`,
|
|
157
|
+
types: (0, index_1.getProjectNewDependenciesTypes)(workspaceProject)
|
|
158
|
+
}],
|
|
159
|
+
ngAddOptions: { exactO3rVersion: options.exactO3rVersion }
|
|
160
|
+
};
|
|
161
|
+
return acc;
|
|
162
|
+
}, (0, dependencies_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
|
|
163
|
+
const externalDependenciesInfo = (0, index_1.getExternalDependenciesInfo)({
|
|
164
|
+
devDependenciesToInstall,
|
|
165
|
+
dependenciesToInstall,
|
|
166
|
+
o3rPackageJsonPath: packageJsonPath,
|
|
167
|
+
projectType: workspaceProject?.projectType,
|
|
168
|
+
projectPackageJson
|
|
169
|
+
}, context.logger);
|
|
170
|
+
const dependencies = {
|
|
171
|
+
...internalDependencies,
|
|
172
|
+
...externalDependenciesInfo
|
|
173
|
+
};
|
|
174
|
+
return (0, schematics_1.chain)([
|
|
175
|
+
(0, dependencies_2.setupDependencies)({
|
|
176
|
+
projectName: options.projectName,
|
|
177
|
+
skipInstall: options.skipInstall,
|
|
178
|
+
dependencies,
|
|
179
|
+
ngAddToRun: depsInfo.o3rPeerDeps
|
|
180
|
+
})
|
|
181
|
+
]);
|
|
182
|
+
};
|
|
183
|
+
}
|
|
137
184
|
//# sourceMappingURL=ng-add.helpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ng-add.helpers.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/ng-add.helpers.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"ng-add.helpers.js","sourceRoot":"","sources":["../../../../src/rule-factories/ng-add/ng-add.helpers.ts"],"names":[],"mappings":"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"}
|