@aeriajs/compiler 0.0.63 → 0.0.64

package/dist/semantic.js

@@ -2,8 +2,11 @@ import { isValidCollection } from '@aeriajs/common';
 import { locationMap } from './parser.js';
 import { Diagnostic } from './diagnostic.js';
 import * as AST from './ast.js';
+const containsPropertyWithId = (propName, properties) => {
+    return propName === '_id' || propName in properties;
+};
 const collectionHasProperty = async (collection, propName, options = {}) => {
-    let hasProperty = propName in collection.properties;
+    let hasProperty = containsPropertyWithId(propName, collection.properties);
     if (!hasProperty) {
         if (collection.extends) {
             if (options.languageServer) {
@@ -14,7 +17,7 @@ const collectionHasProperty = async (collection, propName, options = {}) => {
             if (!isValidCollection(importedCollection)) {
                 throw new Error;
             }
-            hasProperty = propName in importedCollection.description.properties;
+            hasProperty = containsPropertyWithId(propName, importedCollection.description.properties);
         }
     }
     return hasProperty;
@@ -56,7 +59,6 @@ export const analyze = async (ast, options, errors = []) => {
             if (!(propName in node.nestedProperties)) {
                 const symbol = node.property[AST.LOCATION_SYMBOL].arrays[attributeName][index];
                 const location = locationMap.get(symbol);
-                console.log(JSON.stringify(node));
                 errors.push(new Diagnostic(`object hasn't such property "${propName}"`, location));
             }
         }
@@ -115,7 +117,7 @@ export const analyze = async (ast, options, errors = []) => {
                 : Object.keys(node.required);
             for (const index in propNames) {
                 const propName = propNames[index];
-                if (!(propName in node.properties)) {
+                if (!containsPropertyWithId(propName, node.properties)) {
                     const symbol = node[AST.LOCATION_SYMBOL].required[index];
                     const location = locationMap.get(symbol);
                     errors.push(new Diagnostic(`collection "${node.name}" hasn't such property "${propName}"`, location));
@@ -128,7 +130,7 @@ export const analyze = async (ast, options, errors = []) => {
         }
         if (node[AST.LOCATION_SYMBOL].requiredTerms) {
             for (const [name, symbol] of node[AST.LOCATION_SYMBOL].requiredTerms) {
-                if (!(name in node.properties)) {
+                if (!containsPropertyWithId(name, node.properties)) {
                     const location = locationMap.get(symbol);
                     errors.push(new Diagnostic(`invalid left operand "${name}"`, location));
                 }
@@ -140,14 +142,14 @@ export const analyze = async (ast, options, errors = []) => {
                     const option = node.layout.options[name];
                     if (Array.isArray(option)) {
                         for (const [i, propName] of option.entries()) {
-                            if (!(propName in node.properties)) {
+                            if (!containsPropertyWithId(propName, node.properties)) {
                                 const location = locationMap.get(value[i]);
                                 errors.push(new Diagnostic(`invalid property "${propName}"`, location));
                             }
                         }
                     }
                     else {
-                        if (!(option in node.properties)) {
+                        if (!containsPropertyWithId(option, node.properties)) {
                             const location = locationMap.get(value);
                             errors.push(new Diagnostic(`invalid property "${option}"`, location));
                         }
@@ -158,7 +160,7 @@ export const analyze = async (ast, options, errors = []) => {
         if (node.formLayout) {
             if (node.formLayout.fields) {
                 for (const [name, value] of Object.entries(node.formLayout[AST.LOCATION_SYMBOL].fields)) {
-                    if (!(name in node.properties)) {
+                    if (!containsPropertyWithId(name, node.properties)) {
                         const location = locationMap.get(value.name);
                         errors.push(new Diagnostic(`invalid property "${name}"`, location));
                     }
@@ -166,7 +168,7 @@ export const analyze = async (ast, options, errors = []) => {
             }
             if (node.formLayout[AST.LOCATION_SYMBOL].terms) {
                 for (const [name, symbol] of node.formLayout[AST.LOCATION_SYMBOL].terms) {
-                    if (!(name in node.properties)) {
+                    if (!containsPropertyWithId(name, node.properties)) {
                         const location = locationMap.get(symbol);
                         errors.push(new Diagnostic(`invalid left operand "${name}"`, location));
                     }
@@ -176,7 +178,7 @@ export const analyze = async (ast, options, errors = []) => {
         if (node.search) {
             for (const [i, symbol] of node[AST.LOCATION_SYMBOL].searchIndexes.entries()) {
                 const propName = node.search.indexes[i];
-                if (!(propName in node.properties)) {
+                if (!containsPropertyWithId(propName, node.properties)) {
                     const location = locationMap.get(symbol);
                     errors.push(new Diagnostic(`invalid property "${propName}"`, location));
                 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aeriajs/compiler",
   "type": "module",
-  "version": "0.0.63",
+  "version": "0.0.64",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",