@typespec/html-program-viewer 0.68.0-dev.1 → 0.68.0-dev.3

package/dist/emitter/index.js

@@ -353,7 +353,7 @@ function getDebugClassNames(lookupItem, parentLookupItem, parentDebugClassNames,
   });
 }
 
-function getDebugTree(debugSequenceHash, parentNode) {
+function getAtomicDebugSequenceTree(debugSequenceHash, parentNode) {
   const lookupItem = DEFINITION_LOOKUP_TABLE[debugSequenceHash];
   if (lookupItem === undefined) {
     return undefined;
@@ -369,7 +369,7 @@ function getDebugTree(debugSequenceHash, parentNode) {
   const childrenSequences = debugData.getChildrenSequences(node.sequenceHash);
   childrenSequences.reverse() // first process the overriding children that are merged last
   .forEach(sequence => {
-    const child = getDebugTree(sequence, node);
+    const child = getAtomicDebugSequenceTree(sequence, node);
     if (child) {
       node.children.push(child);
     }
@@ -394,6 +394,53 @@ function getDebugTree(debugSequenceHash, parentNode) {
   return node;
 }
 
+function getResetDebugSequence(debugSequenceHash) {
+  const resetClass = DEBUG_RESET_CLASSES[debugSequenceHash];
+  if (resetClass === undefined) {
+    return undefined;
+  }
+  const debugClassNames = [{
+    className: debugSequenceHash
+  }];
+  const node = {
+    sequenceHash: debugSequenceHash,
+    direction: 'ltr',
+    children: [],
+    debugClassNames
+  };
+  node.rules = {};
+  node.slot = 'makeResetStyles()';
+  const [{
+    className
+  }] = node.debugClassNames;
+  const cssRules = debugData.getCSSRules().filter(cssRule => {
+    return cssRule.includes(`.${className}`);
+  });
+  node.rules[className] = cssRules.join('');
+  return node;
+}
+
+function mergeDebugSequence(atomicClases, resetClassName) {
+  const debugResultRootAtomic = atomicClases ? getAtomicDebugSequenceTree(atomicClases) : undefined;
+  const debugResultRootReset = resetClassName ? getResetDebugSequence(resetClassName) : undefined;
+  if (!debugResultRootAtomic && !debugResultRootReset) {
+    return undefined;
+  }
+  if (!debugResultRootAtomic) {
+    return debugResultRootReset;
+  }
+  if (!debugResultRootReset) {
+    return debugResultRootAtomic;
+  }
+  const debugResultRoot = {
+    sequenceHash: debugResultRootAtomic.sequenceHash + debugResultRootReset.sequenceHash,
+    direction: debugResultRootAtomic.direction,
+    children: [debugResultRootAtomic, debugResultRootReset],
+    debugClassNames: [...debugResultRootAtomic.debugClassNames, ...debugResultRootReset.debugClassNames]
+  };
+  return debugResultRoot;
+}
+
 function injectDevTools(document) {
   const window = document.defaultView;
   if (!window || window.__GRIFFEL_DEVTOOLS__) {
@@ -401,11 +448,17 @@ function injectDevTools(document) {
   }
   const devtools = {
     getInfo: element => {
-      const rootDebugSequenceHash = Array.from(element.classList).find(className => className.startsWith(SEQUENCE_PREFIX));
-      if (rootDebugSequenceHash === undefined) {
-        return undefined;
+      let rootDebugSequenceHash;
+      let rootResetDebugClassName;
+      for (const className of element.classList) {
+        if (className.startsWith(SEQUENCE_PREFIX)) {
+          rootDebugSequenceHash = className;
+        }
+        if (DEBUG_RESET_CLASSES[className]) {
+          rootResetDebugClassName = className;
+        }
       }
-      return getDebugTree(rootDebugSequenceHash);
+      return mergeDebugSequence(rootDebugSequenceHash, rootResetDebugClassName);
     }
   };
   Object.defineProperty(window, '__GRIFFEL_DEVTOOLS__', {
@@ -4864,11 +4917,9 @@ const fontWeights = {
     fontWeightBold: 700
 };
 const fontFamilies = {
-    fontFamilyBase: // eslint-disable-next-line @fluentui/max-len
-    "'Segoe UI', 'Segoe UI Web (West European)', -apple-system, BlinkMacSystemFont, Roboto, 'Helvetica Neue', sans-serif",
+    fontFamilyBase: "'Segoe UI', 'Segoe UI Web (West European)', -apple-system, BlinkMacSystemFont, Roboto, 'Helvetica Neue', sans-serif",
     fontFamilyMonospace: "Consolas, 'Courier New', Courier, monospace",
-    fontFamilyNumeric: // eslint-disable-next-line @fluentui/max-len
-    "Bahnschrift, 'Segoe UI', 'Segoe UI Web (West European)', -apple-system, BlinkMacSystemFont, Roboto, 'Helvetica Neue', sans-serif"
+    fontFamilyNumeric: "Bahnschrift, 'Segoe UI', 'Segoe UI Web (West European)', -apple-system, BlinkMacSystemFont, Roboto, 'Helvetica Neue', sans-serif"
 };
 
 // Intentionally not exported! Use horizontalSpacings and verticalSpacings instead.

package/dist/manifest-KysNbCfR.js

@@ -0,0 +1,6 @@
+const manifest = {
+  "version": "0.67.2",
+  "commit": "ee6e65641df375dd753fec60600fb32e93735c78"
+};
+
+export { manifest as default };

package/dist/react/index.js

@@ -2,10 +2,10 @@ import require$$0, { useRef, useState, useMemo, useCallback, useEffect, useId, c
 import { mergeClasses, Breadcrumb, BreadcrumbItem, BreadcrumbButton, BreadcrumbDivider, Combobox, Option, Caption1, Card, CardHeader, Text, Divider } from '@fluentui/react-components';
 import { ChevronDownRegular, ChevronRightRegular, AppsListRegular, DatabaseRegular } from '@fluentui/react-icons';
 import { useHotkeys } from 'react-hotkeys-hook';
-import { List, ListItem } from '@fluentui/react-list-preview';
+import { List, ListItem } from '@fluentui/react-list';
 
 function getAugmentedNamespace(n) {
-  if (n.__esModule) return n;
+  if (Object.prototype.hasOwnProperty.call(n, '__esModule')) return n;
   var f = n.default;
 	if (typeof f == "function") {
 		var a = function a () {
@@ -19088,6 +19088,12 @@ const diagnostics = {
             osx: "Couldn't find VS Code 'code' command in PATH. Make sure you have the VS Code executable added to the system PATH.\nSee instruction for Mac OS here https://code.visualstudio.com/docs/setup/mac",
         },
     },
+    "invalid-option-flag": {
+        severity: "error",
+        messages: {
+            default: paramMessage `The --option parameter value "${"value"}" must be in the format: <emitterName>.some-options=value`,
+        },
+    },
     // #endregion CLI
 };
 const { createDiagnostic} = createDiagnosticCreator(diagnostics);
@@ -22430,9 +22436,11 @@ function requireUtils () {
 
 	const { HEX } = requireScopedChars();
 
+	const IPV4_REG = /^(?:(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)$/u;
+
 	function normalizeIPv4 (host) {
 	  if (findToken(host, '.') < 3) { return { host, isIPV4: false } }
-	  const matches = host.match(/^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])$/u) || [];
+	  const matches = host.match(IPV4_REG) || [];
 	  const [address] = matches;
 	  if (address) {
 	    return { host: stripLeadingZeros(address, '.'), isIPV4: true }
@@ -22524,7 +22532,7 @@ function requireUtils () {
 	  return output
 	}
 
-	function normalizeIPv6 (host, opts = {}) {
+	function normalizeIPv6 (host) {
 	  if (findToken(host, ':') < 2) { return { host, isIPV6: false } }
 	  const ipv6 = getIPV6(host);
 
@@ -22627,7 +22635,7 @@ function requireUtils () {
 	  return components
 	}
 
-	function recomposeAuthority (components, options) {
+	function recomposeAuthority (components) {
 	  const uriTokens = [];
 
 	  if (components.userinfo !== undefined) {
@@ -22642,7 +22650,7 @@ function requireUtils () {
 	    if (ipV4res.isIPV4) {
 	      host = ipV4res.host;
 	    } else {
-	      const ipV6res = normalizeIPv6(ipV4res.host, { });
+	      const ipV6res = normalizeIPv6(ipV4res.host);
 	      if (ipV6res.isIPV6 === true) {
 	        host = `[${ipV6res.escapedHost}]`;
 	      } else {
@@ -22677,7 +22685,7 @@ function requireSchemes () {
 	if (hasRequiredSchemes) return schemes;
 	hasRequiredSchemes = 1;
 
-	const UUID_REG = /^[\da-f]{8}\b-[\da-f]{4}\b-[\da-f]{4}\b-[\da-f]{4}\b-[\da-f]{12}$/iu;
+	const UUID_REG = /^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/iu;
 	const URN_REG = /([\da-z][\d\-a-z]{0,31}):((?:[\w!$'()*+,\-.:;=@]|%[\da-f]{2})+)/iu;
 
 	function isSecure (wsComponents) {
@@ -23010,7 +23018,7 @@ function requireFastUri () {
 	    uriTokens.push(components.scheme, ':');
 	  }
 
-	  const authority = recomposeAuthority(components, options);
+	  const authority = recomposeAuthority(components);
 	  if (authority !== undefined) {
 	    if (options.reference !== 'suffix') {
 	      uriTokens.push('//');
@@ -23046,7 +23054,7 @@ function requireFastUri () {
 	  return uriTokens.join('')
 	}
 
-	const hexLookUp = Array.from({ length: 127 }, (v, k) => /[^!"$&'()*+,\-.;=_`a-z{}~]/u.test(String.fromCharCode(k)));
+	const hexLookUp = Array.from({ length: 127 }, (_v, k) => /[^!"$&'()*+,\-.;=_`a-z{}~]/u.test(String.fromCharCode(k)));
 
 	function nonSimpleDomain (value) {
 	  let code = 0;
@@ -23095,7 +23103,7 @@ function requireFastUri () {
 	    if (parsed.host) {
 	      const ipv4result = normalizeIPv4(parsed.host);
 	      if (ipv4result.isIPV4 === false) {
-	        const ipv6result = normalizeIPv6(ipv4result.host, { isIPV4: false });
+	        const ipv6result = normalizeIPv6(ipv4result.host);
 	        parsed.host = ipv6result.host.toLowerCase();
 	        isIP = ipv6result.isIPV6;
 	      } else {
@@ -23103,7 +23111,7 @@ function requireFastUri () {
 	        isIP = true;
 	      }
 	    }
-	    if (parsed.scheme === undefined && parsed.userinfo === undefined && parsed.host === undefined && parsed.port === undefined && !parsed.path && parsed.query === undefined) {
+	    if (parsed.scheme === undefined && parsed.userinfo === undefined && parsed.host === undefined && parsed.port === undefined && parsed.query === undefined && !parsed.path) {
 	      parsed.reference = 'same-document';
 	    } else if (parsed.scheme === undefined) {
 	      parsed.reference = 'relative';
@@ -23142,10 +23150,10 @@ function requireFastUri () {
 	      if (gotEncoding && parsed.host !== undefined) {
 	        parsed.host = unescape(parsed.host);
 	      }
-	      if (parsed.path !== undefined && parsed.path.length) {
+	      if (parsed.path) {
 	        parsed.path = escape(unescape(parsed.path));
 	      }
-	      if (parsed.fragment !== undefined && parsed.fragment.length) {
+	      if (parsed.fragment) {
 	        parsed.fragment = encodeURI(decodeURIComponent(parsed.fragment));
 	      }
 	    }
@@ -28019,7 +28027,12 @@ function findYamlNode(file, path, kind = "value") {
         else if (isCollection(current)) {
             if (isLast) {
                 if (kind === "value" || !isMap(current)) {
-                    return current.get(key, true);
+                    if (Array.isArray(current.items) && current.items.every((item) => isScalar(item))) {
+                        return current.items.find((m) => m.source && m.source === key);
+                    }
+                    else {
+                        return current.get(key, true);
+                    }
                 }
                 else {
                     const pair = findPair(current.items, key);
@@ -28462,6 +28475,7 @@ const TypeSpecConfigJsonSchema = {
                     default: { type: "string" },
                 },
                 required: ["default"],
+                additionalProperties: false,
             },
         },
         parameters: {
@@ -28474,6 +28488,7 @@ const TypeSpecConfigJsonSchema = {
                     default: { type: "string" },
                 },
                 required: ["default"],
+                additionalProperties: false,
             },
         },
         "output-dir": {
@@ -28509,15 +28524,6 @@ const TypeSpecConfigJsonSchema = {
             required: [],
             additionalProperties: emitterOptionsSchema,
         },
-        emitters: {
-            type: "object",
-            nullable: true,
-            deprecated: true,
-            required: [],
-            additionalProperties: {
-                oneOf: [{ type: "boolean" }, emitterOptionsSchema],
-            },
-        },
         linter: {
             type: "object",
             nullable: true,
@@ -30381,31 +30387,36 @@ var Token;
     Token[Token["RecordKeyword"] = 89] = "RecordKeyword";
     Token[Token["ModuleKeyword"] = 90] = "ModuleKeyword";
     Token[Token["ModKeyword"] = 91] = "ModKeyword";
-    Token[Token["PubKeyword"] = 92] = "PubKeyword";
-    Token[Token["SubKeyword"] = 93] = "SubKeyword";
-    Token[Token["TypeRefKeyword"] = 94] = "TypeRefKeyword";
-    Token[Token["TraitKeyword"] = 95] = "TraitKeyword";
-    Token[Token["ThisKeyword"] = 96] = "ThisKeyword";
-    Token[Token["SelfKeyword"] = 97] = "SelfKeyword";
-    Token[Token["SuperKeyword"] = 98] = "SuperKeyword";
-    Token[Token["KeyofKeyword"] = 99] = "KeyofKeyword";
-    Token[Token["WithKeyword"] = 100] = "WithKeyword";
-    Token[Token["ImplementsKeyword"] = 101] = "ImplementsKeyword";
-    Token[Token["ImplKeyword"] = 102] = "ImplKeyword";
-    Token[Token["SatisfiesKeyword"] = 103] = "SatisfiesKeyword";
-    Token[Token["FlagKeyword"] = 104] = "FlagKeyword";
-    Token[Token["AutoKeyword"] = 105] = "AutoKeyword";
-    Token[Token["PartialKeyword"] = 106] = "PartialKeyword";
-    Token[Token["PrivateKeyword"] = 107] = "PrivateKeyword";
-    Token[Token["PublicKeyword"] = 108] = "PublicKeyword";
-    Token[Token["ProtectedKeyword"] = 109] = "ProtectedKeyword";
-    Token[Token["InternalKeyword"] = 110] = "InternalKeyword";
-    Token[Token["SealedKeyword"] = 111] = "SealedKeyword";
-    Token[Token["LocalKeyword"] = 112] = "LocalKeyword";
-    Token[Token["AsyncKeyword"] = 113] = "AsyncKeyword";
-    /** @internal */ Token[Token["__EndReservedKeyword"] = 114] = "__EndReservedKeyword";
+    Token[Token["SymKeyword"] = 92] = "SymKeyword";
+    Token[Token["ContextKeyword"] = 93] = "ContextKeyword";
+    Token[Token["PropKeyword"] = 94] = "PropKeyword";
+    Token[Token["PropertyKeyword"] = 95] = "PropertyKeyword";
+    Token[Token["ScenarioKeyword"] = 96] = "ScenarioKeyword";
+    Token[Token["PubKeyword"] = 97] = "PubKeyword";
+    Token[Token["SubKeyword"] = 98] = "SubKeyword";
+    Token[Token["TypeRefKeyword"] = 99] = "TypeRefKeyword";
+    Token[Token["TraitKeyword"] = 100] = "TraitKeyword";
+    Token[Token["ThisKeyword"] = 101] = "ThisKeyword";
+    Token[Token["SelfKeyword"] = 102] = "SelfKeyword";
+    Token[Token["SuperKeyword"] = 103] = "SuperKeyword";
+    Token[Token["KeyofKeyword"] = 104] = "KeyofKeyword";
+    Token[Token["WithKeyword"] = 105] = "WithKeyword";
+    Token[Token["ImplementsKeyword"] = 106] = "ImplementsKeyword";
+    Token[Token["ImplKeyword"] = 107] = "ImplKeyword";
+    Token[Token["SatisfiesKeyword"] = 108] = "SatisfiesKeyword";
+    Token[Token["FlagKeyword"] = 109] = "FlagKeyword";
+    Token[Token["AutoKeyword"] = 110] = "AutoKeyword";
+    Token[Token["PartialKeyword"] = 111] = "PartialKeyword";
+    Token[Token["PrivateKeyword"] = 112] = "PrivateKeyword";
+    Token[Token["PublicKeyword"] = 113] = "PublicKeyword";
+    Token[Token["ProtectedKeyword"] = 114] = "ProtectedKeyword";
+    Token[Token["InternalKeyword"] = 115] = "InternalKeyword";
+    Token[Token["SealedKeyword"] = 116] = "SealedKeyword";
+    Token[Token["LocalKeyword"] = 117] = "LocalKeyword";
+    Token[Token["AsyncKeyword"] = 118] = "AsyncKeyword";
+    /** @internal */ Token[Token["__EndReservedKeyword"] = 119] = "__EndReservedKeyword";
     ///////////////////////////////////////////////////////////////
-    /** @internal */ Token[Token["__Count"] = 114] = "__Count";
+    /** @internal */ Token[Token["__Count"] = 119] = "__Count";
 })(Token || (Token = {}));
 /** @internal */
 getTokenDisplayTable([
@@ -30502,6 +30513,11 @@ getTokenDisplayTable([
     [Token.RecordKeyword, "'record'"],
     [Token.ModuleKeyword, "'module'"],
     [Token.ModKeyword, "'mod'"],
+    [Token.SymKeyword, "'sym'"],
+    [Token.ContextKeyword, "'context'"],
+    [Token.PropKeyword, "'prop'"],
+    [Token.PropertyKeyword, "'property'"],
+    [Token.ScenarioKeyword, "'scenario'"],
     [Token.PubKeyword, "'pub'"],
     [Token.SubKeyword, "'sub'"],
     [Token.TypeRefKeyword, "'typeref'"],
@@ -30568,6 +30584,11 @@ const Keywords = new Map([
     ["record", Token.RecordKeyword],
     ["module", Token.ModuleKeyword],
     ["mod", Token.ModKeyword],
+    ["sym", Token.SymKeyword],
+    ["context", Token.ContextKeyword],
+    ["prop", Token.PropKeyword],
+    ["property", Token.PropertyKeyword],
+    ["scenario", Token.ScenarioKeyword],
     ["pub", Token.PubKeyword],
     ["sub", Token.SubKeyword],
     ["typeref", Token.TypeRefKeyword],
@@ -30605,6 +30626,12 @@ const ReservedKeywords = new Map([
     ["struct", Token.StructKeyword],
     ["record", Token.RecordKeyword],
     ["module", Token.ModuleKeyword],
+    ["mod", Token.ModuleKeyword],
+    ["sym", Token.SymKeyword],
+    ["context", Token.ContextKeyword],
+    ["prop", Token.PropKeyword],
+    ["property", Token.PropertyKeyword],
+    ["scenario", Token.ScenarioKeyword],
     ["trait", Token.TraitKeyword],
     ["this", Token.ThisKeyword],
     ["self", Token.SelfKeyword],
@@ -33584,7 +33611,7 @@ let manifest;
 try {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    manifest = (await import('../manifest-CYH440uE.js')).default;
+    manifest = (await import('../manifest-KysNbCfR.js')).default;
 }
 catch {
     const name = "../dist/manifest.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/html-program-viewer",
-  "version": "0.68.0-dev.1",
+  "version": "0.68.0-dev.3",
   "author": "Microsoft Corporation",
   "description": "TypeSpec library for emitting an html view of the program.",
   "homepage": "https://typespec.io",
@@ -36,36 +36,36 @@
     "!dist/test/**"
   ],
   "peerDependencies": {
-    "@typespec/compiler": "^0.67.1 || >=0.68.0-dev <0.68.0"
+    "@typespec/compiler": "^0.67.2 || >=0.68.0-dev <0.68.0"
   },
   "dependencies": {
-    "@fluentui/react-components": "~9.60.0",
-    "@fluentui/react-icons": "^2.0.279",
-    "@fluentui/react-list-preview": "^0.4.4",
+    "@fluentui/react-components": "~9.61.2",
+    "@fluentui/react-icons": "^2.0.292",
+    "@fluentui/react-list": "^9.1.2",
     "react": "~18.3.1",
     "react-dom": "~18.3.1",
     "react-hotkeys-hook": "^4.6.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.26.9",
+    "@babel/core": "^7.26.10",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.2.0",
-    "@types/node": "~22.13.9",
+    "@types/node": "~22.13.11",
     "@types/react": "~18.3.11",
     "@types/react-dom": "~18.3.0",
-    "@typespec/compiler": "^0.67.1 || >=0.68.0-dev <0.68.0",
+    "@typespec/compiler": "^0.67.2 || >=0.68.0-dev <0.68.0",
     "@vitejs/plugin-react": "~4.3.4",
-    "@vitest/coverage-v8": "^3.0.7",
-    "@vitest/ui": "^3.0.7",
+    "@vitest/coverage-v8": "^3.0.9",
+    "@vitest/ui": "^3.0.9",
     "c8": "^10.1.3",
     "rimraf": "~6.0.1",
     "typescript": "~5.8.2",
-    "vite": "^6.2.0",
-    "vite-plugin-checker": "^0.9.0",
+    "vite": "^6.2.2",
+    "vite-plugin-checker": "^0.9.1",
     "vite-plugin-dts": "4.5.3",
     "vite-plugin-node-polyfills": "^0.23.0",
-    "vitest": "^3.0.7",
+    "vitest": "^3.0.9",
     "@typespec/react-components": "^0.57.0"
   },
   "scripts": {

package/dist/manifest-CYH440uE.js

@@ -1,6 +0,0 @@
-const manifest = {
-  "version": "0.67.1",
-  "commit": "420be4b2c4c9717c38fefc30480b21c04a6d771d"
-};
-
-export { manifest as default };