@magda/typescript-common 2.3.3 → 3.0.0-alpha.1

package/dist/handleServerError.js

@@ -1,11 +1,6 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const ServerError_1 = __importDefault(require("./ServerError"));
-function handleServerError(req, res, e) {
-    if (e instanceof ServerError_1.default) {
+import ServerError from "./ServerError.js";
+export default function handleServerError(req, res, e) {
+    if (e instanceof ServerError) {
         res.status(e.statusCode).send(e.message);
     }
     else {
@@ -13,5 +8,4 @@ function handleServerError(req, res, e) {
     }
     console.log(`Error on request to ${req.originalUrl}: ${e}`);
 }
-exports.default = handleServerError;
 //# sourceMappingURL=handleServerError.js.map

package/dist/handleServerError.js.map

@@ -1 +1 @@
-{"version":3,"file":"handleServerError.js","sourceRoot":"","sources":["../src/handleServerError.ts"],"names":[],"mappings":";;;;;AACA,gEAAwC;AAExC,SAAwB,iBAAiB,CAAC,GAAY,EAAE,GAAa,EAAE,CAAM;IACzE,IAAI,CAAC,YAAY,qBAAW,EAAE;QAC1B,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;KAC5C;SAAM;QACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;KAChC;IACD,OAAO,CAAC,GAAG,CAAC,uBAAuB,GAAG,CAAC,WAAW,KAAK,CAAC,EAAE,CAAC,CAAC;AAChE,CAAC;AAPD,oCAOC"}
+{"version":3,"file":"handleServerError.js","sourceRoot":"","sources":["../src/handleServerError.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,kBAAkB,CAAC;AAE3C,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,GAAY,EAAE,GAAa,EAAE,CAAM;IACzE,IAAI,CAAC,YAAY,WAAW,EAAE,CAAC;QAC3B,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;SAAM,CAAC;QACJ,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IACjC,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,uBAAuB,GAAG,CAAC,WAAW,KAAK,CAAC,EAAE,CAAC,CAAC;AAChE,CAAC"}

package/dist/markdownToHtml.js

@@ -1,17 +1,12 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const markdown_it_1 = __importDefault(require("markdown-it"));
-const dompurify_1 = __importDefault(require("dompurify"));
-const md = new markdown_it_1.default({
+import MarkdownIt from "markdown-it";
+import DOMPurify from "dompurify";
+const md = new MarkdownIt({
     html: true,
     linkify: true,
     breaks: true
 });
 const htmlRegex = /^\s*<[^>]+>/;
-function markdownToHtml(markdownString, allowUnsafeHtml = false, options = {
+export default function markdownToHtml(markdownString, allowUnsafeHtml = false, options = {
     FORBID_TAGS: ["svg", "math", "style"]
 }) {
     if (!markdownString || typeof markdownString !== "string") {
@@ -31,8 +26,7 @@ function markdownToHtml(markdownString, allowUnsafeHtml = false, options = {
         return unsafeHtml;
     }
     else {
-        return dompurify_1.default.sanitize(unsafeHtml, options);
+        return DOMPurify.sanitize(unsafeHtml, options);
     }
 }
-exports.default = markdownToHtml;
 //# sourceMappingURL=markdownToHtml.js.map

package/dist/markdownToHtml.js.map

@@ -1 +1 @@
-{"version":3,"file":"markdownToHtml.js","sourceRoot":"","sources":["../src/markdownToHtml.ts"],"names":[],"mappings":";;;;;AAAA,8DAAqC;AACrC,0DAAkC;AAElC,MAAM,EAAE,GAAG,IAAI,qBAAU,CAAC;IACtB,IAAI,EAAE,IAAI;IACV,OAAO,EAAE,IAAI;IACb,MAAM,EAAE,IAAI;CACf,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,aAAa,CAAC;AAEhC,SAAwB,cAAc,CAClC,cAAsB,EACtB,kBAA2B,KAAK,EAChC,OAAO,GAAG;IACN,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC;CACxC;IAED,IAAI,CAAC,cAAc,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE;QACvD,OAAO,cAAc,CAAC;KACzB;IACD,6EAA6E;IAC7E,0CAA0C;IAC1C,IAAI,UAAU,CAAC;IACf,IAAI,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE;QAChC,UAAU,GAAG,cAAc,CAAC;KAC/B;SAAM;QACH,2GAA2G;QAC3G,UAAU,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;KAC1C;IACD,IAAI,eAAe,EAAE;QACjB,OAAO,UAAU,CAAC;KACrB;SAAM;QACH,OAAO,mBAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;KAClD;AACL,CAAC;AAxBD,iCAwBC"}
+{"version":3,"file":"markdownToHtml.js","sourceRoot":"","sources":["../src/markdownToHtml.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,SAAS,MAAM,WAAW,CAAC;AAElC,MAAM,EAAE,GAAG,IAAI,UAAU,CAAC;IACtB,IAAI,EAAE,IAAI;IACV,OAAO,EAAE,IAAI;IACb,MAAM,EAAE,IAAI;CACf,CAAC,CAAC;AAEH,MAAM,SAAS,GAAG,aAAa,CAAC;AAEhC,MAAM,CAAC,OAAO,UAAU,cAAc,CAClC,cAAsB,EACtB,kBAA2B,KAAK,EAChC,OAAO,GAAG;IACN,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC;CACxC;IAED,IAAI,CAAC,cAAc,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE,CAAC;QACxD,OAAO,cAAc,CAAC;IAC1B,CAAC;IACD,6EAA6E;IAC7E,0CAA0C;IAC1C,IAAI,UAAU,CAAC;IACf,IAAI,SAAS,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;QACjC,UAAU,GAAG,cAAc,CAAC;IAChC,CAAC;SAAM,CAAC;QACJ,2GAA2G;QAC3G,UAAU,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAC3C,CAAC;IACD,IAAI,eAAe,EAAE,CAAC;QAClB,OAAO,UAAU,CAAC;IACtB,CAAC;SAAM,CAAC;QACJ,OAAO,SAAS,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;AACL,CAAC"}

package/dist/opa/AspectQuery.js

@@ -1,39 +1,19 @@
-"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]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    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;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AspectQueryGroup = exports.AspectQueryValueInArray = exports.AspectQueryArrayNotEmpty = exports.AspectQueryWithValue = exports.AspectQueryExists = exports.AspectQueryFalse = exports.AspectQueryTrue = exports.AspectQuery = exports.AspectQueryValue = void 0;
-const sql_syntax_1 = __importStar(require("sql-syntax"));
-const SQLUtils_1 = require("../SQLUtils");
-class AspectQueryValue {
+import SQLSyntax, { sqls } from "sql-syntax";
+import { getTableColumnName } from "../SQLUtils.js";
+export class AspectQueryValue {
+    value;
+    postgresType;
     constructor(value) {
         this.value = value;
         switch (typeof value) {
             case "number":
-                this.postgresType = sql_syntax_1.sqls `NUMERIC`;
+                this.postgresType = sqls `NUMERIC`;
                 break;
             case "boolean":
-                this.postgresType = sql_syntax_1.sqls `BOOL`;
+                this.postgresType = sqls `BOOL`;
                 break;
             case "string":
-                this.postgresType = sql_syntax_1.sqls `TEXT`;
+                this.postgresType = sqls `TEXT`;
                 break;
             default:
                 throw new Error("getPostgresValueTypeCastStr: unsupported data type: `${" +
@@ -42,8 +22,10 @@ class AspectQueryValue {
         }
     }
 }
-exports.AspectQueryValue = AspectQueryValue;
-class AspectQuery {
+export class AspectQuery {
+    aspectId;
+    path;
+    negated;
     constructor(aspectId, path = [], negated = false) {
         this.aspectId = aspectId;
         this.path = path;
@@ -63,54 +45,52 @@ class AspectQuery {
         }
         const sqlQuery = this.sqlQueries(config);
         if (this.negated) {
-            return sql_syntax_1.sqls `NOT ${sqlQuery}`;
+            return sqls `NOT ${sqlQuery}`;
         }
         else {
             return sqlQuery;
         }
     }
 }
-exports.AspectQuery = AspectQuery;
-class AspectQueryTrue extends AspectQuery {
+export class AspectQueryTrue extends AspectQuery {
     constructor() {
         super(undefined);
     }
     sqlQueries(config) {
-        return sql_syntax_1.sqls `TRUE`;
+        return sqls `TRUE`;
     }
     // override default toSql as we don't need any validation logic
     toSql(config) {
         return this.sqlQueries(config);
     }
 }
-exports.AspectQueryTrue = AspectQueryTrue;
-class AspectQueryFalse extends AspectQuery {
+export class AspectQueryFalse extends AspectQuery {
     constructor() {
         super(undefined);
     }
     sqlQueries(config) {
-        return sql_syntax_1.sqls `FALSE`;
+        return sqls `FALSE`;
     }
     // override default toSql as we don't need any validation logic
     toSql(config) {
         return this.sqlQueries(config);
     }
 }
-exports.AspectQueryFalse = AspectQueryFalse;
-class AspectQueryExists extends AspectQuery {
+export class AspectQueryExists extends AspectQuery {
     sqlQueries(config) {
-        var _a;
-        const fieldRef = SQLUtils_1.getTableColumnName(this.aspectId, config.tableRef, config.useLowerCaseColumnName);
-        if ((_a = this.path) === null || _a === void 0 ? void 0 : _a.length) {
-            return sql_syntax_1.sqls `(${fieldRef} #> string_to_array(${this.path.join(",")}, ',')) IS NOT NULL`;
+        const fieldRef = getTableColumnName(this.aspectId, config.tableRef, config.useLowerCaseColumnName);
+        if (this.path?.length) {
+            return sqls `(${fieldRef} #> string_to_array(${this.path.join(",")}, ',')) IS NOT NULL`;
         }
         else {
             return fieldRef.isNotNull();
         }
     }
 }
-exports.AspectQueryExists = AspectQueryExists;
-class AspectQueryWithValue extends AspectQuery {
+export class AspectQueryWithValue extends AspectQuery {
+    value;
+    operator;
+    placeReferenceFirst;
     constructor(value, operator, placeReferenceFirst, aspectId, path = [], negated = false) {
         super(aspectId, path, negated);
         this.value = value;
@@ -118,44 +98,40 @@ class AspectQueryWithValue extends AspectQuery {
         this.placeReferenceFirst = placeReferenceFirst;
     }
     sqlQueries(config) {
-        var _a;
-        const fieldRef = SQLUtils_1.getTableColumnName(this.aspectId, config.tableRef, config.useLowerCaseColumnName);
-        const tableDataRef = !((_a = this.path) === null || _a === void 0 ? void 0 : _a.length)
-            ? sql_syntax_1.sqls `${fieldRef}::${this.value.postgresType}`
-            : sql_syntax_1.sqls `(${fieldRef} #>> string_to_array(${this.path.join(",")}, ','))::${this.value.postgresType}`;
+        const fieldRef = getTableColumnName(this.aspectId, config.tableRef, config.useLowerCaseColumnName);
+        const tableDataRef = !this.path?.length
+            ? sqls `${fieldRef}::${this.value.postgresType}`
+            : sqls `(${fieldRef} #>> string_to_array(${this.path.join(",")}, ','))::${this.value.postgresType}`;
         return this.placeReferenceFirst
-            ? sql_syntax_1.sqls `COALESCE(${tableDataRef} ${this.operator} ${this.value.value}::${this.value.postgresType}, false)`
-            : sql_syntax_1.sqls `COALESCE(${this.value.value}::${this.value.postgresType} ${this.operator} ${tableDataRef}, false)`;
+            ? sqls `COALESCE(${tableDataRef} ${this.operator} ${this.value.value}::${this.value.postgresType}, false)`
+            : sqls `COALESCE(${this.value.value}::${this.value.postgresType} ${this.operator} ${tableDataRef}, false)`;
     }
 }
-exports.AspectQueryWithValue = AspectQueryWithValue;
-class AspectQueryArrayNotEmpty extends AspectQuery {
+export class AspectQueryArrayNotEmpty extends AspectQuery {
     sqlQueries(config) {
-        var _a;
-        const fieldRef = SQLUtils_1.getTableColumnName(this.aspectId, config.tableRef, config.useLowerCaseColumnName);
-        const tableDataRef = !((_a = this.path) === null || _a === void 0 ? void 0 : _a.length)
-            ? sql_syntax_1.sqls `(${fieldRef} #> string_to_array('0',','))`
-            : sql_syntax_1.sqls `(${fieldRef} #>> string_to_array(${[...this.path, "0"].join(",")}, ','))`;
+        const fieldRef = getTableColumnName(this.aspectId, config.tableRef, config.useLowerCaseColumnName);
+        const tableDataRef = !this.path?.length
+            ? sqls `(${fieldRef} #> string_to_array('0',','))`
+            : sqls `(${fieldRef} #>> string_to_array(${[...this.path, "0"].join(",")}, ','))`;
         return tableDataRef.isNotNull();
     }
 }
-exports.AspectQueryArrayNotEmpty = AspectQueryArrayNotEmpty;
-class AspectQueryValueInArray extends AspectQuery {
+export class AspectQueryValueInArray extends AspectQuery {
+    value;
     constructor(value, aspectId, path = [], negated = false) {
         super(aspectId, path, negated);
         this.value = value;
     }
     sqlQueries(config) {
-        var _a;
-        const fieldRef = SQLUtils_1.getTableColumnName(this.aspectId, config.tableRef, config.useLowerCaseColumnName);
-        const tableDataRef = !((_a = this.path) === null || _a === void 0 ? void 0 : _a.length)
-            ? sql_syntax_1.sqls `COALESCE(
+        const fieldRef = getTableColumnName(this.aspectId, config.tableRef, config.useLowerCaseColumnName);
+        const tableDataRef = !this.path?.length
+            ? sqls `COALESCE(
                 (
                   (${fieldRef}::JSONB #> string_to_array('0',','))::JSONB
                 ) @> to_json(${this.value.value})::JSONB,
                 FALSE
               )`
-            : sql_syntax_1.sqls `COALESCE(
+            : sqls `COALESCE(
                 (
                   (${fieldRef}::JSONB #> string_to_array(${this.path.join(",")}, ','))::JSONB
                 ) @> to_json(${this.value.value})::JSONB,
@@ -164,27 +140,28 @@ class AspectQueryValueInArray extends AspectQuery {
         return tableDataRef;
     }
 }
-exports.AspectQueryValueInArray = AspectQueryValueInArray;
-class AspectQueryGroup {
+export class AspectQueryGroup {
+    queries;
+    joinWithAnd;
+    negated;
     constructor(queries, joinWithAnd = true, negated = false) {
         this.queries = queries;
         this.joinWithAnd = joinWithAnd;
         this.negated = negated;
     }
     toSql(config) {
-        var _a;
-        if (!((_a = this.queries) === null || _a === void 0 ? void 0 : _a.length)) {
-            return sql_syntax_1.default.empty;
+        if (!this.queries?.length) {
+            return SQLSyntax.empty;
         }
         let result;
         if (this.joinWithAnd) {
             if (this.queries.findIndex((item) => item instanceof AspectQueryFalse) !== -1) {
-                result = sql_syntax_1.sqls `FALSE`;
+                result = sqls `FALSE`;
             }
             else {
-                result = sql_syntax_1.default.joinWithAnd(this.queries.map((q) => {
+                result = SQLSyntax.joinWithAnd(this.queries.map((q) => {
                     if (q instanceof AspectQueryTrue) {
-                        return sql_syntax_1.default.empty;
+                        return SQLSyntax.empty;
                     }
                     else {
                         return q.toSql(config);
@@ -194,12 +171,12 @@ class AspectQueryGroup {
         }
         else {
             if (this.queries.findIndex((item) => item instanceof AspectQueryTrue) !== -1) {
-                result = sql_syntax_1.sqls `TRUE`;
+                result = sqls `TRUE`;
             }
             else {
-                result = sql_syntax_1.default.joinWithOr(this.queries.map((q) => {
+                result = SQLSyntax.joinWithOr(this.queries.map((q) => {
                     if (q instanceof AspectQueryFalse) {
-                        return sql_syntax_1.default.empty;
+                        return SQLSyntax.empty;
                     }
                     else {
                         return q.toSql(config);
@@ -208,12 +185,11 @@ class AspectQueryGroup {
             }
         }
         if (this.negated) {
-            return sql_syntax_1.sqls `NOT ${result}`;
+            return sqls `NOT ${result}`;
         }
         else {
             return result;
         }
     }
 }
-exports.AspectQueryGroup = AspectQueryGroup;
 //# sourceMappingURL=AspectQuery.js.map

package/dist/opa/AspectQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"AspectQuery.js","sourceRoot":"","sources":["../../src/opa/AspectQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AspectQuery.js","sourceRoot":"","sources":["../../src/opa/AspectQuery.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD,MAAM,OAAO,gBAAgB;IAChB,KAAK,CAA4B;IACjC,YAAY,CAAY;IAEjC,YAAY,KAAgC;QACxC,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,QAAQ,OAAO,KAAK,EAAE,CAAC;YACnB,KAAK,QAAQ;gBACT,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA,SAAS,CAAC;gBAClC,MAAM;YACV,KAAK,SAAS;gBACV,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA,MAAM,CAAC;gBAC/B,MAAM;YACV,KAAK,QAAQ;gBACT,IAAI,CAAC,YAAY,GAAG,IAAI,CAAA,MAAM,CAAC;gBAC/B,MAAM;YACV;gBACI,MAAM,IAAI,KAAK,CACX,yDAAyD;oBACrD,OAAO,KAAK;oBACZ,IAAI,CACX,CAAC;QACV,CAAC;IACL,CAAC;CACJ;AAQD,MAAM,OAAgB,WAAW;IACpB,QAAQ,CAAU;IAClB,IAAI,CAAY;IAChB,OAAO,CAAU;IAE1B,YACI,QAAgB,EAChB,OAAiB,EAAE,EACnB,UAAmB,KAAK;QAExB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAaD;;;;;;;OAOG;IACI,KAAK,CAAC,MAA8B;QACvC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;QACtE,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QACzC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO,IAAI,CAAA,OAAO,QAAQ,EAAE,CAAC;QACjC,CAAC;aAAM,CAAC;YACJ,OAAO,QAAQ,CAAC;QACpB,CAAC;IACL,CAAC;CACJ;AAED,MAAM,OAAO,eAAgB,SAAQ,WAAW;IAC5C;QACI,KAAK,CAAC,SAAS,CAAC,CAAC;IACrB,CAAC;IAED,UAAU,CAAC,MAA8B;QACrC,OAAO,IAAI,CAAA,MAAM,CAAC;IACtB,CAAC;IAED,+DAA+D;IAC/D,KAAK,CAAC,MAA8B;QAChC,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;CACJ;AAED,MAAM,OAAO,gBAAiB,SAAQ,WAAW;IAC7C;QACI,KAAK,CAAC,SAAS,CAAC,CAAC;IACrB,CAAC;IAED,UAAU,CAAC,MAA8B;QACrC,OAAO,IAAI,CAAA,OAAO,CAAC;IACvB,CAAC;IAED,+DAA+D;IAC/D,KAAK,CAAC,MAA8B;QAChC,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;CACJ;AAED,MAAM,OAAO,iBAAkB,SAAQ,WAAW;IAC9C,UAAU,CAAC,MAA8B;QACrC,MAAM,QAAQ,GAAG,kBAAkB,CAC/B,IAAI,CAAC,QAAQ,EACb,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,sBAAsB,CAChC,CAAC;QAEF,IAAI,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;YACpB,OAAO,IAAI,CAAA,IAAI,QAAQ,uBAAuB,IAAI,CAAC,IAAI,CAAC,IAAI,CACxD,GAAG,CACN,qBAAqB,CAAC;QAC3B,CAAC;aAAM,CAAC;YACJ,OAAO,QAAQ,CAAC,SAAS,EAAE,CAAC;QAChC,CAAC;IACL,CAAC;CACJ;AAED,MAAM,OAAO,oBAAqB,SAAQ,WAAW;IACxC,KAAK,CAAmB;IACxB,QAAQ,CAAY;IACpB,mBAAmB,CAAU;IAEtC,YACI,KAAuB,EACvB,QAAmB,EACnB,mBAA4B,EAC5B,QAAgB,EAChB,OAAiB,EAAE,EACnB,UAAmB,KAAK;QAExB,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IACnD,CAAC;IAED,UAAU,CAAC,MAA8B;QACrC,MAAM,QAAQ,GAAG,kBAAkB,CAC/B,IAAI,CAAC,QAAQ,EACb,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,sBAAsB,CAChC,CAAC;QACF,MAAM,YAAY,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM;YACnC,CAAC,CAAC,IAAI,CAAA,GAAG,QAAQ,KAAK,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE;YAC/C,CAAC,CAAC,IAAI,CAAA,IAAI,QAAQ,wBAAwB,IAAI,CAAC,IAAI,CAAC,IAAI,CAClD,GAAG,CACN,YAAY,IAAI,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;QAC7C,OAAO,IAAI,CAAC,mBAAmB;YAC3B,CAAC,CAAC,IAAI,CAAA,YAAY,YAAY,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,YAAY,UAAU;YACzG,CAAC,CAAC,IAAI,CAAA,YAAY,IAAI,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,IAAI,CAAC,QAAQ,IAAI,YAAY,UAAU,CAAC;IAClH,CAAC;CACJ;AAED,MAAM,OAAO,wBAAyB,SAAQ,WAAW;IACrD,UAAU,CAAC,MAA8B;QACrC,MAAM,QAAQ,GAAG,kBAAkB,CAC/B,IAAI,CAAC,QAAQ,EACb,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,sBAAsB,CAChC,CAAC;QACF,MAAM,YAAY,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM;YACnC,CAAC,CAAC,IAAI,CAAA,IAAI,QAAQ,+BAA+B;YACjD,CAAC,CAAC,IAAI,CAAA,IAAI,QAAQ,wBAAwB,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,IAAI,CAC5D,GAAG,CACN,SAAS,CAAC;QACjB,OAAO,YAAY,CAAC,SAAS,EAAE,CAAC;IACpC,CAAC;CACJ;AAED,MAAM,OAAO,uBAAwB,SAAQ,WAAW;IAC3C,KAAK,CAAmB;IAEjC,YACI,KAAuB,EACvB,QAAgB,EAChB,OAAiB,EAAE,EACnB,UAAmB,KAAK;QAExB,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;QAC/B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACvB,CAAC;IAED,UAAU,CAAC,MAA8B;QACrC,MAAM,QAAQ,GAAG,kBAAkB,CAC/B,IAAI,CAAC,QAAQ,EACb,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,sBAAsB,CAChC,CAAC;QACF,MAAM,YAAY,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM;YACnC,CAAC,CAAC,IAAI,CAAA;;qBAEG,QAAQ;+BACE,IAAI,CAAC,KAAK,CAAC,KAAK;;gBAE/B;YACJ,CAAC,CAAC,IAAI,CAAA;;qBAEG,QAAQ,8BAA8B,IAAI,CAAC,IAAI,CAAC,IAAI,CACvD,GAAG,CACN;+BACgB,IAAI,CAAC,KAAK,CAAC,KAAK;;gBAE/B,CAAC;QACT,OAAO,YAAY,CAAC;IACxB,CAAC;CACJ;AAED,MAAM,OAAO,gBAAgB;IAChB,OAAO,CAAgB;IACvB,WAAW,CAAU;IACrB,OAAO,CAAU;IAE1B,YACI,OAAuB,EACvB,cAAuB,IAAI,EAC3B,UAAmB,KAAK;QAExB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,KAAK,CAAC,MAA8B;QAChC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC;YACxB,OAAO,SAAS,CAAC,KAAK,CAAC;QAC3B,CAAC;QACD,IAAI,MAAiB,CAAC;QAEtB,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;YACnB,IACI,IAAI,CAAC,OAAO,CAAC,SAAS,CAClB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,YAAY,gBAAgB,CAC7C,KAAK,CAAC,CAAC,EACV,CAAC;gBACC,MAAM,GAAG,IAAI,CAAA,OAAO,CAAC;YACzB,CAAC;iBAAM,CAAC;gBACJ,MAAM,GAAG,SAAS,CAAC,WAAW,CAC1B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBACnB,IAAI,CAAC,YAAY,eAAe,EAAE,CAAC;wBAC/B,OAAO,SAAS,CAAC,KAAK,CAAC;oBAC3B,CAAC;yBAAM,CAAC;wBACJ,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;oBAC3B,CAAC;gBACL,CAAC,CAAC,CACL,CAAC;YACN,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,IACI,IAAI,CAAC,OAAO,CAAC,SAAS,CAClB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,YAAY,eAAe,CAC5C,KAAK,CAAC,CAAC,EACV,CAAC;gBACC,MAAM,GAAG,IAAI,CAAA,MAAM,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACJ,MAAM,GAAG,SAAS,CAAC,UAAU,CACzB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBACnB,IAAI,CAAC,YAAY,gBAAgB,EAAE,CAAC;wBAChC,OAAO,SAAS,CAAC,KAAK,CAAC;oBAC3B,CAAC;yBAAM,CAAC;wBACJ,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;oBAC3B,CAAC;gBACL,CAAC,CAAC,CACL,CAAC;YACN,CAAC;QACL,CAAC;QACD,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,OAAO,IAAI,CAAA,OAAO,MAAM,EAAE,CAAC;QAC/B,CAAC;aAAM,CAAC;YACJ,OAAO,MAAM,CAAC;QAClB,CAAC;IACL,CAAC;CACJ"}

package/dist/opa/AuthDecision.d.ts

@@ -1,6 +1,6 @@
-import { AspectQueryValue, AspectQuery, AspectQueryGroup, AspectQueryToSqlConfig } from "./AspectQuery";
+import { AspectQueryValue, AspectQuery, AspectQueryGroup, AspectQueryToSqlConfig } from "./AspectQuery.js";
 import SQLSyntax from "sql-syntax";
-declare type PlainObject = {
+type PlainObject = {
     [key: string]: any;
 };
 export default class AuthDecision {

package/dist/opa/AuthDecision.js

@@ -1,33 +1,17 @@
-"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]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    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;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConciseOperand = exports.ConciseExpression = exports.ConciseRule = exports.UnconditionalFalseDecision = exports.UnconditionalTrueDecision = exports.isTrueEquivalent = void 0;
-const AspectQuery_1 = require("./AspectQuery");
-const sql_syntax_1 = __importStar(require("sql-syntax"));
-class AuthDecision {
+import { AspectQueryValue, AspectQueryArrayNotEmpty, AspectQueryExists, AspectQueryValueInArray, AspectQueryWithValue, AspectQueryGroup, AspectQueryTrue, AspectQueryFalse } from "./AspectQuery.js";
+import SQLSyntax, { sqls } from "sql-syntax";
+export default class AuthDecision {
+    hasResidualRules;
+    result;
+    residualRules;
+    hasWarns;
+    warns;
+    unknowns;
     constructor(hasResidualRules, residualRules, result, hasWarns = false, warns = [], unknowns) {
         if (typeof hasResidualRules !== "boolean") {
             throw new Error("Failed to create AuthDecision: invalid hasResidualRules type");
         }
-        if (hasResidualRules && !(residualRules === null || residualRules === void 0 ? void 0 : residualRules.length)) {
+        if (hasResidualRules && !residualRules?.length) {
             throw new Error("Failed to create AuthDecision: residualRules must have at least one item when hasResidualRules == true");
         }
         this.hasResidualRules = hasResidualRules;
@@ -38,8 +22,7 @@ class AuthDecision {
         this.unknowns = unknowns;
     }
     static fromJson(data) {
-        var _a;
-        return new AuthDecision(data === null || data === void 0 ? void 0 : data.hasResidualRules, (_a = data === null || data === void 0 ? void 0 : data.residualRules) === null || _a === void 0 ? void 0 : _a.map((item) => ConciseRule.fromJson(item)), data === null || data === void 0 ? void 0 : data.result, (data === null || data === void 0 ? void 0 : data.hasWarns) ? true : false, data === null || data === void 0 ? void 0 : data.warns, data === null || data === void 0 ? void 0 : data.unknowns);
+        return new AuthDecision(data?.hasResidualRules, data?.residualRules?.map((item) => ConciseRule.fromJson(item)), data?.result, data?.hasWarns ? true : false, data?.warns, data?.unknowns);
     }
     toAspectQueryGroups(prefixes) {
         if (this.hasResidualRules) {
@@ -48,19 +31,18 @@ class AuthDecision {
         else {
             if (isTrueEquivalent(this.result)) {
                 // unconditional true
-                return [new AspectQuery_1.AspectQueryGroup([new AspectQuery_1.AspectQueryTrue()])];
+                return [new AspectQueryGroup([new AspectQueryTrue()])];
             }
             else {
-                return [new AspectQuery_1.AspectQueryGroup([new AspectQuery_1.AspectQueryFalse()])];
+                return [new AspectQueryGroup([new AspectQueryFalse()])];
             }
         }
     }
     toSql(config) {
-        return sql_syntax_1.default.joinWithOr(this.toAspectQueryGroups(config.prefixes).map((item) => item.toSql(config))).roundBracket();
+        return SQLSyntax.joinWithOr(this.toAspectQueryGroups(config.prefixes).map((item) => item.toSql(config))).roundBracket();
     }
 }
-exports.default = AuthDecision;
-function isTrueEquivalent(value) {
+export function isTrueEquivalent(value) {
     const typeStr = typeof value;
     if (typeStr === "boolean") {
         return value;
@@ -68,84 +50,85 @@ function isTrueEquivalent(value) {
     else if (typeStr === "undefined") {
         return false;
     }
-    else if (typeof (value === null || value === void 0 ? void 0 : value.length) !== "undefined") {
+    else if (typeof value?.length !== "undefined") {
         return !!value.length;
     }
     else {
         return !!value;
     }
 }
-exports.isTrueEquivalent = isTrueEquivalent;
-exports.UnconditionalTrueDecision = new AuthDecision(false, undefined, true);
-exports.UnconditionalFalseDecision = new AuthDecision(false, undefined, false);
-class ConciseRule {
+export const UnconditionalTrueDecision = new AuthDecision(false, undefined, true);
+export const UnconditionalFalseDecision = new AuthDecision(false, undefined, false);
+export class ConciseRule {
+    default;
+    value;
+    fullName;
+    name;
+    expressions;
     constructor(fullName, name, value, expressions, isDefault = false) {
-        if (!isDefault && !(expressions === null || expressions === void 0 ? void 0 : expressions.length)) {
+        if (!isDefault && !expressions?.length) {
             throw new Error("Invalid ConciseRule data: it must contain at least one ConciseExpression item unless it's a default rule.");
         }
         this.default = isDefault ? true : false;
         this.fullName = fullName;
         this.name = name;
         this.value = value;
-        this.expressions = (expressions === null || expressions === void 0 ? void 0 : expressions.length) ? expressions : [];
+        this.expressions = expressions?.length ? expressions : [];
     }
     static fromJson(data) {
-        var _a;
-        return new ConciseRule(data === null || data === void 0 ? void 0 : data.fullName, data === null || data === void 0 ? void 0 : data.name, data === null || data === void 0 ? void 0 : data.value, (_a = data === null || data === void 0 ? void 0 : data.expressions) === null || _a === void 0 ? void 0 : _a.map((item) => ConciseExpression.fromJson(item)));
+        return new ConciseRule(data?.fullName, data?.name, data?.value, data?.expressions?.map((item) => ConciseExpression.fromJson(item)));
     }
     toAspectQueryGroup(prefixes) {
-        var _a;
-        return new AspectQuery_1.AspectQueryGroup((_a = this.expressions) === null || _a === void 0 ? void 0 : _a.map((item) => item.toAspectQuery(prefixes)), true, !isTrueEquivalent(this.value));
+        return new AspectQueryGroup(this.expressions?.map((item) => item.toAspectQuery(prefixes)), true, !isTrueEquivalent(this.value));
     }
 }
-exports.ConciseRule = ConciseRule;
-class ConciseExpression {
+export class ConciseExpression {
+    negated;
+    operator;
+    operands;
     constructor(operands, operator, negated = false) {
-        var _a, _b;
         this.negated = negated ? true : false;
         this.operands = operands;
         this.operator = operator;
-        if (!((_a = this.operands) === null || _a === void 0 ? void 0 : _a.length)) {
+        if (!this.operands?.length) {
             throw new Error("invalid ConciseExpression data: it must have at least one operand.");
         }
-        if (((_b = this.operands) === null || _b === void 0 ? void 0 : _b.length) > 1 && typeof operator !== "string") {
+        if (this.operands?.length > 1 && typeof operator !== "string") {
             throw new Error("invalid ConciseExpression data: when operands number > 1, operator must be a valid string value.");
         }
     }
     static fromJson(data) {
-        var _a;
-        return new ConciseExpression((_a = data === null || data === void 0 ? void 0 : data.operands) === null || _a === void 0 ? void 0 : _a.map((item) => ConciseOperand.fromJson(item)), data === null || data === void 0 ? void 0 : data.operator, data === null || data === void 0 ? void 0 : data.negated);
+        return new ConciseExpression(data?.operands?.map((item) => ConciseOperand.fromJson(item)), data?.operator, data?.negated);
     }
     getSqlOperator() {
         switch (this.operator) {
             case "!=":
-                return sql_syntax_1.sqls `!=`;
+                return sqls `!=`;
             case "=":
-                return sql_syntax_1.sqls `=`;
+                return sqls `=`;
             case ">":
-                return sql_syntax_1.sqls `>`;
+                return sqls `>`;
             case "<":
-                return sql_syntax_1.sqls `<`;
+                return sqls `<`;
             case ">=":
-                return sql_syntax_1.sqls `>=`;
+                return sqls `>=`;
             case "<=":
-                return sql_syntax_1.sqls `<=`;
+                return sqls `<=`;
             default:
                 throw new Error(`Failed to convert auth decision operator to SQL operator: unsupported operator: ${this.operator}`);
         }
     }
     toAspectQuery(prefixes) {
-        var _a, _b;
-        if (((_a = this.operands) === null || _a === void 0 ? void 0 : _a.length) == 1) {
+        if (this.operands?.length == 1) {
             const [aspectId, path, isCollection] = this.operands[0].extractAspectIdAndPath(prefixes);
             if (isCollection) {
-                return new AspectQuery_1.AspectQueryArrayNotEmpty(aspectId, path, this.negated);
+                return new AspectQueryArrayNotEmpty(aspectId, path, this.negated);
             }
             else {
-                return new AspectQuery_1.AspectQueryExists(aspectId, path, this.negated);
+                return new AspectQueryExists(aspectId, path, this.negated);
             }
         }
-        else if (((_b = this.operands) === null || _b === void 0 ? void 0 : _b.length) == 2) {
+        else if (this.operands?.length == 2) {
             const refOperand = this.operands.find((item) => item.isRef);
             const valOperand = this.operands.find((item) => !item.isRef);
             if (!valOperand) {
@@ -163,10 +146,10 @@ class ConciseExpression {
                     `Only \`=\` operator is supported for collection reference. Expression: ${this}`);
             }
             if (isCollection && this.operator == "=") {
-                return new AspectQuery_1.AspectQueryValueInArray(valOperand.toAspectQueryValue(), aspectId, path, this.negated);
+                return new AspectQueryValueInArray(valOperand.toAspectQueryValue(), aspectId, path, this.negated);
             }
             else {
-                return new AspectQuery_1.AspectQueryWithValue(valOperand.toAspectQueryValue(), this.getSqlOperator(), this.operands[0].isRef, aspectId, path, this.negated);
+                return new AspectQueryWithValue(valOperand.toAspectQueryValue(), this.getSqlOperator(), this.operands[0].isRef, aspectId, path, this.negated);
             }
         }
         else {
@@ -174,8 +157,9 @@ class ConciseExpression {
         }
     }
 }
-exports.ConciseExpression = ConciseExpression;
-class ConciseOperand {
+export class ConciseOperand {
+    isRef;
+    value;
     constructor(isRef, value) {
         if (typeof isRef !== "boolean") {
             throw new Error("Invalid ConciseOperand data: isRef must be a boolean value.");
@@ -187,7 +171,7 @@ class ConciseOperand {
         this.value = value;
     }
     static fromJson(data) {
-        return new ConciseOperand(data === null || data === void 0 ? void 0 : data.isRef, data === null || data === void 0 ? void 0 : data.value);
+        return new ConciseOperand(data?.isRef, data?.value);
     }
     refString() {
         if (!this.isRef) {
@@ -236,8 +220,7 @@ class ConciseOperand {
         if (this.isRef) {
             throw new Error(`Attempt to covert reference \`Operand\` to \`AspectQueryValue\`: ${this}`);
         }
-        return new AspectQuery_1.AspectQueryValue(this.value);
+        return new AspectQueryValue(this.value);
     }
 }
-exports.ConciseOperand = ConciseOperand;
 //# sourceMappingURL=AuthDecision.js.map