windmill-cli 1.613.1 → 1.613.3

package/esm/gen/core/OpenAPI.js

@@ -32,7 +32,7 @@ export const OpenAPI = {
     PASSWORD: undefined,
     TOKEN: getEnv("WM_TOKEN"),
     USERNAME: undefined,
-    VERSION: '1.613.1',
+    VERSION: '1.613.3',
     WITH_CREDENTIALS: true,
     interceptors: {
         request: new Interceptors(),

package/esm/src/commands/app/app_metadata.js

@@ -2,7 +2,7 @@
 import * as dntShim from "../../../_dnt.shims.js";
 import path from "node:path";
 import { SEP, colors, log, yamlParseFile, yamlStringify, } from "../../../deps.js";
-import { checkifMetadataUptodate, blueColor, clearGlobalLock, updateMetadataGlobalLock, inferSchema, getRawWorkspaceDependencies, } from "../../utils/metadata.js";
+import { checkifMetadataUptodate, blueColor, clearGlobalLock, updateMetadataGlobalLock, inferSchema, getRawWorkspaceDependencies, normalizeLockPath, } from "../../utils/metadata.js";
 import { workspaceDependenciesLanguages, } from "../../utils/script_common.js";
 import { generateHash, getHeaders, writeIfChanged } from "../../utils/utils.js";
 import { exts } from "../script/script.js";
@@ -37,7 +37,8 @@ async function generateAppHash(rawReqs, folder, rawApp, defaultTs) {
             }
             if (exts.some((e) => f.path.endsWith(e))) {
                 // Embed lock into hash
-                const relativePath = f.path.replace(runnablesFolder + SEP, "");
+                // Normalize path to ensure OS-independent hashing
+                const relativePath = normalizeLockPath(f.path.replace(runnablesFolder + SEP, ""));
                 hashes[relativePath] = await generateHash((await f.getContentText()) + JSON.stringify(rawReqs));
             }
         }

package/esm/src/commands/flow/flow_metadata.js

@@ -1,6 +1,6 @@
 import * as dntShim from "../../../_dnt.shims.js";
 import { SEP, colors, log, path, yamlParseFile, yamlStringify, } from "../../../deps.js";
-import { readLockfile, checkifMetadataUptodate, blueColor, clearGlobalLock, updateMetadataGlobalLock, LockfileGenerationError, getRawWorkspaceDependencies, } from "../../utils/metadata.js";
+import { readLockfile, checkifMetadataUptodate, blueColor, clearGlobalLock, updateMetadataGlobalLock, LockfileGenerationError, getRawWorkspaceDependencies, normalizeLockPath, } from "../../utils/metadata.js";
 import { extractInlineScripts as extractInlineScriptsForFlows } from "../../../windmill-utils-internal/src/inline-scripts/extractor.js";
 import { generateHash, getHeaders, writeIfChanged } from "../../utils/utils.js";
 import { exts } from "../script/script.js";
@@ -15,7 +15,9 @@ async function generateFlowHash(rawWorkspaceDependencies, folder, defaultTs) {
     for await (const f of elems.getChildren()) {
         if (exts.some((e) => f.path.endsWith(e))) {
             // Embed workspace dependencies into hash
-            hashes[f.path] = await generateHash((await f.getContentText()) + JSON.stringify(rawWorkspaceDependencies));
+            // Normalize path to ensure OS-independent hashing
+            const normalizedPath = normalizeLockPath(f.path);
+            hashes[normalizedPath] = await generateHash((await f.getContentText()) + JSON.stringify(rawWorkspaceDependencies));
         }
     }
     return { ...hashes, [TOP_HASH]: await generateHash(JSON.stringify(hashes)) };

package/esm/src/commands/sync/sync.js

@@ -9,7 +9,7 @@ import { exts, findContentFile, findResourceFile, handleScriptMetadata, removeEx
 import { handleFile } from "../script/script.js";
 import { deepEqual, fetchRemoteVersion, isFileResource, isRawAppFile, isWorkspaceDependencies, } from "../../utils/utils.js";
 import { getEffectiveSettings, mergeConfigWithConfigFile, validateBranchConfiguration, } from "../../core/conf.js";
-import { fromBranchSpecificPath, getBranchSpecificPath, getSpecificItemsForCurrentBranch, isBranchSpecificFile, isCurrentBranchFile, isSpecificItem, } from "../../core/specific_items.js";
+import { fromBranchSpecificPath, getBranchSpecificPath, getSpecificItemsForCurrentBranch, isBranchSpecificFile, isCurrentBranchFile, isItemTypeConfigured, isSpecificItem, } from "../../core/specific_items.js";
 import { getCurrentGitBranch, isGitRepository } from "../../utils/git.js";
 import { removePathPrefix } from "../../types.js";
 import { listSyncCodebases } from "../../utils/codebase.js";
@@ -1181,35 +1181,37 @@ export async function elementsToMap(els, ignore, json, skips, specificItems, bra
             }
         }
         // Handle branch-specific path mapping after all filtering
-        if (specificItems) {
-            if (isCurrentBranchFile(path, branchOverride)) {
-                // This is a branch-specific file for current branch
-                // Safe to compute branch here since isCurrentBranchFile already validated it exists
-                const currentBranch = branchOverride || getCurrentGitBranch();
-                const basePath = fromBranchSpecificPath(path, currentBranch);
-                if (isSpecificItem(basePath, specificItems)) {
-                    // Map to base path for push operations
-                    map[basePath] = content;
-                    processedBasePaths.add(basePath);
-                }
-                else {
-                    // Branch-specific file doesn't match pattern, skip it
-                    continue;
-                }
+        if (isCurrentBranchFile(path, branchOverride)) {
+            // This is a branch-specific file for current branch
+            const currentBranch = branchOverride || getCurrentGitBranch();
+            const basePath = fromBranchSpecificPath(path, currentBranch);
+            // Only use branch-specific files if the item type IS configured as branch-specific
+            // AND matches the pattern. Otherwise, skip and use base file instead.
+            if (!isItemTypeConfigured(basePath, specificItems)) {
+                // Type not configured as branch-specific - skip, use base file instead
+                continue;
             }
-            else if (!isBranchSpecificFile(path)) {
-                // This is a regular base file, check if we should skip it
-                if (processedBasePaths.has(path)) {
-                    // Skip base file, we already processed branch-specific version
-                    continue;
-                }
-                map[path] = content;
+            if (!isSpecificItem(basePath, specificItems)) {
+                // Type configured but doesn't match pattern - skip
+                continue;
             }
+            // Type configured AND matches - map to base path
+            map[basePath] = content;
+            processedBasePaths.add(basePath);
         }
-        else {
-            // No specific items configuration, use regular path
-            map[entry.path] = content;
+        else if (!isBranchSpecificFile(path)) {
+            // This is a regular base file
+            if (processedBasePaths.has(path)) {
+                // Skip base file, we already processed branch-specific version
+                continue;
+            }
+            // Skip base file if it's configured as branch-specific (expect branch version)
+            if (isSpecificItem(path, specificItems)) {
+                continue;
+            }
+            map[path] = content;
         }
+        // Note: branch-specific files for other branches are already filtered out earlier
     }
     return map;
 }

package/esm/src/core/specific_items.js

@@ -108,6 +108,35 @@ export function getSpecificItemsForCurrentBranch(config, branchOverride) {
 function matchesPatterns(path, patterns) {
     return patterns.some(pattern => minimatch(path, pattern));
 }
+/**
+ * Check if the item type for a given path is configured in specificItems.
+ * This checks if the TYPE is configured, not whether it matches the pattern.
+ * Used to determine if branch-specific files should be used for this type.
+ */
+export function isItemTypeConfigured(path, specificItems) {
+    if (!specificItems) {
+        return false;
+    }
+    if (path.endsWith('.variable.yaml')) {
+        return specificItems.variables !== undefined;
+    }
+    if (path.endsWith('.resource.yaml')) {
+        return specificItems.resources !== undefined;
+    }
+    if (isTriggerFile(path)) {
+        return specificItems.triggers !== undefined;
+    }
+    if (path.endsWith('/folder.meta.yaml')) {
+        return specificItems.folders !== undefined;
+    }
+    if (path === 'settings.yaml') {
+        return specificItems.settings !== undefined;
+    }
+    if (isFileResource(path)) {
+        return specificItems.resources !== undefined;
+    }
+    return false;
+}
 /**
  * Check if a file path should be treated as branch-specific
  */

package/esm/src/main.js

@@ -40,7 +40,7 @@ export { flow, app, script, workspace, resource, resourceType, user, variable, h
 //     console.error(JSON.stringify(event.error, null, 4));
 //   }
 // });
-export const VERSION = "1.613.1";
+export const VERSION = "1.613.3";
 // Re-exported from constants.ts to maintain backwards compatibility
 export { WM_FORK_PREFIX } from "./core/constants.js";
 const command = new Command()

package/esm/src/utils/metadata.js

@@ -449,6 +449,13 @@ export async function parseMetadataFile(scriptPath, generateMetadataIfMissing) {
     }
 }
 const WMILL_LOCKFILE = "wmill-lock.yaml";
+/**
+ * Normalizes a path to use Linux separators (forward slashes).
+ * This ensures wmill-lock.yaml is portable across Windows and Linux.
+ */
+export function normalizeLockPath(p) {
+    return p.replace(/\\/g, "/");
+}
 export async function readLockfile() {
     try {
         const read = await yamlParseFile(WMILL_LOCKFILE);
@@ -467,11 +474,12 @@ export async function readLockfile() {
     }
 }
 function v2LockPath(path, subpath) {
+    const normalizedPath = normalizeLockPath(path);
     if (subpath) {
-        return `${path}+${subpath}`;
+        return `${normalizedPath}+${normalizeLockPath(subpath)}`;
     }
     else {
-        return path;
+        return normalizedPath;
     }
 }
 export async function checkifMetadataUptodate(path, hash, conf, subpath) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-cli",
-  "version": "1.613.1",
+  "version": "1.613.3",
   "description": "CLI for Windmill",
   "repository": {
     "type": "git",

package/types/src/commands/app/app_metadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app_metadata.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/app/app_metadata.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAgB/C,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAYtD,OAAO,EAA6B,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAM5E,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAgD5C;;GAEG;AACH,wBAAsB,wBAAwB,CAC5C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,aAAa,GAAG;IACpB,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;CAC5B,EACD,sBAAsB,CAAC,EAAE,OAAO,EAChC,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAsIxB;AAuXD;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,GAAG,CAAC;CACb;AAED;;;;;;;;GAQG;AACH,wBAAsB,2BAA2B,CAC/C,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CA8F3C;AAQD,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,aAAa,GAAG;IACpB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;CAC5B,GAAG,WAAW,EACf,OAAO,EAAE,MAAM,GAAG,SAAS,iBA+H5B"}
+{"version":3,"file":"app_metadata.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/app/app_metadata.ts"],"names":[],"mappings":"AAWA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAiB/C,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAYtD,OAAO,EAA6B,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAM5E,eAAO,MAAM,kBAAkB,YAAY,CAAC;AAiD5C;;GAEG;AACH,wBAAsB,wBAAwB,CAC5C,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,aAAa,GAAG;IACpB,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;CAC5B,EACD,sBAAsB,CAAC,EAAE,OAAO,EAChC,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAsIxB;AAuXD;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,GAAG,CAAC;CACb;AAED;;;;;;;;GAQG;AACH,wBAAsB,2BAA2B,CAC/C,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,oBAAoB,GAAG,SAAS,CAAC,CA8F3C;AAQD,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,aAAa,GAAG;IACpB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;CAC5B,GAAG,WAAW,EACf,OAAO,EAAE,MAAM,GAAG,SAAS,iBA+H5B"}

package/types/src/commands/flow/flow_metadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"flow_metadata.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/flow/flow_metadata.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAe/C,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAuBtD,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,aAAa,GAAG;IACpB,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;CAC5B,EACD,sBAAsB,CAAC,EAAE,OAAO,EAChC,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAuGxB;AAED,wBAAsB,UAAU,CAC9B,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,SAAS,EACrB,UAAU,EAAE,MAAM,EAClB,wBAAwB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/C,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CA8EhC"}
+{"version":3,"file":"flow_metadata.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/flow/flow_metadata.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAgB/C,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAyBtD,wBAAsB,wBAAwB,CAC5C,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,aAAa,GAAG;IACpB,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;CAC5B,EACD,sBAAsB,CAAC,EAAE,OAAO,EAChC,cAAc,CAAC,EAAE,OAAO,GACvB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAuGxB;AAED,wBAAsB,UAAU,CAC9B,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,SAAS,EACrB,UAAU,EAAE,MAAM,EAClB,wBAAwB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC/C,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC,CA8EhC"}

package/types/src/commands/sync/sync.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/sync/sync.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../../src/src/commands/sync/sync.ts"],"names":[],"mappings":"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"}

package/types/src/core/specific_items.d.ts

@@ -11,6 +11,12 @@ export interface SpecificItemsConfig {
  * Merges commonSpecificItems with branch-specific specificItems
  */
 export declare function getSpecificItemsForCurrentBranch(config: SyncOptions, branchOverride?: string): SpecificItemsConfig | undefined;
+/**
+ * Check if the item type for a given path is configured in specificItems.
+ * This checks if the TYPE is configured, not whether it matches the pattern.
+ * Used to determine if branch-specific files should be used for this type.
+ */
+export declare function isItemTypeConfigured(path: string, specificItems: SpecificItemsConfig | undefined): boolean;
 /**
  * Check if a file path should be treated as branch-specific
  */

package/types/src/core/specific_items.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"specific_items.d.ts","sourceRoot":"","sources":["../../../src/src/core/specific_items.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC,MAAM,WAAW,mBAAmB;IAClC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAgDD;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,WAAW,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAgE9H;AASD;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,mBAAmB,GAAG,SAAS,GAAG,OAAO,CA6CpG;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAwCjF;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,kBAAkB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CA4C7F;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,mBAAmB,GAAG,SAAS,EAC9C,cAAc,CAAC,EAAE,MAAM,GACtB,MAAM,GAAG,SAAS,CAsBpB;AAKD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CA8BlF;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAQ1D"}
+{"version":3,"file":"specific_items.d.ts","sourceRoot":"","sources":["../../../src/src/core/specific_items.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAGxC,MAAM,WAAW,mBAAmB;IAClC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAgDD;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,WAAW,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,mBAAmB,GAAG,SAAS,CAgE9H;AASD;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,mBAAmB,GAAG,SAAS,GAAG,OAAO,CA8B1G;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,mBAAmB,GAAG,SAAS,GAAG,OAAO,CA6CpG;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CAwCjF;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,kBAAkB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,CA4C7F;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,MAAM,EAChB,aAAa,EAAE,mBAAmB,GAAG,SAAS,EAC9C,cAAc,CAAC,EAAE,MAAM,GACtB,MAAM,GAAG,SAAS,CAsBpB;AAKD;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CA8BlF;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAQ1D"}

package/types/src/main.d.ts

@@ -22,7 +22,7 @@ import { pull as hubPull } from "./commands/hub/hub.js";
 import { pull, push } from "./commands/sync/sync.js";
 import { add as workspaceAdd } from "./commands/workspace/workspace.js";
 export { flow, app, script, workspace, resource, resourceType, user, variable, hub, folder, schedule, trigger, sync, gitsyncSettings, instance, dev, hubPull, pull, push, workspaceAdd, };
-export declare const VERSION = "1.613.1";
+export declare const VERSION = "1.613.3";
 export { WM_FORK_PREFIX } from "./core/constants.js";
 declare const command: Command<{
     workspace?: (import("../deps/jsr.io/@windmill-labs/cliffy-command/1.0.0-rc.5/mod.js").StringType & string) | undefined;

package/types/src/utils/metadata.d.ts

@@ -45,6 +45,11 @@ interface Lock {
         };
     };
 }
+/**
+ * Normalizes a path to use Linux separators (forward slashes).
+ * This ensures wmill-lock.yaml is portable across Windows and Linux.
+ */
+export declare function normalizeLockPath(p: string): string;
 export declare function readLockfile(): Promise<Lock>;
 export declare function checkifMetadataUptodate(path: string, hash: string, conf: Lock | undefined, subpath?: string): Promise<boolean>;
 export declare function generateScriptHash(rawWorkspaceDependencies: Record<string, string>, scriptContent: string, newMetadataContent: string): Promise<string>;

package/types/src/utils/metadata.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../../../src/src/utils/metadata.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../../../src/src/utils/metadata.ts"],"names":[],"mappings":"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"}