windmill-client 1.148.0 → 1.150.0

package/dist/client.d.ts

@@ -23,13 +23,6 @@ export declare function getResource(path?: string, undefinedIfEmpty?: boolean):
  * @returns resource value
  */
 export declare function resolveDefaultResource(obj: any): Promise<any>;
-/**
- * Get the full resource value by path
- * @param path path of the resource,  default to internal state path
- * @param undefinedIfEmpty if the resource does not exist, return undefined instead of throwing an error
- * @returns full resource
- */
-export declare function getFullResource(path?: string, undefinedIfEmpty?: boolean): Promise<any>;
 export declare function getStatePath(): string;
 /**
  * Set a resource value by path
@@ -63,7 +56,7 @@ export declare function getState(): Promise<any>;
  * @param path path of the variable
  * @returns variable value
  */
-export declare function getVariable(path: string): Promise<string | undefined>;
+export declare function getVariable(path: string): Promise<string>;
 /**
  * Set a variable by path, create if not exist
  * @param path path of the variable

package/dist/client.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.uint8ArrayToBase64 = exports.base64ToUint8Array = exports.databaseUrlFromResource = exports.setVariable = exports.getVariable = exports.getState = exports.getInternalState = exports.setState = exports.setInternalState = exports.setResource = exports.getStatePath = exports.getFullResource = exports.resolveDefaultResource = exports.getResource = exports.getWorkspace = exports.setClient = exports.SHARED_FOLDER = exports.WorkspaceService = exports.UserService = exports.SettingsService = exports.ScheduleService = exports.ScriptService = exports.VariableService = exports.ResourceService = exports.JobService = exports.GroupService = exports.GranularAclService = exports.FlowService = exports.AuditService = exports.AdminService = void 0;
+exports.uint8ArrayToBase64 = exports.base64ToUint8Array = exports.databaseUrlFromResource = exports.setVariable = exports.getVariable = exports.getState = exports.getInternalState = exports.setState = exports.setInternalState = exports.setResource = exports.getStatePath = exports.resolveDefaultResource = exports.getResource = exports.getWorkspace = exports.setClient = exports.SHARED_FOLDER = exports.WorkspaceService = exports.UserService = exports.SettingsService = exports.ScheduleService = exports.ScriptService = exports.VariableService = exports.ResourceService = exports.JobService = exports.GroupService = exports.GranularAclService = exports.FlowService = exports.AuditService = exports.AdminService = void 0;
 const index_1 = require("./index");
 const index_2 = require("./index");
 var index_3 = require("./index");
@@ -72,8 +72,10 @@ function getResource(path, undefinedIfEmpty) {
         const workspace = getWorkspace();
         path = path !== null && path !== void 0 ? path : getStatePath();
         try {
-            const resource = yield index_1.ResourceService.getResource({ workspace, path });
-            return yield _transformLeaf(resource.value);
+            return yield index_1.ResourceService.getResourceValueInterpolated({
+                workspace,
+                path,
+            });
         }
         catch (e) {
             if (undefinedIfEmpty && e.status === 404) {
@@ -102,32 +104,6 @@ function resolveDefaultResource(obj) {
     });
 }
 exports.resolveDefaultResource = resolveDefaultResource;
-/**
- * Get the full resource value by path
- * @param path path of the resource,  default to internal state path
- * @param undefinedIfEmpty if the resource does not exist, return undefined instead of throwing an error
- * @returns full resource
- */
-function getFullResource(path, undefinedIfEmpty) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const workspace = getWorkspace();
-        path = path !== null && path !== void 0 ? path : getStatePath();
-        try {
-            const resource = yield index_1.ResourceService.getResource({ workspace, path });
-            const value = yield _transformLeaf(resource.value);
-            return Object.assign(Object.assign({}, resource), { value });
-        }
-        catch (e) {
-            if (undefinedIfEmpty && e.status === 404) {
-                return undefined;
-            }
-            else {
-                throw Error(`Resource not found at ${path} or not visible to you`);
-            }
-        }
-    });
-}
-exports.getFullResource = getFullResource;
 function getStatePath() {
     const state_path = getEnv("WM_STATE_PATH_NEW");
     if (state_path === undefined) {
@@ -233,8 +209,7 @@ function getVariable(path) {
         !clientSet && setClient();
         const workspace = getWorkspace();
         try {
-            const variable = yield index_1.VariableService.getVariable({ workspace, path });
-            return variable.value;
+            return yield index_1.VariableService.getVariableValue({ workspace, path });
         }
         catch (e) {
             throw Error(`Variable not found at ${path} or not visible to you`);
@@ -274,34 +249,6 @@ function setVariable(path, value, isSecretIfNotExist, descriptionIfNotExist) {
     });
 }
 exports.setVariable = setVariable;
-function transformLeaves(d) {
-    return __awaiter(this, void 0, void 0, function* () {
-        for (const k in d) {
-            d[k] = yield _transformLeaf(d[k]);
-        }
-        return d;
-    });
-}
-const VAR_RESOURCE_PREFIX = "$var:";
-const RES_RESOURCE_PREFIX = "$res:";
-function _transformLeaf(v) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (typeof v === "object") {
-            return transformLeaves(v);
-        }
-        else if (typeof v === "string" && v.startsWith(VAR_RESOURCE_PREFIX)) {
-            const varName = v.substring(VAR_RESOURCE_PREFIX.length);
-            return yield getVariable(varName);
-        }
-        else if (typeof v === "string" && v.startsWith(RES_RESOURCE_PREFIX)) {
-            const resName = v.substring(RES_RESOURCE_PREFIX.length);
-            return yield getResource(resName);
-        }
-        else {
-            return v;
-        }
-    });
-}
 function databaseUrlFromResource(path) {
     return __awaiter(this, void 0, void 0, function* () {
         const resource = yield getResource(path);

package/dist/core/OpenAPI.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OpenAPI = void 0;
 exports.OpenAPI = {
     BASE: '/api',
-    VERSION: '1.148.0',
+    VERSION: '1.150.0',
     WITH_CREDENTIALS: false,
     CREDENTIALS: 'include',
     TOKEN: undefined,

package/dist/services/ResourceService.d.ts

@@ -65,6 +65,15 @@ export declare class ResourceService {
         workspace: string;
         path: string;
     }): CancelablePromise<Resource>;
+    /**
+     * get resource interpolated (variables and resources are fully unrolled)
+     * @returns any resource value
+     * @throws ApiError
+     */
+    static getResourceValueInterpolated({ workspace, path, }: {
+        workspace: string;
+        path: string;
+    }): CancelablePromise<any>;
     /**
      * get resource value
      * @returns any resource value

package/dist/services/ResourceService.js

@@ -87,6 +87,21 @@ class ResourceService {
             },
         });
     }
+    /**
+     * get resource interpolated (variables and resources are fully unrolled)
+     * @returns any resource value
+     * @throws ApiError
+     */
+    static getResourceValueInterpolated({ workspace, path, }) {
+        return (0, request_1.request)(OpenAPI_1.OpenAPI, {
+            method: 'GET',
+            url: '/w/{workspace}/resources/get_value_interpolated/{path}',
+            path: {
+                'workspace': workspace,
+                'path': path,
+            },
+        });
+    }
     /**
      * get resource value
      * @returns any resource value

package/dist/services/VariableService.d.ts

@@ -67,6 +67,15 @@ export declare class VariableService {
          */
         decryptSecret?: boolean;
     }): CancelablePromise<ListableVariable>;
+    /**
+     * get variable value
+     * @returns string variable
+     * @throws ApiError
+     */
+    static getVariableValue({ workspace, path, }: {
+        workspace: string;
+        path: string;
+    }): CancelablePromise<string>;
     /**
      * does variable exists at path
      * @returns boolean variable

package/dist/services/VariableService.js

@@ -92,6 +92,21 @@ class VariableService {
             },
         });
     }
+    /**
+     * get variable value
+     * @returns string variable
+     * @throws ApiError
+     */
+    static getVariableValue({ workspace, path, }) {
+        return (0, request_1.request)(OpenAPI_1.OpenAPI, {
+            method: 'GET',
+            url: '/w/{workspace}/variables/get_value/{path}',
+            path: {
+                'workspace': workspace,
+                'path': path,
+            },
+        });
+    }
     /**
      * does variable exists at path
      * @returns boolean variable

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "windmill-client",
   "description": "Windmill SDK client for browsers and Node.js",
-  "version": "1.148.0",
+  "version": "1.150.0",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {