@agentshouse/mdruntime 0.1.0-alpha.3 → 0.1.0-alpha.30

package/dist/replica.js

@@ -1,14 +1,108 @@
+import { parse } from '@agentshouse/mdmodel';
 import { immutable } from './change.js';
-import { parseCollection, readCollection } from './collection.js';
-import { overlay } from './overlay.js';
-export function readConfirmed(record) {
-    const collection = readCollection(record.documents, record.binaryTargets);
+import { parseCollection, readCollection, validateCollection } from './collection.js';
+import { overlay, overlayChanged, sameLayerText } from './overlay.js';
+import { providerRewritten } from './save.js';
+import { equalValue } from './room-draft.js';
+export function compositionOf(record) {
+    return {
+        collectionRoot: record.collectionRoot,
+        model: record.model,
+        selection: record.typedSelection === null ? null : {
+            roots: record.typedSelection.roots,
+            model: record.selectionModel
+        }
+    };
+}
+export function readConfirmed(record, previous) {
+    const collection = readCollection(record.documents, compositionOf(record), previous === undefined ? undefined : {
+        text: previous.record.documents,
+        collection: previous.collection
+    });
     return collection === null ? null : {
         record,
         collection
     };
 }
-export function replicaOf(confirmed, queue) {
+export function readStaged(record, previous) {
+    if ((record.model.status === 'current' || record.selectionModel.status === 'current') && (previous === undefined || !sameLayerText(record, previous.record) || record.model !== previous.record.model || record.selectionModel !== previous.record.selectionModel)) {
+        const verdict = validateCollection(record.documents, record.binaryTargets, compositionOf(record));
+        if (verdict.verdict === 'refuse' && verdict.rule !== 'model-unavailable') return null;
+    }
+    return readConfirmed(record, previous);
+}
+export function applyReturned(confirmed, documents, revisions, removals, roomVersion) {
+    const nextDocuments = {
+        ...confirmed.record.documents,
+        ...documents
+    };
+    const nextRevisions = {
+        ...confirmed.record.revisions,
+        ...revisions
+    };
+    const binaryTargets = new Set(confirmed.record.binaryTargets);
+    for (const path of removals){
+        delete nextDocuments[path];
+        delete nextRevisions[path];
+        binaryTargets.delete(path);
+    }
+    return readStaged({
+        ...confirmed.record,
+        roomVersion,
+        documents: nextDocuments,
+        revisions: nextRevisions,
+        binaryTargets: [
+            ...binaryTargets
+        ].sort()
+    }, confirmed);
+}
+function predicted(confirmed, batches, previous) {
+    const composition = compositionOf(confirmed.record);
+    let layer = confirmed.record;
+    const replay = [];
+    const prior = new Map(previous?.replay.map((step)=>[
+            step.id,
+            step
+        ]) ?? []);
+    for (const batch of batches){
+        const before = layer;
+        const old = prior.get(batch.id);
+        const hasMove = batch.changes.some((change)=>change.kind === 'move');
+        const reuseRewrite = old?.collection !== undefined && sameLayerText(before, old.before) && old.collection.composition.collectionRoot === composition.collectionRoot && old.collection.composition.model === composition.model && old.collection.composition.selection?.model === composition.selection?.model && JSON.stringify(old.collection.composition.selection?.roots) === JSON.stringify(composition.selection?.roots);
+        const collection = hasMove ? reuseRewrite ? old.collection : parseCollection(before.documents, composition, old?.collection === undefined ? {
+            text: confirmed.record.documents,
+            collection: confirmed.collection
+        } : {
+            text: old.before.documents,
+            collection: old.collection
+        }) : undefined;
+        const effective = collection === undefined ? batch : reuseRewrite ? old.effective : providerRewritten(batch, {
+            ...before,
+            collection
+        });
+        layer = old === undefined ? overlay(before, [
+            effective
+        ]) : overlayChanged(before, [
+            effective
+        ], old.before, [
+            old.effective
+        ], old.after);
+        replay.push({
+            id: batch.id,
+            before,
+            after: layer,
+            effective,
+            ...collection === undefined ? {} : {
+                collection
+            }
+        });
+    }
+    return {
+        layer,
+        replay
+    };
+}
+export function replicaOf(confirmed, queue, rewriting, previous) {
     const batches = Object.freeze(queue.map(immutable));
     if (batches.length === 0) {
         return {
@@ -19,18 +113,76 @@ export function replicaOf(confirmed, queue) {
                 binaryTargets: confirmed.record.binaryTargets,
                 revisions: confirmed.record.revisions,
                 collection: confirmed.collection
-            }
+            },
+            replay: []
         };
     }
-    const layer = overlay(confirmed.record, batches);
+    const predictedState = rewriting === 'provider' ? predicted(confirmed, batches, previous) : null;
+    const layer = rewriting === 'provider' ? predictedState.layer : previous === undefined ? overlay(confirmed.record, batches) : overlayChanged(confirmed.record, batches, previous.confirmed.record, previous.queue, previous.visible);
     return {
         confirmed,
         queue: batches,
+        replay: predictedState?.replay ?? [],
         visible: {
             ...layer,
-            collection: parseCollection(layer.documents)
+            collection: parseCollection(layer.documents, compositionOf(confirmed.record), previous === undefined ? undefined : {
+                text: previous.visible.documents,
+                collection: previous.visible.collection
+            })
         }
     };
 }
+function present(layer, path) {
+    return layer.documents[path] !== undefined || layer.binaryTargets.includes(path);
+}
+function holds(layer, preconditions) {
+    const parsed = new Map();
+    const documentAt = (path)=>{
+        if (!parsed.has(path)) {
+            const text = layer.documents[path];
+            const opened = text === undefined ? null : parse(text, path);
+            parsed.set(path, opened?.ok === true ? opened.document : null);
+        }
+        return parsed.get(path) ?? null;
+    };
+    return preconditions.every((precondition)=>{
+        const path = precondition.path;
+        if (precondition.kind === 'absent') return !present(layer, path);
+        if (precondition.kind === 'present') return present(layer, path);
+        if (precondition.kind === 'revision') {
+            return present(layer, path) && layer.revisions[path] === precondition.revision;
+        }
+        const document = documentAt(path);
+        if (document === null) return false;
+        if (precondition.kind === 'field') {
+            const value = Object.hasOwn(document.fields, precondition.name) ? document.fields[precondition.name] : undefined;
+            return equalValue(value, precondition.value);
+        }
+        if (precondition.kind === 'section') {
+            return Object.hasOwn(document.sections, precondition.name) && document.sections[precondition.name] === precondition.value;
+        }
+        return document.preamble === precondition.value;
+    });
+}
+export function withdrawals(confirmed, queue, withdrawable, rewriting) {
+    if (!queue.some(withdrawable)) return [];
+    const composition = compositionOf(confirmed.record);
+    let layer = confirmed.record;
+    const withdrawn = [];
+    for (const batch of queue){
+        if (withdrawable(batch) && !holds(layer, batch.preconditions)) {
+            withdrawn.push(batch);
+            continue;
+        }
+        const effective = rewriting === 'provider' && batch.changes.some((change)=>change.kind === 'move') ? providerRewritten(batch, {
+            ...layer,
+            collection: parseCollection(layer.documents, composition)
+        }) : batch;
+        layer = overlay(layer, [
+            effective
+        ]);
+    }
+    return withdrawn;
+}
 
 //# sourceMappingURL=replica.js.map

package/dist/replica.js.map

@@ -1 +1 @@
-{"version":3,"sources":["/workspace/packages/mdruntime/src/replica.ts"],"sourcesContent":["import { immutable, type ChangeBatch } from './change.js';\nimport { parseCollection, readCollection, type Collection } from './collection.js';\nimport { overlay, type Layer } from './overlay.js';\nimport type { ReplicaRecord } from './store.js';\n\nexport type ConfirmedLayer = {\n  record: ReplicaRecord;\n  collection: Collection;\n};\n\nexport type VisibleLayer = Layer & {\n  collection: Collection;\n};\n\nexport type Replica = {\n  confirmed: ConfirmedLayer;\n  queue: readonly ChangeBatch[];\n  visible: VisibleLayer;\n};\n\nexport function readConfirmed(record: ReplicaRecord): ConfirmedLayer | null {\n  const collection = readCollection(record.documents, record.binaryTargets);\n  return collection === null ? null : { record, collection };\n}\n\nexport function replicaOf(confirmed: ConfirmedLayer, queue: readonly ChangeBatch[]): Replica {\n  const batches = Object.freeze(queue.map(immutable));\n  if (batches.length === 0) {\n    return {\n      confirmed,\n      queue: batches,\n      visible: {\n        documents: confirmed.record.documents,\n        binaryTargets: confirmed.record.binaryTargets,\n        revisions: confirmed.record.revisions,\n        collection: confirmed.collection,\n      },\n    };\n  }\n  const layer = overlay(confirmed.record, batches);\n  return {\n    confirmed,\n    queue: batches,\n    visible: { ...layer, collection: parseCollection(layer.documents) },\n  };\n}\n"],"names":["immutable","parseCollection","readCollection","overlay","readConfirmed","record","collection","documents","binaryTargets","replicaOf","confirmed","queue","batches","Object","freeze","map","length","visible","revisions","layer"],"mappings":"AAAA,SAASA,SAAS,QAA0B,cAAc;AAC1D,SAASC,eAAe,EAAEC,cAAc,QAAyB,kBAAkB;AACnF,SAASC,OAAO,QAAoB,eAAe;AAkBnD,OAAO,SAASC,cAAcC,MAAqB;IACjD,MAAMC,aAAaJ,eAAeG,OAAOE,SAAS,EAAEF,OAAOG,aAAa;IACxE,OAAOF,eAAe,OAAO,OAAO;QAAED;QAAQC;IAAW;AAC3D;AAEA,OAAO,SAASG,UAAUC,SAAyB,EAAEC,KAA6B;IAChF,MAAMC,UAAUC,OAAOC,MAAM,CAACH,MAAMI,GAAG,CAACf;IACxC,IAAIY,QAAQI,MAAM,KAAK,GAAG;QACxB,OAAO;YACLN;YACAC,OAAOC;YACPK,SAAS;gBACPV,WAAWG,UAAUL,MAAM,CAACE,SAAS;gBACrCC,eAAeE,UAAUL,MAAM,CAACG,aAAa;gBAC7CU,WAAWR,UAAUL,MAAM,CAACa,SAAS;gBACrCZ,YAAYI,UAAUJ,UAAU;YAClC;QACF;IACF;IACA,MAAMa,QAAQhB,QAAQO,UAAUL,MAAM,EAAEO;IACxC,OAAO;QACLF;QACAC,OAAOC;QACPK,SAAS;YAAE,GAAGE,KAAK;YAAEb,YAAYL,gBAAgBkB,MAAMZ,SAAS;QAAE;IACpE;AACF"}
+{"version":3,"sources":["/workspace/packages/mdruntime/src/replica.ts"],"sourcesContent":["import { parse, type Document } from '@agentshouse/mdmodel';\nimport { immutable, type ChangeBatch, type Precondition } from './change.js';\nimport {\n  parseCollection,\n  readCollection,\n  validateCollection,\n  type Collection,\n  type Composition,\n} from './collection.js';\nimport { overlay, overlayChanged, sameLayerText, type Layer } from './overlay.js';\nimport { providerRewritten, type Rewriting } from './save.js';\nimport { equalValue } from './room-draft.js';\nimport type { ReplicaRecord } from './store.js';\n\nexport type ConfirmedLayer = {\n  record: ReplicaRecord;\n  collection: Collection;\n};\n\nexport type VisibleLayer = Layer & {\n  collection: Collection;\n};\n\nexport type Replica = {\n  confirmed: ConfirmedLayer;\n  queue: readonly ChangeBatch[];\n  visible: VisibleLayer;\n  replay: readonly ReplayStep[];\n};\n\ntype ReplayStep = {\n  id: string;\n  before: Layer;\n  after: Layer;\n  effective: ChangeBatch;\n  collection?: Collection;\n};\n\nexport function compositionOf(record: ReplicaRecord): Composition {\n  return {\n    collectionRoot: record.collectionRoot,\n    model: record.model,\n    selection:\n      record.typedSelection === null\n        ? null\n        : { roots: record.typedSelection.roots, model: record.selectionModel },\n  };\n}\n\nexport function readConfirmed(\n  record: ReplicaRecord,\n  previous?: ConfirmedLayer,\n): ConfirmedLayer | null {\n  const collection = readCollection(\n    record.documents,\n    compositionOf(record),\n    previous === undefined\n      ? undefined\n      : { text: previous.record.documents, collection: previous.collection },\n  );\n  return collection === null ? null : { record, collection };\n}\n\nexport function readStaged(\n  record: ReplicaRecord,\n  previous?: ConfirmedLayer,\n): ConfirmedLayer | null {\n  if (\n    (record.model.status === 'current' || record.selectionModel.status === 'current') &&\n    (previous === undefined ||\n      !sameLayerText(record, previous.record) ||\n      record.model !== previous.record.model ||\n      record.selectionModel !== previous.record.selectionModel)\n  ) {\n    const verdict = validateCollection(\n      record.documents,\n      record.binaryTargets,\n      compositionOf(record),\n    );\n    if (verdict.verdict === 'refuse' && verdict.rule !== 'model-unavailable') return null;\n  }\n  return readConfirmed(record, previous);\n}\n\nexport function applyReturned(\n  confirmed: ConfirmedLayer,\n  documents: Readonly<Record<string, string>>,\n  revisions: Readonly<Record<string, string>>,\n  removals: readonly string[],\n  roomVersion: string,\n): ConfirmedLayer | null {\n  const nextDocuments = { ...confirmed.record.documents, ...documents };\n  const nextRevisions = { ...confirmed.record.revisions, ...revisions };\n  const binaryTargets = new Set(confirmed.record.binaryTargets);\n  for (const path of removals) {\n    delete nextDocuments[path];\n    delete nextRevisions[path];\n    binaryTargets.delete(path);\n  }\n  return readStaged(\n    {\n      ...confirmed.record,\n      roomVersion,\n      documents: nextDocuments,\n      revisions: nextRevisions,\n      binaryTargets: [...binaryTargets].sort(),\n    },\n    confirmed,\n  );\n}\n\nfunction predicted(\n  confirmed: ConfirmedLayer,\n  batches: readonly ChangeBatch[],\n  previous?: Replica,\n): { layer: Layer; replay: readonly ReplayStep[] } {\n  const composition = compositionOf(confirmed.record);\n  let layer: Layer = confirmed.record;\n  const replay: ReplayStep[] = [];\n  const prior = new Map(previous?.replay.map((step) => [step.id, step]) ?? []);\n  for (const batch of batches) {\n    const before = layer;\n    const old = prior.get(batch.id);\n    const hasMove = batch.changes.some((change) => change.kind === 'move');\n    const reuseRewrite =\n      old?.collection !== undefined &&\n      sameLayerText(before, old.before) &&\n      old.collection.composition.collectionRoot === composition.collectionRoot &&\n      old.collection.composition.model === composition.model &&\n      old.collection.composition.selection?.model === composition.selection?.model &&\n      JSON.stringify(old.collection.composition.selection?.roots) ===\n        JSON.stringify(composition.selection?.roots);\n    const collection = hasMove\n      ? reuseRewrite\n        ? old.collection\n        : parseCollection(\n            before.documents,\n            composition,\n            old?.collection === undefined\n              ? { text: confirmed.record.documents, collection: confirmed.collection }\n              : { text: old.before.documents, collection: old.collection },\n          )\n      : undefined;\n    const effective =\n      collection === undefined\n        ? batch\n        : reuseRewrite\n          ? old.effective\n          : providerRewritten(batch, { ...before, collection });\n    layer =\n      old === undefined\n        ? overlay(before, [effective])\n        : overlayChanged(before, [effective], old.before, [old.effective], old.after);\n    replay.push({\n      id: batch.id,\n      before,\n      after: layer,\n      effective,\n      ...(collection === undefined ? {} : { collection }),\n    });\n  }\n  return { layer, replay };\n}\n\nexport function replicaOf(\n  confirmed: ConfirmedLayer,\n  queue: readonly ChangeBatch[],\n  rewriting: Rewriting,\n  previous?: Replica,\n): Replica {\n  const batches = Object.freeze(queue.map(immutable));\n  if (batches.length === 0) {\n    return {\n      confirmed,\n      queue: batches,\n      visible: {\n        documents: confirmed.record.documents,\n        binaryTargets: confirmed.record.binaryTargets,\n        revisions: confirmed.record.revisions,\n        collection: confirmed.collection,\n      },\n      replay: [],\n    };\n  }\n  const predictedState = rewriting === 'provider' ? predicted(confirmed, batches, previous) : null;\n  const layer =\n    rewriting === 'provider'\n      ? predictedState!.layer\n      : previous === undefined\n        ? overlay(confirmed.record, batches)\n        : overlayChanged(\n            confirmed.record,\n            batches,\n            previous.confirmed.record,\n            previous.queue,\n            previous.visible,\n          );\n  return {\n    confirmed,\n    queue: batches,\n    replay: predictedState?.replay ?? [],\n    visible: {\n      ...layer,\n      collection: parseCollection(\n        layer.documents,\n        compositionOf(confirmed.record),\n        previous === undefined\n          ? undefined\n          : { text: previous.visible.documents, collection: previous.visible.collection },\n      ),\n    },\n  };\n}\n\nfunction present(layer: Layer, path: string): boolean {\n  return layer.documents[path] !== undefined || layer.binaryTargets.includes(path);\n}\n\nfunction holds(layer: Layer, preconditions: readonly Precondition[]): boolean {\n  const parsed = new Map<string, Document | null>();\n  const documentAt = (path: string) => {\n    if (!parsed.has(path)) {\n      const text = layer.documents[path];\n      const opened = text === undefined ? null : parse(text, path);\n      parsed.set(path, opened?.ok === true ? opened.document : null);\n    }\n    return parsed.get(path) ?? null;\n  };\n  return preconditions.every((precondition) => {\n    const path = precondition.path;\n    if (precondition.kind === 'absent') return !present(layer, path);\n    if (precondition.kind === 'present') return present(layer, path);\n    if (precondition.kind === 'revision') {\n      return present(layer, path) && layer.revisions[path] === precondition.revision;\n    }\n    const document = documentAt(path);\n    if (document === null) return false;\n    if (precondition.kind === 'field') {\n      const value = Object.hasOwn(document.fields, precondition.name)\n        ? document.fields[precondition.name]\n        : undefined;\n      return equalValue(value, precondition.value);\n    }\n    if (precondition.kind === 'section') {\n      return (\n        Object.hasOwn(document.sections, precondition.name) &&\n        document.sections[precondition.name] === precondition.value\n      );\n    }\n    return document.preamble === precondition.value;\n  });\n}\n\nexport function withdrawals(\n  confirmed: ConfirmedLayer,\n  queue: readonly ChangeBatch[],\n  withdrawable: (batch: ChangeBatch) => boolean,\n  rewriting: Rewriting,\n): readonly ChangeBatch[] {\n  if (!queue.some(withdrawable)) return [];\n  const composition = compositionOf(confirmed.record);\n  let layer: Layer = confirmed.record;\n  const withdrawn: ChangeBatch[] = [];\n  for (const batch of queue) {\n    if (withdrawable(batch) && !holds(layer, batch.preconditions)) {\n      withdrawn.push(batch);\n      continue;\n    }\n    const effective =\n      rewriting === 'provider' && batch.changes.some((change) => change.kind === 'move')\n        ? providerRewritten(batch, {\n            ...layer,\n            collection: parseCollection(layer.documents, composition),\n          })\n        : batch;\n    layer = overlay(layer, [effective]);\n  }\n  return withdrawn;\n}\n"],"names":["parse","immutable","parseCollection","readCollection","validateCollection","overlay","overlayChanged","sameLayerText","providerRewritten","equalValue","compositionOf","record","collectionRoot","model","selection","typedSelection","roots","selectionModel","readConfirmed","previous","collection","documents","undefined","text","readStaged","status","verdict","binaryTargets","rule","applyReturned","confirmed","revisions","removals","roomVersion","nextDocuments","nextRevisions","Set","path","delete","sort","predicted","batches","composition","layer","replay","prior","Map","map","step","id","batch","before","old","get","hasMove","changes","some","change","kind","reuseRewrite","JSON","stringify","effective","after","push","replicaOf","queue","rewriting","Object","freeze","length","visible","predictedState","present","includes","holds","preconditions","parsed","documentAt","has","opened","set","ok","document","every","precondition","revision","value","hasOwn","fields","name","sections","preamble","withdrawals","withdrawable","withdrawn"],"mappings":"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"}

package/dist/room-draft.d.ts

@@ -0,0 +1,124 @@
+import type { ProviderRefusal } from './adapter.js';
+import type { Change, Precondition } from './change.js';
+import type { VisibleLayer } from './replica.js';
+export type FieldValue = {
+    readonly value: unknown;
+} | null;
+export type RoomDraftCreation = {
+    readonly type: string;
+    readonly fields: Readonly<Record<string, unknown>>;
+    readonly sections: Readonly<Record<string, string>>;
+} | {
+    readonly markdown: string;
+};
+export type RoomDraftParts = {
+    readonly fields?: Readonly<Record<string, {
+        readonly value: unknown;
+        readonly base?: FieldValue;
+    }>>;
+    readonly sections?: Readonly<Record<string, {
+        readonly value: string;
+        readonly base?: string;
+    }>>;
+    readonly preamble?: {
+        readonly value: string;
+        readonly base?: string;
+    };
+    readonly markdown?: {
+        readonly value: string;
+        readonly base?: string;
+    };
+    readonly creation?: RoomDraftCreation;
+    readonly move?: {
+        readonly to: string;
+        readonly base?: string | null;
+    };
+    readonly removal?: {
+        readonly base?: string | null;
+    };
+};
+type HeldParts = {
+    readonly fields?: Readonly<Record<string, {
+        readonly value: unknown;
+        readonly base: FieldValue;
+    }>>;
+    readonly sections?: Readonly<Record<string, {
+        readonly value: string;
+        readonly base: string;
+    }>>;
+    readonly preamble?: {
+        readonly value: string;
+        readonly base: string;
+    };
+    readonly markdown?: {
+        readonly value: string;
+        readonly base: string;
+    };
+    readonly creation?: RoomDraftCreation;
+    readonly move?: {
+        readonly to: string;
+        readonly base: string | null;
+    };
+    readonly removal?: {
+        readonly base: string | null;
+    };
+};
+type ChangedUnderneath = {
+    readonly fields?: Readonly<Record<string, FieldValue>>;
+    readonly sections?: Readonly<Record<string, string | null>>;
+    readonly preamble?: string | null;
+    readonly markdown?: string | null;
+    readonly creation?: string;
+    readonly move?: string | null;
+    readonly removal?: string | null;
+};
+export type ReturnReason = (ProviderRefusal & {
+    readonly kind: 'conflicted' | 'rejected';
+}) | {
+    readonly kind: 'expired';
+} | {
+    readonly kind: 'withdrawn';
+};
+export type RoomDraft = {
+    readonly room: string;
+    readonly path: string;
+    readonly revision: string;
+    readonly parts: HeldParts;
+    readonly changedUnderneath: ChangedUnderneath;
+    readonly returned: ReturnReason | null;
+};
+export type RoomDraftWrite = {
+    readonly outcome: 'written';
+    readonly roomDraft: RoomDraft | null;
+} | {
+    readonly outcome: 'stale';
+    readonly current: RoomDraft | null;
+};
+export type ChangedPart = {
+    readonly path: string;
+    readonly part: 'field' | 'section' | 'preamble' | 'markdown' | 'creation' | 'move' | 'removal';
+    readonly name?: string;
+};
+export type RoomDraftRecord = {
+    readonly locator: string;
+    readonly path: string;
+    readonly revision: string;
+    readonly parts: HeldParts;
+    readonly returned: ReturnReason | null;
+};
+export type SavedDraft = {
+    readonly path: string;
+    readonly parts: HeldParts;
+};
+export declare function readParts(value: unknown): RoomDraftParts;
+export declare function held(current: HeldParts | undefined, parts: RoomDraftParts): HeldParts;
+export declare function equalValue(left: unknown, right: unknown): boolean;
+export declare function underneath(parts: HeldParts, path: string, visible: VisibleLayer | undefined): ChangedUnderneath;
+export declare function changedParts(path: string, report: ChangedUnderneath): readonly ChangedPart[];
+export declare function returnedInto(existing: HeldParts | undefined, returned: HeldParts): HeldParts;
+export declare function changesOf(path: string, parts: HeldParts): {
+    changes: readonly Change[];
+    bases: readonly Precondition[];
+};
+export {};
+//# sourceMappingURL=room-draft.d.ts.map

package/dist/room-draft.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"room-draft.d.ts","sourceRoot":"","sources":["../src/room-draft.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAExD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAAC;AAE5D,MAAM,MAAM,iBAAiB,GACzB;IACE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IACnD,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACrD,GACD;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAElC,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CACxB,MAAM,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,UAAU,CAAA;KAAE,CAAC,CACxE,CAAC;IACF,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CAAC;IACjG,QAAQ,CAAC,QAAQ,CAAC,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACvE,QAAQ,CAAC,QAAQ,CAAC,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACvE,QAAQ,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC;IACtC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IACvE,QAAQ,CAAC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;CACtD,CAAC;AAEF,KAAK,SAAS,GAAG;IACf,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CACxB,MAAM,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,UAAU,CAAA;KAAE,CAAC,CACvE,CAAC;IACF,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC,CAAC;IAChG,QAAQ,CAAC,QAAQ,CAAC,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACtE,QAAQ,CAAC,QAAQ,CAAC,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IACtE,QAAQ,CAAC,QAAQ,CAAC,EAAE,iBAAiB,CAAC;IACtC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IACtE,QAAQ,CAAC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;CACrD,CAAC;AAEF,KAAK,iBAAiB,GAAG;IACvB,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC,CAAC;IACvD,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC;IAC5D,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,YAAY,GACpB,CAAC,eAAe,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,YAAY,GAAG,UAAU,CAAA;CAAE,CAAC,GAChE;IAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAA;CAAE,GAC5B;IAAE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAA;CAAE,CAAC;AAEnC,MAAM,MAAM,SAAS,GAAG;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,iBAAiB,EAAE,iBAAiB,CAAC;IAC9C,QAAQ,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,cAAc,GACtB;IAAE,QAAQ,CAAC,OAAO,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAAA;CAAE,GACrE;IAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,SAAS,GAAG,IAAI,CAAA;CAAE,CAAC;AAEtE,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,OAAO,GAAG,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,UAAU,GAAG,MAAM,GAAG,SAAS,CAAC;IAC/F,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI,CAAC;CACxC,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAA;CAAE,CAAC;AAsE9E,wBAAgB,SAAS,CAAC,KAAK,EAAE,OAAO,GAAG,cAAc,CA4BxD;AAwBD,wBAAgB,IAAI,CAAC,OAAO,EAAE,SAAS,GAAG,SAAS,EAAE,KAAK,EAAE,cAAc,GAAG,SAAS,CA4CrF;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAQjE;AAOD,wBAAgB,UAAU,CACxB,KAAK,EAAE,SAAS,EAChB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,YAAY,GAAG,SAAS,GAChC,iBAAiB,CA6BnB;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAG,SAAS,WAAW,EAAE,CAU5F;AAsCD,wBAAgB,YAAY,CAAC,QAAQ,EAAE,SAAS,GAAG,SAAS,EAAE,QAAQ,EAAE,SAAS,GAAG,SAAS,CAyB5F;AAED,wBAAgB,SAAS,CACvB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,SAAS,GACf;IAAE,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IAAC,KAAK,EAAE,SAAS,YAAY,EAAE,CAAA;CAAE,CAqChE"}