vscode-behavior3 2.2.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?.({
@@ -213347,14 +213350,15 @@ var readWorkspaceSettings = (path3) => {
   const content = getFs().readFileSync(path3, "utf-8");
   return parseWorkspaceModelContent(content).settings;
 };
-var hasBatchHookMethod = (obj) => {
+var hasBuildHookMethod = (obj) => {
   if (!obj || typeof obj !== "object") {
     return false;
   }
   const candidate = obj;
-  return typeof candidate.shouldUpgradeTree === "function" || typeof candidate.onProcessTree === "function" || typeof candidate.onProcessNode === "function" || typeof candidate.onWriteFile === "function" || typeof candidate.onComplete === "function";
+  return typeof candidate.onProcessTree === "function" || typeof candidate.onProcessNode === "function" || typeof candidate.onWriteFile === "function" || typeof candidate.onComplete === "function";
 };
 var BUILD_HOOK_MARKER = "__behavior3BuildHook";
+var BATCH_HOOK_MARKER = "__behavior3BatchHook";
 var CHECK_HOOK_MARKER = "__behavior3CheckHook";
 var CHECK_HOOK_NAME = "__behavior3CheckName";
 var markBuildHook = (ctor) => {
@@ -213364,6 +213368,13 @@ var markBuildHook = (ctor) => {
   });
   return ctor;
 };
+var markBatchHook = (ctor) => {
+  Object.defineProperty(ctor, BATCH_HOOK_MARKER, {
+    value: true,
+    configurable: false
+  });
+  return ctor;
+};
 var markCheckCtor = (ctor, explicitName) => {
   const name = explicitName?.trim() || ctor.name;
   Object.defineProperty(ctor, CHECK_HOOK_MARKER, {
@@ -213382,28 +213393,51 @@ var markCheckHook = (nameOrCtor, _context) => {
   }
   return (ctor) => markCheckCtor(ctor, nameOrCtor);
 };
-var isDecoratedHookCtor = (value) => typeof value === "function" && value[BUILD_HOOK_MARKER] === true;
+var isDecoratedBuildHookCtor = (value) => typeof value === "function" && value[BUILD_HOOK_MARKER] === true;
+var isDecoratedBatchHookCtor = (value) => typeof value === "function" && value[BATCH_HOOK_MARKER] === true;
 var isDecoratedCheckCtor = (value) => typeof value === "function" && value[CHECK_HOOK_MARKER] === true;
-var findDecoratedHookCtor = (moduleRecord) => {
-  const decorated = Array.from(new Set(Object.values(moduleRecord))).filter(isDecoratedHookCtor);
+var findDecoratedBuildHookCtor = (moduleRecord) => {
+  const decorated = Array.from(new Set(Object.values(moduleRecord))).filter(
+    isDecoratedBuildHookCtor
+  );
   if (decorated.length > 1) {
     logger.error("build script must decorate exactly one exported class with @behavior3.build");
     return void 0;
   }
   return decorated[0];
 };
+var findDecoratedBatchHookCtor = (moduleRecord) => {
+  const decorated = Array.from(new Set(Object.values(moduleRecord))).filter(
+    isDecoratedBatchHookCtor
+  );
+  if (decorated.length > 1) {
+    logger.error("batch script must decorate exactly one exported class with @behavior3.batch");
+    return void 0;
+  }
+  if (decorated.length === 1) {
+    return decorated[0];
+  }
+  const legacyDecorated = Array.from(new Set(Object.values(moduleRecord))).filter(
+    isDecoratedBuildHookCtor
+  );
+  if (legacyDecorated.length > 1) {
+    logger.error("batch script must decorate exactly one exported class with @behavior3.batch");
+    return void 0;
+  }
+  return legacyDecorated[0];
+};
 var findDecoratedCheckCtors = (moduleRecord) => Array.from(new Set(Object.values(moduleRecord))).filter(isDecoratedCheckCtor);
-var createBatchHooks = (moduleExports, env, reportMissing = true) => {
+var createBuildHooks = (moduleExports, env, reportMissing = true) => {
   if (!moduleExports || typeof moduleExports !== "object") {
     return void 0;
   }
   const moduleRecord = moduleExports;
-  const defaultExport = isDecoratedCheckCtor(moduleRecord.default) ? void 0 : moduleRecord.default;
-  const ctor = moduleRecord.Hook ?? findDecoratedHookCtor(moduleRecord) ?? defaultExport;
+  const defaultExport = isDecoratedCheckCtor(moduleRecord.default) || isDecoratedBatchHookCtor(moduleRecord.default) ? void 0 : moduleRecord.default;
+  const ctor = moduleRecord.BuildHook ?? moduleRecord.Hook ?? findDecoratedBuildHookCtor(moduleRecord) ?? defaultExport;
   if (typeof ctor === "function") {
     try {
       const instance = new ctor(env);
-      if (hasBatchHookMethod(instance)) {
+      if (hasBuildHookMethod(instance)) {
         return instance;
       }
       logger.error("build hook class instance has no supported hook methods");
@@ -213413,7 +213447,32 @@ var createBatchHooks = (moduleExports, env, reportMissing = true) => {
   }
   if (reportMissing) {
     logger.error(
-      "build script must export a Hook class, default class, or one @behavior3.build-decorated class"
+      "build script must export a BuildHook class, Hook class, default class, or one @behavior3.build-decorated class"
+    );
+  }
+  return void 0;
+};
+var createBatchHooks = (moduleExports, env, reportMissing = true) => {
+  if (!moduleExports || typeof moduleExports !== "object") {
+    return void 0;
+  }
+  const moduleRecord = moduleExports;
+  const defaultExport = isDecoratedCheckCtor(moduleRecord.default) || isDecoratedBuildHookCtor(moduleRecord.default) || isDecoratedBatchHookCtor(moduleRecord.default) ? void 0 : moduleRecord.default;
+  const ctor = moduleRecord.BatchHook ?? findDecoratedBatchHookCtor(moduleRecord) ?? moduleRecord.Hook ?? defaultExport;
+  if (typeof ctor === "function") {
+    try {
+      const instance = new ctor(env);
+      if (hasBuildHookMethod(instance) || typeof instance.shouldUpgradeTree === "function") {
+        return instance;
+      }
+      logger.error("batch hook class instance has no supported hook methods");
+    } catch (error) {
+      logger.error("failed to instantiate batch hook class", error);
+    }
+  }
+  if (reportMissing) {
+    logger.error(
+      "batch script must export a BatchHook class, default class, or one @behavior3.batch-decorated class"
     );
   }
   return void 0;
@@ -213462,13 +213521,13 @@ var createBuildScriptRuntime = (moduleExports, env) => {
     };
   }
   const moduleRecord = moduleExports;
-  const hasBuildHookCandidate = typeof moduleRecord.Hook === "function" || Object.values(moduleRecord).some(isDecoratedHookCtor) || typeof moduleRecord.default === "function" && !isDecoratedCheckCtor(moduleRecord.default);
-  const buildScript = createBatchHooks(moduleExports, env, false);
+  const hasBuildHookCandidate = typeof moduleRecord.BuildHook === "function" || typeof moduleRecord.Hook === "function" || Object.values(moduleRecord).some(isDecoratedBuildHookCtor) || typeof moduleRecord.default === "function" && !isDecoratedCheckCtor(moduleRecord.default) && !isDecoratedBatchHookCtor(moduleRecord.default);
+  const buildScript = createBuildHooks(moduleExports, env, false);
   const checkerResult = createNodeArgCheckers(moduleExports, env);
   const hasEntries = Boolean(buildScript) || checkerResult.hasCheckers;
   if (!hasEntries) {
     logger.error(
-      "build script must export a Hook class, default build class, @behavior3.build class, or @behavior3.check class"
+      "build script must export a BuildHook class, Hook class, default build class, @behavior3.build class, or @behavior3.check class"
     );
   }
   return {
@@ -213889,6 +213948,7 @@ var applyBehavior3DecoratorGlobal = () => {
   runtimeGlobal.behavior3 = {
     ...decoratorGlobalState.previousBehavior3 && typeof decoratorGlobalState.previousBehavior3 === "object" ? decoratorGlobalState.previousBehavior3 : {},
     build: markBuildHook,
+    batch: markBatchHook,
     check: markCheckHook
   };
 };
@@ -213909,7 +213969,7 @@ var restoreBehavior3DecoratorGlobal = () => {
   decoratorGlobalState.hadBehavior3 = false;
   decoratorGlobalState.previousBehavior3 = void 0;
 };
-var withBehavior3BuildDecoratorGlobal = async (loader) => {
+var withBehavior3ScriptDecoratorGlobal = async (loader) => {
   applyBehavior3DecoratorGlobal();
   try {
     return await loader();
@@ -214048,7 +214108,7 @@ var loadRuntimeModule = async (modulePath, options) => {
       }
     }
     if (getRuntimeProcess()?.type === "renderer") {
-      return await withBehavior3BuildDecoratorGlobal(
+      return await withBehavior3ScriptDecoratorGlobal(
         () => import(
           /* @vite-ignore */
           `${modulePath}?t=${Date.now()}`
@@ -214076,7 +214136,7 @@ var loadRuntimeModule = async (modulePath, options) => {
       return null;
     }
     const normalizedModulePath = b3path_default.posixPath(tempModulePath);
-    const result = await withBehavior3BuildDecoratorGlobal(
+    const result = await withBehavior3ScriptDecoratorGlobal(
       () => import(
         /* @vite-ignore */
         `file:///${normalizedModulePath}?t=${Date.now()}`
@@ -217178,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;
@@ -217292,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 = {
@@ -217375,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) {
@@ -217415,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;
 };