fix: unit tests

@fiction/core/utils/test/nodeTools.ci.test.ts

@@ -54,7 +54,7 @@ describe('node utils', () => {
 
     expect(Object.keys(service).sort()).toMatchInlineSnapshot(`
       [
-        "fictionAdmin",
+        "fictionAi",
         "fictionApp",
         "fictionAppSites",
         "fictionAws",
@@ -66,6 +66,7 @@ describe('node utils', () => {
         "fictionRouter",
         "fictionRouterSites",
         "fictionServer",
+        "fictionSites",
         "fictionTeam",
         "fictionUi",
         "fictionUser",

@fiction/site/el/InputAi.vue

@@ -5,11 +5,11 @@ import ElForm from '@fiction/ui/ElForm.vue'
 import ElButton from '@fiction/ui/ElButton.vue'
 import InputText from '@fiction/ui/InputText.vue'
 import InputCheckbox from '@fiction/ui/InputCheckbox.vue'
-import type { Site } from '@fiction/site'
 import type { InputOptionGeneration } from '@fiction/ui'
 import TransitionSlide from '@fiction/ui/TransitionSlide.vue'
 import ElModal from '@fiction/ui/ElModal.vue'
 import ElProgress from '@fiction/ui/ElProgress.vue'
+import type { Site } from '../site'
 
 const props = defineProps({
   modelValue: { type: String, default: '' },

@fiction/site/el/fig/FigSite.vue

@@ -1,7 +1,7 @@
 <script lang='ts' setup>
-import type { Site } from '@fiction/site/site'
 import type { vue } from '@fiction/core'
 import ElBrowserFrameDevice from '@fiction/ui/ElBrowserFrameDevice.vue'
+import type { Site } from '../../../site'
 import FigSite from './img/figSite.svg'
 import FigSiteMobile from './img/figSiteMobile.svg'
 

@fiction/site/index.ts

@@ -114,7 +114,7 @@ export class FictionSites extends FictionPlugin<SitesPluginSettings> {
       const finalSelectorType = selectorType || (siteId ? 'site' : subDomain ? 'domain' : themeId ? 'theme' : 'none')
       const finalSelectorId = selectorId || siteId || subDomain || themeId || 'none'
 
-      return `${this.settings.adminBaseRoute}/preview/${finalSelectorType}/${finalSelectorId}`
+      return `${this.adminBaseRoute}/preview/${finalSelectorType}/${finalSelectorId}`
     })
   }
 }

@fiction/site/package.json

@@ -14,6 +14,11 @@
     "tailwindcss": "^3.4.3",
     "vue": "^3.4.21"
   },
+  "devDependencies": {
+    "@fiction/theme-admin": "workspace:*",
+    "@fiction/theme-fiction": "workspace:*",
+    "@fiction/theme-minimal": "workspace:*"
+  },
   "gitHead": "b257411e1c6c32b52b444cc6f1518bf1bee1e480",
   "license": "GPL-2.0-only",
   "main": "index.ts",

@fiction/site/routes.ts

@@ -5,7 +5,7 @@ export function getRoutes(args: SitesQuerySettings) {
   return [
     new AppRoute({
       name: `sitePreview`,
-      path: `${args.fictionSites.settings.adminBaseRoute}/preview/:selectorType/:selectorId/:viewId?/:itemId?`,
+      path: `${args.fictionSites.adminBaseRoute}/preview/:selectorType/:selectorId/:viewId?/:itemId?`,
       component: () => import('./el/ViewPreview.vue'),
       priority: 20,
     }),

@fiction/site/test/cert.ci.test.ts

@@ -9,7 +9,7 @@ import { createSiteTestUtils } from './siteTestUtils'
 let testUtils: SiteTestUtils
 describe('manageCertificates', () => {
   const hostname = 'example.com'
-  const maskedKeys = ['id', 'dnsValidationInstructions', 'dnsValidationTarget']
+  const maskedKeys = ['id', 'dnsValidationInstructions', 'dnsValidationTarget', 'issued', 'nodes']
   beforeAll(async () => {
     testUtils = createSiteTestUtils()
     await testUtils.init()
@@ -38,7 +38,7 @@ describe('manageCertificates', () => {
         "hostname": "test-site.fiction.cx",
         "id": "**MASKED**",
         "issued": {
-          "nodes": "[object Object],[object Object]",
+          "nodes": "**MASKED**",
         },
         "source": "fly",
       }
@@ -102,7 +102,7 @@ describe('manageCertificates', () => {
         "hostname": "example.com",
         "id": "**MASKED**",
         "issued": {
-          "nodes": "",
+          "nodes": "**MASKED**",
         },
         "source": "fly",
       }

@fiction/site/test/load.ci.test.ts

@@ -284,7 +284,7 @@ describe('site plugin tests', async () => {
 
   it('should load a site by themeId', async (ctx) => {
     const themeId = 'test'
-    await testUtils.fictionRouter.push(`${testUtils.fictionSites.settings.adminBaseRoute}/preview/theme/${themeId}/`, { caller: ctx.task.name })
+    await testUtils.fictionRouter.push(`${testUtils.fictionSites.adminBaseRoute}/preview/theme/${themeId}/`, { caller: ctx.task.name })
 
     const { selectorType, selectorId } = testUtils.fictionRouter.params.value as Record<string, string>
     const mountContext = getMountContext({ selectorType, selectorId, siteMode: 'standard' })
@@ -299,7 +299,7 @@ describe('site plugin tests', async () => {
 
   it('should load a site by siteId extracted from URL', async (ctx) => {
     const siteId = site.siteId
-    await testUtils.fictionRouter.push(`${testUtils.fictionSites.settings.adminBaseRoute}/preview/site/${siteId}/`, { caller: ctx.task.name })
+    await testUtils.fictionRouter.push(`${testUtils.fictionSites.adminBaseRoute}/preview/site/${siteId}/`, { caller: ctx.task.name })
 
     const { selectorType, selectorId } = testUtils.fictionRouter.params.value as Record<string, string>
     const mountContext = getMountContext({ selectorType, selectorId, siteMode: 'standard' })

@fiction/site/test/preview.ci.test.ts

@@ -39,15 +39,15 @@ describe('sitePreview', async () => {
     const cur = () => r.current.value
     const previewPath = () => testUtils.fictionSites.getPreviewPath().value
 
-    const orgBase = testUtils.fictionAdmin.adminBaseOrgPath.value
+    const orgBase = testUtils.fictionSites.adminBaseRoute
     const siteEdit = `${orgBase}/siteEdit`
 
-    await r.push(`/admin/preview/theme/minimal`, { caller: ctx.task.name })
+    await r.push(`/admin/preview/theme/test`, { caller: ctx.task.name })
 
     expect(cur().params).toMatchInlineSnapshot(`
       {
         "itemId": "",
-        "selectorId": "minimal",
+        "selectorId": "test",
         "selectorType": "theme",
         "viewId": "",
       }
@@ -63,15 +63,15 @@ describe('sitePreview', async () => {
 
     expect(previewPath()).toMatchInlineSnapshot(`"/admin/preview/site/554433"`)
 
-    await r.push(`${siteEdit}?themeId=minimal`, { caller: ctx.task.name })
+    await r.push(`${siteEdit}?themeId=test`, { caller: ctx.task.name })
 
     expect(cur().query).toMatchInlineSnapshot(`
       {
-        "themeId": "minimal",
+        "themeId": "test",
       }
     `)
 
-    expect(previewPath()).toMatchInlineSnapshot(`"/admin/preview/theme/minimal"`)
+    expect(previewPath()).toMatchInlineSnapshot(`"/admin/preview/theme/test"`)
 
     await r.push(`${siteEdit}?subDomain=test-sub-domain`, { caller: ctx.task.name })
 
@@ -99,7 +99,7 @@ describe('sitePreview', async () => {
     const result = await requestManageSite(
       {
         _action: 'create',
-        fields: { title: 'test', themeId: 'minimal', subDomain },
+        fields: { title: 'test', themeId: 'test', subDomain },
         caller: ctx.task.name,
         ...common,
       },
@@ -115,15 +115,15 @@ describe('sitePreview', async () => {
 
     const html = await snapshotHtml(mountEl.innerHTML, { hideTags: ['svg'], maskIds: false })
 
-    expect(html).toContain('data-theme-id="minimal"')
+    expect(html).toContain('data-theme-id="test"')
     expect(html).toContain(`data-site-id="${site?.siteId}"`)
 
     await r.push(`/admin/preview/domain/${site?.subDomain.value}`, { caller: ctx.task.name })
 
     await waitFor(300)
 
     const html2 = await snapshotHtml(mountEl.innerHTML, { hideTags: ['svg'], maskIds: false })
-    expect(html2).toContain('data-theme-id="minimal"')
+    expect(html2).toContain('data-theme-id="test"')
     expect(html2).toContain(`data-site-id="${site?.siteId}"`)
     expect(html2).toContain(`data-sub-domain="${site?.subDomain.value}"`)
   }, 10000)

@fiction/site/test/siteRequest.ci.test.ts

@@ -26,7 +26,7 @@ describe('siteLoading', async () => {
 
     const subDomain = shortId()
     const title = 'test'
-    const themeId = 'fiction'
+    const themeId = 'test'
 
     const result = await requestManageSite(
       {

@fiction/site/test/siteTestUtils.ts

@@ -6,7 +6,7 @@ import type { FictionAdmin } from '@fiction/plugin-admin'
 import { testEnvFile } from '@fiction/core/test-utils'
 import { FictionSites } from '..'
 import FSite from '../engine/FSite.vue'
-import { setup as testThemeSetup } from './test-theme'
+import * as testTheme from './test-theme'
 
 export type SiteTestUtils = TestUtils & {
   fictionAdmin: FictionAdmin
@@ -62,7 +62,7 @@ export function createSiteTestUtils(args: { mainFilePath?: string, context?: 'no
     localHostname: '*.lan.com',
   })
 
-  out.fictionSites = new FictionSites({ ...(out as SiteTestUtils), flyIoApiToken, flyIoAppId, themes: [testThemeSetup(out)] })
+  out.fictionSites = new FictionSites({ ...(out as SiteTestUtils), flyIoApiToken, flyIoAppId, themes: [testTheme.setup(out)] })
 
   out.fictionEnv.log.info('sites test utils created')
 

@fiction/site/utils/frame.ts

@@ -27,7 +27,7 @@ export class SiteFrameTools extends FictionObject<SiteFrameUtilityParams> {
   }
 
   previewFrameUrl = vue.computed(() => {
-    const s = this.site.fictionSites.settings
+    const s = this.site.fictionSites
     return `${s.adminBaseRoute}/preview/site/${this.site.siteId}${this.framePath.value}`
   })
 

@fiction/site/utils/test/frame.ci.test.ts

@@ -9,7 +9,8 @@ describe('previewUrl', async () => {
   it('should return the preview URL for the site', async () => {
     const site = new Site({ ...common, isProd: true, subDomain: 'sub' })
 
-    expect(site.frame.previewFrameUrl.value).toBe(`${site.fictionSites.settings.adminBaseRoute}/preview/site/${site.siteId}`)
+    expect(site.fictionSites.adminBaseRoute).toMatchInlineSnapshot(`"/admin"`)
+    expect(site.frame.previewFrameUrl.value).toBe(`${site.fictionSites.adminBaseRoute}/preview/site/${site.siteId}`)
   })
 })
 

@fiction/site/utils/test/layout.ci.test.ts

@@ -4,7 +4,7 @@
 
 import { beforeAll, describe, expect, it } from 'vitest'
 import { JSDOM } from 'jsdom'
-import { Card } from '@fiction/site/card'
+import { Card } from '../../card'
 import { Site } from '../../site'
 import type { LayoutOrder } from '../layout'
 import { getOrderRecursive, getSimpleOrderSchema, layoutOrderCards, setLayoutOrder } from '../layout'

@fiction/site/utils/test/page.ci.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it, vi } from 'vitest'
 import { vue, waitFor } from '@fiction/core'
 import { createSiteTestUtils } from '../../test/siteTestUtils'
-import { Card } from '@fiction/site/card'
+import { Card } from '../../card'
 import { activePageId, getPageById, getViewMap } from '../page'
 import { Site } from '../../site'
 

@fiction/site/utils/test/region.ci.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, it } from 'vitest'
 import { waitFor } from '@fiction/core'
 import { requestManageSite } from '../../load'
-import { Card } from '@fiction/site/card'
+import { Card } from '../../card'
 import type { CardConfigPortable, TableCardConfig } from '../../tables'
 import { Site } from '../../site'
 import { createSiteTestUtils } from '../../test/siteTestUtils'

@fiction/www/test/entryConfig.ci.test.ts

@@ -26,7 +26,8 @@ describe('user config', () => {
         "fictionRouterSites",
         "fictionAws",
         "fictionMedia",
-        "fictionAdmin",
+        "fictionAi",
+        "fictionSites",
         "fictionTeam",
         "fictionUi",
       ]
@@ -64,13 +65,13 @@ describe('user config', () => {
           "ManageVectors",
           "AiCompletion",
           "AiImage",
-          "OrgMembers",
-          "TeamInvite",
-          "SeekInviteFromUser",
           "ManageSite",
           "ManageIndex",
           "ManagePage",
           "ManageCert",
+          "OrgMembers",
+          "TeamInvite",
+          "SeekInviteFromUser",
         ]
       `)