Skip to content

Commit 009cb3a

Browse files
kristojorgkristojorg
authored
Remove containers from deprecated PublicationServer (#323)
1 parent 598e8d6 commit 009cb3a

File tree

3 files changed

+106
-124
lines changed

3 files changed

+106
-124
lines changed

‎Sources/Navigator/EPUB/Assets/Static/scripts/readium-fixed.js

+53-60
Original file line numberDiff line numberDiff line change
@@ -6329,9 +6329,9 @@ module.exports = function shimStringTrim() {
63296329
var GetIntrinsic = __webpack_require__(/*! get-intrinsic */ "./node_modules/get-intrinsic/index.js");
63306330

63316331
var CodePointAt = __webpack_require__(/*! ./CodePointAt */ "./node_modules/es-abstract/2022/CodePointAt.js");
6332-
var IsIntegralNumber = __webpack_require__(/*! ./IsIntegralNumber */ "./node_modules/es-abstract/2022/IsIntegralNumber.js");
63336332
var Type = __webpack_require__(/*! ./Type */ "./node_modules/es-abstract/2022/Type.js");
63346333

6334+
var isInteger = __webpack_require__(/*! ../helpers/isInteger */ "./node_modules/es-abstract/helpers/isInteger.js");
63356335
var MAX_SAFE_INTEGER = __webpack_require__(/*! ../helpers/maxSafeInteger */ "./node_modules/es-abstract/helpers/maxSafeInteger.js");
63366336

63376337
var $TypeError = GetIntrinsic('%TypeError%');
@@ -6342,7 +6342,7 @@ module.exports = function AdvanceStringIndex(S, index, unicode) {
63426342
if (Type(S) !== 'String') {
63436343
throw new $TypeError('Assertion failed: `S` must be a String');
63446344
}
6345-
if (!IsIntegralNumber(index) || index < 0 || index > MAX_SAFE_INTEGER) {
6345+
if (!isInteger(index) || index < 0 || index > MAX_SAFE_INTEGER) {
63466346
throw new $TypeError('Assertion failed: `length` must be an integer >= 0 and <= 2**53');
63476347
}
63486348
if (Type(unicode) !== 'Boolean') {
@@ -6838,22 +6838,24 @@ var GetIntrinsic = __webpack_require__(/*! get-intrinsic */ "./node_modules/get-
68386838

68396839
var $TypeError = GetIntrinsic('%TypeError%');
68406840

6841+
var inspect = __webpack_require__(/*! object-inspect */ "./node_modules/object-inspect/index.js");
6842+
68416843
var IsPropertyKey = __webpack_require__(/*! ./IsPropertyKey */ "./node_modules/es-abstract/2022/IsPropertyKey.js");
6842-
var ToObject = __webpack_require__(/*! ./ToObject */ "./node_modules/es-abstract/2022/ToObject.js");
6844+
// var ToObject = require('./ToObject');
68436845

68446846
// https://262.ecma-international.org/6.0/#sec-getv
68456847

68466848
module.exports = function GetV(V, P) {
68476849
// 7.3.2.1
68486850
if (!IsPropertyKey(P)) {
6849-
throw new $TypeError('Assertion failed: IsPropertyKey(P) is not true');
6851+
throw new $TypeError('Assertion failed: IsPropertyKey(P) is not true, got ' + inspect(P));
68506852
}
68516853

68526854
// 7.3.2.2-3
6853-
var O = ToObject(V);
6855+
// var O = ToObject(V);
68546856

68556857
// 7.3.2.4
6856-
return O[P];
6858+
return V[P];
68576859
};
68586860

68596861

@@ -7007,35 +7009,6 @@ module.exports = function IsDataDescriptor(Desc) {
70077009
};
70087010

70097011

7010-
/***/ }),
7011-
7012-
/***/ "./node_modules/es-abstract/2022/IsIntegralNumber.js":
7013-
/*!***********************************************************!*\
7014-
!*** ./node_modules/es-abstract/2022/IsIntegralNumber.js ***!
7015-
\***********************************************************/
7016-
/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
7017-
7018-
"use strict";
7019-
7020-
7021-
var abs = __webpack_require__(/*! ./abs */ "./node_modules/es-abstract/2022/abs.js");
7022-
var floor = __webpack_require__(/*! ./floor */ "./node_modules/es-abstract/2022/floor.js");
7023-
var Type = __webpack_require__(/*! ./Type */ "./node_modules/es-abstract/2022/Type.js");
7024-
7025-
var $isNaN = __webpack_require__(/*! ../helpers/isNaN */ "./node_modules/es-abstract/helpers/isNaN.js");
7026-
var $isFinite = __webpack_require__(/*! ../helpers/isFinite */ "./node_modules/es-abstract/helpers/isFinite.js");
7027-
7028-
// https://tc39.es/ecma262/#sec-isintegralnumber
7029-
7030-
module.exports = function IsIntegralNumber(argument) {
7031-
if (Type(argument) !== 'Number' || $isNaN(argument) || !$isFinite(argument)) {
7032-
return false;
7033-
}
7034-
var absValue = abs(argument);
7035-
return floor(absValue) === absValue;
7036-
};
7037-
7038-
70397012
/***/ }),
70407013

70417014
/***/ "./node_modules/es-abstract/2022/IsPropertyKey.js":
@@ -7501,31 +7474,6 @@ module.exports = function ToNumber(argument) {
75017474
};
75027475

75037476

7504-
/***/ }),
7505-
7506-
/***/ "./node_modules/es-abstract/2022/ToObject.js":
7507-
/*!***************************************************!*\
7508-
!*** ./node_modules/es-abstract/2022/ToObject.js ***!
7509-
\***************************************************/
7510-
/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
7511-
7512-
"use strict";
7513-
7514-
7515-
var GetIntrinsic = __webpack_require__(/*! get-intrinsic */ "./node_modules/get-intrinsic/index.js");
7516-
7517-
var $Object = GetIntrinsic('%Object%');
7518-
7519-
var RequireObjectCoercible = __webpack_require__(/*! ./RequireObjectCoercible */ "./node_modules/es-abstract/2022/RequireObjectCoercible.js");
7520-
7521-
// https://262.ecma-international.org/6.0/#sec-toobject
7522-
7523-
module.exports = function ToObject(value) {
7524-
RequireObjectCoercible(value);
7525-
return $Object(value);
7526-
};
7527-
7528-
75297477
/***/ }),
75307478

