cooklang-parse 1.1.2 → 1.2.0

package/dist/parse-cooklang.d.ts

@@ -0,0 +1,3 @@
+import type { CooklangRecipe, ParseCooklangOptions } from "./types";
+export declare function parseCooklang(source: string, options?: ParseCooklangOptions): CooklangRecipe;
+//# sourceMappingURL=parse-cooklang.d.ts.map

package/dist/parse-cooklang.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parse-cooklang.d.ts","sourceRoot":"","sources":["../src/parse-cooklang.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EACV,cAAc,EACd,oBAAoB,EAQrB,MAAM,SAAS,CAAA;AAehB,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,GAAE,oBAAyB,GAAG,cAAc,CAkRhG"}

package/dist/parser/component-builders.d.ts

@@ -0,0 +1,10 @@
+import type { RecipeCookware, RecipeIngredient } from "../types";
+/** Build an ingredient from structured grammar data. */
+export declare function buildIngredient(mods: string, rawName: string, amount: {
+    quantity: string | number;
+    units: string;
+    fixed: boolean;
+}, note: string | undefined): RecipeIngredient;
+/** Build a cookware item from structured grammar data. */
+export declare function buildCookware(mods: string, rawName: string, quantity: string | number, note: string | undefined): RecipeCookware;
+//# sourceMappingURL=component-builders.d.ts.map

package/dist/parser/component-builders.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"component-builders.d.ts","sourceRoot":"","sources":["../../src/parser/component-builders.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,cAAc,EACd,gBAAgB,EAEjB,MAAM,UAAU,CAAA;AAoBjB,wDAAwD;AACxD,wBAAgB,eAAe,CAC7B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,MAAM,EAAE;IAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,EACpE,IAAI,EAAE,MAAM,GAAG,SAAS,GACvB,gBAAgB,CAWlB;AAED,0DAA0D;AAC1D,wBAAgB,aAAa,CAC3B,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,MAAM,GAAG,MAAM,EACzB,IAAI,EAAE,MAAM,GAAG,SAAS,GACvB,cAAc,CAkBhB"}

package/dist/parser/extensions.d.ts

@@ -0,0 +1,5 @@
+import type { ParseCooklangOptions } from "../types";
+import type { ExtensionState } from "./internal-types";
+export declare function resolveExtensions(options?: ParseCooklangOptions): ExtensionState;
+export declare function hasAllExtensions(options?: ParseCooklangOptions): boolean;
+//# sourceMappingURL=extensions.d.ts.map

package/dist/parser/extensions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"extensions.d.ts","sourceRoot":"","sources":["../../src/parser/extensions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAA;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAEtD,wBAAgB,iBAAiB,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,cAAc,CAKhF;AAED,wBAAgB,gBAAgB,CAAC,OAAO,CAAC,EAAE,oBAAoB,GAAG,OAAO,CAExE"}

package/dist/parser/frontmatter.d.ts

@@ -0,0 +1,9 @@
+import type { SourcePosition } from "../types";
+interface YamlParseResult {
+    data: Record<string, unknown>;
+    warning?: string;
+    position?: SourcePosition;
+}
+export declare function parseYamlFrontmatter(content: string, yamlStartOffset: number): YamlParseResult;
+export {};
+//# sourceMappingURL=frontmatter.d.ts.map

package/dist/parser/frontmatter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"frontmatter.d.ts","sourceRoot":"","sources":["../../src/parser/frontmatter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAE9C,UAAU,eAAe;IACvB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC7B,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,QAAQ,CAAC,EAAE,cAAc,CAAA;CAC1B;AAyBD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,eAAe,CAoC9F"}

package/dist/parser/internal-types.d.ts

@@ -0,0 +1,31 @@
+import type { RecipeStepItem, SourcePosition } from "../types";
+export interface ExtensionState {
+    modes: boolean;
+    inlineQuantities: boolean;
+}
+export type DefineMode = "all" | "components" | "steps" | "text";
+export interface DirectiveNode {
+    type: "directive";
+    key: string;
+    rawValue: string;
+    rawLine: string;
+    position: SourcePosition;
+}
+export type SemanticItem = {
+    kind: "step";
+    items: RecipeStepItem[];
+} | {
+    kind: "section";
+    name: string;
+} | {
+    kind: "note";
+    text: string;
+} | {
+    kind: "directive";
+    directive: DirectiveNode;
+};
+export interface SemanticResult {
+    frontmatter: string | null;
+    items: SemanticItem[];
+}
+//# sourceMappingURL=internal-types.d.ts.map

