@livestore/adapter-web 0.4.0-dev.18 → 0.4.0-dev.19

package/src/web-worker/common/worker-schema.ts

@@ -6,7 +6,7 @@ import {
   MigrationsReport,
   SyncBackend,
   SyncState,
-  UnexpectedError,
+  UnknownError,
 } from '@livestore/common'
 import { EventSequenceNumber, LiveStoreEvent } from '@livestore/common/schema'
 import * as WebmeshWorker from '@livestore/devtools-web-common/worker'
@@ -49,7 +49,7 @@ export class LeaderWorkerOuterInitialMessage extends Schema.TaggedRequest<Leader
   {
     payload: { port: Transferable.MessagePort, storeId: Schema.String, clientId: Schema.String },
     success: Schema.Void,
-    failure: UnexpectedError,
+    failure: UnknownError,
   },
 ) {}
 
@@ -68,7 +68,7 @@ export class LeaderWorkerInnerInitialMessage extends Schema.TaggedRequest<Leader
       syncPayloadEncoded: Schema.UndefinedOr(Schema.JsonValue),
     },
     success: Schema.Void,
-    failure: UnexpectedError,
+    failure: UnknownError,
   },
 ) {}
 
@@ -77,7 +77,7 @@ export class LeaderWorkerInnerBootStatusStream extends Schema.TaggedRequest<Lead
   {
     payload: {},
     success: BootStatus,
-    failure: UnexpectedError,
+    failure: UnknownError,
   },
 ) {}
 
@@ -85,27 +85,27 @@ export class LeaderWorkerInnerPushToLeader extends Schema.TaggedRequest<LeaderWo
   'PushToLeader',
   {
     payload: {
-      batch: Schema.Array(LiveStoreEvent.AnyEncoded),
+      batch: Schema.Array(Schema.typeSchema(LiveStoreEvent.Client.Encoded)),
     },
-    success: Schema.Void,
-    failure: Schema.Union(UnexpectedError, LeaderAheadError),
+    success: Schema.Void as Schema.Schema<void>,
+    failure: Schema.Union(UnknownError, LeaderAheadError),
   },
 ) {}
 
 export class LeaderWorkerInnerPullStream extends Schema.TaggedRequest<LeaderWorkerInnerPullStream>()('PullStream', {
   payload: {
-    cursor: EventSequenceNumber.EventSequenceNumber,
+    cursor: Schema.typeSchema(EventSequenceNumber.Client.Composite),
   },
   success: Schema.Struct({
     payload: SyncState.PayloadUpstream,
   }),
-  failure: UnexpectedError,
+  failure: UnknownError,
 }) {}
 
 export class LeaderWorkerInnerExport extends Schema.TaggedRequest<LeaderWorkerInnerExport>()('Export', {
   payload: {},
   success: Transferable.Uint8Array as Schema.Schema<Uint8Array<ArrayBuffer>>,
-  failure: UnexpectedError,
+  failure: UnknownError,
 }) {}
 
 export class LeaderWorkerInnerExportEventlog extends Schema.TaggedRequest<LeaderWorkerInnerExportEventlog>()(
@@ -113,7 +113,7 @@ export class LeaderWorkerInnerExportEventlog extends Schema.TaggedRequest<Leader
   {
     payload: {},
     success: Transferable.Uint8Array as Schema.Schema<Uint8Array<ArrayBuffer>>,
-    failure: UnexpectedError,
+    failure: UnknownError,
   },
 ) {}
 
@@ -125,7 +125,7 @@ export class LeaderWorkerInnerGetRecreateSnapshot extends Schema.TaggedRequest<L
       snapshot: Transferable.Uint8Array as Schema.Schema<Uint8Array<ArrayBuffer>>,
       migrationsReport: MigrationsReport,
     }),
-    failure: UnexpectedError,
+    failure: UnknownError,
   },
 ) {}
 
