mirror of
https://github.com/ClearURLs/Addon.git
synced 2024-08-17 07:30:23 +03:00
Fixed #191
Used first code snippets from ClearURLs v2: https://gitlab.com/ClearURLs/core/-/blob/master/src/utils/URLHashParams.ts
This commit is contained in:
parent
0f08b0f7e3
commit
0d7381f02a
@ -27,6 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
||||
- [138](https://github.com/ClearURLs/Addon/issues/138)
|
||||
- [1177](https://gitlab.com/KevinRoebert/ClearUrls/-/issues/1177)
|
||||
- [234](https://github.com/ClearURLs/Addon/issues/234)
|
||||
- [191](https://github.com/ClearURLs/Addon/issues/191)
|
||||
|
||||
## [1.24.1] - 2022-03-25
|
||||
|
||||
|
@ -120,14 +120,10 @@ function countFields(url) {
|
||||
/**
|
||||
* Extract the fragments from an url.
|
||||
* @param {URL} url URL as object
|
||||
* @return {URLSearchParams} fragments as URLSearchParams object
|
||||
* @return {URLHashParams} fragments as URLSearchParams object
|
||||
*/
|
||||
function extractFragments(url) {
|
||||
if (url.hash) {
|
||||
return new URLSearchParams(url.hash.slice(1));
|
||||
} else {
|
||||
return new URLSearchParams();
|
||||
}
|
||||
return new URLHashParams(url)
|
||||
}
|
||||
|
||||
/**
|
||||
|
21
core_js/utils/Multimap.d.ts
vendored
Normal file
21
core_js/utils/Multimap.d.ts
vendored
Normal file
@ -0,0 +1,21 @@
|
||||
/**
|
||||
* Models a multimap backed by a {@link Set}.
|
||||
*/
|
||||
export default class Multimap<K, V> implements Iterable<[K, V]> {
|
||||
private _map;
|
||||
private _size;
|
||||
constructor();
|
||||
get size(): number;
|
||||
get(key: K): Set<V>;
|
||||
put(key: K, value: V): boolean;
|
||||
has(key: K): boolean;
|
||||
hasEntry(key: K, value: V): boolean;
|
||||
delete(key: K): boolean;
|
||||
deleteEntry(key: K, value: V): boolean;
|
||||
clear(): void;
|
||||
entries(): IterableIterator<[K, V]>;
|
||||
values(): IterableIterator<V>;
|
||||
keys(): IterableIterator<K>;
|
||||
forEach<T>(callback: (this: T | this, key: K, value: V, map: this) => void, thisArg?: T): void;
|
||||
[Symbol.iterator](): IterableIterator<[K, V]>;
|
||||
}
|
130
core_js/utils/Multimap.js
Normal file
130
core_js/utils/Multimap.js
Normal file
@ -0,0 +1,130 @@
|
||||
"use strict";
|
||||
/*
|
||||
* ClearURLs
|
||||
* Copyright (c) 2017-2022 Kevin Röbert.
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Models a multimap backed by a {@link Set}.
|
||||
*/
|
||||
class Multimap {
|
||||
constructor() {
|
||||
Object.defineProperty(this, "_map", {
|
||||
enumerable: true,
|
||||
configurable: true,
|
||||
writable: true,
|
||||
value: void 0
|
||||
});
|
||||
Object.defineProperty(this, "_size", {
|
||||
enumerable: true,
|
||||
configurable: true,
|
||||
writable: true,
|
||||
value: void 0
|
||||
});
|
||||
this._size = 0;
|
||||
this._map = new Map();
|
||||
}
|
||||
get size() {
|
||||
return this._size;
|
||||
}
|
||||
get(key) {
|
||||
const values = this._map.get(key);
|
||||
if (values) {
|
||||
return new Set(values);
|
||||
}
|
||||
else {
|
||||
return new Set();
|
||||
}
|
||||
}
|
||||
put(key, value) {
|
||||
let values = this._map.get(key);
|
||||
if (!values) {
|
||||
values = new Set();
|
||||
}
|
||||
const count = values.size;
|
||||
values.add(value);
|
||||
if (values.size === count) {
|
||||
return false;
|
||||
}
|
||||
this._map.set(key, values);
|
||||
this._size++;
|
||||
return true;
|
||||
}
|
||||
has(key) {
|
||||
return this._map.has(key);
|
||||
}
|
||||
hasEntry(key, value) {
|
||||
const values = this._map.get(key);
|
||||
if (!values) {
|
||||
return false;
|
||||
}
|
||||
return values.has(value);
|
||||
}
|
||||
delete(key) {
|
||||
const values = this._map.get(key);
|
||||
if (values && this._map.delete(key)) {
|
||||
this._size -= values.size;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
deleteEntry(key, value) {
|
||||
const values = this._map.get(key);
|
||||
if (values) {
|
||||
if (!values.delete(value)) {
|
||||
return false;
|
||||
}
|
||||
this._size--;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
clear() {
|
||||
this._map.clear();
|
||||
this._size = 0;
|
||||
}
|
||||
entries() {
|
||||
const self = this;
|
||||
function* gen() {
|
||||
for (const [key, values] of self._map.entries()) {
|
||||
for (const value of values) {
|
||||
yield [key, value];
|
||||
}
|
||||
}
|
||||
}
|
||||
return gen();
|
||||
}
|
||||
values() {
|
||||
const self = this;
|
||||
function* gen() {
|
||||
for (const [, value] of self.entries()) {
|
||||
yield value;
|
||||
}
|
||||
}
|
||||
return gen();
|
||||
}
|
||||
keys() {
|
||||
return this._map.keys();
|
||||
}
|
||||
forEach(callback, thisArg) {
|
||||
for (const [key, value] of this.entries()) {
|
||||
callback.call(thisArg === undefined ? this : thisArg, key, value, this);
|
||||
}
|
||||
}
|
||||
[Symbol.iterator]() {
|
||||
return this.entries();
|
||||
}
|
||||
}
|
13
core_js/utils/URLHashParams.d.ts
vendored
Normal file
13
core_js/utils/URLHashParams.d.ts
vendored
Normal file
@ -0,0 +1,13 @@
|
||||
/**
|
||||
* Models a hash parameter of a given {@link URL}.
|
||||
*/
|
||||
export default class URLHashParams {
|
||||
private _params;
|
||||
constructor(url: URL);
|
||||
append(name: string, value?: string | null): void;
|
||||
delete(name: string): void;
|
||||
get(name: string): string | null;
|
||||
getAll(name: string): Set<string | null>;
|
||||
keys(): IterableIterator<string>;
|
||||
toString(): string;
|
||||
}
|
77
core_js/utils/URLHashParams.js
Normal file
77
core_js/utils/URLHashParams.js
Normal file
@ -0,0 +1,77 @@
|
||||
"use strict";
|
||||
/*
|
||||
* ClearURLs
|
||||
* Copyright (c) 2017-2022 Kevin Röbert.
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser 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 Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Models a hash parameter of a given {@link URL}.
|
||||
*/
|
||||
class URLHashParams {
|
||||
constructor(url) {
|
||||
Object.defineProperty(this, "_params", {
|
||||
enumerable: true,
|
||||
configurable: true,
|
||||
writable: true,
|
||||
value: void 0
|
||||
});
|
||||
this._params = new Multimap();
|
||||
const hash = url.hash.slice(1);
|
||||
const params = hash.split('&');
|
||||
for (const p of params) {
|
||||
const param = p.split('=');
|
||||
if (!param[0])
|
||||
continue;
|
||||
const key = param[0];
|
||||
let value = null;
|
||||
if (param.length === 2 && param[1]) {
|
||||
value = param[1];
|
||||
}
|
||||
this._params.put(key, value);
|
||||
}
|
||||
}
|
||||
append(name, value = null) {
|
||||
this._params.put(name, value);
|
||||
}
|
||||
delete(name) {
|
||||
this._params.delete(name);
|
||||
}
|
||||
get(name) {
|
||||
const [first] = this._params.get(name);
|
||||
if (first) {
|
||||
return first;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
getAll(name) {
|
||||
return this._params.get(name);
|
||||
}
|
||||
keys() {
|
||||
return this._params.keys();
|
||||
}
|
||||
toString() {
|
||||
const rtn = [];
|
||||
this._params.forEach((key, value) => {
|
||||
if (value) {
|
||||
rtn.push(key + '=' + value);
|
||||
}
|
||||
else {
|
||||
rtn.push(key);
|
||||
}
|
||||
});
|
||||
return rtn.join('&');
|
||||
}
|
||||
}
|
@ -57,6 +57,8 @@
|
||||
"background": {
|
||||
"scripts": [
|
||||
"browser-polyfill.js",
|
||||
"core_js/utils/Multimap.js",
|
||||
"core_js/utils/URLHashParams.js",
|
||||
"core_js/message_handler.js",
|
||||
"external_js/ip-range-check.js",
|
||||
"core_js/tools.js",
|
||||
|
Loading…
Reference in New Issue
Block a user