liminal 0.17.1 → 0.17.3

package/dist/experimental/Loader.js.map

@@ -1 +1 @@
-{"version":3,"file":"Loader.js","sourceRoot":"","sources":["../../experimental/Loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AACnD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAE7D,MAAM,OAAO,WAAY,SAAQ,IAAI,CAAC,WAAW,CAAC,aAAa,CAE7D;CAAG;AAEL,MAAM,OAAO,MAAO,SAAQ,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC,EAKtD;CAAG;AAEN,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CACjC,MAAM,EACN,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;IAC7B,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAA;IAEvC,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,GAAW;QACnD,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAA;QACvD,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,KAAK,CAAC,CAAA;QACrD,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7F,OAAO,KAAK,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,IAAI,CACpD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EACvB,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAChD,CAAA;QACH,CAAC;QACD,OAAO,MAAM,CAAC,IAAI,EAAE,CAAA;IACtB,CAAC,CAAC,CAAA;IAEF,OAAO,EAAE,IAAI,EAAE,CAAA;AACjB,CAAC,CAAC,CACH,CAAA"}
+{"version":3,"file":"Loader.js","sourceRoot":"","sources":["../../experimental/Loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACzC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAE7D,MAAM,OAAO,WAAY,SAAQ,IAAI,CAAC,WAAW,CAAC,aAAa,CAE7D;CAAG;AAEL,MAAM,OAAO,MAAO,SAAQ,OAAO,CAAC,OAAO,EAKxC,CAAC,gBAAgB,CAAC;CAAG;AAExB,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CACjC,MAAM,EACN,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAA;IAC7B,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,UAAU,CAAA;IAEvC,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,GAAW;QACnD,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAA;QACvD,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,KAAK,CAAC,CAAA;QACrD,IAAI,KAAK,CAAC,CAAC,EAAE,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC7F,OAAO,KAAK,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,gBAAgB,CAAC,CAAC,IAAI,CACpD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,EACvB,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,WAAW,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,CAChD,CAAA;QACH,CAAC;QACD,OAAO,MAAM,CAAC,IAAI,EAAE,CAAA;IACtB,CAAC,CAAC,CAAA;IAEF,OAAO,EAAE,IAAI,EAAE,CAAA;AACjB,CAAC,CAAC,CACH,CAAA"}

package/dist/experimental/TaggedTemplateFunction.d.ts

@@ -2,8 +2,8 @@ import { Effect } from "effect";
 export type TemplateStringsArrayLike = {
     raw: ReadonlyArray<string> | ArrayLike<string>;
 };
-type ExtractE<T> = [Extract<T, Effect.Effect<any, any, any>>] extends [never] ? never : Effect.Effect.Error<Extract<T, Effect.Effect<any, any, any>>>;
-type ExtractR<T> = [Extract<T, Effect.Effect<any, any, any>>] extends [never] ? never : Effect.Effect.Context<Extract<T, Effect.Effect<any, any, any>>>;
+type ExtractE<T> = [Extract<T, Effect.Effect<any, any, any>>] extends [never] ? never : Effect.Error<Extract<T, Effect.Effect<any, any, any>>>;
+type ExtractR<T> = [Extract<T, Effect.Effect<any, any, any>>] extends [never] ? never : Effect.Services<Extract<T, Effect.Effect<any, any, any>>>;
 export declare const raw: <Substitutions extends Array<unknown>>(template: TemplateStringsArrayLike, ...substitutions: Substitutions) => Effect.Effect<string, ExtractE<Substitutions[number]>, ExtractR<Substitutions[number]>>;
 export type TaggableHead = TemplateStringsArrayLike | string | Effect.Effect<string, any, any>;
 export type TaggableRest<H extends TaggableHead> = H extends TemplateStringsArrayLike ? Array<unknown> : [];

package/dist/experimental/Template.d.ts

@@ -1,7 +1,7 @@
-import { Types, Layer, Effect, Schema as S, Context } from "effect";
+import { Layer, Effect, Schema as S, Context } from "effect";
 import * as Loader from "./Loader.ts";
 export type Template<A> = (...[value]: A extends undefined ? [] : [value: A]) => string;
-declare const TemplateMisalignedError_base: new <A extends Record<string, any> = {}>(args: Types.Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => import("effect/Cause").YieldableError & {
+declare const TemplateMisalignedError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
     readonly _tag: "TemplateMisalignedError";
 } & Readonly<A>;
 export declare class TemplateMisalignedError extends TemplateMisalignedError_base<{
@@ -9,24 +9,20 @@ export declare class TemplateMisalignedError extends TemplateMisalignedError_bas
     readonly keys: ReadonlyArray<string>;
 }> {
 }
-declare const NoSuchTemplateError_base: new <A extends Record<string, any> = {}>(args: Types.Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => import("effect/Cause").YieldableError & {
+declare const NoSuchTemplateError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => import("effect/Cause").YieldableError & {
     readonly _tag: "NoSuchTemplateError";
 } & Readonly<A>;
 export declare class NoSuchTemplateError extends NoSuchTemplateError_base<{
     url: string;
 }> {
 }
-export interface TemplateClass<Self, Id extends string, A> extends Context.Tag<Self, Template<A>> {
-    new (_: never): Context.TagClassShape<Id, Template<A>>;
+export interface TemplateClass<Self, Id extends string, A> extends Context.Service<Self, Template<A>> {
+    new (_: never): Context.ServiceClass.Shape<Id, Template<A>>;
     readonly layer: Layer.Layer<Self, NoSuchTemplateError | TemplateMisalignedError | Loader.LoaderError, Loader.Loader>;
     readonly synthesize: (...[value]: A extends undefined ? [] : [value: A]) => Effect.Effect<string, never, Self>;
 }
-export type Payload = Record<string, S.Schema<any, string> | S.optional<S.Schema<any, string>>>;
-export declare namespace Payload {
-    type FromDefinition<P extends Payload | undefined> = P extends infer Q extends Payload ? S.Struct<Q>["Type"] : {};
-}
-export declare const Service: <Self>() => <const Id extends string, const P extends Payload | undefined>(id: Id, { url, payload, }: {
+export declare const Service: <Self>() => <const Id extends string, const P extends S.Struct.Fields>(_id: Id, _config: {
     readonly url: string;
-    readonly payload?: P | undefined;
-}) => TemplateClass<Self, Id, Payload.FromDefinition<P>>;
+    readonly payload: P;
+}) => TemplateClass<Self, Id, S.Struct<P>["Type"]>;
 export {};

package/dist/experimental/Template.js

@@ -1,58 +1,60 @@
-import { Option, Types, Layer, pipe, String, Effect, Schema as S, Data, SchemaAST, Context } from "effect";
+import { Layer, Effect, Schema as S, Data, Context } from "effect";
 import * as Loader from "./Loader.js";
 export class TemplateMisalignedError extends Data.TaggedError("TemplateMisalignedError") {
 }
 export class NoSuchTemplateError extends Data.TaggedError("NoSuchTemplateError") {
 }
-export const Service = () => (id, { url, payload, }) => {
-    const self = Context.Tag(`liminal/Template/${id}`)();
-    self.layer = Effect.gen(function* () {
-        const loader = yield* Loader.Loader;
-        const template = yield* loader.load(url).pipe(Effect.map(Option.getOrUndefined));
-        if (!template) {
-            return yield* new NoSuchTemplateError({ url });
-        }
-        const [head, ...rest] = pipe(template, String.trim, String.split("{{"));
-        if ((!payload || !Object.keys(payload).length) && !rest.length) {
-            return () => template;
-        }
-        const segments = rest.flatMap((part) => {
-            const i = part.indexOf("}}");
-            if (i === -1) {
-                return [];
-            }
-            return {
-                key: part.slice(0, i).trim(),
-                tail: part.slice(i + 2),
-            };
-        });
-        const keys = segments.map(({ key }) => key);
-        if (payload) {
-            const keys_ = new Set(keys);
-            const dne = new Set();
-            const schema = S.Struct(payload);
-            const fields = SchemaAST.getPropertySignatures(SchemaAST.encodedBoundAST(schema.ast));
-            for (const field of fields) {
-                if (!field.isOptional && !keys_.has(field.name.toString())) {
-                    dne.add(field.name.toString());
-                }
-            }
-            if (dne.size) {
-                return yield* new TemplateMisalignedError({
-                    url,
-                    keys: [...dne.values()],
-                });
-            }
-        }
-        else if (segments.length) {
-            return yield* new TemplateMisalignedError({ url, keys });
-        }
-        const make = (value) => value
-            ? head + segments.map(({ key, tail }) => `${value[key]}${tail}`).join("")
-            : template;
-        return make;
-    }).pipe(Layer.effect(self));
-    self.synthesize = (...args) => self.pipe(Effect.map((make) => make(...args)));
-    return self;
+export const Service = () => (_id, _config) => {
+    throw 0;
 };
+// type Make_ = Template<Payload.FromDefinition<P>>
+// type Self_ = TemplateClass<Self, Id, Payload.FromDefinition<P>>
+// const tag = Context.Service<Self, Make_>()(id)
+// const layer = Effect.gen(function* () {
+//   const loader = yield* Loader.Loader
+//   const template = yield* loader.load(url).pipe(Effect.map(Option.getOrUndefined))
+//   if (!template) {
+//     return yield* new NoSuchTemplateError({ url })
+//   }
+//   const [head, ...rest] = pipe(template, String.trim, String.split("{{"))
+//   if ((!payload || !Object.keys(payload).length) && !rest.length) {
+//     return () => template
+//   }
+//   const segments = rest.flatMap((part) => {
+//     const i = part.indexOf("}}")
+//     if (i === -1) {
+//       return []
+//     }
+//     return {
+//       key: part.slice(0, i).trim(),
+//       tail: part.slice(i + 2),
+//     }
+//   })
+//   const keys = segments.map(({ key }) => key)
+//   if (payload) {
+//     const keys_ = new Set(keys)
+//     const dne = new Set<string>()
+//     const schema = S.Struct(payload)
+//     for (const field of schema.ast.propertySignatures) {
+//       if (!SchemaAST.isOptional(field.type) && !keys_.has(field.name.toString())) {
+//         dne.add(field.name.toString())
+//       }
+//     }
+//     if (dne.size) {
+//       return yield* new TemplateMisalignedError({
+//         url,
+//         keys: [...dne.values()],
+//       })
+//     }
+//   } else if (segments.length) {
+//     return yield* new TemplateMisalignedError({ url, keys })
+//   }
+//   const make: Make_ = (value?) =>
+//     value
+//       ? head + segments.map(({ key, tail }) => `${(value as Record<typeof key, string>)[key]}${tail}`).join("")
+//       : template
+//   return make
+// }).pipe(Layer.effect(tag))
+// const synthesize = (...args) => tag.pipe(Effect.map((make) => make(...args)))
+// return Object.assign(tag, { synthesize })
 //# sourceMappingURL=Template.js.map

package/dist/experimental/Template.js.map

@@ -1 +1 @@
-{"version":3,"file":"Template.js","sourceRoot":"","sources":["../../experimental/Template.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Template.js","sourceRoot":"","sources":["../../experimental/Template.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAElE,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAIrC,MAAM,OAAO,uBAAwB,SAAQ,IAAI,CAAC,WAAW,CAAC,yBAAyB,CAGrF;CAAG;AAEL,MAAM,OAAO,mBAAoB,SAAQ,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAkB;CAAG;AAUpG,MAAM,CAAC,MAAM,OAAO,GAClB,GAAS,EAAE,CACX,CACE,GAAO,EACP,OAGC,EAC6C,EAAE;IAChD,MAAM,CAAC,CAAA;AACT,CAAC,CAAA;AAEH,mDAAmD;AACnD,kEAAkE;AAClE,iDAAiD;AACjD,0CAA0C;AAC1C,wCAAwC;AACxC,qFAAqF;AACrF,qBAAqB;AACrB,qDAAqD;AACrD,MAAM;AACN,4EAA4E;AAC5E,sEAAsE;AACtE,4BAA4B;AAC5B,MAAM;AACN,8CAA8C;AAC9C,mCAAmC;AACnC,sBAAsB;AACtB,kBAAkB;AAClB,QAAQ;AACR,eAAe;AACf,sCAAsC;AACtC,iCAAiC;AACjC,QAAQ;AACR,OAAO;AACP,gDAAgD;AAChD,mBAAmB;AACnB,kCAAkC;AAClC,oCAAoC;AACpC,uCAAuC;AACvC,2DAA2D;AAC3D,sFAAsF;AACtF,yCAAyC;AACzC,UAAU;AACV,QAAQ;AACR,sBAAsB;AACtB,oDAAoD;AACpD,eAAe;AACf,mCAAmC;AACnC,WAAW;AACX,QAAQ;AACR,kCAAkC;AAClC,+DAA+D;AAC/D,MAAM;AACN,oCAAoC;AACpC,YAAY;AACZ,kHAAkH;AAClH,mBAAmB;AACnB,gBAAgB;AAChB,6BAA6B;AAE7B,gFAAgF;AAEhF,4CAA4C"}