@@ -133,8 +133,8 @@ export class LeaderWorkerInnerGetLeaderHead extends Schema.TaggedRequest<LeaderW
   'GetLeaderHead',
   {
     payload: {},
-    success: EventSequenceNumber.EventSequenceNumber,
-    failure: UnexpectedError,
+    success: Schema.typeSchema(EventSequenceNumber.Client.Composite),
+    failure: UnknownError,
   },
 ) {}
 
@@ -143,7 +143,7 @@ export class LeaderWorkerInnerGetLeaderSyncState extends Schema.TaggedRequest<Le
   {
     payload: {},
     success: SyncState.SyncState,
-    failure: UnexpectedError,
+    failure: UnknownError,
   },
 ) {}
 
@@ -152,7 +152,7 @@ export class LeaderWorkerInnerSyncStateStream extends Schema.TaggedRequest<Leade
   {
     payload: {},
     success: SyncState.SyncState,
-    failure: UnexpectedError,
+    failure: UnknownError,
   },
 ) {}
 
@@ -161,7 +161,7 @@ export class LeaderWorkerInnerGetNetworkStatus extends Schema.TaggedRequest<Lead
   {
     payload: {},
     success: SyncBackend.NetworkStatus,
-    failure: UnexpectedError,
+    failure: UnknownError,
   },
 ) {}
 
@@ -170,14 +170,14 @@ export class LeaderWorkerInnerNetworkStatusStream extends Schema.TaggedRequest<L
   {
     payload: {},
     success: SyncBackend.NetworkStatus,
-    failure: UnexpectedError,
+    failure: UnknownError,
   },
 ) {}
 
 export class LeaderWorkerInnerShutdown extends Schema.TaggedRequest<LeaderWorkerInnerShutdown>()('Shutdown', {
   payload: {},
   success: Schema.Void,
-  failure: UnexpectedError,
+  failure: UnknownError,
 }) {}
 
 export class LeaderWorkerInnerExtraDevtoolsMessage extends Schema.TaggedRequest<LeaderWorkerInnerExtraDevtoolsMessage>()(
@@ -187,7 +187,7 @@ export class LeaderWorkerInnerExtraDevtoolsMessage extends Schema.TaggedRequest<
       message: Devtools.Leader.MessageToApp,
     },
     success: Schema.Void,
-    failure: UnexpectedError,
+    failure: UnknownError,
   },
 ) {}
 
@@ -226,7 +226,7 @@ export class SharedWorkerUpdateMessagePort extends Schema.TaggedRequest<SharedWo
       initial: LeaderWorkerInnerInitialMessage,
     },
     success: Schema.Void,
-    failure: UnexpectedError,
+    failure: UnknownError,
   },
 ) {}
 

package/src/web-worker/leader-worker/make-leader-worker.ts

@@ -1,5 +1,5 @@
 import type { SqliteDb, SyncOptions } from '@livestore/common'
-import { Devtools, LogConfig, UnexpectedError } from '@livestore/common'
+import { Devtools, LogConfig, UnknownError } from '@livestore/common'
 import type { DevtoolsOptions } from '@livestore/common/leader-thread'
 import { configureConnection, Eventlog, LeaderThreadCtx, makeLeaderThreadLayer } from '@livestore/common/leader-thread'
 import type { LiveStoreSchema } from '@livestore/common/schema'
