@refrakt-md/learning 0.7.1 → 0.8.0

package/dist/index.js

@@ -4,7 +4,7 @@ import { config } from './config.js';
 export const learning = {
     name: 'learning',
     displayName: 'Learning',
-    version: '0.6.0',
+    version: '0.8.0',
     runes: {
         'howto': {
             transform: howto,

package/dist/schema/howto.d.ts

@@ -1,18 +1,6 @@
-import { ComponentType, PageSection, PageSectionProperties } from "@refrakt-md/types";
+import { PageSection } from "@refrakt-md/types";
 export declare class HowTo extends PageSection {
     estimatedTime: string;
     difficulty: string;
 }
-export interface HowToProperties extends PageSectionProperties {
-    estimatedTime: 'meta';
-    difficulty: 'meta';
-}
-export interface HowToComponent extends ComponentType<HowTo> {
-    tag: 'article';
-    properties: HowToProperties;
-    refs: {
-        tools: 'ul';
-        steps: 'ol';
-    };
-}
 //# sourceMappingURL=howto.d.ts.map

package/dist/schema/howto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"howto.d.ts","sourceRoot":"","sources":["../../src/schema/howto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAEtF,qBAAa,KAAM,SAAQ,WAAW;IACrC,aAAa,EAAE,MAAM,CAAM;IAC3B,UAAU,EAAE,MAAM,CAAM;CACxB;AAED,MAAM,WAAW,eAAgB,SAAQ,qBAAqB;IAC7D,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,cAAe,SAAQ,aAAa,CAAC,KAAK,CAAC;IAC3D,GAAG,EAAE,SAAS,CAAC;IACf,UAAU,EAAE,eAAe,CAAC;IAC5B,IAAI,EAAE;QACL,KAAK,EAAE,IAAI,CAAC;QACZ,KAAK,EAAE,IAAI,CAAC;KACZ,CAAA;CACD"}
+{"version":3,"file":"howto.d.ts","sourceRoot":"","sources":["../../src/schema/howto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,qBAAa,KAAM,SAAQ,WAAW;IACrC,aAAa,EAAE,MAAM,CAAM;IAC3B,UAAU,EAAE,MAAM,CAAM;CACxB"}

package/dist/schema/howto.js.map

@@ -1 +1 @@
-{"version":3,"file":"howto.js","sourceRoot":"","sources":["../../src/schema/howto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,WAAW,EAAyB,MAAM,mBAAmB,CAAC;AAEtF,MAAM,OAAO,KAAM,SAAQ,WAAW;IAAtC;;QACC,kBAAa,GAAW,EAAE,CAAC;QAC3B,eAAU,GAAW,EAAE,CAAC;IACzB,CAAC;CAAA"}
+{"version":3,"file":"howto.js","sourceRoot":"","sources":["../../src/schema/howto.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,OAAO,KAAM,SAAQ,WAAW;IAAtC;;QACC,kBAAa,GAAW,EAAE,CAAC;QAC3B,eAAU,GAAW,EAAE,CAAC;IACzB,CAAC;CAAA"}

package/dist/schema/recipe.d.ts

@@ -1,37 +1,13 @@
-import { ComponentType, PageSection, PageSectionProperties } from "@refrakt-md/types";
+import { PageSection } from "@refrakt-md/types";
 export declare class RecipeIngredient {
     amount: string;
     unit: string;
     name: string;
 }
-export interface RecipeIngredientComponent extends ComponentType<RecipeIngredient> {
-    tag: 'li';
-    properties: {
-        amount: 'span';
-        unit: 'span';
-        name: 'span';
-    };
-    refs: {};
-}
 export declare class Recipe extends PageSection {
     prepTime: string;
     cookTime: string;
     servings: number | undefined;
     difficulty: string;
 }
-export interface RecipeProperties extends PageSectionProperties {
-    prepTime: 'meta';
-    cookTime: 'meta';
-    servings: 'meta';
-    difficulty: 'meta';
-}
-export interface RecipeComponent extends ComponentType<Recipe> {
-    tag: 'article';
-    properties: RecipeProperties;
-    refs: {
-        ingredients: 'ul';
-        steps: 'ol';
-        tips: 'div';
-    };
-}
 //# sourceMappingURL=recipe.d.ts.map

package/dist/schema/recipe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"recipe.d.ts","sourceRoot":"","sources":["../../src/schema/recipe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAEtF,qBAAa,gBAAgB;IAC5B,MAAM,EAAE,MAAM,CAAM;IACpB,IAAI,EAAE,MAAM,CAAM;IAClB,IAAI,EAAE,MAAM,CAAM;CAClB;AAED,MAAM,WAAW,yBAA0B,SAAQ,aAAa,CAAC,gBAAgB,CAAC;IACjF,GAAG,EAAE,IAAI,CAAC;IACV,UAAU,EAAE;QACX,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;KACb,CAAC;IACF,IAAI,EAAE,EAAE,CAAA;CACR;AAED,qBAAa,MAAO,SAAQ,WAAW;IACtC,QAAQ,EAAE,MAAM,CAAM;IACtB,QAAQ,EAAE,MAAM,CAAM;IACtB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAa;IACzC,UAAU,EAAE,MAAM,CAAY;CAC9B;AAED,MAAM,WAAW,gBAAiB,SAAQ,qBAAqB;IAC9D,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,eAAgB,SAAQ,aAAa,CAAC,MAAM,CAAC;IAC7D,GAAG,EAAE,SAAS,CAAC;IACf,UAAU,EAAE,gBAAgB,CAAC;IAC7B,IAAI,EAAE;QACL,WAAW,EAAE,IAAI,CAAC;QAClB,KAAK,EAAE,IAAI,CAAC;QACZ,IAAI,EAAE,KAAK,CAAC;KACZ,CAAA;CACD"}
+{"version":3,"file":"recipe.d.ts","sourceRoot":"","sources":["../../src/schema/recipe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,qBAAa,gBAAgB;IAC5B,MAAM,EAAE,MAAM,CAAM;IACpB,IAAI,EAAE,MAAM,CAAM;IAClB,IAAI,EAAE,MAAM,CAAM;CAClB;AAED,qBAAa,MAAO,SAAQ,WAAW;IACtC,QAAQ,EAAE,MAAM,CAAM;IACtB,QAAQ,EAAE,MAAM,CAAM;IACtB,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAa;IACzC,UAAU,EAAE,MAAM,CAAY;CAC9B"}

package/dist/schema/recipe.js.map

@@ -1 +1 @@
-{"version":3,"file":"recipe.js","sourceRoot":"","sources":["../../src/schema/recipe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,WAAW,EAAyB,MAAM,mBAAmB,CAAC;AAEtF,MAAM,OAAO,gBAAgB;IAA7B;QACC,WAAM,GAAW,EAAE,CAAC;QACpB,SAAI,GAAW,EAAE,CAAC;QAClB,SAAI,GAAW,EAAE,CAAC;IACnB,CAAC;CAAA;AAYD,MAAM,OAAO,MAAO,SAAQ,WAAW;IAAvC;;QACC,aAAQ,GAAW,EAAE,CAAC;QACtB,aAAQ,GAAW,EAAE,CAAC;QACtB,aAAQ,GAAuB,SAAS,CAAC;QACzC,eAAU,GAAW,QAAQ,CAAC;IAC/B,CAAC;CAAA"}
+{"version":3,"file":"recipe.js","sourceRoot":"","sources":["../../src/schema/recipe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,MAAM,OAAO,gBAAgB;IAA7B;QACC,WAAM,GAAW,EAAE,CAAC;QACpB,SAAI,GAAW,EAAE,CAAC;QAClB,SAAI,GAAW,EAAE,CAAC;IACnB,CAAC;CAAA;AAED,MAAM,OAAO,MAAO,SAAQ,WAAW;IAAvC;;QACC,aAAQ,GAAW,EAAE,CAAC;QACtB,aAAQ,GAAW,EAAE,CAAC;QACtB,aAAQ,GAAuB,SAAS,CAAC;QACzC,eAAU,GAAW,QAAQ,CAAC;IAC/B,CAAC;CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"howto.d.ts","sourceRoot":"","sources":["../../src/tags/howto.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AAoFvC,eAAO,MAAM,KAAK,gBAA2B,CAAC"}
+{"version":3,"file":"howto.d.ts","sourceRoot":"","sources":["../../src/tags/howto.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AAqBvC,eAAO,MAAM,KAAK,gBAmGhB,CAAC"}

package/dist/tags/howto.js

@@ -1,35 +1,45 @@
-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 { Ast, Tag } = Markdoc;
-import { attribute, group, Model, createComponentRenderable, createSchema, NodeStream, pageSectionProperties, headingsToList } from '@refrakt-md/runes';
+const { Tag } = Markdoc;
+import { createContentModelSchema, createComponentRenderable, asNodes, resolveSequence, RenderableNodeCursor, pageSectionProperties, headingsToList } from '@refrakt-md/runes';
 import { schema } from '../types.js';
+function tagText(nodes) {
+    return nodes.map((n) => {
+        if (typeof n === 'string')
+            return n;
+        if (Markdoc.Tag.isTag(n))
+            return tagText(n.children);
+        return '';
+    }).join('').trim();
+}
 const difficultyType = ['easy', 'medium', 'hard'];
-class HowToModel extends Model {
-    constructor() {
-        super(...arguments);
-        this.estimatedTime = '';
-        this.difficulty = '';
-        this.headingLevel = undefined;
-    }
-    processChildren(nodes) {
-        if (this.headingLevel !== undefined) {
-            return super.processChildren(headingsToList({ level: this.headingLevel })(nodes));
-        }
-        return super.processChildren(nodes);
-    }
-    transform() {
-        const header = this.header.transform();
-        const body = this.body.transform();
-        const estimatedTimeMeta = new Tag('meta', { content: this.estimatedTime });
-        const difficultyMeta = new Tag('meta', { content: this.difficulty });
+const bodyFields = [
+    { name: 'header', match: 'heading|paragraph|image', greedy: true, optional: true },
+    { name: 'body', match: 'list|tag', greedy: true, optional: true },
+];
+export const howto = createContentModelSchema({
+    attributes: {
+        estimatedTime: { type: String, required: false, default: '' },
+        difficulty: { type: String, required: false, matches: difficultyType.slice() },
+        headingLevel: { type: Number, required: false },
+    },
+    contentModel: {
+        type: 'custom',
+        description: 'Optionally converts headings to list items, then resolves header/body sequence',
+        processChildren(nodes, attrs) {
+            let processed = nodes;
+            if (attrs.headingLevel != null) {
+                processed = headingsToList({ level: attrs.headingLevel })(processed);
+            }
+            return processed;
+        },
+    },
+    transform(resolved, attrs, config) {
+        // Custom model gives us raw children — resolve the header/body sequence manually
+        const inner = resolveSequence(resolved.children, bodyFields);
+        const header = new RenderableNodeCursor(Markdoc.transform(asNodes(inner.header), config));
+        const body = new RenderableNodeCursor(Markdoc.transform(asNodes(inner.body), config));
+        const estimatedTimeMeta = new Tag('meta', { content: attrs.estimatedTime });
+        const difficultyMeta = new Tag('meta', { content: attrs.difficulty ?? '' });
         // Separate unordered lists (tools/materials) and ordered lists (steps)
         const allNodes = body.toArray();
         const tools = [];
@@ -44,6 +54,23 @@ class HowToModel extends Model {
                 }
             }
         }
+        // Annotate tool lis as HowToTool
+        for (const li of tools) {
+            if (Markdoc.Tag.isTag(li)) {
+                li.attributes.typeof = 'HowToTool';
+                li.attributes.property = 'tool';
+                li.children.push(new Tag('meta', { property: 'name', content: tagText(li.children) }));
+            }
+        }
+        // Annotate step lis as HowToStep
+        for (const li of steps) {
+            if (Markdoc.Tag.isTag(li)) {
+                li.attributes.typeof = 'HowToStep';
+                li.attributes.property = 'step';
+                li.children.push(new Tag('meta', { property: 'text', content: tagText(li.children) }));
+            }
+        }
+        const sectionProps = pageSectionProperties(header);
         const toolsList = new Tag('ul', {}, tools);
         const stepsList = new Tag('ol', {}, steps);
         const children = [
@@ -59,7 +86,7 @@ class HowToModel extends Model {
             tag: 'article',
             property: 'contentSection',
             properties: {
-                ...pageSectionProperties(header),
+                ...sectionProps,
                 estimatedTime: estimatedTimeMeta,
                 difficulty: difficultyMeta,
             },
@@ -67,29 +94,13 @@ class HowToModel extends Model {
                 tools: toolsList,
                 steps: stepsList,
             },
+            schema: {
+                name: sectionProps.headline,
+                description: sectionProps.blurb,
+                totalTime: estimatedTimeMeta,
+            },
             children,
         });
-    }
-}
-__decorate([
-    attribute({ type: String, required: false }),
-    __metadata("design:type", String)
-], HowToModel.prototype, "estimatedTime", void 0);
-__decorate([
-    attribute({ type: String, required: false, matches: difficultyType.slice() }),
-    __metadata("design:type", String)
-], HowToModel.prototype, "difficulty", void 0);
-__decorate([
-    attribute({ type: Number, required: false }),
-    __metadata("design:type", Object)
-], HowToModel.prototype, "headingLevel", void 0);
-__decorate([
-    group({ include: ['heading', 'paragraph', 'image'] }),
-    __metadata("design:type", NodeStream)
-], HowToModel.prototype, "header", void 0);
-__decorate([
-    group({ include: ['list', 'tag'] }),
-    __metadata("design:type", NodeStream)
-], HowToModel.prototype, "body", void 0);
-export const howto = createSchema(HowToModel);
+    },
+});
 //# sourceMappingURL=howto.js.map

package/dist/tags/howto.js.map

@@ -1 +1 @@
-{"version":3,"file":"howto.js","sourceRoot":"","sources":["../../src/tags/howto.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AAEvC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,yBAAyB,EAAE,YAAY,EAAE,UAAU,EAAE,qBAAqB,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACxJ,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAU,CAAC;AAE3D,MAAM,UAAW,SAAQ,KAAK;IAA9B;;QAEC,kBAAa,GAAW,EAAE,CAAC;QAG3B,eAAU,GAAW,EAAE,CAAC;QAGxB,iBAAY,GAAuB,SAAS,CAAC;IAkE9C,CAAC;IA1DA,eAAe,CAAC,KAAa;QAC5B,IAAI,IAAI,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;YACrC,OAAO,KAAK,CAAC,eAAe,CAAC,cAAc,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QACnF,CAAC;QACD,OAAO,KAAK,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IACrC,CAAC;IAED,SAAS;QACR,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;QACvC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;QAEnC,MAAM,iBAAiB,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC;QAC3E,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAErE,uEAAuE;QACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAChC,MAAM,KAAK,GAAU,EAAE,CAAC;QACxB,MAAM,KAAK,GAAU,EAAE,CAAC;QAExB,KAAK,MAAM,IAAI,IAAI,QAAQ,EAAE,CAAC;YAC7B,IAAI,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC7B,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;oBACxB,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC;gBACtC,CAAC;qBAAM,IAAI,IAAI,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;oBAC/B,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC;gBACtC,CAAC;YACF,CAAC;QACF,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;QAC3C,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;QAE3C,MAAM,QAAQ,GAAU;YACvB,iBAAiB;YACjB,cAAc;YACd,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,IAAI,EAAE;SAC5B,CAAC;QAEF,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtB,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAC1B,CAAC;QACD,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAEzB,OAAO,yBAAyB,CAAC,MAAM,CAAC,KAAK,EAAE;YAC9C,GAAG,EAAE,SAAS;YACd,QAAQ,EAAE,gBAAgB;YAC1B,UAAU,EAAE;gBACX,GAAG,qBAAqB,CAAC,MAAM,CAAC;gBAChC,aAAa,EAAE,iBAAiB;gBAChC,UAAU,EAAE,cAAc;aAC1B;YACD,IAAI,EAAE;gBACL,KAAK,EAAE,SAAS;gBAChB,KAAK,EAAE,SAAS;aAChB;YACD,QAAQ;SACR,CAAC,CAAC;IACJ,CAAC;CACD;AAxEA;IADC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;iDAClB;AAG3B;IADC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,cAAc,CAAC,KAAK,EAAE,EAAE,CAAC;;8CACtD;AAGxB;IADC,SAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;;gDACA;AAG7C;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC;8BAC9C,UAAU;0CAAC;AAGnB;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC;8BAC9B,UAAU;wCAAC;AA8DlB,MAAM,CAAC,MAAM,KAAK,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC"}
+{"version":3,"file":"howto.js","sourceRoot":"","sources":["../../src/tags/howto.ts"],"names":[],"mappings":"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"}

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

@@ -1 +1 @@
-{"version":3,"file":"recipe.d.ts","sourceRoot":"","sources":["../../src/tags/recipe.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AA4FvC,eAAO,MAAM,MAAM,gBAA4B,CAAC"}
+{"version":3,"file":"recipe.d.ts","sourceRoot":"","sources":["../../src/tags/recipe.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,kBAAkB,CAAC;AAgBvC,eAAO,MAAM,MAAM,gBAyGjB,CAAC"}

package/dist/tags/recipe.js

@@ -1,32 +1,38 @@
-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, group, Model, createComponentRenderable, createSchema, NodeStream, pageSectionProperties } from '@refrakt-md/runes';
+import { createContentModelSchema, createComponentRenderable, asNodes, RenderableNodeCursor, pageSectionProperties } from '@refrakt-md/runes';
 import { schema } from '../types.js';
+function tagText(nodes) {
+    return nodes.map((n) => {
+        if (typeof n === 'string')
+            return n;
+        if (Markdoc.Tag.isTag(n))
+            return tagText(n.children);
+        return '';
+    }).join('').trim();
+}
 const difficultyType = ['easy', 'medium', 'hard'];
-class RecipeModel extends Model {
-    constructor() {
-        super(...arguments);
-        this.prepTime = '';
-        this.cookTime = '';
-        this.servings = undefined;
-        this.difficulty = 'medium';
-    }
-    transform() {
-        const header = this.header.transform();
-        const body = this.body.transform();
-        const prepTimeMeta = new Tag('meta', { content: this.prepTime });
-        const cookTimeMeta = new Tag('meta', { content: this.cookTime });
-        const servingsMeta = new Tag('meta', { content: this.servings != null ? String(this.servings) : '' });
-        const difficultyMeta = new Tag('meta', { content: this.difficulty });
+export const recipe = createContentModelSchema({
+    attributes: {
+        prepTime: { type: String, required: false, default: '' },
+        cookTime: { type: String, required: false, default: '' },
+        servings: { type: Number, required: false },
+        difficulty: { type: String, required: false, matches: difficultyType.slice(), default: 'medium' },
+    },
+    contentModel: {
+        type: 'sequence',
+        fields: [
+            { name: 'header', match: 'heading|paragraph|image', greedy: true, optional: true },
+            { name: 'body', match: 'list|tag|blockquote', greedy: true, optional: true },
+        ],
+    },
+    transform(resolved, attrs, config) {
+        const header = new RenderableNodeCursor(Markdoc.transform(asNodes(resolved.header), config));
+        const body = new RenderableNodeCursor(Markdoc.transform(asNodes(resolved.body), config));
+        const prepTimeMeta = new Tag('meta', { content: attrs.prepTime });
+        const cookTimeMeta = new Tag('meta', { content: attrs.cookTime });
+        const servingsMeta = new Tag('meta', { content: attrs.servings != null ? String(attrs.servings) : '' });
+        const difficultyMeta = new Tag('meta', { content: attrs.difficulty });
         // Separate unordered lists (ingredients), ordered lists (steps), and blockquotes (tips)
         const allNodes = body.toArray();
         const ingredients = [];
@@ -45,6 +51,21 @@ class RecipeModel extends Model {
                 }
             }
         }
+        // Annotate ingredient lis with recipeIngredient property
+        for (const li of ingredients) {
+            if (Markdoc.Tag.isTag(li)) {
+                li.attributes.property = 'recipeIngredient';
+            }
+        }
+        // Annotate step lis as HowToStep with recipeInstructions property
+        for (const li of steps) {
+            if (Markdoc.Tag.isTag(li)) {
+                li.attributes.typeof = 'HowToStep';
+                li.attributes.property = 'recipeInstructions';
+                li.children.push(new Tag('meta', { property: 'text', content: tagText(li.children) }));
+            }
+        }
+        const sectionProps = pageSectionProperties(header);
         const ingredientsList = new Tag('ul', {}, ingredients);
         const stepsList = new Tag('ol', {}, steps);
         const tipsDiv = new Tag('div', {}, tips);
@@ -64,7 +85,7 @@ class RecipeModel extends Model {
             tag: 'article',
             property: 'contentSection',
             properties: {
-                ...pageSectionProperties(header),
+                ...sectionProps,
                 prepTime: prepTimeMeta,
                 cookTime: cookTimeMeta,
                 servings: servingsMeta,
@@ -75,33 +96,15 @@ class RecipeModel extends Model {
                 steps: stepsList,
                 tips: tipsDiv,
             },
+            schema: {
+                name: sectionProps.headline,
+                description: sectionProps.blurb,
+                prepTime: prepTimeMeta,
+                cookTime: cookTimeMeta,
+                recipeYield: servingsMeta,
+            },
             children,
         });
-    }
-}
-__decorate([
-    attribute({ type: String, required: false }),
-    __metadata("design:type", String)
-], RecipeModel.prototype, "prepTime", void 0);
-__decorate([
-    attribute({ type: String, required: false }),
-    __metadata("design:type", String)
-], RecipeModel.prototype, "cookTime", void 0);
-__decorate([
-    attribute({ type: Number, required: false }),
-    __metadata("design:type", Object)
-], RecipeModel.prototype, "servings", void 0);
-__decorate([
-    attribute({ type: String, required: false, matches: difficultyType.slice() }),
-    __metadata("design:type", Object)
-], RecipeModel.prototype, "difficulty", void 0);
-__decorate([
-    group({ include: ['heading', 'paragraph', 'image'] }),
-    __metadata("design:type", NodeStream)
-], RecipeModel.prototype, "header", void 0);
-__decorate([
-    group({ include: ['list', 'tag', 'blockquote'] }),
-    __metadata("design:type", NodeStream)
-], RecipeModel.prototype, "body", void 0);
-export const recipe = createSchema(RecipeModel);
+    },
+});
 //# sourceMappingURL=recipe.js.map

package/dist/tags/recipe.js.map

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

package/dist/types.d.ts

@@ -1,8 +1,8 @@
-import { RecipeComponent, RecipeIngredientComponent } from './schema/recipe.js';
-import { HowToComponent } from './schema/howto.js';
+import { Recipe, RecipeIngredient } from './schema/recipe.js';
+import { HowTo } from './schema/howto.js';
 export declare const schema: {
-    Recipe: import("@refrakt-md/types").Type<RecipeComponent>;
-    RecipeIngredient: import("@refrakt-md/types").Type<RecipeIngredientComponent>;
-    HowTo: import("@refrakt-md/types").Type<HowToComponent>;
+    Recipe: import("@refrakt-md/types").Type<Recipe>;
+    RecipeIngredient: import("@refrakt-md/types").Type<RecipeIngredient>;
+    HowTo: import("@refrakt-md/types").Type<HowTo>;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAU,eAAe,EAAoB,yBAAyB,EAAE,MAAM,oBAAoB,CAAC;AAC1G,OAAO,EAAS,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAE1D,eAAO,MAAM,MAAM;;;;CAIlB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,MAAM,EAAE,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAC,KAAK,EAAC,MAAM,mBAAmB,CAAC;AAExC,eAAO,MAAM,MAAM;;;;CAIlB,CAAC"}

package/dist/types.js

@@ -2,8 +2,8 @@ import { useSchema } from '@refrakt-md/types';
 import { Recipe, RecipeIngredient } from './schema/recipe.js';
 import { HowTo } from './schema/howto.js';
 export const schema = {
-    Recipe: useSchema(Recipe).defineType('Recipe'),
+    Recipe: useSchema(Recipe).defineType('Recipe', {}, 'Recipe'),
     RecipeIngredient: useSchema(RecipeIngredient).defineType('RecipeIngredient'),
-    HowTo: useSchema(HowTo).defineType('HowTo'),
+    HowTo: useSchema(HowTo).defineType('HowTo', {}, 'HowTo'),
 };
 //# sourceMappingURL=types.js.map

package/dist/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAmB,gBAAgB,EAA6B,MAAM,oBAAoB,CAAC;AAC1G,OAAO,EAAE,KAAK,EAAkB,MAAM,mBAAmB,CAAC;AAE1D,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,UAAU,CAAkB,QAAQ,CAAC;IAC/D,gBAAgB,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAC,UAAU,CAA4B,kBAAkB,CAAC;IACvG,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,UAAU,CAAiB,OAAO,CAAC;CAC5D,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAC,MAAM,mBAAmB,CAAC;AAC5C,OAAO,EAAC,MAAM,EAAE,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAC,KAAK,EAAC,MAAM,mBAAmB,CAAC;AAExC,MAAM,CAAC,MAAM,MAAM,GAAG;IACpB,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,UAAU,CAAC,QAAQ,EAAE,EAAE,EAAE,QAAQ,CAAC;IAC5D,gBAAgB,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAC,UAAU,CAAC,kBAAkB,CAAC;IAC5E,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,EAAE,OAAO,CAAC;CACzD,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@refrakt-md/learning",
   "description": "Learning runes for refrakt.md — how-to guides and recipes",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -21,9 +21,9 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@refrakt-md/types": "0.7.1",
-    "@refrakt-md/transform": "0.7.1",
-    "@refrakt-md/runes": "0.7.1",
+    "@refrakt-md/types": "0.8.0",
+    "@refrakt-md/transform": "0.8.0",
+    "@refrakt-md/runes": "0.8.0",
     "@markdoc/markdoc": "0.4.0",
     "reflect-metadata": "^0.2.0"
   }