@withstudiocms/sdk 0.1.0-beta.1 → 0.1.1

package/dist/modules/update/index.d.ts

@@ -1,7 +1,7 @@
 import { Effect } from '@withstudiocms/effect';
-import { StudioCMSPageContent, StudioCMSPageData } from '@withstudiocms/kysely';
 import CacheService from '../../cache.js';
 import { DBClientLive } from '../../context.js';
+import { StudioCMSPageContent, StudioCMSPageData } from '../../tables.js';
 /**
  * CombinedPageUpdateData
  *
@@ -67,15 +67,15 @@ export declare const SDKUpdateModule: Effect.Effect<{
      */
     pageContent: (input: {
         readonly id: string;
-        readonly contentId: string;
         readonly contentLang: string;
+        readonly contentId: string;
         readonly content: string;
     }) => Effect.Effect<{
         readonly id: string;
-        readonly contentId: string;
         readonly contentLang: string;
+        readonly contentId: string;
         readonly content: string;
-    }, import("@withstudiocms/kysely").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError, never>;
+    }, import("@withstudiocms/kysely/client").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError, never>;
     /**
      * Update Tag
      *
@@ -83,20 +83,20 @@ export declare const SDKUpdateModule: Effect.Effect<{
      * @returns The updated tag.
      */
     tags: (input: {
-        readonly name: string;
         readonly id: number;
+        readonly name: string;
         readonly description: string;
         readonly slug: string;
         readonly meta: string;
     }) => Effect.Effect<{
-        readonly name: string;
         readonly id: number;
+        readonly name: string;
         readonly description: string;
         readonly slug: string;
         readonly meta: {
             readonly [x: string]: unknown;
         };
-    }, import("@withstudiocms/kysely").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError, never>;
+    }, import("@withstudiocms/kysely/client").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError, never>;
     /**
      * Update Category
      *
@@ -104,22 +104,22 @@ export declare const SDKUpdateModule: Effect.Effect<{
      * @returns The updated category.
      */
     categories: (input: {
-        readonly parent?: number | null | undefined;
-        readonly name: string;
         readonly id: number;
+        readonly name: string;
         readonly description: string;
+        readonly parent?: number | null | undefined;
         readonly slug: string;
         readonly meta: string;
     }) => Effect.Effect<{
-        readonly name: string;
         readonly id: number;
-        readonly parent: number | null | undefined;
+        readonly name: string;
         readonly description: string;
+        readonly parent?: number | null | undefined;
         readonly slug: string;
         readonly meta: {
             readonly [x: string]: unknown;
         };
-    }, import("@withstudiocms/kysely").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError, never>;
+    }, import("@withstudiocms/kysely/client").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError, never>;
     /**
      * Update Permissions
      *
@@ -132,15 +132,15 @@ export declare const SDKUpdateModule: Effect.Effect<{
     }) => Effect.Effect<{
         readonly user: string;
         readonly rank: "owner" | "admin" | "editor" | "visitor" | "unknown";
-    }, import("@withstudiocms/kysely").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError, never>;
+    }, import("@withstudiocms/kysely/client").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError, never>;
     /**
      * Update Folder Tree Cache
      */
-    folderTree: Effect.Effect<import("../../types.js").FolderNode[], import("@withstudiocms/kysely").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError | import("../util/folderTree.js").FolderTreeError, never>;
+    folderTree: Effect.Effect<import("../../types.js").FolderNode[], import("@withstudiocms/kysely/client").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError | import("../util/folderTree.js").FolderTreeError, never>;
     /**
      * Update Folder List Cache
      */
-    folderList: Effect.Effect<import("../../types.js").FolderListItem[], import("@withstudiocms/kysely").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError, never>;
+    folderList: Effect.Effect<import("../../types.js").FolderListItem[], import("@withstudiocms/kysely/client").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError, never>;
     /**
      * Update Folder Entry and Invalidate Related Caches
      *
@@ -148,25 +148,25 @@ export declare const SDKUpdateModule: Effect.Effect<{
      * @returns The updated folder entry.
      */
     folder: (data: {
-        readonly name: string;
         readonly id: string;
-        readonly parent: string | null | undefined;
-    }) => Effect.Effect<{
         readonly name: string;
+        readonly parent?: string | null | undefined;
+    }) => Effect.Effect<{
         readonly id: string;
-        readonly parent: string | null | undefined;
-    }, import("@withstudiocms/kysely").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError | import("../util/folderTree.js").FolderTreeError, never>;
+        readonly name: string;
+        readonly parent?: string | null | undefined;
+    }, import("@withstudiocms/kysely/client").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError | import("../util/folderTree.js").FolderTreeError, never>;
     /**
      * Update Latest NPM Package Version
      */
     latestVersion: () => Effect.Effect<{
         version: string;
         lastCacheUpdate: Date;
-    }, import("effect/Cause").UnknownException | Error | import("effect/ParseResult").ParseError, never>;
+    }, import("effect/Cause").UnknownException | import("effect/ParseResult").ParseError | import("../util/getFromNPM.js").GetFromNPMError, never>;
     /**
      * Update Site Configuration
      */
