@podlite/schema 0.0.16 → 0.0.18

package/lib/helpers/ids.d.ts

@@ -7,6 +7,7 @@ export declare const cleanIds: (src?: {
     skipChain: number;
     podMode: number;
 }) => (tree: any) => any;
+export declare const slugifyText: (text: string) => string;
 /**
  * Add set id to 'id' to each blocks
  */
@@ -14,5 +15,9 @@ export declare const frozenIds: (src?: {
     skipChain: number;
     podMode: number;
 }) => (tree: any) => any;
+export declare const cleanLocalHrefs: (src?: {
+    skipChain: number;
+    podMode: number;
+}) => (tree: any) => any;
 declare const middleware: ParserPlugin;
 export default middleware;

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.frozenIds = exports.cleanIds = void 0;
+exports.cleanLocalHrefs = 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
@@ -23,25 +27,46 @@ const cleanIds = (src = { skipChain: 0, podMode: 1 }) => tree => {
     return transformerBlocks(tree, {});
 };
 exports.cleanIds = cleanIds;
+// TODO: refactor linking for blocks
+const slugifyText = (text) => {
+    return (0, slugify_1.default)(text.trim(), {});
+};
+exports.slugifyText = slugifyText;
 /**
  * Add set id to 'id' to each blocks
  */
 const frozenIds = (src = { skipChain: 0, podMode: 1 }) => tree => {
     const transformerBlocks = (0, __1.makeTransformer)({
         '*': (node, ctx, visiter) => {
+            if ('content' in node) {
+                node.content = visiter(node.content, ctx);
+            }
             if ('id' in node) {
+                const { id, ...rest } = node;
+                return { ...rest, id: 'id' };
+            }
+            return node;
+        },
+    });
+    return transformerBlocks(tree, {});
+};
+exports.frozenIds = frozenIds;
+const cleanLocalHrefs = (src = { skipChain: 0, podMode: 1 }) => tree => {
+    const transformerBlocks = (0, __1.makeTransformer)({
+        'L<>': (node, ctx, visiter) => {
+            if ('meta' in node) {
                 if ('content' in node) {
                     node.content = visiter(node.content, ctx);
                 }
                 const { id, ...rest } = node;
-                return { ...rest, id: 'id' };
+                return { ...rest, meta: '#' };
             }
             return node;
         },
     });
     return transformerBlocks(tree, {});
 };
-exports.frozenIds = frozenIds;
+exports.cleanLocalHrefs = cleanLocalHrefs;
 const middleware = () => tree => {
     const transformerBlocks = (0, __1.makeTransformer)({
         '*': (node, ctx, visiter) => {
@@ -51,7 +76,7 @@ const middleware = () => tree => {
                         return node;
                     }
                     else if (node.name == 'head') {
-                        return { ...node, id: (0, __1.getTextContentFromNode)(node).trim() };
+                        return { ...node, id: (0, exports.slugifyText)((0, __1.getTextContentFromNode)(node)) };
                     }
                     else {
                         return { ...node, id: (0, nanoid_1.nanoid)() };

package/lib/plugin-formatting-codes.js

@@ -51,25 +51,29 @@ 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 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)
                 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

@@ -333,7 +333,7 @@ export interface TableSeparator {
 }
 export declare type BlockAny = BlockNamed;
 export interface BlockNamed extends Omit<Block, 'content'> {
-    name: Capitalize<string>;
+    name: string;
     content: [(Verbatim | Para | Code)?] | Array<Image | BlockCaption> | RootBlock;
 }
 export interface BlockDiagram extends Omit<BlockNamed, 'content'> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@podlite/schema",
-  "version": "0.0.16",
+  "version": "0.0.18",
   "description": "AST tools for Podlite markup language",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -43,7 +43,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",