wip

package.json

@@ -56,7 +56,7 @@
     "main": "./bundles/index.umd.js",
     "module": "./esm5/index.js",
     "es2015": "./esm2015/index.js",
-    "typings": "./types/index.d.ts",
+    "typings": "./types/types.d.ts",
     "dependencies": {
         "core-js": "^3.0.1",
         "tslib": "^1.9.3"

scripts/tsc.ts

@@ -1,6 +1,6 @@
-import {writeFileSync} from "fs";
+import {writeFileSync, copyFileSync} from "fs";
 import {resolve} from "path";
-import {srcDir, modules} from "./util";
+import {srcDir, modules, distDir} from "./util";
 import {spawnSync} from "child_process";
 
 function writeTsConfig(name: string, es: boolean) {
@@ -47,6 +47,10 @@ function main() {
         const success = tsc(es);
         if (!success) break;
     }
+
+    modules.forEach(m => {
+        copyFileSync(resolve(srcDir, m, 'types.d.ts'), resolve(distDir, m, 'types/types.d.ts'));
+    });
 }
 
 // usage: node [options] scripts/tsc.js [tsc arguments]

scripts/util.ts

@@ -2,8 +2,8 @@ import {join, resolve} from "path";
 import {readdirSync, statSync} from "fs";
 
 export const projectRoot = resolve(__dirname, '..');
-
 export const srcDir = resolve(projectRoot, 'src');
+export const distDir = resolve(projectRoot, 'dist');
 
 //['core', 'classapplier',..]
 export const modules = readdirSync(srcDir)

src/classapplier/types.d.ts

@@ -0,0 +1,14 @@
+// this file will be copy to dist/<module>/index.d.ts when running scripts/tsc.ts
+import * as rangy from "rangy2";
+export * from "./index";
+import * as m from "./index";
+
+declare module "rangy2" {
+    type ClassApplier = m.ClassApplier;
+    const ClassApplier: typeof m.ClassApplier;
+
+    type CssClassApplier = m.ClassApplier;
+    const CssClassApplier: typeof m.ClassApplier;
+
+    const createClassApplier: typeof m.createClassApplier;
+}

src/core/index.ts

@@ -29,9 +29,3 @@ export function shim(win?) {
     shimCreateRange(win);
     shimGetSelection(win);
 }
-
-import * as Rangy from ".";
-export type RangyStatic = typeof Rangy;
-declare global {
-    const rangy: RangyStatic;
-}

src/core/types.d.ts

@@ -0,0 +1,4 @@
+// this file will be copy to dist/<module>/index.d.ts when running scripts/tsc.ts
+export * from "./index";
+
+export as namespace rangy;

src/highlighter/index.ts

@@ -11,6 +11,7 @@
  */
 import * as api from "rangy2";
 import {WrappedRange, WrappedSelection, dom, RangyRangeEx} from "rangy2";
+import {ClassApplier} from "../classapplier";
 const getBody = dom.getBody;
 
 // const module = new Module("Highlighter", ["ClassApplier"]);
@@ -245,7 +246,7 @@ export class Highlighter {
             this.doc = doc || document;
             this.converter = getConverter(type);
         }
-        addClassApplier(classApplier) {
+        addClassApplier(classApplier: ClassApplier) {
             this.classAppliers[classApplier.className] = classApplier;
         }
 

src/highlighter/types.d.ts

@@ -0,0 +1,11 @@
+// this file will be copy to dist/<module>/index.d.ts when running scripts/tsc.ts
+import * as rangy from "rangy2";
+export * from "./index";
+import * as m from "./index";
+
+declare module "rangy2" {
+    const registerHighlighterType: typeof m.registerHighlighterType;
+    const createHighlighter: typeof m.createHighlighter;
+    type Highlighter = m.Highlighter;
+    const Highlighter: typeof m.Highlighter;
+}

src/selectionsaverestore/types.d.ts

@@ -0,0 +1,14 @@
+import * as rangy from "rangy2";
+export * from "./index";
+import * as m from "./index";
+
+declare module "rangy2" {
+    const saveRange: typeof m.saveRange;
+    const restoreRange: typeof m.restoreRange;
+    const saveRanges: typeof m.saveRanges;
+    const saveSelection: typeof m.saveSelection;
+    const restoreRanges: typeof m.restoreRanges;
+    const restoreSelection: typeof m.restoreSelection;
+    const removeMarkerElement: typeof m.removeMarkerElement;
+    const removeMarkers: typeof m.removeMarkers;
+}

src/serializer/types.d.ts

@@ -0,0 +1,19 @@
+// this file will be copy to dist/<module>/index.d.ts when running scripts/tsc.ts
+import * as rangy from "rangy2";
+export * from "./index";
+import * as m from "./index";
+
+declare module "rangy2" {
+    const nodeToInfoString: typeof m.nodeToInfoString;
+    const getElementChecksum: typeof m.getElementChecksum;
+    const serializePosition: typeof m.serializePosition;
+    const deserializePosition: typeof m.deserializePosition;
+    const serializeRange: typeof m.serializeRange;
+    const deserializeRange: typeof m.deserializeRange;
+    const canDeserializeRange: typeof m.canDeserializeRange;
+    const serializeSelection: typeof m.serializeSelection;
+    const deserializeSelection: typeof m.deserializeSelection;
+    const canDeserializeSelection: typeof m.canDeserializeSelection;
+    const restoreSelectionFromCookie: typeof m.restoreSelectionFromCookie;
+    const saveSelectionCookie: typeof m.saveSelectionCookie;
+}

src/util/index.ts

@@ -112,3 +112,10 @@ export function selectNodeContents(node) {
 }
 
     // TODO: simple selection save/restore
+
+// // for d.ts typescript export purpose only
+// import * as _rangy from ".";
+// declare global {
+//     type RangyUtilModule = typeof _rangy;
+//     interface Rangy extends RangyUtilModule{}
+// }

src/util/types.d.ts

@@ -0,0 +1,7 @@
+// this file will be copy to dist/<module>/index.d.ts when running scripts/tsc.ts
+import * as rangy from "rangy2";
+export * from "./index";
+import * as m from "./index";
+
+declare module "rangy2" {
+}

test/core/dom.test.ts

@@ -1,3 +1,5 @@
+import * as rangy from "rangy2";
+
 QUnit.module("Range");
 
     function createTestNodes(parentNode, limit, copies) {

test/core/feature.test.ts

@@ -1,3 +1,4 @@
+import * as rangy from "rangy2";
 import Bowser from "bowser";
 
 const browser = Bowser.getParser(window.navigator.userAgent);

test/core/index.html

@@ -14,8 +14,8 @@
 <body>
 <div id="qunit"></div>
 <div id="qunit-fixture"></div>
-<script src="dom.test.js"></script>
-<script src="range.test.js"></script>
+<!--<script src="dom.test.js"></script>-->
+<!--<script src="range.test.js"></script>-->
 <script src="selection.test.js"></script>
 <!-- Next line for Acid3 tests -->
 <script type="text/javascript">document.write('<iframe src="empty.html" id="selectors"><\/iframe>');</script>

test/core/range.test.ts

@@ -1,3 +1,4 @@
+import * as rangy from "rangy2";
 import {DomRange, RangyRange, DOMException, WrappedRange} from "rangy2";
 
 import "../qunit-ex";

test/core/selection.test.ts

@@ -1,3 +1,4 @@
+import * as rangy from "rangy2";
 import {RangyRangeEx, WrappedSelection} from "rangy2";
 
 var hasNativeGetSelection = "getSelection" in window;
@@ -587,6 +588,7 @@ function testSelectionAndRangeCreators(wins, winName,
                 t.assertFalse(sel.refresh(true));
 
                 sel.nativeSelection.selectAllChildren(nodes.div);
+                t.equal(iframeWin.length, 1);
                 t.assertTrue(sel.refresh(true));
                 t.assertFalse(sel.refresh(true));
 
@@ -778,6 +780,13 @@ QUnit.module("getIframeSelection test");
         });
 
 var iframeEl;
+/*
+window.addEventListener("load", function() {
+    // Do it in an iframe
+    iframeEl = document.getElementById("selectors");
+    iframeWin[0] = iframeEl.contentWindow;
+});
+*/
 window.addEventListener("load", function() {
     // Do it in an iframe
     iframeEl = document.body.appendChild(document.createElement("iframe"));

test/tsconfig.json

@@ -8,16 +8,21 @@
     "stripInternal": true,
     "baseUrl": ".",
     "paths": {
-      "rangy2": ["../src/core"],
-      "rangy-classapplier": ["../src/classapplier"],
-      "rangy-highlighter": ["../src/highlighter"],
-      "rangy-selectionsaverestore": ["../src/selectionsaverestore"],
-      "rangy-serializer": ["../src/serializer"],
-      "rangy-util": ["../src/util"]
+      "rangy2": ["../dist/core"],
+      "rangy-classapplier": ["../dist/classapplier"],
+      "rangy-highlighter": ["../dist/highlighter"],
+      "rangy-selectionsaverestore": ["../dist/selectionsaverestore"],
+      "rangy-serializer": ["../dist/serializer"],
+      "rangy-util": ["../dist/util"]
     }
   },
-  "references": [
-    { "path": "../src" }
-  ]
+//  "references": [
+//    { "path": "../src/core"},
+//    { "path": "../src/classapplier"},
+//    { "path": "../src/highlighter"},
+//    { "path": "../src/selectionsaverestore"},
+//    { "path": "../src/serializer"},
+//    { "path": "../src/util"}
+//  ]
 //  "include": ["./**/*.ts"]
 }