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.
63 lines
1.5 KiB
JavaScript
63 lines
1.5 KiB
JavaScript
/**
|
|
* @fileoverview Applies default rule options
|
|
* @author JoshuaKGoldberg
|
|
*/
|
|
|
|
"use strict";
|
|
|
|
/**
|
|
* Check if the variable contains an object strictly rejecting arrays
|
|
* @param {unknown} value an object
|
|
* @returns {boolean} Whether value is an object
|
|
*/
|
|
function isObjectNotArray(value) {
|
|
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
}
|
|
|
|
/**
|
|
* Deeply merges second on top of first, creating a new {} object if needed.
|
|
* @param {T} first Base, default value.
|
|
* @param {U} second User-specified value.
|
|
* @returns {T | U | (T & U)} Merged equivalent of second on top of first.
|
|
*/
|
|
function deepMergeObjects(first, second) {
|
|
if (second === void 0) {
|
|
return first;
|
|
}
|
|
|
|
if (!isObjectNotArray(first) || !isObjectNotArray(second)) {
|
|
return second;
|
|
}
|
|
|
|
const result = { ...first, ...second };
|
|
|
|
for (const key of Object.keys(second)) {
|
|
if (Object.prototype.propertyIsEnumerable.call(first, key)) {
|
|
result[key] = deepMergeObjects(first[key], second[key]);
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
/**
|
|
* Deeply merges second on top of first, creating a new [] array if needed.
|
|
* @param {T[]} first Base, default values.
|
|
* @param {U[]} second User-specified values.
|
|
* @returns {(T | U | (T & U))[]} Merged equivalent of second on top of first.
|
|
*/
|
|
function deepMergeArrays(first, second) {
|
|
if (!first || !second) {
|
|
return second || first || [];
|
|
}
|
|
|
|
return [
|
|
...first.map((value, i) =>
|
|
deepMergeObjects(value, i < second.length ? second[i] : void 0),
|
|
),
|
|
...second.slice(first.length),
|
|
];
|
|
}
|
|
|
|
module.exports = { deepMergeArrays };
|