feat: allow - in identifiers

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@subsquid/manifest",
   "type": "commonjs",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0-beta.9",
   "homepage": "https://www.subsquid.io",
   "repository": "https://github.com/subsquid/manifest.git",
   "license": "GPL-3.0-or-later",

src/expression.ts

@@ -2,6 +2,11 @@ import assert from 'assert';
 
 export const EXPR_PATTERN = /(\${{[^}]*}})/;
 
+const nums = new Set('0123456789'.split(''));
+const alpha = new Set('abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'.split(''));
+const alphaNum = new Set([...nums, ...alpha]);
+const identifiers = new Set([...alphaNum, '_', '-']);
+
 export class Parser {
   constructor() {}
 
@@ -69,11 +74,10 @@ export class Tokenizer {
 
   id() {
     const start = this.pos;
-    while (
-      this.str[this.pos] &&
-      (/[a-zA-Z_$]/.test(this.str[this.pos]) ||
-        (this.pos > start && /[0-9]/.test(this.str[this.pos])))
-    ) {
+    while (identifiers.has(this.str[this.pos])) {
+      if (this.pos === start && nums.has(this.str[this.pos])) break;
+      if (this.str[this.pos] === '-' && !alphaNum.has(this.str[this.pos + 1])) break;
+
       this.pos++;
     }
 

src/schema.ts

@@ -248,4 +248,4 @@ export const manifestSchema = Joi.object<ManifestValue>({
     .description('[DEPRECATED] Please use "manifest_version" instead.')
     .valid(...AVAILABLE_MANIFEST_VERSIONS)
     .meta({ deprecated: true }),
-}).oxor('slot', 'version', 'tag');
+}).oxor('slot', 'version', 'tag');

test/addon_postgres.test.ts

@@ -318,4 +318,4 @@ describe('Addon Postgres', () => {
 
     expect(error).toBeUndefined();
   });
-});
+});

test/expression.test.ts

@@ -13,6 +13,33 @@ describe('Expression', () => {
     expect(value).toEqual('foo');
   });
 
+  it('should resolve identifier 2', () => {
+    const value = parser.parse('${{foo-bar}}').eval({ ['foo-bar']: 'foo-bar' });
+    expect(value).toEqual('foo-bar');
+  });
+
+  it('should resolve identifier 3', () => {
+    const value = parser.parse('${{foo_bar}}').eval({ ['foo_bar']: 'foo_bar' });
+    expect(value).toEqual('foo_bar');
+  });
+
+  it('should resolve identifier 4', () => {
+    const value = parser.parse('${{foo1337}}').eval({ ['foo1337']: 'foo1337' });
+    expect(value).toEqual('foo1337');
+  });
+
+  it('should throw on invalid identifier', () => {
+    expect(() => parser.parse('${{foo-}}').eval({})).toThrow(
+      new EvaluationError("Unexpected '-' [0,6]"),
+    );
+  });
+
+  it('should throw on invalid identifier 2', () => {
+    expect(() => parser.parse('${{9foo}}').eval({})).toThrow(
+      new EvaluationError("Unexpected '9' [0,3]"),
+    );
+  });
+
   it('should throw on not defined identifier', () => {
     expect(() => parser.parse('${{foo}}').eval({})).toThrow(
       new EvaluationError('"foo" is not defined'),