uniweb 0.13.17 → 0.14.0

package/src/utils/registry-orgs.js

@@ -34,7 +34,9 @@ const HANDLE_RE = /^[a-z0-9][a-z0-9-]{1,37}[a-z0-9]$/
 
 /** Strip a leading `@` and any `/suffix`, returning the bare handle segment. */
 export function bareHandle(scope) {
-  return String(scope || '').replace(/^@/, '').replace(/\/.*$/, '')
+  return String(scope || '')
+    .replace(/^@/, '')
+    .replace(/\/.*$/, '')
 }
 
 /**
@@ -57,14 +59,17 @@ export function validateHandle(handle) {
  */
 export async function fetchOrgs({ apiBase, token }) {
   const res = await fetch(`${apiBase.replace(/\/$/, '')}${ORGS_PATH}`, {
-    headers: { Authorization: `Bearer ${token}` },
+    headers: { Authorization: `Bearer ${token}` }
   })
-  if (!res.ok) throw new Error(`Could not list your orgs: HTTP ${res.status} ${res.statusText}`)
+  if (!res.ok)
+    throw new Error(
+      `Could not list your orgs: HTTP ${res.status} ${res.statusText}`
+    )
   const data = await res.json().catch(() => null)
   return {
     account_handle: data?.account_handle ?? null,
     personal_org_exists: data?.personal_org_exists === true,
-    orgs: Array.isArray(data?.orgs) ? data.orgs : [],
+    orgs: Array.isArray(data?.orgs) ? data.orgs : []
   }
 }
 
