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.
82 lines
3.5 KiB
JavaScript
82 lines
3.5 KiB
JavaScript
'use strict';
|
|
module.exports = function generate_propertyNames(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 $errs = 'errs__' + $lvl;
|
|
var $it = it.util.copy(it);
|
|
var $closingBraces = '';
|
|
$it.level++;
|
|
var $nextValid = 'valid' + $it.level;
|
|
out += 'var ' + ($errs) + ' = errors;';
|
|
if ((it.opts.strictKeywords ? (typeof $schema == 'object' && Object.keys($schema).length > 0) || $schema === false : it.util.schemaHasRules($schema, it.RULES.all))) {
|
|
$it.schema = $schema;
|
|
$it.schemaPath = $schemaPath;
|
|
$it.errSchemaPath = $errSchemaPath;
|
|
var $key = 'key' + $lvl,
|
|
$idx = 'idx' + $lvl,
|
|
$i = 'i' + $lvl,
|
|
$invalidName = '\' + ' + $key + ' + \'',
|
|
$dataNxt = $it.dataLevel = it.dataLevel + 1,
|
|
$nextData = 'data' + $dataNxt,
|
|
$dataProperties = 'dataProperties' + $lvl,
|
|
$ownProperties = it.opts.ownProperties,
|
|
$currentBaseId = it.baseId;
|
|
if ($ownProperties) {
|
|
out += ' var ' + ($dataProperties) + ' = undefined; ';
|
|
}
|
|
if ($ownProperties) {
|
|
out += ' ' + ($dataProperties) + ' = ' + ($dataProperties) + ' || Object.keys(' + ($data) + '); for (var ' + ($idx) + '=0; ' + ($idx) + '<' + ($dataProperties) + '.length; ' + ($idx) + '++) { var ' + ($key) + ' = ' + ($dataProperties) + '[' + ($idx) + ']; ';
|
|
} else {
|
|
out += ' for (var ' + ($key) + ' in ' + ($data) + ') { ';
|
|
}
|
|
out += ' var startErrs' + ($lvl) + ' = errors; ';
|
|
var $passData = $key;
|
|
var $wasComposite = it.compositeRule;
|
|
it.compositeRule = $it.compositeRule = true;
|
|
var $code = it.validate($it);
|
|
$it.baseId = $currentBaseId;
|
|
if (it.util.varOccurences($code, $nextData) < 2) {
|
|
out += ' ' + (it.util.varReplace($code, $nextData, $passData)) + ' ';
|
|
} else {
|
|
out += ' var ' + ($nextData) + ' = ' + ($passData) + '; ' + ($code) + ' ';
|
|
}
|
|
it.compositeRule = $it.compositeRule = $wasComposite;
|
|
out += ' if (!' + ($nextValid) + ') { for (var ' + ($i) + '=startErrs' + ($lvl) + '; ' + ($i) + '<errors; ' + ($i) + '++) { vErrors[' + ($i) + '].propertyName = ' + ($key) + '; } var err = '; /* istanbul ignore else */
|
|
if (it.createErrors !== false) {
|
|
out += ' { keyword: \'' + ('propertyNames') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { propertyName: \'' + ($invalidName) + '\' } ';
|
|
if (it.opts.messages !== false) {
|
|
out += ' , message: \'property name \\\'' + ($invalidName) + '\\\' is invalid\' ';
|
|
}
|
|
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; ';
|
|
}
|
|
}
|
|
if ($breakOnError) {
|
|
out += ' break; ';
|
|
}
|
|
out += ' } }';
|
|
}
|
|
if ($breakOnError) {
|
|
out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
|
|
}
|
|
return out;
|
|
}
|