@memberjunction/codegen-lib 2.13.2 → 2.13.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/dist/Angular/angular-codegen.js +1 -1
- package/dist/Config/config.d.ts +1235 -105
- package/dist/Config/config.d.ts.map +1 -1
- package/dist/Config/config.js +250 -32
- package/dist/Config/config.js.map +1 -1
- package/dist/Config/db-connection.d.ts +2 -2
- package/dist/Config/db-connection.d.ts.map +1 -1
- package/dist/Config/db-connection.js +17 -16
- package/dist/Config/db-connection.js.map +1 -1
- package/dist/Misc/createNewUser.d.ts.map +1 -1
- package/dist/Misc/createNewUser.js +49 -0
- package/dist/Misc/createNewUser.js.map +1 -1
- package/dist/Misc/runCommand.d.ts.map +1 -1
- package/dist/Misc/runCommand.js +4 -3
- package/dist/Misc/runCommand.js.map +1 -1
- package/dist/Misc/status_logging.js +1 -1
- package/dist/Misc/status_logging.js.map +1 -1
- package/dist/runCodeGen.d.ts.map +1 -1
- package/dist/runCodeGen.js +52 -47
- package/dist/runCodeGen.js.map +1 -1
- package/package.json +9 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/Config/config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/Config/config.ts"],"names":[],"mappings":"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"}
|
package/dist/Config/config.js
CHANGED
|
@@ -3,43 +3,261 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.mj_core_schema = exports.MAX_INDEX_NAME_LENGTH = exports.autoIndexForeignKeys = exports.getSettingValue = exports.getSetting = exports.customSqlScripts = exports.commands = exports.outputOptionValue = exports.outputOptions = exports.outputDir = exports.initializeConfig = exports.
|
|
7
|
-
const
|
|
8
|
-
const
|
|
6
|
+
exports.mj_core_schema = exports.MAX_INDEX_NAME_LENGTH = exports.autoIndexForeignKeys = exports.getSettingValue = exports.getSetting = exports.customSqlScripts = exports.commands = exports.outputOptionValue = exports.outputOptions = exports.outputDir = exports.initializeConfig = exports.dbDatabase = exports.mjCoreSchema = exports.configInfo = exports.currentWorkingDirectory = void 0;
|
|
7
|
+
const zod_1 = require("zod");
|
|
8
|
+
const cosmiconfig_1 = require("cosmiconfig");
|
|
9
9
|
const path_1 = __importDefault(require("path"));
|
|
10
10
|
const status_logging_1 = require("../Misc/status_logging");
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
11
|
+
const explorer = (0, cosmiconfig_1.cosmiconfigSync)('mj', { searchStrategy: 'global' });
|
|
12
|
+
const configSearchResult = explorer.search(process.cwd());
|
|
13
|
+
const settingInfoSchema = zod_1.z.object({
|
|
14
|
+
name: zod_1.z.string(),
|
|
15
|
+
value: zod_1.z.any(),
|
|
16
|
+
});
|
|
17
|
+
const logInfoSchema = zod_1.z.object({
|
|
18
|
+
log: zod_1.z.boolean().default(true),
|
|
19
|
+
logFile: zod_1.z.string().default('codegen.output.log'),
|
|
20
|
+
console: zod_1.z.boolean().default(true),
|
|
21
|
+
});
|
|
22
|
+
const customSQLScriptSchema = zod_1.z.object({
|
|
23
|
+
when: zod_1.z.string(),
|
|
24
|
+
scriptFile: zod_1.z.string(),
|
|
25
|
+
});
|
|
26
|
+
const commandInfoSchema = zod_1.z.object({
|
|
27
|
+
workingDirectory: zod_1.z.string(),
|
|
28
|
+
command: zod_1.z.string(),
|
|
29
|
+
args: zod_1.z.string().array(),
|
|
30
|
+
timeout: zod_1.z.number().nullish(),
|
|
31
|
+
when: zod_1.z.string(),
|
|
32
|
+
});
|
|
33
|
+
const outputOptionInfoSchema = zod_1.z.object({
|
|
34
|
+
name: zod_1.z.string(),
|
|
35
|
+
value: zod_1.z.any(),
|
|
36
|
+
});
|
|
37
|
+
const outputInfoSchema = zod_1.z.object({
|
|
38
|
+
type: zod_1.z.string(),
|
|
39
|
+
directory: zod_1.z.string(),
|
|
40
|
+
appendOutputCode: zod_1.z.boolean().optional(),
|
|
41
|
+
options: outputOptionInfoSchema.array().optional(),
|
|
42
|
+
});
|
|
43
|
+
const tableInfoSchema = zod_1.z.object({
|
|
44
|
+
schema: zod_1.z.string(),
|
|
45
|
+
table: zod_1.z.string(),
|
|
46
|
+
});
|
|
47
|
+
const dbSchemaJSONOutputBundleSchema = zod_1.z.object({
|
|
48
|
+
name: zod_1.z.string(),
|
|
49
|
+
schemas: zod_1.z.string().array().default([]),
|
|
50
|
+
excludeSchemas: zod_1.z.string().array().default(['sys', 'staging']),
|
|
51
|
+
excludeEntities: zod_1.z.string().array().default([]),
|
|
52
|
+
});
|
|
53
|
+
const dbSchemaJSONOutputSchema = zod_1.z.object({
|
|
54
|
+
excludeEntities: zod_1.z.string().array(),
|
|
55
|
+
excludeSchemas: zod_1.z.string().array().default(['sys', 'staging', 'dbo']),
|
|
56
|
+
bundles: dbSchemaJSONOutputBundleSchema.array().default([{ name: '_Core_Apps', excludeSchemas: ['__mj'] }]),
|
|
57
|
+
});
|
|
58
|
+
const newUserSetupSchema = zod_1.z.object({
|
|
59
|
+
UserName: zod_1.z.string(),
|
|
60
|
+
FirstName: zod_1.z.string(),
|
|
61
|
+
LastName: zod_1.z.string(),
|
|
62
|
+
Email: zod_1.z.string(),
|
|
63
|
+
Roles: zod_1.z.string().array().default(['Developer', 'Integration', 'UI']),
|
|
64
|
+
CreateUserApplicationRecords: zod_1.z.boolean().optional().default(false),
|
|
65
|
+
UserApplications: zod_1.z.array(zod_1.z.string()).optional().default([]),
|
|
66
|
+
});
|
|
67
|
+
const advancedGenerationFeatureOptionSchema = zod_1.z.object({
|
|
68
|
+
name: zod_1.z.string(),
|
|
69
|
+
value: zod_1.z.unknown(),
|
|
70
|
+
});
|
|
71
|
+
const advancedGenerationFeatureSchema = zod_1.z.object({
|
|
72
|
+
name: zod_1.z.string(),
|
|
73
|
+
enabled: zod_1.z.boolean(),
|
|
74
|
+
description: zod_1.z.string().nullish(), // not used, but useful for documentation within the config file
|
|
75
|
+
systemPrompt: zod_1.z.string().nullish(),
|
|
76
|
+
userMessage: zod_1.z.string().nullish(),
|
|
77
|
+
options: advancedGenerationFeatureOptionSchema.array().nullish(),
|
|
78
|
+
});
|
|
79
|
+
const advancedGenerationSchema = zod_1.z.object({
|
|
80
|
+
enableAdvancedGeneration: zod_1.z.boolean().default(true),
|
|
81
|
+
AIVendor: zod_1.z.enum(['openai', 'anthropic', 'mistral']).default('openai'),
|
|
82
|
+
AIModel: zod_1.z.string().default('gpt-4-1106-preview'),
|
|
83
|
+
features: advancedGenerationFeatureSchema.array().default([
|
|
84
|
+
{
|
|
85
|
+
name: 'EntityNames',
|
|
86
|
+
description: 'Use AI to generate better entity names when creating new entities',
|
|
87
|
+
enabled: false,
|
|
88
|
+
},
|
|
89
|
+
{
|
|
90
|
+
name: 'DefaultInViewFields',
|
|
91
|
+
description: 'Use AI to determine which fields in an entity should be shown, by default, in a newly created User View for the entity. This is only used when creating new entities and when new fields are detected.',
|
|
92
|
+
enabled: false,
|
|
93
|
+
},
|
|
94
|
+
{
|
|
95
|
+
name: 'EntityDescriptions',
|
|
96
|
+
description: 'Use AI to generate descriptions for entities, only used when creating new entities',
|
|
97
|
+
enabled: false,
|
|
98
|
+
},
|
|
99
|
+
{
|
|
100
|
+
name: 'EntityFieldDescriptions',
|
|
101
|
+
description: 'Use AI to generate descriptions for fields, only used when new fields are detected',
|
|
102
|
+
enabled: false,
|
|
103
|
+
},
|
|
104
|
+
{
|
|
105
|
+
name: 'FormLayout',
|
|
106
|
+
description: 'Use AI to generate better layouts for forms. This includes using AI to determine the way to layout fields on each entity form. The field will still be laid out in the order they are defined in the entity, but the AI will determine the best way to layout the fields on the form. Since generated forms are regenerated every time you run this tool, it will be done every time you run the tool, including for existing entities and fields.',
|
|
107
|
+
enabled: false,
|
|
108
|
+
},
|
|
109
|
+
{
|
|
110
|
+
name: 'FormTabs',
|
|
111
|
+
description: "Use AI to decide which entity relationships should have visible tabs and the best order to display those tabs. All relationships will be generated based on the Database Schema, but the EntityRelationship.DisplayInForm. The idea is that the AI will pick which of these tabs should be visible by default. In some cases an entity will have a large # of relationships and it isn't necessarily a good idea to display all of them. This feature only applies when an entity is created or new Entity Relationships are detected. This tool will not change existing EntityRelationship records.",
|
|
112
|
+
enabled: false,
|
|
113
|
+
},
|
|
114
|
+
]),
|
|
115
|
+
});
|
|
116
|
+
const sqlOutputConfigSchema = zod_1.z.object({
|
|
117
|
+
/**
|
|
118
|
+
* Whether or not sql statements generated while managing metadata should be written to a file
|
|
119
|
+
*/
|
|
120
|
+
enabled: zod_1.z.boolean().default(true),
|
|
121
|
+
/**
|
|
122
|
+
* The path of the folder to use when logging is enabled.
|
|
123
|
+
* If provided, a file will be created with the format "CodeGen_Run_yyyy-mm-dd_hh-mm-ss.sql"
|
|
124
|
+
*/
|
|
125
|
+
folderPath: zod_1.z.string().default('../../migrations/v2/'),
|
|
126
|
+
/**
|
|
127
|
+
* Optional, the file name that will be written WITHIN the folderPath specified.
|
|
128
|
+
*/
|
|
129
|
+
fileName: zod_1.z.string().optional(),
|
|
130
|
+
/**
|
|
131
|
+
* If set to true, then we append to the existing file, if one exists, otherwise we create a new file.
|
|
132
|
+
*/
|
|
133
|
+
appendToFile: zod_1.z.boolean().default(true),
|
|
134
|
+
/**
|
|
135
|
+
* If true, all mention of the core schema within the log file will be replaced with the flyway schema,
|
|
136
|
+
* ${flyway:defaultSchema}
|
|
137
|
+
*/
|
|
138
|
+
convertCoreSchemaToFlywayMigrationFile: zod_1.z.boolean().default(true),
|
|
139
|
+
});
|
|
140
|
+
const newSchemaDefaultsSchema = zod_1.z.object({
|
|
141
|
+
CreateNewApplicationWithSchemaName: zod_1.z.boolean().default(true),
|
|
142
|
+
});
|
|
143
|
+
const entityPermissionSchema = zod_1.z.object({
|
|
144
|
+
RoleName: zod_1.z.string(),
|
|
145
|
+
CanRead: zod_1.z.boolean(),
|
|
146
|
+
CanCreate: zod_1.z.boolean(),
|
|
147
|
+
CanUpdate: zod_1.z.boolean(),
|
|
148
|
+
CanDelete: zod_1.z.boolean(),
|
|
149
|
+
});
|
|
150
|
+
const newEntityPermissionDefaultsSchema = zod_1.z.object({
|
|
151
|
+
AutoAddPermissionsForNewEntities: zod_1.z.boolean().default(true),
|
|
152
|
+
Permissions: entityPermissionSchema.array().default([
|
|
153
|
+
{ RoleName: 'UI', CanRead: true, CanCreate: false, CanUpdate: false, CanDelete: false },
|
|
154
|
+
{ RoleName: 'Developer', CanRead: true, CanCreate: true, CanUpdate: true, CanDelete: false },
|
|
155
|
+
{ RoleName: 'Integration', CanRead: true, CanCreate: true, CanUpdate: true, CanDelete: true },
|
|
156
|
+
]),
|
|
157
|
+
});
|
|
158
|
+
const newEntityDefaultsSchema = zod_1.z.object({
|
|
159
|
+
TrackRecordChanges: zod_1.z.boolean().default(true),
|
|
160
|
+
AuditRecordAccess: zod_1.z.boolean().default(false),
|
|
161
|
+
AuditViewRuns: zod_1.z.boolean().default(false),
|
|
162
|
+
AllowAllRowsAPI: zod_1.z.boolean().default(false),
|
|
163
|
+
AllowCreateAPI: zod_1.z.boolean().default(true),
|
|
164
|
+
AllowUpdateAPI: zod_1.z.boolean().default(true),
|
|
165
|
+
AllowDeleteAPI: zod_1.z.boolean().default(true),
|
|
166
|
+
AllowUserSearchAPI: zod_1.z.boolean().default(true),
|
|
167
|
+
CascadeDeletes: zod_1.z.boolean().default(false),
|
|
168
|
+
UserViewMaxRows: zod_1.z.number().default(1000),
|
|
169
|
+
AddToApplicationWithSchemaName: zod_1.z.boolean().default(true),
|
|
170
|
+
IncludeFirstNFieldsAsDefaultInView: zod_1.z.number().default(5),
|
|
171
|
+
PermissionDefaults: newEntityPermissionDefaultsSchema,
|
|
172
|
+
});
|
|
173
|
+
const newEntityRelationshipDefaultsSchema = zod_1.z.object({
|
|
174
|
+
AutomaticallyCreateRelationships: zod_1.z.boolean().default(true),
|
|
175
|
+
CreateOneToManyRelationships: zod_1.z.boolean().default(true),
|
|
176
|
+
});
|
|
177
|
+
const configInfoSchema = zod_1.z.object({
|
|
178
|
+
newUserSetup: newUserSetupSchema.nullish(),
|
|
179
|
+
settings: settingInfoSchema.array().default([
|
|
180
|
+
{ name: 'mj_core_schema', value: '__mj' },
|
|
181
|
+
{ name: 'skip_database_generation', value: false },
|
|
182
|
+
{ name: 'auto_index_foreign_keys', value: true },
|
|
183
|
+
]),
|
|
184
|
+
excludeSchemas: zod_1.z.string().array().default(['sys', 'staging']),
|
|
185
|
+
excludeTables: tableInfoSchema.array().default([{ schema: '%', table: 'sys%' }]),
|
|
186
|
+
customSQLScripts: customSQLScriptSchema.array().default([
|
|
187
|
+
{
|
|
188
|
+
scriptFile: '../../SQL Scripts/MJ_BASE_BEFORE_SQL.sql',
|
|
189
|
+
when: 'before-all',
|
|
190
|
+
},
|
|
191
|
+
]),
|
|
192
|
+
advancedGeneration: advancedGenerationSchema.nullish(),
|
|
193
|
+
output: outputInfoSchema.array().default([
|
|
194
|
+
{ type: 'SQL', directory: '../../SQL Scripts/generated', appendOutputCode: true },
|
|
195
|
+
{ type: 'Angular', directory: '../MJExplorer/src/app/generated', options: [{ name: 'maxComponentsPerModule', value: 20 }] },
|
|
196
|
+
{
|
|
197
|
+
type: 'AngularCoreEntities',
|
|
198
|
+
directory: '../Angular/Explorer/core-entity-forms/src/lib/generated',
|
|
199
|
+
options: [{ name: 'maxComponentsPerModule', value: 100 }],
|
|
200
|
+
},
|
|
201
|
+
{ type: 'GraphQLServer', directory: '../MJAPI/src/generated' },
|
|
202
|
+
{ type: 'GraphQLCoreEntityResolvers', directory: '../MJServer/src/generated' },
|
|
203
|
+
{ type: 'CoreActionSubclasses', directory: '../Actions/CoreActions/src/generated' },
|
|
204
|
+
{ type: 'ActionSubclasses', directory: '../GeneratedActions/src/generated' },
|
|
205
|
+
{ type: 'CoreEntitySubclasses', directory: '../MJCoreEntities/src/generated' },
|
|
206
|
+
{ type: 'EntitySubclasses', directory: '../GeneratedEntities/src/generated' },
|
|
207
|
+
{ type: 'DBSchemaJSON', directory: '../../Schema Files' },
|
|
208
|
+
]),
|
|
209
|
+
commands: commandInfoSchema.array().default([
|
|
210
|
+
{ workingDirectory: '../MJCoreEntities', command: 'npm', args: ['run', 'build'], when: 'after' },
|
|
211
|
+
{ workingDirectory: '../Angular/Explorer/core-entity-forms', command: 'npm', args: ['run', 'build'], when: 'after' },
|
|
212
|
+
{ workingDirectory: '../Actions/CoreActions', command: 'npm', args: ['run', 'build'], when: 'after' },
|
|
213
|
+
{ workingDirectory: '../GeneratedEntities', command: 'npm', args: ['run', 'build'], when: 'after' },
|
|
214
|
+
{ workingDirectory: '../GeneratedActions', command: 'npm', args: ['run', 'build'], when: 'after' },
|
|
215
|
+
{ workingDirectory: '../MJServer', command: 'npm', args: ['run', 'build'], when: 'after' },
|
|
216
|
+
{ workingDirectory: '../MJAPI', command: 'npm', args: ['start'], timeout: 30000, when: 'after' },
|
|
217
|
+
]),
|
|
218
|
+
logging: logInfoSchema,
|
|
219
|
+
newEntityDefaults: newEntityDefaultsSchema,
|
|
220
|
+
newSchemaDefaults: newSchemaDefaultsSchema,
|
|
221
|
+
dbSchemaJSONOutput: dbSchemaJSONOutputSchema,
|
|
222
|
+
newEntityRelationshipDefaults: newEntityRelationshipDefaultsSchema,
|
|
223
|
+
SQLOutput: sqlOutputConfigSchema,
|
|
224
|
+
dbHost: zod_1.z.string(),
|
|
225
|
+
dbPort: zod_1.z.coerce.number().int().positive().default(1433),
|
|
226
|
+
codeGenLogin: zod_1.z.string(),
|
|
227
|
+
codeGenPassword: zod_1.z.string(),
|
|
228
|
+
dbDatabase: zod_1.z.string(),
|
|
229
|
+
dbInstanceName: zod_1.z.string().nullish(),
|
|
230
|
+
dbTrustServerCertificate: zod_1.z.coerce
|
|
231
|
+
.boolean()
|
|
232
|
+
.default(false)
|
|
233
|
+
.transform((v) => (v ? 'Y' : 'N')),
|
|
234
|
+
outputCode: zod_1.z.string().nullish(),
|
|
235
|
+
mjCoreSchema: zod_1.z.string().default('__mj'),
|
|
236
|
+
graphqlPort: zod_1.z.coerce.number().int().positive().default(4000),
|
|
237
|
+
});
|
|
238
|
+
exports.configInfo = configInfoSchema.optional().catch(undefined).parse(configSearchResult?.config) ?? {};
|
|
239
|
+
exports.mjCoreSchema = exports.configInfo.mjCoreSchema, exports.dbDatabase = exports.configInfo.dbDatabase;
|
|
240
|
+
function initializeConfig(cwd) {
|
|
241
|
+
exports.currentWorkingDirectory = cwd;
|
|
242
|
+
const maybeConfig = configInfoSchema.safeParse(explorer.search(exports.currentWorkingDirectory)?.config);
|
|
243
|
+
const config = maybeConfig.success ? maybeConfig.data : exports.configInfo;
|
|
244
|
+
if (config === undefined) {
|
|
245
|
+
throw new Error('No configuration found');
|
|
246
|
+
}
|
|
247
|
+
return config;
|
|
29
248
|
}
|
|
30
249
|
exports.initializeConfig = initializeConfig;
|
|
31
250
|
function outputDir(type, useLocalDirectoryIfMissing) {
|
|
32
|
-
const outputInfo = exports.configInfo.output.find(o => o.type.trim().toUpperCase() === type.trim().toUpperCase());
|
|
251
|
+
const outputInfo = exports.configInfo.output.find((o) => o.type.trim().toUpperCase() === type.trim().toUpperCase());
|
|
33
252
|
if (outputInfo) {
|
|
34
|
-
if (outputInfo.appendOutputCode && outputInfo.appendOutputCode === true &&
|
|
35
|
-
exports.
|
|
36
|
-
return path_1.default.join(exports.currentWorkingDirectory, outputInfo.directory, exports.outputCode);
|
|
253
|
+
if (outputInfo.appendOutputCode && outputInfo.appendOutputCode === true && exports.configInfo.outputCode)
|
|
254
|
+
return path_1.default.join(exports.currentWorkingDirectory, outputInfo.directory, exports.configInfo.outputCode);
|
|
37
255
|
else
|
|
38
256
|
return path_1.default.join(exports.currentWorkingDirectory, outputInfo.directory);
|
|
39
257
|
}
|
|
40
258
|
else {
|
|
41
259
|
if (useLocalDirectoryIfMissing) {
|
|
42
|
-
(0, status_logging_1.logStatus)(
|
|
260
|
+
(0, status_logging_1.logStatus)('>>> No output directory found for type: ' + type + ' within config file, using local directory instead');
|
|
43
261
|
return path_1.default.join(exports.currentWorkingDirectory, 'output', type);
|
|
44
262
|
}
|
|
45
263
|
else
|
|
@@ -48,7 +266,7 @@ function outputDir(type, useLocalDirectoryIfMissing) {
|
|
|
48
266
|
}
|
|
49
267
|
exports.outputDir = outputDir;
|
|
50
268
|
function outputOptions(type) {
|
|
51
|
-
const outputInfo = exports.configInfo.output.find(o => o.type.trim().toUpperCase() === type.trim().toUpperCase());
|
|
269
|
+
const outputInfo = exports.configInfo.output.find((o) => o.type.trim().toUpperCase() === type.trim().toUpperCase());
|
|
52
270
|
if (outputInfo) {
|
|
53
271
|
return outputInfo.options;
|
|
54
272
|
}
|
|
@@ -58,9 +276,9 @@ function outputOptions(type) {
|
|
|
58
276
|
}
|
|
59
277
|
exports.outputOptions = outputOptions;
|
|
60
278
|
function outputOptionValue(type, optionName, defaultValue) {
|
|
61
|
-
const outputInfo = exports.configInfo.output
|
|
279
|
+
const outputInfo = exports.configInfo.output?.find((o) => o.type.trim().toUpperCase() === type.trim().toUpperCase());
|
|
62
280
|
if (outputInfo && outputInfo.options) {
|
|
63
|
-
const theOption = outputInfo.options.find(o => o.name.trim().toUpperCase() === optionName.trim().toUpperCase());
|
|
281
|
+
const theOption = outputInfo.options.find((o) => o.name.trim().toUpperCase() === optionName.trim().toUpperCase());
|
|
64
282
|
if (theOption)
|
|
65
283
|
return theOption.value;
|
|
66
284
|
else
|
|
@@ -72,15 +290,15 @@ function outputOptionValue(type, optionName, defaultValue) {
|
|
|
72
290
|
}
|
|
73
291
|
exports.outputOptionValue = outputOptionValue;
|
|
74
292
|
function commands(when) {
|
|
75
|
-
return exports.configInfo.commands.filter(c => c.when.trim().toUpperCase() === when.trim().toUpperCase());
|
|
293
|
+
return exports.configInfo.commands.filter((c) => c.when.trim().toUpperCase() === when.trim().toUpperCase());
|
|
76
294
|
}
|
|
77
295
|
exports.commands = commands;
|
|
78
296
|
function customSqlScripts(when) {
|
|
79
|
-
return exports.configInfo.customSQLScripts.filter(c => c.when.trim().toUpperCase() === when.trim().toUpperCase());
|
|
297
|
+
return exports.configInfo.customSQLScripts.filter((c) => c.when.trim().toUpperCase() === when.trim().toUpperCase());
|
|
80
298
|
}
|
|
81
299
|
exports.customSqlScripts = customSqlScripts;
|
|
82
300
|
function getSetting(settingName) {
|
|
83
|
-
return exports.configInfo.settings.find(s => s.name.trim().toUpperCase() === settingName.trim().toUpperCase());
|
|
301
|
+
return exports.configInfo.settings.find((s) => s.name.trim().toUpperCase() === settingName.trim().toUpperCase());
|
|
84
302
|
}
|
|
85
303
|
exports.getSetting = getSetting;
|
|
86
304
|
function getSettingValue(settingName, defaultValue) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/Config/config.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/Config/config.ts"],"names":[],"mappings":";;;;;;AAAA,6BAAwB;AACxB,6CAA8C;AAC9C,gDAAwB;AACxB,2DAAmD;AAEnD,MAAM,QAAQ,GAAG,IAAA,6BAAe,EAAC,IAAI,EAAE,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC,CAAC;AACrE,MAAM,kBAAkB,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;AAG1D,MAAM,iBAAiB,GAAG,OAAC,CAAC,MAAM,CAAC;IACjC,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,KAAK,EAAE,OAAC,CAAC,GAAG,EAAE;CACf,CAAC,CAAC;AAGH,MAAM,aAAa,GAAG,OAAC,CAAC,MAAM,CAAC;IAC7B,GAAG,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IAC9B,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC;IACjD,OAAO,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;CACnC,CAAC,CAAC;AAGH,MAAM,qBAAqB,GAAG,OAAC,CAAC,MAAM,CAAC;IACrC,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE;CACvB,CAAC,CAAC;AAGH,MAAM,iBAAiB,GAAG,OAAC,CAAC,MAAM,CAAC;IACjC,gBAAgB,EAAE,OAAC,CAAC,MAAM,EAAE;IAC5B,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE;IACnB,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE;IACxB,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;IAC7B,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;CACjB,CAAC,CAAC;AAGH,MAAM,sBAAsB,GAAG,OAAC,CAAC,MAAM,CAAC;IACtC,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,KAAK,EAAE,OAAC,CAAC,GAAG,EAAE;CACf,CAAC,CAAC;AAGH,MAAM,gBAAgB,GAAG,OAAC,CAAC,MAAM,CAAC;IAChC,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE;IACrB,gBAAgB,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE;IACxC,OAAO,EAAE,sBAAsB,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE;CACnD,CAAC,CAAC;AAGH,MAAM,eAAe,GAAG,OAAC,CAAC,MAAM,CAAC;IAC/B,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE;IAClB,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE;CAClB,CAAC,CAAC;AAGH,MAAM,8BAA8B,GAAG,OAAC,CAAC,MAAM,CAAC;IAC9C,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;IACvC,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAC9D,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;CAChD,CAAC,CAAC;AAGH,MAAM,wBAAwB,GAAG,OAAC,CAAC,MAAM,CAAC;IACxC,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE;IACnC,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IACrE,OAAO,EAAE,8BAA8B,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,cAAc,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;CAC5G,CAAC,CAAC;AAGH,MAAM,kBAAkB,GAAG,OAAC,CAAC,MAAM,CAAC;IAClC,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE;IACpB,SAAS,EAAE,OAAC,CAAC,MAAM,EAAE;IACrB,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE;IACpB,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE;IACjB,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;IACrE,4BAA4B,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;IACnE,gBAAgB,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;CAC7D,CAAC,CAAC;AAGH,MAAM,qCAAqC,GAAG,OAAC,CAAC,MAAM,CAAC;IACrD,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,KAAK,EAAE,OAAC,CAAC,OAAO,EAAE;CACnB,CAAC,CAAC;AAGH,MAAM,+BAA+B,GAAG,OAAC,CAAC,MAAM,CAAC;IAC/C,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;IAChB,OAAO,EAAE,OAAC,CAAC,OAAO,EAAE;IACpB,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,gEAAgE;IACnG,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;IAClC,WAAW,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;IACjC,OAAO,EAAE,qCAAqC,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE;CACjE,CAAC,CAAC;AAGH,MAAM,wBAAwB,GAAG,OAAC,CAAC,MAAM,CAAC;IACxC,wBAAwB,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IACnD,QAAQ,EAAE,OAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC;IACtE,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,oBAAoB,CAAC;IACjD,QAAQ,EAAE,+BAA+B,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC;QACxD;YACE,IAAI,EAAE,aAAa;YACnB,WAAW,EAAE,mEAAmE;YAChF,OAAO,EAAE,KAAK;SACf;QACD;YACE,IAAI,EAAE,qBAAqB;YAC3B,WAAW,EACT,wMAAwM;YAC1M,OAAO,EAAE,KAAK;SACf;QACD;YACE,IAAI,EAAE,oBAAoB;YAC1B,WAAW,EAAE,oFAAoF;YACjG,OAAO,EAAE,KAAK;SACf;QACD;YACE,IAAI,EAAE,yBAAyB;YAC/B,WAAW,EAAE,oFAAoF;YACjG,OAAO,EAAE,KAAK;SACf;QACD;YACE,IAAI,EAAE,YAAY;YAClB,WAAW,EACT,obAAob;YACtb,OAAO,EAAE,KAAK;SACf;QACD;YACE,IAAI,EAAE,UAAU;YAChB,WAAW,EACT,ukBAAukB;YACzkB,OAAO,EAAE,KAAK;SACf;KACF,CAAC;CACH,CAAC,CAAC;AAIH,MAAM,qBAAqB,GAAG,OAAC,CAAC,MAAM,CAAC;IACrC;;OAEG;IACH,OAAO,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IAClC;;;OAGG;IACH,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,sBAAsB,CAAC;IACtD;;OAEG;IACH,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC/B;;OAEG;IACH,YAAY,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IACvC;;;OAGG;IACH,sCAAsC,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;CAClE,CAAC,CAAC;AAGH,MAAM,uBAAuB,GAAG,OAAC,CAAC,MAAM,CAAC;IACvC,kCAAkC,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;CAC9D,CAAC,CAAC;AAEH,MAAM,sBAAsB,GAAG,OAAC,CAAC,MAAM,CAAC;IACtC,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE;IACpB,OAAO,EAAE,OAAC,CAAC,OAAO,EAAE;IACpB,SAAS,EAAE,OAAC,CAAC,OAAO,EAAE;IACtB,SAAS,EAAE,OAAC,CAAC,OAAO,EAAE;IACtB,SAAS,EAAE,OAAC,CAAC,OAAO,EAAE;CACvB,CAAC,CAAC;AAIH,MAAM,iCAAiC,GAAG,OAAC,CAAC,MAAM,CAAC;IACjD,gCAAgC,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IAC3D,WAAW,EAAE,sBAAsB,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC;QAClD,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE;QACvF,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE;QAC5F,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE;KAC9F,CAAC;CACH,CAAC,CAAC;AAIH,MAAM,uBAAuB,GAAG,OAAC,CAAC,MAAM,CAAC;IACvC,kBAAkB,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IAC7C,iBAAiB,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;IAC7C,aAAa,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;IACzC,eAAe,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;IAC3C,cAAc,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IACzC,cAAc,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IACzC,cAAc,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IACzC,kBAAkB,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IAC7C,cAAc,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC;IAC1C,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IACzC,8BAA8B,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IACzD,kCAAkC,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IACzD,kBAAkB,EAAE,iCAAiC;CACtD,CAAC,CAAC;AAGH,MAAM,mCAAmC,GAAG,OAAC,CAAC,MAAM,CAAC;IACnD,gCAAgC,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IAC3D,4BAA4B,EAAE,OAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;CACxD,CAAC,CAAC;AAKH,MAAM,gBAAgB,GAAG,OAAC,CAAC,MAAM,CAAC;IAChC,YAAY,EAAE,kBAAkB,CAAC,OAAO,EAAE;IAC1C,QAAQ,EAAE,iBAAiB,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC;QAC1C,EAAE,IAAI,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,EAAE;QACzC,EAAE,IAAI,EAAE,0BAA0B,EAAE,KAAK,EAAE,KAAK,EAAE;QAClD,EAAE,IAAI,EAAE,yBAAyB,EAAE,KAAK,EAAE,IAAI,EAAE;KACjD,CAAC;IACF,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAC9D,aAAa,EAAE,eAAe,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAChF,gBAAgB,EAAE,qBAAqB,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC;QACtD;YACE,UAAU,EAAE,0CAA0C;YACtD,IAAI,EAAE,YAAY;SACnB;KACF,CAAC;IACF,kBAAkB,EAAE,wBAAwB,CAAC,OAAO,EAAE;IACtD,MAAM,EAAE,gBAAgB,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC;QACvC,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,6BAA6B,EAAE,gBAAgB,EAAE,IAAI,EAAE;QACjF,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,iCAAiC,EAAE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,EAAE;QAC3H;YACE,IAAI,EAAE,qBAAqB;YAC3B,SAAS,EAAE,yDAAyD;YACpE,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;SAC1D;QACD,EAAE,IAAI,EAAE,eAAe,EAAE,SAAS,EAAE,wBAAwB,EAAE;QAC9D,EAAE,IAAI,EAAE,4BAA4B,EAAE,SAAS,EAAE,2BAA2B,EAAE;QAC9E,EAAE,IAAI,EAAE,sBAAsB,EAAE,SAAS,EAAE,sCAAsC,EAAE;QACnF,EAAE,IAAI,EAAE,kBAAkB,EAAE,SAAS,EAAE,mCAAmC,EAAE;QAC5E,EAAE,IAAI,EAAE,sBAAsB,EAAE,SAAS,EAAE,iCAAiC,EAAE;QAC9E,EAAE,IAAI,EAAE,kBAAkB,EAAE,SAAS,EAAE,oCAAoC,EAAE;QAC7E,EAAE,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,oBAAoB,EAAE;KAC1D,CAAC;IACF,QAAQ,EAAE,iBAAiB,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC;QAC1C,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE;QAChG,EAAE,gBAAgB,EAAE,uCAAuC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE;QACpH,EAAE,gBAAgB,EAAE,wBAAwB,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE;QACrG,EAAE,gBAAgB,EAAE,sBAAsB,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE;QACnG,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE;QAClG,EAAE,gBAAgB,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE;QAC1F,EAAE,gBAAgB,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE;KACjG,CAAC;IACF,OAAO,EAAE,aAAa;IACtB,iBAAiB,EAAE,uBAAuB;IAC1C,iBAAiB,EAAE,uBAAuB;IAC1C,kBAAkB,EAAE,wBAAwB;IAC5C,6BAA6B,EAAE,mCAAmC;IAClE,SAAS,EAAE,qBAAqB;IAEhC,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE;IAClB,MAAM,EAAE,OAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;IACxD,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE;IACxB,eAAe,EAAE,OAAC,CAAC,MAAM,EAAE;IAC3B,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE;IACtB,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;IACpC,wBAAwB,EAAE,OAAC,CAAC,MAAM;SAC/B,OAAO,EAAE;SACT,OAAO,CAAC,KAAK,CAAC;SACd,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACpC,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE;IAChC,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC;IACxC,WAAW,EAAE,OAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC;CAC9D,CAAC,CAAC;AAEU,QAAA,UAAU,GAAG,gBAAgB,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,kBAAkB,EAAE,MAAM,CAAC,IAAK,EAAiB,CAAC;AAChH,oBAAY,GAAiB,kBAAU,eAAzB,kBAAU,GAAK,kBAAU,YAAC;AAEvD,SAAgB,gBAAgB,CAAC,GAAW;IAC1C,+BAAuB,GAAG,GAAG,CAAC;IAE9B,MAAM,WAAW,GAAG,gBAAgB,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,+BAAuB,CAAC,EAAE,MAAM,CAAC,CAAC;IAEjG,MAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,kBAAU,CAAC;IAEnE,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAZD,4CAYC;AAED,SAAgB,SAAS,CAAC,IAAY,EAAE,0BAAmC;IACzE,MAAM,UAAU,GAAG,kBAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IAC5G,IAAI,UAAU,EAAE,CAAC;QACf,IAAI,UAAU,CAAC,gBAAgB,IAAI,UAAU,CAAC,gBAAgB,KAAK,IAAI,IAAI,kBAAU,CAAC,UAAU;YAC9F,OAAO,cAAI,CAAC,IAAI,CAAC,+BAAuB,EAAE,UAAU,CAAC,SAAS,EAAE,kBAAU,CAAC,UAAU,CAAC,CAAC;;YACpF,OAAO,cAAI,CAAC,IAAI,CAAC,+BAAuB,EAAE,UAAU,CAAC,SAAS,CAAC,CAAC;IACvE,CAAC;SAAM,CAAC;QACN,IAAI,0BAA0B,EAAE,CAAC;YAC/B,IAAA,0BAAS,EAAC,0CAA0C,GAAG,IAAI,GAAG,oDAAoD,CAAC,CAAC;YACpH,OAAO,cAAI,CAAC,IAAI,CAAC,+BAAuB,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC5D,CAAC;;YAAM,OAAO,IAAI,CAAC;IACrB,CAAC;AACH,CAAC;AAZD,8BAYC;AAED,SAAgB,aAAa,CAAC,IAAY;IACxC,MAAM,UAAU,GAAG,kBAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IAC5G,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,UAAU,CAAC,OAAQ,CAAC;IAC7B,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAPD,sCAOC;AAED,SAAgB,iBAAiB,CAAC,IAAY,EAAE,UAAkB,EAAE,YAAkB;IACpF,MAAM,UAAU,GAAG,kBAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;IAC7G,IAAI,UAAU,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;QACrC,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,UAAU,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;QAClH,IAAI,SAAS;YAAE,OAAO,SAAS,CAAC,KAAK,CAAC;;YACjC,OAAO,YAAY,CAAC;IAC3B,CAAC;SAAM,CAAC;QACN,OAAO,YAAY,CAAC;IACtB,CAAC;AACH,CAAC;AATD,8CASC;AAED,SAAgB,QAAQ,CAAC,IAAY;IACnC,OAAO,kBAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;AACtG,CAAC;AAFD,4BAEC;AACD,SAAgB,gBAAgB,CAAC,IAAY;IAC3C,OAAO,kBAAU,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;AAC9G,CAAC;AAFD,4CAEC;AAED,SAAgB,UAAU,CAAC,WAAmB;IAC5C,OAAO,kBAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,KAAK,WAAW,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAE,CAAC;AAC5G,CAAC;AAFD,gCAEC;AAED,SAAgB,eAAe,CAAC,WAAmB,EAAE,YAAkB;IACrE,MAAM,OAAO,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;IACxC,IAAI,OAAO;QAAE,OAAO,OAAO,CAAC,KAAK,CAAC;;QAC7B,OAAO,YAAY,CAAC;AAC3B,CAAC;AAJD,0CAIC;AAED,SAAgB,oBAAoB;IAClC,MAAM,OAAO,GAAG,yBAAyB,CAAC;IAC1C,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;IACpC,IAAI,OAAO;QAAE,OAAgB,OAAO,CAAC,KAAK,CAAC;;QACtC,OAAO,KAAK,CAAC;AACpB,CAAC;AALD,oDAKC;AAED;;GAEG;AACU,QAAA,qBAAqB,GAAG,GAAG,CAAC;AAEzC,SAAgB,cAAc;IAC5B,OAAO,UAAU,CAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC;AAC5C,CAAC;AAFD,wCAEC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import * as mssql from
|
|
2
|
-
import { DataSource } from
|
|
1
|
+
import * as mssql from 'mssql';
|
|
2
|
+
import { DataSource } from 'typeorm';
|
|
3
3
|
export declare const sqlConfig: mssql.config;
|
|
4
4
|
export declare function MSSQLConnection(): Promise<mssql.ConnectionPool>;
|
|
5
5
|
declare const AppDataSource: DataSource;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db-connection.d.ts","sourceRoot":"","sources":["../../src/Config/db-connection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,
|
|
1
|
+
{"version":3,"file":"db-connection.d.ts","sourceRoot":"","sources":["../../src/Config/db-connection.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAqBrC,eAAO,MAAM,SAAS,EAAE,KAAK,CAAC,MAY7B,CAAC;AAGF,wBAAsB,eAAe,IAAI,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAKrE;AAED,QAAA,MAAM,aAAa,YAA4B,CAAC;AAEhD,eAAe,aAAa,CAAC"}
|
|
@@ -27,33 +27,34 @@ exports.MSSQLConnection = exports.sqlConfig = void 0;
|
|
|
27
27
|
const mssql = __importStar(require("mssql"));
|
|
28
28
|
const config_1 = require("./config");
|
|
29
29
|
const typeorm_1 = require("typeorm");
|
|
30
|
+
const { dbDatabase, dbHost, codeGenPassword, dbPort, codeGenLogin, dbInstanceName, dbTrustServerCertificate } = config_1.configInfo;
|
|
30
31
|
const ormConfig = {
|
|
31
32
|
type: 'mssql',
|
|
32
33
|
logging: false,
|
|
33
|
-
host:
|
|
34
|
-
port:
|
|
35
|
-
username:
|
|
36
|
-
password:
|
|
37
|
-
database:
|
|
34
|
+
host: dbHost,
|
|
35
|
+
port: dbPort,
|
|
36
|
+
username: codeGenLogin,
|
|
37
|
+
password: codeGenPassword,
|
|
38
|
+
database: dbDatabase,
|
|
38
39
|
synchronize: false,
|
|
39
40
|
requestTimeout: 120000, // long timeout for code gen, some queries are long at times...
|
|
40
41
|
options: {
|
|
41
|
-
instanceName:
|
|
42
|
-
trustServerCertificate:
|
|
43
|
-
}
|
|
42
|
+
instanceName: dbInstanceName && dbInstanceName.trim().length > 0 ? dbInstanceName : undefined,
|
|
43
|
+
trustServerCertificate: dbTrustServerCertificate === 'Y',
|
|
44
|
+
},
|
|
44
45
|
};
|
|
45
46
|
exports.sqlConfig = {
|
|
46
|
-
user:
|
|
47
|
-
password:
|
|
48
|
-
server:
|
|
49
|
-
database:
|
|
50
|
-
port:
|
|
47
|
+
user: codeGenLogin,
|
|
48
|
+
password: codeGenPassword,
|
|
49
|
+
server: dbHost,
|
|
50
|
+
database: dbDatabase,
|
|
51
|
+
port: dbPort,
|
|
51
52
|
options: {
|
|
52
53
|
requestTimeout: 120000, // long timeout for code gen, some queries are long at times...
|
|
53
54
|
encrypt: true,
|
|
54
|
-
instanceName:
|
|
55
|
-
trustServerCertificate:
|
|
56
|
-
}
|
|
55
|
+
instanceName: dbInstanceName && dbInstanceName.trim().length > 0 ? dbInstanceName : undefined,
|
|
56
|
+
trustServerCertificate: dbTrustServerCertificate === 'Y',
|
|
57
|
+
},
|
|
57
58
|
};
|
|
58
59
|
let _pool;
|
|
59
60
|
async function MSSQLConnection() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db-connection.js","sourceRoot":"","sources":["../../src/Config/db-connection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAC/B,
|
|
1
|
+
{"version":3,"file":"db-connection.js","sourceRoot":"","sources":["../../src/Config/db-connection.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAA+B;AAC/B,qCAAsC;AACtC,qCAAqC;AAGrC,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,wBAAwB,EAAE,GAAG,mBAAU,CAAC;AAE3H,MAAM,SAAS,GAA+B;IAC5C,IAAI,EAAE,OAAO;IACb,OAAO,EAAE,KAAK;IACd,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,YAAY;IACtB,QAAQ,EAAE,eAAe;IACzB,QAAQ,EAAE,UAAU;IACpB,WAAW,EAAE,KAAK;IAClB,cAAc,EAAE,MAAM,EAAE,+DAA+D;IACvF,OAAO,EAAE;QACP,YAAY,EAAE,cAAc,IAAI,cAAc,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS;QAC7F,sBAAsB,EAAE,wBAAwB,KAAK,GAAG;KACzD;CACF,CAAC;AAEW,QAAA,SAAS,GAAiB;IACrC,IAAI,EAAE,YAAY;IAClB,QAAQ,EAAE,eAAe;IACzB,MAAM,EAAE,MAAM;IACd,QAAQ,EAAE,UAAU;IACpB,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE;QACP,cAAc,EAAE,MAAM,EAAE,+DAA+D;QACvF,OAAO,EAAE,IAAI;QACb,YAAY,EAAE,cAAc,IAAI,cAAc,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS;QAC7F,sBAAsB,EAAE,wBAAwB,KAAK,GAAG;KACzD;CACF,CAAC;AAEF,IAAI,KAA2B,CAAC;AACzB,KAAK,UAAU,eAAe;IACnC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,KAAK,GAAG,MAAM,KAAK,CAAC,OAAO,CAAC,iBAAS,CAAC,CAAC;IACzC,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AALD,0CAKC;AAED,MAAM,aAAa,GAAG,IAAI,oBAAU,CAAC,SAAS,CAAC,CAAC;AAEhD,kBAAe,aAAa,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createNewUser.d.ts","sourceRoot":"","sources":["../../src/Misc/createNewUser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAMhD;;GAEG;AACH,qBACa,iBAAiB;IACb,aAAa,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC;QAAC,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAA;KAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"createNewUser.d.ts","sourceRoot":"","sources":["../../src/Misc/createNewUser.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAMhD;;GAEG;AACH,qBACa,iBAAiB;IACb,aAAa,CAAC,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC;QAAC,OAAO,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,SAAS,GAAG,OAAO,GAAG,SAAS,CAAA;KAAC,CAAC;CA0JlJ"}
|
|
@@ -61,6 +61,55 @@ let CreateNewUserBase = class CreateNewUserBase {
|
|
|
61
61
|
(0, status_logging_1.logError)(" Failed to create User Role: " + roleName);
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
|
+
// Create UserApplication records if specified in the config
|
|
65
|
+
if (newUserSetup.CreateUserApplicationRecords) {
|
|
66
|
+
(0, status_logging_1.logStatus)("Creating User Applications for new user: " + user.Name);
|
|
67
|
+
for (const appName of newUserSetup.UserApplications) {
|
|
68
|
+
const toLowerCase = appName.trim().toLocaleLowerCase();
|
|
69
|
+
const application = md.Applications.find(a => a.Name.trim().toLocaleLowerCase() === toLowerCase);
|
|
70
|
+
if (!application) {
|
|
71
|
+
(0, status_logging_1.logError)(`Application ${appName} not found in the Metadata, cannot assign to new user ${user.Name}`);
|
|
72
|
+
continue;
|
|
73
|
+
}
|
|
74
|
+
const userApplication = await md.GetEntityObject('User Applications', currentUser);
|
|
75
|
+
userApplication.NewRecord();
|
|
76
|
+
userApplication.UserID = user.ID;
|
|
77
|
+
userApplication.ApplicationID = application.ID;
|
|
78
|
+
userApplication.IsActive = true;
|
|
79
|
+
const userApplicationSaveResult = await userApplication.Save();
|
|
80
|
+
if (userApplicationSaveResult) {
|
|
81
|
+
(0, status_logging_1.logStatus)(`Created User Application ${appName} for new user ${user.Name}`);
|
|
82
|
+
//now create a UserApplicationEntity records for each entity in the application
|
|
83
|
+
const rv = new core_1.RunView();
|
|
84
|
+
const rvResult = await rv.RunView({
|
|
85
|
+
EntityName: 'Application Entities',
|
|
86
|
+
ExtraFilter: `ApplicationID = '${application.ID}' and DefaultForNewUser = 1`,
|
|
87
|
+
}, currentUser);
|
|
88
|
+
if (!rvResult.Success) {
|
|
89
|
+
(0, core_1.LogError)(`Failed to load Application Entities for Application ${appName} for new user ${user.Name}:`, undefined, rvResult.ErrorMessage);
|
|
90
|
+
continue;
|
|
91
|
+
}
|
|
92
|
+
(0, core_1.LogStatus)(`Creating ${rvResult.Results.length} User Application Entities for User Application ${appName} for new user ${user.Name}`);
|
|
93
|
+
for (const [index, appEntity] of rvResult.Results.entries()) {
|
|
94
|
+
const userAppEntity = await md.GetEntityObject('User Application Entities', currentUser);
|
|
95
|
+
userAppEntity.NewRecord();
|
|
96
|
+
userAppEntity.UserApplicationID = userApplication.ID;
|
|
97
|
+
userAppEntity.EntityID = appEntity.EntityID;
|
|
98
|
+
userAppEntity.Sequence = index;
|
|
99
|
+
const userAppEntitySaveResult = await userAppEntity.Save();
|
|
100
|
+
if (userAppEntitySaveResult) {
|
|
101
|
+
(0, core_1.LogStatus)(`Created User Application Entity ${appEntity.Entity} for new user ${user.Name}`);
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
(0, core_1.LogError)(`Failed to create User Application Entity for new user ${user.Name}:`, undefined, userAppEntity.LatestResult);
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
else {
|
|
109
|
+
(0, status_logging_1.logError)(`Failed to create User Application ${appName} for new user ${user.Name}:`, undefined, userApplication.LatestResult);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
64
113
|
(0, status_logging_1.logStatus)("Finished creating new user: " + newUserSetup.Email);
|
|
65
114
|
return {
|
|
66
115
|
Success: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createNewUser.js","sourceRoot":"","sources":["../../src/Misc/createNewUser.ts"],"names":[],"mappings":";;;;;;;;;AAAA,+
|
|
1
|
+
{"version":3,"file":"createNewUser.js","sourceRoot":"","sources":["../../src/Misc/createNewUser.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runCommand.d.ts","sourceRoot":"","sources":["../../src/Misc/runCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAO/C,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAA;AAED;;GAEG;AACH,qBACa,eAAe;IACb,WAAW,CAAC,QAAQ,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAwBvE,UAAU,CAAC,OAAO,EAAE,WAAW,GAAI,OAAO,CAAC,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"runCommand.d.ts","sourceRoot":"","sources":["../../src/Misc/runCommand.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAO/C,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAA;AAED;;GAEG;AACH,qBACa,eAAe;IACb,WAAW,CAAC,QAAQ,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC;IAwBvE,UAAU,CAAC,OAAO,EAAE,WAAW,GAAI,OAAO,CAAC,sBAAsB,CAAC;CA+FhF"}
|
package/dist/Misc/runCommand.js
CHANGED
|
@@ -88,21 +88,22 @@ let RunCommandsBase = class RunCommandsBase {
|
|
|
88
88
|
});
|
|
89
89
|
});
|
|
90
90
|
if (command.timeout && command.timeout > 0) {
|
|
91
|
+
const { timeout } = command;
|
|
91
92
|
const timeoutPromise = new Promise((resolve, reject) => {
|
|
92
93
|
setTimeout(() => {
|
|
93
94
|
const elapsedTime = new Date().getTime() - startTime.getTime();
|
|
94
95
|
if (!cp.killed) {
|
|
95
96
|
treeKill(cp.pid);
|
|
96
97
|
(0, status_logging_1.logStatus)(`COMMAND: "${command.command}" COMPLETED ${bErrors ? ' - FAILED' : ' - SUCCESS'} IN ${elapsedTime / 1000} seconds`);
|
|
97
|
-
output += `Process killed after ${
|
|
98
|
+
output += `Process killed after ${timeout} ms`;
|
|
98
99
|
}
|
|
99
100
|
resolve({
|
|
100
101
|
output: output,
|
|
101
102
|
error: null,
|
|
102
103
|
success: !bErrors,
|
|
103
|
-
elapsedTime: elapsedTime
|
|
104
|
+
elapsedTime: elapsedTime,
|
|
104
105
|
});
|
|
105
|
-
},
|
|
106
|
+
}, timeout);
|
|
106
107
|
});
|
|
107
108
|
return Promise.race([
|
|
108
109
|
commandExecution,
|