varlock 0.0.13 → 0.0.14

package/dist/{chunk-MV5ZAKN7.js → chunk-FCVBOYES.js}

@@ -1185,7 +1185,12 @@ var UrlDataType = createEnvGraphDataType(
       return val;
     },
     validate(val) {
-      const url = new URL(val);
+      let url;
+      try {
+        url = new URL(val);
+      } catch (err) {
+        throw new ValidationError("Invalid URL");
+      }
       if (settings?.allowedDomains && !settings.allowedDomains.includes(url.host.toLowerCase())) {
         return new ValidationError(`Domain (${url.host}) is not in allowed list: ${settings.allowedDomains.join(",")}`);
       }
@@ -2045,7 +2050,7 @@ var EnvGraph2 = class {
     const sources = Array.from(this.sortedDataSources).reverse();
     for (const s of sources) {
       if (s.disabled) continue;
-      if (s.importKeys) continue;
+      if (s.isPartialImport) continue;
       const decs = s.getRootDecorators(decoratorName);
       if (decs.length) return decs[0].simplifiedValue;
     }
@@ -2056,7 +2061,7 @@ var EnvGraph2 = class {
     const combinedDecsWithSources = [];
     for (const source of sources) {
       if (source.disabled) continue;
-      if (source.importKeys) continue;
+      if (source.isPartialImport) continue;
       const decs = source.getRootDecorators(decoratorName);
       combinedDecsWithSources.push([source, decs]);
     }
@@ -2429,6 +2434,9 @@ var EnvGraphDataSource3 = class {
   get isImport() {
     return !!this.importMeta?.isImport || !!this.parent?.isImport;
   }
+  get isPartialImport() {
+    return (this.importMeta?.importKeys || []).length > 0;
+  }
   get importKeys() {
     const importKeysArrays = [];
     let currentSource = this;
@@ -2458,6 +2466,13 @@ var EnvGraphDataSource3 = class {
   get envFlagKey() {
     return this._envFlagKey || this.parent?.envFlagKey;
   }
+  /** helper to set the current envFlag key, also propogating upwards */
+  setEnvFlag(key) {
+    this._envFlagKey = key;
+    if (this.parent && !this.isPartialImport && !this.parent._envFlagKey) {
+      this.parent.setEnvFlag(key);
+    }
+  }
   /** environment flag config item getter (follows up the parent chain) */
   get envFlagConfigItem() {
     const envFlagKey = this.envFlagKey;
@@ -2513,7 +2528,7 @@ var EnvGraphDataSource3 = class {
         this._loadingError = new Error(`@envFlag key ${envFlagDecoratorValue} must be an item within this schema`);
         return;
       }
-      this._envFlagKey = envFlagDecoratorValue;
+      this.setEnvFlag(envFlagDecoratorValue);
     }
     for (const itemKey of this.importKeys || my_dash_default.keys(this.configItemDefs)) {
       const itemDef = this.configItemDefs[itemKey];
@@ -2600,18 +2615,6 @@ var EnvGraphDataSource3 = class {
         }
       }
     }
-    if (envFlagDecoratorValue) {
-      const envFlagItem = this.envFlagConfigItem;
-      await envFlagItem.earlyResolve();
-      if (!envFlagItem.isValid) {
-        const err = new Error("resolved @envFlag value is not valid");
-        err.cause = envFlagItem.errors[0];
-        throw err;
-      }
-      if (!my_dash_default.isString(envFlagItem.resolvedValue)) {
-        throw new Error("expected resolved @envFlag value to be a string");
-      }
-    }
   }
   /**
    * called by the finishInit - meant to be overridden by subclasses
@@ -2807,9 +2810,6 @@ var DirectoryDataSource = class extends EnvGraphDataSource3 {
   get loadingError() {
     return this._loadingError || this.schemaDataSource?.loadingError;
   }
-  get envFlagKey() {
-    return this.schemaDataSource?._envFlagKey || this.parent?.envFlagKey;
-  }
   async addAutoLoadedFile(fileName) {
     if (!this.graph) throw new Error("expected graph to be set");
     const filePath = path2.join(this.basePath, fileName);
@@ -3048,5 +3048,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, FileBasedDataSource, ResolutionError, SchemaError, ValidationError, ansis_default, asyncExitHook, checkIsFileGitIgnored, getItemSummary, gracefulExit, joinAndCompact, loadEnvGraph, my_dash_default, pathExists, pathExistsSync, tryCatch };
-//# sourceMappingURL=chunk-MV5ZAKN7.js.map
-//# sourceMappingURL=chunk-MV5ZAKN7.js.map
+//# sourceMappingURL=chunk-FCVBOYES.js.map
+//# sourceMappingURL=chunk-FCVBOYES.js.map