dataverse-utils 2.6.10 → 2.7.0

package/lib/assemblyDeploy.js

@@ -18,11 +18,10 @@ async function assemblyDeploy(creds, apiConfig) {
         return;
     }
     const config = JSON.parse(configFile);
-    let assemblyId;
     if (config.assembly) {
         logger_1.logger.info('deploy plugin package');
         try {
-            assemblyId = await (0, pluginPackage_1.deployPluginPackage)(config, apiConfig, creds.solution);
+            await (0, pluginPackage_1.deployPluginPackage)(config, apiConfig, creds.solution);
         }
         catch (error) {
             logger_1.logger.error(error.message);
@@ -33,7 +32,7 @@ async function assemblyDeploy(creds, apiConfig) {
     else {
         logger_1.logger.info(`deploy assembly to ${creds.server}`);
         try {
-            assemblyId = await (0, pluginAssembly_1.deployAssembly)(config, apiConfig, creds.solution);
+            await (0, pluginAssembly_1.deployAssembly)(config, apiConfig, creds.solution);
         }
         catch (error) {
             logger_1.logger.error(error.message);
@@ -41,10 +40,10 @@ async function assemblyDeploy(creds, apiConfig) {
         }
         logger_1.logger.done(`deployed assembly ${config.name}`);
     }
-    if (config.customapis != null && assemblyId) {
+    if (config.customapis != null && config.pluginassemblyid) {
         logger_1.logger.info('deploy custom api');
         try {
-            const promises = config.customapis.map((a) => (0, customApi_1.deployApi)(a, assemblyId, apiConfig, creds.solution));
+            const promises = config.customapis.map((a) => (0, customApi_1.deployApi)(a, config.pluginassemblyid, apiConfig, creds.solution));
             await Promise.all(promises);
         }
         catch (error) {
@@ -52,5 +51,6 @@ async function assemblyDeploy(creds, apiConfig) {
         }
         logger_1.logger.done('deployed custom api');
     }
+    await fs_1.default.promises.writeFile(path_1.default.resolve(currentPath, 'dataverse.config.json'), JSON.stringify(config, null, 4), 'utf8');
 }
 exports.assemblyDeploy = assemblyDeploy;

package/lib/models/customApi.js

@@ -4,20 +4,25 @@ exports.retrieveApi = exports.deployApi = void 0;
 const node_1 = require("dataverse-webapi/lib/node");
 const pluginType_1 = require("./pluginType");
 const logger_1 = require("../logger");
-async function deployApi(api, assemblyId, apiConfig, solution) {
-    let apiId = await retrieveApi(api.name, apiConfig);
-    if (api.plugintype) {
-        const pluginTypeId = await (0, pluginType_1.retrieveType)(api.plugintype ?? '', assemblyId, apiConfig);
-        if (pluginTypeId === '') {
+async function deployApi(config, assemblyId, apiConfig, solution) {
+    const api = structuredClone(config);
+    if (!config.customapiid) {
+        config.customapiid = await retrieveApi(api.name, apiConfig);
+    }
+    if (config.plugintype && !config.plugintypeid) {
+        config.plugintypeid = await (0, pluginType_1.retrieveType)(config.plugintype, assemblyId, apiConfig);
+        if (config.plugintypeid === '') {
             logger_1.logger.error(`unable to find plugin type ${api.plugintype}`);
             return;
         }
         delete api.plugintype;
-        api['PluginTypeId@odata.bind'] = `plugintypes(${pluginTypeId})`;
+        delete api.customapiid;
+        delete api.plugintypeid;
+        api['PluginTypeId@odata.bind'] = `plugintypes(${config.plugintypeid})`;
     }
-    if (apiId != '') {
+    if (config.customapiid) {
         try {
-            await updateApi(apiId, api, apiConfig);
+            await updateApi(config.customapiid, api, apiConfig);
         }
         catch (error) {
             throw new Error(`failed to update custom api: ${error.message}`);
@@ -25,7 +30,7 @@ async function deployApi(api, assemblyId, apiConfig, solution) {
     }
     else {
         try {
-            apiId = await createApi(api, apiConfig, solution);
+            config.customapiid = await createApi(api, apiConfig, solution);
         }
         catch (error) {
             throw new Error(`failed to create custom api: ${error.message}`);

package/lib/models/pluginAssembly.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deployAssembly = void 0;
+exports.retrieveAssembly = exports.deployAssembly = void 0;
 const fs_1 = __importDefault(require("fs"));
 const glob_1 = __importDefault(require("glob"));
 const node_1 = require("dataverse-webapi/lib/node");
@@ -16,17 +16,12 @@ async function deployAssembly(config, apiConfig, solution) {
         return;
     }
     const content = (await fs_1.default.promises.readFile(files[0])).toString('base64');
-    let assemblyId = '';
-    try {
-        assemblyId = await retrieveAssembly(config.name, apiConfig);
+    if (!config.pluginassemblyid) {
+        config.pluginassemblyid = await retrieveAssembly(config.name, apiConfig);
     }
-    catch (error) {
-        logger_1.logger.error(`failed to retrieve assembly ${config.name}: ${error.message}`);
-        return;
-    }
-    if (assemblyId != '') {
+    if (config.pluginassemblyid) {
         try {
-            await updateAssembly(assemblyId, config, content, apiConfig);
+            await updateAssembly(config, content, apiConfig);
         }
         catch (error) {
             throw new Error(`failed to update assembly: ${error.message}`);
@@ -34,7 +29,7 @@ async function deployAssembly(config, apiConfig, solution) {
     }
     else {
         try {
-            assemblyId = await createAssembly(config, content, apiConfig, solution);
+            config.pluginassemblyid = await createAssembly(config, content, apiConfig, solution);
         }
         catch (error) {
             throw new Error(`failed to create assembly: ${error.message}`);
@@ -42,10 +37,7 @@ async function deployAssembly(config, apiConfig, solution) {
     }
     if (config.types != null) {
         try {
-            const promises = config.types.map((type) => {
-                type['pluginassemblyid@odata.bind'] = `/pluginassemblies(${assemblyId})`;
-                return (0, pluginType_1.deployType)(type, assemblyId, apiConfig, solution);
-            });
+            const promises = config.types.map((type) => (0, pluginType_1.deployType)(type, config.pluginassemblyid, apiConfig, solution));
             await Promise.all(promises);
         }
         catch (error) {
@@ -53,7 +45,6 @@ async function deployAssembly(config, apiConfig, solution) {
             return;
         }
     }
-    return assemblyId;
 }
 exports.deployAssembly = deployAssembly;
 async function retrieveAssembly(name, apiConfig) {
@@ -61,6 +52,7 @@ async function retrieveAssembly(name, apiConfig) {
     const result = await (0, node_1.retrieveMultiple)(apiConfig, 'pluginassemblies', options);
     return result.value.length > 0 ? result.value[0].pluginassemblyid : '';
 }
+exports.retrieveAssembly = retrieveAssembly;
 async function createAssembly(config, content, apiConfig, solution) {
     logger_1.logger.info(`create assembly ${config.name}`);
     const assembly = {
@@ -82,13 +74,13 @@ async function createAssembly(config, content, apiConfig, solution) {
     }
     return result.pluginassemblyid;
 }
-async function updateAssembly(id, config, content, apiConfig) {
+async function updateAssembly(config, content, apiConfig) {
     logger_1.logger.info(`update assembly ${config.name}`);
     const assembly = {
         content: content,
         version: config.version
     };
-    const result = await (0, node_1.update)(apiConfig, 'pluginassemblies', id, assembly);
+    const result = await (0, node_1.update)(apiConfig, 'pluginassemblies', config.pluginassemblyid, assembly);
     if (result?.error) {
         throw new Error(result.error.message);
     }

package/lib/models/pluginImage.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deployImage = void 0;
 const logger_1 = require("../logger");
 const node_1 = require("dataverse-webapi/lib/node");
-async function deployImage(stepId, stepName, image, message, apiConfig) {
+async function deployImage(stepId, stepName, config, message, apiConfig) {
+    const image = structuredClone(config);
     image['sdkmessageprocessingstepid@odata.bind'] = `/sdkmessageprocessingsteps(${stepId})`;
     switch (message) {
         case 'Create':
@@ -22,10 +23,12 @@ async function deployImage(stepId, stepName, image, message, apiConfig) {
             image.messagepropertyname = 'Target';
             break;
     }
-    let imageId = await retrieveImage(stepId, image, apiConfig);
-    if (imageId != '') {
+    if (!config.sdkmessageprocessingstepimageid) {
+        config.sdkmessageprocessingstepimageid = await retrieveImage(stepId, image, apiConfig);
+    }
+    if (config.sdkmessageprocessingstepimageid) {
         try {
-            await updateImage(imageId, image, stepName, apiConfig);
+            await updateImage(config.sdkmessageprocessingstepimageid, image, stepName, apiConfig);
         }
         catch (error) {
             throw new Error(`failed to update plugin image: ${error.message}`);
@@ -33,13 +36,12 @@ async function deployImage(stepId, stepName, image, message, apiConfig) {
     }
     else {
         try {
-            imageId = await createImage(image, stepName, apiConfig);
+            config.sdkmessageprocessingstepimageid = await createImage(image, stepName, apiConfig);
         }
         catch (error) {
             throw new Error(`failed to create plugin image: ${error.message}`);
         }
     }
-    return imageId;
 }
 exports.deployImage = deployImage;
 async function retrieveImage(stepId, image, apiConfig) {

package/lib/models/pluginPackage.js

@@ -9,6 +9,8 @@ const glob_1 = __importDefault(require("glob"));
 const node_1 = require("dataverse-webapi/lib/node");
 const pluginAssembly_1 = require("./pluginAssembly");
 const logger_1 = require("../logger");
+const pluginType_1 = require("./pluginType");
+const pluginStep_1 = require("./pluginStep");
 async function deployPluginPackage(config, apiConfig, solution) {
     const files = glob_1.default.sync(`**/${config.name}.*.nupkg`);
     if (files.length === 0) {
@@ -16,17 +18,12 @@ async function deployPluginPackage(config, apiConfig, solution) {
         return;
     }
     const content = (await fs_1.default.promises.readFile(files[0])).toString('base64');
-    let packageId = '';
-    try {
-        packageId = await retrievePackage(config.prefix, config.name, apiConfig);
+    if (!config.pluginpackageid) {
+        config.pluginpackageid = await retrievePackage(config.prefix, config.name, apiConfig);
     }
-    catch (error) {
-        logger_1.logger.error(`failed to retrieve package ${config.name}: ${error.message}`);
-        return;
-    }
-    if (packageId != '') {
+    if (config.pluginpackageid) {
         try {
-            await updatePackage(packageId, config, content, apiConfig);
+            await updatePackage(config, content, apiConfig);
         }
         catch (error) {
             throw new Error(`failed to update package: ${error.message}`);
@@ -34,24 +31,31 @@ async function deployPluginPackage(config, apiConfig, solution) {
     }
     else {
         try {
-            packageId = await createPackage(config, content, apiConfig, solution);
+            config.pluginpackageid = await createPackage(config, content, apiConfig, solution);
         }
         catch (error) {
             throw new Error(`failed to create package: ${error.message}`);
         }
     }
-    let assemblyId;
     if (config.assembly != null) {
         try {
-            config.assembly['packageid@odata.bind'] = `/pluginpackages(${packageId})`;
-            assemblyId = await (0, pluginAssembly_1.deployAssembly)(config.assembly, apiConfig, solution);
+            if (config.assembly.pluginassemblyid) {
+                config.assembly.pluginassemblyid = await (0, pluginAssembly_1.retrieveAssembly)(config.assembly.name, apiConfig);
+            }
+            const promises = config.assembly.types?.map(async (t) => {
+                if (!t.plugintypeid && config.assembly?.pluginassemblyid) {
+                    t.plugintypeid = await (0, pluginType_1.retrieveType)(t.typename, config.assembly.pluginassemblyid, apiConfig);
+                }
+                const stepPromises = t.steps?.map((s) => (0, pluginStep_1.deployStep)(s, t.plugintypeid, apiConfig, solution)) ?? [];
+                await Promise.all(stepPromises);
+            }) ?? [];
+            await Promise.all(promises);
         }
         catch (error) {
             logger_1.logger.error(error.message);
             return;
         }
     }
-    return assemblyId;
 }
 exports.deployPluginPackage = deployPluginPackage;
 async function retrievePackage(prefix, name, apiConfig) {
@@ -76,13 +80,13 @@ async function createPackage(config, content, apiConfig, solution) {
     }
     return result.pluginpackageid;
 }
-async function updatePackage(id, config, content, apiConfig) {
+async function updatePackage(config, content, apiConfig) {
     logger_1.logger.info(`update package ${config.name}`);
     const updated = {
         content: content,
         version: config.version
     };
-    const result = await (0, node_1.update)(apiConfig, 'pluginpackages', id, updated);
+    const result = await (0, node_1.update)(apiConfig, 'pluginpackages', config.pluginpackageid, updated);
     if (result?.error) {
         throw new Error(result.error.message);
     }

package/lib/models/pluginStep.js

@@ -4,8 +4,9 @@ exports.deployStep = void 0;
 const node_1 = require("dataverse-webapi/lib/node");
 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);
+async function deployStep(config, pluginTypeId, apiConfig, solution) {
+    const step = structuredClone(config);
+    step['plugintypeid@odata.bind'] = `/plugintypes(${pluginTypeId})`;
     const messageId = await getSdkMessageId(step.message ?? '', apiConfig);
     if (messageId == '') {
         logger_1.logger.warn(`sdk message ${step.message} not found`);
@@ -23,14 +24,16 @@ async function deployStep(step, typeId, apiConfig, solution) {
     if (step.mode === 1) {
         step.asyncautodelete = true;
     }
-    const images = step.images;
-    const message = step.message;
     delete step.images;
     delete step.message;
     delete step.entity;
-    if (stepId != '') {
+    delete step.sdkmessageprocessingstepid;
+    if (!config.sdkmessageprocessingstepid) {
+        config.sdkmessageprocessingstepid = await retrieveStep(step.name, pluginTypeId, apiConfig);
+    }
+    if (config.sdkmessageprocessingstepid) {
         try {
-            await updateStep(stepId, step, apiConfig);
+            await updateStep(config.sdkmessageprocessingstepid, step, apiConfig);
         }
         catch (error) {
             throw new Error(`failed to update plugin step: ${error.message}`);
@@ -38,29 +41,23 @@ async function deployStep(step, typeId, apiConfig, solution) {
     }
     else {
         try {
-            stepId = await createStep(step, apiConfig, solution);
+            config.sdkmessageprocessingstepid = await createStep(step, apiConfig, solution);
         }
         catch (error) {
             throw new Error(`failed to create plugin step: ${error.message}`);
         }
     }
-    if (images && images.length > 0) {
+    if (config.images && config.images.length > 0) {
         try {
-            const promises = images.map((image) => (0, pluginImage_1.deployImage)(stepId, step.name, image, message, apiConfig));
+            const promises = config.images.map((image) => (0, pluginImage_1.deployImage)(config.sdkmessageprocessingstepid, step.name, image, config.message, apiConfig));
             await Promise.all(promises);
         }
         catch (error) {
             throw new Error(error.message);
         }
     }
-    return stepId;
 }
 exports.deployStep = deployStep;
-async function retrieveStep(name, typeId, apiConfig) {
-    const options = `$select=sdkmessageprocessingstepid&$filter=name eq '${name}' and _plugintypeid_value eq ${typeId}`;
-    const result = await (0, node_1.retrieveMultiple)(apiConfig, 'sdkmessageprocessingsteps', options);
-    return result.value.length > 0 ? result.value[0].sdkmessageprocessingstepid : '';
-}
 async function getSdkMessageFilterId(messageId, entityName, apiConfig) {
     const options = [
         `?$filter=primaryobjecttypecode eq '${entityName}' and _sdkmessageid_value eq ${messageId}`,
@@ -74,6 +71,11 @@ async function getSdkMessageId(name, apiConfig) {
     const message = await (0, node_1.retrieveMultiple)(apiConfig, 'sdkmessages', options);
     return message.value.length > 0 ? message.value[0].sdkmessageid : '';
 }
+async function retrieveStep(name, typeId, apiConfig) {
+    const options = `$select=sdkmessageprocessingstepid&$filter=name eq '${name}' and _plugintypeid_value eq ${typeId}`;
+    const result = await (0, node_1.retrieveMultiple)(apiConfig, 'sdkmessageprocessingsteps', options);
+    return result.value.length > 0 ? result.value[0].sdkmessageprocessingstepid : '';
+}
 async function createStep(step, apiConfig, solution) {
     logger_1.logger.info(`create plugin step ${step.name}`);
     const options = {};

package/lib/models/pluginType.js

@@ -5,7 +5,6 @@ const node_1 = require("dataverse-webapi/lib/node");
 const pluginStep_1 = require("./pluginStep");
 const logger_1 = require("../logger");
 async function deployType(config, assemblyId, apiConfig, solution) {
-    let typeId = await retrieveType(config.typename, assemblyId, apiConfig);
     const type = {
         name: config.name,
         friendlyname: config.friendlyname,
@@ -13,9 +12,12 @@ async function deployType(config, assemblyId, apiConfig, solution) {
         'pluginassemblyid@odata.bind': config['pluginassemblyid@odata.bind'],
         workflowactivitygroupname: config.workflowactivitygroupname
     };
-    if (typeId != '') {
+    if (!config.plugintypeid) {
+        config.plugintypeid = await retrieveType(config.name, assemblyId, apiConfig);
+    }
+    if (config.plugintypeid) {
         try {
-            await updateType(typeId, type, apiConfig);
+            await updateType(config.plugintypeid, type, apiConfig);
         }
         catch (error) {
             throw new Error(`failed to update plugin type: ${error.message}`);
@@ -23,7 +25,7 @@ async function deployType(config, assemblyId, apiConfig, solution) {
     }
     else {
         try {
-            typeId = await createType(type, apiConfig);
+            config.plugintypeid = await createType(type, apiConfig);
         }
         catch (error) {
             throw new Error(`failed to create plugin type: ${error.message}`);
@@ -31,17 +33,13 @@ async function deployType(config, assemblyId, apiConfig, solution) {
     }
     try {
         if (config.steps) {
-            const promises = config.steps.map((step) => {
-                step['plugintypeid@odata.bind'] = `/plugintypes(${typeId})`;
-                return (0, pluginStep_1.deployStep)(step, typeId, apiConfig, solution);
-            });
+            const promises = config.steps.map((step) => (0, pluginStep_1.deployStep)(step, config.plugintypeid, apiConfig, solution));
             await Promise.all(promises);
         }
     }
     catch (error) {
         throw new Error(error.message);
     }
-    return typeId;
 }
 exports.deployType = deployType;
 async function retrieveType(name, assemblyId, apiConfig) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataverse-utils",
-  "version": "2.6.10",
+  "version": "2.7.0",
   "license": "MIT",
   "description": "Utilities for interacting with Dataverse environments",
   "main": "lib/index.js",