podlite 0.0.8 → 0.0.12

package/CHANGELOG.md

@@ -1,7 +1,13 @@
 # @podlite
 
 ## Upcoming
-
+## 0.0.12
+- add id prop to AST Schema
+- add =Toc plugin
+## 0.0.10
+- update deps
+## 0.0.9
+- fix md transforms
 ## 0.0.8
 - update deps
 

package/jest.config.js

@@ -1,30 +1,2 @@
-/*
- * https://jestjs.io/docs/en/configuration.html
- * https://kulshekhar.github.io/ts-jest/user/config/
- */
-module.exports = {
-    globals: {
-        'ts-jest': {
-            // ts-jest configuration goes here
-            diagnostics: {
-                // https://github.com/kulshekhar/ts-jest/issues/748
-                ignoreCodes: [151001]
-            }
-        }
-    },
-    // Aliases for imports in test files, as 'ts-jest' (and jest) don't use tsconfig.paths!
-    // https://github.com/kulshekhar/ts-jest/issues/414
-    moduleNameMapper: {
-        "^src/(.*)": "<rootDir>/src/$1",
-        "^tests/(.*)": "<rootDir>/tests/$1"
-    },
-    preset: 'ts-jest',
-    // setupFilesAfterEnv: ["<rootDir>/tests/setupTests.ts"],
-    //testEnvironment: 'node',
-    testEnvironment: 'jsdom',
-    testMatch: [
-        '<rootDir>/tests/**/?(*.)test.[jt]s?(x)',
-        "**/?(*.)+(spec|test).[jt]s?(x)"
-    ],
-    verbose: true
-};
+
+module.exports = require('../../jest.config')

package/jest.tsconfig.json

@@ -0,0 +1 @@
+{"extends": "../../jest.tsconfig.json"}

package/lib/ids.d.ts

@@ -0,0 +1,18 @@
+import { Plugin } from 'pod6/built/';
+/**
+ * Clean ids from tree
+ * @returns
+ */
+export declare const cleanIds: (src?: {
+    skipChain: number;
+    podMode: number;
+}) => (tree: any) => any;
+/**
+ * Add set id to 'id' to each blocks
+ */
+export declare const frozenIds: (src?: {
+    skipChain: number;
+    podMode: number;
+}) => (tree: any) => any;
+declare const middleware: Plugin;
+export default middleware;

package/lib/ids.js

@@ -0,0 +1,68 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.frozenIds = exports.cleanIds = void 0;
+const makeTransformer_1 = __importDefault(require("pod6/built/helpers/makeTransformer"));
+const nanoid_1 = require("nanoid");
+/**
+ * Clean ids from tree
+ * @returns
+ */
+const cleanIds = (src = { skipChain: 0, podMode: 1 }) => (tree) => {
+    const transformerBlocks = (0, makeTransformer_1.default)({
+        '*': (node, ctx, visiter) => {
+            if ('id' in node) {
+                if ('content' in node) {
+                    node.content = visiter(node.content, ctx);
+                }
+                const { id, ...rest } = node;
+                return { ...rest, };
+            }
+            return node;
+        }
+    });
+    return transformerBlocks(tree, {});
+};
+exports.cleanIds = cleanIds;
+/**
+ * Add set id to 'id' to each blocks
+ */
+const frozenIds = (src = { skipChain: 0, podMode: 1 }) => (tree) => {
+    const transformerBlocks = (0, makeTransformer_1.default)({
+        '*': (node, ctx, visiter) => {
+            if ('id' in node) {
+                if ('content' in node) {
+                    node.content = visiter(node.content, ctx);
+                }
+                const { id, ...rest } = node;
+                return { ...rest, id: 'id' };
+            }
+            return node;
+        }
+    });
+    return transformerBlocks(tree, {});
+};
+exports.frozenIds = frozenIds;
+const middleware = () => (tree) => {
+    const transformerBlocks = (0, makeTransformer_1.default)({
+        '*': (node, ctx, visiter) => {
+            const addIdField = (node) => {
+                if (typeof node === 'object' && 'type' in node && node.type == 'block') {
+                    return { ...node, id: (0, nanoid_1.nanoid)() };
+                }
+                return node;
+            };
+            const processContent = (node) => {
+                if (typeof node === 'object' && 'content' in node) {
+                    return { ...node, content: visiter(node.content, ctx) };
+                }
+                return node;
+            };
+            return processContent(addIdField(node));
+        }
+    });
+    return transformerBlocks(tree, {});
+};
+exports.default = middleware;

