@o3r/rules-engine 12.4.0-rc.3 → 12.4.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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@o3r/rules-engine",
|
|
3
|
-
"version": "12.4.0
|
|
3
|
+
"version": "12.4.0",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -36,6 +36,9 @@
|
|
|
36
36
|
"default": "./fesm2022/o3r-rules-engine-fixtures-jest.mjs"
|
|
37
37
|
}
|
|
38
38
|
},
|
|
39
|
+
"generatorDependencies": {
|
|
40
|
+
"jsonpath-plus": "~10.3.0"
|
|
41
|
+
},
|
|
39
42
|
"peerDependencies": {
|
|
40
43
|
"@angular-devkit/architect": ">=0.1900.0 <0.2000.0-0",
|
|
41
44
|
"@angular-devkit/core": "^19.0.0",
|
|
@@ -47,11 +50,11 @@
|
|
|
47
50
|
"@ngrx/effects": "^19.0.0",
|
|
48
51
|
"@ngrx/entity": "^19.0.0",
|
|
49
52
|
"@ngrx/store": "^19.0.0",
|
|
50
|
-
"@ngx-translate/core": "~16.0.4",
|
|
51
|
-
"@o3r/core": "^12.4.0
|
|
52
|
-
"@o3r/extractors": "^12.4.0
|
|
53
|
-
"@o3r/logger": "^12.4.0
|
|
54
|
-
"@o3r/schematics": "^12.4.0
|
|
53
|
+
"@ngx-translate/core": "^15.0.0 || ~16.0.4",
|
|
54
|
+
"@o3r/core": "^12.4.0",
|
|
55
|
+
"@o3r/extractors": "^12.4.0",
|
|
56
|
+
"@o3r/logger": "^12.4.0",
|
|
57
|
+
"@o3r/schematics": "^12.4.0",
|
|
55
58
|
"@schematics/angular": "^19.0.0",
|
|
56
59
|
"globby": "^11.1.0",
|
|
57
60
|
"jasmine": "^5.0.0",
|
|
@@ -59,6 +62,7 @@
|
|
|
59
62
|
"jsonpath-plus": "^9.0.0 || ^10.0.0",
|
|
60
63
|
"rxjs": "^7.8.1",
|
|
61
64
|
"ts-node": "~10.9.2",
|
|
65
|
+
"type-fest": "^4.30.0",
|
|
62
66
|
"typescript": "^5.5.4",
|
|
63
67
|
"typescript-json-schema": "^0.65.0"
|
|
64
68
|
},
|
|
@@ -87,6 +91,9 @@
|
|
|
87
91
|
"json-schema": {
|
|
88
92
|
"optional": true
|
|
89
93
|
},
|
|
94
|
+
"type-fest": {
|
|
95
|
+
"optional": true
|
|
96
|
+
},
|
|
90
97
|
"typescript": {
|
|
91
98
|
"optional": true
|
|
92
99
|
},
|
|
@@ -95,7 +102,7 @@
|
|
|
95
102
|
}
|
|
96
103
|
},
|
|
97
104
|
"dependencies": {
|
|
98
|
-
"@o3r/schematics": "^12.4.0
|
|
105
|
+
"@o3r/schematics": "^12.4.0",
|
|
99
106
|
"tslib": "^2.6.2"
|
|
100
107
|
},
|
|
101
108
|
"engines": {
|
|
@@ -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;AA+BpC,OAAO,KAAK,EACV,qBAAqB,EACtB,MAAM,UAAU,CAAC;AAqHlB;;;GAGG;AACH,eAAO,MAAM,KAAK,GAAI,SAAS,qBAAqB,SAA2C,CAAC"}
|
|
@@ -11,8 +11,26 @@ const ast_utils_1 = require("@schematics/angular/utility/ast-utils");
|
|
|
11
11
|
const ts = tslib_1.__importStar(require("typescript"));
|
|
12
12
|
const cms_adapter_1 = require("../cms-adapter");
|
|
13
13
|
const devtools_registration_1 = require("./helpers/devtools-registration");
|
|
14
|
+
/**
|
|
15
|
+
* List of external dependencies to be added to the project as peer dependencies
|
|
16
|
+
*/
|
|
17
|
+
const dependenciesToInstall = [
|
|
18
|
+
'@angular/common',
|
|
19
|
+
'@angular/platform-browser-dynamic',
|
|
20
|
+
'@angular/core',
|
|
21
|
+
'@angular/forms',
|
|
22
|
+
'@ngrx/effects',
|
|
23
|
+
'@ngrx/entity',
|
|
24
|
+
'@ngrx/store',
|
|
25
|
+
'@ngx-translate/core',
|
|
26
|
+
'jsonpath-plus',
|
|
27
|
+
'rxjs'
|
|
28
|
+
];
|
|
29
|
+
/**
|
|
30
|
+
* List of external dependencies to be added to the project as dev dependencies
|
|
31
|
+
*/
|
|
14
32
|
const devDependenciesToInstall = [
|
|
15
|
-
'
|
|
33
|
+
'@angular-devkit/architect'
|
|
16
34
|
];
|
|
17
35
|
const updateAppModuleOrAppConfig = (projectName) => (tree, context) => {
|
|
18
36
|
const moduleFilePath = (0, schematics_2.getAppModuleFilePath)(tree, context, projectName);
|
|
@@ -41,6 +59,8 @@ function ngAddFn(options) {
|
|
|
41
59
|
depsInfo.o3rPeerDeps = [...depsInfo.o3rPeerDeps, '@o3r/extractors'];
|
|
42
60
|
}
|
|
43
61
|
const workspaceProject = options.projectName ? (0, schematics_2.getWorkspaceConfig)(tree)?.projects[options.projectName] : undefined;
|
|
62
|
+
const projectDirectory = workspaceProject?.root || '.';
|
|
63
|
+
const projectPackageJson = tree.readJson(path.posix.join(projectDirectory, 'package.json'));
|
|
44
64
|
const dependencies = depsInfo.o3rPeerDeps.reduce((acc, dep) => {
|
|
45
65
|
acc[dep] = {
|
|
46
66
|
inManifest: [{
|
|
@@ -51,15 +71,13 @@ function ngAddFn(options) {
|
|
|
51
71
|
};
|
|
52
72
|
return acc;
|
|
53
73
|
}, (0, schematics_2.getPackageInstallConfig)(packageJsonPath, tree, options.projectName, false, !!options.exactO3rVersion));
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
};
|
|
62
|
-
});
|
|
74
|
+
const externalDependenciesInfo = (0, schematics_2.getExternalDependenciesInfo)({
|
|
75
|
+
devDependenciesToInstall,
|
|
76
|
+
dependenciesToInstall,
|
|
77
|
+
projectType: workspaceProject?.projectType,
|
|
78
|
+
projectPackageJson,
|
|
79
|
+
o3rPackageJsonPath: packageJsonPath
|
|
80
|
+
}, context.logger);
|
|
63
81
|
const schematicsDefaultOptions = {
|
|
64
82
|
useRulesEngine: undefined
|
|
65
83
|
};
|
|
@@ -72,7 +90,10 @@ function ngAddFn(options) {
|
|
|
72
90
|
(0, schematics_2.removePackages)(['@otter/rules-engine', '@otter/rules-engine-core']),
|
|
73
91
|
(0, schematics_2.setupDependencies)({
|
|
74
92
|
projectName: options.projectName,
|
|
75
|
-
dependencies
|
|
93
|
+
dependencies: {
|
|
94
|
+
...dependencies,
|
|
95
|
+
...externalDependenciesInfo
|
|
96
|
+
},
|
|
76
97
|
ngAddToRun: depsInfo.o3rPeerDeps
|
|
77
98
|
}),
|
|
78
99
|
...(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,gDAayB;AACzB,yDAEqC;AACrC,qEAE+C;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../schematics/ng-add/index.ts"],"names":[],"mappings":"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"}
|