Skip to content
This repository was archived by the owner on Jan 11, 2023. It is now read-only.

Fix prettier 'no parser or filepath given' warning #5

Merged
merged 1 commit into from
Dec 10, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .prettierignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
test/
test/**/input.*
dist/
!test/transformers.test.ts
3 changes: 2 additions & 1 deletion src/compiler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export function compile(
export function getPrettierOptions(filePath: string, source: string, options: prettier.Options): prettier.Options {
const resolvedOptions = prettier.resolveConfig.sync(filePath);
if (resolvedOptions) {
_.defaults(resolvedOptions, options);
_.defaults(resolvedOptions, { ...options, filepath: filePath });
return resolvedOptions;
}
const { amount: indentAmount, type: indentType } = detectIndent(source);
Expand All @@ -97,6 +97,7 @@ export function getPrettierOptions(filePath: string, source: string, options: pr
const quotations = getQuotation(source);

_.defaults(Object.assign({}, options), {
filepath: filePath,
tabWidth: indentAmount,
useTabs: indentType && indentType === 'tab',
printWidth: sourceWidth,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
type Foo = {
foo: string,
stuff: boolean,
other: () => void,
bar: number,
[key: string]: number,
foo: string;
stuff: boolean;
other: () => void;
bar: number;
[key: string]: number;
};
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
type Foo = {
foo: string,
bar: number,
foo: string;
bar: number;
};
type Bar = {
foo: number,
bar: string,
foo: number;
bar: string;
};
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
type A = {
foo: string,
foo: string;
};
type B = {
foo: string | number,
bar: number,
foo: string | number;
bar: number;
};
type C = {
foo: string | number,
bar: number,
foo: string | number;
bar: number;
};
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
type Foo = {
foo: string,
bar: number,
foo: string;
bar: number;
};
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import * as React from 'react';
type MyComponentProps = {
baz: string,
baz: string;
};
type MyComponentState = {
dynamicState: number,
foo: number,
bar: string,
dynamicState: number;
foo: number;
bar: string;
};
export default class MyComponent extends React.Component<MyComponentProps, MyComponentState> {
state = { foo: 1, bar: 'str' };
Expand Down
2 changes: 1 addition & 1 deletion test/end-to-end/initial-state-and-proprypes/input.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ export default class MyComponent extends React.Component {
}

MyComponent.propTypes = {
baz: React.PropTypes.string.isRequired;
baz: React.PropTypes.string.isRequired
}
6 changes: 3 additions & 3 deletions test/end-to-end/initial-state-and-proprypes/output.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import * as React from 'react';
type MyComponentProps = {
baz: string,
baz: string;
};
type MyComponentState = {
foo: number,
bar: string,
foo: number;
bar: string;
};
export default class MyComponent extends React.Component<MyComponentProps, MyComponentState> {
state = { foo: 1, bar: 'str' };
Expand Down
10 changes: 5 additions & 5 deletions test/end-to-end/multiple-components/output.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
type HelloProps = {
message?: string,
message?: string;
};
const Hello: React.FC<HelloProps> = ({ message }) => {
return <div>hello {message}</div>;
};
type HeyProps = {
message?: string,
message?: string;
};
const Hey: React.FC<HeyProps> = ({ name }) => {
return <div>hey, {name}</div>;
};
type MyComponentState = {
foo: number,
bar: number,
foo: number;
bar: number;
};
export default class MyComponent extends React.Component<{}, MyComponentState> {
render() {
Expand All @@ -23,7 +23,7 @@ export default class MyComponent extends React.Component<{}, MyComponentState> {
}
}
type AnotherComponentProps = {
foo: string,
foo: string;
};
export class AnotherComponent extends React.Component<AnotherComponentProps, {}> {
render() {
Expand Down
2 changes: 1 addition & 1 deletion test/end-to-end/stateless-arrow-function/output.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
type HelloProps = {
message?: string,
message?: string;
};
const Hello: React.FC<HelloProps> = ({ message }) => {
return <div>hello {message}</div>;
Expand Down
2 changes: 1 addition & 1 deletion test/end-to-end/stateless-function/output.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
type HelloProps = {
message?: string,
message?: string;
};
export const Hello: React.FC<HelloProps> = ({ message }) => {
return <div>hello {message}</div>;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
type MyComponentState = { foo: number, bar: number };
type MyComponentState = { foo: number; bar: number };
export default class MyComponent extends React.Component<{}, MyComponentState> {
render() {
return <button onClick={this.onclick.bind(this)} />;
Expand All @@ -9,7 +9,7 @@ export default class MyComponent extends React.Component<{}, MyComponentState> {
}
}
type AnotherComponentProps = {
foo: string,
foo: string;
};
export class AnotherComponent extends React.Component<AnotherComponentProps, {}> {
static propTypes = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
type MyComponentState = { foo: number, bar: number } & { baz: number } & {
something: { big: number, here: string, of: { a: number }[] },
type MyComponentState = { foo: number; bar: number } & { baz: number } & {
something: { big: number; here: string; of: { a: number }[] };
};
export default class MyComponent extends React.Component<{}, MyComponentState> {
render() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
type MyComponentState = { foo: number, bar: number };
type MyComponentState = { foo: number; bar: number };
export default class MyComponent extends React.Component<{}, MyComponentState> {
render() {
return <button onClick={this.onclick.bind(this)} />;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
type MyComponentProps = {
foo: string,
foo: string;
};
export default class MyComponent extends React.Component<MyComponentProps, {}> {
static get propTypes() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
import * as React from 'react';
type MyComponentProps = {
any?: any,
array?: any[],
bool?: boolean,
func?: (...args: any[]) => any,
number?: number,
object?: object,
string?: string,
node?: React.ReactNode,
element?: JSX.Element,
oneOf?: 'a' | 'b' | 'c',
oneOfType?: string | number,
arrayOf?: string[],
any?: any;
array?: any[];
bool?: boolean;
func?: (...args: any[]) => any;
number?: number;
object?: object;
string?: string;
node?: React.ReactNode;
element?: JSX.Element;
oneOf?: 'a' | 'b' | 'c';
oneOfType?: string | number;
arrayOf?: string[];
objectOf?: {
[key: string]: string,
},
[key: string]: string;
};
shape?: {
color?: string,
fontSize?: number,
},
anyRequired: any,
arrayRequired: any[],
boolRequired: boolean,
funcRequired: (...args: any[]) => any,
numberRequired: number,
objectRequired: object,
stringRequired: string,
nodeRequired: React.ReactNode,
elementRequired: JSX.Element,
oneOfRequired: 'a' | 'b' | 'c',
oneOfTypeRequired: string | number,
arrayOfRequired: string[],
color?: string;
fontSize?: number;
};
anyRequired: any;
arrayRequired: any[];
boolRequired: boolean;
funcRequired: (...args: any[]) => any;
numberRequired: number;
objectRequired: object;
stringRequired: string;
nodeRequired: React.ReactNode;
elementRequired: JSX.Element;
oneOfRequired: 'a' | 'b' | 'c';
oneOfTypeRequired: string | number;
arrayOfRequired: string[];
objectOfRequired: {
[key: string]: string,
},
[key: string]: string;
};
shapeRequired: {
color?: string,
fontSize: number,
},
color?: string;
fontSize: number;
};
};
export default class MyComponent extends React.Component<MyComponentProps, {}> {
static propTypes = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
type MyComponentProps = {
foo: string,
foo: string;
};
export default class MyComponent extends React.Component<MyComponentProps, {}> {
static propTypes = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
class SomeComponent extends React.Component<
{
foo: number,
foo: number;
},
{
bar: string,
},
bar: string;
}
> {
static propTypes = { foo: React.PropTypes.string };
render() {
Expand All @@ -13,7 +13,7 @@ class SomeComponent extends React.Component<
}
SomeComponent.propTypes = { foo: React.PropTypes.string };
class AnotherComponent extends React.Component<{
baz: number,
baz: number;
}> {
static propTypes = { baz: React.PropTypes.string };
render() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
class SomeComponent extends React.Component<
{
foo: number,
foo: number;
},
{
bar: string,
},
bar: string;
}
> {
static propTypes = { foo: React.PropTypes.string };
render() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
class SomeComponent extends React.Component<
{
foo: string,
baz: string,
foo: string;
baz: string;
},
{
bar: string,
},
bar: string;
}
> {}
class AnotherComponent extends React.Component<{
lol: number,
lol: number;
}> {}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class SomeComponent extends React.Component<
{
foo: number,
foo: number;
},
{
bar: string,
},
bar: string;
}
> {}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class SomeComponent extends React.Component<
{
foo: number,
foo: number;
},
{
bar: string,
},
bar: string;
}
> {}
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
class SomeComponent extends React.Component<
{
foo: number,
foo: number;
},
{
bar: string,
},
bar: string;
}
> {}
class AnotherComponent extends React.Component<
{
foo: number,
foo: number;
},
{
bar: string,
},
bar: string;
}
> {}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
class SomeComponent extends React.Component<
{
foo: number,
foo: number;
},
{
bar: string,
},
bar: string;
}
> {}
Loading