@vendure/core 3.3.1 → 3.3.2

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.
@@ -4,6 +4,7 @@ exports.ENABLE_INSTRUMENTATION_ENV_VAR = void 0;
4
4
  exports.Instrument = Instrument;
5
5
  exports.getInstrumentedClassTarget = getInstrumentedClassTarget;
6
6
  const config_helpers_1 = require("../config/config-helpers");
7
+ const noop_instrumentation_strategy_1 = require("../config/system/noop-instrumentation-strategy");
7
8
  exports.ENABLE_INSTRUMENTATION_ENV_VAR = 'VENDURE_ENABLE_INSTRUMENTATION';
8
9
  const INSTRUMENTED_CLASS = Symbol('InstrumentedClassTarget');
9
10
  /**
@@ -59,16 +60,21 @@ function Instrument() {
59
60
  if (!instrumentationStrategy) {
60
61
  return this;
61
62
  }
63
+ if (instrumentationStrategy instanceof noop_instrumentation_strategy_1.NoopInstrumentationStrategy) {
64
+ throw new Error('Please add a TelemetryPlugin to your VendureConfig');
65
+ }
62
66
  // eslint-disable-next-line @typescript-eslint/no-this-alias
63
67
  const instance = this;
64
- return new Proxy(this, {
68
+ const proxy = new Proxy(this, {
65
69
  get: (obj, prop) => {
66
70
  const original = obj[prop];
67
71
  if (typeof original === 'function') {
72
+ // Bind the method to the proxy instance to ensure internal calls go through the proxy
73
+ const boundMethod = original.bind(proxy);
68
74
  return function (...methodArgs) {
69
- const applyOriginalFunction = original.constructor.name === 'AsyncFunction'
70
- ? async () => await original.apply(obj, methodArgs)
71
- : () => original.apply(obj, methodArgs);
75
+ const applyOriginalFunction = boundMethod.constructor.name === 'AsyncFunction'
76
+ ? async () => await boundMethod(...methodArgs)
77
+ : () => boundMethod(...methodArgs);
72
78
  const wrappedMethodArgs = {
73
79
  instance,
74
80
  target,
@@ -82,6 +88,7 @@ function Instrument() {
82
88
  return original;
83
89
  },
84
90
  });
91
+ return proxy;
85
92
  }
86
93
  };
87
94
  // Set the name property of ProxiedClass to match the target's name
@@ -1 +1 @@
1
- {"version":3,"file":"instrument-decorator.js","sourceRoot":"","sources":["../../src/common/instrument-decorator.ts"],"names":[],"mappings":";;;AAuCA,gCAuDC;AASD,gEAEC;AAzGD,6DAAqD;AAExC,QAAA,8BAA8B,GAAG,gCAAgC,CAAC;AAE/E,MAAM,kBAAkB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AAI7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,SAAgB,UAAU;IACtB,OAAO,UAAU,MAAW;QACxB,sFAAsF;QACtF,uFAAuF;QACvF,oGAAoG;QACpG,8DAA8D;QAC9D,IAAI,OAAO,CAAC,GAAG,CAAC,sCAA8B,CAAC,IAAI,IAAI,EAAE,CAAC;YACtD,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,mDAAmD;QACnD,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;YAC/B,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,MAAM,iBAAiB,GAAG,KAAM,SAAS,MAA2B;YAChE,YAAY,GAAG,IAAW;gBACtB,6CAA6C;gBAC7C,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;gBACf,MAAM,MAAM,GAAG,IAAA,0BAAS,GAAE,CAAC;gBAC3B,MAAM,EAAE,uBAAuB,EAAE,GAAG,MAAM,CAAC,aAAa,CAAC;gBACzD,IAAI,CAAC,uBAAuB,EAAE,CAAC;oBAC3B,OAAO,IAAI,CAAC;gBAChB,CAAC;gBACD,4DAA4D;gBAC5D,MAAM,QAAQ,GAAG,IAAI,CAAC;gBACtB,OAAO,IAAI,KAAK,CAAC,IAAI,EAAE;oBACnB,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;wBACf,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAc,CAAC,CAAC;wBACrC,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE,CAAC;4BACjC,OAAO,UAAU,GAAG,UAAiB;gCACjC,MAAM,qBAAqB,GACvB,QAAQ,CAAC,WAAW,CAAC,IAAI,KAAK,eAAe;oCACzC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC;oCACnD,CAAC,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;gCAChD,MAAM,iBAAiB,GAAG;oCACtB,QAAQ;oCACR,MAAM;oCACN,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC;oCACxB,IAAI,EAAE,UAAU;oCAChB,qBAAqB;iCACxB,CAAC;gCACF,OAAO,uBAAuB,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;4BACjE,CAAC,CAAC;wBACN,CAAC;wBACD,OAAO,QAAQ,CAAC;oBACpB,CAAC;iBACJ,CAAC,CAAC;YACP,CAAC;SACJ,CAAC;QAEF,mEAAmE;QACnE,MAAM,CAAC,cAAc,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QACzE,MAAM,CAAC,cAAc,CAAC,iBAAiB,EAAE,kBAAkB,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAEhF,OAAO,iBAAiB,CAAC;IAC7B,CAAC,CAAC;AACN,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,0BAA0B,CAAI,KAAQ;IAClD,OAAO,KAAK,CAAC,kBAA6B,CAAkB,CAAC;AACjE,CAAC"}
1
+ {"version":3,"file":"instrument-decorator.js","sourceRoot":"","sources":["../../src/common/instrument-decorator.ts"],"names":[],"mappings":";;;AAwCA,gCA+DC;AASD,gEAEC;AAlHD,6DAAqD;AACrD,kGAA6F;AAEhF,QAAA,8BAA8B,GAAG,gCAAgC,CAAC;AAE/E,MAAM,kBAAkB,GAAG,MAAM,CAAC,yBAAyB,CAAC,CAAC;AAI7D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,SAAgB,UAAU;IACtB,OAAO,UAAU,MAAW;QACxB,sFAAsF;QACtF,uFAAuF;QACvF,oGAAoG;QACpG,8DAA8D;QAC9D,IAAI,OAAO,CAAC,GAAG,CAAC,sCAA8B,CAAC,IAAI,IAAI,EAAE,CAAC;YACtD,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,mDAAmD;QACnD,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;YAC/B,OAAO,MAAM,CAAC;QAClB,CAAC;QACD,MAAM,iBAAiB,GAAG,KAAM,SAAS,MAA2B;YAChE,YAAY,GAAG,IAAW;gBACtB,6CAA6C;gBAC7C,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;gBACf,MAAM,MAAM,GAAG,IAAA,0BAAS,GAAE,CAAC;gBAC3B,MAAM,EAAE,uBAAuB,EAAE,GAAG,MAAM,CAAC,aAAa,CAAC;gBACzD,IAAI,CAAC,uBAAuB,EAAE,CAAC;oBAC3B,OAAO,IAAI,CAAC;gBAChB,CAAC;gBAED,IAAI,uBAAuB,YAAY,2DAA2B,EAAE,CAAC;oBACjE,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;gBAC1E,CAAC;gBAED,4DAA4D;gBAC5D,MAAM,QAAQ,GAAG,IAAI,CAAC;gBACtB,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE;oBAC1B,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE;wBACf,MAAM,QAAQ,GAAG,GAAG,CAAC,IAAc,CAAC,CAAC;wBACrC,IAAI,OAAO,QAAQ,KAAK,UAAU,EAAE,CAAC;4BACjC,sFAAsF;4BACtF,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;4BACzC,OAAO,UAAU,GAAG,UAAiB;gCACjC,MAAM,qBAAqB,GACvB,WAAW,CAAC,WAAW,CAAC,IAAI,KAAK,eAAe;oCAC5C,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,MAAM,WAAW,CAAC,GAAG,UAAU,CAAC;oCAC9C,CAAC,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,GAAG,UAAU,CAAC,CAAC;gCAC3C,MAAM,iBAAiB,GAAG;oCACtB,QAAQ;oCACR,MAAM;oCACN,UAAU,EAAE,MAAM,CAAC,IAAI,CAAC;oCACxB,IAAI,EAAE,UAAU;oCAChB,qBAAqB;iCACxB,CAAC;gCACF,OAAO,uBAAuB,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;4BACjE,CAAC,CAAC;wBACN,CAAC;wBACD,OAAO,QAAQ,CAAC;oBACpB,CAAC;iBACJ,CAAC,CAAC;gBACH,OAAO,KAAK,CAAC;YACjB,CAAC;SACJ,CAAC;QAEF,mEAAmE;QACnE,MAAM,CAAC,cAAc,CAAC,iBAAiB,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QACzE,MAAM,CAAC,cAAc,CAAC,iBAAiB,EAAE,kBAAkB,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;QAEhF,OAAO,iBAAiB,CAAC;IAC7B,CAAC,CAAC;AACN,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,0BAA0B,CAAI,KAAQ;IAClD,OAAO,KAAK,CAAC,kBAA6B,CAAkB,CAAC;AACjE,CAAC"}
@@ -168,7 +168,7 @@ export type MiddlewareHandler = Type<any> | Function;
168
168
  * apiOptions: {
169
169
  * middleware: [{
170
170
  * handler: json({ limit: '10mb' }),
171
- * route: '*',
171
+ * route: '*splat',
172
172
  * beforeListen: true,
173
173
  * }],
174
174
  * },
@@ -131,7 +131,14 @@ class Logger {
131
131
  }
132
132
  /** @internal */
