windmill-utils-internal 1.1.0 → 1.2.0

package/dist/gen/services.gen.d.ts

@@ -1108,6 +1108,8 @@ export declare const getVariable: (data: GetVariableData) => CancelablePromise<G
  * @param data The data for the request.
  * @param data.workspace
  * @param data.path
+ * @param data.allowCache allow getting a cached value for improved performance
+ *
  * @returns string variable
  * @throws ApiError
  */
@@ -1363,6 +1365,7 @@ export declare const getResource: (data: GetResourceData) => CancelablePromise<G
  * @param data.workspace
  * @param data.path
  * @param data.jobId job id
+ * @param data.allowCache allow getting a cached value for improved performance
  * @returns unknown resource value
  * @throws ApiError
  */

package/dist/gen/services.gen.js

@@ -2360,6 +2360,8 @@ exports.getVariable = getVariable;
  * @param data The data for the request.
  * @param data.workspace
  * @param data.path
+ * @param data.allowCache allow getting a cached value for improved performance
+ *
  * @returns string variable
  * @throws ApiError
  */
@@ -2370,6 +2372,9 @@ const getVariableValue = (data) => {
         path: {
             workspace: data.workspace,
             path: data.path
+        },
+        query: {
+            allow_cache: data.allowCache
         }
     });
 };
@@ -2907,6 +2912,7 @@ exports.getResource = getResource;
  * @param data.workspace
  * @param data.path
  * @param data.jobId job id
+ * @param data.allowCache allow getting a cached value for improved performance
  * @returns unknown resource value
  * @throws ApiError
  */
@@ -2919,7 +2925,8 @@ const getResourceValueInterpolated = (data) => {
             path: data.path
         },
         query: {
-            job_id: data.jobId
+            job_id: data.jobId,
+            allow_cache: data.allowCache
         }
     });
 };

package/dist/gen/types.gen.d.ts

@@ -30,6 +30,9 @@ export type Retry = {
         seconds?: number;
         random_factor?: number;
     };