package/dist/parser/internal-types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"internal-types.d.ts","sourceRoot":"","sources":["../../src/parser/internal-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAE9D,MAAM,WAAW,cAAc;IAC7B,KAAK,EAAE,OAAO,CAAA;IACd,gBAAgB,EAAE,OAAO,CAAA;CAC1B;AAED,MAAM,MAAM,UAAU,GAAG,KAAK,GAAG,YAAY,GAAG,OAAO,GAAG,MAAM,CAAA;AAEhE,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,WAAW,CAAA;IACjB,GAAG,EAAE,MAAM,CAAA;IACX,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,QAAQ,EAAE,cAAc,CAAA;CACzB;AAED,MAAM,MAAM,YAAY,GACpB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,cAAc,EAAE,CAAA;CAAE,GACzC;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GACjC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,SAAS,EAAE,aAAa,CAAA;CAAE,CAAA;AAEnD,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,MAAM,GAAG,IAAI,CAAA;IAC1B,KAAK,EAAE,YAAY,EAAE,CAAA;CACtB"}

package/dist/parser/metadata.d.ts

@@ -0,0 +1,8 @@
+import type { ParseError } from "../types";
+import type { DefineMode, DirectiveNode } from "./internal-types";
+/** Validate standard metadata entries and push type-mismatch warnings. */
+export declare function checkStandardMetadata(metadata: Record<string, unknown>, warnings: ParseError[], directives: DirectiveNode[]): void;
+export declare function isSpecialDirectiveKey(key: string): boolean;
+export declare function applyDirectiveMode(current: DefineMode, key: string, rawValue: string): DefineMode;
+export declare function createDeprecatedMetadataWarning(directives: DirectiveNode[]): ParseError | null;
+//# sourceMappingURL=metadata.d.ts.map

package/dist/parser/metadata.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../../src/parser/metadata.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAkB,MAAM,UAAU,CAAA;AAE1D,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AA4GjE,0EAA0E;AAC1E,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,QAAQ,EAAE,UAAU,EAAE,EACtB,UAAU,EAAE,aAAa,EAAE,GAC1B,IAAI,CAuBN;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAG1D;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,UAAU,CAYjG;AAED,wBAAgB,+BAA+B,CAAC,UAAU,EAAE,aAAa,EAAE,GAAG,UAAU,GAAG,IAAI,CAwB9F"}

package/dist/parser/ohm-ast.d.ts

@@ -0,0 +1,14 @@
+import * as Ohm from "ohm-js";
+import type { ParseError } from "../types";
+import type { SemanticResult } from "./internal-types";
+declare const grammar: Ohm.Grammar;
+type ParseWithOhmResult = {
+    ok: true;
+    value: SemanticResult;
+} | {
+    ok: false;
+    error: ParseError;
+};
+export declare function parseWithOhm(source: string): ParseWithOhmResult;
+export { grammar };
+//# sourceMappingURL=ohm-ast.d.ts.map

package/dist/parser/ohm-ast.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"ohm-ast.d.ts","sourceRoot":"","sources":["../../src/parser/ohm-ast.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,QAAQ,CAAA;AAE7B,OAAO,KAAK,EAAE,UAAU,EAAkB,MAAM,UAAU,CAAA;AAG1D,OAAO,KAAK,EAA+B,cAAc,EAAE,MAAM,kBAAkB,CAAA;AASnF,QAAA,MAAM,OAAO,aAA6B,CAAA;AAwN1C,KAAK,kBAAkB,GAAG;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,KAAK,EAAE,cAAc,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,UAAU,CAAA;CAAE,CAAA;AAEhG,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,kBAAkB,CAsB/D;AAED,OAAO,EAAE,OAAO,EAAE,CAAA"}

package/dist/parser/preprocess.d.ts

