[ember] @ember/error as source of types, ember as re-export

This commit is contained in:
Mike North 2018-09-20 09:54:56 -07:00
parent 5679ed161c
commit 4066620479
6 changed files with 12 additions and 34 deletions

View File

@ -21,6 +21,7 @@
/// <reference types="ember__array" />
/// <reference types="ember__engine" />
/// <reference types="ember__debug" />
/// <reference types="ember__error" />
declare module 'ember' {
import {
@ -70,6 +71,8 @@ declare module 'ember' {
import EmberArrayProxy from '@ember/array/proxy';
import EmberEnumerable from '@ember/array/-private/enumerable';
import EmberArrayProtoExtensions from '@ember/array/types/prototype-extensions';
// @ember/error
import EmberError from '@ember/error';
type EmberArray<T> = EmberArrayNs.default<T>;
@ -605,7 +608,7 @@ declare module 'ember' {
/**
* A subclass of the JavaScript Error object for use in Ember.
*/
const Error: ErrorConstructor;
const Error: EmberError;
/**
* `Ember.EventDispatcher` handles delegating browser events to their
* corresponding `Ember.Views.` For example, when you click on a view,
@ -2082,33 +2085,6 @@ declare module '@ember/controller' {
export interface Registry {}
}
// declare module '@ember/debug' {
// import Ember from 'ember';
// export const assert: typeof Ember.assert;
// export const debug: typeof Ember.debug;
// export const inspect: typeof Ember.inspect;
// export const registerDeprecationHandler: typeof Ember.Debug.registerDeprecationHandler;
// export const registerWarnHandler: typeof Ember.Debug.registerWarnHandler;
// export const runInDebug: typeof Ember.runInDebug;
// export const warn: typeof Ember.warn;
// }
// declare module '@ember/debug/container-debug-adapter' {
// import Ember from 'ember';
// export default class ContainerDebugAdapter extends Ember.ContainerDebugAdapter { }
// }
// declare module '@ember/debug/data-adapter' {
// import Ember from 'ember';
// export default class DataAdapter extends Ember.DataAdapter { }
// }
declare module '@ember/error' {
import Ember from 'ember';
const Error: typeof Ember.Error;
export default Error;
}
declare module '@ember/routing/auto-location' {
import Ember from 'ember';
export default class AutoLocation extends Ember.AutoLocation { }

View File

@ -1,6 +1,5 @@
import { assertType } from "./lib/assert";
import Ember from "ember";
import EmberError from "@ember/error";
assertType<typeof Ember.Error>(EmberError);
assertType<typeof Ember.Error>(Ember.Error);

View File

@ -18,6 +18,7 @@
"@ember/string": ["ember__string"],
"@ember/engine": ["ember__engine"],
"@ember/engine/*": ["ember__engine/*"],
"@ember/error": ["ember__error"],
"@ember/utils": ["ember__utils"],
"@ember/utils/*": ["ember__utils/*"],
"@ember/array": ["ember__array"],

View File

@ -4,7 +4,7 @@
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
// TypeScript Version: 2.8
import Ember from 'ember';
declare const Error: typeof Ember.Error;
export default Error;
/**
* A subclass of the JavaScript Error object for use in Ember.
*/
export default ErrorConstructor;

View File

@ -7,6 +7,7 @@
// TypeScript Version: 2.8
/// <reference types="ember" />
/// <reference types="ember__error" />
declare module '@ember/test-helpers' {
// DOM Interaction Helpers

View File

@ -19,6 +19,7 @@
"paths": {
"@ember/engine": ["ember__engine"],
"@ember/engine/*": ["ember__engine/*"],
"@ember/error": ["ember__error"],
"@ember/object": ["ember__object"],
"@ember/object/*": ["ember__object/*"],
"@ember/test-helpers": ["ember__test-helpers"]