Revert "use global namespace"

This reverts commit 24c3a9a. # Conflicts: # packages/core/src/Editor.ts
ueberdosis · Nov 16, 2020 · 0c9ce26 · 0c9ce26
1 parent 0cee9fb
commit 0c9ce26
Show file tree

Hide file tree

Showing 39 changed files with 118 additions and 197 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -70,8 +70,6 @@ module.exports = {
         '@typescript-eslint/ban-types': 'off',
         '@typescript-eslint/comma-dangle': ['error', 'always-multiline'],
         '@typescript-eslint/explicit-module-boundary-types': 'off',
-        '@typescript-eslint/no-namespace': 'off',
-        'no-undef': 'off',
       },
     },
   ],

diff --git a/packages/core/src/CommandManager.ts b/packages/core/src/CommandManager.ts
@@ -1,9 +1,9 @@
 import { EditorState, Transaction } from 'prosemirror-state'
 import {
-  Editor,
-  CommandSpec,
   SingleCommands,
   ChainedCommands,
+  Editor,
+  CommandSpec,
 } from './Editor'
 import getAllMethodNames from './utils/getAllMethodNames'
 

diff --git a/packages/core/src/Editor.ts b/packages/core/src/Editor.ts
@@ -21,6 +21,8 @@ import { Extensions, UnionToIntersection } from './types'
 import * as extensions from './extensions'
 import style from './style'
 
+export { extensions }
+
 export type Command = (props: {
   editor: Editor,
   tr: Transaction,
@@ -38,25 +40,21 @@ export interface CommandsSpec {
   [key: string]: CommandSpec
 }
 
-declare global {
-  namespace Tiptap {
-    export interface AllExtensions {}
-  }
-}
+export interface AllExtensions {}
 
-type UnfilteredCommands = {
-  [Item in keyof Tiptap.AllExtensions]: Tiptap.AllExtensions[Item] extends Extension<any, infer ExtensionCommands>
+export type UnfilteredCommands = {
+  [Item in keyof AllExtensions]: AllExtensions[Item] extends Extension<any, infer ExtensionCommands>
     ? ExtensionCommands
-    : Tiptap.AllExtensions[Item] extends Node<any, infer NodeCommands>
+    : AllExtensions[Item] extends Node<any, infer NodeCommands>
       ? NodeCommands
-      : Tiptap.AllExtensions[Item] extends Mark<any, infer MarkCommands>
+      : AllExtensions[Item] extends Mark<any, infer MarkCommands>
         ? MarkCommands
         : never
 }
 
-type ValuesOf<T> = T[keyof T];
-type KeysWithTypeOf<T, Type> = ({[P in keyof T]: T[P] extends Type ? P : never })[keyof T]
-type AllCommands = UnionToIntersection<ValuesOf<Pick<UnfilteredCommands, KeysWithTypeOf<UnfilteredCommands, {}>>>>
+export type ValuesOf<T> = T[keyof T];
+export type KeysWithTypeOf<T, Type> = ({[P in keyof T]: T[P] extends Type ? P : never })[keyof T]
+export type AllCommands = UnionToIntersection<ValuesOf<Pick<UnfilteredCommands, KeysWithTypeOf<UnfilteredCommands, {}>>>>
 
 export type SingleCommands = {
   [Item in keyof AllCommands]: AllCommands[Item] extends (...args: any[]) => any

diff --git a/packages/core/src/extensions/commands.ts b/packages/core/src/extensions/commands.ts
@@ -147,10 +147,8 @@ export const Commands = Extension.create({
   },
 })
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      Commands: typeof Commands,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    Commands: typeof Commands,
   }
 }
diff --git a/packages/core/src/extensions/editable.ts b/packages/core/src/extensions/editable.ts
@@ -14,10 +14,8 @@ export const Editable = Extension.create({
   },
 })
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      Editable: typeof Editable,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    Editable: typeof Editable,
   }
 }
diff --git a/packages/core/src/extensions/focusEvents.ts b/packages/core/src/extensions/focusEvents.ts
@@ -36,10 +36,8 @@ export const FocusEvents = Extension.create({
   },
 })
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      FocusEvents: typeof FocusEvents,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    FocusEvents: typeof FocusEvents,
   }
 }
diff --git a/packages/core/src/extensions/keymap.ts b/packages/core/src/extensions/keymap.ts
@@ -45,10 +45,8 @@ export const Keymap = Extension.create({
   },
 })
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      Keymap: typeof Keymap,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    Keymap: typeof Keymap,
   }
 }
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -1,9 +1,4 @@
-export {
-  Editor,
-  Command,
-  CommandsSpec,
-} from './Editor'
-
+export * from './Editor'
 export * from './Extension'
 export * from './Node'
 export * from './Mark'

diff --git a/packages/extension-blockquote/src/index.ts b/packages/extension-blockquote/src/index.ts
@@ -58,10 +58,8 @@ const Blockquote = Node.create({
 
 export default Blockquote
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      Blockquote: typeof Blockquote,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    Blockquote: typeof Blockquote,
   }
 }
diff --git a/packages/extension-bold/src/index.ts b/packages/extension-bold/src/index.ts
@@ -74,10 +74,8 @@ const Bold = Mark.create({
 
 export default Bold
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      Bold: typeof Bold,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    Bold: typeof Bold,
   }
 }
