effect-app 4.0.0-beta.6 → 4.0.0-beta.60

package/test/special.test.ts

@@ -0,0 +1,525 @@
+import { Option, Predicate, Schema, SchemaGetter } from "effect"
+import { InvalidStateError, LoginError, NotFoundError, NotLoggedInError, OptimisticConcurrencyException, ServiceUnavailableError, UnauthorizedError, ValidationError } from "effect-app/client/errors"
+import { Class, TaggedClass } from "effect-app/Schema/Class"
+import { specialJsonSchemaDocument } from "effect-app/Schema/SpecialJsonSchema"
+import { deduplicateOpenApiSchemas } from "effect-app/Schema/SpecialOpenApi"
+import * as S from "effect/Schema"
+import { describe, expect, it } from "vitest"
+
+describe("Class", () => {
+  it("encoding accepts plain objects matching the struct (Fields argument)", () => {
+    class A extends Class<A>("A")({ a: S.String }) {}
+
+    // Encoding a class instance still works
+    expect(S.encodeUnknownSync(A)(new A({ a: "hello" }))).toStrictEqual({ a: "hello" })
+
+    // Encoding a plain object matching the struct now succeeds
+    expect(S.encodeUnknownSync(A)({ a: "world" })).toStrictEqual({ a: "world" })
+
+    // Encoding null still fails
+    expect(() => S.encodeUnknownSync(A)(null)).toThrow()
+  })
+
+  it("encoding accepts plain objects matching the struct (Struct argument)", () => {
+    class A extends Class<A>("A")(S.Struct({ a: S.String })) {}
+
+    expect(S.encodeUnknownSync(A)(new A({ a: "hello" }))).toStrictEqual({ a: "hello" })
+    expect(S.encodeUnknownSync(A)({ a: "world" })).toStrictEqual({ a: "world" })
+    expect(() => S.encodeUnknownSync(A)(null)).toThrow()
+  })
+
+  it("decoding still works normally", () => {
+    class A extends Class<A>("A")({ a: S.String }) {}
+
+    const decoded = S.decodeUnknownSync(A)({ a: "hello" })
+    expect(decoded).toBeInstanceOf(A)
+    expect((decoded as A).a).toBe("hello")
+
+    expect(() => S.decodeUnknownSync(A)(null)).toThrow()
+    expect(() => S.decodeUnknownSync(A)({ a: 1 })).toThrow()
+  })
+
+  it("rejects values that don't match the struct", () => {
+    class A extends Class<A>("A")({ a: S.String }) {}
+
+    expect(() => S.encodeUnknownSync(A)({ a: 123 })).toThrow()
+    expect(() => S.encodeUnknownSync(A)("not an object")).toThrow()
+  })
+
+  it("returns a class constructor — new and instanceof work", () => {
+    class A extends Class<A>("A")({ a: S.String }) {}
+
+    const instance = new A({ a: "hello" })
+    expect(instance).toBeInstanceOf(A)
+    expect(instance.a).toBe("hello")
+  })
+
+  it("preserves fields and identifier", () => {
+    class A extends Class<A>("A")({ a: S.String, b: S.Number }) {}
+
+    expect(A.identifier).toBe("A")
+    expect(Object.keys(A.fields)).toStrictEqual(["a", "b"])
+  })
+})
+
+describe("Class constructor", () => {
+  it("works as a base class — new, instanceof, encoding plain objects", () => {
+    class A extends Class<A>("A")({ a: S.String }) {}
+
+    // Construction
+    const instance = new A({ a: "hello" })
+    expect(instance).toBeInstanceOf(A)
+    expect(instance.a).toBe("hello")
+
+    // Encoding a class instance
+    expect(S.encodeUnknownSync(A)(instance)).toStrictEqual({ a: "hello" })
+
+    // Encoding a plain object
+    expect(S.encodeUnknownSync(A)({ a: "world" })).toStrictEqual({ a: "world" })
+
+    // Encoding invalid input fails
+    expect(() => S.encodeUnknownSync(A)(null)).toThrow()
+    expect(() => S.encodeUnknownSync(A)({ a: 123 })).toThrow()
+  })
+
+  it("decoding works normally", () => {
+    class A extends Class<A>("A")({ a: S.String }) {}
+
+    const decoded = S.decodeUnknownSync(A)({ a: "hello" })
+    expect(decoded).toBeInstanceOf(A)
+    expect((decoded as A).a).toBe("hello")
+
+    expect(() => S.decodeUnknownSync(A)({ a: 1 })).toThrow()
+  })
+
+  it("exposes fields, identifier, pick, omit", () => {
+    class A extends Class<A>("A")({ a: S.String, b: S.Number }) {}
+
+    expect(A.identifier).toBe("A")
+    expect(Object.keys(A.fields)).toStrictEqual(["a", "b"])
+    expect(A.pick("a")).toStrictEqual({ a: A.fields.a })
+    expect(A.omit("b")).toStrictEqual({ a: A.fields.a })
+  })
+})
+
+describe("TaggedClass constructor", () => {
+  it("works as a base class with _tag — new, instanceof, encoding plain objects", () => {
+    class Circle extends TaggedClass<Circle>()("Circle", { radius: S.Number }) {}
+
+    // Construction
+    const instance = new Circle({ radius: 5 })
+    expect(instance).toBeInstanceOf(Circle)
+    expect(instance._tag).toBe("Circle")
+    expect(instance.radius).toBe(5)
+
+    // Encoding a class instance
+    expect(S.encodeUnknownSync(Circle)(instance)).toStrictEqual({ _tag: "Circle", radius: 5 })
+
+    // Encoding a plain object
+    expect(S.encodeUnknownSync(Circle)({ _tag: "Circle", radius: 10 })).toStrictEqual({ _tag: "Circle", radius: 10 })
+
+    // Encoding invalid input fails
+    expect(() => S.encodeUnknownSync(Circle)(null)).toThrow()
+    expect(() => S.encodeUnknownSync(Circle)({ _tag: "Circle", radius: "nope" })).toThrow()
+  })
+
+  it("decoding works normally", () => {
+    class Circle extends TaggedClass<Circle>()("Circle", { radius: S.Number }) {}
+
+    const decoded = S.decodeUnknownSync(Circle)({ _tag: "Circle", radius: 5 })
+    expect(decoded).toBeInstanceOf(Circle)
+    expect((decoded as Circle).radius).toBe(5)
+    expect((decoded as Circle)._tag).toBe("Circle")
+  })
+
+  it("exposes fields, identifier, pick, omit", () => {
+    class Circle extends TaggedClass<Circle>()("Circle", { radius: S.Number }) {}
+
+    expect(Circle.identifier).toBe("Circle")
+    expect(Object.keys(Circle.fields)).toContain("_tag")
+    expect(Object.keys(Circle.fields)).toContain("radius")
+    expect(Circle.pick("radius")).toStrictEqual({ radius: Circle.fields.radius })
+  })
+})
+
+describe("TaggedError", () => {
+  it("InvalidStateError toString includes the message", () => {
+    const error = new InvalidStateError("something went wrong")
+    expect(error.toString()).toContain("something went wrong")
+  })
+
+  it("NotFoundError toString includes the message", () => {
+    const error = new NotFoundError({ type: "User", id: "123" })
+    expect(error.toString()).toContain("Didn't find User")
+    expect(error.toString()).toContain("123")
+  })
+
+  it("ServiceUnavailableError toString includes the message", () => {
+    const error = new ServiceUnavailableError("service down")
+    expect(error.toString()).toContain("service down")
+  })
+
+  it("ValidationError toString includes the message", () => {
+    const error = new ValidationError({ errors: ["field required"] })
+    expect(error.toString()).toContain("Validation failed")
+    expect(error.toString()).toContain("field required")
+  })
+
+  it("NotLoggedInError toString includes the message", () => {
+    const error = new NotLoggedInError("not logged in")
+    expect(error.toString()).toContain("not logged in")
+  })
+
+  it("LoginError toString includes the message", () => {
+    const error = new LoginError("login failed")
+    expect(error.toString()).toContain("login failed")
+  })
+
+  it("UnauthorizedError toString includes the message", () => {
+    const error = new UnauthorizedError("forbidden")
+    expect(error.toString()).toContain("forbidden")
+  })
+
+  it("OptimisticConcurrencyException toString includes the message", () => {
+    const error = new OptimisticConcurrencyException({ message: "conflict" })
+    expect(error.toString()).toContain("conflict")
+  })
+
+  it("OptimisticConcurrencyException from details toString includes the message", () => {
+    const error = new OptimisticConcurrencyException({ type: "User", id: "123", code: 409 })
+    expect(error.toString()).toContain("Existing User 123 record changed")
+  })
+})
+
+describe("SpecialJsonSchema", () => {
+  it("nullable to optional — from NullOr", () => {
+    const nullableDecodedUndefinedEncoded = (schema: Schema.Top) => {
+      const isNullableSchema = "members" in schema
+        && globalThis.Array.isArray((schema as any).members)
+        && (schema as any).members.length === 2
+        && (schema as any).members.some((member: any) => member.ast._tag === "Null")
+
+      const nullableMembers = isNullableSchema ? (schema as any).members as ReadonlyArray<Schema.Top> : undefined
+      const innerSchema = nullableMembers
+        ? nullableMembers.find((member: any) => member.ast._tag !== "Null")!
+        : schema
+
+      const nullableSchema = isNullableSchema ? schema : Schema.NullOr(schema)
+
+      return nullableSchema.pipe(
+        Schema.encodeTo(Schema.optionalKey(innerSchema), {
+          decode: SchemaGetter.transformOptional(Option.orElseSome(() => null)),
+          encode: SchemaGetter.transformOptional(Option.filter(Predicate.isNotNull))
+        })
+      )
+    }
+
+    const fromNullOr = nullableDecodedUndefinedEncoded(Schema.NullOr(Schema.String))
+    const structFromNullOr = Schema.Struct({ status: fromNullOr })
+
+    const encode = Schema.encodeUnknownSync(structFromNullOr as any)
+    const encodedNull = encode({ status: null }) as any
+    expect("status" in encodedNull).toBe(false)
+    expect(encode({ status: "test" })).toStrictEqual({ status: "test" })
+
+    const decode = Schema.decodeUnknownSync(structFromNullOr as any)
+    expect(decode({})).toStrictEqual({ status: null })
+    expect(decode({ status: "test" })).toStrictEqual({ status: "test" })
+
+    const doc = specialJsonSchemaDocument(structFromNullOr)
+    expect(doc).toStrictEqual({
+      dialect: "draft-2020-12",
+      schema: {
+        "type": "object",
+        "properties": {
+          "status": { "type": "string" }
+        },
+        "additionalProperties": false
+      },
+      definitions: {}
+    })
+  })
+
+  it("identifies X universally — deduplicates same-fingerprint references", () => {
+    const X = Schema.String.annotate({ title: "X", identifier: "X" })
+
+    const s = Schema.Struct({
+      a: Schema.NullOr(X).pipe(
+        Schema.encodeTo(Schema.optionalKey(X), {
+          decode: SchemaGetter.transformOptional(Option.orElseSome(() => null)),
+          encode: SchemaGetter.transformOptional(Option.filter(Predicate.isNotNull))
+        })
+      ),
+      b: Schema.NullOr(X).pipe(
+        Schema.encodeTo(Schema.optionalKey(X), {
+          decode: SchemaGetter.transformOptional(Option.orElseSome(() => null)),
+          encode: SchemaGetter.transformOptional(Option.filter(Predicate.isNotNull))
+        })
+      ),
+      c: Schema.NullOr(X),
+      d: X,
+      e: X.pipe(Schema.optionalKey)
+    })
+
+    const doc = specialJsonSchemaDocument(s)
+    expect(doc).toStrictEqual({
+      dialect: "draft-2020-12",
+      schema: {
+        "type": "object",
+        "properties": {
+          "a": { "$ref": "#/$defs/X" },
+          "b": { "$ref": "#/$defs/X" },
+          "c": {
+            "anyOf": [
+              { "$ref": "#/$defs/X" },
+              { "type": "null" }
+            ]
+          },
+          "d": { "$ref": "#/$defs/X" },
+          "e": { "$ref": "#/$defs/X" }
+        },
+        "required": ["c", "d"],
+        "additionalProperties": false
+      },
+      definitions: {
+        X: {
+          "type": "string",
+          "title": "X"
+        }
+      }
+    })
+  })
+
+  it("shared annotated schema via helper — deduplicates", () => {
+    const X = Schema.String.annotate({ title: "X", identifier: "X" })
+
+    const cache = new WeakMap()
+    const nullableDecodedUndefinedEncoded = (schema: Schema.Top) => {
+      const isNullableSchema = "members" in schema
+        && globalThis.Array.isArray((schema as any).members)
+        && (schema as any).members.length === 2
+        && (schema as any).members.some((member: any) => member.ast._tag === "Null")
+
+      const nullableMembers = isNullableSchema ? (schema as any).members as ReadonlyArray<Schema.Top> : undefined
+      const innerSchema = nullableMembers
+        ? nullableMembers.find((member: any) => member.ast._tag !== "Null")!
+        : schema
+
+      const cached = cache.get(innerSchema.ast)
+      if (cached !== undefined) return cached
+
+      const nullableSchema = isNullableSchema ? schema : Schema.NullOr(schema)
+      const out = nullableSchema.pipe(
+        Schema.encodeTo(Schema.optionalKey(innerSchema), {
+          decode: SchemaGetter.transformOptional(Option.orElseSome(() => null)),
+          encode: SchemaGetter.transformOptional(Option.filter(Predicate.isNotNull))
+        })
+      )
+
+      cache.set(innerSchema.ast, out)
+      return out
+    }
+
+    const structWithShared = Schema.Struct({
+      a: nullableDecodedUndefinedEncoded(X),
+      b: nullableDecodedUndefinedEncoded(Schema.NullOr(X)),
+      c: Schema.NullOr(X),
+      d: X,
+      e: X.pipe(Schema.optionalKey)
+    })
+
+    const doc = specialJsonSchemaDocument(structWithShared)
+    expect(doc).toStrictEqual({
+      dialect: "draft-2020-12",
+      schema: {
+        "type": "object",
+        "properties": {
+          "a": { "$ref": "#/$defs/X" },
+          "b": { "$ref": "#/$defs/X" },
+          "c": {
+            "anyOf": [
+              { "$ref": "#/$defs/X" },
+              { "type": "null" }
+            ]
+          },
+          "d": { "$ref": "#/$defs/X" },
+          "e": { "$ref": "#/$defs/X" }
+        },
+        "required": ["c", "d"],
+        "additionalProperties": false
+      },
+      definitions: {
+        X: {
+          "type": "string",
+          "title": "X"
+        }
+      }
+    })
+  })
+})
+
+describe("SpecialOpenApi", () => {
+  it("deduplicates identical components.schemas entries with same base identifier", () => {
+    const spec = {
+      openapi: "3.1.0",
+      info: { title: "Test", version: "1.0" },
+      paths: {
+        "/foo": {
+          get: {
+            responses: {
+              200: {
+                content: {
+                  "application/json": {
+                    schema: { $ref: "#/components/schemas/X" }
+                  }
+                }
+              }
+            }
+          }
+        },
+        "/bar": {
+          get: {
+            responses: {
+              200: {
+                content: {
+                  "application/json": {
+                    schema: { $ref: "#/components/schemas/X1" }
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      components: {
+        schemas: {
+          X: { type: "string", title: "X" },
+          X1: { type: "string", title: "X" }
+        }
+      }
+    }
+
+    const result = deduplicateOpenApiSchemas(spec) as any
+
+    // X1 should be removed, and $ref to X1 rewritten to X
+    expect(result.components.schemas).toStrictEqual({
+      X: { type: "string", title: "X" }
+    })
+    expect(
+      result.paths["/bar"].get.responses[200].content["application/json"].schema
+    )
+      .toStrictEqual({ $ref: "#/components/schemas/X" })
+  })
+
+  it("does not deduplicate entries with different representations", () => {
+    const spec = {
+      openapi: "3.1.0",
+      info: { title: "Test", version: "1.0" },
+      paths: {},
+      components: {
+        schemas: {
+          X: { type: "string", title: "X" },
+          X1: { type: "number", title: "X" }
+        }
+      }
+    }
+
+    const result = deduplicateOpenApiSchemas(spec) as any
+
+    // Both should remain since they have different representations
+    expect(result.components.schemas).toStrictEqual({
+      X: { type: "string", title: "X" },
+      X1: { type: "number", title: "X" }
+    })
+  })
+
+  it("returns spec unchanged when no duplicates exist", () => {
+    const spec = {
+      openapi: "3.1.0",
+      info: { title: "Test", version: "1.0" },
+      paths: {},
+      components: {
+        schemas: {
+          Foo: { type: "string" },
+          Bar: { type: "number" }
+        }
+      }
+    }
+
+    const result = deduplicateOpenApiSchemas(spec)
+    expect(result).toBe(spec) // same reference, no cloning needed
+  })
+
+  it("rewrites nested $ref pointers in allOf/anyOf/oneOf", () => {
+    const spec = {
+      openapi: "3.1.0",
+      info: { title: "Test", version: "1.0" },
+      paths: {
+        "/baz": {
+          post: {
+            requestBody: {
+              content: {
+                "application/json": {
+                  schema: {
+                    anyOf: [
+                      { $ref: "#/components/schemas/Y1" },
+                      { type: "null" }
+                    ]
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      components: {
+        schemas: {
+          Y: { type: "object", properties: { name: { type: "string" } } },
+          Y1: { type: "object", properties: { name: { type: "string" } } }
+        }
+      }
+    }
+
+    const result = deduplicateOpenApiSchemas(spec) as any
+
+    expect(result.components.schemas).toStrictEqual({
+      Y: { type: "object", properties: { name: { type: "string" } } }
+    })
+    expect(
+      result.paths["/baz"].post.requestBody.content["application/json"].schema.anyOf[0]
+    )
+      .toStrictEqual({ $ref: "#/components/schemas/Y" })
+  })
+
+  it("rewrites $ref pointers inside definitions themselves", () => {
+    const spec = {
+      openapi: "3.1.0",
+      info: { title: "Test", version: "1.0" },
+      paths: {},
+      components: {
+        schemas: {
+          Inner: { type: "string" },
+          Inner1: { type: "string" },
+          Outer: {
+            type: "object",
+            properties: {
+              field: { $ref: "#/components/schemas/Inner1" }
+            }
+          }
+        }
+      }
+    }
+
+    const result = deduplicateOpenApiSchemas(spec) as any
+
+    expect(Object.keys(result.components.schemas)).toStrictEqual(["Inner", "Outer"])
+    expect(result.components.schemas.Outer.properties.field).toStrictEqual({
+      $ref: "#/components/schemas/Inner"
+    })
+  })
+
+  it("handles spec without components gracefully", () => {
+    const spec = { openapi: "3.1.0", info: { title: "Test", version: "1.0" }, paths: {} }
+    expect(deduplicateOpenApiSchemas(spec)).toBe(spec)
+  })
+})

package/test/utils.test.ts

@@ -111,7 +111,7 @@ test("works with schema class", () => {
     name: S.String,
     state: S.Union([
       S.Struct({ a: S.String, _tag: S.Literal("a") }),
-      S.Struct({ b: S.Number, _tag: S.Literal("b") })
+      S.Struct({ b: S.Finite, _tag: S.Literal("b") })
     ])
   }) {}
 

package/tsconfig.base.json

@@ -21,7 +21,6 @@
     "noImplicitThis": true,
     "resolveJsonModule": true,
     "moduleResolution": "Node16",
-    "downlevelIteration": true,
     "noErrorTruncation": true,
     "forceConsistentCasingInFileNames": true
   },

package/tsconfig.json

@@ -32,7 +32,6 @@
     "outDir": "build/dist",
     "resolveJsonModule": true,
     "moduleResolution": "Node16",
-    "downlevelIteration": true,
     "noErrorTruncation": true,
     "forceConsistentCasingInFileNames": true,
     "types": [

package/dist/ServiceMap.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ServiceMap.d.ts","sourceRoot":"","sources":["../src/ServiceMap.ts"],"names":[],"mappings":"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"}

package/dist/ServiceMap.js

@@ -1,91 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/**
- * We're doing the long way around here with assignTag, TagBase & TagBaseTagged,
- * because there's a typescript compiler issue where it will complain about Equal.symbol, and Hash.symbol not being accessible.
- * https://github.com/microsoft/TypeScript/issues/52644
- */
-import { Layer } from "effect";
-import * as ServiceMap from "effect/ServiceMap";
-export * from "effect/ServiceMap";
-// export interface OpaqueMake<Self extends object, in out Shape extends object, E, R>
-//   extends ServiceMap.Service<Self, Self>
-// {
-//   // temp while sorting out https://github.com/Effect-TS/effect-smol/pull/1534
-//   of(self: Shape): Self
-//   serviceMap2(self: Shape): ServiceMap.ServiceMap<Self>
-//   // a version that leverages the Shape -> Self conversion
-//   toLayer: {
-//     <E, R>(
-//       eff: Effect.Effect<Shape, E, R>
-//     ): Layer.Layer<Self, E, Exclude<R, Scope.Scope>>
-//     (): Layer.Layer<Self, E, Exclude<R, Scope.Scope>>
-//   }
-// }
-export function assignTag(key, creationError) {
-    return (cls) => {
-        const tag = ServiceMap.Service(key);
-        let fields = tag;
-        if (Reflect.ownKeys(cls).includes("key")) {
-            const { key, ...rest } = tag;
-            fields = rest;
-        }
-        const t = Object.assign(cls, Object.getPrototypeOf(tag), fields);
-        if (!creationError) {
-            const limit = Error.stackTraceLimit;
-            Error.stackTraceLimit = 2;
-            creationError = new Error();
-            Error.stackTraceLimit = limit;
-        }
-        // the stack is used to get the location of the tag definition, if a service is not found in the registry
-        Object.defineProperty(t, "stack", {
-            get() {
-                return creationError.stack;
-            }
-        });
-        return t;
-    };
-}
-/**
- * Only use this in very specific cases where using dependencies directly is prefered, like inside command handlers.
- */
-export const proxify = (Tag) => () => {
-    const cache = new Map();
-    const done = new Proxy(Tag, {
-        get(_target, prop, _receiver) {
-            if (prop === "use") {
-                // @ts-expect-error abc
-                return (body) => Tag.use(body);
-            }
-            if (prop in Tag) {
-                return Tag[prop];
-            }
-            if (cache.has(prop)) {
-                return cache.get(prop);
-            }
-            const fn = (...args) => Tag.use((s) => s[prop](...args));
-            const cn = Tag.use((s) => s[prop]);
-            // @effect-diagnostics effect/floatingEffect:off
-            Object.assign(fn, cn);
-            Object.setPrototypeOf(fn, Object.getPrototypeOf(cn));
-            cache.set(prop, fn);
-            return fn;
-        }
-    });
-    return done;
-};
-export const TypeId = "~ServiceMap.Opaque";
-// export interface OpaqueClassMake<Self extends object, in out Identifier extends string, Shape extends object, E, R>
-//   extends OpaqueMake<Self, Shape, E, R>
-// {
-//   new(_: never): Shape & { readonly [TypeId]: Identifier }
-//   readonly key: Identifier
-// }
-export const Opaque = () => (id, options) => {
-    const svc = ServiceMap.Service()(id, options);
-    return Object.assign(svc, {
-        toLayer: (eff) => {
-            return Layer.effect(svc, eff);
-        }
-    });
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2VydmljZU1hcC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9TZXJ2aWNlTWFwLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLHVEQUF1RDtBQUN2RDs7OztHQUlHO0FBRUgsT0FBTyxFQUFlLEtBQUssRUFBMEIsTUFBTSxRQUFRLENBQUE7QUFDbkUsT0FBTyxLQUFLLFVBQVUsTUFBTSxtQkFBbUIsQ0FBQTtBQUcvQyxjQUFjLG1CQUFtQixDQUFBO0FBY2pDLHNGQUFzRjtBQUN0RiwyQ0FBMkM7QUFDM0MsSUFBSTtBQUNKLGlGQUFpRjtBQUNqRiwwQkFBMEI7QUFDMUIsMERBQTBEO0FBQzFELDZEQUE2RDtBQUM3RCxlQUFlO0FBQ2YsY0FBYztBQUNkLHdDQUF3QztBQUN4Qyx1REFBdUQ7QUFDdkQsd0RBQXdEO0FBQ3hELE1BQU07QUFDTixJQUFJO0FBRUosTUFBTSxVQUFVLFNBQVMsQ0FDdkIsR0FBVyxFQUNYLGFBQXFCO0lBRXJCLE9BQU8sQ0FBbUIsR0FBTSxFQUFpQyxFQUFFO1FBQ2pFLE1BQU0sR0FBRyxHQUFHLFVBQVUsQ0FBQyxPQUFPLENBQW9CLEdBQUcsQ0FBQyxDQUFBO1FBQ3RELElBQUksTUFBTSxHQUFHLEdBQUcsQ0FBQTtRQUNoQixJQUFJLE9BQU8sQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxFQUFFLENBQUM7WUFDekMsTUFBTSxFQUFFLEdBQUcsRUFBRSxHQUFHLElBQUksRUFBRSxHQUFHLEdBQUcsQ0FBQTtZQUM1QixNQUFNLEdBQUcsSUFBVyxDQUFBO1FBQ3RCLENBQUM7UUFDRCxNQUFNLENBQUMsR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsRUFBRSxNQUFNLENBQUMsY0FBYyxDQUFDLEdBQUcsQ0FBQyxFQUFFLE1BQU0sQ0FBQyxDQUFBO1FBQ2hFLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQztZQUNuQixNQUFNLEtBQUssR0FBRyxLQUFLLENBQUMs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