@bscotch/gcdata 0.20.0 → 0.21.0

package/dist/cl2.shared.types.js

@@ -0,0 +1,108 @@
+import { z } from 'zod';
+import { assert } from './assert.js';
+import { resolvePointerInSchema } from './util.js';
+export const questSchemaId = 'cl2_quest';
+export const chatSchemaId = 'cl2_chat';
+export const buddySchemaId = 'artisan';
+export const npcSchemaId = 'cl2_npc';
+export const comfortSchemaId = 'cl2_artisan_glads';
+export const storylineSchemaId = 'cl2_storyline';
+export const arrayTagPattern = '(?:#(?<arrayTag>[a-z0-9]+))';
+export const linePartsSchema = z.object({
+    indicator: z
+        .string()
+        .optional()
+        .describe('The symbol prefixing the line to indicate what the line type is'),
+    arrayTag: z
+        .string()
+        .regex(/^[a-z0-9]+$/)
+        .optional()
+        .describe("BsArrayElement identifier (without the '#' prefix)"),
+    moteTag: z
+        .string()
+        .regex(/^[\w_-]+$/)
+        .optional()
+        .describe("MoteId (without the '@' prefix)"),
+    moteName: z.string().optional().describe('Mote Name'),
+    emojiGroup: z
+        .string()
+        .optional()
+        .describe('The emoji name, including the outer `()`'),
+    emojiName: z.string().optional().describe("The emoji's mote name"),
+    labelGroup: z.string().optional().describe('The label, including the `:`'),
+    label: z.string().optional().describe('For `Label:Value` elements'),
+    sep: z
+        .string()
+        .optional()
+        .describe('Separator between the line prefix and content.'),
+    text: z
+        .string()
+        .optional()
+        .describe('For dialog and similar, the text content'),
+    style: z
+        .string()
+        .optional()
+        .describe('For array elements whose values come in distinct flavors, the identifier indicating which flavor it is'),
+    status: z
+        .string()
+        .optional()
+        .describe('For entries that have some kind of "status" concept'),
+});
+export function parseIfMatch(pattern, line, startPosition) {
+    const rawMatch = line.match(new RegExp(pattern));
+    if (!rawMatch)
+        return null;
+    const parsedLine = linePartsSchema.parse(rawMatch.groups);
+    const result = {
+        _: {
+            start: startPosition,
+            end: { ...startPosition },
+            value: line,
+        },
+    };
+    result._.end.character += line.length;
+    result._.end.index += line.length;
+    for (const [key, value] of Object.entries(parsedLine)) {
+        if (typeof value !== 'undefined') {
+            // Figure out where this is in the matches so we
+            // can get the start and end positions.
+            const startChar = line.indexOf(`${value}`);
+            const endChar = startChar + `${value}`.length;
+            const start = { ...startPosition };
+            start.character += startChar;
+            start.index += startChar;
+            const end = { ...startPosition };
+            end.character += endChar;
+            end.index += endChar;
+            result[key] = {
+                start,
+                end,
+                value: value,
+            };
+        }
+    }
+    return result;
+}
+export function lineIsArrayItem(line) {
+    if (line.match(/^(\t|name|stage|storyline|(start|end) (moments|requirements)|log|giver|receiver|description|unlocked description)/i)) {
+        return false;
+    }
+    return true;
+}
+export function getStagingOptions(packed) {
+    const stagingSubchema = resolvePointerInSchema(['wip', 'staging'], {
+        schema_id: 'cl2_quest',
+        data: {
+            wip: {
+                staging: 'any',
+            },
+        },
+    }, packed);
+    return stagingSubchema.enum;
+}
+export function getEmojis(packed) {
+    const emojis = packed.listMotesBySchema('cl2_emoji');
+    assert(emojis.length > 0, 'Should have at least one emoji mote');
+    return emojis;
+}
+//# sourceMappingURL=cl2.shared.types.js.map

package/dist/cl2.shared.types.js.map

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

package/dist/cl2.storyline.d.ts

@@ -1,4 +1,4 @@
 export { parseStringifiedStoryline, updateChangesFromParsedStoryline, } from './cl2.storyline.parse.js';
 export { stringifyStoryline } from './cl2.storyline.stringify.js';
-export { isStorylineMote, listStorylines, storylineSchemaId, type StorylineData, type StorylineMote, type StorylineUpdateResult, } from './cl2.storyline.types.js';
+export { isStorylineMote, listStorylines, type StorylineUpdateResult, } from './cl2.storyline.types.js';
 //# sourceMappingURL=cl2.storyline.d.ts.map