@@ -0,0 +1,10 @@
+/** Strip block comments [- ... -] from source, preserving only newlines. */
+export declare function stripBlockComments(source: string): string;
+/**
+ * Normalize marker spacing variants accepted by cooklang-rs parser:
+ * - `@ example{}` -> `@example{}`
+ * - `# 10{}` -> `#10{}`
+ * - `~ {5}` -> `~{5}`
+ */
+export declare function normalizeMarkerSpacing(source: string): string;
+//# sourceMappingURL=preprocess.d.ts.map

package/dist/parser/preprocess.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"preprocess.d.ts","sourceRoot":"","sources":["../../src/parser/preprocess.ts"],"names":[],"mappings":"AAAA,4EAA4E;AAC5E,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAIzD;AAED;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAK7D"}

package/dist/parser/quantity.d.ts

@@ -0,0 +1,3 @@
+/** Parse a quantity string into a number (including fractions) or keep as string. */
+export declare function parseQuantity(raw: string): string | number;
+//# sourceMappingURL=quantity.d.ts.map

package/dist/parser/quantity.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"quantity.d.ts","sourceRoot":"","sources":["../../src/parser/quantity.ts"],"names":[],"mappings":"AAAA,qFAAqF;AACrF,wBAAgB,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAyB1D"}

package/dist/parser/raw-step-items.d.ts

@@ -0,0 +1,4 @@
+import type { RecipeStepItem } from "../types";
+export declare function attachRaw<T extends RecipeStepItem>(item: T, raw: string): T;
+export declare function serializeStepItemRaw(item: RecipeStepItem): string;
+//# sourceMappingURL=raw-step-items.d.ts.map

package/dist/parser/raw-step-items.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"raw-step-items.d.ts","sourceRoot":"","sources":["../../src/parser/raw-step-items.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAI9C,wBAAgB,SAAS,CAAC,CAAC,SAAS,cAAc,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,CAG3E;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAuCjE"}

package/dist/parser/step-processing.d.ts

@@ -0,0 +1,14 @@
+import type { ParseError, RecipeInlineQuantity, RecipeStepItem } from "../types";
+import type { DefineMode } from "./internal-types";
+/** Merge adjacent text items into single items (e.g. across soft line breaks). */
+export declare function mergeConsecutiveTexts(items: RecipeStepItem[]): RecipeStepItem[];
+/** Collect unique items of a given type across parsed step items. */
+export declare function collectUniqueFromSteps<T extends RecipeStepItem>(allSteps: RecipeStepItem[][], type: RecipeStepItem["type"], key: (item: T) => string): T[];
+export declare function applyInlineQuantityExtraction(stepItems: RecipeStepItem[], inlineQuantities: RecipeInlineQuantity[], enabled: boolean): RecipeStepItem[];
+export declare function applyAdvancedUnits(stepItems: RecipeStepItem[], enabled: boolean): RecipeStepItem[];
+export declare function applyAliasMode(stepItems: RecipeStepItem[], aliasEnabled: boolean): RecipeStepItem[];
+export declare function splitInvalidMarkerTextItems(stepItems: RecipeStepItem[]): RecipeStepItem[];
+export declare function warnTimerMissingUnit(stepItems: RecipeStepItem[], warnings: ParseError[]): void;
+export declare function warnUnnecessaryScalingLock(stepItems: RecipeStepItem[], warnings: ParseError[]): void;
+export declare function checkStepsModeReferences(stepItems: RecipeStepItem[], defineMode: DefineMode, knownIngredients: Set<string>, knownCookware: Set<string>, errors: ParseError[]): void;
+//# sourceMappingURL=step-processing.d.ts.map

