@typed/id 0.15.0 → 0.16.0

package/dist/Cuid.d.ts

@@ -0,0 +1,27 @@
+import { Effect, Layer, Schema } from 'effect';
+import { DateTimes } from './DateTimes.js';
+import { GetRandomValues } from './GetRandomValues.js';
+export declare const Cuid: Schema.brand<Schema.filter<Schema.Schema<string, string, never>>, "@typed/id/CUID">;
+export type Cuid = Schema.Schema.Type<typeof Cuid>;
+export declare const isCuid: (value: string) => value is Cuid;
+export type CuidSeed = {
+    readonly timestamp: number;
+    readonly counter: number;
+    readonly random: Uint8Array;
+    readonly fingerprint: string;
+};
+declare const CuidState_base: import("effect/Context").TagClass<CuidState, "CuidState", {
+    readonly next: Effect.Effect<CuidSeed>;
+}> & Effect.Tag.Proxy<CuidState, {
+    readonly next: Effect.Effect<CuidSeed>;
+}> & {
+    use: <X>(body: (_: {
+        readonly next: Effect.Effect<CuidSeed>;
+    }) => X) => [X] extends [Effect.Effect<infer A, infer E, infer R>] ? Effect.Effect<A, E, R | CuidState> : [X] extends [PromiseLike<infer A_1>] ? Effect.Effect<A_1, import("effect/Cause").UnknownException, CuidState> : Effect.Effect<X, never, CuidState>;
+};
+export declare class CuidState extends CuidState_base {
+    static readonly layer: (envData: string) => Layer.Layer<CuidState, never, DateTimes | GetRandomValues>;
+    static readonly Default: Layer.Layer<CuidState, never, DateTimes | GetRandomValues>;
+}
+export declare const makeCuid: Effect.Effect<Cuid, never, DateTimes | GetRandomValues | CuidState>;
+export {};

package/dist/Cuid.js

@@ -0,0 +1,86 @@
+import { Effect, Layer, Schema } from 'effect';
+import { DateTimes } from './DateTimes.js';
+import { GetRandomValues } from './GetRandomValues.js';
+// Constants
+const DEFAULT_LENGTH = 24;
+const BIG_LENGTH = 32;
+const INITIAL_COUNT_MAX = 476782367;
+// Schema
+export const Cuid = Schema.String.pipe(Schema.pattern(/^[a-z][0-9a-z]+$/), Schema.brand('@typed/id/CUID'));
+export const isCuid = Schema.is(Cuid);
+// Utilities
+const ALPHABET = Array.from({ length: 26 }, (_, i) => String.fromCharCode(i + 97));
+const encoder = new TextEncoder();
+function createEntropy(length, random) {
+    let entropy = '';
+    let offset = 0;
+    while (entropy.length < length) {
+        const value = random[offset];
+        entropy += Math.floor(value % 36).toString(36);
+        offset = (offset + 1) % random.length;
+    }
+    return entropy;
+}
+function hash(input) {
+    // Convert string to bytes
+    const data = encoder.encode(input);
+    // Create a hash using the Web Crypto API
+    return crypto.subtle.digest('SHA-512', data).then((buffer) => {
+        const view = new Uint8Array(buffer);
+        let value = 0n;
+        for (const byte of view) {
+            value = (value << 8n) + BigInt(byte);
+        }
+        // Drop the first character because it will bias the histogram to the left
+        return value.toString(36).slice(1);
+    });
+}
+// State Management
+export class CuidState extends Effect.Tag('CuidState')() {
+    static layer = (envData) => Layer.effect(this, Effect.gen(function* () {
+        const { now } = yield* DateTimes;
+        const getRandomValues = yield* GetRandomValues;
+        const initialBytes = yield* getRandomValues(4);
+        const initialValue = Math.abs((initialBytes[0] << 24) |
+            (initialBytes[1] << 16) |
+            (initialBytes[2] << 8) |
+            initialBytes[3]) % INITIAL_COUNT_MAX;
+        // Create fingerprint from environment data
+        const fingerprint = yield* Effect.promise(() => hash(envData).then((h) => h.substring(0, BIG_LENGTH)));
+        let counter = initialValue;
+        return {
+            next: Effect.gen(function* () {
+                const timestamp = yield* now;
+                const random = yield* getRandomValues(32);
+                return {
+                    timestamp,
+                    counter: counter++,
+                    random,
+                    fingerprint,
+                };
+            }),
+        };
+    }));
+    static Default = this.layer('node');
+}
+// Core Functions
+function cuidFromSeed({ timestamp, counter, random, fingerprint }) {
+    return Effect.gen(function* () {
+        // First letter is always a random lowercase letter from the seed
+        const firstLetter = ALPHABET[random[0] % ALPHABET.length];
+        // Convert components to base36
+        const time = timestamp.toString(36);
+        const count = counter.toString(36);
+        // Create entropy from remaining random bytes
+        const salt = createEntropy(4, random.slice(1));
+        // Hash all components together
+        const hashInput = `${time}${salt}${count}${fingerprint}`;
+        const hashed = yield* Effect.promise(() => hash(hashInput));
+        // Construct the final CUID
+        const id = `${firstLetter}${hashed.substring(0, DEFAULT_LENGTH - 1)}`;
+        return Cuid.make(id);
+    });
+}
+// Public API
+export const makeCuid = Effect.flatMap(CuidState.next, cuidFromSeed);
+//# sourceMappingURL=Cuid.js.map

