You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@annotator.apache.org by GitBox <gi...@apache.org> on 2018/06/09 18:57:37 UTC
[GitHub] tilgovi closed pull request #30: Remove reselect/memoisation.
tilgovi closed pull request #30: Remove reselect/memoisation.
URL: https://github.com/apache/incubator-annotator/pull/30
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/packages/any/src/index.mjs b/packages/any/src/index.mjs
index 81e7cc3..6772eeb 100644
--- a/packages/any/src/index.mjs
+++ b/packages/any/src/index.mjs
@@ -13,13 +13,10 @@
* the License.
*/
-import * as reselect from 'reselect';
import { createTextQuoteSelector } from '@annotator/text';
import { createRangeSelector } from '@annotator/range';
import { makeRefinable } from '@annotator/refinedBy';
-const { createSelector } = reselect;
-
export function createAnySelectorCreator(selectorCreatorsByType) {
function selectSelector(type) {
const selectorCreator = selectorCreatorsByType[type];
@@ -32,18 +29,11 @@ export function createAnySelectorCreator(selectorCreatorsByType) {
}
function createAnySelector() {
- const memoizedSelectSelector = createSelector(
- descriptor => descriptor.type,
- type => selectSelector(type)
- );
-
async function* anySelector({ descriptors, context }) {
const descriptor = descriptors[0]; // TODO handle multiple descriptors
- const selectorFunc = memoizedSelectSelector(descriptor);
+ const selectorFunc = selectSelector(descriptor.type);
yield* selectorFunc({ descriptors: [descriptor], context });
}
-
- // Not wrapped with Tee; we expect the selector implementations to do that.
return anySelector;
}
diff --git a/packages/dom/package.json b/packages/dom/package.json
index ea510f4..29243e5 100644
--- a/packages/dom/package.json
+++ b/packages/dom/package.json
@@ -11,7 +11,6 @@
"url": "https://gitbox.apache.org/repos/asf/incubator-annotator.git"
},
"dependencies": {
- "@annotator/selector": "0.0.0",
"range-normalize": "^1.1.1"
},
"peerDependencies": {
diff --git a/packages/dom/src/index.mjs b/packages/dom/src/index.mjs
index 115a8cc..70a36bb 100644
--- a/packages/dom/src/index.mjs
+++ b/packages/dom/src/index.mjs
@@ -14,21 +14,6 @@
*/
export * from './text';
-import { createSelectorCreator, defaultMemoize } from '@annotator/selector';
-
-function domEqualityCheck(a, b) {
- if (a !== b) return false;
- // TODO:
- // - weakref the node
- // - attach mutation listener
- // - invalidate on mutations
- return true;
-}
-
-const createDomSelector = createSelectorCreator(
- defaultMemoize,
- domEqualityCheck
-);
export function createCssSelector(selectors) {
const cssSelector = selectors.map(({ value }) => value).join(',');
@@ -37,5 +22,5 @@ export function createCssSelector(selectors) {
yield* context.querySelectorAll(cssSelector);
}
- return createDomSelector(exec);
+ return exec;
}
diff --git a/packages/range/src/index.mjs b/packages/range/src/index.mjs
index 6a78af6..ffe2906 100644
--- a/packages/range/src/index.mjs
+++ b/packages/range/src/index.mjs
@@ -1,4 +1,3 @@
-import { createSelector as createAnnotatorSelector } from '@annotator/selector';
import { product } from './cartesian';
export function createRangeSelector({ createAnySelector }) {
@@ -29,7 +28,7 @@ export function createRangeSelector({ createAnySelector }) {
}
}
- return createAnnotatorSelector(rangeSelector);
+ return rangeSelector;
}
function rangeBetween({ start, end, context }) {
diff --git a/packages/refinedBy/src/index.mjs b/packages/refinedBy/src/index.mjs
index 10ca9f1..f4f8b9a 100644
--- a/packages/refinedBy/src/index.mjs
+++ b/packages/refinedBy/src/index.mjs
@@ -1,16 +1,10 @@
-import * as reselect from 'reselect';
-
-const { createSelector } = reselect;
-
export function makeRefinable(selector, { createAnySelector }) {
- const memoizedCreateAnySelector = createSelector(() => createAnySelector());
-
async function* refinableSelector({ descriptors, context }) {
const matches = selector({ descriptors, context });
for await (let match of matches) {
const refiningDescriptor = match.descriptor.refinedBy;
if (refiningDescriptor) {
- const anySelector = memoizedCreateAnySelector();
+ const anySelector = createAnySelector();
const refiningMatches = anySelector({
descriptors: [refiningDescriptor],
context: matchAsContext(match),
diff --git a/packages/selector/.npmignore b/packages/selector/.npmignore
deleted file mode 100644
index 281df39..0000000
--- a/packages/selector/.npmignore
+++ /dev/null
@@ -1,2 +0,0 @@
-src
-test
diff --git a/packages/selector/LICENSE b/packages/selector/LICENSE
deleted file mode 100644
index d14c5bb..0000000
--- a/packages/selector/LICENSE
+++ /dev/null
@@ -1,259 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-Annotator Subcomponents:
-
-Annotator includes a number of subcomponents with separate copyright notices and
-license terms. Your use of the code for the these subcomponents is subject to
-the terms and conditions of the following licenses.
-
-
-For the file packages/fragment/src/fragment.pegjs:
-
- Copyright (c) 2016 World Wide Web Consortium, (Massachusetts Institute of
- Technology, European Research Consortium for Informatics and Mathematics, Keio
- University, Beihang). All Rights Reserved. This work is distributed under the
- W3C(R) Software License [1] 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.
-
- [1] http://www.w3.org/Consortium/Legal/copyright-software
-
- License
-
- By obtaining and/or copying this work, you (the licensee) agree that you have
- read, understood, and will comply with the following terms and conditions.
-
- Permission to copy, modify, and distribute this work, with or without
- modification, for any purpose and without fee or royalty is hereby granted,
- provided that you include the following on ALL copies of the work or portions
- thereof, including modifications:
-
- * The full text of this NOTICE in a location viewable to users of the
- redistributed or derivative work.
-
- * Any pre-existing intellectual property disclaimers, notices, or terms
- and conditions. If none exist, the W3C Software and Document Short
- Notice should be included.
-
- * Notice of any changes or modifications, through a copyright statement on
- the new code or document such as "This software or document includes
- material copied from or derived from [title and URI of the W3C
- document]. Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
-
- Disclaimers
-
- THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS
- OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
- MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
- SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
- TRADEMARKS OR OTHER RIGHTS.
-
- COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
- CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
-
- The name and trademarks of copyright holders may NOT be used in advertising or
- publicity pertaining to the work without specific, written prior
- permission. Title to copyright in this work will at all times remain with
- copyright holders.
diff --git a/packages/selector/NOTICE b/packages/selector/NOTICE
deleted file mode 100644
index 559531f..0000000
--- a/packages/selector/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Annotator
-Copyright 2016-2018 The Apache Software Foundation
-
-This product includes software developed at The Apache Software
-Foundation (http://www.apache.org/).
diff --git a/packages/selector/package.json b/packages/selector/package.json
deleted file mode 100644
index f8b27eb..0000000
--- a/packages/selector/package.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
- "name": "@annotator/selector",
- "version": "0.0.0",
- "description": "Web Annotation selector engine.",
- "homepage": "https://annotator.apache.org",
- "license": "Apache-2.0",
- "author": "Apache Software Foundation",
- "main": "lib",
- "repository": {
- "type": "git",
- "url": "https://gitbox.apache.org/repos/asf/incubator-annotator.git"
- },
- "dependencies": {
- "@annotator/tee": "^0.0.0",
- "reselect": "^3.0.1"
- },
- "peerDependencies": {
- "@babel/runtime": "^7.0.0-beta.40"
- },
- "publishConfig": {
- "access": "public"
- }
-}
diff --git a/packages/selector/src/index.mjs b/packages/selector/src/index.mjs
deleted file mode 100644
index 6d66ed7..0000000
--- a/packages/selector/src/index.mjs
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @license
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-import { AsyncTee } from '@annotator/tee';
-import * as reselect from 'reselect';
-
-const _createSelectorCreator = reselect.createSelectorCreator;
-
-const identity = a => a;
-
-export function createSelectorCreator(memoize, ...memoizeOptions) {
- const createSelector = _createSelectorCreator(memoize, ...memoizeOptions);
- return resultFunc => {
- const wrapperFunc = (...args) => {
- const iterable = resultFunc(...args);
- return new AsyncTee(iterable);
- };
- return createSelector(identity, wrapperFunc);
- };
-}
-
-export const { defaultMemoize } = reselect;
-export const createSelector = createSelectorCreator(defaultMemoize);
diff --git a/packages/selector/test/index.mjs b/packages/selector/test/index.mjs
deleted file mode 100644
index 3804136..0000000
--- a/packages/selector/test/index.mjs
+++ /dev/null
@@ -1,7 +0,0 @@
-import * as selector from '../src/index.mjs';
-
-describe('selector', () => {
- it('can be imported', () => {
- assert.isDefined(selector);
- });
-});
diff --git a/packages/tee/.npmignore b/packages/tee/.npmignore
deleted file mode 100644
index 281df39..0000000
--- a/packages/tee/.npmignore
+++ /dev/null
@@ -1,2 +0,0 @@
-src
-test
diff --git a/packages/tee/LICENSE b/packages/tee/LICENSE
deleted file mode 100644
index d14c5bb..0000000
--- a/packages/tee/LICENSE
+++ /dev/null
@@ -1,259 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-
-Annotator Subcomponents:
-
-Annotator includes a number of subcomponents with separate copyright notices and
-license terms. Your use of the code for the these subcomponents is subject to
-the terms and conditions of the following licenses.
-
-
-For the file packages/fragment/src/fragment.pegjs:
-
- Copyright (c) 2016 World Wide Web Consortium, (Massachusetts Institute of
- Technology, European Research Consortium for Informatics and Mathematics, Keio
- University, Beihang). All Rights Reserved. This work is distributed under the
- W3C(R) Software License [1] 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.
-
- [1] http://www.w3.org/Consortium/Legal/copyright-software
-
- License
-
- By obtaining and/or copying this work, you (the licensee) agree that you have
- read, understood, and will comply with the following terms and conditions.
-
- Permission to copy, modify, and distribute this work, with or without
- modification, for any purpose and without fee or royalty is hereby granted,
- provided that you include the following on ALL copies of the work or portions
- thereof, including modifications:
-
- * The full text of this NOTICE in a location viewable to users of the
- redistributed or derivative work.
-
- * Any pre-existing intellectual property disclaimers, notices, or terms
- and conditions. If none exist, the W3C Software and Document Short
- Notice should be included.
-
- * Notice of any changes or modifications, through a copyright statement on
- the new code or document such as "This software or document includes
- material copied from or derived from [title and URI of the W3C
- document]. Copyright © [YEAR] W3C® (MIT, ERCIM, Keio, Beihang)."
-
- Disclaimers
-
- THIS WORK IS PROVIDED "AS IS," AND COPYRIGHT HOLDERS MAKE NO REPRESENTATIONS
- OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO, WARRANTIES OF
- MERCHANTABILITY OR FITNESS FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE
- SOFTWARE OR DOCUMENT WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS,
- TRADEMARKS OR OTHER RIGHTS.
-
- COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL OR
- CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR DOCUMENT.
-
- The name and trademarks of copyright holders may NOT be used in advertising or
- publicity pertaining to the work without specific, written prior
- permission. Title to copyright in this work will at all times remain with
- copyright holders.
diff --git a/packages/tee/NOTICE b/packages/tee/NOTICE
deleted file mode 100644
index 559531f..0000000
--- a/packages/tee/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Apache Annotator
-Copyright 2016-2018 The Apache Software Foundation
-
-This product includes software developed at The Apache Software
-Foundation (http://www.apache.org/).
diff --git a/packages/tee/package.json b/packages/tee/package.json
deleted file mode 100644
index 6a86995..0000000
--- a/packages/tee/package.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- "name": "@annotator/tee",
- "version": "0.0.0",
- "description": "Iterator splitting utilities.",
- "homepage": "https://annotator.apache.org",
- "license": "Apache-2.0",
- "author": "Apache Software Foundation",
- "main": "lib",
- "repository": {
- "type": "git",
- "url": "https://gitbox.apache.org/repos/asf/incubator-annotator.git"
- },
- "peerDependencies": {
- "@babel/runtime": "^7.0.0-beta.40"
- },
- "publishConfig": {
- "access": "public"
- }
-}
diff --git a/packages/tee/src/index.mjs b/packages/tee/src/index.mjs
deleted file mode 100644
index 6636319..0000000
--- a/packages/tee/src/index.mjs
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * @license
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-export class AsyncTee {
- constructor(iterable) {
- this.it = iterable[Symbol.asyncIterator]();
- this.values = [];
- this.finished = false;
- }
-
- async *[Symbol.asyncIterator]() {
- let i = 0;
- while (i < this.values.length || !this.finished) {
- if (i < this.values.length) {
- yield this.values[i++];
- } else {
- let { value, done } = await this.it.next();
- if (done) this.finished = true;
- else this.values.push(value);
- }
- }
- }
-}
-
-export class Tee {
- constructor(iterable) {
- this.it = iterable[Symbol.iterator]();
- this.values = [];
- this.finished = false;
- }
-
- *[Symbol.iterator]() {
- let i = 0;
- while (i < this.values.length || !this.finished) {
- if (i < this.values.length) {
- yield this.values[i++];
- } else {
- let { value, done } = this.it.next();
- if (done) this.finished = true;
- else this.values.push(value);
- }
- }
- }
-}
diff --git a/packages/text/package.json b/packages/text/package.json
index 8f3b5a5..cac051c 100644
--- a/packages/text/package.json
+++ b/packages/text/package.json
@@ -11,7 +11,6 @@
"url": "https://gitbox.apache.org/repos/asf/incubator-annotator.git"
},
"dependencies": {
- "@annotator/selector": "0.0.0"
},
"peerDependencies": {
"@babel/runtime": "^7.0.0-beta.40"
diff --git a/packages/text/src/index.mjs b/packages/text/src/index.mjs
index 8cf4d40..ee8810e 100644
--- a/packages/text/src/index.mjs
+++ b/packages/text/src/index.mjs
@@ -13,8 +13,6 @@
* the License.
*/
-import { createSelector } from '@annotator/selector';
-
export function createTextQuoteSelector() {
async function* exec({ descriptors, context }) {
for (let descriptor of descriptors) {
@@ -36,7 +34,7 @@ export function createTextQuoteSelector() {
}
}
- return createSelector(exec);
+ return exec;
}
export function describeTextQuote({ context, startIndex, endIndex }) {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services