jxp 4.2.0 → 5.0.2

package/dist/libs/read_handlers.js

@@ -0,0 +1,381 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseFilter = parseFilter;
+exports.getOneDocument = getOneDocument;
+exports.executeList = executeList;
+exports.executeGetOne = executeGetOne;
+exports.executeCount = executeCount;
+exports.resultToCsv = resultToCsv;
+exports.buildSyntheticRequest = buildSyntheticRequest;
+exports.buildSyntheticResponse = buildSyntheticResponse;
+const node_querystring_1 = __importDefault(require("node:querystring"));
+const errors = require("restify-errors");
+const query_sanitize = require("./query_sanitize");
+const query_limits = require("./query_limits");
+const response_sanitize = require("./response_sanitize");
+const { safeErrorMessage } = require("./safe_error");
+const { logRequestError } = require("./request_log");
+const { Parser: CsvParser } = require("@json2csv/plainjs");
+function getStripFields(req) {
+    return req.config?.security?.strip_fields || ["password"];
+}
+function changeUrlParams(req, key, val) {
+    const q = { ...req.query };
+    q[key] = val;
+    const base = req.config?.server || req.config?.url || "";
+    const pathStr = req.path();
+    return base + pathStr + "?" + node_querystring_1.default.stringify(q);
+}
+function isISODateString(str) {
+    if (typeof str !== "string")
+        return false;
+    const isoDateRegex = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{1,3})?Z$/;
+    if (!isoDateRegex.test(str))
+        return false;
+    const date = new Date(str);
+    if (isNaN(date.getTime())) {
+        throw new errors.BadRequestError("Invalid date format");
+    }
+    return true;
+}
+function parseFilter(filter, depth = 0) {
+    const MAX_DEPTH = 10;
+    if (!filter)
+        return {};
+    if (depth > MAX_DEPTH) {
+        throw new errors.BadRequestError("Maximum filter depth exceeded");
+    }
+    if (typeof filter !== "object" || filter === null)
+        return filter;
+    if (Array.isArray(filter)) {
+        const result = {};
+        filter.forEach((item) => {
+            if (typeof item === "string" && item.includes(":")) {
+                const parts = item.split(":");
+                const key = parts[0];
+                const value = parts.slice(1).join(":");
+                if (key.startsWith("$")) {
+                    try {
+                        if (isISODateString(value)) {
+                            result[key] = new Date(value);
+                        }
+                        else {
+                            result[key] = value;
+                        }
+                    }
+                    catch (err) {
+                        if (err instanceof errors.BadRequestError)
+                            throw err;
+                        throw new errors.BadRequestError("Invalid date format");
+                    }
+                }
+            }
+        });
+        return result;
+    }
+    const parsedFilter = {};
+    const filterObj = filter;
+    for (const i in filterObj) {
+        if (filterObj[i] === "false") {
+            parsedFilter[i] = false;
+            continue;
+        }
+        if (filterObj[i] === "true") {
+            parsedFilter[i] = true;
+            continue;
+        }
+        if (typeof filterObj[i] === "string") {
+            try {
+                if (isISODateString(filterObj[i])) {
+                    parsedFilter[i] = new Date(filterObj[i]);
+                    continue;
+                }
+            }
+            catch (err) {
+                if (err instanceof errors.BadRequestError)
+                    throw err;
+                throw new errors.BadRequestError("Invalid date format");
+            }
+            const strVal = filterObj[i];
+            if (strVal.includes(":")) {
+                const parts = strVal.split(":");
+                const key = parts[0];
+                const value = parts.slice(1).join(":");
+                if (key.startsWith("$")) {
+                    try {
+                        if (isISODateString(value)) {
+                            if (!parsedFilter[i])
+                                parsedFilter[i] = {};
+                            parsedFilter[i][key] = new Date(value);
+                        }
+                        else if (value.startsWith("[") && value.endsWith("]")) {
+                            if (!parsedFilter[i])
+                                parsedFilter[i] = {};
+                            parsedFilter[i][key] = value.slice(1, -1).split(",");
+                        }
+                        else if (key === "$regex" && value.startsWith("/")) {
+                            if (!parsedFilter[i])
+                                parsedFilter[i] = {};
+                            const match = value.match(/^\/(.+?)\/([gimy]*)$/);
+                            if (match) {
+                                parsedFilter[i][key] = new RegExp(match[1], match[2]);
+                            }
+                        }
+                        else {
+                            if (!parsedFilter[i])
+                                parsedFilter[i] = {};
+                            parsedFilter[i][key] = value;
+                        }
+                    }
+                    catch (err) {
+                        if (err instanceof errors.BadRequestError)
+                            throw err;
+                        throw new errors.BadRequestError("Invalid date format");
+                    }
+                }
+                else {
+                    parsedFilter[i] = filterObj[i];
+                }
+            }
+            else {
+                parsedFilter[i] = filterObj[i];
+            }
+        }
+        else if (Array.isArray(filterObj[i])) {
+            parsedFilter[i] = parseFilter(filterObj[i], depth + 1);
+        }
+        else if (typeof filterObj[i] === "object") {
+            parsedFilter[i] = parseFilter(filterObj[i], depth + 1);
+        }
+        else {
+            parsedFilter[i] = filterObj[i];
+        }
+    }
+    return parsedFilter;
+}
+async function getOneDocument(Model, item_id, params, options) {
+    const query = Model.findById(item_id, {}, options);
+    if (params.populate) {
+        if (typeof params.populate === "object" && !Array.isArray(params.populate)) {
+            for (const i in params.populate) {
+                query.populate(i, params.populate[i].replace(/,/g, " "));
+            }
+        }
+        else {
+            query.populate(params.populate);
+        }
+    }
+    if (params.autopopulate) {
+        for (const key in Model.schema.paths) {
+            const dirpath = Model.schema.paths[key];
+            if (dirpath.instance == "ObjectID" && dirpath.options.link) {
+                query.populate(String(dirpath.options.map_to || dirpath.options.virtual || dirpath.options.link.toLowerCase()));
+            }
+        }
+    }
+    try {
+        const item = await query.exec();
+        if (!item) {
+            throw new errors.NotFoundError(`Could not find document ${item_id} on ${Model.modelName}`);
+        }
+        if (item._deleted && !params.showDeleted) {
+            throw new errors.NotFoundError(`Document ${item_id} is deleted on ${Model.modelName}`);
+        }
+        return response_sanitize.sanitizeDocument(item);
+    }
+    catch (err) {
+        if (err.code)
+            throw err;
+        throw new errors.InternalServerError(safeErrorMessage(err));
+    }
+}
+async function executeList(req, res) {
+    let filters = {};
+    try {
+        filters = parseFilter(req.query.filter);
+        filters = query_sanitize.sanitizeFilter(filters, req.config?.security || {});
+    }
+    catch (err) {
+        logRequestError(req, res, err, "filter");
+        if (err instanceof errors.BadRequestError || err instanceof errors.ForbiddenError)
+            throw err;
+        throw new errors.InternalServerError(safeErrorMessage(err));
+    }
+    const search = query_sanitize.parseSearchObject(req.query.search);
+    for (const i in search) {
+        filters[i] = search[i];
+    }
+    let countquery = filters;
+    let qcount = req.Model.find(filters);
+    let q = req.Model.find(filters);
+    const checkDeleted = [{ _deleted: false }, { _deleted: null }];
+    if (!req.query.showDeleted) {
+        countquery = Object.assign({ $or: checkDeleted }, countquery);
+        qcount.or(checkDeleted);
+        q.or(checkDeleted);
+    }
+    if (req.query.search && typeof req.query.search === "string") {
+        q = req.Model.find({ $text: { $search: req.query.search } }, { score: { $meta: "textScore" } }).sort({ score: { $meta: "textScore" } });
+        countquery = Object.assign({ $text: { $search: req.query.search } }, countquery);
+        qcount = req.Model.find({ $text: { $search: req.query.search } });
+    }
+    if (res.user) {
+        q.options = { user: res.user };
+    }
+    try {
+        const estimatedCount = await req.Model.estimatedDocumentCount();
+        const result = {};
+        const { limit: effectiveLimit, limitCapped, filterExemption } = query_limits.enforceListLimit(req, estimatedCount, res, { result, bodyQuery: filters });
+        let count = -1;
+        if (query_limits.shouldRunCount(req, { filterExemption, limitCapped })) {
+            if (estimatedCount < 100000 && Object.keys(countquery).length !== 0) {
+                count = await qcount.countDocuments();
+            }
+            else {
+                count = estimatedCount;
+            }
+        }
+        if (count >= 0) {
+            result.count = count;
+        }
+        query_limits.applyListPagination(q, result, req, effectiveLimit, count >= 0 ? count : 0, changeUrlParams);
+        if (req.query.sort) {
+            q.sort(req.query.sort);
+            result.sort = req.query.sort;
+        }
+        if (req.query.populate) {
+            if (typeof req.query.populate === "object" && !Array.isArray(req.query.populate)) {
+                for (const i in req.query.populate) {
+                    q.populate(i, req.query.populate[i].replace(/,/g, " "));
+                }
+            }
+            else {
+                q.populate(req.query.populate);
+            }
+            result.populate = req.query.populate;
+        }
+        if (req.query.autopopulate) {
+            for (const key in req.Model.schema.paths) {
+                const dirpath = req.Model.schema.paths[key];
+                if (dirpath.instance == "ObjectID" && dirpath.options.link) {
+                    q.populate(String(dirpath.options.map_to || dirpath.options.virtual || dirpath.options.link.toLowerCase()));
+                }
+            }
+            result.autopopulate = true;
+        }
+        if (req.query.fields && typeof req.query.fields === "string") {
+            const fields = req.query.fields.split(",");
+            const select = {};
+            fields.forEach((field) => {
+                select[field] = 1;
+            });
+            q.select(select);
+        }
+        if (req.query.search) {
+            result.search = req.query.search;
+        }
+        result.data = await q.exec();
+        response_sanitize.sanitizeListResult(result, getStripFields(req));
+        query_limits.finalizeListPagination(result, req, Array.isArray(result.data) ? result.data.length : 0, effectiveLimit, count, changeUrlParams);
+        query_limits.enforceResponseSize(result, req, res);
+        res.result = result;
+    }
+    catch (err) {
+        if (!(err instanceof errors.BadRequestError) &&
+            !(err instanceof errors.ForbiddenError) &&
+            !(err instanceof errors.PayloadTooLargeError)) {
+            logRequestError(req, res, err, "get");
+        }
+        if (err instanceof errors.BadRequestError)
+            throw err;
+        if (err instanceof errors.ForbiddenError)
+            throw err;
+        if (err instanceof errors.PayloadTooLargeError)
+            throw err;
+        if (err.code)
+            throw err;
+        throw new errors.InternalServerError(safeErrorMessage(err));
+    }
+}
+async function executeGetOne(req, res) {
+    try {
+        const data = await getOneDocument(req.Model, req.params.item_id, req.query, { user: res.user });
+        res.result = { data };
+    }
+    catch (err) {
+        logRequestError(req, res, err, "getOne");
+        if (err.code)
+            throw err;
+        throw new errors.InternalServerError(safeErrorMessage(err));
+    }
+}
+async function executeCount(req, res) {
+    let filters = {};
+    try {
+        filters = parseFilter(req.query.filter);
+        filters = query_sanitize.sanitizeFilter(filters, req.config?.security || {});
+    }
+    catch (err) {
+        logRequestError(req, res, err, "filter");
+        if (err instanceof errors.BadRequestError || err instanceof errors.ForbiddenError)
+            throw err;
+        throw new errors.InternalServerError(safeErrorMessage(err));
+    }
+    const search = query_sanitize.parseSearchObject(req.query.search);
+    for (const i in search) {
+        filters[i] = search[i];
+    }
+    if (!req.query.showDeleted) {
+        filters = Object.assign({ $or: [{ _deleted: false }, { _deleted: null }] }, filters);
+    }
+    try {
+        const count = await req.Model.countDocuments(filters).exec();
+        res.result = { count };
+    }
+    catch (err) {
+        logRequestError(req, res, err, "count");
+        if (err.code)
+            throw err;
+        throw new errors.InternalServerError(safeErrorMessage(err));
+    }
+}
+function resultToCsv(result) {
+    if (!result.data || !Array.isArray(result.data) || !result.data.length) {
+        throw new errors.BadRequestError("No data to export");
+    }
+    const opts = { flatten: true };
+    const data = result.data.map((row) => row._doc || row);
+    return new CsvParser(opts).parse(data);
+}
+function buildSyntheticRequest(config, modelname, Model, query, params = {}) {
+    return {
+        params,
+        query,
+        headers: {},
+        method: "GET",
+        modelname,
+        Model,
+        config,
+        path: () => `/api/${modelname}`,
+    };
+}
+function buildSyntheticResponse(user, groups) {
+    return {
+        user,
+        groups,
+        header: () => undefined,
+        status: function () {
+            return this;
+        },
+        send: () => undefined,
+        json: () => undefined,
+        redirect: () => undefined,
+        writeHead: () => undefined,
+        write: () => undefined,
+        end: () => undefined,
+    };
+}
+//# sourceMappingURL=read_handlers.js.map

