varlock 0.0.10 → 0.0.12

package/dist/{chunk-ZW2T4C6A.js → chunk-NXAXPMO5.js}

@@ -1780,7 +1780,8 @@ async function getTsDefinitionForItem(item, indentLevel = 0) {
       }
     }
   }
-  itemSrc.push(`readonly ${item.key}${item.isRequired ? "" : "?"}: ${itemTsType};`);
+  const isRequired = item.isRequired && !item.isRequiredDynamic;
+  itemSrc.push(`readonly ${item.key}${isRequired ? "" : "?"}: ${itemTsType};`);
   itemSrc.push("");
   return my_dash_default.map(itemSrc, (line) => `${i}${line}`);
 }
@@ -1902,8 +1903,8 @@ var EnvGraph2 = class {
         continue;
       }
       if (source.decorators?.envFlag) {
-        if (source.applyForEnv) {
-          throw new Error(`@envFlag cannot be set from within an env-specific data source - ${source.label}`);
+        if (source.type !== "schema") {
+          throw new Error(`@envFlag must only be used in .env.schema, but was found in ${source.label}`);
         } else if (this.envFlagKey) {
           throw new Error("only a single @envFlag setting is allowed");
         } else {
@@ -2175,40 +2176,74 @@ var ConfigItem3 = class {
       const dataTypeFactory = this.envGraph.dataTypesRegistry[dataTypeName];
       this.dataType = dataTypeFactory(...my_dash_default.isPlainObject(dataTypeArgs) ? [dataTypeArgs] : dataTypeArgs);
     }
+    this.processRequired();
   }
-  get isRequired() {
-    for (const def of this.defs) {
-      const defDecorators = def.itemDef.decorators || {};
-      if ("required" in defDecorators) {
-        const val = defDecorators.required.simplifiedValue;
-        if (typeof val === "boolean") return val;
-        if (typeof val === "string") return val === "true";
-        return Boolean(val);
-      }
-      if ("optional" in defDecorators) {
-        const val = defDecorators.optional.simplifiedValue;
-        if (typeof val === "boolean") return !val;
-        if (typeof val === "string") return val !== "true";
-        return !val;
-      }
-      if ("defaultRequired" in def.source.decorators) {
-        const val = def.source.decorators.defaultRequired.simplifiedValue;
-        if (val === "infer") {
-          if (def.source.type === "schema") {
-            const resolver = def.itemDef.resolver;
-            if (resolver instanceof StaticValueResolver) {
-              return resolver.staticValue !== void 0 && resolver.staticValue !== "";
+  _isRequired = true;
+  /**
+   * need to track if required-ness is dynamic, e.g. based on current env
+   * because that will affect type generation (only _always_ required items are never undefined)
+   * */
+  _isRequiredDynamic = false;
+  processRequired() {
+    try {
+      for (const def of this.defs) {
+        const defDecorators = def.itemDef.decorators || {};
+        if ("required" in defDecorators || "optional" in defDecorators) {
+          if ("required" in defDecorators && "optional" in defDecorators) {
+            throw new SchemaError("@required and @optional cannot both be set");
+          }
+          const requiredDecoratorVal = defDecorators.required?.value || defDecorators.optional?.value;
+          const usingOptional = "optional" in defDecorators;
+          if (requiredDecoratorVal instanceof ParsedEnvSpecStaticValue) {
+            const staticVal = requiredDecoratorVal.value;
+            if (my_dash_default.isBoolean(staticVal)) {
+              this._isRequired = usingOptional ? !staticVal : staticVal;
             } else {
-              return true;
+              throw new SchemaError("@required/@optional can only be set to true/false if using a static value");
+            }
+          } else if (requiredDecoratorVal instanceof ParsedEnvSpecFunctionCall) {
+            this._isRequiredDynamic = true;
+            const requiredFnName = requiredDecoratorVal.name;
+            const requiredFnArgs = requiredDecoratorVal.simplifiedArgs;
+            if (requiredFnName === "forEnv") {
+              const currentEnv = this.#envGraph.envFlagValue;
+              if (!currentEnv) {
+                throw new SchemaError("Cannot set @required using forEnv() because environment flag is not set");
+              }
+              const envMatches = requiredFnArgs.includes(currentEnv);
+              this._isRequired = usingOptional ? !envMatches : envMatches;
+            }
+          }
+          return;
+        }
+        if ("defaultRequired" in def.source.decorators) {
+          const val = def.source.decorators.defaultRequired.simplifiedValue;
+          if (val === "infer") {
+            if (def.source.type === "schema") {
+              const resolver = def.itemDef.resolver;
+              if (resolver instanceof StaticValueResolver) {
+                this._isRequired = resolver.staticValue !== void 0 && resolver.staticValue !== "";
+              } else {
+                this._isRequired = true;
+              }
+              return;
+            } else {
+              continue;
             }
-          } else {
-            continue;
           }
+          this._isRequired = val;
+          return;
         }
-        return val;
       }
+    } catch (err) {
+      this.schemaErrors.push(err instanceof SchemaError ? err : new SchemaError(err));
     }
-    return true;
+  }
+  get isRequired() {
+    return this._isRequired;
+  }
+  get isRequiredDynamic() {
+    return this._isRequiredDynamic;
   }
   get isSensitive() {
     for (const def of this.defs) {
@@ -2462,9 +2497,6 @@ var FileBasedDataSource = class extends EnvGraphDataSource {
       throw Error(`Unsure how to interpret filename - ${this.fileName}`);
     } else if (fileNameParts.length === 2) {
       this.applyForEnv = fileNameParts[1];
-      if (this.applyForEnv === "dev") this.applyForEnv = "development";
-      if (this.applyForEnv === "stage") this.applyForEnv = "staging";
-      if (this.applyForEnv === "prod") this.applyForEnv = "production";
     }
   }
   // no async constructors... :(
@@ -2776,5 +2808,5 @@ __name(gracefulExit, "gracefulExit");
 //! these are probably not relevant anymore, or needs to move to a plugin layer?
 
 export { CoercionError, ConfigLoadError, DotEnvFileDataSource, EnvGraph2 as EnvGraph, EnvSourceParseError, ProcessEnvDataSource, ResolutionError, SchemaError, StaticValueResolver, ValidationError, ansis_default, asyncExitHook, checkIsFileGitIgnored, getItemSummary, gracefulExit, joinAndCompact, loadEnvGraph, my_dash_default };
-//# sourceMappingURL=chunk-ZW2T4C6A.js.map
-//# sourceMappingURL=chunk-ZW2T4C6A.js.map
+//# sourceMappingURL=chunk-NXAXPMO5.js.map
+//# sourceMappingURL=chunk-NXAXPMO5.js.map