@podlite/markdown 0.0.4 → 0.0.6

package/package.json

@@ -1,38 +1,44 @@
 {
   "name": "@podlite/markdown",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "=Markdown - markdown text block",
-  "main": "index.js",
+  "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
-  "module": "esm/index.js",
+  "module": "lib/index.esm.js",
   "license": "MIT",
   "scripts": {
     "clean": "rm -rf dist lib esm tsconfig.tsbuildinfo",
     "test": "yarn g:jest  --passWithNoTests",
     "build": "run-p build:cjs  build:esm",
     "build:cjs": "ts-node ./scripts/build.ts && tsc  --declaration --emitDeclarationOnly",
-    "build:esm": "ts-node ./scripts/build_esm.ts &&  tsc  --declaration --emitDeclarationOnly --outDir esm"
+    "build:esm": "ts-node ./scripts/build_esm.ts"
   },
   "publishConfig": {
     "access": "public",
-    "main": "index.js",
+    "main": "./lib/index.js",
     "types": "./lib/index.d.ts"
   },
   "peerDependencies": {
-    "react": "^16.0.0 || ^17.0.0",
+    "react": "^16.0.0 || ^17.0.0 ",
     "react-dom": "^16.0.0 || ^17.0.0"
   },
+  "keywords": [
+    "markdown",
+    "podlite",
+    "markup",
+    "markup-language"
+  ],
   "dependencies": {
-    "@podlite/schema": "0.0.11",
-    "pod6": "^0.0.48",
-    "react": "^16.0.0 || ^17.0.0",
+    "@podlite/schema": "0.0.13",
+    "react": "^16.0.0 || ^17.0.0 ",
     "react-dom": "^16.0.0 || ^17.0.0",
-    "react-is": "^17.0.2",
+    "react-is": "^17.0.0",
     "remark-gfm": "^3.0.1",
     "remark-parse": "^10.0.1",
     "unified": "^10.1.2"
   },
   "devDependencies": {
-    "esbuild": "^0.15.16"
+    "esbuild": "^0.15.16",
+    "npm-run-all": "^4.1.5"
   }
 }

package/scripts/build.ts

@@ -1,4 +1,4 @@
-import { build } from 'esbuild';
+import { build } from 'esbuild'
 
 build({
   bundle: true,
@@ -9,8 +9,8 @@ build({
   target: 'node14',
   platform: 'node',
   sourcemap: true,
-  outfile: 'lib/index.js',
-}).catch((e) => {
-  console.log('Build not successful', e.message);
-  process.exit(1);
-});
+  outfile: 'lib/index.cjs',
+}).catch(e => {
+  console.log('Build not successful', e.message)
+  process.exit(1)
+})

package/scripts/build_esm.ts

@@ -1,15 +1,18 @@
-import { build } from 'esbuild';
-
+import { build, BuildOptions } from 'esbuild'
+const opt: BuildOptions = {
+  tsconfig: 'tsconfig-esm.json',
+}
 build({
   bundle: true,
   entryPoints: ['src/index.tsx'],
   external: ['react', 'react-dom'],
-  minify: true,
+  minify: false,
   format: 'esm',
-  target: 'node14',
+  target: 'es2019',
   sourcemap: true,
-  outfile: 'esm/index.js',
-}).catch((e) => {
-  console.log('Build not successful', e.message);
-  process.exit(1);
-});
+  outfile: 'lib/index.esm.js',
+  ...opt,
+}).catch(e => {
+  console.log('Build not successful', e.message)
+  process.exit(1)
+})

package/src/index.tsx