diff --git a/packages/extension-bullet-list/src/index.ts b/packages/extension-bullet-list/src/index.ts
@@ -56,10 +56,8 @@ const BulletList = Node.create({
 
 export default BulletList
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      BulletList: typeof BulletList,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    BulletList: typeof BulletList,
   }
 }
diff --git a/packages/extension-code-block/src/index.ts b/packages/extension-code-block/src/index.ts
@@ -99,10 +99,8 @@ const CodeBlock = Node.create({
 
 export default CodeBlock
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      CodeBlock: typeof CodeBlock,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    CodeBlock: typeof CodeBlock,
   }
 }
diff --git a/packages/extension-code/src/index.ts b/packages/extension-code/src/index.ts
@@ -65,10 +65,8 @@ const Code = Mark.create({
 
 export default Code
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      Code: typeof Code,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    Code: typeof Code,
   }
 }
diff --git a/packages/extension-collaboration-cursor/src/index.ts b/packages/extension-collaboration-cursor/src/index.ts
@@ -64,10 +64,8 @@ const CollaborationCursor = Extension.create({
 
 export default CollaborationCursor
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      CollaborationCursor: typeof CollaborationCursor,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    CollaborationCursor: typeof CollaborationCursor,
   }
 }
diff --git a/packages/extension-collaboration/src/index.ts b/packages/extension-collaboration/src/index.ts
@@ -32,10 +32,8 @@ const Collaboration = Extension.create({
 
 export default Collaboration
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      Collaboration: typeof Collaboration,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    Collaboration: typeof Collaboration,
   }
 }
diff --git a/packages/extension-document/src/index.ts b/packages/extension-document/src/index.ts
@@ -8,10 +8,8 @@ const Document = Node.create({
 
 export default Document
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      Document: typeof Document,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    Document: typeof Document,
   }
 }
diff --git a/packages/extension-dropcursor/src/index.ts b/packages/extension-dropcursor/src/index.ts
@@ -11,10 +11,8 @@ const Dropcursor = Extension.create({
 
 export default Dropcursor
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      Dropcursor: typeof Dropcursor,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    Dropcursor: typeof Dropcursor,
   }
 }
diff --git a/packages/extension-focus/src/index.ts b/packages/extension-focus/src/index.ts
@@ -50,10 +50,8 @@ const FocusClasses = Extension.create({
 
 export default FocusClasses
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      FocusClasses: typeof FocusClasses,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    FocusClasses: typeof FocusClasses,
   }
 }
diff --git a/packages/extension-font-family/src/index.ts b/packages/extension-font-family/src/index.ts
@@ -52,10 +52,8 @@ const FontFamily = Extension.create({
 
 export default FontFamily
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      FontFamily: typeof FontFamily,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    FontFamily: typeof FontFamily,
   }
 }
diff --git a/packages/extension-gapcursor/src/index.ts b/packages/extension-gapcursor/src/index.ts
@@ -11,10 +11,8 @@ const Gapcursor = Extension.create({
 
 export default Gapcursor
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      Gapcursor: typeof Gapcursor,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    Gapcursor: typeof Gapcursor,
   }
 }
diff --git a/packages/extension-hard-break/src/index.ts b/packages/extension-hard-break/src/index.ts
@@ -50,10 +50,8 @@ const HardBreak = Node.create({
 
 export default HardBreak
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      HardBreak: typeof HardBreak,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    HardBreak: typeof HardBreak,
   }
 }
diff --git a/packages/extension-heading/src/index.ts b/packages/extension-heading/src/index.ts
@@ -83,10 +83,8 @@ const Heading = Node.create({
 
 export default Heading
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      Heading: typeof Heading,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    Heading: typeof Heading,
   }
 }
diff --git a/packages/extension-highlight/src/index.ts b/packages/extension-highlight/src/index.ts
@@ -88,10 +88,8 @@ const Highlight = Mark.create({
 
 export default Highlight
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      Highlight: typeof Highlight,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    Highlight: typeof Highlight,
   }
 }
diff --git a/packages/extension-history/src/index.ts b/packages/extension-history/src/index.ts
@@ -46,10 +46,8 @@ const History = Extension.create({
 
 export default History
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      History: typeof History,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    History: typeof History,
   }
 }
diff --git a/packages/extension-horizontal-rule/src/index.ts b/packages/extension-horizontal-rule/src/index.ts
@@ -47,10 +47,8 @@ const HorizontalRule = Node.create({
 
 export default HorizontalRule
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      HorizontalRule: typeof HorizontalRule,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    HorizontalRule: typeof HorizontalRule,
   }
 }
diff --git a/packages/extension-image/src/index.ts b/packages/extension-image/src/index.ts
@@ -82,10 +82,8 @@ const Image = Node.create({
 
 export default Image
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      Image: typeof Image,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    Image: typeof Image,
   }
 }
diff --git a/packages/extension-italic/src/index.ts b/packages/extension-italic/src/index.ts
@@ -76,10 +76,8 @@ const Italic = Mark.create({
 
 export default Italic
 
-declare global {
-  namespace Tiptap {
-    interface AllExtensions {
-      Italic: typeof Italic,
-    }
+declare module '@tiptap/core' {
+  interface AllExtensions {
+    Italic: typeof Italic,
   }
 }