dataverse-utils 2.8.1 → 2.9.1

package/lib/models/pluginImage.js

@@ -59,7 +59,9 @@ async function createImage(image, stepName, apiConfig) {
 }
 async function updateImage(id, image, stepName, apiConfig) {
     logger_1.logger.info(`update plugin image ${image.name} for step ${stepName}`);
-    const result = await (0, node_1.update)(apiConfig, 'sdkmessageprocessingstepimages', id, image);
+    const entity = { ...image };
+    delete entity.sdkmessageprocessingstepimageid;
+    const result = await (0, node_1.update)(apiConfig, 'sdkmessageprocessingstepimages', id, entity);
     if (result?.error) {
         throw new Error(result.error.message);
     }

package/lib/models/pluginStep.js

@@ -88,7 +88,9 @@ async function createStep(step, apiConfig, solution) {
 }
 async function updateStep(id, step, apiConfig) {
     logger_1.logger.info(`update plugin step ${step.name}`);
-    const result = await (0, node_1.update)(apiConfig, 'sdkmessageprocessingsteps', id, step);
+    const entity = { ...step };
+    delete entity.sdkmessageprocessingstepid;
+    const result = await (0, node_1.update)(apiConfig, 'sdkmessageprocessingsteps', id, entity);
     if (result?.error) {
         throw new Error(result.error.message);
     }

package/lib/models/pluginType.js

@@ -58,7 +58,9 @@ async function createType(type, apiConfig) {
 }
 async function updateType(id, type, apiConfig) {
     logger_1.logger.info(`update assembly type ${type.name}`);
-    const result = await (0, node_1.update)(apiConfig, 'plugintypes', id, type);
+    const entity = { ...type };
+    delete entity.plugintypeid;
+    const result = await (0, node_1.update)(apiConfig, 'plugintypes', id, entity);
     if (result?.error) {
         throw new Error(result.error.message);
     }

package/lib/models/webResource.js

@@ -54,9 +54,10 @@ async function deploy(webResources, apiConfig, solution, files) {
         }
     }
     const promises = resources.map(async (resource) => {
-        let resourceId = '';
         try {
-            resourceId = await retrieveResource(resource.name, apiConfig);
+            if (!resource.webresourceid) {
+                resource.webresourceid = await retrieveResource(resource.name, apiConfig);
+            }
         }
         catch (error) {
             logger_1.logger.error(`failed to retrieve resource ${resource.name}: ${error.message}`);
@@ -64,9 +65,9 @@ async function deploy(webResources, apiConfig, solution, files) {
         }
         const fileContent = await fs_1.default.promises.readFile(resource.path, 'utf8');
         const content = Buffer.from(fileContent).toString('base64');
-        if (resourceId != '') {
+        if (resource.webresourceid) {
             try {
-                const updated = await updateResource(resourceId, resource, content, apiConfig);
+                const updated = await updateResource(resource, content, apiConfig);
                 publishXml.push(updated);
             }
             catch (error) {
@@ -75,7 +76,7 @@ async function deploy(webResources, apiConfig, solution, files) {
         }
         else {
             try {
-                resourceId = await createResource(resource, content, apiConfig, solution);
+                resource.webresourceid = await createResource(resource, content, apiConfig, solution);
             }
             catch (error) {
                 logger_1.logger.error(`failed to create resource: ${error.message}`);
@@ -117,14 +118,16 @@ async function createResource(resource, content, apiConfig, solution) {
     }
     return result.webresourceid;
 }
-async function updateResource(id, resource, content, apiConfig) {
+async function updateResource(resource, content, apiConfig) {
     logger_1.logger.info(`update web resource ${resource.name}`);
     const webResource = {
-        content: content
+        content: content,
+        name: resource.name,
+        displayname: resource.displayname || resource.name
     };
-    const result = await (0, node_1.update)(apiConfig, 'webresourceset', id, webResource);
+    const result = await (0, node_1.update)(apiConfig, 'webresourceset', resource.webresourceid, webResource);
     if (result?.error) {
         throw new Error(result.error.message);
     }
-    return `<webresource>{${id}}</webresource>`;
+    return `<webresource>{${resource.webresourceid}}</webresource>`;
 }

package/lib/webResourceDeploy.js

@@ -15,15 +15,17 @@ async function webResourceDeploy(creds, apiConfig, files) {
         logger_1.logger.warn('unable to find dataverse.config.json file');
         return;
     }
-    const config = JSON.parse(configFile).webResources;
+    const config = JSON.parse(configFile);
+    const resources = config.webResources;
     logger_1.logger.info('deploy web resources');
     try {
-        await (0, webResource_1.deploy)(config, apiConfig, creds.solution, files);
+        await (0, webResource_1.deploy)(resources, apiConfig, creds.solution, files);
     }
     catch (error) {
         logger_1.logger.error(error.message);
         return;
     }
     logger_1.logger.done('deployed web resources');
+    await fs_1.default.promises.writeFile(path_1.default.resolve(currentPath, 'dataverse.config.json'), JSON.stringify(config, null, 4), 'utf8');
 }
 exports.webResourceDeploy = webResourceDeploy;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dataverse-utils",
-  "version": "2.8.1",
+  "version": "2.9.1",
   "license": "MIT",
   "description": "Utilities for interacting with Dataverse environments",
   "main": "lib/index.js",
@@ -24,7 +24,7 @@
   },
   "dependencies": {
     "@azure/msal-node": "^2.6.1",
-    "commander": "^8.3.0",
+    "commander": "^12.0.0",
     "cryptr": "^6.2.0",
     "dataverse-webapi": "^2.4.2",
     "envinfo": "^7.10.0",
@@ -36,7 +36,7 @@
   "devDependencies": {
     "@types/cryptr": "^4.0.1",
     "@types/glob": "^7.2.0",
-    "@types/node": "^16.18.37",
+    "@types/node": "^18.19.20",
     "@types/prompts": "^2.4.4"
   },
   "volta": {