@actions/languageserver 0.3.26 → 0.3.28

package/dist/cli.bundle.cjs

@@ -23412,6 +23412,7 @@ function getJobContext(workflowContext) {
     jobContext.add("services", servicesContext);
   }
   jobContext.add("status", new data_exports.Null());
+  jobContext.add("check_run_id", new data_exports.Null());
   return jobContext;
 }
 function createContainerContext(container, isServices) {
@@ -24454,13 +24455,13 @@ var DefinitionValueMode;
   DefinitionValueMode2[DefinitionValueMode2["Parent"] = 0] = "Parent";
   DefinitionValueMode2[DefinitionValueMode2["Key"] = 1] = "Key";
 })(DefinitionValueMode = DefinitionValueMode || (DefinitionValueMode = {}));
-function definitionValues(def, indentation, mode) {
+function definitionValues(def, indentation, mode, tokenStructure) {
   const schema2 = getWorkflowSchema();
   if (def instanceof MappingDefinition) {
     return mappingValues(def, schema2.definitions, indentation, mode);
   }
   if (def instanceof OneOfDefinition) {
-    return oneOfValues(def, schema2.definitions, indentation, mode);
+    return oneOfValues(def, schema2.definitions, indentation, mode, tokenStructure);
   }
   if (def instanceof BooleanDefinition) {
     return stringsToValues(["true", "false"]);
@@ -24511,14 +24512,12 @@ ${indentation}${indentation}`;
 ${indentation}`;
             }
             break;
-          case DefinitionType.OneOf:
-            if (mode == DefinitionValueMode.Key) {
-              insertText = `
-${indentation}${key}: `;
-            } else {
-              insertText = `${key}: `;
-            }
-            break;
+          case DefinitionType.OneOf: {
+            const oneOfDef = typeDef;
+            const expanded = expandOneOfToCompletions(oneOfDef, definitions, key, description, indentation, mode);
+            properties.push(...expanded);
+            continue;
+          }
           case DefinitionType.String:
           case DefinitionType.Boolean:
             if (mode == DefinitionValueMode.Key) {
@@ -24541,10 +24540,20 @@ ${indentation}${key}: `;
   }
   return properties;
 }
-function oneOfValues(oneOfDefinition, definitions, indentation, mode) {
+function oneOfValues(oneOfDefinition, definitions, indentation, mode, tokenStructure) {
   const values = [];
   for (const key of oneOfDefinition.oneOf) {
-    values.push(...definitionValues(definitions[key], indentation, mode));
+    const variantDef = definitions[key];
+    if (!variantDef) {
+      continue;
+    }
+    if (tokenStructure) {
+      const variantBucket = getStructuralBucket(variantDef.definitionType);
+      if (variantBucket !== tokenStructure) {
+        continue;
+      }
+    }
+    values.push(...definitionValues(variantDef, indentation, mode, tokenStructure));
   }
   return distinctValues(values);
 }
@@ -24555,6 +24564,74 @@ function distinctValues(values) {
   }
   return Array.from(map.values());
 }
+function getStructuralBucket(defType) {
+  switch (defType) {
+    case DefinitionType.Sequence:
+      return "sequence";
+    case DefinitionType.Mapping:
+      return "mapping";
+    default:
+      return "scalar";
+  }
+}
+function expandOneOfToCompletions(oneOfDef, definitions, key, description, indentation, mode) {
+  const buckets = {
+    scalar: false,
+    sequence: false,
+    mapping: false
+  };
+  let scalarIsOnlyNull = true;
+  for (const variantKey of oneOfDef.oneOf) {
+    const variantDef = definitions[variantKey];
+    if (variantDef) {
+      const bucket = getStructuralBucket(variantDef.definitionType);
+      buckets[bucket] = true;
+      if (bucket === "scalar" && !(variantDef instanceof NullDefinition)) {
+        scalarIsOnlyNull = false;
+      }
+    }
+  }
+  const results = [];
+  const bucketCount = [buckets.scalar, buckets.sequence, buckets.mapping].filter(Boolean).length;
+  const needsQualifier = bucketCount > 1;
+  const skipNullOnlyScalar = mode === DefinitionValueMode.Key && scalarIsOnlyNull;
+  if (buckets.scalar && !skipNullOnlyScalar) {
+    const insertText = mode === DefinitionValueMode.Key ? `
+${indentation}${key}: ` : `${key}: `;
+    results.push({
+      label: key,
+      description,
+      insertText
+    });
+  }
+  if (buckets.sequence) {
+    const insertText = mode === DefinitionValueMode.Key ? `
+${indentation}${key}:
+${indentation}${indentation}- ` : `${key}:
+${indentation}- `;
+    results.push({
+      label: needsQualifier ? `${key} (list)` : key,
+      description,
+      insertText,
+      filterText: needsQualifier ? key : void 0,
+      sortText: needsQualifier ? `${key} 1` : void 0
+    });
+  }
+  if (buckets.mapping) {
+    const insertText = mode === DefinitionValueMode.Key ? `
+${indentation}${key}:
+${indentation}${indentation}` : `${key}:
+${indentation}`;
+    results.push({
+      label: needsQualifier ? `${key} (full syntax)` : key,
+      description,
+      insertText,
+      filterText: needsQualifier ? key : void 0,
+      sortText: needsQualifier ? `${key} 2` : void 0
+    });
+  }
+  return results;
+}
 
 // ../languageservice/dist/complete.js
 function getExpressionInput(input, pos) {
@@ -24619,6 +24696,8 @@ async function complete2(textDocument, position, config) {
     const newText = value.insertText || value.label;
     const item = {
       label: value.label,
+      filterText: value.filterText,
+      sortText: value.sortText,
       documentation: value.description && {
         kind: "markdown",
         value: value.description
@@ -24651,9 +24730,35 @@ async function getValues(token, keyToken, parent, valueProviderConfig, workflowC
   if (!def) {
     return [];
   }
-  const values = definitionValues(def, indentation, keyToken ? DefinitionValueMode.Key : DefinitionValueMode.Parent);
+  const tokenStructure = getTokenStructure(token);
+  const values = definitionValues(def, indentation, keyToken ? DefinitionValueMode.Key : DefinitionValueMode.Parent, tokenStructure);
   return filterAndSortCompletionOptions(values, existingValues);
 }
+function getTokenStructure(token) {
+  if (!token) {
+    return void 0;
+  }
+  switch (token.templateTokenType) {
+    case TokenType2.Mapping:
+      return "mapping";
+    case TokenType2.Sequence:
+      return "sequence";
+    case TokenType2.Null:
+      return void 0;
+    case TokenType2.String: {
+      const stringToken = token.assertString("getTokenStructure expected string token");
+      if (stringToken.value === "") {
+        return void 0;
+      }
+      return "scalar";
+    }
+    case TokenType2.Boolean:
+    case TokenType2.Number:
+      return "scalar";
+    default:
+      return void 0;
+  }
+}
 function getExistingValues(token, parent) {
   if (token) {
     if (!isString(token)) {
@@ -24702,7 +24807,7 @@ function getExpressionCompletionItems(token, context, pos) {
 }
 function filterAndSortCompletionOptions(options, existingValues) {
   options = options.filter((x) => !existingValues?.has(x.label));
-  options.sort((a, b) => a.label.localeCompare(b.label));
+  options.sort((a, b) => (a.sortText ?? a.label).localeCompare(b.sortText ?? b.label));
   return options;
 }
 function mapExpressionCompletionItem(item, charAfterPos) {
@@ -25744,6 +25849,23 @@ function validateCronExpression(diagnostics, token) {
     });
   }
 }
+var SHORT_SHA_PATTERN = /^[0-9a-f]{7,8}$/i;
+var SHORT_SHA_DOCS_URL = "https://docs.github.com/en/actions/security-guides/security-hardening-for-github-actions#using-third-party-actions";
+function warnIfShortSha(diagnostics, token, ref) {
+  if (SHORT_SHA_PATTERN.test(ref)) {
+    diagnostics.push({
+      message: `The provided ref '${ref}' may be a shortened commit SHA. If so, please use the full 40-character commit SHA instead, as short SHAs are not supported.`,
+      severity: import_vscode_languageserver_types3.DiagnosticSeverity.Warning,
+      range: mapRange(token.range),
+      code: "short-sha-ref",
+      codeDescription: {
+        href: SHORT_SHA_DOCS_URL
+      }
+    });
+    return true;
+  }
+  return false;
+}
 function validateStepUsesFormat(diagnostics, token) {
   const uses = token.value;
   if (!uses) {
@@ -25785,6 +25907,7 @@ function validateStepUsesFormat(diagnostics, token) {
     });
     return;
   }
+  warnIfShortSha(diagnostics, token, gitRef);
 }
 function addStepUsesFormatError(diagnostics, token) {
   diagnostics.push({
@@ -25873,6 +25996,7 @@ function validateWorkflowUsesFormat(diagnostics, token) {
     addWorkflowUsesFormatError(diagnostics, token, "invalid workflow file name");
     return;
   }
+  warnIfShortSha(diagnostics, token, version);
 }
 function addWorkflowUsesFormatError(diagnostics, token, reason) {
   diagnostics.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@actions/languageserver",
-  "version": "0.3.26",
+  "version": "0.3.28",
   "description": "Language server for GitHub Actions",
   "license": "MIT",
   "type": "module",
@@ -48,8 +48,8 @@
     "actions-languageserver": "./bin/actions-languageserver"
   },
   "dependencies": {
-    "@actions/languageservice": "^0.3.26",
-    "@actions/workflow-parser": "^0.3.26",
+    "@actions/languageservice": "^0.3.28",
+    "@actions/workflow-parser": "^0.3.28",
     "@octokit/rest": "^21.1.1",
     "@octokit/types": "^9.0.0",
     "vscode-languageserver": "^8.0.2",
@@ -78,5 +78,5 @@
     "ts-jest": "^29.0.3",
     "typescript": "^4.8.4"
   },
-  "gitHead": "c0062e5287fdb80b0856bc209e8dad064564bc70"
+  "gitHead": "a06ceee92b19cc7432ed25f63e8b4968b8ecb9ef"
 }