xmlui 0.9.44 → 0.9.46

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

@@ -116,43 +116,73 @@ function parseXmlUiMarkup(text) {
     function parseTag() {
         startNode();
         bump(syntax_kind_1.SyntaxKind.OpenNodeStart);
+        let errInName = false;
         let openTagName = undefined;
         if (at(syntax_kind_1.SyntaxKind.Identifier)) {
             openTagName = parseTagName();
         }
         else {
-            error(diagnostics_1.Diag_Tag_Identifier_Expected);
-        }
-        parseAttrList();
-        if (eat(syntax_kind_1.SyntaxKind.NodeClose)) {
-            completeNode(syntax_kind_1.SyntaxKind.ElementNode);
-            return;
-        }
-        else if (eat(syntax_kind_1.SyntaxKind.NodeEnd)) {
-            parseContent();
-            if (eat(syntax_kind_1.SyntaxKind.CloseNodeStart)) {
-                if (at(syntax_kind_1.SyntaxKind.Identifier)) {
-                    const closeTagName = parseTagName();
-                    const namesMismatch = openTagName !== undefined && !(0, utils_1.tagNameNodesWithoutErrorsMatch)(openTagName, closeTagName, getText);
-                    if (namesMismatch) {
-                        error(MakeErr.tagNameMismatch(getText(openTagName), getText(closeTagName)));
-                    }
-                }
-                else {
-                    errRecover(diagnostics_1.Diag_Tag_Identifier_Expected, [syntax_kind_1.SyntaxKind.NodeEnd]);
-                }
-                if (!eat(syntax_kind_1.SyntaxKind.NodeEnd)) {
-                    error(diagnostics_1.Diag_End_Token_Expected);
+            errInName = true;
+            const errNode = errNodeUntil([syntax_kind_1.SyntaxKind.OpenNodeStart, syntax_kind_1.SyntaxKind.NodeEnd, syntax_kind_1.SyntaxKind.NodeClose, syntax_kind_1.SyntaxKind.CloseNodeStart, syntax_kind_1.SyntaxKind.CData, syntax_kind_1.SyntaxKind.Script]);
+            if (errNode) {
+                errorAt(diagnostics_1.Diag_Tag_Identifier_Expected, errNode.pos, errNode.end);
+            }
+            else {
+                error(diagnostics_1.Diag_Tag_Identifier_Expected);
+            }
+        }
+        if (!errInName) {
+            parseAttrList();
+        }
+        switch (peek().kind) {
+            case syntax_kind_1.SyntaxKind.NodeClose: {
+                bumpAny();
+                completeNode(syntax_kind_1.SyntaxKind.ElementNode);
+                return;
+            }
+            case syntax_kind_1.SyntaxKind.NodeEnd: {
+                bumpAny();
+                parseContent();
+                parseClosingTag(openTagName);
+                completeNode(syntax_kind_1.SyntaxKind.ElementNode);
+                return;
+            }
+            case syntax_kind_1.SyntaxKind.OpenNodeStart:
+            case syntax_kind_1.SyntaxKind.Script:
+            case syntax_kind_1.SyntaxKind.CData: {
+                completeNode(syntax_kind_1.SyntaxKind.ElementNode);
+                error(diagnostics_1.Diag_End_Or_Close_Token_Expected);
+                return;
+            }
+            case syntax_kind_1.SyntaxKind.CloseNodeStart: {
+                error(diagnostics_1.Diag_End_Or_Close_Token_Expected);
+                parseClosingTag(openTagName);
+                completeNode(syntax_kind_1.SyntaxKind.ElementNode);
+                return;
+            }
+            default: {
+                error(diagnostics_1.Diag_End_Or_Close_Token_Expected);
+            }
+        }
+    }
+    function parseClosingTag(openTagName) {
+        if (eat(syntax_kind_1.SyntaxKind.CloseNodeStart)) {
+            if (at(syntax_kind_1.SyntaxKind.Identifier)) {
+                const closeTagName = parseTagName();
+                const namesMismatch = openTagName !== undefined && !(0, utils_1.tagNameNodesWithoutErrorsMatch)(openTagName, closeTagName, getText);
+                if (namesMismatch) {
+                    error(MakeErr.tagNameMismatch(getText(openTagName), getText(closeTagName)));
                 }
             }
             else {
-                error(diagnostics_1.Diag_CloseNodeStart_Token_Expected);
+                errRecover(diagnostics_1.Diag_Tag_Identifier_Expected, [syntax_kind_1.SyntaxKind.NodeEnd]);
+            }
+            if (!eat(syntax_kind_1.SyntaxKind.NodeEnd)) {
+                error(diagnostics_1.Diag_End_Token_Expected);
             }
-            completeNode(syntax_kind_1.SyntaxKind.ElementNode);
-            return;
         }
         else {
-            error(diagnostics_1.Diag_End_Or_Close_Token_Expected);
+            error(diagnostics_1.Diag_CloseNodeStart_Token_Expected);
         }
     }
     function parseTagName() {
@@ -258,6 +288,17 @@ function parseXmlUiMarkup(text) {
     function atAnyOf(kinds) {
         return kinds.includes(peek().kind);
     }
+    function errNodeUntil(tokens) {
+        startNode();
+        advance(tokens);
+        if (node.children.length === 0) {
+            abandonNode();
+            return null;
+        }
+        else {
+            return completeNode(syntax_kind_1.SyntaxKind.ErrorNode);
+        }
+    }
     /**
      * report an error and skip the next token if it isn't in the recoveryTokens. EoF isn't skipped.
      * @param recoveryTokens the [FollowSet](https://www.geeksforgeeks.org/follow-set-in-syntax-analysis/) of the parsed InnerNode. These tokens (or the EoF token) won't be skipped
@@ -274,6 +315,10 @@ function parseXmlUiMarkup(text) {
         completeNode(syntax_kind_1.SyntaxKind.ErrorNode);
         return false;
     }
+    /** Bumps over the next token and marks it as an error node while adding an error to the error list*/
+    function errorAndBump(errCodeAndMsg) {
+        errRecover(errCodeAndMsg, []);
+    }
     function error({ code, message, category }) {
         const { pos, end } = peek();
         errors.push({
@@ -293,6 +338,9 @@ function parseXmlUiMarkup(text) {
             end,
         });
     }
+    function advance(to) {
+        for (let token = peek(); token.kind !== syntax_kind_1.SyntaxKind.EndOfFileToken && !to.includes(token.kind); bumpAny(), token = peek()) { }
+    }
     function peek(inContent = false) {
         if (peekedToken !== undefined) {
             return peekedToken;
@@ -482,10 +530,6 @@ function parseXmlUiMarkup(text) {
             }
         }
     }
-    /** Bumps over the next token and marks it as an error node while adding an error to the error list*/
-    function errorAndBump(errCodeAndMsg) {
-        errRecover(errCodeAndMsg, []);
-    }
     function abandonNode() {
         const parentNode = parents[parents.length - 1];
         parentNode.children.push(...node.children);

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

@@ -103,7 +103,9 @@ declare namespace all {
         VisuallyHidden,
         LinkNative,
         ToneChangerButton,
-        Logo
+        Logo,
+        useSearchContextContent,
+        useAppLayoutContext
     }
 }
 
@@ -374,6 +376,10 @@ declare type AppContextObject = {
     forceRefreshAnchorScroll: () => void;
 };
 
+declare const appLayoutNames: readonly ["vertical", "vertical-sticky", "vertical-full-header", "condensed", "condensed-sticky", "horizontal", "horizontal-sticky"];
+
+declare type AppLayoutType = (typeof appLayoutNames)[number];
+
 /**
  * This component is responsible for running a pre-compiled xmlui app. It
  * receives the internal representation of the app markup and code (coming
@@ -974,6 +980,7 @@ declare const _default: {
         onDidChange?: (newValue: string) => void;
         onFocus?: () => void;
         onBlur?: () => void;
+        onKeyDown?: (event: default_2.KeyboardEvent<HTMLInputElement>) => void;
         registerComponentApi?: all.RegisterComponentApiFn;
         startText?: string;
         startIcon?: string;
@@ -1009,6 +1016,12 @@ declare const _default: {
     Logo: default_2.ForwardRefExoticComponent<{
         style?: default_2.CSSProperties;
     } & default_2.RefAttributes<HTMLImageElement>>;
+    useSearchContextContent: () => Record<string, {
+        path: string;
+        title: string;
+        content: string;
+    }>;
+    useAppLayoutContext: typeof all.useAppLayoutContext;
 };
 export default _default;
 
@@ -1079,7 +1092,7 @@ declare type EntrypointCompilation = CompilationUnit & {
 declare enum ErrCodes {
     onlyOneElem = "U002",
     expTagOpen = "U003",
-    expTagIdent = "U004",
+    expTagName = "U004",
     expCloseStart = "U005",
     expEndOrClose = "U006",
     tagNameMismatch = "U007",
@@ -1089,6 +1102,7 @@ declare enum ErrCodes {
     expAttrValue = "U011",
     duplAttr = "U012",
     uppercaseAttr = "U013",
+    tagNameExpAfterNamespace = "U014",
     invalidChar = "W001",
     untermStr = "W002",
     untermComment = "W007",
@@ -1271,6 +1285,26 @@ declare interface IApiInterceptorContext {
     isMocked: (url: string) => boolean;
 }
 
+declare interface IAppLayoutContext {
+    layout: AppLayoutType;
+    navPanelVisible: boolean;
+    drawerVisible: boolean;
+    showDrawer: () => void;
+    hideDrawer: () => void;
+    toggleDrawer: () => void;
+    hasRegisteredNavPanel: boolean;
+    hasRegisteredHeader: boolean;
+    navPanelDef?: ComponentDef;
+    logoContentDef?: ComponentDef;
+    logo?: string;
+    logoDark?: string;
+    logoLight?: string;
+    registerSubNavPanelSlot?: (slot: HTMLElement) => void;
+    subNavPanelSlot?: HTMLElement;
+    scrollWholePage?: boolean;
+    isFullVerticalWidth?: boolean;
+}
+
 declare const Icon: default_2.ForwardRefExoticComponent<IconBaseProps & default_2.RefAttributes<unknown>>;
 
 declare interface IconBaseProps extends default_2.SVGAttributes<SVGElement> {
@@ -1617,6 +1651,7 @@ declare type Props_4 = {
     onDidChange?: (newValue: string) => void;
     onFocus?: () => void;
     onBlur?: () => void;
+    onKeyDown?: (event: default_2.KeyboardEvent<HTMLInputElement>) => void;
     registerComponentApi?: RegisterComponentApiFn;
     startText?: string;
     startIcon?: string;
@@ -1740,6 +1775,12 @@ declare interface ScriptParserErrorMessage {
 
 declare type ScriptParsingErrorCodes = "W001" | "W002" | "W003" | "W004" | "W005" | "W006" | "W007" | "W008" | "W009" | "W010" | "W011" | "W012" | "W013" | "W014" | "W015" | "W016" | "W017" | "W018" | "W019" | "W020" | "W021" | "W022" | "W023" | "W024" | "W025" | "W026" | "W027" | "W028" | "W029" | "W030" | "W031";
 
+declare type SearchEntry = {
+    path: string;
+    title: string;
+    content: string;
+};
+
 declare type SEQUENCE_EXPRESSION = typeof T_SEQUENCE_EXPRESSION;
 
 declare interface SequenceExpression extends ExpressionBase {
@@ -2284,6 +2325,8 @@ declare type UnaryOpSymbols = "+" | "-" | "~" | "!" | "typeof" | "delete";
  */
 declare type UpdateStateFn = (componentState: any, options?: any) => void;
 
+declare function useAppLayoutContext(): IAppLayoutContext;
+
 declare function useColors(...colorNames: (string | ColorDef)[]): Record<string, string>;
 
 declare function useDevTools(): {
@@ -2301,6 +2344,8 @@ declare function useDevTools(): {
 
 declare const useLogger: () => LogContextType;
 
+declare const useSearchContextContent: () => Record<string, SearchEntry>;
+
 declare function useTheme(): ThemeScope;
 
 declare type ValidationStatus = (typeof validationStatusValues)[number];