package/dist/Cuid.js.map

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

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+export * from './Cuid.js';
 export * from './DateTimes.js';
 export * from './GetRandomValues.js';
 export * from './NanoId.js';

package/dist/index.js

@@ -1,3 +1,4 @@
+export * from './Cuid.js';
 export * from './DateTimes.js';
 export * from './GetRandomValues.js';
 export * from './NanoId.js';

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

package/package.json

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

package/readme.md

@@ -1,6 +1,6 @@
 # @typed/id
 
-A TypeScript library providing common ID format generation using [Effect](https://effect.website/). This package includes implementations for UUID, NanoID, and ULID generation with a focus on type safety and functional programming principles.
+A TypeScript library providing common ID format generation using [Effect](https://effect.website/). This package includes implementations for UUID, NanoID, ULID, and CUID generation with a focus on type safety and functional programming principles.
 
 ## Installation
 
@@ -17,9 +17,10 @@ yarn add @typed/id effect
 - 🎯 Type-safe ID generation
 - 🔧 Built on top of Effect
 - 🎨 Multiple ID format support:
-  - UUID (v4, v5, v6, v7)
+  - UUID (v4, v5, v7)
   - NanoID
   - ULID
+  - CUID2
 - ⚡ Efficient and secure random value generation
 - 📦 Zero dependencies (except Effect)
 
@@ -37,7 +38,9 @@ import {
   Uuid5Namespace,
   Sha1,
   makeNanoId, 
-  makeUlid 
+  makeUlid,
+  makeCuid,
+  CuidState,
 } from '@typed/id'
 
 // Generate a UUID v4 (random)
@@ -80,6 +83,15 @@ await makeUlid.pipe(
   Effect.runPromise
 )
 // Output: "01ARZ3NDEKTSV4RRFFQ69G5FAV"
+
+// Generate a CUID
+await makeCuid.pipe(
+  Effect.provide(CuidState.layer('my-environment')), // Provide environment fingerprint
+  Effect.provide([GetRandomValues.CryptoRandom, DateTimes.Default]),
+  Effect.flatMap(Effect.log),
+  Effect.runPromise
+)
+// Output: "clh3aqnd900003b64zpka3df"
 ```
 
 ## API
@@ -88,7 +100,6 @@ await makeUlid.pipe(
 
 - `makeUuid4`: Generates a v4 UUID (random)
 - `makeUuid5`: Generates a v5 UUID (SHA-1 hash of namespace + name)
-- `makeUuid6`: Generates a v6 UUID (reordered time-based for better sorting)
 - `makeUuid7`: Generates a v7 UUID (time-sortable)
 
 ### UUID v5 Namespaces
@@ -107,6 +118,21 @@ Pre-defined namespaces for UUID v5 generation:
 
 - `makeUlid`: Generates a ULID (Universally Unique Lexicographically Sortable Identifier)
 
+### CUID
+
+- `makeCuid`: Generates a CUID2 (Collision-resistant Unique IDentifier)
+- `CuidState.layer(envData)`: Creates a CUID state layer with environment fingerprint
+  - `envData`: A string identifying the environment (e.g., 'browser', 'node', 'mobile-ios')
+  - Used to help prevent collisions in distributed systems
+  - Cached and reused for efficiency
+- Format: 24 characters, starting with a lowercase letter, followed by numbers and lowercase letters
+- Properties:
+  - Sequential for database performance
+  - Secure from enumeration
+  - URL-safe
+  - Horizontally scalable
+  - Includes timestamp for time-based sorting
+
 ## License
 
 MIT

package/src/Cuid.ts

@@ -0,0 +1,135 @@
+import { Effect, Layer, Schema } from 'effect'
+import { DateTimes } from './DateTimes.js'
+import { GetRandomValues } from './GetRandomValues.js'
+
+// Constants
+const DEFAULT_LENGTH = 24
+const BIG_LENGTH = 32
+const INITIAL_COUNT_MAX = 476782367
+
+// Schema
+export const Cuid = Schema.String.pipe(
+  Schema.pattern(/^[a-z][0-9a-z]+$/),
+  Schema.brand('@typed/id/CUID'),
+)
+export type Cuid = Schema.Schema.Type<typeof Cuid>
+
+export const isCuid: (value: string) => value is Cuid = Schema.is(Cuid)
+
+// Types
+export type CuidSeed = {
+  readonly timestamp: number
+  readonly counter: number
+  readonly random: Uint8Array
+  readonly fingerprint: string
+}
+
+// Utilities
+const ALPHABET = Array.from({ length: 26 }, (_, i) => String.fromCharCode(i + 97))
+const encoder = new TextEncoder()
+
+function createEntropy(length: number, random: Uint8Array): string {
+  let entropy = ''
+  let offset = 0
+
+  while (entropy.length < length) {
+    const value = random[offset]
+    entropy += Math.floor(value % 36).toString(36)
+    offset = (offset + 1) % random.length
+  }
+
+  return entropy
+}
+
+function hash(input: string): Promise<string> {
+  // Convert string to bytes
+  const data = encoder.encode(input)
+
+  // Create a hash using the Web Crypto API
+  return crypto.subtle.digest('SHA-512', data).then((buffer) => {
+    const view = new Uint8Array(buffer)
+    let value = 0n
+    for (const byte of view) {
+      value = (value << 8n) + BigInt(byte)
+    }
+    // Drop the first character because it will bias the histogram to the left
+    return value.toString(36).slice(1)
+  })
+}
+
+// State Management
+export class CuidState extends Effect.Tag('CuidState')<
+  CuidState,
+  {
+    readonly next: Effect.Effect<CuidSeed>
+  }
+>() {
+  static readonly layer = (
+    envData: string,
+  ): Layer.Layer<CuidState, never, DateTimes | GetRandomValues> =>
+    Layer.effect(
+      this,
+      Effect.gen(function* () {
+        const { now } = yield* DateTimes
+        const getRandomValues = yield* GetRandomValues
+        const initialBytes = yield* getRandomValues(4)
+        const initialValue =
+          Math.abs(
+            (initialBytes[0] << 24) |
+              (initialBytes[1] << 16) |
+              (initialBytes[2] << 8) |
+              initialBytes[3],
+          ) % INITIAL_COUNT_MAX
+
+        // Create fingerprint from environment data
+        const fingerprint = yield* Effect.promise(() =>
+          hash(envData).then((h) => h.substring(0, BIG_LENGTH)),
+        )
+
+        let counter = initialValue
+
+        return {
+          next: Effect.gen(function* () {
+            const timestamp = yield* now
+            const random = yield* getRandomValues(32)
+            return {
+              timestamp,
+              counter: counter++,
+              random,
+              fingerprint,
+            }
+          }),
+        }
+      }),
+    )
+
+  static readonly Default = this.layer('node')
+}
+
+// Core Functions
+function cuidFromSeed({ timestamp, counter, random, fingerprint }: CuidSeed): Effect.Effect<Cuid> {
+  return Effect.gen(function* () {
+    // First letter is always a random lowercase letter from the seed
+    const firstLetter = ALPHABET[random[0] % ALPHABET.length]
+
+    // Convert components to base36
+    const time = timestamp.toString(36)
+    const count = counter.toString(36)
+
+    // Create entropy from remaining random bytes
+    const salt = createEntropy(4, random.slice(1))
+
+    // Hash all components together
+    const hashInput = `${time}${salt}${count}${fingerprint}`
+    const hashed = yield* Effect.promise(() => hash(hashInput))
+
+    // Construct the final CUID
+    const id = `${firstLetter}${hashed.substring(0, DEFAULT_LENGTH - 1)}`
+
+    return Cuid.make(id)
+  })
+}
+
+// Public API
+export const makeCuid: Effect.Effect<Cuid, never, DateTimes | GetRandomValues | CuidState> =
+  Effect.flatMap(CuidState.next, cuidFromSeed)

package/src/id.test.ts

@@ -5,18 +5,18 @@ import {
   GetRandomValues,
   isUuid4,
   isUuid5,
-  isUuid6,
   isUuid7,
   makeNanoId,
   makeUlid,
   makeUuid4,
   makeUuid5,
-  makeUuid6,
   makeUuid7,
   Sha1,
   Uuid5Namespace,
-  Uuid6State,
   Uuid7State,
+  makeCuid,
+  isCuid,
+  CuidState,
 } from './index.js'
 
 const makeTestValues = (length: number) => {
@@ -28,19 +28,18 @@ const makeTestValues = (length: number) => {
 }
 
 const provideTestValues = flow(
-  Effect.provide([Uuid7State.Default, Uuid6State.Default]),
+  Effect.provide(CuidState.layer('test')),
+  Effect.provide(Uuid7State.Default),
   Effect.provide(Sha1.Default),
-  Effect.provide([
-    GetRandomValues.layer((length) => Effect.succeed(makeTestValues(length))),
-    DateTimes.Fixed(new Date(0)),
-  ]),
+  Effect.provide(GetRandomValues.layer((length) => Effect.succeed(makeTestValues(length)))),
+  Effect.provide(DateTimes.Fixed(new Date(0))),
 )
 
 describe(__filename, () => {
   describe('Uuid4', () => {
     it.effect('generates a UUID v4', () =>
-      Effect.gen(function* (_) {
-        const id = yield* _(makeUuid4)
+      Effect.gen(function* () {
+        const id = yield* makeUuid4
         expect(id).toMatchInlineSnapshot(`"00010203-0405-4607-8809-0a0b0c0d0e0f"`)
         expect(id.length).toEqual(36)
         expect(isUuid4(id)).toEqual(true)
@@ -50,8 +49,8 @@ describe(__filename, () => {
 
   describe('Uuid5', () => {
     it.effect('generates a UUID v5', () =>
-      Effect.gen(function* (_) {
-        const id = yield* _(makeUuid5(Uuid5Namespace.DNS, 'example.com'))
+      Effect.gen(function* () {
+        const id = yield* makeUuid5(Uuid5Namespace.DNS, 'example.com')
         expect(id).toMatchInlineSnapshot(`"cfbff0d1-9375-5685-968c-48ce8b15ae17"`)
         expect(id.length).toEqual(36)
         expect(isUuid5(id)).toEqual(true)
@@ -59,21 +58,10 @@ describe(__filename, () => {
     )
   })
 
-  describe('Uuid6', () => {
-    it.effect('generates a UUID v6', () =>
-      Effect.gen(function* (_) {
-        const id = yield* _(makeUuid6)
-        expect(id).toMatchInlineSnapshot(`"1b21dd21-3814-6000-8809-0b0b0c0d0e0f"`)
-        expect(id.length).toEqual(36)
-        expect(isUuid6(id)).toEqual(true)
-      }).pipe(provideTestValues),
-    )
-  })
-
   describe('Uuid7', () => {
     it.effect('generates a UUID v7', () =>
-      Effect.gen(function* (_) {
-        const id = yield* _(makeUuid7)
+      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)
@@ -83,8 +71,8 @@ describe(__filename, () => {
 
   describe('NanoId', () => {
     it.effect('generates a NanoId', () =>
-      Effect.gen(function* (_) {
-        const id = yield* _(makeNanoId)
+      Effect.gen(function* () {
+        const id = yield* makeNanoId
         expect(id).toMatchInlineSnapshot(`"0123456789abcdefghijk"`)
         expect(id.length).toEqual(21)
       }).pipe(provideTestValues),
@@ -93,11 +81,28 @@ describe(__filename, () => {
 
   describe('Ulid', () => {
     it.effect('generates a Ulid', () =>
-      Effect.gen(function* (_) {
-        const id = yield* _(makeUlid)
+      Effect.gen(function* () {
+        const id = yield* makeUlid
         expect(id).toMatchInlineSnapshot(`"00000000000123456789ABCDEF"`)
         expect(id.length).toEqual(26)
       }).pipe(provideTestValues),
     )
   })
+
+  describe('Cuid', () => {
+    it.effect('generates a CUID', () =>
+      Effect.gen(function* () {
+        const id = yield* makeCuid
+        expect(id.length).toEqual(24)
+        expect(isCuid(id)).toEqual(true)
+        expect(id).toMatchInlineSnapshot(`"ai17q5mkkp8w5f2cey3lyzu5"`)
+
+        // Generate another to ensure uniqueness
+        const id2 = yield* makeCuid
+        expect(id2).not.toEqual(id)
+        expect(isCuid(id2)).toEqual(true)
+        expect(id2).toMatchInlineSnapshot(`"abeo5wmlmnjxjrnjiidlfvzp"`)
+      }).pipe(provideTestValues),
+    )
+  })
 })

package/src/index.ts

@@ -1,3 +1,4 @@
+export * from './Cuid.js'
 export * from './DateTimes.js'
 export * from './GetRandomValues.js'
 export * from './NanoId.js'