+    retry_if?: {
+        expr: string;
+    };
 };
 export type StopAfterIf = {
     skip_if_stopped?: boolean;
@@ -3283,6 +3286,11 @@ export type GetVariableData = {
 };
 export type GetVariableResponse = (ListableVariable);
 export type GetVariableValueData = {
+    /**
+     * allow getting a cached value for improved performance
+     *
+     */
+    allowCache?: boolean;
     path: string;
     workspace: string;
 };
@@ -3563,6 +3571,10 @@ export type GetResourceData = {
 };
 export type GetResourceResponse = (Resource);
 export type GetResourceValueInterpolatedData = {
+    /**
+     * allow getting a cached value for improved performance
+     */
+    allowCache?: boolean;
     /**
      * job id
      */

package/dist/parse/parse-schema.d.ts

@@ -11,11 +11,11 @@ export interface SchemaProperty {
     pattern?: string;
     default?: any;
     enum?: EnumType;
-    contentEncoding?: 'base64' | 'binary';
+    contentEncoding?: "base64" | "binary";
     format?: string;
     items?: {
-        type?: 'string' | 'number' | 'bytes' | 'object' | 'resource';
-        contentEncoding?: 'base64';
+        type?: "string" | "number" | "bytes" | "object" | "resource";
+        contentEncoding?: "base64";
         enum?: string[];
         resourceType?: string;
         properties?: {
@@ -42,54 +42,3 @@ export interface SchemaProperty {
     oneOf?: SchemaProperty[];
     originalType?: string;
 }
-/**
- * Converts argument signature types to JSON schema properties.
- * This function handles various Windmill-specific types and converts them
- * to standard JSON schema format while preserving existing property metadata.
- *
- * @param t - The argument signature type definition (can be string or complex object types)
- * @param oldS - Existing schema property to update with new type information
- */
-export declare function argSigToJsonSchemaType(t: string | {
-    resource: string | null;
-} | {
-    list: (string | {
-        name?: string;
-        props?: {
-            key: string;
-            typ: any;
-        }[];
-    }) | {
-        str: any;
-    } | {
-        object: {
-            name?: string;
-            props?: {
-                key: string;
-                typ: any;
-            }[];
-        };
-    } | null;
-} | {
-    dynselect: string;
-} | {
-    dynmultiselect: string;
-} | {
-    str: string[] | null;
-} | {
-    object: {
-        name?: string;
-        props?: {
-            key: string;
-            typ: any;
-        }[];
-    };
-} | {
-    oneof: {
-        label: string;
-        properties: {
-            key: string;
-            typ: any;
-        }[];
-    }[];
-}, oldS: SchemaProperty): void;

package/dist/parse/parse-schema.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.argSigToJsonSchemaType = argSigToJsonSchemaType;
 /**
  * Converts argument signature types to JSON schema properties.
  * This function handles various Windmill-specific types and converts them
@@ -10,39 +9,39 @@ exports.argSigToJsonSchemaType = argSigToJsonSchemaType;
  * @param oldS - Existing schema property to update with new type information
  */
 function argSigToJsonSchemaType(t, oldS) {
-    const newS = { type: '' };
-    if (t === 'int') {
-        newS.type = 'integer';
+    const newS = { type: "" };
+    if (t === "int") {
+        newS.type = "integer";
     }
-    else if (t === 'float') {
-        newS.type = 'number';
+    else if (t === "float") {
+        newS.type = "number";
     }
-    else if (t === 'bool') {
-        newS.type = 'boolean';
+    else if (t === "bool") {
+        newS.type = "boolean";
     }
-    else if (t === 'email') {
-        newS.type = 'string';
-        newS.format = 'email';
+    else if (t === "email") {
+        newS.type = "string";
+        newS.format = "email";
     }
-    else if (t === 'sql') {
-        newS.type = 'string';
-        newS.format = 'sql';
+    else if (t === "sql") {
+        newS.type = "string";
+        newS.format = "sql";
     }
-    else if (t === 'yaml') {
-        newS.type = 'string';
-        newS.format = 'yaml';
+    else if (t === "yaml") {
+        newS.type = "string";
+        newS.format = "yaml";
     }
-    else if (t === 'bytes') {
-        newS.type = 'string';
-        newS.contentEncoding = 'base64';
-        newS.originalType = 'bytes';
+    else if (t === "bytes") {
+        newS.type = "string";
+        newS.contentEncoding = "base64";
+        newS.originalType = "bytes";
     }
-    else if (t === 'datetime') {
-        newS.type = 'string';
-        newS.format = 'date-time';
+    else if (t === "datetime") {
+        newS.type = "string";
+        newS.format = "date-time";
     }
-    else if (typeof t !== 'string' && 'oneof' in t) {
-        newS.type = 'object';
+    else if (typeof t !== "string" && "oneof" in t) {
+        newS.type = "object";
         if (t.oneof) {
             newS.oneOf = t.oneof.map((obj) => {
                 const oldObjS = oldS.oneOf?.find((o) => o?.title === obj.label) ?? undefined;
@@ -52,21 +51,21 @@ function argSigToJsonSchemaType(t, oldS) {
                         properties[prop.key] = oldObjS?.properties[prop.key];
                     }
                     else {
-                        properties[prop.key] = { description: '', type: '' };
+                        properties[prop.key] = { description: "", type: "" };
                     }
                     argSigToJsonSchemaType(prop.typ, properties[prop.key]);
                 }
                 return {
-                    type: 'object',
+                    type: "object",
                     title: obj.label,
                     properties,
-                    order: oldObjS?.order ?? undefined
+                    order: oldObjS?.order ?? undefined,
                 };
             });
         }
     }
-    else if (typeof t !== 'string' && `object` in t) {
-        newS.type = 'object';
+    else if (typeof t !== "string" && `object` in t) {
+        newS.type = "object";
         if (t.object.name) {
             newS.format = `resource-${t.object.name}`;
         }
@@ -77,106 +76,116 @@ function argSigToJsonSchemaType(t, oldS) {
                     properties[prop.key] = oldS.properties[prop.key];
                 }
                 else {
-                    properties[prop.key] = { description: '', type: '' };
+                    properties[prop.key] = { description: "", type: "" };
                 }
                 argSigToJsonSchemaType(prop.typ, properties[prop.key]);
             }
             newS.properties = properties;
         }
     }
-    else if (typeof t !== 'string' && `str` in t) {
-        newS.type = 'string';
+    else if (typeof t !== "string" && `str` in t) {
+        newS.type = "string";
         if (t.str) {
-            newS.originalType = 'enum';
+            newS.originalType = "enum";
             newS.enum = t.str;
         }
-        else if (oldS.originalType == 'string' && oldS.enum) {
-            newS.originalType = 'string';
+        else if (oldS.originalType == "string" && oldS.enum) {
+            newS.originalType = "string";
             newS.enum = oldS.enum;
         }
         else {
-            newS.originalType = 'string';
+            newS.originalType = "string";
             newS.enum = undefined;
         }
     }
-    else if (typeof t !== 'string' && `resource` in t) {
-        newS.type = 'object';
+    else if (typeof t !== "string" && `resource` in t) {
+        newS.type = "object";
         newS.format = `resource-${t.resource}`;
     }
-    else if (typeof t !== 'string' && `dynselect` in t) {
-        newS.type = 'object';
+    else if (typeof t !== "string" && `dynselect` in t) {
+        newS.type = "object";
         newS.format = `dynselect-${t.dynselect}`;
     }
-    else if (typeof t !== 'string' && `dynmultiselect` in t) {
-        newS.type = 'object';
+    else if (typeof t !== "string" && `dynmultiselect` in t) {
+        newS.type = "object";
         newS.format = `dynmultiselect-${t.dynmultiselect}`;
     }
-    else if (typeof t !== 'string' && `list` in t) {
-        newS.type = 'array';
-        if (t.list === 'int' || t.list === 'float') {
-            newS.items = { type: 'number' };
-            newS.originalType = 'number[]';
+    else if (typeof t !== "string" && `list` in t) {
+        newS.type = "array";
+        if (t.list === "int" || t.list === "float") {
+            newS.items = { type: "number" };
+            newS.originalType = "number[]";
         }
-        else if (t.list === 'bytes') {
-            newS.items = { type: 'string', contentEncoding: 'base64' };
-            newS.originalType = 'bytes[]';
+        else if (t.list === "bytes") {
+            newS.items = { type: "string", contentEncoding: "base64" };
+            newS.originalType = "bytes[]";
         }
-        else if (t.list && typeof t.list == 'object' && 'str' in t.list && t.list.str) {
-            newS.items = { type: 'string', enum: t.list.str };
-            newS.originalType = 'enum[]';
+        else if (t.list &&
+            typeof t.list == "object" &&
+            "str" in t.list &&
+            t.list.str) {
+            newS.items = { type: "string", enum: t.list.str };
+            newS.originalType = "enum[]";
         }
-        else if (t.list == 'string' || (t.list && typeof t.list == 'object' && 'str' in t.list)) {
-            newS.items = { type: 'string', enum: oldS.items?.enum };
-            newS.originalType = 'string[]';
+        else if (t.list == "string" ||
+            (t.list && typeof t.list == "object" && "str" in t.list)) {
+            newS.items = { type: "string", enum: oldS.items?.enum };
+            newS.originalType = "string[]";
         }
-        else if (t.list && typeof t.list == 'object' && 'resource' in t.list && t.list.resource) {
+        else if (t.list &&
+            typeof t.list == "object" &&
+            "resource" in t.list &&
+            t.list.resource) {
             newS.items = {
-                type: 'resource',
-                resourceType: t.list.resource
+                type: "resource",
+                resourceType: t.list.resource,
             };
-            newS.originalType = 'resource[]';
+            newS.originalType = "resource[]";
         }
-        else if (t.list && typeof t.list == 'object' && 'object' in t.list && t.list.object) {
+        else if (t.list &&
+            typeof t.list == "object" &&
+            "object" in t.list &&
+            t.list.object) {
             if (t.list.object.name) {
                 newS.format = `resource-${t.list.object.name}`;
             }
             if (t.list.object.props && t.list.object.props.length > 0) {
                 const properties = {};
                 for (const prop of t.list.object.props) {
-                    properties[prop.key] = { description: '', type: '' };
+                    properties[prop.key] = { description: "", type: "" };
                     argSigToJsonSchemaType(prop.typ, properties[prop.key]);
                 }
-                newS.items = { type: 'object', properties: properties };
+                newS.items = { type: "object", properties: properties };
             }
             else {
-                newS.items = { type: 'object' };
+                newS.items = { type: "object" };
             }
-            newS.originalType = 'record[]';
+            newS.originalType = "record[]";
         }
         else {
-            newS.items = { type: 'object' };
-            newS.originalType = 'object[]';
+            newS.items = { type: "object" };
+            newS.originalType = "object[]";
         }
     }
     else {
-        newS.type = 'object';
+        newS.type = "object";
     }
     const preservedFields = [
-        'description',
-        'pattern',
-        'min',
-        'max',
-        'currency',
-        'currencyLocale',
-        'multiselect',
-        'customErrorMessage',
-        'required',
-        'showExpr',
-        'password',
-        'order',
-        'dateFormat',
-        'title',
-        'placeholder'
+        "description",
+        "pattern",
+        "min",
+        "max",
+        "currency",
+        "currencyLocale",
+        "multiselect",
+        "customErrorMessage",
+        "required",
+        "showExpr",
+        "password",
+        "order",
+        "dateFormat",
+        "title",
+        "placeholder",
     ];
     preservedFields.forEach((field) => {
         // @ts-ignore
@@ -185,24 +194,34 @@ function argSigToJsonSchemaType(t, oldS) {
             newS[field] = oldS[field];
         }
     });
+    console.log("newS", JSON.stringify(newS, null, 2));
+    console.log("oldS", JSON.stringify(oldS, null, 2));
     if (oldS.type != newS.type) {
         for (const prop of Object.getOwnPropertyNames(newS)) {
-            if (prop != 'description') {
+            if (prop != "description") {
                 // @ts-ignore
                 delete oldS[prop];
             }
         }
     }
-    else if ((oldS.format == 'date' || oldS.format === 'date-time') && newS.format == 'string') {
+    else if ((oldS.format == "date" || oldS.format === "date-time") &&
+        newS.format == "string") {
         newS.format = oldS.format;
     }
-    else if (newS.format == 'date-time' && oldS.format == 'date') {
-        newS.format = 'date';
+    else if (newS.format == "date-time" && oldS.format == "date") {
+        newS.format = "date";
+    }
+    else if (newS.format == "date" || newS.format == "date-time") {
+        newS.format = oldS.format;
     }
     else if (oldS.items?.type != newS.items?.type) {
         delete oldS.items;
     }
-    if (oldS.format && !newS.format) {
+    else if (oldS.type == "string" && oldS.format != undefined) {
+        newS.format = oldS.format;
+    }
+    if ((oldS.type != newS.type || newS.type != "string") &&
+        newS.format == undefined) {
         oldS.format = undefined;
     }
     Object.assign(oldS, newS);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "windmill-utils-internal",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Internal utility functions for Windmill",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",