add tests for new eq, if resolvers

.changeset/twelve-things-hang.md

@@ -0,0 +1,2 @@
+---
+---

.vscode/settings.json

@@ -5,6 +5,7 @@
   "files.associations": {
     // package.json needs to be "json" rather than "json with comments" so that the "version lens" plugin works
     "package.json": "json",
+    "turbo.json": "jsonc",
   },
   "eslint.validate": [
     // enable eslint on file types other than js/ts
@@ -24,7 +25,7 @@
   // these are written out individually because if written as a group
   // users cannot override individual items in their settings.json
   "[typescript]": {
-    "editor.defaultFormatter": "vscode.typescript-language-features"
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
   },
   "[javascript]": {
     "editor.defaultFormatter": "dbaeumer.vscode-eslint"
@@ -42,17 +43,12 @@
     "editor.defaultFormatter": "dbaeumer.vscode-eslint"
   },
   "[json]": {
-    "editor.defaultFormatter": "vscode.json-language-features"
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
   },
   "[jsonc]": {
-    "editor.defaultFormatter": "vscode.json-language-features"
+    "editor.defaultFormatter": "dbaeumer.vscode-eslint"
   },
   "[env]": {
     "editor.formatOnSave": false
   },
-
-  // vscode's built-in json formatter is removing the extra newline at the end which conflicts with editorconfig
-  // "json.format.keepLines": true,
-  // "json.format.enable": false,
-
 }

eslint.config.mjs

