Compare commits

..

55 Commits

Author SHA1 Message Date
5d9f4754a5 update-scanner: automatic update
@sapphirecode/eslint-config-ts: 1.1.12 ==> 1.1.13 minor
@sapphirecode/modelling: 1.1.2 ==> 1.1.3 minor
eslint: 6.8.0 ==> 7.2.0 major
2020-06-19 13:09:59 +02:00
2cac260954 update-scanner: automatic update
@sapphirecode/consts: 1.1.21 ==> 1.1.22 minor
@sapphirecode/eslint-config-ts: 1.1.11 ==> 1.1.12 minor
@sapphirecode/modelling: 1.0.40 ==> 1.1.2 minor
eslint: 6.8.0 ==> 7.2.0 major
typescript: 3.9.3 ==> 3.9.5 minor
2020-06-11 20:31:52 +02:00
d298b8e842 update-scanner: automatic update
@sapphirecode/consts: 1.1.20 ==> 1.1.21 minor
@sapphirecode/eslint-config-ts: 1.1.10 ==> 1.1.11 minor
@sapphirecode/modelling: 1.0.39 ==> 1.0.40 minor
eslint: 6.8.0 ==> 7.1.0 major
2020-06-02 08:49:07 +02:00
bd63607477 update-scanner: automatic update
@sapphirecode/eslint-config-ts: 1.1.9 ==> 1.1.10 minor
@sapphirecode/modelling: 1.0.38 ==> 1.0.39 minor
eslint: 6.8.0 ==> 7.1.0 major
2020-05-28 08:51:43 +02:00
55d461fb8e update-scanner: automatic update
@sapphirecode/consts: 1.1.19 ==> 1.1.20 minor
@sapphirecode/eslint-config-ts: 1.1.7 ==> 1.1.9 minor
@sapphirecode/modelling: 1.0.37 ==> 1.0.38 minor
eslint: 6.8.0 ==> 7.1.0 major
typescript: 3.9.2 ==> 3.9.3 minor
2020-05-23 18:23:15 +02:00
895893e76a update-scanner: automatic update
@sapphirecode/consts: 1.1.16 ==> 1.1.19 minor
@sapphirecode/eslint-config-ts: 1.0.45 ==> 1.1.7 minor
@sapphirecode/modelling: 1.0.34 ==> 1.0.37 minor
eslint: 6.8.0 ==> 7.0.0 major
2020-05-17 19:40:24 +02:00
39fbc73c74 update jenkins.js 2020-05-15 13:16:26 +02:00
e1c26e2c5e adapt jenkins.js 2020-05-13 16:07:31 +02:00
d3a93108e2 update-scanner: automatic update
@sapphirecode/eslint-config-ts: 1.0.44 ==> 1.0.45 minor
@sapphirecode/modelling: 1.0.33 ==> 1.0.34 minor
eslint: 6.8.0 ==> 7.0.0 major
typescript: 3.8.3 ==> 3.9.2 minor
2020-05-13 11:10:26 +02:00
7a79aca59b update-scanner: automatic update
@sapphirecode/modelling: 1.0.31 ==> 1.0.33 minor
eslint: 6.8.0 ==> 7.0.0 major
2020-05-09 21:54:04 +02:00
ffb086a774 update-scanner: automatic update
@sapphirecode/consts: 1.1.15 ==> 1.1.16 minor
@sapphirecode/eslint-config-ts: 1.0.43 ==> 1.0.44 minor
@sapphirecode/modelling: 1.0.30 ==> 1.0.31 minor
2020-05-08 13:43:47 +02:00
d1499bb6d4 update-scanner: automatic update
@sapphirecode/eslint-config-ts: 1.0.41 ==> 1.0.43 minor
@sapphirecode/modelling: 1.0.28 ==> 1.0.30 minor
2020-05-07 19:31:54 +02:00
a6d4a35588 update-scanner: automatic update
@sapphirecode/consts: 1.1.14 ==> 1.1.15 minor
@sapphirecode/eslint-config-ts: 1.0.38 ==> 1.0.41 minor
@sapphirecode/modelling: 1.0.27 ==> 1.0.28 minor
2020-05-07 10:33:18 +02:00
2e4bb21354 update-scanner: automatic update
@sapphirecode/consts: 1.1.13 ==> 1.1.14 minor
2020-05-06 10:00:12 +02:00
3ed5253fc4 upda 2020-05-06 08:35:28 +02:00
274f2b4b7a fix 2020-05-06 07:45:02 +02:00
6eae1742d6 fix 2020-05-06 07:33:07 +02:00
cc59df51d0 fix publish 2020-05-05 19:50:12 +02:00
2a950310be move to @sapphirecode scope 2020-05-05 19:23:36 +02:00
9b4ad340a2 remove unnecessary dependencies 2020-05-04 21:40:54 +02:00
dfc0bc3b7e update-scanner: automatic update
@scode/consts: 1.1.9 ==> 1.1.11 minor
@scode/eslint-config-ts: 1.0.29 ==> 1.0.31 minor
@scode/modelling: 1.0.22 ==> 1.0.23 minor
2020-05-04 21:10:13 +02:00
c2ea65a992 update 2020-05-04 20:28:47 +02:00
3de5485650 update 2020-05-04 20:14:56 +02:00
dfd3df544c update-scanner: automatic update
@scode/consts: 1.1.8 ==> 1.1.9 minor
@scode/eslint-config-ts: 1.0.28 ==> 1.0.29 minor
@scode/modelling: 1.0.17 ==> 1.0.18 minor
2020-05-03 18:25:46 +02:00
7fe6dee81c fix 2020-05-03 17:05:04 +02:00
1d7791c2b0 only publish necessary files 2020-05-03 17:04:36 +02:00
3c8dcf3ad2 fix yarn.lock 2020-05-03 17:03:52 +02:00
ab70c46501 apply functions 2020-05-03 16:10:13 +02:00
3af8b97258 version bump 2020-05-02 21:51:56 +02:00
431e21806b Merge branch 'dev'
# Conflicts:
#	package.json
#	yarn.lock
2020-05-02 21:49:45 +02:00
1541018701 complete 2020-05-02 21:48:22 +02:00
0eea261e56 adapt to modelling 2020-05-02 21:29:25 +02:00
fccd69db74 remodel to be independant of database 2020-04-23 18:58:06 +02:00
95814c5541 test structure 2020-04-22 22:11:19 +02:00
3716e80674 fixes 2020-04-17 11:27:56 +02:00
3b9e3d416a fix 2020-04-17 11:08:03 +02:00
8b8fbb3ec5 implementation of knex crud handler 2020-04-17 11:03:15 +02:00
374940757a fixes 2020-04-17 08:31:14 +02:00
228c204255 imp 2020-04-16 11:09:04 +02:00
a1715aa117 fix 2020-04-16 09:46:06 +02:00
c053340e5e handler templates only 2020-04-16 09:44:43 +02:00
2dc969a47d fixes 2020-04-09 21:12:36 +02:00
bc50897afc fix compile errors 2020-04-09 12:29:30 +02:00
64ec1b5db5 fix 2020-04-09 11:11:19 +02:00
999d493c68 fixes 2020-04-09 10:31:15 +02:00
7a9e12e62d lint 2020-04-09 09:14:54 +02:00
89a861a2dd complete handler structure 2020-04-08 20:46:48 +02:00
715f64408d fix 2020-04-08 15:54:31 +02:00
f00db0efe5 structure 2020-04-08 15:18:14 +02:00
332e833134 fix linting 2020-04-08 11:57:30 +02:00
9b85bb119f linting 2020-04-07 09:24:31 +02:00
cf9e238dc7 fix ts lint 2020-04-06 14:01:58 +02:00
e90e504fb9 fix 2020-04-06 09:42:22 +02:00
81965a1398 reinitializing eslint 2020-04-03 18:50:08 +02:00
9891a7e247 remodel to typescript 2020-04-03 17:51:25 +02:00
42 changed files with 4208 additions and 3751 deletions

