@magda/scripts 3.0.0-alpha.0 → 3.0.0-alpha.1

package/acs-cmd/acs-cmd-admin-set.js

@@ -10,7 +10,7 @@ const pool = getDBPool();
 
 program
     .description("Make a user an Admin user")
-    .option("<userId>", "User ID")
+    .argument("<userId>", "User ID")
     .version(pkg.version)
     .action(async (userId) => {
         try {

package/acs-cmd/acs-cmd-admin-unset.js

@@ -10,7 +10,7 @@ const pool = getDBPool();
 
 program
     .description("Remove Admin role / status from a user")
-    .option("<userId>", "User ID")
+    .argument("<userId>", "User ID")
     .version(pkg.version)
     .action(async (userId) => {
         try {

package/acs-cmd/acs-cmd-assign-permission.js

@@ -10,8 +10,8 @@ const pool = getDBPool();
 
 program
     .description("assign the permission to a role")
-    .option("<permissionId>", "Permission ID")
-    .option("<roleId>", "Role ID")
+    .argument("<permissionId>", "Permission ID")
+    .argument("<roleId>", "Role ID")
     .version(pkg.version)
     .action(async (permissionId, roleId) => {
         try {

package/acs-cmd/acs-cmd-assign-role.js

@@ -10,8 +10,8 @@ const pool = getDBPool();
 
 program
     .description("assign the role to a user")
-    .option("<roleId>", "Role ID")
-    .option("<userId>", "User ID")
+    .argument("<roleId>", "Role ID")
+    .argument("<userId>", "User ID")
     .version(pkg.version)
     .action(async (roleId, userId) => {
         try {

package/acs-cmd/acs-cmd-create-operation.js

@@ -10,10 +10,10 @@ const pool = getDBPool();
 program
     .version(pkg.version)
     .description(`A tool for creating operations. Version: ${pkg.version}`)
-    .option("<permission>", "Permission name")
-    .option("<uri>", "Operation uri")
-    .option("<name>", "Operation name")
-    .option("<description>", "Operation description")
+    .argument("<permission>", "Permission name")
+    .argument("<uri>", "Operation uri")
+    .argument("<name>", "Operation name")
+    .argument("<description>", "Operation description")
     .action(async (permissionName, uri, name, description) => {
         try {
             await pool.query("BEGIN TRANSACTION");

package/acs-cmd/acs-cmd-create-permission.js

@@ -10,8 +10,8 @@ const pool = getDBPool();
 program
     .version(pkg.version)
     .description(`A tool for creating permissions. Version: ${pkg.version}`)
-    .option("<name>", "Permission name")
-    .option("<description>", "Permission description")
+    .argument("<name>", "Permission name")
+    .argument("<description>", "Permission description")
     .action(async (name, description) => {
         try {
             await pool.query(

package/acs-cmd/acs-cmd-jwt.js

@@ -11,8 +11,8 @@ program
     .description(
         `calculate JWT token (only for testing purpose). Version: ${pkg.version}`
     )
-    .option("<userId>", "User ID")
-    .option(
+    .argument("<userId>", "User ID")
+    .argument(
         "[jwtSecret]",
         "Optional JWT secret. Default value: `" + DEFAULT_JWT_SECRET + "`"
     )

package/acs-cmd/acs-cmd-remove-permission.js

@@ -10,8 +10,8 @@ const pool = getDBPool();
 
 program
     .description("Remove a permission from a role")
-    .option("<permissionId>", "Permission ID")
-    .option("<roleId>", "Role ID")
+    .argument("<permissionId>", "Permission ID")
+    .argument("<roleId>", "Role ID")
     .version(pkg.version)
     .action(async (permissionId, roleId) => {
         try {

package/acs-cmd/acs-cmd-remove-role.js

@@ -10,8 +10,8 @@ const pool = getDBPool();
 
 program
     .description("Remove a role from a user")
-    .option("<roleId>", "Role ID")
-    .option("<userId>", "User ID")
+    .argument("<roleId>", "Role ID")
+    .argument("<userId>", "User ID")
     .version(pkg.version)
     .action(async (roleId, userId) => {
         try {

package/create-region-synonym-file.js

@@ -2,7 +2,7 @@
 import _ from "lodash";
 import yargs from "yargs";
 import fs from "fs";
-import request from "request";
+import fetch from "node-fetch";
 import StreamArray from "stream-json/streamers/StreamArray.js";
 
 function getDefaultRegionSourceConfig() {
@@ -85,28 +85,13 @@ function createLineFromRegionData(regionConfig, item) {
 }
 
 async function getRemoteDataFileStream(url) {
-    return new Promise((resolve, reject) => {
-        request
-            .get(url)
-            .on("error", (e) => reject(e))
-            .on("response", (response) => {
-                try {
-                    if (
-                        response.statusCode >= 200 &&
-                        response.statusCode <= 299
-                    ) {
-                        resolve(response.pipe(StreamArray.withParser()));
-                    } else {
-                        throw new Error(
-                            `Request failed ${url}, statusCode: ${response.statusCode}`
-                        );
-                    }
-                } catch (e) {
-                    console.error(e);
-                    reject(e);
-                }
-            });
-    });
+    const res = await fetch(url);
+    if (!res.ok) {
+        throw new Error(
+            `Request failed ${url}, statusCode: ${res.status} ${res.statusText}`
+        );
+    }
+    return res.body.pipe(StreamArray.withParser());
 }
 
 async function processRegionDataPipeline(regionConfig, targetStream) {

package/org-tree/org-tree-assign.js

@@ -14,8 +14,8 @@ program
             "\nBoth `userNameOrId` & `nodeNameOrId` can be either entity name or Id. \n" +
             "\tIf more than one entities are located by entity name, the first one will be used."
     )
-    .option("<userNameOrId>", "user name or id")
-    .option("<nodeNameOrId>", "org unit node id or name")
+    .argument("<userNameOrId>", "user name or id")
+    .argument("<nodeNameOrId>", "org unit node id or name")
     .version(pkg.version)
     .action(async (userNameOrId, parentNodeNameOrId) => {
         try {

package/org-tree/org-tree-create.js

@@ -10,7 +10,7 @@ program
     .description(
         `Create a root tree node with specified name. You can then complete other node fields using other DB admin tools.`
     )
-    .option("<nodeName>", "Root node name")
+    .argument("<nodeName>", "Root node name")
     .version(pkg.version)
     .action(async (nodeName) => {
         try {

package/org-tree/org-tree-delete.js

@@ -14,7 +14,7 @@ program
             "\nIf -o or --only switch is on, only specified node will be removed and its children (if any) " +
             "will become its parent's children."
     )
-    .option("<nodeNameOrId>", "node name or id that to be removed")
+    .argument("<nodeNameOrId>", "node name or id that to be removed")
     .option(
         "-o, --only",
         "If only remove specified node and left its children (if any) to its parent"

package/org-tree/org-tree-insert.js

@@ -12,8 +12,8 @@ program
         "Insert a node as a child node of the specified the parent node with specified name. " +
             "\nIf the parent node name is given instead of the parent node Id, the newly created child node will be inserted to the first located parent node."
     )
-    .option("<parentNodeNameOrId>", "parent node id or name")
-    .option("<nodeName>", "insert node name")
+    .argument("<parentNodeNameOrId>", "parent node id or name")
+    .argument("<nodeName>", "insert node name")
     .version(pkg.version)
     .action(async (parentNodeNameOrId, nodeName) => {
         try {

package/org-tree/org-tree-move.js

@@ -13,8 +13,8 @@ program
             "\nIf the node name is given instead of the node Id, the first located node (and its dependents) will be moved." +
             "\nIf the parent node name is given instead of the parent node Id, the specifed node will be moved to the first located parent node."
     )
-    .option("<nodeNameOrId>", "The id or name of the node to be moved")
-    .option("<parentNodeNameOrId>", "The new parent node id or name")
+    .argument("<nodeNameOrId>", "The id or name of the node to be moved")
+    .argument("<parentNodeNameOrId>", "The new parent node id or name")
     .version(pkg.version)
     .action(async (nodeNameOrId, parentNodeNameOrId) => {
         try {

package/org-tree/org-tree-unassign.js

@@ -8,7 +8,7 @@ import getUserIdFromNameOrId from "./getUserIdFromNameOrId.js";
 
 program
     .description("Remove the specified user to from any org unit.")
-    .option("<userNameOrId>", "user name or id")
+    .argument("<userNameOrId>", "user name or id")
     .version(pkg.version)
     .action(async (userNameOrId) => {
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magda/scripts",
-  "version": "3.0.0-alpha.0",
+  "version": "3.0.0-alpha.1",
   "description": "Scripts for building, running, and deploying MAGDA",
   "license": "Apache-2.0",
   "type": "module",
@@ -34,8 +34,7 @@
     "release": "npm publish || echo \"Skip releasing npm package @magda/scripts.\""
   },
   "devDependencies": {
-    "@types/pg": "^8.6.5",
-    "@types/request": "^2.48.1"
+    "@types/pg": "^8.6.5"
   },
   "magda": {
     "language": "javascript",
@@ -46,7 +45,7 @@
   },
   "dependencies": {
     "@magda/esm-utils": "^1.0.1",
-    "@magda/typescript-common": "^3.0.0-alpha.0",
+    "@magda/typescript-common": "^3.0.0-alpha.1",
     "ansi-styles": "^3.2.1",
     "apidoc": "https://github.com/magda-io/apidoc",
     "chalk": "^2.4.1",
@@ -65,11 +64,10 @@
     "klaw-sync": "^2.1.0",
     "lodash": "^4.17.5",
     "moment": "^2.19.4",
+    "node-fetch": "^3.3.2",
     "nodemon": "^1.11.0",
-    "pg": "^8.7.3",
-    "pkg": "^4.3.4",
+    "pg": "^8.11.3",
     "pwgen": "0.1.6",
-    "request": "^2.88.0",
     "stream-json": "^1.1.3",
     "strip-ansi": "^4.0.0",
     "strip-json-comments": "^2.0.1",
@@ -77,7 +75,7 @@
     "tmp": "0.0.31",
     "toposort": "^1.0.6",
     "tsx": "^4.7.0",
-    "typescript": "~5.2.2",
+    "typescript": "~5.3.3",
     "uniqid": "^5.0.3",
     "yaml": "^1.10.0",
     "yargs": "^12.0.5"