dataverse-utils 2.1.4 → 2.2.3

package/CHANGELOG.json

@@ -2,7 +2,73 @@
   "name": "dataverse-utils",
   "entries": [
     {
-      "date": "Fri, 28 Jan 2022 23:10:57 GMT",
+      "date": "Wed, 09 Feb 2022 16:18:47 GMT",
+      "tag": "dataverse-utils_v2.2.3",
+      "version": "2.2.3",
+      "comments": {
+        "patch": [
+          {
+            "author": "derek.finlinson@journeyteam.com",
+            "package": "dataverse-utils",
+            "commit": "cdab4698564ece9f40c5a45327a38270a6d1c16d",
+            "comment": "Catch errors on commands"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 08 Feb 2022 18:47:13 GMT",
+      "tag": "dataverse-utils_v2.2.2",
+      "version": "2.2.2",
+      "comments": {
+        "patch": [
+          {
+            "author": "derek.finlinson@journeyteam.com",
+            "package": "dataverse-utils",
+            "commit": "70380beb0078b8c1ab669bf5f3e4eacbbcd99ba7",
+            "comment": "Update symbols"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Tue, 08 Feb 2022 18:13:52 GMT",
+      "tag": "dataverse-utils_v2.2.1",
+      "version": "2.2.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "derek.finlinson@journeyteam.com",
+            "package": "dataverse-utils",
+            "commit": "cfa9121f50ea731b9ef639154153b01dc81fff85",
+            "comment": "Fix logger and file paths"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 07 Feb 2022 22:02:33 GMT",
+      "tag": "dataverse-utils_v2.2.0",
+      "version": "2.2.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "derek.finlinson@journeyteam.com",
+            "package": "dataverse-utils",
+            "commit": "55d633b2c3064bbdce48c5d314d8e7572a015882",
+            "comment": "Switch to combined logger"
+          },
+          {
+            "author": "beachball",
+            "package": "dataverse-utils",
+            "comment": "Bump dataverse-webapi to v2.0.4",
+            "commit": "83b50fd1a35a0645f279e60b8ca0eb2ace5c0ad3"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Fri, 28 Jan 2022 23:11:16 GMT",
       "tag": "dataverse-utils_v2.1.4",
       "version": "2.1.4",
       "comments": {

package/CHANGELOG.md

@@ -1,17 +1,50 @@
 # Change Log - dataverse-utils
 
-This log was last generated on Fri, 28 Jan 2022 23:10:57 GMT and should not be manually modified.
+This log was last generated on Wed, 09 Feb 2022 16:18:47 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 2.1.4
+## 2.2.3
 
-Fri, 28 Jan 2022 23:10:57 GMT
+Wed, 09 Feb 2022 16:18:47 GMT
 
 ### Patches
 
-- Prompt to delete cache on error (derek.finlinson@journeyteam.com)
+- Catch errors on commands (derek.finlinson@journeyteam.com)
 
+## 2.2.2
+
+Tue, 08 Feb 2022 18:47:13 GMT
+
+### Patches
+
+- Update symbols (derek.finlinson@journeyteam.com)
+
+## 2.2.1
+
+Tue, 08 Feb 2022 18:13:52 GMT
+
+### Patches
+
+- Fix logger and file paths (derek.finlinson@journeyteam.com)
+
+## 2.2.0
+
+Mon, 07 Feb 2022 22:02:33 GMT
+
+### Minor changes
+
+- Switch to combined logger (derek.finlinson@journeyteam.com)
+- Bump dataverse-webapi to v2.0.4
+
+## 2.1.4
+
+Fri, 28 Jan 2022 23:11:16 GMT
+
+### Patches
+
+- Prompt to delete cache on error (derek.finlinson@journeyteam.com)
+
 ## 2.1.3
 
 Sun, 16 Jan 2022 23:22:22 GMT

package/lib/assemblyDeploy.js

@@ -24,6 +24,6 @@ async function deployAssembly(creds, apiConfig) {
         logger_1.logger.error(error.message);
         return;
     }
-    logger_1.logger.info(`deployed assembly ${config.name}\r\n`);
+    logger_1.logger.done(`deployed assembly ${config.name}\r\n`);
 }
 exports.deployAssembly = deployAssembly;

package/lib/generate.js

@@ -94,6 +94,6 @@ async function generate(table) {
         fs_1.default.mkdirSync(path_1.default.resolve(currentPath, 'src', 'scripts', 'models'));
     }
     fs_1.default.writeFileSync(path_1.default.resolve(currentPath, 'src', 'scripts', 'models', `${metadata.schemaName}.ts`), codeFile);
-    logger_1.logger.info(`Table metadata output to models/${metadata.schemaName}.ts`);
+    logger_1.logger.done(`Table metadata output to models/${metadata.schemaName}.ts`);
 }
 exports.default = generate;

package/lib/logger.js

@@ -3,20 +3,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.logger = void 0;
+exports.logger = exports.icons = void 0;
 const kleur_1 = __importDefault(require("kleur"));
-const tick = '√', cross = '×';
-const log = (method, symbol, ...args) => {
-    console[method](symbol, ...args);
+const isTest = process.env.JEST_WORKER_ID !== undefined;
+exports.icons = {
+    done: kleur_1.default.green('◉'),
+    info: kleur_1.default.cyan('◎'),
+    error: kleur_1.default.red('⨂'),
+    warn: kleur_1.default.yellow('⨁')
 };
 exports.logger = {
     info(...args) {
-        log('info', kleur_1.default.green(tick), ...args);
+        if (!isTest) {
+            console.info(exports.icons.info, ...args);
+        }
     },
     warn(...args) {
-        log('warn', kleur_1.default.yellow(cross), ...args);
+        if (!isTest) {
+            console.warn(exports.icons.warn, ...args);
+        }
     },
     error(...args) {
-        log('error', kleur_1.default.red(cross), ...args);
-    }
+        if (!isTest) {
+            console.error(exports.icons.error, ...args);
+        }
+    },
+    done(...args) {
+        if (!isTest) {
+            console.info(exports.icons.done, ...args);
+        }
+    },
 };

package/lib/models/pluginAssembly.js

@@ -13,7 +13,7 @@ const logger_1 = require("../logger");
 async function deploy(config, apiConfig, solution) {
     const files = glob_1.default.sync(`**/${config.name}.dll`);
     if (files.length === 0) {
-        logger_1.logger.error(`assembly ${config.name}.dll not found`);
+        logger_1.logger.warn(`assembly ${config.name}.dll not found`);
         return;
     }
     const content = fs_1.default.readFileSync(files[0]).toString('base64');

package/lib/models/pluginStep.js

@@ -9,12 +9,12 @@ async function deployStep(step, typeId, apiConfig, solution) {
     let stepId = await retrieveStep(step.name, typeId, apiConfig);
     const messageId = await getSdkMessageId(step.message ?? '', apiConfig);
     if (messageId == '') {
-        logger_1.logger.error(`sdk message ${step.message} not found`);
+        logger_1.logger.warn(`sdk message ${step.message} not found`);
         return;
     }
     const filterId = await getSdkMessageFilterId(messageId, step.entity ?? '', apiConfig);
     if (filterId == '') {
-        logger_1.logger.error(`sdk message ${step.message} for entity ${step.entity} not found`);
+        logger_1.logger.warn(`sdk message ${step.message} for entity ${step.entity} not found`);
         return;
     }
     step['sdkmessagefilterid@odata.bind'] = `/sdkmessagefilters(${filterId})`;

package/lib/models/webResource.js

@@ -47,7 +47,7 @@ async function deploy(webResources, apiConfig, solution, files) {
         for (const file of files.split(',')) {
             const resource = webResources.filter(r => r.path?.endsWith(file));
             if (resource.length === 0) {
-                logger_1.logger.error(`web resource ${file} not found in dataverse.config.json`);
+                logger_1.logger.warn(`web resource ${file} not found in dataverse.config.json`);
                 continue;
             }
             resources.push(resource[0]);

package/lib/webResourceDeploy.js

@@ -24,6 +24,6 @@ async function deployWebResource(creds, apiConfig, files) {
         logger_1.logger.error(error.message);
         return;
     }
-    logger_1.logger.info('deployed web resources');
+    logger_1.logger.done('deployed web resources');
 }
 exports.deployWebResource = deployWebResource;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataverse-utils",
-  "version": "2.1.4",
+  "version": "2.2.3",
   "license": "MIT",
   "description": "Utilities for interacting with Dataverse environments",
   "main": "lib/index.js",
@@ -17,21 +17,22 @@
   "scripts": {
     "build": "tsc -p .",
     "lint": "eslint",
-    "prebuild": "rimraf lib"
+    "clean": "rimraf lib"
   },
   "dependencies": {
     "@azure/msal-node": "^1.3.1",
     "commander": "^8.3.0",
-    "glob": "^7.2.0",
     "cryptr": "^6.0.2",
-    "dataverse-webapi": "^2.0.3",
+    "dataverse-webapi": "^2.0.4",
     "envinfo": "^7.8.1",
+    "glob": "^7.2.0",
     "kleur": "^4.1.4",
     "prompts": "^2.4.2"
   },
   "devDependencies": {
-    "@types/node": "^16.9.1",
+    "@types/cryptr": "^4.0.1",
     "@types/glob": "^7.2.0",
+    "@types/node": "^16.9.1",
     "@types/prompts": "^2.0.14"
   }
 }