zazuko · tpluscode · Nov 8, 2024 · Nov 7, 2024 · Nov 7, 2024 · Nov 7, 2024
diff --git a/.changeset/many-dolphins-kick.md b/.changeset/many-dolphins-kick.md
@@ -0,0 +1,5 @@
+---
+"@kopflos-cms/vite": patch
+---
+
+The plugin populates a variable `VITE.basePath` which will be resolved to the correct path in development and production mode
diff --git a/.changeset/olive-carrots-fetch.md b/.changeset/olive-carrots-fetch.md
@@ -0,0 +1,5 @@
+---
+"@kopflos-labs/html-template": patch
+---
+
+By default, pass Core Representation of the page resource to template func
diff --git a/.changeset/rotten-cameras-check.md b/.changeset/rotten-cameras-check.md
@@ -0,0 +1,5 @@
+---
+"@kopflos-cms/core": patch
+---
+
+Added `env.kopflos.variables` to allow accessing and setting variables
diff --git a/.changeset/unlucky-suns-sniff.md b/.changeset/unlucky-suns-sniff.md
@@ -0,0 +1,5 @@
+---
+"@kopflos-cms/vite": patch
+---
+
+Serve the entire UI build statically. Before, `public` vite resources would not be accessible 
diff --git a/example/kopflos.config.ts b/example/kopflos.config.ts
@@ -10,9 +10,6 @@ export default <KopflosConfig> {
       updateUrl: 'http://localhost:7878/update',
     },
   },
