Skip to content

Commit

Permalink
Merge pull request #44 from sima-land/38-bun-deno-support
Browse files Browse the repository at this point in the history
Шаг 6 #38
  • Loading branch information
krutoo committed Mar 30, 2023
2 parents ffa3a37 + 119e63d commit 6c95bdd
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 5 deletions.
9 changes: 9 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@ module.exports = {
root: true,
extends: [require.resolve('@sima-land/linters/eslint'), 'plugin:react/jsx-runtime'],
overrides: [
{
files: ['*.ts', '*.tsx'],
rules: {
'@typescript-eslint/explicit-member-accessibility': [
'error',
{ accessibility: 'no-public' },
],
},
},
{
files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
rules: {
Expand Down
2 changes: 1 addition & 1 deletion src/di/errors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type { Token } from './types';
* Ошибка, сообщающая, что в контейнере нет сервиса по заданному ключу.
*/
export class NothingBoundError extends Error {
public readonly token: Token<unknown>;
readonly token: Token<unknown>;

/**
* Конструктор.
Expand Down
2 changes: 1 addition & 1 deletion src/di/token.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class TokenImplementation<T = never> implements Token<T> {
/**
* @inheritdoc
*/
public toString(): string {
toString(): string {
return `Token(${this._key.description})`;
}
}
Expand Down
4 changes: 3 additions & 1 deletion src/preset/node/handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -111,12 +111,14 @@ export function provideMain(resolve: Resolve): VoidFunction {
const template = resolve(KnownToken.Http.Handler.Response.Page.template);
const builder = resolve(KnownToken.Http.Handler.Response.builder);

const getAssets = typeof assets === 'function' ? assets : () => assets;

return async function main() {
try {
// @todo это билдер ответа но в ответе может не быть markup, assets и тд, подумать и переделать
builder
.markup(await render(await prepare()))
.assets(assets)
.assets(await getAssets())
.format(PageResponse.defineFormat(context.req))
.template(template)
.send(context.res);
Expand Down
2 changes: 1 addition & 1 deletion src/tokens.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export const KnownToken = {
Response: {
builder: createToken<PageResponse>('response/builder'),
Page: {
assets: createToken<PageAssets>('page/assets'),
assets: createToken<PageAssets | (() => PageAssets | Promise<PageAssets>)>('page/assets'),
template: createToken<PageTemplate>('page/template'),
prepare: createToken<() => JSX.Element | Promise<JSX.Element>>('page/prepare'),
render: createToken<(element: JSX.Element) => string | Promise<string>>('page/render'),
Expand Down
2 changes: 1 addition & 1 deletion src/utils/redux-saga/middleware.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class MiddlewareControl {
});
}

public toMiddleware(): SagaExtendedMiddleware {
toMiddleware(): SagaExtendedMiddleware {
const middleware: SagaExtendedMiddleware = api => {
this.api = api;
return this.sagaMiddleware(api);
Expand Down

0 comments on commit 6c95bdd

Please sign in to comment.