Two related changes bundled together because the diffuser curve files
only make sense once the registry namespace they live in exists.
src/registry — new asset-metadata resolver:
- AssetResolver with synchronous resolve(namespace, id) + lazy cache,
async refresh() for future remote pulls.
- FileBackend (per-id or single-file layouts, case-insensitive) and a
stub HttpBackend (disabled unless EVOLV_ASSET_REMOTE=1).
- Namespaces: curves, menu, monsterSamples, monsterSpecs, units. Menu
namespace re-keys by inner softwareType + filename so editors that
pass either string resolve to the same tree.
- README explains how to add a namespace.
- AssetCategoryManager (datasets/assetData/index.js) becomes a thin
facade over the resolver so existing consumers don't move.
- 246/246 tests pass — including the 39-test registry suite.
datasets/assetData — file moves + new diffuser data:
- modelData/*.json deleted; curves/*.json is the canonical home.
- New diffuser.json menu tree with GVA, Jäger, Aquaconsult/Entec,
PIK/PRK suppliers.
- gva-elastox-r.json migrated from the inline _loadSpecs hardcode,
re-tagged coverageBasis="bottom-coverage-pct" (the legacy 2.4
elements/m² was a prior mis-conversion; we can't recover the
original % so it's a single-point curve under key "0").
- jaeger-jetflex-td-65-2-g-epdm-1000.json — extracted from the Jäger
EPDM-1000mm SSOTE/DWP chart on the data sheet (vector-PDF read).
SSOTE 8.20→6.40 %/m, DWP 25→48 mbar across Q 2-12 Nm³/h. Single
coverage (vendor doesn't state test conditions).
- aerostrip-phoenix.json — 4-coverage SOTE family at 4.75 m water
depth (DD 5/10/15/20 %, flux 10-70 Nm³/h·m²) from the Entec/de
Winter 2023-11-22 dataset; DWP curve from the 21 % @ 4.05 m chart.
- pik300.json / prk300.json — 5-coverage SOTE + SSOTR (DD 5-25 %)
with split DWP per model variant, water depth ≈ 4.0 m inferred from
the SOTE↔SSOTR ratio in the source spreadsheet.
src/configs/diffuser.json:
- New asset.{model, assetTagNumber} block so the editor's selected
model id survives validation.
- diffuser.density description corrected to "Bottom coverage [%]";
default 2.4 → 15 (typical fine-bubble install).
src/configs/{rotatingMachine,valve}.json: small alignment edits that
came with the registry phase.
src/menu/asset.js + src/menu/aquonSamples.js: rewritten as facades
over assetResolver, keeping the editor-side cascade behaviour intact.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
84 lines
3.2 KiB
JavaScript
84 lines
3.2 KiB
JavaScript
'use strict';
|
|
|
|
// AssetCategoryManager is now a thin facade over src/registry/assetResolver.
|
|
// The public surface (getCategory / listCategories / hasCategory / searchCategories)
|
|
// is preserved so existing consumers (src/menu/asset.js, src/helper/assetUtils.js)
|
|
// don't need to change in this phase. New code should use assetResolver directly.
|
|
|
|
const { assetResolver } = require('../../src/registry');
|
|
|
|
class AssetCategoryManager {
|
|
// relPath is retained for signature compatibility with the prior on-disk
|
|
// implementation; it is unused now — the resolver owns file locations.
|
|
constructor(/* relPath = '.' */) {}
|
|
|
|
getCategory(softwareType) {
|
|
if (!softwareType) {
|
|
throw new Error('softwareType is required');
|
|
}
|
|
const data = assetResolver.resolve('menu', softwareType);
|
|
if (!data) {
|
|
throw new Error(`Asset data '${softwareType}' not found in menu namespace`);
|
|
}
|
|
return data;
|
|
}
|
|
|
|
hasCategory(softwareType) {
|
|
if (!softwareType) return false;
|
|
return assetResolver.resolve('menu', softwareType) != null;
|
|
}
|
|
|
|
listCategories({ withMeta = false } = {}) {
|
|
// The resolver indexes each menu file under BOTH its inner softwareType
|
|
// and its filename slug — those may differ. Dedupe by payload identity
|
|
// so we return one entry per source file.
|
|
const seen = new Set();
|
|
const out = [];
|
|
for (const key of assetResolver.list('menu')) {
|
|
const data = assetResolver.resolve('menu', key);
|
|
if (!data || seen.has(data)) continue;
|
|
seen.add(data);
|
|
const softwareType = data.softwareType || key;
|
|
if (withMeta) {
|
|
out.push({
|
|
softwareType,
|
|
label: data.label || softwareType,
|
|
file: `${softwareType}.json`,
|
|
});
|
|
} else {
|
|
out.push(softwareType);
|
|
}
|
|
}
|
|
return out;
|
|
}
|
|
|
|
searchCategories(query) {
|
|
const term = (query || '').trim().toLowerCase();
|
|
if (!term) return [];
|
|
return this.listCategories({ withMeta: true }).filter(
|
|
({ softwareType, label }) =>
|
|
softwareType.toLowerCase().includes(term) ||
|
|
(label || '').toLowerCase().includes(term),
|
|
);
|
|
}
|
|
|
|
clearCache() {
|
|
// Caches live in the resolver namespaces. Force-refresh menu.
|
|
// refresh() is async but the legacy contract here is sync —
|
|
// fire-and-forget; the next resolve() lazily warms in the worst case.
|
|
assetResolver.refresh('menu').catch(() => {});
|
|
}
|
|
}
|
|
|
|
const assetCategoryManager = new AssetCategoryManager();
|
|
|
|
module.exports = {
|
|
AssetCategoryManager,
|
|
assetCategoryManager,
|
|
getCategory: (softwareType) => assetCategoryManager.getCategory(softwareType),
|
|
listCategories: (options) => assetCategoryManager.listCategories(options),
|
|
searchCategories: (query) => assetCategoryManager.searchCategories(query),
|
|
hasCategory: (softwareType) => assetCategoryManager.hasCategory(softwareType),
|
|
clearCache: () => assetCategoryManager.clearCache(),
|
|
};
|