@memberjunction/codegen-lib 0.9.34 → 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.
Files changed (6) hide show
  1. package/dist/config.d.ts +2 -0
  2. package/dist/config.js +3 -1
  3. package/dist/config.js.map +1 -1
  4. package/dist/db.js +7 -3
  5. package/dist/db.js.map +1 -1
  6. package/package.json +4 -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;
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.saveConfigFileFromMemory = 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();
package/dist/config.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"config.js","sourceRoot":"","sources":["../src/config.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 orm = {
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, // long timeout for code gen, some queries are long at times...
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(orm);
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,qCAA8E;AAC9E,qCAAoC;AAIpC,MAAM,GAAG,GAA+B;IACpC,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,EAAE,+DAA+D;CACxF,CAAC;AAEJ,MAAM,aAAa,GAAG,IAAI,oBAAU,CAAC,GAAG,CAAC,CAAA;AAEzC,kBAAe,aAAa,CAAC"}
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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@memberjunction/codegen-lib",
3
- "version": "0.9.34",
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,10 +19,10 @@
19
19
  "typescript": "^5.0.3"
20
20
  },
21
21
  "dependencies": {
22
- "@memberjunction/core": "^0.9.74",
22
+ "@memberjunction/core": "^0.9.75",
23
23
  "@memberjunction/core-entities": "^0.9.44",
24
- "@memberjunction/global": "^0.9.77",
25
- "@memberjunction/sqlserver-dataprovider": "^0.9.69",
24
+ "@memberjunction/global": "^0.9.78",
25
+ "@memberjunction/sqlserver-dataprovider": "^0.9.70",
26
26
  "env-var": "^7.4.1",
27
27
  "fs-extra": "^11.1.1",
28
28
  "typeorm": "^0.3.17"