@memberjunction/codegen-lib 3.3.0 → 4.0.0
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/README.md +56 -1
- package/dist/Angular/angular-codegen.d.ts +1 -1
- package/dist/Angular/angular-codegen.d.ts.map +1 -1
- package/dist/Angular/angular-codegen.js +80 -136
- package/dist/Angular/angular-codegen.js.map +1 -1
- package/dist/Angular/entity-data-grid-related-entity-component.d.ts +1 -1
- package/dist/Angular/entity-data-grid-related-entity-component.js +6 -9
- package/dist/Angular/entity-data-grid-related-entity-component.js.map +1 -1
- package/dist/Angular/join-grid-related-entity-component.d.ts +1 -1
- package/dist/Angular/join-grid-related-entity-component.js +8 -36
- package/dist/Angular/join-grid-related-entity-component.js.map +1 -1
- package/dist/Angular/related-entity-components.js +13 -79
- package/dist/Angular/related-entity-components.js.map +1 -1
- package/dist/Angular/timeline-related-entity-component.d.ts +1 -1
- package/dist/Angular/timeline-related-entity-component.js +14 -38
- package/dist/Angular/timeline-related-entity-component.js.map +1 -1
- package/dist/Angular/user-view-grid-related-entity-component.d.ts +43 -0
- package/dist/Angular/user-view-grid-related-entity-component.d.ts.map +1 -0
- package/dist/Angular/user-view-grid-related-entity-component.js +85 -0
- package/dist/Angular/user-view-grid-related-entity-component.js.map +1 -0
- package/dist/Config/config.d.ts +79 -0
- package/dist/Config/config.d.ts.map +1 -1
- package/dist/Config/config.js +174 -172
- package/dist/Config/config.js.map +1 -1
- package/dist/Config/db-connection.d.ts +1 -1
- package/dist/Config/db-connection.d.ts.map +1 -1
- package/dist/Config/db-connection.js +6 -33
- package/dist/Config/db-connection.js.map +1 -1
- package/dist/Database/dbSchema.js +28 -35
- package/dist/Database/dbSchema.js.map +1 -1
- package/dist/Database/manage-metadata.d.ts +25 -9
- package/dist/Database/manage-metadata.d.ts.map +1 -1
- package/dist/Database/manage-metadata.js +438 -316
- package/dist/Database/manage-metadata.js.map +1 -1
- package/dist/Database/reorder-columns.d.ts +1 -1
- package/dist/Database/reorder-columns.d.ts.map +1 -1
- package/dist/Database/reorder-columns.js +1 -5
- package/dist/Database/reorder-columns.js.map +1 -1
- package/dist/Database/sql.d.ts +1 -1
- package/dist/Database/sql.d.ts.map +1 -1
- package/dist/Database/sql.js +67 -98
- package/dist/Database/sql.js.map +1 -1
- package/dist/Database/sql_codegen.d.ts +5 -2
- package/dist/Database/sql_codegen.d.ts.map +1 -1
- package/dist/Database/sql_codegen.js +344 -268
- package/dist/Database/sql_codegen.js.map +1 -1
- package/dist/Manifest/GenerateClassRegistrationsManifest.d.ts +110 -0
- package/dist/Manifest/GenerateClassRegistrationsManifest.d.ts.map +1 -0
- package/dist/Manifest/GenerateClassRegistrationsManifest.js +632 -0
- package/dist/Manifest/GenerateClassRegistrationsManifest.js.map +1 -0
- package/dist/Misc/action_subclasses_codegen.d.ts.map +1 -1
- package/dist/Misc/action_subclasses_codegen.js +15 -26
- package/dist/Misc/action_subclasses_codegen.js.map +1 -1
- package/dist/Misc/advanced_generation.d.ts +1 -1
- package/dist/Misc/advanced_generation.js +34 -40
- package/dist/Misc/advanced_generation.js.map +1 -1
- package/dist/Misc/createNewUser.d.ts +1 -1
- package/dist/Misc/createNewUser.js +22 -26
- package/dist/Misc/createNewUser.js.map +1 -1
- package/dist/Misc/entity_subclasses_codegen.d.ts +2 -2
- package/dist/Misc/entity_subclasses_codegen.d.ts.map +1 -1
- package/dist/Misc/entity_subclasses_codegen.js +33 -40
- package/dist/Misc/entity_subclasses_codegen.js.map +1 -1
- package/dist/Misc/graphql_server_codegen.js +36 -41
- package/dist/Misc/graphql_server_codegen.js.map +1 -1
- package/dist/Misc/runCommand.d.ts +1 -1
- package/dist/Misc/runCommand.js +13 -20
- package/dist/Misc/runCommand.js.map +1 -1
- package/dist/Misc/sql_logging.d.ts +7 -1
- package/dist/Misc/sql_logging.d.ts.map +1 -1
- package/dist/Misc/sql_logging.js +40 -53
- package/dist/Misc/sql_logging.js.map +1 -1
- package/dist/Misc/status_logging.js +45 -60
- package/dist/Misc/status_logging.js.map +1 -1
- package/dist/Misc/system_integrity.d.ts +1 -1
- package/dist/Misc/system_integrity.d.ts.map +1 -1
- package/dist/Misc/system_integrity.js +12 -16
- package/dist/Misc/system_integrity.js.map +1 -1
- package/dist/Misc/temp_batch_file.js +15 -22
- package/dist/Misc/temp_batch_file.js.map +1 -1
- package/dist/Misc/util.d.ts.map +1 -1
- package/dist/Misc/util.js +17 -28
- package/dist/Misc/util.js.map +1 -1
- package/dist/index.d.ts +21 -20
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +22 -40
- package/dist/index.js.map +1 -1
- package/dist/runCodeGen.d.ts +1 -0
- package/dist/runCodeGen.d.ts.map +1 -1
- package/dist/runCodeGen.js +151 -178
- package/dist/runCodeGen.js.map +1 -1
- package/package.json +24 -21
package/dist/Misc/runCommand.js
CHANGED
|
@@ -1,17 +1,11 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.RunCommandsBase = void 0;
|
|
7
|
-
const child_process_1 = require("child_process");
|
|
8
|
-
const status_logging_1 = require("./status_logging");
|
|
9
|
-
const path_1 = __importDefault(require("path"));
|
|
10
|
-
const treeKill = require("tree-kill");
|
|
1
|
+
import { spawn } from 'child_process';
|
|
2
|
+
import { logError, logStatus } from './status_logging.js';
|
|
3
|
+
import path from 'path';
|
|
4
|
+
import treeKill from 'tree-kill';
|
|
11
5
|
/**
|
|
12
6
|
* Base class that handles the process of running commands which can be done executed from any other area of the system, typically done by the main runMemberJunctionCodeGen process
|
|
13
7
|
*/
|
|
14
|
-
class RunCommandsBase {
|
|
8
|
+
export class RunCommandsBase {
|
|
15
9
|
async runCommands(commands) {
|
|
16
10
|
try {
|
|
17
11
|
const results = [];
|
|
@@ -22,13 +16,13 @@ class RunCommandsBase {
|
|
|
22
16
|
}
|
|
23
17
|
catch (e) {
|
|
24
18
|
// LOG but do not throw because we want to continue running the other commands
|
|
25
|
-
|
|
19
|
+
logError(e);
|
|
26
20
|
}
|
|
27
21
|
}
|
|
28
22
|
return results;
|
|
29
23
|
}
|
|
30
24
|
catch (e) {
|
|
31
|
-
|
|
25
|
+
logError(e);
|
|
32
26
|
throw e;
|
|
33
27
|
}
|
|
34
28
|
}
|
|
@@ -39,10 +33,10 @@ class RunCommandsBase {
|
|
|
39
33
|
let startTime = new Date();
|
|
40
34
|
let bErrors = false;
|
|
41
35
|
const commandName = command.command;
|
|
42
|
-
const absPath =
|
|
43
|
-
|
|
36
|
+
const absPath = path.resolve(command.workingDirectory);
|
|
37
|
+
logStatus(`STARTING COMMAND: "${command.command}" in location "${absPath}" with args "${command.args.join(' ')}"`);
|
|
44
38
|
const commandExecution = new Promise((resolve, reject) => {
|
|
45
|
-
cp =
|
|
39
|
+
cp = spawn(commandName, command.args, {
|
|
46
40
|
cwd: absPath,
|
|
47
41
|
stdio: 'pipe',
|
|
48
42
|
shell: true,
|
|
@@ -69,7 +63,7 @@ class RunCommandsBase {
|
|
|
69
63
|
cp.on('close', (code) => {
|
|
70
64
|
if (code === 0) {
|
|
71
65
|
const elapsedTime = new Date().getTime() - startTime.getTime();
|
|
72
|
-
|
|
66
|
+
logStatus(`COMMAND: "${command.command}" COMPLETED SUCCESSFULLY: ${elapsedTime / 1000} seconds`);
|
|
73
67
|
resolve({ output: output,
|
|
74
68
|
error: null,
|
|
75
69
|
success: !bErrors,
|
|
@@ -107,17 +101,16 @@ class RunCommandsBase {
|
|
|
107
101
|
return commandExecution;
|
|
108
102
|
}
|
|
109
103
|
catch (e) {
|
|
110
|
-
|
|
104
|
+
logError(e);
|
|
111
105
|
try {
|
|
112
106
|
if (cp && !cp.killed)
|
|
113
107
|
treeKill(cp.pid);
|
|
114
108
|
}
|
|
115
109
|
catch (e) {
|
|
116
|
-
|
|
110
|
+
logError(e);
|
|
117
111
|
}
|
|
118
112
|
throw e;
|
|
119
113
|
}
|
|
120
114
|
}
|
|
121
115
|
}
|
|
122
|
-
exports.RunCommandsBase = RunCommandsBase;
|
|
123
116
|
//# sourceMappingURL=runCommand.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runCommand.js","sourceRoot":"","sources":["../../src/Misc/runCommand.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"runCommand.js","sourceRoot":"","sources":["../../src/Misc/runCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import sql from 'mssql';
|
|
2
2
|
/**
|
|
3
3
|
* Utility class for logging SQL to a run file that can be fresh for each run or appended to depending on the settings in the configuration
|
|
4
4
|
*/
|
|
@@ -31,5 +31,11 @@ export declare class SQLLogging {
|
|
|
31
31
|
static LogSQLAndExecute(ds: sql.ConnectionPool, query: string, description?: string, isRecurringScript?: boolean): Promise<any>;
|
|
32
32
|
protected static getFileLength(filePath: string): number;
|
|
33
33
|
protected static convertSQLLogToFlywaySchema(): void;
|
|
34
|
+
/**
|
|
35
|
+
* Escapes special regex characters in a string
|
|
36
|
+
* @param str The string to escape
|
|
37
|
+
* @returns The escaped string safe for use in regex
|
|
38
|
+
*/
|
|
39
|
+
private static escapeRegex;
|
|
34
40
|
}
|
|
35
41
|
//# sourceMappingURL=sql_logging.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql_logging.d.ts","sourceRoot":"","sources":["../../src/Misc/sql_logging.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"sql_logging.d.ts","sourceRoot":"","sources":["../../src/Misc/sql_logging.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,OAAO,CAAC;AAMxB;;GAEG;AACH,qBAAa,UAAU;IACnB,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAc;IAChD,OAAO,CAAC,MAAM,CAAC,4BAA4B,CAAkB;IAE7D,WAAkB,kBAAkB,IAAI,MAAM,CAE7C;IACD,WAAkB,2BAA2B,IAAI,OAAO,CAEvD;WACa,cAAc;WAoCb,gBAAgB;IAa9B,SAAS,CAAC,MAAM,CAAC,cAAc,IAAI,MAAM;IAe1C;;;;;;OAMG;WACiB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,iBAAiB,GAAE,OAAe,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBjI;;;;;;;;;MASE;WACkB,gBAAgB,CAAC,EAAE,EAAE,GAAG,CAAC,cAAc,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,EAAE,iBAAiB,GAAE,OAAe,GAAG,OAAO,CAAC,GAAG,CAAC;IAMnJ,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM;IAUxD,SAAS,CAAC,MAAM,CAAC,2BAA2B,IAAI,IAAI;IAyBnD;;;;OAIG;IACH,OAAO,CAAC,MAAM,CAAC,WAAW;CAG9B"}
|
package/dist/Misc/sql_logging.js
CHANGED
|
@@ -1,42 +1,13 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
-
}
|
|
8
|
-
Object.defineProperty(o, k2, desc);
|
|
9
|
-
}) : (function(o, m, k, k2) {
|
|
10
|
-
if (k2 === undefined) k2 = k;
|
|
11
|
-
o[k2] = m[k];
|
|
12
|
-
}));
|
|
13
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
-
}) : function(o, v) {
|
|
16
|
-
o["default"] = v;
|
|
17
|
-
});
|
|
18
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
-
if (mod && mod.__esModule) return mod;
|
|
20
|
-
var result = {};
|
|
21
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
-
__setModuleDefault(result, mod);
|
|
23
|
-
return result;
|
|
24
|
-
};
|
|
25
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
-
};
|
|
28
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
29
|
-
exports.SQLLogging = void 0;
|
|
30
|
-
const config_1 = require("../Config/config");
|
|
31
|
-
const status_logging_1 = require("./status_logging");
|
|
32
|
-
const fs = __importStar(require("fs"));
|
|
33
|
-
const path_1 = __importDefault(require("path"));
|
|
1
|
+
import { configInfo, mj_core_schema } from "../Config/config.js";
|
|
2
|
+
import { logError, logStatus } from "./status_logging.js";
|
|
3
|
+
import * as fs from 'fs';
|
|
4
|
+
import path from 'path';
|
|
34
5
|
/**
|
|
35
6
|
* Utility class for logging SQL to a run file that can be fresh for each run or appended to depending on the settings in the configuration
|
|
36
7
|
*/
|
|
37
|
-
class SQLLogging {
|
|
38
|
-
static _SQLLoggingFilePath = '';
|
|
39
|
-
static _OmitRecurringScriptsFromLog = false;
|
|
8
|
+
export class SQLLogging {
|
|
9
|
+
static { this._SQLLoggingFilePath = ''; }
|
|
10
|
+
static { this._OmitRecurringScriptsFromLog = false; }
|
|
40
11
|
static get SQLLoggingFilePath() {
|
|
41
12
|
return SQLLogging._SQLLoggingFilePath;
|
|
42
13
|
}
|
|
@@ -44,12 +15,12 @@ class SQLLogging {
|
|
|
44
15
|
return SQLLogging._OmitRecurringScriptsFromLog;
|
|
45
16
|
}
|
|
46
17
|
static initSQLLogging() {
|
|
47
|
-
SQLLogging._OmitRecurringScriptsFromLog =
|
|
18
|
+
SQLLogging._OmitRecurringScriptsFromLog = configInfo.SQLOutput.omitRecurringScriptsFromLog;
|
|
48
19
|
if (!SQLLogging.SQLLoggingFilePath) {
|
|
49
20
|
// not already set up, so proceed, otherwise we do nothing as we're already good to go
|
|
50
|
-
const config =
|
|
21
|
+
const config = configInfo.SQLOutput;
|
|
51
22
|
if (!config) {
|
|
52
|
-
|
|
23
|
+
logError("MetadataLoggingConfig is required to enable metadata logging");
|
|
53
24
|
return;
|
|
54
25
|
}
|
|
55
26
|
if (!config.enabled)
|
|
@@ -60,15 +31,15 @@ class SQLLogging {
|
|
|
60
31
|
fs.mkdirSync(config.folderPath, { recursive: true });
|
|
61
32
|
}
|
|
62
33
|
const fileName = config.fileName || this.createFileName();
|
|
63
|
-
SQLLogging._SQLLoggingFilePath =
|
|
34
|
+
SQLLogging._SQLLoggingFilePath = path.join(config.folderPath, fileName);
|
|
64
35
|
if (!config.appendToFile || !fs.existsSync(SQLLogging.SQLLoggingFilePath)) {
|
|
65
36
|
//create an empty file
|
|
66
37
|
fs.writeFileSync(SQLLogging.SQLLoggingFilePath, '');
|
|
67
38
|
}
|
|
68
|
-
|
|
39
|
+
logStatus(`Metadata logging enabled. File path: ${SQLLogging.SQLLoggingFilePath}`);
|
|
69
40
|
}
|
|
70
41
|
else {
|
|
71
|
-
|
|
42
|
+
logError("folderPath is required to enable metadata logging");
|
|
72
43
|
return;
|
|
73
44
|
}
|
|
74
45
|
}
|
|
@@ -78,9 +49,9 @@ class SQLLogging {
|
|
|
78
49
|
if (SQLLogging.getFileLength(SQLLogging.SQLLoggingFilePath) === 0) {
|
|
79
50
|
// no content in the file, so delete it
|
|
80
51
|
fs.unlinkSync(SQLLogging.SQLLoggingFilePath);
|
|
81
|
-
|
|
52
|
+
logStatus(" >>> SQL logging file was empty and has been deleted");
|
|
82
53
|
}
|
|
83
|
-
else if (
|
|
54
|
+
else if (configInfo.SQLOutput.convertCoreSchemaToFlywayMigrationFile) {
|
|
84
55
|
SQLLogging.convertSQLLogToFlywaySchema();
|
|
85
56
|
}
|
|
86
57
|
}
|
|
@@ -119,7 +90,7 @@ class SQLLogging {
|
|
|
119
90
|
fs.appendFileSync(SQLLogging.SQLLoggingFilePath, contents);
|
|
120
91
|
}
|
|
121
92
|
catch (ex) {
|
|
122
|
-
|
|
93
|
+
logError("Unable to log metadata SQL text to file", ex);
|
|
123
94
|
}
|
|
124
95
|
}
|
|
125
96
|
/**
|
|
@@ -147,16 +118,32 @@ class SQLLogging {
|
|
|
147
118
|
}
|
|
148
119
|
}
|
|
149
120
|
static convertSQLLogToFlywaySchema() {
|
|
150
|
-
if (!this.SQLLoggingFilePath) {
|
|
121
|
+
if (!this.SQLLoggingFilePath || !configInfo.SQLOutput.convertCoreSchemaToFlywayMigrationFile) {
|
|
151
122
|
return;
|
|
152
123
|
}
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
const
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
124
|
+
let data = fs.readFileSync(this.SQLLoggingFilePath, 'utf-8');
|
|
125
|
+
// Get schema placeholder mappings, defaulting to legacy behavior if not specified
|
|
126
|
+
const schemaPlaceholders = configInfo.SQLOutput.schemaPlaceholders || [
|
|
127
|
+
{ schema: mj_core_schema(), placeholder: '${flyway:defaultSchema}' }
|
|
128
|
+
];
|
|
129
|
+
// Apply each schema-to-placeholder mapping in order
|
|
130
|
+
for (const mapping of schemaPlaceholders) {
|
|
131
|
+
// Negative lookahead to avoid matching schema_CreatedAt, schema_UpdatedAt, etc.
|
|
132
|
+
const regex = new RegExp(`${this.escapeRegex(mapping.schema)}(?!(_(\\w+)At))`, 'g');
|
|
133
|
+
const beforeCount = (data.match(regex) || []).length;
|
|
134
|
+
data = data.replace(regex, mapping.placeholder);
|
|
135
|
+
logStatus(` >>> Replaced ${beforeCount} instances of ${mapping.schema} with ${mapping.placeholder}`);
|
|
136
|
+
}
|
|
137
|
+
fs.writeFileSync(`${this.SQLLoggingFilePath}`, data);
|
|
138
|
+
logStatus(` >>> Flyway Migration File Completed`);
|
|
139
|
+
}
|
|
140
|
+
/**
|
|
141
|
+
* Escapes special regex characters in a string
|
|
142
|
+
* @param str The string to escape
|
|
143
|
+
* @returns The escaped string safe for use in regex
|
|
144
|
+
*/
|
|
145
|
+
static escapeRegex(str) {
|
|
146
|
+
return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
|
159
147
|
}
|
|
160
148
|
}
|
|
161
|
-
exports.SQLLogging = SQLLogging;
|
|
162
149
|
//# sourceMappingURL=sql_logging.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sql_logging.js","sourceRoot":"","sources":["../../src/Misc/sql_logging.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sql_logging.js","sourceRoot":"","sources":["../../src/Misc/sql_logging.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,8 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
exports.stopSpinner = exports.warnSpinner = exports.failSpinner = exports.succeedSpinner = exports.updateSpinner = exports.startSpinner = exports.logMessage = exports.logStatus = exports.logWarning = exports.logError = exports.LoggerBase = void 0;
|
|
7
|
-
const config_1 = require("../Config/config");
|
|
8
|
-
const core_1 = require("@memberjunction/core");
|
|
9
|
-
const global_1 = require("@memberjunction/global");
|
|
10
|
-
const path_1 = __importDefault(require("path"));
|
|
11
|
-
const ora_classic_1 = __importDefault(require("ora-classic"));
|
|
1
|
+
import { configInfo, currentWorkingDirectory } from "../Config/config.js";
|
|
2
|
+
import { LogError, LogStatus, SeverityType, FormatFileMessage, FormatConsoleMessage } from '@memberjunction/core';
|
|
3
|
+
import { MJGlobal } from "@memberjunction/global";
|
|
4
|
+
import path from 'path';
|
|
5
|
+
import ora from 'ora-classic';
|
|
12
6
|
/**
|
|
13
7
|
* Base class for logging, you can sub-class this class to create your own logger and override the logError and logStatus methods if desired.
|
|
14
8
|
* The default behavior in the base class is to use the LogError/LogStatus functions from the @memberjunction/core package to log to the console and to a log file if configured in the config.json file.
|
|
@@ -17,15 +11,17 @@ const ora_classic_1 = __importDefault(require("ora-classic"));
|
|
|
17
11
|
* - Verbose mode: Full console output with detailed messages
|
|
18
12
|
* - Normal mode: Clean spinner-based status updates
|
|
19
13
|
*/
|
|
20
|
-
class LoggerBase {
|
|
21
|
-
|
|
14
|
+
export class LoggerBase {
|
|
15
|
+
constructor() {
|
|
16
|
+
this._spinner = null;
|
|
17
|
+
}
|
|
22
18
|
get isVerbose() {
|
|
23
19
|
// Lazy check - configInfo might not be available during module initialization
|
|
24
|
-
return
|
|
20
|
+
return configInfo?.verboseOutput ?? false;
|
|
25
21
|
}
|
|
26
22
|
ensureSpinner() {
|
|
27
23
|
if (!this.isVerbose && !this._spinner) {
|
|
28
|
-
this._spinner = (
|
|
24
|
+
this._spinner = ora();
|
|
29
25
|
}
|
|
30
26
|
}
|
|
31
27
|
/**
|
|
@@ -43,7 +39,7 @@ class LoggerBase {
|
|
|
43
39
|
}
|
|
44
40
|
}
|
|
45
41
|
else {
|
|
46
|
-
this.logStatus(message,
|
|
42
|
+
this.logStatus(message, SeverityType.Info);
|
|
47
43
|
}
|
|
48
44
|
}
|
|
49
45
|
/**
|
|
@@ -61,7 +57,7 @@ class LoggerBase {
|
|
|
61
57
|
}
|
|
62
58
|
}
|
|
63
59
|
else {
|
|
64
|
-
this.logStatus(message,
|
|
60
|
+
this.logStatus(message, SeverityType.Info);
|
|
65
61
|
}
|
|
66
62
|
}
|
|
67
63
|
/**
|
|
@@ -79,7 +75,7 @@ class LoggerBase {
|
|
|
79
75
|
}
|
|
80
76
|
}
|
|
81
77
|
else if (message) {
|
|
82
|
-
this.logStatus(`✓ ${message}`,
|
|
78
|
+
this.logStatus(`✓ ${message}`, SeverityType.Info);
|
|
83
79
|
}
|
|
84
80
|
}
|
|
85
81
|
/**
|
|
@@ -97,7 +93,7 @@ class LoggerBase {
|
|
|
97
93
|
}
|
|
98
94
|
}
|
|
99
95
|
else if (message) {
|
|
100
|
-
this.logError(`✗ ${message}`,
|
|
96
|
+
this.logError(`✗ ${message}`, SeverityType.Critical);
|
|
101
97
|
}
|
|
102
98
|
}
|
|
103
99
|
/**
|
|
@@ -115,7 +111,7 @@ class LoggerBase {
|
|
|
115
111
|
}
|
|
116
112
|
}
|
|
117
113
|
else if (message) {
|
|
118
|
-
this.logError(`⚠ ${message}`,
|
|
114
|
+
this.logError(`⚠ ${message}`, SeverityType.Warning);
|
|
119
115
|
}
|
|
120
116
|
}
|
|
121
117
|
/**
|
|
@@ -135,8 +131,8 @@ class LoggerBase {
|
|
|
135
131
|
* @param args
|
|
136
132
|
*/
|
|
137
133
|
logError(message, severity, ...args) {
|
|
138
|
-
const consoleMessage =
|
|
139
|
-
const fileMessage =
|
|
134
|
+
const consoleMessage = FormatConsoleMessage(message, severity);
|
|
135
|
+
const fileMessage = FormatFileMessage(message, severity);
|
|
140
136
|
this.logToConsole(consoleMessage, true, ...args);
|
|
141
137
|
this.logToFile(fileMessage, true, ...args);
|
|
142
138
|
}
|
|
@@ -146,8 +142,8 @@ class LoggerBase {
|
|
|
146
142
|
* @param args
|
|
147
143
|
*/
|
|
148
144
|
logStatus(message, severity, ...args) {
|
|
149
|
-
const consoleMessage =
|
|
150
|
-
const fileMessage =
|
|
145
|
+
const consoleMessage = FormatConsoleMessage(message, severity);
|
|
146
|
+
const fileMessage = FormatFileMessage(message, severity);
|
|
151
147
|
this.logToConsole(consoleMessage, false, ...args);
|
|
152
148
|
this.logToFile(fileMessage, false, ...args);
|
|
153
149
|
}
|
|
@@ -159,90 +155,79 @@ class LoggerBase {
|
|
|
159
155
|
* @param args Any additional arguments to log
|
|
160
156
|
*/
|
|
161
157
|
logMessage(message, severity, isError, ...args) {
|
|
162
|
-
const consoleMessage =
|
|
163
|
-
const fileMessage =
|
|
158
|
+
const consoleMessage = FormatConsoleMessage(message, severity);
|
|
159
|
+
const fileMessage = FormatFileMessage(message, severity);
|
|
164
160
|
this.logToConsole(consoleMessage, isError, ...args);
|
|
165
161
|
this.logToFile(fileMessage, isError, ...args);
|
|
166
162
|
}
|
|
167
163
|
logToConsole(message, isError, ...args) {
|
|
168
164
|
// Only log to console in verbose mode or for errors
|
|
169
|
-
if (
|
|
165
|
+
if (configInfo?.logging?.console && (this.isVerbose || isError)) {
|
|
170
166
|
if (isError) {
|
|
171
|
-
|
|
167
|
+
LogError(message, null, ...args);
|
|
172
168
|
}
|
|
173
169
|
else {
|
|
174
|
-
|
|
170
|
+
LogStatus(message, null, ...args);
|
|
175
171
|
}
|
|
176
172
|
}
|
|
177
173
|
}
|
|
178
174
|
logToFile(message, isError, ...args) {
|
|
179
|
-
if (
|
|
180
|
-
if (
|
|
181
|
-
|
|
175
|
+
if (configInfo?.logging?.log) {
|
|
176
|
+
if (configInfo.logging.logFile === null || configInfo.logging.logFile === undefined || configInfo.logging.logFile === '') {
|
|
177
|
+
LogError('ERROR: No log file specified in config', null, ...args);
|
|
182
178
|
}
|
|
183
179
|
else {
|
|
184
|
-
const file =
|
|
180
|
+
const file = path.join(currentWorkingDirectory, configInfo.logging.logFile);
|
|
185
181
|
if (isError) {
|
|
186
|
-
|
|
182
|
+
LogError(message, file, ...args);
|
|
187
183
|
}
|
|
188
184
|
else {
|
|
189
|
-
|
|
185
|
+
LogStatus(message, file, ...args);
|
|
190
186
|
}
|
|
191
187
|
}
|
|
192
188
|
}
|
|
193
189
|
}
|
|
194
190
|
}
|
|
195
|
-
exports.LoggerBase = LoggerBase;
|
|
196
191
|
// use the classes below so that it is easier for external code to sub-class the logger if desired
|
|
197
|
-
const _logger =
|
|
192
|
+
const _logger = MJGlobal.Instance.ClassFactory.CreateInstance(LoggerBase);
|
|
198
193
|
/**
|
|
199
194
|
* Wrapper for the LoggerBase.logError method
|
|
200
195
|
*/
|
|
201
|
-
function logError(message, ...args) {
|
|
202
|
-
return _logger.logError(message,
|
|
196
|
+
export function logError(message, ...args) {
|
|
197
|
+
return _logger.logError(message, SeverityType.Critical, ...args);
|
|
203
198
|
}
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
return _logger.logError(message, core_1.SeverityType.Warning, ...args);
|
|
199
|
+
export function logWarning(message, ...args) {
|
|
200
|
+
return _logger.logError(message, SeverityType.Warning, ...args);
|
|
207
201
|
}
|
|
208
|
-
exports.logWarning = logWarning;
|
|
209
202
|
/**
|
|
210
203
|
* Wrapper for the LoggerBase.logStatus method
|
|
211
204
|
*/
|
|
212
|
-
function logStatus(message, ...args) {
|
|
213
|
-
return _logger.logStatus(message,
|
|
205
|
+
export function logStatus(message, ...args) {
|
|
206
|
+
return _logger.logStatus(message, SeverityType.Info, ...args);
|
|
214
207
|
}
|
|
215
|
-
exports.logStatus = logStatus;
|
|
216
208
|
/**
|
|
217
209
|
* Wrapper for the LoggerBase.logMessage method
|
|
218
210
|
*/
|
|
219
|
-
function logMessage(message, severity, isError = false, ...args) {
|
|
211
|
+
export function logMessage(message, severity, isError = false, ...args) {
|
|
220
212
|
return _logger.logMessage(message, severity, isError, ...args);
|
|
221
213
|
}
|
|
222
|
-
exports.logMessage = logMessage;
|
|
223
214
|
// Spinner management functions
|
|
224
|
-
function startSpinner(message) {
|
|
215
|
+
export function startSpinner(message) {
|
|
225
216
|
return _logger.startSpinner(message);
|
|
226
217
|
}
|
|
227
|
-
|
|
228
|
-
function updateSpinner(message) {
|
|
218
|
+
export function updateSpinner(message) {
|
|
229
219
|
return _logger.updateSpinner(message);
|
|
230
220
|
}
|
|
231
|
-
|
|
232
|
-
function succeedSpinner(message) {
|
|
221
|
+
export function succeedSpinner(message) {
|
|
233
222
|
return _logger.succeedSpinner(message);
|
|
234
223
|
}
|
|
235
|
-
|
|
236
|
-
function failSpinner(message) {
|
|
224
|
+
export function failSpinner(message) {
|
|
237
225
|
return _logger.failSpinner(message);
|
|
238
226
|
}
|
|
239
|
-
|
|
240
|
-
function warnSpinner(message) {
|
|
227
|
+
export function warnSpinner(message) {
|
|
241
228
|
return _logger.warnSpinner(message);
|
|
242
229
|
}
|
|
243
|
-
|
|
244
|
-
function stopSpinner() {
|
|
230
|
+
export function stopSpinner() {
|
|
245
231
|
return _logger.stopSpinner();
|
|
246
232
|
}
|
|
247
|
-
exports.stopSpinner = stopSpinner;
|
|
248
233
|
//# sourceMappingURL=status_logging.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status_logging.js","sourceRoot":"","sources":["../../src/Misc/status_logging.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"status_logging.js","sourceRoot":"","sources":["../../src/Misc/status_logging.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system_integrity.d.ts","sourceRoot":"","sources":["../../src/Misc/system_integrity.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"system_integrity.d.ts","sourceRoot":"","sources":["../../src/Misc/system_integrity.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,OAAO,CAAC;AAKxB,MAAM,MAAM,oBAAoB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACnB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,GAAG,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,cAAc,KAAK,OAAO,CAAC,oBAAoB,CAAC,CAAC;CACpE,CAAA;AAED;;;GAGG;AACH,qBAAa,mBAAmB;IAC5B,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAM7B;IAEF;;;;OAIG;WACiB,kBAAkB,CAAC,IAAI,EAAE,GAAG,CAAC,cAAc,EAAE,WAAW,EAAE,OAAO,EAAE,UAAU,GAAE,OAAc,GAAG,OAAO,CAAC,oBAAoB,EAAE,CAAC;IAoCnJ;;;;;;OAMG;WACiB,yBAAyB,CAAC,IAAI,EAAE,GAAG,CAAC,cAAc,GAAG,OAAO,CAAC,oBAAoB,CAAC;IAItG;;;;;OAKG;WACiB,8BAA8B,CAAC,IAAI,EAAE,GAAG,CAAC,cAAc,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;qBAIxG,iCAAiC,CAAC,IAAI,EAAE,GAAG,CAAC,cAAc,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,oBAAoB,CAAC;CA4EpI"}
|