-    siteConfig: (data: import("../../types.js").ConfigFinal<import("../../types.js").StudioCMSSiteConfig>) => Effect.Effect<import("../../types.js").DynamicConfigEntry<import("../../types.js").StudioCMSSiteConfig>, import("@withstudiocms/kysely").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError, never>;
+    siteConfig: (data: import("../../types.js").ConfigFinal<import("../../types.js").StudioCMSSiteConfig>) => Effect.Effect<import("../../types.js").DynamicConfigEntry<import("../../types.js").StudioCMSSiteConfig>, import("@withstudiocms/kysely/client").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError, never>;
     /**
      * Page Operations
      */
@@ -174,11 +174,11 @@ export declare const SDKUpdateModule: Effect.Effect<{
         /**
          * Update Page by ID
          */
-        byId: (pageId: string, data: CombinedPageUpdateData) => Effect.Effect<import("../../types.js").CombinedPageData | undefined, import("effect/ParseResult").ParseError | import("@withstudiocms/kysely").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").QueryParseError | import("@withstudiocms/kysely/core/errors").QueryError | import("@withstudiocms/kysely/core/errors").NotFoundError | import("../util/folderTree.js").FolderTreeError | import("../util/collectors.js").CollectorError | import("../get/index.js").PaginateError, never>;
+        byId: (pageId: string, data: CombinedPageUpdateData) => Effect.Effect<import("../../types.js").CombinedPageData | undefined, import("effect/ParseResult").ParseError | import("@withstudiocms/kysely/client").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").QueryParseError | import("@withstudiocms/kysely/core/errors").QueryError | import("@withstudiocms/kysely/core/errors").NotFoundError | import("../util/folderTree.js").FolderTreeError | import("../util/collectors.js").CollectorError | import("../get/index.js").PaginateError, never>;
         /**
          * Update Page by Slug
          */
-        bySlug: (slug: string, data: CombinedPageUpdateData) => Effect.Effect<import("../../types.js").CombinedPageData | undefined, import("effect/ParseResult").ParseError | import("@withstudiocms/kysely").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError | import("../util/folderTree.js").FolderTreeError | import("../util/collectors.js").CollectorError | import("../get/index.js").PaginateError, never>;
+        bySlug: (slug: string, data: CombinedPageUpdateData) => Effect.Effect<import("../../types.js").CombinedPageData | undefined, import("effect/ParseResult").ParseError | import("@withstudiocms/kysely/client").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError | import("../util/folderTree.js").FolderTreeError | import("../util/collectors.js").CollectorError | import("../get/index.js").PaginateError, never>;
     };
-}, never, DBClientLive | import("../../context.js").SDKDefaults | CacheService | import("@withstudiocms/effect").Deepmerge>;
+}, never, DBClientLive | import("../../context.js").SDKDefaults | import("../../context.js").StorageManagerResolver | CacheService | import("@withstudiocms/effect").Deepmerge>;
 export default SDKUpdateModule;

package/dist/modules/update/index.js

@@ -1,4 +1,7 @@
 import { Effect, Schema } from "@withstudiocms/effect";
+import CacheService from "../../cache.js";
+import { cacheKeyGetters, cacheTags } from "../../consts.js";
+import { DBClientLive } from "../../context.js";
 import {
   StudioCMSPageContent,
   StudioCMSPageData,
@@ -6,10 +9,7 @@ import {
   StudioCMSPageDataTags,
   StudioCMSPageFolderStructure,
   StudioCMSPermissions
-} from "@withstudiocms/kysely";
-import CacheService from "../../cache.js";
-import { cacheKeyGetters, cacheTags } from "../../consts.js";
-import { DBClientLive } from "../../context.js";
+} from "../../tables.js";
 import SDKClearModule from "../clear/index.js";
 import SDKConfigModule from "../config/index.js";
 import SDKGetModule from "../get/index.js";
