feat: Phase 1 — extract the client (web SPA + desktop) to dtoro/oikos-web
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.
This commit is contained in:
257
web/node_modules/eslint/lib/rules/multiline-ternary.js
generated
vendored
Normal file
257
web/node_modules/eslint/lib/rules/multiline-ternary.js
generated
vendored
Normal file
@@ -0,0 +1,257 @@
|
||||
/**
|
||||
* @fileoverview Enforce newlines between operands of ternary expressions
|
||||
* @author Kai Cataldo
|
||||
* @deprecated in ESLint v8.53.0
|
||||
*/
|
||||
|
||||
"use strict";
|
||||
|
||||
const astUtils = require("./utils/ast-utils");
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// Rule Definition
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
/** @type {import('../types').Rule.RuleModule} */
|
||||
module.exports = {
|
||||
meta: {
|
||||
deprecated: {
|
||||
message: "Formatting rules are being moved out of ESLint core.",
|
||||
url: "https://eslint.org/blog/2023/10/deprecating-formatting-rules/",
|
||||
deprecatedSince: "8.53.0",
|
||||
availableUntil: "11.0.0",
|
||||
replacedBy: [
|
||||
{
|
||||
message:
|
||||
"ESLint Stylistic now maintains deprecated stylistic core rules.",
|
||||
url: "https://eslint.style/guide/migration",
|
||||
plugin: {
|
||||
name: "@stylistic/eslint-plugin",
|
||||
url: "https://eslint.style",
|
||||
},
|
||||
rule: {
|
||||
name: "multiline-ternary",
|
||||
url: "https://eslint.style/rules/multiline-ternary",
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
type: "layout",
|
||||
|
||||
docs: {
|
||||
description:
|
||||
"Enforce newlines between operands of ternary expressions",
|
||||
recommended: false,
|
||||
url: "https://eslint.org/docs/latest/rules/multiline-ternary",
|
||||
},
|
||||
|
||||
schema: [
|
||||
{
|
||||
enum: ["always", "always-multiline", "never"],
|
||||
},
|
||||
],
|
||||
|
||||
messages: {
|
||||
expectedTestCons:
|
||||
"Expected newline between test and consequent of ternary expression.",
|
||||
expectedConsAlt:
|
||||
"Expected newline between consequent and alternate of ternary expression.",
|
||||
unexpectedTestCons:
|
||||
"Unexpected newline between test and consequent of ternary expression.",
|
||||
unexpectedConsAlt:
|
||||
"Unexpected newline between consequent and alternate of ternary expression.",
|
||||
},
|
||||
|
||||
fixable: "whitespace",
|
||||
},
|
||||
|
||||
create(context) {
|
||||
const sourceCode = context.sourceCode;
|
||||
const option = context.options[0];
|
||||
const multiline = option !== "never";
|
||||
const allowSingleLine = option === "always-multiline";
|
||||
|
||||
//--------------------------------------------------------------------------
|
||||
// Public
|
||||
//--------------------------------------------------------------------------
|
||||
|
||||
return {
|
||||
ConditionalExpression(node) {
|
||||
const questionToken = sourceCode.getTokenAfter(
|
||||
node.test,
|
||||
astUtils.isNotClosingParenToken,
|
||||
);
|
||||
const colonToken = sourceCode.getTokenAfter(
|
||||
node.consequent,
|
||||
astUtils.isNotClosingParenToken,
|
||||
);
|
||||
|
||||
const firstTokenOfTest = sourceCode.getFirstToken(node);
|
||||
const lastTokenOfTest =
|
||||
sourceCode.getTokenBefore(questionToken);
|
||||
const firstTokenOfConsequent =
|
||||
sourceCode.getTokenAfter(questionToken);
|
||||
const lastTokenOfConsequent =
|
||||
sourceCode.getTokenBefore(colonToken);
|
||||
const firstTokenOfAlternate =
|
||||
sourceCode.getTokenAfter(colonToken);
|
||||
|
||||
const areTestAndConsequentOnSameLine =
|
||||
astUtils.isTokenOnSameLine(
|
||||
lastTokenOfTest,
|
||||
firstTokenOfConsequent,
|
||||
);
|
||||
const areConsequentAndAlternateOnSameLine =
|
||||
astUtils.isTokenOnSameLine(
|
||||
lastTokenOfConsequent,
|
||||
firstTokenOfAlternate,
|
||||
);
|
||||
|
||||
const hasComments = !!sourceCode.getCommentsInside(node).length;
|
||||
|
||||
if (!multiline) {
|
||||
if (!areTestAndConsequentOnSameLine) {
|
||||
context.report({
|
||||
node: node.test,
|
||||
loc: {
|
||||
start: firstTokenOfTest.loc.start,
|
||||
end: lastTokenOfTest.loc.end,
|
||||
},
|
||||
messageId: "unexpectedTestCons",
|
||||
fix(fixer) {
|
||||
if (hasComments) {
|
||||
return null;
|
||||
}
|
||||
const fixers = [];
|
||||
const areTestAndQuestionOnSameLine =
|
||||
astUtils.isTokenOnSameLine(
|
||||
lastTokenOfTest,
|
||||
questionToken,
|
||||
);
|
||||
const areQuestionAndConsOnSameLine =
|
||||
astUtils.isTokenOnSameLine(
|
||||
questionToken,
|
||||
firstTokenOfConsequent,
|
||||
);
|
||||
|
||||
if (!areTestAndQuestionOnSameLine) {
|
||||
fixers.push(
|
||||
fixer.removeRange([
|
||||
lastTokenOfTest.range[1],
|
||||
questionToken.range[0],
|
||||
]),
|
||||
);
|
||||
}
|
||||
if (!areQuestionAndConsOnSameLine) {
|
||||
fixers.push(
|
||||
fixer.removeRange([
|
||||
questionToken.range[1],
|
||||
firstTokenOfConsequent.range[0],
|
||||
]),
|
||||
);
|
||||
}
|
||||
|
||||
return fixers;
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
if (!areConsequentAndAlternateOnSameLine) {
|
||||
context.report({
|
||||
node: node.consequent,
|
||||
loc: {
|
||||
start: firstTokenOfConsequent.loc.start,
|
||||
end: lastTokenOfConsequent.loc.end,
|
||||
},
|
||||
messageId: "unexpectedConsAlt",
|
||||
fix(fixer) {
|
||||
if (hasComments) {
|
||||
return null;
|
||||
}
|
||||
const fixers = [];
|
||||
const areConsAndColonOnSameLine =
|
||||
astUtils.isTokenOnSameLine(
|
||||
lastTokenOfConsequent,
|
||||
colonToken,
|
||||
);
|
||||
const areColonAndAltOnSameLine =
|
||||
astUtils.isTokenOnSameLine(
|
||||
colonToken,
|
||||
firstTokenOfAlternate,
|
||||
);
|
||||
|
||||
if (!areConsAndColonOnSameLine) {
|
||||
fixers.push(
|
||||
fixer.removeRange([
|
||||
lastTokenOfConsequent.range[1],
|
||||
colonToken.range[0],
|
||||
]),
|
||||
);
|
||||
}
|
||||
if (!areColonAndAltOnSameLine) {
|
||||
fixers.push(
|
||||
fixer.removeRange([
|
||||
colonToken.range[1],
|
||||
firstTokenOfAlternate.range[0],
|
||||
]),
|
||||
);
|
||||
}
|
||||
|
||||
return fixers;
|
||||
},
|
||||
});
|
||||
}
|
||||
} else {
|
||||
if (
|
||||
allowSingleLine &&
|
||||
node.loc.start.line === node.loc.end.line
|
||||
) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (areTestAndConsequentOnSameLine) {
|
||||
context.report({
|
||||
node: node.test,
|
||||
loc: {
|
||||
start: firstTokenOfTest.loc.start,
|
||||
end: lastTokenOfTest.loc.end,
|
||||
},
|
||||
messageId: "expectedTestCons",
|
||||
fix: fixer =>
|
||||
hasComments
|
||||
? null
|
||||
: fixer.replaceTextRange(
|
||||
[
|
||||
lastTokenOfTest.range[1],
|
||||
questionToken.range[0],
|
||||
],
|
||||
"\n",
|
||||
),
|
||||
});
|
||||
}
|
||||
|
||||
if (areConsequentAndAlternateOnSameLine) {
|
||||
context.report({
|
||||
node: node.consequent,
|
||||
loc: {
|
||||
start: firstTokenOfConsequent.loc.start,
|
||||
end: lastTokenOfConsequent.loc.end,
|
||||
},
|
||||
messageId: "expectedConsAlt",
|
||||
fix: fixer =>
|
||||
hasComments
|
||||
? null
|
||||
: fixer.replaceTextRange(
|
||||
[
|
||||
lastTokenOfConsequent.range[1],
|
||||
colonToken.range[0],
|
||||
],
|
||||
"\n",
|
||||
),
|
||||
});
|
||||
}
|
||||
}
|
||||
},
|
||||
};
|
||||
},
|
||||
};
|
||||
Reference in New Issue
Block a user