Merge remote-tracking branch 'origin/main' into fork-datatable-schema-export

cli/src/commands/script/script.ts

@@ -832,6 +832,8 @@ export function filePathExtensionFromContentType(
     return ".java";
   } else if (language === "ruby") {
     return ".rb";
+  } else if (language === "rlang") {
+    return ".r";
     // for related places search: ADD_NEW_LANG
   } else {
     throw new Error("Invalid language: " + language);
@@ -863,6 +865,7 @@ export const exts = [
   ".playbook.yml",
   ".java",
   ".rb",
+  ".r",
   // for related places search: ADD_NEW_LANG
 ];
 

cli/src/commands/sync/sync.ts

@@ -1306,6 +1306,7 @@ export async function elementsToMap(
           "nu",
           "java",
           "rb",
+          "r",
           // for related places search: ADD_NEW_LANG
         ].includes(path.split(".").pop() ?? "")
       ) {

cli/src/main.ts

@@ -78,7 +78,7 @@ export {
   token,
 };
 
-export const VERSION = "1.670.0";
+export const VERSION = "1.671.0";
 
 // Re-exported from constants.ts to maintain backwards compatibility
 export { WM_FORK_PREFIX } from "./core/constants.ts";

cli/src/types.ts

@@ -300,6 +300,7 @@ export function getTypeStrFromPath(
     parsed.ext == ".nu" ||
     parsed.ext == ".java" ||
     parsed.ext == ".rb" ||
+    parsed.ext == ".r" ||
     // for related places search: ADD_NEW_LANG
     (parsed.ext == ".yml" && parsed.name.split(".").pop() == "playbook")
   ) {

cli/src/utils/metadata.ts

@@ -868,6 +868,9 @@ export async function inferSchema(
   } else if (language === "ruby") {
     const { parse_ruby } = await loadParser("windmill-parser-wasm-ruby");
     inferedSchema = JSON.parse(parse_ruby(content));
+  } else if (language === "rlang") {
+    const { parse_r } = await loadParser("windmill-parser-wasm-r");
+    inferedSchema = JSON.parse(parse_r(content));
     // for related places search: ADD_NEW_LANG
   } else {
     throw new Error("Invalid language: " + language);

cli/src/utils/script_common.ts

@@ -20,6 +20,7 @@ export type ScriptLanguage =
   | "nu"
   | "ansible"
   | "ruby"
+  | "rlang"
   | "java";
 // for related places search: ADD_NEW_LANG
 
@@ -105,6 +106,8 @@ export function inferContentTypeFromFilePath(
     return "java";
   } else if (contentPath.endsWith(".rb")) {
     return "ruby";
+  } else if (contentPath.endsWith(".r")) {
+    return "rlang";
 	// for related places search: ADD_NEW_LANG
   } else {
     throw new Error(