@o3r/rules-engine 11.6.13 → 11.6.15
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": "@o3r/rules-engine",
|
|
3
|
-
"version": "11.6.
|
|
3
|
+
"version": "11.6.15",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -38,6 +38,9 @@
|
|
|
38
38
|
"default": "./fesm2022/o3r-rules-engine-fixtures-jest.mjs"
|
|
39
39
|
}
|
|
40
40
|
},
|
|
41
|
+
"generatorDependencies": {
|
|
42
|
+
"jsonpath-plus": "~10.3.0"
|
|
43
|
+
},
|
|
41
44
|
"peerDependencies": {
|
|
42
45
|
"@angular-devkit/architect": "^0.1802.0",
|
|
43
46
|
"@angular-devkit/core": "^18.2.0",
|
|
@@ -49,15 +52,16 @@
|
|
|
49
52
|
"@ngrx/entity": "^18.0.0",
|
|
50
53
|
"@ngrx/store": "^18.0.0",
|
|
51
54
|
"@ngx-translate/core": "^15.0.0",
|
|
52
|
-
"@o3r/core": "^11.6.
|
|
53
|
-
"@o3r/extractors": "^11.6.
|
|
54
|
-
"@o3r/logger": "^11.6.
|
|
55
|
-
"@o3r/schematics": "^11.6.
|
|
55
|
+
"@o3r/core": "^11.6.15",
|
|
56
|
+
"@o3r/extractors": "^11.6.15",
|
|
57
|
+
"@o3r/logger": "^11.6.15",
|
|
58
|
+
"@o3r/schematics": "^11.6.15",
|
|
56
59
|
"@schematics/angular": "^18.2.0",
|
|
57
60
|
"globby": "^11.1.0",
|
|
58
61
|
"jasmine": "^5.0.0",
|
|
59
62
|
"jsonpath-plus": "^9.0.0 || ^10.0.0",
|
|
60
63
|
"rxjs": "^7.8.1",
|
|
64
|
+
"type-fest": "^4.30.0",
|
|
61
65
|
"typescript": "^5.5.4",
|
|
62
66
|
"typescript-json-schema": "^0.65.0"
|
|
63
67
|
},
|
|
@@ -83,6 +87,9 @@
|
|
|
83
87
|
"jasmine": {
|
|
84
88
|
"optional": true
|
|
85
89
|
},
|
|
90
|
+
"type-fest": {
|
|
91
|
+
"optional": true
|
|
92
|
+
},
|
|
86
93
|
"typescript": {
|
|
87
94
|
"optional": true
|
|
88
95
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,KAAK,IAAI,EACV,MAAM,4BAA4B,CAAC;AAiBpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AA0IlB;;;GAGG;AACH,eAAO,MAAM,KAAK,YAAa,qBAAqB,KAAG,IAGtD,CAAC"}
|
|
@@ -10,8 +10,25 @@ const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
|
10
10
|
const ts = tslib_1.__importStar(require("typescript"));
|
|
11
11
|
const cms_adapter_1 = require("../cms-adapter");
|
|
12
12
|
const devtools_registration_1 = require("./helpers/devtools-registration");
|
|
13
|
+
/**
|
|
14
|
+
* List of external dependencies to be added to the project as peer dependencies
|
|
15
|
+
*/
|
|
16
|
+
const dependenciesToInstall = [
|
|
17
|
+
'@angular/common',
|
|
18
|
+
'@angular/core',
|
|
19
|
+
'@angular/forms',
|
|
20
|
+
'@ngrx/effects',
|
|
21
|
+
'@ngrx/entity',
|
|
22
|
+
'@ngrx/store',
|
|
23
|
+
'@ngx-translate/core',
|
|
24
|
+
'jsonpath-plus',
|
|
25
|
+
'rxjs'
|
|
26
|
+
];
|
|
27
|
+
/**
|
|
28
|
+
* List of external dependencies to be added to the project as dev dependencies
|
|
29
|
+
*/
|
|
13
30
|
const devDependenciesToInstall = [
|
|
14
|
-
'
|
|
31
|
+
'@angular-devkit/architect'
|
|
15
32
|
];
|
|
16
33
|
const reportMissingSchematicsDep = (logger) => (reason) => {
|
|
17
34
|
logger.error(`[ERROR]: Adding @o3r/rules-engine has failed.
|
|
@@ -39,7 +56,7 @@ const updateAppModuleOrAppConfig = (projectName) => async (tree, context) => {
|
|
|
39
56
|
function ngAddFn(options) {
|
|
40
57
|
/* ng add rules */
|
|
41
58
|
return async (tree, context) => {
|
|
42
|
-
const { setupDependencies, getPackageInstallConfig, getDefaultOptionsForSchematic, getO3rPeerDeps, getProjectNewDependenciesTypes, getWorkspaceConfig,
|
|
59
|
+
const { setupDependencies, getPackageInstallConfig, getDefaultOptionsForSchematic, getO3rPeerDeps, getProjectNewDependenciesTypes, getWorkspaceConfig, getExternalDependenciesInfo, removePackages, setupSchematicsParamsForProject, registerPackageCollectionSchematics } = await Promise.resolve().then(() => tslib_1.__importStar(require('@o3r/schematics')));
|
|
43
60
|
options = { ...getDefaultOptionsForSchematic(getWorkspaceConfig(tree), '@o3r/rules-engine', 'ng-add', options), ...options };
|
|
44
61
|
const packageJsonPath = path.resolve(__dirname, '..', '..', 'package.json');
|
|
45
62
|
const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, { encoding: 'utf8' }));
|
|
@@ -48,6 +65,8 @@ function ngAddFn(options) {
|
|
|
48
65
|
depsInfo.o3rPeerDeps = [...depsInfo.o3rPeerDeps, '@o3r/extractors'];
|
|
49
66
|
}
|
|
50
67
|
const workspaceProject = options.projectName ? getWorkspaceConfig(tree)?.projects[options.projectName] : undefined;
|
|
68
|
+
const projectDirectory = workspaceProject?.root || '.';
|
|
69
|
+
const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
|
|
51
70
|
const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
|
|
52
71
|
acc[dep] = {
|
|
53
72
|
inManifest: [{
|
|
@@ -58,15 +77,13 @@ function ngAddFn(options) {
|
|
|
58
77
|
};
|
|
59
78
|
return acc;
|
|
60
79
|
}, getPackageInstallConfig(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
};
|
|
69
|
-
});
|
|
80
|
+
const externalDependenciesInfo = getExternalDependenciesInfo({
|
|
81
|
+
devDependenciesToInstall,
|
|
82
|
+
dependenciesToInstall,
|
|
83
|
+
projectType: workspaceProject?.projectType,
|
|
84
|
+
projectPackageJson,
|
|
85
|
+
o3rPackageJsonPath: packageJsonPath
|
|
86
|
+
}, context.logger);
|
|
70
87
|
const schematicsDefaultOptions = {
|
|
71
88
|
useRulesEngine: undefined
|
|
72
89
|
};
|
|
@@ -79,7 +96,10 @@ function ngAddFn(options) {
|
|
|
79
96
|
removePackages(['@otter/rules-engine', '@otter/rules-engine-core']),
|
|
80
97
|
setupDependencies({
|
|
81
98
|
projectName: options.projectName,
|
|
82
|
-
dependencies
|
|
99
|
+
dependencies: {
|
|
100
|
+
...dependencies,
|
|
101
|
+
...externalDependenciesInfo
|
|
102
|
+
},
|
|
83
103
|
ngAddToRun: depsInfo.o3rPeerDeps
|
|
84
104
|
}),
|
|
85
105
|
...(options.enableMetadataExtract ? [(0, cms_adapter_1.updateCmsAdapter)(options)] : []),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":";;;;AAAA,oDAA8B;AAC9B,wDAAkC;AAClC,2DAGoC;AACpC,yDAEqC;AACrC,qEAE+C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}
|