diff --git a/out/index.d.ts b/out/index.d.ts index 32cf0dd..463b7cb 100644 --- a/out/index.d.ts +++ b/out/index.d.ts @@ -1,11 +1,11 @@ export { DefaultConfig } from './config'; export { Redis } from './redis'; -export { Logger, HttpLogger } from './logging'; +export { Logger, HttpLogger, levels, LogLevels } from './logging'; export { AuthProxy } from './auth-proxy'; export { Resolvable, WaitForSync } from './helpers/resolvable'; export { urlJoin } from './helpers/urlJoin'; export { AutoReloader } from './auto-reload'; export { Polyfill, PolyfillOptions, PolyfillFeatureList } from './polyfill'; export { Session } from './session'; -export { PermManager } from './permissions'; +export { PermManager, PermissionManager, RermRouterOpts, PermQuery } from './permissions'; export { UserInfo } from './helpers/userinfo'; diff --git a/out/index.js b/out/index.js index b01cfc6..b541f69 100644 --- a/out/index.js +++ b/out/index.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.PermManager = exports.Session = exports.Polyfill = exports.AutoReloader = exports.urlJoin = exports.WaitForSync = exports.Resolvable = exports.AuthProxy = exports.HttpLogger = exports.Logger = exports.Redis = exports.DefaultConfig = void 0; +exports.PermQuery = exports.PermissionManager = exports.PermManager = exports.Session = exports.Polyfill = exports.AutoReloader = exports.urlJoin = exports.WaitForSync = exports.Resolvable = exports.AuthProxy = exports.levels = exports.HttpLogger = exports.Logger = exports.Redis = exports.DefaultConfig = void 0; var config_1 = require("./config"); Object.defineProperty(exports, "DefaultConfig", { enumerable: true, get: function () { return config_1.DefaultConfig; } }); var redis_1 = require("./redis"); @@ -8,6 +8,7 @@ Object.defineProperty(exports, "Redis", { enumerable: true, get: function () { r var logging_1 = require("./logging"); Object.defineProperty(exports, "Logger", { enumerable: true, get: function () { return logging_1.Logger; } }); Object.defineProperty(exports, "HttpLogger", { enumerable: true, get: function () { return logging_1.HttpLogger; } }); +Object.defineProperty(exports, "levels", { enumerable: true, get: function () { return logging_1.levels; } }); var auth_proxy_1 = require("./auth-proxy"); Object.defineProperty(exports, "AuthProxy", { enumerable: true, get: function () { return auth_proxy_1.AuthProxy; } }); var resolvable_1 = require("./helpers/resolvable"); @@ -23,3 +24,5 @@ var session_1 = require("./session"); Object.defineProperty(exports, "Session", { enumerable: true, get: function () { return session_1.Session; } }); var permissions_1 = require("./permissions"); Object.defineProperty(exports, "PermManager", { enumerable: true, get: function () { return permissions_1.PermManager; } }); +Object.defineProperty(exports, "PermissionManager", { enumerable: true, get: function () { return permissions_1.PermissionManager; } }); +Object.defineProperty(exports, "PermQuery", { enumerable: true, get: function () { return permissions_1.PermQuery; } }); diff --git a/out/logging.d.ts b/out/logging.d.ts index f2b5179..d5a2800 100644 --- a/out/logging.d.ts +++ b/out/logging.d.ts @@ -1,5 +1,7 @@ import * as winston from 'winston'; import { RequestHandler } from 'express'; +export declare const levels: readonly ["error", "warn", "info", "http", "verbose", "debug", "silly"]; +export declare type LogLevels = typeof levels[number] | "log"; export declare const Logger: { error: (...args: unknown[]) => winston.Logger; http: (...args: unknown[]) => winston.Logger; diff --git a/out/logging.js b/out/logging.js index 5509f56..edd98dc 100644 --- a/out/logging.js +++ b/out/logging.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -exports.HttpLogger = exports.Logger = void 0; +exports.HttpLogger = exports.Logger = exports.levels = void 0; const winston = require("winston"); const colors = require("colors"); const _1 = require("."); @@ -14,14 +14,14 @@ const logger = winston.createLogger({ }), ], }); -const levels = ["error", "warn", "info", "http", "verbose", "debug", "silly"]; +exports.levels = ["error", "warn", "info", "http", "verbose", "debug", "silly"]; const wrapper = (original) => { return (...args) => { return original(args.map((obj) => typeof obj === "string" ? obj : prune(obj)).join(" ")); }; }; exports.Logger = {}; -for (const level of levels) { +for (const level of exports.levels) { exports.Logger[level] = wrapper(logger[level]); } exports.Logger.log = wrapper(logger["silly"]); diff --git a/out/permissions.d.ts b/out/permissions.d.ts index 43a0cfd..d872c79 100644 --- a/out/permissions.d.ts +++ b/out/permissions.d.ts @@ -1,7 +1,7 @@ import { AccessControl, IQueryInfo, Permission } from 'role-acl'; import { Query } from 'role-acl/lib/src/core/Query'; import { Request, RequestHandler } from 'express'; -declare class PermissionManager extends AccessControl { +export declare class PermissionManager extends AccessControl { can(roleOrRequest: Request | string | string[] | IQueryInfo): PermQuery; getRouter(resource: string, opts?: Partial): RequestHandler; } @@ -21,4 +21,3 @@ export declare class PermQuery extends Query { sync(): PermQuery; } export declare const PermManager: PermissionManager; -export {}; diff --git a/out/permissions.js b/out/permissions.js index 93559a7..87bdae1 100644 --- a/out/permissions.js +++ b/out/permissions.js @@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; Object.defineProperty(exports, "__esModule", { value: true }); -exports.PermManager = exports.PermQuery = void 0; +exports.PermManager = exports.PermQuery = exports.PermissionManager = void 0; const role_acl_1 = require("role-acl"); const Query_1 = require("role-acl/lib/src/core/Query"); // see https://www.npmjs.com/package/role-acl @@ -37,6 +37,7 @@ class PermissionManager extends role_acl_1.AccessControl { }); } } +exports.PermissionManager = PermissionManager; class PermQuery extends Query_1.Query { constructor(grants, roleOrRequest) { function isRequest(obj) {