Uploads to same folder

common/path.test.ts

@@ -0,0 +1,11 @@
+import { assertEquals } from "../test_deps.ts";
+import { folderName, resolve } from "./path.ts";
+
+Deno.test("Path functions", () => {
+  assertEquals(folderName(""), "");
+  assertEquals(folderName("page"), "");
+  assertEquals(folderName("folder/page"), "folder");
+
+  assertEquals(resolve("", "page"), "page");
+  assertEquals(resolve("folder", "page"), "folder/page");
+});

common/path.ts

@@ -0,0 +1,23 @@
+export function folderName(path: string) {
+  return path.split("/").slice(0, -1).join("/");
+}
+
+export function resolve(...paths: string[]) {
+  const parts = paths.reduce((acc, path) => {
+    return acc.concat(path.split("/"));
+  }, [] as string[]);
+  const resolvedParts = [];
+  for (const part of parts) {
+    if (part === "..") {
+      resolvedParts.pop();
+    } else if (part !== ".") {
+      resolvedParts.push(part);
+    }
+  }
+  const result = resolvedParts.join("/");
+  if (result[0] === "/") {
+    return result.substring(1);
+  } else {
+    return result;
+  }
+}

deno.jsonc

@@ -31,35 +31,22 @@
   },
   "importMap": "import_map.json",
   "lint": {
-    "files": {
     "exclude": [
       "dist",
       "dist_bundle"
-      ]
-    },
+    ],
     "rules": {
       "exclude": ["no-explicit-any"]
     }
   },
-  "test": {
-    "files": {
-      "exclude": ["plugos/forked", "plugos/sqlite/deno-sqlite"]
-    }
-  },
   "fmt": {
-    "files": {
     "exclude": [
       "dist",
       "dist_bundle",
-        "desktop",
-        "mobile",
-        "pages",
       "website",
       "website_build",
       "test_space",
-        "plugos/environments/worker_bundle.json",
       "README.md"
     ]
   }
 }
-}

scripts/release.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 VERSION=$1
-echo "export const version = '$VERSION';" > version.ts
+echo "export const version = \"$VERSION\";" > version.ts
 git commit -am $VERSION
 git tag $VERSION
 git push && git push --tags

web/cm_plugins/editor_paste.ts

@@ -17,6 +17,8 @@ import {
   findParentMatching,
   nodeAtPos,
 } from "../../plug-api/lib/tree.ts";
+import { folderName, resolve } from "../../common/path.ts";
+
 const turndownService = new TurndownService({
   hr: "---",
   codeBlockStyle: "fenced",
@@ -202,6 +204,8 @@ export function attachmentExtension(editor: Editor) {
       return;
     }
 
+    suggestedName = resolve(folderName(editor.currentPage!), suggestedName);
+
     const finalFileName = await editor.prompt(
       "File name for pasted attachment",
       suggestedName,