notion2hast 0.1.1 → 0.1.2

package/dist/cli.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { Writable } from 'stream';
-declare type Opts = {
+type Opts = {
     apiKey: string;
     blockId: string;
     defaultClassName?: boolean;

package/dist/cli.js

@@ -22,7 +22,12 @@ export const cli = async ({ apiKey, blockId, defaultClassName, toHtml, stdout, s
             richTexttoHastOpts: { defaultClassName }
         });
         if (toHtml) {
-            stdout.write(`${hastToHtml(tree)}\n`);
+            if (tree !== undefined &&
+                tree !== null &&
+                typeof tree === 'object' &&
+                !Array.isArray(tree)) {
+                stdout.write(`${hastToHtml(tree)}\n`);
+            }
         }
         else {
             stdout.write(`${JSON.stringify(tree, null, '  ')}\n`);

package/dist/lib/block.d.ts

@@ -1,4 +1,4 @@
-import { HChild, HProperties } from 'hastscript/lib/core';
+import type { Child, Properties } from 'hastscript';
 import { Block, BlockToHastBuilderOpts, BlockToHastBuilderPropertiesKey, BlockToHastBuilderPropertiesMap, BlockToHastOpts, ToHastOpts } from './types.js';
 import { RichTextToHast } from './richtext.js';
 import { Client } from './client.js';
@@ -15,9 +15,9 @@ export declare class BlockItem {
     init(): Promise<void>;
     block(): Promise<Block | null>;
 }
-declare type BlockToHastBuilderBuildOpts = {
+type BlockToHastBuilderBuildOpts = {
     block: Block;
-    nest: HChild[];
+    nest: Child[];
     parent?: Block;
     index: number;
     richTextToHast: RichTextToHast;
@@ -28,177 +28,177 @@ export declare abstract class BlockToHastBuilder<T> {
     protected defaultClassname: boolean;
     protected propertiesMap: BlockToHastBuilderPropertiesMap;
     constructor(blockType: T, opts: BlockToHastBuilderOpts);
-    protected props(key: BlockToHastBuilderPropertiesKey): HProperties;
+    protected props(key: BlockToHastBuilderPropertiesKey): Properties;
     abstract outerTag(): {
         name: string | null;
-        properties?: HProperties;
+        properties?: Properties;
     };
-    abstract build(opts: BlockToHastBuilderBuildOpts): Promise<HChild[]>;
+    abstract build(opts: BlockToHastBuilderBuildOpts): Promise<Child[]>;
     abstract isBreak(prevType: PrevType): boolean;
 }
 export declare class BlockParagraphToHast extends BlockToHastBuilder<'paragraph'> {
     constructor(opts?: BlockToHastBuilderOpts);
     outerTag(): {
         name: string | null;
-        properties?: HProperties;
+        properties?: Properties;
     };
-    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<HChild[]>;
+    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<Child[]>;
     isBreak(_prevType: PrevType): boolean;
 }
 export declare class BlockHeading1ToHast extends BlockToHastBuilder<'heading_1'> {
     constructor(opts?: BlockToHastBuilderOpts);
     outerTag(): {
         name: string | null;
-        properties?: HProperties;
+        properties?: Properties;
     };
-    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<HChild[]>;
+    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<Child[]>;
     isBreak(_prevType: PrevType): boolean;
 }
 export declare class BlockHeading2ToHast extends BlockToHastBuilder<'heading_2'> {
     constructor(opts?: BlockToHastBuilderOpts);
     outerTag(): {
         name: string | null;
-        properties?: HProperties;
+        properties?: Properties;
     };
-    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<HChild[]>;
+    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<Child[]>;
     isBreak(_prevType: PrevType): boolean;
 }
 export declare class BlockHeading3ToHast extends BlockToHastBuilder<'heading_3'> {
     constructor(opts?: BlockToHastBuilderOpts);
     outerTag(): {
         name: string | null;
-        properties?: HProperties;
+        properties?: Properties;
     };
-    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<HChild[]>;
+    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<Child[]>;
     isBreak(_prevType: PrevType): boolean;
 }
 export declare class BlockCodeToHast extends BlockToHastBuilder<'code'> {
     constructor(opts?: BlockToHastBuilderOpts);
     outerTag(): {
         name: string | null;
-        properties?: HProperties;
+        properties?: Properties;
     };
-    build({ block, nest, richTextToHast }: BlockToHastBuilderBuildOpts): Promise<HChild[]>;
+    build({ block, nest, richTextToHast }: BlockToHastBuilderBuildOpts): Promise<Child[]>;
     isBreak(_prevType: PrevType): boolean;
 }
 export declare class BlockCalloutToHast extends BlockToHastBuilder<'callout'> {
     constructor(opts?: BlockToHastBuilderOpts);
     outerTag(): {
         name: string | null;
-        properties?: HProperties;
+        properties?: Properties;
     };
-    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<HChild[]>;
+    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<Child[]>;
     isBreak(_prevType: PrevType): boolean;
 }
 export declare class BlockDividerToHast extends BlockToHastBuilder<'divider'> {
     constructor(opts?: BlockToHastBuilderOpts);
     outerTag(): {
         name: string | null;
-        properties?: HProperties;
+        properties?: Properties;
     };
-    build({ block, nest }: BlockToHastBuilderBuildOpts): Promise<HChild[]>;
+    build({ block, nest }: BlockToHastBuilderBuildOpts): Promise<Child[]>;
     isBreak(_prevType: PrevType): boolean;
 }
 export declare class BlockColumnListToHast extends BlockToHastBuilder<'column_list'> {
     constructor(opts?: BlockToHastBuilderOpts);
     outerTag(): {
         name: string | null;
-        properties?: HProperties;
+        properties?: Properties;
     };
-    build({ block, nest, richTextToHast }: BlockToHastBuilderBuildOpts): Promise<HChild[]>;
+    build({ block, nest, richTextToHast }: BlockToHastBuilderBuildOpts): Promise<Child[]>;
     isBreak(_prevType: PrevType): boolean;
 }
 export declare class BlockColumnToHast extends BlockToHastBuilder<'column'> {
     constructor(opts?: BlockToHastBuilderOpts);
     outerTag(): {
         name: string | null;
-        properties?: HProperties;
+        properties?: Properties;
     };
-    build({ block, nest, richTextToHast }: BlockToHastBuilderBuildOpts): Promise<HChild[]>;
+    build({ block, nest, richTextToHast }: BlockToHastBuilderBuildOpts): Promise<Child[]>;
     isBreak(_prevType: PrevType): boolean;
 }
 export declare class BlockBulletedListItemToHast extends BlockToHastBuilder<'bulleted_list_item'> {
     constructor(opts?: BlockToHastBuilderOpts);
     outerTag(): {
         name: string | null;
-        properties?: HProperties;
+        properties?: Properties;
     };
-    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<HChild[]>;
+    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<Child[]>;
     isBreak(prevType: PrevType): boolean;
 }
 export declare class BlockNumberedListItemToHast extends BlockToHastBuilder<'numbered_list_item'> {
     constructor(opts?: BlockToHastBuilderOpts);
     outerTag(): {
         name: string | null;
-        properties?: HProperties;
+        properties?: Properties;
     };
-    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<HChild[]>;
+    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<Child[]>;
     isBreak(prevType: PrevType): boolean;
 }
 export declare class BlockQuoteToHast extends BlockToHastBuilder<'quote'> {
     constructor(opts?: BlockToHastBuilderOpts);
     outerTag(): {
         name: string | null;
-        properties?: HProperties;
+        properties?: Properties;
     };
-    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<HChild[]>;
+    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<Child[]>;
     isBreak(_prevType: PrevType): boolean;
 }
 export declare class BlockTodoToHast extends BlockToHastBuilder<'to_do'> {
     constructor(opts?: BlockToHastBuilderOpts);
     outerTag(): {
         name: string | null;
-        properties?: HProperties;
+        properties?: Properties;
     };
-    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<HChild[]>;
+    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<Child[]>;
     isBreak(_prevType: PrevType): boolean;
 }
 export declare class BlockToggleToHast extends BlockToHastBuilder<'toggle'> {
     constructor(opts?: BlockToHastBuilderOpts);
     outerTag(): {
         name: string | null;
-        properties?: HProperties;
+        properties?: Properties;
     };
-    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<HChild[]>;
+    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<Child[]>;
     isBreak(_prevType: PrevType): boolean;
 }
 export declare class BlockTableToHast extends BlockToHastBuilder<'table'> {
     constructor(opts?: BlockToHastBuilderOpts);
     outerTag(): {
         name: string | null;
-        properties?: HProperties;
+        properties?: Properties;
     };
-    build({ block, nest, richTextToHast }: BlockToHastBuilderBuildOpts): Promise<HChild[]>;
+    build({ block, nest, richTextToHast }: BlockToHastBuilderBuildOpts): Promise<Child[]>;
     isBreak(_prevType: PrevType): boolean;
 }
 export declare class BlockTableRowToHast extends BlockToHastBuilder<'table_row'> {
     constructor(opts?: BlockToHastBuilderOpts);
     outerTag(): {
         name: string | null;
-        properties?: HProperties;
+        properties?: Properties;
     };
-    build({ block, nest, parent, index, richTextToHast }: BlockToHastBuilderBuildOpts): Promise<HChild[]>;
+    build({ block, nest, parent, index, richTextToHast }: BlockToHastBuilderBuildOpts): Promise<Child[]>;
     isBreak(_prevType: PrevType): boolean;
 }
 export declare class BlockBookmarkToHast extends BlockToHastBuilder<'bookmark'> {
     constructor(opts?: BlockToHastBuilderOpts);
     outerTag(): {
         name: string | null;
-        properties?: HProperties;
+        properties?: Properties;
     };
-    build({ block, nest, richTextToHast }: BlockToHastBuilderBuildOpts): Promise<HChild[]>;
+    build({ block, nest, richTextToHast }: BlockToHastBuilderBuildOpts): Promise<Child[]>;
     isBreak(_prevType: PrevType): boolean;
 }
 export declare class BlockImageToHast extends BlockToHastBuilder<'image'> {
     constructor(opts?: BlockToHastBuilderOpts);
     outerTag(): {
         name: string | null;
-        properties?: HProperties;
+        properties?: Properties;
     };
-    build({ block, nest, richTextToHast }: BlockToHastBuilderBuildOpts): Promise<HChild[]>;
+    build({ block, nest, richTextToHast }: BlockToHastBuilderBuildOpts): Promise<Child[]>;
     isBreak(_prevType: PrevType): boolean;
 }
-declare type PrevType = Block['type'] | undefined | '';
+type PrevType = Block['type'] | undefined | '';
 export declare class SurroundElement {
     private prevType;
     private children;
@@ -207,9 +207,9 @@ export declare class SurroundElement {
     constructor(initType: PrevType, opts?: BlockToHastOpts);
     protected builder(blockType: PrevType): BlockToHastBuilder<Block['type']> | undefined;
     append({ block, nest, parent, index, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<void>;
-    nest(contet: HChild): void;
+    nest(contet: Child): void;
     outerTag(): ReturnType<BlockToHastBuilder<Block['type']>['outerTag']> | null;
-    content(): HChild[];
+    content(): Child[];
     isBreak(cur: PrevType): boolean;
     reset(): void;
 }

package/dist/lib/block.js

@@ -471,17 +471,6 @@ export class BlockImageToHast extends BlockToHastBuilder {
     }
 }
 export class SurroundElement {
-    constructor(initType, opts = {}) {
-        this.prevType = '';
-        this.children = [];
-        this.blockToHastBuilders = {};
-        this.prevType = initType;
-        const buildersOpts = opts.blockToHastBuilderOpts || {};
-        if (typeof buildersOpts.defaultClassname === 'undefined') {
-            buildersOpts.defaultClassname = opts.defaultClassName;
-        }
-        this.blockToHastBuilders = Object.assign({}, this.defaultBlockToHastBuilders(buildersOpts), opts.blockToHastBuilders || {});
-    }
     defaultBlockToHastBuilders(opts) {
         return {
             paragraph: new BlockParagraphToHast(opts),
@@ -504,6 +493,17 @@ export class SurroundElement {
             image: new BlockImageToHast(opts)
         };
     }
+    constructor(initType, opts = {}) {
+        this.prevType = '';
+        this.children = [];
+        this.blockToHastBuilders = {};
+        this.prevType = initType;
+        const buildersOpts = opts.blockToHastBuilderOpts || {};
+        if (typeof buildersOpts.defaultClassname === 'undefined') {
+            buildersOpts.defaultClassname = opts.defaultClassName;
+        }
+        this.blockToHastBuilders = Object.assign({}, this.defaultBlockToHastBuilders(buildersOpts), opts.blockToHastBuilders || {});
+    }
     builder(blockType) {
         if (blockType) {
             return this.blockToHastBuilders[blockType];

package/dist/lib/color.d.ts

@@ -1,8 +1,8 @@
-import { HProperties } from 'hastscript/lib/core';
+import type { Properties } from 'hastscript';
 import { ColorPropsOpts } from './types';
 export declare class ColorProps {
     private defaultColorPropertiesMap;
     private colorPropertiesMap;
     constructor(opts: ColorPropsOpts);
-    props(color: string): HProperties;
+    props(color: string): Properties;
 }

package/dist/lib/color.js

@@ -20,13 +20,13 @@ const colorPropertiesMap = {
     red_background: { style: 'background-color:#FBE4E4' }
 };
 export class ColorProps {
+    defaultColorPropertiesMap() {
+        return colorPropertiesMap;
+    }
     constructor(opts) {
         this.colorPropertiesMap = {};
         Object.assign(this.colorPropertiesMap, this.defaultColorPropertiesMap(), opts.colorPropertiesMap || {});
     }
-    defaultColorPropertiesMap() {
-        return colorPropertiesMap;
-    }
     props(color) {
         return { ...(this.colorPropertiesMap[color] || {}) };
     }

package/dist/lib/notion2hast.d.ts

@@ -1,4 +1,4 @@
-import { Node } from 'hastscript/lib/core';
+import type { Child } from 'hastscript';
 import { ToHastOpts } from './types.js';
 import { Client } from './client.js';
-export declare function blockToHast(client: Client, opts: ToHastOpts, depth?: number): Promise<Node>;
+export declare function blockToHast(client: Client, opts: ToHastOpts, depth?: number): Promise<Child>;

package/dist/lib/notion2hast.js

@@ -20,7 +20,12 @@ export async function blockToHast(client, opts, depth = 0) {
             if (i.has_children) {
                 const a = await blockToHast(client, Object.assign({}, opts, { block_id: i.id, parent: i }), depth + 1);
                 // surround.nest(a)
-                nest.push(a);
+                if (Array.isArray(a)) {
+                    nest.push(...a);
+                }
+                else {
+                    nest.push(a);
+                }
             }
             await surround.append({
                 block: i,

package/dist/lib/props.d.ts

@@ -1,2 +1,2 @@
-import { HProperties } from 'hastscript/lib/core';
-export declare function mergeProps(p: HProperties, { className, style, ...others }: HProperties): HProperties;
+import type { Properties } from 'hastscript';
+export declare function mergeProps(p: Properties, { className, style, ...others }: Properties): Properties;

package/dist/lib/richtext.d.ts

@@ -1,7 +1,7 @@
-import { HChild, HProperties } from 'hastscript/lib/core';
+import type { Child, Properties } from 'hastscript';
 import { ColorProps } from './color.js';
 import { RichTextItem, RichTexttoHastOpts } from './types.js';
-export declare type RichTextTextItem = Extract<RichTextItem, {
+export type RichTextTextItem = Extract<RichTextItem, {
     type?: 'text';
 }>;
 export declare function colorText(richTextColor: string): [string, string];
@@ -10,7 +10,7 @@ export declare class RichTextToHast {
     protected defaultClassName: boolean;
     private propertiesMap;
     constructor(opts?: RichTexttoHastOpts, colorProps?: ColorProps);
-    protected props(key: string): HProperties;
-    textToHast(text: RichTextTextItem): HChild;
-    build(richTextItems: RichTextItem[]): Promise<HChild[]>;
+    protected props(key: string): Properties;
+    textToHast(text: RichTextTextItem): Child;
+    build(richTextItems: RichTextItem[]): Promise<Child[]>;
 }

package/dist/lib/types.d.ts

@@ -1,42 +1,42 @@
 import { Client } from '@notionhq/client';
-import { HProperties } from 'hastscript/lib/core';
+import type { Properties } from 'hastscript';
 import { BlockToHastBuilder } from './block';
-export declare type ToHastOpts = {
+export type ToHastOpts = {
     block_id: string;
     parent?: Block;
     blocktoHastOpts?: BlockToHastOpts;
     richTexttoHastOpts?: RichTexttoHastOpts;
     colorPropsOpts?: ColorPropsOpts;
 };
-export declare type Block = Extract<Awaited<ReturnType<InstanceType<typeof Client>['blocks']['retrieve']>>, {
+export type Block = Extract<Awaited<ReturnType<InstanceType<typeof Client>['blocks']['retrieve']>>, {
     type: string;
 }>;
-export declare type BlockToHastBuilderPropertiesKey = `paragraph` | `heading-1` | `heading-2` | `heading-3` | `code` | `code-pre` | `code-code` | `code-caption` | `callout` | `callout-icon-emoji` | `callout-icon-image` | `callout-paragraph` | `divider` | `column-list` | `column` | `bulleted-list` | `bulleted-list-item` | `numbered-list` | `numbered-list-item` | `quote` | `todo` | `todo-checked` | `todo-not-checked` | `todo-text` | `toggle` | `toggle-summary` | `table` | `table-row` | `table-row-cell` | `table-row-header` | `table-row-header-top-left` | `table-row-header-top` | `table-row-header-left` | `bookmark` | `bookmark-link` | `bookmark-caption` | `image` | `image-img` | `image-caption` | `text-link` | `text-bold` | `text-code` | `text-italic` | `text-strikethrough` | `text-underline`;
-export declare type BlockToHastBuilderPropertiesMap = {
-    [key in BlockToHastBuilderPropertiesKey]?: HProperties;
+export type BlockToHastBuilderPropertiesKey = `paragraph` | `heading-1` | `heading-2` | `heading-3` | `code` | `code-pre` | `code-code` | `code-caption` | `callout` | `callout-icon-emoji` | `callout-icon-image` | `callout-paragraph` | `divider` | `column-list` | `column` | `bulleted-list` | `bulleted-list-item` | `numbered-list` | `numbered-list-item` | `quote` | `todo` | `todo-checked` | `todo-not-checked` | `todo-text` | `toggle` | `toggle-summary` | `table` | `table-row` | `table-row-cell` | `table-row-header` | `table-row-header-top-left` | `table-row-header-top` | `table-row-header-left` | `bookmark` | `bookmark-link` | `bookmark-caption` | `image` | `image-img` | `image-caption` | `text-link` | `text-bold` | `text-code` | `text-italic` | `text-strikethrough` | `text-underline`;
+export type BlockToHastBuilderPropertiesMap = {
+    [key in BlockToHastBuilderPropertiesKey]?: Properties;
 };
-export declare type BlockToHastBuilderOpts = {
+export type BlockToHastBuilderOpts = {
     defaultClassname?: boolean;
     propertiesMap?: BlockToHastBuilderPropertiesMap;
 };
-export declare type BlockToHastBuilders = Record<string, BlockToHastBuilder<Block['type']>>;
-export declare type RichTextItem = Extract<Block, {
+export type BlockToHastBuilders = Record<string, BlockToHastBuilder<Block['type']>>;
+export type RichTextItem = Extract<Block, {
     type: 'paragraph';
 }>['paragraph']['rich_text'][0];
-export declare type BlockToHastOpts = {
+export type BlockToHastOpts = {
     defaultClassName?: boolean;
     blockToHastBuilderOpts?: BlockToHastBuilderOpts;
     blockToHastBuilders?: BlockToHastBuilders;
 };
-export declare type ColorPropertiesMap = Record<string, HProperties>;
-export declare type ColorPropsOpts = {
+export type ColorPropertiesMap = Record<string, Properties>;
+export type ColorPropsOpts = {
     colorPropertiesMap?: ColorPropertiesMap;
 };
-export declare type RichTexttoHastBuildePropertiesMap = Record<string, HProperties>;
-export declare type RichTexttoHastBuilderOpts = {
+export type RichTexttoHastBuildePropertiesMap = Record<string, Properties>;
+export type RichTexttoHastBuilderOpts = {
     richTexttoHastBuildePropertiesMap?: RichTexttoHastBuildePropertiesMap;
 };
-export declare type RichTexttoHastOpts = {
+export type RichTexttoHastOpts = {
     defaultClassName?: boolean;
     richTexttoHastBuilderOpts?: RichTexttoHastBuilderOpts;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "notion2hast",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Notion blocks to hast",
   "license": "MIT",
   "author": "hankei6km <hankei6km@gmail.com> (https://github.com/hankei6km)",
@@ -32,16 +32,16 @@
     "start": "npm run build && node dist/main.js",
     "build": "npm run clean && tsc && rimraf dist/test && mv dist/src/* dist/ && rimraf dist/src",
     "test": "node --experimental-vm-modules node_modules/.bin/jest",
-    "clean": "rimraf \"dist/*\"",
+    "clean": "rimraf dist/",
     "upgrade-interactive": "npm-check --update",
     "csb:test": "npm test -- --runInBand --watchAll"
   },
   "dependencies": {
     "@notionhq/client": "^2.2.0",
     "hash.js": "^1.1.7",
-    "hast-util-classnames": "^2.0.0",
-    "hast-util-to-html": "^8.0.3",
-    "hastscript": "^7.0.2",
+    "hast-util-classnames": "^3.0.0",
+    "hast-util-to-html": "^9.0.0",
+    "hastscript": "^9.0.0",
     "sha.js": "^2.4.11",
     "yargs": "^17.5.1"
   },
@@ -51,9 +51,9 @@
     "@types/sha.js": "^2.4.0",
     "@types/yargs": "^17.0.12",
     "jest": "^28.1.3",
-    "rimraf": "^3.0.2",
+    "rimraf": "^5.0.0",
     "ts-jest": "^28.0.8",
     "ts-node": "^10.9.1",
-    "typescript": "^4.8.3"
+    "typescript": "^5.0.2"
   }
 }