75317479
/***/ "./node_modules/es-abstract/2022/ToPrimitive.js":
@@ -7925,6 +7873,7 @@ var $TypeError = GetIntrinsic('%TypeError%');
79257873
var $SyntaxError = GetIntrinsic('%SyntaxError%');
79267874

79277875
var has = __webpack_require__(/*! has */ "./node_modules/has/src/index.js");
7876+
var isInteger = __webpack_require__(/*! ./isInteger */ "./node_modules/es-abstract/helpers/isInteger.js");
79287877

79297878
var isMatchRecord = __webpack_require__(/*! ./isMatchRecord */ "./node_modules/es-abstract/helpers/isMatchRecord.js");
79307879

@@ -7976,6 +7925,21 @@ var predicates = {
79767925
&& has(value, '[[Completion]]') // TODO: confirm is a completion record
79777926
&& has(value, '[[Capability]]')
79787927
&& predicates['PromiseCapability Record'](value['[[Capability]]']);
7928+
},
7929+
'RegExp Record': function isRegExpRecord(value) {
7930+
return value
7931+
&& has(value, '[[IgnoreCase]]')
7932+
&& typeof value['[[IgnoreCase]]'] === 'boolean'
7933+
&& has(value, '[[Multiline]]')
7934+
&& typeof value['[[Multiline]]'] === 'boolean'
7935+
&& has(value, '[[DotAll]]')
7936+
&& typeof value['[[DotAll]]'] === 'boolean'
7937+
&& has(value, '[[Unicode]]')
7938+
&& typeof value['[[Unicode]]'] === 'boolean'
7939+
&& has(value, '[[CapturingGroupsCount]]')
7940+
&& typeof value['[[CapturingGroupsCount]]'] === 'number'
7941+
&& isInteger(value['[[CapturingGroupsCount]]'])
7942+
&& value['[[CapturingGroupsCount]]'] >= 0;
79797943
}
79807944
};
79817945

