@sasjs/utils 2.38.1 → 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/compileTree/compileTree.js +1 -2
- package/compileTree/compileTree.js.map +1 -1
- package/package.json +1 -1
- package/sasjsCli/getInitTerm.d.ts +7 -4
- package/sasjsCli/getInitTerm.js +17 -16
- package/sasjsCli/getInitTerm.js.map +1 -1
- package/sasjsCli/loadDependenciesFile.js +4 -4
- package/sasjsCli/loadDependenciesFile.js.map +1 -1
- package/types/config.d.ts +1 -0
- package/types/target.d.ts +6 -6
- package/types/target.js +16 -7
- package/types/target.js.map +1 -1
- package/types/targetValidators.js +3 -0
- package/types/targetValidators.js.map +1 -1
|
@@ -43,7 +43,6 @@ exports.removeHeader = exports.CompileTree = void 0;
|
|
|
43
43
|
var path_1 = __importDefault(require("path"));
|
|
44
44
|
var __1 = require("../");
|
|
45
45
|
var sasjsCli_1 = require("../sasjsCli");
|
|
46
|
-
var formatter_1 = require("../formatter");
|
|
47
46
|
var CompileTree = /** @class */ (function () {
|
|
48
47
|
function CompileTree(treePath, tree) {
|
|
49
48
|
if (tree === void 0) { tree = {}; }
|
|
@@ -114,7 +113,7 @@ var CompileTree = /** @class */ (function () {
|
|
|
114
113
|
exports.CompileTree = CompileTree;
|
|
115
114
|
// Removes header from SAS file
|
|
116
115
|
var removeHeader = function (content) {
|
|
117
|
-
return content.replace(new RegExp("
|
|
116
|
+
return content.replace(new RegExp("\\/(\\*){1,2}([\\s\\S]*?)(\\*){1,2}\\/"), '');
|
|
118
117
|
};
|
|
119
118
|
exports.removeHeader = removeHeader;
|
|
120
119
|
//# sourceMappingURL=compileTree.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compileTree.js","sourceRoot":"","sources":["../../src/compileTree/compileTree.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AACvB,yBAA0C;AAC1C,wCAA4E;
|
|
1
|
+
{"version":3,"file":"compileTree.js","sourceRoot":"","sources":["../../src/compileTree/compileTree.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AACvB,yBAA0C;AAC1C,wCAA4E;AAa5E;IAIE,qBAAY,QAAgB,EAAE,IAAe;QAAf,qBAAA,EAAA,SAAe;QAC3C,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAA;QACzB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAA;IACnB,CAAC;IAGD,sBAAI,6BAAI;QADR,sBAAsB;aACtB;YACE,OAAO,IAAI,CAAC,KAAK,CAAA;QACnB,CAAC;;;OAAA;IAED,oBAAoB;IACb,6BAAO,GAAd,UAAe,QAAgB;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAA;IAC/C,CAAC;IAED,YAAY;IACL,6BAAO,GAAd,UAAe,IAAU;QACvB,IAAI,CAAC,YAAY,GAAG,IAAA,kBAAO,EACzB,IAAA,8BAAmB,EAAC,IAAI,CAAC,OAAO,EAAE,2BAAgB,CAAC,KAAK,CAAC,EACzD,IAAI,CAAC,OAAO,CACb,CAAA;QACD,IAAI,CAAC,OAAO,GAAG,IAAA,oBAAY,EAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAEzC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,IAAI,CAAA;QAElD,OAAO,IAAI,CAAA;IACb,CAAC;IAED,kCAAkC;IACrB,8BAAQ,GAArB;;;;4BACE,qBAAM,IAAA,cAAU,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAA;;wBAArE,SAAqE,CAAA;;;;;KACtE;IAED,wCAAwC;IACxC,yDAAyD;IAC5C,mCAAa,GAA1B,UAA2B,OAAe;;;;;;;wBAClC,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;wBAElC,IAAI,IAAI;4BAAE,sBAAO,IAAI,CAAC,OAAO,EAAA;wBAEtB,KAAA,IAAI,CAAC,OAAO,CAAA;;wBACR,qBAAM,IAAA,YAAQ,EAAC,OAAO,EAAE,SAAS,CAAC,EAAA;4BAD7C,sBAAO,SAAA,IAAI,IACT,UAAO,GAAE,SAAkC;gCAC3C,eAAY,GAAE,EAAE;gCAChB,WAAQ,GAAE,OAAO;qCACjB,CAAC,OAAO,EAAA;;;;KACX;IAED,uCAAuC;IAC/B,iCAAW,GAAnB,UAAoB,QAAgB;QAClC,OAAO,QAAQ,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IACtE,CAAC;IACH,kBAAC;AAAD,CAAC,AAvDD,IAuDC;AAvDY,kCAAW;AAyDxB,+BAA+B;AACxB,IAAM,YAAY,GAAG,UAAC,OAAe;IAC1C,OAAA,OAAO,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,wCAAwC,CAAC,EAAE,EAAE,CAAC;AAAzE,CAAyE,CAAA;AAD9D,QAAA,YAAY,gBACkD"}
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Configuration, SASJsFileType, Target } from '../types';
|
|
2
|
-
import { CompileTree } from '../compileTree';
|
|
2
|
+
import { CompileTree, Leaf } from '../compileTree';
|
|
3
3
|
export declare enum ProgramType {
|
|
4
4
|
Init = "init",
|
|
5
5
|
Term = "term"
|
|
@@ -9,7 +9,7 @@ interface getInitTermParams {
|
|
|
9
9
|
target?: Target;
|
|
10
10
|
fileType: SASJsFileType;
|
|
11
11
|
buildSourceFolder: string;
|
|
12
|
-
compileTree
|
|
12
|
+
compileTree: CompileTree;
|
|
13
13
|
}
|
|
14
14
|
export declare const getInitTerm: ({ configuration, target, fileType, buildSourceFolder, compileTree }: getInitTermParams) => Promise<{
|
|
15
15
|
init: string;
|
|
@@ -17,12 +17,15 @@ export declare const getInitTerm: ({ configuration, target, fileType, buildSourc
|
|
|
17
17
|
term: string;
|
|
18
18
|
termPath: string;
|
|
19
19
|
startUpVars: string;
|
|
20
|
+
initLeaf: Leaf | undefined;
|
|
21
|
+
termLeaf: Leaf | undefined;
|
|
20
22
|
}>;
|
|
21
|
-
export declare const getProgram: ({ target, configuration, buildSourceFolder, fileType }: getInitTermParams, programType: ProgramType, compileTree
|
|
23
|
+
export declare const getProgram: ({ target, configuration, buildSourceFolder, fileType }: getInitTermParams, programType: ProgramType, compileTree: CompileTree) => Promise<{
|
|
22
24
|
content: string;
|
|
23
25
|
filePath: string;
|
|
26
|
+
compileTreeLeaf?: Leaf | undefined;
|
|
24
27
|
}>;
|
|
25
28
|
export declare const mockGetProgram: (module: {
|
|
26
|
-
getProgram: (param: getInitTermParams, programType: ProgramType) => {};
|
|
29
|
+
getProgram: (param: getInitTermParams, programType: ProgramType, compileTree: CompileTree) => {};
|
|
27
30
|
}, fakeInit: string, fakeTerm: string) => void;
|
|
28
31
|
export {};
|
package/sasjsCli/getInitTerm.js
CHANGED
|
@@ -87,32 +87,36 @@ var ProgramType;
|
|
|
87
87
|
var getInitTerm = function (_a) {
|
|
88
88
|
var configuration = _a.configuration, target = _a.target, fileType = _a.fileType, buildSourceFolder = _a.buildSourceFolder, compileTree = _a.compileTree;
|
|
89
89
|
return __awaiter(void 0, void 0, void 0, function () {
|
|
90
|
-
var _b, init, initPath, _c, term, termPath, startUpVars;
|
|
90
|
+
var _b, init, initPath, initLeaf, _c, term, termPath, termLeaf, startUpVars;
|
|
91
91
|
return __generator(this, function (_d) {
|
|
92
92
|
switch (_d.label) {
|
|
93
93
|
case 0: return [4 /*yield*/, (0, exports.getProgram)({
|
|
94
94
|
target: target,
|
|
95
95
|
configuration: configuration,
|
|
96
96
|
buildSourceFolder: buildSourceFolder,
|
|
97
|
-
fileType: fileType
|
|
97
|
+
fileType: fileType,
|
|
98
|
+
compileTree: compileTree
|
|
98
99
|
}, ProgramType.Init, compileTree)];
|
|
99
100
|
case 1:
|
|
100
|
-
_b = _d.sent(), init = _b.content, initPath = _b.filePath;
|
|
101
|
+
_b = _d.sent(), init = _b.content, initPath = _b.filePath, initLeaf = _b.compileTreeLeaf;
|
|
101
102
|
return [4 /*yield*/, (0, exports.getProgram)({
|
|
102
103
|
target: target,
|
|
103
104
|
configuration: configuration,
|
|
104
105
|
buildSourceFolder: buildSourceFolder,
|
|
105
|
-
fileType: fileType
|
|
106
|
+
fileType: fileType,
|
|
107
|
+
compileTree: compileTree
|
|
106
108
|
}, ProgramType.Term, compileTree)];
|
|
107
109
|
case 2:
|
|
108
|
-
_c = _d.sent(), term = _c.content, termPath = _c.filePath;
|
|
110
|
+
_c = _d.sent(), term = _c.content, termPath = _c.filePath, termLeaf = _c.compileTreeLeaf;
|
|
109
111
|
startUpVars = getVars(fileType, target, configuration);
|
|
110
112
|
return [2 /*return*/, {
|
|
111
113
|
init: init,
|
|
112
114
|
initPath: initPath,
|
|
113
115
|
term: term,
|
|
114
116
|
termPath: termPath,
|
|
115
|
-
startUpVars: startUpVars
|
|
117
|
+
startUpVars: startUpVars,
|
|
118
|
+
initLeaf: initLeaf,
|
|
119
|
+
termLeaf: termLeaf
|
|
116
120
|
}];
|
|
117
121
|
}
|
|
118
122
|
});
|
|
@@ -158,7 +162,7 @@ var convertVarsToSasFormat = function (vars) {
|
|
|
158
162
|
var getProgram = function (_a, programType, compileTree) {
|
|
159
163
|
var target = _a.target, configuration = _a.configuration, buildSourceFolder = _a.buildSourceFolder, fileType = _a.fileType;
|
|
160
164
|
return __awaiter(void 0, void 0, void 0, function () {
|
|
161
|
-
var programContent, filePath, program, targetConfig, rootConfig, content;
|
|
165
|
+
var programContent, filePath, program, targetConfig, rootConfig, content, compileTreeLeaf;
|
|
162
166
|
return __generator(this, function (_b) {
|
|
163
167
|
switch (_b.label) {
|
|
164
168
|
case 0:
|
|
@@ -185,24 +189,21 @@ var getProgram = function (_a, programType, compileTree) {
|
|
|
185
189
|
targetConfig["".concat(programType, "Program")]) ||
|
|
186
190
|
(rootConfig &&
|
|
187
191
|
rootConfig["".concat(programType, "Program")]);
|
|
188
|
-
if (!program) return [3 /*break*/,
|
|
192
|
+
if (!program) return [3 /*break*/, 2];
|
|
189
193
|
filePath = (0, file_1.getAbsolutePath)(program, buildSourceFolder);
|
|
190
|
-
if (!(compileTree && Object.keys(compileTree).length)) return [3 /*break*/, 2];
|
|
191
194
|
return [4 /*yield*/, compileTree.getDepContent(filePath)];
|
|
192
195
|
case 1:
|
|
193
196
|
programContent = _b.sent();
|
|
194
|
-
|
|
195
|
-
case 2:
|
|
196
|
-
case 3:
|
|
197
|
-
programContent = _b.sent();
|
|
198
|
-
_b.label = 4;
|
|
199
|
-
case 4:
|
|
197
|
+
_b.label = 2;
|
|
198
|
+
case 2:
|
|
200
199
|
content = programContent
|
|
201
200
|
? "\n* ".concat(fileType).concat((0, formatter_1.capitalizeFirstChar)(programType), " start;\n").concat(programContent, "\n* ").concat(fileType).concat((0, formatter_1.capitalizeFirstChar)(programType), " end;")
|
|
202
201
|
: '';
|
|
202
|
+
compileTreeLeaf = compileTree.getLeaf(filePath);
|
|
203
203
|
return [2 /*return*/, {
|
|
204
204
|
content: content,
|
|
205
|
-
filePath: filePath
|
|
205
|
+
filePath: filePath,
|
|
206
|
+
compileTreeLeaf: compileTreeLeaf
|
|
206
207
|
}];
|
|
207
208
|
}
|
|
208
209
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getInitTerm.js","sourceRoot":"","sources":["../../src/sasjsCli/getInitTerm.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"getInitTerm.js","sourceRoot":"","sources":["../../src/sasjsCli/getInitTerm.ts"],"names":[],"mappings":"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"}
|
|
@@ -68,7 +68,7 @@ var _1 = require("./");
|
|
|
68
68
|
var loadDependenciesFile = function (_a) {
|
|
69
69
|
var filePath = _a.filePath, fileContent = _a.fileContent, configuration = _a.configuration, target = _a.target, type = _a.type, programFolders = _a.programFolders, macroFolders = _a.macroFolders, buildSourceFolder = _a.buildSourceFolder, macroCorePath = _a.macroCorePath, binaryFolders = _a.binaryFolders, compileTree = _a.compileTree;
|
|
70
70
|
return __awaiter(void 0, void 0, void 0, function () {
|
|
71
|
-
var _b, init, initPath, term, termPath, startUpVars, fileDependencyPaths, initDependencyPaths, termDependencyPaths, allDependencyPaths, initProgramDependencies, termProgramDependencies, programDependencies, binariesDeps, dependenciesContent;
|
|
71
|
+
var _b, init, initPath, term, termPath, startUpVars, initLeaf, termLeaf, fileDependencyPaths, initDependencyPaths, termDependencyPaths, allDependencyPaths, initProgramDependencies, termProgramDependencies, programDependencies, binariesDeps, dependenciesContent;
|
|
72
72
|
return __generator(this, function (_c) {
|
|
73
73
|
switch (_c.label) {
|
|
74
74
|
case 0: return [4 /*yield*/, (0, _1.getInitTerm)({
|
|
@@ -79,15 +79,15 @@ var loadDependenciesFile = function (_a) {
|
|
|
79
79
|
compileTree: compileTree
|
|
80
80
|
})];
|
|
81
81
|
case 1:
|
|
82
|
-
_b = _c.sent(), init = _b.init, initPath = _b.initPath, term = _b.term, termPath = _b.termPath, startUpVars = _b.startUpVars;
|
|
82
|
+
_b = _c.sent(), init = _b.init, initPath = _b.initPath, term = _b.term, termPath = _b.termPath, startUpVars = _b.startUpVars, initLeaf = _b.initLeaf, termLeaf = _b.termLeaf;
|
|
83
83
|
fileContent = "\n* ".concat(type, " start;\n").concat(fileContent, "\n* ").concat(type, " end;");
|
|
84
84
|
return [4 /*yield*/, (0, _1.getDependencyPaths)("".concat(fileContent, "\n").concat(init, "\n").concat(term), macroFolders, macroCorePath, compileTree)];
|
|
85
85
|
case 2:
|
|
86
86
|
fileDependencyPaths = _c.sent();
|
|
87
|
-
return [4 /*yield*/, (0, _1.getDependencyPaths)(init, macroFolders, macroCorePath, compileTree)];
|
|
87
|
+
return [4 /*yield*/, (0, _1.getDependencyPaths)(init, macroFolders, macroCorePath, compileTree, initLeaf)];
|
|
88
88
|
case 3:
|
|
89
89
|
initDependencyPaths = _c.sent();
|
|
90
|
-
return [4 /*yield*/, (0, _1.getDependencyPaths)(term, macroFolders, macroCorePath, compileTree)];
|
|
90
|
+
return [4 /*yield*/, (0, _1.getDependencyPaths)(term, macroFolders, macroCorePath, compileTree, termLeaf)];
|
|
91
91
|
case 4:
|
|
92
92
|
termDependencyPaths = _c.sent();
|
|
93
93
|
allDependencyPaths = __spreadArray(__spreadArray(__spreadArray([], __read(initDependencyPaths), false), __read(fileDependencyPaths), false), __read(termDependencyPaths), false);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadDependenciesFile.js","sourceRoot":"","sources":["../../src/sasjsCli/loadDependenciesFile.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gCAAkC;AAElC,kCAAuC;AACvC,uBAKW;AAiBJ,IAAM,oBAAoB,GAAG,UAAO,EAYlB;QAXvB,QAAQ,cAAA,EACR,WAAW,iBAAA,EACX,aAAa,mBAAA,EACb,MAAM,YAAA,EACN,IAAI,UAAA,EACJ,cAAc,oBAAA,EACd,YAAY,kBAAA,EACZ,iBAAiB,uBAAA,EACjB,aAAa,mBAAA,EACb,aAAa,mBAAA,EACb,WAAW,iBAAA;;;;;
|
|
1
|
+
{"version":3,"file":"loadDependenciesFile.js","sourceRoot":"","sources":["../../src/sasjsCli/loadDependenciesFile.ts"],"names":[],"mappings":"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"}
|
package/types/config.d.ts
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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"}
|
|
@@ -228,6 +228,9 @@ var validateStreamConfig = function (streamConfig) {
|
|
|
228
228
|
if (streamConfig.streamWeb && !streamConfig.webSourcePath) {
|
|
229
229
|
throw new Error('Invalid stream config: `webSourcePath` cannot be empty, null or undefined.');
|
|
230
230
|
}
|
|
231
|
+
if (streamConfig.streamLogo && typeof streamConfig.streamLogo !== 'string') {
|
|
232
|
+
streamConfig.streamLogo = undefined;
|
|
233
|
+
}
|
|
231
234
|
if (!streamConfig.assetPaths) {
|
|
232
235
|
streamConfig.assetPaths = [];
|
|
233
236
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"targetValidators.js","sourceRoot":"","sources":["../../src/types/targetValidators.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"targetValidators.js","sourceRoot":"","sources":["../../src/types/targetValidators.ts"],"names":[],"mappings":"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"}
|