meca 1.0.3 → 1.0.4

package/dist/meca.cjs

@@ -13915,7 +13915,7 @@ var {
 } = import_index.default;
 
 // src/version.ts
-var version = "1.0.3";
+var version = "1.0.4";
 var version_default = version;
 
 // ../../node_modules/myst-cli-utils/dist/logger.js
@@ -16609,7 +16609,14 @@ async function validateMeca(session, file, opts) {
   const manifestString = manifestEntry.getData().toString();
   const manifestItems = extractManifestItems(manifestString);
   const zipEntries = mecaZip.getEntries();
-  const manifestExtras = manifestItems.filter((item) => !zipEntries.map((entry) => entry.entryName).includes(item.href)).map((item) => item.href);
+  const zipEntryNames = /* @__PURE__ */ new Set();
+  zipEntries.forEach((entry) => {
+    const nameParts = entry.entryName.split("/");
+    for (let i2 = 1; i2 <= nameParts.length; i2++) {
+      zipEntryNames.add(nameParts.slice(0, i2).join("/"));
+    }
+  });
+  const manifestExtras = manifestItems.map((item) => item.href).filter((href) => !zipEntryNames.has(href.replace(/\/$/, "")));
   const zipExtras = zipEntries.filter((entry) => entry.entryName !== MANIFEST).filter((entry) => !entry.isDirectory).filter((entry) => !manifestItems.map((item) => item.href).includes(entry.entryName)).map((entry) => entry.entryName);
   if (zipExtras.length) {
     session.log.warn(

package/dist/validate/dtd.js

@@ -109,9 +109,18 @@ export async function validateMeca(session, file, opts) {
     const manifestString = manifestEntry.getData().toString();
     const manifestItems = extractManifestItems(manifestString);
     const zipEntries = mecaZip.getEntries();
+    // Get all file and folder names in the zip file.
+    // Folders may not be explicitly listed in zipEntries, so we compute all folders from file paths.
+    const zipEntryNames = new Set();
+    zipEntries.forEach((entry) => {
+        const nameParts = entry.entryName.split('/');
+        for (let i = 1; i <= nameParts.length; i++) {
+            zipEntryNames.add(nameParts.slice(0, i).join('/'));
+        }
+    });
     const manifestExtras = manifestItems
-        .filter((item) => !zipEntries.map((entry) => entry.entryName).includes(item.href))
-        .map((item) => item.href);
+        .map((item) => item.href)
+        .filter((href) => !zipEntryNames.has(href.replace(/\/$/, ''))); // Ignore trailing slash
     const zipExtras = zipEntries
         .filter((entry) => entry.entryName !== MANIFEST)
         .filter((entry) => !entry.isDirectory)

package/dist/version.d.ts

@@ -1,2 +1,2 @@
-declare const version = "1.0.3";
+declare const version = "1.0.4";
 export default version;

package/dist/version.js

@@ -1,2 +1,2 @@
-const version = '1.0.3';
+const version = '1.0.4';
 export default version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meca",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Types and utilities for working with MECA",
   "author": "Rowan Cockett <rowan@curvenote.com>",
   "homepage": "https://github.com/curvenote/meca",
@@ -45,7 +45,7 @@
   },
   "dependencies": {
     "adm-zip": "^0.5.10",
-    "jats-xml": "^1.0.3",
+    "jats-xml": "^1.0.4",
     "xml-js": "^1.6.11"
   },
   "peerDependencies": {