dtoro
d4d99a7473
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.
97 lines
3.0 KiB
JavaScript
97 lines
3.0 KiB
JavaScript
'use strict'
|
|
|
|
const common = require('./common')
|
|
|
|
// get snippet for a single line, respecting maxLength
|
|
function getLine (buffer, lineStart, lineEnd, position, maxLineLength) {
|
|
let head = ''
|
|
let tail = ''
|
|
const maxHalfLength = Math.floor(maxLineLength / 2) - 1
|
|
|
|
if (position - lineStart > maxHalfLength) {
|
|
head = ' ... '
|
|
lineStart = position - maxHalfLength + head.length
|
|
}
|
|
|
|
if (lineEnd - position > maxHalfLength) {
|
|
tail = ' ...'
|
|
lineEnd = position + maxHalfLength - tail.length
|
|
}
|
|
|
|
return {
|
|
str: head + buffer.slice(lineStart, lineEnd).replace(/\t/g, '→') + tail,
|
|
pos: position - lineStart + head.length // relative position
|
|
}
|
|
}
|
|
|
|
function padStart (string, max) {
|
|
return common.repeat(' ', max - string.length) + string
|
|
}
|
|
|
|
function makeSnippet (mark, options) {
|
|
options = Object.create(options || null)
|
|
|
|
if (!mark.buffer) return null
|
|
|
|
if (!options.maxLength) options.maxLength = 79
|
|
if (typeof options.indent !== 'number') options.indent = 1
|
|
if (typeof options.linesBefore !== 'number') options.linesBefore = 3
|
|
if (typeof options.linesAfter !== 'number') options.linesAfter = 2
|
|
|
|
const re = /\r?\n|\r|\0/g
|
|
const lineStarts = [0]
|
|
const lineEnds = []
|
|
let match
|
|
let foundLineNo = -1
|
|
|
|
while ((match = re.exec(mark.buffer))) {
|
|
lineEnds.push(match.index)
|
|
lineStarts.push(match.index + match[0].length)
|
|
|
|
if (mark.position <= match.index && foundLineNo < 0) {
|
|
foundLineNo = lineStarts.length - 2
|
|
}
|
|
}
|
|
|
|
if (foundLineNo < 0) foundLineNo = lineStarts.length - 1
|
|
|
|
let result = ''
|
|
const lineNoLength = Math.min(mark.line + options.linesAfter, lineEnds.length).toString().length
|
|
const maxLineLength = options.maxLength - (options.indent + lineNoLength + 3)
|
|
|
|
for (let i = 1; i <= options.linesBefore; i++) {
|
|
if (foundLineNo - i < 0) break
|
|
const line = getLine(
|
|
mark.buffer,
|
|
lineStarts[foundLineNo - i],
|
|
lineEnds[foundLineNo - i],
|
|
mark.position - (lineStarts[foundLineNo] - lineStarts[foundLineNo - i]),
|
|
maxLineLength
|
|
)
|
|
result = common.repeat(' ', options.indent) + padStart((mark.line - i + 1).toString(), lineNoLength) +
|
|
' | ' + line.str + '\n' + result
|
|
}
|
|
|
|
const line = getLine(mark.buffer, lineStarts[foundLineNo], lineEnds[foundLineNo], mark.position, maxLineLength)
|
|
result += common.repeat(' ', options.indent) + padStart((mark.line + 1).toString(), lineNoLength) +
|
|
' | ' + line.str + '\n'
|
|
result += common.repeat('-', options.indent + lineNoLength + 3 + line.pos) + '^' + '\n'
|
|
|
|
for (let i = 1; i <= options.linesAfter; i++) {
|
|
if (foundLineNo + i >= lineEnds.length) break
|
|
const line = getLine(
|
|
mark.buffer,
|
|
lineStarts[foundLineNo + i],
|
|
lineEnds[foundLineNo + i],
|
|
mark.position - (lineStarts[foundLineNo] - lineStarts[foundLineNo + i]),
|
|
maxLineLength
|
|
)
|
|
result += common.repeat(' ', options.indent) + padStart((mark.line + i + 1).toString(), lineNoLength) +
|
|
' | ' + line.str + '\n'
|
|
}
|
|
|
|
return result.replace(/\n$/, '')
|
|
}
|
|
|
|
module.exports = makeSnippet
|