tnp-helpers 0.0.70 → 13.0.4
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/app.js +2 -1
- package/browser/README.md +24 -0
- package/browser/esm2020/lib/base-component.mjs +48 -0
- package/browser/esm2020/lib/base-formly-component.mjs +124 -0
- package/browser/esm2020/lib/condition-wait.mjs +54 -0
- package/browser/esm2020/lib/constants.mjs +2 -0
- package/browser/esm2020/lib/dual-component-ctrl.mjs +116 -0
- package/browser/esm2020/lib/helpers-array-obj.mjs +81 -0
- package/browser/esm2020/lib/helpers-environment.mjs +21 -0
- package/browser/esm2020/lib/helpers-strings-regexes.mjs +49 -0
- package/browser/esm2020/lib/helpers-strings.mjs +61 -0
- package/browser/esm2020/lib/helpers.mjs +106 -0
- package/browser/esm2020/lib/index.mjs +11 -0
- package/browser/esm2020/lib/long-press.directive.mjs +106 -0
- package/browser/esm2020/lib/project.mjs +90 -0
- package/browser/esm2020/lib/resize-service.mjs +20 -0
- package/browser/esm2020/public-api.mjs +2 -0
- package/browser/esm2020/tnp-helpers.mjs +5 -0
- package/browser/fesm2015/tnp-helpers.mjs +869 -0
- package/browser/fesm2015/tnp-helpers.mjs.map +1 -0
- package/browser/fesm2020/tnp-helpers.mjs +860 -0
- package/browser/fesm2020/tnp-helpers.mjs.map +1 -0
- package/browser/{base-component.d.ts → lib/base-component.d.ts} +3 -0
- package/browser/{base-formly-component.d.ts → lib/base-formly-component.d.ts} +4 -3
- package/browser/{condition-wait.d.ts → lib/condition-wait.d.ts} +0 -0
- package/browser/{constants.d.ts → lib/constants.d.ts} +0 -0
- package/browser/{dual-component-ctrl.d.ts → lib/dual-component-ctrl.d.ts} +0 -0
- package/{helpers-array-obj.d.ts → browser/lib/helpers-array-obj.d.ts} +1 -0
- package/browser/{helpers-environment.d.ts → lib/helpers-environment.d.ts} +0 -0
- package/browser/{helpers-strings-regexes.d.ts → lib/helpers-strings-regexes.d.ts} +0 -0
- package/browser/{helpers-strings.d.ts → lib/helpers-strings.d.ts} +0 -0
- package/browser/{helpers.d.ts → lib/helpers.d.ts} +2 -4
- package/{client → browser/lib}/index.d.ts +1 -1
- package/{client → browser/lib}/long-press.directive.d.ts +3 -0
- package/browser/{project.d.ts → lib/project.d.ts} +0 -0
- package/{client → browser/lib}/resize-service.d.ts +3 -0
- package/browser/package.json +31 -0
- package/browser/public-api.d.ts +1 -0
- package/browser/tnp-helpers.d.ts +5 -0
- package/client/README.md +24 -0
- package/client/esm2020/lib/base-component.mjs +48 -0
- package/client/esm2020/lib/base-formly-component.mjs +124 -0
- package/client/esm2020/lib/condition-wait.mjs +54 -0
- package/client/esm2020/lib/constants.mjs +2 -0
- package/client/esm2020/lib/dual-component-ctrl.mjs +116 -0
- package/client/esm2020/lib/helpers-array-obj.mjs +81 -0
- package/client/esm2020/lib/helpers-environment.mjs +21 -0
- package/client/esm2020/lib/helpers-strings-regexes.mjs +49 -0
- package/client/esm2020/lib/helpers-strings.mjs +61 -0
- package/client/esm2020/lib/helpers.mjs +106 -0
- package/client/esm2020/lib/index.mjs +11 -0
- package/client/esm2020/lib/long-press.directive.mjs +106 -0
- package/client/esm2020/lib/project.mjs +90 -0
- package/client/esm2020/lib/resize-service.mjs +20 -0
- package/client/esm2020/public-api.mjs +2 -0
- package/client/esm2020/tnp-helpers.mjs +5 -0
- package/client/fesm2015/tnp-helpers.mjs +869 -0
- package/client/fesm2015/tnp-helpers.mjs.map +1 -0
- package/client/fesm2020/tnp-helpers.mjs +860 -0
- package/client/fesm2020/tnp-helpers.mjs.map +1 -0
- package/client/{base-component.d.ts → lib/base-component.d.ts} +3 -0
- package/{base-formly-component.d.ts → client/lib/base-formly-component.d.ts} +4 -3
- package/client/{condition-wait.d.ts → lib/condition-wait.d.ts} +0 -0
- package/client/{constants.d.ts → lib/constants.d.ts} +0 -0
- package/client/{dual-component-ctrl.d.ts → lib/dual-component-ctrl.d.ts} +0 -0
- package/client/{helpers-array-obj.d.ts → lib/helpers-array-obj.d.ts} +1 -0
- package/client/{helpers-environment.d.ts → lib/helpers-environment.d.ts} +0 -0
- package/client/{helpers-strings-regexes.d.ts → lib/helpers-strings-regexes.d.ts} +0 -0
- package/client/{helpers-strings.d.ts → lib/helpers-strings.d.ts} +0 -0
- package/client/{helpers.d.ts → lib/helpers.d.ts} +2 -4
- package/{browser → client/lib}/index.d.ts +1 -1
- package/{browser → client/lib}/long-press.directive.d.ts +3 -0
- package/client/{project.d.ts → lib/project.d.ts} +0 -0
- package/{resize-service.d.ts → client/lib/resize-service.d.ts} +3 -0
- package/client/package.json +25 -19
- package/client/public-api.d.ts +1 -0
- package/client/tnp-helpers.d.ts +5 -0
- package/index.d.ts +1 -11
- package/index.js +3 -21
- package/index.js.map +1 -1
- package/{base-component.d.ts → lib/base-component.d.ts} +0 -0
- package/{base-component.js → lib/base-component.js} +8 -7
- package/lib/base-component.js.map +1 -0
- package/{client → lib}/base-formly-component.d.ts +1 -3
- package/{base-formly-component.js → lib/base-formly-component.js} +46 -47
- package/lib/base-formly-component.js.map +1 -0
- package/{condition-wait.d.ts → lib/condition-wait.d.ts} +0 -0
- package/{condition-wait.js → lib/condition-wait.js} +10 -9
- package/lib/condition-wait.js.map +1 -0
- package/{constants.d.ts → lib/constants.d.ts} +0 -0
- package/{constants.js → lib/constants.js} +2 -1
- package/lib/constants.js.map +1 -0
- package/{dual-component-ctrl.d.ts → lib/dual-component-ctrl.d.ts} +0 -0
- package/{dual-component-ctrl.js → lib/dual-component-ctrl.js} +2 -1
- package/lib/dual-component-ctrl.js.map +1 -0
- package/{git-project.d.ts → lib/git-project.d.ts} +4 -3
- package/{git-project.js → lib/git-project.js} +20 -11
- package/lib/git-project.js.map +1 -0
- package/{browser → lib}/helpers-array-obj.d.ts +1 -0
- package/{helpers-array-obj.js → lib/helpers-array-obj.js} +8 -1
- package/lib/helpers-array-obj.js.map +1 -0
- package/{helpers-cli-tool.backend.d.ts → lib/helpers-cli-tool.backend.d.ts} +0 -0
- package/{helpers-cli-tool.backend.js → lib/helpers-cli-tool.backend.js} +5 -4
- package/lib/helpers-cli-tool.backend.js.map +1 -0
- package/{helpers-dependencies.backend.d.ts → lib/helpers-dependencies.backend.d.ts} +0 -0
- package/{helpers-dependencies.backend.js → lib/helpers-dependencies.backend.js} +6 -5
- package/lib/helpers-dependencies.backend.js.map +1 -0
- package/{helpers-environment.d.ts → lib/helpers-environment.d.ts} +0 -0
- package/{helpers-environment.js → lib/helpers-environment.js} +2 -1
- package/lib/helpers-environment.js.map +1 -0
- package/{helpers-file-folders.backend.d.ts → lib/helpers-file-folders.backend.d.ts} +1 -0
- package/{helpers-file-folders.backend.js → lib/helpers-file-folders.backend.js} +66 -47
- package/lib/helpers-file-folders.backend.js.map +1 -0
- package/{helpers-git.backend.d.ts → lib/helpers-git.backend.d.ts} +3 -1
- package/{helpers-git.backend.js → lib/helpers-git.backend.js} +90 -56
- package/lib/helpers-git.backend.js.map +1 -0
- package/{helpers-json5.backend.d.ts → lib/helpers-json5.backend.d.ts} +0 -0
- package/{helpers-json5.backend.js → lib/helpers-json5.backend.js} +3 -2
- package/lib/helpers-json5.backend.js.map +1 -0
- package/{helpers-morphi-framework.backend.d.ts → lib/helpers-morphi-framework.backend.d.ts} +0 -0
- package/{helpers-morphi-framework.backend.js → lib/helpers-morphi-framework.backend.js} +4 -3
- package/lib/helpers-morphi-framework.backend.js.map +1 -0
- package/{helpers-network.backend.d.ts → lib/helpers-network.backend.d.ts} +0 -0
- package/{helpers-network.backend.js → lib/helpers-network.backend.js} +2 -1
- package/lib/helpers-network.backend.js.map +1 -0
- package/{helpers-npm.backend.d.ts → lib/helpers-npm.backend.d.ts} +0 -0
- package/{helpers-npm.backend.js → lib/helpers-npm.backend.js} +2 -1
- package/lib/helpers-npm.backend.js.map +1 -0
- package/{helpers-path.backend.d.ts → lib/helpers-path.backend.d.ts} +0 -0
- package/{helpers-path.backend.js → lib/helpers-path.backend.js} +4 -3
- package/lib/helpers-path.backend.js.map +1 -0
- package/{helpers-process.backend.d.ts → lib/helpers-process.backend.d.ts} +2 -2
- package/{helpers-process.backend.js → lib/helpers-process.backend.js} +54 -53
- package/lib/helpers-process.backend.js.map +1 -0
- package/{helpers-strings-regexes.d.ts → lib/helpers-strings-regexes.d.ts} +0 -0
- package/{helpers-strings-regexes.js → lib/helpers-strings-regexes.js} +2 -1
- package/lib/helpers-strings-regexes.js.map +1 -0
- package/{helpers-strings.d.ts → lib/helpers-strings.d.ts} +0 -0
- package/{helpers-strings.js → lib/helpers-strings.js} +2 -1
- package/lib/helpers-strings.js.map +1 -0
- package/{helpers-system-terminal.backend.d.ts → lib/helpers-system-terminal.backend.d.ts} +1 -1
- package/{helpers-system-terminal.backend.js → lib/helpers-system-terminal.backend.js} +9 -8
- package/lib/helpers-system-terminal.backend.js.map +1 -0
- package/{helpers.d.ts → lib/helpers.d.ts} +6 -6
- package/{helpers.js → lib/helpers.js} +34 -30
- package/lib/helpers.js.map +1 -0
- package/{client/index.js → lib/index.d.ts} +3 -3
- package/lib/index.js +25 -0
- package/lib/index.js.map +1 -0
- package/{long-press.directive.d.ts → lib/long-press.directive.d.ts} +0 -0
- package/{long-press.directive.js → lib/long-press.directive.js} +40 -39
- package/lib/long-press.directive.js.map +1 -0
- package/{merge-helpers.backend.d.ts → lib/merge-helpers.backend.d.ts} +0 -0
- package/{merge-helpers.backend.js → lib/merge-helpers.backend.js} +7 -6
- package/lib/merge-helpers.backend.js.map +1 -0
- package/{project.d.ts → lib/project.d.ts} +0 -0
- package/{project.js → lib/project.js} +23 -21
- package/lib/project.js.map +1 -0
- package/{browser → lib}/resize-service.d.ts +0 -0
- package/{resize-service.js → lib/resize-service.js} +5 -4
- package/lib/resize-service.js.map +1 -0
- package/{ts-code-modifier → lib/ts-code}/index.d.ts +0 -0
- package/{ts-code-modifier → lib/ts-code}/index.js +3 -2
- package/lib/ts-code/index.js.map +1 -0
- package/lib/ts-code/ts-code-extractor.d.ts +14 -0
- package/lib/ts-code/ts-code-extractor.js +47 -0
- package/lib/ts-code/ts-code-extractor.js.map +1 -0
- package/{ts-code-modifier → lib/ts-code}/ts-code-modifier.backend.d.ts +0 -0
- package/{ts-code-modifier → lib/ts-code}/ts-code-modifier.backend.js +3 -2
- package/lib/ts-code/ts-code-modifier.backend.js.map +1 -0
- package/package.json +10 -18
- package/package.json_devDependencies.json +50 -50
- package/{package.json_tnp.json → package.json_tnp.json5} +12 -8
- package/tmp-environment.json +86 -123
- package/base-component.js.map +0 -1
- package/base-formly-component.js.map +0 -1
- package/browser/base-component.js +0 -48
- package/browser/base-component.js.map +0 -1
- package/browser/base-formly-component.js +0 -149
- package/browser/base-formly-component.js.map +0 -1
- package/browser/condition-wait.js +0 -57
- package/browser/condition-wait.js.map +0 -1
- package/browser/constants.js +0 -2
- package/browser/constants.js.map +0 -1
- package/browser/dual-component-ctrl.js +0 -118
- package/browser/dual-component-ctrl.js.map +0 -1
- package/browser/es5/base-component.js +0 -89
- package/browser/es5/base-formly-component.js +0 -158
- package/browser/es5/condition-wait.js +0 -135
- package/browser/es5/constants.js +0 -7
- package/browser/es5/dual-component-ctrl.js +0 -164
- package/browser/es5/git-project.js +0 -18
- package/browser/es5/helpers-array-obj.js +0 -129
- package/browser/es5/helpers-environment.js +0 -46
- package/browser/es5/helpers-messages.js +0 -105
- package/browser/es5/helpers-strings-regexes.js +0 -74
- package/browser/es5/helpers-strings.js +0 -96
- package/browser/es5/helpers.js +0 -217
- package/browser/es5/index.js +0 -86
- package/browser/es5/long-press.directive.js +0 -133
- package/browser/es5/project.js +0 -146
- package/browser/es5/resize-service.js +0 -45
- package/browser/git-project.d.ts +0 -2
- package/browser/git-project.js +0 -6
- package/browser/git-project.js.map +0 -1
- package/browser/helpers-array-obj.js +0 -75
- package/browser/helpers-array-obj.js.map +0 -1
- package/browser/helpers-environment.js +0 -21
- package/browser/helpers-environment.js.map +0 -1
- package/browser/helpers-messages.d.ts +0 -7
- package/browser/helpers-messages.js +0 -68
- package/browser/helpers-messages.js.map +0 -1
- package/browser/helpers-strings-regexes.js +0 -49
- package/browser/helpers-strings-regexes.js.map +0 -1
- package/browser/helpers-strings.js +0 -61
- package/browser/helpers-strings.js.map +0 -1
- package/browser/helpers.js +0 -113
- package/browser/helpers.js.map +0 -1
- package/browser/index.js +0 -11
- package/browser/index.js.map +0 -1
- package/browser/long-press.directive.js +0 -125
- package/browser/long-press.directive.js.map +0 -1
- package/browser/project.js +0 -90
- package/browser/project.js.map +0 -1
- package/browser/resize-service.js +0 -20
- package/browser/resize-service.js.map +0 -1
- package/client/base-component.js +0 -48
- package/client/base-component.js.map +0 -1
- package/client/base-formly-component.js +0 -149
- package/client/base-formly-component.js.map +0 -1
- package/client/condition-wait.js +0 -57
- package/client/condition-wait.js.map +0 -1
- package/client/constants.js +0 -2
- package/client/constants.js.map +0 -1
- package/client/dual-component-ctrl.js +0 -118
- package/client/dual-component-ctrl.js.map +0 -1
- package/client/es5/base-component.js +0 -89
- package/client/es5/base-formly-component.js +0 -158
- package/client/es5/condition-wait.js +0 -135
- package/client/es5/constants.js +0 -7
- package/client/es5/dual-component-ctrl.js +0 -164
- package/client/es5/git-project.js +0 -18
- package/client/es5/helpers-array-obj.js +0 -129
- package/client/es5/helpers-environment.js +0 -46
- package/client/es5/helpers-messages.js +0 -105
- package/client/es5/helpers-strings-regexes.js +0 -74
- package/client/es5/helpers-strings.js +0 -96
- package/client/es5/helpers.js +0 -217
- package/client/es5/index.js +0 -86
- package/client/es5/long-press.directive.js +0 -133
- package/client/es5/project.js +0 -146
- package/client/es5/resize-service.js +0 -45
- package/client/git-project.d.ts +0 -2
- package/client/git-project.js +0 -6
- package/client/git-project.js.map +0 -1
- package/client/helpers-array-obj.js +0 -75
- package/client/helpers-array-obj.js.map +0 -1
- package/client/helpers-environment.js +0 -21
- package/client/helpers-environment.js.map +0 -1
- package/client/helpers-messages.d.ts +0 -7
- package/client/helpers-messages.js +0 -68
- package/client/helpers-messages.js.map +0 -1
- package/client/helpers-strings-regexes.js +0 -49
- package/client/helpers-strings-regexes.js.map +0 -1
- package/client/helpers-strings.js +0 -61
- package/client/helpers-strings.js.map +0 -1
- package/client/helpers.js +0 -113
- package/client/helpers.js.map +0 -1
- package/client/index.js.map +0 -1
- package/client/long-press.directive.js +0 -125
- package/client/long-press.directive.js.map +0 -1
- package/client/project.js +0 -90
- package/client/project.js.map +0 -1
- package/client/resize-service.js +0 -20
- package/client/resize-service.js.map +0 -1
- package/condition-wait.js.map +0 -1
- package/constants.js.map +0 -1
- package/dual-component-ctrl.js.map +0 -1
- package/git-project.js.map +0 -1
- package/helpers-array-obj.js.map +0 -1
- package/helpers-cli-tool.backend.js.map +0 -1
- package/helpers-dependencies.backend.js.map +0 -1
- package/helpers-environment.js.map +0 -1
- package/helpers-file-folders.backend.js.map +0 -1
- package/helpers-git.backend.js.map +0 -1
- package/helpers-json5.backend.js.map +0 -1
- package/helpers-messages.d.ts +0 -7
- package/helpers-messages.js +0 -237
- package/helpers-messages.js.map +0 -1
- package/helpers-morphi-framework.backend.js.map +0 -1
- package/helpers-network.backend.js.map +0 -1
- package/helpers-npm.backend.js.map +0 -1
- package/helpers-path.backend.js.map +0 -1
- package/helpers-process.backend.js.map +0 -1
- package/helpers-strings-regexes.js.map +0 -1
- package/helpers-strings.js.map +0 -1
- package/helpers-system-terminal.backend.js.map +0 -1
- package/helpers.js.map +0 -1
- package/long-press.directive.js.map +0 -1
- package/merge-helpers.backend.js.map +0 -1
- package/project.js.map +0 -1
- package/resize-service.js.map +0 -1
- package/ts-code-modifier/index.js.map +0 -1
- package/ts-code-modifier/ts-code-modifier.backend.js.map +0 -1
|
@@ -19,7 +19,7 @@ var HelpersGit = /** @class */ (function () {
|
|
|
19
19
|
}
|
|
20
20
|
catch (e) {
|
|
21
21
|
index_1.Helpers.log(e, 1);
|
|
22
|
-
index_1.Helpers.log("[lastCommitHash] Not able to get last commit hash for repository in "
|
|
22
|
+
index_1.Helpers.log("[lastCommitHash] Not able to get last commit hash for repository in ".concat(directoryPath), 1);
|
|
23
23
|
return null;
|
|
24
24
|
}
|
|
25
25
|
};
|
|
@@ -33,7 +33,7 @@ var HelpersGit = /** @class */ (function () {
|
|
|
33
33
|
}
|
|
34
34
|
catch (e) {
|
|
35
35
|
index_1.Helpers.log(e, 1);
|
|
36
|
-
index_1.Helpers.log("[lastCommitHash] Not able to get last commit hash for repository in "
|
|
36
|
+
index_1.Helpers.log("[lastCommitHash] Not able to get last commit hash for repository in ".concat(directoryPath), 1);
|
|
37
37
|
return null;
|
|
38
38
|
}
|
|
39
39
|
};
|
|
@@ -41,11 +41,25 @@ var HelpersGit = /** @class */ (function () {
|
|
|
41
41
|
//#region check tag exists
|
|
42
42
|
HelpersGit.prototype.checkTagExists = function (tag, cwd) {
|
|
43
43
|
if (cwd === void 0) { cwd = process.cwd(); }
|
|
44
|
-
var command =
|
|
44
|
+
var command = "git show-ref --tags ".concat(tag).trim();
|
|
45
45
|
var result = (index_1.Helpers.commnadOutputAsString(command, cwd) || '') !== '';
|
|
46
46
|
return result;
|
|
47
47
|
};
|
|
48
48
|
//#endregion
|
|
49
|
+
HelpersGit.prototype.lastTagVersionName = function (directoryPath) {
|
|
50
|
+
try {
|
|
51
|
+
var cwd = directoryPath;
|
|
52
|
+
var tag = index_1.Helpers.commnadOutputAsString("git describe --tags $(git rev-list --tags --max-count=1)", cwd);
|
|
53
|
+
if (!tag) {
|
|
54
|
+
return void 0;
|
|
55
|
+
}
|
|
56
|
+
return tag;
|
|
57
|
+
}
|
|
58
|
+
catch (e) {
|
|
59
|
+
index_1.Helpers.warn("[lastCommitHash] Not able to get last commit version name for repository in ".concat(directoryPath), false);
|
|
60
|
+
return void 0;
|
|
61
|
+
}
|
|
62
|
+
};
|
|
49
63
|
//#region get last tag hash
|
|
50
64
|
HelpersGit.prototype.lastTagHash = function (directoryPath) {
|
|
51
65
|
try {
|
|
@@ -54,12 +68,12 @@ var HelpersGit = /** @class */ (function () {
|
|
|
54
68
|
if (!tag) {
|
|
55
69
|
return null;
|
|
56
70
|
}
|
|
57
|
-
var hash = tnp_core_1.child_process.execSync("git log -1 --format=format:\"%H\" "
|
|
71
|
+
var hash = tnp_core_1.child_process.execSync("git log -1 --format=format:\"%H\" ".concat(tag), { cwd: cwd }).toString().trim();
|
|
58
72
|
return hash;
|
|
59
73
|
}
|
|
60
74
|
catch (e) {
|
|
61
75
|
index_1.Helpers.log(e, 1);
|
|
62
|
-
index_1.Helpers.log("[lastCommitHash] Not able to get last commit hash for repository in "
|
|
76
|
+
index_1.Helpers.log("[lastCommitHash] Not able to get last commit hash for repository in ".concat(directoryPath), 1);
|
|
63
77
|
return null;
|
|
64
78
|
}
|
|
65
79
|
};
|
|
@@ -73,7 +87,7 @@ var HelpersGit = /** @class */ (function () {
|
|
|
73
87
|
}
|
|
74
88
|
catch (e) {
|
|
75
89
|
index_1.Helpers.log(e, 1);
|
|
76
|
-
index_1.Helpers.log("[lastCommitDate] Cannot counts commits in branch in: "
|
|
90
|
+
index_1.Helpers.log("[lastCommitDate] Cannot counts commits in branch in: ".concat(directoryPath), 1);
|
|
77
91
|
return null;
|
|
78
92
|
}
|
|
79
93
|
};
|
|
@@ -83,12 +97,12 @@ var HelpersGit = /** @class */ (function () {
|
|
|
83
97
|
try {
|
|
84
98
|
// git rev-parse HEAD &> /dev/null check if any commits
|
|
85
99
|
var currentLocalBranch = tnp_core_1.child_process.execSync("git branch | sed -n '/* /s///p'", { cwd: cwd }).toString().trim();
|
|
86
|
-
var value = tnp_core_1.child_process.execSync("git rev-parse HEAD &> /dev/null && git rev-list --count "
|
|
100
|
+
var value = tnp_core_1.child_process.execSync("git rev-parse HEAD &> /dev/null && git rev-list --count ".concat(currentLocalBranch), { cwd: cwd }).toString().trim();
|
|
87
101
|
return Number(value);
|
|
88
102
|
}
|
|
89
103
|
catch (e) {
|
|
90
104
|
index_1.Helpers.log(e, 1);
|
|
91
|
-
index_1.Helpers.log("[countCommits] Cannot counts commits in branch in: "
|
|
105
|
+
index_1.Helpers.log("[countCommits] Cannot counts commits in branch in: ".concat(cwd), 1);
|
|
92
106
|
return 0;
|
|
93
107
|
}
|
|
94
108
|
};
|
|
@@ -114,10 +128,10 @@ var HelpersGit = /** @class */ (function () {
|
|
|
114
128
|
index_1.Helpers.warn("Failed to git add --all .");
|
|
115
129
|
}
|
|
116
130
|
try {
|
|
117
|
-
index_1.Helpers.run("git commit -m \""
|
|
131
|
+
index_1.Helpers.run("git commit -m \"".concat(customMessage, "\"")).sync();
|
|
118
132
|
}
|
|
119
133
|
catch (error) {
|
|
120
|
-
index_1.Helpers.warn("Failed to git commit -m \""
|
|
134
|
+
index_1.Helpers.warn("Failed to git commit -m \"".concat(customMessage, "\""));
|
|
121
135
|
}
|
|
122
136
|
};
|
|
123
137
|
//#endregion
|
|
@@ -128,22 +142,22 @@ var HelpersGit = /** @class */ (function () {
|
|
|
128
142
|
}
|
|
129
143
|
var gitRootProject = ProjectClass.nearestTo(cwd, { findGitRoot: true });
|
|
130
144
|
try {
|
|
131
|
-
index_1.Helpers.info("[git][commit] Adding current git changes in git root:\n "
|
|
145
|
+
index_1.Helpers.info("[git][commit] Adding current git changes in git root:\n ".concat(gitRootProject.location, "\n "));
|
|
132
146
|
gitRootProject.run("git add --all . ").sync();
|
|
133
147
|
}
|
|
134
148
|
catch (error) {
|
|
135
|
-
index_1.Helpers.warn("Failed to 'git add --all .' in:\n "
|
|
149
|
+
index_1.Helpers.warn("Failed to 'git add --all .' in:\n ".concat(gitRootProject.location));
|
|
136
150
|
}
|
|
137
151
|
if (args.search('-m') === -1 && args.search('-msg') === -1) {
|
|
138
152
|
var addBrackets = !((args.startsWith('\'') ||
|
|
139
153
|
args.startsWith('"')) &&
|
|
140
154
|
(args.endsWith('\'') ||
|
|
141
155
|
args.endsWith('"')));
|
|
142
|
-
args = "-m "
|
|
156
|
+
args = "-m ".concat(addBrackets ? "\"".concat(args, "\"") : args);
|
|
143
157
|
}
|
|
144
158
|
try {
|
|
145
|
-
index_1.Helpers.info("[git][commit] trying to commit what it with argument:\n \""
|
|
146
|
-
index_1.Helpers.run("git commit --no-verify "
|
|
159
|
+
index_1.Helpers.info("[git][commit] trying to commit what it with argument:\n \"".concat(args, "\"\n location: ").concat(cwd, "\n "));
|
|
160
|
+
index_1.Helpers.run("git commit --no-verify ".concat(args), { cwd: cwd }).sync();
|
|
147
161
|
}
|
|
148
162
|
catch (error) {
|
|
149
163
|
index_1.Helpers.warn("[git][commit] not able to commit what is");
|
|
@@ -184,38 +198,38 @@ var HelpersGit = /** @class */ (function () {
|
|
|
184
198
|
//#endregion
|
|
185
199
|
HelpersGit.prototype.pull = function (branchName, cwd) {
|
|
186
200
|
if (branchName === void 0) { branchName = 'master'; }
|
|
187
|
-
if (cwd === void 0) { cwd = tnp_core_1.crossPlatformPath(process.cwd()); }
|
|
188
|
-
tnp_core_1.child_process.execSync("git pull --tags --ff-only origin "
|
|
201
|
+
if (cwd === void 0) { cwd = (0, tnp_core_1.crossPlatformPath)(process.cwd()); }
|
|
202
|
+
tnp_core_1.child_process.execSync("git pull --tags --ff-only origin ".concat(branchName), { cwd: cwd });
|
|
189
203
|
};
|
|
190
204
|
//#region pull current branch
|
|
191
205
|
HelpersGit.prototype.pullBranch = function (branchName, directoryPath, askToRetry) {
|
|
192
206
|
if (askToRetry === void 0) { askToRetry = false; }
|
|
193
|
-
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
207
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
|
|
194
208
|
var cwd, e_1;
|
|
195
209
|
var _this = this;
|
|
196
|
-
return tslib_1.__generator(this, function (_a) {
|
|
210
|
+
return (0, tslib_1.__generator)(this, function (_a) {
|
|
197
211
|
switch (_a.label) {
|
|
198
212
|
case 0:
|
|
199
213
|
if (this.getOriginURL(directoryPath) === '') {
|
|
200
214
|
index_1.Helpers.warn("Not pulling branch without "
|
|
201
|
-
+
|
|
215
|
+
+ "remote origin url.... in folder ".concat(tnp_core_1.path.basename(directoryPath)));
|
|
202
216
|
return [2 /*return*/];
|
|
203
217
|
}
|
|
204
|
-
index_1.Helpers.info("Pulling git changes in \""
|
|
218
|
+
index_1.Helpers.info("Pulling git changes in \"".concat(directoryPath, "\" "));
|
|
205
219
|
_a.label = 1;
|
|
206
220
|
case 1:
|
|
207
221
|
_a.trys.push([1, 2, , 5]);
|
|
208
222
|
cwd = directoryPath;
|
|
209
223
|
index_1.Helpers.git.pull(branchName, cwd);
|
|
210
|
-
index_1.Helpers.info("Branch \""
|
|
224
|
+
index_1.Helpers.info("Branch \"".concat(branchName, "\" updated successfully in ").concat(tnp_core_1.path.basename(directoryPath)));
|
|
211
225
|
return [3 /*break*/, 5];
|
|
212
226
|
case 2:
|
|
213
227
|
e_1 = _a.sent();
|
|
214
228
|
// console.log(e)
|
|
215
|
-
index_1.Helpers.error("Cannot update current branch in: "
|
|
229
|
+
index_1.Helpers.error("Cannot update current branch in: ".concat(directoryPath), askToRetry, true);
|
|
216
230
|
if (!askToRetry) return [3 /*break*/, 4];
|
|
217
|
-
return [4 /*yield*/, index_1.Helpers.questionYesNo("Do you wanna try again ?", function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
218
|
-
return tslib_1.__generator(this, function (_a) {
|
|
231
|
+
return [4 /*yield*/, index_1.Helpers.questionYesNo("Do you wanna try again ?", function () { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
|
|
232
|
+
return (0, tslib_1.__generator)(this, function (_a) {
|
|
219
233
|
switch (_a.label) {
|
|
220
234
|
case 0: return [4 /*yield*/, index_1.Helpers.git.pullCurrentBranch(directoryPath, askToRetry)];
|
|
221
235
|
case 1:
|
|
@@ -238,34 +252,38 @@ var HelpersGit = /** @class */ (function () {
|
|
|
238
252
|
//#endregion
|
|
239
253
|
//#region pull current branch
|
|
240
254
|
HelpersGit.prototype.pullCurrentBranch = function (directoryPath, askToRetry) {
|
|
241
|
-
if (askToRetry === void 0) { askToRetry =
|
|
242
|
-
return tslib_1.__awaiter(this, void 0, void 0, function () {
|
|
255
|
+
if (askToRetry === void 0) { askToRetry = true; }
|
|
256
|
+
return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
|
|
243
257
|
var cwd, currentLocalBranch, e_2;
|
|
244
258
|
var _this = this;
|
|
245
|
-
return tslib_1.__generator(this, function (_a) {
|
|
259
|
+
return (0, tslib_1.__generator)(this, function (_a) {
|
|
246
260
|
switch (_a.label) {
|
|
247
261
|
case 0:
|
|
262
|
+
if (global['tnpNonInteractive']) {
|
|
263
|
+
askToRetry = false;
|
|
264
|
+
}
|
|
265
|
+
index_1.Helpers.log("askToRetry: ".concat(askToRetry));
|
|
248
266
|
if (this.getOriginURL(directoryPath) === '') {
|
|
249
267
|
index_1.Helpers.warn("Not pulling branch without "
|
|
250
|
-
+
|
|
268
|
+
+ "remote origin url.... in folder ".concat(tnp_core_1.path.basename(directoryPath)));
|
|
251
269
|
return [2 /*return*/];
|
|
252
270
|
}
|
|
253
|
-
index_1.Helpers.info("Pulling git changes in \""
|
|
271
|
+
index_1.Helpers.info("Pulling git changes in \"".concat(directoryPath, "\" "));
|
|
254
272
|
_a.label = 1;
|
|
255
273
|
case 1:
|
|
256
274
|
_a.trys.push([1, 2, , 5]);
|
|
257
275
|
cwd = directoryPath;
|
|
258
276
|
currentLocalBranch = tnp_core_1.child_process.execSync("git branch | sed -n '/* /s///p'", { cwd: cwd }).toString().trim();
|
|
259
277
|
index_1.Helpers.git.pull(currentLocalBranch, cwd);
|
|
260
|
-
index_1.Helpers.info("Branch \""
|
|
278
|
+
index_1.Helpers.info("Branch \"".concat(currentLocalBranch, "\" updated successfully in ").concat(tnp_core_1.path.basename(directoryPath)));
|
|
261
279
|
return [3 /*break*/, 5];
|
|
262
280
|
case 2:
|
|
263
281
|
e_2 = _a.sent();
|
|
264
282
|
console.log(e_2);
|
|
265
|
-
index_1.Helpers.error("Cannot update current branch in: "
|
|
283
|
+
index_1.Helpers.error("Cannot update current branch in: ".concat(directoryPath), askToRetry, true);
|
|
266
284
|
if (!askToRetry) return [3 /*break*/, 4];
|
|
267
|
-
return [4 /*yield*/, index_1.Helpers.questionYesNo("Do you wanna try again ?", function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
|
|
268
|
-
return tslib_1.__generator(this, function (_a) {
|
|
285
|
+
return [4 /*yield*/, index_1.Helpers.questionYesNo("Do you wanna try again ?", function () { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
|
|
286
|
+
return (0, tslib_1.__generator)(this, function (_a) {
|
|
269
287
|
switch (_a.label) {
|
|
270
288
|
case 0: return [4 /*yield*/, index_1.Helpers.git.pullCurrentBranch(directoryPath, askToRetry)];
|
|
271
289
|
case 1:
|
|
@@ -280,24 +298,27 @@ var HelpersGit = /** @class */ (function () {
|
|
|
280
298
|
_a.sent();
|
|
281
299
|
_a.label = 4;
|
|
282
300
|
case 4: return [3 /*break*/, 5];
|
|
283
|
-
case 5:
|
|
301
|
+
case 5:
|
|
302
|
+
index_1.Helpers.info("DONE PULLING");
|
|
303
|
+
return [2 /*return*/];
|
|
284
304
|
}
|
|
285
305
|
});
|
|
286
306
|
});
|
|
287
307
|
};
|
|
288
308
|
//#endregion
|
|
289
309
|
//#region push current branch
|
|
290
|
-
HelpersGit.prototype.pushCurrentBranch = function (cwd, force) {
|
|
310
|
+
HelpersGit.prototype.pushCurrentBranch = function (cwd, force, origin) {
|
|
291
311
|
if (force === void 0) { force = false; }
|
|
312
|
+
if (origin === void 0) { origin = 'origin'; }
|
|
292
313
|
var currentBranchName = index_1.Helpers.git.currentBranchName(cwd);
|
|
293
314
|
while (true) {
|
|
294
315
|
try {
|
|
295
|
-
index_1.Helpers.info("[git][push] "
|
|
296
|
-
index_1.Helpers.run("git push "
|
|
316
|
+
index_1.Helpers.info("[git][push] ".concat(force ? 'force' : '', " pushing current branch ").concat(currentBranchName, " , origin=").concat(origin));
|
|
317
|
+
index_1.Helpers.run("git push ".concat(force ? '-f' : '', " ").concat(origin, " ").concat(currentBranchName, " --tags"), { cwd: cwd }).sync();
|
|
297
318
|
break;
|
|
298
319
|
}
|
|
299
320
|
catch (err) {
|
|
300
|
-
index_1.Helpers.error("[tnp-helpers] Not able to push branch "
|
|
321
|
+
index_1.Helpers.error("[tnp-helpers] Not able to push branch ".concat(currentBranchName, " in (origin=").concat(origin, "):\n ").concat(cwd), true, true);
|
|
301
322
|
index_1.Helpers.pressKeyAndContinue("Press any key to try again: ");
|
|
302
323
|
// TODO issue 1: issue with press any key
|
|
303
324
|
// TODO issue 2: Updates were rejected because the tag already exists in the remote
|
|
@@ -316,7 +337,7 @@ var HelpersGit = /** @class */ (function () {
|
|
|
316
337
|
}
|
|
317
338
|
catch (e) {
|
|
318
339
|
console.log(e);
|
|
319
|
-
index_1.Helpers.error("Cannot find default branch for repo in : "
|
|
340
|
+
index_1.Helpers.error("Cannot find default branch for repo in : ".concat(cwd));
|
|
320
341
|
}
|
|
321
342
|
};
|
|
322
343
|
//#endregion
|
|
@@ -326,7 +347,7 @@ var HelpersGit = /** @class */ (function () {
|
|
|
326
347
|
var defaultBranch = tnp_core_1.child_process
|
|
327
348
|
.execSync("git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@'", { cwd: cwd })
|
|
328
349
|
.toString().trim();
|
|
329
|
-
tnp_core_1.child_process.execSync("git checkout "
|
|
350
|
+
tnp_core_1.child_process.execSync("git checkout ".concat(defaultBranch), { cwd: cwd });
|
|
330
351
|
};
|
|
331
352
|
//#endregion
|
|
332
353
|
//#region clone
|
|
@@ -341,7 +362,7 @@ var HelpersGit = /** @class */ (function () {
|
|
|
341
362
|
if (!url.startsWith('https://')) {
|
|
342
363
|
var _e = url.split(':'), serverPart = _e[0], pathPart = _e[1];
|
|
343
364
|
var server = (serverPart || '').replace('git@', '');
|
|
344
|
-
url = "https://"
|
|
365
|
+
url = "https://".concat(server, "/").concat(pathPart);
|
|
345
366
|
}
|
|
346
367
|
}
|
|
347
368
|
var cloneFolderName = tnp_core_1.path.join(cwd, (!!destinationFolderName && destinationFolderName.trim() !== '') ? destinationFolderName : tnp_core_1.path.basename(url));
|
|
@@ -349,11 +370,11 @@ var HelpersGit = /** @class */ (function () {
|
|
|
349
370
|
index_1.Helpers.remove(cloneFolderName);
|
|
350
371
|
}
|
|
351
372
|
else if (index_1.Helpers.exists(cloneFolderName) && index_1.Helpers.exists(tnp_core_1.path.join(cloneFolderName, '.git'))) {
|
|
352
|
-
index_1.Helpers.warn("Alread cloned "
|
|
373
|
+
index_1.Helpers.warn("Alread cloned ".concat(tnp_core_1.path.basename(cloneFolderName), "..."));
|
|
353
374
|
return;
|
|
354
375
|
}
|
|
355
|
-
var commnad = "git -c http.sslVerify=false clone "
|
|
356
|
-
index_1.Helpers.info("\n\n Cloning:\n "
|
|
376
|
+
var commnad = "git -c http.sslVerify=false clone ".concat(url, " ").concat(destinationFolderName);
|
|
377
|
+
index_1.Helpers.info("\n\n Cloning:\n ".concat(commnad, "\n\n "));
|
|
357
378
|
if (throwErrors) {
|
|
358
379
|
index_1.Helpers.run(commnad, { cwd: cwd }).sync();
|
|
359
380
|
}
|
|
@@ -363,10 +384,10 @@ var HelpersGit = /** @class */ (function () {
|
|
|
363
384
|
}
|
|
364
385
|
catch (error) {
|
|
365
386
|
if (((_c = (_b = error === null || error === void 0 ? void 0 : error.stderr) === null || _b === void 0 ? void 0 : _b.toString()) === null || _c === void 0 ? void 0 : _c.search('remote: Not Found')) !== -1) {
|
|
366
|
-
index_1.Helpers.warn("[tnp-helpers][git] Project not found :"
|
|
387
|
+
index_1.Helpers.warn("[tnp-helpers][git] Project not found :".concat(url));
|
|
367
388
|
}
|
|
368
389
|
else {
|
|
369
|
-
index_1.Helpers.error("Can't clone from url: "
|
|
390
|
+
index_1.Helpers.error("Can't clone from url: ".concat(tnp_cli_1.CLI.chalk.bold(url), ".."), false, true);
|
|
370
391
|
}
|
|
371
392
|
}
|
|
372
393
|
}
|
|
@@ -374,22 +395,34 @@ var HelpersGit = /** @class */ (function () {
|
|
|
374
395
|
//#endregion
|
|
375
396
|
//#region check if there are some uncommited changes
|
|
376
397
|
HelpersGit.prototype.checkIfthereAreSomeUncommitedChange = function (cwd) {
|
|
398
|
+
return index_1.Helpers.git.thereAreSomeUncommitedChangeExcept([], cwd);
|
|
399
|
+
};
|
|
400
|
+
//#endregion
|
|
401
|
+
HelpersGit.prototype.thereAreSomeUncommitedChangeExcept = function (filesList, cwd) {
|
|
402
|
+
if (filesList === void 0) { filesList = []; }
|
|
403
|
+
filesList = filesList.map(function (f) { return (0, tnp_core_1.crossPlatformPath)(f); });
|
|
377
404
|
try {
|
|
378
|
-
|
|
405
|
+
var res = index_1.Helpers.run("git ls-files --deleted --modified --others --exclude-standard", { output: false, cwd: cwd }).sync().toString().trim();
|
|
406
|
+
var list = !res ? [] : res
|
|
407
|
+
.split(/\r\n|\n|\r/)
|
|
408
|
+
.filter(function (f) {
|
|
409
|
+
f = f === null || f === void 0 ? void 0 : f.trim();
|
|
410
|
+
return !!f && !filesList.includes((0, tnp_core_1.crossPlatformPath)(f));
|
|
411
|
+
});
|
|
412
|
+
return list.length > 0;
|
|
379
413
|
}
|
|
380
414
|
catch (error) {
|
|
381
|
-
return
|
|
415
|
+
return false;
|
|
382
416
|
}
|
|
383
417
|
};
|
|
384
|
-
//#endregion
|
|
385
418
|
//#region restore last version
|
|
386
419
|
HelpersGit.prototype.restoreLastVersion = function (cwd, localFilePath) {
|
|
387
420
|
try {
|
|
388
|
-
index_1.Helpers.info("[git] restoring last verion of file "
|
|
389
|
-
index_1.Helpers.run("git checkout -- "
|
|
421
|
+
index_1.Helpers.info("[git] restoring last verion of file ".concat(tnp_core_1.path.basename(cwd), "/").concat(localFilePath));
|
|
422
|
+
index_1.Helpers.run("git checkout -- ".concat(localFilePath), { cwd: cwd }).sync();
|
|
390
423
|
}
|
|
391
424
|
catch (error) {
|
|
392
|
-
index_1.Helpers.warn("[tnp-git] Not able to resotre last version of file "
|
|
425
|
+
index_1.Helpers.warn("[tnp-git] Not able to resotre last version of file ".concat(localFilePath));
|
|
393
426
|
}
|
|
394
427
|
};
|
|
395
428
|
//#endregion
|
|
@@ -401,14 +434,15 @@ var HelpersGit = /** @class */ (function () {
|
|
|
401
434
|
}
|
|
402
435
|
relativePathes.forEach(function (p) {
|
|
403
436
|
try {
|
|
404
|
-
index_1.Helpers.run("git checkout HEAD -- "
|
|
437
|
+
index_1.Helpers.run("git checkout HEAD -- ".concat(p), { cwd: cwd }).sync();
|
|
405
438
|
}
|
|
406
439
|
catch (err) {
|
|
407
|
-
index_1.Helpers.error("[project.git] Not able to reset files: "
|
|
440
|
+
index_1.Helpers.error("[project.git] Not able to reset files: ".concat(p, " inside project ").concat(tnp_core_1.path.basename(cwd), "."), true, true);
|
|
408
441
|
}
|
|
409
442
|
});
|
|
410
443
|
};
|
|
411
444
|
return HelpersGit;
|
|
412
445
|
}());
|
|
413
446
|
exports.HelpersGit = HelpersGit;
|
|
414
|
-
//# sourceMappingURL=helpers-git.backend.js.map
|
|
447
|
+
//# sourceMappingURL=helpers-git.backend.js.map
|
|
448
|
+
// @fixed
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"helpers-git.backend.js","sourceRoot":"","sources":["../../src/lib/helpers-git.backend.ts"],"names":[],"mappings":"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"}
|
|
File without changes
|
|
@@ -60,11 +60,12 @@ var HelpersJSON5 = /** @class */ (function () {
|
|
|
60
60
|
};
|
|
61
61
|
HelpersJSON5.prototype.allFrom = function (folderPath) {
|
|
62
62
|
var _this = this;
|
|
63
|
-
return glob.sync(folderPath
|
|
63
|
+
return glob.sync("".concat(folderPath, "/*.").concat(tnp_config_1.config.file.meta_config_md)).map(function (f) {
|
|
64
64
|
return _this.fromFile(f);
|
|
65
65
|
});
|
|
66
66
|
};
|
|
67
67
|
return HelpersJSON5;
|
|
68
68
|
}());
|
|
69
69
|
exports.HelpersJSON5 = HelpersJSON5;
|
|
70
|
-
//# sourceMappingURL=helpers-json5.backend.js.map
|
|
70
|
+
//# sourceMappingURL=helpers-json5.backend.js.map
|
|
71
|
+
// @fixed
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"helpers-json5.backend.js","sourceRoot":"","sources":["../../src/lib/helpers-json5.backend.ts"],"names":[],"mappings":";;;AAGA,yCAAoC;AACpC,6BAA+B;AAC/B,0CAA4C;AAC5C,2BAA6B;AAC7B,iCAAkC;AAElC;IAEE,sBACU,QAAgB,EAChB,YAAiB;QAAjB,6BAAA,EAAA,iBAAiB;QADjB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,iBAAY,GAAZ,YAAY,CAAK;QAHnB,wBAAmB,GAAG,KAAK,CAAC;IAMpC,CAAC;IAGD,sBAAI,sCAAY;aAAhB;YACE,IAAI,CAAC,IAAI,CAAC,mBAAmB,EAAE;gBAC7B,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC;gBAChC,IAAI,CAAC,IAAI,EAAE,CAAC;aACb;YACD,IAAI;gBACF,IAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;gBAC7C,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAQ,CAAC;aACrC;YAAC,OAAO,KAAK,EAAE;gBACd,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAQ,CAAC;aAChD;QACH,CAAC;;;OAAA;IAED,sBAAY,uCAAa;aAAzB;YACE,IAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAClD,OAAO,MAAM,CAAC;QAChB,CAAC;;;OAAA;IAED,2BAAI,GAAJ;QACE,IAAI,CAAC,WAAW,GAAG,eAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACrD,CAAC;IAED,6BAAM,GAAN,UAAO,IAAe;QACpB,IAAM,MAAM,GAAG,IAAI,CAAC,aAAa,CAAC;QAClC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACnB,IAAI,CAAC,WAAW,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC;IACvC,CAAC;IAED,2BAAI,GAAJ;QACE,eAAO,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IACrD,CAAC;IAEH,mBAAC;AAAD,CAAC,AA1CD,IA0CC;AA1CY,oCAAY;AA4CzB;IAAA;IAUA,CAAC;IATC,+BAAQ,GAAR,UAAyB,QAAgB;QACvC,OAAO,IAAI,YAAY,CAAC,QAAQ,CAAC,CAAC;IACpC,CAAC;IAED,8BAAO,GAAP,UAAwB,UAAkB;QAA1C,iBAIC;QAHC,OAAO,IAAI,CAAC,IAAI,CAAC,UAAG,UAAU,gBAAM,mBAAM,CAAC,IAAI,CAAC,cAAc,CAAE,CAAC,CAAC,GAAG,CAAC,UAAA,CAAC;YACrE,OAAO,KAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;IACL,CAAC;IACH,mBAAC;AAAD,CAAC,AAVD,IAUC;AAVY,oCAAY"}
|
|
File without changes
|
|
@@ -11,7 +11,7 @@ var HelpersMorphiFramework = /** @class */ (function () {
|
|
|
11
11
|
HelpersMorphiFramework.prototype.getEntites = function (cwd) {
|
|
12
12
|
var entityRegEx = /^([A-Z]|\_|[0-9])+\.ts$/;
|
|
13
13
|
return glob
|
|
14
|
-
.sync(tnp_config_1.config.folder.apps
|
|
14
|
+
.sync("".concat(tnp_config_1.config.folder.apps, "/**/*.ts"), {
|
|
15
15
|
cwd: cwd
|
|
16
16
|
}).filter(function (p) {
|
|
17
17
|
var isMatchRegex = entityRegEx.test(tnp_core_1.path.basename(p));
|
|
@@ -36,7 +36,7 @@ var HelpersMorphiFramework = /** @class */ (function () {
|
|
|
36
36
|
};
|
|
37
37
|
HelpersMorphiFramework.prototype.getControllers = function (cwd) {
|
|
38
38
|
return glob
|
|
39
|
-
.sync(tnp_config_1.config.folder.apps
|
|
39
|
+
.sync("".concat(tnp_config_1.config.folder.apps, "/**/*Controller.ts"), {
|
|
40
40
|
cwd: cwd
|
|
41
41
|
})
|
|
42
42
|
.filter(function (p) {
|
|
@@ -46,4 +46,5 @@ var HelpersMorphiFramework = /** @class */ (function () {
|
|
|
46
46
|
return HelpersMorphiFramework;
|
|
47
47
|
}());
|
|
48
48
|
exports.HelpersMorphiFramework = HelpersMorphiFramework;
|
|
49
|
-
//# sourceMappingURL=helpers-morphi-framework.backend.js.map
|
|
49
|
+
//# sourceMappingURL=helpers-morphi-framework.backend.js.map
|
|
50
|
+
// @fixed
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"helpers-morphi-framework.backend.js","sourceRoot":"","sources":["../../src/lib/helpers-morphi-framework.backend.ts"],"names":[],"mappings":";;;AAAA,qCAAgC;AAChC,2BAA6B;AAC7B,yCAAoC;AACpC,yCAAqD;AAErD;IAAA;IA0CA,CAAC;IAxCC,2CAAU,GAAV,UAAW,GAAW;QACpB,IAAM,WAAW,GAAG,yBAAyB,CAAC;QAC9C,OAAO,IAAI;aACR,IAAI,CAAC,UAAG,mBAAM,CAAC,MAAM,CAAC,IAAI,aAAU,EAAE;YACrC,GAAG,EAAE,GAAG;SACT,CAAC,CAAC,MAAM,CAAC,UAAA,CAAC;YAET,IAAM,YAAY,GAAG,WAAW,CAAC,IAAI,CAAC,eAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;YACxD,uBAAuB;YACvB,4DAA4D;YAC5D,IAAI;YACJ,OAAO,YAAY;gBACjB,CAAC,eAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,kCAAsB,CAAC;gBACpD,CAAC,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC;gBAC5B,CAAC,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAC7B,CAAC,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC;gBAC7B,CAAC,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC;gBAC5B,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC;gBACzB,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC;gBACpB,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC;gBACvB,CAAC,CAAC,CAAC,QAAQ,CAAC,eAAe,CAAC;gBAC5B,CAAC,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC;gBACzB,CAAC,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;gBAC1B,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC;gBACxB,CAAC,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAC,QAAQ,CAAC,eAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC1F,CAAC,CAAC,CAAA;IACN,CAAC;IAGD,+CAAc,GAAd,UAAe,GAAW;QACxB,OAAO,IAAI;aACR,IAAI,CAAC,UAAG,mBAAM,CAAC,MAAM,CAAC,IAAI,uBAAoB,EAAE;YAC/C,GAAG,EAAE,GAAG;SACT,CAAC;aACD,MAAM,CAAC,UAAA,CAAC;YACP,OAAO,CAAC,eAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,kCAAsB,CAAC,CAAC;QAC9D,CAAC,CAAC,CAAC;IACP,CAAC;IAGH,6BAAC;AAAD,CAAC,AA1CD,IA0CC;AA1CY,wDAAsB"}
|
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"helpers-network.backend.js","sourceRoot":"","sources":["../../src/lib/helpers-network.backend.ts"],"names":[],"mappings":";;;AASA;IAAA;IA4CA,CAAC;IA3CC,6BAAI,GAAJ,UAAK,GAAwB;QAC3B,OAAO;YACL,GAAG;YAEH,CAAC;YACD,MAAM,EAAN,UAAO,OAGE,EAAE,WAA6B;gBACtC,IAAI,CAAC,WAAW,EAAE;oBAChB,WAAW,GAAG,SAAS,CAAC;iBACzB;gBACD,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,UAAC,GAAG,EAAE,GAAG;oBAC5B,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;gBACH,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,UAAC,GAAG,EAAE,GAAG;oBAC7B,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;gBACH,GAAG,CAAC,MAAM,CAAC,WAAW,EAAE,UAAC,GAAG,EAAE,GAAG;oBAC/B,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;gBACH,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,UAAC,GAAG,EAAE,GAAG;oBAC5B,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;gBACH,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,UAAC,GAAG,EAAE,GAAG;oBAC7B,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;gBACH,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,UAAC,GAAG,EAAE,GAAG;oBAC9B,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;gBACH,GAAG,CAAC,KAAK,CAAC,WAAW,EAAE,UAAC,GAAG,EAAE,GAAG;oBAC9B,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;gBACH,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,UAAC,GAAG,EAAE,GAAG;oBAChC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;gBACH,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,UAAC,GAAG,EAAE,GAAG;oBAChC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;YACL,CAAC;SACF,CAAA;IACH,CAAC;IAEH,qBAAC;AAAD,CAAC,AA5CD,IA4CC;AA5CY,wCAAc"}
|
|
File without changes
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"helpers-npm.backend.js","sourceRoot":"","sources":["../../src/lib/helpers-npm.backend.ts"],"names":[],"mappings":";;;AAAA,qCAA6B;AAC7B;IAAA;IAUA,CAAC;IARC,6CAAwB,GAAxB,UAAyB,GAAG;QAC1B,IAAI,CAAC,YAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,GAAG,GAAG,EAAE;YACxC,OAAO,KAAK,CAAC;SACd;QACD,OAAO,IAAI,MAAM,CAAC,iEAAiE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjG,CAAC;IAGH,iBAAC;AAAD,CAAC,AAVD,IAUC;AAVY,gCAAU"}
|
|
File without changes
|
|
@@ -16,10 +16,10 @@ var HelpersPath = /** @class */ (function () {
|
|
|
16
16
|
return tnp_core_1.path.join.apply(tnp_core_1.path, pathPart);
|
|
17
17
|
};
|
|
18
18
|
HelpersPath.prototype.PREFIX = function (baseFileName) {
|
|
19
|
-
return ""
|
|
19
|
+
return "".concat(constants_1.BaselineSiteJoinprefix).concat(baseFileName);
|
|
20
20
|
};
|
|
21
21
|
HelpersPath.prototype.removeRootFolder = function (filePath) {
|
|
22
|
-
return filePath.replace(new RegExp("^"
|
|
22
|
+
return filePath.replace(new RegExp("^".concat(tnp_config_1.config.regexString.pathPartStringRegex), 'g'), '');
|
|
23
23
|
};
|
|
24
24
|
HelpersPath.prototype.removeExtension = function (filePath) {
|
|
25
25
|
return index_1.Helpers.path.removeExt(filePath);
|
|
@@ -32,4 +32,5 @@ var HelpersPath = /** @class */ (function () {
|
|
|
32
32
|
return HelpersPath;
|
|
33
33
|
}());
|
|
34
34
|
exports.HelpersPath = HelpersPath;
|
|
35
|
-
//# sourceMappingURL=helpers-path.backend.js.map
|
|
35
|
+
//# sourceMappingURL=helpers-path.backend.js.map
|
|
36
|
+
// @fixed
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"helpers-path.backend.js","sourceRoot":"","sources":["../../src/lib/helpers-path.backend.ts"],"names":[],"mappings":";;;AAAA,qCAAmC;AACnC,yCAAoC;AACpC,yCAAqD;AACrD,iCAAkC;AAElC;IAAA;IAoBA,CAAC;IAlBC,4BAAM,GAAN;QAAO,kBAAqB;aAArB,UAAqB,EAArB,qBAAqB,EAArB,IAAqB;YAArB,6BAAqB;;QAC1B,OAAO,eAAI,CAAC,IAAI,OAAT,eAAI,EAAS,QAAQ,EAAE;IAChC,CAAC;IAED,4BAAM,GAAN,UAAO,YAAY;QACjB,OAAO,UAAG,kCAAsB,SAAG,YAAY,CAAE,CAAA;IACnD,CAAC;IACD,sCAAgB,GAAhB,UAAiB,QAAgB;QAC/B,OAAO,QAAQ,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,WAAI,mBAAM,CAAC,WAAW,CAAC,mBAAmB,CAAE,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,CAAA;IAC5F,CAAC;IACD,qCAAe,GAAf,UAAgB,QAAgB;QAC9B,OAAO,eAAO,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACxC,sCAAsC;QACtC,yEAAyE;IAC3E,CAAC;IACD,+BAAS,GAAT,UAAU,QAAgB;QACxB,OAAO,QAAQ,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,CAAC,CAAA;IAC3C,CAAC;IACH,kBAAC;AAAD,CAAC,AApBD,IAoBC;AApBY,kCAAW"}
|
|
@@ -32,7 +32,7 @@ export declare class HelpersProcess {
|
|
|
32
32
|
label: string;
|
|
33
33
|
option: string;
|
|
34
34
|
}[] | string, disableEncode?: boolean): void;
|
|
35
|
-
sleep(seconds?: number):
|
|
35
|
+
sleep(seconds?: number): string;
|
|
36
36
|
actionWrapper(fn: () => void, taskName?: string): Promise<void>;
|
|
37
37
|
terminalLine(): string;
|
|
38
38
|
killProcess(byPid: number): void;
|
|
@@ -45,5 +45,5 @@ export declare class HelpersProcess {
|
|
|
45
45
|
run(command: string, folderPath: string, options: Models.system.WatchOptions): child_process.ChildProcess;
|
|
46
46
|
call(fn: Function | string, params: string, folderPath: string, options: Models.system.WatchOptions): child_process.ChildProcess;
|
|
47
47
|
};
|
|
48
|
-
getStringFrom(command: string, descriptionOfCommand?: string):
|
|
48
|
+
getStringFrom(command: string, descriptionOfCommand?: string): string;
|
|
49
49
|
}
|