Skip to content

Commit

Permalink
style: apply eslint fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
tpluscode committed Jun 27, 2019
1 parent 203bf34 commit deb8941
Show file tree
Hide file tree
Showing 86 changed files with 2,156 additions and 2,188 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.d.ts
15 changes: 12 additions & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,26 @@
"standard"
],
"env": {
"browser": true
"browser": true,
"jasmine": true
},
"parser": "@typescript-eslint/parser",
"parserOptions": {
"ecmaVersion": 2017,
"sourceType": "module"
},
"plugins": [
"@typescript-eslint/eslint-plugin"
"@typescript-eslint/eslint-plugin",
"jasmine"
],
"rules": {
"indent": "off"
"indent": "off",
"comma-dangle": [
"error",
"always-multiline"
],
"@typescript-eslint/interface-name-prefix": "warn",
"@typescript-eslint/no-use-before-define": "warn",
"@typescript-eslint/explicit-function-return-type": "off"
}
}
6 changes: 6 additions & 0 deletions package-lock.json

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

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,8 @@
"standard-version": "^6.0.1",
"husky": "^1.0.0",
"lint-staged": "^8.0.0",
"cz-conventional-changelog": "^2.1.0"
"cz-conventional-changelog": "^2.1.0",
"eslint-plugin-jasmine": "^2.10.1"
},
"lint-staged": {
"*.{js,ts}": [
Expand Down
117 changes: 59 additions & 58 deletions src/Constants.ts
Original file line number Diff line number Diff line change
@@ -1,74 +1,75 @@
/* eslint-disable @typescript-eslint/no-namespace,no-inner-declarations */
// tslint:disable:no-namespace object-literal-sort-keys

export type HydraTerm = 'apiDocumentation' |
'ApiDocumentation' |
'title' |
'description' |
'method' |
'Class' |
'member' |
'PartialCollectionView' |
'Collection' |
'view' |
'first' |
'next' |
'last' |
'previous' |
'entrypoint' |
'SupportedProperty' |
'supportedProperty' |
'SupportedOperation' |
'supportedClass' |
'supportedOperation' |
'expects' |
'returns' |
'readable' |
'writable' |
'required' |
'property' |
'statusCodes' |
'operation' |
'Operation' |
'mapping' |
'StatusCodeDescription' |
'IriTemplate' |
'IriTemplateMapping' |
'code' |
'variable' |
'variableRepresentation' |
'template' |
'BasicRepresentation' |
'ExplicitRepresentation' |
'totalItems' |
'Link' |
'collection' |
'manages' |
'subject' |
'object' |
'search';
'ApiDocumentation' |
'title' |
'description' |
'method' |
'Class' |
'member' |
'PartialCollectionView' |
'Collection' |
'view' |
'first' |
'next' |
'last' |
'previous' |
'entrypoint' |
'SupportedProperty' |
'supportedProperty' |
'SupportedOperation' |
'supportedClass' |
'supportedOperation' |
'expects' |
'returns' |
'readable' |
'writable' |
'required' |
'property' |
'statusCodes' |
'operation' |
'Operation' |
'mapping' |
'StatusCodeDescription' |
'IriTemplate' |
'IriTemplateMapping' |
'code' |
'variable' |
'variableRepresentation' |
'template' |
'BasicRepresentation' |
'ExplicitRepresentation' |
'totalItems' |
'Link' |
'collection' |
'manages' |
'subject' |
'object' |
'search';

export namespace Core {
export function Vocab(term?: HydraTerm) {
return 'http://www.w3.org/ns/hydra/core#' + (term || '');
export function Vocab (term?: HydraTerm) {
return 'http://www.w3.org/ns/hydra/core#' + (term || '')
}
}

export namespace JsonLd {
export let Graph = '@graph';
export const Context = '@context';
export let Id = '@id';
export let Value = '@value';
export let Type = '@type';
export let Language = '@language';
export let Graph = '@graph'
export const Context = '@context'
export let Id = '@id'
export let Value = '@value'
export let Type = '@type'
export let Language = '@language'
}

export namespace MediaTypes {
export let jsonLd = 'application/ld+json';
export let ntriples = 'application/n-triples';
export let nquads = 'application/n-quads';
export let jsonLd = 'application/ld+json'
export let ntriples = 'application/n-triples'
export let nquads = 'application/n-quads'
}

export namespace Headers {
export let Link = 'Link';
export let ContentType = 'Content-Type';
export let Link = 'Link'
export let ContentType = 'Content-Type'
}
21 changes: 10 additions & 11 deletions src/FetchUtil.ts
Original file line number Diff line number Diff line change
@@ -1,34 +1,33 @@
import 'isomorphic-fetch';
import * as Constants from './Constants';
import {ResponseWrapper} from './ResponseWrapper';
import 'isomorphic-fetch'
import * as Constants from './Constants'
import { ResponseWrapper } from './ResponseWrapper'

// tslint:disable:max-line-length
const requestAcceptHeaders = Constants.MediaTypes.jsonLd + ', ' + Constants.MediaTypes.ntriples + ', ' + Constants.MediaTypes.nquads;
const requestAcceptHeaders = Constants.MediaTypes.jsonLd + ', ' + Constants.MediaTypes.ntriples + ', ' + Constants.MediaTypes.nquads

export async function fetchResource(uri: string): Promise<ResponseWrapper> {
export async function fetchResource (uri: string): Promise<ResponseWrapper> {
const res = await fetch(uri, {
headers: new Headers({
accept: requestAcceptHeaders,
}),
});
})

return new ResponseWrapper(uri, res);
return new ResponseWrapper(uri, res)
}

export async function invokeOperation(
export async function invokeOperation (
method: string,
uri: string,
body?: BodyInit,
mediaType = Constants.MediaTypes.jsonLd): Promise<ResponseWrapper> {

const res = await fetch(uri, {
body,
headers: new Headers({
'Accept': requestAcceptHeaders,
'Content-Type': mediaType,
}),
method,
});
})

return new ResponseWrapper(uri, res);
return new ResponseWrapper(uri, res)
}
46 changes: 23 additions & 23 deletions src/HydraResponse.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {IResourceGraph, ResourceGraph} from './ResourceGraph';
import {HydraResource} from './Resources';
import {IResource} from './Resources/Resource';
import {IResponseWrapper, ResponseWrapper} from './ResponseWrapper';
import {IRootSelector} from './RootSelectors';
import { IResourceGraph, ResourceGraph } from './ResourceGraph'
import { HydraResource } from './Resources'
import { IResource } from './Resources/Resource'
import { IResponseWrapper, ResponseWrapper } from './ResponseWrapper'
import { IRootSelector } from './RootSelectors'

export interface IHydraResponse extends Iterable<HydraResource>, IResponseWrapper {

Expand All @@ -29,47 +29,47 @@ export interface IHydraResponse extends Iterable<HydraResource>, IResponseWrappe
ofType(classId: string): IResource[];
}

export function create(
export function create (
uri: string,
response: IResponseWrapper,
resources: IResourceGraph,
rootSelectors: IRootSelector[]): IHydraResponse {
const safeResources = resources || new ResourceGraph();
const safeSelectors = rootSelectors || [];
const safeResources = resources || new ResourceGraph()
const safeSelectors = rootSelectors || []

class HydraResponse extends ResponseWrapper implements IHydraResponse {
public readonly requestedUri: string;

constructor(requestedUri: string) {
super(requestedUri, response.xhr);
public constructor (requestedUri: string) {
super(requestedUri, response.xhr)
}

public get(identifier: string) {
return safeResources.get(identifier);
public get (identifier: string) {
return safeResources.get(identifier)
}

get root() {
public get root () {
return safeSelectors.reduce((resource, selector) => {
if (!resource) {
resource = selector.selectRoot(safeResources, this);
resource = selector.selectRoot(safeResources, this)
}

return resource;
}, null as HydraResource);
return resource
}, null as HydraResource)
}

get length(): number {
return Object.keys(safeResources).length;
public get length (): number {
return Object.keys(safeResources).length
}

public ofType(classId: string) {
return Object.values(safeResources).filter((res) => res.types.contains(classId));
public ofType (classId: string) {
return Object.values(safeResources).filter((res) => res.types.contains(classId))
}

public [Symbol.iterator]() {
return Object.values(safeResources)[Symbol.iterator]();
public [Symbol.iterator] () {
return Object.values(safeResources)[Symbol.iterator]()
}
}

return new HydraResponse(uri);
return new HydraResponse(uri)
}
6 changes: 3 additions & 3 deletions src/JsonLdUtil.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
export class JsonLdUtil {
public static trimTrailingSlash(uri: string): string {
public static trimTrailingSlash (uri: string): string {
if (!uri || !uri.replace) {
return null;
return null
}

// todo: is this really correct to ignore trailing slash?
return uri.replace(/\/$/, '');
return uri.replace(/\/$/, '')
}
}
16 changes: 8 additions & 8 deletions src/LodashUtil.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
export function forOwn(obj: object, iteratee) {
export function forOwn (obj: object, iteratee) {
for (const key in obj) {
if (!obj.hasOwnProperty(key)) { continue; }
if (!Object.prototype.hasOwnProperty.call(obj, key)) { continue }

iteratee(obj[key], key, obj);
iteratee(obj[key], key, obj)
}
}

export function values(obj: object): any[] {
const result = [];
export function values (obj: object): any[] {
const result = []

forOwn(obj, (o) => {
result.push(o);
});
result.push(o)
})

return result;
return result
}
Loading

0 comments on commit deb8941

Please sign in to comment.