alex/yomichan
1
Fork 0
Code Releases Activity

Profile conditions cleanup (#768)

Browse Source 
* Remove conditions.js

* Rename profile-conditions2.js to profile-conditions.js
This commit is contained in:
toasted-nutbread 2020-09-04 17:53:29 -04:00 committed by GitHub
parent e606a78b18
commit 8cd5a2f75f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/bg/background.html
View File

@ -38,7 +38,7 @@
<script src="/bg/js/json-schema.js"></script> <script src="/bg/js/json-schema.js"></script>
<script src="/bg/js/media-utility.js"></script> <script src="/bg/js/media-utility.js"></script>
<script src="/bg/js/options.js"></script> <script src="/bg/js/options.js"></script>
<script src="/bg/js/profile-conditions2.js"></script> <script src="/bg/js/profile-conditions.js"></script>
<script src="/bg/js/request-builder.js"></script> <script src="/bg/js/request-builder.js"></script>
<script src="/bg/js/template-renderer.js"></script> <script src="/bg/js/template-renderer.js"></script>
<script src="/bg/js/text-source-map.js"></script> <script src="/bg/js/text-source-map.js"></script>

145
ext/bg/js/conditions.js
View File

@ -1,145 +0,0 @@
/*
* Copyright (C) 2019-2020 Yomichan Authors
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
function conditionsValidateOptionValue(object, value) {
if (hasOwn(object, 'validate') && !object.validate(value)) {
throw new Error('Invalid value for condition');
}
if (hasOwn(object, 'transform')) {
value = object.transform(value);
if (hasOwn(object, 'validateTransformed') && !object.validateTransformed(value)) {
throw new Error('Invalid value for condition');
}
}
return value;
}
function conditionsValidateOptionInputValue(object, value) {
if (hasOwn(object, 'transformInput')) {
return object.transformInput(value);
}
return null;
}
function conditionsNormalizeOptionValue(descriptors, type, operator, optionValue, isInput) {
if (!hasOwn(descriptors, type)) {
throw new Error('Invalid type');
}
const conditionDescriptor = descriptors[type];
if (!hasOwn(conditionDescriptor.operators, operator)) {
throw new Error('Invalid operator');
}
const operatorDescriptor = conditionDescriptor.operators[operator];
const descriptorArray = [conditionDescriptor, operatorDescriptor];
let transformedValue = optionValue;
let inputTransformedValue = null;
if (isInput) {
for (const descriptor of descriptorArray) {
let value = inputTransformedValue !== null ? inputTransformedValue : transformedValue;
value = conditionsValidateOptionInputValue(descriptor, value);
if (value !== null) {
inputTransformedValue = value;
}
}
if (inputTransformedValue !== null) {
transformedValue = inputTransformedValue;
}
}
for (const descriptor of descriptorArray) {
transformedValue = conditionsValidateOptionValue(descriptor, transformedValue);
}
if (hasOwn(operatorDescriptor, 'transformReverse')) {
transformedValue = operatorDescriptor.transformReverse(transformedValue);
}
return [transformedValue, inputTransformedValue];
}
function conditionsTestValueThrowing(descriptors, type, operator, optionValue, value) {
if (!hasOwn(descriptors, type)) {
throw new Error('Invalid type');
}
const conditionDescriptor = descriptors[type];
if (!hasOwn(conditionDescriptor.operators, operator)) {
throw new Error('Invalid operator');
}
const operatorDescriptor = conditionDescriptor.operators[operator];
if (hasOwn(operatorDescriptor, 'transform')) {
if (hasOwn(operatorDescriptor, 'transformCache')) {
const key = `${optionValue}`;
const transformCache = operatorDescriptor.transformCache;
if (hasOwn(transformCache, key)) {
optionValue = transformCache[key];
} else {
optionValue = operatorDescriptor.transform(optionValue);
transformCache[key] = optionValue;
}
} else {
optionValue = operatorDescriptor.transform(optionValue);
}
}
return operatorDescriptor.test(value, optionValue);
}
function conditionsTestValue(descriptors, type, operator, optionValue, value) {
try {
return conditionsTestValueThrowing(descriptors, type, operator, optionValue, value);
} catch (e) {
return false;
}
}
function conditionsClearCaches(descriptors) {
for (const type in descriptors) {
if (!hasOwn(descriptors, type)) {
continue;
}
const conditionDescriptor = descriptors[type];
if (hasOwn(conditionDescriptor, 'transformCache')) {
conditionDescriptor.transformCache = {};
}
const operatorDescriptors = conditionDescriptor.operators;
for (const operator in operatorDescriptors) {
if (!hasOwn(operatorDescriptors, operator)) {
continue;
}
const operatorDescriptor = operatorDescriptors[operator];
if (hasOwn(operatorDescriptor, 'transformCache')) {
operatorDescriptor.transformCache = {};
}
}
}
}

0
ext/bg/js/profile-conditions2.js → ext/bg/js/profile-conditions.js
View File

2
test/test-profile-conditions.js
View File

@ -24,7 +24,7 @@ vm.execute([
'mixed/js/core.js', 'mixed/js/core.js',
'mixed/js/cache-map.js', 'mixed/js/cache-map.js',
'bg/js/json-schema.js', 'bg/js/json-schema.js',
'bg/js/profile-conditions2.js' 'bg/js/profile-conditions.js'
]); ]);
const [JsonSchemaValidator, ProfileConditions] = vm.get(['JsonSchemaValidator', 'ProfileConditions']); const [JsonSchemaValidator, ProfileConditions] = vm.get(['JsonSchemaValidator', 'ProfileConditions']);