package/dist/cl2.storyline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cl2.storyline.d.ts","sourceRoot":"","sources":["../src/cl2.storyline.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,gCAAgC,GACjC,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EACL,eAAe,EACf,cAAc,EACd,iBAAiB,EACjB,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,qBAAqB,GAC3B,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"cl2.storyline.d.ts","sourceRoot":"","sources":["../src/cl2.storyline.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,gCAAgC,GACjC,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EACL,eAAe,EACf,cAAc,EACd,KAAK,qBAAqB,GAC3B,MAAM,0BAA0B,CAAC"}

package/dist/cl2.storyline.js

@@ -1,4 +1,4 @@
 export { parseStringifiedStoryline, updateChangesFromParsedStoryline, } from './cl2.storyline.parse.js';
 export { stringifyStoryline } from './cl2.storyline.stringify.js';
-export { isStorylineMote, listStorylines, storylineSchemaId, } from './cl2.storyline.types.js';
+export { isStorylineMote, listStorylines, } from './cl2.storyline.types.js';
 //# sourceMappingURL=cl2.storyline.js.map

package/dist/cl2.storyline.js.map

@@ -1 +1 @@
-{"version":3,"file":"cl2.storyline.js","sourceRoot":"","sources":["../src/cl2.storyline.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,gCAAgC,GACjC,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EACL,eAAe,EACf,cAAc,EACd,iBAAiB,GAIlB,MAAM,0BAA0B,CAAC"}
+{"version":3,"file":"cl2.storyline.js","sourceRoot":"","sources":["../src/cl2.storyline.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,gCAAgC,GACjC,MAAM,0BAA0B,CAAC;AAClC,OAAO,EAAE,kBAAkB,EAAE,MAAM,8BAA8B,CAAC;AAClE,OAAO,EACL,eAAe,EACf,cAAc,GAEf,MAAM,0BAA0B,CAAC"}

package/dist/cl2.storyline.parse.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cl2.storyline.parse.d.ts","sourceRoot":"","sources":["../src/cl2.storyline.parse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAKpD,OAAO,EAQL,KAAK,qBAAqB,EAC3B,MAAM,0BAA0B,CAAC;AAQlC,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,WAAW,EACnB,OAAO,GAAE;IACP,aAAa,CAAC,EAAE,OAAO,CAAC;CACpB,GACL,qBAAqB,CAkMvB;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,qBAAqB,CAAC,QAAQ,CAAC,EACvC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,IAAI,CAAC,CA0Ef"}
+{"version":3,"file":"cl2.storyline.parse.d.ts","sourceRoot":"","sources":["../src/cl2.storyline.parse.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAUpD,OAAO,EAGL,KAAK,qBAAqB,EAC3B,MAAM,0BAA0B,CAAC;AAElC,wBAAgB,yBAAyB,CACvC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,WAAW,EACnB,OAAO,GAAE;IACP,aAAa,CAAC,EAAE,OAAO,CAAC;CACpB,GACL,qBAAqB,CAoEvB;AAED,wBAAsB,gCAAgC,CACpD,MAAM,EAAE,qBAAqB,CAAC,QAAQ,CAAC,EACvC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,IAAI,CAAC,CA6Bf"}

package/dist/cl2.storyline.parse.js

@@ -1,8 +1,7 @@
 import { assert } from './assert.js';
-import { getStagingOptions } from './cl2.quest.utils.js';
-import { arrayTagPattern, getStorylineMote, getStorylineSchema, lineIsArrayItem, linePatterns, parseIfMatch, storylineSchemaId, } from './cl2.storyline.types.js';
-import { bsArrayToArray, createBsArrayKey, updateBsArrayOrder, } from './helpers.js';
-import { checkWords, includes } from './util.js';
+import { isCommentLine, isStageLine, prepareParserHelpers, updateWipChangesFromParsed, } from './cl2.shared.parse.js';
+import { storylineSchemaId } from './cl2.shared.types.js';
+import { getStorylineSchema, linePatterns, } from './cl2.storyline.types.js';
 export function parseStringifiedStoryline(text, packed, options = {}) {
     const result = {
         diagnostics: [],
@@ -14,124 +13,25 @@ export function parseStringifiedStoryline(text, packed, options = {}) {
             comments: [],
         },
     };
-    const availableGlobalLabels = new Set([
-        'Name',
-        'Description',
-        'Stage',
-    ]);
-    const stagingOptions = getStagingOptions(packed.working);
-    /** Terms from the glossary for use in autocompletes */
-    const glossaryTerms = (packed.glossary?.relevantTerms() || []).map((t) => t.text);
-    const checkSpelling = (item) => {
-        if (!item || !options.checkSpelling)
-            return;
-        result.words.push(...checkWords(item, packed.glossary));
-    };
-    const lines = text.split(/(\r?\n)/g);
-    let index = 0;
-    let lineNumber = 0;
-    for (const line of lines) {
+    const helpers = prepareParserHelpers(text, packed, {
+        ...options,
+        globalLabels: new Set(['Name', 'Description', 'Stage']),
+    }, result);
+    for (const line of helpers.lines) {
         const trace = [];
         try {
-            // Is this just a newline?
-            if (line.match(/\r?\n/)) {
-                // Then we just need to increment the index
-                index += line.length;
-                lineNumber++;
-                continue;
-            }
-            const lineRange = {
-                start: {
-                    index,
-                    line: lineNumber,
-                    character: 0,
-                },
-                end: {
-                    index: index + line.length,
-                    line: lineNumber,
-                    character: line.length,
-                },
-            };
-            // Is this just a blank line?
             if (!line) {
-                // Add global autocompletes
-                result.completions.push({
-                    type: 'labels',
-                    start: lineRange.start,
-                    end: lineRange.end,
-                    options: availableGlobalLabels,
-                });
                 continue;
             }
+            const lineRange = helpers.currentLineRange;
             // Find the first matching pattern and pull the values from it.
-            let parsedLine = null;
-            for (const pattern of linePatterns) {
-                parsedLine = parseIfMatch(pattern, line, lineRange.start);
-                if (parsedLine)
-                    break;
-            }
-            if (!parsedLine) {
-                // Then this is likely the result of uncommenting something
-                // that was commented out, resulting in a line that starts with
-                // the comment's array tag. Provide a deletion edit!
-                parsedLine = parseIfMatch(`^${arrayTagPattern} +(?<text>.*)$`, line, lineRange.start);
-                if (parsedLine) {
-                    result.edits.push({
-                        start: lineRange.start,
-                        end: lineRange.end,
-                        newText: parsedLine.text.value,
-                    });
-                }
-                else {
-                    result.diagnostics.push({
-                        message: `Unfamiliar syntax: ${line}`,
-                        ...lineRange,
-                    });
-                }
-                index += line.length;
+            const parsedLine = helpers.parseCurrentLine(linePatterns);
+            if (!parsedLine)
                 continue;
-            }
-            // Ensure the array tag. It goes right after the label or indicator.
-            if (!parsedLine.arrayTag?.value && lineIsArrayItem(line)) {
-                const arrayTag = createBsArrayKey();
-                const start = parsedLine.indicator?.end || parsedLine.label?.end;
-                result.edits.push({
-                    start,
-                    end: start,
-                    newText: `#${arrayTag}`,
-                });
-                parsedLine.arrayTag = {
-                    start,
-                    end: start,
-                    value: arrayTag,
-                };
-            }
-            // If this has a label, remove it from the list of available labels
-            if (parsedLine.label?.value &&
-                availableGlobalLabels.has(parsedLine.label.value)) {
-                availableGlobalLabels.delete(parsedLine.label.value);
-            }
-            // If this has a text section, provide glossary autocompletes
-            if ('text' in parsedLine) {
-                const start = parsedLine.text.start;
-                const end = parsedLine.text.end;
-                result.completions.push({
-                    type: 'glossary',
-                    start,
-                    end,
-                    options: glossaryTerms,
-                });
-            }
             // Work through each line type to add diagnostics and completions
             const labelLower = parsedLine.label?.value?.toLowerCase();
-            const indicator = parsedLine.indicator?.value;
-            if (indicator === '//') {
-                // Then this is a comment/note
-                result.parsed.comments.push({
-                    id: parsedLine.arrayTag?.value?.trim(),
-                    text: parsedLine.text?.value?.trim(),
-                });
-                checkSpelling(parsedLine.text);
+            if (isCommentLine(parsedLine)) {
+                helpers.addComment(parsedLine);
             }
             else if (labelLower === 'name') {
                 result.parsed.name = parsedLine.text?.value?.trim();
@@ -144,26 +44,10 @@ export function parseStringifiedStoryline(text, packed, options = {}) {
             }
             else if (labelLower === 'description') {
                 result.parsed.description = parsedLine.text?.value?.trim();
-                checkSpelling(parsedLine.text);
+                helpers.checkSpelling(parsedLine.text);
             }
-            else if (labelLower === 'stage') {
-                const stage = parsedLine.text?.value?.trim();
-                if (includes(stagingOptions, stage)) {
-                    result.parsed.stage = stage;
-                }
-                else {
-                    result.diagnostics.push({
-                        message: `Stage must be one of: ${stagingOptions.join(', ')}`,
-                        ...lineRange,
-                    });
-                    // Provide autocomplete options
-                    result.completions.push({
-                        type: 'stages',
-                        options: stagingOptions,
-                        start: parsedLine.labelGroup.end,
-                        end: lineRange.end,
-                    });
-                }
+            else if (isStageLine(parsedLine)) {
+                helpers.addStage(parsedLine);
             }
             else {
                 // Then we're in an error state on this line!
@@ -179,7 +63,7 @@ export function parseStringifiedStoryline(text, packed, options = {}) {
             }
             throw err;
         }
-        index += line.length;
+        helpers.index += line.length;
     }
     return result;
 }
@@ -191,8 +75,6 @@ export async function updateChangesFromParsedStoryline(parsed, moteId, packed) {
         // We're always going to be computing ALL changes, so clear whatever
         // we previously had.
         packed.clearMoteChanges(moteId);
-        const storylineMoteBase = getStorylineMote(packed.base, moteId);
-        const storylineMoteWorking = getStorylineMote(packed.working, moteId);
         const schema = getStorylineSchema(packed.working);
         assert(schema, `${storylineSchemaId} schema not found in working copy`);
         assert(schema.name, 'Quest mote must have a name pointer');
@@ -201,47 +83,7 @@ export async function updateChangesFromParsedStoryline(parsed, moteId, packed) {
         };
         updateMote('data/name/text', parsed.name);
         updateMote('data/description/text', parsed.description);
-        if (parsed.stage) {
-            updateMote('data/wip/staging', parsed.stage);
-        }
-        else if (storylineMoteWorking?.data.wip) {
-            updateMote('data/wip/staging', null);
-        }
-        const parsedComments = parsed.comments.filter((c) => !!c.text);
-        //#region COMMENTS
-        // Add/Update COMMENTS
-        trace(`Updating comments`);
-        for (const comment of parsedComments) {
-            trace(`Updating comment ${comment.id} with text "${comment.text}"`);
-            updateMote(`data/wip/notes/${comment.id}/element/text`, comment.text);
-        }
-        // Remove deleted comments
-        for (const existingComment of bsArrayToArray(storylineMoteBase?.data.wip?.notes || {})) {
-            if (!parsedComments.find((c) => c.id === existingComment.id)) {
-                trace(`Deleting comment ${existingComment.id}`);
-                updateMote(`data/wip/notes/${existingComment.id}`, null);
-            }
-        }
-        // Get the BASE order of the comments (if any) and use those
-        // as the starting point for an up to date order.
-        const comments = parsedComments.map((c) => {
-            // Look up the base comment
-            let comment = storylineMoteBase?.data.wip?.notes?.[c.id];
-            if (!comment) {
-                comment = storylineMoteWorking?.data.wip?.notes?.[c.id];
-                // @ts-expect-error - order is a required field, but it'll be re-added
-                delete comment?.order;
-            }
-            assert(comment, `Comment ${c.id} not found in base or working mote`);
-            return { ...comment, id: c.id };
-        });
-        trace('Updating comment order');
-        updateBsArrayOrder(comments);
-        comments.forEach((comment) => {
-            trace(`Updating comment ${comment.id} order to ${comment.order}`);
-            updateMote(`data/wip/notes/${comment.id}/order`, comment.order);
-        });
-        //#endregion
+        updateWipChangesFromParsed(parsed, moteId, packed, trace);
         trace(`Writing changes`);
         await packed.writeChanges();
     }

package/dist/cl2.storyline.parse.js.map

@@ -1 +1 @@
-{"version":3,"file":"cl2.storyline.parse.js","sourceRoot":"","sources":["../src/cl2.storyline.parse.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cl2.storyline.parse.js","sourceRoot":"","sources":["../src/cl2.storyline.parse.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EACL,aAAa,EACb,WAAW,EACX,oBAAoB,EACpB,0BAA0B,GAC3B,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE1D,OAAO,EACL,kBAAkB,EAClB,YAAY,GAEb,MAAM,0BAA0B,CAAC;AAElC,MAAM,UAAU,yBAAyB,CACvC,IAAY,EACZ,MAAmB,EACnB,UAEI,EAAE;IAEN,MAAM,MAAM,GAA0B;QACpC,WAAW,EAAE,EAAE;QACf,MAAM,EAAE,EAAE;QACV,KAAK,EAAE,EAAE;QACT,WAAW,EAAE,EAAE;QACf,KAAK,EAAE,EAAE;QACT,MAAM,EAAE;YACN,QAAQ,EAAE,EAAE;SACb;KACF,CAAC;IAEF,MAAM,OAAO,GAAG,oBAAoB,CAClC,IAAI,EACJ,MAAM,EACN;QACE,GAAG,OAAO;QACV,YAAY,EAAE,IAAI,GAAG,CAAS,CAAC,MAAM,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC;KAChE,EACD,MAAM,CACP,CAAC;IAEF,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;QACjC,MAAM,KAAK,GAAU,EAAE,CAAC;QACxB,IAAI,CAAC;YACH,IAAI,CAAC,IAAI,EAAE,CAAC;gBACV,SAAS;YACX,CAAC;YACD,MAAM,SAAS,GAAG,OAAO,CAAC,gBAAgB,CAAC;YAE3C,+DAA+D;YAC/D,MAAM,UAAU,GAAG,OAAO,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;YAC1D,IAAI,CAAC,UAAU;gBAAE,SAAS;YAE1B,iEAAiE;YACjE,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;YAC1D,IAAI,aAAa,CAAC,UAAU,CAAC,EAAE,CAAC;gBAC9B,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;YACjC,CAAC;iBAAM,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;gBACjC,MAAM,CAAC,MAAM,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;gBACpD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;oBACxB,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;wBACtB,OAAO,EAAE,sBAAsB;wBAC/B,GAAG,SAAS;qBACb,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;iBAAM,IAAI,UAAU,KAAK,aAAa,EAAE,CAAC;gBACxC,MAAM,CAAC,MAAM,CAAC,WAAW,GAAG,UAAU,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;gBAC3D,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;YACzC,CAAC;iBAAM,IAAI,WAAW,CAAC,UAAU,CAAC,EAAE,CAAC;gBACnC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAC/B,CAAC;iBAAM,CAAC;gBACN,6CAA6C;gBAC7C,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC;oBACtB,OAAO,EAAE,sBAAsB,IAAI,EAAE;oBACrC,GAAG,SAAS;iBACb,CAAC,CAAC;YACL,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;gBACzB,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC;YACpB,CAAC;YACD,MAAM,GAAG,CAAC;QACZ,CAAC;QACD,OAAO,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC;IAC/B,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gCAAgC,CACpD,MAAuC,EACvC,MAAc,EACd,MAAmB;IAEnB,MAAM,UAAU,GAAU,EAAE,CAAC;IAC7B,MAAM,KAAK,GAAG,CAAC,GAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACjD,KAAK,CAAC,iBAAiB,MAAM,EAAE,CAAC,CAAC;IACjC,IAAI,CAAC;QACH,oEAAoE;QACpE,qBAAqB;QACrB,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC;QAChC,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,CAAC,MAAM,EAAE,GAAG,iBAAiB,mCAAmC,CAAC,CAAC;QACxE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,qCAAqC,CAAC,CAAC;QAC3D,MAAM,UAAU,GAAG,CAAC,IAA8B,EAAE,KAAU,EAAE,EAAE;YAChE,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAC7C,CAAC,CAAC;QACF,UAAU,CAAC,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;QAC1C,UAAU,CAAC,uBAAuB,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;QAExD,0BAA0B,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,CAAC,CAAC;QAE1D,KAAK,CAAC,iBAAiB,CAAC,CAAC;QACzB,MAAM,MAAM,CAAC,YAAY,EAAE,CAAC;IAC9B,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QAC1B,IAAI,GAAG,YAAY,KAAK,EAAE,CAAC;YACzB,GAAG,CAAC,KAAK,GAAG,UAAU,CAAC;QACzB,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC"}

package/dist/cl2.storyline.stringify.d.ts

@@ -1,4 +1,4 @@
+import { StorylineMote } from './cl2.shared.types.js';
 import type { GameChanger } from './GameChanger.js';
-import { type StorylineMote } from './cl2.storyline.types.js';
 export declare function stringifyStoryline(mote: StorylineMote, packed: GameChanger): string;
 //# sourceMappingURL=cl2.storyline.stringify.d.ts.map

package/dist/cl2.storyline.stringify.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cl2.storyline.stringify.d.ts","sourceRoot":"","sources":["../src/cl2.storyline.stringify.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAG9D,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,aAAa,EACnB,MAAM,EAAE,WAAW,GAClB,MAAM,CA2BR"}
+{"version":3,"file":"cl2.storyline.stringify.d.ts","sourceRoot":"","sources":["../src/cl2.storyline.stringify.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACtD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAGpD,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,aAAa,EACnB,MAAM,EAAE,WAAW,GAClB,MAAM,CA2BR"}

package/dist/cl2.storyline.types.d.ts

@@ -1,36 +1,13 @@
 import type { Gcdata } from './GameChanger.js';
-import type { ParsedLine } from './cl2.quest.types.js';
-import type { Crashlands2 } from './cl2.types.auto.js';
-import type { ParsedBase, ParserResult } from './cl2.types.editor.js';
-import type { Position, Range } from './types.editor.js';
-import type { BschemaRoot, Mote } from './types.js';
-export declare const storylineSchemaId = "cl2_storyline";
-export type StorylineData = Crashlands2.Schemas['cl2_storyline'];
-export type StorylineMote = Mote<StorylineData>;
-type CompletionsData = {
-    type: 'glossary';
-    options: string[];
-} | {
-    type: 'stages';
-    options: string[];
-} | {
-    type: 'labels';
-    options: Set<string>;
-};
-export interface StorylineUpdateResult extends ParserResult {
-    parsed: ParsedBase & {
-        description?: string;
-    };
-    completions: (Range & CompletionsData)[];
+import { ParserResult, StorylineMote } from './cl2.shared.types.js';
+import type { BschemaRoot } from './types.js';
+export interface StorylineUpdateResult extends ParserResult<{
+    description?: string;
+}> {
 }
 export declare function listStorylines(gcData: Gcdata): StorylineMote[];
 export declare function isStorylineMote(mote: any): mote is StorylineMote;
 export declare function getStorylineMote(gcData: Gcdata, moteId: string): StorylineMote | undefined;
-export declare function getStorylineMotes(gcData: Gcdata): StorylineMote[];
 export declare function getStorylineSchema(gcData: Gcdata): BschemaRoot | undefined;
-export declare const arrayTagPattern = "(?:#(?<arrayTag>[a-z0-9]+))";
 export declare const linePatterns: string[];
-export declare function parseIfMatch(pattern: string, line: string, startPosition: Position): ParsedLine | null;
-export declare function lineIsArrayItem(line: string): boolean;
-export {};
 //# sourceMappingURL=cl2.storyline.types.d.ts.map

package/dist/cl2.storyline.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cl2.storyline.types.d.ts","sourceRoot":"","sources":["../src/cl2.storyline.types.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAEpD,eAAO,MAAM,iBAAiB,kBAAkB,CAAC;AAEjD,MAAM,MAAM,aAAa,GAAG,WAAW,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;AACjE,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC;AAEhD,KAAK,eAAe,GAChB;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,GACvC;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,GACrC;IAAE,IAAI,EAAE,QAAQ,CAAC;IAAC,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC;AAC7C,MAAM,WAAW,qBAAsB,SAAQ,YAAY;IACzD,MAAM,EAAE,UAAU,GAAG;QACnB,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,WAAW,EAAE,CAAC,KAAK,GAAG,eAAe,CAAC,EAAE,CAAC;CAC1C;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,EAAE,CAE9D;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,IAAI,aAAa,CAEhE;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACb,aAAa,GAAG,SAAS,CAI3B;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,EAAE,CAGjE;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAE1E;AAyBD,eAAO,MAAM,eAAe,gCAAgC,CAAC;AAE7D,eAAO,MAAM,YAAY,UAKxB,CAAC;AAEF,wBAAgB,YAAY,CAC1B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,QAAQ,GACtB,UAAU,GAAG,IAAI,CAmCnB;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAErD"}
+{"version":3,"file":"cl2.storyline.types.d.ts","sourceRoot":"","sources":["../src/cl2.storyline.types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAEL,YAAY,EAEZ,aAAa,EAEd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,qBACf,SAAQ,YAAY,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;CAAG;AAEP,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,EAAE,CAE9D;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,IAAI,aAAa,CAEhE;AAED,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,GACb,aAAa,GAAG,SAAS,CAI3B;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAE1E;AAED,eAAO,MAAM,YAAY,UAKxB,CAAC"}

package/dist/cl2.storyline.types.js

@@ -1,6 +1,5 @@
-import { z } from 'zod';
 import { assert } from './assert.js';
-export const storylineSchemaId = 'cl2_storyline';
+import { arrayTagPattern, storylineSchemaId, } from './cl2.shared.types.js';
 export function listStorylines(gcData) {
     return gcData.listMotesBySchema(storylineSchemaId);
 }
@@ -12,76 +11,13 @@ export function getStorylineMote(gcData, moteId) {
     assert(!mote || isStorylineMote(mote), `Mote ${moteId} is not a storyline`);
     return mote;
 }
-export function getStorylineMotes(gcData) {
-    const motes = gcData.listMotesBySchema(storylineSchemaId);
-    return motes;
-}
 export function getStorylineSchema(gcData) {
     return gcData.getSchema(storylineSchemaId);
 }
-// PATTERNS
-// Note: These patterns are defined so that they'll work on partial lines
-// as much as possible, so their group names should always be checked for existence.
-const linePartsSchema = z.object({
-    indicator: z
-        .string()
-        .optional()
-        .describe('The symbol prefixing the line to indicate what the line type is'),
-    arrayTag: z
-        .string()
-        .regex(/^[a-z0-9]+$/)
-        .optional()
-        .describe("BsArrayElement identifier (without the '#' prefix)"),
-    labelGroup: z.string().optional().describe('The label, including the `:`'),
-    label: z.string().optional().describe('For `Label:Value` elements'),
-    text: z
-        .string()
-        .optional()
-        .describe('For dialog and similar, the text content'),
-});
-export const arrayTagPattern = '(?:#(?<arrayTag>[a-z0-9]+))';
 export const linePatterns = [
     /** Label:Text */
     `^(?<labelGroup>(?<label>Name|Description|Stage)\\s*:)\\s*(?<text>.*?)\\s*$`,
     /** Comment Line */
     `^(?<indicator>//)\\s*?${arrayTagPattern}?\\s*(?<text>.*?)\\s*$`,
 ];
-export function parseIfMatch(pattern, line, startPosition) {
-    const rawMatch = line.match(new RegExp(pattern));
-    if (!rawMatch)
-        return null;
-    const parsedLine = linePartsSchema.parse(rawMatch.groups);
-    const result = {
-        _: {
-            start: startPosition,
-            end: { ...startPosition },
-            value: line,
-        },
-    };
-    result._.end.character += line.length;
-    result._.end.index += line.length;
-    for (const [key, value] of Object.entries(parsedLine)) {
-        if (typeof value !== 'undefined') {
-            // Figure out where this is in the matches so we
-            // can get the start and end positions.
-            const startChar = line.indexOf(`${value}`);
-            const endChar = startChar + `${value}`.length;
-            const start = { ...startPosition };
-            start.character += startChar;
-            start.index += startChar;
-            const end = { ...startPosition };
-            end.character += endChar;
-            end.index += endChar;
-            result[key] = {
-                start,
-                end,
-                value: value,
-            };
-        }
-    }
-    return result;
-}
-export function lineIsArrayItem(line) {
-    return /^\/\//.test(line);
-}
 //# sourceMappingURL=cl2.storyline.types.js.map

package/dist/cl2.storyline.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"cl2.storyline.types.js","sourceRoot":"","sources":["../src/cl2.storyline.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAOrC,MAAM,CAAC,MAAM,iBAAiB,GAAG,eAAe,CAAC;AAgBjD,MAAM,UAAU,cAAc,CAAC,MAAc;IAC3C,OAAO,MAAM,CAAC,iBAAiB,CAAgB,iBAAiB,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAS;IACvC,OAAO,IAAI,CAAC,SAAS,KAAK,iBAAiB,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,MAAc,EACd,MAAc;IAEd,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAgB,MAAM,CAAC,CAAC;IACnD,MAAM,CAAC,CAAC,IAAI,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,QAAQ,MAAM,qBAAqB,CAAC,CAAC;IAC5E,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAc;IAC9C,MAAM,KAAK,GAAG,MAAM,CAAC,iBAAiB,CAAgB,iBAAiB,CAAC,CAAC;IACzE,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,MAAc;IAC/C,OAAO,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAgB,CAAC;AAC5D,CAAC;AAED,WAAW;AACX,yEAAyE;AACzE,oFAAoF;AACpF,MAAM,eAAe,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/B,SAAS,EAAE,CAAC;SACT,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CACP,iEAAiE,CAClE;IACH,QAAQ,EAAE,CAAC;SACR,MAAM,EAAE;SACR,KAAK,CAAC,aAAa,CAAC;SACpB,QAAQ,EAAE;SACV,QAAQ,CAAC,oDAAoD,CAAC;IACjE,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,8BAA8B,CAAC;IAC1E,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,4BAA4B,CAAC;IACnE,IAAI,EAAE,CAAC;SACJ,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,QAAQ,CAAC,0CAA0C,CAAC;CACxD,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,eAAe,GAAG,6BAA6B,CAAC;AAE7D,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,iBAAiB;IACjB,4EAA4E;IAC5E,mBAAmB;IACnB,yBAAyB,eAAe,wBAAwB;CACjE,CAAC;AAEF,MAAM,UAAU,YAAY,CAC1B,OAAe,EACf,IAAY,EACZ,aAAuB;IAEvB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;IACjD,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAE3B,MAAM,UAAU,GAAG,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAO,CAAC,CAAC;IAE3D,MAAM,MAAM,GAAe;QACzB,CAAC,EAAE;YACD,KAAK,EAAE,aAAa;YACpB,GAAG,EAAE,EAAE,GAAG,aAAa,EAAE;YACzB,KAAK,EAAE,IAAI;SACZ;KACF,CAAC;IACF,MAAM,CAAC,CAAE,CAAC,GAAG,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC;IACvC,MAAM,CAAC,CAAE,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,CAAC,MAAM,CAAC;IACnC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACtD,IAAI,OAAO,KAAK,KAAK,WAAW,EAAE,CAAC;YACjC,gDAAgD;YAChD,uCAAuC;YACvC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,KAAK,EAAE,CAAC,CAAC;YAC3C,MAAM,OAAO,GAAG,SAAS,GAAG,GAAG,KAAK,EAAE,CAAC,MAAM,CAAC;YAC9C,MAAM,KAAK,GAAG,EAAE,GAAG,aAAa,EAAE,CAAC;YACnC,KAAK,CAAC,SAAS,IAAI,SAAS,CAAC;YAC7B,KAAK,CAAC,KAAK,IAAI,SAAS,CAAC;YACzB,MAAM,GAAG,GAAG,EAAE,GAAG,aAAa,EAAE,CAAC;YACjC,GAAG,CAAC,SAAS,IAAI,OAAO,CAAC;YACzB,GAAG,CAAC,KAAK,IAAI,OAAO,CAAC;YACrB,MAAM,CAAC,GAAuB,CAAC,GAAG;gBAChC,KAAK;gBACL,GAAG;gBACH,KAAK,EAAE,KAAY;aACb,CAAC;QACX,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"cl2.storyline.types.js","sourceRoot":"","sources":["../src/cl2.storyline.types.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EACL,eAAe,EAIf,iBAAiB,GAClB,MAAM,uBAAuB,CAAC;AAQ/B,MAAM,UAAU,cAAc,CAAC,MAAc;IAC3C,OAAO,MAAM,CAAC,iBAAiB,CAAgB,iBAAiB,CAAC,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,IAAS;IACvC,OAAO,IAAI,CAAC,SAAS,KAAK,iBAAiB,CAAC;AAC9C,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,MAAc,EACd,MAAc;IAEd,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAgB,MAAM,CAAC,CAAC;IACnD,MAAM,CAAC,CAAC,IAAI,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,QAAQ,MAAM,qBAAqB,CAAC,CAAC;IAC5E,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,MAAc;IAC/C,OAAO,MAAM,CAAC,SAAS,CAAC,iBAAiB,CAAgB,CAAC;AAC5D,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG;IAC1B,iBAAiB;IACjB,4EAA4E;IAC5E,mBAAmB;IACnB,yBAAyB,eAAe,wBAAwB;CACjE,CAAC"}