package/{built → lib}/index.d.ts

@@ -1,6 +1,6 @@
 import { Plugins, PodliteDocument } from '@podlite/schema';
-export * from './mdtopod6';
-export * from './tools';
+import { cleanIds, frozenIds } from './ids';
+export { cleanIds, frozenIds };
 export interface PodliteOpt {
     importPlugins: boolean;
 }

package/lib/index.js

@@ -0,0 +1,102 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.podlite = exports.toAnyRules = exports.frozenIds = exports.cleanIds = void 0;
+const pod6_1 = require("pod6");
+const exportAny_1 = __importDefault(require("pod6/built/exportAny"));
+const schema_1 = require("@podlite/schema");
+// export * from './mdtopod6';
+// export  * from './tools'
+const plugins_1 = __importDefault(require("./plugins"));
+const extrnal_1 = __importDefault(require("./plugins/extrnal"));
+const ids_1 = __importDefault(require("./ids"));
+const ids_2 = require("./ids");
+Object.defineProperty(exports, "cleanIds", { enumerable: true, get: function () { return ids_2.cleanIds; } });
+Object.defineProperty(exports, "frozenIds", { enumerable: true, get: function () { return ids_2.frozenIds; } });
+const toAnyRules = (method, allplugins) => {
+    // make uniq plugins
+    const resultMap = allplugins.reverse().reduce((result, plugins) => {
+        for (const plugin of Object.entries(plugins)) {
+            const [key, val] = plugin;
+            if (!(key in result)) {
+                result[key] = val;
+            }
+        }
+        return result;
+    }, {});
+    let result = {};
+    // prepare plugins for export <method>
+    for (const plugin of Object.entries(resultMap)) {
+        const [key, val = {}] = plugin;
+        //@ts-ignore
+        if (method in val) {
+            result[key] = val[method];
+        }
+    }
+    return result;
+};
+exports.toAnyRules = toAnyRules;
+const podlite = ({ importPlugins = true }) => {
+    let instance = function () { };
+    let plugins = [];
+    instance.use = (onj) => {
+        for (const plugin of Object.entries(onj)) {
+            const [key, val] = plugin;
+            if (typeof val === 'function') {
+                plugins.push({ [key]: { toAst: val } });
+            }
+            else {
+                plugins.push({ [key]: val });
+            }
+        }
+        return instance;
+    };
+    instance.parse = (text, opt) => {
+        const rawTree = (0, pod6_1.toTree)().use(ids_1.default).parse(text, opt = { skipChain: 0, podMode: 1 });
+        const root = (0, schema_1.mkRootBlock)({ margin: "" }, rawTree);
+        return root;
+    };
+    instance.toAst = (ast) => {
+        return instance.toAstResult(ast).interator;
+    };
+    instance.toAstResult = (ast) => {
+        // get plugins  for Ast
+        const toAstPlugins = (0, exports.toAnyRules)('toAst', instance.getPlugins());
+        const result = (0, exportAny_1.default)().use({
+            '*': () => (node, ctx, interator) => {
+                if ('content' in node) {
+                    node.content = interator(node.content, ctx);
+                }
+                return node;
+            }
+        }).use(toAstPlugins).run(ast);
+        // add second pass
+        const toAstAfterPlugins = (0, exports.toAnyRules)('toAstAfter', instance.getPlugins());
+        if (Object.keys(toAstAfterPlugins).length) {
+            const resultAfter = (0, exportAny_1.default)().use({
+                '*': () => (node, ctx, interator) => {
+                    if ('content' in node) {
+                        node.content = interator(node.content, ctx);
+                    }
+                    return node;
+                }
+            }).use(toAstAfterPlugins).run(ast);
+            return resultAfter;
+        }
+        return result;
+    };
+    instance.toHtml = (ast) => {
+        const toHtmlPlugins = (0, exports.toAnyRules)('toHtml', instance.getPlugins());
+        return (0, pod6_1.toHtml)({}).use(toHtmlPlugins).run(ast, null);
+    };
+    instance.getPlugins = () => plugins;
+    // init core plugins
+    instance.use(plugins_1.default);
+    if (importPlugins) {
+        instance.use(extrnal_1.default);
+    }
+    return instance;
+};
+exports.podlite = podlite;

package/lib/mdtopod6.js

