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.
78 lines
2.5 KiB
JavaScript
78 lines
2.5 KiB
JavaScript
'use strict';
|
|
|
|
var identity = require('../../nodes/identity.js');
|
|
var toJS = require('../../nodes/toJS.js');
|
|
var YAMLMap = require('../../nodes/YAMLMap.js');
|
|
var YAMLSeq = require('../../nodes/YAMLSeq.js');
|
|
var pairs = require('./pairs.js');
|
|
|
|
class YAMLOMap extends YAMLSeq.YAMLSeq {
|
|
constructor() {
|
|
super();
|
|
this.add = YAMLMap.YAMLMap.prototype.add.bind(this);
|
|
this.delete = YAMLMap.YAMLMap.prototype.delete.bind(this);
|
|
this.get = YAMLMap.YAMLMap.prototype.get.bind(this);
|
|
this.has = YAMLMap.YAMLMap.prototype.has.bind(this);
|
|
this.set = YAMLMap.YAMLMap.prototype.set.bind(this);
|
|
this.tag = YAMLOMap.tag;
|
|
}
|
|
/**
|
|
* If `ctx` is given, the return type is actually `Map<unknown, unknown>`,
|
|
* but TypeScript won't allow widening the signature of a child method.
|
|
*/
|
|
toJSON(_, ctx) {
|
|
if (!ctx)
|
|
return super.toJSON(_);
|
|
const map = new Map();
|
|
if (ctx?.onCreate)
|
|
ctx.onCreate(map);
|
|
for (const pair of this.items) {
|
|
let key, value;
|
|
if (identity.isPair(pair)) {
|
|
key = toJS.toJS(pair.key, '', ctx);
|
|
value = toJS.toJS(pair.value, key, ctx);
|
|
}
|
|
else {
|
|
key = toJS.toJS(pair, '', ctx);
|
|
}
|
|
if (map.has(key))
|
|
throw new Error('Ordered maps must not include duplicate keys');
|
|
map.set(key, value);
|
|
}
|
|
return map;
|
|
}
|
|
static from(schema, iterable, ctx) {
|
|
const pairs$1 = pairs.createPairs(schema, iterable, ctx);
|
|
const omap = new this();
|
|
omap.items = pairs$1.items;
|
|
return omap;
|
|
}
|
|
}
|
|
YAMLOMap.tag = 'tag:yaml.org,2002:omap';
|
|
const omap = {
|
|
collection: 'seq',
|
|
identify: value => value instanceof Map,
|
|
nodeClass: YAMLOMap,
|
|
default: false,
|
|
tag: 'tag:yaml.org,2002:omap',
|
|
resolve(seq, onError) {
|
|
const pairs$1 = pairs.resolvePairs(seq, onError);
|
|
const seenKeys = [];
|
|
for (const { key } of pairs$1.items) {
|
|
if (identity.isScalar(key)) {
|
|
if (seenKeys.includes(key.value)) {
|
|
onError(`Ordered maps must not include duplicate keys: ${key.value}`);
|
|
}
|
|
else {
|
|
seenKeys.push(key.value);
|
|
}
|
|
}
|
|
}
|
|
return Object.assign(new YAMLOMap(), pairs$1);
|
|
},
|
|
createNode: (schema, iterable, ctx) => YAMLOMap.from(schema, iterable, ctx)
|
|
};
|
|
|
|
exports.YAMLOMap = YAMLOMap;
|
|
exports.omap = omap;
|