package/dist/parser/step-processing.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"step-processing.d.ts","sourceRoot":"","sources":["../../src/parser/step-processing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAChF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAGlD,kFAAkF;AAClF,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,cAAc,EAAE,GAAG,cAAc,EAAE,CAW/E;AAED,qEAAqE;AACrE,wBAAgB,sBAAsB,CAAC,CAAC,SAAS,cAAc,EAC7D,QAAQ,EAAE,cAAc,EAAE,EAAE,EAC5B,IAAI,EAAE,cAAc,CAAC,MAAM,CAAC,EAC5B,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,MAAM,GACvB,CAAC,EAAE,CAcL;AAkGD,wBAAgB,6BAA6B,CAC3C,SAAS,EAAE,cAAc,EAAE,EAC3B,gBAAgB,EAAE,oBAAoB,EAAE,EACxC,OAAO,EAAE,OAAO,GACf,cAAc,EAAE,CAWlB;AA0BD,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,cAAc,EAAE,EAC3B,OAAO,EAAE,OAAO,GACf,cAAc,EAAE,CAgBlB;AAED,wBAAgB,cAAc,CAC5B,SAAS,EAAE,cAAc,EAAE,EAC3B,YAAY,EAAE,OAAO,GACpB,cAAc,EAAE,CAmBlB;AAED,wBAAgB,2BAA2B,CAAC,SAAS,EAAE,cAAc,EAAE,GAAG,cAAc,EAAE,CAyDzF;AAED,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,cAAc,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,IAAI,CAW9F;AAED,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,cAAc,EAAE,EAC3B,QAAQ,EAAE,UAAU,EAAE,GACrB,IAAI,CASN;AAED,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,cAAc,EAAE,EAC3B,UAAU,EAAE,UAAU,EACtB,gBAAgB,EAAE,GAAG,CAAC,MAAM,CAAC,EAC7B,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,EAC1B,MAAM,EAAE,UAAU,EAAE,GACnB,IAAI,CA0BN"}

package/dist/semantics.d.ts

@@ -1,6 +1,3 @@
-import * as Ohm from "ohm-js";
-import type { CooklangRecipe } from "./types";
-declare const grammar: Ohm.Grammar;
-export declare function parseCooklang(source: string): CooklangRecipe;
-export { grammar };
+export { parseCooklang } from "./parse-cooklang";
+export { grammar } from "./parser/ohm-ast";
 //# sourceMappingURL=semantics.d.ts.map

