dataverse-utils 2.0.9 → 2.0.10

package/lib/assemblyDeploy.js

@@ -1,29 +1,22 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployAssembly = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
-const pluginAssembly_1 = require("./models/pluginAssembly");
-const just_scripts_utils_1 = require("just-scripts-utils");
-async function deployAssembly(creds, apiConfig) {
+import fs from 'fs';
+import path from 'path';
+import { deploy } from './models/pluginAssembly';
+import { logger } from 'just-scripts-utils';
+export async function deployAssembly(creds, apiConfig) {
     const currentPath = '.';
-    const configFile = fs_1.default.readFileSync(path_1.default.resolve(currentPath, 'dataverse.config.json'), 'utf8');
+    const configFile = fs.readFileSync(path.resolve(currentPath, 'dataverse.config.json'), 'utf8');
     if (configFile == null) {
-        just_scripts_utils_1.logger.warn('unable to find dataverse.config.json file');
+        logger.warn('unable to find dataverse.config.json file');
         return;
     }
     const config = JSON.parse(configFile);
-    just_scripts_utils_1.logger.info('deploy assembly');
+    logger.info('deploy assembly');
     try {
-        await (0, pluginAssembly_1.deploy)(config, apiConfig, creds.solution);
+        await deploy(config, apiConfig, creds.solution);
     }
     catch (error) {
-        just_scripts_utils_1.logger.error(error.message);
+        logger.error(error.message);
         return;
     }
-    just_scripts_utils_1.logger.info(`deployed assembly ${config.name}\r\n`);
+    logger.info(`deployed assembly ${config.name}\r\n`);
 }
-exports.deployAssembly = deployAssembly;

package/lib/auth.js

@@ -1,25 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAccessToken = void 0;
-const cachePlugin_1 = require("./cachePlugin");
-const msal_node_1 = require("@azure/msal-node");
-const just_scripts_utils_1 = require("just-scripts-utils");
+import { cachePlugin } from './cachePlugin';
+import { PublicClientApplication } from '@azure/msal-node';
+import { logger } from 'just-scripts-utils';
 const clientId = '51f81489-12ee-4a9e-aaae-a2591f45987d';
-const getAccessToken = async (tenant, url) => {
+export const getAccessToken = async (tenant, url) => {
     const config = {
         auth: {
             clientId: clientId,
             authority: `https://login.microsoftonline.com/${tenant}/`
         },
         cache: {
-            cachePlugin: (0, cachePlugin_1.cachePlugin)(url.replace('https://', '').split('.')[0])
+            cachePlugin: cachePlugin(url.replace('https://', '').split('.')[0])
         }
     };
-    const pca = new msal_node_1.PublicClientApplication(config);
+    const pca = new PublicClientApplication(config);
     const cache = pca.getTokenCache();
-    const accounts = await (cache === null || cache === void 0 ? void 0 : cache.getAllAccounts().catch(ex => {
+    const accounts = await cache?.getAllAccounts().catch(ex => {
         throw new Error(ex.message);
-    }));
+    });
     // Try to get token silently
     if (accounts.length > 0) {
         const silentToken = await pca.acquireTokenSilent({
@@ -35,10 +32,9 @@ const getAccessToken = async (tenant, url) => {
     // Acquire token by device code
     const token = await pca.acquireTokenByDeviceCode({
         scopes: [`${url}/.default`],
-        deviceCodeCallback: (response) => just_scripts_utils_1.logger.info(response.message)
+        deviceCodeCallback: (response) => logger.info(response.message)
     }).catch(ex => {
         throw new Error(ex.message);
     });
     return token;
 };
-exports.getAccessToken = getAccessToken;

package/lib/cachePlugin.js

@@ -1,37 +1,31 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.cachePlugin = void 0;
-const os_1 = __importDefault(require("os"));
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const cryptr_1 = __importDefault(require("cryptr"));
+import os from 'os';
+import path from 'path';
+import fs from 'fs';
+import Cryptr from 'cryptr';
 const encrypt = (text) => {
-    const user = os_1.default.userInfo().username;
-    const cryptr = new cryptr_1.default(user);
+    const user = os.userInfo().username;
+    const cryptr = new Cryptr(user);
     const encrypted = cryptr.encrypt(text);
     return encrypted;
 };
 const decrypt = (text) => {
-    const user = os_1.default.userInfo().username;
-    const cryptr = new cryptr_1.default(user);
+    const user = os.userInfo().username;
+    const cryptr = new Cryptr(user);
     const decrypted = cryptr.decrypt(text);
     return decrypted;
 };
-function cachePlugin(org) {
+export function cachePlugin(org) {
     const getCachePath = () => {
-        if (!fs_1.default.existsSync(path_1.default.join(os_1.default.homedir(), './.dataverse-utils/'))) {
-            fs_1.default.mkdirSync(path_1.default.join(os_1.default.homedir(), './.dataverse-utils/'));
+        if (!fs.existsSync(path.join(os.homedir(), './.dataverse-utils/'))) {
+            fs.mkdirSync(path.join(os.homedir(), './.dataverse-utils/'));
         }
-        return path_1.default.join(os_1.default.homedir(), `./.dataverse-utils/${org}.json`);
+        return path.join(os.homedir(), `./.dataverse-utils/${org}.json`);
     };
     const cacheLocation = getCachePath();
     const beforeCacheAccess = (tokenCacheContext) => {
         return new Promise((resolve, reject) => {
-            if (fs_1.default.existsSync(cacheLocation)) {
-                fs_1.default.readFile(cacheLocation, 'utf-8', (err, data) => {
+            if (fs.existsSync(cacheLocation)) {
+                fs.readFile(cacheLocation, 'utf-8', (err, data) => {
                     if (err) {
                         reject();
                     }
@@ -44,7 +38,7 @@ function cachePlugin(org) {
             }
             else {
                 const encrypted = encrypt(tokenCacheContext.tokenCache.serialize());
-                fs_1.default.writeFile(cacheLocation, encrypted, (err) => {
+                fs.writeFile(cacheLocation, encrypted, (err) => {
                     if (err) {
                         reject();
                     }
@@ -59,7 +53,7 @@ function cachePlugin(org) {
         return new Promise((resolve, reject) => {
             if (tokenCacheContext.cacheHasChanged) {
                 const encrypted = encrypt(tokenCacheContext.tokenCache.serialize());
-                fs_1.default.writeFile(cacheLocation, encrypted, (err) => {
+                fs.writeFile(cacheLocation, encrypted, (err) => {
                     if (err) {
                         reject(err);
                     }
@@ -76,4 +70,3 @@ function cachePlugin(org) {
         afterCacheAccess
     };
 }
-exports.cachePlugin = cachePlugin;

package/lib/dataverse-utils.js

@@ -1,43 +1,38 @@
 #!/usr/bin/env node
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const commander_1 = require("commander");
-const deploy_1 = __importDefault(require("./deploy"));
-const generate_1 = __importDefault(require("./generate"));
-commander_1.program
+import { program } from 'commander';
+import deploy from './deploy';
+import generate from './generate';
+program
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     .version(require('../package').version)
     .usage('<command> [options]');
 // Deploy command
-commander_1.program
+program
     .command('deploy')
     .description('Deploy file(s) to dataverse (webresource, plugin, workflow)')
     .argument('[type]', 'Type of project to deploy')
     .argument('[files]', 'Comma separate list of files to deploy')
     .action((type, files) => {
-    (0, deploy_1.default)(type, files);
+    deploy(type, files);
 });
 // Generate command
-commander_1.program
+program
     .command('generate')
     .description('Generate early-bound TypeScript file for specified table')
     .argument('[table]', 'Table to generate')
     .action((table) => {
-    (0, generate_1.default)(table);
+    generate(table);
 });
 // Show help on unknown command
-commander_1.program
+program
     .arguments('<command>')
     .action((cmd) => {
-    commander_1.program.outputHelp();
+    program.outputHelp();
     console.log();
     console.log(`Unknown command ${cmd}.`);
     console.log();
 });
-commander_1.program.parse(process.argv);
+program.parse(process.argv);
 if (!process.argv.slice(2).length) {
-    commander_1.program.outputHelp();
+    program.outputHelp();
 }

package/lib/dataverse.service.js

@@ -1,16 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTableMetadata = exports.publish = exports.addToSolution = exports.ComponentType = void 0;
-const node_1 = require("dataverse-webapi/lib/node");
-var ComponentType;
+import { retrieveMultiple, unboundAction } from 'dataverse-webapi/lib/node';
+export var ComponentType;
 (function (ComponentType) {
     ComponentType[ComponentType["WebResource"] = 61] = "WebResource";
     ComponentType[ComponentType["PluginType"] = 90] = "PluginType";
     ComponentType[ComponentType["PluginAssembly"] = 91] = "PluginAssembly";
     ComponentType[ComponentType["SDKMessageProcessingStep"] = 92] = "SDKMessageProcessingStep";
     ComponentType[ComponentType["SDKMessageProcessingStepImage"] = 93] = "SDKMessageProcessingStepImage";
-})(ComponentType = exports.ComponentType || (exports.ComponentType = {}));
-async function addToSolution(id, solution, type, apiConfig) {
+})(ComponentType || (ComponentType = {}));
+export async function addToSolution(id, solution, type, apiConfig) {
     const data = {
         ComponentId: id,
         ComponentType: type,
@@ -18,22 +15,20 @@ async function addToSolution(id, solution, type, apiConfig) {
         AddRequiredComponents: false,
         IncludedComponentSettingsValues: null
     };
-    await (0, node_1.unboundAction)(apiConfig, 'AddSolutionComponent', data);
+    await unboundAction(apiConfig, 'AddSolutionComponent', data);
 }
-exports.addToSolution = addToSolution;
-async function publish(publishXml, apiConfig) {
+export async function publish(publishXml, apiConfig) {
     const data = {
         ParameterXml: `<importexportxml><webresources>${publishXml}</webresources></importexportxml>`
     };
-    await (0, node_1.unboundAction)(apiConfig, 'PublishXml', data);
+    await unboundAction(apiConfig, 'PublishXml', data);
 }
-exports.publish = publish;
-async function getTableMetadata(table, apiConfig) {
+export async function getTableMetadata(table, apiConfig) {
     const options = [
         '?$select=DisplayName,LogicalName,EntitySetName,SchemaName',
         '&$expand=Attributes($select=LogicalName,SchemaName)'
     ].join('');
-    const metadata = await (0, node_1.retrieveMultiple)(apiConfig, `EntityDefinitions(LogicalName='${table}')`, options);
+    const metadata = await retrieveMultiple(apiConfig, `EntityDefinitions(LogicalName='${table}')`, options);
     if (metadata == null) {
         throw Error(`Table ${table} not found in metadata cache`);
     }
@@ -41,7 +36,7 @@ async function getTableMetadata(table, apiConfig) {
         '?$select=attributevalue,value,attributename',
         `&$filter=objecttypecode eq '${table}'`
     ].join('');
-    const choiceMetadata = await (0, node_1.retrieveMultiple)(apiConfig, 'stringmaps', choiceOptions);
+    const choiceMetadata = await retrieveMultiple(apiConfig, 'stringmaps', choiceOptions);
     const tableMetadata = {
         logicalName: metadata.LogicalName,
         schemaName: metadata.SchemaName,
@@ -65,4 +60,3 @@ async function getTableMetadata(table, apiConfig) {
     });
     return tableMetadata;
 }
-exports.getTableMetadata = getTableMetadata;

package/lib/deploy.js

@@ -1,21 +1,16 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-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 just_scripts_utils_1 = require("just-scripts-utils");
-const assemblyDeploy_1 = require("./assemblyDeploy");
-const webResourceDeploy_1 = require("./webResourceDeploy");
-const node_1 = require("dataverse-webapi/lib/node");
-const auth_1 = require("./auth");
-async function deploy(type, files) {
+import prompts from 'prompts';
+import fs from 'fs';
+import path from 'path';
+import { logger } from 'just-scripts-utils';
+import { deployAssembly } from './assemblyDeploy';
+import { deployWebResource } from './webResourceDeploy';
+import { WebApiConfig } from 'dataverse-webapi/lib/node';
+import { getAccessToken } from './auth';
+export default async function deploy(type, files) {
     if (!type || (type !== 'webresource' && type !== 'assembly')) {
         const invalid = type !== undefined && type !== 'webresource' && type !== 'assembly';
         const invalidMessage = invalid ? `${type} is not a valid project type.` : '';
-        const { typePrompt } = await (0, prompts_1.default)({
+        const { typePrompt } = await prompts({
             type: 'select',
             name: 'typePrompt',
             message: `${invalidMessage} select project type to deploy`,
@@ -27,34 +22,33 @@ async function deploy(type, files) {
         type = typePrompt;
     }
     const currentPath = '.';
-    const credsFile = fs_1.default.readFileSync(path_1.default.resolve(currentPath, 'dataverse.config.json'), 'utf8');
+    const credsFile = fs.readFileSync(path.resolve(currentPath, 'dataverse.config.json'), 'utf8');
     if (credsFile == null) {
-        just_scripts_utils_1.logger.warn('unable to find dataverse.config.json file');
+        logger.warn('unable to find dataverse.config.json file');
         return;
     }
     const creds = JSON.parse(credsFile).connection;
     let token = null;
     try {
-        token = await (0, auth_1.getAccessToken)(creds.tenant, creds.server);
+        token = await getAccessToken(creds.tenant, creds.server);
     }
     catch (error) {
-        just_scripts_utils_1.logger.error(`failed to acquire access token: ${error.message}`);
+        logger.error(`failed to acquire access token: ${error.message}`);
         return;
     }
     if (token == null || token.accessToken == null) {
-        just_scripts_utils_1.logger.error('failed to acquire access token');
+        logger.error('failed to acquire access token');
         return;
     }
-    const apiConfig = new node_1.WebApiConfig('8.2', token.accessToken, creds.server);
+    const apiConfig = new WebApiConfig('8.2', token.accessToken, creds.server);
     switch (type) {
         case 'webresource':
-            await (0, webResourceDeploy_1.deployWebResource)(creds, apiConfig, files);
+            await deployWebResource(creds, apiConfig, files);
             break;
         case 'assembly':
-            await (0, assemblyDeploy_1.deployAssembly)(creds, apiConfig);
+            await deployAssembly(creds, apiConfig);
             break;
         default:
             break;
     }
 }
-exports.default = deploy;

package/lib/generate.js

@@ -1,18 +1,13 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-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 just_scripts_utils_1 = require("just-scripts-utils");
-const dataverse_service_1 = require("./dataverse.service");
-const node_1 = require("dataverse-webapi/lib/node");
-const auth_1 = require("./auth");
-async function generate(table) {
+import prompts from 'prompts';
+import fs from 'fs';
+import path from 'path';
+import { logger } from 'just-scripts-utils';
+import { getTableMetadata } from './dataverse.service';
+import { WebApiConfig } from 'dataverse-webapi/lib/node';
+import { getAccessToken } from './auth';
+export default async function generate(table) {
     while (!table) {
-        const { tablePrompt } = await (0, prompts_1.default)({
+        const { tablePrompt } = await prompts({
             type: 'text',
             name: 'tablePrompt',
             message: `enter table to generate`
@@ -20,32 +15,32 @@ async function generate(table) {
         table = tablePrompt;
     }
     const currentPath = '.';
-    const credsFile = fs_1.default.readFileSync(path_1.default.resolve(currentPath, 'dataverse.config.json'), 'utf8');
+    const credsFile = fs.readFileSync(path.resolve(currentPath, 'dataverse.config.json'), 'utf8');
     if (credsFile == null) {
-        just_scripts_utils_1.logger.warn('unable to find dataverse.config.json file');
+        logger.warn('unable to find dataverse.config.json file');
         return;
     }
     const creds = JSON.parse(credsFile).connection;
     let token = null;
     try {
-        token = await (0, auth_1.getAccessToken)(creds.tenant, creds.server);
+        token = await getAccessToken(creds.tenant, creds.server);
     }
     catch (error) {
-        just_scripts_utils_1.logger.error(`failed to acquire access token: ${error.message}`);
+        logger.error(`failed to acquire access token: ${error.message}`);
         return;
     }
     if (token == null || token.accessToken == null) {
-        just_scripts_utils_1.logger.error('failed to acquire access token');
+        logger.error('failed to acquire access token');
         return;
     }
-    const apiConfig = new node_1.WebApiConfig('8.2', token.accessToken, creds.server);
+    const apiConfig = new WebApiConfig('8.2', token.accessToken, creds.server);
     let metadata = {};
-    just_scripts_utils_1.logger.info('Retrieve table metadata');
+    logger.info('Retrieve table metadata');
     try {
-        metadata = await (0, dataverse_service_1.getTableMetadata)(table, apiConfig);
+        metadata = await getTableMetadata(table, apiConfig);
     }
     catch (error) {
-        just_scripts_utils_1.logger.error(error.message);
+        logger.error(error.message);
         return;
     }
     // Build code file from metadata
@@ -69,19 +64,17 @@ async function generate(table) {
         '\r\n',
         '\r\n',
         metadata.choices.map(c => {
-            var _a, _b;
             const field = metadata.fields.find(f => f.logicalName === c.column);
-            return `  ${(_a = field === null || field === void 0 ? void 0 : field.schemaName) !== null && _a !== void 0 ? _a : c.column} = ${metadata.schemaName}_${(_b = field === null || field === void 0 ? void 0 : field.schemaName) !== null && _b !== void 0 ? _b : c.column};`;
+            return `  ${field?.schemaName ?? c.column} = ${metadata.schemaName}_${field?.schemaName ?? c.column};`;
         }).join('\r\n'),
         '\r\n',
         '}',
         '\r\n',
         '\r\n',
         metadata.choices.map(c => {
-            var _a;
             const field = metadata.fields.find(f => f.logicalName === c.column);
             return [
-                `export enum ${metadata.schemaName}_${(_a = field === null || field === void 0 ? void 0 : field.schemaName) !== null && _a !== void 0 ? _a : c.column} {`,
+                `export enum ${metadata.schemaName}_${field?.schemaName ?? c.column} {`,
                 '\r\n',
                 c.options.map(x => `  '${x.text.replace(`'`, `\\'`)}' = ${x.value}`).join(',\r\n'),
                 '\r\n',
@@ -92,10 +85,9 @@ async function generate(table) {
         '\r\n',
         `export default new ${metadata.schemaName}();`
     ].join('');
-    if (!fs_1.default.existsSync(path_1.default.resolve(currentPath, 'src', 'scripts', 'models'))) {
-        fs_1.default.mkdirSync(path_1.default.resolve(currentPath, 'src', 'scripts', 'models'));
+    if (!fs.existsSync(path.resolve(currentPath, 'src', 'scripts', 'models'))) {
+        fs.mkdirSync(path.resolve(currentPath, 'src', 'scripts', 'models'));
     }
-    fs_1.default.writeFileSync(path_1.default.resolve(currentPath, 'src', 'scripts', 'models', `${metadata.schemaName}.ts`), codeFile);
-    just_scripts_utils_1.logger.info(`Table metadata output to models/${metadata.schemaName}.ts`);
+    fs.writeFileSync(path.resolve(currentPath, 'src', 'scripts', 'models', `${metadata.schemaName}.ts`), codeFile);
+    logger.info(`Table metadata output to models/${metadata.schemaName}.ts`);
 }
-exports.default = generate;

package/lib/models/pluginAssembly.js

@@ -1,28 +1,22 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deploy = void 0;
-const fs_1 = __importDefault(require("fs"));
-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 just_scripts_utils_1 = require("just-scripts-utils");
-async function deploy(config, apiConfig, solution) {
-    const files = glob_1.default.sync(`**/${config.name}.dll`);
+import fs from 'fs';
+import glob from 'glob';
+import { retrieveMultiple, createWithReturnData, update } from 'dataverse-webapi/lib/node';
+import { deployType } from './pluginType';
+import { addToSolution, ComponentType } from '../dataverse.service';
+import { logger } from 'just-scripts-utils';
+export async function deploy(config, apiConfig, solution) {
+    const files = glob.sync(`**/${config.name}.dll`);
     if (files.length === 0) {
-        just_scripts_utils_1.logger.error(`assembly ${config.name}.dll not found`);
+        logger.error(`assembly ${config.name}.dll not found`);
         return;
     }
-    const content = fs_1.default.readFileSync(files[0]).toString('base64');
+    const content = fs.readFileSync(files[0]).toString('base64');
     let assemblyId = '';
     try {
         assemblyId = await retrieveAssembly(config.name, apiConfig);
     }
     catch (error) {
-        just_scripts_utils_1.logger.error(`failed to retrieve assembly ${config.name}: ${error.message}`);
+        logger.error(`failed to retrieve assembly ${config.name}: ${error.message}`);
         return;
     }
     if (assemblyId != '') {
@@ -42,10 +36,10 @@ async function deploy(config, apiConfig, solution) {
         }
         if (solution != undefined) {
             try {
-                await (0, dataverse_service_1.addToSolution)(assemblyId, solution, dataverse_service_1.ComponentType.PluginAssembly, apiConfig);
+                await addToSolution(assemblyId, solution, ComponentType.PluginAssembly, apiConfig);
             }
             catch (error) {
-                just_scripts_utils_1.logger.error(`failed to add to solution: ${error.message}`);
+                logger.error(`failed to add to solution: ${error.message}`);
             }
         }
     }
@@ -53,24 +47,23 @@ async function deploy(config, apiConfig, solution) {
         try {
             const promises = config.types.map(async (type) => {
                 type['pluginassemblyid@odata.bind'] = `/pluginassemblies(${assemblyId})`;
-                await (0, pluginType_1.deployType)(type, apiConfig, solution);
+                await deployType(type, apiConfig, solution);
             });
             await Promise.all(promises);
         }
         catch (error) {
-            just_scripts_utils_1.logger.error(error.message);
+            logger.error(error.message);
             return;
         }
     }
 }
-exports.deploy = deploy;
 async function retrieveAssembly(name, apiConfig) {
     const options = `$select=pluginassemblyid&$filter=name eq '${name}'`;
-    const result = await (0, node_1.retrieveMultiple)(apiConfig, 'pluginassemblies', options);
+    const result = await retrieveMultiple(apiConfig, 'pluginassemblies', options);
     return result.value.length > 0 ? result.value[0].pluginassemblyid : '';
 }
 async function createAssembly(config, content, apiConfig) {
-    just_scripts_utils_1.logger.info(`create assembly ${config.name}`);
+    logger.info(`create assembly ${config.name}`);
     const assembly = {
         name: config.name,
         content: content,
@@ -80,17 +73,17 @@ async function createAssembly(config, content, apiConfig) {
         sourcetype: 0,
         culture: ''
     };
-    const result = await (0, node_1.createWithReturnData)(apiConfig, 'pluginassemblies', assembly, '$select=pluginassemblyid');
+    const result = await createWithReturnData(apiConfig, 'pluginassemblies', assembly, '$select=pluginassemblyid');
     if (result.error) {
         throw new Error(result.error.message);
     }
     return result.pluginassemblyid;
 }
 async function updateAssembly(id, config, content, apiConfig) {
-    just_scripts_utils_1.logger.info(`update assembly ${config.name}`);
+    logger.info(`update assembly ${config.name}`);
     const assembly = {
         content: content,
         version: config.version
     };
-    return (0, node_1.update)(apiConfig, 'pluginassemblies', id, assembly);
+    return update(apiConfig, 'pluginassemblies', id, assembly);
 }

package/lib/models/pluginImage.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployImage = void 0;
-const just_scripts_utils_1 = require("just-scripts-utils");
-const node_1 = require("dataverse-webapi/lib/node");
-async function deployImage(stepId, image, message, apiConfig) {
+import { logger } from 'just-scripts-utils';
+import { retrieveMultiple, createWithReturnData, update } from 'dataverse-webapi/lib/node';
+export async function deployImage(stepId, image, message, apiConfig) {
     image['sdkmessageprocessingstepid@odata.bind'] = `/sdkmessageprocessingsteps(${stepId})`;
     switch (message) {
         case 'Create':
@@ -41,21 +38,20 @@ async function deployImage(stepId, image, message, apiConfig) {
     }
     return imageId;
 }
-exports.deployImage = deployImage;
 async function retrieveImage(stepId, image, apiConfig) {
     const options = `$select=sdkmessageprocessingstepimageid&$filter=name eq '${image.name}' and _sdkmessageprocessingstepid_value eq ${stepId}`;
-    const result = await (0, node_1.retrieveMultiple)(apiConfig, 'sdkmessageprocessingstepimages', options);
+    const result = await retrieveMultiple(apiConfig, 'sdkmessageprocessingstepimages', options);
     return result.value.length > 0 ? result.value[0].sdkmessageprocessingstepimageid : '';
 }
 async function createImage(image, apiConfig) {
-    just_scripts_utils_1.logger.info(`create plugin image ${image.name}`);
-    const result = await (0, node_1.createWithReturnData)(apiConfig, 'sdkmessageprocessingstepimages', image, '$select=sdkmessageprocessingstepimageid');
+    logger.info(`create plugin image ${image.name}`);
+    const result = await createWithReturnData(apiConfig, 'sdkmessageprocessingstepimages', image, '$select=sdkmessageprocessingstepimageid');
     if (result.error) {
         throw new Error(result.error.message);
     }
     return result.sdkmessageprocessingstepimageid;
 }
 async function updateImage(id, image, apiConfig) {
-    just_scripts_utils_1.logger.info(`update plugin image ${image.name}`);
-    return (0, node_1.update)(apiConfig, 'sdkmessageprocessingstepimages', id, image);
+    logger.info(`update plugin image ${image.name}`);
+    return update(apiConfig, 'sdkmessageprocessingstepimages', id, image);
 }

package/lib/models/pluginStep.js

@@ -1,21 +1,17 @@
-"use strict";
-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 just_scripts_utils_1 = require("just-scripts-utils");
-const pluginImage_1 = require("./pluginImage");
-async function deployStep(step, apiConfig, solution) {
-    var _a, _b;
+import { retrieveMultiple, createWithReturnData, update } from 'dataverse-webapi/lib/node';
+import { addToSolution, ComponentType } from '../dataverse.service';
+import { logger } from 'just-scripts-utils';
+import { deployImage } from './pluginImage';
+export async function deployStep(step, apiConfig, solution) {
     let stepId = await retrieveStep(step.name, apiConfig);
-    const messageId = await getSdkMessageId((_a = step.message) !== null && _a !== void 0 ? _a : '', apiConfig);
+    const messageId = await getSdkMessageId(step.message ?? '', apiConfig);
     if (messageId == '') {
-        just_scripts_utils_1.logger.error(`sdk message ${step.message} not found`);
+        logger.error(`sdk message ${step.message} not found`);
         return;
     }
-    const filterId = await getSdkMessageFilterId(messageId, (_b = step.entity) !== null && _b !== void 0 ? _b : '', apiConfig);
+    const filterId = await getSdkMessageFilterId(messageId, step.entity ?? '', apiConfig);
     if (filterId == '') {
-        just_scripts_utils_1.logger.error(`sdk message ${step.message} for entity ${step.entity} not found`);
+        logger.error(`sdk message ${step.message} for entity ${step.entity} not found`);
         return;
     }
     step['sdkmessagefilterid@odata.bind'] = `/sdkmessagefilters(${filterId})`;
@@ -45,7 +41,7 @@ async function deployStep(step, apiConfig, solution) {
         }
         if (solution != undefined) {
             try {
-                await (0, dataverse_service_1.addToSolution)(stepId, solution, dataverse_service_1.ComponentType.SDKMessageProcessingStep, apiConfig);
+                await addToSolution(stepId, solution, ComponentType.SDKMessageProcessingStep, apiConfig);
             }
             catch (error) {
                 throw new Error(`failed to add to solution: ${error.message}`);
@@ -54,7 +50,7 @@ async function deployStep(step, apiConfig, solution) {
     }
     if (images && images.length > 0) {
         try {
-            const promises = images.map(image => (0, pluginImage_1.deployImage)(stepId, image, message, apiConfig));
+            const promises = images.map(image => deployImage(stepId, image, message, apiConfig));
             await Promise.all(promises);
         }
         catch (error) {
@@ -63,10 +59,9 @@ async function deployStep(step, apiConfig, solution) {
     }
     return stepId;
 }
-exports.deployStep = deployStep;
 async function retrieveStep(name, apiConfig) {
     const options = `$select=sdkmessageprocessingstepid&$filter=name eq '${name}'`;
-    const result = await (0, node_1.retrieveMultiple)(apiConfig, 'sdkmessageprocessingsteps', options);
+    const result = await retrieveMultiple(apiConfig, 'sdkmessageprocessingsteps', options);
     return result.value.length > 0 ? result.value[0].sdkmessageprocessingstepid : '';
 }
 async function getSdkMessageFilterId(messageId, entityName, apiConfig) {
@@ -74,7 +69,7 @@ async function getSdkMessageFilterId(messageId, entityName, apiConfig) {
         `?$filter=primaryobjecttypecode eq '${entityName}' and _sdkmessageid_value eq ${messageId}`,
         '&$select=sdkmessagefilterid'
     ].join('');
-    const message = await (0, node_1.retrieveMultiple)(apiConfig, 'sdkmessagefilters', options);
+    const message = await retrieveMultiple(apiConfig, 'sdkmessagefilters', options);
     return message.value.length > 0 ? message.value[0].sdkmessagefilterid : '';
 }
 async function getSdkMessageId(name, apiConfig) {
@@ -82,18 +77,18 @@ async function getSdkMessageId(name, apiConfig) {
         `?$filter=name eq '${name}'`,
         '&$select=sdkmessageid'
     ].join('');
-    const message = await (0, node_1.retrieveMultiple)(apiConfig, 'sdkmessages', options);
+    const message = await retrieveMultiple(apiConfig, 'sdkmessages', options);
     return message.value.length > 0 ? message.value[0].sdkmessageid : '';
 }
 async function createStep(step, apiConfig) {
-    just_scripts_utils_1.logger.info(`create plugin step ${step.name}`);
-    const result = await (0, node_1.createWithReturnData)(apiConfig, 'sdkmessageprocessingsteps', step, '$select=sdkmessageprocessingstepid');
+    logger.info(`create plugin step ${step.name}`);
+    const result = await createWithReturnData(apiConfig, 'sdkmessageprocessingsteps', step, '$select=sdkmessageprocessingstepid');
     if (result.error) {
         throw new Error(result.error.message);
     }
     return result.sdkmessageprocessingstepid;
 }
 async function updateStep(id, step, apiConfig) {
-    just_scripts_utils_1.logger.info(`update plugin step ${step.name}`);
-    return (0, node_1.update)(apiConfig, 'sdkmessageprocessingsteps', id, step);
+    logger.info(`update plugin step ${step.name}`);
+    return update(apiConfig, 'sdkmessageprocessingsteps', id, step);
 }

package/lib/models/pluginType.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployType = void 0;
-const node_1 = require("dataverse-webapi/lib/node");
-const pluginStep_1 = require("./pluginStep");
-const just_scripts_utils_1 = require("just-scripts-utils");
-async function deployType(type, apiConfig, solution) {
+import { retrieveMultiple, createWithReturnData, update } from 'dataverse-webapi/lib/node';
+import { deployStep } from './pluginStep';
+import { logger } from 'just-scripts-utils';
+export async function deployType(type, apiConfig, solution) {
     let typeId = await retrieveType(type.typename, apiConfig);
     const record = {
         name: type.name,
@@ -33,7 +30,7 @@ async function deployType(type, apiConfig, solution) {
         if (type.steps) {
             const promises = type.steps.map(async (step) => {
                 step['plugintypeid@odata.bind'] = `/plugintypes(${typeId})`;
-                await (0, pluginStep_1.deployStep)(step, apiConfig, solution);
+                await deployStep(step, apiConfig, solution);
             });
             await Promise.all(promises);
         }
@@ -43,21 +40,20 @@ async function deployType(type, apiConfig, solution) {
     }
     return typeId;
 }
-exports.deployType = deployType;
 async function retrieveType(name, apiConfig) {
     const options = `$select=plugintypeid&$filter=typename eq '${name}'`;
-    const result = await (0, node_1.retrieveMultiple)(apiConfig, 'plugintypes', options);
+    const result = await retrieveMultiple(apiConfig, 'plugintypes', options);
     return result.value.length > 0 ? result.value[0].plugintypeid : '';
 }
 async function createType(type, apiConfig) {
-    just_scripts_utils_1.logger.info(`create assembly type ${type.name}`);
-    const result = await (0, node_1.createWithReturnData)(apiConfig, 'plugintypes', type, '$select=plugintypeid');
+    logger.info(`create assembly type ${type.name}`);
+    const result = await createWithReturnData(apiConfig, 'plugintypes', type, '$select=plugintypeid');
     if (result.error) {
         throw new Error(result.error.message);
     }
     return result.plugintypeid;
 }
 async function updateType(id, type, apiConfig) {
-    just_scripts_utils_1.logger.info(`update assembly type ${type.name}`);
-    return (0, node_1.update)(apiConfig, 'plugintypes', id, type);
+    logger.info(`update assembly type ${type.name}`);
+    return update(apiConfig, 'plugintypes', id, type);
 }

package/lib/models/webResource.js

@@ -1,13 +1,7 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-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 just_scripts_utils_1 = require("just-scripts-utils");
-const fs_1 = __importDefault(require("fs"));
+import { addToSolution, ComponentType, publish } from '../dataverse.service';
+import { retrieveMultiple, createWithReturnData, update } from 'dataverse-webapi/lib/node';
+import { logger } from 'just-scripts-utils';
+import fs from 'fs';
 function getWebResourceType(type) {
     switch (type) {
         case 'HTML':
@@ -38,16 +32,16 @@ function getWebResourceType(type) {
             return 0;
     }
 }
-async function deploy(webResources, apiConfig, solution, files) {
+export async function deploy(webResources, apiConfig, solution, files) {
     const publishXml = [];
     let resources = webResources;
     // Use list of files if provided
     if (files) {
         resources = [];
         for (const file of files.split(',')) {
-            const resource = webResources.filter(r => { var _a; return (_a = r.path) === null || _a === void 0 ? void 0 : _a.endsWith(file); });
+            const resource = webResources.filter(r => r.path?.endsWith(file));
             if (resource.length === 0) {
-                just_scripts_utils_1.logger.error(`web resource ${file} not found in dataverse.config.json`);
+                logger.error(`web resource ${file} not found in dataverse.config.json`);
                 continue;
             }
             resources.push(resource[0]);
@@ -59,10 +53,10 @@ async function deploy(webResources, apiConfig, solution, files) {
             resourceId = await retrieveResource(resource.name, apiConfig);
         }
         catch (error) {
-            just_scripts_utils_1.logger.error(`failed to retrieve resource ${resource.name}: ${error.message}`);
+            logger.error(`failed to retrieve resource ${resource.name}: ${error.message}`);
             return;
         }
-        const fileContent = fs_1.default.readFileSync(resource.path, 'utf8');
+        const fileContent = fs.readFileSync(resource.path, 'utf8');
         const content = Buffer.from(fileContent).toString('base64');
         if (resourceId != '') {
             try {
@@ -70,7 +64,7 @@ async function deploy(webResources, apiConfig, solution, files) {
                 publishXml.push(updated);
             }
             catch (error) {
-                just_scripts_utils_1.logger.error(`failed to update resource: ${error.message}`);
+                logger.error(`failed to update resource: ${error.message}`);
             }
         }
         else {
@@ -78,14 +72,14 @@ async function deploy(webResources, apiConfig, solution, files) {
                 resourceId = await createResource(resource, content, apiConfig);
             }
             catch (error) {
-                just_scripts_utils_1.logger.error(`failed to create resource: ${error.message}`);
+                logger.error(`failed to create resource: ${error.message}`);
             }
             if (solution != undefined) {
                 try {
-                    await (0, dataverse_service_1.addToSolution)(resourceId, solution, dataverse_service_1.ComponentType.WebResource, apiConfig);
+                    await addToSolution(resourceId, solution, ComponentType.WebResource, apiConfig);
                 }
                 catch (error) {
-                    just_scripts_utils_1.logger.error(`failed to add to solution: ${error.message}`);
+                    logger.error(`failed to add to solution: ${error.message}`);
                 }
             }
         }
@@ -94,38 +88,37 @@ async function deploy(webResources, apiConfig, solution, files) {
     // publish resources
     if (publishXml.length > 0) {
         try {
-            await (0, dataverse_service_1.publish)(publishXml.join(''), apiConfig);
+            await publish(publishXml.join(''), apiConfig);
         }
         catch (error) {
-            just_scripts_utils_1.logger.error(error.message);
+            logger.error(error.message);
         }
     }
 }
-exports.deploy = deploy;
 async function retrieveResource(name, apiConfig) {
     const options = `$select=webresourceid&$filter=name eq '${name}'`;
-    const result = await (0, node_1.retrieveMultiple)(apiConfig, 'webresourceset', options);
+    const result = await retrieveMultiple(apiConfig, 'webresourceset', options);
     return result.value.length > 0 ? result.value[0].webresourceid : '';
 }
 async function createResource(resource, content, apiConfig) {
-    just_scripts_utils_1.logger.info(`create web resource ${resource.name}`);
+    logger.info(`create web resource ${resource.name}`);
     const webResource = {
         webresourcetype: getWebResourceType(resource.type),
         name: resource.name,
         displayname: resource.displayname || resource.name,
         content: content
     };
-    const result = await (0, node_1.createWithReturnData)(apiConfig, 'webresourceset', webResource, '$select=webresourceid');
+    const result = await createWithReturnData(apiConfig, 'webresourceset', webResource, '$select=webresourceid');
     if (result.error) {
         throw new Error(result.error.message);
     }
     return result.webresourceid;
 }
 async function updateResource(id, resource, content, apiConfig) {
-    just_scripts_utils_1.logger.info(`update web resource ${resource.name}`);
+    logger.info(`update web resource ${resource.name}`);
     const webResource = {
         content: content
     };
-    await (0, node_1.update)(apiConfig, 'webresourceset', id, webResource);
+    await update(apiConfig, 'webresourceset', id, webResource);
     return `<webresource>{${id}}</webresource>`;
 }

package/lib/webResourceDeploy.js

@@ -1,29 +1,22 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployWebResource = void 0;
-const path_1 = __importDefault(require("path"));
-const fs_1 = __importDefault(require("fs"));
-const just_scripts_utils_1 = require("just-scripts-utils");
-const webResource_1 = require("./models/webResource");
-async function deployWebResource(creds, apiConfig, files) {
+import path from 'path';
+import fs from 'fs';
+import { logger } from 'just-scripts-utils';
+import { deploy } from './models/webResource';
+export async function deployWebResource(creds, apiConfig, files) {
     const currentPath = '.';
-    const configFile = fs_1.default.readFileSync(path_1.default.resolve(currentPath, 'dataverse.config.json'), 'utf8');
+    const configFile = fs.readFileSync(path.resolve(currentPath, 'dataverse.config.json'), 'utf8');
     if (configFile == null) {
-        just_scripts_utils_1.logger.warn('unable to find dataverse.config.json file');
+        logger.warn('unable to find dataverse.config.json file');
         return;
     }
     const config = JSON.parse(configFile).webResources;
-    just_scripts_utils_1.logger.info('deploy web resources');
+    logger.info('deploy web resources');
     try {
-        await (0, webResource_1.deploy)(config, apiConfig, creds.solution, files);
+        await deploy(config, apiConfig, creds.solution, files);
     }
     catch (error) {
-        just_scripts_utils_1.logger.error(error.message);
+        logger.error(error.message);
         return;
     }
-    just_scripts_utils_1.logger.info('deployed web resources');
+    logger.info('deployed web resources');
 }
-exports.deployWebResource = deployWebResource;

package/license

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 Derek Finlinson
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "dataverse-utils",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "license": "MIT",
+  "description": "Utilities for interacting with Dataverse environments",
   "main": "lib/index.js",
   "bin": {
     "dataverse-utils": "lib/dataverse-utils.js"
@@ -23,7 +24,7 @@
     "commander": "^8.2.0",
     "glob": "^7.2.0",
     "cryptr": "^6.0.2",
-    "dataverse-webapi": "^2.0.1",
+    "dataverse-webapi": "^2.0.2",
     "envinfo": "^7.8.1",
     "just-scripts-utils": "^1.1.4",
     "prompts": "^2.4.1"