@livestore/utils 0.0.58-dev.0 → 0.0.58-dev.10

package/package.json

@@ -1,7 +1,9 @@
 {
   "name": "@livestore/utils",
-  "version": "0.0.58-dev.0",
-  "sideEffects": false,
+  "version": "0.0.58-dev.10",
+  "sideEffects": [
+    "./dist/global.js"
+  ],
   "type": "module",
   "exports": {
     ".": {
@@ -14,6 +16,10 @@
       "react-native": "./dist/cuid/cuid.browser.js",
       "browser": "./dist/cuid/cuid.browser.js"
     },
+    "./nanoid": {
+      "types": "./dist/nanoid/index.d.ts",
+      "default": "./dist/nanoid/index.js"
+    },
     "./effect": {
       "types": "./dist/effect/index.d.ts",
       "default": "./dist/effect/index.js"
@@ -26,38 +32,38 @@
       "./cuid": [
         "./dist/cuid/cuid.node.d.ts"
       ],
+      "./nanoid": [
+        "./dist/nanoid/index.d.ts"
+      ],
       "effect": [
         "./dist/effect"
       ]
     }
   },
   "dependencies": {
-    "date-fns": "^3.6.0",
-    "msgpackr": "^1.11.0",
-    "otel-websocket-exporter": "^0.0.29",
+    "msgpackr": "^1.11.2",
+    "nanoid": "^5.0.7",
     "pretty-bytes": "^6.1.1",
-    "effect-db-schema": "0.0.58-dev.0"
+    "@livestore/db-schema": "0.0.58-dev.10"
   },
   "peerDependencies": {
-    "@effect/experimental": "^0.24.4",
-    "@effect/opentelemetry": "^0.36.2",
-    "@effect/platform": "^0.63.3",
-    "@effect/platform-browser": "^0.42.3",
-    "@effect/schema": "^0.72.2",
+    "@effect/experimental": "^0.30.13",
+    "@effect/opentelemetry": "^0.39.7",
+    "@effect/platform": "^0.69.12",
+    "@effect/platform-browser": "^0.48.12",
     "@opentelemetry/api": "^1.9.0",
-    "effect": "^3.7.2"
+    "effect": "^3.10.7"
   },
   "devDependencies": {
-    "@effect/experimental": "0.24.4",
-    "@effect/opentelemetry": "0.36.2",
-    "@effect/platform": "0.63.3",
-    "@effect/platform-browser": "0.42.3",
-    "@effect/schema": "0.72.2",
+    "@effect/experimental": "0.30.13",
+    "@effect/opentelemetry": "0.39.7",
+    "@effect/platform": "0.69.12",
+    "@effect/platform-browser": "0.48.12",
     "@opentelemetry/api": "^1.9.0",
-    "@types/node": "^22.0.0",
-    "@types/web": "^0.0.153",
-    "effect": "3.7.2",
-    "vitest": "^2.0.4"
+    "@types/node": "^22.8.5",
+    "@types/web": "^0.0.175",
+    "effect": "3.10.7",
+    "vitest": "^2.1.4"
   },
   "publishConfig": {
     "access": "public"

package/src/cuid/cuid.browser.ts

@@ -1,3 +1,4 @@
+/* eslint-disable unicorn/prefer-global-this */
 /**
  * Based on:
  *

package/src/effect/Effect.ts

@@ -47,7 +47,8 @@ const getThreadName = () => {
   const globalName = globalThis.name
   return isNonEmptyString(globalName)
     ? globalName
-    : typeof window === 'object'
+    : // eslint-disable-next-line unicorn/prefer-global-this
+      typeof window === 'object'
       ? 'Browser Main Thread'
       : 'unknown-thread'
 }

package/src/effect/Error.ts

@@ -1,4 +1,4 @@
-import { Schema } from '@effect/schema'
+import { Schema } from 'effect'
 
 export class UnknownError extends Schema.TaggedError<'UnknownError'>()('UnknownError', {
   cause: Schema.Any,

package/src/effect/Schema/debug-diff.test.ts

@@ -1,4 +1,4 @@
-import { Schema } from '@effect/schema'
+import { Schema } from 'effect'
 import { describe, expect, test } from 'vitest'
 
 import type { DiffItem } from './debug-diff.js'

package/src/effect/Schema/debug-diff.ts

@@ -1,11 +1,10 @@
-import type { Schema } from '@effect/schema'
-import { AST, Equivalence } from '@effect/schema'
+import { Schema, SchemaAST } from 'effect'
 
 export type DiffItem = {
   path: string
   a: any
   b: any
-  ast: AST.AST
+  ast: SchemaAST.AST
 }
 
 /**
@@ -19,12 +18,12 @@ export const debugDiff =
     return bag
   }
 
-const debugDiffImpl = (ast: AST.AST, a: any, b: any, path: string, bag: DiffItem[]) => {
-  const eq = Equivalence.make({ ast } as any)
+const debugDiffImpl = (ast: SchemaAST.AST, a: any, b: any, path: string, bag: DiffItem[]) => {
+  const eq = Schema.equivalence({ ast } as any)
   if (eq(a, b) === false) {
     // bag.push({ path, a, b, ast })
 
-    if (AST.isUnion(ast)) {
+    if (SchemaAST.isUnion(ast)) {
       if (isTaggedUnion(ast)) {
         bag.push({ path, a, b, ast })
         return
@@ -36,8 +35,8 @@ const debugDiffImpl = (ast: AST.AST, a: any, b: any, path: string, bag: DiffItem
           } catch {}
         }
       }
-    } else if (AST.isTypeLiteral(ast)) {
-      const props = AST.getPropertySignatures(ast)
+    } else if (SchemaAST.isTypeLiteral(ast)) {
+      const props = SchemaAST.getPropertySignatures(ast)
       for (const prop of props) {
         debugDiffImpl(prop.type, a[prop.name], b[prop.name], `${path}.${prop.name.toString()}`, bag)
       }
@@ -48,11 +47,11 @@ const debugDiffImpl = (ast: AST.AST, a: any, b: any, path: string, bag: DiffItem
   }
 }
 
-const isTaggedUnion = (ast: AST.AST) => {
-  if (AST.isUnion(ast)) {
+const isTaggedUnion = (ast: SchemaAST.AST) => {
+  if (SchemaAST.isUnion(ast)) {
     return ast.types.every((type) => {
-      if (AST.isTypeLiteral(type) === false) return false
-      const props = AST.getPropertySignatures(type)
+      if (SchemaAST.isTypeLiteral(type) === false) return false
+      const props = SchemaAST.getPropertySignatures(type)
       return props.some((prop) => prop.name.toString() === '_tag')
     })
   }

package/src/effect/Schema/index.ts

@@ -1,10 +1,9 @@
 import { Transferable } from '@effect/platform'
-import { ParseResult, Schema } from '@effect/schema'
-import type { ParseOptions } from '@effect/schema/AST'
-import type { ParseError } from '@effect/schema/ParseResult'
-import { Effect, Hash } from 'effect'
+import { Effect, Hash, ParseResult, Schema } from 'effect'
+import type { ParseError } from 'effect/ParseResult'
+import type { ParseOptions } from 'effect/SchemaAST'
 
-export * from '@effect/schema/Schema'
+export * from 'effect/Schema'
 export * from './debug-diff.js'
 export * from './msgpack.js'
 
@@ -42,3 +41,18 @@ export const swap = <A, I, R>(schema: Schema.Schema<A, I, R>): Schema.Schema<I,
   })
 
 export const Base64FromUint8Array: Schema.Schema<string, Uint8Array> = swap(Schema.Uint8ArrayFromBase64)
+
+export interface JsonArray extends ReadonlyArray<JsonValue> {}
+export interface JsonObject {
+  [key: string]: JsonValue
+}
+export type JsonValue = string | number | boolean | null | JsonObject | JsonArray
+
+export const JsonValue: Schema.Schema<JsonValue> = Schema.Union(
+  Schema.String,
+  Schema.Number,
+  Schema.Boolean,
+  Schema.Null,
+  Schema.Array(Schema.suspend(() => JsonValue)),
+  Schema.Record({ key: Schema.String, value: Schema.suspend(() => JsonValue) }),
+)

package/src/effect/Schema/msgpack.ts

@@ -1,4 +1,4 @@
-import { Schema } from '@effect/schema'
+import { Schema } from 'effect'
 import * as msgpack from 'msgpackr'
 
 export const MsgPack = <A, I>(schema: Schema.Schema<A, I>) =>

package/src/effect/WebChannel.ts

@@ -1,5 +1,4 @@
-import type { ParseResult } from '@effect/schema'
-import type { Scope } from 'effect'
+import type { ParseResult, Scope } from 'effect'
 import { Deferred, Effect, Either, Queue, Stream } from 'effect'
 
 import * as Schema from './Schema/index.js'

package/src/effect/index.ts

@@ -38,6 +38,7 @@ export {
   HashMap,
   HashSet,
   MutableHashSet,
+  MutableHashMap,
   Option,
   LogLevel,
   Logger,
@@ -47,6 +48,7 @@ export {
   Channel,
   pipe,
   identity,
+  GlobalValue,
   Match,
 } from 'effect'
 
@@ -58,15 +60,10 @@ export * as SubscriptionRef from './SubscriptionRef.js'
 
 export * as WebChannel from './WebChannel.js'
 
-export {
-  TreeFormatter,
-  AST as SchemaAST,
-  Pretty as SchemaPretty,
-  Equivalence as SchemaEquivalence,
-  Serializable,
-  JSONSchema,
-  ParseResult,
-} from '@effect/schema'
+export * as SchemaAST from 'effect/SchemaAST'
+export { TreeFormatter } from 'effect/ParseResult'
+export { ParseResult, Pretty } from 'effect'
+export type { Serializable, SerializableWithResult } from 'effect/Schema'
 export * as Schema from './Schema/index.js'
 export * as OtelTracer from '@effect/opentelemetry/Tracer'
 
@@ -82,6 +79,7 @@ export {
   HttpClientError,
   HttpClientRequest,
   HttpClientResponse,
+  FetchHttpClient,
 } from '@effect/platform'
 export { BrowserWorker, BrowserWorkerRunner } from '@effect/platform-browser'
 

package/src/index.ts

@@ -16,8 +16,6 @@ import type * as otel from '@opentelemetry/api'
 
 import { objectToString } from './misc.js'
 
-export * as dateFns from 'date-fns'
-
 export type Prettify<T> = T extends infer U ? { [K in keyof U]: Prettify<U[K]> } : never
 export type PrettifyFlat<T> = T extends infer U ? { [K in keyof U]: U[K] } : never
 

package/src/misc.ts

@@ -18,6 +18,7 @@ export const tryAsFunctionAndNew = <TArg, TResult>(
   try {
     // @ts-expect-error try out as constructor
     return new fnOrConstructor(arg)
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
   } catch (e) {
     // @ts-expect-error try out as function
     return fnOrConstructor(arg)

package/src/nanoid/index.ts

@@ -0,0 +1 @@
+export { nanoid } from 'nanoid'

package/src/string.ts

@@ -1,2 +1,9 @@
 export const lowercaseFirstChar = (str: string) => str.charAt(0).toLowerCase() + str.slice(1)
 export const uppercaseFirstChar = (str: string) => str.charAt(0).toUpperCase() + str.slice(1)
+
+/** Indents a string each line by `n` characters (default: spaces) */
+export const indent = (str: string, n: number, char = ' '): string =>
+  str
+    .split('\n')
+    .map((line) => char.repeat(n) + line)
+    .join('\n')

package/tsconfig.json

@@ -6,5 +6,5 @@
     "tsBuildInfoFile": "./dist/.tsbuildinfo.json"
   },
   "include": ["./src"],
-  "references": [{ "path": "../../effect-db-schema"}]
+  "references": [{ "path": "../db-schema"}]
 }