xmlui 0.9.92 → 0.9.93

package/dist/scripts/src/parsers/xmlui-parser/parser.js

@@ -33,6 +33,18 @@ const RECOVER_CLOSE_TAG = [
     syntax_kind_1.SyntaxKind.CData,
     syntax_kind_1.SyntaxKind.Script,
 ];
+const needsExtendedContext = [
+    diagnostics_1.ErrCodes.unexpectedCloseTag,
+    diagnostics_1.ErrCodes.expCloseStartWithName,
+    diagnostics_1.ErrCodes.expCloseStart,
+    diagnostics_1.ErrCodes.tagNameMismatch,
+    diagnostics_1.ErrCodes.expEnd,
+    diagnostics_1.ErrCodes.expTagName,
+    diagnostics_1.ErrCodes.expTagOpen,
+    diagnostics_1.ErrCodes.expEndOrClose,
+    diagnostics_1.ErrCodes.expTagNameAfterNamespace,
+    diagnostics_1.ErrCodes.expTagNameAfterCloseStart,
+];
 function createXmlUiParser(source) {
     return {
         parse: () => parseXmlUiMarkup(source),
@@ -319,23 +331,70 @@ function parseXmlUiMarkup(text) {
             attrNames.push({ name: attrName, ns: attrNs });
         }
     }
+    function getContextWithSurroundingLines(pos, end, surroundingContextLines) {
+        let newlinesFound;
+        let cursor;
+        let contextPos;
+        cursor = pos;
+        newlinesFound = 0;
+        while (cursor >= 0) {
+            if (text[cursor] === "\n") {
+                newlinesFound++;
+                if (newlinesFound > surroundingContextLines) {
+                    break;
+                }
+            }
+            cursor--;
+        }
+        contextPos = cursor + 1;
+        let contextEnd;
+        cursor = end;
+        newlinesFound = 0;
+        while (cursor < text.length) {
+            if (text[cursor] === "\n") {
+                newlinesFound++;
+                if (newlinesFound > surroundingContextLines) {
+                    break;
+                }
+                cursor++;
+            }
+            else if (text[cursor] === "\r" && text[cursor + 1] === "\n") {
+                newlinesFound++;
+                if (newlinesFound > surroundingContextLines) {
+                    break;
+                }
+                cursor += 2;
+            }
+            else {
+                cursor++;
+            }
+        }
+        contextEnd = cursor;
+        return { contextPos, contextEnd };
+    }
     function error({ code, message, category }) {
         const { pos, end } = peek();
+        const { contextPos, contextEnd } = getContextWithSurroundingLines(pos, end, 1);
         errors.push({
             category,
             code,
             message,
             pos,
             end,
+            contextPos,
+            contextEnd,
         });
     }
     function errorAt({ code, message, category }, pos, end) {
+        const { contextPos, contextEnd } = getContextWithSurroundingLines(pos, end, 1);
         errors.push({
             category,
             code,
             message,
             pos,
             end,
+            contextPos,
+            contextEnd,
         });
     }
     /**
@@ -523,7 +582,16 @@ function parseXmlUiMarkup(text) {
                 scanner.resetTokenState(badPrefixEnd);
                 startNode();
                 node.children.push(token);
-                errorAt(err, pos, badPrefixEnd);
+                const { contextPos, contextEnd } = getContextWithSurroundingLines(pos, badPrefixEnd, 0);
+                errors.push({
+                    category: err.category,
+                    code: err.code,
+                    message: err.message,
+                    pos,
+                    end: badPrefixEnd,
+                    contextPos,
+                    contextEnd,
+                });
                 completeNode(syntax_kind_1.SyntaxKind.ErrorNode);
                 errFromScanner = undefined;
                 return collectToken(inContent);

package/dist/standalone/xmlui-standalone.es.d.ts

@@ -637,6 +637,8 @@ declare interface Error_2 {
     readonly message: string;
     readonly pos: number;
     readonly end: number;
+    readonly contextPos: number;
+    readonly contextEnd: number;
 }
 
 /**
@@ -674,15 +676,14 @@ declare class ErrorBoundary extends default_2.Component<Props, State> {
     render(): string | number | boolean | Iterable<default_2.ReactNode> | JSX_2.Element;
 }
 
-declare interface ErrorWithLineColInfo extends Error_2 {
-    line: number;
-    col: number;
+declare interface ErrorForDisplay extends Error_2 {
+    contextStartLine: number;
+    contextSource: string;
+    errPosLine: number;
+    errPosCol: number;
 }
 
-/** returns a component definition containing the errors.
- * It is a component and a compound component definition at the same time,
- * so that it can be used to render the errors for a compound component as well*/
-declare function errReportComponent(errors: ErrorWithLineColInfo[], fileName: number | string, compoundCompName: string | undefined): any;
+declare function errReportComponent(errors: ErrorForDisplay[], fileName: number | string, compoundCompName: string | undefined): any;
 
 declare type Expression = UnaryExpression | BinaryExpression | SequenceExpression | ConditionalExpression | FunctionInvocationExpression | MemberAccessExpression | CalculatedMemberAccessExpression | Identifier | TemplateLiteralExpression | Literal | ArrayLiteral | ObjectLiteral | SpreadExpression | AssignmentExpression | NoArgExpression | ArrowExpression | PrefixOpExpression | PostfixOpExpression | ReactiveVarDeclaration | VarDeclaration | Destructure | ObjectDestructure | ArrayDestructure | SwitchCase;
 
@@ -1006,6 +1007,12 @@ declare interface ParentRenderContext {
     props?: Record<string, any>;
 }
 
+declare type ParserResult = {
+    component: null | ComponentDef | CompoundComponentDef;
+    errors: ErrorForDisplay[];
+    erroneousCompoundComponentName?: string;
+};
+
 /**
  * This function extracts CSS variables from the specified SCSS input. It uses a hack to convert the CSS input to JSON
  * and then calls a JSON parser to create the desired object.
@@ -1069,6 +1076,7 @@ declare type Props_2 = {
 };
 
 declare type Props_3 = {
+    id?: string;
     activeTab?: number;
     orientation?: "horizontal" | "vertical";
     tabRenderer?: (item: {
@@ -1351,6 +1359,7 @@ declare const standaloneExports: {
     getColor: typeof xmluiExports.getColor;
     TabItem: default_2.ForwardRefExoticComponent<Tab & default_2.RefAttributes<HTMLDivElement>>;
     Tabs: default_2.ForwardRefExoticComponent<{
+        id?: string;
         activeTab?: number;
         orientation?: "horizontal" | "vertical";
         tabRenderer?: (item: {
@@ -1623,6 +1632,7 @@ declare const T_WHILE_STATEMENT: number;
 
 declare type Tab = {
     label: string;
+    labelRenderer?: (contextVars: any) => ReactNode;
     children?: ReactNode;
     style?: CSSProperties;
 };
@@ -2096,11 +2106,7 @@ declare class XmlUiHelper {
     private addComponentList;
 }
 
-declare function xmlUiMarkupToComponent(source: string, fileId?: string | number): {
-    component: null | ComponentDef | CompoundComponentDef;
-    errors: ErrorWithLineColInfo[];
-    erroneousCompoundComponentName?: string;
-};
+declare function xmlUiMarkupToComponent(source: string, fileId?: string | number): ParserResult;
 
 declare type XmlUiNode = XmlUiComment | XmlUiAttribute | XmlUiElement;