@typed/id 0.12.0 → 0.13.0

package/dist/DateTimes.d.ts

@@ -12,14 +12,8 @@ declare const DateTimes_base: import("effect/Context").TagClass<DateTimes, "Date
     }) => X) => [X] extends [Effect.Effect<infer A, infer E, infer R>] ? Effect.Effect<A, E, DateTimes | R> : [X] extends [PromiseLike<infer A_1>] ? Effect.Effect<A_1, import("effect/Cause").UnknownException, DateTimes> : Effect.Effect<X, never, DateTimes>;
 };
 export declare class DateTimes extends DateTimes_base {
-    static readonly make: (now: Effect.Effect<number>) => Effect.Effect<{
-        now: Effect.Effect<number, never, never>;
-        date: Effect.Effect<Date, never, never>;
-    }, never, never>;
-    static readonly Default: Effect.Effect<{
-        now: Effect.Effect<number, never, never>;
-        date: Effect.Effect<Date, never, never>;
-    }, never, never>;
-    static readonly Fixed: (base: Date) => Layer.Layer<DateTimes, never, never>;
+    static readonly make: (now: Effect.Effect<number>) => Layer.Layer<DateTimes>;
+    static readonly Default: Layer.Layer<DateTimes>;
+    static readonly Fixed: (base: Date) => Layer.Layer<DateTimes>;
 }
 export {};

package/dist/DateTimes.js

