fix clean build errors

ohze · Apr 19, 2019 · 0181b41 · 0181b41
1 parent 6ea692d
commit 0181b41
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 45 deletions.
diff --git a/src/core/api.ts b/src/core/api.ts
@@ -1,24 +1,48 @@
 const UNDEF = "undefined";
 
-// // TODO remove
-// // Ensure rangy.rangePrototype and rangy.selectionPrototype are available immediately
-// export class RangePrototype {}
-// class SelectionPrototype {}
-
 export const version = "%%build:version%%";
 export const isBrowser = typeof window != UNDEF && typeof document != UNDEF;
 if (!isBrowser) {
     console.log("Rangy can only run in a browser");
 }
-export const features = {
-    implementsDomRange: true, // always support
-    implementsTextRange: false, // dont support IE < 9
-    htmlParsingConforms: true, // don't support IE 6, 7, Pre-Blink Opera
-    // Test for IE's crash (IE 6/7) or exception (IE >= 8) when a reference to garbage-collected text node is queried
-    // rangy2 don't support IE < 9. I have tested in browserstack.com with updated IE => not crash
+export interface Features {
+    /** @deprecated always support */
+    implementsDomRange: true;
+    /** @deprecated always dont support IE < 9 */
+    implementsTextRange: false;
+    /** @deprecated always don't support IE 6, 7, Pre-Blink Opera */
+    htmlParsingConforms: true;
+    /** @deprecated
+     * Test for IE's crash (IE 6/7) or exception (IE >= 8) when a reference to garbage-collected text node is queried
+     * rangy2 don't support IE < 9. I have tested in browserstack.com with updated IE => not crash */
+    crashyTextNodes: false;
+    /** Always use window.getSelection */
+    implementsWinGetSelection: true;
+    /** document.selection should only be used for IE < 9 which rangy2 don't support */
+    implementsDocSelection: false;
+    selectionHasAnchorAndFocus?: boolean;
+    selectionHasExtend?: boolean;
+    selectionHasRangeCount?: boolean;
+    selectionSupportsMultipleRanges: false;
+    implementsControlRange: false;
+}
+export const features: Features = {
+    implementsDomRange: true,
+    implementsTextRange: false,
+    htmlParsingConforms: true,
     crashyTextNodes: false,
+    implementsWinGetSelection: true,
+    implementsDocSelection: false,
+    selectionSupportsMultipleRanges: false,
+    implementsControlRange: false,
 };
-export const config = {
+/** @deprecated all configs is const! */
+export interface Config {
+    preferTextRange: false;
+    checkSelectionRanges: true;
+}
+/** @deprecated all configs is const! */
+export const config: Config = {
     preferTextRange: false,
     checkSelectionRanges: true,
 };

diff --git a/src/core/internal/domrange/index.ts b/src/core/internal/domrange/index.ts
@@ -2,6 +2,7 @@ export {
     rangeProperties,
     RangeBase,
     RangyRange,
+    RangyRangeEx,
     rangesEqual,
     getRangeDocument,
     createPrototypeRange,

diff --git a/src/core/internal/index.ts b/src/core/internal/index.ts
@@ -2,6 +2,7 @@ export {
     // from ./domrange
     RangeBase,
     RangyRange,
+    RangyRangeEx,
     rangesEqual,
     getRangeDocument,
     createPrototypeRange,
@@ -17,5 +18,6 @@ export {
     isSelectionValid,
     getSelection,
     Selection,
+    WrappedSelection,
     shimGetSelection
 } from "./_";
diff --git a/src/core/internal/wrappedselection.ts b/src/core/internal/wrappedselection.ts
@@ -6,7 +6,7 @@ import * as util from "../util";
 import {Constructor, isHostMethod} from "../util";
 
 import * as dom from "../dom";
-import {DomPosition, getDocument, getBody} from "../dom";
+import {DomPosition, getDocument} from "../dom";
 
 import {
     DomRange, RangeBase, rangesEqual,
@@ -20,8 +20,6 @@ const module = new Module("WrappedSelection", ["DomRange", "WrappedRange"]);
 // This module creates a selection object wrapper that conforms as closely as possible to the Selection specification
 // in the HTML Editing spec (http://dvcs.w3.org/hg/editing/raw-file/tip/editing.html#selections)
 // /* build:replaceWith(api) */rangy/* build:replaceEnd */.createCoreModule("WrappedSelection", ["DomRange", "WrappedRange"], function(api, module) {
-    config.checkSelectionRanges = true;
-
     var BOOLEAN = "boolean";
     var NUMBER = "number";
     var log = log4javascript.getLogger("rangy.WrappedSelection");
@@ -63,11 +61,6 @@ export function isSelectionValid() {
     return true;
 }
 
-// features. Always use window.getSelection
-const implementsWinGetSelection = true;
-//features. document.selection should only be used for IE < 9 which rangy2 don't support
-const implementsDocSelection = false;
-
     var testSelection = getNativeSelection();
 
     // In Firefox, the selection is null in an iframe with display: none. See issue #138.
@@ -77,23 +70,21 @@ const implementsDocSelection = false;
     }
 
     var testRange = createNativeRange(document);
-    var body = getBody(document);
 
     // Obtaining a range from a selection
-//features
-const selectionHasAnchorAndFocus = util.areHostProperties(testSelection,
-        ["anchorNode", "focusNode", "anchorOffset", "focusOffset"]);
+const selectionHasAnchorAndFocus =
+    features.selectionHasAnchorAndFocus =
+        util.areHostProperties(testSelection, ["anchorNode", "focusNode", "anchorOffset", "focusOffset"]);
 
     // Test for existence of native selection extend() method
-//features
-export const selectionHasExtend = isHostMethod(testSelection, "extend");
+const selectionHasExtend =
+    features.selectionHasExtend =
+        isHostMethod(testSelection, "extend");
 
     // Test if rangeCount exists
-//features
-const selectionHasRangeCount = (typeof testSelection.rangeCount == NUMBER);
-
-//features
-const selectionSupportsMultipleRanges = false;
+const selectionHasRangeCount =
+    features.selectionHasRangeCount =
+        (typeof testSelection.rangeCount == NUMBER);
 
 const addRangeBackwardToNative = selectionHasExtend
     ?   function(nativeSelection, range) {
@@ -105,10 +96,6 @@ const addRangeBackwardToNative = selectionHasExtend
         }
     :   null;
 
-    // ControlRanges
-//features
-const implementsControlRange = false;
-
     // Selection collapsedness
 let selectionIsCollapsed =
     selectionHasAnchorAndFocus
@@ -279,7 +266,7 @@ export class WrappedSelBase {
     readonly anchorOffset: number;
     isCollapsed: boolean;
 
-    constructor(public nativeSelection: Selection, public win) {
+    constructor(public nativeSelection: Selection, public win: Window) {
         //@deprecated the old rangy2 constructor form: (nativeSelection, docSelection: null, win)
         if (arguments.length == 3) {
             this.win = arguments[2];
@@ -288,6 +275,7 @@ export class WrappedSelBase {
     }
 }
 
+// TODO
 function createWrappedSelection<TBase extends Constructor<WrappedSelBase>>(Base: TBase) {
         function addRangeBackward(sel, range) {
             addRangeBackwardToNative(sel.nativeSelection, range);
@@ -299,7 +287,7 @@ function createWrappedSelection<TBase extends Constructor<WrappedSelBase>>(Base:
                         addRangeBackward(this, range);
                     } else {
                         var previousRangeCount;
-                        if (selectionSupportsMultipleRanges) {
+                        if (features.selectionSupportsMultipleRanges) {
                             previousRangeCount = this.rangeCount;
                         } else {
                             this.removeAllRanges();
@@ -647,12 +635,11 @@ function createWrappedSelection<TBase extends Constructor<WrappedSelBase>>(Base:
     }
 }
 
-const WrappedSelection = createWrappedSelection(WrappedSelBase);
-// export type WrappedSelection = InstanceType<typeof WrappedSelection>;
-// export interface WrappedSelection extends InstanceType<typeof WrappedSelection>{};
+export const WrappedSelection = createWrappedSelection(WrappedSelBase);
+export interface WrappedSelection extends InstanceType<typeof WrappedSelection>{}
 //alias
 export const Selection = WrappedSelection;
-export interface Selection extends InstanceType<typeof WrappedSelection>{};
+export interface Selection extends WrappedSelection{}
 
 export function shimGetSelection(win?) {
         if(!win) win = window;

diff --git a/src/highlighter/index.ts b/src/highlighter/index.ts
@@ -10,7 +10,7 @@
  * Build date: %%build:date%%
  */
 import * as api from "rangy2";
-import {WrappedRange, WrappedSelection, dom} from "rangy2";
+import {WrappedRange, WrappedSelection, dom, RangyRangeEx} from "rangy2";
 const getBody = dom.getBody;
 
 // const module = new Module("Highlighter", ["ClassApplier"]);
@@ -35,7 +35,7 @@ type ConverterCreator = () => Converter;
 interface Converter {
     type?: string;
 
-    rangeToCharacterRange(range: RangyRange, containerNode?: Node): CharacterRange;
+    rangeToCharacterRange(range: RangyRangeEx, containerNode?: Node): CharacterRange;
 
     characterRangeToRange(doc: Document | Window | HTMLIFrameElement,
                           characterRange: CharacterRange,

diff --git a/src/selectionsaverestore/index.ts b/src/selectionsaverestore/index.ts
@@ -14,7 +14,7 @@
  */
 
 import * as api from "rangy2";
-import {Module, dom, selectionHasExtend} from "rangy2";
+import {Module, dom, features} from "rangy2";
 
 const removeNode = dom.removeNode;
 
@@ -194,7 +194,7 @@ export function restoreSelection(savedSelection, preserveDirection) {
             var sel = api.getSelection(savedSelection.win);
             var ranges = restoreRanges(rangeInfos), rangeCount = rangeInfos.length;
 
-            if (rangeCount == 1 && preserveDirection && selectionHasExtend && rangeInfos[0].backward) {
+            if (rangeCount == 1 && preserveDirection && features.selectionHasExtend && rangeInfos[0].backward) {
                 sel.removeAllRanges();
                 sel.addRange(ranges[0], true);
             } else {