1
.eslintignore Normal file
View File

@ -0,0 +1 @@
/dist/

View File

@ -2,7 +2,7 @@
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
* Created by Timo Hocker <timo@sapphirecode.ovh>, March 2020
*/
module.exports = {
@ -12,13 +12,6 @@ module.exports = {
node: true
},
extends: [
'@scode'
],
globals: {
Atomics: 'readonly',
SharedArrayBuffer: 'readonly'
},
parserOptions: {
ecmaVersion: 2018
}
'@sapphirecode'
]
}

1
.gitignore vendored
View File

@ -1,6 +1,7 @@
/node_modules/
/coverage/
/.nyc_output/
/dist/
# stryker temp files
.stryker-tmp

View File

@ -1 +0,0 @@
/test/

1
.npmrc
View File

@ -1 +0,0 @@
@scode:registry=https://npm.scode.ovh

2
Jenkinsfile vendored
View File

@ -5,7 +5,7 @@ pipeline {
VERSION = VersionNumber([
versionNumberString:
'${BUILDS_ALL_TIME}',
versionPrefix: '1.1.',
versionPrefix: '2.0.',
worstResultForIncrement: 'SUCCESS'
])
}

144
index.js
View File

@ -1,144 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
/* eslint-disable no-console */
/* eslint-disable no-sync */
'use strict';
const fs = require ('fs');
const path = require ('path');
/**
* @typedef {object} options
* @property {any} [opts] object to pass to the handlers
* @property {string} [subdir] subdirectory for all requests
* @property {boolean} [verbose] enable verbose logging
* @property {boolean} [rethrow] rethrow errors (default: true)
*/
/**
* @typedef {object} handler_description
* @property {string} module_folder folder the module file is in
* @property {string} file name of the module
* @property {any} opts optional arguments
* @property {boolean} rethrow should errors be rethrown
*/
/**
* wrap a requestor handler to be compatible with express
*
* @param {handler_description} data handler data
* @returns {Function} requestor handler
*/
function get_handler ({ module_folder, file, opts, rethrow }) {
// eslint-disable-next-line global-require
const handler = require (path.join (process.cwd (), module_folder, file));
return (req, res, next) => new Promise (
(resolve) => resolve (handler (req, res, next, opts))
)
.catch ((e) => {
if (rethrow)
throw e;
});
}
/**
* register a handler to the given app
*
* @param {any} app express app
* @param {handler_description} handler_description data for the used handler
* @param {string} method method to respond to
* @param {string} url url to respond to
* @param {boolean} verbose should verbose logging be enabled
*/
function register_handler (
app,
handler_description,
method,
url,
verbose
) {
const handler = get_handler (handler_description);
if (verbose) {
console.log (
`[requestor info] redirecting ${url} to ${handler_description.file}`
);
}
switch (method) {
case 'post':
app.post (url, handler);
break;
case 'get':
app.get (url, handler);
break;
case 'put':
app.put (url, handler);
break;
case 'delete':
app.delete (url, handler);
break;
case 'all':
app.all (url, handler);
break;
default:
if (verbose) {
console.warn (
`'${method}' did not match any request method, ignoring`
);
}
break;
}
}
/**
* Load all request handlers in the given folder
*
* @param {any} app express app
* @param {string} module_folder folder that contains all modules
* @param {options} options additional options
*/
module.exports = function main (
app,
module_folder,
options = { opts: null, subdir: '', verbose: false, rethrow: true }
) {
const { opts, subdir, verbose, rethrow } = options;
for (const file of fs.readdirSync (module_folder)) {
const regex = /(?<method>.*?)-(?<url>.*?)\.js/u;
const { groups } = regex.exec (file);
if (typeof subdir === 'undefined')
groups.url = `/${groups.url}/`;
else
groups.url = `/${subdir}/${groups.url}/`;
groups.url = groups.url
.replace (/^\/[^/]*\/root/iu, '/')
.replace (/\./gu, '/')
.replace (/\/+/gu, '/');
register_handler (
app,
{
file,
module_folder,
opts,
rethrow
},
groups.method,
groups.url,
verbose
);
}
};

