caldav-adapter 4.2.0 → 4.3.1

package/lib/routes/calendar/calendar.js

@@ -15,30 +15,31 @@ const get_1 = __importDefault(require("./calendar/get"));
 const put_1 = __importDefault(require("./calendar/put"));
 const delete_1 = __importDefault(require("./calendar/delete"));
 function default_1(opts) {
-    const log = winston_1.default(Object.assign(Object.assign({}, opts), { label: 'calendar' }));
+    const log = (0, winston_1.default)(Object.assign(Object.assign({}, opts), { label: 'calendar' }));
     const userMethods = {
-        propfind: propfind_1.default(opts),
+        propfind: (0, propfind_1.default)(opts),
+        // proppatch: routerUserProppatch(opts)
     };
     const calMethods = {
-        propfind: propfind_2.default(opts),
-        report: report_1.default(opts),
-        get: get_1.default(opts),
+        propfind: (0, propfind_2.default)(opts),
+        report: (0, report_1.default)(opts),
+        get: (0, get_1.default)(opts),
         // proppatch: routerCalProppatch(opts),
-        put: put_1.default(opts),
-        delete: delete_1.default(opts)
+        put: (0, put_1.default)(opts),
+        delete: (0, delete_1.default)(opts)
     };
     return async function (ctx) {
         const method = ctx.method.toLowerCase();
         const calendarId = ctx.state.params.calendarId;
-        response_1.setMultistatusResponse(ctx);
+        (0, response_1.setMultistatusResponse)(ctx);
         if (!calendarId) {
             if (method === 'options') {
-                response_1.setOptions(ctx, ['OPTIONS', 'PROPFIND']);
+                (0, response_1.setOptions)(ctx, ['OPTIONS', 'PROPFIND']);
                 return;
             }
             if (!userMethods[method]) {
                 log.warn(`method handler not found: ${method}`);
-                ctx.body = xBuild_1.notFound(ctx.url);
+                ctx.body = (0, xBuild_1.notFound)(ctx.url);
                 return;
             }
             ctx.body = await userMethods[method].exec(ctx);
@@ -54,17 +55,17 @@ function default_1(opts) {
                 const methods = calendar && calendar.readOnly ?
                     ['OPTIONS', 'PROPFIND', 'REPORT'] :
                     ['OPTIONS', 'PROPFIND', 'REPORT', 'PUT', 'DELETE'];
-                response_1.setOptions(ctx, methods);
+                (0, response_1.setOptions)(ctx, methods);
                 return;
             }
             if (!calendar) {
                 log.warn(`calendar not found: ${calendarId}`);
-                ctx.body = xBuild_1.notFound(ctx.url);
+                ctx.body = (0, xBuild_1.notFound)(ctx.url);
                 return;
             }
             if (!calMethods[method]) {
                 log.warn(`method handler not found: ${method}`);
-                ctx.body = xBuild_1.notFound(ctx.url);
+                ctx.body = (0, xBuild_1.notFound)(ctx.url);
                 return;
             }
             const body = await calMethods[method].exec(ctx, calendar);

package/lib/routes/calendar/user/propfind.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -28,8 +32,8 @@ const lodash_1 = __importDefault(require("lodash"));
 const propfind_1 = __importDefault(require("../calendar/propfind"));
 const tags_1 = __importDefault(require("../../../common/tags"));
 function default_1(opts) {
-    const { calendarResponse } = propfind_1.default(opts);
-    const tags = tags_1.default(opts);
+    const { calendarResponse } = (0, propfind_1.default)(opts);
+    const tags = (0, tags_1.default)(opts);
     const exec = async function (ctx) {
         const { children } = xml.getWithChildren('/D:propfind/D:prop', ctx.request.xml);
         const checksum = lodash_1.default.some(children, (child) => child.localName === 'checksum-versions');
@@ -42,7 +46,7 @@ function default_1(opts) {
         });
         const res = await Promise.all(actions);
         const props = lodash_1.default.compact(res);
-        const responses = [xBuild_1.response(ctx.url, props.length ? xBuild_1.status[200] : xBuild_1.status[404], props)];
+        const responses = [(0, xBuild_1.response)(ctx.url, props.length ? xBuild_1.status[200] : xBuild_1.status[404], props)];
         const calendars = await opts.data.getCalendarsForPrincipal({
             principalId: ctx.state.params.principalId,
             user: ctx.state.user
@@ -50,8 +54,8 @@ function default_1(opts) {
         const calResponses = !checksum ? await Promise.all(calendars.map(async (cal) => {
             return await calendarResponse(ctx, cal);
         })) : [];
-        const ms = xBuild_1.multistatus([...responses, ...lodash_1.default.compact(calResponses)]);
-        return xBuild_1.build(ms);
+        const ms = (0, xBuild_1.multistatus)([...responses, ...lodash_1.default.compact(calResponses)]);
+        return (0, xBuild_1.build)(ms);
     };
     return {
         exec

package/lib/routes/calendar/user/proppatch.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -27,7 +31,7 @@ const xBuild_1 = require("../../../common/xBuild");
 const lodash_1 = __importDefault(require("lodash"));
 const tags_1 = __importDefault(require("../../../common/tags"));
 function default_1(opts) {
-    const tags = tags_1.default(opts);
+    const tags = (0, tags_1.default)(opts);
     const exec = async function (ctx) {
         const { children } = xml.getWithChildren('/D:propertyupdate/D:set/D:prop', ctx.request.xml);
         const actions = lodash_1.default.map(children, async (child) => {
@@ -38,8 +42,8 @@ function default_1(opts) {
             });
         });
         const res = await Promise.all(actions);
-        const ms = xBuild_1.multistatus(lodash_1.default.compact(res));
-        return xBuild_1.build(ms);
+        const ms = (0, xBuild_1.multistatus)(lodash_1.default.compact(res));
+        return (0, xBuild_1.build)(ms);
     };
     return {
         exec

package/lib/routes/principal/principal.js

@@ -9,20 +9,21 @@ const winston_1 = __importDefault(require("../../common/winston"));
 const propfind_1 = __importDefault(require("./propfind"));
 // import routeReport from './report';
 function default_1(opts) {
-    const log = winston_1.default(Object.assign(Object.assign({}, opts), { label: 'principal' }));
+    const log = (0, winston_1.default)(Object.assign(Object.assign({}, opts), { label: 'principal' }));
     const methods = {
-        propfind: propfind_1.default(opts),
+        propfind: (0, propfind_1.default)(opts),
+        // report: reportReport(opts)
     };
     return async function (ctx) {
         const method = ctx.method.toLowerCase();
-        response_1.setMultistatusResponse(ctx);
+        (0, response_1.setMultistatusResponse)(ctx);
         if (method === 'options') {
-            response_1.setOptions(ctx, ['OPTIONS', 'PROPFIND']);
+            (0, response_1.setOptions)(ctx, ['OPTIONS', 'PROPFIND']);
             return;
         }
         if (!methods[method]) {
             log.warn(`method handler not found: ${method}`);
-            ctx.body = xBuild_1.notFound(ctx.url);
+            ctx.body = (0, xBuild_1.notFound)(ctx.url);
             return;
         }
         ctx.body = await methods[method](ctx);

package/lib/routes/principal/propfind.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
@@ -14,7 +18,7 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 var __importStar = (this && this.__importStar) || function (mod) {
     if (mod && mod.__esModule) return mod;
     var result = {};
-    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
     __setModuleDefault(result, mod);
     return result;
 };
@@ -27,7 +31,7 @@ const xBuild_1 = require("../../common/xBuild");
 const lodash_1 = __importDefault(require("lodash"));
 const tags_1 = __importDefault(require("../../common/tags"));
 function default_1(opts) {
-    const tags = tags_1.default(opts);
+    const tags = (0, tags_1.default)(opts);
     return async function (ctx) {
         const { children } = xml.getWithChildren('/D:propfind/D:prop', ctx.request.xml);
         const actions = lodash_1.default.map(children, async (child) => {
@@ -38,9 +42,9 @@ function default_1(opts) {
             });
         });
         const res = await Promise.all(actions);
-        const resps = xBuild_1.response(ctx.url, xBuild_1.status[200], lodash_1.default.compact(res));
-        const ms = xBuild_1.multistatus([resps]);
-        return xBuild_1.build(ms);
+        const resps = (0, xBuild_1.response)(ctx.url, xBuild_1.status[200], lodash_1.default.compact(res));
+        const ms = (0, xBuild_1.multistatus)([resps]);
+        return (0, xBuild_1.build)(ms);
     };
 }
 exports.default = default_1;

package/lib/routes/principal/report.js

@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const xBuild_1 = require("../../common/xBuild");
 const winston_1 = __importDefault(require("../../common/winston"));
 function default_1(opts) {
-    const log = winston_1.default(Object.assign(Object.assign({}, opts), { label: 'principal/report' }));
+    const log = (0, winston_1.default)(Object.assign(Object.assign({}, opts), { label: 'principal/report' }));
     return async function (ctx) {
         const rootTag = ctx.request.xml.documentElement.localName;
         if (rootTag === 'principal-search-property-set') {
             log.debug('principal-search-property-set');
             /* https://tools.ietf.org/html/rfc3744#section-9.5 */
-            return xBuild_1.build({
+            return (0, xBuild_1.build)({
                 'D:principal-search-property-set': {
                     '@xmlns:D': 'DAV:'
                 }
@@ -21,11 +21,11 @@ function default_1(opts) {
         else if (rootTag === 'principal-property-search') {
             log.debug('principal-property-search');
             /* https://tools.ietf.org/html/rfc3744#section-9.4 */
-            const blank = xBuild_1.multistatus();
-            return xBuild_1.build(blank);
+            const blank = (0, xBuild_1.multistatus)();
+            return (0, xBuild_1.build)(blank);
         }
         else {
-            return xBuild_1.notFound(ctx.url);
+            return (0, xBuild_1.notFound)(ctx.url);
         }
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "caldav-adapter",
-  "version": "4.2.0",
+  "version": "4.3.1",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "description": "Middleware to handle CalDAV requests to node web server.",
@@ -17,37 +17,37 @@
   "scripts": {
     "build": "tsc",
     "eslint": "eslint --ext .ts src/**",
-    "prepare": "npm run eslint && npm run build",
+    "test": "npm run eslint && npm run build",
     "watch": "nodemon -e js --ignore node_modules/ --inspect example/server.js"
   },
   "devDependencies": {
     "@types/ical": "^0.6.1",
-    "@types/koa": "^2.11.3",
-    "@types/lodash": "^4.14.151",
-    "@types/node": "^14.0.1",
-    "@types/xmldom": "^0.1.29",
-    "@typescript-eslint/eslint-plugin": "^2.31.0",
-    "@typescript-eslint/parser": "^2.31.0",
-    "eslint": "^6.8.0",
-    "koa": "^2.11.0",
-    "koa-compress": "^4.0.1",
+    "@types/koa": "^2.13.12",
+    "@types/lodash": "^4.14.202",
+    "@types/node": "^20.10.6",
+    "@types/xmldom": "^0.1.34",
+    "@typescript-eslint/eslint-plugin": "^6.16.0",
+    "@typescript-eslint/parser": "^6.16.0",
+    "eslint": "^8.56.0",
+    "koa": "^2.15.0",
+    "koa-compress": "^5.1.1",
     "koa-morgan": "^1.0.1",
-    "nodemon": "^2.0.4",
-    "typescript": "^3.9.2"
+    "nodemon": "^3.0.2",
+    "typescript": "^5.3.3"
   },
   "dependencies": {
     "basic-auth": "^2.0.1",
     "ical": "^0.8.0",
     "ical-generator": "^1.10.0",
-    "lodash": "^4.17.15",
-    "moment": "^2.25.3",
-    "moment-timezone": "^0.5.28",
-    "path-to-regexp": "^6.1.0",
-    "raw-body": "^2.4.1",
-    "rrule": "^2.6.4",
-    "winston": "^3.2.0",
-    "xmlbuilder2": "^2.1.2",
-    "xmldom": "^0.3.0",
-    "xpath": "0.0.27"
+    "lodash": "^4.17.21",
+    "moment": "^2.30.1",
+    "moment-timezone": "^0.5.44",
+    "path-to-regexp": "^6.2.1",
+    "raw-body": "^2.5.2",
+    "rrule": "^2.8.1",
+    "winston": "^3.11.0",
+    "xmlbuilder2": "^3.1.1",
+    "xmldom": "^0.6.0",
+    "xpath": "0.0.34"
   }
 }