@@ -10,7 +10,6 @@ import { loadSqlite3Wasm } from '@livestore/sqlite-wasm/load-wasm'
 import { isDevEnv, LS_DEV } from '@livestore/utils'
 import type { HttpClient, Scope, WorkerError } from '@livestore/utils/effect'
 import {
-  BrowserWorkerRunner,
   Effect,
   FetchHttpClient,
   identity,
@@ -22,9 +21,9 @@ import {
   TaskTracing,
   WorkerRunner,
 } from '@livestore/utils/effect'
+import { BrowserWorkerRunner, Opfs } from '@livestore/utils/effect/browser'
 import type * as otel from '@opentelemetry/api'
 
-import * as OpfsUtils from '../../opfs-utils.ts'
 import { cleanupOldStateDbFiles, getStateDbFileName, sanitizeOpfsDir } from '../common/persisted-sqlite.ts'
 import { makeShutdownChannel } from '../common/shutdown-channel.ts'
 import * as WorkerSchema from '../common/worker-schema.ts'
@@ -40,7 +39,7 @@ export type WorkerOptions = {
 
 if (isDevEnv()) {
   globalThis.__debugLiveStoreUtils = {
-    opfs: OpfsUtils,
+    opfs: Opfs.debugUtils,
     blobUrl: (buffer: Uint8Array<ArrayBuffer>) =>
       URL.createObjectURL(new Blob([buffer], { type: 'application/octet-stream' })),
     runSync: (effect: Effect.Effect<any, any, never>) => Effect.runSync(effect),
@@ -93,7 +92,12 @@ const makeWorkerRunnerOuter = (
           Effect.withSpan('@livestore/adapter-web:worker:wrapper:InitialMessage:innerFiber'),
           Effect.tapCauseLogPretty,
           Effect.provide(
-            WebmeshWorker.CacheService.layer({ nodeName: Devtools.makeNodeName.client.leader({ storeId, clientId }) }),
+            Layer.mergeAll(
+              Opfs.Opfs.Default,
+              WebmeshWorker.CacheService.layer({
+                nodeName: Devtools.makeNodeName.client.leader({ storeId, clientId }),
+              }),
+            ),
           ),
           Effect.forkScoped,
         )
@@ -108,12 +112,13 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions, syncPayloadSchema }:
       Effect.gen(function* () {
         const sqlite3 = yield* Effect.promise(() => loadSqlite3Wasm())
         const makeSqliteDb = sqliteDbFactory({ sqlite3 })
+        const opfsDirectory = yield* sanitizeOpfsDir(storageOptions.directory, storeId)
         const runtime = yield* Effect.runtime<never>()
 
         const makeDb = (kind: 'state' | 'eventlog') =>
           makeSqliteDb({
             _tag: 'opfs',
-            opfsDirectory: sanitizeOpfsDir(storageOptions.directory, storeId),
+            opfsDirectory,
             fileName: kind === 'state' ? getStateDbFileName(schema) : 'eventlog.db',
             configureDb: (db) =>
               configureConnection(db, {
@@ -159,7 +164,7 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions, syncPayloadSchema }:
         })
       }).pipe(
         Effect.tapCauseLogPretty,
-        UnexpectedError.mapToUnexpectedError,
+        UnknownError.mapToUnknownError,
         Effect.withPerformanceMeasure('@livestore/adapter-web:worker:InitialMessage'),
         Effect.withSpan('@livestore/adapter-web:worker:InitialMessage'),
         Effect.annotateSpans({ debugInstanceId }),
@@ -177,10 +182,7 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions, syncPayloadSchema }:
 
         const snapshot = workerCtx.dbState.export()
         return { snapshot, migrationsReport: workerCtx.initialState.migrationsReport }
-      }).pipe(
-        UnexpectedError.mapToUnexpectedError,
-        Effect.withSpan('@livestore/adapter-web:worker:GetRecreateSnapshot'),
-      ),
+      }).pipe(UnknownError.mapToUnknownError, Effect.withSpan('@livestore/adapter-web:worker:GetRecreateSnapshot')),
     PullStream: ({ cursor }) =>
       Effect.gen(function* () {
         const { syncProcessor } = yield* LeaderThreadCtx
@@ -193,19 +195,19 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions, syncPayloadSchema }:
     PushToLeader: ({ batch }) =>
       Effect.andThen(LeaderThreadCtx, ({ syncProcessor }) =>
         syncProcessor.push(
-          batch.map((event) => new LiveStoreEvent.EncodedWithMeta(event)),
+          batch.map((event) => new LiveStoreEvent.Client.EncodedWithMeta(event)),
           // We'll wait in order to keep back pressure on the client session
           { waitForProcessing: true },
         ),
       ).pipe(Effect.uninterruptible, Effect.withSpan('@livestore/adapter-web:worker:PushToLeader')),
     Export: () =>
       Effect.andThen(LeaderThreadCtx, (_) => _.dbState.export()).pipe(
-        UnexpectedError.mapToUnexpectedError,
+        UnknownError.mapToUnknownError,
         Effect.withSpan('@livestore/adapter-web:worker:Export'),
       ),
     ExportEventlog: () =>
       Effect.andThen(LeaderThreadCtx, (_) => _.dbEventlog.export()).pipe(
-        UnexpectedError.mapToUnexpectedError,
+        UnknownError.mapToUnknownError,
         Effect.withSpan('@livestore/adapter-web:worker:ExportEventlog'),
       ),
     BootStatusStream: () =>
@@ -214,15 +216,12 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions, syncPayloadSchema }:
       Effect.gen(function* () {
         const workerCtx = yield* LeaderThreadCtx
         return Eventlog.getClientHeadFromDb(workerCtx.dbEventlog)
-      }).pipe(UnexpectedError.mapToUnexpectedError, Effect.withSpan('@livestore/adapter-web:worker:GetLeaderHead')),
+      }).pipe(UnknownError.mapToUnknownError, Effect.withSpan('@livestore/adapter-web:worker:GetLeaderHead')),
     GetLeaderSyncState: () =>
       Effect.gen(function* () {
         const workerCtx = yield* LeaderThreadCtx
         return yield* workerCtx.syncProcessor.syncState
-      }).pipe(
-        UnexpectedError.mapToUnexpectedError,
-        Effect.withSpan('@livestore/adapter-web:worker:GetLeaderSyncState'),
-      ),
+      }).pipe(UnknownError.mapToUnknownError, Effect.withSpan('@livestore/adapter-web:worker:GetLeaderSyncState')),
     SyncStateStream: () =>
       Effect.gen(function* () {
         const workerCtx = yield* LeaderThreadCtx
@@ -232,7 +231,7 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions, syncPayloadSchema }:
       Effect.gen(function* () {
         const workerCtx = yield* LeaderThreadCtx
         return yield* workerCtx.networkStatus
-      }).pipe(UnexpectedError.mapToUnexpectedError, Effect.withSpan('@livestore/adapter-web:worker:GetNetworkStatus')),
+      }).pipe(UnknownError.mapToUnknownError, Effect.withSpan('@livestore/adapter-web:worker:GetNetworkStatus')),
     NetworkStatusStream: () =>
       Effect.gen(function* () {
         const workerCtx = yield* LeaderThreadCtx
@@ -245,10 +244,10 @@ const makeWorkerRunnerInner = ({ schema, sync: syncOptions, syncPayloadSchema }:
         // Buy some time for Otel to flush
         // TODO find a cleaner way to do this
         yield* Effect.sleep(300)
-      }).pipe(UnexpectedError.mapToUnexpectedError, Effect.withSpan('@livestore/adapter-web:worker:Shutdown')),
+      }).pipe(UnknownError.mapToUnknownError, Effect.withSpan('@livestore/adapter-web:worker:Shutdown')),
     ExtraDevtoolsMessage: ({ message }) =>
       Effect.andThen(LeaderThreadCtx, (_) => _.extraIncomingMessagesQueue.offer(message)).pipe(
-        UnexpectedError.mapToUnexpectedError,
+        UnknownError.mapToUnknownError,
         Effect.withSpan('@livestore/adapter-web:worker:ExtraDevtoolsMessage'),
       ),
     'DevtoolsWebCommon.CreateConnection': WebmeshWorker.CreateConnection,
