alchemy 0.55.2 → 0.55.3

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.
@@ -0,0 +1,3 @@
1
+ import type esbuild from "esbuild";
2
+ export declare const esbuildPluginAlias: (alias: Record<string, string>, projectRoot: string) => esbuild.Plugin;
3
+ //# sourceMappingURL=plugin-alias.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"plugin-alias.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/bundle/plugin-alias.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAMnC,eAAO,MAAM,kBAAkB,GAC7B,OAAO,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC7B,aAAa,MAAM,KAClB,OAAO,CAAC,MA8BT,CAAC"}
@@ -0,0 +1,40 @@
1
+ // esbuild's `alias` option is applied after each plugin's onResolve hook,
2
+ // whereas we would like these user-defined aliases to take precedence over
3
+ // the unenv polyfill aliases, so we reimplement the aliasing as a plugin
4
+ // to be applied before that plugin (earlier in the array of plugins)
5
+ export const esbuildPluginAlias = (alias, projectRoot) => ({
6
+ name: "alias",
7
+ setup(build) {
8
+ if (!alias) {
9
+ return;
10
+ }
11
+ // filter the hook calls to only those that match the alias keys
12
+ // this should avoid slowing down builds which don't use aliasing
13
+ const filter = new RegExp(Object.keys(alias)
14
+ .map((key) => escapeRegex(key))
15
+ .join("|"));
16
+ // reimplement module aliasing as an esbuild plugin onResolve hook
17
+ build.onResolve({ filter }, (args) => {
18
+ const aliasPath = alias[args.path];
19
+ if (aliasPath) {
20
+ return {
21
+ // resolve with node resolution
22
+ path: require.resolve(aliasPath, {
23
+ // From the esbuild alias docs: "Note that when an import path is substituted using an alias, the resulting import path is resolved in the working directory instead of in the directory containing the source file with the import path."
24
+ // https://esbuild.github.io/api/#alias:~:text=Note%20that%20when%20an%20import%20path%20is%20substituted%20using%20an%20alias%2C%20the%20resulting%20import%20path%20is%20resolved%20in%20the%20working%20directory%20instead%20of%20in%20the%20directory%20containing%20the%20source%20file%20with%20the%20import%20path.
25
+ paths: [projectRoot],
26
+ }),
27
+ };
28
+ }
29
+ });
30
+ },
31
+ });
32
+ // Taken from https://stackoverflow.com/a/3561711
33
+ // which is everything from the tc39 proposal, plus the following two characters: ^/
34
+ // It's also everything included in the URLPattern escape (https://wicg.github.io/urlpattern/#escape-a-regexp-string), plus the following: -
35
+ // As the answer says, there's no downside to escaping these extra characters, so better safe than sorry
36
+ const ESCAPE_REGEX_CHARACTERS = /[-/\\^$*+?.()|[\]{}]/g;
37
+ const escapeRegex = (str) => {
38
+ return str.replace(ESCAPE_REGEX_CHARACTERS, "\\$&");
39
+ };
40
+ //# sourceMappingURL=plugin-alias.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"plugin-alias.js","sourceRoot":"","sources":["../../../src/cloudflare/bundle/plugin-alias.ts"],"names":[],"mappings":"AAEA,0EAA0E;AAC1E,2EAA2E;AAC3E,yEAAyE;AACzE,qEAAqE;AACrE,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,KAA6B,EAC7B,WAAmB,EACH,EAAE,CAAC,CAAC;IACpB,IAAI,EAAE,OAAO;IACb,KAAK,CAAC,KAAK;QACT,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO;QACT,CAAC;QAED,gEAAgE;QAChE,iEAAiE;QACjE,MAAM,MAAM,GAAG,IAAI,MAAM,CACvB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACf,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;aAC9B,IAAI,CAAC,GAAG,CAAC,CACb,CAAC;QAEF,kEAAkE;QAClE,KAAK,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;YACnC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACnC,IAAI,SAAS,EAAE,CAAC;gBACd,OAAO;oBACL,+BAA+B;oBAC/B,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE;wBAC/B,0OAA0O;wBAC1O,2TAA2T;wBAC3T,KAAK,EAAE,CAAC,WAAW,CAAC;qBACrB,CAAC;iBACH,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC;AAEH,iDAAiD;AACjD,oFAAoF;AACpF,4IAA4I;AAC5I,wGAAwG;AACxG,MAAM,uBAAuB,GAAG,uBAAuB,CAAC;AACxD,MAAM,WAAW,GAAG,CAAC,GAAW,EAAE,EAAE;IAClC,OAAO,GAAG,CAAC,OAAO,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"worker-bundle.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker-bundle.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"worker-bundle.d.ts","sourceRoot":"","sources":["../../src/cloudflare/worker-bundle.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@ import { err, ok } from "neverthrow";
3
3
  import fs from "node:fs/promises";
