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.
86 lines
3.0 KiB
JavaScript
86 lines
3.0 KiB
JavaScript
'use strict';
|
|
module.exports = function generate_pattern(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 $isData = it.opts.$data && $schema && $schema.$data,
|
|
$schemaValue;
|
|
if ($isData) {
|
|
out += ' var schema' + ($lvl) + ' = ' + (it.util.getData($schema.$data, $dataLvl, it.dataPathArr)) + '; ';
|
|
$schemaValue = 'schema' + $lvl;
|
|
} else {
|
|
$schemaValue = $schema;
|
|
}
|
|
var $regExpCode = it.opts.regExp ? 'regExp' : 'new RegExp';
|
|
if ($isData) {
|
|
out += ' var ' + ($valid) + ' = true; try { ' + ($valid) + ' = ' + ($regExpCode) + '(' + ($schemaValue) + ').test(' + ($data) + '); } catch(e) { ' + ($valid) + ' = false; } if ( ';
|
|
if ($isData) {
|
|
out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'string\') || ';
|
|
}
|
|
out += ' !' + ($valid) + ') {';
|
|
} else {
|
|
var $regexp = it.usePattern($schema);
|
|
out += ' if ( ';
|
|
if ($isData) {
|
|
out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'string\') || ';
|
|
}
|
|
out += ' !' + ($regexp) + '.test(' + ($data) + ') ) {';
|
|
}
|
|
var $$outStack = $$outStack || [];
|
|
$$outStack.push(out);
|
|
out = ''; /* istanbul ignore else */
|
|
if (it.createErrors !== false) {
|
|
out += ' { keyword: \'' + ('pattern') + '\' , dataPath: (dataPath || \'\') + ' + (it.errorPath) + ' , schemaPath: ' + (it.util.toQuotedString($errSchemaPath)) + ' , params: { pattern: ';
|
|
if ($isData) {
|
|
out += '' + ($schemaValue);
|
|
} else {
|
|
out += '' + (it.util.toQuotedString($schema));
|
|
}
|
|
out += ' } ';
|
|
if (it.opts.messages !== false) {
|
|
out += ' , message: \'should match pattern "';
|
|
if ($isData) {
|
|
out += '\' + ' + ($schemaValue) + ' + \'';
|
|
} else {
|
|
out += '' + (it.util.escapeQuotes($schema));
|
|
}
|
|
out += '"\' ';
|
|
}
|
|
if (it.opts.verbose) {
|
|
out += ' , schema: ';
|
|
if ($isData) {
|
|
out += 'validate.schema' + ($schemaPath);
|
|
} else {
|
|
out += '' + (it.util.toQuotedString($schema));
|
|
}
|
|
out += ' , parentSchema: validate.schema' + (it.schemaPath) + ' , data: ' + ($data) + ' ';
|
|
}
|
|
out += ' } ';
|
|
} else {
|
|
out += ' {} ';
|
|
}
|
|
var __err = out;
|
|
out = $$outStack.pop();
|
|
if (!it.compositeRule && $breakOnError) {
|
|
/* istanbul ignore if */
|
|
if (it.async) {
|
|
out += ' throw new ValidationError([' + (__err) + ']); ';
|
|
} else {
|
|
out += ' validate.errors = [' + (__err) + ']; return false; ';
|
|
}
|
|
} else {
|
|
out += ' var err = ' + (__err) + '; if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
|
|
}
|
|
out += '} ';
|
|
if ($breakOnError) {
|
|
out += ' else { ';
|
|
}
|
|
return out;
|
|
}
|