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.
134 lines
5.1 KiB
JavaScript
134 lines
5.1 KiB
JavaScript
"use strict";
|
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
const utils_1 = require("../utils");
|
|
const ast_utils_1 = require("../utils/ast-utils");
|
|
const compat_1 = require("../utils/compat");
|
|
/**
|
|
* Splits the given node by the given logical operator.
|
|
* @param operator Logical operator `||` or `&&`.
|
|
* @param node The node to split.
|
|
* @returns Array of conditions that makes the node when joined by the operator.
|
|
*/
|
|
function splitByLogicalOperator(operator, node) {
|
|
if (node.type === 'LogicalExpression' && node.operator === operator) {
|
|
return [
|
|
...splitByLogicalOperator(operator, node.left),
|
|
...splitByLogicalOperator(operator, node.right)
|
|
];
|
|
}
|
|
return [node];
|
|
}
|
|
/**
|
|
* Split with ||.
|
|
*/
|
|
function splitByOr(node) {
|
|
return splitByLogicalOperator('||', node);
|
|
}
|
|
/**
|
|
* Split with &&.
|
|
*/
|
|
function splitByAnd(node) {
|
|
return splitByLogicalOperator('&&', node);
|
|
}
|
|
/**
|
|
* Build OrOperands
|
|
*/
|
|
function buildOrOperands(node) {
|
|
const orOperands = splitByOr(node);
|
|
return {
|
|
node,
|
|
operands: orOperands.map((orOperand) => {
|
|
const andOperands = splitByAnd(orOperand);
|
|
return {
|
|
node: orOperand,
|
|
operands: andOperands
|
|
};
|
|
})
|
|
};
|
|
}
|
|
exports.default = (0, utils_1.createRule)('no-dupe-else-if-blocks', {
|
|
meta: {
|
|
docs: {
|
|
description: 'disallow duplicate conditions in `{#if}` / `{:else if}` chains',
|
|
category: 'Possible Errors',
|
|
recommended: true
|
|
},
|
|
schema: [],
|
|
messages: {
|
|
unexpected: 'This branch can never execute. Its condition is a duplicate or covered by previous conditions in the `{#if}` / `{:else if}` chain.'
|
|
},
|
|
type: 'problem' // "problem",
|
|
},
|
|
create(context) {
|
|
const sourceCode = (0, compat_1.getSourceCode)(context);
|
|
/**
|
|
* Determines whether the two given nodes are considered to be equal. In particular, given that the nodes
|
|
* represent expressions in a boolean context, `||` and `&&` can be considered as commutative operators.
|
|
* @param a First node.
|
|
* @param b Second node.
|
|
* @returns `true` if the nodes are considered to be equal.
|
|
*/
|
|
function equal(a, b) {
|
|
if (a.type !== b.type) {
|
|
return false;
|
|
}
|
|
if (a.type === 'LogicalExpression' &&
|
|
b.type === 'LogicalExpression' &&
|
|
(a.operator === '||' || a.operator === '&&') &&
|
|
a.operator === b.operator) {
|
|
return ((equal(a.left, b.left) && equal(a.right, b.right)) ||
|
|
(equal(a.left, b.right) && equal(a.right, b.left)));
|
|
}
|
|
return (0, ast_utils_1.equalTokens)(a, b, sourceCode);
|
|
}
|
|
/**
|
|
* Determines whether the first given AndOperands is a subset of the second given AndOperands.
|
|
*
|
|
* e.g. A: (a && b), B: (a && b && c): B is a subset of A.
|
|
*
|
|
* @param operandsA The AndOperands to compare from.
|
|
* @param operandsB The AndOperands to compare against.
|
|
* @returns `true` if the `andOperandsA` is a subset of the `andOperandsB`.
|
|
*/
|
|
function isSubset(operandsA, operandsB) {
|
|
return operandsA.operands.every((operandA) => operandsB.operands.some((operandB) => equal(operandA, operandB)));
|
|
}
|
|
/** Iterate SvelteIfBlock nodes */
|
|
function* iterateIfElseIf(node) {
|
|
let target = node;
|
|
while (target.parent.type === 'SvelteElseBlock' &&
|
|
target.parent.children.includes(target) &&
|
|
target.parent.parent.type === 'SvelteIfBlock') {
|
|
yield target.parent.parent;
|
|
target = target.parent.parent;
|
|
}
|
|
}
|
|
return {
|
|
SvelteIfBlock(node) {
|
|
const test = node.expression;
|
|
const conditionsToCheck = test.type === 'LogicalExpression' && test.operator === '&&'
|
|
? [...splitByAnd(test), test]
|
|
: [test];
|
|
const listToCheck = conditionsToCheck.map(buildOrOperands);
|
|
for (const currentIdBlock of iterateIfElseIf(node)) {
|
|
if (currentIdBlock.expression) {
|
|
const currentOrOperands = buildOrOperands(currentIdBlock.expression);
|
|
for (const condition of listToCheck) {
|
|
const operands = (condition.operands = condition.operands.filter((orOperand) => {
|
|
return !currentOrOperands.operands.some((currentOrOperand) => isSubset(currentOrOperand, orOperand));
|
|
}));
|
|
if (!operands.length) {
|
|
context.report({
|
|
node: condition.node,
|
|
messageId: 'unexpected'
|
|
});
|
|
return;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
};
|
|
}
|
|
});
|