@typespec/compiler 1.16.0-dev.1 → 1.16.0-dev.10

package/dist/src/yaml/diagnostics.js

@@ -20,7 +20,10 @@ function findYamlNode(file, path, kind = "value") {
             if (isLast) {
                 if (kind === "value" || !isMap(current)) {
                     if (Array.isArray(current.items) && current.items.every((item) => isScalar(item))) {
-                        return current.items.find((m) => m.source && m.source === key);
+                        const match = current.items.find((m) => m.source && m.source === key);
+                        // Fall back to an index lookup so callers that only know the position of an entry
+                        // (e.g. when the value was rewritten after parsing) can still locate it.
+                        return match ?? current.get(key, true);
                     }
                     else {
                         return current.get(key, true);

package/dist/src/yaml/diagnostics.js.map

@@ -1 +1 @@
-{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../../../src/yaml/diagnostics.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAIrC,MAAM,UAAU,uBAAuB,CACrC,IAAgB,EAChB,IAAc,EACd,OAAiC,OAAO;IAExC,MAAM,IAAI,GAAqB,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9D,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAC1B,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;KAC3B,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CACnB,IAAgB,EAChB,IAAc,EACd,OAAiC,OAAO;IAExC,IAAI,OAAO,GAAgB,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;IAE7C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,MAAM,MAAM,GAAG,CAAC,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QACrC,IAAI,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACtB,OAAO,OAAO,CAAC;QACjB,CAAC;aAAM,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;YACjC,IAAI,MAAM,EAAE,CAAC;gBACX,IAAI,IAAI,KAAK,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;oBACxC,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;wBAClF,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG,CAAQ,CAAC;oBAC7E,CAAC;yBAAM,CAAC;wBACN,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;oBAChC,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;oBAC1C,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;wBACnB,OAAO,IAAI,EAAE,GAAU,CAAC;oBAC1B,CAAC;yBAAM,CAAC;wBACN,OAAO,IAAW,CAAC;oBACrB,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAQ,CAAC;YAC1C,CAAC;QACH,CAAC;aAAM,CAAC;YACN,SAAS;QACX,CAAC;IACH,CAAC;IACD,OAAO,OAAO,IAAI,SAAS,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../../../src/yaml/diagnostics.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,MAAM,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAIrC,MAAM,UAAU,uBAAuB,CACrC,IAAgB,EAChB,IAAc,EACd,OAAiC,OAAO;IAExC,MAAM,IAAI,GAAqB,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;IAC9D,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAC1B,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;KAC3B,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CACnB,IAAgB,EAChB,IAAc,EACd,OAAiC,OAAO;IAExC,IAAI,OAAO,GAAgB,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC;IAE7C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,MAAM,MAAM,GAAG,CAAC,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;QACrC,IAAI,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;YACtB,OAAO,OAAO,CAAC;QACjB,CAAC;aAAM,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;YACjC,IAAI,MAAM,EAAE,CAAC;gBACX,IAAI,IAAI,KAAK,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;oBACxC,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;wBAClF,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,KAAK,GAAG,CAAQ,CAAC;wBAClF,kFAAkF;wBAClF,yEAAyE;wBACzE,OAAO,KAAK,IAAK,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAS,CAAC;oBAClD,CAAC;yBAAM,CAAC;wBACN,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;oBAChC,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;oBAC1C,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;wBACnB,OAAO,IAAI,EAAE,GAAU,CAAC;oBAC1B,CAAC;yBAAM,CAAC;wBACN,OAAO,IAAW,CAAC;oBACrB,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAQ,CAAC;YAC1C,CAAC;QACH,CAAC;aAAM,CAAC;YACN,SAAS;QACX,CAAC;IACH,CAAC;IACD,OAAO,OAAO,IAAI,SAAS,CAAC;AAC9B,CAAC"}

package/dist/typespec.tmLanguage

@@ -2125,6 +2125,34 @@
           </dict>
         </array>
       </dict>
+      <key>union-extends</key>
+      <dict>
+        <key>name</key>
+        <string>meta.union-extends.typespec</string>
+        <key>begin</key>
+        <string>\b(extends)\b</string>
+        <key>beginCaptures</key>
+        <dict>
+          <key>1</key>
+          <dict>
+            <key>name</key>
+            <string>keyword.other.tsp</string>
+          </dict>
+        </dict>
+        <key>end</key>
+        <string>((?=\{)|(?=;|@|\)|\}|\b(?:extern|internal)\b|\b(?:namespace|model|op|using|import|enum|alias|union|interface|dec|fn)\b))</string>
+        <key>patterns</key>
+        <array>
+          <dict>
+            <key>include</key>
+            <string>#expression</string>
+          </dict>
+          <dict>
+            <key>include</key>
+            <string>#punctuation-comma</string>
+          </dict>
+        </array>
+      </dict>
       <key>union-statement</key>
       <dict>
         <key>name</key>
@@ -2157,6 +2185,14 @@
             <key>include</key>
             <string>#token</string>
           </dict>
+          <dict>
+            <key>include</key>
+            <string>#type-parameters</string>
+          </dict>
+          <dict>
+            <key>include</key>
+            <string>#union-extends</string>
+          </dict>
           <dict>
             <key>include</key>
             <string>#union-body</string>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/compiler",
-  "version": "1.16.0-dev.1",
+  "version": "1.16.0-dev.10",
   "description": "TypeSpec compiler and standard library",
   "author": "Microsoft Corporation",
   "license": "MIT",
@@ -88,36 +88,36 @@
   ],
   "dependencies": {
     "@babel/code-frame": "^7.29.0",
-    "@inquirer/prompts": "^8.4.1",
-    "ajv": "^8.18.0",
+    "@inquirer/prompts": "^8.6.0",
+    "ajv": "^8.20.0",
     "change-case": "^5.4.4",
     "env-paths": "^4.0.0",
     "is-unicode-supported": "^2.1.0",
     "mustache": "^4.2.0",
     "picocolors": "^1.1.1",
-    "prettier": "^3.9.5",
-    "semver": "^7.7.4",
-    "tar": "^7.5.21",
-    "temporal-polyfill": "^1.0.1",
-    "vscode-languageserver": "^10.0.0",
-    "vscode-languageserver-textdocument": "^1.0.12",
-    "yaml": "^2.8.3",
-    "yargs": "^18.0.0"
+    "prettier": "^3.9.6",
+    "semver": "^7.8.5",
+    "tar": "^7.5.22",
+    "temporal-polyfill": "^1.0.4",
+    "vscode-languageserver": "^10.1.0",
+    "vscode-languageserver-textdocument": "^1.0.13",
+    "yaml": "^2.9.0",
+    "yargs": "^18.1.0"
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.27.0",
     "@types/mustache": "^4.2.6",
-    "@types/node": "^26.0.0",
-    "@types/semver": "^7.7.1",
+    "@types/node": "^26.3.0",
+    "@types/semver": "^7.8.0",
     "@types/yargs": "^17.0.35",
     "@typespec/internal-build-utils": "^0.85.0 || >= 0.86.0-dev.0",
-    "@vitest/coverage-v8": "^4.1.3",
-    "@vitest/ui": "^4.1.3",
+    "@vitest/coverage-v8": "^4.1.11",
+    "@vitest/ui": "^4.1.11",
     "pathe": "^2.0.3",
     "rimraf": "^6.1.3",
     "tmlanguage-generator": "^0.6.8 || >= 0.6.9-dev.8",
     "typescript": "~6.0.2",
-    "vitest": "^4.1.3",
+    "vitest": "^4.1.11",
     "vscode-oniguruma": "^2.0.1",
     "vscode-textmate": "^9.3.2"
   },