@@ -1,30 +1,25 @@
-import { Plugins } from '@podlite/schema';
-import {Plugin} from '@podlite/schema'
-import { md2ast } from './tools';
-import { content as nodeContent } from 'pod6/built/helpers/handlers'
-  
-export const plugin:Plugin =({
-    toAst: (_, processor) => (node, ctx) => {
-        if (typeof node !== "string" && 'type' in node && 'content' in node && node.type === 'block') {
-            const content = node.content[0]
-            if (content && typeof content !== "string" && 'location' in node && 'value' in content) {
-                const lineOffset = node.location.start.line
-                return { ...node, content: md2ast(content, {lineOffset})  }
-            }
-            return node
-        }
+import { content as nodeContent, Plugins } from '@podlite/schema'
+import { Plugin } from '@podlite/schema'
+import { md2ast } from './tools'
 
-     },
-     toJSX: (helper) => {
-        return nodeContent
-     }
-
-    })
-export const PluginRegister:Plugins = {
-    Markdown: plugin
+export const plugin: Plugin = {
+  toAst: (_, processor) => (node, ctx) => {
+    if (typeof node !== 'string' && 'type' in node && 'content' in node && node.type === 'block') {
+      const content = node.content[0]
+      if (content && typeof content !== 'string' && 'location' in node && 'value' in content) {
+        const lineOffset = node.location.start.line
+        return { ...node, content: md2ast(content, { lineOffset }) }
+      }
+      return node
+    }
+  },
+  toJSX: helper => {
+    return nodeContent
+  },
+}
+export const PluginRegister: Plugins = {
+  Markdown: plugin,
 }
 
 export { md2ast as parseMd } from './tools'
 export default plugin
-
-

package/src/tools.ts

@@ -1,147 +1,191 @@
-import  {unified}  from 'unified'
-import markdown  from 'remark-parse'
+import { unified } from 'unified'
+import markdown from 'remark-parse'
 import remarkGfm from 'remark-gfm'
-import toAny  from 'pod6/built/exportAny'
-import { AstTree, BlockImage, mkBlock, mkFomattingCode, mkFomattingCodeL, mkVerbatim, Location } from '@podlite/schema'
+import {
+  toAny,
+  AstTree,
+  BlockImage,
+  mkBlock,
+  mkFomattingCode,
+  mkFomattingCodeL,
+  mkVerbatim,
+  Location,
+} from '@podlite/schema'
 import { mkRootBlock } from '@podlite/schema'
 import { mkImage } from '@podlite/schema'
 import { mkCaption } from '@podlite/schema'
 import { mkFomattingCodeDelete } from '@podlite/schema'
 
-type Md2astArgs = { lineOffset?: number};
-export const  md2ast = ( src:string, {lineOffset }:Md2astArgs = {lineOffset:0} ) :AstTree => {
-    // first convert mardown to ast 
-    const md_tree = unified().use(markdown).use(remarkGfm).parse(src)
-    // first pass : collect linkRefs
-    let definitionMap = {}
-    const applyLineOffset = ((offset:number)=>(location:Location):Location=>{
-        const { start, end } = location
-        return {
-            "start": {
-                ...start,
-              "line": start.line + offset,
-            },
-            "end": {
-              ...end,
-              "line": end.line + offset,
-            }
+type Md2astArgs = { lineOffset?: number }
+export const md2ast = (src: string, { lineOffset }: Md2astArgs = { lineOffset: 0 }): AstTree => {
+  // first convert mardown to ast
+  const md_tree = unified().use(markdown).use(remarkGfm).parse(src)
+  // first pass : collect linkRefs
+  let definitionMap = {}
+  const applyLineOffset = (
+    (offset: number) =>
+    (location: Location): Location => {
+      const { start, end } = location
+      return {
+        start: {
+          ...start,
+          line: start.line + offset,
+        },
+        end: {
+          ...end,
+          line: end.line + offset,
+        },
+      }
     }
-   })(lineOffset);
-    toAny({processor:1})
-    .use({'*:*':( writer, processor )=>( node, ctx, interator )=>{
-        if (node.children) interator(node.children, { ...ctx})
-    }})
-    .use({':definition' : ( writer, processor )=>( node, ctx, interator )=>{
+  )(lineOffset)
+  toAny({ processor: 1 })
+    .use({
+      '*:*': (writer, processor) => (node, ctx, interator) => {
+        if (node.children) interator(node.children, { ...ctx })
+      },
+    })
+    .use({
+      ':definition': (writer, processor) => (node, ctx, interator) => {
         definitionMap[node.identifier] = node
-    }}).run(md_tree)
+      },
+    })
+    .run(md_tree)
 
-    // second stage - make Universal AST nodes
-    const uast = []
-    const  res = toAny({processor:1})
-    .use({'*:*':( writer, processor )=>( node, ctx, interator )=>{
+  // second stage - make Universal AST nodes
+  const uast = []
+  const res = toAny({ processor: 1 })
+    .use({
+      '*:*': (writer, processor) => (node, ctx, interator) => {
         console.warn('[Podlite:md2ast]- unhandled MD node')
-        console.warn(JSON.stringify(node,null,2))
-        if (node.children) interator(node.children, { ...ctx})
-    }})
+        console.warn(JSON.stringify(node, null, 2))
+        if (node.children) interator(node.children, { ...ctx })
+      },
+    })
     .use({
-        ':root' : ( writer, processor )=>( node, ctx, interator )=>{
-            const { children, position, ...attr} = node 
-            return mkRootBlock({}, interator(children, ctx))
-        },
-        ':heading' :  ( writer, processor )=>( node, ctx, interator )=>{
-            const { children, position, ...attr} = node
-            return mkBlock({type:'block', level:node.depth,name:'head', location:applyLineOffset(position)},  interator(children, ctx));
-        },
-        ':text' :  ( writer, processor )=>( node, ctx, interator )=>{
-            const { children, position, ...attr} = node
-            return node.value
-            // return mkNode({type:"text", value: node.value})
-        },
-        ':list' :  ( writer, processor )=>( node, ctx, interator )=>{
-            const savedListLevel = ctx['listLevel'] || 0
-            const { children, position, ...attr} = node
-            return mkBlock( { type:'list', level:savedListLevel+1, list: node.ordered ? 'ordered' : 'itemized' }, interator(children, { ...ctx, listLevel : savedListLevel + 1, ordered: node.ordered}))
-        },
-        ':listItem' :  ( writer, processor )=>( node, ctx, interator )=>{
-            const savedListLevel = ctx['listLevel'] || 0
-            const { children, position, ...attr} = node
-            return mkBlock({name: 'item', type:'block', level:ctx['listLevel'], location:applyLineOffset(position)}, interator(children, { ...ctx, listLevel : savedListLevel , ordered: node.ordered}))
-        },
-        ':paragraph' :  ( writer, processor )=>( node, ctx, interator )=>{
-            const { children, position, ...attr} = node
-            return mkBlock({type:'para', location:applyLineOffset(position), text: 'text', margin:"",}, interator(children, { ...ctx}))
-        },
-        ':linkReference' : ( writer, processor )=>( node, ctx, interator )=>{
-            const { children, position, ...attr} = node
-            const definition = definitionMap[attr.identifier]
-            const meta = definition?.url || ''
-            return mkFomattingCodeL({ meta}, interator(children, { ...ctx}))
-        },
-        ':definition' : ( writer, processor )=>( node, ctx, interator )=>{
-            return null
-        },
-        ':inlineCode' : ( writer, processor )=>( node, ctx, interator )=>{
-            const { children, position, ...attr} = node
-            return mkFomattingCode({name:"C"}, [node.value])
-        },
-        ':strong' : ( writer, processor )=>( node, ctx, interator )=>{
-            const { children, position, ...attr} = node
-            return mkFomattingCode({name:"B"}, interator(children, { ...ctx}))
-        },
-        ':emphasis' : ( writer, processor )=>( node, ctx, interator )=>{
-            const { children, position, ...attr} = node
-            return mkFomattingCode({name:"I"}, interator(children, { ...ctx}))
-        },
-        ':link': ( writer, processor )=>( node, ctx, interator )=>{ 
-            const { children, position, ...attr} = node
-            return mkFomattingCodeL({ meta:node.url}, interator(children, { ...ctx}))
-        },
-        ':html': ( writer, processor )=>( node, ctx, interator )=>{
-            const { children, position, ...attr} = node 
-            return mkBlock({type:'block', name:'Html', location:applyLineOffset(position)},[mkVerbatim(node.value)]);
-        },
-        ':code' : ( writer, processor )=>( node, ctx, interator )=>{
-            const { children, position, lang, meta, ...attr} = node
-            if (lang === 'mermaid' || lang === 'diagram') {
-                return mkBlock({type:'block', name:'Diagram', config:[], location:applyLineOffset(position)},[mkVerbatim(node.value)]);
-            }
-            let config = []
-            if (lang) { config.push({ name: 'lang', value:lang, type:"string"})}
-            if (meta) { config.push({ name: 'meta', value:meta, type:"string"})} //  filled as is from markdown
-            return mkBlock({type:'block', name:'code', config, location:applyLineOffset(position)},[mkVerbatim(node.value)]);
-        },
-        ':image':  ( writer, processor )=>( node, ctx, interator ):BlockImage=>{
-            const { title, alt, url, position, ...attr} = node
-            let config = []
-            return mkBlock({type:'block', name:'Image', config, location:applyLineOffset(position)},[mkImage(url,alt),mkCaption([title])]);
-        },
-        ':thematicBreak': ( writer, processor )=>( node, ctx, interator )=>{
-            return null // TODO: add support for "thematic break"
-        },
-        ':blockquote' :  ( writer, processor )=>( node, ctx, interator )=>{
-            const { children, position, ...attr} = node
-            return mkBlock({name:'nested', location:applyLineOffset(position)}, interator(children, { ...ctx}))
-        },
-        //table section
-        ':table' :  ( writer, processor )=>( node, ctx, interator )=>{
-            const { children, position, ...attr} = node
-            return mkBlock({name:'table', location:applyLineOffset(position)}, interator(children, { ...ctx}))
-        },
-        ':tableRow' :  ( writer, processor )=>( node, ctx, interator )=>{
-            const { children, position, ...attr} = node
-            return mkBlock({name:'table_row', location:applyLineOffset(position)}, interator(children, { ...ctx}))
-        },
-        ':tableCell' :  ( writer, processor )=>( node, ctx, interator )=>{
-            const { children, position, ...attr} = node
-            return mkBlock({name:'table_cell', location:applyLineOffset(position)}, interator(children, { ...ctx}))
-        },
-        ':delete': ( writer, processor )=>( node, ctx, interator )=>{
-            const { children, position, ...attr} = node
-            return mkFomattingCodeDelete( interator(children, { ...ctx}))
-        },
-        ':break': ( writer, processor )=>( node, ctx, interator )=>{
-            return null
-        },
-    }).run(md_tree)
-    return res.interator
-}
+      ':root': (writer, processor) => (node, ctx, interator) => {
+        const { children, position, ...attr } = node
+        return mkRootBlock({}, interator(children, ctx))
+      },
+      ':heading': (writer, processor) => (node, ctx, interator) => {
+        const { children, position, ...attr } = node
+        return mkBlock(
+          { type: 'block', level: node.depth, name: 'head', location: applyLineOffset(position) },
+          interator(children, ctx),
+        )
+      },
+      ':text': (writer, processor) => (node, ctx, interator) => {
+        const { children, position, ...attr } = node
+        return node.value
+        // return mkNode({type:"text", value: node.value})
+      },
+      ':list': (writer, processor) => (node, ctx, interator) => {
+        const savedListLevel = ctx['listLevel'] || 0
+        const { children, position, ...attr } = node
+        return mkBlock(
+          { type: 'list', level: savedListLevel + 1, list: node.ordered ? 'ordered' : 'itemized' },
+          interator(children, { ...ctx, listLevel: savedListLevel + 1, ordered: node.ordered }),
+        )
+      },
+      ':listItem': (writer, processor) => (node, ctx, interator) => {
+        const savedListLevel = ctx['listLevel'] || 0
+        const { children, position, ...attr } = node
+        return mkBlock(
+          { name: 'item', type: 'block', level: ctx['listLevel'], location: applyLineOffset(position) },
+          interator(children, { ...ctx, listLevel: savedListLevel, ordered: node.ordered }),
+        )
+      },
+      ':paragraph': (writer, processor) => (node, ctx, interator) => {
+        const { children, position, ...attr } = node
+        return mkBlock(
+          { type: 'para', location: applyLineOffset(position), text: 'text', margin: '' },
+          interator(children, { ...ctx }),
+        )
+      },
+      ':linkReference': (writer, processor) => (node, ctx, interator) => {
+        const { children, position, ...attr } = node
+        const definition = definitionMap[attr.identifier]
+        const meta = definition?.url || ''
+        return mkFomattingCodeL({ meta }, interator(children, { ...ctx }))
+      },
+      ':definition': (writer, processor) => (node, ctx, interator) => {
+        return null
+      },
+      ':inlineCode': (writer, processor) => (node, ctx, interator) => {
+        const { children, position, ...attr } = node
+        return mkFomattingCode({ name: 'C' }, [node.value])
+      },
+      ':strong': (writer, processor) => (node, ctx, interator) => {
+        const { children, position, ...attr } = node
+        return mkFomattingCode({ name: 'B' }, interator(children, { ...ctx }))
+      },
+      ':emphasis': (writer, processor) => (node, ctx, interator) => {
+        const { children, position, ...attr } = node
+        return mkFomattingCode({ name: 'I' }, interator(children, { ...ctx }))
+      },
+      ':link': (writer, processor) => (node, ctx, interator) => {
+        const { children, position, ...attr } = node
+        return mkFomattingCodeL({ meta: node.url }, interator(children, { ...ctx }))
+      },
+      ':html': (writer, processor) => (node, ctx, interator) => {
+        const { children, position, ...attr } = node
+        return mkBlock({ type: 'block', name: 'Html', location: applyLineOffset(position) }, [mkVerbatim(node.value)])
+      },
+      ':code': (writer, processor) => (node, ctx, interator) => {
+        const { children, position, lang, meta, ...attr } = node
+        if (lang === 'mermaid' || lang === 'diagram') {
+          return mkBlock({ type: 'block', name: 'Diagram', config: [], location: applyLineOffset(position) }, [
+            mkVerbatim(node.value),
+          ])
+        }
+        let config = []
+        if (lang) {
+          config.push({ name: 'lang', value: lang, type: 'string' })
+        }
+        if (meta) {
+          config.push({ name: 'meta', value: meta, type: 'string' })
+        } //  filled as is from markdown
+        return mkBlock({ type: 'block', name: 'code', config, location: applyLineOffset(position) }, [
+          mkVerbatim(node.value),
+        ])
+      },
+      ':image':
+        (writer, processor) =>
+        (node, ctx, interator): BlockImage => {
+          const { title, alt, url, position, ...attr } = node
+          let config = []
+          return mkBlock({ type: 'block', name: 'Image', config, location: applyLineOffset(position) }, [
+            mkImage(url, alt),
+            mkCaption([title]),
+          ])
+        },
+      ':thematicBreak': (writer, processor) => (node, ctx, interator) => {
+        return null // TODO: add support for "thematic break"
+      },
+      ':blockquote': (writer, processor) => (node, ctx, interator) => {
+        const { children, position, ...attr } = node
+        return mkBlock({ name: 'nested', location: applyLineOffset(position) }, interator(children, { ...ctx }))
+      },
+      //table section
+      ':table': (writer, processor) => (node, ctx, interator) => {
+        const { children, position, ...attr } = node
+        return mkBlock({ name: 'table', location: applyLineOffset(position) }, interator(children, { ...ctx }))
+      },
+      ':tableRow': (writer, processor) => (node, ctx, interator) => {
+        const { children, position, ...attr } = node
+        return mkBlock({ name: 'table_row', location: applyLineOffset(position) }, interator(children, { ...ctx }))
+      },
+      ':tableCell': (writer, processor) => (node, ctx, interator) => {
+        const { children, position, ...attr } = node
+        return mkBlock({ name: 'table_cell', location: applyLineOffset(position) }, interator(children, { ...ctx }))
+      },
+      ':delete': (writer, processor) => (node, ctx, interator) => {
+        const { children, position, ...attr } = node
+        return mkFomattingCodeDelete(interator(children, { ...ctx }))
+      },
+      ':break': (writer, processor) => (node, ctx, interator) => {
+        return null
+      },
+    })
+    .run(md_tree)
+  return res.interator
+}