package/dist/libs/read_handlers.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"read_handlers.js","sourceRoot":"","sources":["../../src/libs/read_handlers.ts"],"names":[],"mappings":"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"}

package/dist/libs/request_log.d.ts

@@ -33,6 +33,8 @@ type ResLike = {
 };
 /** Client IP; prefers Restify `req.ip`, then first X-Forwarded-For hop, then socket address. */
 export declare function clientIp(req: ReqLike): string | undefined;
+/** Redact API credentials from relative or absolute URLs before logging. */
+export declare function sanitizeRequestUrl(value: string): string;
 /** How the request authenticated (no secrets logged). */
 export declare function authHint(req: ReqLike): string | undefined;
 export declare function requestClientInfo(req: ReqLike): string | undefined;

package/dist/libs/request_log.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"request_log.d.ts","sourceRoot":"","sources":["../../src/libs/request_log.ts"],"names":[],"mappings":"AAEA,KAAK,OAAO,GAAG;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxE,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,KAAK,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC;IACxD,UAAU,CAAC,EAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxC,MAAM,CAAC,EAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACpC,CAAC;AAEF,KAAK,OAAO,GAAG;IACd,IAAI,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE;YAAE,QAAQ,IAAI,MAAM,CAAA;SAAE,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CACzE,CAAC;AAmBF,gGAAgG;AAChG,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAUzD;AAQD,yDAAyD;AACzD,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAYzD;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CASlE;AA6CD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAgBlE;AAyBD,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,OAAO,GAAG,MAAM,CAUlE;AAED,wBAAgB,eAAe,CAC9B,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,OAAO,GAAG,SAAS,EACxB,GAAG,EAAE,OAAO,EACZ,OAAO,CAAC,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,GACZ,IAAI,CA4BN;AAED,wBAAgB,WAAW,CAC1B,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,OAAO,GAAG,SAAS,EACxB,GAAG,EAAE,KAAK,EACV,OAAO,CAAC,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,GACZ,KAAK,CAGP"}
+{"version":3,"file":"request_log.d.ts","sourceRoot":"","sources":["../../src/libs/request_log.ts"],"names":[],"mappings":"AAEA,KAAK,OAAO,GAAG;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxE,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,KAAK,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC1B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC;IACxD,UAAU,CAAC,EAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACxC,MAAM,CAAC,EAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACpC,CAAC;AAEF,KAAK,OAAO,GAAG;IACd,IAAI,CAAC,EAAE;QAAE,GAAG,CAAC,EAAE;YAAE,QAAQ,IAAI,MAAM,CAAA;SAAE,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC;CACzE,CAAC;AAmBF,gGAAgG;AAChG,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAUzD;AAQD,4EAA4E;AAC5E,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAKxD;AAED,yDAAyD;AACzD,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAYzD;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CASlE;AA6CD,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAgBlE;AAyBD,wBAAgB,cAAc,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,OAAO,GAAG,MAAM,CAUlE;AAED,wBAAgB,eAAe,CAC9B,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,OAAO,GAAG,SAAS,EACxB,GAAG,EAAE,OAAO,EACZ,OAAO,CAAC,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,GACZ,IAAI,CA4BN;AAED,wBAAgB,WAAW,CAC1B,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,OAAO,GAAG,SAAS,EACxB,GAAG,EAAE,KAAK,EACV,OAAO,CAAC,EAAE,MAAM,EAChB,KAAK,CAAC,EAAE,MAAM,GACZ,KAAK,CAGP"}