@@ -82,8 +87,11 @@ export async function createOrg({ apiBase, token, handle }) {
   const h = bareHandle(handle)
   const res = await fetch(`${apiBase.replace(/\/$/, '')}${ORGS_PATH}`, {
     method: 'POST',
-    headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
-    body: JSON.stringify({ handle: h }),
+    headers: {
+      'Content-Type': 'application/json',
+      Authorization: `Bearer ${token}`
+    },
+    body: JSON.stringify({ handle: h })
   })
   if (res.ok) return res.json()
 
@@ -93,11 +101,15 @@ export async function createOrg({ apiBase, token, handle }) {
   try {
     const body = await res.json()
     detail = body?.detail || ''
-  } catch { /* non-JSON body — keep the generic line */ }
+  } catch {
+    /* non-JSON body — keep the generic line */
+  }
   const fallback =
-    res.status === 409 ? `@${h} is not available.`
-    : res.status === 422 ? `@${h} is not a valid handle.`
-    : `Could not create @${h}: HTTP ${res.status}`
+    res.status === 409
+      ? `@${h} is not available.`
+      : res.status === 422
+        ? `@${h} is not a valid handle.`
+        : `Could not create @${h}: HTTP ${res.status}`
   const e = new Error(detail || fallback)
   e.status = res.status
   throw e
@@ -118,10 +130,17 @@ export async function createOrg({ apiBase, token, handle }) {
  * @param {string[]} [p.args] - argv slice; checked for --non-interactive
  * @returns {Promise<string|null>}
  */
-export async function deriveScope({ apiBase, token, accountHandle = null, args = [] }) {
+export async function deriveScope({
+  apiBase,
+  token,
+  accountHandle = null,
+  args = []
+}) {
   const envelope = await fetchOrgs({ apiBase, token })
   const { orgs } = envelope
-  const personal = envelope.account_handle || (accountHandle ? bareHandle(accountHandle) : null)
+  const personal =
+    envelope.account_handle ||
+    (accountHandle ? bareHandle(accountHandle) : null)
   const personalOrgExists = envelope.personal_org_exists
   const { isNonInteractive } = await import('./interactive.js')
   const nonInteractive = isNonInteractive(args)
@@ -131,15 +150,30 @@ export async function deriveScope({ apiBase, token, accountHandle = null, args =
     const h = orgs[0].handle
     const label = isPersonal(h) ? `your personal org @${h}` : `your org @${h}`
     if (nonInteractive) {
-      console.log(`Publishing under ${label.replace(`@${h}`, `\x1b[1m@${h}\x1b[0m`)}.`)
+      console.log(
+        `Publishing under ${label.replace(`@${h}`, `\x1b[1m@${h}\x1b[0m`)}.`
+      )
       return h
     }
     const prompts = (await import('prompts')).default
-    const { ok } = await prompts({
-      type: 'confirm', name: 'ok', message: `Publish under ${label}?`, initial: true,
-    }, { onCancel: () => { console.log('\nCancelled.'); process.exit(0) } })
+    const { ok } = await prompts(
+      {
+        type: 'confirm',
+        name: 'ok',
+        message: `Publish under ${label}?`,
+        initial: true
+      },
+      {
+        onCancel: () => {
+          console.log('\nCancelled.')
+          process.exit(0)
+        }
+      }
+    )
     if (!ok) {
-      console.log('Pass --scope @org, or create another with `uniweb org create <handle>`.')
+      console.log(
+        'Pass --scope @org, or create another with `uniweb org create <handle>`.'
+      )
       return null
     }
     return h
@@ -147,32 +181,54 @@ export async function deriveScope({ apiBase, token, accountHandle = null, args =
 
   if (orgs.length > 1) {
     // Personal org first; the rest in server order (primary-first).
-    const ordered = [...orgs].sort((a, b) => (isPersonal(b.handle) ? 1 : 0) - (isPersonal(a.handle) ? 1 : 0))
+    const ordered = [...orgs].sort(
+      (a, b) => (isPersonal(b.handle) ? 1 : 0) - (isPersonal(a.handle) ? 1 : 0)
+    )
     if (nonInteractive) {
-      const pick = ordered.find((u) => isPersonal(u.handle)) || orgs.find((u) => u.is_primary) || orgs[0]
-      console.log(`Multiple orgs; using \x1b[1m@${pick.handle}\x1b[0m (non-interactive).`)
+      const pick =
+        ordered.find((u) => isPersonal(u.handle)) ||
+        orgs.find((u) => u.is_primary) ||
+        orgs[0]
+      console.log(
+        `Multiple orgs; using \x1b[1m@${pick.handle}\x1b[0m (non-interactive).`
+      )
       return pick.handle
     }
     const prompts = (await import('prompts')).default
-    const { choice } = await prompts({
-      type: 'select',
-      name: 'choice',
-      message: 'Publish under which org?',
-      choices: ordered.map((u) => ({
-        title: `@${u.handle}${isPersonal(u.handle) ? ' — your personal org' : u.is_primary ? ' (primary)' : ''}`,
-        value: u.handle,
-      })),
-      initial: 0,
-    }, { onCancel: () => { console.log('\nCancelled.'); process.exit(0) } })
+    const { choice } = await prompts(
+      {
+        type: 'select',
+        name: 'choice',
+        message: 'Publish under which org?',
+        choices: ordered.map((u) => ({
+          title: `@${u.handle}${isPersonal(u.handle) ? ' — your personal org' : u.is_primary ? ' (primary)' : ''}`,
+          value: u.handle
+        })),
+        initial: 0
+      },
+      {
+        onCancel: () => {
+          console.log('\nCancelled.')
+          process.exit(0)
+        }
+      }
+    )
     return choice || null
   }
 
   // 0 orgs → the first-publish picker.
   if (nonInteractive) {
-    console.error('\x1b[31m✗\x1b[0m You have no org to publish under. Create one with `uniweb org create <handle>`, or pass --scope @org.')
+    console.error(
+      '\x1b[31m✗\x1b[0m You have no org to publish under. Create one with `uniweb org create <handle>`, or pass --scope @org.'
+    )
     process.exit(1)
   }
-  return offerCreateOrg({ apiBase, token, accountHandle: personal, personalOrgExists })
+  return offerCreateOrg({
+    apiBase,
+    token,
+    accountHandle: personal,
+    personalOrgExists
+  })
 }
 
 /**
@@ -192,14 +248,22 @@ export async function deriveScope({ apiBase, token, accountHandle = null, args =
  *    (created-then-left) → the lazy claim would 409; don't offer it.
  * Returns the chosen bare handle, or null if cancelled/failed.
  */
-export async function offerCreateOrg({ apiBase, token, accountHandle = null, personalOrgExists = false }) {
+export async function offerCreateOrg({
+  apiBase,
+  token,
+  accountHandle = null,
+  personalOrgExists = false
+}) {
   const prompts = (await import('prompts')).default
-  const personal = accountHandle && !validateHandle(accountHandle) ? bareHandle(accountHandle) : null
+  const personal =
+    accountHandle && !validateHandle(accountHandle)
+      ? bareHandle(accountHandle)
+      : null
 
   if (!personal) {
     console.error(
-      '\x1b[31m✗\x1b[0m This account has no handle (service accounts don\'t get one), so there is no ready-to-go org.\n' +
-      '  Log in with a personal account or set a handle in the app — or pass --scope @org / `uniweb org create <handle>`.'
+      "\x1b[31m✗\x1b[0m This account has no handle (service accounts don't get one), so there is no ready-to-go org.\n" +
+        '  Log in with a personal account or set a handle in the app — or pass --scope @org / `uniweb org create <handle>`.'
     )
     return null
   }
@@ -207,38 +271,63 @@ export async function offerCreateOrg({ apiBase, token, accountHandle = null, per
   const canClaimPersonal = !personalOrgExists
   const choices = [
     ...(canClaimPersonal
-      ? [{ title: `@${personal} — your personal org (created on first publish)`, value: personal }]
+      ? [
+          {
+            title: `@${personal} — your personal org (created on first publish)`,
+            value: personal
+          }
+        ]
       : []),
-    { title: 'A new organization…', value: ':new' },
+    { title: 'A new organization…', value: ':new' }
   ]
   if (!canClaimPersonal) {
-    console.log(`\x1b[2m@${personal} exists but you're not a member of it — ask its admin, or create another org.\x1b[0m`)
+    console.log(
+      `\x1b[2m@${personal} exists but you're not a member of it — ask its admin, or create another org.\x1b[0m`
+    )
   }
 
-  const { choice } = await prompts({
-    type: 'select',
-    name: 'choice',
-    message: 'Publish under which org?',
-    choices,
-    initial: 0,
-  }, { onCancel: () => { console.log('\nCancelled.'); process.exit(0) } })
+  const { choice } = await prompts(
+    {
+      type: 'select',
+      name: 'choice',
+      message: 'Publish under which org?',
+      choices,
+      initial: 0
+    },
+    {
+      onCancel: () => {
+        console.log('\nCancelled.')
+        process.exit(0)
+      }
+    }
+  )
   if (!choice) return null
 
   let handle = choice
   if (choice === ':new') {
-    const answer = await prompts({
-      type: 'text',
-      name: 'handle',
-      message: 'Org handle (e.g. acme):',
-      validate: (v) => validateHandle(v) || true,
-    }, { onCancel: () => { console.log('\nCancelled.'); process.exit(0) } })
+    const answer = await prompts(
+      {
+        type: 'text',
+        name: 'handle',
+        message: 'Org handle (e.g. acme):',
+        validate: (v) => validateHandle(v) || true
+      },
+      {
+        onCancel: () => {
+          console.log('\nCancelled.')
+          process.exit(0)
+        }
+      }
+    )
     if (!answer.handle) return null
     handle = answer.handle
   }
 
   try {
     const org = await createOrg({ apiBase, token, handle })
-    console.log(`\x1b[32m✓\x1b[0m Created \x1b[1m@${org.handle}\x1b[0m — you're a member${org.is_primary ? ' (primary)' : ''}.`)
+    console.log(
+      `\x1b[32m✓\x1b[0m Created \x1b[1m@${org.handle}\x1b[0m — you're a member${org.is_primary ? ' (primary)' : ''}.`
+    )
     return org.handle
   } catch (err) {
     console.error(`\x1b[31m✗\x1b[0m ${err.message}`)

package/src/utils/runtime-upload.js

@@ -51,7 +51,7 @@ function fileEntry(diskPath, path) {
     content_type: contentTypeFor(path),
     size: bytes.length,
     sha256: createHash('sha256').update(bytes).digest('hex'),
-    diskPath,
+    diskPath
   }
 }
 
@@ -75,7 +75,8 @@ export function collectRuntimeFiles(distDir) {
       const rel = prefix ? `${prefix}/${name}` : name
       const st = statSync(full)
       if (st.isDirectory()) walk(full, rel)
-      else if (st.isFile() && !rel.endsWith('.map')) files.push(fileEntry(full, rel))
+      else if (st.isFile() && !rel.endsWith('.map'))
+        files.push(fileEntry(full, rel))
     }
   }
   walk(appDir, '')
@@ -111,22 +112,40 @@ export function hasShims(files) {
  * @param {object} opts - { apiBase, token, version, distDir, files?, onProgress? }
  * @returns {Promise<{ mode, uploaded: string[], failed: Array, serveBase: string|null }>}
  */
-export async function uploadRuntime({ apiBase, token, version, distDir, files, onProgress = () => {} }) {
+export async function uploadRuntime({
+  apiBase,
+  token,
+  version,
+  distDir,
+  files,
+  onProgress = () => {}
+}) {
   const list = files || collectRuntimeFiles(distDir)
-  if (!list.length) return { mode: 'none', uploaded: [], failed: [], serveBase: null }
+  if (!list.length)
+    return { mode: 'none', uploaded: [], failed: [], serveBase: null }
 
   const origin = apiBase.replace(/\/$/, '')
   const planRes = await fetch(`${origin}/dev/runtime`, {
     method: 'POST',
-    headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${token}` },
+    headers: {
+      'Content-Type': 'application/json',
+      Authorization: `Bearer ${token}`
+    },
     body: JSON.stringify({
       version,
-      files: list.map(({ path, content_type, size, sha256 }) => ({ path, content_type, size, sha256 })),
-    }),
+      files: list.map(({ path, content_type, size, sha256 }) => ({
+        path,
+        content_type,
+        size,
+        sha256
+      }))
+    })
   })
   if (!planRes.ok) {
     const detail = await planRes.text().catch(() => '')
-    const err = new Error(`runtime plan rejected: HTTP ${planRes.status}${detail ? ` — ${detail.slice(0, 300)}` : ''}`)
+    const err = new Error(
+      `runtime plan rejected: HTTP ${planRes.status}${detail ? ` — ${detail.slice(0, 300)}` : ''}`
+    )
     err.status = planRes.status
     throw err
   }
@@ -134,14 +153,19 @@ export async function uploadRuntime({ apiBase, token, version, distDir, files, o
   const targets = new Map((plan.uploads || []).map((u) => [u.path, u]))
   // The one mode-aware bit: direct PUTs are bearer-authed backend routes;
   // presigned URLs are self-authorizing and must NOT carry a foreign bearer.
-  const authHeaders = plan.mode === 'presigned' ? {} : { Authorization: `Bearer ${token}` }
+  const authHeaders =
+    plan.mode === 'presigned' ? {} : { Authorization: `Bearer ${token}` }
 
   const uploaded = []
   const failed = []
   for (const f of list) {
     const target = targets.get(f.path)
     if (!target) {
-      failed.push({ path: f.path, status: 0, detail: 'no upload target in plan' })
+      failed.push({
+        path: f.path,
+        status: 0,
+        detail: 'no upload target in plan'
+      })
       continue
     }
     onProgress(`↑ ${f.path}`)
@@ -149,15 +173,29 @@ export async function uploadRuntime({ apiBase, token, version, distDir, files, o
     try {
       res = await fetch(new URL(target.url, origin), {
         method: target.method || 'PUT',
-        headers: { ...(target.headers || {}), ...authHeaders, 'x-uniweb-sha256': f.sha256 },
-        body: readFileSync(f.diskPath),
+        headers: {
+          ...(target.headers || {}),
+          ...authHeaders,
+          'x-uniweb-sha256': f.sha256
+        },
+        body: readFileSync(f.diskPath)
       })
     } catch (err) {
       failed.push({ path: f.path, status: 0, detail: err.message })
       continue
     }
     if (res.ok) uploaded.push(f.path)
-    else failed.push({ path: f.path, status: res.status, detail: (await res.text().catch(() => '')).slice(0, 200) })
+    else
+      failed.push({
+        path: f.path,
+        status: res.status,
+        detail: (await res.text().catch(() => '')).slice(0, 200)
+      })
+  }
+  return {
+    mode: plan.mode || 'direct',
+    uploaded,
+    failed,
+    serveBase: plan.serve_base || null
   }
-  return { mode: plan.mode || 'direct', uploaded, failed, serveBase: plan.serve_base || null }
 }

package/src/utils/scaffold.js

@@ -11,7 +11,11 @@ import { join, dirname } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import yaml from 'js-yaml'
 import Handlebars from 'handlebars'
-import { copyTemplateDirectory, enumerateTemplateOutputs, registerVersions } from '../templates/processor.js'
+import {
+  copyTemplateDirectory,
+  enumerateTemplateOutputs,
+  registerVersions
+} from '../templates/processor.js'
 import { getVersionsForTemplates, getCliVersion } from '../versions.js'
 import { writeJsonPreservingStyleAsync } from './json-file.js'
 
@@ -45,7 +49,7 @@ export async function scaffoldWorkspace(targetDir, context, options = {}) {
   await copyTemplateDirectory(templatePath, targetDir, context, {
     onProgress: options.onProgress,
     onWarning: options.onWarning,
-    skip,
+    skip
   })
 }
 
@@ -87,7 +91,7 @@ export async function scaffoldFoundation(targetDir, context, options = {}) {
   const templatePath = join(TEMPLATES_DIR, 'foundation')
   await copyTemplateDirectory(templatePath, targetDir, context, {
     onProgress: options.onProgress,
-    onWarning: options.onWarning,
+    onWarning: options.onWarning
   })
 }
 
@@ -120,7 +124,7 @@ export async function scaffoldSite(targetDir, context, options = {}) {
   const templatePath = join(TEMPLATES_DIR, 'site')
   await copyTemplateDirectory(templatePath, targetDir, context, {
     onProgress: options.onProgress,
-    onWarning: options.onWarning,
+    onWarning: options.onWarning
   })
 }
 
@@ -146,7 +150,12 @@ export async function scaffoldSite(targetDir, context, options = {}) {
  *   directories. Used to migrate legacy `foundation/foundation.js`
  *   templates onto the new flat `src/main.js` layout.
  */
-export async function applyContent(contentDir, targetDir, context, options = {}) {
+export async function applyContent(
+  contentDir,
+  targetDir,
+  context,
+  options = {}
+) {
   if (!existsSync(contentDir)) return
 
   registerVersions(getVersionsForTemplates())
@@ -157,16 +166,24 @@ export async function applyContent(contentDir, targetDir, context, options = {})
     'vite.config.js',
     'entry.js',
     'index.html',
-    '.gitignore',
+    '.gitignore'
   ])
 
   // Config files that should be merged, not overwritten.
   // Keys listed here are preserved from the scaffolded version.
   const MERGE_FILES = {
-    'site.yml': ['name', 'foundation'],
+    'site.yml': ['name', 'foundation']
   }
 
-  await copyContentRecursive(contentDir, targetDir, context, STRUCTURAL_FILES, MERGE_FILES, options, 0)
+  await copyContentRecursive(
+    contentDir,
+    targetDir,
+    context,
+    STRUCTURAL_FILES,
+    MERGE_FILES,
+    options,
+    0
+  )
 }
 
 /**
@@ -178,7 +195,15 @@ export async function applyContent(contentDir, targetDir, context, options = {})
  * nested `sections/foo/foundation.js` if one existed, which is not the
  * intent.
  */
-async function copyContentRecursive(sourceDir, targetDir, context, structuralFiles, mergeFiles, options, depth = 0) {
+async function copyContentRecursive(
+  sourceDir,
+  targetDir,
+  context,
+  structuralFiles,
+  mergeFiles,
+  options,
+  depth = 0
+) {
   await fs.mkdir(targetDir, { recursive: true })
 
   const entries = readdirSync(sourceDir, { withFileTypes: true })
@@ -189,7 +214,15 @@ async function copyContentRecursive(sourceDir, targetDir, context, structuralFil
 
     if (entry.isDirectory()) {
       const targetSubDir = join(targetDir, entry.name)
-      await copyContentRecursive(sourcePath, targetSubDir, context, structuralFiles, mergeFiles, options, depth + 1)
+      await copyContentRecursive(
+        sourcePath,
+        targetSubDir,
+        context,
+        structuralFiles,
+        mergeFiles,
+        options,
+        depth + 1
+      )
     } else {
       // Determine the output filename (strip .hbs extension)
       let outputName = entry.name.endsWith('.hbs')
@@ -197,7 +230,10 @@ async function copyContentRecursive(sourceDir, targetDir, context, structuralFil
         : entry.name
 
       // Apply top-level rename (e.g. legacy `foundation.js` → `main.js`)
-      if (renames && Object.prototype.hasOwnProperty.call(renames, outputName)) {
+      if (
+        renames &&
+        Object.prototype.hasOwnProperty.call(renames, outputName)
+      ) {
         outputName = renames[outputName]
       }
 
@@ -236,7 +272,7 @@ async function copyContentRecursive(sourceDir, targetDir, context, structuralFil
       if (preserveKeys && existsSync(targetPath)) {
         const existingContent = await fs.readFile(targetPath, 'utf-8')
         const existing = yaml.load(existingContent) || {}
-        let merged = newContent ?? await fs.readFile(sourcePath, 'utf-8')
+        let merged = newContent ?? (await fs.readFile(sourcePath, 'utf-8'))
 
         for (const key of preserveKeys) {
           if (existing[key] === undefined) continue
@@ -292,7 +328,12 @@ export async function applyStarter(projectDir, context, options = {}) {
   // Apply foundation starter content
   const foundationContentDir = join(STARTER_DIR, 'foundation')
   const foundationTargetDir = join(projectDir, foundationDir)
-  await applyContent(foundationContentDir, foundationTargetDir, context, options)
+  await applyContent(
+    foundationContentDir,
+    foundationTargetDir,
+    context,
+    options
+  )
 
   // Apply site starter content
   const siteContentDir = join(STARTER_DIR, 'site')
@@ -328,7 +369,7 @@ function matchTopLevelLine(content, key) {
 function replaceTopLevelLine(content, key, replacement) {
   return content.replace(
     new RegExp(`^${escapeRegex(key)}:.*$`, 'm'),
-    () => replacement,
+    () => replacement
   )
 }
 

package/src/utils/site-content-refs.js

@@ -17,5 +17,7 @@
  * site.yml; the runtime loads it as a federated module.
  */
 export function extractFoundationRef(info = {}, document = {}) {
-  return info?.foundation ?? info?.foundation_name ?? document?.foundation ?? null
+  return (
+    info?.foundation ?? info?.foundation_name ?? document?.foundation ?? null
+  )
 }