@@ -8062,6 +8026,35 @@ var $isNaN = __webpack_require__(/*! ./isNaN */ "./node_modules/es-abstract/help
80628026
module.exports = function (x) { return (typeof x === 'number' || typeof x === 'bigint') && !$isNaN(x) && x !== Infinity && x !== -Infinity; };
80638027

80648028

8029+
/***/ }),
8030+
8031+
/***/ "./node_modules/es-abstract/helpers/isInteger.js":
8032+
/*!*******************************************************!*\
8033+
!*** ./node_modules/es-abstract/helpers/isInteger.js ***!
8034+
\*******************************************************/
8035+
/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
8036+
8037+
"use strict";
8038+
8039+
8040+
var GetIntrinsic = __webpack_require__(/*! get-intrinsic */ "./node_modules/get-intrinsic/index.js");
8041+
8042+
var $abs = GetIntrinsic('%Math.abs%');
8043+
var $floor = GetIntrinsic('%Math.floor%');
8044+
8045+
var $isNaN = __webpack_require__(/*! ./isNaN */ "./node_modules/es-abstract/helpers/isNaN.js");
8046+
var $isFinite = __webpack_require__(/*! ./isFinite */ "./node_modules/es-abstract/helpers/isFinite.js");
8047+
8048+
module.exports = function isInteger(argument) {
8049+
if (typeof argument !== 'number' || $isNaN(argument) || !$isFinite(argument)) {
8050+
return false;
8051+
}
8052+
var absValue = $abs(argument);
8053+
return $floor(absValue) === absValue;
8054+
};
8055+
8056+
8057+
80658058
/***/ }),
80668059

80678060
/***/ "./node_modules/es-abstract/helpers/isLeadingSurrogate.js":

‎Sources/Navigator/EPUB/Assets/Static/scripts/readium-reflowable.js

