@magda/org-tree 2.0.0-alpha.8 → 2.0.0

package/bin/org-tree/NestedSetModelQueryer.js

@@ -17843,7 +17843,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 (k !== "default" && 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;
 };
@@ -18016,16 +18016,19 @@ function searchTableRecord(poolOrClient, table, conditions = [], queryConfig) {
         if (!table.trim()) {
             throw new ServerError_1.default("invalid empty table name is supplied.");
         }
-        const objectKind = (queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.objectKind) ? queryConfig.objectKind
+        const objectKind = (queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.objectKind)
+            ? queryConfig.objectKind
             : "authObject";
-        const authDecision = (queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.authDecision) ? queryConfig.authDecision
+        const authDecision = (queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.authDecision)
+            ? queryConfig.authDecision
             : AuthDecision_1.UnconditionalTrueDecision;
         let limit = parseIntParam(queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.limit);
         const offset = parseIntParam(queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.offset);
         if (limit > exports.MAX_PAGE_RECORD_NUMBER) {
             limit = exports.MAX_PAGE_RECORD_NUMBER;
         }
-        const config = (queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.toSqlConfig) ? queryConfig.toSqlConfig
+        const config = (queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.toSqlConfig)
+            ? queryConfig.toSqlConfig
             : {
                 prefixes: [
                     `input.${objectKind}.${lodash_1.camelCase(table.replace(/s$/, ""))}`
@@ -18033,19 +18036,23 @@ function searchTableRecord(poolOrClient, table, conditions = [], queryConfig) {
             };
         const authConditions = authDecision.toSql(config);
         const where = sql_syntax_1.default.where(sql_syntax_1.default.joinWithAnd([...conditions, authConditions]));
-        const sqlSyntax = sql_syntax_1.sqls `SELECT ${(queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.selectedFields) ? sql_syntax_1.default.csv(...queryConfig.selectedFields)
+        const sqlSyntax = sql_syntax_1.sqls `SELECT ${(queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.selectedFields)
+            ? sql_syntax_1.default.csv(...queryConfig.selectedFields)
             : sql_syntax_1.sqls `*`} 
         FROM ${escapeIdentifier(table)}
-        ${((_a = queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.leftJoins) === null || _a === void 0 ? void 0 : _a.length) ? sql_syntax_1.default.join(queryConfig.leftJoins.map((joinItem) => sql_syntax_1.sqls `LEFT JOIN ${escapeIdentifier(joinItem.table)} ON ${joinItem.joinCondition}`), sql_syntax_1.sqls `\n`)
+        ${((_a = queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.leftJoins) === null || _a === void 0 ? void 0 : _a.length)
+            ? sql_syntax_1.default.join(queryConfig.leftJoins.map((joinItem) => sql_syntax_1.sqls `LEFT JOIN ${escapeIdentifier(joinItem.table)} ON ${joinItem.joinCondition}`), sql_syntax_1.sqls `\n`)
             : sql_syntax_1.default.empty}
         ${where}
-        ${(queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.groupBy) ? sql_syntax_1.sqls `GROUP BY ${typeof ((_b = queryConfig.groupBy) === null || _b === void 0 ? void 0 : _b.length) === "number"
-            ? sql_syntax_1.default.csv(...queryConfig.groupBy)
-            : queryConfig.groupBy}`
+        ${(queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.groupBy)
+            ? sql_syntax_1.sqls `GROUP BY ${typeof ((_b = queryConfig.groupBy) === null || _b === void 0 ? void 0 : _b.length) === "number"
+                ? sql_syntax_1.default.csv(...queryConfig.groupBy)
+                : queryConfig.groupBy}`
             : sql_syntax_1.default.empty}
-        ${(queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.orderBy) ? sql_syntax_1.sqls `ORDER BY ${typeof ((_c = queryConfig.orderBy) === null || _c === void 0 ? void 0 : _c.length) === "number"
-            ? sql_syntax_1.default.csv(...queryConfig.orderBy)
-            : queryConfig.orderBy}`
+        ${(queryConfig === null || queryConfig === void 0 ? void 0 : queryConfig.orderBy)
+            ? sql_syntax_1.sqls `ORDER BY ${typeof ((_c = queryConfig.orderBy) === null || _c === void 0 ? void 0 : _c.length) === "number"
+                ? sql_syntax_1.default.csv(...queryConfig.orderBy)
+                : queryConfig.orderBy}`
             : sql_syntax_1.default.empty}
         ${offset ? sql_syntax_1.sqls `OFFSET ${offset}` : sql_syntax_1.default.empty}
         ${limit ? sql_syntax_1.sqls `LIMIT ${limit}` : sql_syntax_1.default.empty}
@@ -18116,7 +18123,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 (k !== "default" && 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;
 };
@@ -18220,6 +18227,8 @@ class ConciseExpression {
     }
     getSqlOperator() {
         switch (this.operator) {
+            case "!=":
+                return sql_syntax_1.sqls `!=`;
             case "=":
                 return sql_syntax_1.sqls `=`;
             case ">":
@@ -18364,7 +18373,7 @@ var __setModuleDefault = this && this.__setModuleDefault || (Object.create ? fun
 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.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;
 };
@@ -19471,7 +19480,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 (k !== "default" && 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;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@magda/org-tree",
   "description": "MAGDA Organizational Hierarchy Management Utilities",
-  "version": "2.0.0-alpha.8",
+  "version": "2.0.0",
   "bin": {
     "org-tree": "./bin/org-tree/org-tree.js"
   },
@@ -14,9 +14,9 @@
   "author": "",
   "license": "Apache-2.0",
   "devDependencies": {
-    "@magda/authorization-api": "^2.0.0-alpha.8",
-    "@magda/scripts": "^2.0.0-alpha.8",
-    "@magda/typescript-common": "^2.0.0-alpha.8",
+    "@magda/authorization-api": "^2.0.0",
+    "@magda/scripts": "^2.0.0",
+    "@magda/typescript-common": "^2.0.0",
     "fs-extra": "^2.1.2",
     "webpack": "^4.41.2",
     "webpack-cli": "^3.3.10"