View File

@ -1,33 +1,22 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
/* eslint-disable no-process-exit */
/* eslint-disable no-console */
/* eslint-disable no-sync */
'use strict';
const https = require ('https');
const fs = require ('fs');
const child_process = require ('child_process');
const { execSync: exec_sync } = require ('child_process');
const pkg = JSON.parse (fs.readFileSync ('package.json', 'utf-8'));
[
,, pkg.version
const run_file = fs.createWriteStream ('.jenkins.run.js');
const [
,, ...args
] = process.argv;
fs.writeFileSync ('package.json', JSON.stringify (pkg, null, 2));
child_process.execSync ('yarn lint', { stdio: 'inherit' });
if (typeof pkg.scripts !== 'undefined' && typeof pkg.scripts.test === 'string')
child_process.execSync ('yarn test', { stdio: 'inherit' });
run_file.on ('close', () => {
exec_sync (`node .jenkins.run.js ${args.join (' ')}`, { stdio: 'inherit' });
});
child_process.exec ('git log -1 | grep \'\\[no publish\\]\'')
.addListener ('exit', (code) => {
if (code === 0) {
console.log ('build not marked for deployment');
process.exit (1);
}
else { child_process.execSync ('yarn publish'); }
});
https.get (
'https://git.scode.ovh/Timo/standard/raw/branch/master/jenkins.run.js',
(msg) => {
msg.pipe (run_file);
}
);

17
lib/.eslintrc.js Normal file
View File

@ -0,0 +1,17 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@sapphirecode.ovh>, March 2020
*/
module.exports = {
env: {
commonjs: true,
es6: true,
node: true
},
extends: [
'@sapphirecode/eslint-config-ts'
]
}

8
lib/CrudHandler.ts Normal file
View File

@ -0,0 +1,8 @@
import { Request, Response } from 'express';
export interface CrudHandler {
create(req: Request, res: Response): Promise<void>;
read(req: Request, res: Response): Promise<void>;
update(req: Request, res: Response): Promise<void>;
delete(req: Request, res: Response): Promise<void>;
}

160
lib/DatabaseCrudHandler.ts Normal file
View File

@ -0,0 +1,160 @@
import { Request, Response, Router } from 'express';
import { http } from '@sapphirecode/consts';
import { ControlModel, DatabaseModel } from '@sapphirecode/modelling';
import { CrudHandler } from './CrudHandler';
import { HttpHandler } from './HttpHandler';
import { DatabaseCrudOptionsReader } from './DatabaseCrudOptionsReader';
import { DatabaseCrudOptions } from './DatabaseCrudOptions';
export class DatabaseCrudHandler extends HttpHandler implements CrudHandler {
protected cm:
new (object: Record<string, string|number|boolean>) => ControlModel;
protected dm: new (id?: number) => DatabaseModel;
protected options: DatabaseCrudOptionsReader;
public constructor (
cm: new (object: Record<string, string|number|boolean>) => ControlModel,
dm: new (id?: number) => DatabaseModel,
options: DatabaseCrudOptions = {}
) {
super ();
this.cm = cm;
this.dm = dm;
this.options = new DatabaseCrudOptionsReader (options);
}
protected validate_body (
req: Request,
res: Response
): Promise<Record<string, unknown> | null> | Record<string, unknown> | null {
if (typeof req.body === 'undefined') {
res.status (http.status_bad_request);
res.end ('body was undefined');
return null;
}
try {
return JSON.parse (req.body);
}
catch (e) {
res.status (http.status_bad_request);
res.end ('invalid json input');
}
return null;
}
public async create (req: Request, res: Response): Promise<void> {
if (!await this.options.create_authorization (req, res))
return;
const body_data = await this.validate_body (req, res);
if (body_data === null)
return;
const cm = new this.cm (body_data as Record<string|string, number|boolean>);
cm.update ();
const dm = new this.dm;
dm.assign (cm);
await dm.write ();
res.status (http.status_created)
.end (dm.id);
}
public async read (req: Request, res: Response): Promise<void> {
if (!await this.options.read_authorization (req, res))
return;
if (typeof req.headers.id === 'undefined') {
res.status (http.status_bad_request)
.end ('id undefined');
return;
}
const dm = new this.dm (parseInt (req.headers.id as string));
const found = await dm.read ();
const cm = new this.cm (dm.get_data ());
cm.update ();
res.status (found ? http.status_ok : http.status_not_found)
.json (cm.get_data ());
}
public async update (req: Request, res: Response): Promise<void> {
if (!await this.options.update_authorization (req, res))
return;
const body_data = await this.validate_body (req, res);
if (body_data === null)
return;
if (typeof req.headers.id === 'undefined') {
res.status (http.status_bad_request)
.end ('id undefined');
return;
}
const dm = new this.dm (parseInt (req.headers.id as string));
const found = await dm.read ();
if (!found) {
res.status (http.status_not_found)
.end ();
return;
}
const cm = new this.cm (dm.get_data ());
cm.update ();
cm.assign_object (body_data);
cm.update ();
dm.assign (cm);
const written = await dm.write ();
res.status (written ? http.status_ok : http.status_internal_server_error)
.end ();
}
public async delete (req: Request, res: Response): Promise<void> {
if (!await this.options.delete_authorization (req, res))
return;
if (typeof req.headers.id === 'undefined') {
res.status (http.status_bad_request)
.end ('id undefined');
return;
}
const dm = new this.dm (parseInt (req.headers.id as string));
const found = await dm.read ();
if (!found) {
res.status (http.status_not_found)
.end ();
return;
}
const deleted = await dm.delete ();
res.status (deleted ? http.status_ok : http.status_internal_server_error)
.end ();
}
protected async create_or_update (
req: Request,
res: Response
): Promise<void> {
if (typeof req.headers.id === 'undefined')
await this.create (req, res);
else
await this.update (req, res);
}
public register_handlers (router: Router): void {
router.post ('/', this.create_or_update);
router.get ('/', this.read);
router.delete ('/', this.delete);
}
}

View File

@ -0,0 +1,17 @@
import { Request, Response } from 'express';
type Authorization = {
(req: Request, res: Response): Promise<boolean>;
(req: Request, res: Response, next: Function): unknown;
}
interface DatabaseCrudOptions {
general_authorization?: Authorization;
create_authorization?: Authorization;
read_authorization?: Authorization;
update_authorization?: Authorization;
delete_authorization?: Authorization;
optional_columns?: Array<string>;
}
export { Authorization, DatabaseCrudOptions };

View File

@ -0,0 +1,74 @@
import { Request, Response } from 'express';
import { DatabaseCrudOptions, Authorization } from './DatabaseCrudOptions';
type AuthRunner = {
(req: Request, res: Response): Promise<boolean>;
}
export class DatabaseCrudOptionsReader {
private _options: DatabaseCrudOptions;
public constructor (options: DatabaseCrudOptions) {
this._options = options;
}
private get_auth_runner (
auth?: Authorization
): AuthRunner {
if (typeof auth === 'undefined')
return (): Promise<boolean> => new Promise ((r) => r (true));
return (req, res): Promise<boolean> => new Promise (
(resolve: (value: boolean) => void) => {
(async (): Promise<void> => {
let resolved = false;
const result = await auth (req, res, (cb: unknown) => {
resolved = true;
resolve (typeof cb === 'undefined' || cb === true);
});
if (!resolved)
resolve (result === true);
}) ();
}
);
}
public get optional_columns (): Array<string> | undefined {
return this._options.optional_columns;
}
public get create_authorization (): Authorization {
const general = this.get_auth_runner (this._options.general_authorization);
const specific = this.get_auth_runner (this._options.create_authorization);
return async (req: Request, res: Response): Promise<boolean> => {
const result = (await general (req, res)) && (await specific (req, res));
return result;
};
}
public get read_authorization (): Authorization {
const general = this.get_auth_runner (this._options.general_authorization);
const specific = this.get_auth_runner (this._options.read_authorization);
return async (req: Request, res: Response): Promise<boolean> => {
const result = (await general (req, res)) && (await specific (req, res));
return result;
};
}
public get update_authorization (): Authorization {
const general = this.get_auth_runner (this._options.general_authorization);
const specific = this.get_auth_runner (this._options.update_authorization);
return async (req: Request, res: Response): Promise<boolean> => {
const result = (await general (req, res)) && (await specific (req, res));
return result;
};
}
public get delete_authorization (): Authorization {
const general = this.get_auth_runner (this._options.general_authorization);
const specific = this.get_auth_runner (this._options.delete_authorization);
return async (req: Request, res: Response): Promise<boolean> => {
const result = (await general (req, res)) && (await specific (req, res));
return result;
};
}
}

11
lib/HttpHandler.ts Normal file
View File

@ -0,0 +1,11 @@
import { Router } from 'express';
export abstract class HttpHandler {
public abstract register_handlers(router: Router): void;
public get_router (): Router {
const r = Router ();
this.register_handlers (r);
return r;
}
}

3
lib/index.ts Normal file
View File

@ -0,0 +1,3 @@
export { HttpHandler } from './HttpHandler';
export { CrudHandler } from './CrudHandler';
export { DatabaseCrudHandler } from './DatabaseCrudHandler';

View File

@ -1,13 +1,13 @@
{
"name": "@scode/requestor",
"name": "@sapphirecode/requestor",
"version": "1.0.0",
"description": "Split express paths into individual files to make api programming more structured",
"main": "index.js",
"description": "Express handler templates",
"main": "dist/index.js",
"scripts": {
"test": "nyc ava",
"test": "echo \"no test\"",
"compile": "tsc",
"lint": "eslint . --ext .js,.jsx,.ts,.tsx,.vue,.mjs",
"ci": "yarn --frozen-lockfile && node jenkins.js",
"mutate": "stryker run"
"ci": "yarn --frozen-lockfile && node jenkins.js"
},
"repository": {
"type": "git",
@ -22,11 +22,19 @@
"node": ">=10.0.0"
},
"devDependencies": {
"@scode/eslint-config": "^2.0.2",
"@stryker-mutator/core": "^3.0.2",
"@stryker-mutator/javascript-mutator": "^3.0.2",
"ava": "^3.4.0",
"@ava/typescript": "^1.1.1",
"@sapphirecode/eslint-config-ts": "^1.0.29",
"eslint": "^6.8.0",
"nyc": "^15.0.0"
}
"typescript": "^3.8.3"
},
"dependencies": {
"@sapphirecode/consts": "^1.1.9",
"@sapphirecode/modelling": "^1.0.19",
"@types/express": "^4.17.6",
"express": "^4.17.1"
},
"files": [
"LICENSE",
"/dist/"
]
}

