@omnia/tooling-composers 8.0.115-vnext → 8.0.117-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/BlockingRegistry.js +1 -1
- package/internal-do-not-import-from-here/BuildConfigurationRegistry.js +1 -1
- package/internal-do-not-import-from-here/ComponentComposer.js +1 -1
- package/internal-do-not-import-from-here/ComponentRegistry.js +1 -1
- package/internal-do-not-import-from-here/Composer.js +1 -1
- package/internal-do-not-import-from-here/ConfigurationClientServiceRegistry.js +1 -1
- package/internal-do-not-import-from-here/CustomServiceComposer.js +1 -1
- package/internal-do-not-import-from-here/DevelopmentBuildConfiguration.js +1 -1
- package/internal-do-not-import-from-here/DevelopmentEnvironment.js +1 -1
- package/internal-do-not-import-from-here/DevelopmentHostingEnvironment.js +1 -1
- package/internal-do-not-import-from-here/ImportManifestRegistry.js +1 -1
- package/internal-do-not-import-from-here/LoadableManifestRegistry.js +51 -51
- package/internal-do-not-import-from-here/LocalizationComposer.js +1 -1
- package/internal-do-not-import-from-here/ManifestGroupComposer.js +1 -1
- package/internal-do-not-import-from-here/ManifestGroupRegistry.js +1 -1
- package/internal-do-not-import-from-here/ManifestRegistry.js +4 -4
- package/internal-do-not-import-from-here/RequestedResourcesRegistry.js +1 -1
- package/internal-do-not-import-from-here/RequiredAzureAdAppPermissionRegistry.js +1 -1
- package/internal-do-not-import-from-here/ResourceRegistry.js +1 -1
- package/internal-do-not-import-from-here/ResourcesComposer.js +1 -1
- package/internal-do-not-import-from-here/SecurityProviderManifestRegistry.js +1 -1
- package/internal-do-not-import-from-here/ServiceAppRegistry.js +1 -1
- package/internal-do-not-import-from-here/ServiceComposer.d.ts +1 -1
- package/internal-do-not-import-from-here/ServiceFeatureRegistry.js +1 -1
- package/internal-do-not-import-from-here/ServiceManifestRegistry.js +1 -1
- package/internal-do-not-import-from-here/ServiceRoleRegistry.js +1 -1
- package/internal-do-not-import-from-here/Utils.js +1 -1
- package/internal-do-not-import-from-here/models/Build.d.ts +7 -2
- package/internal-do-not-import-from-here/models/ComponentComposer.d.ts +1 -8
- package/internal-do-not-import-from-here/models/Enums.d.ts +1 -2
- package/internal-do-not-import-from-here/models/Enums.js +8 -9
- package/internal-do-not-import-from-here/models/ServerManifests.d.ts +2 -1
- package/internal-do-not-import-from-here/task.js +7 -6
- package/package.json +3 -3
|
@@ -18,6 +18,7 @@ class BlockInformation {
|
|
|
18
18
|
//}
|
|
19
19
|
class BlockingRegistry {
|
|
20
20
|
}
|
|
21
|
+
exports.BlockingRegistry = BlockingRegistry;
|
|
21
22
|
BlockingRegistry.BlockedManifests = [];
|
|
22
23
|
BlockingRegistry.addBlockedManifest = (omniaServiceId, manifestId) => {
|
|
23
24
|
omniaServiceId = Utils_1.Utils.ensureValidServiceId(omniaServiceId);
|
|
@@ -51,4 +52,3 @@ BlockingRegistry.clearState = () => {
|
|
|
51
52
|
BlockingRegistry.BlockedManifests = [];
|
|
52
53
|
};
|
|
53
54
|
BlockingRegistry.Subscription = ManifestRegistry_1.ManifestRegistry.registerClientManifestProvider(new ManifestRegistry_1.StaticClientManifestProviderProxy(BlockingRegistry.getClientManifests, BlockingRegistry.clearState));
|
|
54
|
-
exports.BlockingRegistry = BlockingRegistry;
|
|
@@ -4,6 +4,7 @@ exports.BuildConfigurationRegistry = void 0;
|
|
|
4
4
|
const ManifestRegistry_1 = require("./ManifestRegistry");
|
|
5
5
|
class BuildConfigurationRegistry {
|
|
6
6
|
}
|
|
7
|
+
exports.BuildConfigurationRegistry = BuildConfigurationRegistry;
|
|
7
8
|
BuildConfigurationRegistry.BuildOptions = null;
|
|
8
9
|
BuildConfigurationRegistry.AddBuildOptions = (buildOptions) => {
|
|
9
10
|
BuildConfigurationRegistry.BuildOptions = buildOptions;
|
|
@@ -23,4 +24,3 @@ BuildConfigurationRegistry.clearState = () => {
|
|
|
23
24
|
BuildConfigurationRegistry.BuildOptions = null;
|
|
24
25
|
};
|
|
25
26
|
BuildConfigurationRegistry.Subscription = ManifestRegistry_1.ManifestRegistry.registerClientManifestProvider(new ManifestRegistry_1.StaticClientManifestProviderProxy(BuildConfigurationRegistry.getClientManifests, BuildConfigurationRegistry.clearState));
|
|
26
|
-
exports.BuildConfigurationRegistry = BuildConfigurationRegistry;
|
|
@@ -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
|
}
|
|
@@ -72,6 +72,7 @@ class ComponentRegistry {
|
|
|
72
72
|
};
|
|
73
73
|
}
|
|
74
74
|
}
|
|
75
|
+
exports.ComponentRegistry = ComponentRegistry;
|
|
75
76
|
ComponentRegistry.ComponentRegistrations = new Map();
|
|
76
77
|
ComponentRegistry.ComponentElements = {};
|
|
77
78
|
ComponentRegistry.registerComponent = (manifest, componentOptions) => {
|
|
@@ -159,4 +160,3 @@ ComponentRegistry.ensureCorrectManifest = (manifest) => {
|
|
|
159
160
|
}
|
|
160
161
|
manifest.resourceId = Utils_1.Utils.ensureValidManifestId(manifest.resourceId);
|
|
161
162
|
};
|
|
162
|
-
exports.ComponentRegistry = ComponentRegistry;
|
|
@@ -63,6 +63,7 @@ class Composer {
|
|
|
63
63
|
return new BlockingComposer_1.BlockingComposer();
|
|
64
64
|
}
|
|
65
65
|
}
|
|
66
|
+
exports.Composer = Composer;
|
|
66
67
|
/**
|
|
67
68
|
* Registers a new manifest
|
|
68
69
|
* @param manifestId the unique id of the manifest, must be a valid guid.
|
|
@@ -93,4 +94,3 @@ Composer.importManifests = (folderPath) => {
|
|
|
93
94
|
}
|
|
94
95
|
};
|
|
95
96
|
};
|
|
96
|
-
exports.Composer = Composer;
|
|
@@ -68,6 +68,7 @@ class ConfigurationClientServiceRegistry {
|
|
|
68
68
|
return ConfigurationClientServiceRegistry.configurations;
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
|
+
exports.ConfigurationClientServiceRegistry = ConfigurationClientServiceRegistry;
|
|
71
72
|
ConfigurationClientServiceRegistry.configurations = {};
|
|
72
73
|
ConfigurationClientServiceRegistry.getClientManifests = (currentServiceId) => {
|
|
73
74
|
let result = new Array();
|
|
@@ -83,4 +84,3 @@ ConfigurationClientServiceRegistry.clearState = () => {
|
|
|
83
84
|
ConfigurationClientServiceRegistry.configurations = {};
|
|
84
85
|
};
|
|
85
86
|
ConfigurationClientServiceRegistry.Subscription = ManifestRegistry_1.ManifestRegistry.registerClientManifestProvider(new ManifestRegistry_1.StaticClientManifestProviderProxy(ConfigurationClientServiceRegistry.getClientManifests, ConfigurationClientServiceRegistry.clearState));
|
|
86
|
-
exports.ConfigurationClientServiceRegistry = ConfigurationClientServiceRegistry;
|
|
@@ -24,7 +24,7 @@ class CustomServiceComposer extends ServiceManifestComposer_1.ServiceManifestCom
|
|
|
24
24
|
ServiceManifestRegistry_1.ServiceManifestRegistry.AddService(serviceInfo);
|
|
25
25
|
}
|
|
26
26
|
runHelm(cmd) {
|
|
27
|
-
ServiceManifestRegistry_1.ServiceManifestRegistry.getServiceInfo().
|
|
27
|
+
ServiceManifestRegistry_1.ServiceManifestRegistry.getServiceInfo().helmCommand = cmd;
|
|
28
28
|
return this;
|
|
29
29
|
}
|
|
30
30
|
}
|
|
@@ -26,6 +26,7 @@ class DevelopmentBuildConfiguration {
|
|
|
26
26
|
return DevelopmentBuildConfiguration._enableMeasureBuild;
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
|
+
exports.DevelopmentBuildConfiguration = DevelopmentBuildConfiguration;
|
|
29
30
|
DevelopmentBuildConfiguration.getServerManifests = (currentServiceId) => {
|
|
30
31
|
let serverManifests = new Array();
|
|
31
32
|
return serverManifests;
|
|
@@ -34,4 +35,3 @@ DevelopmentBuildConfiguration.clearState = () => {
|
|
|
34
35
|
DevelopmentBuildConfiguration._disableBuild = false;
|
|
35
36
|
};
|
|
36
37
|
DevelopmentBuildConfiguration.clientSubscription = ManifestRegistry_1.ManifestRegistry.registerServerManifestProvider(new ManifestRegistry_1.StaticServerManifestProviderProxy(DevelopmentBuildConfiguration.getServerManifests, DevelopmentBuildConfiguration.clearState));
|
|
37
|
-
exports.DevelopmentBuildConfiguration = DevelopmentBuildConfiguration;
|
|
@@ -23,7 +23,7 @@ class DevelopmentEnvironment {
|
|
|
23
23
|
return new DevelopmentBuildConfiguration_1.DevelopmentBuildConfiguration();
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
|
+
exports.DevelopmentEnvironment = DevelopmentEnvironment;
|
|
26
27
|
DevelopmentEnvironment.localOverride = () => {
|
|
27
28
|
return new DevelopmentEnvironment(true);
|
|
28
29
|
};
|
|
29
|
-
exports.DevelopmentEnvironment = DevelopmentEnvironment;
|
|
@@ -76,6 +76,7 @@ class DevelopmentHostingEnvironment {
|
|
|
76
76
|
};
|
|
77
77
|
}
|
|
78
78
|
}
|
|
79
|
+
exports.DevelopmentHostingEnvironment = DevelopmentHostingEnvironment;
|
|
79
80
|
DevelopmentHostingEnvironment.getServerManifests = (currentServiceId) => {
|
|
80
81
|
let serverManifests = new Array();
|
|
81
82
|
return serverManifests;
|
|
@@ -84,4 +85,3 @@ DevelopmentHostingEnvironment.clearState = () => {
|
|
|
84
85
|
devHosting = null;
|
|
85
86
|
};
|
|
86
87
|
DevelopmentHostingEnvironment.ServerSubscription = ManifestRegistry_1.ManifestRegistry.registerServerManifestProvider(new ManifestRegistry_1.StaticServerManifestProviderProxy(DevelopmentHostingEnvironment.getServerManifests, DevelopmentHostingEnvironment.clearState));
|
|
87
|
-
exports.DevelopmentHostingEnvironment = DevelopmentHostingEnvironment;
|
|
@@ -4,6 +4,7 @@ exports.ImportManifestRegistry = void 0;
|
|
|
4
4
|
const ManifestRegistry_1 = require("./ManifestRegistry");
|
|
5
5
|
class ImportManifestRegistry {
|
|
6
6
|
}
|
|
7
|
+
exports.ImportManifestRegistry = ImportManifestRegistry;
|
|
7
8
|
ImportManifestRegistry.manifestPackagePaths = [];
|
|
8
9
|
ImportManifestRegistry.add = (path) => {
|
|
9
10
|
// use Set to filter duplicate
|
|
@@ -22,4 +23,3 @@ ImportManifestRegistry.clearState = () => {
|
|
|
22
23
|
ImportManifestRegistry.manifestPackagePaths = [];
|
|
23
24
|
};
|
|
24
25
|
ImportManifestRegistry.Subscription = ManifestRegistry_1.ManifestRegistry.registerClientManifestProvider(new ManifestRegistry_1.StaticClientManifestProviderProxy(ImportManifestRegistry.getClientManifests, ImportManifestRegistry.clearState));
|
|
25
|
-
exports.ImportManifestRegistry = ImportManifestRegistry;
|
|
@@ -77,17 +77,18 @@ 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
|
}
|
|
90
90
|
}
|
|
91
|
+
exports.LoadableManifestRegistry = LoadableManifestRegistry;
|
|
91
92
|
_a = LoadableManifestRegistry;
|
|
92
93
|
LoadableManifestRegistry.ManifestDependencies = new Map();
|
|
93
94
|
LoadableManifestRegistry.WithNoManifestDependencies = new Map();
|
|
@@ -98,57 +99,57 @@ LoadableManifestRegistry.RegisteredManifests = new Map();
|
|
|
98
99
|
LoadableManifestRegistry.ClientManifestProviders = [];
|
|
99
100
|
LoadableManifestRegistry.getRegisteredManifest = (manifestId) => {
|
|
100
101
|
manifestId = Utils_1.Utils.ensureValidManifestId(manifestId);
|
|
101
|
-
return
|
|
102
|
+
return _a.RegisteredManifests.get(manifestId);
|
|
102
103
|
};
|
|
103
104
|
LoadableManifestRegistry.withNoDependency = (manifestId) => {
|
|
104
105
|
manifestId = Utils_1.Utils.ensureValidManifestId(manifestId);
|
|
105
|
-
if (
|
|
106
|
+
if (_a.ManifestDependencies.get(manifestId)) {
|
|
106
107
|
new Error("Can't combine adding dependencies and also set withNoDependency, see manifest path: " + ManifestRegistry_1.ManifestRegistry.getCurrentManifestPath());
|
|
107
108
|
}
|
|
108
|
-
|
|
109
|
+
_a.WithNoManifestDependencies.set(manifestId, true);
|
|
109
110
|
};
|
|
110
111
|
LoadableManifestRegistry.isDefineWithNoDependency = (manifestId) => {
|
|
111
|
-
return
|
|
112
|
+
return _a.WithNoManifestDependencies.get(manifestId) === true;
|
|
112
113
|
};
|
|
113
114
|
LoadableManifestRegistry.addManifestDependency = (manifestId, dependentOnManifestId, dependentManifestOmniaServiceId = null) => {
|
|
114
115
|
manifestId = Utils_1.Utils.ensureValidManifestId(manifestId);
|
|
115
116
|
dependentOnManifestId = Utils_1.Utils.ensureValidManifestId(dependentOnManifestId, "Invalid depending manifest id");
|
|
116
|
-
if (
|
|
117
|
+
if (_a.WithNoManifestDependencies.get(manifestId) === true) {
|
|
117
118
|
new Error("Can't combine adding dependencies and also set withNoDependency, see manifest path: " + ManifestRegistry_1.ManifestRegistry.getCurrentManifestPath());
|
|
118
119
|
}
|
|
119
120
|
if (dependentManifestOmniaServiceId != null) {
|
|
120
121
|
dependentManifestOmniaServiceId = Utils_1.Utils.ensureValidServiceId(dependentManifestOmniaServiceId, "Invalid depending omnia service id");
|
|
121
122
|
}
|
|
122
123
|
let dependency = new ManifestDependency(dependentOnManifestId, ManifestRegistry_1.ManifestRegistry.getCurrentManifestPath(), dependentManifestOmniaServiceId);
|
|
123
|
-
if (
|
|
124
|
-
|
|
124
|
+
if (_a.ManifestDependencies.get(manifestId) == null) {
|
|
125
|
+
_a.ManifestDependencies.set(manifestId, []);
|
|
125
126
|
}
|
|
126
127
|
let alreadyAdded = false;
|
|
127
|
-
for (let currDep of
|
|
128
|
+
for (let currDep of _a.ManifestDependencies.get(manifestId)) {
|
|
128
129
|
if (currDep.manifestId.toString() === dependentOnManifestId.toString()) {
|
|
129
130
|
alreadyAdded = true;
|
|
130
131
|
break;
|
|
131
132
|
}
|
|
132
133
|
}
|
|
133
134
|
if (!alreadyAdded) {
|
|
134
|
-
|
|
135
|
+
_a.ManifestDependencies.get(manifestId).push(dependency);
|
|
135
136
|
}
|
|
136
137
|
};
|
|
137
138
|
LoadableManifestRegistry.getManifestDependencies = (manifestId, currentServiceId) => {
|
|
138
139
|
manifestId = Utils_1.Utils.ensureValidManifestId(manifestId);
|
|
139
140
|
currentServiceId = Utils_1.Utils.ensureValidServiceId(currentServiceId);
|
|
140
141
|
let result = [];
|
|
141
|
-
if (!
|
|
142
|
-
!
|
|
143
|
-
result =
|
|
142
|
+
if (!_a.WithNoManifestDependencies.get(manifestId) &&
|
|
143
|
+
!_a.ManifestDependencies.get(manifestId)) {
|
|
144
|
+
result = _a.getDefaultDependencies();
|
|
144
145
|
for (let def of result) {
|
|
145
146
|
if (def.resourceId == manifestId) {
|
|
146
147
|
throw new Error("Cirkular (default) dependency error for manifest id " + manifestId + ". Please specify withDependency or withNoDependency, as current manifest is part of default");
|
|
147
148
|
}
|
|
148
149
|
}
|
|
149
150
|
}
|
|
150
|
-
else if (
|
|
151
|
-
for (let dep of
|
|
151
|
+
else if (_a.ManifestDependencies.get(manifestId)) {
|
|
152
|
+
for (let dep of _a.ManifestDependencies.get(manifestId)) {
|
|
152
153
|
const bundleIdentity = {
|
|
153
154
|
resourceId: dep.manifestId
|
|
154
155
|
};
|
|
@@ -163,10 +164,10 @@ LoadableManifestRegistry.getManifestDependencies = (manifestId, currentServiceId
|
|
|
163
164
|
//This only seems to be used for detecting changes
|
|
164
165
|
LoadableManifestRegistry.getAllManifestDependencies = () => {
|
|
165
166
|
const dependencies = new Map();
|
|
166
|
-
for (const regis of
|
|
167
|
+
for (const regis of _a.ManifestDependencies) {
|
|
167
168
|
if (regis[1].length == 0 &&
|
|
168
|
-
|
|
169
|
-
dependencies.set(regis[0],
|
|
169
|
+
_a.WithNoManifestDependencies.get(regis[0]) !== true) {
|
|
170
|
+
dependencies.set(regis[0], _a.getDefaultDependencies());
|
|
170
171
|
}
|
|
171
172
|
else {
|
|
172
173
|
dependencies.set(regis[0], regis[1]);
|
|
@@ -179,14 +180,14 @@ LoadableManifestRegistry.addManifestVersion = (manifestId, type, version) => {
|
|
|
179
180
|
if (!version) {
|
|
180
181
|
throw new Error("Can't add manifest version null/empty/undefined to manifest id: " + manifestId);
|
|
181
182
|
}
|
|
182
|
-
if (!
|
|
183
|
-
|
|
183
|
+
if (!_a.ManifestVersions.get(manifestId)) {
|
|
184
|
+
_a.ManifestVersions.set(manifestId, {});
|
|
184
185
|
}
|
|
185
|
-
|
|
186
|
+
_a.ManifestVersions.get(manifestId)[type] = version;
|
|
186
187
|
};
|
|
187
188
|
LoadableManifestRegistry.getManifestVersion = (manifestId) => {
|
|
188
189
|
manifestId = Utils_1.Utils.ensureValidManifestId(manifestId, "Can't get manifest version for manifest id null/empty/undefined.");
|
|
189
|
-
let result =
|
|
190
|
+
let result = _a.ManifestVersions.get(manifestId);
|
|
190
191
|
if (!result) {
|
|
191
192
|
throw new Error(`Unexpected manifest ${manifestId}, build step has not set manifest version`);
|
|
192
193
|
}
|
|
@@ -194,23 +195,23 @@ LoadableManifestRegistry.getManifestVersion = (manifestId) => {
|
|
|
194
195
|
};
|
|
195
196
|
LoadableManifestRegistry.addManifestBundleType = (manifestId, type) => {
|
|
196
197
|
manifestId = Utils_1.Utils.ensureValidManifestId(manifestId, "Can't add manifest targetType to manifest id null/empty/undefined.");
|
|
197
|
-
if (
|
|
198
|
-
|
|
198
|
+
if (_a.ManifestFileTypes.get(manifestId) == null) {
|
|
199
|
+
_a.ManifestFileTypes.set(manifestId, []);
|
|
199
200
|
}
|
|
200
201
|
let exists = false;
|
|
201
|
-
for (let t of
|
|
202
|
+
for (let t of _a.ManifestFileTypes.get(manifestId)) {
|
|
202
203
|
if (t === type) {
|
|
203
204
|
exists = true;
|
|
204
205
|
break;
|
|
205
206
|
}
|
|
206
207
|
}
|
|
207
208
|
if (!exists) {
|
|
208
|
-
|
|
209
|
+
_a.ManifestFileTypes.get(manifestId).push(type);
|
|
209
210
|
}
|
|
210
211
|
};
|
|
211
212
|
LoadableManifestRegistry.getManifestBundleTypes = (manifestId) => {
|
|
212
213
|
manifestId = Utils_1.Utils.ensureValidManifestId(manifestId, "Can't add manifest bundle target types for manifest id null/empty/undefined.");
|
|
213
|
-
let result =
|
|
214
|
+
let result = _a.ManifestFileTypes.get(manifestId);
|
|
214
215
|
if (!result ||
|
|
215
216
|
(result &&
|
|
216
217
|
result.length == 0)) {
|
|
@@ -228,13 +229,13 @@ LoadableManifestRegistry.registerManifest = (manifest) => {
|
|
|
228
229
|
}
|
|
229
230
|
manifest.resourceId = Utils_1.Utils.ensureValidManifestId(manifest.resourceId);
|
|
230
231
|
manifest.resourceName = manifest.resourceName;
|
|
231
|
-
return
|
|
232
|
+
return _a.RegisteredManifests.set(manifest.resourceId, manifest);
|
|
232
233
|
};
|
|
233
234
|
LoadableManifestRegistry.registerManifestProvider = (provider) => {
|
|
234
235
|
if (!provider) {
|
|
235
236
|
throw new Error("Unexpected state, loadable client manifest provider can't be null/undefined");
|
|
236
237
|
}
|
|
237
|
-
|
|
238
|
+
_a.ClientManifestProviders.push(provider);
|
|
238
239
|
};
|
|
239
240
|
LoadableManifestRegistry.getClientManifests = (currentServiceId) => {
|
|
240
241
|
if (!currentServiceId) {
|
|
@@ -243,43 +244,43 @@ LoadableManifestRegistry.getClientManifests = (currentServiceId) => {
|
|
|
243
244
|
currentServiceId = Utils_1.Utils.ensureValidServiceId(currentServiceId);
|
|
244
245
|
let manifests = [];
|
|
245
246
|
//Note the order here could be important as the manifest types are ordered like this client side
|
|
246
|
-
for (let i =
|
|
247
|
-
let provider =
|
|
247
|
+
for (let i = _a.ClientManifestProviders.length - 1; i >= 0; i--) {
|
|
248
|
+
let provider = _a.ClientManifestProviders[i];
|
|
248
249
|
let providerManifests = provider.getClientLoadableManifests(currentServiceId);
|
|
249
250
|
for (let m of providerManifests) {
|
|
250
251
|
//Check conflict etc
|
|
251
|
-
|
|
252
|
+
_a.addClientManifest(currentServiceId, m);
|
|
252
253
|
}
|
|
253
254
|
}
|
|
254
|
-
|
|
255
|
-
for (const m of
|
|
255
|
+
_a.validateDependencies(currentServiceId);
|
|
256
|
+
for (const m of _a.ClientManifests.values()) {
|
|
256
257
|
manifests.push(m);
|
|
257
258
|
}
|
|
258
259
|
return manifests;
|
|
259
260
|
};
|
|
260
261
|
LoadableManifestRegistry.clearState = () => {
|
|
261
|
-
for (let provider of
|
|
262
|
+
for (let provider of _a.ClientManifestProviders) {
|
|
262
263
|
provider.clearState();
|
|
263
264
|
}
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
265
|
+
_a.ClientManifests = new Map();
|
|
266
|
+
_a.ClientManifestProviders = [];
|
|
267
|
+
_a.ManifestDependencies = new Map();
|
|
267
268
|
};
|
|
268
269
|
LoadableManifestRegistry.validateDependencies = (currentServiceId) => {
|
|
269
|
-
for (let manifestIdWithDep of
|
|
270
|
+
for (let manifestIdWithDep of _a.ManifestDependencies.keys()) {
|
|
270
271
|
const clientManifestWithDep = _a.ClientManifests.get(manifestIdWithDep);
|
|
271
|
-
for (let dep of
|
|
272
|
+
for (let dep of _a.ManifestDependencies.get(manifestIdWithDep)) {
|
|
272
273
|
if (dep.externalOmniaServiceId == null) {
|
|
273
274
|
const manifestDependency = _a.ClientManifests.get(dep.manifestId);
|
|
274
275
|
// validate dependencies across manifest targets
|
|
275
276
|
// only allow dependency to manifest the same target or is public target
|
|
276
|
-
if (clientManifestWithDep.target !== manifestDependency.target && manifestDependency.target !== models_1.ClientManifestTargetTypes.
|
|
277
|
+
if (clientManifestWithDep.target !== manifestDependency.target && manifestDependency.target !== models_1.ClientManifestTargetTypes.public) {
|
|
277
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);
|
|
278
279
|
console.log(clientManifestWithDep, manifestDependency);
|
|
279
280
|
throw new Error("Have exception");
|
|
280
281
|
}
|
|
281
282
|
}
|
|
282
|
-
new CircularDependencyValidator(
|
|
283
|
+
new CircularDependencyValidator(_a.ManifestDependencies, _a.WithNoManifestDependencies, _a.getDefaultDependencies(), manifestIdWithDep, dep);
|
|
283
284
|
/* This check is prob not needed, as groups is just a package from which individual stuff is loaded
|
|
284
285
|
//Check groups
|
|
285
286
|
if (LoadableManifestRegistry.ClientManifests[manifestIdWithDep].manifestType == ClientManifestTypes.ManifestGroup) {
|
|
@@ -304,7 +305,7 @@ LoadableManifestRegistry.validateDependencies = (currentServiceId) => {
|
|
|
304
305
|
throw new Error("Manifest: " + dep.manifestPath + " has dependency to " + dep.manifestId + " which is marked as external, but the omnia service id matches the current omnia service id: " + currentServiceId + ". Add dependency as none external or insure a correct omnia service id");
|
|
305
306
|
}
|
|
306
307
|
if (dep.externalOmniaServiceId == null &&
|
|
307
|
-
|
|
308
|
+
_a.ClientManifests.get(dep.manifestId) == null) {
|
|
308
309
|
throw new Error("Manifest: " + dep.manifestPath + " has dependency to " + dep.manifestId + " which could not be found. Mark the dependency as external if it's not part of the current project.");
|
|
309
310
|
}
|
|
310
311
|
}
|
|
@@ -320,13 +321,13 @@ LoadableManifestRegistry.addClientManifest = (omniaServiceId, manifest) => {
|
|
|
320
321
|
if (manifest.omniaServiceId && manifest.omniaServiceId !== omniaServiceId) {
|
|
321
322
|
throw new Error("Unexpected state, client manifest omnia service id should match current omnia service id:" + omniaServiceId + " manifest: " + JSON.stringify(manifest));
|
|
322
323
|
}
|
|
323
|
-
if (
|
|
324
|
+
if (_a.ClientManifests.get(manifest.resourceId) != null) {
|
|
324
325
|
throw new Error("Unexpected state, client manifest id's should be unique and added once. Already added: "
|
|
325
|
-
+ JSON.stringify(
|
|
326
|
+
+ JSON.stringify(_a.ClientManifests.get(manifest.resourceId))
|
|
326
327
|
+ " trying to add: " +
|
|
327
328
|
JSON.stringify(manifest));
|
|
328
329
|
}
|
|
329
|
-
|
|
330
|
+
_a.ClientManifests.set(manifest.resourceId, manifest);
|
|
330
331
|
};
|
|
331
332
|
LoadableManifestRegistry.getDefaultDependencies = () => {
|
|
332
333
|
return [
|
|
@@ -338,5 +339,4 @@ LoadableManifestRegistry.getDefaultDependencies = () => {
|
|
|
338
339
|
];
|
|
339
340
|
};
|
|
340
341
|
//Just dummy to register subscriber
|
|
341
|
-
LoadableManifestRegistry.Subscription = ManifestRegistry_1.ManifestRegistry.registerClientManifestProvider(new ManifestRegistry_1.StaticClientManifestProviderProxy(
|
|
342
|
-
exports.LoadableManifestRegistry = LoadableManifestRegistry;
|
|
342
|
+
LoadableManifestRegistry.Subscription = ManifestRegistry_1.ManifestRegistry.registerClientManifestProvider(new ManifestRegistry_1.StaticClientManifestProviderProxy(_a.getClientManifests, _a.clearState));
|
|
@@ -49,6 +49,7 @@ class Localization {
|
|
|
49
49
|
return this;
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
|
+
exports.Localization = Localization;
|
|
52
53
|
Localization.localizationRegistrations = [];
|
|
53
54
|
Localization.getRegistrations = () => {
|
|
54
55
|
return Localization.localizationRegistrations;
|
|
@@ -64,7 +65,6 @@ Localization.clearState = () => {
|
|
|
64
65
|
_localizations = {};
|
|
65
66
|
};
|
|
66
67
|
Localization.Subscription = ManifestRegistry_1.ManifestRegistry.registerClientManifestProvider(new ManifestRegistry_1.StaticClientManifestProviderProxy(Localization.getClientManifests, Localization.clearState));
|
|
67
|
-
exports.Localization = Localization;
|
|
68
68
|
class LocalizationNamespaceComposer {
|
|
69
69
|
constructor(root, manifestId) {
|
|
70
70
|
this.add = (localizeObject) => {
|
|
@@ -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
|
}
|
|
@@ -63,6 +63,7 @@ class ManifestGroupRegistry {
|
|
|
63
63
|
};
|
|
64
64
|
}
|
|
65
65
|
}
|
|
66
|
+
exports.ManifestGroupRegistry = ManifestGroupRegistry;
|
|
66
67
|
ManifestGroupRegistry.ManifestGroupRegistrations = new Map();
|
|
67
68
|
ManifestGroupRegistry._registeredManifestProvider = false;
|
|
68
69
|
ManifestGroupRegistry.registerManifestGroup = (manifest, groupOptions) => {
|
|
@@ -157,4 +158,3 @@ ManifestGroupRegistry.clearManifestGroupRegistrations = () => {
|
|
|
157
158
|
ManifestGroupRegistry.ManifestGroupRegistrations = new Map();
|
|
158
159
|
};
|
|
159
160
|
ManifestGroupRegistry.ServerSubscription = ManifestRegistry_1.ManifestRegistry.registerServerManifestProvider(new ManifestRegistry_1.StaticServerManifestProviderProxy(() => { return new Array(); }, ManifestGroupRegistry.clearManifestGroupRegistrations));
|
|
160
|
-
exports.ManifestGroupRegistry = ManifestGroupRegistry;
|
|
@@ -19,6 +19,7 @@ class StaticServerManifestProviderProxy {
|
|
|
19
19
|
exports.StaticServerManifestProviderProxy = StaticServerManifestProviderProxy;
|
|
20
20
|
class ManifestRegistry {
|
|
21
21
|
}
|
|
22
|
+
exports.ManifestRegistry = ManifestRegistry;
|
|
22
23
|
ManifestRegistry.CurrentManifestPath = null;
|
|
23
24
|
ManifestRegistry.ClientManifestProviders = [];
|
|
24
25
|
ManifestRegistry.ServerManifestProviders = [];
|
|
@@ -49,15 +50,15 @@ ManifestRegistry.getCurrentManifestPath = () => {
|
|
|
49
50
|
ManifestRegistry.getClientManifests = (currentServiceId) => {
|
|
50
51
|
currentServiceId = Utils_1.Utils.ensureValidServiceId(currentServiceId, "Can't get client manifests for service id undefined/empty/null");
|
|
51
52
|
const manifestsByTarget = {
|
|
52
|
-
[models_1.ClientManifestTargetTypes.
|
|
53
|
-
target: models_1.ClientManifestTargetTypes.
|
|
53
|
+
[models_1.ClientManifestTargetTypes.public]: {
|
|
54
|
+
target: models_1.ClientManifestTargetTypes.public,
|
|
54
55
|
omniaServiceId: currentServiceId
|
|
55
56
|
}
|
|
56
57
|
};
|
|
57
58
|
for (let provider of ManifestRegistry.ClientManifestProviders) {
|
|
58
59
|
let providerManifests = provider.getClientManifests(currentServiceId);
|
|
59
60
|
for (let m of providerManifests) {
|
|
60
|
-
let target = manifestsByTarget[models_1.ClientManifestTargetTypes.
|
|
61
|
+
let target = manifestsByTarget[models_1.ClientManifestTargetTypes.public]; // default is public target
|
|
61
62
|
if (m.target) {
|
|
62
63
|
if (manifestsByTarget[m.target] === undefined) {
|
|
63
64
|
manifestsByTarget[m.target] = { target: m.target, omniaServiceId: currentServiceId };
|
|
@@ -108,4 +109,3 @@ ManifestRegistry.addResetableProvider = (provider) => {
|
|
|
108
109
|
ManifestRegistry.ResetableManifestProviders.push(provider);
|
|
109
110
|
}
|
|
110
111
|
};
|
|
111
|
-
exports.ManifestRegistry = ManifestRegistry;
|
|
@@ -8,6 +8,7 @@ const deep_extend_1 = tslib_1.__importDefault(require("deep-extend"));
|
|
|
8
8
|
const models_1 = require("../../fx-models");
|
|
9
9
|
class RequestedResourcesRegistry {
|
|
10
10
|
}
|
|
11
|
+
exports.RequestedResourcesRegistry = RequestedResourcesRegistry;
|
|
11
12
|
RequestedResourcesRegistry.RequestedResources = {};
|
|
12
13
|
RequestedResourcesRegistry.AddSql = (option) => {
|
|
13
14
|
if (!models_1.Guid.isValid(option.uniqueId)) {
|
|
@@ -62,4 +63,3 @@ RequestedResourcesRegistry.clearState = () => {
|
|
|
62
63
|
RequestedResourcesRegistry.RequestedResources = {};
|
|
63
64
|
};
|
|
64
65
|
RequestedResourcesRegistry.ServerSubscription = ManifestRegistry_1.ManifestRegistry.registerServerManifestProvider(new ManifestRegistry_1.StaticServerManifestProviderProxy(RequestedResourcesRegistry.getServerManifests, RequestedResourcesRegistry.clearState));
|
|
65
|
-
exports.RequestedResourcesRegistry = RequestedResourcesRegistry;
|
|
@@ -21,6 +21,7 @@ class RequiredAzureAdAppPermissionRegistry {
|
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
}
|
|
24
|
+
exports.RequiredAzureAdAppPermissionRegistry = RequiredAzureAdAppPermissionRegistry;
|
|
24
25
|
RequiredAzureAdAppPermissionRegistry.RequiredApis = {};
|
|
25
26
|
RequiredAzureAdAppPermissionRegistry.getServerManifests = (currentServiceId) => {
|
|
26
27
|
let serverManifests = new Array();
|
|
@@ -33,4 +34,3 @@ RequiredAzureAdAppPermissionRegistry.clearState = () => {
|
|
|
33
34
|
RequiredAzureAdAppPermissionRegistry.RequiredApis = {};
|
|
34
35
|
};
|
|
35
36
|
RequiredAzureAdAppPermissionRegistry.ServerSubscription = ManifestRegistry_1.ManifestRegistry.registerServerManifestProvider(new ManifestRegistry_1.StaticServerManifestProviderProxy(RequiredAzureAdAppPermissionRegistry.getServerManifests, RequiredAzureAdAppPermissionRegistry.clearState));
|
|
36
|
-
exports.RequiredAzureAdAppPermissionRegistry = RequiredAzureAdAppPermissionRegistry;
|
|
@@ -75,6 +75,7 @@ class ResourceRegistry {
|
|
|
75
75
|
};
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
|
+
exports.ResourceRegistry = ResourceRegistry;
|
|
78
79
|
ResourceRegistry.ResourceRegistrations = new Map();
|
|
79
80
|
ResourceRegistry.registerResource = (manifest, resourceDescription) => {
|
|
80
81
|
ResourceRegistry.ensureCorrectManifest(manifest);
|
|
@@ -220,4 +221,3 @@ ResourceRegistry.ensureCorrectManifest = (manifest) => {
|
|
|
220
221
|
}
|
|
221
222
|
manifest.resourceId = Utils_1.Utils.ensureValidManifestId(manifest.resourceId);
|
|
222
223
|
};
|
|
223
|
-
exports.ResourceRegistry = ResourceRegistry;
|
|
@@ -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
|
}
|
|
@@ -5,6 +5,7 @@ const ManifestRegistry_1 = require("./ManifestRegistry");
|
|
|
5
5
|
const index_1 = require("./models/index");
|
|
6
6
|
class SecurityProviderManifestRegistry {
|
|
7
7
|
}
|
|
8
|
+
exports.SecurityProviderManifestRegistry = SecurityProviderManifestRegistry;
|
|
8
9
|
SecurityProviderManifestRegistry.SecurityProviders = [];
|
|
9
10
|
SecurityProviderManifestRegistry.getServerManifests = (currentServiceId) => {
|
|
10
11
|
let result = [];
|
|
@@ -29,4 +30,3 @@ SecurityProviderManifestRegistry.clearState = () => {
|
|
|
29
30
|
SecurityProviderManifestRegistry.SecurityProviders = [];
|
|
30
31
|
};
|
|
31
32
|
SecurityProviderManifestRegistry.ServerSubscription = ManifestRegistry_1.ManifestRegistry.registerServerManifestProvider(new ManifestRegistry_1.StaticServerManifestProviderProxy(SecurityProviderManifestRegistry.getServerManifests, SecurityProviderManifestRegistry.clearState));
|
|
32
|
-
exports.SecurityProviderManifestRegistry = SecurityProviderManifestRegistry;
|
|
@@ -8,6 +8,7 @@ const deep_extend_1 = tslib_1.__importDefault(require("deep-extend"));
|
|
|
8
8
|
const models_1 = require("../../fx-models");
|
|
9
9
|
class ServiceAppRegistry {
|
|
10
10
|
}
|
|
11
|
+
exports.ServiceAppRegistry = ServiceAppRegistry;
|
|
11
12
|
ServiceAppRegistry.AddedAppDefinitions = {};
|
|
12
13
|
ServiceAppRegistry.AddAppDefinition = (appDefinitionId, option) => {
|
|
13
14
|
if (appDefinitionId == models_1.Guid.empty) {
|
|
@@ -34,4 +35,3 @@ ServiceAppRegistry.clearState = () => {
|
|
|
34
35
|
ServiceAppRegistry.AddedAppDefinitions = {};
|
|
35
36
|
};
|
|
36
37
|
ServiceAppRegistry.ServerSubscription = ManifestRegistry_1.ManifestRegistry.registerServerManifestProvider(new ManifestRegistry_1.StaticServerManifestProviderProxy(ServiceAppRegistry.getServerManifests, ServiceAppRegistry.clearState));
|
|
37
|
-
exports.ServiceAppRegistry = ServiceAppRegistry;
|
|
@@ -19,7 +19,7 @@ export interface IServiceComposer {
|
|
|
19
19
|
*/
|
|
20
20
|
AsWorker: () => IWorkerServiceComposer;
|
|
21
21
|
/**
|
|
22
|
-
* Register service to be of custom type (to install
|
|
22
|
+
* Register service to be of custom type (to install helm)
|
|
23
23
|
*/
|
|
24
24
|
AsCustom: () => ICustomServiceComposer;
|
|
25
25
|
}
|
|
@@ -9,6 +9,7 @@ const models_1 = require("../../fx-models");
|
|
|
9
9
|
const AzureAdAppPermissionHelper_1 = require("./AzureAdAppPermissionHelper");
|
|
10
10
|
class ServiceFeatureRegistry {
|
|
11
11
|
}
|
|
12
|
+
exports.ServiceFeatureRegistry = ServiceFeatureRegistry;
|
|
12
13
|
ServiceFeatureRegistry.AddedFeatures = {};
|
|
13
14
|
ServiceFeatureRegistry.AddFeature = (featureId, option) => {
|
|
14
15
|
if (featureId == models_1.Guid.empty) {
|
|
@@ -36,4 +37,3 @@ ServiceFeatureRegistry.clearState = () => {
|
|
|
36
37
|
ServiceFeatureRegistry.AddedFeatures = {};
|
|
37
38
|
};
|
|
38
39
|
ServiceFeatureRegistry.ServerSubscription = ManifestRegistry_1.ManifestRegistry.registerServerManifestProvider(new ManifestRegistry_1.StaticServerManifestProviderProxy(ServiceFeatureRegistry.getServerManifests, ServiceFeatureRegistry.clearState));
|
|
39
|
-
exports.ServiceFeatureRegistry = ServiceFeatureRegistry;
|
|
@@ -5,6 +5,7 @@ const index_1 = require("./models/index");
|
|
|
5
5
|
const ManifestRegistry_1 = require("./ManifestRegistry");
|
|
6
6
|
class ServiceManifestRegistry {
|
|
7
7
|
}
|
|
8
|
+
exports.ServiceManifestRegistry = ServiceManifestRegistry;
|
|
8
9
|
ServiceManifestRegistry.Service = null;
|
|
9
10
|
ServiceManifestRegistry.AddService = (service) => {
|
|
10
11
|
if (!(service.serviceType === index_1.ServiceTypes.WebApp ||
|
|
@@ -34,4 +35,3 @@ ServiceManifestRegistry.clearState = () => {
|
|
|
34
35
|
ServiceManifestRegistry.Service = null;
|
|
35
36
|
};
|
|
36
37
|
ServiceManifestRegistry.ServerSubscription = ManifestRegistry_1.ManifestRegistry.registerServerManifestProvider(new ManifestRegistry_1.StaticServerManifestProviderProxy(ServiceManifestRegistry.getServerManifests, ServiceManifestRegistry.clearState));
|
|
37
|
-
exports.ServiceManifestRegistry = ServiceManifestRegistry;
|
|
@@ -8,6 +8,7 @@ const deep_extend_1 = tslib_1.__importDefault(require("deep-extend"));
|
|
|
8
8
|
const models_1 = require("../../fx-models");
|
|
9
9
|
class ServiceRoleRegistry {
|
|
10
10
|
}
|
|
11
|
+
exports.ServiceRoleRegistry = ServiceRoleRegistry;
|
|
11
12
|
ServiceRoleRegistry.AddedRoleDefinitions = {};
|
|
12
13
|
ServiceRoleRegistry.AddRoleDefinition = (roleDefinitionId, option) => {
|
|
13
14
|
if (roleDefinitionId == models_1.Guid.empty) {
|
|
@@ -34,4 +35,3 @@ ServiceRoleRegistry.clearState = () => {
|
|
|
34
35
|
ServiceRoleRegistry.AddedRoleDefinitions = {};
|
|
35
36
|
};
|
|
36
37
|
ServiceRoleRegistry.ServerSubscription = ManifestRegistry_1.ManifestRegistry.registerServerManifestProvider(new ManifestRegistry_1.StaticServerManifestProviderProxy(ServiceRoleRegistry.getServerManifests, ServiceRoleRegistry.clearState));
|
|
37
|
-
exports.ServiceRoleRegistry = ServiceRoleRegistry;
|
|
@@ -66,6 +66,7 @@ class Utils {
|
|
|
66
66
|
return [apiPath, configuration];
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
|
+
exports.Utils = Utils;
|
|
69
70
|
Utils.ensureValidManifestId = (id, errorMsg) => {
|
|
70
71
|
if (!id) {
|
|
71
72
|
throw new Error(errorMsg ? errorMsg : "Invalid manifest id, can't be null/empty or undefined");
|
|
@@ -145,4 +146,3 @@ Utils.isNull = (obj) => {
|
|
|
145
146
|
Utils.isNullOrEmpty = (obj) => {
|
|
146
147
|
return Utils.isNull(obj) || obj === "";
|
|
147
148
|
};
|
|
148
|
-
exports.Utils = Utils;
|
|
@@ -32,6 +32,11 @@ export interface BuildOptions {
|
|
|
32
32
|
* Usage: reference:["omnia.vendor.manifest.json"]
|
|
33
33
|
*/
|
|
34
34
|
reference?: Array<string>;
|
|
35
|
+
/**
|
|
36
|
+
* Specifies a list prebuild webpack manifests to improve build next time.
|
|
37
|
+
* Usage: reference:["omnia.vendor.manifest.json"]
|
|
38
|
+
*/
|
|
39
|
+
webpackManifests?: Array<string>;
|
|
35
40
|
/**
|
|
36
41
|
* Prevent webpack from parsing any files matching the given regular expression(s).
|
|
37
42
|
* Ignored files should not have calls to import, require, define or any other importing mechanism.
|
|
@@ -51,9 +56,9 @@ export interface BuildOptions {
|
|
|
51
56
|
*/
|
|
52
57
|
docResourceManifestId?: GuidValue;
|
|
53
58
|
/**
|
|
54
|
-
* Create a namespace to
|
|
59
|
+
* Create a namespace to element name.
|
|
55
60
|
*/
|
|
56
|
-
|
|
61
|
+
componentNamespace?: string;
|
|
57
62
|
}
|
|
58
63
|
export interface CircularDependencyOptions {
|
|
59
64
|
/**
|
|
@@ -8,15 +8,8 @@ export interface ElementOptions {
|
|
|
8
8
|
Paths should be relative project root, or relative current folder
|
|
9
9
|
*/
|
|
10
10
|
entryPoint: string;
|
|
11
|
-
|
|
12
|
-
e.g. './ComponentFolder/ComponentTypings.d.ts'
|
|
13
|
-
Paths should be relative project root or relative current folder
|
|
14
|
-
*/
|
|
11
|
+
namespace?: string;
|
|
15
12
|
typings?: Array<string>;
|
|
16
|
-
/** The path to a .d.ts file containing the intrinsic declaration for the web component
|
|
17
|
-
e.g. './ComponentFolder/ComponentTypings.d.ts'
|
|
18
|
-
Paths should be relative project root or relative current folder
|
|
19
|
-
*/
|
|
20
13
|
documentations?: Array<string>;
|
|
21
14
|
}
|
|
22
15
|
export interface ResourceBuildOptions {
|
|
@@ -34,8 +34,7 @@ export declare enum ServerManifestTypes {
|
|
|
34
34
|
ServiceFeature = "servicefeature",
|
|
35
35
|
ServiceAppDefinition = "serviceappdefinition",
|
|
36
36
|
AzureADAppPermission = "azureadapppermission",
|
|
37
|
-
ServiceRoleDefinition = "serviceroledefinition"
|
|
38
|
-
HemlProvider = "hemlprovider"
|
|
37
|
+
ServiceRoleDefinition = "serviceroledefinition"
|
|
39
38
|
}
|
|
40
39
|
export declare enum BundleTargetTypes {
|
|
41
40
|
Javascript = "js",
|
|
@@ -6,36 +6,36 @@ var RequestedResourceTypes;
|
|
|
6
6
|
RequestedResourceTypes["SqlDatabase"] = "SqlDatabase";
|
|
7
7
|
RequestedResourceTypes["SqlElasticPoolDatabase"] = "SqlElasticPoolDatabase";
|
|
8
8
|
RequestedResourceTypes["PersistentDisk"] = "PersistentDisk";
|
|
9
|
-
})(RequestedResourceTypes
|
|
9
|
+
})(RequestedResourceTypes || (exports.RequestedResourceTypes = RequestedResourceTypes = {}));
|
|
10
10
|
var ServiceTypes;
|
|
11
11
|
(function (ServiceTypes) {
|
|
12
12
|
ServiceTypes["WebApp"] = "WebAppService";
|
|
13
13
|
ServiceTypes["Worker"] = "WorkerService";
|
|
14
14
|
ServiceTypes["Custom"] = "CustomService";
|
|
15
|
-
})(ServiceTypes
|
|
15
|
+
})(ServiceTypes || (exports.ServiceTypes = ServiceTypes = {}));
|
|
16
16
|
var SecurityProviderTypes;
|
|
17
17
|
(function (SecurityProviderTypes) {
|
|
18
18
|
SecurityProviderTypes["RoleBased"] = "RoleBasedProvider";
|
|
19
19
|
SecurityProviderTypes["Combined"] = "CombinedProviders";
|
|
20
|
-
})(SecurityProviderTypes
|
|
20
|
+
})(SecurityProviderTypes || (exports.SecurityProviderTypes = SecurityProviderTypes = {}));
|
|
21
21
|
var SecurityRoleScopes;
|
|
22
22
|
(function (SecurityRoleScopes) {
|
|
23
23
|
SecurityRoleScopes["Tenant"] = "Tenant";
|
|
24
24
|
SecurityRoleScopes["SiteCollection"] = "SiteCollection";
|
|
25
25
|
SecurityRoleScopes["Site"] = "Site";
|
|
26
|
-
})(SecurityRoleScopes
|
|
26
|
+
})(SecurityRoleScopes || (exports.SecurityRoleScopes = SecurityRoleScopes = {}));
|
|
27
27
|
var RuleLogicalOperator;
|
|
28
28
|
(function (RuleLogicalOperator) {
|
|
29
29
|
RuleLogicalOperator["And"] = "&&";
|
|
30
30
|
RuleLogicalOperator["Or"] = "||";
|
|
31
|
-
})(RuleLogicalOperator
|
|
31
|
+
})(RuleLogicalOperator || (exports.RuleLogicalOperator = RuleLogicalOperator = {}));
|
|
32
32
|
var ClientManifestTypes;
|
|
33
33
|
(function (ClientManifestTypes) {
|
|
34
34
|
ClientManifestTypes["Component"] = "webcomponent";
|
|
35
35
|
ClientManifestTypes["ManifestGroup"] = "groupedResouresAndComponents";
|
|
36
36
|
ClientManifestTypes["Resource"] = "resource";
|
|
37
37
|
ClientManifestTypes["BlockedManifest"] = "blockedManifest";
|
|
38
|
-
})(ClientManifestTypes
|
|
38
|
+
})(ClientManifestTypes || (exports.ClientManifestTypes = ClientManifestTypes = {}));
|
|
39
39
|
var ServerManifestTypes;
|
|
40
40
|
(function (ServerManifestTypes) {
|
|
41
41
|
ServerManifestTypes["SecurityProvider"] = "securityprovider";
|
|
@@ -45,10 +45,9 @@ var ServerManifestTypes;
|
|
|
45
45
|
ServerManifestTypes["ServiceAppDefinition"] = "serviceappdefinition";
|
|
46
46
|
ServerManifestTypes["AzureADAppPermission"] = "azureadapppermission";
|
|
47
47
|
ServerManifestTypes["ServiceRoleDefinition"] = "serviceroledefinition";
|
|
48
|
-
|
|
49
|
-
})(ServerManifestTypes = exports.ServerManifestTypes || (exports.ServerManifestTypes = {}));
|
|
48
|
+
})(ServerManifestTypes || (exports.ServerManifestTypes = ServerManifestTypes = {}));
|
|
50
49
|
var BundleTargetTypes;
|
|
51
50
|
(function (BundleTargetTypes) {
|
|
52
51
|
BundleTargetTypes["Javascript"] = "js";
|
|
53
52
|
BundleTargetTypes["Stylesheet"] = "css";
|
|
54
|
-
})(BundleTargetTypes
|
|
53
|
+
})(BundleTargetTypes || (exports.BundleTargetTypes = BundleTargetTypes = {}));
|
|
@@ -99,6 +99,7 @@ export interface AppResourceType {
|
|
|
99
99
|
parameters: Array<ServiceParam>;
|
|
100
100
|
providedParameters: Array<ServiceParam>;
|
|
101
101
|
requiredFeatures?: Array<GuidValue>;
|
|
102
|
+
requiredEnvironments?: Array<string>;
|
|
102
103
|
}
|
|
103
104
|
export interface ServiceAppDefinitionOption {
|
|
104
105
|
title: string;
|
|
@@ -219,7 +220,7 @@ export interface ServiceBase extends ServiceOptions {
|
|
|
219
220
|
optionalService: boolean;
|
|
220
221
|
}
|
|
221
222
|
export interface CustomService extends ServiceBase {
|
|
222
|
-
|
|
223
|
+
helmCommand?: string;
|
|
223
224
|
}
|
|
224
225
|
export interface ServiceManifest extends ServiceBase, ServerManifest {
|
|
225
226
|
}
|
|
@@ -150,7 +150,8 @@ function build(scanFolders, cleanOutputBeforeBuild) {
|
|
|
150
150
|
resolve();
|
|
151
151
|
}
|
|
152
152
|
else if (process.argv.length > 0
|
|
153
|
-
&& process.argv.find(argv => argv === "--package") !== undefined
|
|
153
|
+
&& (process.argv.find(argv => argv === "--package") !== undefined
|
|
154
|
+
|| process.argv.find(argv => argv === "--webpackManifest") !== undefined)) {
|
|
154
155
|
cleanOutput = false;
|
|
155
156
|
afterScanManifest()
|
|
156
157
|
.then(beforeBundleManifest, chainError)
|
|
@@ -370,13 +371,13 @@ function afterGeneratedManifestsMetadata(data) {
|
|
|
370
371
|
}
|
|
371
372
|
function getManifestFileName(target) {
|
|
372
373
|
switch (target.toString()) {
|
|
373
|
-
case fx_models_1.ClientManifestTargetTypes.
|
|
374
|
+
case fx_models_1.ClientManifestTargetTypes.public.toString():
|
|
374
375
|
return `${getServiceId()}_public_manifests.json`;
|
|
375
|
-
case fx_models_1.ClientManifestTargetTypes.
|
|
376
|
+
case fx_models_1.ClientManifestTargetTypes.admin.toString():
|
|
376
377
|
return `${getServiceId()}_admin_manifests.json`;
|
|
377
|
-
case fx_models_1.ClientManifestTargetTypes.
|
|
378
|
+
case fx_models_1.ClientManifestTargetTypes.editor.toString():
|
|
378
379
|
return `${getServiceId()}_editor_manifests.json`;
|
|
379
|
-
case fx_models_1.ClientManifestTargetTypes.
|
|
380
|
+
case fx_models_1.ClientManifestTargetTypes.docs.toString():
|
|
380
381
|
return `${getServiceId()}_docs_manifests.json`;
|
|
381
382
|
}
|
|
382
383
|
}
|
|
@@ -492,7 +493,7 @@ function ensureFolder(folderPath) {
|
|
|
492
493
|
function chainError(err) {
|
|
493
494
|
return Promise.reject(err);
|
|
494
495
|
}
|
|
495
|
-
function getManifestJsonByTarget(target = fx_models_1.ClientManifestTargetTypes.
|
|
496
|
+
function getManifestJsonByTarget(target = fx_models_1.ClientManifestTargetTypes.public) {
|
|
496
497
|
if (!_manifestJsonObject || _manifestJsonObject[target] === undefined) {
|
|
497
498
|
_manifestJsonObject = _manifestJsonObject || {};
|
|
498
499
|
_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.117-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.117-dev",
|
|
23
|
+
"@omnia/tooling": "8.0.117-dev",
|
|
24
24
|
"deep-extend": "0.6.0",
|
|
25
25
|
"fs-extra": "11.1.0",
|
|
26
26
|
"del": "6.0.0",
|