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.
126 lines
3.9 KiB
JavaScript
126 lines
3.9 KiB
JavaScript
/**
|
|
* @fileoverview Helper class to aid in constructing fix commands.
|
|
* @author Alan Pierce
|
|
*/
|
|
"use strict";
|
|
|
|
//------------------------------------------------------------------------------
|
|
// Typedefs
|
|
//------------------------------------------------------------------------------
|
|
|
|
/**
|
|
* @import { SourceRange } from "@eslint/core";
|
|
*/
|
|
|
|
//------------------------------------------------------------------------------
|
|
// Requirements
|
|
//------------------------------------------------------------------------------
|
|
|
|
const astUtils = require("./ast-utils");
|
|
|
|
//------------------------------------------------------------------------------
|
|
// Public Interface
|
|
//------------------------------------------------------------------------------
|
|
|
|
/**
|
|
* A helper class to combine fix options into a fix command. Currently, it
|
|
* exposes some "retain" methods that extend the range of the text being
|
|
* replaced so that other fixes won't touch that region in the same pass.
|
|
*/
|
|
class FixTracker {
|
|
/**
|
|
* Create a new FixTracker.
|
|
* @param {ruleFixer} fixer A ruleFixer instance.
|
|
* @param {SourceCode} sourceCode A SourceCode object for the current code.
|
|
*/
|
|
constructor(fixer, sourceCode) {
|
|
this.fixer = fixer;
|
|
this.sourceCode = sourceCode;
|
|
this.retainedRange = null;
|
|
}
|
|
|
|
/**
|
|
* Mark the given range as "retained", meaning that other fixes may not
|
|
* may not modify this region in the same pass.
|
|
* @param {SourceRange} range The range to retain.
|
|
* @returns {FixTracker} The same RuleFixer, for chained calls.
|
|
*/
|
|
retainRange(range) {
|
|
this.retainedRange = range;
|
|
return this;
|
|
}
|
|
|
|
/**
|
|
* Given a node, find the function containing it (or the entire program) and
|
|
* mark it as retained, meaning that other fixes may not modify it in this
|
|
* pass. This is useful for avoiding conflicts in fixes that modify control
|
|
* flow.
|
|
* @param {ASTNode} node The node to use as a starting point.
|
|
* @returns {FixTracker} The same RuleFixer, for chained calls.
|
|
*/
|
|
retainEnclosingFunction(node) {
|
|
const functionNode = astUtils.getUpperFunction(node);
|
|
|
|
return this.retainRange(
|
|
functionNode ? functionNode.range : this.sourceCode.ast.range,
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Given a node or token, find the token before and afterward, and mark that
|
|
* range as retained, meaning that other fixes may not modify it in this
|
|
* pass. This is useful for avoiding conflicts in fixes that make a small
|
|
* change to the code where the AST should not be changed.
|
|
* @param {ASTNode|Token} nodeOrToken The node or token to use as a starting
|
|
* point. The token to the left and right are use in the range.
|
|
* @returns {FixTracker} The same RuleFixer, for chained calls.
|
|
*/
|
|
retainSurroundingTokens(nodeOrToken) {
|
|
const tokenBefore =
|
|
this.sourceCode.getTokenBefore(nodeOrToken) || nodeOrToken;
|
|
const tokenAfter =
|
|
this.sourceCode.getTokenAfter(nodeOrToken) || nodeOrToken;
|
|
|
|
return this.retainRange([tokenBefore.range[0], tokenAfter.range[1]]);
|
|
}
|
|
|
|
/**
|
|
* Create a fix command that replaces the given range with the given text,
|
|
* accounting for any retained ranges.
|
|
* @param {SourceRange} range The range to remove in the fix.
|
|
* @param {string} text The text to insert in place of the range.
|
|
* @returns {Object} The fix command.
|
|
*/
|
|
replaceTextRange(range, text) {
|
|
let actualRange;
|
|
|
|
if (this.retainedRange) {
|
|
actualRange = [
|
|
Math.min(this.retainedRange[0], range[0]),
|
|
Math.max(this.retainedRange[1], range[1]),
|
|
];
|
|
} else {
|
|
actualRange = range;
|
|
}
|
|
|
|
return this.fixer.replaceTextRange(
|
|
actualRange,
|
|
this.sourceCode.text.slice(actualRange[0], range[0]) +
|
|
text +
|
|
this.sourceCode.text.slice(range[1], actualRange[1]),
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Create a fix command that removes the given node or token, accounting for
|
|
* any retained ranges.
|
|
* @param {ASTNode|Token} nodeOrToken The node or token to remove.
|
|
* @returns {Object} The fix command.
|
|
*/
|
|
remove(nodeOrToken) {
|
|
return this.replaceTextRange(nodeOrToken.range, "");
|
|
}
|
|
}
|
|
|
|
module.exports = FixTracker;
|