model parsing fix

steroids · Sep 26, 2023 · 23bad37 · 23bad37
1 parent d0cccf6
commit 23bad37
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@steroidsjs/gii-fs",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "FS Developer Server",
   "author": "Vladimir Kozhin <hello@kozhindev.com>",
   "repository": {

diff --git a/src/project/usecases/services/ProjectModelService.ts b/src/project/usecases/services/ProjectModelService.ts
@@ -26,7 +26,10 @@ export class ProjectModelService {
     }
 
     private parseModelField(fileContent: string, tsMember: any, projectName: string): ProjectModelFieldModel | null {
-        const fieldDecorator = tsMember.decorators?.find(decorator => decorator.expression.expression.escapedText.includes('Field'));
+        let fieldDecorator = tsMember.decorators?.find(decorator => decorator.expression.expression.escapedText.includes('Field'));
+        if (!fieldDecorator) {
+            fieldDecorator = tsMember.modifiers?.find(decorator => decorator.expression.expression.escapedText.includes('Field'));
+        }
         if (!fieldDecorator) {
             return null;
         }
@@ -210,9 +213,12 @@ export class ProjectModelService {
                 continue;
             }
 
-            const fieldDecorator = fieldNode.decorators?.find(decorator => decorator.expression.expression.escapedText.includes('Field'));
+            let fieldDecorator = fieldNode.decorators?.find(decorator => decorator.expression.expression.escapedText.includes('Field'));
+            if (!fieldDecorator) {
+                fieldDecorator = fieldNode.modifiers?.find(decorator => decorator.expression.expression.escapedText.includes('Field'));
+            }
             // Если изменился тип поля, обновляем его целиком
-            if (fieldDecorator.expression.expression.escapedText !== field.type) {
+            if (fieldDecorator?.expression?.expression.escapedText !== field.type) {
                 const generatedFieldInfo = this.generateModelField(field);
                 toUpdate.push({
                     start: fieldNode.pos,