diff --git a/coverage/lcov.info b/coverage/lcov.info index 21685f7..9271aa6 100644 --- a/coverage/lcov.info +++ b/coverage/lcov.info @@ -199,23 +199,24 @@ BRDA:69,4,0,47 BRDA:86,5,0,47 BRDA:90,6,0,47 BRDA:94,7,0,47 -BRDA:113,8,0,1 -BRDA:71,9,0,100 -BRDA:73,10,0,219 -BRDA:114,11,0,51 -BRDA:142,12,0,50 -BRDA:146,13,0,2 -BRDA:146,14,0,48 -BRDA:148,15,0,48 -BRDA:151,16,0,44 -BRDA:151,17,0,43 -BRDA:152,18,0,4 -BRDA:154,19,0,47 -BRDA:155,20,0,5 -BRDA:156,21,0,1 -BRDA:161,22,0,1 -BRDA:161,23,0,49 -BRF:24 +BRDA:113,8,0,0 +BRDA:113,9,0,1 +BRDA:71,10,0,100 +BRDA:73,11,0,219 +BRDA:114,12,0,51 +BRDA:142,13,0,50 +BRDA:146,14,0,2 +BRDA:146,15,0,48 +BRDA:148,16,0,48 +BRDA:151,17,0,44 +BRDA:151,18,0,43 +BRDA:152,19,0,4 +BRDA:154,20,0,47 +BRDA:155,21,0,5 +BRDA:156,22,0,1 +BRDA:161,23,0,1 +BRDA:161,24,0,49 +BRF:25 BRH:24 end_of_record TN: diff --git a/dist/entity.js b/dist/entity.js index a87cbf1..13ae9ae 100644 --- a/dist/entity.js +++ b/dist/entity.js @@ -32,6 +32,7 @@ entity.defaults = { }; // All functionality should be loaded when defining plugin function preload(context) { + var _a; const seneca = this; const options = context.options; seneca.util.parsecanon = seneca.util.parsecanon || make_entity_1.MakeEntity.parsecanon; @@ -71,7 +72,7 @@ function preload(context) { if (options.mem_store) { seneca.root.use(require('seneca-mem-store')); } - if (options.log.active) { + if ((_a = options.log) === null || _a === void 0 ? void 0 : _a.active) { seneca.root.private$.exports.Entity.prototype.log$ = function () { // Use this, as make$ will have changed seneca ref. const seneca = this.private$.get_instance(); diff --git a/dist/entity.js.map b/dist/entity.js.map index 7a36652..67a5224 100644 --- a/dist/entity.js.map +++ b/dist/entity.js.map @@ -1 +1 @@ -{"version":3,"file":"entity.js","sourceRoot":"","sources":["../src/entity.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"entity.js","sourceRoot":"","sources":["../src/entity.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index c1be011..561484d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "seneca-entity", "main": "dist/entity.js", - "version": "25.1.0", + "version": "25.1.1", "type": "commonjs", "types": "dist/entity.d.ts", "description": "Entity plugin for seneca", @@ -58,12 +58,12 @@ }, "devDependencies": { "@seneca/maintain": "^0.1.0", - "@types/jest": "^29.5.8", - "esbuild": "^0.19.6", + "@types/jest": "^29.5.11", + "esbuild": "^0.19.9", "esbuild-jest": "^0.5.0", "jest": "^29.7.0", - "prettier": "^3.1.0", + "prettier": "^3.1.1", "seneca-msg-test": "^3.4.0", - "typescript": "^5.3.2" + "typescript": "^5.3.3" } } diff --git a/src/entity.ts b/src/entity.ts index e9e882e..206af6d 100644 --- a/src/entity.ts +++ b/src/entity.ts @@ -110,7 +110,7 @@ function preload(this: any, context: any) { seneca.root.use(require('seneca-mem-store')) } - if (options.log.active) { + if (options.log?.active) { seneca.root.private$.exports.Entity.prototype.log$ = function(this: any) { // Use this, as make$ will have changed seneca ref. const seneca = this.private$.get_instance()