@refrakt-md/storytelling 0.7.1 → 0.8.0

package/dist/tags/character.js

@@ -8,8 +8,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import Markdoc from '@markdoc/markdoc';
-const { Ast, Tag } = Markdoc;
-import { NodeStream, attribute, group, Model, createComponentRenderable, createSchema, headingsToList } from '@refrakt-md/runes';
+const { Tag } = Markdoc;
+import { attribute, Model, createComponentRenderable, createContentModelSchema, createSchema, asNodes, RenderableNodeCursor } from '@refrakt-md/runes';
 import { schema } from '../types.js';
 class StorySectionModel extends Model {
     constructor() {
@@ -33,55 +33,54 @@ __decorate([
 ], StorySectionModel.prototype, "name", void 0);
 const roleType = ['protagonist', 'antagonist', 'supporting', 'minor'];
 const statusType = ['alive', 'dead', 'unknown', 'missing'];
-class CharacterModel extends Model {
-    constructor() {
-        super(...arguments);
-        this.headingLevel = undefined;
-        this.name = '';
-        this.role = 'supporting';
-        this.status = 'alive';
-        this.aliases = '';
-        this.tags = '';
-    }
-    convertHeadings(nodes) {
-        const level = this.headingLevel ?? nodes.find(n => n.type === 'heading')?.attributes.level;
-        if (!level)
-            return nodes;
-        const converted = headingsToList({ level })(nodes);
-        const n = converted.length - 1;
-        if (!converted[n] || converted[n].type !== 'list')
-            return nodes;
-        const tags = converted[n].children.map(item => {
-            const heading = item.children[0];
-            const name = Array.from(heading.walk())
-                .filter(n => n.type === 'text')
-                .map(t => t.attributes.content)
-                .join(' ');
-            return new Ast.Node('tag', { name }, item.children.slice(1), 'character-section');
-        });
-        converted.splice(n, 1, ...tags);
-        return converted;
-    }
-    processChildren(nodes) {
-        return super.processChildren(this.convertHeadings(nodes));
-    }
-    transform() {
-        const header = this.header.transform();
-        const itemStream = this.itemgroup.transform();
-        const nameTag = new Tag('span', {}, [this.name]);
-        const roleMeta = new Tag('meta', { content: this.role });
-        const statusMeta = new Tag('meta', { content: this.status });
-        const aliasesMeta = new Tag('meta', { content: this.aliases });
-        const tagsMeta = new Tag('meta', { content: this.tags });
-        // Extract portrait image from header
-        const portrait = header.tag('img').limit(1);
+export const characterSection = createSchema(StorySectionModel);
+export const character = createContentModelSchema({
+    attributes: {
+        headingLevel: { type: Number, required: false },
+        name: { type: String, required: true },
+        role: { type: String, required: false, matches: roleType.slice() },
+        status: { type: String, required: false, matches: statusType.slice() },
+        aliases: { type: String, required: false },
+        tags: { type: String, required: false },
+    },
+    contentModel: (attrs) => ({
+        type: 'sections',
+        sectionHeading: attrs.headingLevel ? `heading:${attrs.headingLevel}` : 'heading',
+        emitTag: 'character-section',
+        emitAttributes: { name: '$heading' },
+        fields: [
+            { name: 'portrait', match: 'image', optional: true },
+            { name: 'header', match: 'heading|paragraph', optional: true, greedy: true },
+            { name: 'items', match: 'tag', optional: true, greedy: true },
+        ],
+        sectionModel: {
+            type: 'sequence',
+            fields: [{ name: 'body', match: 'any', optional: true, greedy: true }],
+        },
+    }),
+    transform(resolved, attrs, config) {
+        // Combine explicit child tags (preamble items) with emitted section tags
+        const allItems = [...asNodes(resolved.items), ...asNodes(resolved.sections)];
+        const sectionNodes = new RenderableNodeCursor(Markdoc.transform(allItems, config));
+        const nameTag = new Tag('span', {}, [attrs.name ?? '']);
+        const roleMeta = new Tag('meta', { content: attrs.role ?? 'supporting' });
+        const statusMeta = new Tag('meta', { content: attrs.status ?? 'alive' });
+        const aliasesMeta = new Tag('meta', { content: attrs.aliases ?? '' });
+        const tagsMeta = new Tag('meta', { content: attrs.tags ?? '' });
+        // Extract portrait image from preamble
+        const portraitNodes = new RenderableNodeCursor(Markdoc.transform(asNodes(resolved.portrait), config));
+        const portrait = portraitNodes.tag('img').limit(1);
         const hasPortrait = portrait.count() > 0;
         const portraitDiv = hasPortrait ? portrait.wrap('div') : undefined;
-        const sections = itemStream.tag('div').typeof('CharacterSection');
+        const sections = sectionNodes.tag('div').typeof('CharacterSection');
         const hasSections = sections.count() > 0;
         const children = [nameTag, roleMeta, statusMeta, aliasesMeta, tagsMeta];
         if (portraitDiv)
             children.push(portraitDiv.next());
+        const schemaMap = {
+            name: nameTag,
+            jobTitle: roleMeta,
+        };
         if (hasSections) {
             const sectionsContainer = sections.wrap('div');
             children.push(sectionsContainer.next());
@@ -100,11 +99,12 @@ class CharacterModel extends Model {
                     ...(portraitDiv ? { portrait: portraitDiv } : {}),
                     sections: sectionsContainer,
                 },
+                schema: schemaMap,
                 children,
             });
         }
         else {
-            const body = itemStream.wrap('div');
+            const body = sectionNodes.wrap('div');
             children.push(body.next());
             return createComponentRenderable(schema.Character, {
                 tag: 'article',
@@ -120,43 +120,10 @@ class CharacterModel extends Model {
                     ...(portraitDiv ? { portrait: portraitDiv } : {}),
                     body,
                 },
+                schema: schemaMap,
                 children,
             });
         }
-    }
-}
-__decorate([
-    attribute({ type: Number, required: false }),
-    __metadata("design:type", Object)
-], CharacterModel.prototype, "headingLevel", void 0);
-__decorate([
-    attribute({ type: String, required: true }),
-    __metadata("design:type", String)
-], CharacterModel.prototype, "name", void 0);
-__decorate([
-    attribute({ type: String, required: false, matches: roleType.slice() }),
-    __metadata("design:type", Object)
-], CharacterModel.prototype, "role", void 0);
-__decorate([
-    attribute({ type: String, required: false, matches: statusType.slice() }),
-    __metadata("design:type", Object)
-], CharacterModel.prototype, "status", void 0);
-__decorate([
-    attribute({ type: String, required: false }),
-    __metadata("design:type", String)
-], CharacterModel.prototype, "aliases", void 0);
-__decorate([
-    attribute({ type: String, required: false }),
-    __metadata("design:type", String)
-], CharacterModel.prototype, "tags", void 0);
-__decorate([
-    group({ include: ['heading', 'paragraph', 'image'] }),
-    __metadata("design:type", NodeStream)
-], CharacterModel.prototype, "header", void 0);
-__decorate([
-    group({ include: ['tag'] }),
-    __metadata("design:type", NodeStream)
-], CharacterModel.prototype, "itemgroup", void 0);
-export const characterSection = createSchema(StorySectionModel);
-export const character = createSchema(CharacterModel);
+    },
+});
 //# sourceMappingURL=character.js.map

