@typed/id 1.0.0-beta.3 → 1.0.0-beta.4

package/dist/Cuid.d.ts

@@ -1,7 +1,7 @@
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Schema from "effect/Schema";
-import * as ServiceMap from "effect/ServiceMap";
+import * as Context from "effect/Context";
 import { DateTimes } from "./DateTimes.js";
 import { RandomValues } from "./RandomValues.js";
 export declare const Cuid: Schema.brand<Schema.String, "@typed/id/CUID">;
@@ -13,7 +13,7 @@ export type CuidSeed = {
     readonly random: Uint8Array;
     readonly fingerprint: string;
 };
-declare const CuidState_base: ServiceMap.ServiceClass<CuidState, "@typed/id/CuidState", Effect.Effect<{
+declare const CuidState_base: Context.ServiceClass<CuidState, "@typed/id/CuidState", Effect.Effect<{
     timestamp: number;
     counter: number;
     random: Uint8Array<ArrayBufferLike>;

package/dist/Cuid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Cuid.d.ts","sourceRoot":"","sources":["../src/Cuid.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAQjD,eAAO,MAAM,IAAI,+CAGhB,CAAC;AACF,MAAM,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;AAEnD,eAAO,MAAM,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,KAAK,IAAI,IAAsB,CAAC;AAGxE,MAAM,MAAM,QAAQ,GAAG;IACrB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B,CAAC;;;;;;;6BAGgB,MAAM;;;;;;;AADxB,qBAAa,SAAU,SAAQ,cA8B7B;IACA,MAAM,CAAC,QAAQ,CAAC,IAAI;;;;;yBAAwC;IAE5D,MAAM,CAAC,QAAQ,CAAC,OAAO,kEAErB;CACH;AAED,eAAO,MAAM,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAGtD,CAAC"}
+{"version":3,"file":"Cuid.d.ts","sourceRoot":"","sources":["../src/Cuid.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAQjD,eAAO,MAAM,IAAI,+CAGhB,CAAC;AACF,MAAM,MAAM,IAAI,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;AAEnD,eAAO,MAAM,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,KAAK,IAAI,IAAsB,CAAC;AAGxE,MAAM,MAAM,QAAQ,GAAG;IACrB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B,CAAC;;;;;;;6BAGgB,MAAM;;;;;;;AADxB,qBAAa,SAAU,SAAQ,cA8B7B;IACA,MAAM,CAAC,QAAQ,CAAC,IAAI;;;;;yBAAwC;IAE5D,MAAM,CAAC,QAAQ,CAAC,OAAO,kEAErB;CACH;AAED,eAAO,MAAM,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAGtD,CAAC"}

package/dist/Cuid.js

@@ -1,7 +1,7 @@
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Schema from "effect/Schema";
-import * as ServiceMap from "effect/ServiceMap";
+import * as Context from "effect/Context";
 import { sha512 } from "./_sha.js";
 import { DateTimes } from "./DateTimes.js";
 import { RandomValues } from "./RandomValues.js";
@@ -12,7 +12,7 @@ const INITIAL_COUNT_MAX = 476782367;
 // Schema
 export const Cuid = Schema.String.pipe(Schema.check(Schema.isPattern(/^[a-z][0-9a-z]+$/)), Schema.brand("@typed/id/CUID"));
 export const isCuid = Schema.is(Cuid);
-export class CuidState extends ServiceMap.Service()("@typed/id/CuidState", {
+export class CuidState extends Context.Service()("@typed/id/CuidState", {
     make: (envData) => Effect.gen(function* () {
         const { now } = yield* DateTimes;
         const getRandomValues = yield* RandomValues;
@@ -78,6 +78,6 @@ function cuidFromSeed({ counter, fingerprint, random, timestamp }) {
         const hashed = yield* hash(hashInput);
         // Construct the final CUID
         const id = `${firstLetter}${hashed.substring(0, DEFAULT_LENGTH - 1)}`;
-        return Cuid.makeUnsafe(id);
+        return Cuid.make(id);
     });
 }

package/dist/DateTimes.d.ts

@@ -1,7 +1,7 @@
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as ServiceMap from "effect/ServiceMap";
-declare const DateTimes_base: ServiceMap.ServiceClass<DateTimes, "@typed/id/DateTimes", {
+import * as Context from "effect/Context";
+declare const DateTimes_base: Context.ServiceClass<DateTimes, "@typed/id/DateTimes", {
     now: Effect.Effect<number, never, never>;
     date: Effect.Effect<Date, never, never>;
 }> & {

package/dist/DateTimes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DateTimes.d.ts","sourceRoot":"","sources":["../src/DateTimes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;;;;;;;;;;AAEhD,qBAAa,SAAU,SAAQ,cAK7B;IACA,MAAM,CAAC,QAAQ,CAAC,GAAG,0CAA0D;IAC7E,MAAM,CAAC,QAAQ,CAAC,IAAI,wCAA4D;IAEhF,MAAM,CAAC,QAAQ,CAAC,OAAO,uCAA2C;IAElE,MAAM,CAAC,QAAQ,CAAC,KAAK,GAAI,UAAU,MAAM,GAAG,MAAM,GAAG,IAAI,0CAkBrD;CACL"}
+{"version":3,"file":"DateTimes.d.ts","sourceRoot":"","sources":["../src/DateTimes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;;;;;;;;;;AAE1C,qBAAa,SAAU,SAAQ,cAK7B;IACA,MAAM,CAAC,QAAQ,CAAC,GAAG,0CAA0D;IAC7E,MAAM,CAAC,QAAQ,CAAC,IAAI,wCAA4D;IAEhF,MAAM,CAAC,QAAQ,CAAC,OAAO,uCAA2C;IAElE,MAAM,CAAC,QAAQ,CAAC,KAAK,GAAI,UAAU,MAAM,GAAG,MAAM,GAAG,IAAI,0CAkBrD;CACL"}

package/dist/DateTimes.js

@@ -1,8 +1,8 @@
 import * as Clock from "effect/Clock";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as ServiceMap from "effect/ServiceMap";
-export class DateTimes extends ServiceMap.Service()("@typed/id/DateTimes", {
+import * as Context from "effect/Context";
+export class DateTimes extends Context.Service()("@typed/id/DateTimes", {
     make: Effect.succeed({
         now: Effect.sync(() => Date.now()),
         date: Effect.sync(() => new Date()),

package/dist/Ids.d.ts

@@ -1,6 +1,6 @@
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as ServiceMap from "effect/ServiceMap";
+import * as Context from "effect/Context";
 import type { Cuid } from "./Cuid.js";
 import { CuidState } from "./Cuid.js";
 import { DateTimes } from "./DateTimes.js";
@@ -13,7 +13,7 @@ import { type Uuid5, Uuid5Namespace } from "./Uuid5.js";
 import type { Uuid7 } from "./Uuid7.js";
 import { Uuid7State } from "./Uuid7.js";
 import { TestClock } from "effect/testing";
-declare const Ids_base: ServiceMap.ServiceClass<Ids, "@typed/id/Ids", {
+declare const Ids_base: Context.ServiceClass<Ids, "@typed/id/Ids", {
     cuid: Effect.Effect<string & import("effect/Brand").Brand<"@typed/id/CUID">, never, never>;
     ksuid: Effect.Effect<string & import("effect/Brand").Brand<"@typed/id/KSUID">, never, never>;
     nanoId: Effect.Effect<string & import("effect/Brand").Brand<"@typed/id/NanoId">, never, never>;

package/dist/Ids.d.ts.map

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

package/dist/Ids.js

@@ -1,7 +1,7 @@
 import * as Effect from "effect/Effect";
 import { dual } from "effect/Function";
 import * as Layer from "effect/Layer";
-import * as ServiceMap from "effect/ServiceMap";
+import * as Context from "effect/Context";
 import { cuid, CuidState } from "./Cuid.js";
 import { DateTimes } from "./DateTimes.js";
 import { ksuid } from "./Ksuid.js";
@@ -12,9 +12,9 @@ import { uuid4 } from "./Uuid4.js";
 import { uuid5, Uuid5Namespace } from "./Uuid5.js";
 import { uuid7, Uuid7State } from "./Uuid7.js";
 import { TestClock } from "effect/testing";
-export class Ids extends ServiceMap.Service()("@typed/id/Ids", {
+export class Ids extends Context.Service()("@typed/id/Ids", {
     make: Effect.gen(function* () {
-        const services = yield* Effect.services();
+        const services = yield* Effect.context();
         const uuid5_ = Object.assign(dual(2, (name, namespace) => Effect.provide(uuid5(name, namespace), services)), {
             dns: uuid5(Uuid5Namespace.DNS),
             url: uuid5(Uuid5Namespace.URL),

package/dist/Ksuid.js

@@ -28,7 +28,7 @@ export const ksuid = Effect.zipWith(DateTimes.now, RandomValues.call(PAYLOAD_BYT
     // Copy payload
     bytes.set(payload, TIMESTAMP_BYTES);
     // Encode as base62
-    return Ksuid.makeUnsafe(base62Encode(bytes));
+    return Ksuid.make(base62Encode(bytes));
 });
 // Utilities
 const base62Chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";

package/dist/NanoId.js

@@ -3,7 +3,7 @@ import * as Schema from "effect/Schema";
 import { RandomValues } from "./RandomValues.js";
 export const NanoId = Schema.String.pipe(Schema.check(Schema.isPattern(/^[0-9a-zA-Z_-]+$/)), Schema.brand("@typed/id/NanoId"));
 export const isNanoId = Schema.is(NanoId);
-export const nanoId = Effect.map(RandomValues.call(21), (seed) => NanoId.makeUnsafe(Array.from(seed, numToCharacter).join("")));
+export const nanoId = Effect.map(RandomValues.call(21), (seed) => NanoId.make(Array.from(seed, numToCharacter).join("")));
 function numToCharacter(byte) {
     byte &= 63;
     if (byte < 36) {

package/dist/RandomValues.d.ts

@@ -1,7 +1,7 @@
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as ServiceMap from "effect/ServiceMap";
-declare const RandomValues_base: ServiceMap.ServiceClass<RandomValues, "@typed/id/RandomValues", <A extends Uint8Array>(length: A["length"]) => Effect.Effect<A>> & {
+import * as Context from "effect/Context";
+declare const RandomValues_base: Context.ServiceClass<RandomValues, "@typed/id/RandomValues", <A extends Uint8Array>(length: A["length"]) => Effect.Effect<A>> & {
     readonly make: Effect.Effect<(<A extends Uint8Array>(length: A["length"]) => Effect.Effect<A>), never, never>;
 };
 export declare class RandomValues extends RandomValues_base {

package/dist/RandomValues.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"RandomValues.d.ts","sourceRoot":"","sources":["../src/RandomValues.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;kGAI3C,CAAC,SAAS,UAAU,UAAU,CAAC,CAAC,QAAQ,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;mCAA5D,CAAC,SAAS,UAAU,UAAU,CAAC,CAAC,QAAQ,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;;AAFjE,qBAAa,YAAa,SAAQ,iBAKhC;IACA,gBAAyB,IAAI,GAAI,CAAC,SAAS,UAAU,EACnD,QAAQ,CAAC,CAAC,QAAQ,CAAC,KAClB,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,CAC+C;IAEvF,MAAM,CAAC,QAAQ,CAAC,OAAO,0CAAiD;IAExE,MAAM,CAAC,QAAQ,CAAC,MAAM,0CAapB;CACH"}
+{"version":3,"file":"RandomValues.d.ts","sourceRoot":"","sources":["../src/RandomValues.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AAEtC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;+FAIrC,CAAC,SAAS,UAAU,UAAU,CAAC,CAAC,QAAQ,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;mCAA5D,CAAC,SAAS,UAAU,UAAU,CAAC,CAAC,QAAQ,CAAC,KAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;;AAFjE,qBAAa,YAAa,SAAQ,iBAKhC;IACA,gBAAyB,IAAI,GAAI,CAAC,SAAS,UAAU,EACnD,QAAQ,CAAC,CAAC,QAAQ,CAAC,KAClB,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,CAC+C;IAEvF,MAAM,CAAC,QAAQ,CAAC,OAAO,0CAAiD;IAExE,MAAM,CAAC,QAAQ,CAAC,MAAM,0CAapB;CACH"}

package/dist/RandomValues.js

@@ -1,8 +1,8 @@
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Random from "effect/Random";
-import * as ServiceMap from "effect/ServiceMap";
-export class RandomValues extends ServiceMap.Service()("@typed/id/RandomValues", {
+import * as Context from "effect/Context";
+export class RandomValues extends Context.Service()("@typed/id/RandomValues", {
     make: Effect.succeed((length) => Effect.sync(() => crypto.getRandomValues(new Uint8Array(length)))),
 }) {
     static call = (length) => RandomValues.asEffect().pipe(Effect.flatMap((randomValues) => randomValues(length)));

package/dist/Ulid.js

@@ -14,7 +14,7 @@ export const ulid = Effect.zipWith(DateTimes.now, RandomValues.call(16), (now, s
     if (now > TIME_MAX) {
         throw new Error("Cannot generate ULID due to timestamp overflow");
     }
-    return Ulid.makeUnsafe(encodeTime(now, TIME_LEN) + encodeRandom(seed));
+    return Ulid.make(encodeTime(now, TIME_LEN) + encodeRandom(seed));
 });
 function encodeTime(now, len) {
     let str = "";

package/dist/Uuid4.js

@@ -8,5 +8,5 @@ export const uuid4 = Effect.map(RandomValues.call(16), (seed) => {
     // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
     seed[6] = (seed[6] & 0x0f) | 0x40;
     seed[8] = (seed[8] & 0x3f) | 0x80;
-    return Uuid4.makeUnsafe(uuidStringify(seed));
+    return Uuid4.make(uuidStringify(seed));
 });

package/dist/Uuid5.js

@@ -38,7 +38,7 @@ export const uuid5 = dual(2, function uuid5(name, namespace) {
         // Set version (5) and variant bits
         result[6] = (result[6] & 0x0f) | 0x50; // version 5
         result[8] = (result[8] & 0x3f) | 0x80; // variant 1
-        return Uuid5.makeUnsafe(uuidStringify(result));
+        return Uuid5.make(uuidStringify(result));
     });
 });
 export const dnsUuid5 = uuid5(Uuid5Namespace.DNS);

package/dist/Uuid7.d.ts

@@ -1,7 +1,7 @@
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Schema from "effect/Schema";
-import * as ServiceMap from "effect/ServiceMap";
+import * as Context from "effect/Context";
 import { DateTimes } from "./DateTimes.js";
 import { RandomValues } from "./RandomValues.js";
 export declare const Uuid7: Schema.brand<Schema.String, "@typed/id/UUID7">;
@@ -14,7 +14,7 @@ export type Uuid7Seed = {
         length: 16;
     };
 };
-declare const Uuid7State_base: ServiceMap.ServiceClass<Uuid7State, "@typed/id/Uuid7State", Effect.Effect<{
+declare const Uuid7State_base: Context.ServiceClass<Uuid7State, "@typed/id/Uuid7State", Effect.Effect<{
     timestamp: number;
     seq: number;
     randomBytes: Uint8Array<ArrayBufferLike> & {

package/dist/Uuid7.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Uuid7.d.ts","sourceRoot":"","sources":["../src/Uuid7.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,eAAO,MAAM,KAAK,gDAGjB,CAAC;AACF,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,CAAC;AAEtC,eAAO,MAAM,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,KAAK,IAAI,KAAwB,CAAC;AAE3E,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,WAAW,EAAE,UAAU,GAAG;QAAE,MAAM,EAAE,EAAE,CAAA;KAAE,CAAC;CACnD,CAAC;;;;;gBAD6C,EAAE;;;;;;;oBAAF,EAAE;;;;AAGjD,qBAAa,UAAW,SAAQ,eAkC9B;IACA,MAAM,CAAC,QAAQ,CAAC,IAAI;;;;oBAtCyB,EAAE;;0BAsCc;IAE7D,MAAM,CAAC,QAAQ,CAAC,OAAO,mEAErB;CACH;AAED,eAAO,MAAM,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAGzD,CAAC"}
+{"version":3,"file":"Uuid7.d.ts","sourceRoot":"","sources":["../src/Uuid7.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAC;AACtC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEjD,eAAO,MAAM,KAAK,gDAGjB,CAAC;AACF,MAAM,MAAM,KAAK,GAAG,OAAO,KAAK,CAAC,IAAI,CAAC;AAEtC,eAAO,MAAM,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,KAAK,IAAI,KAAwB,CAAC;AAE3E,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,WAAW,EAAE,UAAU,GAAG;QAAE,MAAM,EAAE,EAAE,CAAA;KAAE,CAAC;CACnD,CAAC;;;;;gBAD6C,EAAE;;;;;;;oBAAF,EAAE;;;;AAGjD,qBAAa,UAAW,SAAQ,eAkC9B;IACA,MAAM,CAAC,QAAQ,CAAC,IAAI;;;;oBAtCyB,EAAE;;0BAsCc;IAE7D,MAAM,CAAC,QAAQ,CAAC,OAAO,mEAErB;CACH;AAED,eAAO,MAAM,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,UAAU,CAGzD,CAAC"}

package/dist/Uuid7.js

@@ -1,13 +1,13 @@
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Schema from "effect/Schema";
-import * as ServiceMap from "effect/ServiceMap";
+import * as Context from "effect/Context";
 import { uuidStringify } from "./_uuid-stringify.js";
 import { DateTimes } from "./DateTimes.js";
 import { RandomValues } from "./RandomValues.js";
 export const Uuid7 = Schema.String.pipe(Schema.check(Schema.isUUID(7)), Schema.brand("@typed/id/UUID7"));
 export const isUuid7 = Schema.is(Uuid7);
-export class Uuid7State extends ServiceMap.Service()("@typed/id/Uuid7State", {
+export class Uuid7State extends Context.Service()("@typed/id/Uuid7State", {
     make: Effect.gen(function* () {
         const { now } = yield* DateTimes;
         const getRandomValues = yield* RandomValues;
@@ -69,5 +69,5 @@ function uuid7FromSeed({ randomBytes, seq, timestamp }) {
     result[13] = randomBytes[13];
     result[14] = randomBytes[14];
     result[15] = randomBytes[15];
-    return Uuid7.makeUnsafe(uuidStringify(result));
+    return Uuid7.make(uuidStringify(result));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed/id",
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "files": [
     "dist",
     "src"
@@ -19,15 +19,15 @@
   "publishConfig": {
     "access": "public"
   },
-  "dependencies": {
-    "effect": "4.0.0-beta.38"
-  },
-  "devDependencies": {
-    "typescript": "5.9.3",
-    "vitest": "4.1.1"
-  },
   "scripts": {
     "build": "[ -d dist ] || rm -f tsconfig.tsbuildinfo; tsc",
     "test": "vitest run --passWithNoTests"
+  },
+  "dependencies": {
+    "effect": "catalog:"
+  },
+  "devDependencies": {
+    "typescript": "catalog:",
+    "vitest": "catalog:"
   }
-}
+}

package/src/Cuid.ts

@@ -1,7 +1,7 @@
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Schema from "effect/Schema";
-import * as ServiceMap from "effect/ServiceMap";
+import * as Context from "effect/Context";
 import { sha512 } from "./_sha.js";
 import { DateTimes } from "./DateTimes.js";
 import { RandomValues } from "./RandomValues.js";
@@ -28,7 +28,7 @@ export type CuidSeed = {
   readonly fingerprint: string;
 };
 
-export class CuidState extends ServiceMap.Service<CuidState>()("@typed/id/CuidState", {
+export class CuidState extends Context.Service<CuidState>()("@typed/id/CuidState", {
   make: (envData: string) =>
     Effect.gen(function* () {
       const { now } = yield* DateTimes;
@@ -119,6 +119,6 @@ function cuidFromSeed({ counter, fingerprint, random, timestamp }: CuidSeed): Ef
     // Construct the final CUID
     const id = `${firstLetter}${hashed.substring(0, DEFAULT_LENGTH - 1)}`;
 
-    return Cuid.makeUnsafe(id);
+    return Cuid.make(id);
   });
 }

package/src/DateTimes.ts

@@ -1,9 +1,9 @@
 import * as Clock from "effect/Clock";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
-import * as ServiceMap from "effect/ServiceMap";
+import * as Context from "effect/Context";
 
-export class DateTimes extends ServiceMap.Service<DateTimes>()("@typed/id/DateTimes", {
+export class DateTimes extends Context.Service<DateTimes>()("@typed/id/DateTimes", {
   make: Effect.succeed({
     now: Effect.sync(() => Date.now()),
     date: Effect.sync(() => new Date()),

package/src/Ids.ts

@@ -1,7 +1,7 @@
 import * as Effect from "effect/Effect";
 import { dual } from "effect/Function";
 import * as Layer from "effect/Layer";
-import * as ServiceMap from "effect/ServiceMap";
+import * as Context from "effect/Context";
 import type { Cuid } from "./Cuid.js";
 import { cuid, CuidState } from "./Cuid.js";
 import { DateTimes } from "./DateTimes.js";
@@ -19,9 +19,9 @@ import type { Uuid7 } from "./Uuid7.js";
 import { uuid7, Uuid7State } from "./Uuid7.js";
 import { TestClock } from "effect/testing";
 
-export class Ids extends ServiceMap.Service<Ids>()("@typed/id/Ids", {
+export class Ids extends Context.Service<Ids>()("@typed/id/Ids", {
   make: Effect.gen(function* () {
-    const services = yield* Effect.services<DateTimes | RandomValues | CuidState | Uuid7State>();
+    const services = yield* Effect.context<DateTimes | RandomValues | CuidState | Uuid7State>();
 
     const uuid5_: {
       (namespace: Uuid5Namespace): (name: string) => Effect.Effect<Uuid5>;

package/src/Ksuid.ts

@@ -46,7 +46,7 @@ export const ksuid: Effect.Effect<Ksuid, never, DateTimes | RandomValues> = Effe
     bytes.set(payload, TIMESTAMP_BYTES);
 
     // Encode as base62
-    return Ksuid.makeUnsafe(base62Encode(bytes));
+    return Ksuid.make(base62Encode(bytes));
   },
 );
 

package/src/NanoId.ts

@@ -14,7 +14,7 @@ type NanoIdSeed = Uint8Array & { length: 21 };
 
 export const nanoId: Effect.Effect<NanoId, never, RandomValues> = Effect.map(
   RandomValues.call<NanoIdSeed>(21),
-  (seed: NanoIdSeed): NanoId => NanoId.makeUnsafe(Array.from(seed, numToCharacter).join("")),
+  (seed: NanoIdSeed): NanoId => NanoId.make(Array.from(seed, numToCharacter).join("")),
 );
 
 function numToCharacter(byte: number): string {

package/src/RandomValues.ts

@@ -1,9 +1,9 @@
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Random from "effect/Random";
-import * as ServiceMap from "effect/ServiceMap";
+import * as Context from "effect/Context";
 
-export class RandomValues extends ServiceMap.Service<RandomValues>()("@typed/id/RandomValues", {
+export class RandomValues extends Context.Service<RandomValues>()("@typed/id/RandomValues", {
   make: Effect.succeed(
     <A extends Uint8Array>(length: A["length"]): Effect.Effect<A> =>
       Effect.sync(() => crypto.getRandomValues(new Uint8Array(length)) as A),

package/src/Ulid.ts

@@ -28,7 +28,7 @@ export const ulid: Effect.Effect<Ulid, never, RandomValues | DateTimes> = Effect
       throw new Error("Cannot generate ULID due to timestamp overflow");
     }
 
-    return Ulid.makeUnsafe(encodeTime(now, TIME_LEN) + encodeRandom(seed));
+    return Ulid.make(encodeTime(now, TIME_LEN) + encodeRandom(seed));
   },
 );
 

package/src/Uuid4.ts

@@ -19,6 +19,6 @@ export const uuid4: Effect.Effect<Uuid4, never, RandomValues> = Effect.map(
     // Per 4.4, set bits for version and `clock_seq_hi_and_reserved`
     seed[6] = (seed[6] & 0x0f) | 0x40;
     seed[8] = (seed[8] & 0x3f) | 0x80;
-    return Uuid4.makeUnsafe(uuidStringify(seed));
+    return Uuid4.make(uuidStringify(seed));
   },
 );

package/src/Uuid5.ts

@@ -61,7 +61,7 @@ export const uuid5: {
     result[6] = (result[6] & 0x0f) | 0x50; // version 5
     result[8] = (result[8] & 0x3f) | 0x80; // variant 1
 
-    return Uuid5.makeUnsafe(uuidStringify(result));
+    return Uuid5.make(uuidStringify(result));
   });
 });
 

package/src/Uuid7.ts

@@ -1,7 +1,7 @@
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 import * as Schema from "effect/Schema";
-import * as ServiceMap from "effect/ServiceMap";
+import * as Context from "effect/Context";
 import { uuidStringify } from "./_uuid-stringify.js";
 import { DateTimes } from "./DateTimes.js";
 import { RandomValues } from "./RandomValues.js";
@@ -20,7 +20,7 @@ export type Uuid7Seed = {
   readonly randomBytes: Uint8Array & { length: 16 };
 };
 
-export class Uuid7State extends ServiceMap.Service<Uuid7State>()("@typed/id/Uuid7State", {
+export class Uuid7State extends Context.Service<Uuid7State>()("@typed/id/Uuid7State", {
   make: Effect.gen(function* () {
     const { now } = yield* DateTimes;
     const getRandomValues = yield* RandomValues;
@@ -100,5 +100,5 @@ function uuid7FromSeed({ randomBytes, seq, timestamp }: Uuid7Seed): Uuid7 {
   result[14] = randomBytes[14];
   result[15] = randomBytes[15];
 
-  return Uuid7.makeUnsafe(uuidStringify(result));
+  return Uuid7.make(uuidStringify(result));
 }