Skip to content

Commit 201491c

Browse files
Extract repository type from function that creates it
1 parent 644b31a commit 201491c

File tree

12 files changed

+24
-55
lines changed

12 files changed

+24
-55
lines changed

src/registry/app-start.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import colors from 'colors/safe';
22
import path from 'path';
33
import fs from 'fs-extra';
4-
import { Config, Repository } from '../types';
4+
import type { Repository } from './domain/repository';
5+
import { Config } from '../types';
56

67
const packageInfo = fs.readJsonSync(
78
path.join(

src/registry/domain/repository.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ import * as validator from './validators';
1111
import getPromiseBasedAdapter from './storage-adapter';
1212
import * as versionHandler from './version-handler';
1313
import errorToString from '../../utils/error-to-string';
14-
import { Component, Config, Repository } from '../../types';
14+
import { Component, Config } from '../../types';
1515
import { StorageAdapter } from 'oc-storage-adapters-utils';
1616

1717
const packageInfo = fs.readJsonSync(
1818
path.join(__dirname, '..', '..', '..', 'package.json')
1919
);
2020

21-
export default function repository(conf: Config): Repository {
21+
export default function repository(conf: Config) {
2222
const cdn: StorageAdapter =
2323
!conf.local &&
2424
(getPromiseBasedAdapter(conf.storage.adapter(conf.storage.options)) as any);
@@ -341,3 +341,5 @@ export default function repository(conf: Config): Repository {
341341

342342
return repository;
343343
}
344+
345+
export type Repository = ReturnType<typeof repository>;

src/registry/router.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import PluginsRoute from './routes/plugins';
99
import DependenciesRoute from './routes/dependencies';
1010
import settings from '../resources/settings';
1111
import type { Express } from 'express';
12-
import { Config, Repository } from '../types';
12+
import type { Repository } from '../registry/domain/repository';
13+
import { Config } from '../types';
1314

1415
export function create(app: Express, conf: Config, repository: Repository) {
1516
const routes = {

src/registry/routes/component-info.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ import * as getComponentFallback from './helpers/get-component-fallback';
66
import infoView from '../views/info';
77
import isUrlDiscoverable from './helpers/is-url-discoverable';
88
import * as urlBuilder from '../domain/url-builder';
9-
import { Component, Config, Repository } from '../../types';
9+
import type { Repository } from '../domain/repository';
10+
import { Component, Config } from '../../types';
1011
import { Request, Response } from 'express';
1112

1213
function getParams(component: Component) {

src/registry/routes/component-preview.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import * as getComponentFallback from './helpers/get-component-fallback';
22
import previewView from '../views/preview';
33
import * as urlBuilder from '../domain/url-builder';
44
import { Request, Response } from 'express';
5-
import { Component, Config, TemplateInfo, Repository } from '../../types';
5+
import type { Repository } from '../domain/repository';
6+
import { Component, Config, TemplateInfo } from '../../types';
67
import { fromPromise } from 'universalify';
78

89
function componentPreview(

src/registry/routes/component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import _ from 'lodash';
33

44
import GetComponentHelper from './helpers/get-component';
55
import strings from '../../resources';
6-
import { Config, Repository } from '../../types';
6+
import type { Repository } from '../domain/repository';
7+
import { Config } from '../../types';
78
import { Request, RequestHandler, Response } from 'express';
89

910
export default function component(

src/registry/routes/components.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import GetComponentHelper, {
55
GetComponentResult
66
} from './helpers/get-component';
77
import strings from '../../resources';
8-
import { Config, Repository } from '../../types';
8+
import type { Repository } from '../domain/repository';
9+
import { Config } from '../../types';
910
import { Request, RequestHandler, Response } from 'express';
1011

1112
type Component = {

src/registry/routes/helpers/get-component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ import settings from '../../../resources/settings';
1818
import strings from '../../../resources';
1919
import * as urlBuilder from '../../domain/url-builder';
2020
import * as validator from '../../domain/validators';
21-
import { Config, Repository } from '../../../types';
21+
import type { Repository } from '../../domain/repository';
22+
import { Config } from '../../../types';
2223
import { IncomingHttpHeaders } from 'http';
2324
import { fromPromise } from 'universalify';
2425

src/registry/routes/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import getComponentsHistory from './helpers/get-components-history';
99
import getAvailableDependencies from './helpers/get-available-dependencies';
1010
import indexView from '../views';
1111
import urlBuilder = require('../domain/url-builder');
12-
import { Author, Component, ParsedComponent, Repository } from '../../types';
12+
import type { Repository } from '../domain/repository';
13+
import { Author, Component, ParsedComponent } from '../../types';
1314
import { NextFunction, Request, Response } from 'express';
1415
import { IncomingHttpHeaders } from 'http';
1516
import { PackageJson } from 'type-fest';

src/registry/routes/publish.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import { Request, Response } from 'express';
12
import extractPackage from '../domain/extract-package';
23
import strings from '../../resources/index';
34
import * as validator from '../domain/validators';
4-
import { Request, Response } from 'express';
5-
import { Repository } from '../../types';
5+
import type { Repository } from '../domain/repository';
66

77
export default function publish(repository: Repository) {
88
return async function (req: Request, res: Response): Promise<void> {

0 commit comments

Comments
 (0)