package/dist/tags/character.js.map

@@ -1 +1 @@
-{"version":3,"file":"character.js","sourceRoot":"","sources":["../../src/tags/character.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"character.js","sourceRoot":"","sources":["../../src/tags/character.ts"],"names":[],"mappings":"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"}

package/dist/tags/faction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"faction.d.ts","sourceRoot":"","sources":["../../src/tags/faction.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AAgIvC,eAAO,MAAM,cAAc,gBAAoC,CAAC;AAChE,eAAO,MAAM,OAAO,gBAA6B,CAAC"}
+{"version":3,"file":"faction.d.ts","sourceRoot":"","sources":["../../src/tags/faction.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AAuBvC,eAAO,MAAM,cAAc,gBAAoC,CAAC;AAEhE,eAAO,MAAM,OAAO,gBAoFlB,CAAC"}

package/dist/tags/faction.js

@@ -8,8 +8,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 import Markdoc from '@markdoc/markdoc';
-const { Ast, Tag } = Markdoc;
-import { NodeStream, attribute, group, Model, createComponentRenderable, createSchema, headingsToList } from '@refrakt-md/runes';
+const { Tag } = Markdoc;
+import { attribute, Model, createComponentRenderable, createContentModelSchema, createSchema, asNodes, RenderableNodeCursor } from '@refrakt-md/runes';
 import { schema } from '../types.js';
 class FactionSectionModel extends Model {
     constructor() {
@@ -31,49 +31,45 @@ __decorate([
     attribute({ type: String, required: true }),
     __metadata("design:type", String)
 ], FactionSectionModel.prototype, "name", void 0);
-class FactionModel extends Model {
-    constructor() {
-        super(...arguments);
-        this.headingLevel = undefined;
-        this.name = '';
-        this.type = '';
-        this.alignment = '';
-        this.size = '';
-        this.tags = '';
-    }
-    convertHeadings(nodes) {
-        const level = this.headingLevel ?? nodes.find(n => n.type === 'heading')?.attributes.level;
-        if (!level)
-            return nodes;
-        const converted = headingsToList({ level })(nodes);
-        const n = converted.length - 1;
-        if (!converted[n] || converted[n].type !== 'list')
-            return nodes;
-        const tags = converted[n].children.map(item => {
-            const heading = item.children[0];
-            const name = Array.from(heading.walk())
-                .filter(n => n.type === 'text')
-                .map(t => t.attributes.content)
-                .join(' ');
-            return new Ast.Node('tag', { name }, item.children.slice(1), 'faction-section');
-        });
-        converted.splice(n, 1, ...tags);
-        return converted;
-    }
-    processChildren(nodes) {
-        return super.processChildren(this.convertHeadings(nodes));
-    }
-    transform() {
-        const header = this.header.transform();
-        const itemStream = this.itemgroup.transform();
-        const nameTag = new Tag('span', {}, [this.name]);
-        const factionTypeMeta = new Tag('meta', { content: this.type });
-        const alignmentMeta = new Tag('meta', { content: this.alignment });
-        const sizeMeta = new Tag('meta', { content: this.size });
-        const tagsMeta = new Tag('meta', { content: this.tags });
-        const sections = itemStream.tag('div').typeof('FactionSection');
+export const factionSection = createSchema(FactionSectionModel);
+export const faction = createContentModelSchema({
+    attributes: {
+        headingLevel: { type: Number, required: false },
+        name: { type: String, required: true },
+        type: { type: String, required: false },
+        alignment: { type: String, required: false },
+        size: { type: String, required: false },
+        tags: { type: String, required: false },
+    },
+    contentModel: (attrs) => ({
+        type: 'sections',
+        sectionHeading: attrs.headingLevel ? `heading:${attrs.headingLevel}` : 'heading',
+        emitTag: 'faction-section',
+        emitAttributes: { name: '$heading' },
+        fields: [
+            { name: 'header', match: 'heading|paragraph|image', optional: true, greedy: true },
+            { name: 'items', match: 'tag', optional: true, greedy: true },
+        ],
+        sectionModel: {
+            type: 'sequence',
+            fields: [{ name: 'body', match: 'any', optional: true, greedy: true }],
+        },
+    }),
+    transform(resolved, attrs, config) {
+        // Combine explicit child tags (preamble items) with emitted section tags
+        const allItems = [...asNodes(resolved.items), ...asNodes(resolved.sections)];
+        const sectionNodes = new RenderableNodeCursor(Markdoc.transform(allItems, config));
+        const nameTag = new Tag('span', {}, [attrs.name ?? '']);
+        const factionTypeMeta = new Tag('meta', { content: attrs.type ?? '' });
+        const alignmentMeta = new Tag('meta', { content: attrs.alignment ?? '' });
+        const sizeMeta = new Tag('meta', { content: attrs.size ?? '' });
+        const tagsMeta = new Tag('meta', { content: attrs.tags ?? '' });
+        const sections = sectionNodes.tag('div').typeof('FactionSection');
         const hasSections = sections.count() > 0;
         const children = [nameTag, factionTypeMeta, alignmentMeta, sizeMeta, tagsMeta];
+        const schemaMap = {
+            name: nameTag,
+        };
         if (hasSections) {
             const sectionsContainer = sections.wrap('div');
             children.push(sectionsContainer.next());
@@ -89,11 +85,12 @@ class FactionModel extends Model {
                     section: sections,
                 },
                 refs: { sections: sectionsContainer },
+                schema: schemaMap,
                 children,
             });
         }
         else {
-            const body = itemStream.wrap('div');
+            const body = sectionNodes.wrap('div');
             children.push(body.next());
             return createComponentRenderable(schema.Faction, {
                 tag: 'article',
@@ -106,43 +103,10 @@ class FactionModel extends Model {
                     tags: tagsMeta,
                 },
                 refs: { body },
+                schema: schemaMap,
                 children,
             });
         }
-    }
-}
-__decorate([
-    attribute({ type: Number, required: false }),
-    __metadata("design:type", Object)
-], FactionModel.prototype, "headingLevel", void 0);
-__decorate([
-    attribute({ type: String, required: true }),
-    __metadata("design:type", String)
-], FactionModel.prototype, "name", void 0);
-__decorate([
-    attribute({ type: String, required: false }),
-    __metadata("design:type", String)
-], FactionModel.prototype, "type", void 0);
-__decorate([
-    attribute({ type: String, required: false }),
-    __metadata("design:type", String)
-], FactionModel.prototype, "alignment", void 0);
-__decorate([
-    attribute({ type: String, required: false }),
-    __metadata("design:type", String)
-], FactionModel.prototype, "size", void 0);
-__decorate([
-    attribute({ type: String, required: false }),
-    __metadata("design:type", String)
-], FactionModel.prototype, "tags", void 0);
-__decorate([
-    group({ include: ['heading', 'paragraph', 'image'] }),
-    __metadata("design:type", NodeStream)
-], FactionModel.prototype, "header", void 0);
-__decorate([
-    group({ include: ['tag'] }),
-    __metadata("design:type", NodeStream)
-], FactionModel.prototype, "itemgroup", void 0);
-export const factionSection = createSchema(FactionSectionModel);
-export const faction = createSchema(FactionModel);
+    },
+});
 //# sourceMappingURL=faction.js.map

package/dist/tags/faction.js.map

@@ -1 +1 @@
-{"version":3,"file":"faction.js","sourceRoot":"","sources":["../../src/tags/faction.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"faction.js","sourceRoot":"","sources":["../../src/tags/faction.ts"],"names":[],"mappings":"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"}

package/dist/tags/lore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lore.d.ts","sourceRoot":"","sources":["../../src/tags/lore.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AA0CvC,eAAO,MAAM,IAAI,gBAA0B,CAAC"}
+{"version":3,"file":"lore.d.ts","sourceRoot":"","sources":["../../src/tags/lore.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AAMvC,eAAO,MAAM,IAAI,gBAyCf,CAAC"}

package/dist/tags/lore.js

@@ -1,30 +1,26 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
 import Markdoc from '@markdoc/markdoc';
 const { Tag } = Markdoc;
-import { attribute, Model, createComponentRenderable, createSchema } from '@refrakt-md/runes';
+import { createContentModelSchema, createComponentRenderable, asNodes, RenderableNodeCursor } from '@refrakt-md/runes';
 import { schema } from '../types.js';
-class LoreModel extends Model {
-    constructor() {
-        super(...arguments);
-        this.title = '';
-        this.category = '';
-        this.spoiler = false;
-        this.tags = '';
-    }
-    transform() {
-        const titleTag = new Tag('span', {}, [this.title]);
-        const categoryMeta = new Tag('meta', { content: this.category });
-        const spoilerMeta = new Tag('meta', { content: String(this.spoiler) });
-        const tagsMeta = new Tag('meta', { content: this.tags });
-        const body = this.transformChildren().wrap('div');
+export const lore = createContentModelSchema({
+    attributes: {
+        title: { type: String, required: true },
+        category: { type: String, required: false },
+        spoiler: { type: Boolean, required: false },
+        tags: { type: String, required: false },
+    },
+    contentModel: {
+        type: 'sequence',
+        fields: [
+            { name: 'body', match: 'any', optional: true, greedy: true },
+        ],
+    },
+    transform(resolved, attrs, config) {
+        const titleTag = new Tag('span', {}, [attrs.title ?? '']);
+        const categoryMeta = new Tag('meta', { content: attrs.category ?? '' });
+        const spoilerMeta = new Tag('meta', { content: String(attrs.spoiler ?? false) });
+        const tagsMeta = new Tag('meta', { content: attrs.tags ?? '' });
+        const body = new RenderableNodeCursor(Markdoc.transform(asNodes(resolved.body), config)).wrap('div');
         return createComponentRenderable(schema.Lore, {
             tag: 'article',
             property: 'contentSection',
@@ -37,25 +33,12 @@ class LoreModel extends Model {
             refs: {
                 body: body.tag('div'),
             },
+            schema: {
+                headline: titleTag,
+                articleSection: categoryMeta,
+            },
             children: [titleTag, categoryMeta, spoilerMeta, tagsMeta, body.next()],
         });
-    }
-}
-__decorate([
-    attribute({ type: String, required: true }),
-    __metadata("design:type", String)
-], LoreModel.prototype, "title", void 0);
-__decorate([
-    attribute({ type: String, required: false }),
-    __metadata("design:type", String)
-], LoreModel.prototype, "category", void 0);
-__decorate([
-    attribute({ type: Boolean, required: false }),
-    __metadata("design:type", Boolean)
-], LoreModel.prototype, "spoiler", void 0);
-__decorate([
-    attribute({ type: String, required: false }),
-    __metadata("design:type", String)
-], LoreModel.prototype, "tags", void 0);
-export const lore = createSchema(LoreModel);
+    },
+});
 //# sourceMappingURL=lore.js.map

package/dist/tags/lore.js.map

@@ -1 +1 @@
-{"version":3,"file":"lore.js","sourceRoot":"","sources":["../../src/tags/lore.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AACvC,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,yBAAyB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC9F,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,SAAU,SAAQ,KAAK;IAA7B;;QAEC,UAAK,GAAW,EAAE,CAAC;QAGnB,aAAQ,GAAW,EAAE,CAAC;QAGtB,YAAO,GAAY,KAAK,CAAC;QAGzB,SAAI,GAAW,EAAE,CAAC;IAwBnB,CAAC;IAtBA,SAAS;QACR,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;QACnD,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjE,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACzD,MAAM,IAAI,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAElD,OAAO,yBAAyB,CAAC,MAAM,CAAC,IAAI,EAAE;YAC7C,GAAG,EAAE,SAAS;YACd,QAAQ,EAAE,gBAAgB;YAC1B,UAAU,EAAE;gBACX,KAAK,EAAE,QAAQ;gBACf,QAAQ,EAAE,YAAY;gBACtB,OAAO,EAAE,WAAW;gBACpB,IAAI,EAAE,QAAQ;aACd;YACD,IAAI,EAAE;gBACL,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;aACrB;YACD,QAAQ,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;SACtE,CAAC,CAAC;IACJ,CAAC;CACD;AAjCA;IADC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCACzB;AAGnB;IADC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;2CACvB;AAGtB;IADC,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;0CACrB;AAGzB;IADC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;uCAC3B;AA0BnB,MAAM,CAAC,MAAM,IAAI,GAAG,YAAY,CAAC,SAAS,CAAC,CAAC"}
+{"version":3,"file":"lore.js","sourceRoot":"","sources":["../../src/tags/lore.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AAEvC,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;AACxB,OAAO,EAAE,wBAAwB,EAAE,yBAAyB,EAAE,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AACvH,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,CAAC,MAAM,IAAI,GAAG,wBAAwB,CAAC;IAC5C,UAAU,EAAE;QACX,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;QACvC,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE;QAC3C,OAAO,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE;QAC3C,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE;KACvC;IACD,YAAY,EAAE;QACb,IAAI,EAAE,UAAU;QAChB,MAAM,EAAE;YACP,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;SAC5D;KACD;IACD,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,MAAM;QAChC,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,CAAC;QAC1D,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,QAAQ,IAAI,EAAE,EAAE,CAAC,CAAC;QACxE,MAAM,WAAW,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,EAAE,CAAC,CAAC;QACjF,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,IAAI,EAAE,EAAE,CAAC,CAAC;QAChE,MAAM,IAAI,GAAG,IAAI,oBAAoB,CACpC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAyB,CACzE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAEd,OAAO,yBAAyB,CAAC,MAAM,CAAC,IAAI,EAAE;YAC7C,GAAG,EAAE,SAAS;YACd,QAAQ,EAAE,gBAAgB;YAC1B,UAAU,EAAE;gBACX,KAAK,EAAE,QAAQ;gBACf,QAAQ,EAAE,YAAY;gBACtB,OAAO,EAAE,WAAW;gBACpB,IAAI,EAAE,QAAQ;aACd;YACD,IAAI,EAAE;gBACL,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC;aACrB;YACD,MAAM,EAAE;gBACP,QAAQ,EAAE,QAAQ;gBAClB,cAAc,EAAE,YAAY;aAC5B;YACD,QAAQ,EAAE,CAAC,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;SACtE,CAAC,CAAC;IACJ,CAAC;CACD,CAAC,CAAC"}

package/dist/tags/plot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plot.d.ts","sourceRoot":"","sources":["../../src/tags/plot.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AAuKvC,eAAO,MAAM,IAAI,gBAA0B,CAAC;AAC5C,eAAO,MAAM,IAAI,gBAA0B,CAAC"}
+{"version":3,"file":"plot.d.ts","sourceRoot":"","sources":["../../src/tags/plot.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AAoHvC,eAAO,MAAM,IAAI,gBAA0B,CAAC;AAE5C,eAAO,MAAM,IAAI,gBAkEf,CAAC"}