@@ -1,6 +1,6 @@
 import { Effect, Layer } from 'effect';
 export class DateTimes extends Effect.Tag('DateTimes')() {
-    static make = (now) => Effect.succeed({
+    static make = (now) => Layer.succeed(this, {
         now,
         date: now.pipe(Effect.map((millis) => new Date(millis))),
     });

package/dist/DateTimes.js.map

@@ -1 +1 @@
-{"version":3,"file":"DateTimes.js","sourceRoot":"","sources":["../src/DateTimes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAqB,MAAM,QAAQ,CAAA;AAEzD,MAAM,OAAO,SAAU,SAAQ,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,EAMnD;IACD,MAAM,CAAU,IAAI,GAAG,CAAC,GAA0B,EAAE,EAAE,CACpD,MAAM,CAAC,OAAO,CAAC;QACb,GAAG;QACH,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;KACzD,CAAC,CAAA;IAEJ,MAAM,CAAU,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAA;IAEzF,MAAM,CAAU,KAAK,GAAG,CAAC,IAAU,EAAE,EAAE,CACrC,KAAK,CAAC,MAAM,CACV,SAAS,EACT,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAA;QACjC,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAA;QAClD,MAAM,GAAG,GAAG,KAAK,CAAC,iBAAiB,CAAC,IAAI,CACtC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACpB,4FAA4F;QAC5F,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CACtE,CACF,CAAA;QAED,OAAO;YACL,GAAG;YACH,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;SACzD,CAAA;IACH,CAAC,CAAC,CACH,CAAA"}
+{"version":3,"file":"DateTimes.js","sourceRoot":"","sources":["../src/DateTimes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAqB,MAAM,QAAQ,CAAA;AAEzD,MAAM,OAAO,SAAU,SAAQ,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,EAMnD;IACD,MAAM,CAAU,IAAI,GAAG,CAAC,GAA0B,EAA0B,EAAE,CAC5E,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE;QAClB,GAAG;QACH,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;KACzD,CAAC,CAAA;IAEJ,MAAM,CAAU,OAAO,GAA2B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAA;IAEjH,MAAM,CAAU,KAAK,GAAG,CAAC,IAAU,EAA0B,EAAE,CAC7D,KAAK,CAAC,MAAM,CACV,SAAS,EACT,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAClB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAA;QACjC,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAA;QAClD,MAAM,GAAG,GAAG,KAAK,CAAC,iBAAiB,CAAC,IAAI,CACtC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACpB,4FAA4F;QAC5F,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CACtE,CACF,CAAA;QAED,OAAO;YACL,GAAG;YACH,IAAI,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;SACzD,CAAA;IACH,CAAC,CAAC,CACH,CAAA"}

package/dist/Uuid4.d.ts

@@ -0,0 +1,7 @@
+import * as Effect from 'effect/Effect';
+import { GetRandomValues } from './GetRandomValues.js';
+import { Schema } from 'effect';
+export declare const Uuid4: Schema.brand<typeof Schema.UUID, "@typed/id/UUID4">;
+export type Uuid4 = Schema.Schema.Type<typeof Uuid4>;
+export declare const isUuid4: (value: string) => value is Uuid4;
+export declare const makeUuid4: Effect.Effect<Uuid4, never, GetRandomValues>;

package/dist/Uuid4.js

@@ -0,0 +1,14 @@
+import * as Effect from 'effect/Effect';
+import { GetRandomValues } from './GetRandomValues.js';
+import { Schema } from 'effect';
+import { uuidStringify } from './UuidStringify.js';
+export const Uuid4 = Schema.UUID.pipe(Schema.brand('@typed/id/UUID4'));
+export const isUuid4 = Schema.is(Uuid4);
+export const makeUuid4 = Effect.map(GetRandomValues.apply(16), uuid4FromSeed);
+function uuid4FromSeed(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 uuidStringify(seed);
+}
+//# sourceMappingURL=Uuid4.js.map

package/dist/Uuid4.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Uuid4.js","sourceRoot":"","sources":["../src/Uuid4.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC/B,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAElD,MAAM,CAAC,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAA;AAGtE,MAAM,CAAC,MAAM,OAAO,GAAsC,MAAM,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;AAE1E,MAAM,CAAC,MAAM,SAAS,GAAiD,MAAM,CAAC,GAAG,CAC/E,eAAe,CAAC,KAAK,CAAC,EAAE,CAAC,EACzB,aAAa,CACd,CAAA;AAED,SAAS,aAAa,CAAC,IAAgB;IACrC,gEAAgE;IAChE,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAA;IACjC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAA;IAEjC,OAAO,aAAa,CAAC,IAAI,CAAU,CAAA;AACrC,CAAC"}

package/dist/Uuid7.d.ts

@@ -0,0 +1,26 @@
+import * as Effect from 'effect/Effect';
+import { GetRandomValues } from './GetRandomValues.js';
+import { Layer, Schema } from 'effect';
+import { DateTimes } from './DateTimes.js';
+export declare const Uuid7: Schema.brand<typeof Schema.UUID, "@typed/id/UUID7">;
+export type Uuid7 = Schema.Schema.Type<typeof Uuid7>;
+export declare const isUuid7: (value: string) => value is Uuid7;
+export type Uuid7Seed = {
+    readonly timestamp: number;
+    readonly seq: number;
+    readonly randomBytes: Uint8Array;
+};
+declare const Uuid7State_base: import("effect/Context").TagClass<Uuid7State, "Uuid7State", {
+    readonly next: Effect.Effect<Uuid7Seed>;
+}> & Effect.Tag.Proxy<Uuid7State, {
+    readonly next: Effect.Effect<Uuid7Seed>;
+}> & {
+    use: <X>(body: (_: {
+        readonly next: Effect.Effect<Uuid7Seed>;
+    }) => X) => [X] extends [Effect.Effect<infer A, infer E, infer R>] ? Effect.Effect<A, E, R | Uuid7State> : [X] extends [PromiseLike<infer A_1>] ? Effect.Effect<A_1, import("effect/Cause").UnknownException, Uuid7State> : Effect.Effect<X, never, Uuid7State>;
+};
+export declare class Uuid7State extends Uuid7State_base {
+    static Default: Layer.Layer<Uuid7State, never, GetRandomValues | DateTimes>;
+}
+export declare const makeUuid7: Effect.Effect<Uuid7, never, Uuid7State>;
+export {};

package/dist/Uuid7.js

@@ -0,0 +1,71 @@
+import * as Effect from 'effect/Effect';
+import { GetRandomValues } from './GetRandomValues.js';
+import { Layer, Schema } from 'effect';
+import { DateTimes } from './DateTimes.js';
+import { uuidStringify } from './UuidStringify.js';
+export const Uuid7 = Schema.UUID.pipe(Schema.brand('@typed/id/UUID7'));
+export const isUuid7 = Schema.is(Uuid7);
+export class Uuid7State extends Effect.Tag('Uuid7State')() {
+    static Default = Layer.effect(this, Effect.gen(function* () {
+        const { now } = yield* DateTimes;
+        const getRandomValues = yield* GetRandomValues;
+        const state = {
+            msecs: Number.NEGATIVE_INFINITY,
+            seq: 0,
+        };
+        function updateV7State(now, randomBytes) {
+            if (now > state.msecs) {
+                // Time has moved on! Pick a new random sequence number
+                state.seq =
+                    (randomBytes[6] << 23) | (randomBytes[7] << 16) | (randomBytes[8] << 8) | randomBytes[9];
+                state.msecs = now;
+            }
+            else {
+                // Bump sequence counter w/ 32-bit rollover
+                state.seq = (state.seq + 1) | 0;
+                // In case of rollover, bump timestamp to preserve monotonicity. This is
+                // allowed by the RFC and should self-correct as the system clock catches
+                // up. See https://www.rfc-editor.org/rfc/rfc9562.html#section-6.2-9.4
+                if (state.seq === 0) {
+                    state.msecs++;
+                }
+            }
+        }
+        return {
+            next: Effect.gen(function* () {
+                const randomBytes = yield* getRandomValues(16);
+                updateV7State(yield* now, randomBytes);
+                return { timestamp: state.msecs, seq: state.seq, randomBytes };
+            }),
+        };
+    }));
+}
+export const makeUuid7 = Effect.map(Uuid7State.next, uuid7FromSeed);
+function uuid7FromSeed({ timestamp, seq, randomBytes }) {
+    const result = new Uint8Array(16);
+    // byte 0-5: timestamp (48 bits)
+    result[0] = (timestamp / 0x10000000000) & 0xff;
+    result[1] = (timestamp / 0x100000000) & 0xff;
+    result[2] = (timestamp / 0x1000000) & 0xff;
+    result[3] = (timestamp / 0x10000) & 0xff;
+    result[4] = (timestamp / 0x100) & 0xff;
+    result[5] = timestamp & 0xff;
+    // byte 6: `version` (4 bits) | sequence bits 28-31 (4 bits)
+    result[6] = 0x70 | ((seq >>> 28) & 0x0f);
+    // byte 7: sequence bits 20-27 (8 bits)
+    result[7] = (seq >>> 20) & 0xff;
+    // byte 8: `variant` (2 bits) | sequence bits 14-19 (6 bits)
+    result[8] = 0x80 | ((seq >>> 14) & 0x3f);
+    // byte 9: sequence bits 6-13 (8 bits)
+    result[9] = (seq >>> 6) & 0xff;
+    // byte 10: sequence bits 0-5 (6 bits) | random (2 bits)
+    result[10] = ((seq << 2) & 0xff) | (randomBytes[10] & 0x03);
+    // bytes 11-15: random (40 bits)
+    result[11] = randomBytes[11];
+    result[12] = randomBytes[12];
+    result[13] = randomBytes[13];
+    result[14] = randomBytes[14];
+    result[15] = randomBytes[15];
+    return uuidStringify(result);
+}
+//# sourceMappingURL=Uuid7.js.map

package/dist/Uuid7.js.map

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

package/dist/UuidStringify.d.ts

@@ -0,0 +1 @@
+export declare function uuidStringify(seed: Uint8Array): string;

package/dist/UuidStringify.js

@@ -0,0 +1,29 @@
+const byteToHex = [];
+for (let i = 0; i < 256; ++i) {
+    byteToHex.push((i + 0x100).toString(16).slice(1));
+}
+export function uuidStringify(seed) {
+    return (
+    // biome-ignore lint/style/useTemplate: Faster than template literals
+    byteToHex[seed[0]] +
+        byteToHex[seed[1]] +
+        byteToHex[seed[2]] +
+        byteToHex[seed[3]] +
+        '-' +
+        byteToHex[seed[4]] +
+        byteToHex[seed[5]] +
+        '-' +
+        byteToHex[seed[6]] +
+        byteToHex[seed[7]] +
+        '-' +
+        byteToHex[seed[8]] +
+        byteToHex[seed[9]] +
+        '-' +
+        byteToHex[seed[10]] +
+        byteToHex[seed[11]] +
+        byteToHex[seed[12]] +
+        byteToHex[seed[13]] +
+        byteToHex[seed[14]] +
+        byteToHex[seed[15]]);
+}
+//# sourceMappingURL=UuidStringify.js.map

package/dist/UuidStringify.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"UuidStringify.js","sourceRoot":"","sources":["../src/UuidStringify.ts"],"names":[],"mappings":"AAAA,MAAM,SAAS,GAAkB,EAAE,CAAA;AAEnC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC;IAC7B,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AACnD,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAgB;IAC5C,OAAO;IACL,qEAAqE;IACrE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,GAAG;QACH,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,GAAG;QACH,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,GAAG;QACH,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,GAAG;QACH,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnB,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnB,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnB,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnB,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACnB,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CACpB,CAAA;AACH,CAAC"}

package/dist/index.d.ts

@@ -2,4 +2,5 @@ export * from './DateTimes.js';
 export * from './GetRandomValues.js';
 export * from './NanoId.js';
 export * from './Ulid.js';
-export * from './Uuid.js';
+export * from './Uuid4.js';
+export * from './Uuid7.js';

package/dist/index.js

@@ -2,5 +2,6 @@ export * from './DateTimes.js';
 export * from './GetRandomValues.js';
 export * from './NanoId.js';
 export * from './Ulid.js';
-export * from './Uuid.js';
+export * from './Uuid4.js';
+export * from './Uuid7.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,sBAAsB,CAAA;AACpC,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,gBAAgB,CAAA;AAC9B,cAAc,sBAAsB,CAAA;AACpC,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AACzB,cAAc,YAAY,CAAA;AAC1B,cAAc,YAAY,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed/id",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "Common ID format generation for Effect",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/DateTimes.ts

@@ -7,15 +7,15 @@ export class DateTimes extends Effect.Tag('DateTimes')<
     readonly date: Effect.Effect<Date>
   }
 >() {
-  static readonly make = (now: Effect.Effect<number>) =>
-    Effect.succeed({
+  static readonly make = (now: Effect.Effect<number>): Layer.Layer<DateTimes> =>
+    Layer.succeed(this, {
       now,
       date: now.pipe(Effect.map((millis) => new Date(millis))),
     })
 
-  static readonly Default = this.make(Effect.clockWith((clock) => clock.currentTimeMillis))
+  static readonly Default: Layer.Layer<DateTimes> = this.make(Effect.clockWith((clock) => clock.currentTimeMillis))
 
-  static readonly Fixed = (base: Date) =>
+  static readonly Fixed = (base: Date): Layer.Layer<DateTimes> =>
     Layer.effect(
       DateTimes,
       Effect.gen(function* () {

package/src/Uuid4.ts

@@ -0,0 +1,22 @@
+import * as Effect from 'effect/Effect'
+import { GetRandomValues } from './GetRandomValues.js'
+import { Schema } from 'effect'
+import { uuidStringify } from './UuidStringify.js'
+
+export const Uuid4 = Schema.UUID.pipe(Schema.brand('@typed/id/UUID4'))
+export type Uuid4 = Schema.Schema.Type<typeof Uuid4>
+
+export const isUuid4: (value: string) => value is Uuid4 = Schema.is(Uuid4)
+
+export const makeUuid4: Effect.Effect<Uuid4, never, GetRandomValues> = Effect.map(
+  GetRandomValues.apply(16),
+  uuid4FromSeed,
+)
+
+function uuid4FromSeed(seed: Uint8Array): Uuid4 {
+  // 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 uuidStringify(seed) as Uuid4
+}

package/src/Uuid7.ts

@@ -0,0 +1,104 @@
+import * as Effect from 'effect/Effect'
+import { GetRandomValues } from './GetRandomValues.js'
+import { Layer, Schema } from 'effect'
+import { DateTimes } from './DateTimes.js'
+import { uuidStringify } from './UuidStringify.js'
+
+export const Uuid7 = Schema.UUID.pipe(Schema.brand('@typed/id/UUID7'))
+export type Uuid7 = Schema.Schema.Type<typeof Uuid7>
+
+export const isUuid7: (value: string) => value is Uuid7 = Schema.is(Uuid7)
+
+export type Uuid7Seed = {
+  readonly timestamp: number
+  readonly seq: number
+  readonly randomBytes: Uint8Array
+}
+
+export class Uuid7State extends Effect.Tag('Uuid7State')<
+  Uuid7State,
+  {
+    readonly next: Effect.Effect<Uuid7Seed>
+  }
+>() {
+  static Default: Layer.Layer<Uuid7State, never, GetRandomValues | DateTimes> = Layer.effect(
+    this,
+    Effect.gen(function* () {
+      const { now } = yield* DateTimes
+      const getRandomValues = yield* GetRandomValues
+
+      const state = {
+        msecs: Number.NEGATIVE_INFINITY,
+        seq: 0,
+      }
+
+      function updateV7State(now: number, randomBytes: Uint8Array) {
+        if (now > state.msecs) {
+          // Time has moved on! Pick a new random sequence number
+          state.seq =
+            (randomBytes[6] << 23) | (randomBytes[7] << 16) | (randomBytes[8] << 8) | randomBytes[9]
+          state.msecs = now
+        } else {
+          // Bump sequence counter w/ 32-bit rollover
+          state.seq = (state.seq + 1) | 0
+
+          // In case of rollover, bump timestamp to preserve monotonicity. This is
+          // allowed by the RFC and should self-correct as the system clock catches
+          // up. See https://www.rfc-editor.org/rfc/rfc9562.html#section-6.2-9.4
+          if (state.seq === 0) {
+            state.msecs++
+          }
+        }
+      }
+
+      return {
+        next: Effect.gen(function* () {
+          const randomBytes = yield* getRandomValues(16)
+          updateV7State(yield* now, randomBytes)
+          return { timestamp: state.msecs, seq: state.seq, randomBytes }
+        }),
+      }
+    }),
+  )
+}
+
+export const makeUuid7: Effect.Effect<Uuid7, never, Uuid7State> = Effect.map(
+  Uuid7State.next,
+  uuid7FromSeed,
+)
+
+function uuid7FromSeed({ timestamp, seq, randomBytes }: Uuid7Seed): Uuid7 {
+  const result = new Uint8Array(16)
+
+  // byte 0-5: timestamp (48 bits)
+  result[0] = (timestamp / 0x10000000000) & 0xff
+  result[1] = (timestamp / 0x100000000) & 0xff
+  result[2] = (timestamp / 0x1000000) & 0xff
+  result[3] = (timestamp / 0x10000) & 0xff
+  result[4] = (timestamp / 0x100) & 0xff
+  result[5] = timestamp & 0xff
+
+  // byte 6: `version` (4 bits) | sequence bits 28-31 (4 bits)
+  result[6] = 0x70 | ((seq >>> 28) & 0x0f)
+
+  // byte 7: sequence bits 20-27 (8 bits)
+  result[7] = (seq >>> 20) & 0xff
+
+  // byte 8: `variant` (2 bits) | sequence bits 14-19 (6 bits)
+  result[8] = 0x80 | ((seq >>> 14) & 0x3f)
+
+  // byte 9: sequence bits 6-13 (8 bits)
+  result[9] = (seq >>> 6) & 0xff
+
+  // byte 10: sequence bits 0-5 (6 bits) | random (2 bits)
+  result[10] = ((seq << 2) & 0xff) | (randomBytes[10] & 0x03)
+
+  // bytes 11-15: random (40 bits)
+  result[11] = randomBytes[11]
+  result[12] = randomBytes[12]
+  result[13] = randomBytes[13]
+  result[14] = randomBytes[14]
+  result[15] = randomBytes[15]
+
+  return uuidStringify(result) as Uuid7
+}

package/src/UuidStringify.ts

@@ -0,0 +1,31 @@
+const byteToHex: Array<string> = []
+
+for (let i = 0; i < 256; ++i) {
+  byteToHex.push((i + 0x100).toString(16).slice(1))
+}
+
+export function uuidStringify(seed: Uint8Array): string {
+  return (
+    // biome-ignore lint/style/useTemplate: Faster than template literals
+    byteToHex[seed[0]] +
+    byteToHex[seed[1]] +
+    byteToHex[seed[2]] +
+    byteToHex[seed[3]] +
+    '-' +
+    byteToHex[seed[4]] +
+    byteToHex[seed[5]] +
+    '-' +
+    byteToHex[seed[6]] +
+    byteToHex[seed[7]] +
+    '-' +
+    byteToHex[seed[8]] +
+    byteToHex[seed[9]] +
+    '-' +
+    byteToHex[seed[10]] +
+    byteToHex[seed[11]] +
+    byteToHex[seed[12]] +
+    byteToHex[seed[13]] +
+    byteToHex[seed[14]] +
+    byteToHex[seed[15]]
+  )
+}

package/src/id.test.ts

@@ -1,6 +1,16 @@
 import { describe, expect, it } from '@effect/vitest'
-import { Effect } from 'effect'
-import { DateTimes, GetRandomValues, isUuid, makeNanoId, makeUlid, makeUuid } from './index.js'
+import { Effect, flow } from 'effect'
+import {
+  DateTimes,
+  GetRandomValues,
+  isUuid4,
+  isUuid7,
+  makeNanoId,
+  makeUlid,
+  makeUuid4,
+  makeUuid7,
+  Uuid7State,
+} from './index.js'
 
 const makeTestValues = (length: number) => {
   const values = new Uint8Array(length)
@@ -10,19 +20,33 @@ const makeTestValues = (length: number) => {
   return values
 }
 
-const provideTestValues = Effect.provide([
-  GetRandomValues.layer((length) => Effect.succeed(makeTestValues(length))),
-  DateTimes.Fixed(new Date(0)),
-])
+const provideTestValues = flow(
+  Effect.provide(Uuid7State.Default),
+  Effect.provide([
+    GetRandomValues.layer((length) => Effect.succeed(makeTestValues(length))),
+    DateTimes.Fixed(new Date(0)),
+  ]),
+)
 
 describe(__filename, () => {
-  describe('Uuid', () => {
-    it.effect('generates a UUID', () =>
+  describe('Uuid4', () => {
+    it.effect('generates a UUID v4', () =>
       Effect.gen(function* (_) {
-        const id = yield* _(makeUuid)
-        expect(id).toEqual('00010203-0405-0607-0809-0a0b0c0d0e0f')
+        const id = yield* _(makeUuid4)
+        expect(id).toMatchInlineSnapshot(`"00010203-0405-4607-8809-0a0b0c0d0e0f"`)
         expect(id.length).toEqual(36)
-        expect(isUuid(id)).toEqual(true)
+        expect(isUuid4(id)).toEqual(true)
+      }).pipe(provideTestValues),
+    )
+  })
+
+  describe('Uuid7', () => {
+    it.effect('generates a UUID v7', () =>
+      Effect.gen(function* (_) {
+        const id = yield* _(makeUuid7)
+        expect(id).toMatchInlineSnapshot(`"00000000-0000-7030-9c20-260b0c0d0e0f"`)
+        expect(id.length).toEqual(36)
+        expect(isUuid7(id)).toEqual(true)
       }).pipe(provideTestValues),
     )
   })
@@ -31,8 +55,7 @@ describe(__filename, () => {
     it.effect('generates a NanoId', () =>
       Effect.gen(function* (_) {
         const id = yield* _(makeNanoId)
-
-        expect(id).toEqual('0123456789abcdefghijk')
+        expect(id).toMatchInlineSnapshot(`"0123456789abcdefghijk"`)
         expect(id.length).toEqual(21)
       }).pipe(provideTestValues),
     )

package/src/index.ts

@@ -2,4 +2,5 @@ export * from './DateTimes.js'
 export * from './GetRandomValues.js'
 export * from './NanoId.js'
 export * from './Ulid.js'
-export * from './Uuid.js'
+export * from './Uuid4.js'
+export * from './Uuid7.js'

package/src/Uuid.ts

@@ -1,76 +0,0 @@
-import * as Effect from 'effect/Effect'
-import { GetRandomValues } from './GetRandomValues.js'
-import { Schema } from 'effect'
-
-export const isUuid: (value: string) => value is Uuid = Schema.is(Schema.UUID) as any
-
-export const Uuid = Schema.UUID.pipe(Schema.brand('@typed/id/UUID'))
-export type Uuid = Schema.Schema.Type<typeof Uuid>
-
-export type UuidSeed = readonly [
-  zero: number,
-  one: number,
-  two: number,
-  three: number,
-  four: number,
-  five: number,
-  six: number,
-  seven: number,
-  eight: number,
-  nine: number,
-  ten: number,
-  eleven: number,
-  twelve: number,
-  thirteen: number,
-  fourteen: number,
-  fifteen: number,
-]
-
-export const makeUuidSeed: Effect.Effect<UuidSeed, never, GetRandomValues> = GetRandomValues.apply(
-  32,
-) as any
-
-export const makeUuid: Effect.Effect<Uuid, never, GetRandomValues> = Effect.map(makeUuidSeed, uuid4)
-
-/**
- * Convert array of 16 byte values to UUID string format of the form:
- * XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
- */
-const byteToHex: Array<string> = []
-
-for (let i = 0; i < 256; ++i) {
-  byteToHex.push((i + 0x100).toString(16).slice(1))
-}
-
-export function uuid4(seed: UuidSeed): Uuid {
-  // Note: Be careful editing this code!  It's been tuned for performance
-  // and works in ways you may not expect. See https://github.com/uuidjs/uuid/pull/434
-  //
-  // Note to future-self: No, you can't remove the `toLowerCase()` call.
-  // REF: https://github.com/uuidjs/uuid/pull/677#issuecomment-1757351351
-  return (
-    (
-      // biome-ignore lint/style/useTemplate: <explanation>
-      byteToHex[seed[0]] +
-      byteToHex[seed[1]] +
-      byteToHex[seed[2]] +
-      byteToHex[seed[3]] +
-      '-' +
-      byteToHex[seed[4]] +
-      byteToHex[seed[5]] +
-      '-' +
-      byteToHex[seed[6]] +
-      byteToHex[seed[7]] +
-      '-' +
-      byteToHex[seed[8]] +
-      byteToHex[seed[9]] +
-      '-' +
-      byteToHex[seed[10]] +
-      byteToHex[seed[11]] +
-      byteToHex[seed[12]] +
-      byteToHex[seed[13]] +
-      byteToHex[seed[14]] +
-      byteToHex[seed[15]]
-    ).toLowerCase() as Uuid
-  )
-}