@catladder/cli 0.0.0-main-45f6e733 → 0.0.0-main-5c481bfe
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/dist/bundles/catenv/index.js +138 -17
- package/dist/bundles/cli/index.js +138 -17
- package/dist/pipeline/src/pipeline/generatePipelineFiles.js +36 -9
- package/dist/pipeline/src/pipeline/generatePipelineFiles.js.map +1 -1
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js +2 -8
- package/dist/pipeline/src/pipeline/gitlab/createGitlabJobs.js.map +1 -1
- package/dist/pipeline/src/pipeline/gitlab/sortGitLabJobDefProps.d.ts +7 -0
- package/dist/pipeline/src/pipeline/gitlab/sortGitLabJobDefProps.js +59 -0
- package/dist/pipeline/src/pipeline/gitlab/sortGitLabJobDefProps.js.map +1 -0
- package/dist/pipeline/src/utils/removeUndefined.d.ts +1 -0
- package/dist/pipeline/src/utils/removeUndefined.js +27 -0
- package/dist/pipeline/src/utils/removeUndefined.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
|
@@ -7922,15 +7922,32 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
7922
7922
|
}
|
|
7923
7923
|
return t;
|
|
7924
7924
|
};
|
|
7925
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
7926
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
7927
|
+
if (!m) return o;
|
|
7928
|
+
var i = m.call(o), r, ar = [], e;
|
|
7929
|
+
try {
|
|
7930
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
7931
|
+
}
|
|
7932
|
+
catch (error) { e = { error: error }; }
|
|
7933
|
+
finally {
|
|
7934
|
+
try {
|
|
7935
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
7936
|
+
}
|
|
7937
|
+
finally { if (e) throw e.error; }
|
|
7938
|
+
}
|
|
7939
|
+
return ar;
|
|
7940
|
+
};
|
|
7925
7941
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
7926
7942
|
exports.generatePipelineFiles = void 0;
|
|
7927
7943
|
var writeFiles_1 = __nccwpck_require__(2228);
|
|
7928
7944
|
var createChildPipeline_1 = __nccwpck_require__(5139);
|
|
7929
7945
|
var createMainPipeline_1 = __nccwpck_require__(9192);
|
|
7930
7946
|
var getPipelineTriggerForGitlabChildPipeline_1 = __nccwpck_require__(7426);
|
|
7947
|
+
var sortGitLabJobDefProps_1 = __nccwpck_require__(2361);
|
|
7931
7948
|
function generatePipelineFiles(config, pipelineType, mode) {
|
|
7932
7949
|
return __awaiter(this, void 0, void 0, function () {
|
|
7933
|
-
var trigger, _a, jobs, image, stages, variables, workflow,
|
|
7950
|
+
var trigger, _a, jobs, image, stages, variables, workflow, pipelineRest, jobsWithSortedProps, _b, jobs, image, stages, variables, workflow, pipelineRest, jobsWithSortedProps;
|
|
7934
7951
|
return __generator(this, function (_c) {
|
|
7935
7952
|
switch (_c.label) {
|
|
7936
7953
|
case 0:
|
|
@@ -7938,20 +7955,30 @@ function generatePipelineFiles(config, pipelineType, mode) {
|
|
|
7938
7955
|
trigger = (0, getPipelineTriggerForGitlabChildPipeline_1.getPipelineTriggerForGitlabChildPipeline)();
|
|
7939
7956
|
return [4 /*yield*/, (0, createChildPipeline_1.createChildPipeline)(pipelineType, trigger, config)];
|
|
7940
7957
|
case 1:
|
|
7941
|
-
_a = _c.sent(), jobs = _a.jobs, image = _a.image, stages = _a.stages, variables = _a.variables, workflow = _a.workflow,
|
|
7942
|
-
|
|
7943
|
-
|
|
7958
|
+
_a = _c.sent(), jobs = _a.jobs, image = _a.image, stages = _a.stages, variables = _a.variables, workflow = _a.workflow, pipelineRest = __rest(_a, ["jobs", "image", "stages", "variables", "workflow"]);
|
|
7959
|
+
jobsWithSortedProps = Object.fromEntries(Object.entries(jobs).map(function (_a) {
|
|
7960
|
+
var _b = __read(_a, 2), jobName = _b[0], job = _b[1];
|
|
7961
|
+
return [
|
|
7962
|
+
jobName,
|
|
7963
|
+
(0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(job),
|
|
7964
|
+
];
|
|
7965
|
+
}));
|
|
7966
|
+
return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)("__pipeline.yml", __assign(__assign({ image: image, stages: stages, variables: variables, workflow: workflow }, pipelineRest), jobsWithSortedProps))];
|
|
7944
7967
|
case 2:
|
|
7945
|
-
// need to spread out the jobs, forgot why
|
|
7946
7968
|
_c.sent();
|
|
7947
7969
|
return [3 /*break*/, 6];
|
|
7948
7970
|
case 3: return [4 /*yield*/, (0, createMainPipeline_1.createMainPipeline)(pipelineType, config)];
|
|
7949
7971
|
case 4:
|
|
7950
|
-
_b = _c.sent(), jobs = _b.jobs, image = _b.image, stages = _b.stages, variables = _b.variables, workflow = _b.workflow,
|
|
7951
|
-
|
|
7952
|
-
|
|
7972
|
+
_b = _c.sent(), jobs = _b.jobs, image = _b.image, stages = _b.stages, variables = _b.variables, workflow = _b.workflow, pipelineRest = __rest(_b, ["jobs", "image", "stages", "variables", "workflow"]);
|
|
7973
|
+
jobsWithSortedProps = Object.fromEntries(Object.entries(jobs).map(function (_a) {
|
|
7974
|
+
var _b = __read(_a, 2), jobName = _b[0], job = _b[1];
|
|
7975
|
+
return [
|
|
7976
|
+
jobName,
|
|
7977
|
+
(0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(job),
|
|
7978
|
+
];
|
|
7979
|
+
}));
|
|
7980
|
+
return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)(".gitlab-ci.yml", __assign(__assign({ image: image, stages: stages, variables: variables, workflow: workflow }, pipelineRest), jobsWithSortedProps))];
|
|
7953
7981
|
case 5:
|
|
7954
|
-
// need to spread out the jobs, forgot why
|
|
7955
7982
|
_c.sent();
|
|
7956
7983
|
_c.label = 6;
|
|
7957
7984
|
case 6: return [2 /*return*/];
|
|
@@ -8111,13 +8138,8 @@ var getInjectVarsScript_1 = __nccwpck_require__(8133);
|
|
|
8111
8138
|
var defaults_1 = __nccwpck_require__(6484);
|
|
8112
8139
|
var utils_1 = __nccwpck_require__(2497);
|
|
8113
8140
|
var gitlab_1 = __nccwpck_require__(8490);
|
|
8141
|
+
var removeUndefined_1 = __nccwpck_require__(1073);
|
|
8114
8142
|
exports.GITLAB_ENVIRONMENT_URL_VARIABLE = "CL_GITLAB_ENVIRONMENT_URL";
|
|
8115
|
-
var removeUndefined = function (obj) {
|
|
8116
|
-
return Object.fromEntries(Object.entries(obj).filter(function (_a) {
|
|
8117
|
-
var _b = __read(_a, 2), value = _b[1];
|
|
8118
|
-
return value !== undefined;
|
|
8119
|
-
}));
|
|
8120
|
-
};
|
|
8121
8143
|
var getFullJobName = function (name, componentName, env) {
|
|
8122
8144
|
if (env) {
|
|
8123
8145
|
return "".concat(componentName, " ").concat(name, " | ").concat(env, " ");
|
|
@@ -8195,8 +8217,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
|
|
|
8195
8217
|
var modified = addGitlabEnvironment(context, environment, __assign(__assign({}, job), { rules: rules.length > 0 ? rules : undefined, variables: __assign(__assign({}, legacyRunnerVariables), runnerVariables), script: __spreadArray(__spreadArray([], __read(varsInjectScripts), false), __read(((_c = script === null || script === void 0 ? void 0 : script.filter(utils_1.notNil)) !== null && _c !== void 0 ? _c : [])), false), tags: jobTags, stage: stage,
|
|
8196
8218
|
// sort in a predictable manner for snapshot tests
|
|
8197
8219
|
needs: deduplicatedGitlabNeeds, retry: defaults_1.BASE_RETRY, interruptible: true }), componentName, env, allJobs);
|
|
8198
|
-
|
|
8199
|
-
return [fullJobName, gitlabJob];
|
|
8220
|
+
return [fullJobName, (0, removeUndefined_1.removeUndefined)(modified)];
|
|
8200
8221
|
};
|
|
8201
8222
|
exports.makeGitlabJob = makeGitlabJob;
|
|
8202
8223
|
var addGitlabEnvironment = function (context, environment, job, componentName, env, // TODO: we could actually pull this from contxt
|
|
@@ -8360,6 +8381,72 @@ exports.getGitlabReleaseJobs = getGitlabReleaseJobs;
|
|
|
8360
8381
|
|
|
8361
8382
|
/***/ }),
|
|
8362
8383
|
|
|
8384
|
+
/***/ 2361:
|
|
8385
|
+
/***/ ((__unused_webpack_module, exports) => {
|
|
8386
|
+
|
|
8387
|
+
"use strict";
|
|
8388
|
+
|
|
8389
|
+
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
8390
|
+
exports.sortGitLabJobDefProps = void 0;
|
|
8391
|
+
/**
|
|
8392
|
+
* The desired order of GitLab job definition keys.
|
|
8393
|
+
*/
|
|
8394
|
+
var jobDefOrder = [
|
|
8395
|
+
"stage",
|
|
8396
|
+
"tags",
|
|
8397
|
+
"image",
|
|
8398
|
+
"services",
|
|
8399
|
+
"variables",
|
|
8400
|
+
"before_script",
|
|
8401
|
+
"script",
|
|
8402
|
+
"after_script",
|
|
8403
|
+
"cache",
|
|
8404
|
+
"coverage",
|
|
8405
|
+
"environment",
|
|
8406
|
+
"release",
|
|
8407
|
+
"artifacts",
|
|
8408
|
+
"rules",
|
|
8409
|
+
"only",
|
|
8410
|
+
"except",
|
|
8411
|
+
"needs",
|
|
8412
|
+
"dependencies",
|
|
8413
|
+
"trigger",
|
|
8414
|
+
"retry",
|
|
8415
|
+
"interruptible",
|
|
8416
|
+
"allow_failure",
|
|
8417
|
+
"parallel",
|
|
8418
|
+
"hooks",
|
|
8419
|
+
"resource_group",
|
|
8420
|
+
];
|
|
8421
|
+
var sortGitLabJobDefKeys = function (jobDef) {
|
|
8422
|
+
return Object.keys(jobDef).sort(function (a, b) {
|
|
8423
|
+
return jobDefOrder.indexOf(a) === -1 && jobDefOrder.indexOf(b) === -1
|
|
8424
|
+
? 0
|
|
8425
|
+
: jobDefOrder.indexOf(a) === -1
|
|
8426
|
+
? 1
|
|
8427
|
+
: jobDefOrder.indexOf(b) === -1
|
|
8428
|
+
? -1
|
|
8429
|
+
: jobDefOrder.indexOf(a) - jobDefOrder.indexOf(b);
|
|
8430
|
+
});
|
|
8431
|
+
};
|
|
8432
|
+
/**
|
|
8433
|
+
* Sorts the properties of a GitLab job definition based on the desired order.
|
|
8434
|
+
*
|
|
8435
|
+
* This is only useful when generating a GitLab pipeline YAML file.
|
|
8436
|
+
*/
|
|
8437
|
+
var sortGitLabJobDefProps = function (jobDef) {
|
|
8438
|
+
return sortGitLabJobDefKeys(jobDef).reduce(function (acc, key) {
|
|
8439
|
+
var _a;
|
|
8440
|
+
return jobDef[key] !== undefined
|
|
8441
|
+
? Object.assign(acc, (_a = {}, _a[key] = jobDef[key], _a))
|
|
8442
|
+
: acc;
|
|
8443
|
+
}, {});
|
|
8444
|
+
};
|
|
8445
|
+
exports.sortGitLabJobDefProps = sortGitLabJobDefProps;
|
|
8446
|
+
//# sourceMappingURL=sortGitLabJobDefProps.js.map
|
|
8447
|
+
|
|
8448
|
+
/***/ }),
|
|
8449
|
+
|
|
8363
8450
|
/***/ 7752:
|
|
8364
8451
|
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
|
|
8365
8452
|
|
|
@@ -9014,6 +9101,40 @@ exports.mergeWithMergingArrays = mergeWithMergingArrays;
|
|
|
9014
9101
|
|
|
9015
9102
|
/***/ }),
|
|
9016
9103
|
|
|
9104
|
+
/***/ 1073:
|
|
9105
|
+
/***/ (function(__unused_webpack_module, exports) {
|
|
9106
|
+
|
|
9107
|
+
"use strict";
|
|
9108
|
+
|
|
9109
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
9110
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
9111
|
+
if (!m) return o;
|
|
9112
|
+
var i = m.call(o), r, ar = [], e;
|
|
9113
|
+
try {
|
|
9114
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
9115
|
+
}
|
|
9116
|
+
catch (error) { e = { error: error }; }
|
|
9117
|
+
finally {
|
|
9118
|
+
try {
|
|
9119
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
9120
|
+
}
|
|
9121
|
+
finally { if (e) throw e.error; }
|
|
9122
|
+
}
|
|
9123
|
+
return ar;
|
|
9124
|
+
};
|
|
9125
|
+
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
9126
|
+
exports.removeUndefined = void 0;
|
|
9127
|
+
var removeUndefined = function (obj) {
|
|
9128
|
+
return Object.fromEntries(Object.entries(obj).filter(function (_a) {
|
|
9129
|
+
var _b = __read(_a, 2), value = _b[1];
|
|
9130
|
+
return value !== undefined;
|
|
9131
|
+
}));
|
|
9132
|
+
};
|
|
9133
|
+
exports.removeUndefined = removeUndefined;
|
|
9134
|
+
//# sourceMappingURL=removeUndefined.js.map
|
|
9135
|
+
|
|
9136
|
+
/***/ }),
|
|
9137
|
+
|
|
9017
9138
|
/***/ 2228:
|
|
9018
9139
|
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
|
|
9019
9140
|
|
|
@@ -15359,15 +15359,32 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
15359
15359
|
}
|
|
15360
15360
|
return t;
|
|
15361
15361
|
};
|
|
15362
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
15363
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
15364
|
+
if (!m) return o;
|
|
15365
|
+
var i = m.call(o), r, ar = [], e;
|
|
15366
|
+
try {
|
|
15367
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
15368
|
+
}
|
|
15369
|
+
catch (error) { e = { error: error }; }
|
|
15370
|
+
finally {
|
|
15371
|
+
try {
|
|
15372
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
15373
|
+
}
|
|
15374
|
+
finally { if (e) throw e.error; }
|
|
15375
|
+
}
|
|
15376
|
+
return ar;
|
|
15377
|
+
};
|
|
15362
15378
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
15363
15379
|
exports.generatePipelineFiles = void 0;
|
|
15364
15380
|
var writeFiles_1 = __nccwpck_require__(92228);
|
|
15365
15381
|
var createChildPipeline_1 = __nccwpck_require__(55139);
|
|
15366
15382
|
var createMainPipeline_1 = __nccwpck_require__(39192);
|
|
15367
15383
|
var getPipelineTriggerForGitlabChildPipeline_1 = __nccwpck_require__(7426);
|
|
15384
|
+
var sortGitLabJobDefProps_1 = __nccwpck_require__(72361);
|
|
15368
15385
|
function generatePipelineFiles(config, pipelineType, mode) {
|
|
15369
15386
|
return __awaiter(this, void 0, void 0, function () {
|
|
15370
|
-
var trigger, _a, jobs, image, stages, variables, workflow,
|
|
15387
|
+
var trigger, _a, jobs, image, stages, variables, workflow, pipelineRest, jobsWithSortedProps, _b, jobs, image, stages, variables, workflow, pipelineRest, jobsWithSortedProps;
|
|
15371
15388
|
return __generator(this, function (_c) {
|
|
15372
15389
|
switch (_c.label) {
|
|
15373
15390
|
case 0:
|
|
@@ -15375,20 +15392,30 @@ function generatePipelineFiles(config, pipelineType, mode) {
|
|
|
15375
15392
|
trigger = (0, getPipelineTriggerForGitlabChildPipeline_1.getPipelineTriggerForGitlabChildPipeline)();
|
|
15376
15393
|
return [4 /*yield*/, (0, createChildPipeline_1.createChildPipeline)(pipelineType, trigger, config)];
|
|
15377
15394
|
case 1:
|
|
15378
|
-
_a = _c.sent(), jobs = _a.jobs, image = _a.image, stages = _a.stages, variables = _a.variables, workflow = _a.workflow,
|
|
15379
|
-
|
|
15380
|
-
|
|
15395
|
+
_a = _c.sent(), jobs = _a.jobs, image = _a.image, stages = _a.stages, variables = _a.variables, workflow = _a.workflow, pipelineRest = __rest(_a, ["jobs", "image", "stages", "variables", "workflow"]);
|
|
15396
|
+
jobsWithSortedProps = Object.fromEntries(Object.entries(jobs).map(function (_a) {
|
|
15397
|
+
var _b = __read(_a, 2), jobName = _b[0], job = _b[1];
|
|
15398
|
+
return [
|
|
15399
|
+
jobName,
|
|
15400
|
+
(0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(job),
|
|
15401
|
+
];
|
|
15402
|
+
}));
|
|
15403
|
+
return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)("__pipeline.yml", __assign(__assign({ image: image, stages: stages, variables: variables, workflow: workflow }, pipelineRest), jobsWithSortedProps))];
|
|
15381
15404
|
case 2:
|
|
15382
|
-
// need to spread out the jobs, forgot why
|
|
15383
15405
|
_c.sent();
|
|
15384
15406
|
return [3 /*break*/, 6];
|
|
15385
15407
|
case 3: return [4 /*yield*/, (0, createMainPipeline_1.createMainPipeline)(pipelineType, config)];
|
|
15386
15408
|
case 4:
|
|
15387
|
-
_b = _c.sent(), jobs = _b.jobs, image = _b.image, stages = _b.stages, variables = _b.variables, workflow = _b.workflow,
|
|
15388
|
-
|
|
15389
|
-
|
|
15409
|
+
_b = _c.sent(), jobs = _b.jobs, image = _b.image, stages = _b.stages, variables = _b.variables, workflow = _b.workflow, pipelineRest = __rest(_b, ["jobs", "image", "stages", "variables", "workflow"]);
|
|
15410
|
+
jobsWithSortedProps = Object.fromEntries(Object.entries(jobs).map(function (_a) {
|
|
15411
|
+
var _b = __read(_a, 2), jobName = _b[0], job = _b[1];
|
|
15412
|
+
return [
|
|
15413
|
+
jobName,
|
|
15414
|
+
(0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(job),
|
|
15415
|
+
];
|
|
15416
|
+
}));
|
|
15417
|
+
return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)(".gitlab-ci.yml", __assign(__assign({ image: image, stages: stages, variables: variables, workflow: workflow }, pipelineRest), jobsWithSortedProps))];
|
|
15390
15418
|
case 5:
|
|
15391
|
-
// need to spread out the jobs, forgot why
|
|
15392
15419
|
_c.sent();
|
|
15393
15420
|
_c.label = 6;
|
|
15394
15421
|
case 6: return [2 /*return*/];
|
|
@@ -15548,13 +15575,8 @@ var getInjectVarsScript_1 = __nccwpck_require__(8133);
|
|
|
15548
15575
|
var defaults_1 = __nccwpck_require__(96484);
|
|
15549
15576
|
var utils_1 = __nccwpck_require__(32497);
|
|
15550
15577
|
var gitlab_1 = __nccwpck_require__(38490);
|
|
15578
|
+
var removeUndefined_1 = __nccwpck_require__(61073);
|
|
15551
15579
|
exports.GITLAB_ENVIRONMENT_URL_VARIABLE = "CL_GITLAB_ENVIRONMENT_URL";
|
|
15552
|
-
var removeUndefined = function (obj) {
|
|
15553
|
-
return Object.fromEntries(Object.entries(obj).filter(function (_a) {
|
|
15554
|
-
var _b = __read(_a, 2), value = _b[1];
|
|
15555
|
-
return value !== undefined;
|
|
15556
|
-
}));
|
|
15557
|
-
};
|
|
15558
15580
|
var getFullJobName = function (name, componentName, env) {
|
|
15559
15581
|
if (env) {
|
|
15560
15582
|
return "".concat(componentName, " ").concat(name, " | ").concat(env, " ");
|
|
@@ -15632,8 +15654,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
|
|
|
15632
15654
|
var modified = addGitlabEnvironment(context, environment, __assign(__assign({}, job), { rules: rules.length > 0 ? rules : undefined, variables: __assign(__assign({}, legacyRunnerVariables), runnerVariables), script: __spreadArray(__spreadArray([], __read(varsInjectScripts), false), __read(((_c = script === null || script === void 0 ? void 0 : script.filter(utils_1.notNil)) !== null && _c !== void 0 ? _c : [])), false), tags: jobTags, stage: stage,
|
|
15633
15655
|
// sort in a predictable manner for snapshot tests
|
|
15634
15656
|
needs: deduplicatedGitlabNeeds, retry: defaults_1.BASE_RETRY, interruptible: true }), componentName, env, allJobs);
|
|
15635
|
-
|
|
15636
|
-
return [fullJobName, gitlabJob];
|
|
15657
|
+
return [fullJobName, (0, removeUndefined_1.removeUndefined)(modified)];
|
|
15637
15658
|
};
|
|
15638
15659
|
exports.makeGitlabJob = makeGitlabJob;
|
|
15639
15660
|
var addGitlabEnvironment = function (context, environment, job, componentName, env, // TODO: we could actually pull this from contxt
|
|
@@ -15797,6 +15818,72 @@ exports.getGitlabReleaseJobs = getGitlabReleaseJobs;
|
|
|
15797
15818
|
|
|
15798
15819
|
/***/ }),
|
|
15799
15820
|
|
|
15821
|
+
/***/ 72361:
|
|
15822
|
+
/***/ ((__unused_webpack_module, exports) => {
|
|
15823
|
+
|
|
15824
|
+
"use strict";
|
|
15825
|
+
|
|
15826
|
+
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
15827
|
+
exports.sortGitLabJobDefProps = void 0;
|
|
15828
|
+
/**
|
|
15829
|
+
* The desired order of GitLab job definition keys.
|
|
15830
|
+
*/
|
|
15831
|
+
var jobDefOrder = [
|
|
15832
|
+
"stage",
|
|
15833
|
+
"tags",
|
|
15834
|
+
"image",
|
|
15835
|
+
"services",
|
|
15836
|
+
"variables",
|
|
15837
|
+
"before_script",
|
|
15838
|
+
"script",
|
|
15839
|
+
"after_script",
|
|
15840
|
+
"cache",
|
|
15841
|
+
"coverage",
|
|
15842
|
+
"environment",
|
|
15843
|
+
"release",
|
|
15844
|
+
"artifacts",
|
|
15845
|
+
"rules",
|
|
15846
|
+
"only",
|
|
15847
|
+
"except",
|
|
15848
|
+
"needs",
|
|
15849
|
+
"dependencies",
|
|
15850
|
+
"trigger",
|
|
15851
|
+
"retry",
|
|
15852
|
+
"interruptible",
|
|
15853
|
+
"allow_failure",
|
|
15854
|
+
"parallel",
|
|
15855
|
+
"hooks",
|
|
15856
|
+
"resource_group",
|
|
15857
|
+
];
|
|
15858
|
+
var sortGitLabJobDefKeys = function (jobDef) {
|
|
15859
|
+
return Object.keys(jobDef).sort(function (a, b) {
|
|
15860
|
+
return jobDefOrder.indexOf(a) === -1 && jobDefOrder.indexOf(b) === -1
|
|
15861
|
+
? 0
|
|
15862
|
+
: jobDefOrder.indexOf(a) === -1
|
|
15863
|
+
? 1
|
|
15864
|
+
: jobDefOrder.indexOf(b) === -1
|
|
15865
|
+
? -1
|
|
15866
|
+
: jobDefOrder.indexOf(a) - jobDefOrder.indexOf(b);
|
|
15867
|
+
});
|
|
15868
|
+
};
|
|
15869
|
+
/**
|
|
15870
|
+
* Sorts the properties of a GitLab job definition based on the desired order.
|
|
15871
|
+
*
|
|
15872
|
+
* This is only useful when generating a GitLab pipeline YAML file.
|
|
15873
|
+
*/
|
|
15874
|
+
var sortGitLabJobDefProps = function (jobDef) {
|
|
15875
|
+
return sortGitLabJobDefKeys(jobDef).reduce(function (acc, key) {
|
|
15876
|
+
var _a;
|
|
15877
|
+
return jobDef[key] !== undefined
|
|
15878
|
+
? Object.assign(acc, (_a = {}, _a[key] = jobDef[key], _a))
|
|
15879
|
+
: acc;
|
|
15880
|
+
}, {});
|
|
15881
|
+
};
|
|
15882
|
+
exports.sortGitLabJobDefProps = sortGitLabJobDefProps;
|
|
15883
|
+
//# sourceMappingURL=sortGitLabJobDefProps.js.map
|
|
15884
|
+
|
|
15885
|
+
/***/ }),
|
|
15886
|
+
|
|
15800
15887
|
/***/ 97752:
|
|
15801
15888
|
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
|
|
15802
15889
|
|
|
@@ -16451,6 +16538,40 @@ exports.mergeWithMergingArrays = mergeWithMergingArrays;
|
|
|
16451
16538
|
|
|
16452
16539
|
/***/ }),
|
|
16453
16540
|
|
|
16541
|
+
/***/ 61073:
|
|
16542
|
+
/***/ (function(__unused_webpack_module, exports) {
|
|
16543
|
+
|
|
16544
|
+
"use strict";
|
|
16545
|
+
|
|
16546
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
16547
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
16548
|
+
if (!m) return o;
|
|
16549
|
+
var i = m.call(o), r, ar = [], e;
|
|
16550
|
+
try {
|
|
16551
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
16552
|
+
}
|
|
16553
|
+
catch (error) { e = { error: error }; }
|
|
16554
|
+
finally {
|
|
16555
|
+
try {
|
|
16556
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
16557
|
+
}
|
|
16558
|
+
finally { if (e) throw e.error; }
|
|
16559
|
+
}
|
|
16560
|
+
return ar;
|
|
16561
|
+
};
|
|
16562
|
+
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
|
16563
|
+
exports.removeUndefined = void 0;
|
|
16564
|
+
var removeUndefined = function (obj) {
|
|
16565
|
+
return Object.fromEntries(Object.entries(obj).filter(function (_a) {
|
|
16566
|
+
var _b = __read(_a, 2), value = _b[1];
|
|
16567
|
+
return value !== undefined;
|
|
16568
|
+
}));
|
|
16569
|
+
};
|
|
16570
|
+
exports.removeUndefined = removeUndefined;
|
|
16571
|
+
//# sourceMappingURL=removeUndefined.js.map
|
|
16572
|
+
|
|
16573
|
+
/***/ }),
|
|
16574
|
+
|
|
16454
16575
|
/***/ 92228:
|
|
16455
16576
|
/***/ (function(__unused_webpack_module, exports, __nccwpck_require__) {
|
|
16456
16577
|
|
|
@@ -57,15 +57,32 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
57
57
|
}
|
|
58
58
|
return t;
|
|
59
59
|
};
|
|
60
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
61
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
62
|
+
if (!m) return o;
|
|
63
|
+
var i = m.call(o), r, ar = [], e;
|
|
64
|
+
try {
|
|
65
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
66
|
+
}
|
|
67
|
+
catch (error) { e = { error: error }; }
|
|
68
|
+
finally {
|
|
69
|
+
try {
|
|
70
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
71
|
+
}
|
|
72
|
+
finally { if (e) throw e.error; }
|
|
73
|
+
}
|
|
74
|
+
return ar;
|
|
75
|
+
};
|
|
60
76
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
61
77
|
exports.generatePipelineFiles = void 0;
|
|
62
78
|
var writeFiles_1 = require("../utils/writeFiles");
|
|
63
79
|
var createChildPipeline_1 = require("./createChildPipeline");
|
|
64
80
|
var createMainPipeline_1 = require("./createMainPipeline");
|
|
65
81
|
var getPipelineTriggerForGitlabChildPipeline_1 = require("./gitlab/getPipelineTriggerForGitlabChildPipeline");
|
|
82
|
+
var sortGitLabJobDefProps_1 = require("./gitlab/sortGitLabJobDefProps");
|
|
66
83
|
function generatePipelineFiles(config, pipelineType, mode) {
|
|
67
84
|
return __awaiter(this, void 0, void 0, function () {
|
|
68
|
-
var trigger, _a, jobs, image, stages, variables, workflow,
|
|
85
|
+
var trigger, _a, jobs, image, stages, variables, workflow, pipelineRest, jobsWithSortedProps, _b, jobs, image, stages, variables, workflow, pipelineRest, jobsWithSortedProps;
|
|
69
86
|
return __generator(this, function (_c) {
|
|
70
87
|
switch (_c.label) {
|
|
71
88
|
case 0:
|
|
@@ -73,20 +90,30 @@ function generatePipelineFiles(config, pipelineType, mode) {
|
|
|
73
90
|
trigger = (0, getPipelineTriggerForGitlabChildPipeline_1.getPipelineTriggerForGitlabChildPipeline)();
|
|
74
91
|
return [4 /*yield*/, (0, createChildPipeline_1.createChildPipeline)(pipelineType, trigger, config)];
|
|
75
92
|
case 1:
|
|
76
|
-
_a = _c.sent(), jobs = _a.jobs, image = _a.image, stages = _a.stages, variables = _a.variables, workflow = _a.workflow,
|
|
77
|
-
|
|
78
|
-
|
|
93
|
+
_a = _c.sent(), jobs = _a.jobs, image = _a.image, stages = _a.stages, variables = _a.variables, workflow = _a.workflow, pipelineRest = __rest(_a, ["jobs", "image", "stages", "variables", "workflow"]);
|
|
94
|
+
jobsWithSortedProps = Object.fromEntries(Object.entries(jobs).map(function (_a) {
|
|
95
|
+
var _b = __read(_a, 2), jobName = _b[0], job = _b[1];
|
|
96
|
+
return [
|
|
97
|
+
jobName,
|
|
98
|
+
(0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(job),
|
|
99
|
+
];
|
|
100
|
+
}));
|
|
101
|
+
return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)("__pipeline.yml", __assign(__assign({ image: image, stages: stages, variables: variables, workflow: workflow }, pipelineRest), jobsWithSortedProps))];
|
|
79
102
|
case 2:
|
|
80
|
-
// need to spread out the jobs, forgot why
|
|
81
103
|
_c.sent();
|
|
82
104
|
return [3 /*break*/, 6];
|
|
83
105
|
case 3: return [4 /*yield*/, (0, createMainPipeline_1.createMainPipeline)(pipelineType, config)];
|
|
84
106
|
case 4:
|
|
85
|
-
_b = _c.sent(), jobs = _b.jobs, image = _b.image, stages = _b.stages, variables = _b.variables, workflow = _b.workflow,
|
|
86
|
-
|
|
87
|
-
|
|
107
|
+
_b = _c.sent(), jobs = _b.jobs, image = _b.image, stages = _b.stages, variables = _b.variables, workflow = _b.workflow, pipelineRest = __rest(_b, ["jobs", "image", "stages", "variables", "workflow"]);
|
|
108
|
+
jobsWithSortedProps = Object.fromEntries(Object.entries(jobs).map(function (_a) {
|
|
109
|
+
var _b = __read(_a, 2), jobName = _b[0], job = _b[1];
|
|
110
|
+
return [
|
|
111
|
+
jobName,
|
|
112
|
+
(0, sortGitLabJobDefProps_1.sortGitLabJobDefProps)(job),
|
|
113
|
+
];
|
|
114
|
+
}));
|
|
115
|
+
return [4 /*yield*/, (0, writeFiles_1.writeYamlfile)(".gitlab-ci.yml", __assign(__assign({ image: image, stages: stages, variables: variables, workflow: workflow }, pipelineRest), jobsWithSortedProps))];
|
|
88
116
|
case 5:
|
|
89
|
-
// need to spread out the jobs, forgot why
|
|
90
117
|
_c.sent();
|
|
91
118
|
_c.label = 6;
|
|
92
119
|
case 6: return [2 /*return*/];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generatePipelineFiles.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/generatePipelineFiles.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generatePipelineFiles.js","sourceRoot":"","sources":["../../../../../pipeline/src/pipeline/generatePipelineFiles.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,kDAAoD;AACpD,6DAA4D;AAC5D,2DAA0D;AAC1D,8GAA6G;AAC7G,wEAAuE;AACvE,SAAsB,qBAAqB,CACzC,MAAc,EACd,YAAe,EACf,IAAqB;;;;;;yBAEjB,CAAA,IAAI,KAAK,eAAe,CAAA,EAAxB,wBAAwB;oBACpB,OAAO,GAAG,IAAA,mFAAwC,GAAE,CAAC;oBAGzD,qBAAM,IAAA,yCAAmB,EAAC,YAAY,EAAE,OAAO,EAAE,MAAM,CAAC,EAAA;;oBADpD,KACJ,SAAwD,EADlD,IAAI,UAAA,EAAE,KAAK,WAAA,EAAE,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,QAAQ,cAAA,EAAK,YAAY,cAA3D,oDAA6D,CAAF;oBAE3D,mBAAmB,GAAG,MAAM,CAAC,WAAW,CAC5C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAC,EAAc;4BAAd,KAAA,aAAc,EAAb,OAAO,QAAA,EAAE,GAAG,QAAA;wBAAM,OAAA;4BAC3C,OAAO;4BACP,IAAA,6CAAqB,EAAC,GAAG,CAAC;yBAC3B;oBAH4C,CAG5C,CAAC,CACH,CAAC;oBACF,qBAAM,IAAA,0BAAa,EAAC,gBAAgB,sBAClC,KAAK,OAAA,EACL,MAAM,QAAA,EACN,SAAS,WAAA,EACT,QAAQ,UAAA,IACL,YAAY,GAEZ,mBAAmB,EACtB,EAAA;;oBARF,SAQE,CAAC;;wBAGD,qBAAM,IAAA,uCAAkB,EAAC,YAAY,EAAE,MAAM,CAAC,EAAA;;oBAD1C,KACJ,SAA8C,EADxC,IAAI,UAAA,EAAE,KAAK,WAAA,EAAE,MAAM,YAAA,EAAE,SAAS,eAAA,EAAE,QAAQ,cAAA,EAAK,YAAY,cAA3D,oDAA6D,CAAF;oBAE3D,mBAAmB,GAAG,MAAM,CAAC,WAAW,CAC5C,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,UAAC,EAAc;4BAAd,KAAA,aAAc,EAAb,OAAO,QAAA,EAAE,GAAG,QAAA;wBAAM,OAAA;4BAC3C,OAAO;4BACP,IAAA,6CAAqB,EAAC,GAAG,CAAC;yBAC3B;oBAH4C,CAG5C,CAAC,CACH,CAAC;oBACF,qBAAM,IAAA,0BAAa,EAAC,gBAAgB,sBAClC,KAAK,OAAA,EACL,MAAM,QAAA,EACN,SAAS,WAAA,EACT,QAAQ,UAAA,IACL,YAAY,GAEZ,mBAAmB,EACtB,EAAA;;oBARF,SAQE,CAAC;;;;;;CAEN;AA5CD,sDA4CC"}
|
|
@@ -89,13 +89,8 @@ var getInjectVarsScript_1 = require("../../bash/getInjectVarsScript");
|
|
|
89
89
|
var defaults_1 = require("../../defaults");
|
|
90
90
|
var utils_1 = require("../../utils");
|
|
91
91
|
var gitlab_1 = require("../../utils/gitlab");
|
|
92
|
+
var removeUndefined_1 = require("../../utils/removeUndefined");
|
|
92
93
|
exports.GITLAB_ENVIRONMENT_URL_VARIABLE = "CL_GITLAB_ENVIRONMENT_URL";
|
|
93
|
-
var removeUndefined = function (obj) {
|
|
94
|
-
return Object.fromEntries(Object.entries(obj).filter(function (_a) {
|
|
95
|
-
var _b = __read(_a, 2), value = _b[1];
|
|
96
|
-
return value !== undefined;
|
|
97
|
-
}));
|
|
98
|
-
};
|
|
99
94
|
var getFullJobName = function (name, componentName, env) {
|
|
100
95
|
if (env) {
|
|
101
96
|
return "".concat(componentName, " ").concat(name, " | ").concat(env, " ");
|
|
@@ -173,8 +168,7 @@ var makeGitlabJob = function (componentName, env, _a, allJobs, baseRules) {
|
|
|
173
168
|
var modified = addGitlabEnvironment(context, environment, __assign(__assign({}, job), { rules: rules.length > 0 ? rules : undefined, variables: __assign(__assign({}, legacyRunnerVariables), runnerVariables), script: __spreadArray(__spreadArray([], __read(varsInjectScripts), false), __read(((_c = script === null || script === void 0 ? void 0 : script.filter(utils_1.notNil)) !== null && _c !== void 0 ? _c : [])), false), tags: jobTags, stage: stage,
|
|
174
169
|
// sort in a predictable manner for snapshot tests
|
|
175
170
|
needs: deduplicatedGitlabNeeds, retry: defaults_1.BASE_RETRY, interruptible: true }), componentName, env, allJobs);
|
|
176
|
-
|
|
177
|
-
return [fullJobName, gitlabJob];
|
|
171
|
+
return [fullJobName, (0, removeUndefined_1.removeUndefined)(modified)];
|
|
178
172
|
};
|
|
179
173
|
exports.makeGitlabJob = makeGitlabJob;
|
|
180
174
|
var addGitlabEnvironment = function (context, environment, job, componentName, env, // TODO: we could actually pull this from contxt
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createGitlabJobs.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/gitlab/createGitlabJobs.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAyC;AACzC,sEAAqE;AACrE,2CAA4C;AAQ5C,qCAAqC;AACrC,6CAAyD;
|
|
1
|
+
{"version":3,"file":"createGitlabJobs.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/gitlab/createGitlabJobs.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { GitlabJobDef } from "../../types";
|
|
2
|
+
/**
|
|
3
|
+
* Sorts the properties of a GitLab job definition based on the desired order.
|
|
4
|
+
*
|
|
5
|
+
* This is only useful when generating a GitLab pipeline YAML file.
|
|
6
|
+
*/
|
|
7
|
+
export declare const sortGitLabJobDefProps: (jobDef: GitlabJobDef) => GitlabJobDef;
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.sortGitLabJobDefProps = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* The desired order of GitLab job definition keys.
|
|
6
|
+
*/
|
|
7
|
+
var jobDefOrder = [
|
|
8
|
+
"stage",
|
|
9
|
+
"tags",
|
|
10
|
+
"image",
|
|
11
|
+
"services",
|
|
12
|
+
"variables",
|
|
13
|
+
"before_script",
|
|
14
|
+
"script",
|
|
15
|
+
"after_script",
|
|
16
|
+
"cache",
|
|
17
|
+
"coverage",
|
|
18
|
+
"environment",
|
|
19
|
+
"release",
|
|
20
|
+
"artifacts",
|
|
21
|
+
"rules",
|
|
22
|
+
"only",
|
|
23
|
+
"except",
|
|
24
|
+
"needs",
|
|
25
|
+
"dependencies",
|
|
26
|
+
"trigger",
|
|
27
|
+
"retry",
|
|
28
|
+
"interruptible",
|
|
29
|
+
"allow_failure",
|
|
30
|
+
"parallel",
|
|
31
|
+
"hooks",
|
|
32
|
+
"resource_group",
|
|
33
|
+
];
|
|
34
|
+
var sortGitLabJobDefKeys = function (jobDef) {
|
|
35
|
+
return Object.keys(jobDef).sort(function (a, b) {
|
|
36
|
+
return jobDefOrder.indexOf(a) === -1 && jobDefOrder.indexOf(b) === -1
|
|
37
|
+
? 0
|
|
38
|
+
: jobDefOrder.indexOf(a) === -1
|
|
39
|
+
? 1
|
|
40
|
+
: jobDefOrder.indexOf(b) === -1
|
|
41
|
+
? -1
|
|
42
|
+
: jobDefOrder.indexOf(a) - jobDefOrder.indexOf(b);
|
|
43
|
+
});
|
|
44
|
+
};
|
|
45
|
+
/**
|
|
46
|
+
* Sorts the properties of a GitLab job definition based on the desired order.
|
|
47
|
+
*
|
|
48
|
+
* This is only useful when generating a GitLab pipeline YAML file.
|
|
49
|
+
*/
|
|
50
|
+
var sortGitLabJobDefProps = function (jobDef) {
|
|
51
|
+
return sortGitLabJobDefKeys(jobDef).reduce(function (acc, key) {
|
|
52
|
+
var _a;
|
|
53
|
+
return jobDef[key] !== undefined
|
|
54
|
+
? Object.assign(acc, (_a = {}, _a[key] = jobDef[key], _a))
|
|
55
|
+
: acc;
|
|
56
|
+
}, {});
|
|
57
|
+
};
|
|
58
|
+
exports.sortGitLabJobDefProps = sortGitLabJobDefProps;
|
|
59
|
+
//# sourceMappingURL=sortGitLabJobDefProps.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sortGitLabJobDefProps.js","sourceRoot":"","sources":["../../../../../../pipeline/src/pipeline/gitlab/sortGitLabJobDefProps.ts"],"names":[],"mappings":";;;AAIA;;GAEG;AACH,IAAM,WAAW,GAAsB;IACrC,OAAO;IACP,MAAM;IACN,OAAO;IACP,UAAU;IACV,WAAW;IACX,eAAe;IACf,QAAQ;IACR,cAAc;IACd,OAAO;IACP,UAAU;IACV,aAAa;IACb,SAAS;IACT,WAAW;IACX,OAAO;IACP,MAAM;IACN,QAAQ;IACR,OAAO;IACP,cAAc;IACd,SAAS;IACT,OAAO;IACP,eAAe;IACf,eAAe;IACf,UAAU;IACV,OAAO;IACP,gBAAgB;CACjB,CAAC;AAEF,IAAM,oBAAoB,GAAG,UAAC,MAAoB;IAChD,OAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAuB,CAAC,IAAI,CAAC,UAAC,CAAC,EAAE,CAAC;QACnD,OAAA,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;YACH,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;gBAC7B,CAAC,CAAC,CAAC;gBACH,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;oBAC7B,CAAC,CAAC,CAAC,CAAC;oBACJ,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC;IANvD,CAMuD,CACxD;AARD,CAQC,CAAC;AAEJ;;;;GAIG;AACI,IAAM,qBAAqB,GAAG,UAAC,MAAoB;IACxD,OAAA,oBAAoB,CAAC,MAAM,CAAC,CAAC,MAAM,CACjC,UAAC,GAAG,EAAE,GAAG;;QACP,OAAA,MAAM,CAAC,GAAG,CAAC,KAAK,SAAS;YACvB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,YAAI,GAAC,GAAG,IAAG,MAAM,CAAC,GAAG,CAAC,MAAG;YAC5C,CAAC,CAAC,GAAG;IAFP,CAEO,EACT,EAAkB,CACnB;AAND,CAMC,CAAC;AAPS,QAAA,qBAAqB,yBAO9B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const removeUndefined: <T extends object>(obj: T) => T;
|