@sasjs/utils 2.40.0 → 2.40.1
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 +1 -1
- package/types/target.d.ts +6 -6
- package/types/target.js +16 -7
- package/types/target.js.map +1 -1
package/package.json
CHANGED
package/types/target.d.ts
CHANGED
|
@@ -18,9 +18,9 @@ export interface TargetJson {
|
|
|
18
18
|
serviceConfig?: ServiceConfig;
|
|
19
19
|
jobConfig?: JobConfig;
|
|
20
20
|
streamConfig?: StreamConfig;
|
|
21
|
-
macroFolders
|
|
22
|
-
programFolders
|
|
23
|
-
binaryFolders
|
|
21
|
+
macroFolders?: string[];
|
|
22
|
+
programFolders?: string[];
|
|
23
|
+
binaryFolders?: string[];
|
|
24
24
|
isDefault?: boolean;
|
|
25
25
|
testConfig?: TestConfig;
|
|
26
26
|
}
|
|
@@ -51,11 +51,11 @@ export declare class Target implements TargetJson {
|
|
|
51
51
|
private _jobConfig;
|
|
52
52
|
get streamConfig(): StreamConfig | undefined;
|
|
53
53
|
private _streamConfig;
|
|
54
|
-
get macroFolders(): string[];
|
|
54
|
+
get macroFolders(): string[] | undefined;
|
|
55
55
|
private _macroFolders;
|
|
56
|
-
get programFolders(): string[];
|
|
56
|
+
get programFolders(): string[] | undefined;
|
|
57
57
|
private _programFolders;
|
|
58
|
-
get binaryFolders(): string[];
|
|
58
|
+
get binaryFolders(): string[] | undefined;
|
|
59
59
|
private _binaryFolders;
|
|
60
60
|
get contextName(): string;
|
|
61
61
|
private _contextName;
|
package/types/target.js
CHANGED
|
@@ -6,9 +6,6 @@ var targetValidators_1 = require("./targetValidators");
|
|
|
6
6
|
var Target = /** @class */ (function () {
|
|
7
7
|
function Target(json) {
|
|
8
8
|
this._serverType = serverType_1.ServerType.SasViya;
|
|
9
|
-
this._macroFolders = [];
|
|
10
|
-
this._programFolders = [];
|
|
11
|
-
this._binaryFolders = [];
|
|
12
9
|
try {
|
|
13
10
|
if (!json) {
|
|
14
11
|
throw new Error('Invalid target: Input JSON is null or undefined.');
|
|
@@ -36,6 +33,12 @@ var Target = /** @class */ (function () {
|
|
|
36
33
|
if (json.deployConfig) {
|
|
37
34
|
this._deployConfig = (0, targetValidators_1.validateDeployConfig)(json.deployConfig);
|
|
38
35
|
}
|
|
36
|
+
else {
|
|
37
|
+
this._deployConfig = (0, targetValidators_1.validateDeployConfig)({
|
|
38
|
+
deployServicePack: true,
|
|
39
|
+
deployScripts: []
|
|
40
|
+
});
|
|
41
|
+
}
|
|
39
42
|
if (json.serviceConfig) {
|
|
40
43
|
this._serviceConfig = (0, targetValidators_1.validateServiceConfig)(json.serviceConfig);
|
|
41
44
|
}
|
|
@@ -203,6 +206,7 @@ var Target = /** @class */ (function () {
|
|
|
203
206
|
configurable: true
|
|
204
207
|
});
|
|
205
208
|
Target.prototype.toJson = function (withDefaults) {
|
|
209
|
+
var _a, _b, _c;
|
|
206
210
|
if (withDefaults === void 0) { withDefaults = true; }
|
|
207
211
|
var json = {
|
|
208
212
|
name: this.name,
|
|
@@ -210,11 +214,14 @@ var Target = /** @class */ (function () {
|
|
|
210
214
|
serverType: this.serverType,
|
|
211
215
|
httpsAgentOptions: this.httpsAgentOptions,
|
|
212
216
|
appLoc: this.appLoc,
|
|
213
|
-
macroFolders: this.macroFolders,
|
|
214
|
-
programFolders: this.programFolders,
|
|
215
|
-
binaryFolders: this.binaryFolders,
|
|
216
217
|
docConfig: this.docConfig
|
|
217
218
|
};
|
|
219
|
+
if ((_a = this.macroFolders) === null || _a === void 0 ? void 0 : _a.length)
|
|
220
|
+
json.macroFolders = this.macroFolders;
|
|
221
|
+
if ((_b = this.programFolders) === null || _b === void 0 ? void 0 : _b.length)
|
|
222
|
+
json.programFolders = this.programFolders;
|
|
223
|
+
if ((_c = this.binaryFolders) === null || _c === void 0 ? void 0 : _c.length)
|
|
224
|
+
json.binaryFolders = this.binaryFolders;
|
|
218
225
|
if (this.authConfig) {
|
|
219
226
|
json.authConfig = this.authConfig;
|
|
220
227
|
}
|
|
@@ -264,7 +271,9 @@ var Target = /** @class */ (function () {
|
|
|
264
271
|
streamServiceName: '',
|
|
265
272
|
assetPaths: []
|
|
266
273
|
};
|
|
267
|
-
if (this.deployConfig
|
|
274
|
+
if (this.deployConfig &&
|
|
275
|
+
(!this.deployConfig.deployServicePack ||
|
|
276
|
+
this.deployConfig.deployScripts.length)) {
|
|
268
277
|
json.deployConfig = this.deployConfig;
|
|
269
278
|
}
|
|
270
279
|
else if (withDefaults)
|
package/types/target.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"target.js","sourceRoot":"","sources":["../../src/types/target.ts"],"names":[],"mappings":";;;AAWA,2CAAyC;AAEzC,uDAkB2B;AA0B3B;IAqGE,gBAAY,IAAS;QAvFb,gBAAW,GAAG,uBAAU,CAAC,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"target.js","sourceRoot":"","sources":["../../src/types/target.ts"],"names":[],"mappings":"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"}
|