@vertekum/schema-builder 0.1.5 → 0.1.6

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @vertekum/schema-builder
 
+## 0.1.6
+
+### Patch Changes
+
+- [`2e9a56f`](https://github.com/moros-oxus/vertekum/commit/2e9a56f5cc52de26ee8768ae0035178ebe4d847e) Thanks [@tschemmer](https://github.com/tschemmer)! - Names may start with digits when they contain a letter (`2xs`, `4k-display`) — everywhere a name works, including pick/omit lists. Pure numbers and scale expressions keep their numeric meaning; the syntax highlighting follows suit.
+
 ## 0.1.5
 
 ### Patch Changes

package/docs/language.md

@@ -29,9 +29,10 @@ root = color.[text | icon].<role>.<@emphasis>
   ```
 
 - **`#` starts a comment**, running to the end of the line.
-- **Identifiers** are `[A-Za-z][A-Za-z0-9-]*` — letters, digits, hyphens
-  (`color-role`). A term that starts with a digit is numeric: a bare number (`950`) or
-  a [scale expression](./scales.md) (`100-300/50`) — which is why hyphens inside names
+- **Identifiers** are letters, digits, and hyphens (`color-role`), and may start with
+  digits **when they contain a letter** (`2xs`, `4k-display`). A term that is purely
+  numeric keeps its numeric meaning: a bare number (`950`) or a
+  [scale expression](./scales.md) (`100-300/50`) — which is why hyphens inside names
   never collide with range syntax.
 - **Strings** (pragma and `use` arguments) are double-quoted.
 

package/grammar/dfn.tmLanguage.json

@@ -61,7 +61,7 @@
       }
     },
     "production": {
-      "match": "^([A-Za-z][A-Za-z0-9-]*)\\s*(=)",
+      "match": "^(\\d+[A-Za-z][A-Za-z0-9-]*|[A-Za-z][A-Za-z0-9-]*)\\s*(=)",
       "captures": {
         "1": {
           "name": "entity.name.function.production.dfn"
@@ -127,7 +127,7 @@
       },
       "patterns": [
         {
-          "match": "([A-Za-z][A-Za-z0-9-]*)(/)([A-Za-z][A-Za-z0-9-]*)",
+          "match": "(\\d+[A-Za-z][A-Za-z0-9-]*|[A-Za-z][A-Za-z0-9-]*)(/)(\\d+[A-Za-z][A-Za-z0-9-]*|[A-Za-z][A-Za-z0-9-]*)",
           "captures": {
             "1": {
               "name": "entity.name.namespace.module.dfn"
@@ -145,7 +145,7 @@
         },
         {
           "name": "variable.other.reference.imported.dfn",
-          "match": "[A-Za-z][A-Za-z0-9-]*"
+          "match": "\\d+[A-Za-z][A-Za-z0-9-]*|[A-Za-z][A-Za-z0-9-]*"
         }
       ]
     },
@@ -171,7 +171,7 @@
         },
         {
           "name": "variable.other.reference.dfn",
-          "match": "[A-Za-z][A-Za-z0-9-]*"
+          "match": "\\d+[A-Za-z][A-Za-z0-9-]*|[A-Za-z][A-Za-z0-9-]*"
         }
       ]
     },
@@ -197,7 +197,7 @@
           "patterns": [
             {
               "name": "variable.parameter.member.dfn",
-              "match": "[A-Za-z][A-Za-z0-9-]*|\\d+"
+              "match": "\\d+[A-Za-z][A-Za-z0-9-]*|[A-Za-z][A-Za-z0-9-]*|\\d+"
             },
             {
               "name": "punctuation.separator.comma.dfn",
@@ -245,7 +245,7 @@
     },
     "name": {
       "name": "constant.language.name.dfn",
-      "match": "[A-Za-z][A-Za-z0-9-]*"
+      "match": "\\d+[A-Za-z][A-Za-z0-9-]*|[A-Za-z][A-Za-z0-9-]*"
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vertekum/schema-builder",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "Declare token vocabularies as grammar; build them into JSON Schema files",
   "license": "Apache-2.0",
   "keywords": [

package/src/tokenizer.ts

@@ -49,6 +49,12 @@ export interface Token {
 
 const IDENT = /^[A-Za-z][A-Za-z0-9-]*/;
 const RANGE = /^(\d+)-(\d+)([*/])(\d+(?:\.\d+)?)(?:~(\d+))?/;
+/**
+ * A digit-leading NAME (`2xs`, `4k-display`): digits, then at least one letter. Tried after
+ * RANGE — so `100-300/50` stays numeric — and before NUMBER, so the whole word is one token
+ * rather than `2` + `xs`. Real design systems name t-shirt sizes this way.
+ */
+const WORD = /^\d+[A-Za-z][A-Za-z0-9-]*/;
 const NUMBER = /^\d+/;
 
 /** "Write the numbers as they appear": a leading zero declares the pad width. */
@@ -113,6 +119,11 @@ export function tokenize(source: string): Token[] {
         text = text.slice(range[0].length);
         continue;
       }
+      const word = text.match(WORD);
+      if (word) {
+        push('ident', word[0]);
+        continue;
+      }
       const number = text.match(NUMBER);
       if (number) {
         push('number', number[0]);