tnp-helpers 16.100.25 → 16.100.31
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/esm2022/lib/base/base-project.mjs +20 -1
- package/browser/esm2022/lib/base/linked-project.mjs +1 -1
- package/browser/esm2022/lib/helpers/helpers.mjs +26 -2
- package/browser/esm2022/lib/index.mjs +1 -1
- package/browser/fesm2022/tnp-helpers.mjs +44 -1
- package/browser/fesm2022/tnp-helpers.mjs.map +1 -1
- package/browser/lib/base/base-project.d.ts +13 -2
- package/browser/lib/base/core-project.d.ts +1 -1
- package/browser/lib/base/linked-project.d.ts +1 -0
- package/browser/lib/helpers/helpers.d.ts +3 -3
- package/browser/lib/index.d.ts +2 -1
- package/client/esm2022/lib/base/base-project.mjs +20 -1
- package/client/esm2022/lib/base/linked-project.mjs +1 -1
- package/client/esm2022/lib/helpers/helpers.mjs +26 -2
- package/client/esm2022/lib/index.mjs +1 -1
- package/client/fesm2022/tnp-helpers.mjs +44 -1
- package/client/fesm2022/tnp-helpers.mjs.map +1 -1
- package/client/lib/base/base-project.d.ts +13 -2
- package/client/lib/base/core-project.d.ts +1 -1
- package/client/lib/base/linked-project.d.ts +1 -0
- package/client/lib/helpers/helpers.d.ts +3 -3
- package/client/lib/index.d.ts +2 -1
- package/client/package.json +3 -3
- package/lib/base/base-command-line.backend.d.ts +8 -2
- package/lib/base/base-command-line.backend.js +154 -45
- package/lib/base/base-command-line.backend.js.map +1 -1
- package/lib/base/base-project.d.ts +58 -40
- package/lib/base/base-project.js +28 -12
- package/lib/base/base-project.js.map +1 -1
- package/lib/base/command-line-feature.backend.js +1 -0
- package/lib/base/command-line-feature.backend.js.map +1 -1
- package/lib/base/core-project.d.ts +1 -1
- package/lib/base/linked-project.d.ts +1 -0
- package/lib/base/linked-project.js.map +1 -1
- package/lib/helpers/for-backend/helpers-console-gui.d.ts +3 -3
- package/lib/helpers/for-backend/helpers-file-folders.backend.d.ts +1 -1
- package/lib/helpers/for-backend/helpers-git.backend.d.ts +4 -4
- package/lib/helpers/for-backend/helpers-git.backend.js +131 -71
- package/lib/helpers/for-backend/helpers-git.backend.js.map +1 -1
- package/lib/helpers/for-backend/helpers-path.backend.d.ts +2 -2
- 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 +4 -4
- package/lib/helpers/helpers.js +12 -9
- package/lib/helpers/helpers.js.map +1 -1
- package/lib/index.d.ts +2 -1
- 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/esm2022/lib/base/base-project.mjs +20 -1
- package/websql/esm2022/lib/base/linked-project.mjs +1 -1
- package/websql/esm2022/lib/helpers/helpers.mjs +26 -2
- package/websql/esm2022/lib/index.mjs +1 -1
- package/websql/fesm2022/tnp-helpers.mjs +44 -1
- package/websql/fesm2022/tnp-helpers.mjs.map +1 -1
- package/websql/lib/base/base-project.d.ts +13 -2
- package/websql/lib/base/core-project.d.ts +1 -1
- package/websql/lib/base/linked-project.d.ts +1 -0
- package/websql/lib/helpers/helpers.d.ts +3 -3
- package/websql/lib/index.d.ts +2 -1
|
@@ -23,6 +23,7 @@ var CommandLineFeature = /** @class */ (function () {
|
|
|
23
23
|
this.cwd = cwd;
|
|
24
24
|
this.ins = ins;
|
|
25
25
|
this.project = project;
|
|
26
|
+
this.cwd = (0, tnp_core_1.crossPlatformPath)(cwd);
|
|
26
27
|
//#region resolve params and args
|
|
27
28
|
// this.project = Project.Current as Project;
|
|
28
29
|
var className = typescript_class_helpers_1.CLASS.getNameFromObject(this);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command-line-feature.backend.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAAA,iBAAiB;AACjB,kCAAmC;AAEnC,
|
|
1
|
+
{"version":3,"file":"command-line-feature.backend.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAAA,iBAAiB;AACjB,kCAAmC;AAEnC,qCAAgD;AAEhD,qEAAiD;AACjD,YAAY;AAEZ;IAmBE,4BACqB,cAAsB,EACtB,gBAAwB;IAC3C;;OAEG;IACO,OAAgB;IAC1B;;OAEG;IACO,GAAW,EACX,GAAiC;QAX7C,iBAiFC;QAhFoB,mBAAc,GAAd,cAAc,CAAQ;QACtB,qBAAgB,GAAhB,gBAAgB,CAAQ;QAIjC,YAAO,GAAP,OAAO,CAAS;QAIhB,QAAG,GAAH,GAAG,CAAQ;QACX,QAAG,GAAH,GAAG,CAA8B;QAE3C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,GAAG,GAAG,IAAA,4BAAiB,EAAC,GAAG,CAAC,CAAC;QAClC,iCAAiC;QAEjC,6CAA6C;QAC7C,IAAM,SAAS,GAAG,gCAAK,CAAC,iBAAiB,CAAC,IAAW,CAAC,CAAC;QACvD,IAAM,OAAO,GAAG,gCAAK,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAlB,CAAkB,CAAC,CAAC;QAC5E,sCAAsC;QAEtC,2CAA2C;QAC3C,2DAA2D;QAC3D,uCAAuC;QACvC,kGAAkG;QAClG,sCAAsC;QACtC,0CAA0C;QAC1C,4CAA4C;QAC5C,yEAAyE;QACzE,aAAa;QACb,oEAAoE;QACpE,6BAA6B;QAC7B,gDAAgD;QAChD,uBAAuB;QACvB,QAAQ;QACR,IAAI;QACJ,YAAY;QAEZ,IAAM,QAAQ,GAAG,YAAC,CAAC,KAAK,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QACpD,IAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,KAAK,QAAQ,EAAd,CAAc,CAAC,CAAC;QACjD,qCAAqC;QACrC,IAAI,MAAM,IAAI,CAAC,CAAC,SAAS,EAAE;YACzB,iEAAiE;YACjE,gBAAgB,GAAG,MAAM,CAAC;YAC1B,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YAC9D,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;SACtC;QACD,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;QACnE,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,gBAAgB;QACzC,IAAM,cAAc,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAChD,2BAA2B;QAC3B,+CAA+C;QAC/C,sCAAsC;QACtC,IAAI;QACJ,6CAA6C;QAC7C,IAAI,CAAC,IAAI,GAAG,eAAO,CAAC,OAAO;aACxB,qBAAqB,CAAC,cAAc,EAAE,cAAc,CAAC;aACrD,KAAK,CAAC,GAAG,CAAC;aACV,MAAM,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,CAAC,EAAH,CAAG,CAAC,CAAC;QAEpB,eAAO,CAAC,cAAc,CAAC;YACrB,UAAU,EAAE,IAAI,CAAC,cAAc;YAC/B,aAAa,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC;YACrD,OAAO,EAAE,IAAI;SACd,CAAC,CAAC,IAAI,CAAC;YACN,IAAI,gBAAgB,EAAE;gBACpB,IAAI,YAAC,CAAC,UAAU,CAAC,KAAI,CAAC,gBAAgB,CAAC,CAAC,EAAE;oBACxC,KAAI,CAAC,gBAAgB,CAAC,CAAC,cAAc,EAAE,KAAI,CAAC,OAAO,CAAC,CAAC;iBACtD;qBAAM;oBACL,eAAO,CAAC,KAAK,CACX,gBAAS,gCAAK,CAAC,OAAO,CAAC,KAAW,CAAC,mCAAyB,gBAAgB,MAAG,EAC/E,KAAK,EACL,IAAI,CACL,CAAC;iBACH;aACF;iBAAM;gBACL,KAAI,CAAC,CAAC,EAAE,CAAC;aACV;QACH,CAAC,CAAC,CAAC;QACH,YAAY;IACd,CAAC;IApFD,sBAAI,wCAAQ;QAHZ;;WAEG;aACH;YACE,OAAO,YAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;;;OAAA;IAoFS,kCAAK,GAAf,UAAgB,IAAQ;QAAR,qBAAA,EAAA,QAAQ;QACtB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACrB,CAAC;IAES,2CAAc,GAAxB,cAA4B,CAAC;IAE7B,wDAA2B,GAA3B;QAAA,iBAUC;QATO,IAAA,KAIJ,eAAO,CAAC,OAAO,CAAC,wBAAwB,CAAU,IAAI,CAAC,IAAI,EAAE,UAAA,GAAG;YAC9D,OAAA,KAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAA/C,CAA+C,CAChD,EALD,QAAQ,cAAA,EACR,cAAc,oBAIb,CAAC;QACJ,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;QAClD,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;IAC/D,CAAC;IAMH,yBAAC;AAAD,CAAC,AA5HD,IA4HC;AA5HqB,gDAAkB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"linked-project.js","sourceRoot":"","sources":[""],"names":[],"mappings":";;;AAAA,qCAAsD;AACtD,kCAAmC;AAGnC;IAAA;IA0FA,CAAC;IAzFC,gBAAgB;IAEhB,uBAAuB;IAChB,kBAAI,GAAX,UAAY,OAA+B;QACzC,IAAM,UAAU,GAAG,YAAC,CAAC,KAAK,CAAC,IAAK,aAAqB,EAAE,EAAE,YAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAkB,CAAC;QAChG,IAAI,CAAC,UAAU,CAAC,iBAAiB,EAAE;YACjC,UAAU,CAAC,iBAAiB,GAAG,eAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;SAC1F;QACD,IAAI,CAAC,UAAU,CAAC,aAAa,EAAE;YAC7B,UAAU,CAAC,aAAa,GAAG,QAAQ,CAAC;SACrC;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,YAAY;IAEZ,4BAA4B;IACrB,sBAAQ,GAAf,UAAgB,WAAmB,EAAE,gBAAyB,EAAE,aAAsB;QACpF,OAAO,aAAa,CAAC,IAAI,CAAC;YACxB,OAAO,EAAE,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,OAAO,CAAC,eAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,UAAG,WAAW,SAAM,CAAC;YACzF,aAAa,EAAE,aAAa;YAC5B,iBAAiB,EAAE,WAAW;SAC/B,CAAC,CAAC;IACL,CAAC;IACD,YAAY;IAEZ,yBAAyB;IAClB,oBAAM,GAAb,UAAc,cAAsB,EAAE,SAAiB;QAAjB,0BAAA,EAAA,iBAAiB;QACrD,sBAAsB;QACtB,cAAc,GAAG,IAAA,4BAAiB,EAAC,cAAc,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAA;QACrE,IAAM,sBAAsB,GAAG,eAAO;aACnC,WAAW,CAAC,cAAc,EAAE;YAC3B,SAAS,WAAA;SACV,CAAC;aACD,MAAM,CAAC,UAAA,aAAa;YACnB,+CAA+C;YAC/C,4EAA4E;YAE5E,OAAO,eAAO,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QAC9C,CAAC,CAAC;aACD,GAAG,CAAC,UAAA,aAAa;YAChB,IAAM,YAAY,GAAG,aAAa,CAAC,OAAO,CAAC,cAAc,GAAG,GAAG,EAAE,EAAE,CAAC,CAAA;YACpE,IAAM,WAAW,GAAG,eAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YAChD,OAAO,aAAa,CAAC,IAAI,CAAC;gBACxB,OAAO,EAAE,eAAO,CAAC,GAAG,CAAC,YAAY,CAAC,aAAa,CAAC;gBAChD,iBAAiB,EAAE,WAAW;aAC/B,CAAC,CAAC;QACL,CAAC,CAAC;aACD,IAAI,CAAC,UAAC,CAAC,EAAE,CAAC;YACT,OAAO,CAAC,CAAC,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC,CAAC;QAChF,CAAC,CAAC,CAAC;QACL,OAAO,sBAAsB,CAAC;QAC9B,YAAY;IACd,CAAC;IAsBD;;OAEG;IACI,iCAAS,GAAhB;QACE,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,OAAO,IAAI,CAAC,OAAO,CAAC;SACrB;QACD,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,OAAO,IAAI,CAAC,WAAW,CAAC;SACzB;QACD,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAIH,oBAAC;AAAD,CAAC,AA1FD,IA0FC;AA1FY,sCAAa;AA4F1B;IAAA;
|
|
1
|
+
{"version":3,"file":"linked-project.js","sourceRoot":"","sources":[""],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare class HelpersConsoleGuiQuestion {
|
|
2
|
-
yesNo(questionMessage: string): Promise<
|
|
2
|
+
yesNo(questionMessage: string): Promise<boolean>;
|
|
3
3
|
}
|
|
4
4
|
export declare class HelpersConsoleGui {
|
|
5
5
|
constructor();
|
|
@@ -7,11 +7,11 @@ export declare class HelpersConsoleGui {
|
|
|
7
7
|
select: <T = string>(questionMessage: string, choices: {
|
|
8
8
|
name: string;
|
|
9
9
|
value: T;
|
|
10
|
-
}[], autocomplete?: boolean) => Promise<
|
|
10
|
+
}[], autocomplete?: boolean) => Promise<string | T>;
|
|
11
11
|
multiselect: (questionMessage: string, choices: {
|
|
12
12
|
name: string;
|
|
13
13
|
value: string;
|
|
14
|
-
}[], autocomplete?: boolean) => Promise<
|
|
14
|
+
}[], autocomplete?: boolean) => Promise<string[]>;
|
|
15
15
|
wait: (howManySecondsWait: number) => Promise<void>;
|
|
16
16
|
pressAnyKey: (message?: string) => Promise<void>;
|
|
17
17
|
}
|
|
@@ -3,7 +3,7 @@ export declare class HelpersGit {
|
|
|
3
3
|
lastCommitHash(cwd: any): string;
|
|
4
4
|
penultimageCommitHash(cwd: any): string;
|
|
5
5
|
checkTagExists(tag: string, cwd?: string): boolean;
|
|
6
|
-
lastTagVersionName(cwd: string):
|
|
6
|
+
lastTagVersionName(cwd: string): string;
|
|
7
7
|
/**
|
|
8
8
|
*
|
|
9
9
|
* @param cwd di
|
|
@@ -90,16 +90,16 @@ export declare class HelpersGit {
|
|
|
90
90
|
/**
|
|
91
91
|
* @returns absolute path to cloned folder
|
|
92
92
|
*/
|
|
93
|
-
clone({ cwd, url, destinationFolderName, throwErrors, override }: {
|
|
93
|
+
clone({ cwd, url, destinationFolderName, throwErrors, override, }: {
|
|
94
94
|
cwd: string;
|
|
95
95
|
url: string;
|
|
96
96
|
destinationFolderName?: string;
|
|
97
97
|
throwErrors?: boolean;
|
|
98
98
|
override?: boolean;
|
|
99
99
|
}): string;
|
|
100
|
-
checkIfthereAreSomeUncommitedChange(cwd: string):
|
|
100
|
+
checkIfthereAreSomeUncommitedChange(cwd: string): boolean;
|
|
101
101
|
thereAreSomeUncommitedChangeExcept(filesList: string[], cwd: string): boolean;
|
|
102
|
-
uncommitedFiles(cwd: string):
|
|
102
|
+
uncommitedFiles(cwd: string): string[];
|
|
103
103
|
restoreLastVersion(cwd: string, localFilePath: string): void;
|
|
104
104
|
resetFiles(cwd: string, ...relativePathes: string[]): void;
|
|
105
105
|
/**
|
|
@@ -24,7 +24,11 @@ var HelpersGit = /** @class */ (function () {
|
|
|
24
24
|
HelpersGit.prototype.lastCommitHash = function (cwd) {
|
|
25
25
|
index_1.Helpers.log('[firedev-helpers][lastcommithash] ' + cwd, 1);
|
|
26
26
|
try {
|
|
27
|
-
var hash = this.isInsideGitRepo(cwd) &&
|
|
27
|
+
var hash = this.isInsideGitRepo(cwd) &&
|
|
28
|
+
tnp_core_1.child_process
|
|
29
|
+
.execSync("git log -1 --format=\"%H\"", { cwd: cwd })
|
|
30
|
+
.toString()
|
|
31
|
+
.trim();
|
|
28
32
|
return hash;
|
|
29
33
|
}
|
|
30
34
|
catch (e) {
|
|
@@ -38,7 +42,11 @@ var HelpersGit = /** @class */ (function () {
|
|
|
38
42
|
HelpersGit.prototype.penultimageCommitHash = function (cwd) {
|
|
39
43
|
index_1.Helpers.log('[penultimageCommitHash] ' + cwd, 1);
|
|
40
44
|
try {
|
|
41
|
-
var hash = this.isInsideGitRepo(cwd) &&
|
|
45
|
+
var hash = this.isInsideGitRepo(cwd) &&
|
|
46
|
+
tnp_core_1.child_process
|
|
47
|
+
.execSync("git log -2 --format=\"%H\"", { cwd: cwd })
|
|
48
|
+
.toString()
|
|
49
|
+
.trim();
|
|
42
50
|
return hash;
|
|
43
51
|
}
|
|
44
52
|
catch (e) {
|
|
@@ -91,21 +99,24 @@ var HelpersGit = /** @class */ (function () {
|
|
|
91
99
|
* @returns name of trag
|
|
92
100
|
*/
|
|
93
101
|
HelpersGit.prototype.lastTagNameForMajorVersion = function (cwd, majorVersion) {
|
|
94
|
-
index_1.Helpers.log('[firedev-helpers][lastTagNameForMajorVersion] ' +
|
|
102
|
+
index_1.Helpers.log('[firedev-helpers][lastTagNameForMajorVersion] ' +
|
|
103
|
+
cwd +
|
|
104
|
+
' major ver:' +
|
|
105
|
+
majorVersion);
|
|
95
106
|
var tag = index_1.Helpers.git.lastTagVersionName(cwd);
|
|
96
107
|
if (!tag) {
|
|
97
108
|
return void 0;
|
|
98
109
|
}
|
|
99
110
|
// git describe --match "v1.1.*" --abbrev=0 --tags $(git rev-list --tags --max-count=1)
|
|
100
111
|
var tagName = void 0;
|
|
101
|
-
var cm1 = "git describe --match \"v".concat(majorVersion.toString().replace('v', ''), ".*\" ")
|
|
102
|
-
|
|
103
|
-
var cm2 = "git describe --match \"v".concat(majorVersion.toString().replace('v', ''), ".*\" ")
|
|
104
|
-
|
|
105
|
-
var cm3 = "git describe --match \"".concat(majorVersion.toString().replace('v', ''), ".*\" ")
|
|
106
|
-
|
|
107
|
-
var cm4 = "git describe --match \"".concat(majorVersion.toString().replace('v', ''), ".*\" ")
|
|
108
|
-
|
|
112
|
+
var cm1 = "git describe --match \"v".concat(majorVersion.toString().replace('v', ''), ".*\" ") +
|
|
113
|
+
"--abbrev=0 ";
|
|
114
|
+
var cm2 = "git describe --match \"v".concat(majorVersion.toString().replace('v', ''), ".*\" ") +
|
|
115
|
+
"--abbrev=0 --tags $(git rev-list --tags --max-count=1)";
|
|
116
|
+
var cm3 = "git describe --match \"".concat(majorVersion.toString().replace('v', ''), ".*\" ") +
|
|
117
|
+
"--abbrev=0";
|
|
118
|
+
var cm4 = "git describe --match \"".concat(majorVersion.toString().replace('v', ''), ".*\" ") +
|
|
119
|
+
"--abbrev=0 --tags $(git rev-list --tags --max-count=1)";
|
|
109
120
|
// console.log({
|
|
110
121
|
// cm1, cm2, cm3, cm4
|
|
111
122
|
// })
|
|
@@ -172,7 +183,7 @@ var HelpersGit = /** @class */ (function () {
|
|
|
172
183
|
return {
|
|
173
184
|
modified: modifiedFiles_1,
|
|
174
185
|
deleted: deletedFiles_1,
|
|
175
|
-
created: createdFiles_1
|
|
186
|
+
created: createdFiles_1,
|
|
176
187
|
};
|
|
177
188
|
}
|
|
178
189
|
catch (error) {
|
|
@@ -180,7 +191,6 @@ var HelpersGit = /** @class */ (function () {
|
|
|
180
191
|
}
|
|
181
192
|
//#endregion
|
|
182
193
|
};
|
|
183
|
-
;
|
|
184
194
|
//#endregion
|
|
185
195
|
//#region get last tag hash
|
|
186
196
|
HelpersGit.prototype.lastTagHash = function (cwd) {
|
|
@@ -190,7 +200,10 @@ var HelpersGit = /** @class */ (function () {
|
|
|
190
200
|
if (!tag) {
|
|
191
201
|
return null;
|
|
192
202
|
}
|
|
193
|
-
var hash = tnp_core_1.child_process
|
|
203
|
+
var hash = tnp_core_1.child_process
|
|
204
|
+
.execSync("git log -1 --format=format:\"%H\" ".concat(tag), { cwd: cwd })
|
|
205
|
+
.toString()
|
|
206
|
+
.trim();
|
|
194
207
|
return hash;
|
|
195
208
|
}
|
|
196
209
|
catch (e) {
|
|
@@ -204,8 +217,8 @@ var HelpersGit = /** @class */ (function () {
|
|
|
204
217
|
HelpersGit.prototype.lastCommitDate = function (cwd) {
|
|
205
218
|
index_1.Helpers.log('[firedev-helpers][lastCommitDate] ' + cwd, 1);
|
|
206
219
|
try {
|
|
207
|
-
var unixTimestamp = this.isInsideGitRepo(cwd)
|
|
208
|
-
|
|
220
|
+
var unixTimestamp = this.isInsideGitRepo(cwd) &&
|
|
221
|
+
tnp_core_1.child_process
|
|
209
222
|
.execSync("git log -1 --pretty=format:%ct", { cwd: cwd })
|
|
210
223
|
.toString()
|
|
211
224
|
.trim();
|
|
@@ -222,7 +235,10 @@ var HelpersGit = /** @class */ (function () {
|
|
|
222
235
|
HelpersGit.prototype.lastCommitMessage = function (cwd) {
|
|
223
236
|
index_1.Helpers.log('[firedev-helpers][lastCommitMessage] ' + cwd, 1);
|
|
224
237
|
try {
|
|
225
|
-
var unixTimestamp = tnp_core_1.child_process
|
|
238
|
+
var unixTimestamp = tnp_core_1.child_process
|
|
239
|
+
.execSync("git log -1 --pretty=%B", { cwd: cwd })
|
|
240
|
+
.toString()
|
|
241
|
+
.trim();
|
|
226
242
|
return unixTimestamp;
|
|
227
243
|
}
|
|
228
244
|
catch (e) {
|
|
@@ -242,8 +258,8 @@ var HelpersGit = /** @class */ (function () {
|
|
|
242
258
|
index_1.Helpers.log('[firedev-helpers] RUNNING COUNT COMMITS');
|
|
243
259
|
// git rev-parse HEAD &> /dev/null check if any commits
|
|
244
260
|
var currentLocalBranch = this.currentBranchName(cwd);
|
|
245
|
-
var value = Number(this.isInsideGitRepo(cwd) &&
|
|
246
|
-
.commnadOutputAsString("git rev-list --count ".concat(currentLocalBranch), cwd).trim());
|
|
261
|
+
var value = Number(this.isInsideGitRepo(cwd) &&
|
|
262
|
+
index_1.Helpers.commnadOutputAsString("git rev-list --count ".concat(currentLocalBranch), cwd).trim());
|
|
247
263
|
return !isNaN(value) ? value : 0;
|
|
248
264
|
}
|
|
249
265
|
catch (e) {
|
|
@@ -258,11 +274,18 @@ var HelpersGit = /** @class */ (function () {
|
|
|
258
274
|
// con.log('[firedev-helpers][hasAnyCommits] ' + cwd, 1)
|
|
259
275
|
try {
|
|
260
276
|
if (process.platform === 'win32') {
|
|
261
|
-
index_1.Helpers.run('git rev-parse HEAD', {
|
|
277
|
+
index_1.Helpers.run('git rev-parse HEAD', {
|
|
278
|
+
cwd: cwd,
|
|
279
|
+
silence: true,
|
|
280
|
+
output: false,
|
|
281
|
+
}).sync();
|
|
262
282
|
// child_process.execSync('git rev-parse HEAD', { cwd, stdio: ['pipe',] }).toString().trim()
|
|
263
283
|
}
|
|
264
284
|
else {
|
|
265
|
-
tnp_core_1.child_process
|
|
285
|
+
tnp_core_1.child_process
|
|
286
|
+
.execSync('git rev-parse HEAD &> /dev/null', { cwd: cwd })
|
|
287
|
+
.toString()
|
|
288
|
+
.trim();
|
|
266
289
|
}
|
|
267
290
|
return true;
|
|
268
291
|
}
|
|
@@ -275,7 +298,9 @@ var HelpersGit = /** @class */ (function () {
|
|
|
275
298
|
HelpersGit.prototype.isInMergeProcess = function (cwd) {
|
|
276
299
|
index_1.Helpers.log('[firedev-helpers][hasAnyCommits] ' + cwd, 1);
|
|
277
300
|
try {
|
|
278
|
-
var message = (tnp_core_1.child_process.execSync("git status", { cwd: cwd }) || '')
|
|
301
|
+
var message = (tnp_core_1.child_process.execSync("git status", { cwd: cwd }) || '')
|
|
302
|
+
.toString()
|
|
303
|
+
.trim();
|
|
279
304
|
return message.search('Unmerged paths:') !== -1;
|
|
280
305
|
}
|
|
281
306
|
catch (e) {
|
|
@@ -328,7 +353,8 @@ var HelpersGit = /** @class */ (function () {
|
|
|
328
353
|
var _a;
|
|
329
354
|
var remotes = [];
|
|
330
355
|
try {
|
|
331
|
-
remotes = (((_a = index_1.Helpers.run("git remote -v", { cwd: cwd, output: false })
|
|
356
|
+
remotes = (((_a = index_1.Helpers.run("git remote -v", { cwd: cwd, output: false })
|
|
357
|
+
.sync()) === null || _a === void 0 ? void 0 : _a.toString()) || '')
|
|
332
358
|
.trim()
|
|
333
359
|
.replace(new RegExp('\\(push\\)', 'g'), ' ')
|
|
334
360
|
.replace(new RegExp('\\t', 'g'), ' ')
|
|
@@ -338,7 +364,7 @@ var HelpersGit = /** @class */ (function () {
|
|
|
338
364
|
var _a = tslib_1.__read(s.trim().split(' '), 2), origin = _a[0], url = _a[1];
|
|
339
365
|
return {
|
|
340
366
|
origin: origin,
|
|
341
|
-
url: url
|
|
367
|
+
url: url,
|
|
342
368
|
};
|
|
343
369
|
});
|
|
344
370
|
}
|
|
@@ -350,7 +376,10 @@ var HelpersGit = /** @class */ (function () {
|
|
|
350
376
|
HelpersGit.prototype.currentBranchName = function (cwd) {
|
|
351
377
|
index_1.Helpers.log('[firedev-helpers][currentBranchName] ' + cwd, 1);
|
|
352
378
|
try {
|
|
353
|
-
var branchName = tnp_core_1.child_process
|
|
379
|
+
var branchName = tnp_core_1.child_process
|
|
380
|
+
.execSync("git branch | sed -n '/* /s///p'", { cwd: cwd })
|
|
381
|
+
.toString()
|
|
382
|
+
.trim();
|
|
354
383
|
return branchName;
|
|
355
384
|
}
|
|
356
385
|
catch (e) {
|
|
@@ -370,15 +399,19 @@ var HelpersGit = /** @class */ (function () {
|
|
|
370
399
|
if (!tnp_core_1._.isString(commitMessage)) {
|
|
371
400
|
commitMessage = 'update';
|
|
372
401
|
}
|
|
373
|
-
if (commitMessage.search('-m') === -1 &&
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
(commitMessage.endsWith('
|
|
377
|
-
|
|
378
|
-
|
|
402
|
+
if (commitMessage.search('-m') === -1 &&
|
|
403
|
+
commitMessage.search('-msg') === -1) {
|
|
404
|
+
var addBrackets = !((commitMessage.startsWith("'") || commitMessage.startsWith('"')) &&
|
|
405
|
+
(commitMessage.endsWith("'") || commitMessage.endsWith('"')));
|
|
406
|
+
commitMessage =
|
|
407
|
+
"".concat(addBrackets ? "\"".concat(commitMessage, "\"") : commitMessage).replace(/\"\"/g, '"');
|
|
379
408
|
}
|
|
380
409
|
if (process.platform === 'win32') {
|
|
381
|
-
commitMessage = commitMessage
|
|
410
|
+
commitMessage = commitMessage
|
|
411
|
+
.split('\n')
|
|
412
|
+
.filter(function (f) { return !!f.trim(); })
|
|
413
|
+
.map(function (l) { return " -m \"".concat(l, "\" "); })
|
|
414
|
+
.join(' ');
|
|
382
415
|
}
|
|
383
416
|
else {
|
|
384
417
|
commitMessage = "-m ".concat(commitMessage);
|
|
@@ -417,7 +450,10 @@ var HelpersGit = /** @class */ (function () {
|
|
|
417
450
|
var url = '';
|
|
418
451
|
try {
|
|
419
452
|
// git config --get remote.origin.url
|
|
420
|
-
url = index_1.Helpers.run("git config --get remote.".concat(differentOriginName ? differentOriginName : 'origin', ".url"), { output: false, cwd: cwd })
|
|
453
|
+
url = index_1.Helpers.run("git config --get remote.".concat(differentOriginName ? differentOriginName : 'origin', ".url"), { output: false, cwd: cwd })
|
|
454
|
+
.sync()
|
|
455
|
+
.toString()
|
|
456
|
+
.trim();
|
|
421
457
|
}
|
|
422
458
|
catch (error) {
|
|
423
459
|
console.log(error);
|
|
@@ -441,13 +477,14 @@ var HelpersGit = /** @class */ (function () {
|
|
|
441
477
|
var rootGitCwd = (_b = (_a = index_1.Helpers.run('git rev-parse --show-toplevel', {
|
|
442
478
|
biggerBuffer: false,
|
|
443
479
|
cwd: cwd,
|
|
444
|
-
output: false
|
|
445
|
-
})
|
|
480
|
+
output: false,
|
|
481
|
+
})
|
|
482
|
+
.sync()) === null || _a === void 0 ? void 0 : _a.toString()) === null || _b === void 0 ? void 0 : _b.trim();
|
|
446
483
|
// console.log({
|
|
447
484
|
// rootGitCwd,
|
|
448
485
|
// cwd
|
|
449
486
|
// })
|
|
450
|
-
return rootGitCwd && (
|
|
487
|
+
return (rootGitCwd && (0, tnp_core_1.crossPlatformPath)(rootGitCwd) === (0, tnp_core_1.crossPlatformPath)(cwd));
|
|
451
488
|
}
|
|
452
489
|
catch (e) {
|
|
453
490
|
return false;
|
|
@@ -464,7 +501,7 @@ var HelpersGit = /** @class */ (function () {
|
|
|
464
501
|
var test = index_1.Helpers.run('git rev-parse --is-inside-work-tree', {
|
|
465
502
|
biggerBuffer: false,
|
|
466
503
|
cwd: cwd,
|
|
467
|
-
output: false
|
|
504
|
+
output: false,
|
|
468
505
|
}).sync();
|
|
469
506
|
}
|
|
470
507
|
catch (e) {
|
|
@@ -506,7 +543,9 @@ var HelpersGit = /** @class */ (function () {
|
|
|
506
543
|
else {
|
|
507
544
|
this.meltActionCommits(cwd);
|
|
508
545
|
}
|
|
509
|
-
tnp_core_1.child_process.execSync("git pull --tags --rebase origin ".concat(branchName), {
|
|
546
|
+
tnp_core_1.child_process.execSync("git pull --tags --rebase origin ".concat(branchName), {
|
|
547
|
+
cwd: cwd,
|
|
548
|
+
});
|
|
510
549
|
};
|
|
511
550
|
HelpersGit.prototype.pullCurrentBranch = function (cwd, options) {
|
|
512
551
|
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
@@ -523,15 +562,18 @@ var HelpersGit = /** @class */ (function () {
|
|
|
523
562
|
}
|
|
524
563
|
index_1.Helpers.log("askToRetry: ".concat(askToRetry));
|
|
525
564
|
if (this.getOriginURL(cwd) === '') {
|
|
526
|
-
index_1.Helpers.warn("Not pulling branch without "
|
|
527
|
-
|
|
565
|
+
index_1.Helpers.warn("Not pulling branch without " +
|
|
566
|
+
"remote origin url.... in folder ".concat(tnp_core_1.path.basename(cwd)));
|
|
528
567
|
return [2 /*return*/];
|
|
529
568
|
}
|
|
530
569
|
index_1.Helpers.info("[firedev-helpers][".concat((0, tnp_core_1.dateformat)(new Date(), 'dd-mm-yyyy HH:MM:ss'), "] Pulling git changes in \"").concat(cwd, "\", origin=").concat(index_1.Helpers.git.getOriginURL(cwd), " "));
|
|
531
570
|
_a.label = 1;
|
|
532
571
|
case 1:
|
|
533
572
|
_a.trys.push([1, 2, , 5]);
|
|
534
|
-
currentLocalBranch = tnp_core_1.child_process
|
|
573
|
+
currentLocalBranch = tnp_core_1.child_process
|
|
574
|
+
.execSync("git branch | sed -n '/* /s///p'", { cwd: cwd })
|
|
575
|
+
.toString()
|
|
576
|
+
.trim();
|
|
535
577
|
index_1.Helpers.git._pull(cwd, tslib_1.__assign(tslib_1.__assign({}, options), { branchName: currentLocalBranch }));
|
|
536
578
|
index_1.Helpers.info("[firedev-helpers] Branch \"".concat(currentLocalBranch, "\" updated successfully in ").concat(tnp_core_1.path.basename(cwd)));
|
|
537
579
|
return [3 /*break*/, 5];
|
|
@@ -572,7 +614,8 @@ var HelpersGit = /** @class */ (function () {
|
|
|
572
614
|
if (soft === void 0) { soft = false; }
|
|
573
615
|
var i = 0;
|
|
574
616
|
while (true) {
|
|
575
|
-
if (this.lastCommitMessage(cwd) ===
|
|
617
|
+
if (this.lastCommitMessage(cwd) ===
|
|
618
|
+
index_1.Helpers.git.ACTION_MSG_RESET_GIT_HARD_COMMIT) {
|
|
576
619
|
index_1.Helpers.logInfo("Reseting branch deep ".concat(++i, ".. "));
|
|
577
620
|
if (soft) {
|
|
578
621
|
index_1.Helpers.git.resetSoftHEAD(cwd, 1);
|
|
@@ -585,7 +628,6 @@ var HelpersGit = /** @class */ (function () {
|
|
|
585
628
|
return i;
|
|
586
629
|
}
|
|
587
630
|
}
|
|
588
|
-
;
|
|
589
631
|
};
|
|
590
632
|
//#endregion
|
|
591
633
|
//#region push current branch
|
|
@@ -623,8 +665,8 @@ var HelpersGit = /** @class */ (function () {
|
|
|
623
665
|
taskName = "\n [".concat((0, tnp_core_1.dateformat)(new Date(), 'dd-mm-yyyy HH:MM:ss'), "]\n Pushing ").concat(force ? 'FORCE' : 'NORMALLY', " current branch (remote=").concat(origin, "): ").concat(currentBranchName, "\n ");
|
|
624
666
|
index_1.Helpers.info(taskName);
|
|
625
667
|
command = "git push ".concat(force ? '-f' : '', " ").concat(origin, " ").concat(currentBranchName, " --tags");
|
|
626
|
-
index_1.Helpers.info("[git][push] [".concat((0, tnp_core_1.dateformat)(new Date(), 'dd-mm-yyyy HH:MM:ss'), "] ").concat(force ? 'force' : 'normal', " pushing current branch ").concat(currentBranchName, " ,")
|
|
627
|
-
|
|
668
|
+
index_1.Helpers.info("[git][push] [".concat((0, tnp_core_1.dateformat)(new Date(), 'dd-mm-yyyy HH:MM:ss'), "] ").concat(force ? 'force' : 'normal', " pushing current branch ").concat(currentBranchName, " ,") +
|
|
669
|
+
" origin=".concat(index_1.Helpers.git.getOriginURL(cwd, origin)));
|
|
628
670
|
index_1.Helpers.run(command, { cwd: cwd }).sync();
|
|
629
671
|
index_1.Helpers.info(taskName);
|
|
630
672
|
return [3 /*break*/, 8];
|
|
@@ -651,7 +693,8 @@ var HelpersGit = /** @class */ (function () {
|
|
|
651
693
|
try {
|
|
652
694
|
var defaultBranch = tnp_core_1.child_process
|
|
653
695
|
.execSync("git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@'", { cwd: cwd })
|
|
654
|
-
.toString()
|
|
696
|
+
.toString()
|
|
697
|
+
.trim();
|
|
655
698
|
return defaultBranch;
|
|
656
699
|
}
|
|
657
700
|
catch (e) {
|
|
@@ -665,7 +708,8 @@ var HelpersGit = /** @class */ (function () {
|
|
|
665
708
|
index_1.Helpers.log('[checkoutDefaultBranch] ' + cwd, 1);
|
|
666
709
|
var defaultBranch = tnp_core_1.child_process
|
|
667
710
|
.execSync("git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@'", { cwd: cwd })
|
|
668
|
-
.toString()
|
|
711
|
+
.toString()
|
|
712
|
+
.trim();
|
|
669
713
|
tnp_core_1.child_process.execSync("git checkout ".concat(defaultBranch), { cwd: cwd });
|
|
670
714
|
};
|
|
671
715
|
//#endregion
|
|
@@ -725,8 +769,8 @@ var HelpersGit = /** @class */ (function () {
|
|
|
725
769
|
if (fetchBeforeCheckout) {
|
|
726
770
|
this.fetch(cwd);
|
|
727
771
|
}
|
|
728
|
-
|
|
729
|
-
|
|
772
|
+
if (switchBranchWhenExists &&
|
|
773
|
+
this.getBranchesNames(cwd, branchName).includes(branchName)) {
|
|
730
774
|
createBranchIfNotExists = false;
|
|
731
775
|
}
|
|
732
776
|
try {
|
|
@@ -746,7 +790,9 @@ var HelpersGit = /** @class */ (function () {
|
|
|
746
790
|
if (currentBranchName === targetBranch) {
|
|
747
791
|
index_1.Helpers.info('Already on proper branch.. just pulling');
|
|
748
792
|
tnp_core_1.child_process.execSync("git reset --hard", { cwd: cwd });
|
|
749
|
-
tnp_core_1.child_process.execSync("git pull ".concat(origin, " ").concat(checkoutFromBranch), {
|
|
793
|
+
tnp_core_1.child_process.execSync("git pull ".concat(origin, " ").concat(checkoutFromBranch), {
|
|
794
|
+
cwd: cwd,
|
|
795
|
+
});
|
|
750
796
|
}
|
|
751
797
|
else {
|
|
752
798
|
var targetBranchExists = this.getBranchesNames(cwd).filter(function (f) { return targetBranch === f; }).length > 0;
|
|
@@ -754,7 +800,9 @@ var HelpersGit = /** @class */ (function () {
|
|
|
754
800
|
if (currentBranchName !== checkoutFromBranch) {
|
|
755
801
|
tnp_core_1.child_process.execSync("git checkout ".concat(checkoutFromBranch), { cwd: cwd });
|
|
756
802
|
}
|
|
757
|
-
tnp_core_1.child_process.execSync("git pull ".concat(origin, " ").concat(checkoutFromBranch), {
|
|
803
|
+
tnp_core_1.child_process.execSync("git pull ".concat(origin, " ").concat(checkoutFromBranch), {
|
|
804
|
+
cwd: cwd,
|
|
805
|
+
});
|
|
758
806
|
if (targetBranchExists) {
|
|
759
807
|
tnp_core_1.child_process.execSync("git checkout ".concat(targetBranch), { cwd: cwd });
|
|
760
808
|
tnp_core_1.child_process.execSync("git rebase ".concat(checkoutFromBranch), { cwd: cwd });
|
|
@@ -806,14 +854,20 @@ var HelpersGit = /** @class */ (function () {
|
|
|
806
854
|
}
|
|
807
855
|
}
|
|
808
856
|
if (!url.endsWith('.git')) {
|
|
809
|
-
url =
|
|
810
|
-
}
|
|
811
|
-
var cloneFolderPath = (0, tnp_core_1.crossPlatformPath)(tnp_core_1.path
|
|
857
|
+
url = url + '.git';
|
|
858
|
+
}
|
|
859
|
+
var cloneFolderPath = (0, tnp_core_1.crossPlatformPath)(tnp_core_1.path
|
|
860
|
+
.join(cwd, !!destinationFolderName && destinationFolderName.trim() !== ''
|
|
861
|
+
? destinationFolderName
|
|
862
|
+
: tnp_core_1.path.basename(url))
|
|
863
|
+
.trim()
|
|
864
|
+
.replace('.git', ''));
|
|
812
865
|
// console.log({ cloneFolderPath })
|
|
813
866
|
if (override) {
|
|
814
867
|
index_1.Helpers.tryRemoveDir(cloneFolderPath);
|
|
815
868
|
}
|
|
816
|
-
else if (index_1.Helpers.exists(cloneFolderPath) &&
|
|
869
|
+
else if (index_1.Helpers.exists(cloneFolderPath) &&
|
|
870
|
+
index_1.Helpers.exists(tnp_core_1.path.join(cloneFolderPath, '.git'))) {
|
|
817
871
|
index_1.Helpers.warn("[firedev-helpers] Already cloned ".concat(tnp_core_1.path.basename(cloneFolderPath), "..."));
|
|
818
872
|
return cloneFolderPath;
|
|
819
873
|
}
|
|
@@ -860,13 +914,16 @@ var HelpersGit = /** @class */ (function () {
|
|
|
860
914
|
index_1.Helpers.log('[firedev-helpers][thereAreSomeUncommitedChangeExcept] ' + cwd, 1);
|
|
861
915
|
filesList = filesList.map(function (f) { return (0, tnp_core_1.crossPlatformPath)(f); });
|
|
862
916
|
try {
|
|
863
|
-
var res = index_1.Helpers.run("git ls-files --deleted --modified --others --exclude-standard", { output: false, cwd: cwd })
|
|
864
|
-
|
|
865
|
-
.
|
|
866
|
-
.
|
|
867
|
-
|
|
868
|
-
|
|
869
|
-
|
|
917
|
+
var res = index_1.Helpers.run("git ls-files --deleted --modified --others --exclude-standard", { output: false, cwd: cwd })
|
|
918
|
+
.sync()
|
|
919
|
+
.toString()
|
|
920
|
+
.trim();
|
|
921
|
+
var list = !res
|
|
922
|
+
? []
|
|
923
|
+
: res.split(/\r\n|\n|\r/).filter(function (f) {
|
|
924
|
+
f = f === null || f === void 0 ? void 0 : f.trim();
|
|
925
|
+
return !!f && !filesList.includes((0, tnp_core_1.crossPlatformPath)(f));
|
|
926
|
+
});
|
|
870
927
|
return list.length > 0;
|
|
871
928
|
}
|
|
872
929
|
catch (error) {
|
|
@@ -878,13 +935,16 @@ var HelpersGit = /** @class */ (function () {
|
|
|
878
935
|
HelpersGit.prototype.uncommitedFiles = function (cwd) {
|
|
879
936
|
index_1.Helpers.log('[firedev-helpers][thereAreSomeUncommitedChangeExcept] ' + cwd, 1);
|
|
880
937
|
try {
|
|
881
|
-
var res = index_1.Helpers.run("git ls-files --deleted --modified --others --exclude-standard", { output: false, cwd: cwd })
|
|
882
|
-
|
|
883
|
-
.
|
|
884
|
-
.
|
|
885
|
-
|
|
886
|
-
|
|
887
|
-
|
|
938
|
+
var res = index_1.Helpers.run("git ls-files --deleted --modified --others --exclude-standard", { output: false, cwd: cwd })
|
|
939
|
+
.sync()
|
|
940
|
+
.toString()
|
|
941
|
+
.trim();
|
|
942
|
+
var list = !res
|
|
943
|
+
? []
|
|
944
|
+
: res.split(/\r\n|\n|\r/).filter(function (f) {
|
|
945
|
+
f = f === null || f === void 0 ? void 0 : f.trim();
|
|
946
|
+
return !!f;
|
|
947
|
+
});
|
|
888
948
|
return list;
|
|
889
949
|
}
|
|
890
950
|
catch (error) {
|
|
@@ -930,9 +990,9 @@ var HelpersGit = /** @class */ (function () {
|
|
|
930
990
|
HelpersGit.prototype.stagedFiles = function (cwd) {
|
|
931
991
|
cwd = (0, tnp_core_1.crossPlatformPath)(cwd).replace(/\/$/, '');
|
|
932
992
|
var command = "git diff --name-only --cached".trim();
|
|
933
|
-
var result =
|
|
993
|
+
var result = index_1.Helpers.commnadOutputAsString(command, cwd, {
|
|
934
994
|
showWholeCommandNotOnlyLastLine: true,
|
|
935
|
-
}) || ''
|
|
995
|
+
}) || '';
|
|
936
996
|
return (result ? result.split('\n') : []).map(function (relative) {
|
|
937
997
|
return (0, tnp_core_1.crossPlatformPath)([cwd, relative]);
|
|
938
998
|
});
|