@omnia/tooling-composers 8.0.62-dev → 8.0.63-dev
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/internal-do-not-import-from-here/ComponentComposer.js +1 -1
- package/internal-do-not-import-from-here/LoadableManifestRegistry.js +5 -5
- package/internal-do-not-import-from-here/ManifestGroupComposer.js +1 -1
- package/internal-do-not-import-from-here/ManifestRegistry.js +3 -3
- package/internal-do-not-import-from-here/ResourcesComposer.js +1 -1
- package/internal-do-not-import-from-here/task.js +5 -5
- package/package.json +3 -3
|
@@ -54,7 +54,7 @@ class ComponentComposer extends ComposerBase_1.ComposerBase {
|
|
|
54
54
|
this.manifest.resourceName = manifestName;
|
|
55
55
|
}
|
|
56
56
|
if (this.manifest.target === undefined) {
|
|
57
|
-
this.manifest.target = models_1.ClientManifestTargetTypes.
|
|
57
|
+
this.manifest.target = models_1.ClientManifestTargetTypes.public;
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
}
|
|
@@ -77,13 +77,13 @@ class CircularDependencyValidator {
|
|
|
77
77
|
class LoadableManifestRegistry {
|
|
78
78
|
static getManifestTargetName(target) {
|
|
79
79
|
switch (target.toString()) {
|
|
80
|
-
case models_1.ClientManifestTargetTypes.
|
|
80
|
+
case models_1.ClientManifestTargetTypes.public.toString():
|
|
81
81
|
return "public";
|
|
82
|
-
case models_1.ClientManifestTargetTypes.
|
|
82
|
+
case models_1.ClientManifestTargetTypes.admin.toString():
|
|
83
83
|
return "admin";
|
|
84
|
-
case models_1.ClientManifestTargetTypes.
|
|
84
|
+
case models_1.ClientManifestTargetTypes.editor.toString():
|
|
85
85
|
return "editor";
|
|
86
|
-
case models_1.ClientManifestTargetTypes.
|
|
86
|
+
case models_1.ClientManifestTargetTypes.docs.toString():
|
|
87
87
|
return "docs";
|
|
88
88
|
}
|
|
89
89
|
}
|
|
@@ -274,7 +274,7 @@ LoadableManifestRegistry.validateDependencies = (currentServiceId) => {
|
|
|
274
274
|
const manifestDependency = _a.ClientManifests.get(dep.manifestId);
|
|
275
275
|
// validate dependencies across manifest targets
|
|
276
276
|
// only allow dependency to manifest the same target or is public target
|
|
277
|
-
if (clientManifestWithDep.target !== manifestDependency.target && manifestDependency.target !== models_1.ClientManifestTargetTypes.
|
|
277
|
+
if (clientManifestWithDep.target !== manifestDependency.target && manifestDependency.target !== models_1.ClientManifestTargetTypes.public) {
|
|
278
278
|
(0, tooling_1.log)(`Manifest: ${manifestIdWithDep} with target ${_a.getManifestTargetName(clientManifestWithDep.target)} has dependency to ${dep.manifestId} with target ${_a.getManifestTargetName(manifestDependency.target)}`, tooling_1.LogTypes.Error);
|
|
279
279
|
console.log(clientManifestWithDep, manifestDependency);
|
|
280
280
|
throw new Error("Have exception");
|
|
@@ -49,7 +49,7 @@ class ManifestGroupComposer {
|
|
|
49
49
|
this.manifest.resourceName = manifestName;
|
|
50
50
|
}
|
|
51
51
|
if (this.manifest.target === undefined) {
|
|
52
|
-
this.manifest.target = models_1.ClientManifestTargetTypes.
|
|
52
|
+
this.manifest.target = models_1.ClientManifestTargetTypes.public;
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
55
|
}
|
|
@@ -50,15 +50,15 @@ ManifestRegistry.getCurrentManifestPath = () => {
|
|
|
50
50
|
ManifestRegistry.getClientManifests = (currentServiceId) => {
|
|
51
51
|
currentServiceId = Utils_1.Utils.ensureValidServiceId(currentServiceId, "Can't get client manifests for service id undefined/empty/null");
|
|
52
52
|
const manifestsByTarget = {
|
|
53
|
-
[models_1.ClientManifestTargetTypes.
|
|
54
|
-
target: models_1.ClientManifestTargetTypes.
|
|
53
|
+
[models_1.ClientManifestTargetTypes.public]: {
|
|
54
|
+
target: models_1.ClientManifestTargetTypes.public,
|
|
55
55
|
omniaServiceId: currentServiceId
|
|
56
56
|
}
|
|
57
57
|
};
|
|
58
58
|
for (let provider of ManifestRegistry.ClientManifestProviders) {
|
|
59
59
|
let providerManifests = provider.getClientManifests(currentServiceId);
|
|
60
60
|
for (let m of providerManifests) {
|
|
61
|
-
let target = manifestsByTarget[models_1.ClientManifestTargetTypes.
|
|
61
|
+
let target = manifestsByTarget[models_1.ClientManifestTargetTypes.public]; // default is public target
|
|
62
62
|
if (m.target) {
|
|
63
63
|
if (manifestsByTarget[m.target] === undefined) {
|
|
64
64
|
manifestsByTarget[m.target] = { target: m.target, omniaServiceId: currentServiceId };
|
|
@@ -75,7 +75,7 @@ class ResourcesComposer extends ComposerBase_1.ComposerBase {
|
|
|
75
75
|
this.manifest.resourceName = manifestName;
|
|
76
76
|
}
|
|
77
77
|
if (this.manifest.target === undefined) {
|
|
78
|
-
this.manifest.target = models_1.ClientManifestTargetTypes.
|
|
78
|
+
this.manifest.target = models_1.ClientManifestTargetTypes.public;
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
81
|
}
|
|
@@ -370,13 +370,13 @@ function afterGeneratedManifestsMetadata(data) {
|
|
|
370
370
|
}
|
|
371
371
|
function getManifestFileName(target) {
|
|
372
372
|
switch (target.toString()) {
|
|
373
|
-
case fx_models_1.ClientManifestTargetTypes.
|
|
373
|
+
case fx_models_1.ClientManifestTargetTypes.public.toString():
|
|
374
374
|
return `${getServiceId()}_public_manifests.json`;
|
|
375
|
-
case fx_models_1.ClientManifestTargetTypes.
|
|
375
|
+
case fx_models_1.ClientManifestTargetTypes.admin.toString():
|
|
376
376
|
return `${getServiceId()}_admin_manifests.json`;
|
|
377
|
-
case fx_models_1.ClientManifestTargetTypes.
|
|
377
|
+
case fx_models_1.ClientManifestTargetTypes.editor.toString():
|
|
378
378
|
return `${getServiceId()}_editor_manifests.json`;
|
|
379
|
-
case fx_models_1.ClientManifestTargetTypes.
|
|
379
|
+
case fx_models_1.ClientManifestTargetTypes.docs.toString():
|
|
380
380
|
return `${getServiceId()}_docs_manifests.json`;
|
|
381
381
|
}
|
|
382
382
|
}
|
|
@@ -492,7 +492,7 @@ function ensureFolder(folderPath) {
|
|
|
492
492
|
function chainError(err) {
|
|
493
493
|
return Promise.reject(err);
|
|
494
494
|
}
|
|
495
|
-
function getManifestJsonByTarget(target = fx_models_1.ClientManifestTargetTypes.
|
|
495
|
+
function getManifestJsonByTarget(target = fx_models_1.ClientManifestTargetTypes.public) {
|
|
496
496
|
if (!_manifestJsonObject || _manifestJsonObject[target] === undefined) {
|
|
497
497
|
_manifestJsonObject = _manifestJsonObject || {};
|
|
498
498
|
_manifestJsonObject[target] = null;
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@omnia/tooling-composers",
|
|
3
3
|
"license": "MIT",
|
|
4
|
-
"version": "8.0.
|
|
4
|
+
"version": "8.0.63-dev",
|
|
5
5
|
"description": "Provide tooling to work with manifest things.",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"test": "echo \"Error: no test specified\" && exit 1"
|
|
@@ -19,8 +19,8 @@
|
|
|
19
19
|
],
|
|
20
20
|
"author": "Precio Fishbone",
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@omnia/fx-models": "8.0.
|
|
23
|
-
"@omnia/tooling": "8.0.
|
|
22
|
+
"@omnia/fx-models": "8.0.63-dev",
|
|
23
|
+
"@omnia/tooling": "8.0.63-dev",
|
|
24
24
|
"deep-extend": "0.6.0",
|
|
25
25
|
"fs-extra": "11.1.0",
|
|
26
26
|
"del": "6.0.0",
|