@openstax/ts-utils 1.25.1-pre1 → 1.25.1

package/dist/esm/middleware/apiErrorHandler.d.ts

@@ -10,7 +10,7 @@ export declare type DefaultErrors = {
     SessionExpiredError: SessionExpiredError;
 };
 export declare type Handlers<E> = {
-    [T in keyof E]: (e: E[T], logger: Logger) => ApiResponse<number, any>;
+    [T in keyof E]?: (e: E[T], logger: Logger) => ApiResponse<number, any>;
 };
 export declare const defaultHandlers: Handlers<DefaultErrors>;
 /**

package/dist/esm/middleware/apiErrorHandler.js

@@ -22,16 +22,17 @@ export const createErrorHandler = (inputHandlers) => {
     return async (e, logger) => {
         const name = isAppError(e) ? e.constructor.TYPE : e.constructor.name;
         const handler = handlers[name];
+        const logLevel = handler ? Level.Info : Level.Error;
+        logger.logEvent(logLevel, {
+            name: e.name,
+            message: e.message,
+            stack: e.stack,
+        });
         if (handler) {
             // convincing typescript that this error is the right kind for the handler
             // we looked up based on the errors name is very annoying
             return handler(e, logger);
         }
-        logger.logEvent(Level.Error, {
-            name: e.name,
-            message: e.message,
-            stack: e.stack,
-        });
         return apiTextResponse(500, '500 Error');
     };
 };

package/dist/esm/routing/index.js

@@ -105,7 +105,10 @@ const bindRoute = (services, appBinder, pathExtractor, matcher) => (route) => {
         const path = pathExtractor(request);
         const match = getParamsFromPath(path);
         if ((!matcher || matcher(request, route)) && match) {
-            return () => route.handler(match.params, boundServiceProvider ? boundServiceProvider({ request, logger }, { route, params: match.params }) : undefined);
+            return {
+                name: route.name,
+                executor: () => route.handler(match.params, boundServiceProvider ? boundServiceProvider({ request, logger }, { route, params: match.params }) : undefined)
+            };
         }
     };
 };
@@ -158,11 +161,13 @@ export const makeGetRequestResponder = () => ({ routes, pathExtractor, routeMatc
         if (logExtractor) {
             logger.setContext(logExtractor(request));
         }
+        logger.log('begin request');
         try {
-            const executor = mapFind(boundRoutes, (route) => route(request, logger));
-            if (executor) {
+            const route = mapFind(boundRoutes, (route) => route(request, logger));
+            if (route) {
+                logger.log(`route matched ${route.name}`);
                 const result = boundResponseMiddleware ?
-                    boundResponseMiddleware(executor(), { request, logger }) : executor();
+                    boundResponseMiddleware(route.executor(), { request, logger }) : route.executor();
                 if (isPromise(result) && errorHandler) {
                     const errorHandlerWithMiddleware = (e) => boundResponseMiddleware ?
                         boundResponseMiddleware(errorHandler(e, logger), { request, logger }) : errorHandler(e, logger);
@@ -173,6 +178,7 @@ export const makeGetRequestResponder = () => ({ routes, pathExtractor, routeMatc
                 }
             }
             else if (boundResponseMiddleware) {
+                logger.log('no route matched, returning 404');
                 return boundResponseMiddleware(undefined, { request, logger });
             }
         }

package/dist/esm/services/documentStore/versioned/file-system.d.ts

@@ -8,7 +8,9 @@ interface Initializer<C> {
 }
 export declare const fileSystemVersionedDocumentStore: <C extends string = "fileSystem">(initializer: Initializer<C>) => <T extends VersionedTDocument<T>>() => (configProvider: { [key in C]: {
     tableName: import("../../../config").ConfigValueProvider<string>;
-}; }) => <K extends keyof T, A extends ((...a: any[]) => Promise<VersionedDocumentAuthor>) | undefined>(_: {}, hashKey: K, getAuthor: A) => {
+}; }) => <K extends keyof T, A extends ((...a: any[]) => Promise<VersionedDocumentAuthor>) | undefined>(_: {}, hashKey: K, options?: {
+    getAuthor?: A | undefined;
+} | undefined) => {
     loadAllDocumentsTheBadWay: () => Promise<T[]>;
     getVersions: (id: T[K], startVersion?: number | undefined) => Promise<{
         items: T[];

package/dist/esm/services/documentStore/versioned/file-system.js

@@ -1,6 +1,6 @@
 import { fileSystemUnversionedDocumentStore } from '../unversioned/file-system';
 const PAGE_LIMIT = 5;
-export const fileSystemVersionedDocumentStore = (initializer) => () => (configProvider) => (_, hashKey, getAuthor) => {
+export const fileSystemVersionedDocumentStore = (initializer) => () => (configProvider) => (_, hashKey, options) => {
     const unversionedDocuments = fileSystemUnversionedDocumentStore(initializer)()(configProvider)({}, 'id');
     return {
         loadAllDocumentsTheBadWay: () => {
@@ -31,7 +31,7 @@ export const fileSystemVersionedDocumentStore = (initializer) => () => (configPr
         },
         prepareItem: async (item, ...authorArgs) => {
             // this getAuthor type is terrible
-            const author = getAuthor ? await getAuthor(...authorArgs) : authorArgs[0];
+            const author = (options === null || options === void 0 ? void 0 : options.getAuthor) ? await options.getAuthor(...authorArgs) : authorArgs[0];
             const timestamp = new Date().getTime();
             return {
                 document: { ...item, timestamp, author },
@@ -47,7 +47,7 @@ export const fileSystemVersionedDocumentStore = (initializer) => () => (configPr
         },
         putItem: async (item, ...authorArgs) => {
             var _a;
-            const author = getAuthor ? await getAuthor(...authorArgs) : authorArgs[0];
+            const author = (options === null || options === void 0 ? void 0 : options.getAuthor) ? await options.getAuthor(...authorArgs) : authorArgs[0];
             const document = { ...item, timestamp: new Date().getTime(), author };
             const container = (_a = await unversionedDocuments.getItem(document[hashKey])) !== null && _a !== void 0 ? _a : { id: document[hashKey], items: [] };
             const updated = { ...container, items: [...container.items, document] };