package/dist/semantics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"semantics.d.ts","sourceRoot":"","sources":["../src/semantics.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,QAAQ,CAAA;AAG7B,OAAO,KAAK,EACV,cAAc,EAOf,MAAM,SAAS,CAAA;AAEhB,QAAA,MAAM,OAAO,aAA6B,CAAA;AAuS1C,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc,CA0D5D;AAED,OAAO,EAAE,OAAO,EAAE,CAAA"}
+{"version":3,"file":"semantics.d.ts","sourceRoot":"","sources":["../src/semantics.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAA"}

package/dist/types.d.ts

@@ -8,35 +8,88 @@ export interface ParseError {
     shortMessage?: string;
     position: SourcePosition;
     severity: "error" | "warning";
+    help?: string;
+}
+export interface ParseCooklangOptions {
+    /**
+     * Parser behavior preset:
+     * - "canonical": canonical/spec-oriented behavior (extensions off)
+     * - "all": cooklang-rs default behavior (extensions on)
+     */
+    extensions?: "canonical" | "all";
+}
+export type SectionContent = {
+    type: "step";
+    items: RecipeStepItem[];
+    number?: number;
+} | {
+    type: "text";
+    value: string;
+};
+export interface RecipeSection {
+    name: string | null;
+    content: SectionContent[];
 }
 export interface CooklangRecipe {
     metadata: Record<string, unknown>;
-    steps: RecipeStepItem[][];
+    sections: RecipeSection[];
     ingredients: RecipeIngredient[];
     cookware: RecipeCookware[];
     timers: RecipeTimer[];
-    sections: string[];
-    notes: string[];
+    inlineQuantities: RecipeInlineQuantity[];
     errors: ParseError[];
     warnings: ParseError[];
 }
 export type RecipeStepItem = {
     type: "text";
     value: string;
-} | RecipeIngredient | RecipeCookware | RecipeTimer;
+} | RecipeIngredient | RecipeCookware | RecipeTimer | {
+    type: "inline_quantity";
+    index: number;
+};
+export type ComponentRelation = {
+    type: "definition";
+    referencedFrom: number[];
+    definedInStep: boolean;
+} | {
+    type: "reference";
+    referencesTo: number;
+};
+export type IngredientReferenceTarget = "ingredient" | "step" | "section";
+export interface IngredientRelation {
+    type: "definition" | "reference";
+    referencedFrom?: number[];
+    definedInStep?: boolean;
+    referencesTo?: number;
+    referenceTarget?: IngredientReferenceTarget;
+}
+export interface RecipeModifiers {
+    recipe?: boolean;
+    reference?: boolean;
+    hidden?: boolean;
+    optional?: boolean;
+    new?: boolean;
+}
 export interface RecipeIngredient {
     type: "ingredient";
     name: string;
+    alias?: string;
     quantity: number | string;
     units: string;
     fixed: boolean;
-    preparation?: string;
+    note?: string;
+    modifiers: RecipeModifiers;
+    relation: IngredientRelation;
 }
 export interface RecipeCookware {
     type: "cookware";
     name: string;
+    alias?: string;
     quantity: number | string;
     units: string;
+    note?: string;
+    modifiers: RecipeModifiers;
+    relation: ComponentRelation;
 }
 export interface RecipeTimer {
     type: "timer";
@@ -44,4 +97,8 @@ export interface RecipeTimer {
     quantity: number | string;
     units: string;
 }
+export interface RecipeInlineQuantity {
+    quantity: number | string;
+    units: string;
+}
 //# 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":"AAAA,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,CAAA;IACf,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,cAAc,CAAA;IACxB,QAAQ,EAAE,OAAO,GAAG,SAAS,CAAA;CAC9B;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACjC,KAAK,EAAE,cAAc,EAAE,EAAE,CAAA;IACzB,WAAW,EAAE,gBAAgB,EAAE,CAAA;IAC/B,QAAQ,EAAE,cAAc,EAAE,CAAA;IAC1B,MAAM,EAAE,WAAW,EAAE,CAAA;IACrB,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,KAAK,EAAE,MAAM,EAAE,CAAA;IACf,MAAM,EAAE,UAAU,EAAE,CAAA;IACpB,QAAQ,EAAE,UAAU,EAAE,CAAA;CACvB;AAED,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC/B,gBAAgB,GAChB,cAAc,GACd,WAAW,CAAA;AAEf,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,YAAY,CAAA;IAClB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;IACzB,KAAK,EAAE,MAAM,CAAA;IACb,KAAK,EAAE,OAAO,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAA;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,UAAU,CAAA;IAChB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;IACzB,KAAK,EAAE,MAAM,CAAA;CACd;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,OAAO,CAAA;IACb,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAA;IACzB,KAAK,EAAE,MAAM,CAAA;CACd"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}

package/dist/utils.d.ts

@@ -0,0 +1,2 @@
+export declare function isRecord(v: unknown): v is Record<string, unknown>;
+//# sourceMappingURL=utils.d.ts.map

package/dist/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAEjE"}

package/grammars/cooklang.ohm

@@ -6,11 +6,11 @@
 Cooklang {
   // Main recipe structure
   Recipe
-    = Metadata? RecipeItem*
+    = (MetadataDirective | blankLine)* Metadata? RecipeItem*
 
   // Recipe items can be interleaved
   RecipeItem
-    = Section | Note | BlockComment | CommentLine | blankLine | spaceOnly | Step
+    = Section | MetadataDirective | Note | CommentLine | blankLine | spaceOnly | Step
 
   // YAML front matter metadata
   Metadata
@@ -32,7 +32,7 @@ Cooklang {
     = StepLine+
 
   StepLine
-    = ~(hspace* "-- ") ~(hspace* newline) ~sectionStart StepItem+ InlineComment? "\n"?
+    = ~(hspace* "-- ") ~(hspace* newline) ~sectionStart ~MetadataDirective StepItem+ InlineComment? "\n"?
 
   sectionStart
     = "==" | "=" ~"=" ~"@"
@@ -43,7 +43,7 @@ Cooklang {
 
   // Text without special Cooklang syntax
   Text
-    = (~("\n" | "\r\n" | "\r" | "=" &"@" | "@" &ingredientStartChar | "#" &cookwareStartChar | "~" &wordChar | "~" &"{" | "-- " | "[-") any)+
+    = (~("\n" | "\r\n" | "\r" | "@" &ingredientStartChar | "#" &cookwareStartChar | "~" &wordChar | "~" &"{" | "-- ") any)+
 
   ingredientStartChar
     = wordChar | "@" | "&" | "?" | "+" | "-"
@@ -52,12 +52,11 @@ Cooklang {
     = wordChar | "&" | "?" | "+" | "-"
 
   // Ingredient: @name{quantity%unit} or @multi word name{}
-  // Fixed quantity: =@name{quantity%unit}
   Ingredient
-    = FixedIndicator? "@" ingredientModifiers ingredientWord (hspace+ ingredientWord)+ ingredientAmount ingredientPreparation?  -- multi
-    | FixedIndicator? "@" ingredientModifiers ingredientWord ingredientAmount? ingredientPreparation?                           -- single
+    = "@" ingredientModifiers ingredientWord (hspace+ ingredientWord)+ ingredientAmount ingredientNote?  -- multi
+    | "@" ingredientModifiers ingredientWord ingredientAmount? ingredientNote?                           -- single
 
-  ingredientPreparation
+  ingredientNote
     = "(" (~")" ~newline any)* ")"
 
   ingredientModifiers
@@ -67,15 +66,17 @@ Cooklang {
     = componentWordChar+
 
   ingredientAmount
-    = "{" (~"}" any)* "}"
-
-  FixedIndicator
-    = "="
+    = "{" amountFixed? amountQuantity "%" amountUnit "}"  -- withUnit
+    | "{" hspace* amountFixed? hspace* "}"                 -- empty
+    | "{" amountFixed? amountQuantity "}"                   -- quantityOnly
 
   // Cookware: #name or #multi word{}
   Cookware
-    = "#" cookwareModifiers cookwareWord (hspace+ cookwareWord)+ cookwareAmount   -- multi
-    | "#" cookwareModifiers cookwareWord cookwareAmount?                         -- single
+    = "#" cookwareModifiers cookwareWord (hspace+ cookwareWord)+ cookwareAmount cookwareNote?   -- multi
+    | "#" cookwareModifiers cookwareWord cookwareAmount? cookwareNote?                         -- single
+
+  cookwareNote
+    = "(" (~")" ~newline any)* ")"
 
   cookwareModifiers
     = ("&" | "?" | "+" | "-")*
@@ -84,21 +85,30 @@ Cooklang {
     = componentWordChar+
 
   cookwareAmount
-    = "{" (~"}" any)* "}"
+    = "{" hspace* "}"           -- empty
+    | "{" cookwareQuantity "}"  -- withQuantity
+
+  cookwareQuantity
+    = (~"}" any)+
 
   // Timer: ~{quantity%unit} or ~name{quantity%unit}
   Timer
-    = "~" timerName? "{" timerQuantity timerUnit? "}"   -- withAmount
-    | "~" timerName                                     -- word
+    = "~" timerName? "{" amountQuantity "%" amountUnit "}"  -- withUnit
+    | "~" timerName? "{" amountQuantity "}"                  -- quantityOnly
+    | "~" timerName                                           -- word
 
   timerName
     = word+
 
-  timerQuantity
+  // Shared amount sub-rules for ingredients and timers
+  amountFixed
+    = hspace* "=" hspace*
+
+  amountQuantity
     = (~"%" ~"}" any)+
 
-  timerUnit
-    = "%" (~"}" any)+
+  amountUnit
+    = (~"}" any)+
 
   // Note lines (start with >)
   Note
@@ -107,6 +117,19 @@ Cooklang {
   noteText
     = (~"\n" ~"\r" ~">" any)+
 
+  // Metadata directive: >> key: value
+  MetadataDirective
+    = hspace* ">>" directiveBody Newline?
+
+  directiveBody
+    = hspace* directiveKey hspace* ":" directiveValue
+
+  directiveKey
+    = (~":" ~newline any)+
+
+  directiveValue
+    = (~newline any)*
+
   // Inline comment: -- comment
   InlineComment
     = "-- " (~Newline any)*
@@ -115,10 +138,6 @@ Cooklang {
   CommentLine
     = hspace* InlineComment Newline?
 
-  // Block comment: [- comment -]
-  BlockComment
-    = "[-" (~"-]" any)+ "-]"
-
   // Component name word char - wordChar plus | for alias syntax
   componentWordChar
     = wordChar | "|"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cooklang-parse",
-  "version": "1.1.2",
+  "version": "1.2.0",
   "description": "A simple, type-safe Cooklang parser built with Ohm.js",
   "type": "module",
   "main": "dist/index.js",
@@ -45,7 +45,8 @@
   },
   "devDependencies": {
     "@biomejs/biome": "^2.3.11",
-    "@types/bun": "latest"
+    "@types/bun": "latest",
+    "lefthook": "^2.1.0"
   },
   "peerDependencies": {
     "typescript": "^5"