windmill-cli 1.570.0 → 1.572.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm/gen/core/OpenAPI.js +1 -1
- package/esm/src/commands/dev/dev.js +1 -1
- package/esm/src/main.js +1 -1
- package/esm/src/utils/metadata.js +7 -3
- package/esm/windmill-utils-internal/src/inline-scripts/extractor.js +1 -2
- package/esm/windmill-utils-internal/src/inline-scripts/replacer.js +4 -3
- package/package.json +1 -1
- package/types/src/main.d.ts +1 -1
- package/types/src/utils/metadata.d.ts.map +1 -1
- package/types/windmill-utils-internal/src/inline-scripts/extractor.d.ts.map +1 -1
- package/types/windmill-utils-internal/src/inline-scripts/replacer.d.ts +1 -1
- package/types/windmill-utils-internal/src/inline-scripts/replacer.d.ts.map +1 -1
package/esm/gen/core/OpenAPI.js
CHANGED
|
@@ -48,7 +48,7 @@ async function dev(opts) {
|
|
|
48
48
|
if (typ == "flow") {
|
|
49
49
|
const localPath = cpath.split(DOT_FLOW_SEP)[0] + DOT_FLOW_SEP;
|
|
50
50
|
const localFlow = (await yamlParseFile(localPath + "flow.yaml"));
|
|
51
|
-
await replaceInlineScripts(localFlow.value.modules, async (path) => await dntShim.Deno.readTextFile(localPath + path), log, localPath, SEP, undefined
|
|
51
|
+
await replaceInlineScripts(localFlow.value.modules, async (path) => await dntShim.Deno.readTextFile(localPath + path), log, localPath, SEP, undefined);
|
|
52
52
|
currentLastEdit = {
|
|
53
53
|
type: "flow",
|
|
54
54
|
flow: localFlow,
|
package/esm/src/main.js
CHANGED
|
@@ -38,7 +38,7 @@ export { flow, app, script, workspace, resource, resourceType, user, variable, h
|
|
|
38
38
|
// console.error(JSON.stringify(event.error, null, 4));
|
|
39
39
|
// }
|
|
40
40
|
// });
|
|
41
|
-
export const VERSION = "1.
|
|
41
|
+
export const VERSION = "1.572.0";
|
|
42
42
|
export const WM_FORK_PREFIX = "wm-fork";
|
|
43
43
|
const command = new Command()
|
|
44
44
|
.name("wmill")
|
|
@@ -106,7 +106,7 @@ export async function generateFlowLockInternal(folder, dryRun, workspace, opts,
|
|
|
106
106
|
}
|
|
107
107
|
}
|
|
108
108
|
log.info(`Recomputing locks of ${changedScripts.join(", ")} in ${folder}`);
|
|
109
|
-
await replaceInlineScripts(flowValue.value.modules, async (path) => await dntShim.Deno.readTextFile(folder + SEP + path), log, folder + SEP, SEP, changedScripts
|
|
109
|
+
await replaceInlineScripts(flowValue.value.modules, async (path) => await dntShim.Deno.readTextFile(folder + SEP + path), log, folder + SEP, SEP, changedScripts);
|
|
110
110
|
//removeChangedLocks
|
|
111
111
|
flowValue.value = await updateFlow(workspace, flowValue.value, remote_path, rawReqs);
|
|
112
112
|
const inlineScripts = extractInlineScriptsForFlows(flowValue.value.modules, {}, SEP, opts.defaultTs);
|
|
@@ -254,7 +254,9 @@ async function updateScriptLock(workspace, scriptContent, language, remotePath,
|
|
|
254
254
|
await dntShim.Deno.remove(lockPath);
|
|
255
255
|
}
|
|
256
256
|
}
|
|
257
|
-
catch {
|
|
257
|
+
catch (e) {
|
|
258
|
+
log.info(colors.yellow(`Error removing lock file ${lockPath}: ${e}`));
|
|
259
|
+
}
|
|
258
260
|
metadataContent.lock = "";
|
|
259
261
|
}
|
|
260
262
|
}
|
|
@@ -318,7 +320,9 @@ export async function updateFlow(workspace, flow_value, remotePath, rawDeps) {
|
|
|
318
320
|
try {
|
|
319
321
|
responseText = await rawResponse.text();
|
|
320
322
|
}
|
|
321
|
-
catch {
|
|
323
|
+
catch {
|
|
324
|
+
responseText = "";
|
|
325
|
+
}
|
|
322
326
|
throw new Error(`Failed to generate lockfile. Status was: ${rawResponse.statusText}, ${responseText}, ${e}`);
|
|
323
327
|
}
|
|
324
328
|
}
|
|
@@ -15,8 +15,7 @@ export function extractInlineScripts(modules, mapping = {}, separator = "/", def
|
|
|
15
15
|
const assigner = pathAssigner ?? newPathAssigner(defaultTs ?? "bun");
|
|
16
16
|
return modules.flatMap((m) => {
|
|
17
17
|
if (m.value.type == "rawscript") {
|
|
18
|
-
|
|
19
|
-
[basePath, ext] = assigner.assignPath(m.summary, m.value.language);
|
|
18
|
+
const [basePath, ext] = assigner.assignPath(m.summary, m.value.language);
|
|
20
19
|
const path = mapping[m.id] ?? basePath + ext;
|
|
21
20
|
const content = m.value.content;
|
|
22
21
|
const r = [{ path: path, content: content }];
|
|
@@ -12,14 +12,14 @@
|
|
|
12
12
|
export async function replaceInlineScripts(modules, fileReader, logger = {
|
|
13
13
|
info: () => { },
|
|
14
14
|
error: () => { },
|
|
15
|
-
}, localPath, separator = "/", removeLocks
|
|
15
|
+
}, localPath, separator = "/", removeLocks) {
|
|
16
16
|
await Promise.all(modules.map(async (module) => {
|
|
17
17
|
if (!module.value) {
|
|
18
18
|
throw new Error(`Module value is undefined for module ${module.id}`);
|
|
19
19
|
}
|
|
20
20
|
if (module.value.type === "rawscript" && module.value.content && module.value.content.startsWith("!inline")) {
|
|
21
21
|
const path = module.value.content.split(" ")[1];
|
|
22
|
-
const pathPrefix = path.split(".")[0];
|
|
22
|
+
// const pathPrefix = path.split(".")[0];
|
|
23
23
|
const pathSuffix = path.split(".").slice(1).join(".");
|
|
24
24
|
// new path is the module id with the same suffix
|
|
25
25
|
const newPath = module.id + "." + pathSuffix;
|
|
@@ -70,7 +70,8 @@ export async function replaceInlineScripts(modules, fileReader, logger = {
|
|
|
70
70
|
module.value.lock = await fileReader(path.replaceAll("/", separator));
|
|
71
71
|
}
|
|
72
72
|
catch {
|
|
73
|
-
logger.error(`Lock file ${path} not found`);
|
|
73
|
+
logger.error(`Lock file ${path} not found, treating as empty`);
|
|
74
|
+
module.value.lock = "";
|
|
74
75
|
}
|
|
75
76
|
}
|
|
76
77
|
}
|
package/package.json
CHANGED
package/types/src/main.d.ts
CHANGED
|
@@ -22,7 +22,7 @@ import { pull as hubPull } from "./commands/hub/hub.js";
|
|
|
22
22
|
import { pull, push } from "./commands/sync/sync.js";
|
|
23
23
|
import { add as workspaceAdd } from "./commands/workspace/workspace.js";
|
|
24
24
|
export { flow, app, script, workspace, resource, resourceType, user, variable, hub, folder, schedule, trigger, sync, gitsyncSettings, instance, dev, hubPull, pull, push, workspaceAdd, };
|
|
25
|
-
export declare const VERSION = "1.
|
|
25
|
+
export declare const VERSION = "1.572.0";
|
|
26
26
|
export declare const WM_FORK_PREFIX = "wm-fork";
|
|
27
27
|
declare const command: Command<{
|
|
28
28
|
workspace?: (import("../deps/jsr.io/@windmill-labs/cliffy-command/1.0.0-rc.5/mod.js").StringType & string) | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../../../src/src/utils/metadata.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAa5C,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAGL,cAAc,EACf,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAE,UAAU,EAAwB,MAAM,8BAA8B,CAAC;AAYhF,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAM7C,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,qBAAa,uBAAwB,SAAQ,KAAK;gBACpC,OAAO,EAAE,MAAM;CAI5B;AAED,wBAAsB,mBAAmB,kBAAK;AAgD9C,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,EACxB,UAAU,CAAC,EAAE,OAAO,GACnB,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAkHxB;AAGD,wBAAsB,SAAS,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC,CAG9D;AAED,wBAAsB,8BAA8B,CAClD,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,SAAS,EACpB,IAAI,EAAE,aAAa,GAAG;IACpB,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC/B,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACjC,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;CAC5B,EACD,MAAM,EAAE,OAAO,EACf,cAAc,EAAE,OAAO,EACvB,UAAU,EAAE,UAAU,EACtB,SAAS,EAAE,YAAY,EAAE,EACzB,sBAAsB,CAAC,EAAE,OAAO,GAC/B,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CA6F7B;AAED,wBAAsB,kBAAkB,CACtC,aAAa,EAAE,MAAM,EACrB,QAAQ,EAAE,cAAc,EACxB,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACpC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAmBf;
|
|
1
|
+
{"version":3,"file":"metadata.d.ts","sourceRoot":"","sources":["../../../src/src/utils/metadata.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractor.d.ts","sourceRoot":"","sources":["../../../../src/windmill-utils-internal/src/inline-scripts/extractor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD;;GAEG;AACH,UAAU,YAAY;IACpB,2DAA2D;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,gCAAgC;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,UAAU,EAAE,EACrB,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EACpC,SAAS,GAAE,MAAY,EACvB,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,EAC1B,YAAY,CAAC,EAAE,YAAY,GAC1B,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"extractor.d.ts","sourceRoot":"","sources":["../../../../src/windmill-utils-internal/src/inline-scripts/extractor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD;;GAEG;AACH,UAAU,YAAY;IACpB,2DAA2D;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,gCAAgC;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,UAAU,EAAE,EACrB,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,EACpC,SAAS,GAAE,MAAY,EACvB,SAAS,CAAC,EAAE,KAAK,GAAG,MAAM,EAC1B,YAAY,CAAC,EAAE,YAAY,GAC1B,YAAY,EAAE,CA6DhB;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,UAAU,EAAE,GAAG,SAAS,EACjC,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GACnC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAgCxB"}
|
|
@@ -13,5 +13,5 @@ import { FlowModule } from "../gen/types.gen.js";
|
|
|
13
13
|
export declare function replaceInlineScripts(modules: FlowModule[], fileReader: (path: string) => Promise<string>, logger: {
|
|
14
14
|
info: (message: string) => void;
|
|
15
15
|
error: (message: string) => void;
|
|
16
|
-
} | undefined, localPath: string, separator?: string, removeLocks?: string[]
|
|
16
|
+
} | undefined, localPath: string, separator?: string, removeLocks?: string[]): Promise<void>;
|
|
17
17
|
//# sourceMappingURL=replacer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"replacer.d.ts","sourceRoot":"","sources":["../../../../src/windmill-utils-internal/src/inline-scripts/replacer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD;;;;;;;;;;GAUG;AACH,wBAAsB,oBAAoB,CACtC,OAAO,EAAE,UAAU,EAAE,EACrB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EAC7C,MAAM,EAAE;IACN,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAClC,YAGA,EACD,SAAS,EAAE,MAAM,EACjB,SAAS,GAAE,MAAY,EACvB,WAAW,CAAC,EAAE,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"replacer.d.ts","sourceRoot":"","sources":["../../../../src/windmill-utils-internal/src/inline-scripts/replacer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD;;;;;;;;;;GAUG;AACH,wBAAsB,oBAAoB,CACtC,OAAO,EAAE,UAAU,EAAE,EACrB,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,EAC7C,MAAM,EAAE;IACN,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;IAChC,KAAK,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,CAAC;CAClC,YAGA,EACD,SAAS,EAAE,MAAM,EACjB,SAAS,GAAE,MAAY,EACvB,WAAW,CAAC,EAAE,MAAM,EAAE,GAGrB,OAAO,CAAC,IAAI,CAAC,CA+Ef"}
|