Skip to content

Commit

Permalink
Linter updated and issues fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
gius committed Sep 3, 2023
1 parent b3c6f5c commit 4db51a5
Show file tree
Hide file tree
Showing 46 changed files with 147 additions and 82 deletions.
5 changes: 4 additions & 1 deletion examples/complexdemo/src/data/backendConnector.ts
Expand Up @@ -4,7 +4,10 @@ import DeserializingRequestBuilder from "./deserializingRequestBuilder";
import { serializeEntity } from "./helpers";

export default class BackendConnector {
constructor(private baseUrl: string, private apiKey: string) {}
constructor(
private baseUrl: string,
private apiKey: string
) {}

@bound
getRequestBuilder() {
Expand Down
5 changes: 4 additions & 1 deletion examples/complexdemo/src/data/repositoryBase.ts
Expand Up @@ -7,7 +7,10 @@ import type DeserializingRequestBuilder from "./deserializingRequestBuilder";

export default abstract class RepositoryBase {
protected apiFactory: () => DeserializingRequestBuilder;
constructor(connector: BackendConnector, protected eventBus: EventBus) {
constructor(
connector: BackendConnector,
protected eventBus: EventBus
) {
this.apiFactory = connector.getRequestBuilder;
}

Expand Down
11 changes: 6 additions & 5 deletions examples/complexdemo/src/main.tsx
@@ -1,11 +1,12 @@
import React from "react";
import ReactDOM from "react-dom";
import "./index.css";
import { createRoot } from "react-dom/client";
import App from "./App";
import "./index.css";

ReactDOM.render(
const container = document.getElementById("root");
const root = createRoot(container!);
root.render(
<React.StrictMode>
<App />
</React.StrictMode>,
document.getElementById("root")
</React.StrictMode>
);
2 changes: 1 addition & 1 deletion examples/navigation/src/main.tsx
Expand Up @@ -58,7 +58,7 @@ declare module "@tanstack/react-router" {
}

const container = document.getElementById("root");
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion

const root = createRoot(container!);
root.render(
<React.StrictMode>
Expand Down
2 changes: 1 addition & 1 deletion examples/todolist/src/main.tsx
Expand Up @@ -26,7 +26,7 @@ declare module "@tanstack/react-router" {
}

const container = document.getElementById("root");
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion

const root = createRoot(container!);
root.render(
<React.StrictMode>
Expand Down
5 changes: 4 additions & 1 deletion packages/apiclient/src/fetchError.ts
@@ -1,7 +1,10 @@
export default class FetchError<TContent = any> extends Error {
handled = false;

constructor(public response: Response, public content?: TContent) {
constructor(
public response: Response,
public content?: TContent
) {
super(response.statusText);
}
}
7 changes: 5 additions & 2 deletions packages/apiclient/src/restRequestBuilder.ts
Expand Up @@ -42,7 +42,11 @@ export class RestRequestBuilder {
return this.urlValue;
}

constructor(protected apiConnector: IApiConnector, private baseUrl: string, protected params?: RequestInit) {
constructor(
protected apiConnector: IApiConnector,
private baseUrl: string,
protected params?: RequestInit
) {
this.reset();
}

Expand All @@ -63,7 +67,6 @@ export class RestRequestBuilder {
one(path: string, id?: any): this {
this.urlValue += "/" + path;
if (id !== undefined) {
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
this.urlValue += `/${id}`;
}
return this;
Expand Down
4 changes: 2 additions & 2 deletions packages/datascreens/src/filteredList.ts
Expand Up @@ -9,7 +9,7 @@ import DataListBase from "./dataListBase";

export default class FilteredList<
TEntity,
TFilter extends Record<string, any> = Record<string, any>
TFilter extends Record<string, any> = Record<string, any>,
> extends DataListBase<TEntity> {
static defaultPageSize = 30;

Expand Down Expand Up @@ -40,7 +40,7 @@ export default class FilteredList<

constructor(
public onLoadData: (filter: TFilter, paging: IPagingFilter) => Awaitable<PagedQueryResult<TEntity> | void>,
private initFilter: () => TFilter = () => ({} as TFilter),
private initFilter: () => TFilter = () => ({}) as TFilter,
private defaultPagingFilter: (previous?: Readonly<IPagingFilter>) => IPagingFilter = previous => ({
limit: FilteredList.defaultPageSize,
offset: 0,
Expand Down
4 changes: 2 additions & 2 deletions packages/dataviews/src/dataRepeater/index.tsx
Expand Up @@ -12,7 +12,7 @@ export interface DataRepeaterProps<
THeadCell extends React.ElementType,
TBodyWrapper extends React.ElementType,
TItemWrapper extends React.ElementType,
TItemCell extends React.ElementType
TItemCell extends React.ElementType,
> extends DataTablePropsBase<TItem, TContext> {
wrapperType?: TWrapper;
wrapperProps?: React.ComponentPropsWithoutRef<TWrapper>;
Expand Down Expand Up @@ -45,7 +45,7 @@ function dataRepeater<
THeadCell extends React.ElementType,
TBodyWrapper extends React.ElementType,
TItemWrapper extends React.ElementType,
TItemCell extends React.ElementType
TItemCell extends React.ElementType,
>(props: DataRepeaterProps<TItem, TContext, TWrapper, THeadWrapper, THeadCell, TBodyWrapper, TItemWrapper, TItemCell>) {
const Wrapper = props.wrapperType ?? "table";
const ItemWrapper = props.bodyWrapperType ?? "tbody";
Expand Down
1 change: 1 addition & 0 deletions packages/dataviews/src/dataTypes.ts
Expand Up @@ -16,6 +16,7 @@ export interface ColumnRenderProps<TItem, TContext, TProperty extends PropertyKe

export interface ValueRenderProps<TItem, TContext, TProperty extends PropertyKey<TItem>>
extends ColumnRenderProps<TItem, TContext, TProperty> {
// eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
value?: TItem[TProperty] | any; // if we remove any, TS is not able to infer type when multiple columns definitions are defined next to each other :-(
item: TItem;
}
Expand Down
6 changes: 4 additions & 2 deletions packages/dirtycheck/src/automaticDirtyWatcher.ts
Expand Up @@ -18,7 +18,10 @@ export default class AutomaticDirtyWatcher<TEntity extends object = any> extends
private _results: Readonly<Partial<Record<PropertyName<TEntity>, boolean>>>;
private _watchedProperties: PropertyName<TEntity>[] = [];

constructor(private target: TEntity, params?: AutomaticDirtyWatcherParams<TEntity>) {
constructor(
private target: TEntity,
params?: AutomaticDirtyWatcherParams<TEntity>
) {
super(params?.isVisible);

if (typeof params === "object") {
Expand Down Expand Up @@ -69,7 +72,6 @@ export default class AutomaticDirtyWatcher<TEntity extends object = any> extends
const propertyName = name as PropertyName<TEntity>;
if (
(!this._includedProperties || this._includedProperties.includes(propertyName)) &&
// eslint-disable-next-line @typescript-eslint/prefer-optional-chain
(!this._excludedProperties || !this._excludedProperties.includes(propertyName))
) {
this._watchedProperties.push(propertyName);
Expand Down
2 changes: 1 addition & 1 deletion packages/generator/src/inversify/index.ts
Expand Up @@ -92,7 +92,7 @@ export default class IversifyGenerator extends GeneratorBase<IGeneratorParams, I
({
...x,
regexPattern: new RegExp(x.pattern),
} as ServiceRule)
}) as ServiceRule
) ?? []
);
}
Expand Down
6 changes: 5 additions & 1 deletion packages/generator/src/inversify/registrationsProcessor.ts
Expand Up @@ -9,7 +9,11 @@ export default class RegistrationsProcessor {
private decorators: CodeBlock[];
private registrations: CodeBlock[];

constructor(private decoratorsFile: SourceFile, private registrationFile: SourceFile, private factoryName: string) {}
constructor(
private decoratorsFile: SourceFile,
private registrationFile: SourceFile,
private factoryName: string
) {}

process(services: ServiceRegistration[]) {
this.decorators = [];
Expand Down
1 change: 1 addition & 0 deletions packages/generator/src/inversify/types.ts
Expand Up @@ -8,6 +8,7 @@ export interface IGeneratorParams extends BaseParams {
registry?: { output: string };
}

// eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
export type ServiceIdentifier = "$class" | "$interface" | string;
export type LifeScope = "none" | "singleton" | "transient";

Expand Down
2 changes: 1 addition & 1 deletion packages/generator/src/morphHelpers.ts
Expand Up @@ -42,5 +42,5 @@ export function unwrapType(sourceType: Type) {
}
}

return symbol && (symbol.getValueDeclaration() || symbol.getDeclarations()[0]);
return symbol?.getValueDeclaration() ?? symbol?.getDeclarations()[0];
}
6 changes: 5 additions & 1 deletion packages/generator/src/openapi/fileGenerator.ts
Expand Up @@ -20,7 +20,11 @@ import StringLiteralWriter from "./writers/stringLiteralWriter";
import UnionEntityWriter from "./writers/unionEntityWriter";

export default class FileGenerator {
constructor(private project: Project, _params: IGeneratorParams, private config: IConfig) {
constructor(
private project: Project,
_params: IGeneratorParams,
private config: IConfig
) {
this.initTemplates();
}

Expand Down
6 changes: 5 additions & 1 deletion packages/generator/src/openapi/models/aliasEntity.ts
Expand Up @@ -2,7 +2,11 @@ import NamedObject from "./namedObject";
import type TypeReference from "./typeReference";

export default class AliasEntity extends NamedObject {
constructor(name: string, public referencedEntity: TypeReference, public isArray = false) {
constructor(
name: string,
public referencedEntity: TypeReference,
public isArray = false
) {
super(name);
}
}
5 changes: 4 additions & 1 deletion packages/generator/src/openapi/models/entityProperty.ts
Expand Up @@ -9,7 +9,10 @@ export default class EntityProperty extends NamedObject {
validations?: Map<Restriction, unknown>;
tags?: Map<symbol, any>;

constructor(name: string, public type: TypeReference) {
constructor(
name: string,
public type: TypeReference
) {
super(name);
}

Expand Down
5 changes: 4 additions & 1 deletion packages/generator/src/openapi/models/enum.ts
@@ -1,7 +1,10 @@
import NamedObject from "./namedObject";

export default class Enum extends NamedObject {
constructor(name: string, public items: string[]) {
constructor(
name: string,
public items: string[]
) {
super(name);
}
}
5 changes: 4 additions & 1 deletion packages/generator/src/openapi/models/externalEntity.ts
@@ -1,7 +1,10 @@
import NamedObject from "./namedObject";

export default class ExternalEntity extends NamedObject {
constructor(name: string, public fullName: string) {
constructor(
name: string,
public fullName: string
) {
super(name);
}
}
6 changes: 5 additions & 1 deletion packages/generator/src/openapi/models/inheritedEntity.ts
Expand Up @@ -3,7 +3,11 @@ import ObjectEntity from "./objectEntity";
import type TypeReference from "./typeReference";

export default class InheritedEntity extends ObjectEntity {
constructor(name: string, public baseEntities: TypeReference[], properties: EntityProperty[]) {
constructor(
name: string,
public baseEntities: TypeReference[],
properties: EntityProperty[]
) {
super(name, properties);
}
}
5 changes: 4 additions & 1 deletion packages/generator/src/openapi/models/objectEntity.ts
Expand Up @@ -3,7 +3,10 @@ import NamedObject from "./namedObject";
import type Restriction from "./restriction";

export default class ObjectEntity extends NamedObject {
constructor(name: string, public properties: EntityProperty[]) {
constructor(
name: string,
public properties: EntityProperty[]
) {
super(name);
}

Expand Down
5 changes: 4 additions & 1 deletion packages/generator/src/openapi/models/unionEntity.ts
Expand Up @@ -2,7 +2,10 @@ import NamedObject from "./namedObject";
import type TypeReference from "./typeReference";

export default class UnionEntity extends NamedObject {
constructor(name: string, public entities: TypeReference[]) {
constructor(
name: string,
public entities: TypeReference[]
) {
super(name);
}
}
6 changes: 2 additions & 4 deletions packages/generator/src/openapi/parsers/openApi2Parser.ts
Expand Up @@ -112,7 +112,6 @@ export default class OpenApi2Parser implements ApiModel {
}

private parseAllOfObject(name: string, definition: OpenAPIV2.SchemaObject) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const subTypes = definition.allOf!;

const plainObjects = subTypes.filter(
Expand All @@ -131,15 +130,14 @@ export default class OpenApi2Parser implements ApiModel {

const entity = new InheritedEntity(name, otherParents, properties);

plainObjects.forEach(object =>
object.required?.forEach(property => entity.addPropertyRestriction(property, Restriction.required, true))
plainObjects.forEach(
object => object.required?.forEach(property => entity.addPropertyRestriction(property, Restriction.required, true))
);

return this.setTypeReference(name, entity);
}

private parseOneOfObject(name: string, definition: OpenAPIV2.SchemaObject) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const subTypes = definition.oneOf!;
const innerTypes = subTypes.map((x, i) =>
this.parseSchemaObject(`${name}Option${i + 1}`, x as OpenAPIV2.SchemaObject | OpenAPIV2.ItemsObject)
Expand Down
11 changes: 6 additions & 5 deletions packages/generator/src/openapi/parsers/openApi3Parser.ts
Expand Up @@ -20,7 +20,10 @@ export default class OpenApi3Parser implements ApiModel {
types = new Map<string, TypeReference>();
endpoints: Endpoint[];

constructor(private apiDocument: OpenAPIV3.Document, private config?: IApiParserConfig) {}
constructor(
private apiDocument: OpenAPIV3.Document,
private config?: IApiParserConfig
) {}

parse() {
if (this.apiDocument.components?.schemas) {
Expand Down Expand Up @@ -115,7 +118,6 @@ export default class OpenApi3Parser implements ApiModel {
}

private parseAllOfObject(name: string, definition: OpenAPIV3.SchemaObject) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const subTypes = definition.allOf!;

const plainObjects = subTypes.filter(
Expand All @@ -134,15 +136,14 @@ export default class OpenApi3Parser implements ApiModel {

const entity = new InheritedEntity(name, otherParents, properties);

plainObjects.forEach(object =>
object.required?.forEach(property => entity.addPropertyRestriction(property, Restriction.required, true))
plainObjects.forEach(
object => object.required?.forEach(property => entity.addPropertyRestriction(property, Restriction.required, true))
);

return this.setTypeReference(name, entity);
}

private parseOneOfObject(name: string, definition: OpenAPIV3.SchemaObject) {
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
const subTypes = definition.oneOf!;
const innerTypes = subTypes.map((x, i) => this.parseSchemaObject(`${name}Option${i + 1}`, x));

Expand Down
1 change: 0 additions & 1 deletion packages/generator/src/openapi/types.ts
@@ -1,6 +1,5 @@
import type { BaseParams } from "../generatorBase";

// eslint-disable-next-line @typescript-eslint/no-empty-interface
export interface IGeneratorParams extends BaseParams {}

interface HasExclude {
Expand Down
1 change: 0 additions & 1 deletion packages/helpers/__tests__/busyWatcher.test.ts
Expand Up @@ -86,7 +86,6 @@ describe("BusyWatcher", () => {
it("clears busy when promise fails", async () => {
const watcher = new BusyWatcher();

// eslint-disable-next-line @typescript-eslint/no-empty-function
let handler = () => {};
const promise = new Promise((_resolve, reject) => {
handler = reject;
Expand Down
4 changes: 2 additions & 2 deletions packages/helpers/src/path.ts
Expand Up @@ -112,7 +112,7 @@ export type FieldPathValue<TFieldValues extends FieldValues, TFieldPath extends
*/
export type FieldArrayPathValue<
TFieldValues extends FieldValues,
TFieldArrayPath extends FieldArrayPath<TFieldValues>
TFieldArrayPath extends FieldArrayPath<TFieldValues>,
> = PathValue<TFieldValues, TFieldArrayPath>;

/**
Expand All @@ -127,7 +127,7 @@ export type FieldArrayPathValue<
*/
export type FieldPathValues<
TFieldValues extends FieldValues,
TPath extends FieldPath<TFieldValues>[] | readonly FieldPath<TFieldValues>[]
TPath extends FieldPath<TFieldValues>[] | readonly FieldPath<TFieldValues>[],
// eslint-disable-next-line @typescript-eslint/ban-types
> = {} & {
[K in keyof TPath]: FieldPathValue<TFieldValues, TPath[K] & FieldPath<TFieldValues>>;
Expand Down
2 changes: 1 addition & 1 deletion packages/helpers/src/types.ts
Expand Up @@ -26,5 +26,5 @@ export type ExtractTypeRestriction<T> = T extends TypedBindingProperty<any, infe

export type PropertyType<
TTarget extends BindingTarget,
TProperty extends TypedBindingProperty<TTarget, any>
TProperty extends TypedBindingProperty<TTarget, any>,
> = TTarget extends Map<TProperty, infer TValue> ? TValue | undefined : TTarget[TProperty] & ExtractTypeRestriction<TProperty>;

0 comments on commit 4db51a5

Please sign in to comment.