@crombolo/server 0.13.1 → 0.13.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crombolo/server",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "description": "The crombolo HTTP server: routing, configuration, media stores and background jobs.",
   "license": "MIT",
   "author": "Crombolo",
@@ -28,17 +28,17 @@
     "access": "public"
   },
   "dependencies": {
-    "@crombolo/api-delivery": "0.13.1",
-    "@crombolo/api-management": "0.13.1",
-    "@crombolo/assistant": "0.13.1",
-    "@crombolo/auth": "0.13.1",
-    "@crombolo/backoffice-host": "0.13.1",
-    "@crombolo/contracts": "0.13.1",
-    "@crombolo/core": "0.13.1",
-    "@crombolo/data": "0.13.1",
-    "@crombolo/render": "0.13.1",
-    "@crombolo/schema": "0.13.1",
-    "@crombolo/transfer": "0.13.1",
+    "@crombolo/api-delivery": "0.13.2",
+    "@crombolo/api-management": "0.13.2",
+    "@crombolo/assistant": "0.13.2",
+    "@crombolo/auth": "0.13.2",
+    "@crombolo/backoffice-host": "0.13.2",
+    "@crombolo/contracts": "0.13.2",
+    "@crombolo/core": "0.13.2",
+    "@crombolo/data": "0.13.2",
+    "@crombolo/render": "0.13.2",
+    "@crombolo/schema": "0.13.2",
+    "@crombolo/transfer": "0.13.2",
     "@logtape/logtape": "^2.3.8"
   }
 }

package/src/approvals-api.ts

@@ -1,5 +1,5 @@
 /**
- * The Workflow section's and the page tab's reads and actions (story 028),
+ * The Workflows section's and the page tab's reads and actions (story 028),
  * under `<backoffice>/crombolo/api/approvals/`, and saving a workflow drawn in
  * the designer back to `schema/workflows/`. docs/workflows.md.
  *

package/src/approvals.ts

@@ -75,6 +75,7 @@ interface PageFacts {
   name: string
   chain: string[]
   contentTypeAlias: string | undefined
+  variesByCulture: boolean
 }
 
 export interface PageApproval {
@@ -90,6 +91,8 @@ export interface RequestView {
   key: string
   nodeKey: string
   nodeName: string
+  /** The editor's variant segment for the page: `invariant`, or the culture to open. */
+  variant: string
   action: ApprovalAction
   cultures: string[] | null
   state: ApprovalRequest['state']
@@ -181,8 +184,8 @@ export function createApprovals(options: ApprovalsOptions): Approvals {
       .filter((id) => id > 0)
     const rows = await nodes.byIds(ids)
     const keyOf = new Map(rows.map((r) => [r.id, r.key]))
-    const type = await db.query<{ alias: string }>(
-      `SELECT ct.alias FROM content c JOIN content_type ct ON ct.node_id = c.content_type_id WHERE c.node_id = ?`,
+    const type = await db.query<{ alias: string; variations: number }>(
+      `SELECT ct.alias, ct.variations FROM content c JOIN content_type ct ON ct.node_id = c.content_type_id WHERE c.node_id = ?`,
       [node.id],
     )
     return {
@@ -190,6 +193,8 @@ export function createApprovals(options: ApprovalsOptions): Approvals {
       name: node.text ?? node.key,
       chain: ids.flatMap((id) => keyOf.get(id) ?? []),
       contentTypeAlias: type[0]?.alias,
+      // Umbraco's flags: 1 is culture, 2 is segment.
+      variesByCulture: (Number(type[0]?.variations ?? 0) & 1) === 1,
     }
   }
 
@@ -470,10 +475,19 @@ export function createApprovals(options: ApprovalsOptions): Approvals {
           h.userKey === normaliseUuid(principal.id),
       )
     const ownChange = normaliseUuid(principal.id) === request.requestedBy
+    let variant = 'invariant'
+    if (facts?.variesByCulture) {
+      const fallback = await db.query<{ iso_code: string }>(
+        'SELECT iso_code FROM language WHERE is_default = ?',
+        [db.dialect.boolValue(true)],
+      )
+      variant = request.cultures?.[0] ?? fallback[0]?.iso_code ?? 'invariant'
+    }
     return {
       key: request.key,
       nodeKey: request.nodeKey,
       nodeName: facts?.name ?? request.nodeKey,
+      variant,
       action: request.action,
       cultures: request.cultures,
       state: request.state,
@@ -563,6 +577,7 @@ export function createApprovals(options: ApprovalsOptions): Approvals {
         name: 'This page',
         chain: parent?.chain ?? [],
         contentTypeAlias: type[0]?.alias,
+        variesByCulture: false,
       }
       return refusalFor(principal, facts, await covering(facts), 'publish')
     },

package/src/config.ts

@@ -618,4 +618,4 @@ export function describeDatabase(
   }
 }
 
-export const VERSION = '0.13.1'
+export const VERSION = '0.13.2'

package/src/marketplace.ts

@@ -17,6 +17,7 @@
  * browser cannot reach npm, and the backoffice keeps making same-origin
  * requests only.
  */
+import { readFileSync } from 'node:fs'
 import { join } from 'node:path'
 import {
   type BundlePackage,
@@ -57,6 +58,10 @@ export interface InstalledListing {
   wired: boolean
   /** The version whose content was applied here, or null when none has been. */
   contentApplied: string | null
+  /** What the package says it is, from its `package.json`; empty when it says nothing. */
+  description: string
+  /** The crombolo releases it is written for. */
+  peerRange: string
 }
 
 /** What became of the content half of an install. */
@@ -308,6 +313,8 @@ export function createMarketplace(options: MarketplaceOptions): Marketplace {
           carries: bundle.carries,
           wired: wired.has(bundle.id),
           contentApplied: (await options.contentApplied?.(bundle.packageName)) ?? null,
+          description: descriptionOf(bundle.directory),
+          peerRange: bundle.peerRange,
         })),
       )
     },
@@ -386,6 +393,18 @@ export function createMarketplace(options: MarketplaceOptions): Marketplace {
   }
 }
 
+/** A package's own description, read leniently: anything unreadable is none. */
+function descriptionOf(directory: string): string {
+  try {
+    const json = JSON.parse(readFileSync(join(directory, 'package.json'), 'utf8')) as {
+      description?: unknown
+    }
+    return typeof json.description === 'string' ? json.description : ''
+  } catch {
+    return ''
+  }
+}
+
 /** What a site that does not install at runtime says instead, with what to do. */
 function refusedHere(name: string, verb: 'add' | 'remove'): InstallOutcome {
   return {

package/src/server.ts

@@ -1467,7 +1467,7 @@ export async function createServer(config: CromboloConfig = loadConfig()): Promi
     }
 
     // Non-contract: approval workflows (story 028) — the page's Workflow tab, the
-    // Workflow section and its designer. Content or Workflow, as either screen is.
+    // Workflows section and its designer. Content or Workflows, as either screen is.
     if (pathname.startsWith(`${paths.pluginPath}/api/approvals/`)) {
       const principal = await authenticate(request)
       if (!principal) return new Response('Unauthorized', { status: 401 })