+53-60
Original file line numberDiff line numberDiff line change
@@ -6329,9 +6329,9 @@ module.exports = function shimStringTrim() {
63296329
var GetIntrinsic = __webpack_require__(/*! get-intrinsic */ "./node_modules/get-intrinsic/index.js");
63306330

63316331
var CodePointAt = __webpack_require__(/*! ./CodePointAt */ "./node_modules/es-abstract/2022/CodePointAt.js");
6332-
var IsIntegralNumber = __webpack_require__(/*! ./IsIntegralNumber */ "./node_modules/es-abstract/2022/IsIntegralNumber.js");
63336332
var Type = __webpack_require__(/*! ./Type */ "./node_modules/es-abstract/2022/Type.js");
63346333

6334+
var isInteger = __webpack_require__(/*! ../helpers/isInteger */ "./node_modules/es-abstract/helpers/isInteger.js");
63356335
var MAX_SAFE_INTEGER = __webpack_require__(/*! ../helpers/maxSafeInteger */ "./node_modules/es-abstract/helpers/maxSafeInteger.js");
63366336

63376337
var $TypeError = GetIntrinsic('%TypeError%');
@@ -6342,7 +6342,7 @@ module.exports = function AdvanceStringIndex(S, index, unicode) {
63426342
if (Type(S) !== 'String') {
63436343
throw new $TypeError('Assertion failed: `S` must be a String');
63446344
}
6345-
if (!IsIntegralNumber(index) || index < 0 || index > MAX_SAFE_INTEGER) {
6345+
if (!isInteger(index) || index < 0 || index > MAX_SAFE_INTEGER) {
63466346
throw new $TypeError('Assertion failed: `length` must be an integer >= 0 and <= 2**53');
63476347
}
63486348
if (Type(unicode) !== 'Boolean') {
@@ -6838,22 +6838,24 @@ var GetIntrinsic = __webpack_require__(/*! get-intrinsic */ "./node_modules/get-
68386838

68396839
var $TypeError = GetIntrinsic('%TypeError%');
68406840

6841+
var inspect = __webpack_require__(/*! object-inspect */ "./node_modules/object-inspect/index.js");
6842+
68416843
var IsPropertyKey = __webpack_require__(/*! ./IsPropertyKey */ "./node_modules/es-abstract/2022/IsPropertyKey.js");
6842-
var ToObject = __webpack_require__(/*! ./ToObject */ "./node_modules/es-abstract/2022/ToObject.js");
6844+
// var ToObject = require('./ToObject');
68436845

68446846
// https://262.ecma-international.org/6.0/#sec-getv
68456847

68466848
module.exports = function GetV(V, P) {
68476849
// 7.3.2.1
68486850
if (!IsPropertyKey(P)) {
6849-
throw new $TypeError('Assertion failed: IsPropertyKey(P) is not true');
6851+
throw new $TypeError('Assertion failed: IsPropertyKey(P) is not true, got ' + inspect(P));
68506852
}
68516853

68526854
// 7.3.2.2-3
6853-
var O = ToObject(V);
6855+
// var O = ToObject(V);
68546856

68556857
// 7.3.2.4
6856-
return O[P];
6858+
return V[P];
68576859
};
68586860

68596861

@@ -7007,35 +7009,6 @@ module.exports = function IsDataDescriptor(Desc) {
70077009
};
70087010

70097011

7010-
/***/ }),
7011-
7012-
/***/ "./node_modules/es-abstract/2022/IsIntegralNumber.js":
7013-
/*!***********************************************************!*\
7014-
!*** ./node_modules/es-abstract/2022/IsIntegralNumber.js ***!
7015-
\***********************************************************/
7016-
/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
7017-
7018-
"use strict";
7019-
7020-
7021-
var abs = __webpack_require__(/*! ./abs */ "./node_modules/es-abstract/2022/abs.js");
7022-
var floor = __webpack_require__(/*! ./floor */ "./node_modules/es-abstract/2022/floor.js");
7023-
var Type = __webpack_require__(/*! ./Type */ "./node_modules/es-abstract/2022/Type.js");
7024-
7025-
var $isNaN = __webpack_require__(/*! ../helpers/isNaN */ "./node_modules/es-abstract/helpers/isNaN.js");
7026-
var $isFinite = __webpack_require__(/*! ../helpers/isFinite */ "./node_modules/es-abstract/helpers/isFinite.js");
7027-
7028-
// https://tc39.es/ecma262/#sec-isintegralnumber
7029-
7030-
module.exports = function IsIntegralNumber(argument) {
7031-
if (Type(argument) !== 'Number' || $isNaN(argument) || !$isFinite(argument)) {
7032-
return false;
7033-
}
7034-
var absValue = abs(argument);
7035-
return floor(absValue) === absValue;
7036-
};
7037-
7038-
70397012
/***/ }),
70407013

70417014
/***/ "./node_modules/es-abstract/2022/IsPropertyKey.js":
@@ -7501,31 +7474,6 @@ module.exports = function ToNumber(argument) {
75017474
};
75027475

75037476

7504-
/***/ }),
7505-
7506-
/***/ "./node_modules/es-abstract/2022/ToObject.js":
7507-
/*!***************************************************!*\
7508-
!*** ./node_modules/es-abstract/2022/ToObject.js ***!
7509-
\***************************************************/
7510-
/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
7511-
7512-
"use strict";
7513-
7514-
7515-
var GetIntrinsic = __webpack_require__(/*! get-intrinsic */ "./node_modules/get-intrinsic/index.js");
7516-
7517-
var $Object = GetIntrinsic('%Object%');
7518-
7519-
var RequireObjectCoercible = __webpack_require__(/*! ./RequireObjectCoercible */ "./node_modules/es-abstract/2022/RequireObjectCoercible.js");
7520-
7521-
// https://262.ecma-international.org/6.0/#sec-toobject
7522-
7523-
module.exports = function ToObject(value) {
7524-
RequireObjectCoercible(value);
7525-
return $Object(value);
7526-
};
7527-
7528-
75297477
/***/ }),
75307478