-  variables: {
-    uiRoot: 'ui',
-  },
   plugins: {
     '@kopflos-cms/plugin-deploy-resources': {
       paths: ['resources', 'resources.dev'],

diff --git a/example/package.json b/example/package.json
@@ -7,7 +7,7 @@
     "build": "kopflos build",
     "start": "kopflos serve --mode development --trust-proxy",
     "prestart:prod": "npm run build",
-    "start:prod": "kopflos serve --trust-proxy --variable uiRoot=dist"
+    "start:prod": "kopflos serve --trust-proxy"
   },
   "dependencies": {
     "@kopflos-cms/vite": "0.0.1-beta.1",

diff --git a/example/resources/api/index.ttl b/example/resources/api/index.ttl
@@ -36,7 +36,7 @@ PREFIX kl: <https://kopflos.described.at/>
           [
             a code:EcmaScriptModule ;
             code:link <node:@kopflos-cms/serve-file#default> ;
-            code:arguments ( "${uiRoot}/${type}.html"^^code:EcmaScriptTemplateLiteral ) ;
+            code:arguments ( "${VITE.basePath}/${type}.html"^^code:EcmaScriptTemplateLiteral ) ;
           ]
           [
             a code:EcmaScriptModule ;

diff --git a/example/public/foo.txt → example/ui/public/foo.txt b/example/public/foo.txt → example/ui/public/foo.txt
diff --git a/labs/html-template/index.ts b/labs/html-template/index.ts
@@ -23,7 +23,7 @@ export default function bindTemplate<A extends unknown[] = unknown[]>(evaluateTe
       return new Error('Template handler must be chained after another which returns a HTML response')
     }
 
-    let dataset: DatasetCore | undefined
+    let dataset: DatasetCore = context.subject.dataset
 
     if (fetchData) {
       const templateData = fetchData(...args)(context)

diff --git a/labs/html-template/test/__snapshots__/index.test.ts.snap b/labs/html-template/test/__snapshots__/index.test.ts.snap
@@ -9,3 +9,8 @@ exports[`@kopflos-labs/html-template fetches data with given arguments 1`] = `
 "_:c14n0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Foo> .
 "
 `;
+
+exports[`@kopflos-labs/html-template uses core representation a default template data 1`] = `
+"<> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.com/Foo> .
+"
+`;
diff --git a/labs/html-template/test/index.test.ts b/labs/html-template/test/index.test.ts
@@ -10,6 +10,37 @@ import bindTemplate from '../index.js'
 describe('@kopflos-labs/html-template', () => {
   use(snapshots)
 
+  it('uses core representation a default template data', async () => {
+    // given
+    const templateFunc = sinon.stub()
+    const context = {
+      subject: rdf.clownface()
+        .namedNode('')
+        .addOut(rdf.ns.rdf.type, rdf.namedNode('http://example.com/Foo')),
+      env: createEnv({
+        baseIri: 'http://example.com/',
+        sparql: {
+          default: 'http://example.com/query',
+        },
+      }),
+    } as HandlerArgs
+    const previousResponse = {
+      status: 200,
+      body: '<html><body><template target-class="Foo"></template></body></html>',
+      headers: {
+        'Content-Type': 'text/html',
+      },
+    }
+
+    // when
+    const handler = bindTemplate(templateFunc)
+    await handler(context, previousResponse)
+
+    // then
+    const templateData: AnyPointer = templateFunc.firstCall.args[1].pointer
+    expect(templateData.dataset).canonical.toMatchSnapshot()
+  })
+
   it('fetches data with given arguments', async () => {
     // given
     const templateFunc = sinon.stub()
@@ -20,6 +51,7 @@ describe('@kopflos-labs/html-template', () => {
         .dataset
     })
     const context = {
+      subject: rdf.clownface().namedNode(''),
       env: createEnv({
         baseIri: 'http://example.com/',
         sparql: {
@@ -55,6 +87,7 @@ describe('@kopflos-labs/html-template', () => {
         .dataset.toStream()
     })
     const context = {
+      subject: rdf.clownface().namedNode(''),
       env: createEnv({
         baseIri: 'http://example.com/',
         sparql: {

diff --git a/packages/core/lib/env/KopflosFactory.ts b/packages/core/lib/env/KopflosFactory.ts
@@ -3,15 +3,21 @@ import type { KopflosConfig } from '../Kopflos.js'
 export interface KopflosFactory {
   readonly kopflos: {
     readonly config: KopflosConfig
+    readonly variables: Record<string, unknown>
   }
 }
 
-export default (config: KopflosConfig) => class implements KopflosFactory {
-  get kopflos() {
-    return {
-      config: Object.freeze(config),
+export default (config: KopflosConfig) => {
+  const variables = config.variables || {}
+
+  return class implements KopflosFactory {
+    get kopflos() {
+      return {
+        config: Object.freeze(config),
+        variables,
+      }
     }
-  }
 
-  static exports = ['kopflos']
+    static exports = ['kopflos']
+  }
 }
diff --git a/packages/core/lib/handler.ts b/packages/core/lib/handler.ts
@@ -54,7 +54,7 @@ export const loadHandlers: HandlerLookup = ({ resourceShape, ...rest }: Resource
     .out(env.ns.kopflos.handler)
     .filter(matchingMethod(env, method))
 
-  const vars = new Map(Object.entries(env.kopflos.config.variables || {}))
+  const vars = new Map(Object.entries(env.kopflos.variables))
   if ('subjectVariables' in rest) {
     for (const [k, v] of rest.subjectVariables) {
       vars.set(k, v)

diff --git a/packages/core/test/lib/env/SparqlClientFactory.test.ts b/packages/core/test/lib/env/SparqlClientFactory.test.ts
@@ -23,6 +23,7 @@ describe('lib/env/SparqlClientFactory', () => {
                 default: 'http://example.com/sparql',
               },
             },
+            variables: {},
           }
         }
       }
@@ -63,6 +64,7 @@ describe('lib/env/SparqlClientFactory', () => {
                 },
               },
             },
+            variables: {},
           }
         }
       }
@@ -112,6 +114,7 @@ describe('lib/env/SparqlClientFactory', () => {
                 },
               },
             },
+            variables: {},
           }
         }
       }
@@ -148,6 +151,7 @@ describe('lib/env/SparqlClientFactory', () => {
 
             get kopflos() {
               return {
+                variables: {},
                 config: {
                   baseIri: 'http://example.com/',
                   sparql: {

diff --git a/packages/vite/index.ts b/packages/vite/index.ts
@@ -1,5 +1,5 @@
 import { resolve } from 'node:path'
-import type { KopflosPlugin } from '@kopflos-cms/core'
+import type { Kopflos, KopflosPlugin } from '@kopflos-cms/core'
 import express from 'express'
 import { build } from 'vite'
 import { createViteServer } from './lib/server.js'
@@ -22,17 +22,26 @@
 }
 
 export default function ({ outDir = 'dist', ...options }: Options): KopflosPlugin {
+  const rootDir = resolve(process.cwd(), options.root || '')
+  const buildDir = resolve(process.cwd(), outDir)
+
   return {
+    onStart({ env }: Kopflos): Promise<void> | void {
+      const viteVars = {
+        basePath: env.kopflos.config.mode === 'development' ? rootDir : buildDir,
+      }
+      log.info('Variables', viteVars)
+      env.kopflos.variables.VITE = Object.freeze(viteVars)
+    },
     async beforeMiddleware(host: express.Router, { env }) {
       if (env.kopflos.config.mode === 'development') {
         log.info('Development UI mode. Creating Vite server...')
         const viteServer = await createViteServer(options)
         host.use(viteServer.middlewares)
       } else {
         log.info('Serving UI from build directory')
-        const buildDir = resolve(process.cwd(), outDir)
         log.debug('Build directory:', buildDir)
-        host.use('/assets', express.static(resolve(buildDir, 'assets')))
+        host.use(express.static(buildDir))
       }
     },
     async build() {