View File

@ -1,24 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
/**
* @type {import('@stryker-mutator/api/core').StrykerOptions}
*/
module.exports = {
mutator: 'javascript',
packageManager: 'yarn',
reporters: [
'clear-text',
'progress'
],
testRunner: 'command',
transpilers: [],
coverageAnalysis: 'all',
mutate: [ 'index.js' ]
};

View File

@ -1,127 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
const test = require ('ava');
const requestor = require ('../index');
const mock = {
registered: {},
post (path, handler) {
this.registered[`post-${path}`] = handler;
},
get (path, handler) {
this.registered[`get-${path}`] = handler;
},
put (path, handler) {
this.registered[`put-${path}`] = handler;
},
delete (path, handler) {
this.registered[`delete-${path}`] = handler;
},
all (path, handler) {
this.registered[`all-${path}`] = handler;
}
};
test ('detect requests on root', async (t) => {
mock.registered = {};
requestor (mock, './test_files/root');
const keys = [
'all-/',
'delete-/',
'get-/',
'post-/',
'put-/'
];
t.deepEqual (Object.keys (mock.registered), keys);
const res = await Promise.all (
Object.values (mock.registered)
.map ((val) => val ())
);
t.is (res.filter ((val) => val === 'dummy').length, keys.length);
});
test ('detect requests on root.subfolder', async (t) => {
mock.registered = {};
requestor (mock, './test_files/root.sub');
const keys = [
'all-/sub/',
'delete-/sub/',
'get-/sub/',
'post-/sub/',
'put-/sub/'
];
t.deepEqual (Object.keys (mock.registered), keys);
const res = await Promise.all (
Object.values (mock.registered)
.map ((val) => val ())
);
t.is (res.filter ((val) => val === 'dummy').length, keys.length);
});
test ('detect requests on subfolder', async (t) => {
mock.registered = {};
requestor (mock, './test_files/sub');
const keys = [
'all-/sub/',
'all-/sub/root/',
'delete-/sub/',
'get-/sub/',
'get-/sub/lv1/lv2/lv3/',
'post-/sub/',
'put-/sub/'
];
t.deepEqual (Object.keys (mock.registered), keys);
const res = await Promise.all (
Object.values (mock.registered)
.map ((val) => val ())
);
t.is (res.filter ((val) => val === 'dummy').length, keys.length);
});
test ('build requests with subdirectory', async (t) => {
mock.registered = {};
requestor (mock, './test_files/sub', { subdir: 'test' });
const keys = [
'all-/test/sub/',
'all-/test/sub/root/',
'delete-/test/sub/',
'get-/test/sub/',
'get-/test/sub/lv1/lv2/lv3/',
'post-/test/sub/',
'put-/test/sub/'
];
t.deepEqual (Object.keys (mock.registered), keys);
const res = await Promise.all (
Object.values (mock.registered)
.map ((val) => val ())
);
t.is (res.filter ((val) => val === 'dummy').length, keys.length);
});
test ('should rethrow', async (t) => {
mock.registered = {};
requestor (mock, './test_files/throw');
const [ func ] = Object.values (mock.registered);
await t.throwsAsync (func);
});
test ('should not rethrow', async (t) => {
mock.registered = {};
requestor (mock, './test_files/throw', { rethrow: false });
const [ func ] = Object.values (mock.registered);
await t.notThrowsAsync (func);
});