package/dist/libs/request_log.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.clientIp = clientIp;
+exports.sanitizeRequestUrl = sanitizeRequestUrl;
 exports.authHint = authHint;
 exports.requestClientInfo = requestClientInfo;
 exports.requestQueryHints = requestQueryHints;
@@ -46,6 +47,10 @@ function truncate(value, max = 120) {
         return oneLine;
     return `${oneLine.slice(0, max - 1)}…`;
 }
+/** Redact API credentials from relative or absolute URLs before logging. */
+function sanitizeRequestUrl(value) {
+    return String(value).replace(/([?&](?:apikey|api_key|x-api-key)=)[^&#]*/gi, "$1[REDACTED]");
+}
 /** How the request authenticated (no secrets logged). */
 function authHint(req) {
     if (req.query?.apikey)
@@ -169,7 +174,7 @@ function summarizeRequestDetail(req) {
 }
 function requestSummary(req, res) {
     const method = req.method || "?";
-    const path = req.url || req.path || "?";
+    const path = sanitizeRequestUrl(req.url || req.path || "?");
     const bits = [`${method} ${path}`];
     const model = req.modelname || req.params?.modelname;
     if (model)
@@ -215,6 +220,7 @@ function logAndThrow(req, res, err, context, extra) {
 module.exports = {
     filterLogUser,
     clientIp,
+    sanitizeRequestUrl,
     authHint,
     requestClientInfo,
     requestSummary,

package/dist/libs/request_log.js.map

@@ -1 +1 @@
-{"version":3,"file":"request_log.js","sourceRoot":"","sources":["../../src/libs/request_log.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"request_log.js","sourceRoot":"","sources":["../../src/libs/request_log.ts"],"names":[],"mappings":"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"}

package/dist/libs/schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/libs/schema.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,EAAE,EAAE,KAAK,KAAK,EAAyB,MAAM,UAAU,CAAC;AAKvE,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AA8B9E,cAAM,SAAU,SAAQ,QAAQ,CAAC,MAAM;IAC9B,IAAI,EAAE,gBAAgB,CAAC;IACvB,UAAU,EAAE,aAAa,CAAC;gBAEtB,UAAU,EAAE,aAAa,EAAE,IAAI,GAAE,gBAAqB;IAkClE,QAAQ,IAAI,IAAI;IAgBhB,aAAa,IAAI,IAAI;IA2BrB,MAAM,CAAC,KAAK,+BAAyB;IACrC,MAAM,CAAC,KAAK,EAAoC,CAAC,CAAC,EACjD,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,SAAS,EAClB,UAAU,CAAC,EAAE,MAAM,KACf,KAAK,CAAC,CAAC,CAAC,CAAC;CACd;AAED,YAAY,EAAE,SAAS,EAAE,CAAC;AAC1B,eAAe,SAAS,CAAC"}
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../src/libs/schema.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,EAAE,EAAE,KAAK,KAAK,EAAyB,MAAM,UAAU,CAAC;AAKvE,OAAO,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AA8B9E,cAAM,SAAU,SAAQ,QAAQ,CAAC,MAAM;IAC9B,IAAI,EAAE,gBAAgB,CAAC;IACvB,UAAU,EAAE,aAAa,CAAC;gBAEtB,UAAU,EAAE,aAAa,EAAE,IAAI,GAAE,gBAAqB;IAiClE,QAAQ,IAAI,IAAI;IAgBhB,aAAa,IAAI,IAAI;IA2BrB,MAAM,CAAC,KAAK,+BAAyB;IACrC,MAAM,CAAC,KAAK,EAAoC,CAAC,CAAC,EACjD,IAAI,EAAE,MAAM,EACZ,MAAM,CAAC,EAAE,SAAS,EAClB,UAAU,CAAC,EAAE,MAAM,KACf,KAAK,CAAC,CAAC,CAAC,CAAC;CACd;AAED,YAAY,EAAE,SAAS,EAAE,CAAC;AAC1B,eAAe,SAAS,CAAC"}

package/dist/libs/schema.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const mongoose_1 = __importDefault(require("mongoose"));
 const path_1 = __importDefault(require("path"));
-const JXPHelper = require("jxp-helper");
+const jxp_helper_1 = require("jxp-helper");
 const modeldir = require("./modeldir");
 const load_config_1 = require("./load-config");
 // Set some global types for JS model files using /* global ObjectId Mixed */
@@ -38,13 +38,10 @@ class JXPSchema extends mongoose_1.default.Schema {
             _updated_by_id: { type: global.ObjectId, link: "User", map_to: "_updated_by", index: true },
         }, definition);
         if (!global.jxphelper) {
-            const jxp_settings = {};
-            if (global.apikey)
-                jxp_settings.apikey = global.apikey;
-            if (global.server)
-                jxp_settings.server = global.server;
-            if (jxp_settings.apikey && jxp_settings.server) {
-                global.jxphelper = new JXPHelper(jxp_settings);
+            const apikey = global.apikey;
+            const server = global.server;
+            if (apikey && server) {
+                global.jxphelper = new jxp_helper_1.JXPHelper({ apikey, server });
             }
         }
         super(definition, opts);

package/dist/libs/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/libs/schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/libs/schema.ts"],"names":[],"mappings":"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"}

package/dist/libs/schema_description.d.ts

@@ -1,3 +1,9 @@
-declare const getModelFileContents: (model_dir: any) => Promise<unknown>;
+type ModelRegistry = Record<string, {
+    modelName?: string;
+    schema?: {
+        get(name: string): unknown;
+    };
+}>;
+declare const getModelFileContents: (model_dir: any, registeredModels?: ModelRegistry) => Promise<unknown>;
 export = getModelFileContents;
 //# sourceMappingURL=schema_description.d.ts.map

package/dist/libs/schema_description.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema_description.d.ts","sourceRoot":"","sources":["../../src/libs/schema_description.ts"],"names":[],"mappings":"AAIA,QAAA,MAAM,oBAAoB,GAAI,cAAS,qBAmFtC,CAAA;AAED,SAAS,oBAAoB,CAAC"}
+{"version":3,"file":"schema_description.d.ts","sourceRoot":"","sources":["../../src/libs/schema_description.ts"],"names":[],"mappings":"AAIA,KAAK,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE;QAAE,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAAC;CAC3C,CAAC,CAAC;AAyBH,QAAA,MAAM,oBAAoB,GAAI,cAAS,EAAE,mBAAkB,aAAkB,qBAoE5E,CAAA;AAED,SAAS,oBAAoB,CAAC"}

package/dist/libs/schema_description.js

@@ -2,7 +2,25 @@
 const fs = require("fs");
 const path = require("path");
 const mongoose = require("mongoose");
-const getModelFileContents = (model_dir) => {
+function normalizeModelName(name) {
+    return name.replace(/[^a-z0-9]/gi, "").toLowerCase();
+}
+function resolveLoadedModel(modelname, filePath, models) {
+    if (models[modelname])
+        return models[modelname];
+    const cached = require.cache[require.resolve(filePath)]?.exports;
+    if (cached)
+        return cached.default || cached;
+    const normalized = normalizeModelName(modelname);
+    const registered = Object.values(mongoose.models).find((model) => model.modelName && normalizeModelName(model.modelName) === normalized);
+    if (registered)
+        return registered;
+    // Model files are normally preloaded by JXP. This fallback supports callers
+    // that use schema_description directly without mutating the module cache.
+    const loaded = require(filePath);
+    return loaded.default || loaded;
+}
+const getModelFileContents = (model_dir, registeredModels = {}) => {
     return new Promise((resolve, reject) => {
         try {
             fs.readdir(model_dir, function (err, files) {
@@ -22,25 +40,8 @@ const getModelFileContents = (model_dir) => {
                 for (const file of modelFiles) {
                     const modelname = path.basename(file, ".js").replace("_model", "");
                     try {
-                        // Try to get the model from mongoose first
-                        let modelobj;
-                        try {
-                            // Convert modelname to proper case for mongoose (first letter uppercase)
-                            const modelKey = modelname.charAt(0).toUpperCase() + modelname.slice(1);
-                            modelobj = mongoose.models[modelKey];
-                            // If model doesn't exist in mongoose, try to load it from file
-                            if (!modelobj) {
-                                const filePath = path.join(model_dir, file);
-                                delete require.cache[require.resolve(filePath)];
-                                modelobj = require(filePath);
-                            }
-                        }
-                        catch (e) {
-                            // If getting from mongoose fails, try loading from file
-                            const filePath = path.join(model_dir, file);
-                            delete require.cache[require.resolve(filePath)];
-                            modelobj = require(filePath);
-                        }
+                        const filePath = path.join(model_dir, file);
+                        const modelobj = resolveLoadedModel(modelname, filePath, registeredModels);
                         // Check if we have a valid model with schema and permissions
                         if (modelobj && modelobj.schema) {
                             const perms = modelobj.schema.get("_perms");
@@ -57,11 +58,9 @@ const getModelFileContents = (model_dir) => {
                         errors.push(`Invalid model structure for ${modelname}`);
                     }
                     catch (error) {
-                        // Only add to errors if it's not an OverwriteModelError
-                        if (!error.message.includes('Cannot overwrite')) {
-                            errors.push(`Error with model ${modelname}: ${error.message}`);
-                            console.error(`Error processing model ${modelname}:`, error);
-                        }
+                        const message = error instanceof Error ? error.message : String(error);
+                        errors.push(`Error with model ${modelname}: ${message}`);
+                        console.error(`Error processing model ${modelname}:`, error);
                     }
                 }
                 // If we have errors but also some valid models, just log the errors