@oxide/design-system 6.1.4 → 6.2.0-canary.d8e9792

package/dist/button.css

@@ -14,7 +14,7 @@ label {
   }
   &.ox-button:after {
     content: '';
-    @apply absolute bottom-0 left-0 right-0 top-0 rounded-md border border-current/5;
+    @apply absolute top-0 right-0 bottom-0 left-0 rounded-md border border-current/5;
   }
   &.btn-primary {
     @apply text-accent bg-accent hover:bg-accent-hover disabled:text-accent/35 disabled:bg-accent;

package/dist/components/src/asciidoc/index.js

@@ -485,6 +485,159 @@ var oxql_tmLanguage_default = {
   ]
 };
 
+// components/src/asciidoc/langs/p4.tmLanguage.json
+var p4_tmLanguage_default = {
+  $schema: "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
+  name: "p4",
+  scopeName: "source.p4",
+  repository: {
+    comment: {
+      patterns: [
+        {
+          name: "comment.line.double-slash.p4",
+          match: "//.*$"
+        },
+        {
+          name: "comment.block.p4",
+          begin: "/\\*",
+          end: "\\*/"
+        }
+      ]
+    },
+    keywords: {
+      patterns: [
+        {
+          name: "constant.language.p4",
+          match: "\\b(?:false|true)\\b"
+        },
+        {
+          name: "keyword.control.p4",
+          match: "\\b(?:default_action|transition|counters|NoAction|optional|actions|control|default|package|ternary|typedef|action|extern|header|meters|parser|return|select|struct|apply|const|exact|inout|range|state|table|else|size|key|lpm|out|if|in|_)\\b"
+        },
+        {
+          name: "storage.type.p4",
+          match: "\\b(?:packet_out|packet_in|varbit|error|tuple|bool|bit|int)\\b"
+        }
+      ]
+    }
+  },
+  patterns: [
+    {
+      name: "keyword.control.directive.p4",
+      match: "^\\s*#\\s*\\w+"
+    },
+    {
+      include: "#comment"
+    },
+    {
+      name: "string.quoted.double.p4",
+      begin: '"',
+      end: '"',
+      patterns: [
+        {
+          name: "constant.character.escape.p4",
+          match: "\\\\."
+        }
+      ]
+    },
+    {
+      match: "(@)([A-Za-z_]\\w*)",
+      captures: {
+        "1": {
+          name: "punctuation.definition.annotation.p4"
+        },
+        "2": {
+          name: "storage.type.annotation.p4"
+        }
+      }
+    },
+    {
+      name: "storage.type.p4",
+      match: "\\b(?:bit|varbit)\\s*<\\s*\\d+\\s*>|\\btuple\\s*<(?:[^<>]|<[^>]*>)*>"
+    },
+    {
+      name: "constant.numeric.p4",
+      match: "\\b(?:\\d+w0x[0-9a-fA-F]+|\\d+w\\d+|0x[0-9a-fA-F]+|\\d+)\\b"
+    },
+    {
+      match: "\\b(typedef|struct|header|extern)\\s+([A-Za-z_]\\w*)",
+      captures: {
+        "1": {
+          name: "keyword.control.p4"
+        },
+        "2": {
+          name: "storage.type.p4"
+        }
+      }
+    },
+    {
+      match: "\\b(table|parser|control|state|package)\\s+([A-Za-z_]\\w*)",
+      captures: {
+        "1": {
+          name: "keyword.control.p4"
+        },
+        "2": {
+          name: "entity.name.type.p4"
+        }
+      }
+    },
+    {
+      match: "\\b(action)\\s+([A-Za-z_]\\w*)",
+      captures: {
+        "1": {
+          name: "keyword.control.p4"
+        },
+        "2": {
+          name: "entity.name.function.p4"
+        }
+      }
+    },
+    {
+      name: "storage.type.p4",
+      match: "\\b[A-Za-z_]\\w*_[th]\\b"
+    },
+    {
+      begin: "\\b(actions)\\s*=\\s*\\{",
+      end: "\\}",
+      beginCaptures: {
+        "1": {
+          name: "keyword.control.p4"
+        }
+      },
+      patterns: [
+        {
+          include: "#comment"
+        },
+        {
+          include: "#keywords"
+        },
+        {
+          name: "entity.name.function.p4",
+          match: "\\b[A-Za-z_]\\w*\\b"
+        }
+      ]
+    },
+    {
+      include: "#keywords"
+    },
+    {
+      match: "(\\.)([A-Za-z_]\\w*)(?=\\s*\\()",
+      captures: {
+        "1": {
+          name: "punctuation.accessor.p4"
+        },
+        "2": {
+          name: "entity.name.function.p4"
+        }
+      }
+    },
+    {
+      name: "entity.name.function.p4",
+      match: "(?<!\\.)\\b[A-Za-z_]\\w*(?=\\s*\\()"
+    }
+  ]
+};
+
 // components/src/asciidoc/oxide-syntax.json
 var oxide_syntax_default = {
   name: "Oxide Dark",
@@ -1853,14 +2006,11 @@ var oxide_syntax_default = {
 
 // components/src/asciidoc/util.ts
 var highlighter = null;
-var customLanguages = ["oxql"];
+var customLanguages = ["oxql", "p4"];
 var supportedLanguages = [...Object.keys(bundledLanguages), ...customLanguages];
-async function getOrCreateHighlighter() {
+async function getHighlighter() {
   if (!highlighter) {
-    const langs = [];
-    langs.push({
-      ...oxql_tmLanguage_default
-    });
+    const langs = [{ ...oxql_tmLanguage_default }, { ...p4_tmLanguage_default }];
     highlighter = await createHighlighter({
       themes: [oxide_syntax_default],
       langs
@@ -1868,6 +2018,18 @@ async function getOrCreateHighlighter() {
   }
   return highlighter;
 }
+async function highlightCode(code, lang, { inline = false } = {}) {
+  const h = await getHighlighter();
+  const resolved = supportedLanguages.includes(lang) ? lang : "text";
+  if (!h.getLoadedLanguages().includes(resolved)) {
+    await h.loadLanguage(resolved);
+  }
+  return h.codeToHtml(code, {
+    lang: resolved,
+    theme: oxide_syntax_default,
+    ...inline ? { structure: "inline" } : {}
+  });
+}
 var highlight = async (block) => {
   if (block.type === "listing") {
     const literalBlock = block;
@@ -1889,20 +2051,11 @@ var highlight = async (block) => {
         )
       };
     }
-    let lang = literalBlock.language;
-    const h = await getOrCreateHighlighter();
-    const loadedLanguages = h.getLoadedLanguages();
-    if (!supportedLanguages.includes(lang)) {
-      lang = "text";
-    }
-    if (!loadedLanguages.includes(lang)) {
-      await h.loadLanguage(lang);
-    }
-    const highlightedContent = h.codeToHtml(placeholderContent, {
-      lang,
-      theme: oxide_syntax_default,
-      structure: "inline"
-    });
+    const highlightedContent = await highlightCode(
+      placeholderContent,
+      literalBlock.language,
+      { inline: true }
+    );
     const restoredContent = highlightedContent.replace(
       /__CALLOUT_PLACEHOLDER_(\d+)__/g,
       (_, index) => callouts[parseInt(index)]