@byline/host-tanstack-start 1.2.0 → 1.3.0

package/dist/server-fns/auth/current-user.js

@@ -1,16 +1,13 @@
 import { createServerFn } from "@tanstack/react-start";
 import { AuthError } from "@byline/auth";
-import { getServerConfig } from "@byline/core";
-import { createAdminUsersRepository } from "@byline/db-postgres/admin";
 import { getAdminRequestContext } from "../../auth/auth-context.js";
+import { bylineCore } from "../../integrations/byline-core.js";
 const getCurrentAdminUser = createServerFn({
     method: 'GET'
 }).handler(async ()=>{
     const { actor } = await getAdminRequestContext();
     if (!actor) throw new Error('unexpected null actor after getAdminRequestContext');
-    const db = getServerConfig().db.drizzle;
-    const users = createAdminUsersRepository(db);
-    const row = await users.getById(actor.id);
+    const row = await bylineCore().adminStore?.adminUsers.getById(actor.id);
     if (!row) throw new Error('admin user not found for current session');
     return {
         id: row.id,
@@ -33,9 +30,7 @@ const getCurrentAdminUserSoft = createServerFn({
             throw err;
         }
         if (!actor) return null;
-        const db = getServerConfig().db.drizzle;
-        const users = createAdminUsersRepository(db);
-        const row = await users.getById(actor.id);
+        const row = await bylineCore().adminStore?.adminUsers.getById(actor.id);
         if (!row) return null;
         return {
             id: row.id,

package/dist/server-fns/collections/upload.js

@@ -1,8 +1,8 @@
 import { createServerFn } from "@tanstack/react-start";
 import { ERR_NOT_FOUND, ERR_VALIDATION, getServerConfig, getUploadFields } from "@byline/core";
+import { extractImageMeta, generateImageVariants, isBypassMimeType } from "@byline/core/image";
 import { getLogger, withLogContext } from "@byline/core/logger";
 import { uploadField } from "@byline/core/services";
-import { extractImageMeta, generateImageVariants, isBypassMimeType } from "@byline/storage-local";
 import { getAdminRequestContext } from "../../auth/auth-context.js";
 import { ensureCollection } from "../../integrations/api-utils.js";
 function parseUploadFormData(data) {
@@ -101,12 +101,7 @@ const uploadCollectionField = createServerFn({
             imageProcessor: {
                 extractMeta: extractImageMeta,
                 isBypassMimeType: isBypassMimeType,
-                generateVariants: async ({ buffer, mimeType, storedFile, storage, upload, logger })=>{
-                    if (!('uploadDir' in storage) || 'string' != typeof storage.uploadDir) return [];
-                    const uploadDir = storage.uploadDir;
-                    const absoluteOriginalPath = `${uploadDir}/${storedFile.storagePath}`;
-                    return generateImageVariants(buffer, mimeType, absoluteOriginalPath, uploadDir, upload.sizes ?? [], logger);
-                }
+                generateVariants: ({ buffer, mimeType, storedFile, storage, upload, logger })=>generateImageVariants(buffer, mimeType, storedFile, storage, upload.sizes ?? [], logger)
             }
         };
         return uploadField(ctx, {

package/package.json

@@ -3,7 +3,7 @@
   "private": false,
   "type": "module",
   "license": "MPL-2.0",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "engines": {
     "node": ">=20.9.0"
   },
@@ -101,27 +101,17 @@
     "react-swipeable": "^7.0.2",
     "uuid": "^14.0.0",
     "zod": "^4.4.2",
-    "@byline/admin": "1.2.0",
-    "@byline/client": "1.2.0",
-    "@byline/ui": "1.2.0",
-    "@byline/auth": "1.2.0",
-    "@byline/core": "1.2.0"
+    "@byline/admin": "1.3.0",
+    "@byline/client": "1.3.0",
+    "@byline/ui": "1.3.0",
+    "@byline/core": "1.3.0",
+    "@byline/auth": "1.3.0"
   },
   "peerDependencies": {
     "@tanstack/react-router": "^1.167.0",
     "@tanstack/react-start": "^1.167.0",
     "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "@byline/db-postgres": "1.2.0",
-    "@byline/storage-local": "1.2.0"
-  },
-  "peerDependenciesMeta": {
-    "@byline/db-postgres": {
-      "optional": false
-    },
-    "@byline/storage-local": {
-      "optional": false
-    }
+    "react-dom": "^19.0.0"
   },
   "devDependencies": {
     "@biomejs/biome": "2.4.14",
@@ -138,9 +128,7 @@
     "rimraf": "^6.1.3",
     "typescript": "6.0.3",
     "typescript-plugin-css-modules": "^5.2.0",
-    "vitest": "^4.1.5",
-    "@byline/storage-local": "1.2.0",
-    "@byline/db-postgres": "1.2.0"
+    "vitest": "^4.1.5"
   },
   "publishConfig": {
     "access": "public",

package/src/admin-shell/admin-roles/container.tsx

@@ -29,8 +29,17 @@ import type React from 'react'
 import { useState } from 'react'
 import { useRouter } from '@tanstack/react-router'
 
-import { Button, CloseIcon, Drawer, IconButton, Modal, useToastManager } from '@byline/ui/react'
-import { LocalDateTime, RolePermissions, UpdateRole } from '@byline/ui/react'
+import {
+  Button,
+  CloseIcon,
+  Drawer,
+  IconButton,
+  LocalDateTime,
+  Modal,
+  RolePermissions,
+  UpdateRole,
+  useToastManager,
+} from '@byline/ui/react'
 import cx from 'classnames'
 
 import styles from './container.module.css'

package/src/admin-shell/admin-roles/list.tsx

@@ -29,11 +29,13 @@ import {
   Button,
   CloseIcon,
   Container,
+  CreateAdminRole,
   DraggableSortable,
   Drawer,
   GripperVerticalIcon,
   IconButton,
   LoaderEllipsis,
+  LocalDateTime,
   moveItem,
   PlusIcon,
   Section,
@@ -41,7 +43,6 @@ import {
   useSortable,
   useToastManager,
 } from '@byline/ui/react'
-import { CreateAdminRole, LocalDateTime } from '@byline/ui/react'
 import cx from 'classnames'
 
 import { reorderAdminRoles } from '../../server-fns/admin-roles/reorder.js'

package/src/admin-shell/admin-users/container.tsx

@@ -12,8 +12,19 @@ import type React from 'react'
 import { useState } from 'react'
 import { useRouter } from '@tanstack/react-router'
 
-import { Button, CloseIcon, Drawer, EditIcon, IconButton, Modal, useToastManager } from '@byline/ui/react'
-import { LocalDateTime, SetPassword, UpdateUser, UserRoles } from '@byline/ui/react'
+import {
+  Button,
+  CloseIcon,
+  Drawer,
+  EditIcon,
+  IconButton,
+  LocalDateTime,
+  Modal,
+  SetPassword,
+  UpdateUser,
+  UserRoles,
+  useToastManager,
+} from '@byline/ui/react'
 import cx from 'classnames'
 
 import styles from './container.module.css'

package/src/admin-shell/admin-users/list.tsx

@@ -14,8 +14,10 @@ import { useRouter, useRouterState } from '@tanstack/react-router'
 import {
   CloseIcon,
   Container,
+  CreateAdminUser,
   Drawer,
   IconButton,
+  LocalDateTime,
   PlusIcon,
   Search,
   Section,
@@ -23,7 +25,6 @@ import {
   Table,
   useToastManager,
 } from '@byline/ui/react'
-import { CreateAdminUser, LocalDateTime } from '@byline/ui/react'
 import cx from 'classnames'
 
 import { Link, useNavigate } from '../chrome/loose-router.js'

package/src/admin-shell/collections/create.tsx

@@ -9,8 +9,7 @@
 import { useState } from 'react'
 
 import type { CollectionAdminConfig, CollectionDefinition } from '@byline/core'
-import { Container, Section, useToastManager } from '@byline/ui/react'
-import { FormRenderer } from '@byline/ui/react'
+import { Container, FormRenderer, Section, useToastManager } from '@byline/ui/react'
 
 import { createCollectionDocument } from '../../server-fns/collections/index.js'
 import { useNavigate } from '../chrome/loose-router.js'

package/src/admin-shell/collections/edit.tsx

@@ -11,8 +11,7 @@ import { useState } from 'react'
 import type { CollectionAdminConfig, CollectionDefinition } from '@byline/core'
 import { getDefaultStatus, getWorkflowStatuses } from '@byline/core'
 import type { AnyCollectionSchemaTypes } from '@byline/core/zod-schemas'
-import { Container, Section, useToastManager } from '@byline/ui/react'
-import { FormRenderer } from '@byline/ui/react'
+import { Container, FormRenderer, Section, useToastManager } from '@byline/ui/react'
 
 import {
   deleteDocument,

package/src/admin-shell/collections/history.module.css

@@ -24,7 +24,6 @@
 }
 
 @media (min-width: 40rem) {
-
   .head,
   :global(.byline-coll-history-head) {
     flex-direction: row;
@@ -74,7 +73,6 @@
 }
 
 @media (min-width: 40rem) {
-
   .options,
   :global(.byline-coll-history-options) {
     flex-direction: row;
@@ -197,9 +195,8 @@
 }
 
 @media (min-width: 40rem) {
-
   .pageSize,
   :global(.byline-coll-history-page-size) {
     margin-left: auto;
   }
-}
+}

package/src/admin-shell/collections/history.tsx

@@ -11,8 +11,18 @@ import { useParams, useRouterState } from '@tanstack/react-router'
 
 import type { CollectionAdminConfig, CollectionDefinition, WorkflowStatus } from '@byline/core'
 import type { AnyCollectionSchemaTypes } from '@byline/core/zod-schemas'
-import { Button, CloseIcon, Container, IconButton, Modal, Section, Select, Table } from '@byline/ui/react'
-import { renderFormatted, StatusBadge } from '@byline/ui/react'
+import {
+  Button,
+  CloseIcon,
+  Container,
+  IconButton,
+  Modal,
+  renderFormatted,
+  Section,
+  Select,
+  StatusBadge,
+  Table,
+} from '@byline/ui/react'
 import cx from 'classnames'
 
 import { Link, useNavigate } from '../chrome/loose-router.js'
@@ -75,7 +85,7 @@ function padRows(value: number) {
       key={`empty-row-${
         // biome-ignore lint/suspicious/noArrayIndexKey: we're okay here
         index
-        }`}
+      }`}
       className={cx('byline-coll-history-pad-row', styles.padRow)}
     >
        
@@ -262,15 +272,15 @@ export const HistoryView = ({
                                 >
                                   {column.formatter
                                     ? renderFormatted(
-                                      getColumnValue(document, column.fieldName as string),
-                                      document,
-                                      column.formatter
-                                    )
+                                        getColumnValue(document, column.fieldName as string),
+                                        document,
+                                        column.formatter
+                                      )
                                     : resolveDisplayValue(
-                                      getColumnValue(document, column.fieldName as string),
-                                      locale,
-                                      defaultContentLocale
-                                    ) || '------'}
+                                        getColumnValue(document, column.fieldName as string),
+                                        locale,
+                                        defaultContentLocale
+                                      ) || '------'}
                                 </button>
                               ) : (
                                 <Link
@@ -282,15 +292,15 @@ export const HistoryView = ({
                                 >
                                   {column.formatter
                                     ? renderFormatted(
-                                      getColumnValue(document, column.fieldName as string),
-                                      document,
-                                      column.formatter
-                                    )
+                                        getColumnValue(document, column.fieldName as string),
+                                        document,
+                                        column.formatter
+                                      )
                                     : resolveDisplayValue(
-                                      getColumnValue(document, column.fieldName as string),
-                                      locale,
-                                      defaultContentLocale
-                                    ) || '------'}
+                                        getColumnValue(document, column.fieldName as string),
+                                        locale,
+                                        defaultContentLocale
+                                      ) || '------'}
                                 </Link>
                               )
                             ) : column.formatter ? (

package/src/admin-shell/collections/list.tsx

@@ -16,12 +16,13 @@ import {
   IconButton,
   LoaderRing,
   PlusIcon,
+  renderFormatted,
   Search,
   Section,
   Select,
+  StatusBadge,
   Table,
 } from '@byline/ui/react'
-import { renderFormatted, StatusBadge } from '@byline/ui/react'
 import cx from 'classnames'
 
 import { Link, useNavigate } from '../chrome/loose-router.js'

package/src/routes/create-admin-account-route.tsx

@@ -8,8 +8,7 @@
 
 import { createFileRoute } from '@tanstack/react-router'
 
-import { Container, Section } from '@byline/ui/react'
-import { AccountSelfContainer } from '@byline/ui/react'
+import { AccountSelfContainer, Container, Section } from '@byline/ui/react'
 
 import { BreadcrumbsClient } from '../admin-shell/chrome/breadcrumbs/breadcrumbs-client.js'
 import { type AccountResponse, getAccount } from '../server-fns/admin-account/index.js'

package/src/server-fns/auth/current-user.ts

@@ -21,11 +21,9 @@
 import { createServerFn } from '@tanstack/react-start'
 
 import { type Actor, AuthError } from '@byline/auth'
-import { getServerConfig } from '@byline/core'
-import type { PgAdapter } from '@byline/db-postgres'
-import { createAdminUsersRepository } from '@byline/db-postgres/admin'
 
 import { getAdminRequestContext } from '../../auth/auth-context.js'
+import { bylineCore } from '../../integrations/byline-core.js'
 
 export interface CurrentAdminUser {
   id: string
@@ -57,9 +55,7 @@ export const getCurrentAdminUser = createServerFn({ method: 'GET' }).handler(
       throw new Error('unexpected null actor after getAdminRequestContext')
     }
 
-    const db = (getServerConfig().db as PgAdapter).drizzle
-    const users = createAdminUsersRepository(db)
-    const row = await users.getById(actor.id)
+    const row = await bylineCore().adminStore?.adminUsers.getById(actor.id)
     if (!row) {
       // Session resolved to an admin id that no longer exists — force the
       // caller back through sign-in rather than return partial data.
@@ -97,9 +93,7 @@ export const getCurrentAdminUserSoft = createServerFn({ method: 'GET' }).handler
       }
       if (!actor) return null
 
-      const db = (getServerConfig().db as PgAdapter).drizzle
-      const users = createAdminUsersRepository(db)
-      const row = await users.getById(actor.id)
+      const row = await bylineCore().adminStore?.adminUsers.getById(actor.id)
       if (!row) return null
 
       return {

package/src/server-fns/collections/upload.ts

@@ -8,9 +8,9 @@ import type {
   StoredFileValue,
 } from '@byline/core'
 import { ERR_NOT_FOUND, ERR_VALIDATION, getServerConfig, getUploadFields } from '@byline/core'
+import { extractImageMeta, generateImageVariants, isBypassMimeType } from '@byline/core/image'
 import { getLogger, withLogContext } from '@byline/core/logger'
 import { uploadField as coreUploadField } from '@byline/core/services'
-import { extractImageMeta, generateImageVariants, isBypassMimeType } from '@byline/storage-local'
 
 import { getAdminRequestContext } from '../../auth/auth-context.js'
 import { ensureCollection } from '../../integrations/api-utils.js'
@@ -208,23 +208,15 @@ export const uploadCollectionField = createServerFn({ method: 'POST' })
           imageProcessor: {
             extractMeta: extractImageMeta,
             isBypassMimeType,
-            generateVariants: async ({ buffer, mimeType, storedFile, storage, upload, logger }) => {
-              if (!('uploadDir' in storage) || typeof (storage as any).uploadDir !== 'string') {
-                return []
-              }
-
-              const uploadDir = (storage as any).uploadDir as string
-              const absoluteOriginalPath = `${uploadDir}/${storedFile.storagePath}`
-
-              return generateImageVariants(
+            generateVariants: ({ buffer, mimeType, storedFile, storage, upload, logger }) =>
+              generateImageVariants(
                 buffer,
                 mimeType,
-                absoluteOriginalPath,
-                uploadDir,
+                storedFile,
+                storage,
                 upload.sizes ?? [],
                 logger
-              )
-            },
+              ),
           },
         }