133
133
  error(message, trace, context) {
134
- this.instance.error(message, context, trace);
134
+ // Nestjs ExceptionHandler can't log Error instances properly, so we need to handle them separately.
135
+ if (message instanceof Error) {
136
+ const err = message;
137
+ this.instance.error(err.message, context, err.stack);
138
+ }
139
+ else {
140
+ this.instance.error(message, context, trace);
141
+ }
135
142
  }
136
143
  /** @internal */
137
144
  warn(message, context) {
@@ -1 +1 @@
1
- {"version":3,"file":"vendure-logger.js","sourceRoot":"","sources":["../../../src/config/logger/vendure-logger.ts"],"names":[],"mappings":";;;AAEA;;;;;GAKG;AACH,IAAY,QA6BX;AA7BD,WAAY,QAAQ;IAChB;;;;OAIG;IACH,yCAAS,CAAA;IACT;;;;OAIG;IACH,uCAAQ,CAAA;IACR;;;OAGG;IACH,uCAAQ,CAAA;IACR;;;OAGG;IACH,6CAAW,CAAA;IACX;;;;OAIG;IACH,yCAAS,CAAA;AACb,CAAC,EA7BW,QAAQ,wBAAR,QAAQ,QA6BnB;AAkBD,MAAM,UAAU,GAAkB;IAC9B,KAAK;QACD,KAAK;IACT,CAAC;IACD,IAAI;QACA,KAAK;IACT,CAAC;IACD,IAAI;QACA,KAAK;IACT,CAAC;IACD,OAAO;QACH,KAAK;IACT,CAAC;IACD,KAAK;QACD,KAAK;IACT,CAAC;CACJ,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6DG;AACH,MAAa,MAAM;IAIf,MAAM,KAAK,MAAM;QACb,OAAO,IAAI,CAAC,OAAO,IAAI,UAAU,CAAC;IACtC,CAAC;IAED,IAAY,QAAQ;QAChB,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;QAC7B,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,gBAAgB;IAChB,MAAM,CAAC,SAAS,CAAC,MAAqB;QAClC,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC;IAC5B,CAAC;IAED,gBAAgB;IAChB,KAAK,CAAC,OAAY,EAAE,KAAc,EAAE,OAAgB;QAChD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,gBAAgB;IAChB,IAAI,CAAC,OAAY,EAAE,OAAgB;QAC/B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,gBAAgB;IAChB,GAAG,CAAC,OAAY,EAAE,OAAgB;QAC9B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,gBAAgB;IAChB,OAAO,CAAC,OAAY,EAAE,OAAgB;QAClC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,gBAAgB;IAChB,KAAK,CAAC,OAAY,EAAE,OAAgB;QAChC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAe,EAAE,OAAgB,EAAE,KAAc;QAC1D,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,OAAe,EAAE,OAAgB;QACzC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,OAAe,EAAE,OAAgB;QACzC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,OAAe,EAAE,OAAgB;QAC5C,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,OAAe,EAAE,OAAgB;QAC1C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC;;AA7DL,wBA8DC;AA7DkB,gBAAS,GAAkB,MAAM,CAAC"}
1
+ {"version":3,"file":"vendure-logger.js","sourceRoot":"","sources":["../../../src/config/logger/vendure-logger.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vendure/core",
3
- "version": "3.3.1",
3
+ "version": "3.3.2",
4
4
  "description": "A modern, headless ecommerce framework",
5
5
  "repository": {
6
6
  "type": "git",
@@ -49,7 +49,7 @@
49
49
  "@nestjs/platform-express": "~11.0.12",
50
50
  "@nestjs/terminus": "~11.0.0",
51
51
  "@nestjs/typeorm": "~11.0.0",
52
- "@vendure/common": "3.3.1",
52
+ "@vendure/common": "3.3.2",
53
53
  "bcrypt": "^5.1.1",
54
54
  "body-parser": "^1.20.2",
55
55
  "cookie-session": "^2.1.0",
@@ -106,5 +106,5 @@
106
106
  "sqlite3": "^5.1.7",
107
107
  "typescript": "5.8.2"
108
108
  },
109
- "gitHead": "32fbe4af70da48fef8b915e6e00abca74f092513"
109
+ "gitHead": "18a7e1f05da5921cc9478db90066654e502bea41"
110
110
  }