@cr_docs_t/dts 0.32.0 → 0.33.0

package/dist/type-gen.js

@@ -61,20 +61,17 @@ export interface ParserContext {
         props.set("parentId", { type: "NodeId | null", optional: false });
         props.set("type", { type: `'${node.type}'`, optional: false });
         props.set("text", { type: "string", optional: false });
-        // Map Fields
+        props.set("startIndex", { type: "number", optional: false });
+        props.set("endIndex", { type: "number", optional: false });
+        // Map Fields skipping any field whose name collides with a reserved base property
+        const RESERVED = new Set(["id", "parentId", "type", "text", "childrenIds", "startIndex", "endIndex"]);
         if (node.fields) {
             for (const [fieldName, fieldData] of Object.entries(node.fields)) {
-                let typeString = fieldData.multiple ? "NodeId[]" : "NodeId";
+                if (RESERVED.has(fieldName))
+                    continue;
+                const typeString = fieldData.multiple ? "NodeId[]" : "NodeId";
                 const isOptional = !fieldData.required;
-                if (props.has(fieldName)) {
-                    // Merge types on collision
-                    const existing = props.get(fieldName);
-                    existing.type = `${existing.type} | ${typeString}`;
-                    existing.optional = existing.optional && isOptional;
-                }
-                else {
-                    props.set(fieldName, { type: typeString, optional: isOptional });
-                }
+                props.set(fieldName, { type: typeString, optional: isOptional });
             }
         }
         props.set("childrenIds", { type: "NodeId[]", optional: false });
@@ -89,46 +86,43 @@ export interface ParserContext {
         switches += `case '${node.type}': return ${funcName}(node, ctx, parentId);\n`;
         unmarshalersOut += `function ${funcName}(node: Node, ctx: ParserContext, parentId: NodeId | null): NodeId {
             const id = v4();
+            const namedChildren = node.namedChildren;
             const n: Partial<${interfaceName}> = {
                 id,
                 parentId,
                 type: '${node.type}',
-                text: node.text,
+                text: namedChildren.length === 0 ? node.text : '',
+                startIndex: node.startIndex, 
+                endIndex: node.endIndex
             };
             ctx.nodes.set(id, n as AstNode);
 
 `;
-        let fieldExtractionNodes = "";
+        // Unmarshal all namedChildren once into childrenIds.
+        unmarshalersOut += ` n.childrenIds = namedChildren.map(child => unmarshalNode(child, ctx, id));
+
+        `;
+        // Assign field properties by index-lookup into the already-built childrenIds.
         if (node.fields) {
-            for (const [fieldName, fieldData] of Object.entries(node.fields)) {
-                if (fieldData.multiple) {
-                    unmarshalersOut += `n.${fieldName} = node.childrenForFieldName('${fieldName}').map(n => unmarshalNode(n, ctx, id));\n`;
-                    fieldExtractionNodes += `...node.childrenForFieldName('${fieldName}').map(n => n.id), `;
-                }
-                else {
-                    if (fieldData.required) {
-                        unmarshalersOut += `n.${fieldName} = unmarshalNode(node.childForFieldName('${fieldName}')!, ctx, id);\n`;
-                        fieldExtractionNodes += `node.childForFieldName('${fieldName}')!.id, `;
+            const nonReservedFields = Object.entries(node.fields).filter(([fieldName]) => !RESERVED.has(fieldName));
+            if (nonReservedFields.length > 0) {
+                for (const [fieldName, fieldData] of nonReservedFields) {
+                    if (fieldData.multiple) {
+                        unmarshalersOut += `    n.${fieldName} = node.childrenForFieldName('${fieldName}').map(child => n.childrenIds![node.namedChildren.indexOf(child)]).filter((id) => id !== undefined);\n`;
                     }
                     else {
-                        unmarshalersOut += `const ${fieldName}Node = node.childForFieldName('${fieldName}');
-n.${fieldName} = ${fieldName}Node ? unmarshalNode(${fieldName}Node, ctx, id) : undefined;
-`;
-                        fieldExtractionNodes += `${fieldName}Node ? ${fieldName}Node.id : undefined, `;
+                        if (fieldData.required) {
+                            unmarshalersOut += `    { const _fc = node.childForFieldName('${fieldName}'); n.${fieldName} = _fc ? n.childrenIds![namedChildren.indexOf(_fc)] : undefined; }\n`;
+                        }
+                        else {
+                            unmarshalersOut += `    { const _fc = node.childForFieldName('${fieldName}'); n.${fieldName} = _fc ? n.childrenIds![namedChildren.indexOf(_fc)] : undefined; }\n`;
+                        }
                     }
                 }
+                unmarshalersOut += `\n`;
             }
         }
-        if (fieldExtractionNodes.length > 0) {
-            unmarshalersOut += `
-const fieldNodes = new Set([${fieldExtractionNodes}].filter(id => id !== undefined));
-n.childrenIds = node.namedChildren.filter(n => !fieldNodes.has(n.id)).map(n => unmarshalNode(n, ctx, id));
-`;
-        }
-        else {
-            unmarshalersOut += `n.childrenIds = node.namedChildren.map(n => unmarshalNode(n, ctx, id));\n`;
-        }
-        unmarshalersOut += `return id;
+        unmarshalersOut += `    return id;
 }
 
 `;
@@ -140,11 +134,12 @@ export const unmarshalNode = (node: Node, ctx: ParserContext, parentId: NodeId |
         ${switches}
         default: {
             const id = v4();
+            const namedChildren = node.namedChildren;
             const n = {
                 id,
                 parentId,
                 type: node.type as any,
-                text: node.text,
+                text: namedChildren.length === 0 ? node.text : "",
                 childrenIds: [] as NodeId[],
             };
             ctx.nodes.set(id, n as AstNode);
@@ -163,6 +158,11 @@ export const unmarshalNode = (node: Node, ctx: ParserContext, parentId: NodeId |
      const rootId = unmarshalNode(root, ctx, null);
      return {rootId, nodes: ctx.nodes};
  }
+
+export const allChildIds = (ast: BragiAST, node: AstNode): string[] => {
+    return node.childrenIds;
+};
+
     `;
     // Create a generic ASTNode type
     const concreteNodes = nodes

package/dist/types/Presence.d.ts

@@ -1,7 +1,7 @@
 import { BaseMessage, MessageType } from "./Message.js";
 export declare enum PresenceMessageType {
     CURSOR = 0,
-    SELECTION = 1
+    UPDATE = 1
 }
 export interface BasePresenceMessage<T extends PresenceMessageType = PresenceMessageType> extends BaseMessage<MessageType.PRESENCE> {
     type: T;
@@ -9,6 +9,8 @@ export interface BasePresenceMessage<T extends PresenceMessageType = PresenceMes
 export interface PresenceCursorMessage extends BasePresenceMessage<PresenceMessageType.CURSOR> {
     pos: number;
 }
-export type PresenceMessage = PresenceCursorMessage;
+export interface PresenceUpdateMessage extends BasePresenceMessage<PresenceMessageType.UPDATE> {
+}
+export type PresenceMessage = PresenceCursorMessage | PresenceUpdateMessage;
 export declare const makePresenceMsg: <T extends PresenceMessage>(msg: Omit<T, "msgType">) => BasePresenceMessage;
 //# sourceMappingURL=Presence.d.ts.map

package/dist/types/Presence.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Presence.d.ts","sourceRoot":"","sources":["../../src/types/Presence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAExD,oBAAY,mBAAmB;IAC3B,MAAM,IAAA;IACN,SAAS,IAAA;CACZ;AAED,MAAM,WAAW,mBAAmB,CAAC,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CACpF,SAAQ,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC;IACzC,IAAI,EAAE,CAAC,CAAC;CACX;AAED,MAAM,WAAW,qBAAsB,SAAQ,mBAAmB,CAAC,mBAAmB,CAAC,MAAM,CAAC;IAC1F,GAAG,EAAE,MAAM,CAAC;CACf;AAED,MAAM,MAAM,eAAe,GAAG,qBAAqB,CAAC;AAEpD,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,eAAe,EAAE,KAAK,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,KAAG,mBAKpF,CAAC"}
+{"version":3,"file":"Presence.d.ts","sourceRoot":"","sources":["../../src/types/Presence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAExD,oBAAY,mBAAmB;IAC3B,MAAM,IAAA;IACN,MAAM,IAAA;CACT;AAED,MAAM,WAAW,mBAAmB,CAAC,CAAC,SAAS,mBAAmB,GAAG,mBAAmB,CACpF,SAAQ,WAAW,CAAC,WAAW,CAAC,QAAQ,CAAC;IACzC,IAAI,EAAE,CAAC,CAAC;CACX;AAED,MAAM,WAAW,qBAAsB,SAAQ,mBAAmB,CAAC,mBAAmB,CAAC,MAAM,CAAC;IAC1F,GAAG,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,qBAAsB,SAAQ,mBAAmB,CAAC,mBAAmB,CAAC,MAAM,CAAC;CAAG;AAEjG,MAAM,MAAM,eAAe,GAAG,qBAAqB,GAAG,qBAAqB,CAAC;AAE5E,eAAO,MAAM,eAAe,GAAI,CAAC,SAAS,eAAe,EAAE,KAAK,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,KAAG,mBAKpF,CAAC"}

package/dist/types/Presence.js

@@ -2,7 +2,7 @@ import { MessageType } from "./Message.js";
 export var PresenceMessageType;
 (function (PresenceMessageType) {
     PresenceMessageType[PresenceMessageType["CURSOR"] = 0] = "CURSOR";
-    PresenceMessageType[PresenceMessageType["SELECTION"] = 1] = "SELECTION";
+    PresenceMessageType[PresenceMessageType["UPDATE"] = 1] = "UPDATE";
 })(PresenceMessageType || (PresenceMessageType = {}));
 export const makePresenceMsg = (msg) => {
     return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cr_docs_t/dts",
-  "version": "0.32.0",
+  "version": "0.33.0",
   "description": "",
   "main": "dist/index.js",
   "type": "module",