dataverse-utils 2.1.4 → 2.2.0

package/CHANGELOG.json

@@ -2,7 +2,28 @@
   "name": "dataverse-utils",
   "entries": [
     {
-      "date": "Fri, 28 Jan 2022 23:10:57 GMT",
+      "date": "Mon, 07 Feb 2022 22:01:58 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,26 @@
 # 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 Mon, 07 Feb 2022 22:01:58 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 2.1.4
+## 2.2.0
 
-Fri, 28 Jan 2022 23:10:57 GMT
+Mon, 07 Feb 2022 22:01:58 GMT
 
-### Patches
+### Minor changes
 
-- Prompt to delete cache on error (derek.finlinson@journeyteam.com)
+- 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/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.info, ...args);
+        }
+    },
 };

package/lib/{assemblyDeploy.js → packages/dataverse-utils/src/assemblyDeploy.js}

@@ -7,7 +7,7 @@ exports.deployAssembly = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const pluginAssembly_1 = require("./models/pluginAssembly");
-const logger_1 = require("./logger");
+const logger_1 = require("../../../logger");
 async function deployAssembly(creds, apiConfig) {
     const currentPath = '.';
     const configFile = fs_1.default.readFileSync(path_1.default.resolve(currentPath, 'dataverse.config.json'), 'utf8');
@@ -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/{auth.js → packages/dataverse-utils/src/auth.js}

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAccessToken = void 0;
 const cachePlugin_1 = require("./cachePlugin");
 const msal_node_1 = require("@azure/msal-node");
-const logger_1 = require("./logger");
+const logger_1 = require("../../../logger");
 const clientId = '51f81489-12ee-4a9e-aaae-a2591f45987d';
 const getAccessToken = async (tenant, url) => {
     const config = {

package/lib/{deploy.js → packages/dataverse-utils/src/deploy.js}

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prompts_1 = __importDefault(require("prompts"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const logger_1 = require("./logger");
+const logger_1 = require("../../../logger");
 const assemblyDeploy_1 = require("./assemblyDeploy");
 const webResourceDeploy_1 = require("./webResourceDeploy");
 const node_1 = require("dataverse-webapi/lib/node");

package/lib/{generate.js → packages/dataverse-utils/src/generate.js}

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prompts_1 = __importDefault(require("prompts"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const logger_1 = require("./logger");
+const logger_1 = require("../../../logger");
 const dataverse_service_1 = require("./dataverse.service");
 const node_1 = require("dataverse-webapi/lib/node");
 const auth_1 = require("./auth");
@@ -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/{models → packages/dataverse-utils/src/models}/pluginAssembly.js

@@ -9,11 +9,11 @@ const glob_1 = __importDefault(require("glob"));
 const node_1 = require("dataverse-webapi/lib/node");
 const pluginType_1 = require("./pluginType");
 const dataverse_service_1 = require("../dataverse.service");
-const logger_1 = require("../logger");
+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 → packages/dataverse-utils/src/models}/pluginImage.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployImage = void 0;
-const logger_1 = require("../logger");
+const logger_1 = require("../../../../logger");
 const node_1 = require("dataverse-webapi/lib/node");
 async function deployImage(stepId, image, message, apiConfig) {
     image['sdkmessageprocessingstepid@odata.bind'] = `/sdkmessageprocessingsteps(${stepId})`;

package/lib/{models → packages/dataverse-utils/src/models}/pluginStep.js

@@ -3,18 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployStep = void 0;
 const node_1 = require("dataverse-webapi/lib/node");
 const dataverse_service_1 = require("../dataverse.service");
-const logger_1 = require("../logger");
+const logger_1 = require("../../../../logger");
 const pluginImage_1 = require("./pluginImage");
 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 → packages/dataverse-utils/src/models}/pluginType.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployType = void 0;
 const node_1 = require("dataverse-webapi/lib/node");
 const pluginStep_1 = require("./pluginStep");
-const logger_1 = require("../logger");
+const logger_1 = require("../../../../logger");
 async function deployType(type, assemblyId, apiConfig, solution) {
     let typeId = await retrieveType(type.typename, assemblyId, apiConfig);
     const record = {

package/lib/{models → packages/dataverse-utils/src/models}/webResource.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deploy = void 0;
 const dataverse_service_1 = require("../dataverse.service");
 const node_1 = require("dataverse-webapi/lib/node");
-const logger_1 = require("../logger");
+const logger_1 = require("../../../../logger");
 const fs_1 = __importDefault(require("fs"));
 function getWebResourceType(type) {
     switch (type) {
@@ -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 → packages/dataverse-utils/src/webResourceDeploy.js}

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployWebResource = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
-const logger_1 = require("./logger");
+const logger_1 = require("../../../logger");
 const webResource_1 = require("./models/webResource");
 async function deployWebResource(creds, apiConfig, files) {
     const currentPath = '.';
@@ -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.0",
   "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"
   }
 }