Skip to content

style: prettier #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 20, 2021
Merged

style: prettier #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a89e38a
build(deps): prettier
gr2m Jul 20, 2021
1737514
build(package): lock file
gr2m Jul 20, 2021
1c6985b
style: prettier
gr2m Jul 20, 2021
1952ea6
build(scripts): run lint as part of test
gr2m Jul 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 36 additions & 21 deletions index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
export declare namespace Base {
interface Options { }
interface Options {}
}

declare type ApiExtension = {
Expand All @@ -23,33 +23,43 @@ declare type UnionToIntersection<Union> = (
declare type AnyFunction = (...args: any) => any;
declare type ReturnTypeOf<T extends AnyFunction | AnyFunction[]> =
T extends AnyFunction
? ReturnType<T>
: T extends AnyFunction[]
? UnionToIntersection<Exclude<ReturnType<T[number]>, void>>
: never;
? ReturnType<T>
: T extends AnyFunction[]
? UnionToIntersection<Exclude<ReturnType<T[number]>, void>>
: never;

type ClassWithPlugins = Constructor<any> & {
plugins: Plugin[];
};

type RemainingRequirements<PredefinedOptions> =
keyof PredefinedOptions extends never
? Base.Options
: Omit<Base.Options, keyof PredefinedOptions>
? Base.Options
: Omit<Base.Options, keyof PredefinedOptions>;

type NonOptionalKeys<Obj> = {
[K in keyof Obj]: {} extends Pick<Obj, K> ? undefined : K;
}[keyof Obj];

type RequiredIfRemaining<PredefinedOptions, NowProvided> =
NonOptionalKeys<RemainingRequirements<PredefinedOptions>> extends undefined
type RequiredIfRemaining<PredefinedOptions, NowProvided> = NonOptionalKeys<
RemainingRequirements<PredefinedOptions>
> extends undefined
? [(Partial<Base.Options> & NowProvided)?]
: [Partial<Base.Options> & RemainingRequirements<PredefinedOptions> & NowProvided];
: [
Partial<Base.Options> &
RemainingRequirements<PredefinedOptions> &
NowProvided
];

type ConstructorRequiringVersion<Class extends ClassWithPlugins, PredefinedOptions> = {
type ConstructorRequiringVersion<
Class extends ClassWithPlugins,
PredefinedOptions
> = {
defaultOptions: PredefinedOptions;
} & {
new <NowProvided>(...options: RequiredIfRemaining<PredefinedOptions, NowProvided>): Class & {
new <NowProvided>(
...options: RequiredIfRemaining<PredefinedOptions, NowProvided>
): Class & {
options: NowProvided & PredefinedOptions;
};
};
Expand Down Expand Up @@ -78,12 +88,12 @@ export declare class Base<TOptions extends Base.Options = Base.Options> {
*/
static plugin<
Class extends ClassWithPlugins,
Plugins extends [Plugin, ...Plugin[]],
>(
this: Class,
...plugins: Plugins,
Plugins extends [Plugin, ...Plugin[]]
>(
this: Class,
...plugins: Plugins
): Class & {
plugins: [...Class['plugins'], ...Plugins];
plugins: [...Class["plugins"], ...Plugins];
} & Constructor<UnionToIntersection<ReturnTypeOf<Plugins>>>;

/**
Expand All @@ -104,7 +114,8 @@ export declare class Base<TOptions extends Base.Options = Base.Options> {
*/
static defaults<
PredefinedOptionsOne,
ClassOne extends Constructor<Base<Base.Options & PredefinedOptionsOne>> & ClassWithPlugins
ClassOne extends Constructor<Base<Base.Options & PredefinedOptionsOne>> &
ClassWithPlugins
>(
this: ClassOne,
defaults: PredefinedOptionsOne
Expand All @@ -122,8 +133,12 @@ export declare class Base<TOptions extends Base.Options = Base.Options> {
): ConstructorRequiringVersion<
ClassOne & ClassTwo & ClassThree,
PredefinedOptionsOne & PredefinedOptionsTwo & PredefinedOptionsThree
> & ClassOne & ClassTwo & ClassThree;
} & ClassOne & ClassTwo;
> &
ClassOne &
ClassTwo &
ClassThree;
} & ClassOne &
ClassTwo;
} & ClassOne;

static defaultOptions: {};
Expand All @@ -135,4 +150,4 @@ export declare class Base<TOptions extends Base.Options = Base.Options> {

constructor(options: TOptions);
}
export { };
export {};
6 changes: 6 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
},
"types": "./index.d.ts",
"scripts": {
"test": "npm run -s test:code && npm run -s test:typescript && npm run -s test:coverage",
"lint": "prettier --check '*.{md,json,js,ts}' 'examples/**' 'plugins/**'",
"lint:fix": "prettier --write '*.{md,json,js,ts}' 'examples/**' 'plugins/**'",
"test": "npm run -s test:code && npm run -s test:typescript && npm run -s test:coverage && npm run -s lint",
"test:code": "c8 uvu . '^(examples/.*/)?test.js$'",
"test:coverage": "c8 check-coverage",
"test:typescript": "tsd && tsd examples/*"
Expand All @@ -32,6 +34,7 @@
"license": "ISC",
"devDependencies": {
"c8": "^7.7.2",
"prettier": "^2.3.2",
"tsd": "^0.17.0",
"uvu": "^0.5.1"
},
Expand Down