windmill-cli 1.716.0 → 1.717.1

package/esm/main.js

@@ -16772,7 +16772,7 @@ var init_OpenAPI = __esm(() => {
     PASSWORD: undefined,
     TOKEN: getEnv3("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: "1.716.0",
+    VERSION: "1.717.1",
     WITH_CREDENTIALS: true,
     interceptors: {
       request: new Interceptors,
@@ -25289,7 +25289,7 @@ var init_auth = __esm(async () => {
 });
 
 // src/core/constants.ts
-var WM_FORK_PREFIX = "wm-fork", VERSION = "1.716.0";
+var WM_FORK_PREFIX = "wm-fork", VERSION = "1.717.1";
 
 // src/utils/git.ts
 var exports_git = {};
@@ -26943,13 +26943,6 @@ function isFolderResourcePathAnyFormat(p) {
   }
   return false;
 }
-function isRawAppBackendPath(filePath) {
-  const suffixes = getFolderSuffixes();
-  const normalizedPath = filePath.replaceAll(SEP2, "/");
-  const escapedSuffix = suffixes.raw_app.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-  const pattern = new RegExp(`${escapedSuffix}/backend/`);
-  return pattern.test(normalizedPath);
-}
 function isAppInlineScriptPath(filePath) {
   const suffixes = getFolderSuffixes();
   const normalizedPath = filePath.replaceAll(SEP2, "/");
@@ -63694,9 +63687,6 @@ import { sep as SEP6 } from "node:path";
 import * as path7 from "node:path";
 import fs8 from "node:fs";
 import { execSync as execSync4 } from "node:child_process";
-function isRawAppBackendPath2(filePath) {
-  return isRawAppBackendPath(filePath);
-}
 function isAppInlineScriptPath2(filePath) {
   return isAppInlineScriptPath(filePath);
 }
@@ -63779,7 +63769,7 @@ async function handleScriptMetadata(path8, workspace, alreadySynced, message, ra
 }
 async function handleFile(path8, workspace, alreadySynced, message, opts, rawWorkspaceDependencies, codebases, permissionedAsContext) {
   const moduleEntryPoint = isModuleEntryPoint(path8);
-  if (!isAppInlineScriptPath2(path8) && !isFlowInlineScriptPath2(path8) && !isRawAppBackendPath2(path8) && (!isScriptModulePath(path8) || moduleEntryPoint) && exts.some((exts2) => path8.endsWith(exts2))) {
+  if (!isAppInlineScriptPath2(path8) && !isFlowInlineScriptPath2(path8) && !isRawAppPath(path8) && (!isScriptModulePath(path8) || moduleEntryPoint) && exts.some((exts2) => path8.endsWith(exts2))) {
     if (alreadySynced.includes(path8)) {
       return true;
     }
@@ -68144,7 +68134,7 @@ Run 'wmill folder add-missing' to create them locally, then push again.`;
                 await pushFilesetParentResource(change.path, workspace.workspaceId, alreadySynced, cachedWsNameForPush, specificItems);
                 continue;
               }
-              if (change.path.endsWith(".script.json") || change.path.endsWith(".script.yaml") || change.path.endsWith(".lock") || isFileResource(change.path)) {
+              if (!isRawAppFile(change.path) && (change.path.endsWith(".script.json") || change.path.endsWith(".script.yaml") || change.path.endsWith(".lock") || isFileResource(change.path))) {
                 continue;
               } else if (await handleFile(change.path, workspace, alreadySynced, opts.message, opts, rawWorkspaceDependencies, codebases, permissionedAsContext)) {
                 continue;
@@ -86135,8 +86125,8 @@ import path21 from "node:path";
 import process22 from "node:process";
 function buildManagedTsconfig() {
   const paths = {};
-  for (const [alias, dir] of Object.entries(WORKSPACE_IMPORT_ALIASES)) {
-    paths[`${alias}/*`] = [`./${dir}/*`];
+  for (const dir of WORKSPACE_IMPORT_DIRS) {
+    paths[`/${dir}/*`] = [`./${dir}/*`];
   }
   return {
     compilerOptions: {
@@ -86210,7 +86200,7 @@ async function refreshManagedTsconfig(defaultTs, mode) {
       const co = parsed.compilerOptions;
       const paths = co && typeof co === "object" && !Array.isArray(co) ? co.paths : undefined;
       if (paths && typeof paths === "object" && !Array.isArray(paths) && Object.keys(paths).length > 0) {
-        return "defines its own `compilerOptions.paths` (TS won't merge ours in via " + '`extends`); add "$f/*": ["./f/*"] and "$u/*": ["./u/*"] to it';
+        return "defines its own `compilerOptions.paths` (TS won't merge ours in via " + '`extends`); add "/f/*": ["./f/*"] and "/u/*": ["./u/*"] to it';
       }
       const ext2 = parsed.extends;
       const managed2 = `./${MANAGED_TSCONFIG}`;
@@ -86231,8 +86221,8 @@ async function refreshManagedTsconfig(defaultTs, mode) {
 }
 async function refreshManagedDenoImportMap(mode) {
   const imports = {};
-  for (const [alias, dir] of Object.entries(WORKSPACE_IMPORT_ALIASES)) {
-    imports[`${alias}/`] = `./${dir}/`;
+  for (const dir of WORKSPACE_IMPORT_DIRS) {
+    imports[`/${dir}/`] = `./${dir}/`;
   }
   writeFileSync7(path21.join(process22.cwd(), MANAGED_IMPORT_MAP), JSON.stringify({ imports }, null, 2) + `
 `);
@@ -86280,7 +86270,7 @@ async function ensureUserReferencesManaged(opts) {
   try {
     parsed = JSON.parse(text);
   } catch {
-    warn(`${existingName} couldn't be auto-edited (it may contain comments). Add ${opts.hint} ` + `to pick up wmill's recommended settings (incl. $f//$u/ import aliases).`);
+    warn(`${existingName} couldn't be auto-edited (it may contain comments). Add ${opts.hint} ` + `to pick up wmill's recommended settings (incl. workspace /f/, /u/ import resolution).`);
     return;
   }
   if (opts.legacyFormats?.some((fmt) => deepEqual2(parsed, fmt))) {
@@ -86292,7 +86282,7 @@ async function ensureUserReferencesManaged(opts) {
   const next = JSON.parse(JSON.stringify(parsed));
   const wired = opts.wire(next);
   if (wired !== true) {
-    warn(`${existingName}: ${wired}. Add ${opts.hint} manually to pick up wmill's ` + `recommended settings (incl. $f//$u/ import aliases).`);
+    warn(`${existingName}: ${wired}. Add ${opts.hint} manually to pick up wmill's ` + `recommended settings (incl. workspace /f/, /u/ import resolution).`);
     return;
   }
   const consent = opts.mode.assumeYes ? true : opts.mode.interactive ? await Confirm.prompt({
@@ -86300,7 +86290,7 @@ async function ensureUserReferencesManaged(opts) {
     default: true
   }) : false;
   if (!consent) {
-    info(colors.gray(`Left ${existingName} unchanged — add ${opts.hint} when ready to enable ` + `$f//$u/ import aliases (or re-run \`wmill refresh tsconfig\`).`));
+    info(colors.gray(`Left ${existingName} unchanged — add ${opts.hint} when ready to enable ` + `workspace /f/, /u/ import resolution (or re-run \`wmill refresh tsconfig\`).`));
     return;
   }
   writeFileSync7(existing, JSON.stringify(next, null, 2) + `
@@ -86353,7 +86343,7 @@ function emitTsconfigWarning(message) {
   process22.stderr.write(`${colors.yellow(message)}
 `);
 }
-var WORKSPACE_IMPORT_ALIASES, MANAGED_TSCONFIG = "tsconfig.wmill.json", MANAGED_IMPORT_MAP = "import_map.wmill.json", MANAGED_NOTICE, TSCONFIG_HASH_PREFIX = "// wmill-tsconfig-hash: ", TSCONFIG_HASH_REGEX, LEGACY_GENERATED_TSCONFIGS, command30, tsconfig_default;
+var WORKSPACE_IMPORT_DIRS, MANAGED_TSCONFIG = "tsconfig.wmill.json", MANAGED_IMPORT_MAP = "import_map.wmill.json", MANAGED_NOTICE, TSCONFIG_HASH_PREFIX = "// wmill-tsconfig-hash: ", TSCONFIG_HASH_REGEX, LEGACY_GENERATED_TSCONFIGS, command30, tsconfig_default;
 var init_tsconfig = __esm(async () => {
   init_colors2();
   init_mod3();
@@ -86362,10 +86352,7 @@ var init_tsconfig = __esm(async () => {
     init_confirm(),
     init_conf()
   ]);
-  WORKSPACE_IMPORT_ALIASES = {
-    $f: "f",
-    $u: "u"
-  };
+  WORKSPACE_IMPORT_DIRS = ["f", "u"];
   MANAGED_NOTICE = "// Managed by wmill — regenerated by `wmill init` / `wmill refresh tsconfig`.\n" + `// Do not edit; put your overrides in tsconfig.json (which extends this file).
 `;
   TSCONFIG_HASH_REGEX = /^\/\/ wmill-tsconfig-hash: ([0-9a-f]{12})/m;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-cli",
-  "version": "1.716.0",
+  "version": "1.717.1",
   "description": "CLI for Windmill",
   "license": "Apache 2.0",
   "type": "module",
@@ -18,7 +18,7 @@
   "dependencies": {
     "esbuild": "0.28.0",
     "windmill-parser-wasm-py": "1.693.1",
-    "windmill-parser-wasm-ts": "1.714.0",
+    "windmill-parser-wasm-ts": "1.695.0",
     "windmill-parser-wasm-regex": "1.692.0",
     "windmill-parser-wasm-go": "1.510.1",
     "windmill-parser-wasm-php": "1.647.1",