@dmptool/utils 1.0.13 → 1.0.15

package/dist/dynamo.d.ts

@@ -85,6 +85,7 @@ export declare const createDMP: (dynamoConnectionParams: DynamoConnectionParams,
  *
  * @param dynamoConnectionParams the DynamoDB connection parameters
  * @param domainName The domain name of the DMPTool instance (e.g. 'dmptool.org')
+ * @param dmpId the DMP ID (e.g. 'doi.org/11.12345/A1B2C3D4')
  * @param dmp The DMP metadata record to persist as either an RDA Common Standard
  * or the standard with DMP Tool specific extensions.
  * @param gracePeriodInMS The grace period in milliseconds to wait before creating
@@ -94,7 +95,7 @@ export declare const createDMP: (dynamoConnectionParams: DynamoConnectionParams,
  * metadata record with the DMP Tool specific extensions merged in.
  * @throws DMPToolDynamoError if the record could not be persisted
  */
-export declare const updateDMP: (dynamoConnectionParams: DynamoConnectionParams, domainName: string, dmp: DMPToolDMPType, gracePeriodInMS?: number, // 2 hours in milliseconds
+export declare const updateDMP: (dynamoConnectionParams: DynamoConnectionParams, domainName: string, dmpId: string, dmp: DMPToolDMPType, gracePeriodInMS?: number, // 2 hours in milliseconds
 includeExtensions?: boolean) => Promise<DMPToolDMPType>;
 /**
  * Create a Tombstone for the specified DMP metadata record

package/dist/dynamo.js

@@ -378,6 +378,7 @@ const createDMPExtensions = async (dynamoConnectionParams, dmpId, dmp, version =
  *
  * @param dynamoConnectionParams the DynamoDB connection parameters
  * @param domainName The domain name of the DMPTool instance (e.g. 'dmptool.org')
+ * @param dmpId the DMP ID (e.g. 'doi.org/11.12345/A1B2C3D4')
  * @param dmp The DMP metadata record to persist as either an RDA Common Standard
  * or the standard with DMP Tool specific extensions.
  * @param gracePeriodInMS The grace period in milliseconds to wait before creating
@@ -387,16 +388,15 @@ const createDMPExtensions = async (dynamoConnectionParams, dmpId, dmp, version =
  * metadata record with the DMP Tool specific extensions merged in.
  * @throws DMPToolDynamoError if the record could not be persisted
  */
-const updateDMP = async (dynamoConnectionParams, domainName, dmp, gracePeriodInMS = 7200000, // 2 hours in milliseconds
+const updateDMP = async (dynamoConnectionParams, domainName, dmpId, dmp, gracePeriodInMS = 7200000, // 2 hours in milliseconds
 includeExtensions = true) => {
-    var _a, _b, _c, _d, _e, _f;
-    const dmpId = (_b = (_a = dmp.dmp) === null || _a === void 0 ? void 0 : _a.dmp_id) === null || _b === void 0 ? void 0 : _b.identifier;
+    var _a, _b, _c, _d;
     if (!dynamoConnectionParams || !dmp || !dmpId) {
         throw new DMPToolDynamoError('Missing Dynamo config, DMP ID or DMP metadata record');
     }
     try {
         // If the metadata is nested in a top level 'dmp' property, then unwrap it
-        const innerMetadata = (_c = dmp === null || dmp === void 0 ? void 0 : dmp.dmp) !== null && _c !== void 0 ? _c : dmp;
+        const innerMetadata = (_a = dmp === null || dmp === void 0 ? void 0 : dmp.dmp) !== null && _a !== void 0 ? _a : dmp;
         // Separate the RDA Common Standard metadata from the DMP Tool specific extensions
         const dmptoolExtension = pick(innerMetadata, [...EXTENSION_KEYS]);
         const rdaCommonStandard = pick(innerMetadata, Object.keys(innerMetadata).filter(k => !EXTENSION_KEYS.includes(k)));
@@ -407,11 +407,11 @@ includeExtensions = true) => {
         // Or if the incoming modified timestamp is newer than the latest version's
         // modified timestamp (collision)
         if ((0, general_1.isNullOrUndefined)(latest)
-            || ((_d = latest.dmp) === null || _d === void 0 ? void 0 : _d.tombstoned)
-            || ((_e = latest.dmp) === null || _e === void 0 ? void 0 : _e.modified) > innerMetadata.modified) {
+            || ((_b = latest.dmp) === null || _b === void 0 ? void 0 : _b.tombstoned)
+            || ((_c = latest.dmp) === null || _c === void 0 ? void 0 : _c.modified) > innerMetadata.modified) {
             throw new DMPToolDynamoError(`Cannot update a historical DMP id: ${dmpId}, ver: ${exports.DMP_LATEST_VERSION}`);
         }
-        const lastModified = new Date((_f = latest.dmp) === null || _f === void 0 ? void 0 : _f.modified).getTime();
+        const lastModified = new Date((_d = latest.dmp) === null || _d === void 0 ? void 0 : _d.modified).getTime();
         const now = Date.now();
         const gracePeriod = gracePeriodInMS ? Number(gracePeriodInMS) : 7200000;
         // We need to version the DMP if the provenance doesn't match or the modified

package/dist/maDMP.js

@@ -574,7 +574,7 @@ const buildDMPToolExtensions = async (rdsConnectionParams, applicationName, doma
         // Define the Funder's project number if applicable. project_id and funder_id
         // are used to help tie the project_identifier to the correct
         // project[?].funding[?] in the RDA Common Standard.
-        if (funding.funderProjectNumber !== undefined) {
+        if (funding.funderProjectNumber) {
             funderProject = {
                 project_id: projectId,
                 funder_id: funderId,
@@ -589,7 +589,7 @@ const buildDMPToolExtensions = async (rdsConnectionParams, applicationName, doma
         // Define the Funder's opportunity number if applicable. project_id and
         // funder_id are used to help tie the opportunity_identifier to the correct
         // project[?].funding[?] in the RDA Common Standard.
-        if (funding.funderOpportunityNumber !== undefined) {
+        if (funding.funderOpportunityNumber) {
             funderOpportunity = {
                 project_id: projectId,
                 funder_id: funderId,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dmptool/utils",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "Helper/Utility functions for use in the DMP Tool services. Particularly AWS tooling and maDMP serialization",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",