View File

@ -1,10 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => 'dummy';

View File

@ -1,10 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => 'dummy';

View File

@ -1,10 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => 'dummy';

View File

@ -1,10 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => 'dummy';

View File

@ -1,10 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => 'dummy';

View File

@ -1,10 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => 'dummy';

View File

@ -1,10 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => 'dummy';

View File

@ -1,10 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => 'dummy';

View File

@ -1,10 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => 'dummy';

View File

@ -1,10 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => 'dummy';

View File

@ -1,10 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => 'dummy';

View File

@ -1,10 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => 'dummy';

View File

@ -1,10 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => 'dummy';

View File

@ -1,10 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => 'dummy';

View File

@ -1,10 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => 'dummy';

View File

@ -1,10 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => 'dummy';

View File

@ -1,10 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => 'dummy';

View File

@ -1,10 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => 'dummy';

View File

@ -1,10 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => 'dummy';

View File

@ -1,10 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => 'dummy';

View File

@ -1,12 +0,0 @@
/*
* Copyright (C) Sapphirecode - All Rights Reserved
* This file is part of Requestor which is released under BSD-3-Clause.
* See file 'LICENSE' for full license details.
* Created by Timo Hocker <timo@scode.ovh>, March 2020
*/
'use strict';
module.exports = () => {
throw new Error ('foo');
};