75317479
/***/ "./node_modules/es-abstract/2022/ToPrimitive.js":
@@ -7925,6 +7873,7 @@ var $TypeError = GetIntrinsic('%TypeError%');
79257873
var $SyntaxError = GetIntrinsic('%SyntaxError%');
79267874

79277875
var has = __webpack_require__(/*! has */ "./node_modules/has/src/index.js");
7876+
var isInteger = __webpack_require__(/*! ./isInteger */ "./node_modules/es-abstract/helpers/isInteger.js");
79287877

79297878
var isMatchRecord = __webpack_require__(/*! ./isMatchRecord */ "./node_modules/es-abstract/helpers/isMatchRecord.js");
79307879

@@ -7976,6 +7925,21 @@ var predicates = {
79767925
&& has(value, '[[Completion]]') // TODO: confirm is a completion record
79777926
&& has(value, '[[Capability]]')
79787927
&& predicates['PromiseCapability Record'](value['[[Capability]]']);
7928+
},
7929+
'RegExp Record': function isRegExpRecord(value) {
7930+
return value
7931+
&& has(value, '[[IgnoreCase]]')
7932+
&& typeof value['[[IgnoreCase]]'] === 'boolean'
7933+
&& has(value, '[[Multiline]]')
7934+
&& typeof value['[[Multiline]]'] === 'boolean'
7935+
&& has(value, '[[DotAll]]')
7936+
&& typeof value['[[DotAll]]'] === 'boolean'
7937+
&& has(value, '[[Unicode]]')
7938+
&& typeof value['[[Unicode]]'] === 'boolean'
7939+
&& has(value, '[[CapturingGroupsCount]]')
7940+
&& typeof value['[[CapturingGroupsCount]]'] === 'number'
7941+
&& isInteger(value['[[CapturingGroupsCount]]'])
7942+
&& value['[[CapturingGroupsCount]]'] >= 0;
79797943
}
79807944
};
79817945

@@ -8062,6 +8026,35 @@ var $isNaN = __webpack_require__(/*! ./isNaN */ "./node_modules/es-abstract/help
80628026
module.exports = function (x) { return (typeof x === 'number' || typeof x === 'bigint') && !$isNaN(x) && x !== Infinity && x !== -Infinity; };
80638027

80648028

8029+
/***/ }),
8030+
8031+
/***/ "./node_modules/es-abstract/helpers/isInteger.js":
8032+
/*!*******************************************************!*\
8033+
!*** ./node_modules/es-abstract/helpers/isInteger.js ***!
8034+
\*******************************************************/
8035+
/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
8036+
8037+
"use strict";
8038+
8039+
8040+
var GetIntrinsic = __webpack_require__(/*! get-intrinsic */ "./node_modules/get-intrinsic/index.js");
8041+
8042+
var $abs = GetIntrinsic('%Math.abs%');
8043+
var $floor = GetIntrinsic('%Math.floor%');
8044+
8045+
var $isNaN = __webpack_require__(/*! ./isNaN */ "./node_modules/es-abstract/helpers/isNaN.js");
8046+
var $isFinite = __webpack_require__(/*! ./isFinite */ "./node_modules/es-abstract/helpers/isFinite.js");
8047+
8048+
module.exports = function isInteger(argument) {
8049+
if (typeof argument !== 'number' || $isNaN(argument) || !$isFinite(argument)) {
8050+
return false;
8051+
}
8052+
var absValue = $abs(argument);
8053+
return $floor(absValue) === absValue;
8054+
};
8055+
8056+
8057+
80658058
/***/ }),
80668059

80678060
/***/ "./node_modules/es-abstract/helpers/isLeadingSurrogate.js":

‎Sources/Streamer/Server/PublicationServer.swift

-4
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,4 @@ public class PublicationServer: ResourcesServer, Loggable {
355355
public func add(_ publication: Publication, with container: Container, at endpoint: String = UUID().uuidString) throws {
356356
try add(publication, at: endpoint)
357357
}
358-
359-
// Mapping between endpoint and the matching container.
360-
@available(*, unavailable, message: "`Container` is not used anymore in the `PublicationServer")
361-
public private(set) var containers: [String: Container] = [:]
362358
}

0 commit comments

Comments
 (0)