vscode-behavior3 2.1.2 → 2.1.3

package/README.md

@@ -161,6 +161,7 @@ runtime, so no value import is required. The extension constructs the class once
 with `env`, then calls methods:
 
 - `constructor(env)`
+- `shouldUpgradeTree(path, tree)`
 - `onProcessTree(tree, path, errors)`
 - `onProcessNode(node, errors)`
 - `onWriteFile(path, tree)`

package/dist/build-cli.js

@@ -215619,7 +215619,7 @@ var hasBatchHookMethod = (obj) => {
     return false;
   }
   const candidate = obj;
-  return typeof candidate.onProcessTree === "function" || typeof candidate.onProcessNode === "function" || typeof candidate.onWriteFile === "function" || typeof candidate.onComplete === "function";
+  return typeof candidate.shouldUpgradeTree === "function" || typeof candidate.onProcessTree === "function" || typeof candidate.onProcessNode === "function" || typeof candidate.onWriteFile === "function" || typeof candidate.onComplete === "function";
 };
 var BUILD_HOOK_MARKER = "__behavior3BuildHook";
 var CHECK_HOOK_MARKER = "__behavior3CheckHook";
@@ -216501,11 +216501,8 @@ var batchProcessProjectWithContext = async (project, scriptPath, context) => {
   let skippedFiles = 0;
   let failedFiles = 0;
   let writtenFiles = 0;
-  const settings = readWorkspaceSettings(project);
-  const checkScriptSetting = settings.checkScripts ?? [];
   const allErrors = [];
   const stagedWrites = [];
-  context.setCheckExpr(context.checkExprOverride ?? settings.checkExpr ?? true);
   let buildScriptModule;
   try {
     buildScriptModule = await loadRuntimeModule(scriptPath, {
@@ -216514,23 +216511,6 @@ var batchProcessProjectWithContext = async (project, scriptPath, context) => {
   } catch {
     logger.error(`'${scriptPath}' is not a valid batch script`);
   }
-  const checkScriptModules = [];
-  const checkScriptPaths = resolveCheckScriptPaths(context.workdir, checkScriptSetting);
-  for (const pattern of checkScriptPaths.missingPatterns) {
-    logger.error(`checkScripts pattern matched no files: ${pattern}`);
-    hasError = true;
-  }
-  for (const checkScriptPath of checkScriptPaths.paths) {
-    const moduleExports = await loadRuntimeModule(checkScriptPath, {
-      debug: context.buildScriptDebug
-    });
-    if (!moduleExports) {
-      logger.error(`'${checkScriptPath}' is not a valid check script`);
-      hasError = true;
-      continue;
-    }
-    checkScriptModules.push({ path: checkScriptPath, moduleExports });
-  }
   const scriptEnv = {
     fs: getFs(),
     path: b3path_default,
@@ -216538,28 +216518,25 @@ var batchProcessProjectWithContext = async (project, scriptPath, context) => {
     nodeDefs: context.nodeDefs,
     logger
   };
-  const buildRuntime = createBuildScriptRuntimeWithCheckModules(
-    buildScriptModule,
-    checkScriptModules,
-    scriptEnv
-  );
-  if (!buildScriptModule || buildRuntime.hasError || !buildRuntime.buildScript) {
+  const buildScript = createBatchHooks(buildScriptModule, scriptEnv);
+  if (!buildScriptModule || !buildScript) {
     hasError = true;
   }
   try {
-    if (!hasError || buildRuntime.buildScript) {
+    if (!hasError || buildScript) {
       for (const candidatePath of b3path_default.lsdir(b3path_default.dirname(project), true)) {
         if (!isBehaviorTreeJsonPath(candidatePath)) {
           continue;
         }
         totalFiles += 1;
         const treeName = b3path_default.basenameWithoutExt(candidatePath);
+        const originalDiskContent = getFs().readFileSync(candidatePath, "utf-8");
         const originalTree = readTreeFromFile(candidatePath);
         const originalContent = writeTree(originalTree, treeName);
         const errors = [];
         let tree = originalTree;
         try {
-          tree = processBatchTree(tree, candidatePath, buildRuntime.buildScript, errors);
+          tree = processBatchTree(tree, candidatePath, buildScript, errors);
         } catch (error) {
           errors.push(`batch script failed: ${formatRuntimeError(error)}`);
         }
@@ -216568,34 +216545,6 @@ var batchProcessProjectWithContext = async (project, scriptPath, context) => {
           skippedFiles += 1;
           continue;
         }
-        const declare = {
-          import: tree.variables.imports.map((importPath) => ({
-            path: importPath,
-            vars: [],
-            depends: []
-          })),
-          vars: tree.variables.locals.map((variable) => ({
-            name: variable.name,
-            desc: variable.desc
-          })),
-          subtree: []
-        };
-        context.refreshVarDecl(tree.root, tree.group, declare);
-        if (!context.checkNodeData(tree.root, (message) => errors.push(message))) {
-          hasError = true;
-        }
-        const checkDiagnostics = collectNodeArgCheckDiagnostics({
-          tree,
-          treePath: candidatePath,
-          env: scriptEnv,
-          checkers: buildRuntime.nodeArgCheckers
-        });
-        if (checkDiagnostics.length) {
-          hasError = true;
-          checkDiagnostics.forEach(
-            (diagnostic) => errors.push(formatNodeArgCheckBuildDiagnostic(diagnostic))
-          );
-        }
         if (errors.length) {
           hasError = true;
           failedFiles += 1;
@@ -216604,7 +216553,9 @@ var batchProcessProjectWithContext = async (project, scriptPath, context) => {
           continue;
         }
         const nextContent = writeTree(tree, treeName);
-        if (nextContent === originalContent) {
+        const changedByScript = nextContent !== originalContent;
+        const changedByInputUpgrade = buildScript?.shouldUpgradeTree?.(candidatePath, tree) === true && nextContent !== originalDiskContent;
+        if (!changedByScript && !changedByInputUpgrade) {
           unchangedFiles += 1;
           continue;
         }
@@ -216618,7 +216569,7 @@ var batchProcessProjectWithContext = async (project, scriptPath, context) => {
     if (!hasError) {
       for (const staged of stagedWrites) {
         try {
-          buildRuntime.buildScript?.onWriteFile?.(staged.path, staged.tree);
+          buildScript?.onWriteFile?.(staged.path, staged.tree);
         } catch (error) {
           hasError = true;
           failedFiles += 1;
@@ -216638,7 +216589,7 @@ var batchProcessProjectWithContext = async (project, scriptPath, context) => {
   } finally {
     allErrors.forEach((message) => logger.error(message));
     try {
-      buildRuntime.buildScript?.onComplete?.(hasError ? "failure" : "success");
+      buildScript?.onComplete?.(hasError ? "failure" : "success");
     } catch (error) {
       logger.error("batch script onComplete failed", error);
     }

package/dist/extension.js

@@ -218736,7 +218736,7 @@ var hasBatchHookMethod = (obj) => {
     return false;
   }
   const candidate = obj;
-  return typeof candidate.onProcessTree === "function" || typeof candidate.onProcessNode === "function" || typeof candidate.onWriteFile === "function" || typeof candidate.onComplete === "function";
+  return typeof candidate.shouldUpgradeTree === "function" || typeof candidate.onProcessTree === "function" || typeof candidate.onProcessNode === "function" || typeof candidate.onWriteFile === "function" || typeof candidate.onComplete === "function";
 };
 var BUILD_HOOK_MARKER = "__behavior3BuildHook";
 var CHECK_HOOK_MARKER = "__behavior3CheckHook";
@@ -219618,11 +219618,8 @@ var batchProcessProjectWithContext = async (project, scriptPath, context) => {
   let skippedFiles = 0;
   let failedFiles = 0;
   let writtenFiles = 0;
-  const settings = readWorkspaceSettings(project);
-  const checkScriptSetting = settings.checkScripts ?? [];
   const allErrors = [];
   const stagedWrites = [];
-  context.setCheckExpr(context.checkExprOverride ?? settings.checkExpr ?? true);
   let buildScriptModule;
   try {
     buildScriptModule = await loadRuntimeModule(scriptPath, {
@@ -219631,23 +219628,6 @@ var batchProcessProjectWithContext = async (project, scriptPath, context) => {
   } catch {
     logger.error(`'${scriptPath}' is not a valid batch script`);
   }
-  const checkScriptModules = [];
-  const checkScriptPaths = resolveCheckScriptPaths(context.workdir, checkScriptSetting);
-  for (const pattern of checkScriptPaths.missingPatterns) {
-    logger.error(`checkScripts pattern matched no files: ${pattern}`);
-    hasError = true;
-  }
-  for (const checkScriptPath of checkScriptPaths.paths) {
-    const moduleExports = await loadRuntimeModule(checkScriptPath, {
-      debug: context.buildScriptDebug
-    });
-    if (!moduleExports) {
-      logger.error(`'${checkScriptPath}' is not a valid check script`);
-      hasError = true;
-      continue;
-    }
-    checkScriptModules.push({ path: checkScriptPath, moduleExports });
-  }
   const scriptEnv = {
     fs: getFs(),
     path: b3path_default,
@@ -219655,28 +219635,25 @@ var batchProcessProjectWithContext = async (project, scriptPath, context) => {
     nodeDefs: context.nodeDefs,
     logger
   };
-  const buildRuntime = createBuildScriptRuntimeWithCheckModules(
-    buildScriptModule,
-    checkScriptModules,
-    scriptEnv
-  );
-  if (!buildScriptModule || buildRuntime.hasError || !buildRuntime.buildScript) {
+  const buildScript = createBatchHooks(buildScriptModule, scriptEnv);
+  if (!buildScriptModule || !buildScript) {
     hasError = true;
   }
   try {
-    if (!hasError || buildRuntime.buildScript) {
+    if (!hasError || buildScript) {
       for (const candidatePath of b3path_default.lsdir(b3path_default.dirname(project), true)) {
         if (!isBehaviorTreeJsonPath(candidatePath)) {
           continue;
         }
         totalFiles += 1;
         const treeName = b3path_default.basenameWithoutExt(candidatePath);
+        const originalDiskContent = getFs().readFileSync(candidatePath, "utf-8");
         const originalTree = readTreeFromFile(candidatePath);
         const originalContent = writeTree(originalTree, treeName);
         const errors = [];
         let tree = originalTree;
         try {
-          tree = processBatchTree(tree, candidatePath, buildRuntime.buildScript, errors);
+          tree = processBatchTree(tree, candidatePath, buildScript, errors);
         } catch (error) {
           errors.push(`batch script failed: ${formatRuntimeError(error)}`);
         }
@@ -219685,34 +219662,6 @@ var batchProcessProjectWithContext = async (project, scriptPath, context) => {
           skippedFiles += 1;
           continue;
         }
-        const declare = {
-          import: tree.variables.imports.map((importPath) => ({
-            path: importPath,
-            vars: [],
-            depends: []
-          })),
-          vars: tree.variables.locals.map((variable) => ({
-            name: variable.name,
-            desc: variable.desc
-          })),
-          subtree: []
-        };
-        context.refreshVarDecl(tree.root, tree.group, declare);
-        if (!context.checkNodeData(tree.root, (message) => errors.push(message))) {
-          hasError = true;
-        }
-        const checkDiagnostics = collectNodeArgCheckDiagnostics({
-          tree,
-          treePath: candidatePath,
-          env: scriptEnv,
-          checkers: buildRuntime.nodeArgCheckers
-        });
-        if (checkDiagnostics.length) {
-          hasError = true;
-          checkDiagnostics.forEach(
-            (diagnostic) => errors.push(formatNodeArgCheckBuildDiagnostic(diagnostic))
-          );
-        }
         if (errors.length) {
           hasError = true;
           failedFiles += 1;
@@ -219721,7 +219670,9 @@ var batchProcessProjectWithContext = async (project, scriptPath, context) => {
           continue;
         }
         const nextContent = writeTree(tree, treeName);
-        if (nextContent === originalContent) {
+        const changedByScript = nextContent !== originalContent;
+        const changedByInputUpgrade = buildScript?.shouldUpgradeTree?.(candidatePath, tree) === true && nextContent !== originalDiskContent;
+        if (!changedByScript && !changedByInputUpgrade) {
           unchangedFiles += 1;
           continue;
         }
@@ -219735,7 +219686,7 @@ var batchProcessProjectWithContext = async (project, scriptPath, context) => {
     if (!hasError) {
       for (const staged of stagedWrites) {
         try {
-          buildRuntime.buildScript?.onWriteFile?.(staged.path, staged.tree);
+          buildScript?.onWriteFile?.(staged.path, staged.tree);
         } catch (error) {
           hasError = true;
           failedFiles += 1;
@@ -219755,7 +219706,7 @@ var batchProcessProjectWithContext = async (project, scriptPath, context) => {
   } finally {
     allErrors.forEach((message) => logger.error(message));
     try {
-      buildRuntime.buildScript?.onComplete?.(hasError ? "failure" : "success");
+      buildScript?.onComplete?.(hasError ? "failure" : "success");
     } catch (error) {
       logger.error("batch script onComplete failed", error);
     }

package/dist/webview/icons/icon.svg

@@ -1 +1 @@
-<svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 256 256" height="200px" width="200px" xmlns="http://www.w3.org/2000/svg"><path d="M160,116h48a20,20,0,0,0,20-20V48a20,20,0,0,0-20-20H160a20,20,0,0,0-20,20V60H128a28,28,0,0,0-28,28v28H76v-4A20,20,0,0,0,56,92H24A20,20,0,0,0,4,112v32a20,20,0,0,0,20,20H56a20,20,0,0,0,20-20v-4h24v28a28,28,0,0,0,28,28h12v12a20,20,0,0,0,20,20h48a20,20,0,0,0,20-20V160a20,20,0,0,0-20-20H160a20,20,0,0,0-20,20v12H128a4,4,0,0,1-4-4V88a4,4,0,0,1,4-4h12V96A20,20,0,0,0,160,116ZM52,140H28V116H52Zm112,24h40v40H164Zm0-112h40V92H164Z"></path></svg>
+<svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 256 256" height="200px" width="200px" xmlns="http://www.w3.org/2000/svg"><path d="M160,112h48a16,16,0,0,0,16-16V48a16,16,0,0,0-16-16H160a16,16,0,0,0-16,16V64H128a24,24,0,0,0-24,24v32H72v-8A16,16,0,0,0,56,96H24A16,16,0,0,0,8,112v32a16,16,0,0,0,16,16H56a16,16,0,0,0,16-16v-8h32v32a24,24,0,0,0,24,24h16v16a16,16,0,0,0,16,16h48a16,16,0,0,0,16-16V160a16,16,0,0,0-16-16H160a16,16,0,0,0-16,16v16H128a8,8,0,0,1-8-8V88a8,8,0,0,1,8-8h16V96A16,16,0,0,0,160,112ZM56,144H24V112H56v32Zm104,16h48v48H160Zm0-112h48V96H160Z"></path></svg>

package/media/icons/icon.svg

@@ -1 +1 @@
-<svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 256 256" height="200px" width="200px" xmlns="http://www.w3.org/2000/svg"><path d="M160,116h48a20,20,0,0,0,20-20V48a20,20,0,0,0-20-20H160a20,20,0,0,0-20,20V60H128a28,28,0,0,0-28,28v28H76v-4A20,20,0,0,0,56,92H24A20,20,0,0,0,4,112v32a20,20,0,0,0,20,20H56a20,20,0,0,0,20-20v-4h24v28a28,28,0,0,0,28,28h12v12a20,20,0,0,0,20,20h48a20,20,0,0,0,20-20V160a20,20,0,0,0-20-20H160a20,20,0,0,0-20,20v12H128a4,4,0,0,1-4-4V88a4,4,0,0,1,4-4h12V96A20,20,0,0,0,160,116ZM52,140H28V116H52Zm112,24h40v40H164Zm0-112h40V92H164Z"></path></svg>
+<svg stroke="currentColor" fill="currentColor" stroke-width="0" viewBox="0 0 256 256" height="200px" width="200px" xmlns="http://www.w3.org/2000/svg"><path d="M160,112h48a16,16,0,0,0,16-16V48a16,16,0,0,0-16-16H160a16,16,0,0,0-16,16V64H128a24,24,0,0,0-24,24v32H72v-8A16,16,0,0,0,56,96H24A16,16,0,0,0,8,112v32a16,16,0,0,0,16,16H56a16,16,0,0,0,16-16v-8h32v32a24,24,0,0,0,24,24h16v16a16,16,0,0,0,16,16h48a16,16,0,0,0,16-16V160a16,16,0,0,0-16-16H160a16,16,0,0,0-16,16v16H128a8,8,0,0,1-8-8V88a8,8,0,0,1,8-8h16V96A16,16,0,0,0,160,112ZM56,144H24V112H56v32Zm104,16h48v48H160Zm0-112h48V96H160Z"></path></svg>

package/package.json

@@ -2,7 +2,7 @@
   "name": "vscode-behavior3",
   "displayName": "%extension.displayName%",
   "description": "%extension.description%",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "publisher": "codetypess",
   "repository": {
     "type": "git",

package/webview/shared/b3build-model.d.ts

@@ -62,6 +62,7 @@ export interface NodeArgChecker {
 }
 
 export type BuildScript = {
+    shouldUpgradeTree?: (path: string, tree: TreeData) => boolean;
     onProcessTree?: (tree: TreeData, path: string, errors: string[]) => TreeData | null;
     onProcessNode?: (node: NodeData, errors: string[]) => NodeData | null;
     onWriteFile?: (path: string, tree: TreeData) => void;
@@ -91,6 +92,7 @@ export type BuildRuntime = {
 
 export declare class Hook implements BuildScript {
     constructor(env: BuildEnv);
+    shouldUpgradeTree?(path: string, tree: TreeData): boolean;
     onProcessTree?(tree: TreeData, path: string, errors: string[]): TreeData | null;
     onProcessNode?(node: NodeData, errors: string[]): NodeData | null;
     onWriteFile?(path: string, tree: TreeData): void;