@podlite/schema 0.0.17 → 0.0.19

package/lib/helpers/ids.d.ts

@@ -15,7 +15,7 @@ export declare const frozenIds: (src?: {
     skipChain: number;
     podMode: number;
 }) => (tree: any) => any;
-export declare const cleanLocalHrefs: (src?: {
+export declare const setAllLinksToAnchor: (src?: {
     skipChain: number;
     podMode: number;
 }) => (tree: any) => any;

package/lib/helpers/ids.js

@@ -1,8 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cleanLocalHrefs = exports.frozenIds = exports.slugifyText = exports.cleanIds = void 0;
+exports.setAllLinksToAnchor = exports.frozenIds = exports.slugifyText = exports.cleanIds = void 0;
 const __1 = require("..");
 const nanoid_1 = require("nanoid");
+const slugify_1 = __importDefault(require("slugify"));
 /**
  * Clean ids from tree
  * @returns
@@ -25,12 +29,7 @@ const cleanIds = (src = { skipChain: 0, podMode: 1 }) => tree => {
 exports.cleanIds = cleanIds;
 // TODO: refactor linking for blocks
 const slugifyText = (text) => {
-    // https://github.com/microsoft/vscode/blob/master/extensions/markdown-language-features/src/slugify.ts
-    return text.trim()
-        //    .toLowerCase()
-        .replace(/\s+/g, '-')
-        .replace(/[\]\[\!\/\'\"\#\$\%\&\(\)\*\+\,\.\/\:\;\<\=\>\?\@\\\^\{\|\}\~\`。，、；：？！…—·ˉ¨‘’“”々～‖∶＂＇｀｜〃〔〕〈〉《》「」『』．〖〗【】（）［］｛｝]/g, '')
-        .replace(/^\-+/, '');
+    return (0, slugify_1.default)(text.trim(), {});
 };
 exports.slugifyText = slugifyText;
 /**
@@ -52,7 +51,7 @@ const frozenIds = (src = { skipChain: 0, podMode: 1 }) => tree => {
     return transformerBlocks(tree, {});
 };
 exports.frozenIds = frozenIds;
-const cleanLocalHrefs = (src = { skipChain: 0, podMode: 1 }) => tree => {
+const setAllLinksToAnchor = (src = { skipChain: 0, podMode: 1 }) => tree => {
     const transformerBlocks = (0, __1.makeTransformer)({
         'L<>': (node, ctx, visiter) => {
             if ('meta' in node) {
@@ -67,7 +66,7 @@ const cleanLocalHrefs = (src = { skipChain: 0, podMode: 1 }) => tree => {
     });
     return transformerBlocks(tree, {});
 };
-exports.cleanLocalHrefs = cleanLocalHrefs;
+exports.setAllLinksToAnchor = setAllLinksToAnchor;
 const middleware = () => tree => {
     const transformerBlocks = (0, __1.makeTransformer)({
         '*': (node, ctx, visiter) => {

package/lib/helpers/makeInterator.js

@@ -35,7 +35,7 @@ function thisFunc(rules) {
                 }
             };
             if (typeof reversed[ruleIndex].fn !== 'function') {
-                console.warn('[pod6] bad fn for ' + JSON.stringify(node, null, 2));
+                console.warn('[podlite] bad fn for ' + JSON.stringify(node, null, 2));
             }
             return reversed[ruleIndex].fn(node, context, interator, defaultFn);
         }

package/lib/helpers/makeQuery.js

@@ -53,11 +53,11 @@ function is(query, node) {
         return true;
     for (var prop in query) {
         if (query === undefined) {
-            console.warn('[pod6] undefined key!!!');
+            console.warn('[podlite] undefined key!!!');
         }
         if (query.hasOwnProperty(prop)) {
             if (node === undefined) {
-                console.warn('[pod6] undefined node!!!');
+                console.warn('[podlite] undefined node!!!');
             }
             if (node && node.hasOwnProperty(prop)) {
                 if (query[prop] !== node[prop]) {

package/lib/helpers/makeTransformer.js

@@ -21,7 +21,7 @@ const makeTransformer = rule => {
     let rules = [];
     function use(key, fn) {
         if (key instanceof Array) {
-            console.warn(`[pod] Unsupported param for ${key}`);
+            console.warn(`[podlite] Unsupported param for ${key}`);
         }
         if (key instanceof Object) {
             for (var prop in key) {

package/lib/plugin-formatting-codes.js

@@ -51,25 +51,31 @@ const middle = () => tree => {
             const isDataBlock = 'name' in n && n.name === 'data';
             const isMarkdownBlock = 'name' in n && n.name === 'markdown';
             const isPictureBlock = 'name' in n && n.name === 'picture';
-            const allowValues = conf.getAllValues('allow');
+            const isFormulaBlock = 'name' in n && n.name === 'formula';
+            const allowValues = [...conf.getAllValues('allow'), ...(isCodeBlock ? ['NONE'] : [])];
+            if ((0, makeTransformer_2.isNamedBlock)(n.name))
+                return n;
             // for code block not parse content by default
-            if ((isCodeBlock || isDataBlock || isMarkdownBlock || isPictureBlock) && allowValues.length == 0)
+            if ((isCodeBlock || isDataBlock || isMarkdownBlock || isPictureBlock || isFormulaBlock) &&
+                allowValues.length == 0)
                 return n;
             const allowed = allowValues.sort();
             const transformer = (0, makeTransformer_1.default)({
                 ':verbatim': (n, ctx) => {
+                    // special case for code block, 'NONE' - flag disabled all markup codes
+                    // do not parse content by default
+                    if (allowed.length == 1 && allowed.includes('NONE'))
+                        return n;
                     return fcparser.parse(n.value, { allowed });
                 },
                 ':text': (n, ctx) => {
                     return fcparser.parse(n.value, { allowed });
                 },
                 ':block': (n, ctx) => {
-                    if ((0, makeTransformer_2.isNamedBlock)(n.name))
-                        return n;
-                    return { ...n, content: transformer(n.content, { ...ctx }) };
+                    return transformerBlocks(n, { ...ctx });
                 },
             });
-            return transformer(n, { ...ctx });
+            return { ...n, content: transformer(n.content, { ...ctx }) };
         },
     });
     return transformerBlocks(tree, {});

package/lib/types.d.ts

@@ -1,11 +1,18 @@
+import * as React from 'react';
 export interface RuleHandler<T = any> {
     (writer: any, processor: any, tree: PodliteDocument): (node: T, ctx: any, interator: any) => void | AstTree | PodNode;
 }
-export interface Plugin {
-    toAst?: RuleHandler;
-    toAstAfter?: RuleHandler;
-    toHtml?: RuleHandler;
-    toJSX?: (helper: any) => RuleHandler;
+declare type createComponentParams = PodNode & {
+    children: React.ReactNode[];
+} & {
+    key: string | number;
+};
+export declare type JSXHelper = (src: string | (({}: createComponentParams, children: React.ReactNode[]) => React.ReactNode[] | React.ReactNode), node: PodNode | {}, children: React.ReactNode[], extraProps?: {}, ctx?: {}) => any;
+export interface Plugin<T = any> {
+    toAst?: RuleHandler<T>;
+    toAstAfter?: RuleHandler<T>;
+    toHtml?: RuleHandler<T>;
+    toJSX?: (helper: JSXHelper) => RuleHandler<T>;
 }
 export interface Plugins {
     [name: string]: Plugin;
@@ -16,6 +23,7 @@ export interface RulesStrict {
     'C<>': RuleHandler<FormattingCodeC>;
     'D<>': RuleHandler<FormattingCodeD>;
     'E<>': RuleHandler<FormattingCodeE>;
+    'F<>': RuleHandler<FormattingCodeF>;
     'I<>': RuleHandler<FormattingCodeI>;
     'K<>': RuleHandler<FormattingCodeAny>;
     'R<>': RuleHandler<FormattingCodeAny>;
@@ -139,6 +147,20 @@ export interface FormattingCodeE {
     content: Array<{
         type: 'number';
         value: number;
+    } | {
+        type: 'unicode_name';
+        value: string;
+    } | {
+        type: 'html_named';
+        value: string;
+    }>;
+}
+export interface FormattingCodeF {
+    type: 'fcode';
+    name: 'F';
+    content: Array<{
+        type: 'text';
+        value: string;
     }>;
 }
 export interface FormattingCodeN {
@@ -350,8 +372,13 @@ export interface BlockMermaid extends Omit<BlockNamed, 'content'> {
         location: Location;
     };
 }
-export declare type FormattingCodes = FormattingCodeA | FormattingCodeC | FormattingCodeB | FormattingCodeD | FormattingCodeE | FormattingCodeI | FormattingCodeL | FormattingCodeN | FormattingCodeX | FormattingCodeZ | FormattingCodeV | FormattingCodeS | FormattingCodeAny;
-export declare type PodNode = Ambient | BlockPod | BlockData | BlockCode | BlankLine | BlockNested | BlockMarkdown | BlockOutput | BlockInput | BlockPara | BlockHead | BlockComment | BlockDefn | string | Para | Text | Code | BlockNamed | BlockAny | Verbatim | BlockTable | List | BlockConfig | BlockItem | Alias | BlockToc | BlockPicture | BlockImage | Image | RootBlock | Separator | BlockCaption | FormattingCodes | Toc;
+export interface BlockFormula extends Omit<BlockNamed, 'content'> {
+    name: 'formula';
+    content: [Verbatim];
+}
+export declare type FormattingCodes = FormattingCodeA | FormattingCodeC | FormattingCodeB | FormattingCodeD | FormattingCodeE | FormattingCodeF | FormattingCodeI | FormattingCodeL | FormattingCodeN | FormattingCodeX | FormattingCodeZ | FormattingCodeV | FormattingCodeS | FormattingCodeAny;
+export declare type PodNode = Ambient | BlockPod | BlockData | BlockFormula | BlockCode | BlankLine | BlockNested | BlockMarkdown | BlockOutput | BlockInput | BlockPara | BlockHead | BlockComment | BlockDefn | string | Para | Text | Code | BlockNamed | BlockAny | Verbatim | BlockTable | List | BlockConfig | BlockItem | Alias | BlockToc | BlockPicture | BlockImage | Image | RootBlock | Separator | BlockCaption | FormattingCodes | Toc;
 export declare type Node = PodNode;
 export declare type AstTree = Array<PodNode>;
 export declare type PodliteDocument = RootBlock;
+export {};

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "@podlite/schema",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "description": "AST tools for Podlite markup language",
   "main": "lib/index.js",
-  "types": "./lib/index.d.ts",
   "license": "MIT",
   "files": [
     "lib/**/*.js",
@@ -43,7 +42,8 @@
     "ajv": "^7.2.3",
     "events": "^3.1.0",
     "json-pointer": "^0.6.1",
-    "nanoid": "3.1.30"
+    "nanoid": "3.1.30",
+    "slugify": "^1.6.6"
   },
   "devDependencies": {
     "@types/node": "^17.0.7",