@memberjunction/codegen-lib 0.9.33 → 0.9.35
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/config.d.ts +12 -0
- package/dist/config.js +23 -1
- package/dist/config.js.map +1 -1
- package/dist/createNewUser.d.ts +2 -0
- package/dist/createNewUser.js +68 -0
- package/dist/createNewUser.js.map +1 -0
- package/dist/db.js +7 -3
- package/dist/db.js.map +1 -1
- package/dist/runCodeGen.js +9 -0
- package/dist/runCodeGen.js.map +1 -1
- package/package.json +5 -4
package/dist/config.d.ts
CHANGED
|
@@ -3,6 +3,8 @@ export declare const dbPort: number;
|
|
|
3
3
|
export declare const dbUsername: string;
|
|
4
4
|
export declare const dbPassword: string;
|
|
5
5
|
export declare const dbDatabase: string;
|
|
6
|
+
export declare const dbInstanceName: string;
|
|
7
|
+
export declare const dbTrustServerCertificate: boolean;
|
|
6
8
|
export declare const outputCode: string;
|
|
7
9
|
export declare const configFile: string;
|
|
8
10
|
export declare const mjCoreSchema: string;
|
|
@@ -47,7 +49,16 @@ export type DBSchemaJSONOutputBundle = {
|
|
|
47
49
|
excludeSchemas: string[];
|
|
48
50
|
excludeEntities: string[];
|
|
49
51
|
};
|
|
52
|
+
export type NewUserSetup = {
|
|
53
|
+
UserName: string;
|
|
54
|
+
FirstName: string;
|
|
55
|
+
LastName: string;
|
|
56
|
+
Email: string;
|
|
57
|
+
Roles: string[];
|
|
58
|
+
IsComplete: boolean;
|
|
59
|
+
};
|
|
50
60
|
export type ConfigInfo = {
|
|
61
|
+
newUserSetup?: NewUserSetup;
|
|
51
62
|
settings: SettingInfo[];
|
|
52
63
|
excludeSchemas: string[];
|
|
53
64
|
excludeTables: TableInfo[];
|
|
@@ -95,6 +106,7 @@ export type NewEntityRelationshipDefaults = {
|
|
|
95
106
|
export declare let configInfo: ConfigInfo;
|
|
96
107
|
export declare let currentWorkingDirectory: any;
|
|
97
108
|
export declare function initializeConfig(workingDirectory: string): ConfigInfo;
|
|
109
|
+
export declare function saveConfigFileFromMemory(): boolean;
|
|
98
110
|
export declare function outputDir(type: string): string;
|
|
99
111
|
export declare function commands(when: string): CommandInfo[];
|
|
100
112
|
export declare function customSqlScripts(when: string): CustomSQLScript[];
|
package/dist/config.js
CHANGED
|
@@ -3,7 +3,7 @@ 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.getSetting = exports.customSqlScripts = exports.commands = exports.outputDir = exports.initializeConfig = exports.currentWorkingDirectory = exports.configInfo = exports.graphqlPort = exports.mjCoreSchema = exports.configFile = exports.outputCode = exports.dbDatabase = exports.dbPassword = exports.dbUsername = exports.dbPort = exports.dbHost = void 0;
|
|
6
|
+
exports.mj_core_schema = exports.getSetting = exports.customSqlScripts = exports.commands = exports.outputDir = exports.saveConfigFileFromMemory = exports.initializeConfig = exports.currentWorkingDirectory = exports.configInfo = exports.graphqlPort = exports.mjCoreSchema = exports.configFile = exports.outputCode = exports.dbTrustServerCertificate = exports.dbInstanceName = exports.dbDatabase = exports.dbPassword = exports.dbUsername = exports.dbPort = exports.dbHost = void 0;
|
|
7
7
|
const env_var_1 = __importDefault(require("env-var"));
|
|
8
8
|
const fs_1 = __importDefault(require("fs"));
|
|
9
9
|
const path_1 = __importDefault(require("path"));
|
|
@@ -12,6 +12,8 @@ exports.dbPort = env_var_1.default.get('DB_PORT').default('1433').asPortNumber()
|
|
|
12
12
|
exports.dbUsername = env_var_1.default.get('DB_USERNAME').required().asString();
|
|
13
13
|
exports.dbPassword = env_var_1.default.get('DB_PASSWORD').required().asString();
|
|
14
14
|
exports.dbDatabase = env_var_1.default.get('DB_DATABASE').required().asString();
|
|
15
|
+
exports.dbInstanceName = env_var_1.default.get('DB_INSTANCE_NAME').asString();
|
|
16
|
+
exports.dbTrustServerCertificate = env_var_1.default.get('DB_TRUST_SERVER_CERTIFICATE').asBool();
|
|
15
17
|
exports.outputCode = env_var_1.default.get('OUTPUT_CODE').asString();
|
|
16
18
|
exports.configFile = env_var_1.default.get('CONFIG_FILE').asString();
|
|
17
19
|
exports.mjCoreSchema = env_var_1.default.get('MJ_CORE_SCHEMA').default('admin').asString();
|
|
@@ -25,6 +27,26 @@ function initializeConfig(workingDirectory) {
|
|
|
25
27
|
return exports.configInfo;
|
|
26
28
|
}
|
|
27
29
|
exports.initializeConfig = initializeConfig;
|
|
30
|
+
function saveConfigFileFromMemory() {
|
|
31
|
+
try {
|
|
32
|
+
if (!exports.configInfo || !exports.currentWorkingDirectory) {
|
|
33
|
+
console.error("ConfigInfo or currentWorkingDirectory not set, cannot save config file");
|
|
34
|
+
return false;
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
const configFileName = exports.configFile ? exports.configFile : 'config.json';
|
|
38
|
+
const configPath = path_1.default.join(exports.currentWorkingDirectory, configFileName);
|
|
39
|
+
const configData = JSON.stringify(exports.configInfo, null, 4);
|
|
40
|
+
fs_1.default.writeFileSync(configPath, configData);
|
|
41
|
+
return true;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
catch (err) {
|
|
45
|
+
console.error(err);
|
|
46
|
+
return false;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
exports.saveConfigFileFromMemory = saveConfigFileFromMemory;
|
|
28
50
|
function outputDir(type) {
|
|
29
51
|
const outputInfo = exports.configInfo.output.find(o => o.type.trim().toUpperCase() === type.trim().toUpperCase());
|
|
30
52
|
if (outputInfo) {
|
package/dist/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":";;;;;;AAAA,sDAA0B;AAC1B,4CAAoB;AACpB,gDAAwB;AAEX,QAAA,MAAM,GAAG,iBAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC;AAClD,QAAA,MAAM,GAAG,iBAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,CAAC;AAC3D,QAAA,UAAU,GAAG,iBAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC;AAC1D,QAAA,UAAU,GAAG,iBAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC;AAC1D,QAAA,UAAU,GAAG,iBAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC;AAC1D,QAAA,UAAU,GAAG,iBAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC/C,QAAA,UAAU,GAAG,iBAAG,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,QAAQ,EAAE,CAAC;AAE/C,QAAA,YAAY,GAAG,iBAAG,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;AAErE,QAAA,WAAW,GAAG,iBAAG,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.createNewUser = void 0;
|
|
4
|
+
const core_1 = require("@memberjunction/core");
|
|
5
|
+
const config_1 = require("./config");
|
|
6
|
+
const sqlserver_dataprovider_1 = require("@memberjunction/sqlserver-dataprovider");
|
|
7
|
+
async function createNewUser(newUserSetup) {
|
|
8
|
+
try {
|
|
9
|
+
const matches = sqlserver_dataprovider_1.UserCache.Users.find(u => u?.Type?.trim().toLowerCase() === 'owner');
|
|
10
|
+
const currentUser = matches ? matches : sqlserver_dataprovider_1.UserCache.Users[0]; // if we don't find an Owner, use the first user in the cache
|
|
11
|
+
if (!currentUser) {
|
|
12
|
+
console.error("No existing users found in the database, cannot create a new user");
|
|
13
|
+
return false;
|
|
14
|
+
}
|
|
15
|
+
if (newUserSetup) {
|
|
16
|
+
if (newUserSetup.IsComplete === false || newUserSetup.IsComplete === undefined || newUserSetup.IsComplete === null) {
|
|
17
|
+
if (newUserSetup.Email && newUserSetup.Email.length > 0) {
|
|
18
|
+
console.log("Attempting to create new user: " + newUserSetup.Email);
|
|
19
|
+
const md = new core_1.Metadata();
|
|
20
|
+
const user = await md.GetEntityObject('Users', currentUser);
|
|
21
|
+
user.NewRecord();
|
|
22
|
+
user.Name = newUserSetup.UserName ? newUserSetup.UserName : newUserSetup.Email;
|
|
23
|
+
user.FirstName = newUserSetup.FirstName;
|
|
24
|
+
user.LastName = newUserSetup.LastName;
|
|
25
|
+
user.Email = newUserSetup.Email;
|
|
26
|
+
user.Type = 'Owner';
|
|
27
|
+
user.IsActive = true;
|
|
28
|
+
if (await user.Save()) {
|
|
29
|
+
// save was successful, so we can create the User Roles
|
|
30
|
+
for (let i = 0; i < newUserSetup.Roles.length; i++) {
|
|
31
|
+
const roleName = newUserSetup.Roles[i];
|
|
32
|
+
const userRole = await md.GetEntityObject('User Roles', currentUser);
|
|
33
|
+
userRole.NewRecord();
|
|
34
|
+
userRole.UserID = user.ID;
|
|
35
|
+
userRole.RoleName = roleName;
|
|
36
|
+
if (await userRole.Save()) {
|
|
37
|
+
console.log(" Created User Role: " + roleName);
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
console.error(" Failed to create User Role: " + roleName);
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
console.log("Finished creating new user: " + newUserSetup.Email + ", saving config file");
|
|
44
|
+
newUserSetup.IsComplete = true;
|
|
45
|
+
(0, config_1.saveConfigFileFromMemory)();
|
|
46
|
+
return true;
|
|
47
|
+
}
|
|
48
|
+
else {
|
|
49
|
+
// saving the user failed, so we don't atempt to create User Roles, throw error
|
|
50
|
+
console.error("Failed to save user: " + newUserSetup.Email);
|
|
51
|
+
return false;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
else {
|
|
57
|
+
console.error("No NewUserSetup object provided, createNewUser() shouldn't be called without a valid object");
|
|
58
|
+
return false;
|
|
59
|
+
}
|
|
60
|
+
return true;
|
|
61
|
+
}
|
|
62
|
+
catch (err) {
|
|
63
|
+
console.error(err);
|
|
64
|
+
return false;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
exports.createNewUser = createNewUser;
|
|
68
|
+
//# sourceMappingURL=createNewUser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"createNewUser.js","sourceRoot":"","sources":["../src/createNewUser.ts"],"names":[],"mappings":"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"}
|
package/dist/db.js
CHANGED
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
//import * as mssql from "mssql";
|
|
4
4
|
const config_1 = require("./config");
|
|
5
5
|
const typeorm_1 = require("typeorm");
|
|
6
|
-
const
|
|
6
|
+
const ormConfig = {
|
|
7
7
|
type: 'mssql',
|
|
8
8
|
logging: false,
|
|
9
9
|
host: config_1.dbHost,
|
|
@@ -12,8 +12,12 @@ const orm = {
|
|
|
12
12
|
password: config_1.dbPassword,
|
|
13
13
|
database: config_1.dbDatabase,
|
|
14
14
|
synchronize: false,
|
|
15
|
-
requestTimeout: 120000,
|
|
15
|
+
requestTimeout: 120000,
|
|
16
|
+
options: {
|
|
17
|
+
instanceName: config_1.dbInstanceName && config_1.dbInstanceName.trim().length > 0 ? config_1.dbInstanceName : undefined,
|
|
18
|
+
trustServerCertificate: config_1.dbTrustServerCertificate !== null && config_1.dbTrustServerCertificate !== undefined ? config_1.dbTrustServerCertificate : undefined
|
|
19
|
+
}
|
|
16
20
|
};
|
|
17
|
-
const AppDataSource = new typeorm_1.DataSource(
|
|
21
|
+
const AppDataSource = new typeorm_1.DataSource(ormConfig);
|
|
18
22
|
exports.default = AppDataSource;
|
|
19
23
|
//# sourceMappingURL=db.js.map
|
package/dist/db.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"db.js","sourceRoot":"","sources":["../src/db.ts"],"names":[],"mappings":";;AAAA,iCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../src/db.ts"],"names":[],"mappings":";;AAAA,iCAAiC;AACjC,qCAAwH;AACxH,qCAAoC;AAIpC,MAAM,SAAS,GAA+B;IAC1C,IAAI,EAAE,OAAO;IACb,OAAO,EAAE,KAAK;IACd,IAAI,EAAE,eAAM;IACZ,IAAI,EAAE,eAAM;IACZ,QAAQ,EAAE,mBAAU;IACpB,QAAQ,EAAE,mBAAU;IACpB,QAAQ,EAAE,mBAAU;IACpB,WAAW,EAAE,KAAK;IAClB,cAAc,EAAE,MAAM;IACtB,OAAO,EAAE;QACP,YAAY,EAAE,uBAAc,IAAI,uBAAc,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,uBAAc,CAAC,CAAC,CAAC,SAAS;QAC7F,sBAAsB,EAAE,iCAAwB,KAAK,IAAI,IAAI,iCAAwB,KAAK,SAAS,CAAC,CAAC,CAAC,iCAAwB,CAAC,CAAC,CAAC,SAAS;KAC3I;CACF,CAAC;AAGJ,MAAM,aAAa,GAAG,IAAI,oBAAU,CAAC,SAAS,CAAC,CAAA;AAE/C,kBAAe,aAAa,CAAC"}
|
package/dist/runCodeGen.js
CHANGED
|
@@ -42,6 +42,7 @@ const runCommand_1 = require("./runCommand");
|
|
|
42
42
|
const dbSchema_1 = require("./dbSchema");
|
|
43
43
|
const angular_client_codegen_1 = require("./angular_client_codegen");
|
|
44
44
|
const sqlserver_dataprovider_2 = require("@memberjunction/sqlserver-dataprovider");
|
|
45
|
+
const createNewUser_1 = require("./createNewUser");
|
|
45
46
|
async function runMemberJunctionCodeGeneration() {
|
|
46
47
|
try {
|
|
47
48
|
const startTime = new Date();
|
|
@@ -81,6 +82,14 @@ async function runMemberJunctionCodeGeneration() {
|
|
|
81
82
|
if (!await (0, sql_codegen_1.runCustomSQLScripts)(db_1.default, 'before-all'))
|
|
82
83
|
(0, logging_1.logError)('ERROR running before-all SQL Scripts');
|
|
83
84
|
/****************************************************************************************
|
|
85
|
+
// STEP 0.2 --- Create a new user if there is newUserSetup info in the config file
|
|
86
|
+
****************************************************************************************/
|
|
87
|
+
const newUserSetup = config_1.configInfo.newUserSetup;
|
|
88
|
+
if (newUserSetup) {
|
|
89
|
+
if (!await (0, createNewUser_1.createNewUser)(newUserSetup))
|
|
90
|
+
(0, logging_1.logError)('ERROR creating new user');
|
|
91
|
+
}
|
|
92
|
+
/****************************************************************************************
|
|
84
93
|
// STEP 1 - Manage Metadata - including generating new metadata as required
|
|
85
94
|
****************************************************************************************/
|
|
86
95
|
(0, logging_1.logStatus)('Managing Metadata...');
|
package/dist/runCodeGen.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runCodeGen.js","sourceRoot":"","sources":["../src/runCodeGen.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iEAA2D;AAC3D,qEAAqE;AACrE,qEAAqE;AACrE,+CAAkF;AAClF,2EAA0E;AAC1E,mFAA6E;AAC7E,8CAAgC;AAChC,qDAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"runCodeGen.js","sourceRoot":"","sources":["../src/runCodeGen.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@memberjunction/codegen-lib",
|
|
3
|
-
"version": "0.9.
|
|
3
|
+
"version": "0.9.35",
|
|
4
4
|
"description": "Library used by the CodeGen executable to generate code for the MemberJunction platform",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -19,9 +19,10 @@
|
|
|
19
19
|
"typescript": "^5.0.3"
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@memberjunction/core": "^0.9.
|
|
23
|
-
"@memberjunction/
|
|
24
|
-
"@memberjunction/
|
|
22
|
+
"@memberjunction/core": "^0.9.75",
|
|
23
|
+
"@memberjunction/core-entities": "^0.9.44",
|
|
24
|
+
"@memberjunction/global": "^0.9.78",
|
|
25
|
+
"@memberjunction/sqlserver-dataprovider": "^0.9.70",
|
|
25
26
|
"env-var": "^7.4.1",
|
|
26
27
|
"fs-extra": "^11.1.1",
|
|
27
28
|
"typeorm": "^0.3.17"
|