alchemy-effect 0.4.0 → 0.5.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-effect.js +295 -253
- package/bin/alchemy-effect.js.map +1 -1
- package/lib/apply.d.ts.map +1 -1
- package/lib/apply.js +237 -232
- package/lib/apply.js.map +1 -1
- package/lib/aws/dynamodb/table.provider.d.ts.map +1 -1
- package/lib/aws/dynamodb/table.provider.js +10 -2
- package/lib/aws/dynamodb/table.provider.js.map +1 -1
- package/lib/aws/ec2/vpc.provider.d.ts +2 -2
- package/lib/aws/ec2/vpc.provider.d.ts.map +1 -1
- package/lib/aws/ec2/vpc.provider.js +6 -7
- package/lib/aws/ec2/vpc.provider.js.map +1 -1
- package/lib/aws/lambda/function.provider.d.ts.map +1 -1
- package/lib/aws/lambda/function.provider.js +19 -23
- package/lib/aws/lambda/function.provider.js.map +1 -1
- package/lib/aws/sqs/queue.provider.d.ts +1 -2
- package/lib/aws/sqs/queue.provider.d.ts.map +1 -1
- package/lib/aws/sqs/queue.provider.js +14 -7
- package/lib/aws/sqs/queue.provider.js.map +1 -1
- package/lib/cli/index.d.ts +7 -3
- package/lib/cli/index.d.ts.map +1 -1
- package/lib/cloudflare/kv/namespace.provider.d.ts.map +1 -1
- package/lib/cloudflare/kv/namespace.provider.js +11 -6
- package/lib/cloudflare/kv/namespace.provider.js.map +1 -1
- package/lib/cloudflare/r2/bucket.binding.js +1 -1
- package/lib/cloudflare/r2/bucket.binding.js.map +1 -1
- package/lib/cloudflare/r2/bucket.d.ts +1 -1
- package/lib/cloudflare/r2/bucket.d.ts.map +1 -1
- package/lib/cloudflare/r2/bucket.provider.d.ts +1 -2
- package/lib/cloudflare/r2/bucket.provider.d.ts.map +1 -1
- package/lib/cloudflare/r2/bucket.provider.js +20 -14
- package/lib/cloudflare/r2/bucket.provider.js.map +1 -1
- package/lib/cloudflare/worker/worker.d.ts +2 -2
- package/lib/cloudflare/worker/worker.d.ts.map +1 -1
- package/lib/cloudflare/worker/worker.provider.d.ts +1 -2
- package/lib/cloudflare/worker/worker.provider.d.ts.map +1 -1
- package/lib/cloudflare/worker/worker.provider.js +40 -13
- package/lib/cloudflare/worker/worker.provider.js.map +1 -1
- package/lib/instance-id.d.ts +5 -1
- package/lib/instance-id.d.ts.map +1 -1
- package/lib/instance-id.js +4 -0
- package/lib/instance-id.js.map +1 -1
- package/lib/physical-name.d.ts +15 -4
- package/lib/physical-name.d.ts.map +1 -1
- package/lib/physical-name.js +12 -3
- package/lib/physical-name.js.map +1 -1
- package/lib/plan.d.ts.map +1 -1
- package/lib/plan.js +65 -17
- package/lib/plan.js.map +1 -1
- package/lib/provider.d.ts +0 -1
- package/lib/provider.d.ts.map +1 -1
- package/lib/provider.js.map +1 -1
- package/lib/resource.d.ts +3 -2
- package/lib/resource.d.ts.map +1 -1
- package/lib/resource.js.map +1 -1
- package/lib/tsconfig.test.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/apply.ts +296 -286
- package/src/aws/dynamodb/table.provider.ts +15 -4
- package/src/aws/ec2/vpc.provider.ts +10 -9
- package/src/aws/lambda/function.provider.ts +42 -31
- package/src/aws/sqs/queue.provider.ts +15 -9
- package/src/cloudflare/kv/namespace.provider.ts +18 -14
- package/src/cloudflare/r2/bucket.binding.ts +1 -1
- package/src/cloudflare/r2/bucket.provider.ts +34 -30
- package/src/cloudflare/r2/bucket.ts +1 -1
- package/src/cloudflare/worker/worker.provider.ts +39 -13
- package/src/cloudflare/worker/worker.ts +2 -2
- package/src/instance-id.ts +5 -1
- package/src/physical-name.ts +27 -5
- package/src/plan.ts +90 -29
- package/src/provider.ts +0 -1
- package/src/resource.ts +17 -6
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as Effect from "effect/Effect";
|
|
2
2
|
import { App } from "../../app.js";
|
|
3
|
+
import { createPhysicalName } from "../../physical-name.js";
|
|
3
4
|
import { Account } from "../account.js";
|
|
4
5
|
import { CloudflareApi } from "../api.js";
|
|
5
6
|
import { Namespace, } from "./namespace.js";
|
|
@@ -7,7 +8,9 @@ export const namespaceProvider = () => Namespace.provider.effect(Effect.gen(func
|
|
|
7
8
|
const app = yield* App;
|
|
8
9
|
const api = yield* CloudflareApi;
|
|
9
10
|
const accountId = yield* Account;
|
|
10
|
-
const createTitle = (id, title) =>
|
|
11
|
+
const createTitle = (id, title) => Effect.gen(function* () {
|
|
12
|
+
return title ?? (yield* createPhysicalName({ id }));
|
|
13
|
+
});
|
|
11
14
|
const mapResult = (result) => ({
|
|
12
15
|
title: result.title,
|
|
13
16
|
namespaceId: result.id,
|
|
@@ -16,28 +19,30 @@ export const namespaceProvider = () => Namespace.provider.effect(Effect.gen(func
|
|
|
16
19
|
});
|
|
17
20
|
return {
|
|
18
21
|
stables: ["namespaceId", "accountId"],
|
|
19
|
-
diff: ({ id, news, output })
|
|
22
|
+
diff: Effect.fn(function* ({ id, news, output }) {
|
|
20
23
|
if (output.accountId !== accountId) {
|
|
21
24
|
return { action: "replace" };
|
|
22
25
|
}
|
|
23
|
-
const title = createTitle(id, news.title);
|
|
26
|
+
const title = yield* createTitle(id, news.title);
|
|
24
27
|
if (title !== output.title) {
|
|
25
28
|
return { action: "update" };
|
|
26
29
|
}
|
|
27
30
|
}),
|
|
28
31
|
create: Effect.fn(function* ({ id, news }) {
|
|
32
|
+
const title = yield* createTitle(id, news.title);
|
|
29
33
|
return yield* api.kv.namespaces
|
|
30
34
|
.create({
|
|
31
35
|
account_id: accountId,
|
|
32
|
-
title
|
|
36
|
+
title,
|
|
33
37
|
})
|
|
34
38
|
.pipe(Effect.map((mapResult)));
|
|
35
39
|
}),
|
|
36
40
|
update: Effect.fn(function* ({ id, news, output }) {
|
|
41
|
+
const title = yield* createTitle(id, news.title);
|
|
37
42
|
return yield* api.kv.namespaces
|
|
38
43
|
.update(output.namespaceId, {
|
|
39
44
|
account_id: accountId,
|
|
40
|
-
title
|
|
45
|
+
title,
|
|
41
46
|
})
|
|
42
47
|
.pipe(Effect.map((mapResult)));
|
|
43
48
|
}),
|
|
@@ -56,7 +61,7 @@ export const namespaceProvider = () => Namespace.provider.effect(Effect.gen(func
|
|
|
56
61
|
})
|
|
57
62
|
.pipe(Effect.map((mapResult)), Effect.catchTag("NotFound", () => Effect.succeed(undefined)));
|
|
58
63
|
}
|
|
59
|
-
const title = createTitle(id, olds?.title); // why is olds optional? because read can be called before the resource exists (sync)
|
|
64
|
+
const title = yield* createTitle(id, olds?.title); // why is olds optional? because read can be called before the resource exists (sync)
|
|
60
65
|
let page = 1;
|
|
61
66
|
while (true) {
|
|
62
67
|
// todo: abstract pagination
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"namespace.provider.js","sourceRoot":"","sources":["../../../src/cloudflare/kv/namespace.provider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EACL,SAAS,GAGV,MAAM,gBAAgB,CAAC;AAExB,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,EAAE,CACpC,SAAS,CAAC,QAAQ,CAAC,MAAM,CACvB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC;IACvB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;IACjC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC;IAEjC,MAAM,WAAW,GAAG,CAAC,EAAU,EAAE,KAAyB,EAAE,EAAE,CAC5D,
|
|
1
|
+
{"version":3,"file":"namespace.provider.js","sourceRoot":"","sources":["../../../src/cloudflare/kv/namespace.provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ export const bindFromWorker = () => Bind.provider.succeed({
|
|
|
7
7
|
{
|
|
8
8
|
type: "r2_bucket",
|
|
9
9
|
name: source.id,
|
|
10
|
-
bucket_name: source.attr.
|
|
10
|
+
bucket_name: source.attr.bucketName,
|
|
11
11
|
jurisdiction: source.attr.jurisdiction === "default"
|
|
12
12
|
? undefined
|
|
13
13
|
: source.attr.jurisdiction,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bucket.binding.js","sourceRoot":"","sources":["../../../src/cloudflare/r2/bucket.binding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAG3C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAM7C,MAAM,CAAC,MAAM,IAAI,GAAG,OAAO,CAEzB,MAAM,EAAE,2BAA2B,CAAC,CAAC;AAEvC,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE,CACjC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IACpB,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;QACvB,QAAQ,EAAE;YACR;gBACE,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,MAAM,CAAC,EAAE;gBACf,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"bucket.binding.js","sourceRoot":"","sources":["../../../src/cloudflare/r2/bucket.binding.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAG3C,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAM7C,MAAM,CAAC,MAAM,IAAI,GAAG,OAAO,CAEzB,MAAM,EAAE,2BAA2B,CAAC,CAAC;AAEvC,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE,CACjC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IACpB,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC;QACvB,QAAQ,EAAE;YACR;gBACE,IAAI,EAAE,WAAW;gBACjB,IAAI,EAAE,MAAM,CAAC,EAAE;gBACf,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,UAAU;gBACnC,YAAY,EACV,MAAM,CAAC,IAAI,CAAC,YAAY,KAAK,SAAS;oBACpC,CAAC,CAAC,SAAS;oBACX,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY;aAC/B;SACF;KACF,CAAC;CACH,CAAC,CAAC"}
|
|
@@ -6,7 +6,7 @@ export type BucketProps = {
|
|
|
6
6
|
locationHint?: Bucket.Location;
|
|
7
7
|
};
|
|
8
8
|
export type BucketAttr<Props extends BucketProps> = {
|
|
9
|
-
|
|
9
|
+
bucketName: Props["name"] extends string ? Props["name"] : string;
|
|
10
10
|
storageClass: Props["storageClass"] extends Bucket.StorageClass ? Props["storageClass"] : "Standard";
|
|
11
11
|
jurisdiction: Props["jurisdiction"] extends Bucket.Jurisdiction ? Props["jurisdiction"] : "default";
|
|
12
12
|
location: Bucket.Location | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bucket.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/r2/bucket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,UAAU,CAAC,KAAK,SAAS,WAAW,IAAI;IAClD,
|
|
1
|
+
{"version":3,"file":"bucket.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/r2/bucket.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC;IACnC,YAAY,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,UAAU,CAAC,KAAK,SAAS,WAAW,IAAI;IAClD,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,SAAS,MAAM,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;IAClE,YAAY,EAAE,KAAK,CAAC,cAAc,CAAC,SAAS,MAAM,CAAC,YAAY,GAC3D,KAAK,CAAC,cAAc,CAAC,GACrB,UAAU,CAAC;IACf,YAAY,EAAE,KAAK,CAAC,cAAc,CAAC,SAAS,MAAM,CAAC,YAAY,GAC3D,KAAK,CAAC,cAAc,CAAC,GACrB,SAAS,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC,QAAQ,GAAG,SAAS,CAAC;IACtC,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,WAAW,MAAM,CACrB,EAAE,SAAS,MAAM,GAAG,MAAM,EAC1B,KAAK,SAAS,WAAW,GAAG,WAAW,CACvC,SAAQ,QAAQ,CACd,sBAAsB,EACtB,EAAE,EACF,KAAK,EACL,UAAU,CAAC,KAAK,CAAC,EACjB,MAAM,CACP;CAAG;AAEN,eAAO,MAAM,MAAM,UACV,EAAE,SAAS,MAAM,QAAQ,KAAK,SAAS,WAAW,MACnD,EAAE,UACE,KAAK,KACZ,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC;;;;;;;;;;CACI,CAAC;AAE3B,MAAM,CAAC,OAAO,WAAW,MAAM,CAAC;IAC9B,KAAY,YAAY,GAAG,UAAU,GAAG,kBAAkB,CAAC;IAC3D,KAAY,YAAY,GAAG,SAAS,GAAG,IAAI,GAAG,SAAS,CAAC;IACxD,KAAY,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;CAC1E"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import { App } from "../../app";
|
|
2
1
|
import { Account } from "../account.ts";
|
|
3
2
|
import { CloudflareApi } from "../api";
|
|
4
3
|
import { Bucket, type BucketProps } from "./bucket";
|
|
5
|
-
export declare const bucketProvider: () => import("effect/Layer").Layer<import("../../provider.ts").Provider<Bucket<string, BucketProps>>, never, App | Account | CloudflareApi>;
|
|
4
|
+
export declare const bucketProvider: () => import("effect/Layer").Layer<import("../../provider.ts").Provider<Bucket<string, BucketProps>>, never, import("../../app.ts").App | Account | CloudflareApi>;
|
|
6
5
|
//# sourceMappingURL=bucket.provider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bucket.provider.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/r2/bucket.provider.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bucket.provider.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/r2/bucket.provider.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,MAAM,EAAmB,KAAK,WAAW,EAAE,MAAM,UAAU,CAAC;AAErE,eAAO,MAAM,cAAc,oKAsFxB,CAAC"}
|
|
@@ -1,24 +1,31 @@
|
|
|
1
1
|
import * as Effect from "effect/Effect";
|
|
2
|
-
import {
|
|
2
|
+
import { createPhysicalName } from "../../physical-name.js";
|
|
3
3
|
import { Account } from "../account.js";
|
|
4
4
|
import { CloudflareApi } from "../api";
|
|
5
5
|
import { Bucket } from "./bucket";
|
|
6
6
|
export const bucketProvider = () => Bucket.provider.effect(Effect.gen(function* () {
|
|
7
7
|
const api = yield* CloudflareApi;
|
|
8
8
|
const accountId = yield* Account;
|
|
9
|
-
const
|
|
10
|
-
|
|
9
|
+
const createBucketName = (id, name) => Effect.gen(function* () {
|
|
10
|
+
if (name)
|
|
11
|
+
return name;
|
|
12
|
+
return (yield* createPhysicalName({
|
|
13
|
+
id,
|
|
14
|
+
maxLength: 63,
|
|
15
|
+
})).toLowerCase();
|
|
16
|
+
});
|
|
11
17
|
const mapResult = (bucket) => ({
|
|
12
|
-
|
|
18
|
+
bucketName: bucket.name,
|
|
13
19
|
storageClass: bucket.storage_class ?? "Standard",
|
|
14
20
|
jurisdiction: bucket.jurisdiction ?? "default",
|
|
15
21
|
location: bucket.location,
|
|
16
22
|
accountId,
|
|
17
23
|
});
|
|
18
24
|
return {
|
|
19
|
-
diff: ({ id, olds, news, output })
|
|
25
|
+
diff: Effect.fn(function* ({ id, olds, news, output }) {
|
|
26
|
+
const name = yield* createBucketName(id, news.name);
|
|
20
27
|
if (output.accountId !== accountId ||
|
|
21
|
-
output.
|
|
28
|
+
output.bucketName !== name ||
|
|
22
29
|
output.jurisdiction !== (news.jurisdiction ?? "default") ||
|
|
23
30
|
olds.locationHint !== news.locationHint) {
|
|
24
31
|
return { action: "replace" };
|
|
@@ -26,17 +33,15 @@ export const bucketProvider = () => Bucket.provider.effect(Effect.gen(function*
|
|
|
26
33
|
if (output.storageClass !== (news.storageClass ?? "Standard")) {
|
|
27
34
|
return {
|
|
28
35
|
action: "update",
|
|
29
|
-
stables: output.
|
|
30
|
-
? ["name"]
|
|
31
|
-
: undefined,
|
|
36
|
+
stables: output.bucketName === name ? ["name"] : undefined,
|
|
32
37
|
};
|
|
33
38
|
}
|
|
34
|
-
return { action: "noop" };
|
|
35
39
|
}),
|
|
36
40
|
create: Effect.fnUntraced(function* ({ id, news }) {
|
|
41
|
+
const name = yield* createBucketName(id, news.name);
|
|
37
42
|
const bucket = yield* api.r2.buckets.create({
|
|
38
43
|
account_id: accountId,
|
|
39
|
-
name
|
|
44
|
+
name,
|
|
40
45
|
storageClass: news.storageClass,
|
|
41
46
|
jurisdiction: news.jurisdiction,
|
|
42
47
|
locationHint: news.locationHint,
|
|
@@ -44,7 +49,7 @@ export const bucketProvider = () => Bucket.provider.effect(Effect.gen(function*
|
|
|
44
49
|
return mapResult(bucket);
|
|
45
50
|
}),
|
|
46
51
|
update: Effect.fnUntraced(function* ({ news, output }) {
|
|
47
|
-
const bucket = yield* api.r2.buckets.edit(output.
|
|
52
|
+
const bucket = yield* api.r2.buckets.edit(output.bucketName, {
|
|
48
53
|
account_id: output.accountId,
|
|
49
54
|
storage_class: news.storageClass ?? output.storageClass,
|
|
50
55
|
jurisdiction: output.jurisdiction,
|
|
@@ -53,15 +58,16 @@ export const bucketProvider = () => Bucket.provider.effect(Effect.gen(function*
|
|
|
53
58
|
}),
|
|
54
59
|
delete: Effect.fnUntraced(function* ({ output }) {
|
|
55
60
|
yield* api.r2.buckets
|
|
56
|
-
.delete(output.
|
|
61
|
+
.delete(output.bucketName, {
|
|
57
62
|
account_id: output.accountId,
|
|
58
63
|
})
|
|
59
64
|
.pipe(Effect.catchTag("NotFound", () => Effect.void));
|
|
60
65
|
}),
|
|
61
66
|
read: Effect.fnUntraced(function* ({ id, output, olds }) {
|
|
67
|
+
const name = output?.bucketName ?? (yield* createBucketName(id, olds?.name));
|
|
62
68
|
const params = {
|
|
63
69
|
account_id: output?.accountId ?? accountId,
|
|
64
|
-
name
|
|
70
|
+
name,
|
|
65
71
|
};
|
|
66
72
|
return yield* api.r2.buckets
|
|
67
73
|
.get(params.name, { account_id: params.account_id })
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bucket.provider.js","sourceRoot":"","sources":["../../../src/cloudflare/r2/bucket.provider.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"bucket.provider.js","sourceRoot":"","sources":["../../../src/cloudflare/r2/bucket.provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,8 +22,8 @@ export type WorkerProps<Req = any> = RuntimeProps<Worker, Exclude<Req, Assets.Fe
|
|
|
22
22
|
assets: string | Worker.AssetsProps;
|
|
23
23
|
});
|
|
24
24
|
export type WorkerAttr<Props extends WorkerProps<any>> = {
|
|
25
|
-
|
|
26
|
-
|
|
25
|
+
workerId: string;
|
|
26
|
+
workerName: Props["name"] extends string ? Props["name"] : string;
|
|
27
27
|
logpush: Props["logpush"] extends boolean ? Props["logpush"] : boolean;
|
|
28
28
|
observability: Props["observability"] extends Worker.Observability ? Props["observability"] : {};
|
|
29
29
|
url: Props["subdomain"] extends {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/worker/worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,KAAK,KAAK,MAAM,MAAM,mBAAmB,CAAC;AAEjD,eAAO,MAAM,UAAU,EAAG,mBAA4B,CAAC;AACvD,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAC;AAE3C,MAAM,MAAM,WAAW,CAAC,GAAG,GAAG,GAAG,IAAI,YAAY,CAC/C,MAAM,EACN,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAC3B,GAAG;IACF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC;IACrC,SAAS,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC;IAC7B,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,CAAC,EAAE;QACd,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;KAClB,CAAC;IACF,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC;CAC9B,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,SAAS,KAAK,GACvC;IACE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC;CACtC,GACD;IACE,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC;CACrC,CAAC,CAAC;AAET,MAAM,MAAM,UAAU,CAAC,KAAK,SAAS,WAAW,CAAC,GAAG,CAAC,IAAI;IACvD,
|
|
1
|
+
{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/worker/worker.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import * as FileSystem from "@effect/platform/FileSystem";
|
|
2
2
|
import * as Path from "@effect/platform/Path";
|
|
3
|
-
import { App } from "../../app.ts";
|
|
4
3
|
import { DotAlchemy } from "../../dot-alchemy.ts";
|
|
5
4
|
import { ESBuild } from "../../esbuild.ts";
|
|
6
5
|
import { Account } from "../account.ts";
|
|
7
6
|
import { CloudflareApi } from "../api.ts";
|
|
8
7
|
import { Assets } from "./assets.provider.ts";
|
|
9
8
|
import { Worker } from "./worker.ts";
|
|
10
|
-
export declare const workerProvider: () => import("effect/Layer").Layer<import("./worker.serve.ts").Provider<Worker>, never, FileSystem.FileSystem | Path.Path | App | DotAlchemy | ESBuild | Account | CloudflareApi | Assets>;
|
|
9
|
+
export declare const workerProvider: () => import("effect/Layer").Layer<import("./worker.serve.ts").Provider<Worker>, never, FileSystem.FileSystem | Path.Path | import("../../app.ts").App | DotAlchemy | ESBuild | Account | CloudflareApi | Assets>;
|
|
11
10
|
//# sourceMappingURL=worker.provider.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.provider.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/worker/worker.provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,6BAA6B,CAAC;AAC1D,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"worker.provider.d.ts","sourceRoot":"","sources":["../../../src/cloudflare/worker/worker.provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,6BAA6B,CAAC;AAC1D,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAI9C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAG3C,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAqC,MAAM,aAAa,CAAC;AAExE,eAAO,MAAM,cAAc,mNAwQxB,CAAC"}
|
|
@@ -1,16 +1,15 @@
|
|
|
1
1
|
import * as FileSystem from "@effect/platform/FileSystem";
|
|
2
2
|
import * as Path from "@effect/platform/Path";
|
|
3
3
|
import * as Effect from "effect/Effect";
|
|
4
|
-
import { App } from "../../app.js";
|
|
5
4
|
import { DotAlchemy } from "../../dot-alchemy.js";
|
|
6
5
|
import { ESBuild } from "../../esbuild.js";
|
|
6
|
+
import { createPhysicalName } from "../../physical-name.js";
|
|
7
7
|
import { sha256 } from "../../sha256.js";
|
|
8
8
|
import { Account } from "../account.js";
|
|
9
9
|
import { CloudflareApi } from "../api.js";
|
|
10
10
|
import { Assets } from "./assets.provider.js";
|
|
11
11
|
import { Worker } from "./worker.js";
|
|
12
12
|
export const workerProvider = () => Worker.provider.effect(Effect.gen(function* () {
|
|
13
|
-
const app = yield* App;
|
|
14
13
|
const api = yield* CloudflareApi;
|
|
15
14
|
const accountId = yield* Account;
|
|
16
15
|
const { read, upload } = yield* Assets;
|
|
@@ -33,7 +32,14 @@ export const workerProvider = () => Worker.provider.effect(Effect.gen(function*
|
|
|
33
32
|
});
|
|
34
33
|
yield* Effect.logDebug("setWorkerSubdomain", subdomain);
|
|
35
34
|
});
|
|
36
|
-
const createWorkerName = (id, name) =>
|
|
35
|
+
const createWorkerName = (id, name) => Effect.gen(function* () {
|
|
36
|
+
if (name)
|
|
37
|
+
return name;
|
|
38
|
+
return (yield* createPhysicalName({
|
|
39
|
+
id,
|
|
40
|
+
maxLength: 54,
|
|
41
|
+
})).toLowerCase();
|
|
42
|
+
});
|
|
37
43
|
const prepareAssets = Effect.fnUntraced(function* (assets) {
|
|
38
44
|
if (!assets)
|
|
39
45
|
return undefined;
|
|
@@ -88,7 +94,7 @@ export const workerProvider = () => Worker.provider.effect(Effect.gen(function*
|
|
|
88
94
|
return metadata;
|
|
89
95
|
});
|
|
90
96
|
const putWorker = Effect.fnUntraced(function* (id, news, bindings, olds, output, session) {
|
|
91
|
-
const name = createWorkerName(id, news.name);
|
|
97
|
+
const name = yield* createWorkerName(id, news.name);
|
|
92
98
|
const [assets, bundle, metadata] = yield* Effect.all([
|
|
93
99
|
prepareAssets(news.assets),
|
|
94
100
|
prepareBundle(id, news.main),
|
|
@@ -130,8 +136,8 @@ export const workerProvider = () => Worker.provider.effect(Effect.gen(function*
|
|
|
130
136
|
yield* setWorkerSubdomain(name, enable);
|
|
131
137
|
}
|
|
132
138
|
return {
|
|
133
|
-
|
|
134
|
-
name,
|
|
139
|
+
workerId: worker.id,
|
|
140
|
+
workerName: name,
|
|
135
141
|
logpush: worker.logpush,
|
|
136
142
|
observability: metadata.observability,
|
|
137
143
|
subdomain: news.subdomain ?? {
|
|
@@ -150,13 +156,13 @@ export const workerProvider = () => Worker.provider.effect(Effect.gen(function*
|
|
|
150
156
|
};
|
|
151
157
|
});
|
|
152
158
|
return {
|
|
153
|
-
stables: ["
|
|
154
|
-
diff: Effect.fnUntraced(function* ({ id,
|
|
159
|
+
stables: ["workerId"],
|
|
160
|
+
diff: Effect.fnUntraced(function* ({ id, news, output }) {
|
|
155
161
|
if (output.accountId !== accountId) {
|
|
156
162
|
return { action: "replace" };
|
|
157
163
|
}
|
|
158
|
-
const workerName = createWorkerName(id, news.name);
|
|
159
|
-
if (workerName !== output.
|
|
164
|
+
const workerName = yield* createWorkerName(id, news.name);
|
|
165
|
+
if (workerName !== output.workerName) {
|
|
160
166
|
return { action: "replace" };
|
|
161
167
|
}
|
|
162
168
|
const [assets, bundle] = yield* Effect.all([
|
|
@@ -167,12 +173,33 @@ export const workerProvider = () => Worker.provider.effect(Effect.gen(function*
|
|
|
167
173
|
bundle.hash !== output.hash.bundle) {
|
|
168
174
|
return {
|
|
169
175
|
action: "update",
|
|
170
|
-
stables: output.
|
|
176
|
+
stables: output.workerName === workerName ? ["name"] : undefined,
|
|
171
177
|
};
|
|
172
178
|
}
|
|
173
179
|
}),
|
|
180
|
+
read: Effect.fnUntraced(function* ({ id, output }) {
|
|
181
|
+
const workerName = yield* createWorkerName(id, output?.workerName);
|
|
182
|
+
const worker = yield* api.workers.beta.workers.get(workerName, {
|
|
183
|
+
account_id: accountId,
|
|
184
|
+
});
|
|
185
|
+
return {
|
|
186
|
+
accountId,
|
|
187
|
+
workerId: worker.id,
|
|
188
|
+
workerName: worker.name,
|
|
189
|
+
logpush: worker.logpush,
|
|
190
|
+
observability: worker.observability,
|
|
191
|
+
subdomain: {
|
|
192
|
+
enabled: worker.subdomain.enabled,
|
|
193
|
+
previews_enabled: worker.subdomain.previews_enabled,
|
|
194
|
+
},
|
|
195
|
+
url: worker.subdomain.enabled
|
|
196
|
+
? `https://${workerName}.${yield* getAccountSubdomain(accountId)}.workers.dev`
|
|
197
|
+
: undefined,
|
|
198
|
+
tags: worker.tags,
|
|
199
|
+
};
|
|
200
|
+
}),
|
|
174
201
|
create: Effect.fnUntraced(function* ({ id, news, bindings, session }) {
|
|
175
|
-
const name = createWorkerName(id, news.name);
|
|
202
|
+
const name = yield* createWorkerName(id, news.name);
|
|
176
203
|
const existing = yield* api.workers.beta.workers
|
|
177
204
|
.get(name, {
|
|
178
205
|
account_id: accountId,
|
|
@@ -188,7 +215,7 @@ export const workerProvider = () => Worker.provider.effect(Effect.gen(function*
|
|
|
188
215
|
}),
|
|
189
216
|
delete: Effect.fnUntraced(function* ({ output }) {
|
|
190
217
|
yield* api.workers.scripts
|
|
191
|
-
.delete(output.
|
|
218
|
+
.delete(output.workerId, {
|
|
192
219
|
account_id: output.accountId,
|
|
193
220
|
})
|
|
194
221
|
.pipe(Effect.catchTag("NotFound", () => Effect.void));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.provider.js","sourceRoot":"","sources":["../../../src/cloudflare/worker/worker.provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,6BAA6B,CAAC;AAC1D,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAE9C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"worker.provider.js","sourceRoot":"","sources":["../../../src/cloudflare/worker/worker.provider.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,6BAA6B,CAAC;AAC1D,OAAO,KAAK,IAAI,MAAM,uBAAuB,CAAC;AAE9C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAqC,MAAM,aAAa,CAAC;AAExE,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE,CACjC,MAAM,CAAC,QAAQ,CAAC,MAAM,CACpB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;IACjC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC;IACjC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC;IACvC,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC;IACjC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAC;IACxC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;IAC9B,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC;IAErC,MAAM,mBAAmB,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CACtD,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,SAAiB;QAC5C,MAAM,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;YACtD,UAAU,EAAE,SAAS;SACtB,CAAC,CAAC;QACH,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,CACH,CAAC;IAEF,oCAAoC;IACpC,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC;IAEzD,MAAM,kBAAkB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EACpD,IAAY,EACZ,OAAgB;QAEhB,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE;YAClE,UAAU,EAAE,SAAS;YACrB,OAAO;SACR,CAAC,CAAC;QACH,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,EAAE,SAAS,CAAC,CAAC;IAC1D,CAAC,CAAC,CAAC;IAEH,MAAM,gBAAgB,GAAG,CAAC,EAAU,EAAE,IAAwB,EAAE,EAAE,CAChE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;QACtB,OAAO,CAAC,KAAK,CAAC,CAAC,kBAAkB,CAAC;YAChC,EAAE;YACF,SAAS,EAAE,EAAE;SACd,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEL,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAC/C,MAA6B;QAE7B,IAAI,CAAC,MAAM;YAAE,OAAO,SAAS,CAAC;QAC9B,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,IAAI,CACxB,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAC5D,CAAC;QACF,OAAO;YACL,GAAG,MAAM;YACT,IAAI,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;SAC5C,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAC/C,EAAU,EACV,IAAY;QAEZ,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;QACzD,KAAK,CAAC,CAAC,KAAK,CAAC;YACX,WAAW,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,IAAI,CAAC,CAAC;YACjD,OAAO;YACP,KAAK,EAAE,IAAI;YACX,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,KAAK;YACb,SAAS,EAAE,KAAK;YAChB,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC/C,OAAO;YACL,IAAI;YACJ,IAAI,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC;SAC1B,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EACjD,KAAuB;QAEvB,MAAM,QAAQ,GAAwC;YACpD,MAAM,EAAE,SAAS;YACjB,QAAQ,EAAE,EAAE;YACZ,SAAS,EAAE,SAAS;YACpB,kBAAkB,EAAE,KAAK,CAAC,aAAa,EAAE,IAAI;YAC7C,mBAAmB,EAAE,KAAK,CAAC,aAAa,EAAE,KAAK;YAC/C,WAAW,EAAE,SAAS;YACtB,aAAa,EAAE,SAAS;YACxB,MAAM,EAAE,KAAK,CAAC,MAAM;YACpB,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,WAAW,EAAE,WAAW;YACxB,UAAU,EAAE,SAAS;YACrB,aAAa,EAAE,KAAK,CAAC,aAAa,IAAI;gBACpC,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE;oBACJ,OAAO,EAAE,IAAI;oBACb,eAAe,EAAE,IAAI;iBACtB;aACF;YACD,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,cAAc,EAAE,SAAS;YACzB,WAAW,EAAE,SAAS;SACvB,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAC3C,EAAU,EACV,IAAsB,EACtB,QAA6B,EAC7B,IAAkC,EAClC,MAAgD,EAChD,OAAgC;QAEhC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACpD,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;YACnD,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC;YAC1B,aAAa,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC;YAC5B,eAAe,CAAC,IAAI,CAAC;SACtB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QACtB,QAAQ,CAAC,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACpE,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,MAAM,EAAE,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC;gBACxC,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;gBAChE,QAAQ,CAAC,MAAM,GAAG;oBAChB,GAAG;oBACH,MAAM,EAAE,MAAM,CAAC,MAAM;iBACtB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,MAAM,GAAG;oBAChB,MAAM,EAAE,MAAM,CAAC,MAAM;iBACtB,CAAC;gBACF,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC;YAC9B,CAAC;YACD,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC;gBACrB,IAAI,EAAE,QAAQ;gBACd,IAAI,EAAE,QAAQ;aACf,CAAC,CAAC;QACL,CAAC;QACD,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QAC3C,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE;YACrD,UAAU,EAAE,SAAS;YACrB,QAAQ,EAAE,QAAQ;YAClB,KAAK,EAAE;gBACL,IAAI,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE;oBACnC,IAAI,EAAE,+BAA+B;iBACtC,CAAC;aACH;SACF,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,SAAS,EAAE,OAAO,KAAK,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,CAAC;YACjE,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,KAAK,KAAK,CAAC;YACjD,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,CACjB,GAAG,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,2BAA2B,CAChE,CAAC;YACF,KAAK,CAAC,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO;YACL,QAAQ,EAAE,MAAM,CAAC,EAAE;YACnB,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,aAAa,EAAE,QAAQ,CAAC,aAAa;YACrC,SAAS,EAAE,IAAI,CAAC,SAAS,IAAI;gBAC3B,OAAO,EAAE,IAAI;gBACb,gBAAgB,EAAE,IAAI;aACvB;YACD,GAAG,EACD,IAAI,CAAC,SAAS,EAAE,OAAO,KAAK,KAAK;gBAC/B,CAAC,CAAC,WAAW,IAAI,IAAI,KAAK,CAAC,CAAC,mBAAmB,CAAC,SAAS,CAAC,cAAc;gBACxE,CAAC,CAAC,SAAS;YACf,IAAI,EAAE,QAAQ,CAAC,IAAI;YACnB,SAAS;YACT,IAAI,EAAE;gBACJ,MAAM,EAAE,MAAM,EAAE,IAAI;gBACpB,MAAM,EAAE,MAAM,CAAC,IAAI;aACpB;SAC8B,CAAC;IACpC,CAAC,CAAC,CAAC;IAEH,OAAO;QACL,OAAO,EAAE,CAAC,UAAU,CAAC;QACrB,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;YACrD,IAAI,MAAM,CAAC,SAAS,KAAK,SAAS,EAAE,CAAC;gBACnC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;YAC/B,CAAC;YACD,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1D,IAAI,UAAU,KAAK,MAAM,CAAC,UAAU,EAAE,CAAC;gBACrC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;YAC/B,CAAC;YACD,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;gBACzC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC;gBAC1B,aAAa,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC;aAC7B,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACtB,IACE,MAAM,EAAE,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,MAAM;gBACnC,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CAAC,MAAM,EAClC,CAAC;gBACD,OAAO;oBACL,MAAM,EAAE,QAAQ;oBAChB,OAAO,EAAE,MAAM,CAAC,UAAU,KAAK,UAAU,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS;iBACjE,CAAC;YACJ,CAAC;QACH,CAAC,CAAC;QACF,IAAI,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE;YAC/C,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;YACnE,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,EAAE;gBAC7D,UAAU,EAAE,SAAS;aACtB,CAAC,CAAC;YACH,OAAO;gBACL,SAAS;gBACT,QAAQ,EAAE,MAAM,CAAC,EAAE;gBACnB,UAAU,EAAE,MAAM,CAAC,IAAI;gBACvB,OAAO,EAAE,MAAM,CAAC,OAAO;gBACvB,aAAa,EAAE,MAAM,CAAC,aAAa;gBACnC,SAAS,EAAE;oBACT,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC,OAAO;oBACjC,gBAAgB,EAAE,MAAM,CAAC,SAAS,CAAC,gBAAgB;iBACpD;gBACD,GAAG,EAAE,MAAM,CAAC,SAAS,CAAC,OAAO;oBAC3B,CAAC,CAAC,WAAW,UAAU,IAAI,KAAK,CAAC,CAAC,mBAAmB,CAAC,SAAS,CAAC,cAAc;oBAC9E,CAAC,CAAC,SAAS;gBACb,IAAI,EAAE,MAAM,CAAC,IAAI;aACc,CAAC;QACpC,CAAC,CAAC;QACF,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE;YAClE,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;YACpD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO;iBAC7C,GAAG,CAAC,IAAI,EAAE;gBACT,UAAU,EAAE,SAAS;aACtB,CAAC;iBACD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;YACxD,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACvB,IAAI,KAAK,CAAC,WAAW,IAAI,kBAAkB,CAAC,CAC7C,CAAC;YACJ,CAAC;YACD,OAAO,KAAK,CAAC,CAAC,SAAS,CACrB,EAAE,EACF,IAAI,EACJ,QAAQ,EACR,SAAS,EACT,SAAS,EACT,OAAO,CACR,CAAC;QACJ,CAAC,CAAC;QACF,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,EACnC,EAAE,EACF,IAAI,EACJ,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,OAAO,GACR;YACC,OAAO,KAAK,CAAC,CAAC,SAAS,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;QACrE,CAAC,CAAC;QACF,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE;YAC7C,KAAK,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO;iBACvB,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE;gBACvB,UAAU,EAAE,MAAM,CAAC,SAAS;aAC7B,CAAC;iBACD,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC1D,CAAC,CAAC;KACH,CAAC;AACJ,CAAC,CAAC,CACH,CAAC"}
|
package/lib/instance-id.d.ts
CHANGED
|
@@ -1,8 +1,12 @@
|
|
|
1
1
|
import * as Effect from "effect/Effect";
|
|
2
|
+
import * as Context from "effect/Context";
|
|
3
|
+
declare const InstanceId_base: Context.TagClass<InstanceId, "instance-id", string>;
|
|
2
4
|
/** A 16-byte (128-bit) random hex-encoded string representing an physical instance of a logical resource */
|
|
3
|
-
export
|
|
5
|
+
export declare class InstanceId extends InstanceId_base {
|
|
6
|
+
}
|
|
4
7
|
/**
|
|
5
8
|
* @returns Hex-encoded instance ID (16 random bytes)
|
|
6
9
|
*/
|
|
7
10
|
export declare const generateInstanceId: () => Effect.Effect<string, never, never>;
|
|
11
|
+
export {};
|
|
8
12
|
//# sourceMappingURL=instance-id.d.ts.map
|
package/lib/instance-id.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-id.d.ts","sourceRoot":"","sources":["../src/instance-id.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"instance-id.d.ts","sourceRoot":"","sources":["../src/instance-id.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;;AAE1C,4GAA4G;AAC5G,qBAAa,UAAW,SAAQ,eAG7B;CAAG;AAEN;;GAEG;AACH,eAAO,MAAM,kBAAkB,2CAO3B,CAAC"}
|
package/lib/instance-id.js
CHANGED
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import * as Effect from "effect/Effect";
|
|
2
|
+
import * as Context from "effect/Context";
|
|
3
|
+
/** A 16-byte (128-bit) random hex-encoded string representing an physical instance of a logical resource */
|
|
4
|
+
export class InstanceId extends Context.Tag("instance-id")() {
|
|
5
|
+
}
|
|
2
6
|
/**
|
|
3
7
|
* @returns Hex-encoded instance ID (16 random bytes)
|
|
4
8
|
*/
|
package/lib/instance-id.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"instance-id.js","sourceRoot":"","sources":["../src/instance-id.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"instance-id.js","sourceRoot":"","sources":["../src/instance-id.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAE1C,4GAA4G;AAC5G,MAAM,OAAO,UAAW,SAAQ,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,EAGvD;CAAG;AAEN;;GAEG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,EAAE,CACrC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;IACf,MAAM,KAAK,GAAG,IAAI,UAAU,CAAC,EAAE,CAAC,CAAC;IACjC,MAAM,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IAC9B,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;SACrB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;SAC3C,IAAI,CAAC,EAAE,CAAC,CAAC;AACd,CAAC,CAAC,CAAC"}
|
package/lib/physical-name.d.ts
CHANGED
|
@@ -1,11 +1,22 @@
|
|
|
1
1
|
import * as Effect from "effect/Effect";
|
|
2
2
|
import { App } from "./app.ts";
|
|
3
|
-
|
|
3
|
+
import { InstanceId } from "./instance-id.ts";
|
|
4
|
+
export declare const createPhysicalName: (args_0: {
|
|
4
5
|
id: string;
|
|
5
|
-
/**
|
|
6
|
-
|
|
6
|
+
/**
|
|
7
|
+
* Hex-encoded instance ID (16 random bytes)
|
|
8
|
+
*
|
|
9
|
+
* @default - the InstanceID set by the engine in Context
|
|
10
|
+
*/
|
|
11
|
+
instanceId?: string;
|
|
7
12
|
suffixLength?: number;
|
|
8
|
-
|
|
13
|
+
/**
|
|
14
|
+
* Maximum length of the physical name.
|
|
15
|
+
*
|
|
16
|
+
* If the name exceeds this length, the human-friendly portion of the name will be truncated to maxLength-suffixLength
|
|
17
|
+
*/
|
|
18
|
+
maxLength?: number;
|
|
19
|
+
}) => Effect.Effect<string, never, InstanceId | App>;
|
|
9
20
|
/**
|
|
10
21
|
* Encode bytes into RFC4648 Base32 (no padding), lowercase.
|
|
11
22
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"physical-name.d.ts","sourceRoot":"","sources":["../src/physical-name.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"physical-name.d.ts","sourceRoot":"","sources":["../src/physical-name.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAC/B,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,eAAO,MAAM,kBAAkB;QAOzB,MAAM;IACV;;;;OAIG;iBACU,MAAM;mBACJ,MAAM;IACrB;;;;OAIG;gBACS,MAAM;oDAclB,CAAC;AAUH;;;;;;GAMG;AACH,wBAAgB,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CA4BhD"}
|
package/lib/physical-name.js
CHANGED
|
@@ -1,10 +1,19 @@
|
|
|
1
1
|
import * as Effect from "effect/Effect";
|
|
2
2
|
import { App } from "./app.js";
|
|
3
|
-
|
|
3
|
+
import { InstanceId } from "./instance-id.js";
|
|
4
|
+
export const createPhysicalName = Effect.fn(function* ({ id,
|
|
4
5
|
// 16 base32 characters = 80 bits of entropy = 4 × 10⁻⁷
|
|
5
|
-
suffixLength = 16, }) {
|
|
6
|
+
instanceId, suffixLength = 16, maxLength = 64, }) {
|
|
6
7
|
const app = yield* App;
|
|
7
|
-
|
|
8
|
+
const sanitizedId = id.replace(/[^a-zA-Z0-9-_]/g, "-");
|
|
9
|
+
const prefix = `${app.name}-${sanitizedId}-${app.stage}-`;
|
|
10
|
+
const randomId = base32(Buffer.from(instanceId ?? (yield* InstanceId), "hex"));
|
|
11
|
+
const suffix = randomId.slice(0, suffixLength);
|
|
12
|
+
const name = `${prefix}${suffix}`;
|
|
13
|
+
if (maxLength && name.length > maxLength) {
|
|
14
|
+
return `${prefix.slice(0, maxLength - suffix.length)}${suffix}`;
|
|
15
|
+
}
|
|
16
|
+
return name;
|
|
8
17
|
});
|
|
9
18
|
// Base32 is ideal for physical names because it's denser than hex (5 bits per char vs 4)
|
|
10
19
|
// and compatible with DNS/S3 (as opposed to base64 which contains uppercase letters and symbols).
|
package/lib/physical-name.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"physical-name.js","sourceRoot":"","sources":["../src/physical-name.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"physical-name.js","sourceRoot":"","sources":["../src/physical-name.ts"],"names":[],"mappings":"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"}
|
package/lib/plan.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../src/plan.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../src/plan.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC,OAAO,KAAK,EACV,UAAU,EAGX,MAAM,cAAc,CAAC;AAGtB,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,KAAK,eAAe,EAAqB,MAAM,eAAe,CAAC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAgB,MAAM,eAAe,CAAC;AACzE,OAAO,EAAa,KAAK,QAAQ,EAAE,KAAK,OAAO,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EACL,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,EAC1B,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,oBAAoB,EACzB,KAAK,oBAAoB,EACzB,KAAK,EAEL,KAAK,aAAa,EACnB,MAAM,YAAY,CAAC;AAIpB,MAAM,MAAM,SAAS,GAAG,KAAK,CAAC;AAE9B,eAAO,MAAM,UAAU,GAAI,MAAM,GAAG,KAAG,IAAI,IAAI,QAQ9C,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAClD,MAAM,CAAC,CAAC,CAAC,GACT,QAAQ,CAAC,CAAC,CAAC,GACX,MAAM,CAAC,CAAC,CAAC,GACT,QAAQ,CAAC,CAAC,CAAC,CAAC;AAEhB,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI;IACtD,MAAM,EAAE,QAAQ,CAAC;IACjB,OAAO,EAAE,CAAC,CAAC;IACX,IAAI,EAAE,QAAQ,GAAG,SAAS,CAAC;IAC3B,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI;IACxD,MAAM,EAAE,UAAU,CAAC;IACnB,OAAO,EAAE,CAAC,CAAC;IACX,IAAI,EAAE,QAAQ,CAAC;IACf,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI;IACtD,MAAM,EAAE,QAAQ,CAAC;IACjB,OAAO,EAAE,CAAC,CAAC;IACX,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,IAAI;IACxD,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,CAAC,CAAC;IACX,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,MAAM,GAAI,MAAM,GAAG,KAAG,IAAI,IAAI,IAS1C,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,IAAI,CAAC,CAAC,SAAS,QAAQ,GAAG,WAAW,IAC7C,MAAM,CAAC,CAAC,CAAC,GACT,MAAM,CAAC,CAAC,CAAC,GACT,MAAM,CAAC,CAAC,CAAC,GACT,OAAO,CAAC,CAAC,CAAC,GACV,UAAU,CAAC,CAAC,CAAC,CAAC;AAElB,MAAM,MAAM,KAAK,CAAC,CAAC,SAAS,QAAQ,GAAG,WAAW,IAC9C,MAAM,CAAC,CAAC,CAAC,GACT,MAAM,CAAC,CAAC,CAAC,GACT,OAAO,CAAC,CAAC,CAAC,GACV,UAAU,CAAC,CAAC,CAAC,CAAC;AAElB,MAAM,WAAW,QAAQ,CAAC,CAAC,SAAS,QAAQ,GAAG,WAAW;IACxD,QAAQ,EAAE,CAAC,CAAC;IACZ,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC;IAC7B,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB;AAED,MAAM,WAAW,MAAM,CAAC,CAAC,SAAS,QAAQ,GAAG,WAAW,CAAE,SAAQ,QAAQ,CAAC,CAAC,CAAC;IAC3E,MAAM,EAAE,QAAQ,CAAC;IACjB,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,qBAAqB,GAAG,SAAS,CAAC;CAC1C;AAED,MAAM,WAAW,MAAM,CAAC,CAAC,SAAS,QAAQ,GAAG,WAAW,CAAE,SAAQ,QAAQ,CAAC,CAAC,CAAC;IAC3E,MAAM,EAAE,QAAQ,CAAC;IACjB,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EACD,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GAGpB,qBAAqB,CAAC;CAC3B;AAED,MAAM,WAAW,MAAM,CAAC,CAAC,SAAS,QAAQ,GAAG,WAAW,CAAE,SAAQ,QAAQ,CAAC,CAAC,CAAC;IAC3E,MAAM,EAAE,QAAQ,CAAC;IAEjB,KAAK,EAAE,aAAa,CAAC;CACtB;AAED,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,QAAQ,GAAG,WAAW,CAC1D,SAAQ,QAAQ,CAAC,CAAC,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,oBAAoB,GAAG,oBAAoB,CAAC;CACpD;AAED,MAAM,WAAW,OAAO,CAAC,CAAC,SAAS,QAAQ,GAAG,WAAW,CAAE,SAAQ,QAAQ,CAAC,CAAC,CAAC;IAC5E,MAAM,EAAE,SAAS,CAAC;IAClB,KAAK,EAAE,GAAG,CAAC;IACX,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,EACD,qBAAqB,GACrB,oBAAoB,GACpB,oBAAoB,GACpB,oBAAoB,GACpB,sBAAsB,GACtB,qBAAqB,CAAC;CAC3B;AAED,MAAM,MAAM,aAAa,CAAC,SAAS,SAAS,OAAO,GAAG,QAAQ,IAAI,OAAO,CACvE,iBAAiB,CAAC,SAAS,CAAC,CAC7B,CAAC;AAEF,MAAM,MAAM,iBAAiB,CAAC,SAAS,SAAS,OAAO,GAAG,QAAQ,IAC9D,SAAS,GACT,cAAc,CAAC,SAAS,CAAC,GACzB,mBAAmB,CAAC,SAAS,CAAC,CAAC;AAEnC,KAAK,OAAO,CAAC,SAAS,SAAS,OAAO,GAAG,QAAQ,IAAI;KAClD,EAAE,IAAI,SAAS,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE;QAAE,EAAE,EAAE,EAAE,CAAA;KAAE,CAAC,CAAC;CAC/D,CAAC;AAEF,MAAM,MAAM,cAAc,CAAC,SAAS,SAAS,OAAO,GAAG,QAAQ,IAAI,YAAY,CAC7E,OAAO,CACL,SAAS,EACT,QAAQ,CACT,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,CAC3D,CAAC;AAIF,MAAM,MAAM,mBAAmB,CAC7B,SAAS,SAAS,OAAO,GAAG,QAAQ,EACpC,KAAK,SAAS,OAAO,GAAG,QAAQ,GAAG,KAAK,IACtC,OAAO,CACP,KAAK,GACL;KACG,IAAI,IAAI,MAAM,SAAS,CAAC,OAAO,CAAC,GAAG,KAAK,CACvC,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CACzB,SAAS,IAAI,GACV,KAAK,GACL,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS;QAAE,IAAI,EAAE,gBAAgB,CAAA;KAAE,GACzD,KAAK,GACL,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,EAAE,GAAG,CAAC,GACjE,GAAG,SAAS,KAAK,GACf,KAAK,GACL,mBAAmB,CAAC,GAAG,EAAE,GAAG,GAAG,KAAK,CAAC,GACvC;SACG,CAAC,IAAI,MAAM,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,KAAK,CAC1C,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAC5B,SAAS,IAAI,GACV,KAAK,GACL,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,CAC7C,GAAG,EACH,MAAM,GAAG,EACT,GAAG,CACJ,GACD,GAAG,SAAS,KAAK,GACf,KAAK,GACL,mBAAmB,CAAC,GAAG,EAAE,GAAG,GAAG,KAAK,CAAC,GACvC,KAAK;KACZ,CAAC,MAAM,SAAS,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;CAC1C,CAAC,MAAM,SAAS,CAAC,OAAO,CAAC,CAAC,EAC7B,OAAO,GAAG,QAAQ,CACnB,CAAC;AAEF,MAAM,MAAM,SAAS,CAAC,SAAS,SAAS,OAAO,GAAG,QAAQ,IACtD,iBAAiB,CAAC,SAAS,CAAC,GAC5B,WAAW,CAAC,SAAS,CAAC,CAAC;AAE3B,MAAM,MAAM,iBAAiB,CAAC,GAAG,SAAS,OAAO,GAAG,QAAQ,IAAI,GAAG,SAAS,GAAG,GAC3E,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC,CAAC,GAClD,KAAK,CAAC;AAEV,MAAM,MAAM,WAAW,CAAC,SAAS,SAAS,OAAO,GAAG,QAAQ,IAAI,YAAY,CAC1E,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CACjE,CAAC;AAEF,KAAK,YAAY,CAAC,CAAC,IAAI,OAAO,SAAS,CAAC,GAAG,KAAK,GAAG,CAAC,CAAC;AAErD,KAAK,KAAK,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,IAAI,GAAG,KAAK,CAAC;AAE/C,MAAM,MAAM,UAAU,CAAC,SAAS,SAAS,OAAO,GAAG,QAAQ,IAAI;IAC7D,SAAS,EAAE;SACR,EAAE,IAAI,MAAM,aAAa,CAAC,SAAS,CAAC,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;KACrE,CAAC;IACF,SAAS,EAAE;SACR,EAAE,IAAI,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC;KACpC,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAClB,SAAS,EAAE;SACR,EAAE,IAAI,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC;KAC3B,CAAC;IACF,SAAS,EAAE;SACR,EAAE,IAAI,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;KAClC,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,IAAI,CAAC,SAAS,SAAS,OAAO,GAAG,QAAQ,IAAI,MAAM,CAAC,MAAM,CACpE,UAAU,CAAC,SAAS,CAAC,EACnB,sCAAsC,GACtC,uCAAuC,EACzC,SAAS,CAAC,SAAS,CAAC,GAAG,KAAK,CAC7B,CAAC;AAEF,eAAO,MAAM,IAAI,GAAI,KAAK,CAAC,SAAS,SAAS,CAAC,OAAO,GAAG,QAAQ,CAAC,EAAE,EACjE,GAAG,YAAY,SAAS,KACvB,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAskBxB,CAAC;;;;AAEZ,qBAAa,sCAAuC,SAAQ,4CAE1D;IACA,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;gBACY,SAAS,EAAE,MAAM;CAS9B;;;;AAED,qBAAa,uCAAwC,SAAQ,6CAE3D;IACA,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,EAAE,CAAC;CACxB,CAAC;CAAG;AA6JL;;GAEG;AACH,eAAO,MAAM,SAAS,GAAI,MAAM,KAAK,KAAG,MAkGvC,CAAC"}
|