@mikeyt23/node-cli-utils 2.0.14 → 2.0.16
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/dbMigrationUtils.js +15 -8
- package/dist/cjs/dotnetUtils.d.ts +6 -0
- package/dist/cjs/dotnetUtils.d.ts.map +1 -1
- package/dist/cjs/dotnetUtils.js +23 -8
- package/dist/esm/dbMigrationUtils.js +14 -8
- package/dist/esm/dotnetUtils.d.ts +6 -0
- package/dist/esm/dotnetUtils.d.ts.map +1 -1
- package/dist/esm/dotnetUtils.js +21 -8
- package/package.json +1 -1
|
@@ -80,7 +80,7 @@ async function efRemoveLastMigration(projectPath, dbContextName, skipConfirm = f
|
|
|
80
80
|
if (returnCode !== 0) {
|
|
81
81
|
throw new Error(`dotnet ef migrations remove returned non-zero exit code: ${returnCode}`);
|
|
82
82
|
}
|
|
83
|
-
(0, generalUtils_js_1.log)(`Removing migration SQL script files
|
|
83
|
+
(0, generalUtils_js_1.log)(`Removing migration SQL script files if they're empty`);
|
|
84
84
|
await deleteScriptFileIfEmpty(getScriptPath(projectPath, lastMigrationName, true));
|
|
85
85
|
await deleteScriptFileIfEmpty(getScriptPath(projectPath, lastMigrationName, false));
|
|
86
86
|
}
|
|
@@ -145,13 +145,20 @@ async function getCSharpMigrationFilePath(projectDirectory, dbContextName, migra
|
|
|
145
145
|
return filePath;
|
|
146
146
|
}
|
|
147
147
|
async function addDbMigrationBoilerplate(projectDirectory, dbContextName, migrationName) {
|
|
148
|
-
|
|
149
|
-
|
|
148
|
+
var _a;
|
|
149
|
+
const cSharpMigrationFilePath = await getCSharpMigrationFilePath(projectDirectory, dbContextName, migrationName);
|
|
150
|
+
(0, generalUtils_js_1.log)(`Replacing file contents with boilerplate for file 📄${cSharpMigrationFilePath}`);
|
|
151
|
+
const oldFileContents = await promises_1.default.readFile(cSharpMigrationFilePath, { encoding: 'utf8' });
|
|
152
|
+
const namespaceLine = (_a = oldFileContents.split('\n').find(line => line.startsWith('namespace '))) === null || _a === void 0 ? void 0 : _a.trim();
|
|
153
|
+
if (!namespaceLine) {
|
|
154
|
+
throw new Error(`Unable to find namespace line in file: ${cSharpMigrationFilePath}`);
|
|
155
|
+
}
|
|
150
156
|
const newFileContents = cSharpMigrationFileTemplate
|
|
157
|
+
.replaceAll(namespaceLinePlaceholder, namespaceLine)
|
|
151
158
|
.replaceAll(contextNamePlaceholder, dbContextName)
|
|
152
159
|
.replaceAll(migrationNamePlaceholder, migrationName);
|
|
153
|
-
await promises_1.default.writeFile(
|
|
154
|
-
(0, generalUtils_js_1.log)(`Updated file with boilerplate - please ensure it is correct: 📄${
|
|
160
|
+
await promises_1.default.writeFile(cSharpMigrationFilePath, newFileContents, { encoding: 'utf8' });
|
|
161
|
+
(0, generalUtils_js_1.log)(`Updated file with boilerplate - please ensure it is correct: 📄${cSharpMigrationFilePath}`);
|
|
155
162
|
const upScriptPath = node_path_1.default.join(projectDirectory, `Scripts/${migrationName}.sql`);
|
|
156
163
|
const downScriptPath = node_path_1.default.join(projectDirectory, `Scripts/${migrationName}_Down.sql`);
|
|
157
164
|
(0, generalUtils_js_1.log)('\nCreating corresponding empty sql files (no action will be taken if they already exist):');
|
|
@@ -168,6 +175,7 @@ async function writeEmptySqlFileIfNotExists(scriptPath, scriptType) {
|
|
|
168
175
|
(0, generalUtils_js_1.log)(`Skipping ${scriptType} sql script (already exists)`);
|
|
169
176
|
}
|
|
170
177
|
}
|
|
178
|
+
const namespaceLinePlaceholder = '{{namespace}}';
|
|
171
179
|
const contextNamePlaceholder = '{{context_name}}';
|
|
172
180
|
const migrationNamePlaceholder = '{{migration_name}}';
|
|
173
181
|
const cSharpMigrationFileTemplate = `using Microsoft.EntityFrameworkCore.Migrations;
|
|
@@ -175,7 +183,7 @@ using MikeyT.DbMigrations;
|
|
|
175
183
|
|
|
176
184
|
#nullable disable
|
|
177
185
|
|
|
178
|
-
namespace
|
|
186
|
+
{{namespace}}
|
|
179
187
|
{
|
|
180
188
|
public partial class ${migrationNamePlaceholder} : Migration
|
|
181
189
|
{
|
|
@@ -190,6 +198,5 @@ namespace DbMigrator.Migrations.${contextNamePlaceholder}Migrations
|
|
|
190
198
|
}
|
|
191
199
|
}
|
|
192
200
|
}
|
|
193
|
-
|
|
194
201
|
`;
|
|
195
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
202
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dbMigrationUtils.js","sourceRoot":"","sources":["../../src/dbMigrationUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,10 +12,16 @@ export declare function dotnetBuild(projectPath: string): Promise<void>;
|
|
|
12
12
|
* @param cwd Optionally run the command from another current working directory
|
|
13
13
|
*/
|
|
14
14
|
export declare function dotnetPublish(projectPath?: string, configuration?: string, outputDir?: string, cwd?: string): Promise<void>;
|
|
15
|
+
/**
|
|
16
|
+
* Install or update a global dotnet tool.
|
|
17
|
+
* @param toolName The name of the dotnet global tool
|
|
18
|
+
*/
|
|
19
|
+
export declare function installOrUpdateDotnetGlobalTool(toolName: string): Promise<void>;
|
|
15
20
|
/**
|
|
16
21
|
* Spawns a process that runs the necessary commands to install or update the dotnet-ef tool globally on the system.
|
|
17
22
|
*/
|
|
18
23
|
export declare function installOrUpdateDotnetEfTool(): Promise<void>;
|
|
24
|
+
export declare function installOrUpdateReportGeneratorTool(): Promise<void>;
|
|
19
25
|
/**
|
|
20
26
|
* Spawns a process that runs the following commands to clean and re-install the dotnet dev certs:
|
|
21
27
|
* - dotnet dev-certs https --clean
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dotnetUtils.d.ts","sourceRoot":"","sources":["../../src/dotnetUtils.ts"],"names":[],"mappings":"AAMA;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,WAAW,EAAE,MAAM,iBAGpD;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,WAAW,GAAE,MAAa,EAAE,aAAa,GAAE,MAAkB,EAAE,SAAS,GAAE,MAAkB,EAAE,GAAG,CAAC,EAAE,MAAM,iBAY7I;AAED;;GAEG;AACH,wBAAsB,2BAA2B,
|
|
1
|
+
{"version":3,"file":"dotnetUtils.d.ts","sourceRoot":"","sources":["../../src/dotnetUtils.ts"],"names":[],"mappings":"AAMA;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,WAAW,EAAE,MAAM,iBAGpD;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,WAAW,GAAE,MAAa,EAAE,aAAa,GAAE,MAAkB,EAAE,SAAS,GAAE,MAAkB,EAAE,GAAG,CAAC,EAAE,MAAM,iBAY7I;AAED;;;GAGG;AACH,wBAAsB,+BAA+B,CAAC,QAAQ,EAAE,MAAM,iBAYrE;AAED;;GAEG;AACH,wBAAsB,2BAA2B,kBAEhD;AAED,wBAAsB,kCAAkC,kBAEvD;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,kBAG5C"}
|
package/dist/cjs/dotnetUtils.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.configureDotnetDevCerts = exports.installOrUpdateDotnetEfTool = exports.dotnetPublish = exports.dotnetBuild = void 0;
|
|
3
|
+
exports.configureDotnetDevCerts = exports.installOrUpdateReportGeneratorTool = exports.installOrUpdateDotnetEfTool = exports.installOrUpdateDotnetGlobalTool = exports.dotnetPublish = exports.dotnetBuild = void 0;
|
|
4
4
|
const generalUtils_js_1 = require("./generalUtils.js");
|
|
5
5
|
/**
|
|
6
6
|
* Runs dotnet build on the specified project.
|
|
@@ -34,20 +34,35 @@ async function dotnetPublish(projectPath = './', configuration = 'Release', outp
|
|
|
34
34
|
}
|
|
35
35
|
exports.dotnetPublish = dotnetPublish;
|
|
36
36
|
/**
|
|
37
|
-
*
|
|
37
|
+
* Install or update a global dotnet tool.
|
|
38
|
+
* @param toolName The name of the dotnet global tool
|
|
38
39
|
*/
|
|
39
|
-
async function
|
|
40
|
-
|
|
40
|
+
async function installOrUpdateDotnetGlobalTool(toolName) {
|
|
41
|
+
if (!(await (0, generalUtils_js_1.which)('dotnet')).location) {
|
|
42
|
+
throw new Error('"dotnet" is not installed');
|
|
43
|
+
}
|
|
44
|
+
const installed = (await (0, generalUtils_js_1.which)(toolName)).location;
|
|
41
45
|
if (installed) {
|
|
42
|
-
(0, generalUtils_js_1.log)(
|
|
46
|
+
(0, generalUtils_js_1.log)(`${toolName} tool already installed, updating...`);
|
|
43
47
|
}
|
|
44
48
|
else {
|
|
45
|
-
(0, generalUtils_js_1.log)(
|
|
49
|
+
(0, generalUtils_js_1.log)(`${toolName} tool not installed, installing...`);
|
|
46
50
|
}
|
|
47
|
-
const args = ['tool', installed ? 'update' : 'install', '--global',
|
|
51
|
+
const args = ['tool', installed ? 'update' : 'install', '--global', toolName];
|
|
48
52
|
await (0, generalUtils_js_1.spawnAsync)('dotnet', args);
|
|
49
53
|
}
|
|
54
|
+
exports.installOrUpdateDotnetGlobalTool = installOrUpdateDotnetGlobalTool;
|
|
55
|
+
/**
|
|
56
|
+
* Spawns a process that runs the necessary commands to install or update the dotnet-ef tool globally on the system.
|
|
57
|
+
*/
|
|
58
|
+
async function installOrUpdateDotnetEfTool() {
|
|
59
|
+
await installOrUpdateDotnetGlobalTool('dotnet-ef');
|
|
60
|
+
}
|
|
50
61
|
exports.installOrUpdateDotnetEfTool = installOrUpdateDotnetEfTool;
|
|
62
|
+
async function installOrUpdateReportGeneratorTool() {
|
|
63
|
+
await installOrUpdateDotnetGlobalTool('dotnet-reportgenerator-globaltool');
|
|
64
|
+
}
|
|
65
|
+
exports.installOrUpdateReportGeneratorTool = installOrUpdateReportGeneratorTool;
|
|
51
66
|
/**
|
|
52
67
|
* Spawns a process that runs the following commands to clean and re-install the dotnet dev certs:
|
|
53
68
|
* - dotnet dev-certs https --clean
|
|
@@ -58,4 +73,4 @@ async function configureDotnetDevCerts() {
|
|
|
58
73
|
await (0, generalUtils_js_1.spawnAsync)('dotnet', ['dev-certs', 'https', '-t']);
|
|
59
74
|
}
|
|
60
75
|
exports.configureDotnetDevCerts = configureDotnetDevCerts;
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
76
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG90bmV0VXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZG90bmV0VXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsdURBQWtHO0FBTWxHOzs7O0dBSUc7QUFDSSxLQUFLLFVBQVUsV0FBVyxDQUFDLFdBQW1CO0lBQ25ELElBQUEsa0NBQWdCLEVBQUMsYUFBYSxFQUFFLFdBQVcsQ0FBQyxDQUFBO0lBQzVDLE1BQU0sSUFBQSw0QkFBVSxFQUFDLFFBQVEsRUFBRSxDQUFDLE9BQU8sRUFBRSxXQUFXLENBQUMsRUFBRSxFQUFFLGNBQWMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFBO0FBQzlFLENBQUM7QUFIRCxrQ0FHQztBQUVEOzs7Ozs7R0FNRztBQUNJLEtBQUssVUFBVSxhQUFhLENBQUMsY0FBc0IsSUFBSSxFQUFFLGdCQUF3QixTQUFTLEVBQUUsWUFBb0IsU0FBUyxFQUFFLEdBQVk7SUFDNUksSUFBQSxrQ0FBZ0IsRUFBQyxhQUFhLEVBQUUsV0FBVyxDQUFDLENBQUE7SUFDNUMsSUFBQSwrQkFBYSxFQUFDLFdBQVcsRUFBRSxTQUFTLENBQUMsQ0FBQTtJQUNyQyxJQUFBLCtCQUFhLEVBQUMsZUFBZSxFQUFFLGFBQWEsQ0FBQyxDQUFBO0lBQzdDLElBQUksR0FBRyxFQUFFO1FBQ1AsSUFBQSxrQ0FBZ0IsRUFBQyxLQUFLLEVBQUUsR0FBRyxDQUFDLENBQUE7S0FDN0I7SUFDRCxNQUFNLElBQUksR0FBRyxDQUFDLFNBQVMsRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLGFBQWEsRUFBRSxJQUFJLEVBQUUsU0FBUyxDQUFDLENBQUE7SUFDM0UsTUFBTSxZQUFZLEdBQUcsa0JBQWtCLElBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQTtJQUN2RCxNQUFNLGVBQWUsR0FBRyxHQUFHLENBQUMsQ0FBQyxDQUFDLFdBQVcsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQTtJQUNuRCxJQUFBLHVCQUFLLEVBQUMsR0FBRyxZQUFZLEdBQUcsZUFBZSxFQUFFLENBQUMsQ0FBQTtJQUMxQyxNQUFNLElBQUEsNEJBQVUsRUFBQyxRQUFRLEVBQUUsSUFBSSxFQUFFLEVBQUUsR0FBRyxFQUFFLEdBQUcsRUFBRSxDQUFDLENBQUE7QUFDaEQsQ0FBQztBQVpELHNDQVlDO0FBRUQ7OztHQUdHO0FBQ0ksS0FBSyxVQUFVLCtCQUErQixDQUFDLFFBQWdCO0lBQ3BFLElBQUksQ0FBQyxDQUFDLE1BQU0sSUFBQSx1QkFBSyxFQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFO1FBQ3JDLE1BQU0sSUFBSSxLQUFLLENBQUMsMkJBQTJCLENBQUMsQ0FBQTtLQUM3QztJQUNELE1BQU0sU0FBUyxHQUFHLENBQUMsTUFBTSxJQUFBLHVCQUFLLEVBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUE7SUFDbEQsSUFBSSxTQUFTLEVBQUU7UUFDYixJQUFBLHFCQUFHLEVBQUMsR0FBRyxRQUFRLHNDQUFzQyxDQUFDLENBQUE7S0FDdkQ7U0FBTTtRQUNMLElBQUEscUJBQUcsRUFBQyxHQUFHLFFBQVEsb0NBQW9DLENBQUMsQ0FBQTtLQUNyRDtJQUNELE1BQU0sSUFBSSxHQUFHLENBQUMsTUFBTSxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxTQUFTLEVBQUUsVUFBVSxFQUFFLFFBQVEsQ0FBQyxDQUFBO0lBQzdFLE1BQU0sSUFBQSw0QkFBVSxFQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQTtBQUNsQyxDQUFDO0FBWkQsMEVBWUM7QUFFRDs7R0FFRztBQUNJLEtBQUssVUFBVSwyQkFBMkI7SUFDL0MsTUFBTSwrQkFBK0IsQ0FBQyxXQUFXLENBQUMsQ0FBQTtBQUNwRCxDQUFDO0FBRkQsa0VBRUM7QUFFTSxLQUFLLFVBQVUsa0NBQWtDO0lBQ3RELE1BQU0sK0JBQStCLENBQUMsbUNBQW1DLENBQUMsQ0FBQTtBQUM1RSxDQUFDO0FBRkQsZ0ZBRUM7QUFFRDs7OztHQUlHO0FBQ0ksS0FBSyxVQUFVLHVCQUF1QjtJQUMzQyxNQUFNLElBQUEsNEJBQVUsRUFBQyxRQUFRLEVBQUUsQ0FBQyxXQUFXLEVBQUUsT0FBTyxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUE7SUFDN0QsTUFBTSxJQUFBLDRCQUFVLEVBQUMsUUFBUSxFQUFFLENBQUMsV0FBVyxFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFBO0FBQzFELENBQUM7QUFIRCwwREFHQyJ9
|
|
@@ -70,7 +70,7 @@ export async function efRemoveLastMigration(projectPath, dbContextName, skipConf
|
|
|
70
70
|
if (returnCode !== 0) {
|
|
71
71
|
throw new Error(`dotnet ef migrations remove returned non-zero exit code: ${returnCode}`);
|
|
72
72
|
}
|
|
73
|
-
log(`Removing migration SQL script files
|
|
73
|
+
log(`Removing migration SQL script files if they're empty`);
|
|
74
74
|
await deleteScriptFileIfEmpty(getScriptPath(projectPath, lastMigrationName, true));
|
|
75
75
|
await deleteScriptFileIfEmpty(getScriptPath(projectPath, lastMigrationName, false));
|
|
76
76
|
}
|
|
@@ -134,13 +134,19 @@ async function getCSharpMigrationFilePath(projectDirectory, dbContextName, migra
|
|
|
134
134
|
return filePath;
|
|
135
135
|
}
|
|
136
136
|
async function addDbMigrationBoilerplate(projectDirectory, dbContextName, migrationName) {
|
|
137
|
-
const
|
|
138
|
-
log(`Replacing file contents with boilerplate for file 📄${
|
|
137
|
+
const cSharpMigrationFilePath = await getCSharpMigrationFilePath(projectDirectory, dbContextName, migrationName);
|
|
138
|
+
log(`Replacing file contents with boilerplate for file 📄${cSharpMigrationFilePath}`);
|
|
139
|
+
const oldFileContents = await fsp.readFile(cSharpMigrationFilePath, { encoding: 'utf8' });
|
|
140
|
+
const namespaceLine = oldFileContents.split('\n').find(line => line.startsWith('namespace '))?.trim();
|
|
141
|
+
if (!namespaceLine) {
|
|
142
|
+
throw new Error(`Unable to find namespace line in file: ${cSharpMigrationFilePath}`);
|
|
143
|
+
}
|
|
139
144
|
const newFileContents = cSharpMigrationFileTemplate
|
|
145
|
+
.replaceAll(namespaceLinePlaceholder, namespaceLine)
|
|
140
146
|
.replaceAll(contextNamePlaceholder, dbContextName)
|
|
141
147
|
.replaceAll(migrationNamePlaceholder, migrationName);
|
|
142
|
-
await fsp.writeFile(
|
|
143
|
-
log(`Updated file with boilerplate - please ensure it is correct: 📄${
|
|
148
|
+
await fsp.writeFile(cSharpMigrationFilePath, newFileContents, { encoding: 'utf8' });
|
|
149
|
+
log(`Updated file with boilerplate - please ensure it is correct: 📄${cSharpMigrationFilePath}`);
|
|
144
150
|
const upScriptPath = path.join(projectDirectory, `Scripts/${migrationName}.sql`);
|
|
145
151
|
const downScriptPath = path.join(projectDirectory, `Scripts/${migrationName}_Down.sql`);
|
|
146
152
|
log('\nCreating corresponding empty sql files (no action will be taken if they already exist):');
|
|
@@ -157,6 +163,7 @@ async function writeEmptySqlFileIfNotExists(scriptPath, scriptType) {
|
|
|
157
163
|
log(`Skipping ${scriptType} sql script (already exists)`);
|
|
158
164
|
}
|
|
159
165
|
}
|
|
166
|
+
const namespaceLinePlaceholder = '{{namespace}}';
|
|
160
167
|
const contextNamePlaceholder = '{{context_name}}';
|
|
161
168
|
const migrationNamePlaceholder = '{{migration_name}}';
|
|
162
169
|
const cSharpMigrationFileTemplate = `using Microsoft.EntityFrameworkCore.Migrations;
|
|
@@ -164,7 +171,7 @@ using MikeyT.DbMigrations;
|
|
|
164
171
|
|
|
165
172
|
#nullable disable
|
|
166
173
|
|
|
167
|
-
namespace
|
|
174
|
+
{{namespace}}
|
|
168
175
|
{
|
|
169
176
|
public partial class ${migrationNamePlaceholder} : Migration
|
|
170
177
|
{
|
|
@@ -179,6 +186,5 @@ namespace DbMigrator.Migrations.${contextNamePlaceholder}Migrations
|
|
|
179
186
|
}
|
|
180
187
|
}
|
|
181
188
|
}
|
|
182
|
-
|
|
183
189
|
`;
|
|
184
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
190
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dbMigrationUtils.js","sourceRoot":"","sources":["../../src/dbMigrationUtils.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,10 +12,16 @@ export declare function dotnetBuild(projectPath: string): Promise<void>;
|
|
|
12
12
|
* @param cwd Optionally run the command from another current working directory
|
|
13
13
|
*/
|
|
14
14
|
export declare function dotnetPublish(projectPath?: string, configuration?: string, outputDir?: string, cwd?: string): Promise<void>;
|
|
15
|
+
/**
|
|
16
|
+
* Install or update a global dotnet tool.
|
|
17
|
+
* @param toolName The name of the dotnet global tool
|
|
18
|
+
*/
|
|
19
|
+
export declare function installOrUpdateDotnetGlobalTool(toolName: string): Promise<void>;
|
|
15
20
|
/**
|
|
16
21
|
* Spawns a process that runs the necessary commands to install or update the dotnet-ef tool globally on the system.
|
|
17
22
|
*/
|
|
18
23
|
export declare function installOrUpdateDotnetEfTool(): Promise<void>;
|
|
24
|
+
export declare function installOrUpdateReportGeneratorTool(): Promise<void>;
|
|
19
25
|
/**
|
|
20
26
|
* Spawns a process that runs the following commands to clean and re-install the dotnet dev certs:
|
|
21
27
|
* - dotnet dev-certs https --clean
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dotnetUtils.d.ts","sourceRoot":"","sources":["../../src/dotnetUtils.ts"],"names":[],"mappings":"AAMA;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,WAAW,EAAE,MAAM,iBAGpD;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,WAAW,GAAE,MAAa,EAAE,aAAa,GAAE,MAAkB,EAAE,SAAS,GAAE,MAAkB,EAAE,GAAG,CAAC,EAAE,MAAM,iBAY7I;AAED;;GAEG;AACH,wBAAsB,2BAA2B,
|
|
1
|
+
{"version":3,"file":"dotnetUtils.d.ts","sourceRoot":"","sources":["../../src/dotnetUtils.ts"],"names":[],"mappings":"AAMA;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,WAAW,EAAE,MAAM,iBAGpD;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CAAC,WAAW,GAAE,MAAa,EAAE,aAAa,GAAE,MAAkB,EAAE,SAAS,GAAE,MAAkB,EAAE,GAAG,CAAC,EAAE,MAAM,iBAY7I;AAED;;;GAGG;AACH,wBAAsB,+BAA+B,CAAC,QAAQ,EAAE,MAAM,iBAYrE;AAED;;GAEG;AACH,wBAAsB,2BAA2B,kBAEhD;AAED,wBAAsB,kCAAkC,kBAEvD;AAED;;;;GAIG;AACH,wBAAsB,uBAAuB,kBAG5C"}
|
package/dist/esm/dotnetUtils.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { log, requireString, requireValidPath, spawnAsync, trace,
|
|
1
|
+
import { log, requireString, requireValidPath, spawnAsync, trace, which } from './generalUtils.js';
|
|
2
2
|
/**
|
|
3
3
|
* Runs dotnet build on the specified project.
|
|
4
4
|
* @param projectPath Path to project file (like .csproj) or directory of project to build
|
|
@@ -29,19 +29,32 @@ export async function dotnetPublish(projectPath = './', configuration = 'Release
|
|
|
29
29
|
await spawnAsync('dotnet', args, { cwd: cwd });
|
|
30
30
|
}
|
|
31
31
|
/**
|
|
32
|
-
*
|
|
32
|
+
* Install or update a global dotnet tool.
|
|
33
|
+
* @param toolName The name of the dotnet global tool
|
|
33
34
|
*/
|
|
34
|
-
export async function
|
|
35
|
-
|
|
35
|
+
export async function installOrUpdateDotnetGlobalTool(toolName) {
|
|
36
|
+
if (!(await which('dotnet')).location) {
|
|
37
|
+
throw new Error('"dotnet" is not installed');
|
|
38
|
+
}
|
|
39
|
+
const installed = (await which(toolName)).location;
|
|
36
40
|
if (installed) {
|
|
37
|
-
log(
|
|
41
|
+
log(`${toolName} tool already installed, updating...`);
|
|
38
42
|
}
|
|
39
43
|
else {
|
|
40
|
-
log(
|
|
44
|
+
log(`${toolName} tool not installed, installing...`);
|
|
41
45
|
}
|
|
42
|
-
const args = ['tool', installed ? 'update' : 'install', '--global',
|
|
46
|
+
const args = ['tool', installed ? 'update' : 'install', '--global', toolName];
|
|
43
47
|
await spawnAsync('dotnet', args);
|
|
44
48
|
}
|
|
49
|
+
/**
|
|
50
|
+
* Spawns a process that runs the necessary commands to install or update the dotnet-ef tool globally on the system.
|
|
51
|
+
*/
|
|
52
|
+
export async function installOrUpdateDotnetEfTool() {
|
|
53
|
+
await installOrUpdateDotnetGlobalTool('dotnet-ef');
|
|
54
|
+
}
|
|
55
|
+
export async function installOrUpdateReportGeneratorTool() {
|
|
56
|
+
await installOrUpdateDotnetGlobalTool('dotnet-reportgenerator-globaltool');
|
|
57
|
+
}
|
|
45
58
|
/**
|
|
46
59
|
* Spawns a process that runs the following commands to clean and re-install the dotnet dev certs:
|
|
47
60
|
* - dotnet dev-certs https --clean
|
|
@@ -51,4 +64,4 @@ export async function configureDotnetDevCerts() {
|
|
|
51
64
|
await spawnAsync('dotnet', ['dev-certs', 'https', '--clean']);
|
|
52
65
|
await spawnAsync('dotnet', ['dev-certs', 'https', '-t']);
|
|
53
66
|
}
|
|
54
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
67
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG90bmV0VXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZG90bmV0VXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLEdBQUcsRUFBRSxhQUFhLEVBQUUsZ0JBQWdCLEVBQUUsVUFBVSxFQUFFLEtBQUssRUFBRSxLQUFLLEVBQUUsTUFBTSxtQkFBbUIsQ0FBQTtBQU1sRzs7OztHQUlHO0FBQ0gsTUFBTSxDQUFDLEtBQUssVUFBVSxXQUFXLENBQUMsV0FBbUI7SUFDbkQsZ0JBQWdCLENBQUMsYUFBYSxFQUFFLFdBQVcsQ0FBQyxDQUFBO0lBQzVDLE1BQU0sVUFBVSxDQUFDLFFBQVEsRUFBRSxDQUFDLE9BQU8sRUFBRSxXQUFXLENBQUMsRUFBRSxFQUFFLGNBQWMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFBO0FBQzlFLENBQUM7QUFFRDs7Ozs7O0dBTUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLGFBQWEsQ0FBQyxjQUFzQixJQUFJLEVBQUUsZ0JBQXdCLFNBQVMsRUFBRSxZQUFvQixTQUFTLEVBQUUsR0FBWTtJQUM1SSxnQkFBZ0IsQ0FBQyxhQUFhLEVBQUUsV0FBVyxDQUFDLENBQUE7SUFDNUMsYUFBYSxDQUFDLFdBQVcsRUFBRSxTQUFTLENBQUMsQ0FBQTtJQUNyQyxhQUFhLENBQUMsZUFBZSxFQUFFLGFBQWEsQ0FBQyxDQUFBO0lBQzdDLElBQUksR0FBRyxFQUFFO1FBQ1AsZ0JBQWdCLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxDQUFBO0tBQzdCO0lBQ0QsTUFBTSxJQUFJLEdBQUcsQ0FBQyxTQUFTLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxhQUFhLEVBQUUsSUFBSSxFQUFFLFNBQVMsQ0FBQyxDQUFBO0lBQzNFLE1BQU0sWUFBWSxHQUFHLGtCQUFrQixJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUE7SUFDdkQsTUFBTSxlQUFlLEdBQUcsR0FBRyxDQUFDLENBQUMsQ0FBQyxXQUFXLEdBQUcsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUE7SUFDbkQsS0FBSyxDQUFDLEdBQUcsWUFBWSxHQUFHLGVBQWUsRUFBRSxDQUFDLENBQUE7SUFDMUMsTUFBTSxVQUFVLENBQUMsUUFBUSxFQUFFLElBQUksRUFBRSxFQUFFLEdBQUcsRUFBRSxHQUFHLEVBQUUsQ0FBQyxDQUFBO0FBQ2hELENBQUM7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLCtCQUErQixDQUFDLFFBQWdCO0lBQ3BFLElBQUksQ0FBQyxDQUFDLE1BQU0sS0FBSyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFO1FBQ3JDLE1BQU0sSUFBSSxLQUFLLENBQUMsMkJBQTJCLENBQUMsQ0FBQTtLQUM3QztJQUNELE1BQU0sU0FBUyxHQUFHLENBQUMsTUFBTSxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUE7SUFDbEQsSUFBSSxTQUFTLEVBQUU7UUFDYixHQUFHLENBQUMsR0FBRyxRQUFRLHNDQUFzQyxDQUFDLENBQUE7S0FDdkQ7U0FBTTtRQUNMLEdBQUcsQ0FBQyxHQUFHLFFBQVEsb0NBQW9DLENBQUMsQ0FBQTtLQUNyRDtJQUNELE1BQU0sSUFBSSxHQUFHLENBQUMsTUFBTSxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxTQUFTLEVBQUUsVUFBVSxFQUFFLFFBQVEsQ0FBQyxDQUFBO0lBQzdFLE1BQU0sVUFBVSxDQUFDLFFBQVEsRUFBRSxJQUFJLENBQUMsQ0FBQTtBQUNsQyxDQUFDO0FBRUQ7O0dBRUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLDJCQUEyQjtJQUMvQyxNQUFNLCtCQUErQixDQUFDLFdBQVcsQ0FBQyxDQUFBO0FBQ3BELENBQUM7QUFFRCxNQUFNLENBQUMsS0FBSyxVQUFVLGtDQUFrQztJQUN0RCxNQUFNLCtCQUErQixDQUFDLG1DQUFtQyxDQUFDLENBQUE7QUFDNUUsQ0FBQztBQUVEOzs7O0dBSUc7QUFDSCxNQUFNLENBQUMsS0FBSyxVQUFVLHVCQUF1QjtJQUMzQyxNQUFNLFVBQVUsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxXQUFXLEVBQUUsT0FBTyxFQUFFLFNBQVMsQ0FBQyxDQUFDLENBQUE7SUFDN0QsTUFBTSxVQUFVLENBQUMsUUFBUSxFQUFFLENBQUMsV0FBVyxFQUFFLE9BQU8sRUFBRSxJQUFJLENBQUMsQ0FBQyxDQUFBO0FBQzFELENBQUMifQ==
|