@@ -0,0 +1,109 @@
+// import  unified  from 'unified'
+// import markdown  from 'remark-parse'
+// import toAny  from 'pod6/built/exportAny'
+// export const mdToPod6 = (src, extraRules? ) => {
+//     const md_tree = unified().use(markdown).parse(src)
+//     let definitionMap = {}
+//     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)
+//     const  res = toAny({processor:1})
+//     .use({'*:*':( writer, processor )=>( node, ctx, interator )=>{
+//         console.warn(node)
+//         if (node.children) interator(node.children, { ...ctx})
+//     }})
+//     .use({
+//         ':root': ( writer, processor )=>( node, ctx, interator )=>{
+//             // handle text with content
+//             const { children, position, ...attr} = node
+//             writer.write( "=begin pod\n")
+//             interator( children, ctx )
+//             writer.write( "=end pod\n")
+//         },
+//         ':heading' :  ( writer, processor )=>( node, ctx, interator )=>{
+//             const { children, position, ...attr} = node
+//             writer.write( `=head${node.depth} `)
+//             if (children) interator( children, ctx )
+//             writer.write( "\n")
+//         },
+//         ':text' :  ( writer, processor )=>( node, ctx, interator )=>{
+//             const { children, position, ...attr} = node
+//             writer.writeRaw(node.value)
+//             if (children) interator( children, ctx )
+//         },
+//         ':list' :  ( writer, processor )=>( node, ctx, interator )=>{
+//             // console.error(node)
+//             const savedListLevel = ctx['listLevel'] || 0
+//             const newctx = { ...ctx, listLevel:savedListLevel+1, ordered: node.ordered ? 'ordered' : 'itemized'}
+//             const { children, position, ...attr} = node
+//             if (children) interator( children, newctx )
+//         },
+//         ':listItem' :  ( writer, processor )=>( node, ctx, interator )=>{
+//             const { children, position, ...attr} = node
+//             // console.error(node)
+//             writer.write(`=begin item${ctx['listLevel']} ${ctx.ordered ? ":numbered" : ''} \n`)
+//             if (children) { interator( children, ctx ) }
+//             writer.write(`=end item${ctx['listLevel']}\n`)
+//         },
+//         ':paragraph' :  ( writer, processor )=>( node, ctx, interator )=>{
+//             const { children, position, ...attr} = node
+//             writer.write(`=begin para\n`)
+//             if (children) { interator( children, ctx ) }
+//             writer.write(`\n=end para\n`)
+//         },
+//         ':linkReference' : ( writer, processor )=>( node, ctx, interator )=>{
+//             // console.log(log(node))
+//             const { children, position, ...attr} = node
+//             const definition = definitionMap[attr.identifier]
+//             const meta = definition?.url || ''
+//             writer.write(`L<`)
+//             if (children) { interator( children, ctx ) }
+//             writer.write(`|${meta}>`)
+//         },
+//         ':definition' : ( writer, processor )=>( node, ctx, interator )=>{
+//             return null
+//         },
+//         ':inlineCode' : ( writer, processor )=>( node, ctx, interator )=>{
+//             const { children, position, ...attr} = node
+//             writer.write(`C<${node.value}>`)
+//         },
+//         ':strong' : ( writer, processor )=>( node, ctx, interator )=>{
+//             const { children, position, ...attr} = node
+//             writer.write(`B<`)
+//             if (children) { interator( children, ctx ) }
+//             writer.write(`>`)
+//         },
+//         ':link': ( writer, processor )=>( node, ctx, interator )=>{ 
+//             const { children, position, ...attr} = node
+//             writer.write(`L<`)
+//             if (children) { interator( children, ctx ) }
+//             writer.write(`|${node.url}>`)
+//         },
+//         ':image': ( writer, processor )=>( node, ctx, interator )=>{
+//             const { children, position, ...attr} = node 
+//             writer.write(`=begin Image :title('${node.title}') :alt('${node.alt}')\n`)
+//             writer.write(node.url)
+//             writer.write(`\n=end Image\n`)
+//         },
+//         ':html': ( writer, processor )=>( node, ctx, interator )=>{
+//             const { children, position, ...attr} = node 
+//             writer.write(`=begin Html\n`)
+//             writer.write(`${node.value}`)
+//             writer.write(`\n=end Html\n`)
+//         },
+//         ':code' : ( writer, processor )=>( node, ctx, interator )=>{
+//             // console.log(JSON.stringify(node,null,2))
+//             const { children, position, lang, ...attr} = node
+//             writer.write(`=begin code ${lang ? ':lang(\''+lang+'\')' : ""}\n`)
+//             writer.write(`${node.value}`)
+//             writer.write(`\n=end code\n`)
+//         },
+//         ...extraRules
+//     },
+//     ).run(md_tree) 
+//     return res.toString()
+// }