66
tsconfig.json Normal file
View File

@ -0,0 +1,66 @@
{
"compilerOptions": {
/* Basic Options */
// "incremental": true, /* Enable incremental compilation */
"target": "es5", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
// "lib": [], /* Specify library files to be included in the compilation. */
// "allowJs": true, /* Allow javascript files to be compiled. */
// "checkJs": true, /* Report errors in .js files. */
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
"declaration": true, /* Generates corresponding '.d.ts' file. */
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
// "sourceMap": true, /* Generates corresponding '.map' file. */
// "outFile": "./", /* Concatenate and emit output to single file. */
"outDir": "./dist", /* Redirect output structure to the directory. */
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
// "composite": true, /* Enable project compilation */
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
// "removeComments": true, /* Do not emit comments to output. */
// "noEmit": true, /* Do not emit outputs. */
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
/* Strict Type-Checking Options */
"strict": true, /* Enable all strict type-checking options. */
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
// "strictNullChecks": true, /* Enable strict null checks. */
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
/* Additional Checks */
// "noUnusedLocals": true, /* Report errors on unused locals. */
// "noUnusedParameters": true, /* Report errors on unused parameters. */
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
/* Module Resolution Options */
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
// "typeRoots": [], /* List of folders to include type definitions from. */
// "types": [], /* Type declaration files to be included in compilation. */
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
/* Source Map Options */
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
/* Experimental Options */
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
/* Advanced Options */
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
}
}

1922
yarn-error.log Normal file

File diff suppressed because it is too large Load Diff

5082
yarn.lock

File diff suppressed because it is too large Load Diff