fix: wmill app generate-locks (#7288)

* all

* fix(cli): wmill app generate-locks

* handle raw reqs

* handle raw reqs

* rework paths

Author: rubenfiszel

cli/src/commands/app/app_metadata.ts

@@ -52,23 +52,31 @@ export function repopulateFields(runnables: Record<string, any>) {
     }
   });
 }
-export function replaceInlineScripts(rec: any, localPath: string) {
+export function replaceInlineScripts(
+  rec: any,
+  localPath: string,
+  addType: boolean
+) {
   if (!rec) {
     return;
   }
   if (typeof rec == "object") {
     return Object.entries(rec).flatMap(([k, v]) => {
       if (k == "runType") {
-        if (isVersionsGeq1585()) {
-          rec["type"] = "path";
-        } else {
-          rec["type"] = "runnableByPath";
+        if (addType) {
+          if (isVersionsGeq1585()) {
+            rec["type"] = "path";
+          } else {
+            rec["type"] = "runnableByPath";
+          }
         }
       } else if (k == "inlineScript" && typeof v == "object") {
-        if (isVersionsGeq1585()) {
-          rec["type"] = "inline";
-        } else {
-          rec["type"] = "runnableByName";
+        if (addType) {
+          if (isVersionsGeq1585()) {
+            rec["type"] = "inline";
+          } else {
+            rec["type"] = "runnableByName";
+          }
         }
         const o: Record<string, any> = v as any;
 
@@ -81,7 +89,7 @@ export function replaceInlineScripts(rec: any, localPath: string) {
           o["lock"] = readInlinePathSync(basePath);
         }
       } else {
-        replaceInlineScripts(v, localPath);
+        replaceInlineScripts(v, localPath, addType);
       }
     });
   }
@@ -125,7 +133,7 @@ export async function pushApp(
   const path = localPath + "app.yaml";
   const localApp = (await yamlParseFile(path)) as AppFile;
 
-  replaceInlineScripts(localApp.value, localPath);
+  replaceInlineScripts(localApp.value, localPath, true);
   await generatingPolicy(
     localApp,
     remotePath,
@@ -234,7 +242,7 @@ const command = new Command()
     "Default TypeScript runtime (bun or deno)"
   )
   .action(async (opts: any, appFolder: string | undefined) => {
-    const { generateLocksCommand } = await import("./raw_apps.ts");
+    const { generateLocksCommand } = await import("./app_metadata.ts");
     await generateLocksCommand(opts, appFolder);
   });
 

cli/src/commands/app/apps.ts

@@ -7,6 +7,7 @@ import {
   open,
   windmillUtils,
   yamlParseFile,
+  SEP,
 } from "../../../deps.ts";
 import { GlobalOptions } from "../../types.ts";
 import * as http from "node:http";
@@ -16,15 +17,23 @@ import process from "node:process";
 import { Buffer } from "node:buffer";
 import { writeFileSync } from "node:fs";
 import { WebSocketServer, WebSocket } from "npm:ws";
-import { getDevBuildOptions, ensureNodeModules, createFrameworkPlugins, detectFrameworks } from "./bundle.ts";
+import {
+  getDevBuildOptions,
+  ensureNodeModules,
+  createFrameworkPlugins,
+  detectFrameworks,
+} from "./bundle.ts";
 import { wmillTsDev as wmillTs } from "./wmillTsDev.ts";
 import * as wmill from "../../../gen/services.gen.ts";
 import { resolveWorkspace } from "../../core/context.ts";
 import { requireLogin } from "../../core/auth.ts";
 import { GLOBAL_CONFIG_OPT } from "../../core/conf.ts";
 import { replaceInlineScripts } from "./apps.ts";
 import { Runnable } from "./metadata.ts";
-import { inferRunnableSchemaFromFile } from "./app_metadata.ts";
+import {
+  APP_BACKEND_FOLDER,
+  inferRunnableSchemaFromFile,
+} from "./app_metadata.ts";
 
 const DEFAULT_PORT = 4000;
 const DEFAULT_HOST = "localhost";
@@ -92,8 +101,8 @@ async function dev(opts: DevOptions) {
     log.error(
       colors.red(
         `Error: The dev command must be run inside a .raw_app folder.\n` +
-        `Current directory: ${currentDirName}\n` +
-        `Please navigate to a folder ending with '.raw_app' before running this command.`
+          `Current directory: ${currentDirName}\n` +
+          `Please navigate to a folder ending with '.raw_app' before running this command.`
       )
     );
     Deno.exit(1);
@@ -105,7 +114,7 @@ async function dev(opts: DevOptions) {
     log.error(
       colors.red(
         `Error: raw_app.yaml not found in current directory.\n` +
-        `The dev command must be run in a .raw_app folder containing a raw_app.yaml file.`
+          `The dev command must be run in a .raw_app folder containing a raw_app.yaml file.`
       )
     );
     Deno.exit(1);
@@ -133,7 +142,8 @@ async function dev(opts: DevOptions) {
 
   // Detect frameworks to determine default entry point
   const frameworks = detectFrameworks(process.cwd());
-  const defaultEntry = (frameworks.svelte || frameworks.vue) ? "index.ts" : "index.tsx";
+  const defaultEntry =
+    frameworks.svelte || frameworks.vue ? "index.ts" : "index.tsx";
   const entryPoint = opts.entry ?? defaultEntry;
 
   // Verify entry point exists
@@ -206,7 +216,6 @@ async function dev(opts: DevOptions) {
     },
   };
 
-  
   // Create esbuild context
   const ctx = await esbuild.context({
     ...buildOptions,
@@ -242,7 +251,7 @@ async function dev(opts: DevOptions) {
   await ctx.rebuild();
 
   // Watch runnables folder for changes
-  const runnablesPath = path.join(process.cwd(), "runnables");
+  const runnablesPath = path.join(process.cwd(), APP_BACKEND_FOLDER);
   let runnablesWatcher: Deno.FsWatcher | undefined;
 
   if (fs.existsSync(runnablesPath)) {
@@ -262,7 +271,10 @@ async function dev(opts: DevOptions) {
           // Process each changed path with individual debouncing
           for (const changedPath of event.paths) {
             const relativePath = path.relative(process.cwd(), changedPath);
-            const relativeToRunnables = path.relative(runnablesPath, changedPath);
+            const relativeToRunnables = path.relative(
+              runnablesPath,
+              changedPath
+            );
 
             // Skip non-modify events for schema inference
             if (event.kind !== "modify" && event.kind !== "create") {
@@ -276,7 +288,9 @@ async function dev(opts: DevOptions) {
 
             // Log the change event
             log.info(
-              colors.cyan(`📝 Runnable changed [${event.kind}]: ${relativePath}`)
+              colors.cyan(
+                `📝 Runnable changed [${event.kind}]: ${relativePath}`
+              )
             );
 
             // Debounce schema inference per file (wait for typing to finish)
@@ -288,7 +302,9 @@ async function dev(opts: DevOptions) {
               delete schemaInferenceTimeouts[changedPath];
 
               try {
-                log.info(colors.cyan(`📝 Inferring schema for: ${relativeToRunnables}`));
+                log.info(
+                  colors.cyan(`📝 Inferring schema for: ${relativeToRunnables}`)
+                );
                 // Infer schema for this runnable (returns schema in memory, doesn't write to file)
                 const result = await inferRunnableSchemaFromFile(
                   process.cwd(),
@@ -299,7 +315,15 @@ async function dev(opts: DevOptions) {
                   // log.info(colors.green(`  Runnable ID: ${result.runnableId}`));
                   // Store inferred schema in memory
                   inferredSchemas[result.runnableId] = result.schema;
-                  log.info(colors.green(`  Inferred Schemas: ${JSON.stringify(inferredSchemas, null, 2)}`));
+                  log.info(
+                    colors.green(
+                      `  Inferred Schemas: ${JSON.stringify(
+                        inferredSchemas,
+                        null,
+                        2
+                      )}`
+                    )
+                  );
                   // Regenerate wmill.d.ts with updated schema from memory
                   await genRunnablesTs(inferredSchemas);
                 }
@@ -468,7 +492,9 @@ async function dev(opts: DevOptions) {
           case "backendAsync": {
             // Run a runnable asynchronously and return job ID immediately
             log.info(
-              colors.blue(`[backendAsync] Running runnable async: ${runnable_id}`)
+              colors.blue(
+                `[backendAsync] Running runnable async: ${runnable_id}`
+              )
             );
             try {
               const runnables = await loadRunnables();
@@ -628,7 +654,10 @@ const command = new Command()
   .option("--host <host:string>", "Host to bind the dev server to", {
     default: DEFAULT_HOST,
   })
-  .option("--entry <entry:string>", "Entry point file (default: index.ts for Svelte/Vue, index.tsx otherwise)")
+  .option(
+    "--entry <entry:string>",
+    "Entry point file (default: index.ts for Svelte/Vue, index.tsx otherwise)"
+  )
   .option("--no-open", "Don't automatically open the browser")
   .action(dev as any);
 
@@ -671,7 +700,11 @@ async function loadRunnables(): Promise<Record<string, Runnable>> {
     const rawApp = (await yamlParseFile(
       path.join(localPath, "raw_app.yaml")
     )) as any;
-    replaceInlineScripts(rawApp.runnables, path.join(localPath, "runnables/"));
+    replaceInlineScripts(
+      rawApp.runnables,
+      path.join(localPath, APP_BACKEND_FOLDER) + SEP,
+      true
+    );
 
     return rawApp?.runnables ?? {};
   } catch (error: any) {
@@ -707,7 +740,10 @@ async function executeRunnable(
     }
   }
 
-  if ((runnable.type === "inline" || runnable.type === "runnableByName") && runnable.inlineScript) {
+  if (
+    (runnable.type === "inline" || runnable.type === "runnableByName") &&
+    runnable.inlineScript
+  ) {
     const inlineScript = runnable.inlineScript;
     if (inlineScript.id !== undefined) {
       requestBody.id = inlineScript.id;
@@ -719,7 +755,10 @@ async function executeRunnable(
       lock: inlineScript.id === undefined ? inlineScript.lock : undefined,
       cache_ttl: inlineScript.cache_ttl,
     };
-  } else if ((runnable.type === "path" || runnable.type === "runnableByPath") && runnable.path) {
+  } else if (
+    (runnable.type === "path" || runnable.type === "runnableByPath") &&
+    runnable.path
+  ) {
     const runType = runnable.runType ?? "script";
     requestBody.path =
       runType !== "hubscript"