alchemy 0.65.1 → 0.66.0
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/bin/alchemy.js +132 -78
- package/bin/commands/init.ts +6 -3
- package/bin/services/cdp-manager/server.ts +3 -2
- package/bin/services/execute-alchemy.ts +33 -3
- package/bin/services/find-workspace-root.ts +48 -0
- package/lib/alchemy.d.ts +14 -3
- package/lib/alchemy.d.ts.map +1 -1
- package/lib/alchemy.js +17 -5
- package/lib/alchemy.js.map +1 -1
- package/lib/apply.d.ts.map +1 -1
- package/lib/apply.js +51 -1
- package/lib/apply.js.map +1 -1
- package/lib/cloudflare/bucket.js +1 -1
- package/lib/cloudflare/bucket.js.map +1 -1
- package/lib/cloudflare/cloudflare-env-proxy.js +3 -3
- package/lib/cloudflare/cloudflare-env-proxy.js.map +1 -1
- package/lib/cloudflare/compatibility-date.gen.d.ts +1 -1
- package/lib/cloudflare/compatibility-date.gen.js +1 -1
- package/lib/cloudflare/d1-database.d.ts.map +1 -1
- package/lib/cloudflare/d1-database.js +2 -1
- package/lib/cloudflare/d1-database.js.map +1 -1
- package/lib/cloudflare/d1-local-migrations.d.ts +1 -0
- package/lib/cloudflare/d1-local-migrations.d.ts.map +1 -1
- package/lib/cloudflare/d1-local-migrations.js +3 -2
- package/lib/cloudflare/d1-local-migrations.js.map +1 -1
- package/lib/cloudflare/kv-namespace.js +1 -1
- package/lib/cloudflare/kv-namespace.js.map +1 -1
- package/lib/cloudflare/miniflare/delete.d.ts +3 -2
- package/lib/cloudflare/miniflare/delete.d.ts.map +1 -1
- package/lib/cloudflare/miniflare/delete.js +13 -12
- package/lib/cloudflare/miniflare/delete.js.map +1 -1
- package/lib/cloudflare/miniflare/miniflare-controller.d.ts.map +1 -1
- package/lib/cloudflare/miniflare/miniflare-controller.js +5 -4
- package/lib/cloudflare/miniflare/miniflare-controller.js.map +1 -1
- package/lib/cloudflare/miniflare/paths.d.ts +4 -4
- package/lib/cloudflare/miniflare/paths.d.ts.map +1 -1
- package/lib/cloudflare/miniflare/paths.js +10 -4
- package/lib/cloudflare/miniflare/paths.js.map +1 -1
- package/lib/cloudflare/miniflare/symlink-miniflare-state.d.ts +2 -0
- package/lib/cloudflare/miniflare/symlink-miniflare-state.d.ts.map +1 -0
- package/lib/cloudflare/miniflare/symlink-miniflare-state.js +19 -0
- package/lib/cloudflare/miniflare/symlink-miniflare-state.js.map +1 -0
- package/lib/cloudflare/nuxt/plugin.d.ts.map +1 -1
- package/lib/cloudflare/nuxt/plugin.js +3 -3
- package/lib/cloudflare/nuxt/plugin.js.map +1 -1
- package/lib/cloudflare/redwood/plugin.js +2 -2
- package/lib/cloudflare/redwood/plugin.js.map +1 -1
- package/lib/cloudflare/vite/plugin.d.ts.map +1 -1
- package/lib/cloudflare/vite/plugin.js +6 -3
- package/lib/cloudflare/vite/plugin.js.map +1 -1
- package/lib/cloudflare/website.d.ts.map +1 -1
- package/lib/cloudflare/website.js +5 -16
- package/lib/cloudflare/website.js.map +1 -1
- package/lib/cloudflare/worker.d.ts.map +1 -1
- package/lib/cloudflare/worker.js +4 -2
- package/lib/cloudflare/worker.js.map +1 -1
- package/lib/cloudflare/wrangler.json.js +1 -0
- package/lib/cloudflare/wrangler.json.js.map +1 -1
- package/lib/scope.d.ts +16 -0
- package/lib/scope.d.ts.map +1 -1
- package/lib/scope.js +10 -5
- package/lib/scope.js.map +1 -1
- package/lib/state/file-system-state-store.d.ts.map +1 -1
- package/lib/state/file-system-state-store.js +1 -2
- package/lib/state/file-system-state-store.js.map +1 -1
- package/lib/state/sqlite-state-store.d.ts +11 -0
- package/lib/state/sqlite-state-store.d.ts.map +1 -1
- package/lib/state/sqlite-state-store.js +22 -14
- package/lib/state/sqlite-state-store.js.map +1 -1
- package/lib/stripe/customer.d.ts +0 -8
- package/lib/stripe/customer.d.ts.map +1 -1
- package/lib/stripe/customer.js +0 -6
- package/lib/stripe/customer.js.map +1 -1
- package/lib/stripe/price.d.ts +23 -23
- package/lib/stripe/price.d.ts.map +1 -1
- package/lib/stripe/price.js +6 -22
- package/lib/stripe/price.js.map +1 -1
- package/lib/test/vitest.d.ts.map +1 -1
- package/lib/test/vitest.js +1 -1
- package/lib/test/vitest.js.map +1 -1
- package/lib/util/assert-never.js +1 -1
- package/lib/util/assert-never.js.map +1 -1
- package/lib/util/cli.d.ts.map +1 -1
- package/lib/util/cli.js +12 -13
- package/lib/util/cli.js.map +1 -1
- package/lib/util/root-dir.d.ts +2 -0
- package/lib/util/root-dir.d.ts.map +1 -0
- package/lib/util/root-dir.js +2 -0
- package/lib/util/root-dir.js.map +1 -0
- package/package.json +4 -4
- package/src/alchemy.ts +36 -8
- package/src/apply.ts +58 -3
- package/src/cloudflare/bucket.ts +1 -1
- package/src/cloudflare/cloudflare-env-proxy.ts +5 -5
- package/src/cloudflare/compatibility-date.gen.ts +1 -1
- package/src/cloudflare/d1-database.ts +2 -1
- package/src/cloudflare/d1-local-migrations.ts +10 -6
- package/src/cloudflare/kv-namespace.ts +1 -1
- package/src/cloudflare/miniflare/delete.ts +19 -11
- package/src/cloudflare/miniflare/miniflare-controller.ts +10 -6
- package/src/cloudflare/miniflare/paths.ts +11 -7
- package/src/cloudflare/miniflare/symlink-miniflare-state.ts +19 -0
- package/src/cloudflare/nuxt/plugin.ts +12 -3
- package/src/cloudflare/redwood/plugin.ts +2 -2
- package/src/cloudflare/vite/plugin.ts +8 -3
- package/src/cloudflare/website.ts +5 -19
- package/src/cloudflare/worker.ts +4 -2
- package/src/cloudflare/wrangler.json.ts +1 -0
- package/src/scope.ts +26 -5
- package/src/state/file-system-state-store.ts +1 -2
- package/src/state/sqlite-state-store.ts +41 -14
- package/src/stripe/customer.ts +0 -14
- package/src/stripe/price.ts +59 -56
- package/src/test/vitest.ts +4 -1
- package/src/util/assert-never.ts +1 -1
- package/src/util/cli.ts +15 -13
- package/src/util/root-dir.ts +1 -0
- package/templates/nextjs/alchemy.run.ts +2 -2
- package/workers/cloudflare-state-store.js +1 -1
package/lib/stripe/customer.js
CHANGED
|
@@ -86,7 +86,6 @@ export const Customer = Resource("stripe::Customer", async function (_id, props)
|
|
|
86
86
|
}
|
|
87
87
|
: undefined,
|
|
88
88
|
balance: props.balance,
|
|
89
|
-
coupon: props.coupon,
|
|
90
89
|
description: props.description,
|
|
91
90
|
email: props.email,
|
|
92
91
|
invoice_prefix: props.invoicePrefix,
|
|
@@ -95,7 +94,6 @@ export const Customer = Resource("stripe::Customer", async function (_id, props)
|
|
|
95
94
|
next_invoice_sequence: props.nextInvoiceSequence,
|
|
96
95
|
phone: props.phone,
|
|
97
96
|
preferred_locales: props.preferredLocales,
|
|
98
|
-
promotion_code: props.promotionCode,
|
|
99
97
|
shipping: props.shipping,
|
|
100
98
|
source: props.source,
|
|
101
99
|
tax_exempt: props.taxExempt,
|
|
@@ -127,7 +125,6 @@ export const Customer = Resource("stripe::Customer", async function (_id, props)
|
|
|
127
125
|
}
|
|
128
126
|
: undefined,
|
|
129
127
|
balance: props.balance,
|
|
130
|
-
coupon: props.coupon,
|
|
131
128
|
description: props.description,
|
|
132
129
|
email: props.email,
|
|
133
130
|
invoice_prefix: props.invoicePrefix,
|
|
@@ -137,7 +134,6 @@ export const Customer = Resource("stripe::Customer", async function (_id, props)
|
|
|
137
134
|
payment_method: props.paymentMethod,
|
|
138
135
|
phone: props.phone,
|
|
139
136
|
preferred_locales: props.preferredLocales,
|
|
140
|
-
promotion_code: props.promotionCode,
|
|
141
137
|
shipping: props.shipping,
|
|
142
138
|
source: props.source,
|
|
143
139
|
tax_exempt: props.taxExempt,
|
|
@@ -174,7 +170,6 @@ export const Customer = Resource("stripe::Customer", async function (_id, props)
|
|
|
174
170
|
}
|
|
175
171
|
: undefined,
|
|
176
172
|
balance: props.balance,
|
|
177
|
-
coupon: props.coupon,
|
|
178
173
|
description: props.description,
|
|
179
174
|
email: props.email,
|
|
180
175
|
invoice_prefix: props.invoicePrefix,
|
|
@@ -183,7 +178,6 @@ export const Customer = Resource("stripe::Customer", async function (_id, props)
|
|
|
183
178
|
next_invoice_sequence: props.nextInvoiceSequence,
|
|
184
179
|
phone: props.phone,
|
|
185
180
|
preferred_locales: props.preferredLocales,
|
|
186
|
-
promotion_code: props.promotionCode,
|
|
187
181
|
shipping: props.shipping,
|
|
188
182
|
source: props.source,
|
|
189
183
|
tax_exempt: props.taxExempt,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"customer.js","sourceRoot":"","sources":["../../src/stripe/customer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"customer.js","sourceRoot":"","sources":["../../src/stripe/customer.ts"],"names":[],"mappings":"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"}
|
package/lib/stripe/price.d.ts
CHANGED
|
@@ -2,10 +2,11 @@ import type Stripe from "stripe";
|
|
|
2
2
|
import type { Context } from "../context.ts";
|
|
3
3
|
import { Resource } from "../resource.ts";
|
|
4
4
|
import type { Secret } from "../secret.ts";
|
|
5
|
+
import type { Meter } from "./meter.ts";
|
|
5
6
|
/**
|
|
6
7
|
* Properties for price recurring configuration
|
|
7
8
|
*/
|
|
8
|
-
export
|
|
9
|
+
export type PriceRecurring = {
|
|
9
10
|
/**
|
|
10
11
|
* Specifies billing frequency. Either 'day', 'week', 'month' or 'year'.
|
|
11
12
|
*/
|
|
@@ -16,22 +17,34 @@ export interface PriceRecurring {
|
|
|
16
17
|
intervalCount?: number;
|
|
17
18
|
/**
|
|
18
19
|
* Configures how the quantity per period should be determined, can be either 'metered' or 'licensed'.
|
|
19
|
-
* 'licensed' will automatically bill the quantity set for a plan when adding it to a subscription,
|
|
20
20
|
* 'metered' will aggregate the total usage based on usage records.
|
|
21
21
|
*/
|
|
22
|
-
usageType
|
|
22
|
+
usageType: "metered";
|
|
23
23
|
/**
|
|
24
|
-
*
|
|
25
|
-
*
|
|
26
|
-
|
|
24
|
+
* The ID of the billing meter this price is associated with.
|
|
25
|
+
* Required when usageType = 'metered'.
|
|
26
|
+
*/
|
|
27
|
+
meter: string | Meter;
|
|
28
|
+
} | {
|
|
29
|
+
/**
|
|
30
|
+
* Specifies billing frequency. Either 'day', 'week', 'month' or 'year'.
|
|
31
|
+
*/
|
|
32
|
+
interval: Stripe.PriceCreateParams.Recurring.Interval;
|
|
33
|
+
/**
|
|
34
|
+
* The number of intervals between subscription billings. For example, interval=month and interval_count=3 bills every 3 months.
|
|
35
|
+
*/
|
|
36
|
+
intervalCount?: number;
|
|
37
|
+
/**
|
|
38
|
+
* Configures how the quantity per period should be determined, can be either 'metered' or 'licensed'.
|
|
39
|
+
* 'licensed' will automatically bill the quantity set for a plan when adding it to a subscription.
|
|
27
40
|
*/
|
|
28
|
-
|
|
41
|
+
usageType?: "licensed" | undefined;
|
|
29
42
|
/**
|
|
30
43
|
* The ID of the billing meter this price is associated with.
|
|
31
|
-
*
|
|
44
|
+
* Not applicable when usageType is not 'metered'.
|
|
32
45
|
*/
|
|
33
|
-
meter?:
|
|
34
|
-
}
|
|
46
|
+
meter?: never;
|
|
47
|
+
};
|
|
35
48
|
type TaxBehavior = Stripe.PriceCreateParams.TaxBehavior;
|
|
36
49
|
type BillingScheme = Stripe.PriceCreateParams.BillingScheme;
|
|
37
50
|
/**
|
|
@@ -218,19 +231,6 @@ export interface Price extends Resource<"stripe::Price">, PriceProps {
|
|
|
218
231
|
* });
|
|
219
232
|
*
|
|
220
233
|
* @example
|
|
221
|
-
* // Create a metered price for usage-based billing
|
|
222
|
-
* const meteredPrice = await Price("storage", {
|
|
223
|
-
* currency: "usd",
|
|
224
|
-
* unitAmount: 25, // $0.25 per GB
|
|
225
|
-
* product: "prod_xyz",
|
|
226
|
-
* recurring: {
|
|
227
|
-
* interval: "month",
|
|
228
|
-
* usageType: "metered",
|
|
229
|
-
* aggregateUsage: "sum"
|
|
230
|
-
* }
|
|
231
|
-
* });
|
|
232
|
-
*
|
|
233
|
-
* @example
|
|
234
234
|
* // Create a graduated tiered price with usage-based billing
|
|
235
235
|
* const tieredPrice = await Price("api-usage", {
|
|
236
236
|
* currency: "usd",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"price.d.ts","sourceRoot":"","sources":["../../src/stripe/price.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"price.d.ts","sourceRoot":"","sources":["../../src/stripe/price.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAExC;;GAEG;AACH,MAAM,MAAM,cAAc,GAEtB;IACE;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,QAAQ,CAAC;IAEtD;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;;OAGG;IACH,SAAS,EAAE,SAAS,CAAC;IAErB;;;OAGG;IACH,KAAK,EAAE,MAAM,GAAG,KAAK,CAAC;CACvB,GAED;IACE;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC,iBAAiB,CAAC,SAAS,CAAC,QAAQ,CAAC;IAEtD;;OAEG;IACH,aAAa,CAAC,EAAE,MAAM,CAAC;IAEvB;;;OAGG;IACH,SAAS,CAAC,EAAE,UAAU,GAAG,SAAS,CAAC;IAEnC;;;OAGG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,CAAC;AAEN,KAAK,WAAW,GAAG,MAAM,CAAC,iBAAiB,CAAC,WAAW,CAAC;AACxD,KAAK,aAAa,GAAG,MAAM,CAAC,iBAAiB,CAAC,aAAa,CAAC;AAE5D;;GAEG;AACH,MAAM,WAAW,SAAS;IACxB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;;OAGG;IACH,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;CACtB;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IAEjB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;;OAGG;IACH,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B;;OAEG;IACH,MAAM,CAAC,EAAE,OAAO,CAAC;IAEjB;;;;;OAKG;IACH,aAAa,CAAC,EAAE,aAAa,CAAC;IAE9B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,SAAS,CAAC,EAAE,cAAc,CAAC;IAE3B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAElC;;;OAGG;IACH,WAAW,CAAC,EAAE,WAAW,CAAC;IAE1B;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB;;;OAGG;IACH,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC;IAEpB;;;;OAIG;IACH,SAAS,CAAC,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAC;IAE/C;;OAEG;IACH,iBAAiB,CAAC,EACd;QACE;;WAEG;QACH,QAAQ,EAAE,MAAM,CAAC;QAEjB;;WAEG;QACH,KAAK,EAAE,IAAI,GAAG,MAAM,CAAC;KACtB,GACD,SAAS,CAAC;CACf;AAED;;GAEG;AACH,MAAM,WAAW,KAAM,SAAQ,QAAQ,CAAC,eAAe,CAAC,EAAE,UAAU;IAClE;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,QAAQ,EAAE,OAAO,CAAC;IAElB;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;IAExB;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC;IAEpB;;OAEG;IACH,SAAS,CAAC,EAAE,WAAW,GAAG,QAAQ,GAAG,SAAS,CAAC;IAE/C;;OAEG;IACH,iBAAiB,CAAC,EACd;QACE,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,IAAI,GAAG,MAAM,CAAC;KACtB,GACD,SAAS,CAAC;CACf;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8FG;AACH,eAAO,MAAM,KAAK,yFAGR,OAAO,CAAC,KAAK,CAAC,OACf,MAAM,SACJ,UAAU,KAChB,OAAO,CAAC,KAAK,CAAC,CAqNlB,CAAC"}
|
package/lib/stripe/price.js
CHANGED
|
@@ -25,19 +25,6 @@ import { createStripeClient, handleStripeDeleteError } from "./client.js";
|
|
|
25
25
|
* });
|
|
26
26
|
*
|
|
27
27
|
* @example
|
|
28
|
-
* // Create a metered price for usage-based billing
|
|
29
|
-
* const meteredPrice = await Price("storage", {
|
|
30
|
-
* currency: "usd",
|
|
31
|
-
* unitAmount: 25, // $0.25 per GB
|
|
32
|
-
* product: "prod_xyz",
|
|
33
|
-
* recurring: {
|
|
34
|
-
* interval: "month",
|
|
35
|
-
* usageType: "metered",
|
|
36
|
-
* aggregateUsage: "sum"
|
|
37
|
-
* }
|
|
38
|
-
* });
|
|
39
|
-
*
|
|
40
|
-
* @example
|
|
41
28
|
* // Create a graduated tiered price with usage-based billing
|
|
42
29
|
* const tieredPrice = await Price("api-usage", {
|
|
43
30
|
* currency: "usd",
|
|
@@ -177,15 +164,14 @@ export const Price = Resource("stripe::Price", async function (_id, props) {
|
|
|
177
164
|
interval: props.recurring.interval,
|
|
178
165
|
interval_count: props.recurring.intervalCount,
|
|
179
166
|
usage_type: props.recurring.usageType,
|
|
180
|
-
aggregate_usage: props.recurring.aggregateUsage,
|
|
181
167
|
};
|
|
182
168
|
// Add meter to recurring if present (only for metered usage type)
|
|
183
|
-
if (props.recurring.
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
169
|
+
if (props.recurring.usageType === "metered" &&
|
|
170
|
+
props.recurring.meter) {
|
|
171
|
+
createParams.recurring.meter =
|
|
172
|
+
typeof props.recurring.meter === "string"
|
|
173
|
+
? props.recurring.meter
|
|
174
|
+
: props.recurring.meter.id;
|
|
189
175
|
}
|
|
190
176
|
}
|
|
191
177
|
// Add tier configuration if present
|
|
@@ -249,8 +235,6 @@ export const Price = Resource("stripe::Price", async function (_id, props) {
|
|
|
249
235
|
intervalCount: price.recurring.interval_count,
|
|
250
236
|
usageType: price.recurring
|
|
251
237
|
.usage_type,
|
|
252
|
-
aggregateUsage: price.recurring
|
|
253
|
-
.aggregate_usage,
|
|
254
238
|
meter: price.recurring.meter,
|
|
255
239
|
}
|
|
256
240
|
: undefined;
|
package/lib/stripe/price.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"price.js","sourceRoot":"","sources":["../../src/stripe/price.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"price.js","sourceRoot":"","sources":["../../src/stripe/price.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AA8P1E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8FG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,QAAQ,CAC3B,eAAe,EACf,KAAK,WAEH,GAAW,EACX,KAAiB;IAEjB,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;IAC9C,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;IAElE,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC5B,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC;gBAC/C,4CAA4C;gBAC5C,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;YAChE,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,uBAAuB,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC;IACxB,CAAC;IAED,oCAAoC;IACpC,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,aAAa,KAAK,QAAQ,EAAE,CAAC;QACpD,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;IACzE,CAAC;IAED,IAAI,KAAK,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,UAAU,IAAI,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACjE,MAAM,IAAI,KAAK,CAAC,wDAAwD,CAAC,CAAC;IAC5E,CAAC;IAED,IAAI,KAAK,CAAC,SAAS,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAC5D,CAAC;IAED,IAAI,CAAC;QACH,IAAI,KAAmB,CAAC;QAExB,IAAI,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC;YAC/C,4DAA4D;YAC5D,MAAM,YAAY,GAAqD;gBACrE,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,UAAU,EAAE,KAAK,CAAC,SAAS;gBAC3B,mBAAmB,EAAE,KAAK,CAAC,iBAAiB;gBAC5C,MAAM,EAAE,CAAC,OAAO,CAAC;aAClB,CAAC;YAEF,8FAA8F;YAC9F,4DAA4D;YAE5D,KAAK,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,YAAY,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,mBAAmB;YACnB,MAAM,YAAY,GAAqD;gBACrE,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,cAAc,EAAE,KAAK,CAAC,aAAa;gBACnC,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;gBACxB,YAAY,EAAE,KAAK,CAAC,WAAW;gBAC/B,UAAU,EAAE,KAAK,CAAC,SAAS;gBAC3B,mBAAmB,EAAE,KAAK,CAAC,iBAAiB;gBAC5C,MAAM,EAAE,CAAC,OAAO,CAAC;aAClB,CAAC;YAEF,yBAAyB;YACzB,IAAI,KAAK,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;gBACnC,YAAY,CAAC,WAAW,GAAG,KAAK,CAAC,UAAU,CAAC;YAC9C,CAAC;iBAAM,IAAI,KAAK,CAAC,iBAAiB,KAAK,SAAS,EAAE,CAAC;gBACjD,YAAY,CAAC,mBAAmB,GAAG,KAAK,CAAC,iBAAiB,CAAC;YAC7D,CAAC;YAED,sCAAsC;YACtC,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;gBACpB,YAAY,CAAC,SAAS,GAAG;oBACvB,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC,QAAQ;oBAClC,cAAc,EAAE,KAAK,CAAC,SAAS,CAAC,aAAa;oBAC7C,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,SAAS;iBACtC,CAAC;gBAEF,kEAAkE;gBAClE,IACE,KAAK,CAAC,SAAS,CAAC,SAAS,KAAK,SAAS;oBACvC,KAAK,CAAC,SAAS,CAAC,KAAK,EACrB,CAAC;oBAEC,YAAY,CAAC,SAGd,CAAC,KAAK;wBACL,OAAO,KAAK,CAAC,SAAS,CAAC,KAAK,KAAK,QAAQ;4BACvC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK;4BACvB,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;gBACjC,CAAC;YACH,CAAC;YAED,oCAAoC;YACpC,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gBAChB,YAAY,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;oBAC9C,KAAK,EAAE,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI;oBAC9C,WAAW,EAAE,IAAI,CAAC,UAAU;oBAC5B,mBAAmB,EAAE,IAAI,CAAC,iBAAiB;oBAC3C,WAAW,EAAE,IAAI,CAAC,UAAU;oBAC5B,mBAAmB,EAAE,IAAI,CAAC,iBAAiB;iBAC5C,CAAC,CAAC,CAAC;YACN,CAAC;YAED,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;gBACpB,YAAY,CAAC,UAAU,GAAG,KAAK,CAAC,SAAS,CAAC;YAC5C,CAAC;YAED,oCAAoC;YACpC,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;gBAC5B,YAAY,CAAC,kBAAkB,GAAG;oBAChC,SAAS,EAAE,KAAK,CAAC,iBAAiB,CAAC,QAAQ;oBAC3C,KAAK,EAAE,KAAK,CAAC,iBAAiB,CAAC,KAAK;iBACrC,CAAC;YACJ,CAAC;YAED,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;gBACpB,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;oBAC9C,WAAW,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC;oBAC9B,KAAK,EAAE,CAAC;iBACT,CAAC,CAAC;gBACH,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACnC,IAAI,KAAK,EAAE,CAAC;wBACV,MAAM,aAAa,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;wBAC7C,MAAM,YAAY,GAEd;4BACF,MAAM,EAAE,KAAK,CAAC,MAAM;4BACpB,QAAQ,EAAE,KAAK,CAAC,QAAQ;4BACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;4BACxB,UAAU,EAAE,KAAK,CAAC,SAAS;4BAC3B,mBAAmB,EAAE,KAAK,CAAC,iBAAiB;4BAC5C,MAAM,EAAE,CAAC,OAAO,CAAC;yBAClB,CAAC;wBACF,KAAK,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAChC,aAAa,CAAC,EAAE,EAChB,YAAY,CACb,CAAC;oBACJ,CAAC;yBAAM,CAAC;wBACN,uCAAuC;wBACvC,KAAK,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;4BAC9D,MAAM,EAAE,CAAC,OAAO,CAAC;yBAClB,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,KAAK,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBACnD,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,KAAK,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;QAED,kDAAkD;QAClD,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS;YAC/B,CAAC,CAAC;gBACE,QAAQ,EAAE,KAAK,CAAC,SAAS;qBACtB,QAAuD;gBAC1D,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc;gBAC7C,SAAS,EAAE,KAAK,CAAC,SAAS;qBACvB,UAA0D;gBAC7D,KAAK,EACH,KAAK,CAAC,SACP,CAAC,KAAK;aACR;YACH,CAAC,CAAC,SAAS,CAAC;QAEd,6CAA6C;QAC7C,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK;YACvB,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACzB,UAAU,EAAE,IAAI,CAAC,WAAW,IAAI,SAAS;gBACzC,iBAAiB,EAAE,IAAI,CAAC,mBAAmB,IAAI,SAAS;gBACxD,UAAU,EAAE,IAAI,CAAC,WAAW,IAAI,SAAS;gBACzC,iBAAiB,EAAE,IAAI,CAAC,mBAAmB,IAAI,SAAS;gBACxD,IAAI,EAAE,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAE,KAAe,CAAC,CAAC,CAAC,IAAI,CAAC,KAAM;aAC3D,CAAC,CAAC;YACL,CAAC,CAAC,SAAS,CAAC;QAEd,0CAA0C;QAC1C,MAAM,iBAAiB,GAAG,KAAK,CAAC,kBAAkB;YAChD,CAAC,CAAC;gBACE,QAAQ,EAAE,KAAK,CAAC,kBAAkB,CAAC,SAAS;gBAC5C,KAAK,EAAE,KAAK,CAAC,kBAAkB,CAAC,KAAsB;aACvD;YACH,CAAC,CAAC,SAAS,CAAC;QAEd,+CAA+C;QAC/C,OAAO,IAAI,CAAC;YACV,EAAE,EAAE,KAAK,CAAC,EAAE;YACZ,OAAO,EACL,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;YACtE,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,UAAU,EAAE,KAAK,CAAC,WAAW,IAAI,SAAS;YAC1C,iBAAiB,EAAE,KAAK,CAAC,mBAAmB,IAAI,SAAS;YACzD,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,aAAa,EAAE,KAAK,CAAC,cAA+B;YACpD,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,SAAS;YACrC,SAAS,EAAE,SAA2B;YACtC,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,SAAS;YACrC,WAAW,EAAE,KAAK,CAAC,YAA2B;YAC9C,SAAS,EAAE,KAAK,CAAC,OAAO;YACxB,QAAQ,EAAE,KAAK,CAAC,QAAQ;YACxB,IAAI,EAAE,KAAK,CAAC,IAAyB;YACrC,SAAS,EAAE,KAAK,CAAC,UAAU,IAAI,SAAS;YACxC,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,KAAK,CAAC,UAAU,IAAI,SAAS;YACxC,iBAAiB,EAAE,iBAAiB;SACrC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC;QACtD,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC,CACF,CAAC"}
|
package/lib/test/vitest.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vitest.d.ts","sourceRoot":"","sources":["../../src/test/vitest.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAQpC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD;;GAEG;AACH,OAAO,QAAQ,eAAe,CAAC;IAC7B,UAAU,OAAO;QACf,IAAI,EAAE,OAAO,IAAI,CAAC;KACnB;CACF;AAOD;;GAEG;AACH,KAAK,IAAI,GAAG;IACV;;;;;OAKG;IACH,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE3E;;;;;;OAMG;IACH,CACE,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,WAAW,EACpB,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,GAAG,CAAC,EAClC,OAAO,CAAC,EAAE,MAAM,GACf,IAAI,CAAC;IAER;;;OAGG;IACH,MAAM,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI,CAAC;IAEjC,SAAS,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvE,QAAQ,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEtE;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,IAAI,CAClB,IAAI,EAAE,UAAU,EAChB,cAAc,GAAE,WAEf,GACA,IAAI,
|
|
1
|
+
{"version":3,"file":"vitest.d.ts","sourceRoot":"","sources":["../../src/test/vitest.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAQpC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD;;GAEG;AACH,OAAO,QAAQ,eAAe,CAAC;IAC7B,UAAU,OAAO;QACf,IAAI,EAAE,OAAO,IAAI,CAAC;KACnB;CACF;AAOD;;GAEG;AACH,KAAK,IAAI,GAAG;IACV;;;;;OAKG;IACH,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAE3E;;;;;;OAMG;IACH,CACE,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,WAAW,EACpB,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,GAAG,CAAC,EAClC,OAAO,CAAC,EAAE,MAAM,GACf,IAAI,CAAC;IAER;;;OAGG;IACH,MAAM,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI,CAAC;IAEjC,SAAS,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvE,QAAQ,CAAC,EAAE,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEtE;;OAEG;IACH,KAAK,EAAE,KAAK,CAAC;CACd,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,IAAI,CAClB,IAAI,EAAE,UAAU,EAChB,cAAc,GAAE,WAEf,GACA,IAAI,CA0GN"}
|
package/lib/test/vitest.js
CHANGED
|
@@ -50,7 +50,7 @@ export function test(meta, defaultOptions = {
|
|
|
50
50
|
return new D1StateStore(scope);
|
|
51
51
|
default:
|
|
52
52
|
return new SQLiteStateStore(scope, {
|
|
53
|
-
filename:
|
|
53
|
+
filename: path.join(scope.dotAlchemy, `${path.relative(process.cwd(), meta.filename)}.sqlite`),
|
|
54
54
|
});
|
|
55
55
|
}
|
|
56
56
|
};
|
package/lib/test/vitest.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vitest.js","sourceRoot":"","sources":["../../src/test/vitest.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EACL,oBAAoB,EACpB,YAAY,EACZ,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAYlE;;GAEG;AACH,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;AA4CpB;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,IAAI,CAClB,IAAgB,EAChB,iBAA8B;IAC5B,KAAK,EAAE,IAAI;CACZ;IAED,IAAI,CAAC,CAAC,OAAO,IAAI,cAAc,CAAC,EAAE,CAAC;QACjC,cAAc,CAAC,KAAK,GAAG,IAAI,CAAC;IAC9B,CAAC;IACD,cAAc,CAAC,UAAU,KAAK,CAAC,KAAK,EAAE,EAAE;QACtC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;QAClD,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,IAAI;gBACP,OAAO,IAAI,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACzC,KAAK,IAAI;gBACP,OAAO,IAAI,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACzC,KAAK,IAAI;gBACP,OAAO,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC;YACjC;gBACE,OAAO,IAAI,gBAAgB,CAAC,KAAK,EAAE;oBACjC,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"vitest.js","sourceRoot":"","sources":["../../src/test/vitest.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EACL,oBAAoB,EACpB,YAAY,EACZ,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,6BAA6B,CAAC;AAYlE;;GAEG;AACH,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;AA4CpB;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,MAAM,UAAU,IAAI,CAClB,IAAgB,EAChB,iBAA8B;IAC5B,KAAK,EAAE,IAAI;CACZ;IAED,IAAI,CAAC,CAAC,OAAO,IAAI,cAAc,CAAC,EAAE,CAAC;QACjC,cAAc,CAAC,KAAK,GAAG,IAAI,CAAC;IAC9B,CAAC;IACD,cAAc,CAAC,UAAU,KAAK,CAAC,KAAK,EAAE,EAAE;QACtC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;QAClD,QAAQ,SAAS,EAAE,CAAC;YAClB,KAAK,IAAI;gBACP,OAAO,IAAI,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACzC,KAAK,IAAI;gBACP,OAAO,IAAI,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACzC,KAAK,IAAI;gBACP,OAAO,IAAI,YAAY,CAAC,KAAK,CAAC,CAAC;YACjC;gBACE,OAAO,IAAI,gBAAgB,CAAC,KAAK,EAAE;oBACjC,QAAQ,EAAE,IAAI,CAAC,IAAI,CACjB,KAAK,CAAC,UAAU,EAChB,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,QAAQ,CAAC,SAAS,CACxD;iBACF,CAAC,CAAC;QACP,CAAC;IACH,CAAC,CAAC;IAEF,IAAI,CAAC,MAAM,GAAG,CAAC,SAAkB,EAAE,EAAE;QACnC,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,CAAC,GAAG,KAAY,EAAE,EAAE,GAAE,CAAC,CAAC;QACjC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IAEF,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;QACtB,MAAM,EAAE,SAAS;QACjB,SAAS,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;QACvG,UAAU,EAAE,cAAc,EAAE,UAAU;QACtC,KAAK,EAAE,IAAI;QACX,eAAe,EAAE,IAAI,mBAAmB,EAAE;QAC1C,KAAK,EAAE,cAAc,CAAC,KAAK;QAC3B,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;KACvC,CAAC,CAAC;IAEH,IAAI,CAAC,SAAS,GAAG,CAAC,EAAmC,EAAE,OAAgB,EAAE,EAAE;QACzE,OAAO,SAAS,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC,CAAC;IAEF,IAAI,CAAC,QAAQ,GAAG,CAAC,EAAmC,EAAE,OAAgB,EAAE,EAAE;QACxE,OAAO,QAAQ,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IAC7D,CAAC,CAAC;IAEF,OAAO,IAAY,CAAC;IAEpB,SAAS,IAAI,CACX,GAAG,IAMoD;QAEvD,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACzB,MAAM,QAAQ,GAAG,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACnE,MAAM,OAAO,GACX,OAAO,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,QAAQ;YACvC,CAAC,CAAE,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAY;YACnC,CAAC,CAAC,MAAM,CAAC;QACb,MAAM,MAAM,GAAG,CAAC,GAAQ,EAAE,EAAE,CAC1B,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ;YAC5B,CAAC,CAAC,MAAM,CAAC,WAAW,CAChB,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CACrC,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAChC,CACF;YACH,CAAC,CAAC,EAAE,CAAC;QAET,MAAM,OAAO,GAAgB;YAC3B,KAAK,EAAE,cAAc,EAAE,KAAK,IAAI,KAAK;YACrC,QAAQ,EAAE,eAAe;YACzB,GAAG,MAAM,CAAC,cAAc,CAAC;YACzB,GAAG,MAAM,CAAC,QAAQ,CAAC;SACpB,CAAC;QAEF,MAAM,EAAE,GAAG,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC;QAE9D,OAAO,EAAE,CACP,QAAQ,EACR,CAAC,GAAG,EAAE,EAAE;YACN,4DAA4D;YAC5D,IAAI,iBAAiB,GAAG,EAAE,CAAC;YAC3B,IAAI,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;gBAC3B,iBAAiB,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC;YAChD,CAAC;YAED,OAAO,OAAO,CAAC,GAAG,CAChB,GAAG,iBAAiB,GAAG,QAAQ,EAAE,EACjC;gBACE,GAAG,OAAO;gBACV,MAAM,EAAE,KAAK;aACd,EACD,KAAK,EAAE,KAAK,EAAE,EAAE;gBACd,MAAM,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;YACnC,CAAC,CACF,CAAC;QACJ,CAAC,EACD,OAAO,CACR,CAAC;IACJ,CAAC;AACH,CAAC"}
|
package/lib/util/assert-never.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assert-never.js","sourceRoot":"","sources":["../../src/util/assert-never.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,WAAW,CAAC,KAAY,EAAE,OAAgB;IACxD,MAAM,IAAI,KAAK,CAAC,OAAO,IAAI,qBAAqB,KAAK,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"assert-never.js","sourceRoot":"","sources":["../../src/util/assert-never.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,WAAW,CAAC,KAAY,EAAE,OAAgB;IACxD,MAAM,IAAI,KAAK,CAAC,OAAO,IAAI,qBAAqB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;AAC3E,CAAC"}
|
package/lib/util/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/util/cli.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAG3C,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;CAChD;AAGD,QAAA,MAAM,MAAM;;;;;;;;CAQF,CAAC;AAEX,KAAK,SAAS,GAAG,MAAM,OAAO,MAAM,CAAC;AAerC,MAAM,WAAW,IAAI;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;CAC5C;AAED,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAClC,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACnC,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACpC,IAAI,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACvC,IAAI,EAAE,MAAM,IAAI,CAAC;CAClB;AAED,UAAU,WAAW;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB;
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/util/cli.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,eAAe,CAAC;AAG3C,OAAO,CAAC,MAAM,CAAC;IACb,IAAI,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;CAChD;AAGD,QAAA,MAAM,MAAM;;;;;;;;CAQF,CAAC;AAEX,KAAK,SAAS,GAAG,MAAM,OAAO,MAAM,CAAC;AAerC,MAAM,WAAW,IAAI;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,SAAS,CAAC;CAC5C;AAED,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IAClC,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACnC,QAAQ,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IACpC,KAAK,EAAE,CAAC,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,CAAC;IACpC,IAAI,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IACvC,IAAI,EAAE,MAAM,IAAI,CAAC;CAClB;AAED,UAAU,WAAW;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACjB;AAMD,eAAO,MAAM,oBAAoB,GAC/B,aAAa,WAAW,EACxB,eAAe,SAAS,cAIzB,CAAC;AAEF,eAAO,MAAM,iBAAiB,QAAO,SASpC,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAAI,aAAa,WAAW,KAAG,SA8C/D,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,KAAK,MAAM,WAAwC,CAAC"}
|
package/lib/util/cli.js
CHANGED
|
@@ -21,13 +21,10 @@ const colorize = (text, color) => {
|
|
|
21
21
|
}
|
|
22
22
|
return `${colors[color]}${text}${colors.reset}`;
|
|
23
23
|
};
|
|
24
|
-
let
|
|
24
|
+
let loggers = {};
|
|
25
25
|
export const createLoggerInstance = (alchemyInfo, customLogger) => {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
// Use custom logger if provided, otherwise use the basic fallback logger
|
|
29
|
-
loggerApi = customLogger ?? createFallbackLogger(alchemyInfo);
|
|
30
|
-
return loggerApi;
|
|
26
|
+
return (loggers[alchemyInfo.appName] ??=
|
|
27
|
+
customLogger ?? createFallbackLogger(alchemyInfo));
|
|
31
28
|
};
|
|
32
29
|
export const createDummyLogger = () => {
|
|
33
30
|
return {
|
|
@@ -40,13 +37,15 @@ export const createDummyLogger = () => {
|
|
|
40
37
|
};
|
|
41
38
|
};
|
|
42
39
|
export const createFallbackLogger = (alchemyInfo) => {
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
40
|
+
if (alchemyInfo.phase !== "read") {
|
|
41
|
+
console.log(dedent `
|
|
42
|
+
${colorize("Alchemy", "cyanBright")} (v${packageJson.version})
|
|
43
|
+
App: ${alchemyInfo.appName}
|
|
44
|
+
Phase: ${alchemyInfo.phase}
|
|
45
|
+
Stage: ${alchemyInfo.stage}
|
|
46
|
+
|
|
47
|
+
`);
|
|
48
|
+
}
|
|
50
49
|
return {
|
|
51
50
|
log: console.log,
|
|
52
51
|
error: (...args) => console.error(colorize("ERROR", "redBright"), ...args),
|
package/lib/util/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/util/cli.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,oBAAoB,CAAC,OAAO,IAAI,EAAE,MAAM,EAAE,CAAC;AAEnE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAMrC,mBAAmB;AACnB,MAAM,MAAM,GAAG;IACb,KAAK,EAAE,SAAS;IAChB,UAAU,EAAE,UAAU;IACtB,YAAY,EAAE,UAAU;IACxB,OAAO,EAAE,UAAU;IACnB,WAAW,EAAE,UAAU;IACvB,SAAS,EAAE,UAAU;IACrB,IAAI,EAAE,UAAU;CACR,CAAC;AAIX,qCAAqC;AACrC,MAAM,mBAAmB,GAAG,GAAY,EAAE;IACxC,OAAO,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AACvC,CAAC,CAAC;AAEF,oCAAoC;AACpC,MAAM,QAAQ,GAAG,CAAC,IAAY,EAAE,KAAgB,EAAU,EAAE;IAC1D,IAAI,mBAAmB,EAAE,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,CAAC;AAClD,CAAC,CAAC;AAyBF,IAAI,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/util/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"root-dir.d.ts","sourceRoot":"","sources":["../../src/util/root-dir.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,YAAY,QAA4C,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"root-dir.js","sourceRoot":"","sources":["../../src/util/root-dir.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "alchemy",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.66.0",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"author": "Sam Goodwin <sam@alchemy.run>",
|
|
6
6
|
"homepage": "https://alchemy.run",
|
|
@@ -160,7 +160,7 @@
|
|
|
160
160
|
"glob": "^10.0.0",
|
|
161
161
|
"jszip": "^3.0.0",
|
|
162
162
|
"libsodium-wrappers": "^0.7.15",
|
|
163
|
-
"miniflare": "^4.
|
|
163
|
+
"miniflare": "^4.20250906.0",
|
|
164
164
|
"neverthrow": "^8.2.0",
|
|
165
165
|
"open": "^10.1.2",
|
|
166
166
|
"openapi-types": "^12.1.3",
|
|
@@ -189,7 +189,7 @@
|
|
|
189
189
|
"astro": "^5.13.2",
|
|
190
190
|
"drizzle-orm": "^0.44.2",
|
|
191
191
|
"rwsdk": "^0.1.36",
|
|
192
|
-
"stripe": "^
|
|
192
|
+
"stripe": "^18.5.0"
|
|
193
193
|
},
|
|
194
194
|
"peerDependenciesMeta": {
|
|
195
195
|
"@astrojs/cloudflare": {
|
|
@@ -289,7 +289,7 @@
|
|
|
289
289
|
"listr2": "^8.0.0",
|
|
290
290
|
"nitropack": "^2.12.4",
|
|
291
291
|
"rwsdk": "^0.1.36",
|
|
292
|
-
"stripe": "^
|
|
292
|
+
"stripe": "^18.5.0",
|
|
293
293
|
"trpc-cli": "^0.10.2",
|
|
294
294
|
"ts-morph": "^26.0.0",
|
|
295
295
|
"tsdown": "^0.14.2",
|
package/src/alchemy.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import path from "node:path";
|
|
1
2
|
import { execArgv } from "node:process";
|
|
2
3
|
import { onExit } from "signal-exit";
|
|
3
4
|
import { isReplacedSignal } from "./apply.ts";
|
|
@@ -15,6 +16,7 @@ import { DEFAULT_STAGE, Scope, type ProviderCredentials } from "./scope.ts";
|
|
|
15
16
|
import { secret } from "./secret.ts";
|
|
16
17
|
import type { StateStoreType } from "./state.ts";
|
|
17
18
|
import type { LoggerApi } from "./util/cli.ts";
|
|
19
|
+
import { ALCHEMY_ROOT } from "./util/root-dir.ts";
|
|
18
20
|
import { TelemetryClient } from "./util/telemetry/client.ts";
|
|
19
21
|
|
|
20
22
|
/**
|
|
@@ -101,12 +103,26 @@ async function _alchemy(
|
|
|
101
103
|
options?: Omit<AlchemyOptions, "appName">,
|
|
102
104
|
): Promise<Scope> {
|
|
103
105
|
const cliArgs = process.argv.slice(2);
|
|
106
|
+
// user may select a specific app to auto-enable read mode for any other app
|
|
107
|
+
const app = parseOption("--app");
|
|
108
|
+
function parseOption<D extends string | undefined>(
|
|
109
|
+
option: string,
|
|
110
|
+
defaultValue?: D,
|
|
111
|
+
): D {
|
|
112
|
+
const i = cliArgs.indexOf(option);
|
|
113
|
+
return (
|
|
114
|
+
i !== -1 && i + 1 < cliArgs.length ? cliArgs[i + 1] : defaultValue
|
|
115
|
+
) as D;
|
|
116
|
+
}
|
|
104
117
|
const cliOptions = {
|
|
105
|
-
phase:
|
|
106
|
-
|
|
107
|
-
: cliArgs.includes("--read")
|
|
118
|
+
phase:
|
|
119
|
+
app && app !== appName
|
|
108
120
|
? "read"
|
|
109
|
-
: "
|
|
121
|
+
: cliArgs.includes("--destroy")
|
|
122
|
+
? "destroy"
|
|
123
|
+
: cliArgs.includes("--read")
|
|
124
|
+
? "read"
|
|
125
|
+
: "up",
|
|
110
126
|
local: cliArgs.includes("--local") || cliArgs.includes("--dev"),
|
|
111
127
|
watch: cliArgs.includes("--watch") || execArgv.includes("--watch"),
|
|
112
128
|
quiet: cliArgs.includes("--quiet"),
|
|
@@ -120,6 +136,7 @@ async function _alchemy(
|
|
|
120
136
|
})(),
|
|
121
137
|
password: process.env.ALCHEMY_PASSWORD,
|
|
122
138
|
adopt: cliArgs.includes("--adopt"),
|
|
139
|
+
rootDir: path.resolve(parseOption("--root-dir", ALCHEMY_ROOT)),
|
|
123
140
|
} satisfies Partial<AlchemyOptions>;
|
|
124
141
|
const mergedOptions = {
|
|
125
142
|
...cliOptions,
|
|
@@ -158,6 +175,7 @@ If this is a mistake, you can disable this check by setting the ALCHEMY_CI_STATE
|
|
|
158
175
|
phase,
|
|
159
176
|
password: mergedOptions?.password ?? process.env.ALCHEMY_PASSWORD,
|
|
160
177
|
telemetryClient,
|
|
178
|
+
isSelected: app === undefined ? undefined : app === appName,
|
|
161
179
|
});
|
|
162
180
|
onExit((code) => {
|
|
163
181
|
root.cleanup().then(() => {
|
|
@@ -272,10 +290,20 @@ export interface AlchemyOptions {
|
|
|
272
290
|
* @default false
|
|
273
291
|
*/
|
|
274
292
|
adopt?: boolean;
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
293
|
+
/**
|
|
294
|
+
* The root directory of the project.
|
|
295
|
+
*
|
|
296
|
+
* @default process.cwd()
|
|
297
|
+
*/
|
|
298
|
+
rootDir?: string;
|
|
299
|
+
/**
|
|
300
|
+
* Whether this is the application that was selected with `--app`
|
|
301
|
+
*
|
|
302
|
+
* `true` if the application was selected with `--app`
|
|
303
|
+
* `false` if the application was not selected with `--app`
|
|
304
|
+
* `undefined` if the program was not run with `--app`
|
|
305
|
+
*/
|
|
306
|
+
isSelected?: boolean;
|
|
279
307
|
}
|
|
280
308
|
|
|
281
309
|
export interface RunOptions extends AlchemyOptions, ProviderCredentials {
|
package/src/apply.ts
CHANGED
|
@@ -15,6 +15,7 @@ import {
|
|
|
15
15
|
} from "./resource.ts";
|
|
16
16
|
import type { PendingDeletions } from "./scope.ts";
|
|
17
17
|
import { serialize } from "./serde.ts";
|
|
18
|
+
import type { State } from "./state.ts";
|
|
18
19
|
import { formatFQN } from "./util/cli.ts";
|
|
19
20
|
import { logger } from "./util/logger.ts";
|
|
20
21
|
import type { Telemetry } from "./util/telemetry/index.ts";
|
|
@@ -64,16 +65,69 @@ async function _apply<Out extends Resource>(
|
|
|
64
65
|
}
|
|
65
66
|
if (scope.phase === "read") {
|
|
66
67
|
if (state === undefined) {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
68
|
+
if (scope.isSelected === false) {
|
|
69
|
+
// we are running in a monorepo and are not the selected app
|
|
70
|
+
if (process.argv.includes("--destroy")) {
|
|
71
|
+
// if we are trying to destroy a downstream app and this (upstream) app does not have data, then exit
|
|
72
|
+
process.exit(0);
|
|
73
|
+
}
|
|
74
|
+
// if we are in `--deploy`, then poll until state available
|
|
75
|
+
state = await waitForConsistentState();
|
|
76
|
+
} else {
|
|
77
|
+
throw new Error(
|
|
78
|
+
`Resource "${resource[ResourceFQN]}" not found and running in 'read' phase. Selected(${scope.isSelected})`,
|
|
79
|
+
);
|
|
80
|
+
}
|
|
81
|
+
} else if (scope.isSelected === false) {
|
|
82
|
+
// we are running in a monorepo and are not the selected app, so we need to wait for the process to be consistent
|
|
83
|
+
state = await waitForConsistentState();
|
|
70
84
|
}
|
|
71
85
|
scope.telemetryClient.record({
|
|
72
86
|
event: "resource.read",
|
|
73
87
|
resource: resource[ResourceKind],
|
|
74
88
|
});
|
|
75
89
|
return state.output as Awaited<Out>;
|
|
90
|
+
|
|
91
|
+
// -> poll until it does not (i.e. when the owner process applies the change and updates the state store)
|
|
92
|
+
async function waitForConsistentState() {
|
|
93
|
+
while (true) {
|
|
94
|
+
if (state === undefined) {
|
|
95
|
+
// state doesn't exist yet
|
|
96
|
+
} else if (
|
|
97
|
+
state.status === "creating" ||
|
|
98
|
+
state.status === "updating"
|
|
99
|
+
) {
|
|
100
|
+
// no-op
|
|
101
|
+
} else if (
|
|
102
|
+
state.status === "deleted" ||
|
|
103
|
+
state.status === "deleting"
|
|
104
|
+
) {
|
|
105
|
+
// ok something is wrong, the stack should not be being deleted
|
|
106
|
+
// TODO(sam): better error message
|
|
107
|
+
throw new Error("Resource is being deleted");
|
|
108
|
+
} else if (await inputsAreEqual(state)) {
|
|
109
|
+
// sweet, we've reached a stable state and read can progress
|
|
110
|
+
return state;
|
|
111
|
+
}
|
|
112
|
+
// jitter between 100-300ms
|
|
113
|
+
const jitter = 100 + Math.random() * 200;
|
|
114
|
+
await new Promise((resolve) => setTimeout(resolve, jitter));
|
|
115
|
+
state = await scope.state.get(resource[ResourceID]);
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
async function inputsAreEqual(
|
|
119
|
+
state: State<string, ResourceProps | undefined, Resource<string>>,
|
|
120
|
+
) {
|
|
121
|
+
const oldProps = await serialize(scope, state.props, {
|
|
122
|
+
encrypt: false,
|
|
123
|
+
});
|
|
124
|
+
const newProps = await serialize(scope, props, {
|
|
125
|
+
encrypt: false,
|
|
126
|
+
});
|
|
127
|
+
return JSON.stringify(oldProps) === JSON.stringify(newProps);
|
|
128
|
+
}
|
|
76
129
|
}
|
|
130
|
+
|
|
77
131
|
if (state === undefined) {
|
|
78
132
|
state = {
|
|
79
133
|
kind: resource[ResourceKind],
|
|
@@ -96,6 +150,7 @@ async function _apply<Out extends Resource>(
|
|
|
96
150
|
};
|
|
97
151
|
await scope.state.set(resource[ResourceID], state);
|
|
98
152
|
}
|
|
153
|
+
|
|
99
154
|
const oldOutput = state.output;
|
|
100
155
|
|
|
101
156
|
const alwaysUpdate =
|
package/src/cloudflare/bucket.ts
CHANGED
|
@@ -388,7 +388,7 @@ const _R2Bucket = Resource(
|
|
|
388
388
|
if (this.phase === "delete") {
|
|
389
389
|
if (props.delete !== false) {
|
|
390
390
|
if (this.output.dev?.id) {
|
|
391
|
-
await deleteMiniflareBinding("r2", this.output.dev.id);
|
|
391
|
+
await deleteMiniflareBinding(this.scope, "r2", this.output.dev.id);
|
|
392
392
|
}
|
|
393
393
|
if (props.empty) {
|
|
394
394
|
await emptyBucket(api, bucketName, props);
|