notion2hast 0.1.4 → 0.2.0

package/README.md

@@ -7,7 +7,7 @@
 ## Installtion
 
 ```console
-$ npm install --save notion2hast
+npm install --save notion2hast
 ```
 
 ## Security
@@ -235,6 +235,7 @@ const client = new FromNotion({
 - [x] heading_1
 - [x] heading_2
 - [x] heading_3
+- [x] heading_4
 - [x] bulleted_list_item
 - [x] numbered_list_item
 - [x] quote
@@ -311,6 +312,7 @@ const client = new FromNotion({
 - `heading-1`
 - `heading-2`
 - `heading-3`
+- `heading-4`
 - `code`
 - `code-pre`
 - `code-code`

package/dist/cli.js

@@ -3,6 +3,7 @@ import { Client as NotionClient } from '@notionhq/client';
 import { Client } from './lib/client.js';
 import { blockToHast } from './lib/notion2hast.js';
 class CliClient extends Client {
+    client;
     constructor(options) {
         super();
         this.client = new NotionClient(options);

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export { blockToHast } from './lib/notion2hast.js';
-export { Client } from './lib/client.js';
+export { blockToHast } from './lib/notion2hast.ts';
+export { Client } from './lib/client.ts';

package/dist/lib/block.d.ts

@@ -1,8 +1,8 @@
 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';
-import { ColorProps } from './color.js';
+import type { Block, BlockToHastBuilderOpts, BlockToHastBuilderPropertiesKey, BlockToHastBuilderPropertiesMap, BlockToHastOpts, ToHastOpts } from './types.ts';
+import { RichTextToHast } from './richtext.ts';
+import { Client } from './client.ts';
+import { ColorProps } from './color.ts';
 export declare function isBlock(o: any): o is Block;
 export declare class BlockItem {
     private client;
@@ -72,6 +72,15 @@ export declare class BlockHeading3ToHast extends BlockToHastBuilder<'heading_3'>
     build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<Child[]>;
     isBreak(_prevType: PrevType): boolean;
 }
+export declare class BlockHeading4ToHast extends BlockToHastBuilder<'heading_4'> {
+    constructor(opts?: BlockToHastBuilderOpts);
+    outerTag(): {
+        name: string | null;
+        properties?: Properties;
+    };
+    build({ block, nest, richTextToHast, colorProps }: BlockToHastBuilderBuildOpts): Promise<Child[]>;
+    isBreak(_prevType: PrevType): boolean;
+}
 export declare class BlockCodeToHast extends BlockToHastBuilder<'code'> {
     constructor(opts?: BlockToHastBuilderOpts);
     outerTag(): {

package/dist/lib/block.js

@@ -8,6 +8,12 @@ export function isBlock(o) {
     return false;
 }
 export class BlockItem {
+    client;
+    opts;
+    blocks;
+    next_cursor;
+    blocksLen;
+    idx;
     constructor(client, opts) {
         this.client = client;
         this.opts = opts;
@@ -53,8 +59,10 @@ export class BlockItem {
     }
 }
 export class BlockToHastBuilder {
+    blockType;
+    defaultClassname;
+    propertiesMap = {};
     constructor(blockType, opts) {
-        this.propertiesMap = {};
         this.blockType = blockType;
         this.defaultClassname = opts.defaultClassname || false;
         this.propertiesMap = { ...(opts.propertiesMap || {}) };
@@ -145,6 +153,25 @@ export class BlockHeading3ToHast extends BlockToHastBuilder {
         return true;
     }
 }
+export class BlockHeading4ToHast extends BlockToHastBuilder {
+    constructor(opts = {}) {
+        super('heading_4', opts);
+    }
+    outerTag() {
+        return { name: null };
+    }
+    async build({ block, nest, richTextToHast, colorProps }) {
+        if (this.blockType === block.type) {
+            return [
+                h('h4', mergeProps(this.props('heading-4'), colorProps.props(block[block.type].color)), ...(await richTextToHast.build(block[block.type].rich_text)), ...nest)
+            ];
+        }
+        return [];
+    }
+    isBreak(_prevType) {
+        return true;
+    }
+}
 export class BlockCodeToHast extends BlockToHastBuilder {
     constructor(opts = {}) {
         super('code', opts);
@@ -471,12 +498,15 @@ export class BlockImageToHast extends BlockToHastBuilder {
     }
 }
 export class SurroundElement {
+    prevType = '';
+    children = [];
     defaultBlockToHastBuilders(opts) {
         return {
             paragraph: new BlockParagraphToHast(opts),
             heading_1: new BlockHeading1ToHast(opts),
             heading_2: new BlockHeading2ToHast(opts),
             heading_3: new BlockHeading3ToHast(opts),
+            heading_4: new BlockHeading4ToHast(opts),
             code: new BlockCodeToHast(opts),
             callout: new BlockCalloutToHast(opts),
             divider: new BlockDividerToHast(opts),
@@ -493,10 +523,8 @@ export class SurroundElement {
             image: new BlockImageToHast(opts)
         };
     }
+    blockToHastBuilders = {};
     constructor(initType, opts = {}) {
-        this.prevType = '';
-        this.children = [];
-        this.blockToHastBuilders = {};
         this.prevType = initType;
         const buildersOpts = opts.blockToHastBuilderOpts || {};
         if (typeof buildersOpts.defaultClassname === 'undefined') {

package/dist/lib/color.d.ts

@@ -1,5 +1,5 @@
 import type { Properties } from 'hastscript';
-import { ColorPropsOpts } from './types';
+import type { ColorPropsOpts } from './types.ts';
 export declare class ColorProps {
     private defaultColorPropertiesMap;
     private colorPropertiesMap;

package/dist/lib/color.js

@@ -23,8 +23,8 @@ export class ColorProps {
     defaultColorPropertiesMap() {
         return colorPropertiesMap;
     }
+    colorPropertiesMap = {};
     constructor(opts) {
-        this.colorPropertiesMap = {};
         Object.assign(this.colorPropertiesMap, this.defaultColorPropertiesMap(), opts.colorPropertiesMap || {});
     }
     props(color) {

package/dist/lib/notion2hast.d.ts

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

package/dist/lib/richtext.d.ts

@@ -1,6 +1,6 @@
 import type { Child, Properties } from 'hastscript';
-import { ColorProps } from './color.js';
-import { RichTextItem, RichTexttoHastOpts } from './types.js';
+import { ColorProps } from './color.ts';
+import type { RichTextItem, RichTexttoHastOpts } from './types.ts';
 export type RichTextTextItem = Extract<RichTextItem, {
     type?: 'text';
 }>;

package/dist/lib/richtext.js

@@ -9,8 +9,10 @@ export function colorText(richTextColor) {
     return [richTextColor, ''];
 }
 export class RichTextToHast {
+    colorProps;
+    defaultClassName;
+    propertiesMap = {};
     constructor(opts = {}, colorProps) {
-        this.propertiesMap = {};
         this.colorProps = colorProps || new ColorProps({});
         this.defaultClassName = opts.defaultClassName || false;
         Object.assign(this.propertiesMap, opts.richTexttoHastBuilderOpts?.richTexttoHastBuildePropertiesMap || {});

package/dist/lib/types.d.ts

@@ -1,6 +1,6 @@
 import { Client } from '@notionhq/client';
 import type { Properties } from 'hastscript';
-import { BlockToHastBuilder } from './block';
+import { BlockToHastBuilder } from './block.ts';
 export type ToHastOpts = {
     block_id: string;
     parent?: Block;
@@ -11,7 +11,7 @@ export type ToHastOpts = {
 export type Block = Extract<Awaited<ReturnType<InstanceType<typeof Client>['blocks']['retrieve']>>, {
     type: string;
 }>;
-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 BlockToHastBuilderPropertiesKey = `paragraph` | `heading-1` | `heading-2` | `heading-3` | `heading-4` | `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;
 };

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "notion2hast",
-  "version": "0.1.4",
+  "version": "0.2.0",
   "description": "Notion blocks to hast",
   "license": "MIT",
   "author": "hankei6km <hankei6km@gmail.com> (https://github.com/hankei6km)",
   "repository": {
     "type": "git",
-    "url": "git@github.com:hankei6km/notion2hast.git"
+    "url": "git+https://github.com/hankei6km/notion2hast.git"
   },
   "bugs": {
     "url": "https://github.com/hankei6km/notion2hast/issues"
@@ -30,14 +30,16 @@
   },
   "scripts": {
     "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/",
-    "upgrade-interactive": "npm-check --update",
-    "csb:test": "npm test -- --runInBand --watchAll"
+    "start:ts": "node --experimental-strip-types src/main.ts",
+    "prebuild": "npm run clean",
+    "build": "tsc -p tsconfig.build.json",
+    "test": "node --experimental-test-module-mocks --experimental-test-module-mocks --experimental-strip-types --test",
+    "test:coverage": "npm run test -- --experimental-test-coverage",
+    "lint:types": "tsc --noEmit -p tsconfig.json",
+    "clean": "rm -rf dist/*"
   },
   "dependencies": {
-    "@notionhq/client": "^4.0.0",
+    "@notionhq/client": "^5.0.0",
     "hash.js": "^1.1.7",
     "hast-util-classnames": "^3.0.0",
     "hast-util-to-html": "^9.0.0",
@@ -46,14 +48,9 @@
     "yargs": "^18.0.0"
   },
   "devDependencies": {
-    "@types/jest": "^30.0.0",
-    "@types/node": "^20.12.8",
+    "@types/node": "^26.1.1",
     "@types/sha.js": "^2.4.0",
     "@types/yargs": "^17.0.12",
-    "jest": "^30.0.0",
-    "rimraf": "^6.0.1",
-    "ts-jest": "^29.1.2",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.0.2"
+    "typescript": "^7.0.2"
   }
 }