@highstate/pulumi 0.9.15 → 0.9.18

package/dist/highstate.manifest.json

@@ -1,5 +1,5 @@
 {
   "sourceHashes": {
-    "./dist/index.js": "633a08c5c489e757e251aea53802531d602cbc505b32ef20d08092b62c746f6f"
+    "./dist/index.js": 938090806
   }
 }

package/dist/index.js

@@ -1,38 +1,31 @@
-// src/index.ts
-export * from "@pulumi/pulumi";
-
-// src/unit.ts
-import {
-  parseInstanceId,
-  getInstanceId
-} from "@highstate/contract";
-import { Type } from "@sinclair/typebox";
-import { mapValues, pickBy, pipe } from "remeda";
-import {
-  Config,
-  getStack,
-  output,
-  secret as secret2,
-  StackReference
-} from "@pulumi/pulumi";
-import { Ajv } from "ajv";
+import { getStack, secret, output, Config, all, StackReference } from '@pulumi/pulumi';
+export * from '@pulumi/pulumi';
+import { HighstateSignature, getInstanceId, camelCaseToHumanReadable, unitArtifactSchema, unitSecretSchema, parseInstanceId } from '@highstate/contract';
+import { mapValues, pipe, pickBy } from 'remeda';
+import { Ajv } from 'ajv';
 