@@ -45,7 +45,7 @@ export default tseslint.config(
       'packages/eslint-custom-rules',
       'packages/env-spec-parser/src/grammar.js',
       'packages/varlock-website/.astro',
-      'packages/varlock/env-graph/test/plugins',
+      'packages/varlock/src/env-graph/test/plugins',
       '**/*.ignore',
       '**/.vercel',
       '**/.netlify',

package.json

@@ -10,9 +10,9 @@
   "scripts": {
     "build": "turbo build --filter='!./examples/**'",
     "build:libs": "pnpm run build --filter=\"!@varlock/website\"",
-    "test:ci": "turbo test:ci",
+    "test:ci": "turbo test:ci --filter='!./examples/**'",
     "preinstall": "npx only-allow pnpm",
-    "dev": "turbo run dev --concurrency=40 --parallel",
+    "dev": "turbo run dev --concurrency=40 --parallel --filter='!./examples/**'",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "changeset:add": "changeset add",

packages/varlock/package.json

@@ -16,6 +16,7 @@
     "build:sea": "tsup --config tsup-sea.config.ts",
     "dev": "tsup",
     "test": "vitest",
+    "test:ci": "vitest --run",
     "lint": "eslint .",
     "lint:fix": "pnpm run lint --fix"
   },

packages/varlock/src/cli/commands/load.command.ts

@@ -6,7 +6,7 @@ import { getItemSummary } from '../../lib/formatting';
 import { checkForConfigErrors, checkForSchemaErrors } from '../helpers/error-checks';
 import { type TypedGunshiCommandFn } from '../helpers/gunshi-type-utils';
 import path from 'node:path';
-import { FileBasedDataSource } from '../../../env-graph';
+import { FileBasedDataSource } from '../../env-graph';
 
 export const commandSpec = define({
   name: 'load',

packages/varlock/src/cli/commands/plugin.command.ts

@@ -1,5 +1,5 @@
 import { define } from 'gunshi';
-import { loadEnvGraph } from '../../../env-graph';
+import { loadEnvGraph } from '../../env-graph';
 import { type TypedGunshiCommandFn } from '../helpers/gunshi-type-utils';
 import { checkForSchemaErrors } from '../helpers/error-checks';
 

packages/varlock/src/cli/helpers/error-checks.ts

@@ -1,9 +1,9 @@
 import ansis from 'ansis';
 import { gracefulExit } from 'exit-hook';
 import _ from '@env-spec/utils/my-dash';
-import { EnvGraph, ConfigItem } from '../../../env-graph';
+import { EnvGraph, ConfigItem } from '../../env-graph';
 import { getItemSummary, joinAndCompact } from '../../lib/formatting';
-import { VarlockError } from '../../../env-graph/lib/errors';
+import { VarlockError } from '../../env-graph/lib/errors';
 
 
 function showErrorLocationDetails(err: Error) {

packages/varlock/env-graph/test/helpers/generic-test.ts → packages/varlock/src/env-graph/test/helpers/generic-test.ts

@@ -78,8 +78,8 @@ export function envFilesTest(spec: {
         for (const key of Object.keys(spec.expectValues)) {
           const item = g.configSchema[key];
           if (spec.expectValues[key] === SchemaError) {
-            expect(item._schemaErrors.length).toBe(1);
-            expect(item._schemaErrors[0]).toBeInstanceOf(spec.expectValues[key]);
+            expect(item.errors.length).toBeGreaterThan(0);
+            expect(item.errors[0]).toBeInstanceOf(spec.expectValues[key]);
           } else {
             expect(item.resolvedValue, `${key} value did not match`).toEqual(spec.expectValues[key]);
           }
@@ -94,8 +94,8 @@ export function envFilesTest(spec: {
         for (const key of Object.keys(spec.expectRequired)) {
           const item = g.configSchema[key];
           if (spec.expectRequired[key] === SchemaError) {
-            expect(item._schemaErrors.length, 'Expected a schema error').toBe(1);
-            expect(item._schemaErrors[0]).toBeInstanceOf(spec.expectRequired[key]);
+            expect(item.errors.length, 'Expected a schema error').toBeGreaterThan(0);
+            expect(item.errors[0]).toBeInstanceOf(spec.expectRequired[key]);
           } else {
             expect(item.isRequired, `expected ${key} to be ${spec.expectRequired[key] ? 'required' : 'NOT required'}`).toBe(spec.expectRequired[key]);
           }

packages/varlock/env-graph/test/plugins/test-plugin-conflict-1/plugin.js → packages/varlock/src/env-graph/test/plugins/test-plugin-conflict-1/plugin.js

@@ -1,4 +1,4 @@
-/// <reference path="../../../../src/plugin-lib.ts" />
+/// <reference path="../../../../plugin-lib.ts" />
 
 plugin.registerResolverFunction({
   name: 'conflict',

packages/varlock/env-graph/test/plugins/test-plugin-conflict-2/plugin.js → packages/varlock/src/env-graph/test/plugins/test-plugin-conflict-2/plugin.js

@@ -1,4 +1,4 @@
-/// <reference path="../../../../src/plugin-lib.ts" />
+/// <reference path="../../../../plugin-lib.ts" />
 
 plugin.registerResolverFunction({
   name: 'conflict',

packages/varlock/env-graph/test/plugins/test-plugin-version-conflict/plugin.js → packages/varlock/src/env-graph/test/plugins/test-plugin-version-conflict/plugin.js

@@ -1,4 +1,4 @@
-/// <reference path="../../../../src/plugin-lib.ts" />
+/// <reference path="../../../../plugin-lib.ts" />
 
 plugin.registerResolverFunction({
   name: 'noop',

packages/varlock/env-graph/test/plugins/test-plugin/plugin.js → packages/varlock/src/env-graph/test/plugins/test-plugin/plugin.js

@@ -1,4 +1,4 @@
-/// <reference path="../../../../src/plugin-lib.ts" />
+/// <reference path="../../../../plugin-lib.ts" />
 
 plugin.registerResolverFunction({
   name: 'test',

packages/varlock/env-graph/test/resolvers.test.ts → packages/varlock/src/env-graph/test/resolvers.test.ts

@@ -266,6 +266,126 @@ describe('remap()', functionValueTests({
   },
 }));
 
+describe('eq()', functionValueTests({
+  'check equality': {
+    input: outdent`
+      STR=eq("a", "a")
+      NUM=eq(42, 42)
+      BOOL=eq(false, false)
+      UNDEF=eq(undefined, undefined)
+    `,
+    expected: {
+      STR: true,
+      NUM: true,
+      BOOL: true,
+      UNDEF: true,
+    },
+  },
+  'check inequality': {
+    input: outdent`
+      STR=eq("a", "b")
+      NUM=eq(42, 41)
+      BOOL=eq(true, false)
+      MIXED=eq(42, "42")
+    `,
+    expected: {
+      STR: false,
+      NUM: false,
+      BOOL: false,
+      MIXED: false,
+    },
+  },
+  'with variables': {
+    input: outdent`
+      A=test
+      B=test
+      C=different
+      ITEM1=eq($A, $B)
+      ITEM2=eq($A, $C)
+    `,
+    expected: { ITEM1: true, ITEM2: false },
+  },
+  'with nested resolvers': {
+    input: 'ITEM=eq(concat("a", "b"), "ab")',
+    expected: { ITEM: true },
+  },
+  'working example - undefined values': {
+    input: outdent`
+      A=
+      B=
+      ITEM=eq($A, $B)
+    `,
+    expected: { A: undefined, B: undefined, ITEM: true },
+  },
+  'error - no args': {
+    input: 'ITEM=eq()',
+    expected: { ITEM: SchemaError },
+  },
+  'error - single arg': {
+    input: 'ITEM=eq("a")',
+    expected: { ITEM: SchemaError },
+  },
+  'error - too many args': {
+    input: 'ITEM=eq("a", "b", "c")',
+    expected: { ITEM: SchemaError },
+  },
+  'error - key/val args': {
+    input: 'ITEM=eq(left="a", right="b")',
+    expected: { ITEM: SchemaError },
+  },
+}));
+
+describe('if()', functionValueTests({
+  'working examples': {
+    input: outdent`
+      TRUE=if(true, yes, no)
+      FALSE=if(false, yes, no)
+      STR=if("a", yes, no)
+      NUM=if(1, yes, no)
+      NUM0=if(0, yes, no)
+    `,
+    expected: {
+      TRUE: 'yes',
+      FALSE: 'no',
+      STR: 'yes',
+      NUM: 'yes',
+      NUM0: 'no',
+    },
+  },
+  'with nested fns': {
+    input: outdent`
+      ITEM1=if(eq(a, a), if(true, yes), no)
+      ITEM2=if(eq(a, b), yes, if(true, no))
+    `,
+    expected: {
+      ITEM1: 'yes',
+      ITEM2: 'no',
+    },
+  },
+  'optional false value': {
+    input: outdent`
+      ITEM1=if(true, "yes")
+      ITEM2=if(false, "yes")
+    `,
+    expected: { ITEM1: 'yes', ITEM2: undefined },
+  },
+  'error - no args': {
+    input: 'ITEM=if()',
+    expected: { ITEM: SchemaError },
+  },
+  'error - single arg': {
+    input: 'ITEM=if(true)',
+    expected: { ITEM: SchemaError },
+  },
+  'error - key/val args': {
+    input: 'ITEM=if(condition=true, trueVal="yes", falseVal="no")',
+    expected: { ITEM: SchemaError },
+  },
+  'error - nested bad arg': {
+    input: 'ITEM=if(ref(BADKEY), "yes", "no")',
+    expected: { ITEM: SchemaError },
+  },
+}));
 
 describe('dependency cycles', functionValueTests({
   'detect cycle - self': {

packages/varlock/src/index.ts

@@ -13,7 +13,7 @@ import {
   CoercionError,
   ResolutionError,
   type SerializedEnvGraph,
-} from '../env-graph';
+} from './env-graph';
 
 export async function load() {
   // TODO: add some options

packages/varlock/src/lib/formatting.ts

@@ -1,7 +1,7 @@
 import ansis, { type AnsiColors, type AnsiStyles } from 'ansis';
 import _ from '@env-spec/utils/my-dash';
 
-import { ConfigItem, VarlockError } from '../../env-graph';
+import { ConfigItem, VarlockError } from '../env-graph';
 import { redactString } from '../runtime/lib/redaction';
 
 type ColorMod = AnsiStyles | AnsiColors;

packages/varlock/src/lib/load-graph.ts

@@ -1,4 +1,4 @@
-import { loadEnvGraph } from '../../env-graph';
+import { loadEnvGraph } from '../env-graph';
 
 export async function loadVarlockEnvGraph(opts?: {
   currentEnvFallback?: string,

packages/varlock/src/plugin-lib.ts

@@ -1,5 +1,5 @@
-import type { VarlockPlugin } from '../env-graph/lib/plugins';
-export type { Resolver } from '../env-graph/lib/resolver';
+import type { VarlockPlugin } from './env-graph/lib/plugins';
+export type { Resolver } from './env-graph/lib/resolver';
 
 // we must inject our varlock code via the global scope
 // because of how we dynamically import the plugin code

packages/varlock/src/runtime/env.ts

@@ -1,6 +1,6 @@
 import { redactString } from './lib/redaction';
 
-import type { SerializedEnvGraph } from '../../env-graph';
+import type { SerializedEnvGraph } from '../env-graph';
 import { isBrowser } from '../lib/detect-runtime';
 import { debug } from './lib/debug';
 

packages/varlock/tsconfig.json

@@ -18,7 +18,6 @@
   },
   "include": [
     "src/**/*.ts",
-    "env-graph/**/*.ts",
     "*.ts",
   ],
   "exclude": ["src/plugin-lib.ts"]