wip

Author: florianbgt

examples/node/nestjs-typescript/src/comics/comics.controller.ts

@@ -9,7 +9,7 @@ import {
 } from '@nestjs/common';
 import { ComicsService } from './comics.service';
 import { Comic, ComicPartial } from './comics.data';
-import { calculateHighFibonacci } from 'src/helpers/fibonacci';
+import { calculateHighFibonacci } from '../helpers/fibonacci';
 
 @Controller('comics')
 export class ComicsController {

examples/python/flask/api/views/elves.py

@@ -11,7 +11,7 @@ def get(self, *args, **kwargs):
         return elves
 
 
-# @nanoapi path:/api/elves method:GET
+# @nanoapi method:GET path:/api/elves group:elf_read
 elves_bp.add_url_rule("/", view_func=ElfListView.as_view("elf_list"), methods=["GET"])
 
 
@@ -22,7 +22,7 @@ def post(self, *args, **kwargs):
         return new_elf
 
 
-# @nanoapi path:/api/elves method:POST
+# @nanoapi method:POST path:/api/elves group:elf_write
 elves_bp.add_url_rule(
     "/", view_func=ElfCreateView.as_view("elf_create"), methods=["POST"]
 )
@@ -34,7 +34,7 @@ def get(self, elf_id, *args, **kwargs):
         return elf
 
 
-# @nanoapi path:/api/elves/<elf_id> method:GET
+# @nanoapi method:GET path:/api/elves/<elf_id> group:elf_read
 elves_bp.add_url_rule(
     "/<int:elf_id>", view_func=ElfDetailView.as_view("elf_detail"), methods=["GET"]
 )
@@ -47,7 +47,7 @@ def put(self, elf_id, *args, **kwargs):
         return updated_elf
 
 
-# @nanoapi path:/api/elves/<elf_id> method:PUT
+# @nanoapi method:PUT path:/api/elves/<elf_id> group:elf_write
 elves_bp.add_url_rule(
     "/<int:elf_id>", view_func=ElfUpdateView.as_view("elf_update"), methods=["PUT"]
 )
@@ -59,7 +59,7 @@ def delete(self, elf_id, *args, **kwargs):
         return None
 
 
-# @nanoapi path:/api/elves/<elf_id> method:DELETE
+# @nanoapi method:DELETE path:/api/elves/<elf_id> group:elf_write
 elves_bp.add_url_rule(
     "/<int:elf_id>", view_func=ElfDeleteView.as_view("elf_delete"), methods=["DELETE"]
 )

examples/python/flask/api/views/hobbits.py

@@ -11,7 +11,7 @@ def get(self, *args, **kwargs):
         return hobbits
 
 
-# @nanoapi path:/api/hobbits method:GET
+# @nanoapi method:GET path:/api/hobbits group:hobbit_read
 hobbits_bp.add_url_rule(
     "/", view_func=HobbitListView.as_view("hobbit_list"), methods=["GET"]
 )
@@ -24,7 +24,7 @@ def post(self, *args, **kwargs):
         return new_hobbit
 
 
-# @nanoapi path:/api/hobbits method:POST
+# @nanoapi method:POST path:/api/hobbits group:hobbit_write
 hobbits_bp.add_url_rule(
     "/", view_func=HobbitCreateView.as_view("hobbit_create"), methods=["POST"]
 )
@@ -36,7 +36,7 @@ def get(self, hobbit_id, *args, **kwargs):
         return hobbit
 
 
-# @nanoapi path:/api/hobbits/<hobbit_id> method:GET
+# @nanoapi method:GET path:/api/hobbits/<hobbit_id> group:hobbit_read
 hobbits_bp.add_url_rule(
     "/<int:hobbit_id>",
     view_func=HobbitDetailView.as_view("hobbit_detail"),
@@ -51,7 +51,7 @@ def put(self, hobbit_id, *args, **kwargs):
         return updated_hobbit
 
 
-# @nanoapi path:/api/hobbits/<hobbit_id> method:PUT
+# @nanoapi method:PUT path:/api/hobbits/<hobbit_id> group:hobbit_write
 hobbits_bp.add_url_rule(
     "/<int:hobbit_id>",
     view_func=HobbitUpdateView.as_view("hobbit_update"),
@@ -65,7 +65,7 @@ def delete(self, hobbit_id, *args, **kwargs):
         return None
 
 
-# @nanoapi path:/api/hobbits/<hobbit_id> method:DELETE
+# @nanoapi method:DELETE path:/api/hobbits/<hobbit_id> group:hobbit_write
 hobbits_bp.add_url_rule(
     "/<int:hobbit_id>",
     view_func=HobbitDeleteView.as_view("hobbit_delete"),

examples/python/flask/api/wizards/views.py

@@ -1,6 +1,6 @@
 from flask.views import MethodView
 from flask import request, Blueprint
-from api.wizards.services import WizardService
+from .services import WizardService
 
 wizards_bp = Blueprint("wizards", __name__)
 
@@ -11,7 +11,7 @@ def get(self, *args, **kwargs):
         return wizards
 
 
-# @nanoapi path:/api/wizards method:GET
+# @nanoapi method:GET path:/api/wizards group:wizard_read
 wizards_bp.add_url_rule(
     "/", view_func=WizardListView.as_view("wizard_list"), methods=["GET"]
 )
@@ -24,7 +24,7 @@ def post(self, *args, **kwargs):
         return new_wizard
 
 
-# @nanoapi path:/api/wizards method:POST
+# @nanoapi method:POST path:/api/wizards group:wizard_write
 wizards_bp.add_url_rule(
     "/", view_func=WizardCreateView.as_view("wizard_create"), methods=["POST"]
 )
@@ -36,7 +36,7 @@ def get(self, wizard_id, *args, **kwargs):
         return wizard
 
 
-# @nanoapi path:/api/wizards/<wizard_id> method:GET
+# @nanoapi method:GET path:/api/wizards/<wizard_id> group:wizard_read
 wizards_bp.add_url_rule(
     "/<int:wizard_id>",
     view_func=WizardDetailView.as_view("wizard_detail"),
@@ -51,7 +51,7 @@ def put(self, wizard_id, *args, **kwargs):
         return updated_wizard
 
 
-# @nanoapi path:/api/wizards/<wizard_id> method:PUT
+# @nanoapi method:PUT path:/api/wizards/<wizard_id> group:wizard_write
 wizards_bp.add_url_rule(
     "/<int:wizard_id>",
     view_func=WizardUpdateView.as_view("wizard_update"),
@@ -65,7 +65,7 @@ def delete(self, wizard_id, *args, **kwargs):
         return None
 
 
-# @nanoapi path:/api/wizards/<wizard_id> method:DELETE
+# @nanoapi method:DELETE path:/api/wizards/<wizard_id> group:wizard_write
 wizards_bp.add_url_rule(
     "/<int:wizard_id>",
     view_func=WizardDeleteView.as_view("wizard_delete"),

examples/python/flask/app.py

@@ -1,29 +1,25 @@
 from flask import Flask
-from api.wizards.views import wizards_bp
+from .api.wizards.views import wizards_bp
 from api.views.elves import elves_bp
 from api.views.hobbits import hobbits_bp
 
 app = Flask(__name__)
 
 
-# @nanoapi path:/ method:GET
 @app.get("/")
 def hello_world():
     return {"message": "Hello, World!"}
 
 
-# @nanoapi path:/liveness method:GET
 @app.get("/liveness")
 def liveness():
     return {"status": "ok"}
 
-
-# @nanoapi path:/readiness method:GET
+# @nanoapi path:readiness method:GET
 @app.get("/readiness")
 def readiness():
     return {"status": "ok"}
 
-
 # @nanoapi path:/api/wizards
 app.register_blueprint(wizards_bp, url_prefix="/api/wizards")
 

packages/cli/src/api/sync.ts

@@ -3,7 +3,7 @@ import { syncSchema } from "./helpers/validation";
 import fs from "fs";
 import DependencyTreeManager from "../dependencyManager/dependencyManager";
 import AnnotationManager from "../annotationManager";
-import { getLanguagePluginFromFilePath } from "../languagesPlugins";
+import { getLanguagePlugin } from "../languagesPlugins";
 import { replaceIndexesFromSourceCode } from "../helper/file";
 
 export function sync(payload: z.infer<typeof syncSchema>) {
@@ -29,7 +29,10 @@ export function sync(payload: z.infer<typeof syncSchema>) {
   });
 
   updatedEndpoints.forEach((endpoint) => {
-    const languagePlugin = getLanguagePluginFromFilePath(endpoint.filePath);
+    const languagePlugin = getLanguagePlugin(
+      payload.entrypointPath,
+      endpoint.filePath,
+    );
 
     const sourceCode = fs.readFileSync(endpoint.filePath, "utf-8");
 

packages/cli/src/dependencyManager/dependencyManager.ts

@@ -1,41 +1,51 @@
 import fs from "fs";
 
-import { resolveFilePath } from "../helper/file";
 import { DependencyTree, Group, Endpoint } from "./types";
 import AnnotationManager from "../annotationManager";
-import { getLanguagePluginFromFilePath } from "../languagesPlugins";
+import { getLanguagePlugin } from "../languagesPlugins";
 
 class DependencyTreeManager {
+  entryPointPath: string;
   dependencyTree: DependencyTree;
 
-  constructor(filePath: string) {
-    const dependencyTree = this.#getDependencyTree(filePath);
+  constructor(entryPointPath: string) {
+    this.entryPointPath = entryPointPath;
+    const dependencyTree = this.#getDependencyTree(
+      this.entryPointPath,
+      this.entryPointPath,
+    );
     this.dependencyTree = dependencyTree;
   }
 
-  #getDependencyTree(filePath: string): DependencyTree {
-    const sourceCode = fs.readFileSync(filePath, "utf8");
+  #getDependencyTree(
+    entryPointPath: string,
+    currentFilePath: string,
+  ): DependencyTree {
+    const sourceCode = fs.readFileSync(currentFilePath, "utf8");
 
     const dependencyTree: DependencyTree = {
-      path: filePath,
+      path: currentFilePath,
       sourceCode,
       children: [],
     };
 
-    const languagePlugin = getLanguagePluginFromFilePath(filePath);
+    const languagePlugin = getLanguagePlugin(entryPointPath, currentFilePath);
 
     const tree = languagePlugin.parser.parse(sourceCode);
 
-    let imports = languagePlugin.getImports(tree.rootNode);
-
-    imports = imports.filter((importPath) => importPath.source.startsWith("."));
+    const imports = languagePlugin.getImports(currentFilePath, tree.rootNode);
 
-    imports.forEach((importPath) => {
-      const resolvedPath = resolveFilePath(importPath.source, filePath);
-      if (resolvedPath && fs.existsSync(resolvedPath)) {
-        const childTree = this.#getDependencyTree(resolvedPath);
-        dependencyTree.children.push(childTree);
+    imports.forEach((depImport) => {
+      if (depImport.isExternal || !depImport.source) {
+        // Ignore external dependencies
+        return;
       }
+
+      const childTree = this.#getDependencyTree(
+        entryPointPath,
+        depImport.source,
+      );
+      dependencyTree.children.push(childTree);
     });
 
     return dependencyTree;
@@ -58,7 +68,10 @@ class DependencyTreeManager {
     parentFilePaths: string[],
     dependencyTree: DependencyTree,
   ) {
-    const languagePlugin = getLanguagePluginFromFilePath(dependencyTree.path);
+    const languagePlugin = getLanguagePlugin(
+      this.entryPointPath,
+      dependencyTree.path,
+    );
 
     const tree = languagePlugin.parser.parse(dependencyTree.sourceCode);
 

packages/cli/src/helper/file.ts

@@ -1,5 +1,4 @@
 import fs from "fs";
-import path from "path";
 
 export function cleanupOutputDir(outputDir: string) {
   if (fs.existsSync(outputDir)) {
@@ -11,44 +10,6 @@ export function createOutputDir(outputDir: string) {
   fs.mkdirSync(outputDir, { recursive: true });
 }
 
-export function resolveFilePath(importPath: string, currentFile: string) {
-  const currentFileExt = path.extname(currentFile);
-  const importExt = path.extname(importPath);
-  if (importPath.startsWith(".")) {
-    if (importExt) {
-      // If import path has an extension, resolve directly
-      const resolvedPath = path.resolve(path.dirname(currentFile), importPath);
-      if (fs.existsSync(resolvedPath)) {
-        return resolvedPath;
-      }
-    }
-
-    // If import path does not have an extension, try current file's extension first
-    const resolvedPathWithCurrentExt = path.resolve(
-      path.dirname(currentFile),
-      `${importPath}${currentFileExt}`,
-    );
-    if (fs.existsSync(resolvedPathWithCurrentExt)) {
-      return resolvedPathWithCurrentExt;
-    }
-
-    // try to resolve with any extension
-    const resolvedPath = path.resolve(path.dirname(currentFile), importPath);
-    try {
-      const resolvedPathWithAnyExt = require.resolve(resolvedPath);
-      if (fs.existsSync(resolvedPathWithAnyExt)) {
-        return resolvedPathWithAnyExt;
-      }
-    } catch {
-      // cannot resolve the path, return null
-      return null;
-    }
-  }
-
-  // Skip external dependencies (e.g., node_modules)
-  return null;
-}
-
 export function removeIndexesFromSourceCode(
   sourceCode: string,
   indexesToRemove: { startIndex: number; endIndex: number }[],

packages/cli/src/languagesPlugins/index.ts

@@ -1,17 +1,21 @@
 import JavascriptPlugin from "./javascript";
+import PythonPlugin from "./python";
 import { LanguagePlugin } from "./types";
 import TypescriptPlugin from "./typescript";
 
-export function getLanguagePluginFromFilePath(
+export function getLanguagePlugin(
+  entryPointPath: string,
   filePath: string,
 ): LanguagePlugin {
   const ext = filePath.split(".").pop();
 
   switch (ext) {
     case "js":
-      return new JavascriptPlugin();
+      return new JavascriptPlugin(entryPointPath);
     case "ts":
-      return new TypescriptPlugin();
+      return new TypescriptPlugin(entryPointPath);
+    case "py":
+      return new PythonPlugin(entryPointPath);
     default:
       throw new Error(`Unsupported file type: ${ext}`);
   }