-// src/secret.ts
-import { secret } from "@pulumi/pulumi";
-var createdSecrets = {};
-function getOrCreateSecret(secrets, key, create) {
-  return secrets[key].apply((value) => {
-    if (value !== void 0) {
-      createdSecrets[key] = value;
-      return value;
-    }
-    const secretValue = createdSecrets[key] ?? secret(create());
-    createdSecrets[key] = secretValue;
-    return secretValue;
-  });
+// src/index.ts
+var updatedSecretValues = {};
+function ensureSecretValue(secret2, create) {
+  return {
+    [HighstateSignature.Secret]: true,
+    id: secret2.id,
+    value: secret2.value.apply((value) => {
+      if (value !== void 0) {
+        return value;
+      }
+      updatedSecretValues[secret2.id] = secret(create());
+      return updatedSecretValues[secret2.id];
+    })
+  };
 }
-function storeSecret(_secrets, key, value) {
-  createdSecrets[key] = value;
+function updateSecretValue(secret2, value) {
+  updatedSecretValues[secret2.id] = secret(value);
+  return {
+    [HighstateSignature.Secret]: true,
+    id: secret2.id,
+    value: output(updatedSecretValues[secret2.id])
+  };
 }
 
 // src/unit.ts
@@ -68,12 +61,16 @@ function getOutput(unit, input, refs) {
   const _getOutput = (ref) => {
     const value = getStackRef(ref).requireOutput(ref.output);
     return value.apply((value2) => {
-      let schema = entity.schema;
-      if (input.multiple) {
-        schema = Type.Union([schema, Type.Array(schema)]);
-      }
-      if (!ajv.validate(schema, value2)) {
-        throw new Error(`Invalid output for '${input.type}': ${ajv.errorsText()}`);
+      if (Array.isArray(value2)) {
+        for (const [index, item] of value2.entries()) {
+          if (!ajv.validate(entity.schema, item)) {
+            throw new Error(`Invalid output for '${input.type}[${index}]': ${ajv.errorsText()}`);
+          }
+        }
+      } else {
+        if (!ajv.validate(entity.schema, value2)) {
+          throw new Error(`Invalid output for '${input.type}': ${ajv.errorsText()}`);
+        }
       }
       if (Array.isArray(value2)) {
         return value2;
@@ -89,9 +86,7 @@ function getOutput(unit, input, refs) {
 }
 function isAnyOfSchema(schema, itemType) {
   if (schema.anyOf) {
-    return Object.values(schema.anyOf).every(
-      (schema2) => isAnyOfSchema(schema2, itemType)
-    );
+    return Object.values(schema.anyOf).every((schema2) => isAnyOfSchema(schema2, itemType));
   }
   return schema.type === itemType;
 }
@@ -127,15 +122,38 @@ function forUnit(unit) {
   const args = mapValues(unit.model.args, (arg, argName) => {
     switch (true) {
       case isStringSchema(arg.schema): {
-        return arg.required ? config.require(argName) : config.get(argName) ?? arg.schema.default;
+        if (arg.required) {
+          return config.require(argName);
+        }
+        return config.get(argName) || arg.schema.default;
       }
       case isNumberSchema(arg.schema): {
-        return arg.required ? config.requireNumber(argName) : config.getNumber(argName) ?? arg.schema.default;
+        if (arg.required) {
+          return config.requireNumber(argName);
+        }
+        const value = config.get(argName);
+        if (!value) {
+          return arg.schema.default;
+        }
+        return config.getNumber(argName) ?? arg.schema.default;
       }
       case isBooleanSchema(arg.schema): {
-        return arg.required ? config.requireBoolean(argName) : config.getBoolean(argName) ?? arg.schema.default;
+        if (arg.required) {
+          return config.requireBoolean(argName);
+        }
+        const value = config.get(argName);
+        if (!value) {
+          return arg.schema.default;
+        }
+        return config.getBoolean(argName) ?? arg.schema.default;
       }
       default: {
+        if (!arg.required) {
+          const value2 = config.get(argName);
+          if (!value2) {
+            return arg.schema.default;
+          }
+        }
         const value = arg.required ? config.requireObject(argName) : config.getObject(argName);
         if (value === void 0) return arg.schema.default;
         if (!ajv.validate(arg.schema, value)) {
@@ -145,28 +163,38 @@ function forUnit(unit) {
       }
     }
   });
-  const secrets = output(
-    mapValues(unit.model.secrets, (secret3, secretName) => {
-      switch (true) {
-        case isStringSchema(secret3.schema): {
-          return secret3.required ? config.requireSecret(secretName) : config.getSecret(secretName);
-        }
-        case isNumberSchema(secret3.schema): {
-          return secret3.required ? config.requireSecretNumber(secretName) : config.getSecretNumber(secretName);
-        }
-        case isBooleanSchema(secret3.schema): {
-          return secret3.required ? config.requireSecretBoolean(secretName) : config.getSecretBoolean(secretName);
-        }
-        default: {
-          const value = secret3.required ? config.requireSecretObject(secretName) : config.getSecretObject(secretName);
-          if (!ajv.validate(secret3.schema, value)) {
-            throw new Error(`Invalid secret for '${secretName}': ${ajv.errorsText()}`);
-          }
-          return value;
+  const secretIds = config.requireObject("$secretIds");
+  const getSecretValue = (secretName, secret2) => {
+    switch (true) {
+      case isStringSchema(secret2.schema): {
+        return secret2.required ? config.requireSecret(secretName) : config.getSecret(secretName);
+      }
+      case isNumberSchema(secret2.schema): {
+        return secret2.required ? config.requireSecretNumber(secretName) : config.getSecretNumber(secretName);
+      }
+      case isBooleanSchema(secret2.schema): {
+        return secret2.required ? config.requireSecretBoolean(secretName) : config.getSecretBoolean(secretName);
+      }
+      default: {
+        const value = secret2.required ? config.requireSecretObject(secretName) : config.getSecretObject(secretName);
+        if (!ajv.validate(secret2.schema, value)) {
+          throw new Error(`Invalid secret for '${secretName}': ${ajv.errorsText()}`);
         }
+        return value;
       }
-    })
-  );
+    }
+  };
+  const secrets = mapValues(unit.model.secrets, (secret2, secretName) => {
+    const secretId = secretIds[secretName];
+    if (!secretId) {
+      throw new Error(`Secret '${secretName}' not found in the config.`);
+    }
+    return {
+      [HighstateSignature.Secret]: true,
+      id: secretId,
+      value: secret2.required ? config.requireSecret(secretName) : output(getSecretValue(secretName, secret2))
+    };
+  });
   const inputs = mapValues(unit.model.inputs, (input, inputName) => {
     const value = input.required ? config.requireObject(`input.${inputName}`) : config.getObject(`input.${inputName}`);
     if (!value) {
@@ -189,15 +217,12 @@ function forUnit(unit) {
     invokedTriggers: config.getObject("$invokedTriggers") ?? [],
     outputs: async (outputs = {}) => {
       const result = mapValues(outputs, (outputValue, outputName) => {
-        if (outputName === "$status") {
-          return output(outputValue).apply(mapStatus);
+        if (outputName === "$statusFields") {
+          return output(outputValue).apply(mapStatusFields);
         }
         if (outputName === "$pages") {
           return output(outputValue).apply(mapPages);
         }
-        if (outputName === "$files") {
-          return output(outputValue).apply(mapFiles);
-        }
         if (outputName === "$terminals") {
           return output(outputValue).apply(mapTerminals);
         }
@@ -224,7 +249,7 @@ function forUnit(unit) {
             }
             return void 0;
           }
-          const schema = outputModel.multiple ? Type.Array(entity.schema) : entity.schema;
+          const schema = outputModel.multiple ? entity.schema.array() : entity.schema;
           if (!ajv.validate(schema, value)) {
             throw new Error(`Invalid output for '${outputName}': ${ajv.errorsText()}`);
           }
@@ -232,8 +257,32 @@ function forUnit(unit) {
         });
       });
       await Promise.all(Object.values(result).map((o) => outputToPromise(o)));
-      if (Object.keys(createdSecrets).length > 0) {
-        result.$secrets = createdSecrets;
+      result.$secrets = updatedSecretValues;
+      const secretsMap = {};
+      for (const [outputName, outputValue] of Object.entries(outputs)) {
+        if (!outputName.startsWith("$")) {
+          const resolvedValue = await outputToPromise(outputValue);
+          const secrets2 = extractObjectsFromValue(unitSecretSchema, resolvedValue);
+          if (secrets2.length > 0) {
+            secretsMap[outputName] = secrets2;
+          }
+        }
+      }
+      const artifactsMap = {};
+      for (const [outputName, outputValue] of Object.entries(outputs)) {
+        if (!outputName.startsWith("$")) {
+          const resolvedValue = await outputToPromise(outputValue);
+          const artifacts = extractObjectsFromValue(unitArtifactSchema, resolvedValue);
+          if (artifacts.length > 0) {
+            artifactsMap[outputName] = artifacts;
+          }
+        }
+      }
+      if (Object.keys(artifactsMap).length > 0) {
+        result.$exportedArtifacts = artifactsMap;
+      }
+      if (Object.keys(secretsMap).length > 0) {
+        result.$exportedSecretIds = mapValues(secretsMap, (v) => v.map((secret2) => secret2.id));
       }
       return result;
     }
@@ -242,21 +291,42 @@ function forUnit(unit) {
 function outputToPromise(o) {
   return new Promise((resolve) => output(o).apply(resolve));
 }
-function mapStatus(status) {
+function mapStatusFields(status) {
   if (!status) {
     return [];
   }
   if (Array.isArray(status)) {
-    return status.filter((field) => !!field?.value);
+    return status.filter((field) => !!field?.value).map((field) => {
+      return {
+        name: field.name,
+        meta: {
+          title: field.meta?.title ?? camelCaseToHumanReadable(field.name)
+        },
+        value: field.value
+      };
+    });
   }
   return Object.entries(status).map(([name, field]) => {
     if (!field) {
       return void 0;
     }
     if (typeof field === "string" || typeof field === "number" || typeof field === "boolean" || Array.isArray(field)) {
-      return { name, value: field };
+      return {
+        name,
+        meta: {
+          title: camelCaseToHumanReadable(name)
+        },
+        value: field
+      };
     }
-    return { ...field, name };
+    return {
+      ...field,
+      meta: {
+        ...field.meta,
+        title: field.meta?.title ?? camelCaseToHumanReadable(name)
+      },
+      name
+    };
   }).filter((field) => !!field?.value);
 }
 function mapPages(pages) {
@@ -275,7 +345,10 @@ function fileFromString(name, content, contentType = "text/plain", isSecret = fa
       contentType,
       size: Buffer.byteLength(content, "utf8")
     },
-    content: isSecret ? secret2(content) : content
+    content: {
+      type: "embedded",
+      value: isSecret ? secret(content) : content
+    }
   };
 }
 function fileFromBuffer(name, content, contentType = "application/octet-stream", isSecret = false) {
@@ -286,12 +359,12 @@ function fileFromBuffer(name, content, contentType = "application/octet-stream",
       size: content.byteLength,
       isBinary: true
     },
-    content: isSecret ? secret2(content.toString("base64")) : content.toString("base64")
+    content: {
+      type: "embedded",
+      value: isSecret ? secret(content.toString("base64")) : content.toString("base64")
+    }
   };
 }
-function mapFiles(files) {
-  return files?.filter((file) => !!file) ?? [];
-}
 function mapTerminals(terminals) {
   if (!terminals) {
     return [];
@@ -305,21 +378,34 @@ function mapTerminals(terminals) {
     });
   }
   return terminals.filter((terminal) => !!terminal).map((terminal) => {
-    if (!terminal.files) {
+    if (!terminal.spec.files) {
       return terminal;
     }
     return {
       ...terminal,
-      files: pipe(
-        terminal.files,
-        mapValues((file) => {
-          if (typeof file === "string") {
-            return { content: file };
-          }
-          return file;
-        }),
-        pickBy((value) => !!value?.content)
-      )
+      spec: {
+        ...terminal.spec,
+        files: pipe(
+          terminal.spec.files,
+          mapValues((file) => {
+            if (typeof file === "string") {
+              return {
+                meta: {
+                  name: "content",
+                  contentType: "text/plain",
+                  size: Buffer.byteLength(file, "utf8")
+                },
+                content: {
+                  type: "embedded",
+                  value: file
+                }
+              };
+            }
+            return file;
+          }),
+          pickBy((value) => !!value)
+        )
+      }
     };
   });
 }
@@ -332,9 +418,30 @@ function mapTriggers(triggers) {
   }
   return Object.entries(triggers).filter(([, trigger]) => !!trigger).map(([name, trigger]) => ({ ...trigger, name }));
 }
-
-// src/utils.ts
-import { output as output2, all } from "@pulumi/pulumi";
+function extractObjectsFromValue(schema, data) {
+  const result = [];
+  function traverse(obj) {
+    if (obj === null || obj === void 0 || typeof obj !== "object") {
+      return;
+    }
+    if (Array.isArray(obj)) {
+      for (const item of obj) {
+        traverse(item);
+      }
+      return;
+    }
+    const parseResult = schema.safeParse(obj);
+    if (parseResult.success) {
+      result.push(parseResult.data);
+      return;
+    }
+    for (const value of Object.values(obj)) {
+      traverse(value);
+    }
+  }
+  traverse(data);
+  return result;
+}
 function flattenInputs(...values) {
   return all(values).apply((allValues) => {
     const result = [];
@@ -349,7 +456,7 @@ function flattenInputs(...values) {
   });
 }
 function mapInputs(array, fn) {
-  return output2(array).apply((array2) => {
+  return output(array).apply((array2) => {
     return array2?.map((v, index) => fn(v, index, array2)) ?? [];
   });
 }
@@ -365,7 +472,7 @@ function mapOptional(input, func) {
   return func(input);
 }
 function toPromise(input) {
-  return new Promise((resolve) => output2(input).apply(resolve));
+  return new Promise((resolve) => output(input).apply(resolve));
 }
 function singleton(factory) {
   let instance;
@@ -386,7 +493,7 @@ function providerFactory(factory) {
   };
 }
 function mergeInputObjects(...objects) {
-  return output2(objects).apply((array) => {
+  return output(objects).apply((array) => {
     return Object.assign({}, ...array);
   });
 }
@@ -400,30 +507,12 @@ function normalize(item, collection) {
   return collection ?? [];
 }
 function apply(fn) {
-  return (input) => output2(input).apply(fn);
+  return (input) => output(input).apply(fn);
 }
 function applyMap(fn) {
-  return (input) => output2(input).apply((array) => array.map(fn));
+  return (input) => output(input).apply((array) => array.map(fn));
 }
-export {
-  apply,
-  applyMap,
-  fileFromBuffer,
-  fileFromString,
-  flatMapInput,
-  flattenInputs,
-  forUnit,
-  getOrCreateSecret,
-  getResourceComment,
-  getUnitInstanceId,
-  getUnitInstanceName,
-  mapInputs,
-  mapOptional,
-  mergeInputObjects,
-  normalize,
-  providerFactory,
-  singleton,
-  storeSecret,
-  toPromise
-};
+
+export { apply, applyMap, ensureSecretValue, fileFromBuffer, fileFromString, flatMapInput, flattenInputs, forUnit, getResourceComment, getUnitInstanceId, getUnitInstanceName, mapInputs, mapOptional, mergeInputObjects, normalize, providerFactory, singleton, toPromise, updateSecretValue };
+//# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map