@markii/pack 0.12.1 → 0.14.0

package/dist/archive.js

@@ -38,6 +38,39 @@ const MANIFEST_ENTRY = 'pack.json';
 const SCRIPT_ENTRY = 'webview.js';
 const STYLESHEET_ENTRY = 'webview.css';
 const SCRIPTS_DIR_PREFIX = 'scripts/';
+/** macOS's zip metadata folder — never a real pack file, and never counted toward "is this archive a single wrapped folder" detection below (batch 7 #61). */
+const MACOSX_PREFIX = '__MACOSX/';
+/** Every entry in `paths` that isn't macOS's `__MACOSX` metadata folder or its bare directory entry. */
+function significantEntries(paths) {
+    return paths.filter((entry) => entry !== '__MACOSX' && !entry.startsWith(MACOSX_PREFIX));
+}
+/**
+ * When every significant entry (ignoring `__MACOSX`) sits under the SAME
+ * single top-level directory — the shape produced by zipping a folder
+ * rather than its contents — returns that directory's bare name (no
+ * trailing slash). Returns `undefined` when there is no such common
+ * folder (including: no significant entries at all, or at least one
+ * significant entry already sits at the archive root).
+ */
+function singleWrappingFolder(paths) {
+    const relevant = significantEntries(paths);
+    if (relevant.length === 0)
+        return undefined;
+    let folder;
+    for (const entry of relevant) {
+        const slash = entry.indexOf('/');
+        if (slash === -1)
+            return undefined; // already at the archive root
+        const top = entry.slice(0, slash);
+        if (folder === undefined) {
+            folder = top;
+        }
+        else if (folder !== top) {
+            return undefined;
+        }
+    }
+    return folder;
+}
 function isScriptModulePath(path) {
     return (path.startsWith(SCRIPTS_DIR_PREFIX) &&
         path.length > SCRIPTS_DIR_PREFIX.length);
@@ -85,6 +118,23 @@ export async function openPackArchive(bytes, options = {}) {
     }
     const paths = await storage.list();
     if (!paths.includes(MANIFEST_ENTRY)) {
+        // Before reporting a bare "missing" (which reads as "there is no
+        // pack.json anywhere", and sends a user who zipped a FOLDER instead of
+        // its CONTENTS looking for a file that plainly exists one level down),
+        // check whether this archive is exactly that shape: every entry
+        // wrapped under one common top-level folder (batch 7 #61).
+        const wrappingFolder = singleWrappingFolder(paths);
+        if (wrappingFolder !== undefined &&
+            paths.includes(`${wrappingFolder}/${MANIFEST_ENTRY}`)) {
+            return {
+                ok: false,
+                error: {
+                    kind: 'missing-entry',
+                    entry: MANIFEST_ENTRY,
+                    message: `pack archive rejected: "${MANIFEST_ENTRY}" is inside the folder "${wrappingFolder}/", not at the archive root. Zip the pack's files themselves, not the folder containing them.`,
+                },
+            };
+        }
         return {
             ok: false,
             error: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@markii/pack",
-  "version": "0.12.1",
+  "version": "0.14.0",
   "description": "Component pack contract for Markii (docs/packs.md): the pack.json manifest shape, namespace and engine rules, hand-rolled validation, and the .mkp prebuilt-archive reader. No React, no parsing.",
   "keywords": [
     "markdown",
@@ -42,6 +42,6 @@
     "lint": "eslint ."
   },
   "dependencies": {
-    "@markii/bundle": "^0.12.1"
+    "@markii/bundle": "^0.14.0"
   }
 }