Merge pull request #10 from cdsiats/main

fixes #9 16h

Author: cblanquera

packages/idea-parser/src/definitions.ts

@@ -131,7 +131,7 @@ const definitions: Record<string, Reader> = {
     };
   },
   'Float': (code, start) => {
-    const match = code.slice(start).match(/^\d+\.\d+/);
+    const match = code.slice(start).match(/^-?\d+\.\d+/);
     if (match !== null && match.index === 0) {
       const end = start + match[0].length;
       const value = code.substring(start, end);
@@ -147,7 +147,7 @@ const definitions: Record<string, Reader> = {
     return undefined;
   },
   'Integer': (code, start) => {
-    const match = code.slice(start).match(/^[0-9]+/);
+    const match = code.slice(start).match(/^-?[0-9]+/);
     if (match !== null && match.index === 0) {
       const end = start + match[0].length;
       const value = code.substring(start, end);

packages/idea-parser/tests/ModelTree.test.ts

@@ -51,7 +51,13 @@ describe('Model Tree', () => {
     expect(() => modelTree.parse('model foobar')).to.throw('Expected CapitalIdentifier but got something else');
   });
 
-
-
-
+  it('Should parse negative values', async () => {
+    const actualRaw = ModelTree.parse(fs.readFileSync(`${__dirname}/fixtures/address.idea`, 'utf8'));
+    const expectedRaw = JSON.parse(fs.readFileSync(`${__dirname}/fixtures/address.json`, 'utf8'));
+    
+    const actual = cleanAST(actualRaw);
+    const expected = cleanAST(expectedRaw);
+    
+    expect(actual).to.deep.equalInAnyOrder(expected);
+  });
 });

packages/idea-parser/tests/fixtures/address.idea

@@ -0,0 +1,72 @@
+model Address 
+  @label("Address" "Addresses") 
+  @template("{{label}}") 
+  @icon("map-marker") 
+{
+  id          String    @label("Places ID") @id
+                        @list.overflow({ length 10 hellip true })
+
+  formatted    String   @label("Formatted Address") 
+                        @field.text
+                        @is.required
+                        @list.text @view.text
+  
+  street       String   @label("Street Address")
+                        @field.text
+                        @is.required
+                        @list.text @view.text
+  
+  neighborhood String?  @label("Neighborhood")
+                        @field.text
+                        @list.text @view.text
+  
+  city         String   @label("City")
+                        @field.text
+                        @is.required
+                        @list.text @view.text
+  
+  state        String?  @label("State")
+                        @field.text
+                        @list.text @view.text
+  
+  region       String?  @label("Region")
+                        @field.text
+                        @list.text @view.text
+  
+  country      String   @label("Country")
+                        @field.text
+                        @is.required
+                        @list.text @view.text
+  
+  postal       String   @label("Postal Code")
+                        @field.text
+                        @is.required
+                        @list.text @view.text
+
+  latitude     Float?   @label("Latitude")
+                        @min(-90) @max(90) @step(0.00000001)
+                        @field.number({ min -90 max 90 step 0.00000001 })
+                        @is.gte(-90) @is.lte(90)
+                        @list.hide @view.number
+
+  longitude    Float?   @label("Longitude")
+                        @min(-180) @max(180) @step(0.00000001)
+                        @field.number({ min -180 max 180 step 0.00000001 })
+                        @is.gte(-180) @is.lte(180)
+                        @list.hide @view.number
+  
+  active       Boolean  @label("Active") 
+                        @default(true) 
+                        @filter.switch
+                        @list.hide @view.yesno
+  
+  created      Datetime @label("Created") 
+                        @default("now()") @sortable
+                        @list.date("m d, Y h:iA") 
+                        @view.date("m d, Y h:iA")
+  
+  updated      Datetime @label("Updated") 
+                        @default("now()") @timestamp @sortable
+                        @list.date("m d, Y h:iA") 
+                        @view.date("m d, Y h:iA")
+}