tnp-helpers 16.100.22 → 16.100.25
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/assets/shared/shared_folder_info.txt +1 -1
- package/browser/README.md +24 -24
- package/browser/esm2022/lib/base/base-feature-for-project.mjs +1 -1
- package/browser/esm2022/lib/base/base-project.mjs +279 -32
- package/browser/esm2022/lib/helpers/helpers.mjs +2 -2
- package/browser/esm2022/lib/index.mjs +1 -1
- package/browser/fesm2022/tnp-helpers.mjs +272 -31
- package/browser/fesm2022/tnp-helpers.mjs.map +1 -1
- package/browser/lib/base/base-feature-for-project.d.ts +1 -1
- package/browser/lib/base/base-project.d.ts +10 -21
- package/browser/lib/index.d.ts +1 -2
- package/client/README.md +24 -24
- package/client/esm2022/lib/base/base-feature-for-project.mjs +1 -1
- package/client/esm2022/lib/base/base-project.mjs +279 -32
- package/client/esm2022/lib/helpers/helpers.mjs +2 -2
- package/client/esm2022/lib/index.mjs +1 -1
- package/client/fesm2022/tnp-helpers.mjs +272 -31
- package/client/fesm2022/tnp-helpers.mjs.map +1 -1
- package/client/lib/base/base-feature-for-project.d.ts +1 -1
- package/client/lib/base/base-project.d.ts +10 -21
- package/client/lib/index.d.ts +1 -2
- package/client/package.json +3 -3
- package/firedev.jsonc +62 -62
- package/lib/base/base-command-line.backend.js +1 -0
- package/lib/base/base-command-line.backend.js.map +1 -1
- package/lib/base/base-feature-for-project.d.ts +1 -1
- package/lib/base/base-project.d.ts +48 -66
- package/lib/base/base-project.js +146 -74
- package/lib/base/base-project.js.map +1 -1
- package/lib/base/command-line-feature.backend.js +17 -26
- package/lib/base/command-line-feature.backend.js.map +1 -1
- package/lib/helpers/for-backend/helpers-console-gui.d.ts +3 -3
- package/lib/helpers/for-backend/helpers-git.backend.d.ts +3 -3
- package/lib/helpers/for-backend/helpers-path.backend.d.ts +1 -1
- package/lib/helpers/for-backend/helpers-process.backend.d.ts +1 -1
- package/lib/helpers/for-backend/helpers-system-terminal.backend.d.ts +1 -1
- package/lib/helpers/for-browser/angular.helper.js +3 -3
- package/lib/helpers/helpers.d.ts +1 -1
- package/lib/helpers/helpers.js +1 -1
- package/lib/helpers/helpers.js.map +1 -1
- package/lib/index.d.ts +1 -2
- package/lib/index.js.map +1 -1
- package/lib/old/base-component.js +3 -3
- package/lib/old/base-formly-component.js +3 -3
- package/lib/old/dual-component-ctrl.js +3 -3
- package/package.json +2 -2
- package/tmp-environment.json +7 -7
- package/websql/README.md +24 -24
- package/websql/esm2022/lib/base/base-feature-for-project.mjs +1 -1
- package/websql/esm2022/lib/base/base-project.mjs +276 -33
- package/websql/esm2022/lib/helpers/helpers.mjs +2 -2
- package/websql/esm2022/lib/index.mjs +1 -1
- package/websql/fesm2022/tnp-helpers.mjs +269 -32
- package/websql/fesm2022/tnp-helpers.mjs.map +1 -1
- package/websql/lib/base/base-feature-for-project.d.ts +1 -1
- package/websql/lib/base/base-project.d.ts +10 -21
- package/websql/lib/index.d.ts +1 -2
package/lib/base/base-project.js
CHANGED
|
@@ -82,12 +82,17 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
82
82
|
// Helpers.taskStarted(`Detecting embedded project for ${this.location}`); // TODO it is slow
|
|
83
83
|
var nearsetProj = this.ins.nearestTo((0, tnp_core_1.crossPlatformPath)([this.location, '..']));
|
|
84
84
|
var linkedPorj = nearsetProj.linkedProjects.find(function (l) {
|
|
85
|
-
return _this.location ===
|
|
85
|
+
return (_this.location ===
|
|
86
|
+
(0, tnp_core_1.crossPlatformPath)([nearsetProj.location, l.relativeClonePath]));
|
|
86
87
|
});
|
|
87
88
|
if (!linkedPorj || !linkedPorj.internalRealtiveProjectPath) {
|
|
88
89
|
return;
|
|
89
90
|
}
|
|
90
|
-
var pathToEmbededProj = (0, tnp_core_1.crossPlatformPath)([
|
|
91
|
+
var pathToEmbededProj = (0, tnp_core_1.crossPlatformPath)([
|
|
92
|
+
nearsetProj.location,
|
|
93
|
+
linkedPorj.relativeClonePath,
|
|
94
|
+
linkedPorj.internalRealtiveProjectPath || '',
|
|
95
|
+
]);
|
|
91
96
|
var embdedresult = this.ins.From(pathToEmbededProj);
|
|
92
97
|
// Helpers.taskDone(`Embedded project detected for ${this.location}`);
|
|
93
98
|
this.globalCache[cacheKey] = embdedresult;
|
|
@@ -168,7 +173,11 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
168
173
|
case 3:
|
|
169
174
|
if (!!_b.done) return [3 /*break*/, 7];
|
|
170
175
|
link = _b.value;
|
|
171
|
-
linkedPorj = this.ins.From([
|
|
176
|
+
linkedPorj = this.ins.From([
|
|
177
|
+
proj.location,
|
|
178
|
+
link.relativeClonePath,
|
|
179
|
+
link.internalRealtiveProjectPath || '',
|
|
180
|
+
]);
|
|
172
181
|
if (!linkedPorj) return [3 /*break*/, 5];
|
|
173
182
|
return [4 /*yield*/, linkedPorj.saveLocationToDB()];
|
|
174
183
|
case 4:
|
|
@@ -291,7 +300,9 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
291
300
|
return this.cache['core'];
|
|
292
301
|
}
|
|
293
302
|
// Helpers.taskStarted(`Detecting core project for ${this.genericName}`);
|
|
294
|
-
var coreProjects = index_1.CoreProject.coreProjects.filter(function (p) {
|
|
303
|
+
var coreProjects = index_1.CoreProject.coreProjects.filter(function (p) {
|
|
304
|
+
return p.recognizedFn(_this);
|
|
305
|
+
});
|
|
295
306
|
coreProjects = this.orderCoreProjects(coreProjects);
|
|
296
307
|
// Helpers.taskDone(`Core project detected for ${this.genericName}`);
|
|
297
308
|
// console.log('CoreProject.coreProjects', CoreProject.coreProjects.map(c => c.name));
|
|
@@ -304,7 +315,9 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
304
315
|
//#endregion
|
|
305
316
|
//#region methods & getters / add linked project
|
|
306
317
|
BaseProject.prototype.addLinkedProject = function (linkedProj) {
|
|
307
|
-
var linkedProject = tnp_core_2._.isString(linkedProj)
|
|
318
|
+
var linkedProject = tnp_core_2._.isString(linkedProj)
|
|
319
|
+
? index_1.LinkedProject.fromName(linkedProj)
|
|
320
|
+
: linkedProj;
|
|
308
321
|
//#region @backendFunc
|
|
309
322
|
var linkedProjectsConfig = this.getLinkedProjectsConfig();
|
|
310
323
|
linkedProjectsConfig.projects.push(index_1.LinkedProject.from(linkedProject));
|
|
@@ -342,7 +355,10 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
342
355
|
var writer = json5Write.load(index_1.Helpers.readFile(this.linkedProjectsConfigPath));
|
|
343
356
|
writer.write(linkedPorjectsConfig);
|
|
344
357
|
var removeEmptyLineFromString = function (str) {
|
|
345
|
-
return (str || '')
|
|
358
|
+
return (str || '')
|
|
359
|
+
.split('\n')
|
|
360
|
+
.filter(function (f) { return !!f.trim(); })
|
|
361
|
+
.join('\n');
|
|
346
362
|
};
|
|
347
363
|
index_1.Helpers.writeFile(this.linkedProjectsConfigPath, removeEmptyLineFromString(writer.toSource({ quote: 'double', trailingComma: false })));
|
|
348
364
|
// Helpers.writeJson(this.pathFor(config.file.linked_projects_json), linkedPorjectsConfig);
|
|
@@ -361,7 +377,8 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
361
377
|
//#region methods & getters / recreate linked projects config
|
|
362
378
|
BaseProject.prototype.recreateLinkedProjectsConfig = function () {
|
|
363
379
|
//#region @backendFunc
|
|
364
|
-
if (!index_1.Helpers.exists(this.linkedProjectsConfigPath) &&
|
|
380
|
+
if (!index_1.Helpers.exists(this.linkedProjectsConfigPath) &&
|
|
381
|
+
index_1.Helpers.exists(this.pathFor(tnp_config_1.config.file.firedev_jsonc))) {
|
|
365
382
|
index_1.Helpers.writeJson(this.linkedProjectsConfigPath, index_1.LinkedPorjectsConfig.from({ projects: [] }));
|
|
366
383
|
}
|
|
367
384
|
//#endregion
|
|
@@ -382,7 +399,9 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
382
399
|
return index_1.LinkedProject.fromName(projOrProjName, currentRemoteUrl, currentBranch);
|
|
383
400
|
}
|
|
384
401
|
if (!projOrProjName.relativeClonePath) {
|
|
385
|
-
projOrProjName.relativeClonePath = tnp_core_1.path
|
|
402
|
+
projOrProjName.relativeClonePath = tnp_core_1.path
|
|
403
|
+
.basename(projOrProjName.remoteUrl())
|
|
404
|
+
.replace('.git', '');
|
|
386
405
|
}
|
|
387
406
|
projOrProjName = index_1.LinkedProject.from(projOrProjName);
|
|
388
407
|
if (!projOrProjName.remoteUrl()) {
|
|
@@ -391,6 +410,7 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
391
410
|
return projOrProjName;
|
|
392
411
|
});
|
|
393
412
|
// console.log({ linkedPorjectsConfig })
|
|
413
|
+
// @ts-ignore
|
|
394
414
|
linkedPorjectsConfig.projects = index_1.Helpers.uniqArray(linkedPorjectsConfig.projects, 'relativeClonePath');
|
|
395
415
|
if (!tnp_core_2._.isEqual(orgExistedConfig, linkedPorjectsConfig)) {
|
|
396
416
|
this.setLinkedProjectsConfig(linkedPorjectsConfig);
|
|
@@ -411,8 +431,7 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
411
431
|
//#endregion
|
|
412
432
|
//#region methods & getters / detected linked projects
|
|
413
433
|
get: function () {
|
|
414
|
-
var detectedLinkedProjects = index_1.LinkedProject.detect(this.location, true
|
|
415
|
-
);
|
|
434
|
+
var detectedLinkedProjects = index_1.LinkedProject.detect(this.location, true);
|
|
416
435
|
return detectedLinkedProjects;
|
|
417
436
|
},
|
|
418
437
|
enumerable: false,
|
|
@@ -460,19 +479,24 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
460
479
|
switch (_c.label) {
|
|
461
480
|
case 0:
|
|
462
481
|
//#region @backendFunc
|
|
463
|
-
if (actionType === 'push' &&
|
|
482
|
+
if (actionType === 'push' &&
|
|
483
|
+
this.automaticallyAddAllChnagesWhenPushingToGit()) {
|
|
464
484
|
return [2 /*return*/];
|
|
465
485
|
}
|
|
466
486
|
detectedLinkedProjects = this.detectedLinkedProjects;
|
|
467
487
|
projectsThatShouldBeLinked = this.linkedProjects
|
|
468
488
|
.map(function (linkedProj) {
|
|
469
|
-
return detectedLinkedProjects.find(function (f) { return f.relativeClonePath === linkedProj.relativeClonePath; })
|
|
489
|
+
return detectedLinkedProjects.find(function (f) { return f.relativeClonePath === linkedProj.relativeClonePath; })
|
|
490
|
+
? void 0
|
|
491
|
+
: linkedProj;
|
|
470
492
|
})
|
|
471
493
|
.filter(function (f) { return !!f; });
|
|
472
494
|
if (!(projectsThatShouldBeLinked.length > 0)) return [3 /*break*/, 11];
|
|
473
|
-
index_1.Helpers.info("\n\n".concat(projectsThatShouldBeLinked
|
|
495
|
+
index_1.Helpers.info("\n\n".concat(projectsThatShouldBeLinked
|
|
496
|
+
.map(function (p, index) {
|
|
474
497
|
return "- ".concat(index + 1, ". ").concat(tnp_core_3.chalk.bold(p.relativeClonePath), " ").concat(p.remoteUrl(), " {").concat(p.purpose ? " purpose: ".concat(p.purpose, " }") : '');
|
|
475
|
-
})
|
|
498
|
+
})
|
|
499
|
+
.join('\n'), "\n\n "));
|
|
476
500
|
if (!!this.isMonorepo) return [3 /*break*/, 11];
|
|
477
501
|
_a = cloneChildren;
|
|
478
502
|
if (_a) return [3 /*break*/, 2];
|
|
@@ -495,7 +519,10 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
495
519
|
return [4 /*yield*/, this.git.clone(linkedProj.remoteUrl(), linkedProj.relativeClonePath, linkedProj.deafultBranch)];
|
|
496
520
|
case 5:
|
|
497
521
|
_c.sent();
|
|
498
|
-
childProjLocaiton = this.pathFor([
|
|
522
|
+
childProjLocaiton = this.pathFor([
|
|
523
|
+
linkedProj.relativeClonePath,
|
|
524
|
+
linkedProj.internalRealtiveProjectPath,
|
|
525
|
+
]);
|
|
499
526
|
childProj = this.ins.From(childProjLocaiton);
|
|
500
527
|
if (!childProj) return [3 /*break*/, 7];
|
|
501
528
|
return [4 /*yield*/, childProj.saveLocationToDB()];
|
|
@@ -601,8 +628,8 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
601
628
|
//#endregion
|
|
602
629
|
//#region methods & getters / major version
|
|
603
630
|
/**
|
|
604
|
-
|
|
605
|
-
|
|
631
|
+
* Major Version from package.json
|
|
632
|
+
*/
|
|
606
633
|
// @ts-ignore
|
|
607
634
|
get: function () {
|
|
608
635
|
//#region @backendFunc
|
|
@@ -622,7 +649,7 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
622
649
|
get: function () {
|
|
623
650
|
var _a;
|
|
624
651
|
//#region @backendFunc
|
|
625
|
-
var __ = (_a = tslib_1.__read((
|
|
652
|
+
var __ = (_a = tslib_1.__read((this.version || '').split('.') || [void 0, void 0], 2), _a[0]), minor = _a[1];
|
|
626
653
|
return Number(minor);
|
|
627
654
|
//#endregion
|
|
628
655
|
},
|
|
@@ -708,10 +735,12 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
708
735
|
//#region @backendFunc
|
|
709
736
|
var isDirectory = function (source) { return tnp_core_3.fse.lstatSync(source).isDirectory(); };
|
|
710
737
|
var getDirectories = function (source) {
|
|
711
|
-
return tnp_core_3.fse
|
|
738
|
+
return tnp_core_3.fse
|
|
739
|
+
.readdirSync(source)
|
|
740
|
+
.map(function (name) { return tnp_core_1.path.join(source, name); })
|
|
741
|
+
.filter(isDirectory);
|
|
712
742
|
};
|
|
713
|
-
var subdirectories = getDirectories(this.location)
|
|
714
|
-
.filter(function (f) {
|
|
743
|
+
var subdirectories = getDirectories(this.location).filter(function (f) {
|
|
715
744
|
var folderName = tnp_core_1.path.basename(f);
|
|
716
745
|
return index_1.Helpers.checkIfNameAllowedForFiredevProj(folderName);
|
|
717
746
|
});
|
|
@@ -816,7 +845,8 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
816
845
|
//#endregion
|
|
817
846
|
]
|
|
818
847
|
.filter(function (f) { return !!f; })
|
|
819
|
-
.join('/')
|
|
848
|
+
.join('/')
|
|
849
|
+
.replace(/\(\)/, '');
|
|
820
850
|
//#endregion
|
|
821
851
|
},
|
|
822
852
|
enumerable: false,
|
|
@@ -842,13 +872,14 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
842
872
|
};
|
|
843
873
|
BaseProject.prototype.nodeModulesEmpty = function () {
|
|
844
874
|
//#region @backendFunc
|
|
845
|
-
return !this.hasFolder(tnp_config_1.config.folder.node_modules) ||
|
|
875
|
+
return (!this.hasFolder(tnp_config_1.config.folder.node_modules) ||
|
|
876
|
+
tnp_core_3.fse.readdirSync(this.pathFor(tnp_config_1.config.folder.node_modules)).length === 0);
|
|
846
877
|
//#endregion
|
|
847
878
|
};
|
|
848
879
|
//#region methods & getters / path exits
|
|
849
880
|
/**
|
|
850
|
-
|
|
851
|
-
|
|
881
|
+
* same has project.hasFile();
|
|
882
|
+
*/
|
|
852
883
|
BaseProject.prototype.pathExists = function (relativePath) {
|
|
853
884
|
return this.hasFile(relativePath);
|
|
854
885
|
};
|
|
@@ -864,7 +895,8 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
864
895
|
};
|
|
865
896
|
BaseProject.prototype.hasFolder = function (relativePath) {
|
|
866
897
|
//#region @backendFunc
|
|
867
|
-
return index_1.Helpers.exists(this.pathFor(relativePath)) &&
|
|
898
|
+
return (index_1.Helpers.exists(this.pathFor(relativePath)) &&
|
|
899
|
+
tnp_core_3.fse.lstatSync(this.pathFor(relativePath)).isDirectory());
|
|
868
900
|
//#endregion
|
|
869
901
|
};
|
|
870
902
|
//#endregion
|
|
@@ -970,11 +1002,9 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
970
1002
|
* @param options
|
|
971
1003
|
* @returns
|
|
972
1004
|
*/
|
|
973
|
-
BaseProject.prototype.tryRunSync = function (command
|
|
1005
|
+
BaseProject.prototype.tryRunSync = function (command,
|
|
974
1006
|
//#region @backend
|
|
975
|
-
|
|
976
|
-
//#endregion
|
|
977
|
-
) {
|
|
1007
|
+
options) {
|
|
978
1008
|
//#region @backendFunc
|
|
979
1009
|
try {
|
|
980
1010
|
this.run(command, options).sync();
|
|
@@ -986,11 +1016,9 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
986
1016
|
};
|
|
987
1017
|
//#endregion
|
|
988
1018
|
//#region methods & getters / output from command
|
|
989
|
-
BaseProject.prototype.outputFrom = function (command
|
|
1019
|
+
BaseProject.prototype.outputFrom = function (command,
|
|
990
1020
|
//#region @backend
|
|
991
|
-
|
|
992
|
-
//#endregion
|
|
993
|
-
) {
|
|
1021
|
+
options) {
|
|
994
1022
|
//#region @backendFunc
|
|
995
1023
|
return index_1.Helpers.commnadOutputAsString(command, this.location, options);
|
|
996
1024
|
//#endregion
|
|
@@ -1071,7 +1099,7 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
1071
1099
|
max = 2000;
|
|
1072
1100
|
i = 0;
|
|
1073
1101
|
while (takenPorts.includes(startFrom)) {
|
|
1074
|
-
startFrom +=
|
|
1102
|
+
startFrom += 1 + howManyFreePortsAfterThatPort;
|
|
1075
1103
|
}
|
|
1076
1104
|
_a.label = 1;
|
|
1077
1105
|
case 1:
|
|
@@ -1227,7 +1255,9 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
1227
1255
|
linked = _c.value;
|
|
1228
1256
|
child = this.ins.From(this.pathFor([linked.relativeClonePath]));
|
|
1229
1257
|
if (!child) return [3 /*break*/, 6];
|
|
1230
|
-
return [4 /*yield*/, child.resetProcess(child.resetLinkedProjectsOnlyToCoreBranches()
|
|
1258
|
+
return [4 /*yield*/, child.resetProcess(child.resetLinkedProjectsOnlyToCoreBranches()
|
|
1259
|
+
? void 0
|
|
1260
|
+
: branchToReset, true)];
|
|
1231
1261
|
case 5:
|
|
1232
1262
|
_e.sent();
|
|
1233
1263
|
_e.label = 6;
|
|
@@ -1276,7 +1306,6 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
1276
1306
|
this.git.stash();
|
|
1277
1307
|
}
|
|
1278
1308
|
catch (error) { }
|
|
1279
|
-
;
|
|
1280
1309
|
}
|
|
1281
1310
|
return [4 /*yield*/, this.git.pullCurrentBranch({ askToRetry: true })];
|
|
1282
1311
|
case 2:
|
|
@@ -1381,14 +1410,17 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
1381
1410
|
}
|
|
1382
1411
|
_f.label = 14;
|
|
1383
1412
|
case 14:
|
|
1384
|
-
if (this.automaticallyAddAllChnagesWhenPushingToGit()) {
|
|
1413
|
+
if (this.automaticallyAddAllChnagesWhenPushingToGit()) {
|
|
1414
|
+
// my project
|
|
1385
1415
|
this.git.stageAllFiles();
|
|
1386
1416
|
}
|
|
1387
1417
|
if (this.useGitBranchesAsMetadataForCommits()) {
|
|
1388
1418
|
index_1.Helpers.info('Checkingout branches (if needed)...');
|
|
1389
1419
|
if (((_a = this.git.currentBranchName) === null || _a === void 0 ? void 0 : _a.trim()) !== commitData.branchName) {
|
|
1390
1420
|
try {
|
|
1391
|
-
this.git.checkout(commitData.branchName, {
|
|
1421
|
+
this.git.checkout(commitData.branchName, {
|
|
1422
|
+
createBranchIfNotExists: true,
|
|
1423
|
+
});
|
|
1392
1424
|
}
|
|
1393
1425
|
catch (error) {
|
|
1394
1426
|
index_1.Helpers.error('Please modyfiy you commit message or delete branch,');
|
|
@@ -1401,7 +1433,12 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
1401
1433
|
catch (error) {
|
|
1402
1434
|
index_1.Helpers.warn("Not commiting anything... ");
|
|
1403
1435
|
}
|
|
1404
|
-
return [4 /*yield*/, this.git.pushCurrentBranch({
|
|
1436
|
+
return [4 /*yield*/, this.git.pushCurrentBranch({
|
|
1437
|
+
force: force,
|
|
1438
|
+
origin: origin,
|
|
1439
|
+
forcePushNoQuestion: forcePushNoQuestion,
|
|
1440
|
+
askToRetry: true,
|
|
1441
|
+
})];
|
|
1405
1442
|
case 15:
|
|
1406
1443
|
_f.sent();
|
|
1407
1444
|
if (!(this.automaticallyAddAllChnagesWhenPushingToGit() && !skipChildren)) return [3 /*break*/, 23];
|
|
@@ -1466,7 +1503,9 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
1466
1503
|
case 0:
|
|
1467
1504
|
//#region @backendFunc
|
|
1468
1505
|
this._beforeAnyActionOnGitRoot();
|
|
1469
|
-
if (!(this.git.isInsideGitRepo &&
|
|
1506
|
+
if (!(this.git.isInsideGitRepo &&
|
|
1507
|
+
this.git.isGitRoot &&
|
|
1508
|
+
!((_a = this.git.currentBranchName) === null || _a === void 0 ? void 0 : _a.trim()))) return [3 /*break*/, 2];
|
|
1470
1509
|
return [4 /*yield*/, index_1.Helpers.consoleGui.question.yesNo('Repository is empty...Commit "master" branch and commit all as "first commit" ?')];
|
|
1471
1510
|
case 1:
|
|
1472
1511
|
if (_b.sent()) {
|
|
@@ -1569,7 +1608,9 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
1569
1608
|
//#region getters & methods / ru command and get string
|
|
1570
1609
|
BaseProject.prototype.runCommandGetString = function (command) {
|
|
1571
1610
|
//#region @backendFunc
|
|
1572
|
-
return index_1.Helpers.commnadOutputAsString(command, this.location, {
|
|
1611
|
+
return index_1.Helpers.commnadOutputAsString(command, this.location, {
|
|
1612
|
+
biggerBuffer: false,
|
|
1613
|
+
});
|
|
1573
1614
|
//#endregion
|
|
1574
1615
|
};
|
|
1575
1616
|
Object.defineProperty(BaseProject.prototype, "git", {
|
|
@@ -1595,20 +1636,29 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
1595
1636
|
return tslib_1.__generator(this, function (_a) {
|
|
1596
1637
|
switch (_a.label) {
|
|
1597
1638
|
case 0:
|
|
1598
|
-
clondeFolderpath = index_1.Helpers.git.clone({
|
|
1639
|
+
clondeFolderpath = index_1.Helpers.git.clone({
|
|
1640
|
+
cwd: self.location,
|
|
1641
|
+
url: url,
|
|
1642
|
+
destinationFolderName: destinationFolderName,
|
|
1643
|
+
});
|
|
1599
1644
|
if (!branchName) return [3 /*break*/, 4];
|
|
1600
1645
|
_a.label = 1;
|
|
1601
1646
|
case 1:
|
|
1602
1647
|
_a.trys.push([1, 3, , 4]);
|
|
1603
1648
|
index_1.Helpers.git.checkout(clondeFolderpath, branchName);
|
|
1604
|
-
return [4 /*yield*/, index_1.Helpers.git.pullCurrentBranch(clondeFolderpath, {
|
|
1649
|
+
return [4 /*yield*/, index_1.Helpers.git.pullCurrentBranch(clondeFolderpath, {
|
|
1650
|
+
askToRetry: true,
|
|
1651
|
+
})];
|
|
1605
1652
|
case 2:
|
|
1606
1653
|
_a.sent();
|
|
1607
1654
|
return [3 /*break*/, 4];
|
|
1608
1655
|
case 3:
|
|
1609
1656
|
error_3 = _a.sent();
|
|
1610
1657
|
return [3 /*break*/, 4];
|
|
1611
|
-
case 4: return [2 /*return*/, (0, tnp_core_1.crossPlatformPath)([
|
|
1658
|
+
case 4: return [2 /*return*/, (0, tnp_core_1.crossPlatformPath)([
|
|
1659
|
+
clondeFolderpath,
|
|
1660
|
+
destinationFolderName || '',
|
|
1661
|
+
]).replace(/\/$/g, '')];
|
|
1612
1662
|
}
|
|
1613
1663
|
});
|
|
1614
1664
|
});
|
|
@@ -1834,7 +1884,7 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
1834
1884
|
},
|
|
1835
1885
|
get lastTagVersionName() {
|
|
1836
1886
|
//#region @backendFunc
|
|
1837
|
-
return
|
|
1887
|
+
return index_1.Helpers.git.lastTagVersionName(self.location) || '';
|
|
1838
1888
|
//#endregion
|
|
1839
1889
|
},
|
|
1840
1890
|
get stagedFiles() {
|
|
@@ -1848,10 +1898,11 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
1848
1898
|
renameOrigin: function (newNameOrUlr) {
|
|
1849
1899
|
//#region @backendFunc
|
|
1850
1900
|
if (!newNameOrUlr.endsWith('.git')) {
|
|
1851
|
-
newNameOrUlr =
|
|
1901
|
+
newNameOrUlr = newNameOrUlr + '.git';
|
|
1852
1902
|
}
|
|
1853
1903
|
var oldOrigin = self.git.originURL;
|
|
1854
|
-
if (!newNameOrUlr.startsWith('git@') &&
|
|
1904
|
+
if (!newNameOrUlr.startsWith('git@') &&
|
|
1905
|
+
!newNameOrUlr.startsWith('https://')) {
|
|
1855
1906
|
newNameOrUlr = oldOrigin.replace(tnp_core_1.path.basename(oldOrigin), newNameOrUlr);
|
|
1856
1907
|
}
|
|
1857
1908
|
try {
|
|
@@ -1934,8 +1985,7 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
1934
1985
|
index_1.Helpers.run("fkill -f ".concat(this.name)).sync();
|
|
1935
1986
|
}
|
|
1936
1987
|
}
|
|
1937
|
-
catch (error) {
|
|
1938
|
-
}
|
|
1988
|
+
catch (error) { }
|
|
1939
1989
|
index_1.Helpers.taskDone('Done kill all app instances');
|
|
1940
1990
|
//#endregion
|
|
1941
1991
|
};
|
|
@@ -1947,7 +1997,7 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
1947
1997
|
BaseProject.prototype.init = function (initOptions) {
|
|
1948
1998
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
1949
1999
|
return tslib_1.__generator(this, function (_a) {
|
|
1950
|
-
throw
|
|
2000
|
+
throw new Error('TODO IMPLEMENT');
|
|
1951
2001
|
});
|
|
1952
2002
|
});
|
|
1953
2003
|
};
|
|
@@ -1959,7 +2009,7 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
1959
2009
|
BaseProject.prototype.link = function () {
|
|
1960
2010
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
1961
2011
|
return tslib_1.__generator(this, function (_a) {
|
|
1962
|
-
throw
|
|
2012
|
+
throw new Error('TODO IMPLEMENT');
|
|
1963
2013
|
});
|
|
1964
2014
|
});
|
|
1965
2015
|
};
|
|
@@ -1971,19 +2021,19 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
1971
2021
|
BaseProject.prototype.struct = function (initOptions) {
|
|
1972
2022
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
1973
2023
|
return tslib_1.__generator(this, function (_a) {
|
|
1974
|
-
throw
|
|
2024
|
+
throw new Error('TODO IMPLEMENT');
|
|
1975
2025
|
});
|
|
1976
2026
|
});
|
|
1977
2027
|
};
|
|
1978
2028
|
//#endregion
|
|
1979
2029
|
//#region getters & methods / build
|
|
1980
2030
|
/**
|
|
1981
|
-
|
|
1982
|
-
|
|
2031
|
+
* init and build() project
|
|
2032
|
+
*/
|
|
1983
2033
|
BaseProject.prototype.build = function (buildOptions) {
|
|
1984
2034
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
1985
2035
|
return tslib_1.__generator(this, function (_a) {
|
|
1986
|
-
throw
|
|
2036
|
+
throw new Error('TODO IMPLEMENT');
|
|
1987
2037
|
});
|
|
1988
2038
|
});
|
|
1989
2039
|
};
|
|
@@ -2011,7 +2061,7 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
2011
2061
|
var proj;
|
|
2012
2062
|
return tslib_1.__generator(this, function (_d) {
|
|
2013
2063
|
proj = this;
|
|
2014
|
-
index_1.Helpers.info("\n\n name: ".concat(proj === null || proj === void 0 ? void 0 : proj.name, "\n type: ").concat(proj === null || proj === void 0 ? void 0 : proj.type, "\n core project name: '").concat((_a = proj === null || proj === void 0 ? void 0 : proj.core) === null || _a === void 0 ? void 0 : _a.name, "'\n embedded project: ").concat(((_b = proj === null || proj === void 0 ? void 0 : proj.embeddedProject) === null || _b === void 0 ? void 0 : _b.genericName) || '< none >', "\n children (").concat(proj === null || proj === void 0 ? void 0 : proj.children.length, "): ").concat(
|
|
2064
|
+
index_1.Helpers.info("\n\n name: ".concat(proj === null || proj === void 0 ? void 0 : proj.name, "\n type: ").concat(proj === null || proj === void 0 ? void 0 : proj.type, "\n core project name: '").concat((_a = proj === null || proj === void 0 ? void 0 : proj.core) === null || _a === void 0 ? void 0 : _a.name, "'\n embedded project: ").concat(((_b = proj === null || proj === void 0 ? void 0 : proj.embeddedProject) === null || _b === void 0 ? void 0 : _b.genericName) || '< none >', "\n children (").concat(proj === null || proj === void 0 ? void 0 : proj.children.length, "): ").concat(!proj || !proj.children.length ? '< none >' : '', "\n").concat(proj === null || proj === void 0 ? void 0 : proj.children.map(function (c) { return '+' + c.genericName; }).join('\n'), "\n") +
|
|
2015
2065
|
"\nlinked porject prefix: \"".concat(this.linkedProjectsPrefix, "\"\n\nlinked projects from json (").concat(((_c = this.linkedProjects) === null || _c === void 0 ? void 0 : _c.length) || 0, "):\n").concat((this.linkedProjects || []).map(function (c) { return '- ' + c.relativeClonePath; }).join('\n'), "\n\n "));
|
|
2016
2066
|
return [2 /*return*/];
|
|
2017
2067
|
});
|
|
@@ -2063,9 +2113,10 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
2063
2113
|
if (!this.pathExists(tnp_config_1.config.file.angular_json)) {
|
|
2064
2114
|
return [];
|
|
2065
2115
|
}
|
|
2066
|
-
var projects = Object.values((_a = index_1.Helpers.readJson(this.pathFor(tnp_config_1.config.file.angular_json))) === null || _a === void 0 ? void 0 : _a.projects)
|
|
2067
|
-
|
|
2068
|
-
|
|
2116
|
+
var projects = Object.values((_a = index_1.Helpers.readJson(this.pathFor(tnp_config_1.config.file.angular_json))) === null || _a === void 0 ? void 0 : _a.projects).filter(function (f) { return f.projectType === 'library'; });
|
|
2117
|
+
var libraries = projects.map(function (c) {
|
|
2118
|
+
return _this.ins.From(tnp_core_1.path.join(_this.location, c.root));
|
|
2119
|
+
});
|
|
2069
2120
|
return libraries;
|
|
2070
2121
|
//#endregion
|
|
2071
2122
|
},
|
|
@@ -2099,7 +2150,9 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
2099
2150
|
// console.log(`CACHE ${proj.basename} => name: ` + proj.cache['nameToCompare'])
|
|
2100
2151
|
return proj.cache['nameToCompare'];
|
|
2101
2152
|
}
|
|
2102
|
-
proj.cache['nameToCompare'] = index_1.Helpers.exists(proj.pathFor('ui-module.json'))
|
|
2153
|
+
proj.cache['nameToCompare'] = index_1.Helpers.exists(proj.pathFor('ui-module.json'))
|
|
2154
|
+
? proj.basename
|
|
2155
|
+
: proj.name;
|
|
2103
2156
|
return proj.cache['nameToCompare'];
|
|
2104
2157
|
});
|
|
2105
2158
|
return sorted;
|
|
@@ -2159,7 +2212,9 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
2159
2212
|
}
|
|
2160
2213
|
return [3 /*break*/, 5];
|
|
2161
2214
|
case 8:
|
|
2162
|
-
index_1.Helpers.writeJson(this.pathFor(lastSelectedJsonFile), {
|
|
2215
|
+
index_1.Helpers.writeJson(this.pathFor(lastSelectedJsonFile), {
|
|
2216
|
+
lastSelected: libs.map(function (c) { return c.basename; }),
|
|
2217
|
+
});
|
|
2163
2218
|
return [2 /*return*/, libs];
|
|
2164
2219
|
}
|
|
2165
2220
|
});
|
|
@@ -2207,7 +2262,9 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
2207
2262
|
return true;
|
|
2208
2263
|
}
|
|
2209
2264
|
var nameMatchesPattern = onlySelectedLibs.find(function (c) { return f.name.includes(c); });
|
|
2210
|
-
var basenameMatchesPattern = onlySelectedLibs.find(function (c) {
|
|
2265
|
+
var basenameMatchesPattern = onlySelectedLibs.find(function (c) {
|
|
2266
|
+
return f.basename.includes(c);
|
|
2267
|
+
});
|
|
2211
2268
|
return nameMatchesPattern || basenameMatchesPattern;
|
|
2212
2269
|
});
|
|
2213
2270
|
if (!(allLibsToBuild.length == 1)) return [3 /*break*/, 2];
|
|
@@ -2215,7 +2272,7 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
2215
2272
|
return [3 /*break*/, 4];
|
|
2216
2273
|
case 2: return [4 /*yield*/, this.getSortedLibrariesByDepsForBuild(allLibsToBuild, allLibs.length != allLibsToBuild.length)];
|
|
2217
2274
|
case 3:
|
|
2218
|
-
_e =
|
|
2275
|
+
_e = _p.sent();
|
|
2219
2276
|
_p.label = 4;
|
|
2220
2277
|
case 4:
|
|
2221
2278
|
libsToWatch = _e;
|
|
@@ -2241,7 +2298,9 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
2241
2298
|
console.log('linking from ', sourceDist);
|
|
2242
2299
|
console.log('linking to ', dest);
|
|
2243
2300
|
// Helpers.remove(dest);
|
|
2244
|
-
index_1.Helpers.createSymLink(sourceDist, dest, {
|
|
2301
|
+
index_1.Helpers.createSymLink(sourceDist, dest, {
|
|
2302
|
+
continueWhenExistedFolderDoesntExists: true,
|
|
2303
|
+
});
|
|
2245
2304
|
}
|
|
2246
2305
|
}
|
|
2247
2306
|
catch (e_13_1) { e_13 = { error: e_13_1 }; }
|
|
@@ -2253,7 +2312,9 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
2253
2312
|
}
|
|
2254
2313
|
if (rebuild || !index_1.Helpers.exists(sourceDist)) {
|
|
2255
2314
|
index_1.Helpers.info("Compiling ".concat(lib.name, " ..."));
|
|
2256
|
-
_this.run(lib.getLibraryBuildComamnd({ watch: false }), {
|
|
2315
|
+
_this.run(lib.getLibraryBuildComamnd({ watch: false }), {
|
|
2316
|
+
output: true,
|
|
2317
|
+
}).sync();
|
|
2257
2318
|
}
|
|
2258
2319
|
})();
|
|
2259
2320
|
(function () {
|
|
@@ -2262,7 +2323,9 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
2262
2323
|
if (!index_1.Helpers.isSymlinkFileExitedOrUnexisted(dest)) {
|
|
2263
2324
|
index_1.Helpers.remove(dest);
|
|
2264
2325
|
}
|
|
2265
|
-
index_1.Helpers.createSymLink(sourceDist, dest, {
|
|
2326
|
+
index_1.Helpers.createSymLink(sourceDist, dest, {
|
|
2327
|
+
continueWhenExistedFolderDoesntExists: true,
|
|
2328
|
+
});
|
|
2266
2329
|
})();
|
|
2267
2330
|
}
|
|
2268
2331
|
else if (strategy === 'copy') {
|
|
@@ -2270,7 +2333,9 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
2270
2333
|
var dest = this_1.pathFor([tnp_config_1.config.folder.node_modules, lib.name]);
|
|
2271
2334
|
if (rebuild || !index_1.Helpers.exists(sourceDist)) {
|
|
2272
2335
|
index_1.Helpers.info("Compiling ".concat(lib.name, " ..."));
|
|
2273
|
-
this_1.run(lib.getLibraryBuildComamnd({ watch: false }), {
|
|
2336
|
+
this_1.run(lib.getLibraryBuildComamnd({ watch: false }), {
|
|
2337
|
+
output: true,
|
|
2338
|
+
}).sync();
|
|
2274
2339
|
}
|
|
2275
2340
|
if (index_1.Helpers.isSymlinkFileExitedOrUnexisted(dest)) {
|
|
2276
2341
|
index_1.Helpers.remove(dest);
|
|
@@ -2302,9 +2367,13 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
2302
2367
|
var _this = this;
|
|
2303
2368
|
return tslib_1.__generator(this, function (_a) {
|
|
2304
2369
|
switch (_a.label) {
|
|
2305
|
-
case 0: return [4 /*yield*/, this.run(lib.getLibraryBuildComamnd({ watch: true }), {
|
|
2306
|
-
|
|
2307
|
-
|
|
2370
|
+
case 0: return [4 /*yield*/, this.run(lib.getLibraryBuildComamnd({ watch: true }), {
|
|
2371
|
+
output: true,
|
|
2372
|
+
}).unitlOutputContains(lib.getLibraryBuildSuccessComamnd, [], 0, function () {
|
|
2373
|
+
var sourceDist = _this.pathFor([
|
|
2374
|
+
tnp_config_1.config.folder.dist,
|
|
2375
|
+
lib.basename,
|
|
2376
|
+
]);
|
|
2308
2377
|
var dest = _this.pathFor([tnp_config_1.config.folder.node_modules, lib.name]);
|
|
2309
2378
|
index_1.Helpers.copy(sourceDist, dest);
|
|
2310
2379
|
console.log("Sync done for ".concat(lib.basename, " to ").concat(lib.name));
|
|
@@ -2365,7 +2434,8 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
2365
2434
|
BaseProject.prototype.getLibraryBuildComamnd = function (options) {
|
|
2366
2435
|
//#region @backendFunc
|
|
2367
2436
|
var watch = options.watch;
|
|
2368
|
-
var isAngularLib = index_1.Helpers.exists(this.pathFor('ng-package.json')) ||
|
|
2437
|
+
var isAngularLib = index_1.Helpers.exists(this.pathFor('ng-package.json')) ||
|
|
2438
|
+
index_1.Helpers.exists(this.pathFor('tsconfig.app.json'));
|
|
2369
2439
|
if (isAngularLib) {
|
|
2370
2440
|
return "npm-run ng build ".concat(this.basename, " ").concat(watch ? '--watch' : '');
|
|
2371
2441
|
}
|
|
@@ -2378,9 +2448,11 @@ var BaseProject = exports.BaseProject = /** @class */ (function () {
|
|
|
2378
2448
|
//#region getters & methods / start npm task
|
|
2379
2449
|
BaseProject.prototype.startNpmTask = function (taskName, additionalArguments) {
|
|
2380
2450
|
if (tnp_core_2._.isObject(additionalArguments)) {
|
|
2381
|
-
additionalArguments = Object.keys(additionalArguments)
|
|
2451
|
+
additionalArguments = Object.keys(additionalArguments)
|
|
2452
|
+
.map(function (k) { return "--".concat(k, " ").concat(additionalArguments[k]); })
|
|
2453
|
+
.join(' ');
|
|
2382
2454
|
}
|
|
2383
|
-
return this.run("npm run ".concat(taskName, " ").concat(additionalArguments ?
|
|
2455
|
+
return this.run("npm run ".concat(taskName, " ").concat(additionalArguments ? ' -- ' + additionalArguments : ''), { output: true });
|
|
2384
2456
|
};
|
|
2385
2457
|
//#region static
|
|
2386
2458
|
//#region static / instance of resovle
|