4
4
  import path from "node:path";
5
5
  import { external, external_als } from "./bundle/externals.js";
6
+ import { esbuildPluginAlias } from "./bundle/plugin-alias.js";
6
7
  import { esbuildPluginCompatWarning } from "./bundle/plugin-compat-warning.js";
7
8
  import { createHotReloadPlugin } from "./bundle/plugin-hot-reload.js";
8
9
  import { esbuildPluginHybridNodeCompat } from "./bundle/plugin-hybrid-node-compat.js";
@@ -224,13 +225,13 @@ export var WorkerBundleSource;
224
225
  ...props.loader,
225
226
  },
226
227
  plugins: [
228
+ esbuildPluginAlias(props.alias ?? {}, this.props.cwd),
227
229
  nodeCompat === "v2"
228
230
  ? esbuildPluginHybridNodeCompat()
229
231
  : esbuildPluginCompatWarning(nodeCompat ?? null),
230
232
  ...(props.plugins ?? []),
231
233
  ...additionalPlugins,
232
234
  ],
233
- alias: props.alias,
234
235
  external: [
235
236
  ...(nodeCompat === "als" ? external_als : external),
236
237
  ...(props.external ?? []),
@@ -1 +1 @@
1
- {"version":3,"file":"worker-bundle.js","sourceRoot":"","sources":["../../src/cloudflare/worker-bundle.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"worker-bundle.js","sourceRoot":"","sources":["../../src/cloudflare/worker-bundle.ts"],"names":[],"mappings":"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"}
@@ -7,7 +7,7 @@ export interface TelemetryClientOptions {
7
7
  quiet: boolean;
8
8
  }
9
9
  export interface ITelemetryClient {
10
- ready: Promise<void>;
10
+ ready: Promise<unknown>;
11
11
  record(event: Telemetry.EventInput): void;
12
12
  finalize(): Promise<void>;
13
13
  }
@@ -18,11 +18,10 @@ export declare class NoopTelemetryClient implements ITelemetryClient {
18
18
  }
19
19
  export declare class TelemetryClient implements ITelemetryClient {
20
20
  readonly options: TelemetryClientOptions;
21
- ready: Promise<void>;
21
+ private context;
22
22
  private events;
23
- private context?;
24
23
  constructor(options: TelemetryClientOptions);
25
- private init;
24
+ get ready(): Promise<Telemetry.Context>;
26
25
  record(event: Telemetry.EventInput, timestamp?: number): void;
27
26
  private serializeError;
28
27
  finalize(): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/util/telemetry/client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAO9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACrB,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,UAAU,GAAG,IAAI,CAAC;IAC1C,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED,qBAAa,mBAAoB,YAAW,gBAAgB;IAC1D,KAAK,gBAAqB;IAC1B,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,UAAU;IAC9B,QAAQ;CAGT;AAED,qBAAa,eAAgB,YAAW,gBAAgB;IAM1C,QAAQ,CAAC,OAAO,EAAE,sBAAsB;IALpD,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAErB,OAAO,CAAC,MAAM,CAAyB;IACvC,OAAO,CAAC,OAAO,CAAC,CAAoB;gBAEf,OAAO,EAAE,sBAAsB;YAItC,IAAI;IAclB,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,UAAU,EAAE,SAAS,SAAa;IAS1D,OAAO,CAAC,cAAc;IAkBhB,QAAQ;YAQA,IAAI;IAkClB,MAAM,CAAC,MAAM,CAAC,EACZ,KAAK,EACL,OAAO,EACP,KAAK,GACN,EAAE,IAAI,CAAC,sBAAsB,EAAE,WAAW,CAAC,GAAG,gBAAgB;CAchE"}
1
+ {"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/util/telemetry/client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAO9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;CAChB;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IACxB,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,UAAU,GAAG,IAAI,CAAC;IAC1C,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC3B;AAED,qBAAa,mBAAoB,YAAW,gBAAgB;IAC1D,KAAK,gBAAqB;IAC1B,MAAM,CAAC,CAAC,EAAE,SAAS,CAAC,UAAU;IAC9B,QAAQ;CAGT;AAED,qBAAa,eAAgB,YAAW,gBAAgB;IAI1C,QAAQ,CAAC,OAAO,EAAE,sBAAsB;IAHpD,OAAO,CAAC,OAAO,CAA6B;IAC5C,OAAO,CAAC,MAAM,CAAyB;gBAElB,OAAO,EAAE,sBAAsB;IAUpD,IAAI,KAAK,+BAER;IAED,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,UAAU,EAAE,SAAS,SAAa;IAS1D,OAAO,CAAC,cAAc;IAiBhB,QAAQ;YAQA,IAAI;IA+BlB,MAAM,CAAC,MAAM,CAAC,EACZ,KAAK,EACL,OAAO,EACP,KAAK,GACN,EAAE,IAAI,CAAC,sBAAsB,EAAE,WAAW,CAAC,GAAG,gBAAgB;CAchE"}
@@ -10,22 +10,20 @@ export class NoopTelemetryClient {
10
10
  }
11
11
  export class TelemetryClient {
12
12
  options;
13
- ready;
14
- events = [];
15
13
  context;
14
+ events = [];
16
15
  constructor(options) {
17
16
  this.options = options;
18
- this.ready = this.init();
19
- }
20
- async init() {
21
- const now = Date.now();
22
- this.context = await context({
17
+ this.context = context({
23
18
  sessionId: this.options.sessionId,
24
19
  phase: this.options.phase,
25
20
  });
26
21
  this.record({
27
22
  event: "app.start",
28
- }, now);
23
+ });
24
+ }
25
+ get ready() {
26
+ return this.context;
29
27
  }
30
28
  record(event, timestamp = Date.now()) {
31
29
  const payload = {
@@ -43,9 +41,8 @@ export class TelemetryClient {
43
41
  return {
44
42
  ...error, // include additional properties from error object
45
43
  name: error.name,
46
- message: error.message,
47
- // TODO: maybe redact more of the stack trace?
48
- stack: error.stack?.replaceAll(os.homedir(), "~"), // redact home directory
44
+ message: error.message?.replaceAll(os.homedir(), "~"), // redact home directory
45
+ stack: error.stack?.replaceAll(os.homedir(), "~"),
49
46
  };
50
47
  }
51
48
  return error;
@@ -58,10 +55,10 @@ export class TelemetryClient {
58
55
  });
59
56
  }
60
57
  async send(events) {
61
- if (events.length === 0 || this.context) {
58
+ if (events.length === 0) {
62
59
  return;
63
60
  }
64
- const { userId, ...data } = this.context;
61
+ const { userId, ...context } = await this.context;
65
62
  const response = await fetch(`${POSTHOG_CLIENT_API_HOST}/batch`, {
66
63
  method: "POST",
67
64
  headers: {
@@ -70,18 +67,15 @@ export class TelemetryClient {
70
67
  body: JSON.stringify({
71
68
  api_key: POSTHOG_PROJECT_ID,
72
69
  historical_migration: false,
73
- batch: events.map((e) => {
74
- const { event, ...eventData } = e;
75
- return {
76
- event: event,
77
- properties: {
78
- distinct_id: userId,
79
- ...data,
80
- ...eventData,
81
- },
82
- timestamp: new Date(e.timestamp).toISOString(),
83
- };
84
- }),
70
+ batch: events.map(({ event, timestamp, ...properties }) => ({
71
+ event,
72
+ properties: {
73
+ distinct_id: userId,
74
+ ...context,
75
+ ...properties,
76
+ },
77
+ timestamp: new Date(timestamp).toISOString(),
78
+ })),
85
79
  }),
86
80
  });
87
81
  if (!response.ok) {
@@ -1 +1 @@
1
- {"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/util/telemetry/client.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/util/telemetry/client.ts"],"names":[],"mappings":"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"}
@@ -57,7 +57,7 @@ export declare namespace Telemetry {
57
57
  error?: SerializedError;
58
58
  }
59
59
  type Event = AppEvent | ResourceEvent | StateStoreEvent;
60
- type EventInput = (Omit<AppEvent, "context" | "timestamp" | "error"> | Omit<ResourceEvent, "context" | "timestamp" | "error"> | Omit<StateStoreEvent, "context" | "timestamp" | "error">) & {
60
+ type EventInput = (Omit<AppEvent, "timestamp" | "error"> | Omit<ResourceEvent, "timestamp" | "error"> | Omit<StateStoreEvent, "timestamp" | "error">) & {
61
61
  error?: ErrorInput;
62
62
  };
63
63
  }
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/util/telemetry/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9C,yBAAiB,SAAS,CAAC;IACzB,UAAiB,OAAO;QACtB,yJAAyJ;QACzJ,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QACtB,kGAAkG;QAClG,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,+CAA+C;QAC/C,SAAS,EAAE,MAAM,CAAC;QAElB,MAAM,EAAE;YACN,QAAQ,EAAE,MAAM,CAAC;YACjB,SAAS,EAAE,MAAM,CAAC;YAClB,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,EAAE,MAAM,CAAC;YACb,MAAM,EAAE,MAAM,CAAC;SAChB,CAAC;QAEF,OAAO,EAAE;YACP,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;YACpB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;SACxB,CAAC;QAEF,WAAW,EAAE;YACX,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;YACxB,IAAI,EAAE,OAAO,CAAC;SACf,CAAC;QAEF,OAAO,EAAE;YACP,OAAO,EAAE,MAAM,CAAC;YAChB,KAAK,EAAE,KAAK,CAAC;SACd,CAAC;KACH;IAED,UAAiB,SAAS;QACxB,KAAK,EAAE,MAAM,CAAC;QACd,SAAS,EAAE,MAAM,CAAC;KACnB;IAED,UAAiB,eAAe;QAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB;IAED,KAAY,UAAU,GAAG,KAAK,GAAG,eAAe,CAAC;IAEjD,UAAiB,QAAS,SAAQ,SAAS;QACzC,KAAK,EAAE,WAAW,GAAG,aAAa,GAAG,WAAW,CAAC;QACjD,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,eAAe,CAAC;KACzB;IAED,UAAiB,aAAc,SAAQ,SAAS;QAC9C,KAAK,EACD,gBAAgB,GAChB,kBAAkB,GAClB,gBAAgB,GAChB,eAAe,GACf,eAAe,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,CAAC,EACH,UAAU,GACV,SAAS,GACT,UAAU,GACV,SAAS,GACT,UAAU,GACV,SAAS,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,eAAe,CAAC;QACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB;IAED,UAAiB,eAAgB,SAAQ,SAAS;QAChD,KAAK,EACD,iBAAiB,GACjB,mBAAmB,GACnB,iBAAiB,GACjB,kBAAkB,GAClB,gBAAgB,GAChB,qBAAqB,GACrB,gBAAgB,GAChB,gBAAgB,GAChB,mBAAmB,CAAC;QACxB,eAAe,EAAE,MAAM,CAAC;QACxB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,eAAe,CAAC;KACzB;IAED,KAAY,KAAK,GAAG,QAAQ,GAAG,aAAa,GAAG,eAAe,CAAC;IAC/D,KAAY,UAAU,GAAG,CACrB,IAAI,CAAC,QAAQ,EAAE,SAAS,GAAG,WAAW,GAAG,OAAO,CAAC,GACjD,IAAI,CAAC,aAAa,EAAE,SAAS,GAAG,WAAW,GAAG,OAAO,CAAC,GACtD,IAAI,CAAC,eAAe,EAAE,SAAS,GAAG,WAAW,GAAG,OAAO,CAAC,CAC3D,GAAG;QACF,KAAK,CAAC,EAAE,UAAU,CAAC;KACpB,CAAC;CACH"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/util/telemetry/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAE9C,yBAAiB,SAAS,CAAC;IACzB,UAAiB,OAAO;QACtB,yJAAyJ;QACzJ,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QACtB,kGAAkG;QAClG,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;QACzB,+CAA+C;QAC/C,SAAS,EAAE,MAAM,CAAC;QAElB,MAAM,EAAE;YACN,QAAQ,EAAE,MAAM,CAAC;YACjB,SAAS,EAAE,MAAM,CAAC;YAClB,IAAI,EAAE,MAAM,CAAC;YACb,IAAI,EAAE,MAAM,CAAC;YACb,MAAM,EAAE,MAAM,CAAC;SAChB,CAAC;QAEF,OAAO,EAAE;YACP,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;YACpB,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;SACxB,CAAC;QAEF,WAAW,EAAE;YACX,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;YACxB,IAAI,EAAE,OAAO,CAAC;SACf,CAAC;QAEF,OAAO,EAAE;YACP,OAAO,EAAE,MAAM,CAAC;YAChB,KAAK,EAAE,KAAK,CAAC;SACd,CAAC;KACH;IAED,UAAiB,SAAS;QACxB,KAAK,EAAE,MAAM,CAAC;QACd,SAAS,EAAE,MAAM,CAAC;KACnB;IAED,UAAiB,eAAe;QAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,OAAO,EAAE,MAAM,CAAC;QAChB,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB;IAED,KAAY,UAAU,GAAG,KAAK,GAAG,eAAe,CAAC;IAEjD,UAAiB,QAAS,SAAQ,SAAS;QACzC,KAAK,EAAE,WAAW,GAAG,aAAa,GAAG,WAAW,CAAC;QACjD,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,eAAe,CAAC;KACzB;IAED,UAAiB,aAAc,SAAQ,SAAS;QAC9C,KAAK,EACD,gBAAgB,GAChB,kBAAkB,GAClB,gBAAgB,GAChB,eAAe,GACf,eAAe,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,MAAM,CAAC,EACH,UAAU,GACV,SAAS,GACT,UAAU,GACV,SAAS,GACT,UAAU,GACV,SAAS,CAAC;QACd,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,eAAe,CAAC;QACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;KACpB;IAED,UAAiB,eAAgB,SAAQ,SAAS;QAChD,KAAK,EACD,iBAAiB,GACjB,mBAAmB,GACnB,iBAAiB,GACjB,kBAAkB,GAClB,gBAAgB,GAChB,qBAAqB,GACrB,gBAAgB,GAChB,gBAAgB,GAChB,mBAAmB,CAAC;QACxB,eAAe,EAAE,MAAM,CAAC;QACxB,OAAO,CAAC,EAAE,MAAM,CAAC;QACjB,KAAK,CAAC,EAAE,eAAe,CAAC;KACzB;IAED,KAAY,KAAK,GAAG,QAAQ,GAAG,aAAa,GAAG,eAAe,CAAC;IAC/D,KAAY,UAAU,GAAG,CACrB,IAAI,CAAC,QAAQ,EAAE,WAAW,GAAG,OAAO,CAAC,GACrC,IAAI,CAAC,aAAa,EAAE,WAAW,GAAG,OAAO,CAAC,GAC1C,IAAI,CAAC,eAAe,EAAE,WAAW,GAAG,OAAO,CAAC,CAC/C,GAAG;QACF,KAAK,CAAC,EAAE,UAAU,CAAC;KACpB,CAAC;CACH"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "alchemy",
3
- "version": "0.55.2",
3
+ "version": "0.55.3",
4
4
  "license": "Apache-2.0",
5
5
  "author": "Sam Goodwin <sam@alchemy.run>",
6
6
  "homepage": "https://alchemy.run",
@@ -0,0 +1,49 @@
1
+ import type esbuild from "esbuild";
2
+
3
+ // esbuild's `alias` option is applied after each plugin's onResolve hook,
4
+ // whereas we would like these user-defined aliases to take precedence over
5
+ // the unenv polyfill aliases, so we reimplement the aliasing as a plugin
6
+ // to be applied before that plugin (earlier in the array of plugins)
7
+ export const esbuildPluginAlias = (
8
+ alias: Record<string, string>,
9
+ projectRoot: string,
10
+ ): esbuild.Plugin => ({
11
+ name: "alias",
12
+ setup(build) {
13
+ if (!alias) {
14
+ return;
15
+ }
16
+
17
+ // filter the hook calls to only those that match the alias keys
18
+ // this should avoid slowing down builds which don't use aliasing
19
+ const filter = new RegExp(
20
+ Object.keys(alias)
21
+ .map((key) => escapeRegex(key))
22
+ .join("|"),
23
+ );
24
+
25
+ // reimplement module aliasing as an esbuild plugin onResolve hook
26
+ build.onResolve({ filter }, (args) => {
27
+ const aliasPath = alias[args.path];
28
+ if (aliasPath) {
29
+ return {
30
+ // resolve with node resolution
31
+ path: require.resolve(aliasPath, {
32
+ // From the esbuild alias docs: "Note that when an import path is substituted using an alias, the resulting import path is resolved in the working directory instead of in the directory containing the source file with the import path."
33
+ // https://esbuild.github.io/api/#alias:~:text=Note%20that%20when%20an%20import%20path%20is%20substituted%20using%20an%20alias%2C%20the%20resulting%20import%20path%20is%20resolved%20in%20the%20working%20directory%20instead%20of%20in%20the%20directory%20containing%20the%20source%20file%20with%20the%20import%20path.
34
+ paths: [projectRoot],
35
+ }),
36
+ };
37
+ }
38
+ });
39
+ },
40
+ });
41
+
42
+ // Taken from https://stackoverflow.com/a/3561711
43
+ // which is everything from the tc39 proposal, plus the following two characters: ^/
44
+ // It's also everything included in the URLPattern escape (https://wicg.github.io/urlpattern/#escape-a-regexp-string), plus the following: -
45
+ // As the answer says, there's no downside to escaping these extra characters, so better safe than sorry
46
+ const ESCAPE_REGEX_CHARACTERS = /[-/\\^$*+?.()|[\]{}]/g;
47
+ const escapeRegex = (str: string) => {
48
+ return str.replace(ESCAPE_REGEX_CHARACTERS, "\\$&");
49
+ };
@@ -3,6 +3,7 @@ import { err, ok, type Result } from "neverthrow";
3
3
  import fs from "node:fs/promises";
4
4
  import path from "node:path";
5
5
  import { external, external_als } from "./bundle/externals.ts";
6
+ import { esbuildPluginAlias } from "./bundle/plugin-alias.ts";
6
7
  import { esbuildPluginCompatWarning } from "./bundle/plugin-compat-warning.ts";
7
8
  import { createHotReloadPlugin } from "./bundle/plugin-hot-reload.ts";
8
9
  import { esbuildPluginHybridNodeCompat } from "./bundle/plugin-hybrid-node-compat.ts";
@@ -319,13 +320,13 @@ export namespace WorkerBundleSource {
319
320
  ...props.loader,
320
321
  },
321
322
  plugins: [
323
+ esbuildPluginAlias(props.alias ?? {}, this.props.cwd),
322
324
  nodeCompat === "v2"
323
325
  ? esbuildPluginHybridNodeCompat()
324
326
  : esbuildPluginCompatWarning(nodeCompat ?? null),
325
327
  ...(props.plugins ?? []),
326
328
  ...additionalPlugins,
327
329
  ],
328
- alias: props.alias,
329
330
  external: [
330
331
  ...(nodeCompat === "als" ? external_als : external),
331
332
  ...(props.external ?? []),
@@ -16,7 +16,7 @@ export interface TelemetryClientOptions {
16
16
  }
17
17
 
18
18
  export interface ITelemetryClient {
19
- ready: Promise<void>;
19
+ ready: Promise<unknown>;
20
20
  record(event: Telemetry.EventInput): void;
21
21
  finalize(): Promise<void>;
22
22
  }
@@ -30,27 +30,21 @@ export class NoopTelemetryClient implements ITelemetryClient {
30
30
  }
31
31
 
32
32
  export class TelemetryClient implements ITelemetryClient {
33
- ready: Promise<void>;
34
-
33
+ private context: Promise<Telemetry.Context>;
35
34
  private events: Telemetry.Event[] = [];
36
- private context?: Telemetry.Context;
37
35
 
38
36
  constructor(readonly options: TelemetryClientOptions) {
39
- this.ready = this.init();
40
- }
41
-
42
- private async init() {
43
- const now = Date.now();
44
- this.context = await context({
37
+ this.context = context({
45
38
  sessionId: this.options.sessionId,
46
39
  phase: this.options.phase,
47
40
  });
48
- this.record(
49
- {
50
- event: "app.start",
51
- },
52
- now,
53
- );
41
+ this.record({
42
+ event: "app.start",
43
+ });
44
+ }
45
+
46
+ get ready() {
47
+ return this.context;
54
48
  }
55
49
 
56
50
  record(event: Telemetry.EventInput, timestamp = Date.now()) {
@@ -72,9 +66,8 @@ export class TelemetryClient implements ITelemetryClient {
72
66
  return {
73
67
  ...error, // include additional properties from error object
74
68
  name: error.name,
75
- message: error.message,
76
- // TODO: maybe redact more of the stack trace?
77
- stack: error.stack?.replaceAll(os.homedir(), "~"), // redact home directory
69
+ message: error.message?.replaceAll(os.homedir(), "~"), // redact home directory
70
+ stack: error.stack?.replaceAll(os.homedir(), "~"),
78
71
  };
79
72
  }
80
73
  return error;
@@ -89,10 +82,10 @@ export class TelemetryClient implements ITelemetryClient {
89
82
  }
90
83
 
91
84
  private async send(events: Telemetry.Event[]) {
92
- if (events.length === 0 || this.context) {
85
+ if (events.length === 0) {
93
86
  return;
94
87
  }
95
- const { userId, ...data } = this.context!;
88
+ const { userId, ...context } = await this.context;
96
89
  const response = await fetch(`${POSTHOG_CLIENT_API_HOST}/batch`, {
97
90
  method: "POST",
98
91
  headers: {
@@ -101,18 +94,15 @@ export class TelemetryClient implements ITelemetryClient {
101
94
  body: JSON.stringify({
102
95
  api_key: POSTHOG_PROJECT_ID,
103
96
  historical_migration: false,
104
- batch: events.map((e) => {
105
- const { event, ...eventData } = e;
106
- return {
107
- event: event,
108
- properties: {
109
- distinct_id: userId,
110
- ...data,
111
- ...eventData,
112
- },
113
- timestamp: new Date(e.timestamp).toISOString(),
114
- };
115
- }),
97
+ batch: events.map(({ event, timestamp, ...properties }) => ({
98
+ event,
99
+ properties: {
100
+ distinct_id: userId,
101
+ ...context,
102
+ ...properties,
103
+ },
104
+ timestamp: new Date(timestamp).toISOString(),
105
+ })),
116
106
  }),
117
107
  });
118
108
  if (!response.ok) {
@@ -90,9 +90,9 @@ export namespace Telemetry {
90
90
 
91
91
  export type Event = AppEvent | ResourceEvent | StateStoreEvent;
92
92
  export type EventInput = (
93
- | Omit<AppEvent, "context" | "timestamp" | "error">
94
- | Omit<ResourceEvent, "context" | "timestamp" | "error">
95
- | Omit<StateStoreEvent, "context" | "timestamp" | "error">
93
+ | Omit<AppEvent, "timestamp" | "error">
94
+ | Omit<ResourceEvent, "timestamp" | "error">
95
+ | Omit<StateStoreEvent, "timestamp" | "error">
96
96
  ) & {
97
97
  error?: ErrorInput;
98
98
  };