Problem: the hexagonal refactor churns the backend tree for nine more phases; the UI delivery stack (web/ SPA, cmd/desktop Wails wrapper, compose/web image) must move to its own repo first so doc/layout rewrites land once on a backend-only tree. Change: - New repo git.hubris.network/dtoro/oikos-web (v0.33.0): web/, desktop/ (updateURL repointed to oikos-web releases), compose/, own CI (web + desktop jobs), own deploy script (CI-green gate, TOCTOU guard, version-tagged images, prune-to-3), own webhook receiver on :9798 + launchd unit, own compose project publishing the same 8091:80. - Cutover executed on mac-mini in order: oikos stack's web service stopped+removed, oikos-web project brought up on 8091; outer Caddy untouched (targets the published port) — serving + Authentik flow + /wails 404 quirk verified post-cutover. - Stripped from oikos: web/, cmd/desktop/, compose/web/, desktop CI workflow, ci.yml web job, Makefile ui/desktop/desktop-package/install targets, the compose web service, oikos-web from deploy.sh's fallback prune list; wails + go-keyring dropped from go.mod, vendor synced. - README / CONTRIBUTING / AGENTS.md / .agents dev+operations docs now point at the new repo; mbse + mascot design docs carry a path note. Risk: production SPA serving depends on the new pipeline now; rollback is versioned-image re-up of the old web service from a pre-split checkout (port 8091). Desktop builds installed before the split still check dtoro/oikos releases — one manual reinstall, noted in the oikos-web release notes. Verification: go vet, make test (race), make generate-check, golangci (no new findings; baseline down 400→365); post-cutover curls — localhost:8091 200, /wails/runtime.js 404, outer Caddy 302 Authentik.
68 lines
2.2 KiB
JavaScript
68 lines
2.2 KiB
JavaScript
// Limited implementation of python % string operator, supports only %s and %r for now
|
|
// (other formats are not used here, but may appear in custom templates)
|
|
|
|
'use strict'
|
|
|
|
const { inspect } = require('util')
|
|
|
|
|
|
module.exports = function sub(pattern, ...values) {
|
|
let regex = /%(?:(%)|(-)?(\*)?(?:\((\w+)\))?([A-Za-z]))/g
|
|
|
|
let result = pattern.replace(regex, function (_, is_literal, is_left_align, is_padded, name, format) {
|
|
if (is_literal) return '%'
|
|
|
|
let padded_count = 0
|
|
if (is_padded) {
|
|
if (values.length === 0) throw new TypeError('not enough arguments for format string')
|
|
padded_count = values.shift()
|
|
if (!Number.isInteger(padded_count)) throw new TypeError('* wants int')
|
|
}
|
|
|
|
let str
|
|
if (name !== undefined) {
|
|
let dict = values[0]
|
|
if (typeof dict !== 'object' || dict === null) throw new TypeError('format requires a mapping')
|
|
if (!(name in dict)) throw new TypeError(`no such key: '${name}'`)
|
|
str = dict[name]
|
|
} else {
|
|
if (values.length === 0) throw new TypeError('not enough arguments for format string')
|
|
str = values.shift()
|
|
}
|
|
|
|
switch (format) {
|
|
case 's':
|
|
str = String(str)
|
|
break
|
|
case 'r':
|
|
str = inspect(str)
|
|
break
|
|
case 'd':
|
|
case 'i':
|
|
if (typeof str !== 'number') {
|
|
throw new TypeError(`%${format} format: a number is required, not ${typeof str}`)
|
|
}
|
|
str = String(str.toFixed(0))
|
|
break
|
|
default:
|
|
throw new TypeError(`unsupported format character '${format}'`)
|
|
}
|
|
|
|
if (padded_count > 0) {
|
|
return is_left_align ? str.padEnd(padded_count) : str.padStart(padded_count)
|
|
} else {
|
|
return str
|
|
}
|
|
})
|
|
|
|
if (values.length) {
|
|
if (values.length === 1 && typeof values[0] === 'object' && values[0] !== null) {
|
|
// mapping
|
|
} else {
|
|
throw new TypeError('not all arguments converted during string formatting')
|
|
}
|
|
}
|
|
|
|
return result
|
|
}
|