mirror of
https://github.com/zvx-echo6/meshai.git
synced 2026-08-26 17:31:34 +00:00
* feat(region-routing): P1 tagging + region_routes primitive + read/write API + preview launcher - config.py: add Coverage.region_tagging (bool=False); add RegionRouteMatrix dataclass (enabled, cells) above NotificationsConfig; add region_routes field to NotificationsConfig; add explicit hydration branch for region_routes in _dict_to_dataclass mirroring destinations pattern. - coverage_area.py: add MonitoringArea.name (str|None=None, frozen); update areas_from_config to preserve name; refactor inline geom extraction from classify_event_areas into shared _event_geom_json helper; add matching_area_names(geom_json, areas)->list[str] (additive, all named matches, config-order, deduped; gate unchanged); add event_region_names convenience wrapper. - coverage_filter.py: add region_tagging ctor kwarg; stamp event.region/ regions before the gate when region_tagging=True and areas non-empty and not event.regions (never clobbers satpass preset). - pipeline/__init__.py: wire region_tagging into CoverageFilter construction. - notification_routes.py: add GET /notifications/regions (named coverage area names, config-order, deduped); GET /notifications/region-routing (matrix as JSON); POST /notifications/region-routing (explicit RMW — only region_routes changes, toggles/rules/destinations survive). - scripts/preview_dashboard.py: mesh-free launcher — dashboard API only, no mesh connector, no broadcast loop; vite runs separately. All 87 coverage tests pass; 300 total pass; 6 pre-existing failures unchanged (adapter config count mismatch + MeshCore EventType.NEW_CONTACT). * feat(region-routing): manual region x family matrix editor page Adds RegionRoutingMatrix.tsx — a plain editor over the region_routes config primitive. Rows = families (via useFamilies()), cols = regions (from GET /api/notifications/regions). Each cell exposes MT channel (ChannelPicker single + includeDisabled), MC channel name (text input), min_severity select (routine/priority/critical/immediate), and an enabled checkbox. Only cells where MT or MC is set are included in the sparse POST payload. Master enable toggle maps to top-level enabled. MT budget guard warns when more than 7 distinct MT indices are in use. Sticky family column; horizontal scroll for wide region sets. Registers route /region-routing in App.tsx and adds "Region Routing" nav entry (Map icon) under the Meshtastic section in Layout.tsx, immediately after Routing. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> * fix(region-routing): regions endpoint reads saved (disk) coverage so routing columns are dynamic without a bot restart; preview reloads config after writes * feat(routing): unify MT/MC routing into per-family cards; region routing as an in-card expand; remove rules/destinations UI + standalone page * refactor(routing): move Meshtastic Routing from /notifications to /meshtastic/routing (mirror /meshcore/routing); redirect legacy path * feat(region-routing): dispatcher honors region_routes matrix (authoritative-on-match, per-region cooldown, per-channel dedup); non-matrix path unchanged Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> * fix(region-routing): matrix dedup key must match boot-restore 2-tuple form (prevents restart re-broadcast flood); regression test --------- Co-authored-by: Matt Johnson <mj@k7zvx.com> Co-authored-by: Claude Sonnet 4.6 <noreply@anthropic.com>
361 lines
8.8 KiB
JavaScript
361 lines
8.8 KiB
JavaScript
const { AtRule, Rule } = require('postcss')
|
|
let parser = require('postcss-selector-parser')
|
|
|
|
/**
|
|
* Run a selector string through postcss-selector-parser
|
|
*/
|
|
function parse(rawSelector, rule) {
|
|
let nodes
|
|
try {
|
|
parser(parsed => {
|
|
nodes = parsed
|
|
}).processSync(rawSelector)
|
|
} catch (e) {
|
|
if (rawSelector.includes(':')) {
|
|
throw rule ? rule.error('Missed semicolon') : e
|
|
} else {
|
|
throw rule ? rule.error(e.message) : e
|
|
}
|
|
}
|
|
return nodes.at(0)
|
|
}
|
|
|
|
/**
|
|
* Replaces the "&" token in a node's selector with the parent selector
|
|
* similar to what SCSS does.
|
|
*
|
|
* Mutates the nodes list
|
|
*/
|
|
function interpolateAmpInSelector(nodes, parent) {
|
|
let replaced = false
|
|
nodes.each(node => {
|
|
if (node.type === 'nesting') {
|
|
let clonedParent = parent.clone({})
|
|
if (node.value !== '&') {
|
|
node.replaceWith(
|
|
parse(node.value.replace('&', clonedParent.toString()))
|
|
)
|
|
} else {
|
|
node.replaceWith(clonedParent)
|
|
}
|
|
replaced = true
|
|
} else if ('nodes' in node && node.nodes) {
|
|
if (interpolateAmpInSelector(node, parent)) {
|
|
replaced = true
|
|
}
|
|
}
|
|
})
|
|
return replaced
|
|
}
|
|
|
|
/**
|
|
* Combines parent and child selectors, in a SCSS-like way
|
|
*/
|
|
function mergeSelectors(parent, child) {
|
|
let merged = []
|
|
parent.selectors.forEach(sel => {
|
|
let parentNode = parse(sel, parent)
|
|
|
|
child.selectors.forEach(selector => {
|
|
if (!selector) {
|
|
return
|
|
}
|
|
let node = parse(selector, child)
|
|
let replaced = interpolateAmpInSelector(node, parentNode)
|
|
if (!replaced) {
|
|
node.prepend(parser.combinator({ value: ' ' }))
|
|
node.prepend(parentNode.clone({}))
|
|
}
|
|
merged.push(node.toString())
|
|
})
|
|
})
|
|
return merged
|
|
}
|
|
|
|
/**
|
|
* Move a child and its preceeding comment(s) to after "after"
|
|
*/
|
|
function breakOut(child, after) {
|
|
let prev = child.prev()
|
|
after.after(child)
|
|
while (prev && prev.type === 'comment') {
|
|
let nextPrev = prev.prev()
|
|
after.after(prev)
|
|
prev = nextPrev
|
|
}
|
|
return child
|
|
}
|
|
|
|
function createFnAtruleChilds(bubble) {
|
|
return function atruleChilds(rule, atrule, bubbling, mergeSels = bubbling) {
|
|
let children = []
|
|
atrule.each(child => {
|
|
if (child.type === 'rule' && bubbling) {
|
|
if (mergeSels) {
|
|
child.selectors = mergeSelectors(rule, child)
|
|
}
|
|
} else if (child.type === 'atrule' && child.nodes) {
|
|
if (bubble[child.name]) {
|
|
atruleChilds(rule, child, mergeSels)
|
|
} else if (atrule[rootRuleMergeSel] !== false) {
|
|
children.push(child)
|
|
}
|
|
} else {
|
|
children.push(child)
|
|
}
|
|
})
|
|
if (bubbling) {
|
|
if (children.length) {
|
|
let clone = rule.clone({ nodes: [] })
|
|
for (let child of children) {
|
|
clone.append(child)
|
|
}
|
|
atrule.prepend(clone)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
function pickDeclarations(selector, declarations, after) {
|
|
let parent = new Rule({
|
|
nodes: [],
|
|
selector
|
|
})
|
|
parent.append(declarations)
|
|
after.after(parent)
|
|
return parent
|
|
}
|
|
|
|
function atruleNames(defaults, custom) {
|
|
let list = {}
|
|
for (let name of defaults) {
|
|
list[name] = true
|
|
}
|
|
if (custom) {
|
|
for (let name of custom) {
|
|
list[name.replace(/^@/, '')] = true
|
|
}
|
|
}
|
|
return list
|
|
}
|
|
|
|
function parseRootRuleParams(params) {
|
|
params = params.trim()
|
|
let braceBlock = params.match(/^\((.*)\)$/)
|
|
if (!braceBlock) {
|
|
return { selector: params, type: 'basic' }
|
|
}
|
|
let bits = braceBlock[1].match(/^(with(?:out)?):(.+)$/)
|
|
if (bits) {
|
|
let allowlist = bits[1] === 'with'
|
|
let rules = Object.fromEntries(
|
|
bits[2]
|
|
.trim()
|
|
.split(/\s+/)
|
|
.map(name => [name, true])
|
|
)
|
|
if (allowlist && rules.all) {
|
|
return { type: 'noop' }
|
|
}
|
|
let escapes = rule => !!rules[rule]
|
|
if (rules.all) {
|
|
escapes = () => true
|
|
} else if (allowlist) {
|
|
escapes = rule => (rule === 'all' ? false : !rules[rule])
|
|
}
|
|
|
|
return {
|
|
escapes,
|
|
type: 'withrules'
|
|
}
|
|
}
|
|
// Unrecognized brace block
|
|
return { type: 'unknown' }
|
|
}
|
|
|
|
function getAncestorRules(leaf) {
|
|
let lineage = []
|
|
let parent = leaf.parent
|
|
|
|
while (parent && parent instanceof AtRule) {
|
|
lineage.push(parent)
|
|
parent = parent.parent
|
|
}
|
|
return lineage
|
|
}
|
|
|
|
function unwrapRootRule(rule) {
|
|
let escapes = rule[rootRuleEscapes]
|
|
|
|
if (!escapes) {
|
|
rule.after(rule.nodes)
|
|
} else {
|
|
let nodes = rule.nodes
|
|
|
|
let topEscaped
|
|
let topEscapedIdx = -1
|
|
let breakoutLeaf
|
|
let breakoutRoot
|
|
let clone
|
|
|
|
let lineage = getAncestorRules(rule)
|
|
lineage.forEach((parent, i) => {
|
|
if (escapes(parent.name)) {
|
|
topEscaped = parent
|
|
topEscapedIdx = i
|
|
breakoutRoot = clone
|
|
} else {
|
|
let oldClone = clone
|
|
clone = parent.clone({ nodes: [] })
|
|
oldClone && clone.append(oldClone)
|
|
breakoutLeaf = breakoutLeaf || clone
|
|
}
|
|
})
|
|
|
|
if (!topEscaped) {
|
|
rule.after(nodes)
|
|
} else if (!breakoutRoot) {
|
|
topEscaped.after(nodes)
|
|
} else {
|
|
let leaf = breakoutLeaf
|
|
leaf.append(nodes)
|
|
topEscaped.after(breakoutRoot)
|
|
}
|
|
|
|
if (rule.next() && topEscaped) {
|
|
let restRoot
|
|
lineage.slice(0, topEscapedIdx + 1).forEach((parent, i, arr) => {
|
|
let oldRoot = restRoot
|
|
restRoot = parent.clone({ nodes: [] })
|
|
oldRoot && restRoot.append(oldRoot)
|
|
|
|
let nextSibs = []
|
|
let _child = arr[i - 1] || rule
|
|
let next = _child.next()
|
|
while (next) {
|
|
nextSibs.push(next)
|
|
next = next.next()
|
|
}
|
|
restRoot.append(nextSibs)
|
|
})
|
|
restRoot && (breakoutRoot || nodes[nodes.length - 1]).after(restRoot)
|
|
}
|
|
}
|
|
|
|
rule.remove()
|
|
}
|
|
|
|
const rootRuleMergeSel = Symbol('rootRuleMergeSel')
|
|
const rootRuleEscapes = Symbol('rootRuleEscapes')
|
|
|
|
function normalizeRootRule(rule) {
|
|
let { params } = rule
|
|
let { escapes, selector, type } = parseRootRuleParams(params)
|
|
if (type === 'unknown') {
|
|
throw rule.error(
|
|
`Unknown @${rule.name} parameter ${JSON.stringify(params)}`
|
|
)
|
|
}
|
|
if (type === 'basic' && selector) {
|
|
let selectorBlock = new Rule({ nodes: rule.nodes, selector })
|
|
rule.removeAll()
|
|
rule.append(selectorBlock)
|
|
}
|
|
rule[rootRuleEscapes] = escapes
|
|
rule[rootRuleMergeSel] = escapes ? !escapes('all') : type === 'noop'
|
|
}
|
|
|
|
const hasRootRule = Symbol('hasRootRule')
|
|
|
|
module.exports = (opts = {}) => {
|
|
let bubble = atruleNames(
|
|
['media', 'supports', 'layer', 'container', 'starting-style'],
|
|
opts.bubble
|
|
)
|
|
let atruleChilds = createFnAtruleChilds(bubble)
|
|
let unwrap = atruleNames(
|
|
[
|
|
'document',
|
|
'font-face',
|
|
'keyframes',
|
|
'-webkit-keyframes',
|
|
'-moz-keyframes'
|
|
],
|
|
opts.unwrap
|
|
)
|
|
let rootRuleName = (opts.rootRuleName || 'at-root').replace(/^@/, '')
|
|
let preserveEmpty = opts.preserveEmpty
|
|
|
|
return {
|
|
Once(root) {
|
|
root.walkAtRules(rootRuleName, node => {
|
|
normalizeRootRule(node)
|
|
root[hasRootRule] = true
|
|
})
|
|
},
|
|
|
|
postcssPlugin: 'postcss-nested',
|
|
|
|
RootExit(root) {
|
|
if (root[hasRootRule]) {
|
|
root.walkAtRules(rootRuleName, unwrapRootRule)
|
|
root[hasRootRule] = false
|
|
}
|
|
},
|
|
|
|
Rule(rule) {
|
|
let unwrapped = false
|
|
let after = rule
|
|
let copyDeclarations = false
|
|
let declarations = []
|
|
|
|
rule.each(child => {
|
|
if (child.type === 'rule') {
|
|
if (declarations.length) {
|
|
after = pickDeclarations(rule.selector, declarations, after)
|
|
declarations = []
|
|
}
|
|
|
|
copyDeclarations = true
|
|
unwrapped = true
|
|
child.selectors = mergeSelectors(rule, child)
|
|
after = breakOut(child, after)
|
|
} else if (child.type === 'atrule') {
|
|
if (declarations.length) {
|
|
after = pickDeclarations(rule.selector, declarations, after)
|
|
declarations = []
|
|
}
|
|
if (child.name === rootRuleName) {
|
|
unwrapped = true
|
|
atruleChilds(rule, child, true, child[rootRuleMergeSel])
|
|
after = breakOut(child, after)
|
|
} else if (bubble[child.name]) {
|
|
copyDeclarations = true
|
|
unwrapped = true
|
|
atruleChilds(rule, child, true)
|
|
after = breakOut(child, after)
|
|
} else if (unwrap[child.name]) {
|
|
copyDeclarations = true
|
|
unwrapped = true
|
|
atruleChilds(rule, child, false)
|
|
after = breakOut(child, after)
|
|
} else if (copyDeclarations) {
|
|
declarations.push(child)
|
|
}
|
|
} else if (child.type === 'decl' && copyDeclarations) {
|
|
declarations.push(child)
|
|
}
|
|
})
|
|
|
|
if (declarations.length) {
|
|
after = pickDeclarations(rule.selector, declarations, after)
|
|
}
|
|
|
|
if (unwrapped && preserveEmpty !== true) {
|
|
rule.raws.semicolon = true
|
|
if (rule.nodes.length === 0) rule.remove()
|
|
}
|
|
}
|
|
}
|
|
}
|
|
module.exports.postcss = true
|