@@ -25,42 +25,60 @@ const SDKUpdateModule = Effect.gen(function* () {
     encoder: StudioCMSPageContent.Update,
     decoder: StudioCMSPageContent.Select,
     callbackFn: (db, data) => db(
-      (client) => client.updateTable("StudioCMSPageContent").set(data).where("id", "=", data.id).returningAll().executeTakeFirstOrThrow()
+      (client) => client.transaction().execute(async (trx) => {
+        await trx.updateTable("StudioCMSPageContent").set(data).where("id", "=", data.id).executeTakeFirstOrThrow();
+        return await trx.selectFrom("StudioCMSPageContent").selectAll().where("id", "=", data.id).executeTakeFirstOrThrow();
+      })
     )
   });
   const _updateTag = withCodec({
     encoder: StudioCMSPageDataTags.Update,
     decoder: StudioCMSPageDataTags.Select,
     callbackFn: (db, data) => db(
-      (client) => client.updateTable("StudioCMSPageDataTags").set(data).where("id", "=", data.id).returningAll().executeTakeFirstOrThrow()
+      (client) => client.transaction().execute(async (trx) => {
+        await trx.updateTable("StudioCMSPageDataTags").set(data).where("id", "=", data.id).executeTakeFirstOrThrow();
+        return await trx.selectFrom("StudioCMSPageDataTags").selectAll().where("id", "=", data.id).executeTakeFirstOrThrow();
+      })
     )
   });
   const _updateCategory = withCodec({
     encoder: StudioCMSPageDataCategories.Update,
     decoder: StudioCMSPageDataCategories.Select,
     callbackFn: (db, data) => db(
-      (client) => client.updateTable("StudioCMSPageDataCategories").set(data).where("id", "=", data.id).returningAll().executeTakeFirstOrThrow()
+      (client) => client.transaction().execute(async (trx) => {
+        await trx.updateTable("StudioCMSPageDataCategories").set(data).where("id", "=", data.id).executeTakeFirstOrThrow();
+        return await trx.selectFrom("StudioCMSPageDataCategories").selectAll().where("id", "=", data.id).executeTakeFirstOrThrow();
+      })
     )
   });
   const _updatePermission = withCodec({
     encoder: StudioCMSPermissions.Update,
     decoder: StudioCMSPermissions.Select,
     callbackFn: (db, data) => db(
-      (client) => client.updateTable("StudioCMSPermissions").set(data).where("user", "=", data.user).returningAll().executeTakeFirstOrThrow()
+      (client) => client.transaction().execute(async (trx) => {
+        await trx.updateTable("StudioCMSPermissions").set(data).where("user", "=", data.user).executeTakeFirstOrThrow();
+        return await trx.selectFrom("StudioCMSPermissions").selectAll().where("user", "=", data.user).executeTakeFirstOrThrow();
+      })
     )
   });
   const _updateFolderEntry = withCodec({
     encoder: StudioCMSPageFolderStructure.Update,
     decoder: StudioCMSPageFolderStructure.Select,
     callbackFn: (db, data) => db(
-      (client) => client.updateTable("StudioCMSPageFolderStructure").set(data).where("id", "=", data.id).returningAll().executeTakeFirstOrThrow()
+      (client) => client.transaction().execute(async (trx) => {
+        await trx.updateTable("StudioCMSPageFolderStructure").set(data).where("id", "=", data.id).executeTakeFirstOrThrow();
+        return await trx.selectFrom("StudioCMSPageFolderStructure").selectAll().where("id", "=", data.id).executeTakeFirstOrThrow();
+      })
     )
   });
   const _updatePageDataEntry = withCodec({
     encoder: StudioCMSPageData.Update,
     decoder: StudioCMSPageData.Select,
     callbackFn: (db, data) => db(
-      (client) => client.updateTable("StudioCMSPageData").set(data).where("id", "=", data.id).returningAll().executeTakeFirstOrThrow()
+      (client) => client.transaction().execute(async (trx) => {
+        await trx.updateTable("StudioCMSPageData").set(data).where("id", "=", data.id).executeTakeFirstOrThrow();
+        return await trx.selectFrom("StudioCMSPageData").selectAll().where("id", "=", data.id).executeTakeFirstOrThrow();
+      })
     )
   });
   const _findPageDataBySlug = withCodec({

package/dist/modules/util/collectors.d.ts

@@ -1,7 +1,7 @@
 import { Effect, type ParseResult } from '@withstudiocms/effect';
-import { type DBCallbackFailure } from '@withstudiocms/kysely';
+import type { DBCallbackFailure } from '@withstudiocms/kysely/client';
 import type { DatabaseError } from '@withstudiocms/kysely/core/errors';
-import { DBClientLive } from '../../context.js';
+import { DBClientLive, StorageManagerResolver } from '../../context.js';
 import type { CombinedPageData, CombinedUserData, FolderNode, MetaOnlyPageData, tsPageDataSelect } from '../../types.js';
 import { type FolderTreeError } from './folderTree.js';
 declare const CollectorError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => import("effect/Cause").YieldableError & {
@@ -85,155 +85,19 @@ export declare const useCollectorError: <T>(_try: () => T) => Effect.Effect<T, C
  *   SDK modules to obtain normalized, assembled data for pages, users, tags, and categories.
  */
 export declare const SDKCollectors: Effect.Effect<{
-    collectCategories: (input: {
-        readonly [x: number]: number;
-        readonly length: number;
-        toString: {};
-        toLocaleString: {};
-        concat: {};
-        join: {};
-        slice: {};
-        indexOf: {};
-        lastIndexOf: {};
-        every: {};
-        some: {};
-        forEach: {};
-        map: {};
-        filter: {};
-        reduce: {};
-        reduceRight: {};
-        find: {};
-        findIndex: {};
-        entries: {};
-        keys: {};
-        values: {};
-        includes: {};
-        flatMap: {};
-        flat: {};
-        at: {};
-        findLast: {};
-        findLastIndex: {};
-        toReversed: {};
-        toSorted: {};
-        toSpliced: {};
-        with: {};
-        [Symbol.iterator]: {};
-        readonly [Symbol.unscopables]: {
-            readonly [x: number]: boolean | undefined;
-            readonly length?: boolean | undefined;
-            toString?: boolean | undefined;
-            toLocaleString?: boolean | undefined;
-            concat?: boolean | undefined;
-            join?: boolean | undefined;
-            slice?: boolean | undefined;
-            indexOf?: boolean | undefined;
-            lastIndexOf?: boolean | undefined;
-            every?: boolean | undefined;
-            some?: boolean | undefined;
-            forEach?: boolean | undefined;
-            map?: boolean | undefined;
-            filter?: boolean | undefined;
-            reduce?: boolean | undefined;
-            reduceRight?: boolean | undefined;
-            find?: boolean | undefined;
-            findIndex?: boolean | undefined;
-            entries?: boolean | undefined;
-            keys?: boolean | undefined;
-            values?: boolean | undefined;
-            includes?: boolean | undefined;
-            flatMap?: boolean | undefined;
-            flat?: boolean | undefined;
-            at?: boolean | undefined;
-            findLast?: boolean | undefined;
-            findLastIndex?: boolean | undefined;
-            toReversed?: boolean | undefined;
-            toSorted?: boolean | undefined;
-            toSpliced?: boolean | undefined;
-            with?: boolean | undefined;
-            [Symbol.iterator]?: boolean | undefined;
-            readonly [Symbol.unscopables]?: boolean | undefined;
-        };
-    }) => Effect.Effect<readonly {
-        readonly name: string;
+    collectCategories: (input: readonly number[]) => Effect.Effect<readonly {
         readonly id: number;
-        readonly parent: number | null | undefined;
+        readonly name: string;
         readonly description: string;
+        readonly parent?: number | null | undefined;
         readonly slug: string;
         readonly meta: {
             readonly [x: string]: unknown;
         };
     }[], DBCallbackFailure | DatabaseError, never>;
-    collectTags: (input: {
-        readonly [x: number]: number;
-        readonly length: number;
-        toString: {};
-        toLocaleString: {};
-        concat: {};
-        join: {};
-        slice: {};
-        indexOf: {};
-        lastIndexOf: {};
-        every: {};
-        some: {};
-        forEach: {};
-        map: {};
-        filter: {};
-        reduce: {};
-        reduceRight: {};
-        find: {};
-        findIndex: {};
-        entries: {};
-        keys: {};
-        values: {};
-        includes: {};
-        flatMap: {};
-        flat: {};
-        at: {};
-        findLast: {};
-        findLastIndex: {};
-        toReversed: {};
-        toSorted: {};
-        toSpliced: {};
-        with: {};
-        [Symbol.iterator]: {};
-        readonly [Symbol.unscopables]: {
-            readonly [x: number]: boolean | undefined;
-            readonly length?: boolean | undefined;
-            toString?: boolean | undefined;
-            toLocaleString?: boolean | undefined;
-            concat?: boolean | undefined;
-            join?: boolean | undefined;
-            slice?: boolean | undefined;
-            indexOf?: boolean | undefined;
-            lastIndexOf?: boolean | undefined;
-            every?: boolean | undefined;
-            some?: boolean | undefined;
-            forEach?: boolean | undefined;
-            map?: boolean | undefined;
-            filter?: boolean | undefined;
-            reduce?: boolean | undefined;
-            reduceRight?: boolean | undefined;
-            find?: boolean | undefined;
-            findIndex?: boolean | undefined;
-            entries?: boolean | undefined;
-            keys?: boolean | undefined;
-            values?: boolean | undefined;
-            includes?: boolean | undefined;
-            flatMap?: boolean | undefined;
-            flat?: boolean | undefined;
-            at?: boolean | undefined;
-            findLast?: boolean | undefined;
-            findLastIndex?: boolean | undefined;
-            toReversed?: boolean | undefined;
-            toSorted?: boolean | undefined;
-            toSpliced?: boolean | undefined;
-            with?: boolean | undefined;
-            [Symbol.iterator]?: boolean | undefined;
-            readonly [Symbol.unscopables]?: boolean | undefined;
-        };
-    }) => Effect.Effect<readonly {
-        readonly name: string;
+    collectTags: (input: readonly number[]) => Effect.Effect<readonly {
         readonly id: number;
+        readonly name: string;
         readonly description: string;
         readonly slug: string;
         readonly meta: {
@@ -245,17 +109,17 @@ export declare const SDKCollectors: Effect.Effect<{
         (page: tsPageDataSelect, tree: FolderNode[], metaOnly: boolean): Effect.Effect<MetaOnlyPageData, CollectorError | FolderTreeError | DBCallbackFailure | DatabaseError | ParseResult.ParseError, never>;
     };
     collectUserData: (user: {
-        readonly name: string;
         readonly id: string;
-        readonly url: string | null | undefined;
-        readonly email: string | null | undefined;
-        readonly avatar: string | null | undefined;
+        readonly url?: string | null | undefined;
+        readonly name: string;
+        readonly email?: string | null | undefined;
+        readonly avatar?: string | null | undefined;
         readonly username: string;
-        readonly password: string | null | undefined;
+        readonly password?: string | null | undefined;
         readonly updatedAt: Date;
         readonly createdAt: Date;
         readonly emailVerified: boolean;
-        readonly notifications: string | null | undefined;
+        readonly notifications?: string | null | undefined;
     }) => Effect.Effect<CombinedUserData, DBCallbackFailure | DatabaseError, never>;
-}, never, DBClientLive>;
+}, never, DBClientLive | StorageManagerResolver>;
 export {};

package/dist/modules/util/collectors.js

@@ -1,4 +1,6 @@
 import { Data, Effect, Schema } from "@withstudiocms/effect";
+import { DBClientLive, StorageManagerResolver } from "../../context.js";
+import { resolveStorageManagerUrls } from "../../lib/storage-manager.js";
 import {
   StudioCMSOAuthAccounts,
   StudioCMSPageContent,
@@ -6,8 +8,7 @@ import {
   StudioCMSPageDataTags,
   StudioCMSPermissions,
   StudioCMSUsersTable
-} from "@withstudiocms/kysely";
-import { DBClientLive } from "../../context.js";
+} from "../../tables.js";
 import { SDKFolderTree } from "./folderTree.js";
 import { SDKParsers } from "./parsers.js";
 import { slugify } from "./slugify.js";
@@ -18,7 +19,13 @@ const useCollectorError = (_try) => Effect.try({
   catch: (error) => new CollectorError({ cause: error })
 });
 const SDKCollectors = Effect.gen(function* () {
-  const [{ withCodec }, { findNodesAlongPathToId }, { parseIdNumberArray, parseIdStringArray }] = yield* Effect.all([DBClientLive, SDKFolderTree, SDKParsers]);
+  const [
+    { withCodec },
+    { findNodesAlongPathToId },
+    { parseIdNumberArray, parseIdStringArray },
+    smResolver
+  ] = yield* Effect.all([DBClientLive, SDKFolderTree, SDKParsers, StorageManagerResolver]);
+  const resolveUrls = resolveStorageManagerUrls(smResolver);
   const _getUserData = withCodec({
     encoder: Schema.String,
     decoder: Schema.UndefinedOr(StudioCMSUsersTable.Select),
@@ -99,17 +106,37 @@ const SDKCollectors = Effect.gen(function* () {
         const folderPath = urlParts.map(({ name }) => slugify(name)).join("/");
         urlRoute = folderPath.length > 0 ? `/${folderPath}${safeSlug === "/" ? "" : `/${safeSlug}`}` : safeSlug;
       }
-      const returnData = {
-        ...page,
-        slug: safeSlug,
-        urlRoute,
-        categories,
-        tags,
-        authorData,
-        contributorsData,
-        multiLangContent,
-        defaultContent
-      };
+      let authorDataTyped;
+      if (authorData) {
+        const { email, password, ...rest } = authorData;
+        authorDataTyped = {
+          ...rest
+        };
+      }
+      let contributorsDataTyped;
+      if (contributorsData) {
+        contributorsDataTyped = contributorsData.map(({ email, password, ...rest }) => ({
+          ...rest
+        }));
+      }
+      const returnData = yield* resolveUrls(
+        {
+          ...page,
+          urlRoute,
+          categories,
+          tags,
+          authorData: authorDataTyped,
+          contributorsData: contributorsDataTyped,
+          multiLangContent,
+          defaultContent
+        },
+        ["heroImage"]
+      ).pipe(Effect.catchTag("UnknownException", (e) => new CollectorError({ cause: e })));
+      if (!returnData) {
+        return yield* new CollectorError({
+          cause: "Unknown error occurred while resolving storage manager URL"
+        });
+      }
       if (metaOnly) {
         return yield* _transformPageDataToMetaOnly(returnData);
       }

package/dist/modules/util/folderTree.d.ts

@@ -84,9 +84,9 @@ export declare const useFolderTreeError: <T>(_try: () => T) => Effect.Effect<T,
  */
 export declare const SDKFolderTree: Effect.Effect<{
     generateFolderTree: (folders: readonly {
-        readonly name: string;
         readonly id: string;
-        readonly parent: string | null | undefined;
+        readonly name: string;
+        readonly parent?: string | null | undefined;
     }[]) => Effect.Effect<FolderNode[], FolderTreeError, never>;
     getFullPath: (tree: FolderNode[], path: string[]) => Effect.Effect<string[], FolderTreeError, never>;
     findNodeByPath: (tree: FolderNode[], path: string[]) => Effect.Effect<FolderNode | null, FolderTreeError, never>;
@@ -94,7 +94,7 @@ export declare const SDKFolderTree: Effect.Effect<{
     findNodesAlongPathToId: (tree: FolderNode[], id: string) => Effect.Effect<FolderNode[], FolderTreeError, never>;
     findNodeById: (tree: FolderNode[], id: string) => Effect.Effect<FolderNode | null, FolderTreeError, never>;
     addPageToFolderTree: (tree: FolderNode[], folderId: string, newPage: FolderNode) => Effect.Effect<FolderNode[], FolderTreeError, never>;
-    buildFolderTree: Effect.Effect<FolderNode[], import("@withstudiocms/kysely").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError | FolderTreeError, never>;
-    getAvailableFolders: Effect.Effect<FolderListItem[], import("@withstudiocms/kysely").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError, never>;
+    buildFolderTree: Effect.Effect<FolderNode[], import("@withstudiocms/kysely/client").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError | FolderTreeError, never>;
+    getAvailableFolders: Effect.Effect<FolderListItem[], import("@withstudiocms/kysely/client").DBCallbackFailure | import("@withstudiocms/kysely/core/errors").DatabaseError, never>;
 }, never, DBClientLive>;
 export {};

package/dist/modules/util/folderTree.js

@@ -1,6 +1,6 @@
 import { Data, Effect, Schema } from "@withstudiocms/effect";
-import { StudioCMSPageFolderStructure } from "@withstudiocms/kysely";
 import { DBClientLive } from "../../context.js";
+import { StudioCMSPageFolderStructure } from "../../tables.js";
 class FolderTreeError extends Data.TaggedError("FolderTreeError") {
 }
 const useFolderTreeError = (_try) => Effect.try({

package/dist/modules/util/getFromNPM.d.ts

@@ -106,19 +106,19 @@ declare const NpmRegistryResponseSchema_base: Schema.Class<NpmRegistryResponseSc
     }[];
 } & {
     readonly author?: {
-        readonly name: string;
         readonly url: string;
+        readonly name: string;
     } | undefined;
 } & {
     readonly repository?: {
-        readonly type: string;
         readonly url: string;
+        readonly type: string;
         readonly directory?: string | undefined;
     } | undefined;
 } & {
     readonly contributors?: readonly {
-        readonly name: string;
         readonly url?: string | undefined;
+        readonly name: string;
     }[] | undefined;
 } & {
     readonly keywords: readonly string[];
@@ -154,6 +154,14 @@ export declare class NpmRegistryResponseSchema extends NpmRegistryResponseSchema
  * Helper to process and validate the HTTP response from the NPM registry.
  */
 export declare const parseNpmRegistryResponse: (response: Response) => Effect.Effect<NpmRegistryResponseSchema, import("effect/Cause").UnknownException | import("effect/ParseResult").ParseError, never>;
+declare const GetFromNPMError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<A, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }) => import("effect/Cause").YieldableError & {
+    readonly _tag: "GetFromNPMError";
+} & Readonly<A>;
+export declare class GetFromNPMError extends GetFromNPMError_base<{
+    message: string;
+    cause?: unknown;
+}> {
+}
 /**
  * Cache key for NPM package data.
  */
@@ -185,7 +193,7 @@ export declare const GetFromNPM: Effect.Effect<{
     getVersion: (pkg: string, ver?: string | undefined) => Effect.Effect<{
         version: string;
         lastCacheUpdate: Date;
-    }, import("effect/Cause").UnknownException | Error | import("effect/ParseResult").ParseError, never>;
-    getDataFromNPM: (pkg: string, ver?: string | undefined) => Effect.Effect<NpmRegistryResponseSchema, import("effect/Cause").UnknownException | Error | import("effect/ParseResult").ParseError, never>;
+    }, import("effect/Cause").UnknownException | import("effect/ParseResult").ParseError | GetFromNPMError, never>;
+    getDataFromNPM: (pkg: string, ver?: string | undefined) => Effect.Effect<NpmRegistryResponseSchema, import("effect/Cause").UnknownException | import("effect/ParseResult").ParseError | GetFromNPMError, never>;
 }, never, CacheService>;
 export {};

package/dist/modules/util/getFromNPM.js

@@ -1,4 +1,4 @@
-import { Effect, HTTPClient, Schema } from "@withstudiocms/effect";
+import { Data, Effect, HTTPClient, Schema } from "@withstudiocms/effect";
 import { CacheService } from "../../cache.js";
 import { cacheKeyGetters, cacheTags } from "../../consts.js";
 class NpmRegistryResponseSchema extends Schema.Class(
@@ -60,6 +60,8 @@ const parseNpmRegistryResponse = Effect.fn(function* (response) {
   const data = yield* Effect.tryPromise(() => response.json());
   return yield* Schema.decodeUnknown(NpmRegistryResponseSchema)(data);
 });
+class GetFromNPMError extends Data.TaggedError("GetFromNPMError") {
+}
 const cacheKey = cacheKeyGetters.npmPackage;
 const cacheOpts = { tags: cacheTags.npmPackage };
 const GetFromNPM = Effect.gen(function* () {
@@ -67,7 +69,10 @@ const GetFromNPM = Effect.gen(function* () {
   const effectFetch = Effect.fn(
     (url) => Effect.tryPromise({
       try: () => fetch(url),
-      catch: (error) => new Error(`Failed to fetch NPM package data: ${String(error)}`)
+      catch: (error) => new GetFromNPMError({
+        message: `Failed to fetch NPM package data: ${String(error)}`,
+        cause: error
+      })
     })
   );
   const _remapCacheStatusData = (status) => status ? status.lastUpdatedAt : /* @__PURE__ */ new Date();
@@ -93,6 +98,7 @@ const GetFromNPM = Effect.gen(function* () {
 }).pipe(Effect.provide(HTTPClient.Default));
 export {
   GetFromNPM,
+  GetFromNPMError,
   NpmRegistryResponseSchema,
   cacheKey,
   cacheOpts,