@dbml/core 2.3.0 → 2.4.1

package/lib/model_structure/table.js

@@ -17,11 +17,11 @@ var _utils = require("./utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -31,21 +31,25 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
 function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
-var Table =
-/*#__PURE__*/
-function (_Element) {
+var Table = /*#__PURE__*/function (_Element) {
   _inherits(Table, _Element);
 
+  var _super = _createSuper(Table);
+
   function Table() {
     var _this;
 
@@ -64,7 +68,7 @@ function (_Element) {
 
     _classCallCheck(this, Table);
 
-    _this = _possibleConstructorReturn(this, _getPrototypeOf(Table).call(this, token));
+    _this = _super.call(this, token);
     _this.name = name;
     _this.alias = alias;
     _this.note = note;
@@ -98,7 +102,7 @@ function (_Element) {
       }
 
       rawFields.forEach(function (field) {
-        _this2.pushField(new _field["default"](_objectSpread({}, field, {
+        _this2.pushField(new _field["default"](_objectSpread(_objectSpread({}, field), {}, {
           table: _this2
         })));
       });
@@ -124,7 +128,7 @@ function (_Element) {
       var _this3 = this;
 
       rawIndexes.forEach(function (index) {
-        _this3.pushIndex(new _indexes["default"](_objectSpread({}, index, {
+        _this3.pushIndex(new _indexes["default"](_objectSpread(_objectSpread({}, index), {}, {
           table: _this3
         })));
       });
@@ -161,7 +165,7 @@ function (_Element) {
   }, {
     key: "export",
     value: function _export() {
-      return _objectSpread({}, this.shallowExport(), {}, this.exportChild());
+      return _objectSpread(_objectSpread({}, this.shallowExport()), this.exportChild());
     }
   }, {
     key: "exportChild",
@@ -208,9 +212,9 @@ function (_Element) {
   }, {
     key: "normalize",
     value: function normalize(model) {
-      model.tables = _objectSpread({}, model.tables, _defineProperty({}, this.id, _objectSpread({
+      model.tables = _objectSpread(_objectSpread({}, model.tables), {}, _defineProperty({}, this.id, _objectSpread(_objectSpread(_objectSpread({
         id: this.id
-      }, this.shallowExport(), {}, this.exportChildIds(), {}, this.exportParentIds())));
+      }, this.shallowExport()), this.exportChildIds()), this.exportParentIds())));
       this.fields.forEach(function (field) {
         return field.normalize(model);
       });

package/lib/model_structure/tableGroup.js

@@ -11,11 +11,11 @@ var _utils = require("./utils");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -25,21 +25,25 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
 function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
-var TableGroup =
-/*#__PURE__*/
-function (_Element) {
+var TableGroup = /*#__PURE__*/function (_Element) {
   _inherits(TableGroup, _Element);
 
+  var _super = _createSuper(TableGroup);
+
   function TableGroup(_ref) {
     var _this;
 
@@ -52,7 +56,7 @@ function (_Element) {
 
     _classCallCheck(this, TableGroup);
 
-    _this = _possibleConstructorReturn(this, _getPrototypeOf(TableGroup).call(this, token));
+    _this = _super.call(this, token);
     _this.name = name;
     _this.tables = [];
     _this.schema = schema;
@@ -76,7 +80,7 @@ function (_Element) {
       var _this2 = this;
 
       rawTables.forEach(function (rawTable) {
-        var table = _this2.schema.database.findTable(rawTable);
+        var table = _this2.schema.database.findTable(rawTable.schemaName, rawTable.name);
 
         if (!table) {
           _this2.error("Table ".concat(rawTable.schemaName ? "\"".concat(rawTable.schemaName, "\".") : '').concat(rawTable.name, " don't exist"));
@@ -108,7 +112,7 @@ function (_Element) {
   }, {
     key: "export",
     value: function _export() {
-      return _objectSpread({}, this.shallowExport(), {}, this.exportChild());
+      return _objectSpread(_objectSpread({}, this.shallowExport()), this.exportChild());
     }
   }, {
     key: "exportChild",
@@ -148,9 +152,9 @@ function (_Element) {
   }, {
     key: "normalize",
     value: function normalize(model) {
-      model.tableGroups = _objectSpread({}, model.tableGroups, _defineProperty({}, this.id, _objectSpread({
+      model.tableGroups = _objectSpread(_objectSpread({}, model.tableGroups), {}, _defineProperty({}, this.id, _objectSpread(_objectSpread(_objectSpread({
         id: this.id
-      }, this.shallowExport(), {}, this.exportChildIds(), {}, this.exportParentIds())));
+      }, this.shallowExport()), this.exportChildIds()), this.exportParentIds())));
     }
   }]);
 

package/lib/model_structure/utils.js

@@ -4,9 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.shouldPrintSchema = shouldPrintSchema;
+exports.shouldPrintSchemaName = shouldPrintSchemaName;
 
 var _config = require("./config");
 
 function shouldPrintSchema(schema) {
   return schema.name !== _config.DEFAULT_SCHEMA_NAME || schema.name === _config.DEFAULT_SCHEMA_NAME && schema.database.hasDefaultSchema;
+}
+
+function shouldPrintSchemaName(schemaName) {
+  return schemaName !== _config.DEFAULT_SCHEMA_NAME;
 }

package/lib/parse/Parser.js

@@ -19,7 +19,7 @@ var _mssqlParser = _interopRequireDefault(require("./mssqlParser"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
@@ -27,9 +27,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
-var Parser =
-/*#__PURE__*/
-function () {
+var Parser = /*#__PURE__*/function () {
   function Parser() {
     _classCallCheck(this, Parser);
   }

package/lib/parse/buildParser.js

@@ -21,9 +21,7 @@ function buildParserFile(_x, _x2) {
 }
 
 function _buildParserFile() {
-  _buildParserFile = _asyncToGenerator(
-  /*#__PURE__*/
-  regeneratorRuntime.mark(function _callee(source, fileName) {
+  _buildParserFile = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(source, fileName) {
     return regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {

package/lib/parse/dbml/parser.pegjs

@@ -5,6 +5,7 @@
     refs: [],
     enums: [],
     tableGroups: [],
+    aliases: [],
     project: {},
   };
   let projectCnt = 0;
@@ -122,23 +123,31 @@ ProjectField
     }
   }
 
-TableGroupSyntax = table_group sp+ name:name _ "{" _ body:table_group_body _ "}" {
+TableGroupSyntax = table_group sp+ schemaName:schema_name? name:name _ "{" _ body:table_group_body _ "}" {
   return {
     name: name,
+    schemaName,
     tables: body,
     token: location()
   }
 }
 
-table_group_body = tables:(name __)* {
+table_group_body = tables:(schema_name? name __)* {
   return tables.map(t => ({
-    name: t[0]
+    name: t[1],
+    schemaName: t[0]
   }));
 }
 
 // References
 RefSyntax
-  = r: (ref_long / ref_short) { return r; }
+  = r: (ref_long / ref_short) {
+    const schemaName = r.endpoints[0].schemaName;
+    return {
+      ...r,
+      schemaName,
+    }; 
+  }
 
 ref_long
   = ref name:(__ name)? _ "{" _ body:ref_body _ "}" {
@@ -163,17 +172,19 @@ ref_short
     }
 
 ref_body
-  = table1:name "." field1:RefField sp+ relation:relation sp+ table2:name "." field2:RefField sp* ref_settings:RefSettings? {
+  = field1:field_identifier sp+ relation:relation sp+ field2:field_identifier sp* ref_settings:RefSettings? {
     const endpoints = [
       {
-        tableName: table1,
-        fieldNames: field1,
+        schemaName: field1.schemaName,
+        tableName: field1.tableName,
+        fieldNames: field1.fieldNames,
         relation: relation === ">" ? "*" : "1",
         token: location()
       },
       {
-        tableName: table2,
-        fieldNames: field2,
+        schemaName: field2.schemaName,
+        tableName: field2.tableName,
+        fieldNames: field2.fieldNames,
         relation: relation === "<" ? "*" : "1",
         token: location()
       }
@@ -224,7 +235,7 @@ OnDelete
 
 // Tables
 TableSyntax
-  = table sp+ name:name alias:alias_def? sp* table_settings:TableSettings? _ "{" body:TableBody "}" {
+  = table sp+ schemaName:schema_name? name:name alias:alias_def? sp* table_settings:TableSettings? _ "{" body:TableBody "}" {
       let fields = body.fields || [];
       let indexes = body.indexes || [];
       // Handle list of partial inline_refs
@@ -234,12 +245,14 @@ TableSyntax
         (field.inline_refs || []).forEach((iref) => {
           const endpoints = [
           {
+            schemaName: iref.schemaName,
             tableName: iref.tableName,
             fieldNames: iref.fieldNames,
             relation: iref.relation === "<" ? "*" : "1",
             token: iref.token
           },
           {
+            schemaName: schemaName,
             tableName: name,
             fieldNames: [field.name],
             relation: iref.relation === ">" ? "*" : "1",
@@ -247,6 +260,7 @@ TableSyntax
           }];
 
           let ref = {
+            schemaName,
             name: null, // no name
             endpoints: endpoints,
             token: iref.token
@@ -255,8 +269,21 @@ TableSyntax
         })
       });
 
+      if (alias) {
+        if (data.aliases.find(a => a.name === alias)) error(`Alias "${alias}" is already defined`);
+        data.aliases.push({
+          name: alias,
+          kind: 'table',
+          value: {
+            tableName: name,
+            schemaName: schemaName,
+          }
+        })
+      }
+
       let res = {
         name: name,
+        schemaName,
         alias: alias,
         fields: fields,
         token: location(),
@@ -323,10 +350,13 @@ TableElement
   }
 
 Field
-  = _ name:name sp+ type:type constrains:(sp+ constrain)* field_settings:(sp+ FieldSettings)? sp* comment? newline {
+  = _ name:name sp+ typeSchemaName:schema_name? type:type constrains:(sp+ constrain)* field_settings:(sp+ FieldSettings)? sp* comment? newline {
     const field = {
       name: name,
-      type: type,
+      type:  {
+        schemaName: typeSchemaName,
+        ...type,
+      },
       token: location(),
       inline_refs: []
     }
@@ -338,9 +368,10 @@ Field
   }
 
 EnumSyntax
-  = enum sp+ name:name _ "{" body: EnumBody "}" {
+  = enum sp+ schemaName:schema_name? name:name _ "{" body: EnumBody "}" {
     return {
       name: name,
+      schemaName,
       token: location(),
       values: body.enum_values
     };
@@ -437,7 +468,7 @@ FieldSetting
   / _ a:"unique"i _ { return a }
   / _ a:"increment" _ { return a }
   / _ v:ObjectNote _ { return { type: 'note', value: v } }
-  / _ v:RefInline { return { type: 'ref_inline', value: v } }
+  / _ v:RefInline _ { return { type: 'ref_inline', value: v } }
   / _ v:Default _ {return {type: 'default', value: v} }
 
 Indexes
@@ -523,10 +554,11 @@ ObjectNote
 IndexType
   = "type:"i _ val:(btree/hash) { return val }
 RefInline
-  = "ref:" sp* relation:relation sp+ table2:name "." field2:name {
+  = "ref:" sp* relation:relation sp+ field:inline_field_identifier{
       return {
-        tableName: table2,
-        fieldNames: [field2],
+        schemaName: field.schemaName,
+        tableName: field.tableName,
+        fieldNames: [field.fieldName],
         relation: relation,
         token: location(),
       }
@@ -584,6 +616,16 @@ name "valid name"
   = c:(character+) { return c.join("") }
   / quote c:[^\"\n]+ quote { return c.join("") }
 
+schema_name "schema name" = name:name "." { return name }
+
+field_identifier = 
+  schemaName:name "." tableName:name "." fieldNames:RefField { return { schemaName, tableName, fieldNames } } /
+  tableName:name "." fieldNames:RefField { return { schemaName: null, tableName, fieldNames } }
+
+inline_field_identifier = 
+  schemaName:name "." tableName:name "." fieldName:name { return { schemaName, tableName, fieldName } } /
+  tableName:name "." fieldName:name { return { schemaName: null, tableName, fieldName } }
+
 type_name "valid name"
   = c:(type_character+) { return c.join("") }
   / quote c:[^\"\n]+ quote { return c.join("") }
@@ -626,7 +668,9 @@ __ = (comment/whitespace)+
 
 endline "endline" = sp* newline
 tab = "\t"
-comment "comment" = "//" [^\n]*
+single_line_comment = "//" [^\n]*
+multi_lime_comment = "/*" (!"*/" .)* "*/"
+comment "comment" = single_line_comment / multi_lime_comment
 newline "newline" = "\r\n" / "\n"
 whitespace "whitespace" = [ \t\r\n\r]
 whitespace_quote "whitespace" = [ \t\r\n\r\"]
@@ -705,10 +749,10 @@ BooleanLiteral = boolean: ('true'i/'false'i/'null'i) {
     value: boolean
   };
 }
-NumberLiteral = number:(float / integer) {
+NumberLiteral = minus:"-"? number:(float / integer) {
   return {
     type: 'number',
-    value: number
+    value: minus ? -number : number
   };
 }
 float