dtoro
d4d99a7473
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.
96 lines
2.4 KiB
JavaScript
96 lines
2.4 KiB
JavaScript
"use strict";
|
|
|
|
const parsers = require("../parsers");
|
|
|
|
module.exports.parse = function parse(v) {
|
|
if (v === "") {
|
|
return v;
|
|
}
|
|
const keywords = [
|
|
"serif",
|
|
"sans-serif",
|
|
"cursive",
|
|
"fantasy",
|
|
"monospace",
|
|
"system-ui",
|
|
"math",
|
|
"ui-serif",
|
|
"ui-sans-serif",
|
|
"ui-monospace",
|
|
"ui-rounded"
|
|
];
|
|
const genericValues = ["fangsong", "kai", "khmer-mul", "nastaliq"];
|
|
const val = parsers.splitValue(v, {
|
|
delimiter: ","
|
|
});
|
|
const font = [];
|
|
let valid = false;
|
|
for (const i of val) {
|
|
const str = parsers.parseString(i);
|
|
if (str) {
|
|
font.push(str);
|
|
valid = true;
|
|
continue;
|
|
}
|
|
const key = parsers.parseKeyword(i, keywords);
|
|
if (key) {
|
|
font.push(key);
|
|
valid = true;
|
|
continue;
|
|
}
|
|
const obj = parsers.parseFunction(i);
|
|
if (obj) {
|
|
const { name, value } = obj;
|
|
if (name === "generic" && genericValues.includes(value)) {
|
|
font.push(`${name}(${value})`);
|
|
valid = true;
|
|
continue;
|
|
}
|
|
}
|
|
// This implementation does not strictly follow the specification.
|
|
// The spec does not require the first letter of the font-family to be
|
|
// capitalized, and unquoted font-family names are not restricted to ASCII.
|
|
// However, in the real world, the first letter of the ASCII font-family
|
|
// names are capitalized, and unquoted font-family names do not contain
|
|
// spaces, e.g. `Times`. And non-ASCII font-family names are quoted even
|
|
// without spaces, e.g. `"メイリオ"`.
|
|
// @see https://drafts.csswg.org/css-fonts/#font-family-prop
|
|
if (
|
|
i !== "undefined" &&
|
|
/^(?:[A-Z][A-Za-z\d-]+(?:\s+[A-Z][A-Za-z\d-]+)*|-?[a-z][a-z-]+)$/.test(i)
|
|
) {
|
|
font.push(i.trim());
|
|
valid = true;
|
|
continue;
|
|
}
|
|
if (!valid) {
|
|
return;
|
|
}
|
|
}
|
|
return font.join(", ");
|
|
};
|
|
|
|
module.exports.isValid = function isValid(v) {
|
|
if (v === "") {
|
|
return true;
|
|
}
|
|
return typeof module.exports.parse(v) === "string";
|
|
};
|
|
|
|
module.exports.definition = {
|
|
set(v) {
|
|
v = parsers.prepareValue(v, this._global);
|
|
if (parsers.hasVarFunc(v)) {
|
|
this._setProperty("font", "");
|
|
this._setProperty("font-family", v);
|
|
} else {
|
|
this._setProperty("font-family", module.exports.parse(v));
|
|
}
|
|
},
|
|
get() {
|
|
return this.getPropertyValue("font-family");
|
|
},
|
|
enumerable: true,
|
|
configurable: true
|
|
};
|