npm - @andrzejchm/notion-cli - Versions diffs - 0.3.0 → 0.4.0 - Mend

@andrzejchm/notion-cli 0.3.0 → 0.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/cli.js CHANGED Viewed

@@ -4,7 +4,7 @@
 import { readFileSync } from "fs";
 import { dirname, join as join3 } from "path";
 import { fileURLToPath } from "url";
-import { Command as Command19 } from "commander";
+import { Command as Command20 } from "commander";
 // src/commands/append.ts
 import { Command } from "commander";
@@ -692,26 +692,26 @@ function createNotionClient(token) {
 var NOTION_ID_REGEX = /^[0-9a-f]{32}$/i;
 var UUID_REGEX = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
 var NOTION_URL_REGEX = /https?:\/\/(?:[a-zA-Z0-9-]+\.)?notion\.(?:so|site)\/.*?([0-9a-f]{32})(?:[?#]|$)/i;
-function throwInvalidId(input2) {
+function throwInvalidId(input3) {
   throw new CliError(
     ErrorCodes.INVALID_ID,
-    `Cannot parse Notion ID from: ${input2}`,
+    `Cannot parse Notion ID from: ${input3}`,
     "Provide a valid Notion URL or page/database ID"
   );
 }
-function parseNotionId(input2) {
-  if (!input2) throwInvalidId(input2);
-  if (NOTION_ID_REGEX.test(input2)) {
-    return input2.toLowerCase();
+function parseNotionId(input3) {
+  if (!input3) throwInvalidId(input3);
+  if (NOTION_ID_REGEX.test(input3)) {
+    return input3.toLowerCase();
   }
-  if (UUID_REGEX.test(input2)) {
-    return input2.replace(/-/g, "").toLowerCase();
+  if (UUID_REGEX.test(input3)) {
+    return input3.replace(/-/g, "").toLowerCase();
   }
-  const urlMatch = NOTION_URL_REGEX.exec(input2);
+  const urlMatch = NOTION_URL_REGEX.exec(input3);
   if (urlMatch) {
     return urlMatch[1].toLowerCase();
   }
-  throwInvalidId(input2);
+  throwInvalidId(input3);
 }
 function toUuid(id) {
   return `${id.slice(0, 8)}-${id.slice(8, 12)}-${id.slice(12, 16)}-${id.slice(16, 20)}-${id.slice(20)}`;
@@ -825,7 +825,7 @@ function authDefaultAction(authCmd2) {
 }
 // src/commands/auth/login.ts
-import { select } from "@inquirer/prompts";
+import { input as input2, select } from "@inquirer/prompts";
 import { Command as Command3 } from "commander";
 // src/oauth/oauth-flow.ts
@@ -924,6 +924,13 @@ Paste the full redirect URL here (${OAUTH_REDIRECT_URI}?code=...):
     });
   });
 }
+function closeServer(ctx, cb) {
+  for (const socket of ctx.sockets) {
+    socket.destroy();
+  }
+  ctx.sockets.clear();
+  ctx.server.close(cb);
+}
 function handleCallbackRequest(req, res, ctx) {
   if (ctx.settled) {
     res.writeHead(200, { "Content-Type": "text/html" });
@@ -944,7 +951,7 @@ function handleCallbackRequest(req, res, ctx) {
         "<html><body><h1>Access Denied</h1><p>You cancelled the Notion OAuth request. You can close this tab.</p></body></html>"
       );
       if (ctx.timeoutHandle) clearTimeout(ctx.timeoutHandle);
-      ctx.server.close(() => {
+      closeServer(ctx, () => {
         ctx.reject(
           new CliError(
             ErrorCodes.AUTH_INVALID,
@@ -967,7 +974,7 @@ function handleCallbackRequest(req, res, ctx) {
         "<html><body><h1>Security Error</h1><p>State mismatch \u2014 possible CSRF attempt. You can close this tab.</p></body></html>"
       );
       if (ctx.timeoutHandle) clearTimeout(ctx.timeoutHandle);
-      ctx.server.close(() => {
+      closeServer(ctx, () => {
         ctx.reject(
           new CliError(
             ErrorCodes.AUTH_INVALID,
@@ -984,7 +991,7 @@ function handleCallbackRequest(req, res, ctx) {
       "<html><body><h1>Authenticated!</h1><p>You can close this tab and return to the terminal.</p></body></html>"
     );
     if (ctx.timeoutHandle) clearTimeout(ctx.timeoutHandle);
-    ctx.server.close(() => {
+    closeServer(ctx, () => {
       ctx.resolve({ code, state: returnedState });
     });
   } catch {
@@ -1006,12 +1013,17 @@ async function runOAuthFlow(options) {
       resolve,
       reject,
       // assigned below after server is created
-      server: null
+      server: null,
+      sockets: /* @__PURE__ */ new Set()
     };
     const server = createServer(
       (req, res) => handleCallbackRequest(req, res, ctx)
     );
     ctx.server = server;
+    server.on("connection", (socket) => {
+      ctx.sockets.add(socket);
+      socket.once("close", () => ctx.sockets.delete(socket));
+    });
     server.on("error", (err) => {
       if (ctx.settled) return;
       ctx.settled = true;
@@ -1045,7 +1057,7 @@ Waiting for callback (up to 120 seconds)...
       ctx.timeoutHandle = setTimeout(() => {
         if (ctx.settled) return;
         ctx.settled = true;
-        server.close(() => {
+        closeServer(ctx, () => {
           reject(
             new CliError(
               ErrorCodes.AUTH_INVALID,
@@ -1188,19 +1200,44 @@ function loginCommand() {
         ]
       });
       if (method === "oauth") {
-        let profileName = opts.profile;
-        if (!profileName) {
-          const config = await readGlobalConfig();
-          profileName = config.active_profile ?? "default";
-        }
         const result = await runOAuthFlow({ manual: opts.manual });
         const response = await exchangeCode(result.code);
-        await saveOAuthTokens(profileName, response);
         const userName = response.owner?.user?.name ?? "unknown user";
         const workspaceName = response.workspace_name ?? "unknown workspace";
+        const config = await readGlobalConfig();
+        const existingProfiles = config.profiles ?? {};
+        let profileName = opts.profile;
+        if (!profileName) {
+          const suggested = workspaceName.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "") || "default";
+          profileName = await input2({
+            message: "Profile name to save this account under:",
+            default: suggested
+          });
+        }
+        const isUpdate = Boolean(existingProfiles[profileName]);
+        const isFirst = Object.keys(existingProfiles).length === 0;
+        if (isUpdate) {
+          stderrWrite(dim(`Updating existing profile "${profileName}"...`));
+        }
+        await saveOAuthTokens(profileName, response);
+        if (isFirst) {
+          const updated = await readGlobalConfig();
+          await writeGlobalConfig({
+            ...updated,
+            active_profile: profileName
+          });
+        }
         stderrWrite(
           success(`\u2713 Logged in as ${userName} to workspace ${workspaceName}`)
         );
+        stderrWrite(dim(`Saved as profile "${profileName}".`));
+        if (!isFirst && !isUpdate) {
+          stderrWrite(
+            dim(
+              `Run "notion auth use ${profileName}" to switch to this profile.`
+            )
+          );
+        }
         stderrWrite(
           dim(
             "Your comments and pages will now be attributed to your Notion account."
@@ -2053,10 +2090,38 @@ function profileListCommand() {
   return cmd;
 }
-// src/commands/profile/use.ts
+// src/commands/profile/remove.ts
 import { Command as Command15 } from "commander";
+function profileRemoveCommand() {
+  const cmd = new Command15("remove");
+  cmd.description("remove an authentication profile").argument("<name>", "profile name to remove").action(
+    withErrorHandling(async (name) => {
+      const config = await readGlobalConfig();
+      const profiles = { ...config.profiles ?? {} };
+      if (!profiles[name]) {
+        throw new CliError(
+          ErrorCodes.AUTH_PROFILE_NOT_FOUND,
+          `Profile "${name}" not found.`,
+          `Run "notion auth list" to see available profiles`
+        );
+      }
+      delete profiles[name];
+      const newActiveProfile = config.active_profile === name ? void 0 : config.active_profile;
+      await writeGlobalConfig({
+        ...config,
+        profiles,
+        active_profile: newActiveProfile
+      });
+      stderrWrite(success(`Profile "${name}" removed.`));
+    })
+  );
+  return cmd;
+}
+// src/commands/profile/use.ts
+import { Command as Command16 } from "commander";
 function profileUseCommand() {
-  const cmd = new Command15("use");
+  const cmd = new Command16("use");
   cmd.description("switch the active profile").argument("<name>", "profile name to activate").action(
     withErrorHandling(async (name) => {
       const config = await readGlobalConfig();
@@ -2079,7 +2144,7 @@ function profileUseCommand() {
 }
 // src/commands/read.ts
-import { Command as Command16 } from "commander";
+import { Command as Command17 } from "commander";
 // src/blocks/rich-text.ts
 function richTextToMd(richText) {
@@ -2501,7 +2566,7 @@ async function fetchPageWithBlocks(client, pageId) {
 // src/commands/read.ts
 function readCommand() {
-  return new Command16("read").description("Read a Notion page as markdown").argument("<id>", "Notion page ID or URL").option("--json", "Output raw JSON instead of markdown").option("--md", "Output raw markdown (no terminal styling)").action(
+  return new Command17("read").description("Read a Notion page as markdown").argument("<id>", "Notion page ID or URL").option("--json", "Output raw JSON instead of markdown").option("--md", "Output raw markdown (no terminal styling)").action(
     withErrorHandling(
       async (id, options) => {
         const { token } = await resolveToken();
@@ -2528,7 +2593,7 @@ function readCommand() {
 // src/commands/search.ts
 import { isFullPageOrDataSource as isFullPageOrDataSource2 } from "@notionhq/client";
-import { Command as Command17 } from "commander";
+import { Command as Command18 } from "commander";
 function getTitle2(item) {
   if (item.object === "data_source") {
     return item.title.map((t) => t.plain_text).join("") || "(untitled)";
@@ -2548,7 +2613,7 @@ function displayType2(item) {
   return item.object === "data_source" ? "database" : item.object;
 }
 function searchCommand() {
-  const cmd = new Command17("search");
+  const cmd = new Command18("search");
   cmd.description("search Notion workspace by keyword").argument("<query>", "search keyword").option(
     "--type <type>",
     "filter by object type (page or database)",
@@ -2606,7 +2671,7 @@ function searchCommand() {
 }
 // src/commands/users.ts
-import { Command as Command18 } from "commander";
+import { Command as Command19 } from "commander";
 function getEmailOrWorkspace(user) {
   if (user.type === "person") {
     return user.person.email ?? "\u2014";
@@ -2618,7 +2683,7 @@ function getEmailOrWorkspace(user) {
   return "\u2014";
 }
 function usersCommand() {
-  const cmd = new Command18("users");
+  const cmd = new Command19("users");
   cmd.description("list all users in the workspace").option("--json", "output as JSON").action(
     withErrorHandling(async (opts) => {
       if (opts.json) setOutputMode("json");
@@ -2649,7 +2714,7 @@ var __dirname = dirname(__filename);
 var pkg = JSON.parse(
   readFileSync(join3(__dirname, "../package.json"), "utf-8")
 );
-var program = new Command19();
+var program = new Command20();
 program.name("notion").description("Notion CLI \u2014 read Notion pages and databases from the terminal").version(pkg.version);
 program.option("--verbose", "show API requests/responses").option("--color", "force color output").option("--json", "force JSON output (overrides TTY detection)").option("--md", "force markdown output for page content");
 program.configureOutput({
@@ -2670,20 +2735,22 @@ program.hook("preAction", (thisCommand) => {
     setOutputMode("md");
   }
 });
-var authCmd = new Command19("auth").description("manage Notion authentication");
+var authCmd = new Command20("auth").description("manage Notion authentication");
 authCmd.action(authDefaultAction(authCmd));
 authCmd.addCommand(loginCommand());
 authCmd.addCommand(logoutCommand());
 authCmd.addCommand(statusCommand());
 authCmd.addCommand(profileListCommand());
 authCmd.addCommand(profileUseCommand());
+authCmd.addCommand(profileRemoveCommand());
 program.addCommand(authCmd);
 program.addCommand(initCommand(), { hidden: true });
-var profileCmd = new Command19("profile").description(
+var profileCmd = new Command20("profile").description(
   "manage authentication profiles"
 );
 profileCmd.addCommand(profileListCommand());
 profileCmd.addCommand(profileUseCommand());
+profileCmd.addCommand(profileRemoveCommand());
 program.addCommand(profileCmd, { hidden: true });
 program.addCommand(searchCommand());
 program.addCommand(lsCommand());
@@ -2694,7 +2761,7 @@ program.addCommand(readCommand());
 program.addCommand(commentAddCommand());
 program.addCommand(appendCommand());
 program.addCommand(createPageCommand());
-var dbCmd = new Command19("db").description("Database operations");
+var dbCmd = new Command20("db").description("Database operations");
 dbCmd.addCommand(dbSchemaCommand());
 dbCmd.addCommand(dbQueryCommand());
 program.addCommand(dbCmd);