fix: be more liberal with spaces in module expressions

AEB-labs · Sep 12, 2024 · 412da2f · 412da2f
1 parent 51a84d9
commit 412da2f
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 1 deletion.
diff --git a/spec/schema/ast-validation-modules/modules-validator.spec.ts b/spec/schema/ast-validation-modules/modules-validator.spec.ts
@@ -349,6 +349,50 @@ describe('modules validator', () => {
             );
         });
 
+        it('accepts an expression that starts with spaces', () => {
+            assertValidatorAcceptsAndDoesNotWarn(
+                `
+                    type Foo @rootEntity @modules(in: ["    module1"]) {
+                        foo: String @modules(all: true)
+                    }
+                `,
+                { withModuleDefinitions: true },
+            );
+        });
+
+        it('accepts an expression that ends in a tab', () => {
+            assertValidatorAcceptsAndDoesNotWarn(
+                `
+                    type Foo @rootEntity @modules(in: ["module1 & module2\t"]) {
+                        foo: String @modules(all: true)
+                    }
+                `,
+                { withModuleDefinitions: true },
+            );
+        });
+
+        it('accepts an expression that ends in a space', () => {
+            assertValidatorAcceptsAndDoesNotWarn(
+                `
+                    type Foo @rootEntity @modules(in: ["module1 & module2 "]) {
+                        foo: String @modules(all: true)
+                    }
+                `,
+                { withModuleDefinitions: true },
+            );
+        });
+
+        it('accepts an and combination of two modules with multiple space characters', () => {
+            assertValidatorAcceptsAndDoesNotWarn(
+                `
+                    type Foo @rootEntity @modules(in: ["module1    &\tmodule2"]) {
+                        foo: String @modules(all: true)
+                    }
+                `,
+                { withModuleDefinitions: true },
+            );
+        });
+
         it('accepts an and combination of three modules', () => {
             assertValidatorAcceptsAndDoesNotWarn(
                 `

diff --git a/src/model/implementation/modules/expression-parser.ts b/src/model/implementation/modules/expression-parser.ts
@@ -90,7 +90,7 @@ export function parseModuleSpecificationExpression(
                 if (char === '&') {
                     // expecting next module
                     state = ParserState.EXPECT_IDENTIFIER;
-                } else if (isEOF) {
+                } else if (isEOF || isWhitespace) {
                     // do nothing
                 } else {
                     return {