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.
74 lines
3.1 KiB
JavaScript
74 lines
3.1 KiB
JavaScript
'use strict';
|
|
module.exports = function generate_oneOf(it, $keyword, $ruleType) {
|
|
var out = ' ';
|
|
var $lvl = it.level;
|
|
var $dataLvl = it.dataLevel;
|
|
var $schema = it.schema[$keyword];
|
|
var $schemaPath = it.schemaPath + it.util.getProperty($keyword);
|
|
var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
|
|
var $breakOnError = !it.opts.allErrors;
|
|
var $data = 'data' + ($dataLvl || '');
|
|
var $valid = 'valid' + $lvl;
|
|
var $errs = 'errs__' + $lvl;
|
|
var $it = it.util.copy(it);
|
|
var $closingBraces = '';
|
|
$it.level++;
|
|
var $nextValid = 'valid' + $it.level;
|
|
var $currentBaseId = $it.baseId,
|
|
$prevValid = 'prevValid' + $lvl,
|
|
$passingSchemas = 'passingSchemas' + $lvl;
|
|
out += 'var ' + ($errs) + ' = errors , ' + ($prevValid) + ' = false , ' + ($valid) + ' = false , ' + ($passingSchemas) + ' = null; ';
|
|
var $wasComposite = it.compositeRule;
|
|
it.compositeRule = $it.compositeRule = true;
|
|
var arr1 = $schema;
|
|
if (arr1) {
|
|
var $sch, $i = -1,
|
|
l1 = arr1.length - 1;
|
|
while ($i < l1) {
|
|
$sch = arr1[$i += 1];
|
|
if ((it.opts.strictKeywords ? (typeof $sch == 'object' && Object.keys($sch).length > 0) || $sch === false : it.util.schemaHasRules($sch, it.RULES.all))) {
|
|
$it.schema = $sch;
|
|
$it.schemaPath = $schemaPath + '[' + $i + ']';
|
|
$it.errSchemaPath = $errSchemaPath + '/' + $i;
|
|
out += ' ' + (it.validate($it)) + ' ';
|
|
$it.baseId = $currentBaseId;
|
|
} else {
|
|
out += ' var ' + ($nextValid) + ' = true; ';
|
|
}
|
|
if ($i) {
|
|
out += ' if (' + ($nextValid) + ' && ' + ($prevValid) + ') { ' + ($valid) + ' = false; ' + ($passingSchemas) + ' = [' + ($passingSchemas) + ', ' + ($i) + ']; } else { ';
|
|
$closingBraces += '}';
|
|
}
|
|
out += ' if (' + ($nextValid) + ') { ' + ($valid) + ' = ' + ($prevValid) + ' = true; ' + ($passingSchemas) + ' = ' + ($i) + '; }';
|
|
}
|
|
}
|
|
it.compositeRule = $it.compositeRule = $wasComposite;
|
|
out += '' + ($closingBraces) + 'if (!' + ($valid) + ') { var err = '; /* istanbul ignore else */
|
|
if (it.createErrors !== false) {
|
|
out += ' { keyword: \'' + ('oneOf') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { passingSchemas: ' + ($passingSchemas) + ' } ';
|
|
if (it.opts.messages !== false) {
|
|
out += ' , message: \'should match exactly one schema in oneOf\' ';
|
|
}
|
|
if (it.opts.verbose) {
|
|
out += ' , schema: validate.schema' + ($schemaPath) + ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
|
|
}
|
|
out += ' } ';
|
|
} else {
|
|
out += ' {} ';
|
|
}
|
|
out += '; if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
|
|
if (!it.compositeRule && $breakOnError) {
|
|
/* istanbul ignore if */
|
|
if (it.async) {
|
|
out += ' throw new ValidationError(vErrors); ';
|
|
} else {
|
|
out += ' validate.errors = vErrors; return false; ';
|
|
}
|
|
}
|
|
out += '} else { errors = ' + ($errs) + '; if (vErrors !== null) { if (' + ($errs) + ') vErrors.length = ' + ($errs) + '; else vErrors = null; }';
|
|
if (it.opts.allErrors) {
|
|
out += ' } ';
|
|
}
|
|
return out;
|
|
}
|