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.
141 lines
3.2 KiB
JavaScript
141 lines
3.2 KiB
JavaScript
/**
|
|
* @fileoverview Rule to flag blocks with no reason to exist
|
|
* @author Brandon Mills
|
|
*/
|
|
|
|
"use strict";
|
|
|
|
//------------------------------------------------------------------------------
|
|
// Rule Definition
|
|
//------------------------------------------------------------------------------
|
|
|
|
/** @type {import('../types').Rule.RuleModule} */
|
|
module.exports = {
|
|
meta: {
|
|
type: "suggestion",
|
|
|
|
docs: {
|
|
description: "Disallow unnecessary nested blocks",
|
|
recommended: false,
|
|
url: "https://eslint.org/docs/latest/rules/no-lone-blocks",
|
|
},
|
|
|
|
schema: [],
|
|
|
|
messages: {
|
|
redundantBlock: "Block is redundant.",
|
|
redundantNestedBlock: "Nested block is redundant.",
|
|
},
|
|
},
|
|
|
|
create(context) {
|
|
// A stack of lone blocks to be checked for block-level bindings
|
|
const loneBlocks = [];
|
|
let ruleDef;
|
|
const sourceCode = context.sourceCode;
|
|
|
|
/**
|
|
* Reports a node as invalid.
|
|
* @param {ASTNode} node The node to be reported.
|
|
* @returns {void}
|
|
*/
|
|
function report(node) {
|
|
const messageId =
|
|
node.parent.type === "BlockStatement" ||
|
|
node.parent.type === "StaticBlock"
|
|
? "redundantNestedBlock"
|
|
: "redundantBlock";
|
|
|
|
context.report({
|
|
node,
|
|
messageId,
|
|
});
|
|
}
|
|
|
|
/**
|
|
* Checks for any occurrence of a BlockStatement in a place where lists of statements can appear
|
|
* @param {ASTNode} node The node to check
|
|
* @returns {boolean} True if the node is a lone block.
|
|
*/
|
|
function isLoneBlock(node) {
|
|
return (
|
|
node.parent.type === "BlockStatement" ||
|
|
node.parent.type === "StaticBlock" ||
|
|
node.parent.type === "Program" ||
|
|
// Don't report blocks in switch cases if the block is the only statement of the case.
|
|
(node.parent.type === "SwitchCase" &&
|
|
!(
|
|
node.parent.consequent[0] === node &&
|
|
node.parent.consequent.length === 1
|
|
))
|
|
);
|
|
}
|
|
|
|
/**
|
|
* Checks the enclosing block of the current node for block-level bindings,
|
|
* and "marks it" as valid if any.
|
|
* @param {ASTNode} node The current node to check.
|
|
* @returns {void}
|
|
*/
|
|
function markLoneBlock(node) {
|
|
if (loneBlocks.length === 0) {
|
|
return;
|
|
}
|
|
|
|
const block = node.parent;
|
|
|
|
if (loneBlocks.at(-1) === block) {
|
|
loneBlocks.pop();
|
|
}
|
|
}
|
|
|
|
// Default rule definition: report all lone blocks
|
|
ruleDef = {
|
|
BlockStatement(node) {
|
|
if (isLoneBlock(node)) {
|
|
report(node);
|
|
}
|
|
},
|
|
};
|
|
|
|
// ES6: report blocks without block-level bindings, or that's only child of another block
|
|
if (context.languageOptions.ecmaVersion >= 2015) {
|
|
ruleDef = {
|
|
BlockStatement(node) {
|
|
if (isLoneBlock(node)) {
|
|
loneBlocks.push(node);
|
|
}
|
|
},
|
|
"BlockStatement:exit"(node) {
|
|
if (loneBlocks.length > 0 && loneBlocks.at(-1) === node) {
|
|
loneBlocks.pop();
|
|
report(node);
|
|
} else if (
|
|
(node.parent.type === "BlockStatement" ||
|
|
node.parent.type === "StaticBlock") &&
|
|
node.parent.body.length === 1
|
|
) {
|
|
report(node);
|
|
}
|
|
},
|
|
};
|
|
|
|
ruleDef.VariableDeclaration = function (node) {
|
|
if (node.kind !== "var") {
|
|
markLoneBlock(node);
|
|
}
|
|
};
|
|
|
|
ruleDef.FunctionDeclaration = function (node) {
|
|
if (sourceCode.getScope(node).isStrict) {
|
|
markLoneBlock(node);
|
|
}
|
|
};
|
|
|
|
ruleDef.ClassDeclaration = markLoneBlock;
|
|
}
|
|
|
|
return ruleDef;
|
|
},
|
|
};
|