package/{built → lib}/plugins/extrnal.js

@@ -3,10 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var image_1 = __importDefault(require("@podlite/image"));
-var diagram_1 = require("@podlite/diagram");
-var external = {
+const image_1 = __importDefault(require("@podlite/image"));
+const diagram_1 = require("@podlite/diagram");
+const toc_1 = __importDefault(require("@podlite/toc"));
+const external = {
     "Image": image_1.default,
-    Diagram: diagram_1.plugin
+    Diagram: diagram_1.plugin,
+    Toc: toc_1.default
 };
 exports.default = external;

package/{built → lib}/plugins/index.d.ts

@@ -3,10 +3,10 @@ export declare const core: {
         toHtml: (writer: any) => (node: any) => void;
     };
     image: {
-        toHtml: any;
+        toHtml: import("pod6/built/helpers/makeQuery").RuleHandler<any>;
     };
     root: {
-        toHtml: any;
+        toHtml: import("pod6/built/helpers/makeQuery").RuleHandler<any>;
     };
 };
 export default core;

package/{built → lib}/plugins/index.js

@@ -1,19 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.core = void 0;
-var handlers_1 = require("pod6/built/helpers/handlers");
+const handlers_1 = require("pod6/built/helpers/handlers");
 exports.core = {
     ':image': {
-        toHtml: function (writer) { return function (node) {
+        toHtml: (writer) => (node) => {
             if (typeof node !== "string" && 'type' in node && node.type === 'image') {
-                writer.writeRaw("<img");
-                writer.writeRaw(" src=\"" + node.src + "\"");
+                writer.writeRaw(`<img`);
+                writer.writeRaw(` src="${node.src}"`);
                 if (node.alt) {
-                    writer.writeRaw(" alt=\"" + node.alt + "\"");
+                    writer.writeRaw(` alt="${node.alt}"`);
                 }
-                writer.writeRaw("/>");
+                writer.writeRaw(`/>`);
             }
-        }; }
+        }
     },
     'image': {
         toHtml: handlers_1.content

package/lib/tools.js

@@ -0,0 +1,124 @@
+// import  unified  from 'unified'
+// import markdown  from 'remark-parse'
+// import toAny  from 'pod6/built/exportAny'
+// import { AstTree, BlockImage, Location, mkBlock, mkFomattingCode, mkFomattingCodeL, mkVerbatim } from '@podlite/schema'
+// export const  md2ast = ( src, extraRules? ) :AstTree => {
+//     // first convert mardown to ast 
+//     const md_tree = unified().use(markdown).parse(src)
+//     // first pass : collect linkRefs
+//     let definitionMap = {}
+//     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)
+//     // second stage - make Universal AST nodes
+//     const uast = []
+//     const  res = toAny({processor:1})
+//     .use({'*:*':( writer, processor )=>( node, ctx, interator )=>{
+//         console.warn('[Podlite]')
+//         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 mkBlock({name:"pod", location:position}, interator(children, ctx))
+//         },
+//         ':heading' :  ( writer, processor )=>( node, ctx, interator )=>{
+//             const { children, position, ...attr} = node
+//             return mkBlock({type:'block', level:node.depth,name:'head', location: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: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:position}, 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", location:position}, [node.value])
+//         },
+//         ':strong' : ( writer, processor )=>( node, ctx, interator )=>{
+//             const { children, position, ...attr} = node
+//             return mkFomattingCode({name:"B", location:position}, interator(children, { ...ctx}))
+//         },
+//         ':emphasis' : ( writer, processor )=>( node, ctx, interator )=>{
+//             const { children, position, ...attr} = node
+//             return mkFomattingCode({name:"I", location:position}, interator(children, { ...ctx}))
+//         },
+//         ':link': ( writer, processor )=>( node, ctx, interator )=>{ 
+//             const { children, position, ...attr} = node
+//             return mkFomattingCodeL({ meta:node.url,location:position}, interator(children, { ...ctx}))
+//         },
+//         ':html': ( writer, processor )=>( node, ctx, interator )=>{
+//             const { children, position, ...attr} = node 
+//             return mkBlock({type:'block', name:'Html', location:position},[mkVerbatim(node.value)]);
+//         },
+//         ':code' : ( writer, processor )=>( node, ctx, interator )=>{
+//             const { children, position, lang, ...attr} = node
+//             let config = {}
+//             if (lang) { config = { name: 'lang', value:"lang"}}
+//             return mkBlock({type:'block', name:'code', config, location:position},[mkVerbatim(node.value)]);
+//         },
+//         ':image':  ( writer, processor )=>( node, ctx, interator )=>{
+//             const { title, alt, url, position, ...attr} = node
+//             let config = []
+//             if (!!title) { config.push({ name: 'title', value:title}) }
+//             if (!!alt) { config.push({ name: 'alt', value:alt}) }
+//             return mkBlock({type:'block', name:'Image', config, location:position},[mkVerbatim(url)]);
+//         },
+//         ':thematicBreak': ( writer, processor )=>( node, ctx, interator )=>{
+//             return null
+//         },
+//         ':blockquote' :  ( writer, processor )=>( node, ctx, interator )=>{
+//             const { children, position, ...attr} = node
+//             return mkBlock({type:'nested'}, interator(children, { ...ctx}))
+//         },
+//         //table section
+//         ':table' :  ( writer, processor )=>( node, ctx, interator )=>{
+//             const { children, position, ...attr} = node
+//             return mkBlock({name:'table', location:position}, interator(children, { ...ctx}))
+//         },
+//         ':tableRow' :  ( writer, processor )=>( node, ctx, interator )=>{
+//             const { children, position, ...attr} = node
+//             return mkBlock({name:'table_row', location:position}, interator(children, { ...ctx}))
+//         },
+//         ':tableCell' :  ( writer, processor )=>( node, ctx, interator )=>{
+//             const { children, position, ...attr} = node
+//             return mkBlock({name:'table_cell', location:position}, interator(children, { ...ctx}))
+//         },
+//         ':delete': ( writer, processor )=>( node, ctx, interator )=>{
+//             return null
+//         },
+//         ':break': ( writer, processor )=>( node, ctx, interator )=>{
+//             return null
+//         },
+//         ...extraRules
+//     }).run(md_tree)
+//     return res.interator
+// }

package/package.json

@@ -1,14 +1,12 @@
 {
   "name": "podlite",
-  "version": "0.0.8",
+  "version": "0.0.12",
   "description": "Adaptation of pod6 markup language",
   "main": "index.js",
-  "types": "./built/index.d.ts",
+  "types": "./lib/index.d.ts",
   "scripts": {
-    "clean": "rm -rf built tsconfig.tsbuildinfo",
-    "test": "yarn build && jest",
-    "build": "run-s build:ts",
-    "build:ts": "tsc",
+    "test": "yarn g:jest --passWithNoTests",
+    "build": "tsc",
     "watch": "run-p -r watch:*",
     "watch:ts": "tsc -w --pretty",
     "watch:tests": "jest --watch -t \"test\""
@@ -21,27 +19,24 @@
   "author": "Alexandr Zahatski",
   "license": "MIT",
   "dependencies": {
-    "@podlite/diagram": "^0.0.4",
-    "@podlite/image": "^0.0.4",
-    "@podlite/schema": "^0.0.3",
-    "pod6": "0.0.38",
-    "remark-parse": "8.0.3",
-    "unified": "9.2.0"
+    "@podlite/diagram": "^0.0.8",
+    "@podlite/image": "^0.0.8",
+    "@podlite/schema": "^0.0.7",
+    "@podlite/toc": "0.0.1",
+    "nanoid": "^3.1.30",
+    "pod6": "0.0.43"
   },
   "devDependencies": {
-    "@podlite/schema": "*",
     "@types/jest": "^26.0.21",
     "@types/node": "^14.11.2",
-    "jest": "^26.5.2",
     "npm-run-all": "^4.1.5",
-    "ts-jest": "^26.4.1",
-    "typescript": "4.2.3"
+    "typescript": "4.5.4"
   },
   "peerDependencies": {
-    "@podlite/diagram": "*",
-    "@podlite/image": "*",
-    "@podlite/schema": "*",
     "pod6": "*"
   },
-  "gitHead": "658ca02b7366520f9516d86249622bc47f60a620"
-}
+  "publishConfig": {
+    "access": "public",
+    "main": "index.js"
+  }
+}