@andrzejchm/notion-cli 0.8.0 → 0.9.1

package/dist/cli.js

@@ -4,7 +4,7 @@
 import { readFileSync } from "fs";
 import { dirname, join as join3 } from "path";
 import { fileURLToPath } from "url";
-import { Command as Command23 } from "commander";
+import { Command as Command24 } from "commander";
 
 // src/commands/append.ts
 import { Command } from "commander";
@@ -543,23 +543,25 @@ function reportTokenSource(source) {
 }
 
 // src/services/write.service.ts
-async function addComment(client, pageId, text, options = {}) {
-  await client.comments.create({
-    parent: { page_id: pageId },
-    rich_text: [
-      {
-        type: "text",
-        text: { content: text, link: null },
-        annotations: {
-          bold: false,
-          italic: false,
-          strikethrough: false,
-          underline: false,
-          code: false,
-          color: "default"
-        }
+async function addComment(client, target, text, options = {}) {
+  const richText = [
+    {
+      type: "text",
+      text: { content: text, link: null },
+      annotations: {
+        bold: false,
+        italic: false,
+        strikethrough: false,
+        underline: false,
+        code: false,
+        color: "default"
       }
-    ],
+    }
+  ];
+  const targetPayload = target.type === "reply" ? { discussion_id: target.discussionId } : target.type === "block" ? { parent: { block_id: target.blockId } } : { parent: { page_id: target.pageId } };
+  await client.comments.create({
+    ...targetPayload,
+    rich_text: richText,
     ...options.asUser && { display_name: { type: "user" } }
   });
 }
@@ -1316,20 +1318,50 @@ function statusCommand() {
 
 // src/commands/comment-add.ts
 import { Command as Command6 } from "commander";
+function resolveTarget(idOrUrl, opts) {
+  const targetCount = [idOrUrl, opts.replyTo, opts.block].filter(
+    Boolean
+  ).length;
+  if (targetCount > 1) {
+    throw new CliError(
+      ErrorCodes.INVALID_ARG,
+      "Provide only one target: a page ID/URL, --reply-to, or --block.",
+      "These options are mutually exclusive"
+    );
+  }
+  if (opts.replyTo) {
+    return { type: "reply", discussionId: opts.replyTo };
+  }
+  if (opts.block) {
+    return { type: "block", blockId: opts.block };
+  }
+  if (idOrUrl) {
+    const id = parseNotionId(idOrUrl);
+    return { type: "page", pageId: toUuid(id) };
+  }
+  throw new CliError(
+    ErrorCodes.INVALID_ARG,
+    "Provide a page ID/URL, --reply-to <discussion-id>, or --block <block-id>."
+  );
+}
 function commentAddCommand() {
   const cmd = new Command6("comment");
-  cmd.description("add a comment to a Notion page").argument("<id/url>", "Notion page ID or URL").requiredOption("-m, --message <text>", "comment text to post").action(
-    withErrorHandling(async (idOrUrl, opts) => {
-      const { token, source } = await resolveToken();
-      reportTokenSource(source);
-      const client = createNotionClient(token);
-      const id = parseNotionId(idOrUrl);
-      const uuid = toUuid(id);
-      await addComment(client, uuid, opts.message, {
-        asUser: source === "oauth"
-      });
-      process.stdout.write("Comment added.\n");
-    })
+  cmd.description("add a comment to a Notion page, block, or discussion thread").argument("[id/url]", "Notion page ID or URL").requiredOption("-m, --message <text>", "comment text to post").option(
+    "--reply-to <discussion-id>",
+    "reply to an existing discussion thread"
+  ).option("--block <block-id>", "comment on a specific block").action(
+    withErrorHandling(
+      async (idOrUrl, opts) => {
+        const target = resolveTarget(idOrUrl, opts);
+        const { token, source } = await resolveToken();
+        reportTokenSource(source);
+        const client = createNotionClient(token);
+        await addComment(client, target, opts.message, {
+          asUser: source === "oauth"
+        });
+        process.stdout.write("Comment added.\n");
+      }
+    )
   );
   return cmd;
 }
@@ -1352,6 +1384,14 @@ async function paginateResults(fetcher) {
 }
 
 // src/commands/comments.ts
+function formatParent(parent) {
+  switch (parent.type) {
+    case "page_id":
+      return "page";
+    case "block_id":
+      return `block:${parent.block_id.slice(0, 8)}`;
+  }
+}
 function commentsCommand() {
   const cmd = new Command7("comments");
   cmd.description("list comments on a Notion page").argument("<id/url>", "Notion page ID or URL").option("--json", "output as JSON").action(
@@ -1374,10 +1414,16 @@ function commentsCommand() {
         return [
           comment.created_time.split("T")[0],
           `${comment.created_by.id.slice(0, 8)}...`,
+          comment.discussion_id.slice(0, 8),
+          formatParent(comment.parent),
           text.slice(0, 80) + (text.length > 80 ? "\u2026" : "")
         ];
       });
-      printOutput(comments, ["DATE", "AUTHOR ID", "COMMENT"], rows);
+      printOutput(
+        comments,
+        ["DATE", "AUTHOR ID", "DISCUSSION", "PARENT", "COMMENT"],
+        rows
+      );
     })
   );
   return cmd;
@@ -1638,6 +1684,126 @@ function displayDate(date) {
   if (!date) return "";
   return date.end ? `${date.start} \u2192 ${date.end}` : date.start;
 }
+var SIMPLE_PROPERTY_TYPES = /* @__PURE__ */ new Set([
+  "title",
+  "rich_text",
+  "number",
+  "date",
+  "checkbox",
+  "url",
+  "email",
+  "phone_number",
+  "people",
+  "files",
+  "created_time",
+  "last_edited_time"
+]);
+var OPTIONS_PROPERTY_TYPES = /* @__PURE__ */ new Set(["select", "multi_select", "status"]);
+var UNSUPPORTED_PROPERTY_TYPES = {
+  relation: "requires a data_source_id reference",
+  rollup: "requires relation and property references",
+  formula: "requires an expression string",
+  unique_id: "auto-managed by Notion"
+};
+function parsePropertyDefinition(defString) {
+  if (!defString) {
+    throw new CliError(
+      ErrorCodes.INVALID_ARG,
+      "Property definition cannot be empty",
+      'Use format: --prop "Name:type" or --prop "Name:type:opt1,opt2"'
+    );
+  }
+  const firstColon = defString.indexOf(":");
+  if (firstColon === -1) {
+    throw new CliError(
+      ErrorCodes.INVALID_ARG,
+      `Invalid property definition: "${defString}"`,
+      'Use format: --prop "Name:type" or --prop "Name:type:opt1,opt2"'
+    );
+  }
+  const name = defString.slice(0, firstColon);
+  const rest = defString.slice(firstColon + 1);
+  const secondColon = rest.indexOf(":");
+  const type = secondColon === -1 ? rest : rest.slice(0, secondColon);
+  const optionsStr = secondColon === -1 ? "" : rest.slice(secondColon + 1);
+  if (type in UNSUPPORTED_PROPERTY_TYPES) {
+    throw new CliError(
+      ErrorCodes.INVALID_ARG,
+      `Property type "${type}" is not supported via CLI \u2014 ${UNSUPPORTED_PROPERTY_TYPES[type]}`,
+      "Supported types: title, rich_text, number, select, multi_select, status, date, checkbox, url, email, phone_number, people, files, created_time, last_edited_time"
+    );
+  }
+  if (SIMPLE_PROPERTY_TYPES.has(type)) {
+    return { name, config: { [type]: {} } };
+  }
+  if (OPTIONS_PROPERTY_TYPES.has(type)) {
+    const options = optionsStr ? optionsStr.split(",").map((opt) => ({ name: opt.trim() })) : [];
+    return { name, config: { [type]: { options } } };
+  }
+  throw new CliError(
+    ErrorCodes.INVALID_ARG,
+    `Unknown property type: "${type}"`,
+    "Supported types: title, rich_text, number, select, multi_select, status, date, checkbox, url, email, phone_number, people, files, created_time, last_edited_time"
+  );
+}
+function parsePropertyDefinitions(defStrings) {
+  const properties = {};
+  let hasTitleProperty = false;
+  for (const def of defStrings) {
+    const { name, config } = parsePropertyDefinition(def);
+    if (name in properties) {
+      throw new CliError(
+        ErrorCodes.INVALID_ARG,
+        `Duplicate property name: "${name}"`,
+        "Each property must have a unique name"
+      );
+    }
+    const isTitle = "title" in config;
+    if (isTitle && hasTitleProperty) {
+      throw new CliError(
+        ErrorCodes.INVALID_ARG,
+        "Only one title property is allowed per database",
+        "Remove one of the title property definitions"
+      );
+    }
+    if (isTitle) hasTitleProperty = true;
+    properties[name] = config;
+  }
+  if (!hasTitleProperty) {
+    properties.Name = { title: {} };
+  }
+  return properties;
+}
+async function createDatabase(client, parentId, title, properties) {
+  return client.databases.create({
+    parent: { type: "page_id", page_id: parentId },
+    title: [{ type: "text", text: { content: title } }],
+    initial_data_source: {
+      properties
+    }
+  });
+}
+async function resolveDataSourceId(client, idOrUrl) {
+  const id = toUuid(parseNotionId(idOrUrl));
+  try {
+    await client.dataSources.retrieve({ data_source_id: id });
+    return id;
+  } catch {
+  }
+  try {
+    const db = await client.databases.retrieve({
+      database_id: id
+    });
+    if (db.data_sources && db.data_sources.length > 0) {
+      return db.data_sources[0].id;
+    }
+  } catch {
+  }
+  throw new CliError(
+    ErrorCodes.API_NOT_FOUND,
+    `Could not find database or data source: ${id}`
+  );
+}
 function displayPropertyValue(prop) {
   switch (prop.type) {
     case "title":
@@ -1873,8 +2039,46 @@ function createPageCommand() {
   return cmd;
 }
 
-// src/commands/db/query.ts
+// src/commands/db/create.ts
 import { Command as Command10 } from "commander";
+function collectProps2(val, acc) {
+  acc.push(val);
+  return acc;
+}
+function dbCreateCommand() {
+  return new Command10("create").description("Create a new database under a parent page").requiredOption("--parent <id/url>", "parent page ID or URL").requiredOption("--title <title>", "database title").option(
+    "--prop <definition>",
+    'property definition (repeatable): --prop "Name:type:options"',
+    collectProps2,
+    []
+  ).action(
+    withErrorHandling(async (opts) => {
+      const { token, source } = await resolveToken();
+      reportTokenSource(source);
+      const client = createNotionClient(token);
+      const parentUuid = toUuid(parseNotionId(opts.parent));
+      const properties = parsePropertyDefinitions(opts.prop);
+      const response = await createDatabase(
+        client,
+        parentUuid,
+        opts.title,
+        properties
+      );
+      if (getOutputMode() === "json") {
+        process.stdout.write(`${formatJSON(response)}
+`);
+        return;
+      }
+      if ("url" in response) {
+        process.stdout.write(`${response.url}
+`);
+      }
+    })
+  );
+}
+
+// src/commands/db/query.ts
+import { Command as Command11 } from "commander";
 var SKIP_TYPES_IN_AUTO = /* @__PURE__ */ new Set(["relation", "rich_text", "people"]);
 function autoSelectColumns(schema, entries) {
   const termWidth = process.stdout.columns || 120;
@@ -1902,7 +2106,7 @@ function autoSelectColumns(schema, entries) {
   return selected;
 }
 function dbQueryCommand() {
-  return new Command10("query").description("Query database entries with optional filtering and sorting").argument("<id>", "Notion database ID or URL").option(
+  return new Command11("query").description("Query database entries with optional filtering and sorting").argument("<id>", "Notion database ID or URL").option(
     "--filter <filter>",
     'Filter entries (repeatable): --filter "Status=Done"',
     collect,
@@ -1915,22 +2119,22 @@ function dbQueryCommand() {
   ).option(
     "--columns <columns>",
     'Comma-separated list of columns to display: --columns "Title,Status"'
-  ).option("--json", "Output raw JSON").action(
+  ).action(
     withErrorHandling(
       async (id, options) => {
         const { token } = await resolveToken();
         const client = createNotionClient(token);
-        const dbId = parseNotionId(id);
-        const schema = await fetchDatabaseSchema(client, dbId);
+        const dsId = await resolveDataSourceId(client, id);
+        const schema = await fetchDatabaseSchema(client, dsId);
         const columns = options.columns ? options.columns.split(",").map((c2) => c2.trim()) : void 0;
         const filter = options.filter.length ? buildFilter(options.filter, schema) : void 0;
         const sorts = options.sort.length ? buildSorts(options.sort) : void 0;
-        const entries = await queryDatabase(client, dbId, {
+        const entries = await queryDatabase(client, dsId, {
           filter,
           sorts,
           columns
         });
-        if (options.json) {
+        if (getOutputMode() === "json") {
           process.stdout.write(`${formatJSON(entries.map((e) => e.raw))}
 `);
           return;
@@ -1957,15 +2161,15 @@ function collect(value, previous) {
 }
 
 // src/commands/db/schema.ts
-import { Command as Command11 } from "commander";
+import { Command as Command12 } from "commander";
 function dbSchemaCommand() {
-  return new Command11("schema").description("Show database schema (property names, types, and options)").argument("<id>", "Notion database ID or URL").option("--json", "Output raw JSON").action(
-    withErrorHandling(async (id, options) => {
+  return new Command12("schema").description("Show database schema (property names, types, and options)").argument("<id>", "Notion database ID or URL").action(
+    withErrorHandling(async (id) => {
       const { token } = await resolveToken();
       const client = createNotionClient(token);
-      const dbId = parseNotionId(id);
-      const schema = await fetchDatabaseSchema(client, dbId);
-      if (options.json) {
+      const dsId = await resolveDataSourceId(client, id);
+      const schema = await fetchDatabaseSchema(client, dsId);
+      if (getOutputMode() === "json") {
         process.stdout.write(`${formatJSON(schema)}
 `);
         return;
@@ -1983,13 +2187,13 @@ function dbSchemaCommand() {
 }
 
 // src/commands/edit-page.ts
-import { Command as Command12 } from "commander";
+import { Command as Command13 } from "commander";
 function collect2(val, acc) {
   acc.push(val);
   return acc;
 }
 function editPageCommand() {
-  const cmd = new Command12("edit-page");
+  const cmd = new Command13("edit-page");
   cmd.description(
     "replace a Notion page's content \u2014 full page or a targeted section"
   ).argument("<id/url>", "Notion page ID or URL").option(
@@ -2087,7 +2291,7 @@ function editPageCommand() {
 
 // src/commands/init.ts
 import { confirm, input as input2, password } from "@inquirer/prompts";
-import { Command as Command13 } from "commander";
+import { Command as Command14 } from "commander";
 async function runInitFlow() {
   const profileName = await input2({
     message: "Profile name:",
@@ -2167,7 +2371,7 @@ async function runInitFlow() {
   stderrWrite(dim("  notion auth login"));
 }
 function initCommand() {
-  const cmd = new Command13("init");
+  const cmd = new Command14("init");
   cmd.description("authenticate with Notion and save a profile").action(
     withErrorHandling(async () => {
       if (!process.stdin.isTTY) {
@@ -2185,7 +2389,7 @@ function initCommand() {
 
 // src/commands/ls.ts
 import { isFullPageOrDataSource } from "@notionhq/client";
-import { Command as Command14 } from "commander";
+import { Command as Command15 } from "commander";
 function getTitle(item) {
   if (item.object === "data_source") {
     return item.title.map((t) => t.plain_text).join("") || "(untitled)";
@@ -2202,7 +2406,7 @@ function displayType(item) {
   return item.object === "data_source" ? "database" : item.object;
 }
 function lsCommand() {
-  const cmd = new Command14("ls");
+  const cmd = new Command15("ls");
   cmd.description("list accessible Notion pages and databases").option(
     "--type <type>",
     "filter by object type (page or database)",
@@ -2212,6 +2416,15 @@ function lsCommand() {
       }
       return val;
     }
+  ).option(
+    "--sort <direction>",
+    "sort by last edited time (asc or desc)",
+    (val) => {
+      if (val !== "asc" && val !== "desc") {
+        throw new Error('--sort must be "asc" or "desc"');
+      }
+      return val;
+    }
   ).option(
     "--cursor <cursor>",
     "start from this pagination cursor (from a previous --next hint)"
@@ -2225,6 +2438,10 @@ function lsCommand() {
         reportTokenSource(source);
         const notion = createNotionClient(token);
         const response = await notion.search({
+          sort: opts.sort ? {
+            timestamp: "last_edited_time",
+            direction: opts.sort === "asc" ? "ascending" : "descending"
+          } : void 0,
           start_cursor: opts.cursor,
           page_size: 20
         });
@@ -2265,10 +2482,10 @@ function lsCommand() {
 // src/commands/open.ts
 import { exec } from "child_process";
 import { promisify } from "util";
-import { Command as Command15 } from "commander";
+import { Command as Command16 } from "commander";
 var execAsync = promisify(exec);
 function openCommand() {
-  const cmd = new Command15("open");
+  const cmd = new Command16("open");
   cmd.description("open a Notion page in the default browser").argument("<id/url>", "Notion page ID or URL").action(
     withErrorHandling(async (idOrUrl) => {
       const id = parseNotionId(idOrUrl);
@@ -2284,9 +2501,9 @@ function openCommand() {
 }
 
 // src/commands/profile/list.ts
-import { Command as Command16 } from "commander";
+import { Command as Command17 } from "commander";
 function profileListCommand() {
-  const cmd = new Command16("list");
+  const cmd = new Command17("list");
   cmd.description("list all authentication profiles").action(
     withErrorHandling(async () => {
       const config = await readGlobalConfig();
@@ -2315,9 +2532,9 @@ function profileListCommand() {
 }
 
 // src/commands/profile/remove.ts
-import { Command as Command17 } from "commander";
+import { Command as Command18 } from "commander";
 function profileRemoveCommand() {
-  const cmd = new Command17("remove");
+  const cmd = new Command18("remove");
   cmd.description("remove an authentication profile").argument("<name>", "profile name to remove").action(
     withErrorHandling(async (name) => {
       const config = await readGlobalConfig();
@@ -2343,9 +2560,9 @@ function profileRemoveCommand() {
 }
 
 // src/commands/profile/use.ts
-import { Command as Command18 } from "commander";
+import { Command as Command19 } from "commander";
 function profileUseCommand() {
-  const cmd = new Command18("use");
+  const cmd = new Command19("use");
   cmd.description("switch the active profile").argument("<name>", "profile name to activate").action(
     withErrorHandling(async (name) => {
       const config = await readGlobalConfig();
@@ -2368,7 +2585,7 @@ function profileUseCommand() {
 }
 
 // src/commands/read.ts
-import { Command as Command19 } from "commander";
+import { Command as Command20 } from "commander";
 
 // src/output/markdown.ts
 import { Chalk as Chalk2 } from "chalk";
@@ -2508,7 +2725,7 @@ async function fetchPageMarkdown(client, pageId) {
 
 // src/commands/read.ts
 function readCommand() {
-  return new Command19("read").description("Read a Notion page as markdown").argument("<id>", "Notion page ID or URL").action(
+  return new Command20("read").description("Read a Notion page as markdown").argument("<id>", "Notion page ID or URL").action(
     withErrorHandling(async (id) => {
       const { token } = await resolveToken();
       const client = createNotionClient(token);
@@ -2534,7 +2751,7 @@ function readCommand() {
 
 // src/commands/search.ts
 import { isFullPageOrDataSource as isFullPageOrDataSource2 } from "@notionhq/client";
-import { Command as Command20 } from "commander";
+import { Command as Command21 } from "commander";
 function getTitle2(item) {
   if (item.object === "data_source") {
     return item.title.map((t) => t.plain_text).join("") || "(untitled)";
@@ -2554,7 +2771,7 @@ function displayType2(item) {
   return item.object === "data_source" ? "database" : item.object;
 }
 function searchCommand() {
-  const cmd = new Command20("search");
+  const cmd = new Command21("search");
   cmd.description("search Notion workspace by keyword").argument("<query>", "search keyword").option(
     "--type <type>",
     "filter by object type (page or database)",
@@ -2564,6 +2781,15 @@ function searchCommand() {
       }
       return val;
     }
+  ).option(
+    "--sort <direction>",
+    "sort by last edited time (asc or desc)",
+    (val) => {
+      if (val !== "asc" && val !== "desc") {
+        throw new Error('--sort must be "asc" or "desc"');
+      }
+      return val;
+    }
   ).option(
     "--cursor <cursor>",
     "start from this pagination cursor (from a previous --next hint)"
@@ -2579,6 +2805,10 @@ function searchCommand() {
         const response = await notion.search({
           query,
           filter: opts.type ? { property: "object", value: toSdkFilterValue(opts.type) } : void 0,
+          sort: opts.sort ? {
+            timestamp: "last_edited_time",
+            direction: opts.sort === "asc" ? "ascending" : "descending"
+          } : void 0,
           start_cursor: opts.cursor,
           page_size: 20
         });
@@ -2612,17 +2842,17 @@ function searchCommand() {
 }
 
 // src/commands/update.ts
-import { Command as Command21 } from "commander";
-function collectProps2(val, acc) {
+import { Command as Command22 } from "commander";
+function collectProps3(val, acc) {
   acc.push(val);
   return acc;
 }
 function updateCommand() {
-  const cmd = new Command21("update");
+  const cmd = new Command22("update");
   cmd.description("update properties on a Notion page").argument("<id/url>", "Notion page ID or URL").option(
     "--prop <property=value>",
     "set a property value (repeatable)",
-    collectProps2,
+    collectProps3,
     []
   ).option("--title <title>", "set the page title").action(
     withErrorHandling(async (idOrUrl, opts) => {
@@ -2676,7 +2906,7 @@ function updateCommand() {
 }
 
 // src/commands/users.ts
-import { Command as Command22 } from "commander";
+import { Command as Command23 } from "commander";
 function getEmailOrWorkspace(user) {
   if (user.type === "person") {
     return user.person.email ?? "\u2014";
@@ -2688,7 +2918,7 @@ function getEmailOrWorkspace(user) {
   return "\u2014";
 }
 function usersCommand() {
-  const cmd = new Command22("users");
+  const cmd = new Command23("users");
   cmd.description("list all users in the workspace").option("--json", "output as JSON").action(
     withErrorHandling(async (opts) => {
       if (opts.json) setOutputMode("json");
@@ -2719,7 +2949,7 @@ var __dirname = dirname(__filename);
 var pkg = JSON.parse(
   readFileSync(join3(__dirname, "../package.json"), "utf-8")
 );
-var program = new Command23();
+var program = new Command24();
 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({
@@ -2740,7 +2970,7 @@ program.hook("preAction", (thisCommand) => {
     setOutputMode("md");
   }
 });
-var authCmd = new Command23("auth").description("manage Notion authentication");
+var authCmd = new Command24("auth").description("manage Notion authentication");
 authCmd.action(authDefaultAction(authCmd));
 authCmd.addCommand(loginCommand());
 authCmd.addCommand(logoutCommand());
@@ -2750,7 +2980,7 @@ authCmd.addCommand(profileUseCommand());
 authCmd.addCommand(profileRemoveCommand());
 program.addCommand(authCmd);
 program.addCommand(initCommand(), { hidden: true });
-var profileCmd = new Command23("profile").description(
+var profileCmd = new Command24("profile").description(
   "manage authentication profiles"
 );
 profileCmd.addCommand(profileListCommand());
@@ -2769,7 +2999,8 @@ program.addCommand(createPageCommand());
 program.addCommand(editPageCommand());
 program.addCommand(updateCommand());
 program.addCommand(archiveCommand());
-var dbCmd = new Command23("db").description("Database operations");
+var dbCmd = new Command24("db").description("Database operations");
+dbCmd.addCommand(dbCreateCommand());
 dbCmd.addCommand(dbSchemaCommand());
 dbCmd.addCommand(dbQueryCommand());
 program.addCommand(dbCmd);