@@ -262,7 +261,7 @@ const makeDevtoolsOptions = ({
   devtoolsEnabled: boolean
   dbState: SqliteDb
   dbEventlog: SqliteDb
-}): Effect.Effect<DevtoolsOptions, UnexpectedError, Scope.Scope | WebmeshWorker.CacheService> =>
+}): Effect.Effect<DevtoolsOptions, UnknownError, Scope.Scope | WebmeshWorker.CacheService> =>
   Effect.gen(function* () {
     if (devtoolsEnabled === false) {
       return { enabled: false }

package/src/web-worker/shared-worker/make-shared-worker.ts

@@ -1,10 +1,8 @@
-import { Devtools, LogConfig, liveStoreVersion, UnexpectedError } from '@livestore/common'
+import { Devtools, LogConfig, liveStoreVersion, UnknownError } from '@livestore/common'
 import * as DevtoolsWeb from '@livestore/devtools-web-common/web-channel'
 import * as WebmeshWorker from '@livestore/devtools-web-common/worker'
 import { isDevEnv, isNotUndefined, LS_DEV } from '@livestore/utils'
 import {
-  BrowserWorker,
-  BrowserWorkerRunner,
   Deferred,
   Effect,
   Exit,
@@ -22,6 +20,7 @@ import {
   WorkerError,
   WorkerRunner,
 } from '@livestore/utils/effect'
+import { BrowserWorker, BrowserWorkerRunner } from '@livestore/utils/effect/browser'
 
 import { makeShutdownChannel } from '../common/shutdown-channel.ts'
 import * as WorkerSchema from '../common/worker-schema.ts'
@@ -66,10 +65,10 @@ const makeWorkerRunner = Effect.gen(function* () {
     req: TReq,
   ): Effect.Effect<
     Schema.WithResult.Success<TReq>,
-    UnexpectedError | Schema.WithResult.Failure<TReq>,
+    UnknownError | Schema.WithResult.Failure<TReq>,
     Schema.WithResult.Context<TReq>
   > =>
-    // Forward the request to the active worker and normalize platform errors into UnexpectedError.
+    // Forward the request to the active worker and normalize platform errors into UnknownError.
     waitForWorker.pipe(
       // Effect.logBefore(`forwardRequest: ${req._tag}`),
       Effect.andThen((worker) => worker.executeEffect(req) as Effect.Effect<unknown, unknown, unknown>),
@@ -81,17 +80,17 @@ const makeWorkerRunner = Effect.gen(function* () {
         duration: 500,
       }),
       Effect.mapError((cause) =>
-        Schema.is(UnexpectedError)(cause)
+        Schema.is(UnknownError)(cause)
           ? cause
           : ParseResult.isParseError(cause) || Schema.is(WorkerError.WorkerError)(cause)
-            ? new UnexpectedError({ cause })
+            ? new UnknownError({ cause })
             : cause,
       ),
-      Effect.catchAllDefect((cause) => new UnexpectedError({ cause })),
+      Effect.catchAllDefect((cause) => new UnknownError({ cause })),
       Effect.tapCauseLogPretty,
     ) as Effect.Effect<
       Schema.WithResult.Success<TReq>,
-      UnexpectedError | Schema.WithResult.Failure<TReq>,
+      UnknownError | Schema.WithResult.Failure<TReq>,
       Schema.WithResult.Context<TReq>
     >
 
@@ -99,7 +98,7 @@ const makeWorkerRunner = Effect.gen(function* () {
     req: TReq,
   ): Stream.Stream<
     Schema.WithResult.Success<TReq>,
-    UnexpectedError | Schema.WithResult.Failure<TReq>,
+    UnknownError | Schema.WithResult.Failure<TReq>,
     Schema.WithResult.Context<TReq>
   > =>
     Effect.gen(function* () {
@@ -121,14 +120,14 @@ const makeWorkerRunner = Effect.gen(function* () {
       return Stream.merge(stream, scopeShutdownStream, { haltStrategy: 'either' })
     }).pipe(
       Effect.interruptible,
-      UnexpectedError.mapToUnexpectedError,
+      UnknownError.mapToUnknownError,
       Effect.tapCauseLogPretty,
       Stream.unwrap,
       Stream.ensuring(Effect.logDebug(`shutting down stream for ${req._tag}`)),
-      UnexpectedError.mapToUnexpectedErrorStream,
+      UnknownError.mapToUnknownErrorStream,
     ) as Stream.Stream<
       Schema.WithResult.Success<TReq>,
-      UnexpectedError | Schema.WithResult.Failure<TReq>,
+      UnknownError | Schema.WithResult.Failure<TReq>,
       Schema.WithResult.Context<TReq>
     >
 
@@ -186,7 +185,7 @@ const makeWorkerRunner = Effect.gen(function* () {
         // Early return on mismatch to keep happy path linear
         if (prev !== undefined && !sameInvariants(prev, invariants)) {
           const diff = Schema.debugDiff(InvariantsSchema)(prev, invariants)
-          return yield* new UnexpectedError({
+          return yield* new UnknownError({
             cause: 'Store invariants changed across leader transitions',
             payload: { diff, previous: prev, next: invariants },
           })
@@ -236,7 +235,7 @@ const makeWorkerRunner = Effect.gen(function* () {
         }).pipe(Effect.tapCauseLogPretty, Scope.extend(scope), Effect.forkIn(scope))
       }).pipe(
         Effect.withSpan('@livestore/adapter-web:shared-worker:updateMessagePort'),
-        UnexpectedError.mapToUnexpectedError,
+        UnknownError.mapToUnknownError,
         Effect.tapCauseLogPretty,
       ),
 

package/dist/opfs-utils.d.ts

@@ -1,7 +0,0 @@
-export declare const rootHandlePromise: Promise<FileSystemDirectoryHandle>;
-export declare const getDirHandle: (absDirPath: string | undefined, options?: {
-    create?: boolean;
-}) => Promise<FileSystemDirectoryHandle>;
-export declare const printTree: (directoryHandle_?: FileSystemDirectoryHandle | Promise<FileSystemDirectoryHandle>, depth?: number, prefix?: string) => Promise<void>;
-export declare const deleteAll: (directoryHandle: FileSystemDirectoryHandle) => Promise<void>;
-//# sourceMappingURL=opfs-utils.d.ts.map

package/dist/opfs-utils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"opfs-utils.d.ts","sourceRoot":"","sources":["../src/opfs-utils.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,iBAAiB,oCAYQ,CAAA;AAEtC,eAAO,MAAM,YAAY,GAAU,YAAY,MAAM,GAAG,SAAS,EAAE,UAAS;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,uCAWpG,CAAA;AAED,eAAO,MAAM,SAAS,GACpB,mBAAkB,yBAAyB,GAAG,OAAO,CAAC,yBAAyB,CAAqB,EACpG,QAAO,MAAiC,EACxC,eAAW,KACV,OAAO,CAAC,IAAI,CAgBd,CAAA;AAED,eAAO,MAAM,SAAS,GAAU,iBAAiB,yBAAyB,kBAMzE,CAAA"}

package/dist/opfs-utils.js

@@ -1,43 +0,0 @@
-// NOTE we're already firing off this promise call here since we'll need it anyway and need it cached
-import { prettyBytes } from '@livestore/utils';
-// To improve LiveStore compatibility with e.g. Node.js we're guarding for `navigator` / `navigator.storage` to be defined.
-export const rootHandlePromise = typeof navigator === 'undefined' || navigator.storage === undefined
-    ? // We're using a proxy here to make the promise reject lazy
-        new Proxy({}, {
-            get: () => Promise.reject(new Error(`Can't get OPFS root handle in this environment as navigator.storage is undefined`)),
-        })
-    : navigator.storage.getDirectory();
-export const getDirHandle = async (absDirPath, options = {}) => {
-    const rootHandle = await rootHandlePromise;
-    if (absDirPath === undefined || absDirPath === '' || absDirPath === '/')
-        return rootHandle;
-    let dirHandle = rootHandle;
-    const directoryStack = absDirPath.split('/').filter(Boolean);
-    while (directoryStack.length > 0) {
-        dirHandle = await dirHandle.getDirectoryHandle(directoryStack.shift(), options);
-    }
-    return dirHandle;
-};
-export const printTree = async (directoryHandle_ = rootHandlePromise, depth = Number.POSITIVE_INFINITY, prefix = '') => {
-    if (depth < 0)
-        return;
-    const directoryHandle = await directoryHandle_;
-    const entries = directoryHandle.values();
-    for await (const entry of entries) {
-        const isDirectory = entry.kind === 'directory';
-        const size = entry.kind === 'file' ? await entry.getFile().then((file) => prettyBytes(file.size)) : undefined;
-        console.log(`${prefix}${isDirectory ? '📁' : '📄'} ${entry.name} ${size ? `(${size})` : ''}`);
-        if (isDirectory) {
-            const nestedDirectoryHandle = await directoryHandle.getDirectoryHandle(entry.name);
-            await printTree(nestedDirectoryHandle, depth - 1, `${prefix}  `);
-        }
-    }
-};
-export const deleteAll = async (directoryHandle) => {
-    if (directoryHandle.kind !== 'directory')
-        return;
-    for await (const entryName of directoryHandle.keys()) {
-        await directoryHandle.removeEntry(entryName, { recursive: true });
-    }
-};
-//# sourceMappingURL=opfs-utils.js.map

package/dist/opfs-utils.js.map

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

package/src/opfs-utils.ts

@@ -1,61 +0,0 @@
-// NOTE we're already firing off this promise call here since we'll need it anyway and need it cached
-
-import { prettyBytes } from '@livestore/utils'
-
-// To improve LiveStore compatibility with e.g. Node.js we're guarding for `navigator` / `navigator.storage` to be defined.
-export const rootHandlePromise =
-  typeof navigator === 'undefined' || navigator.storage === undefined
-    ? // We're using a proxy here to make the promise reject lazy
-      (new Proxy(
-        {},
-        {
-          get: () =>
-            Promise.reject(
-              new Error(`Can't get OPFS root handle in this environment as navigator.storage is undefined`),
-            ),
-        },
-      ) as never)
-    : navigator.storage.getDirectory()
-
-export const getDirHandle = async (absDirPath: string | undefined, options: { create?: boolean } = {}) => {
-  const rootHandle = await rootHandlePromise
-  if (absDirPath === undefined || absDirPath === '' || absDirPath === '/') return rootHandle
-
-  let dirHandle = rootHandle
-  const directoryStack = absDirPath.split('/').filter(Boolean)
-  while (directoryStack.length > 0) {
-    dirHandle = await dirHandle.getDirectoryHandle(directoryStack.shift()!, options)
-  }
-
-  return dirHandle
-}
-
-export const printTree = async (
-  directoryHandle_: FileSystemDirectoryHandle | Promise<FileSystemDirectoryHandle> = rootHandlePromise,
-  depth: number = Number.POSITIVE_INFINITY,
-  prefix = '',
-): Promise<void> => {
-  if (depth < 0) return
-
-  const directoryHandle = await directoryHandle_
-  const entries = directoryHandle.values()
-
-  for await (const entry of entries) {
-    const isDirectory = entry.kind === 'directory'
-    const size = entry.kind === 'file' ? await entry.getFile().then((file) => prettyBytes(file.size)) : undefined
-    console.log(`${prefix}${isDirectory ? '📁' : '📄'} ${entry.name} ${size ? `(${size})` : ''}`)
-
-    if (isDirectory) {
-      const nestedDirectoryHandle = await directoryHandle.getDirectoryHandle(entry.name)
-      await printTree(nestedDirectoryHandle, depth - 1, `${prefix}  `)
-    }
-  }
-}
-
-export const deleteAll = async (directoryHandle: FileSystemDirectoryHandle) => {
-  if (directoryHandle.kind !== 'directory') return
-
-  for await (const entryName of directoryHandle.keys()) {
-    await directoryHandle.removeEntry(entryName, { recursive: true })
-  }
-}