vscode-behavior3 2.3.0 → 2.3.3

package/dist/build-cli.js

@@ -212496,10 +212496,7 @@ function customAlphabet(alphabet, size = 21) {
 
 // webview/shared/stable-id.ts
 var UUID_ALPHABET = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-var generateUuid = customAlphabet(
-  UUID_ALPHABET,
-  10
-);
+var generateUuid = customAlphabet(UUID_ALPHABET, 10);
 var hashString = (value) => {
   let hash = 2166136261;
   for (let index = 0; index < value.length; index += 1) {
@@ -212513,7 +212510,7 @@ var generateDeterministicUuid = (seed) => {
   let result = "";
   for (let index = 0; index < 10; index += 1) {
     state = Math.imul(state ^ state >>> 16, 2246822519) >>> 0;
-    state ^= hashString(`${seed}:${index}`);
+    state = (state ^ hashString(`${seed}:${index}`)) >>> 0;
     result += UUID_ALPHABET[state % UUID_ALPHABET.length];
   }
   return result;
@@ -212559,6 +212556,12 @@ var asRequiredString = (value, label) => {
   }
   return value;
 };
+var normalizeTreeVersion = (value) => {
+  if (value === void 0) {
+    return DOCUMENT_VERSION;
+  }
+  return asRequiredString(value, "tree file version");
+};
 var asStringArray = (value, label) => {
   if (value === void 0) {
     return [];
@@ -212874,7 +212877,7 @@ var normalizeTreeData = (value, opts) => {
   const variablesValue = record.variables;
   const variablesRecord = variablesValue === void 0 ? void 0 : expectPlainRecord(variablesValue, "tree file variables");
   return {
-    version: asRequiredString(record.version, "tree file version"),
+    version: normalizeTreeVersion(record.version),
     name: asRequiredString(record.name, "tree file name"),
     prefix: asOptionalString(record.prefix) ?? "",
     desc: asOptionalString(record.desc),
@@ -213034,10 +213037,10 @@ var collectReachableSubtreePaths = (root) => {
   });
   return Array.from(paths);
 };
-var hasMissingStableIds = (content) => {
+var needsLegacyTreeWriteback = (content) => {
   try {
     const parsed = JSON.parse(content);
-    return subtreeNeedsMissingIds(parsed.root) || parsed.$override !== void 0 || parsed.import !== void 0 || parsed.vars !== void 0;
+    return parsed.version === void 0 || subtreeNeedsMissingIds(parsed.root) || parsed.$override !== void 0 || parsed.import !== void 0 || parsed.vars !== void 0;
   } catch {
     return false;
   }
@@ -213060,7 +213063,7 @@ var loadSubtreeSourceCache = async (params) => {
       return;
     }
     try {
-      const needsWriteback = hasMissingStableIds(content);
+      const needsWriteback = needsLegacyTreeWriteback(content);
       const tree = parsePersistedTreeContent(content, normalizedPath);
       cache[normalizedPath] = tree;
       await params.onTreeLoaded?.({
@@ -217235,6 +217238,14 @@ var validateExpressionEntries = (entries, usingVars, checkExpr) => {
   return null;
 };
 var getArgLabel = (arg) => arg.desc || arg.name;
+var findNodeArgOneofInputIndex = (arg, inputDefs) => {
+  if (!arg.oneof || !inputDefs?.length) {
+    return -1;
+  }
+  return inputDefs.findIndex(
+    (input, index) => parseSlotDefinition(input, inputDefs, index).label === arg.oneof
+  );
+};
 var isRequiredNodeArgValueMissing = (arg, value) => {
   if (isNodeArgOptional(arg)) {
     return false;
@@ -217349,6 +217360,28 @@ var validateNodeArgValue = (params) => {
   }
   return validateNodeArgScalarValue(arg, value, args, validateOptions);
 };
+var validateNodeArgOneof = (params) => {
+  const { arg, argValue, inputValues, inputDefs } = params;
+  if (!arg.oneof) {
+    return null;
+  }
+  const relatedInputIndex = findNodeArgOneofInputIndex(arg, inputDefs);
+  if (relatedInputIndex < 0) {
+    return {
+      code: "missing-oneof-input",
+      argName: arg.name,
+      inputLabel: arg.oneof
+    };
+  }
+  if (checkOneof(arg, argValue, inputValues?.[relatedInputIndex])) {
+    return null;
+  }
+  return {
+    code: "oneof-conflict",
+    argName: arg.name,
+    inputLabel: arg.oneof
+  };
+};
 
 // webview/shared/b3build-context.ts
 var unknownNodeDef = {
@@ -217432,6 +217465,10 @@ var formatBuildDiagnostic = (diagnostic) => {
       return `intput field '${diagnostic.label}' is required`;
     case "required-output":
       return `output field '${diagnostic.label}' is required`;
+    case "missing-oneof-input":
+      return `missing oneof input slot '${diagnostic.inputLabel}' for arg '${diagnostic.argName}'`;
+    case "oneof-conflict":
+      return `only one of arg '${diagnostic.argName}' and input '${diagnostic.inputLabel}' can be set`;
     case "invalid-arg-value": {
       const value = JSON.stringify(diagnostic.value);
       switch (diagnostic.expected) {
@@ -217472,14 +217509,15 @@ var checkNodeArg = (data, conf, i, printer) => {
   const diagnostics = validateNodeArgValue({ arg, value, args: data.args ?? {} });
   let hasError = diagnostics.length > 0;
   diagnostics.forEach((diagnostic) => error(formatBuildDiagnostic(diagnostic)));
-  if (arg.oneof !== void 0) {
-    const idx = conf.input?.findIndex((v) => v.startsWith(arg.oneof)) ?? -1;
-    if (!checkOneof(arg, data.args?.[arg.name], data.input?.[idx])) {
-      error(
-        `only one is allowed for between argument '${arg.name}' and input '${data.input?.[idx]}'`
-      );
-      hasError = true;
-    }
+  const oneofDiagnostic = validateNodeArgOneof({
+    arg,
+    argValue: value,
+    inputValues: data.input,
+    inputDefs: conf.input
+  });
+  if (oneofDiagnostic) {
+    error(formatBuildDiagnostic(oneofDiagnostic));
+    hasError = true;
   }
   return !hasError;
 };

package/dist/extension.js

@@ -215264,10 +215264,7 @@ function customAlphabet(alphabet, size = 21) {
 
 // webview/shared/stable-id.ts
 var UUID_ALPHABET = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
-var generateUuid = customAlphabet(
-  UUID_ALPHABET,
-  10
-);
+var generateUuid = customAlphabet(UUID_ALPHABET, 10);
 var hashString = (value) => {
   let hash = 2166136261;
   for (let index = 0; index < value.length; index += 1) {
@@ -215281,7 +215278,7 @@ var generateDeterministicUuid = (seed) => {
   let result = "";
   for (let index = 0; index < 10; index += 1) {
     state = Math.imul(state ^ state >>> 16, 2246822519) >>> 0;
-    state ^= hashString(`${seed}:${index}`);
+    state = (state ^ hashString(`${seed}:${index}`)) >>> 0;
     result += UUID_ALPHABET[state % UUID_ALPHABET.length];
   }
   return result;
@@ -215375,6 +215372,12 @@ var asRequiredString = (value, label) => {
   }
   return value;
 };
+var normalizeTreeVersion = (value) => {
+  if (value === void 0) {
+    return DOCUMENT_VERSION;
+  }
+  return asRequiredString(value, "tree file version");
+};
 var asStringArray = (value, label) => {
   if (value === void 0) {
     return [];
@@ -215693,7 +215696,7 @@ var normalizeTreeData = (value, opts) => {
   const variablesValue = record.variables;
   const variablesRecord = variablesValue === void 0 ? void 0 : expectPlainRecord(variablesValue, "tree file variables");
   return {
-    version: asRequiredString(record.version, "tree file version"),
+    version: normalizeTreeVersion(record.version),
     name: asRequiredString(record.name, "tree file name"),
     prefix: asOptionalString(record.prefix) ?? "",
     desc: asOptionalString(record.desc),
@@ -215948,10 +215951,10 @@ var applyMainTreeDisplayIds = (root, idsByStableId) => {
     }
   });
 };
-var hasMissingStableIds = (content) => {
+var needsLegacyTreeWriteback = (content) => {
   try {
     const parsed = JSON.parse(content);
-    return subtreeNeedsMissingIds(parsed.root) || parsed.$override !== void 0 || parsed.import !== void 0 || parsed.vars !== void 0;
+    return parsed.version === void 0 || subtreeNeedsMissingIds(parsed.root) || parsed.$override !== void 0 || parsed.import !== void 0 || parsed.vars !== void 0;
   } catch {
     return false;
   }
@@ -215974,7 +215977,7 @@ var loadSubtreeSourceCache = async (params) => {
       return;
     }
     try {
-      const needsWriteback = hasMissingStableIds(content);
+      const needsWriteback = needsLegacyTreeWriteback(content);
       const tree = parsePersistedTreeContent(content, normalizedPath);
       cache[normalizedPath] = tree;
       await params.onTreeLoaded?.({
@@ -217564,6 +217567,14 @@ var validateExpressionEntries = (entries, usingVars, checkExpr) => {
   return null;
 };
 var getArgLabel = (arg) => arg.desc || arg.name;
+var findNodeArgOneofInputIndex = (arg, inputDefs) => {
+  if (!arg.oneof || !inputDefs?.length) {
+    return -1;
+  }
+  return inputDefs.findIndex(
+    (input, index) => parseSlotDefinition(input, inputDefs, index).label === arg.oneof
+  );
+};
 var isRequiredNodeArgValueMissing = (arg, value) => {
   if (isNodeArgOptional(arg)) {
     return false;
@@ -217678,6 +217689,28 @@ var validateNodeArgValue = (params) => {
   }
   return validateNodeArgScalarValue(arg, value, args, validateOptions);
 };
+var validateNodeArgOneof = (params) => {
+  const { arg, argValue, inputValues, inputDefs } = params;
+  if (!arg.oneof) {
+    return null;
+  }
+  const relatedInputIndex = findNodeArgOneofInputIndex(arg, inputDefs);
+  if (relatedInputIndex < 0) {
+    return {
+      code: "missing-oneof-input",
+      argName: arg.name,
+      inputLabel: arg.oneof
+    };
+  }
+  if (checkOneof(arg, argValue, inputValues?.[relatedInputIndex])) {
+    return null;
+  }
+  return {
+    code: "oneof-conflict",
+    argName: arg.name,
+    inputLabel: arg.oneof
+  };
+};
 
 // webview/shared/b3build-context.ts
 var unknownNodeDef = {
@@ -217761,6 +217794,10 @@ var formatBuildDiagnostic = (diagnostic) => {
       return `intput field '${diagnostic.label}' is required`;
     case "required-output":
       return `output field '${diagnostic.label}' is required`;
+    case "missing-oneof-input":
+      return `missing oneof input slot '${diagnostic.inputLabel}' for arg '${diagnostic.argName}'`;
+    case "oneof-conflict":
+      return `only one of arg '${diagnostic.argName}' and input '${diagnostic.inputLabel}' can be set`;
     case "invalid-arg-value": {
       const value = JSON.stringify(diagnostic.value);
       switch (diagnostic.expected) {
@@ -217801,14 +217838,15 @@ var checkNodeArg = (data, conf, i, printer) => {
   const diagnostics = validateNodeArgValue({ arg, value, args: data.args ?? {} });
   let hasError = diagnostics.length > 0;
   diagnostics.forEach((diagnostic) => error(formatBuildDiagnostic(diagnostic)));
-  if (arg.oneof !== void 0) {
-    const idx = conf.input?.findIndex((v) => v.startsWith(arg.oneof)) ?? -1;
-    if (!checkOneof(arg, data.args?.[arg.name], data.input?.[idx])) {
-      error(
-        `only one is allowed for between argument '${arg.name}' and input '${data.input?.[idx]}'`
-      );
-      hasError = true;
-    }
+  const oneofDiagnostic = validateNodeArgOneof({
+    arg,
+    argValue: value,
+    inputValues: data.input,
+    inputDefs: conf.input
+  });
+  if (oneofDiagnostic) {
+    error(formatBuildDiagnostic(oneofDiagnostic));
+    hasError = true;
   }
   return !hasError;
 };