dalux-build-api 1.1.5 → 2.0.1

package/package.json

@@ -1,8 +1,13 @@
 {
   "name": "dalux-build-api",
-  "version": "1.1.5",
+  "version": "2.0.1",
   "description": "Node.js client for the Dalux Build API",
   "main": "src/index.js",
+  "exports": {
+    ".": "./src/index.js",
+    "./browser": "./src/browser.js",
+    "./next": "./src/next.js"
+  },
   "files": [
     "src",
     "README.md"
@@ -24,17 +29,19 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/bruadam/dalux-build.git"
+    "url": "git+https://github.com/bruadam/dalux-build.git",
+    "directory": "javascript"
   },
   "bugs": {
     "url": "https://github.com/bruadam/dalux-build/issues"
   },
-  "homepage": "https://github.com/bruadam/dalux-build#readme",
+  "homepage": "https://github.com/bruadam/dalux-build/tree/main/javascript#readme",
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "axios": "^1.7.7"
+    "axios": "^1.7.7",
+    "zod": "^3.23.8"
   },
   "devDependencies": {
     "axios-mock-adapter": "^2.1.0",

package/src/api/CompaniesApi.js

@@ -1,5 +1,8 @@
 'use strict';
 
+const { convertToModel } = require('../models/convert');
+const { CompaniesListResponseSchema, CompanyResponseSchema } = require('../models/companies');
+
 /**
  * API methods for managing companies on a project.
  */
@@ -16,10 +19,11 @@ class CompaniesApi {
    * GET /3.1/projects/{projectId}/companies
    * @param {string} projectId
    * @param {object} [params]
-   * @returns {Promise<object>}
+   * @returns {Promise<object>} CompaniesListResponse ({ items: ProjectCompany[], metadata?, links? })
    */
-  listProjectCompanies(projectId, params = {}) {
-    return this._client.get(`/3.1/projects/${projectId}/companies`, params);
+  async listProjectCompanies(projectId, params = {}) {
+    const response = await this._client.get(`/3.1/projects/${projectId}/companies`, params);
+    return convertToModel(response, CompaniesListResponseSchema, 'CompaniesListResponse');
   }
 
   /**
@@ -27,10 +31,11 @@ class CompaniesApi {
    * GET /3.0/projects/{projectId}/companies/{companyId}
    * @param {string} projectId
    * @param {string} companyId
-   * @returns {Promise<object>}
+   * @returns {Promise<object>} CompanyResponse ({ data: ProjectCompany, links? })
    */
-  getProjectCompany(projectId, companyId) {
-    return this._client.get(`/3.0/projects/${projectId}/companies/${companyId}`);
+  async getProjectCompany(projectId, companyId) {
+    const response = await this._client.get(`/3.0/projects/${projectId}/companies/${companyId}`);
+    return convertToModel(response, CompanyResponseSchema, 'CompanyResponse');
   }
 
   /**
@@ -38,10 +43,11 @@ class CompaniesApi {
    * POST /3.1/projects/{projectId}/companies
    * @param {string} projectId
    * @param {object} body
-   * @returns {Promise<object>}
+   * @returns {Promise<object>} CompanyResponse
    */
-  createProjectCompany(projectId, body) {
-    return this._client.post(`/3.1/projects/${projectId}/companies`, body);
+  async createProjectCompany(projectId, body) {
+    const response = await this._client.post(`/3.1/projects/${projectId}/companies`, body);
+    return convertToModel(response, CompanyResponseSchema, 'CompanyResponse');
   }
 
   /**
@@ -50,10 +56,11 @@ class CompaniesApi {
    * @param {string} projectId
    * @param {string} companyId
    * @param {object} body
-   * @returns {Promise<object>}
+   * @returns {Promise<object>} CompanyResponse
    */
-  updateProjectCompany(projectId, companyId, body) {
-    return this._client.patch(`/3.0/projects/${projectId}/companies/${companyId}`, body);
+  async updateProjectCompany(projectId, companyId, body) {
+    const response = await this._client.patch(`/3.0/projects/${projectId}/companies/${companyId}`, body);
+    return convertToModel(response, CompanyResponseSchema, 'CompanyResponse');
   }
 }
 

package/src/api/CompanyCatalogApi.js

@@ -1,5 +1,9 @@
 'use strict';
 
+const { findByField } = require('../utils/search');
+const { convertToModel } = require('../models/convert');
+const { CompaniesListResponseSchema, CompanyResponseSchema } = require('../models/companies');
+
 /**
  * API methods for the company catalog.
  */
@@ -15,30 +19,33 @@ class CompanyCatalogApi {
    * Get companies registered in the company catalog.
    * GET /2.2/companyCatalog
    * @param {object} [params]
-   * @returns {Promise<object>}
+   * @returns {Promise<object>} CompaniesListResponse ({ items: ProjectCompany[], metadata?, links? })
    */
-  getCompanies(params = {}) {
-    return this._client.get('/2.2/companyCatalog', params);
+  async getCompanies(params = {}) {
+    const response = await this._client.get('/2.2/companyCatalog', params);
+    return convertToModel(response, CompaniesListResponseSchema, 'CompaniesListResponse');
   }
 
   /**
    * Get a specific company from the catalog.
    * GET /1.2/companyCatalog/{catalogCompanyId}
    * @param {string} catalogCompanyId
-   * @returns {Promise<object>}
+   * @returns {Promise<object>} CompanyResponse ({ data: ProjectCompany, links? })
    */
-  getCompany(catalogCompanyId) {
-    return this._client.get(`/1.2/companyCatalog/${catalogCompanyId}`);
+  async getCompany(catalogCompanyId) {
+    const response = await this._client.get(`/1.2/companyCatalog/${catalogCompanyId}`);
+    return convertToModel(response, CompanyResponseSchema, 'CompanyResponse');
   }
 
   /**
    * Add a company to the catalog.
    * POST /2.2/companyCatalog
    * @param {object} body
-   * @returns {Promise<object>}
+   * @returns {Promise<object>} CompanyResponse
    */
-  createCompany(body) {
-    return this._client.post('/2.2/companyCatalog', body);
+  async createCompany(body) {
+    const response = await this._client.post('/2.2/companyCatalog', body);
+    return convertToModel(response, CompanyResponseSchema, 'CompanyResponse');
   }
 
   /**
@@ -46,10 +53,11 @@ class CompanyCatalogApi {
    * PATCH /2.1/companyCatalog/{catalogCompanyId}
    * @param {string} catalogCompanyId
    * @param {object} body
-   * @returns {Promise<object>}
+   * @returns {Promise<object>} CompanyResponse
    */
-  updateCompany(catalogCompanyId, body) {
-    return this._client.patch(`/2.1/companyCatalog/${catalogCompanyId}`, body);
+  async updateCompany(catalogCompanyId, body) {
+    const response = await this._client.patch(`/2.1/companyCatalog/${catalogCompanyId}`, body);
+    return convertToModel(response, CompanyResponseSchema, 'CompanyResponse');
   }
 
   /**
@@ -110,15 +118,11 @@ class CompanyCatalogApi {
    * @returns {Promise<string|null>} The catalogCompanyId, or null if not found.
    */
   async getCompanyByName(companyName) {
-    const { findByField } = require('../utils/search');
     const response = await this.getCompanies();
     const items = (response && response.items) || [];
-    const company =
-      findByField(items, 'companyName', companyName, (x) => x.data || x) ||
-      findByField(items, 'name', companyName, (x) => x.data || x);
+    const company = findByField(items, 'name', companyName);
     if (!company) return null;
-    const data = company.data || company;
-    return data.catalogCompanyId || data.id || null;
+    return company.catalogCompanyId || null;
   }
 }
 

package/src/api/FileAreasApi.js

@@ -1,5 +1,9 @@
 'use strict';
 
+const { findByField } = require('../utils/search');
+const { convertToModel } = require('../models/convert');
+const { FileAreaSchema, FileAreasListResponseSchema } = require('../models/fileAreas');
+
 /**
  * API methods for file areas on a project.
  */
@@ -16,10 +20,11 @@ class FileAreasApi {
    * GET /5.1/projects/{projectId}/file_areas
    * @param {string} projectId
    * @param {object} [params]
-   * @returns {Promise<object>}
+   * @returns {Promise<object>} FileAreasListResponse ({ items: FileArea[], metadata?, links? })
    */
-  getFileAreas(projectId, params = {}) {
-    return this._client.get(`/5.1/projects/${projectId}/file_areas`, params);
+  async getFileAreas(projectId, params = {}) {
+    const response = await this._client.get(`/5.1/projects/${projectId}/file_areas`, params);
+    return convertToModel(response, FileAreasListResponseSchema, 'FileAreasListResponse');
   }
 
   /**
@@ -27,10 +32,11 @@ class FileAreasApi {
    * GET /1.0/projects/{projectId}/file_areas/{fileAreaId}
    * @param {string} projectId
    * @param {string} fileAreaId
-   * @returns {Promise<object>}
+   * @returns {Promise<object>} FileArea (not wrapped in a data envelope, matches Python)
    */
-  getFileArea(projectId, fileAreaId) {
-    return this._client.get(`/1.0/projects/${projectId}/file_areas/${fileAreaId}`);
+  async getFileArea(projectId, fileAreaId) {
+    const response = await this._client.get(`/1.0/projects/${projectId}/file_areas/${fileAreaId}`);
+    return convertToModel(response, FileAreaSchema, 'FileArea');
   }
 
   /**
@@ -40,15 +46,11 @@ class FileAreasApi {
    * @returns {Promise<string|null>} The fileAreaId, or null if not found.
    */
   async getFileAreaByName(projectId, fileAreaName) {
-    const { findByField } = require('../utils/search');
     const response = await this.getFileAreas(projectId);
     const items = (response && response.items) || [];
-    const area =
-      findByField(items, 'fileAreaName', fileAreaName, (x) => x.data || x) ||
-      findByField(items, 'name', fileAreaName, (x) => x.data || x);
+    const area = findByField(items, 'fileAreaName', fileAreaName);
     if (!area) return null;
-    const data = area.data || area;
-    return data.fileAreaId || data.id || null;
+    return area.fileAreaId || null;
   }
 }
 

package/src/api/FilesApi.js

@@ -7,6 +7,8 @@ const axios = require('axios');
 const { findByField, findAllByField } = require('../utils/search');
 const { resolveFolderIdFromNamedPath } = require('../utils/pathResolver');
 const { validateProjectId, validateFileAreaId, validateFolderId } = require('../utils/validation');
+const { convertToModel, convertToModelList } = require('../models/convert');
+const { FileSchema, FileResponseSchema, FilesListResponseSchema } = require('../models/files');
 
 /**
  * API methods for files within a file area.
@@ -24,14 +26,15 @@ class FilesApi {
    * GET /6.1/projects/{projectId}/file_areas/{fileAreaId}/files
    * @param {string} projectId
    * @param {string} fileAreaId
-   * @param {object} [params] - Optional params (e.g. folderId, updatedAfter, includeProperties). The files endpoint does not support OData $filter.
+   * @param {object} [params] - Optional documented params such as includeProperties. The files endpoint does not support OData $filter.
    * @returns {Promise<object>}
    */
-  listFiles(projectId, fileAreaId, params = {}) {
-    return this._client.get(
+  async listFiles(projectId, fileAreaId, params = {}) {
+    const response = await this._client.get(
       `/6.1/projects/${projectId}/file_areas/${fileAreaId}/files`,
       params,
     );
+    return convertToModel(response, FilesListResponseSchema, 'FilesListResponse');
   }
 
   /**
@@ -75,7 +78,7 @@ class FilesApi {
     if (verbose) {
       console.log(`Done. Total files retrieved: ${allItems.length}`);
     }
-    return allItems;
+    return convertToModelList(allItems, FileSchema, 'File');
   }
 
   /**
@@ -208,9 +211,10 @@ class FilesApi {
     }
 
     // ID-based lookup (original behaviour)
-    const fileInfo = await this._client.get(
+    const rawResponse = await this._client.get(
       `/5.0/projects/${projectId}/file_areas/${fileAreaIdOrPath}/files/${fileId}`,
     );
+    const fileInfo = convertToModel(rawResponse, FileResponseSchema, 'FileResponse');
     if (options.download && fileInfo && fileInfo.data && fileInfo.data.downloadLink) {
       const name = fileInfo.data.fileName || fileId;
       const downloadedPath = await this.downloadFileFromLink(
@@ -538,11 +542,11 @@ class FilesApi {
     const question = (prompt) => new Promise((resolve) => rl.question(prompt, resolve));
 
     function getFid(f) {
-      const d = f.data || {};
+      const d = f.data || f || {};
       return d.id || d.fileId || null;
     }
     function getFname(f) {
-      return (f.data || {}).fileName || '<unknown>';
+      return (f.data || f || {}).fileName || '<unknown>';
     }
     function hasContent(node) {
       if (node.files.length) return true;

package/src/api/FoldersApi.js

@@ -4,6 +4,8 @@ const { paginate } = require('../utils/pagination');
 const { findByField } = require('../utils/search');
 const { validateProjectId, validateFileAreaId } = require('../utils/validation');
 const { resolveFolderIdFromNamedPath } = require('../utils/pathResolver');
+const { convertToModel, convertToModelList } = require('../models/convert');
+const { FolderSchema, FolderResponseSchema, FoldersListResponseSchema } = require('../models/folders');
 
 /**
  * API methods for folders within a file area.
@@ -24,11 +26,12 @@ class FoldersApi {
    * @param {object} [params]
    * @returns {Promise<object>}
    */
-  listFolders(projectId, fileAreaId, params = {}) {
-    return this._client.get(
+  async listFolders(projectId, fileAreaId, params = {}) {
+    const response = await this._client.get(
       `/5.1/projects/${projectId}/file_areas/${fileAreaId}/folders`,
       params,
     );
+    return convertToModel(response, FoldersListResponseSchema, 'FoldersListResponse');
   }
 
   /**
@@ -43,7 +46,8 @@ class FoldersApi {
     validateProjectId(projectId);
     validateFileAreaId(fileAreaId);
     const endpoint = `/5.1/projects/${projectId}/file_areas/${fileAreaId}/folders`;
-    return paginate(endpoint, this._client, params, verbose);
+    const raw = await paginate(endpoint, this._client, params, verbose);
+    return convertToModelList(raw, FolderSchema, 'Folder');
   }
 
   /**
@@ -54,10 +58,11 @@ class FoldersApi {
    * @param {string} folderId
    * @returns {Promise<object>}
    */
-  getFolder(projectId, fileAreaId, folderId) {
-    return this._client.get(
+  async getFolder(projectId, fileAreaId, folderId) {
+    const response = await this._client.get(
       `/5.0/projects/${projectId}/file_areas/${fileAreaId}/folders/${folderId}`,
     );
+    return convertToModel(response, FolderResponseSchema, 'FolderResponse');
   }
 
   /**
@@ -103,15 +108,12 @@ class FoldersApi {
     validateProjectId(projectId);
     validateFileAreaId(fileAreaId);
     const allFolders = await this.getAllFolders(projectId, fileAreaId);
-    const folder = findByField(allFolders, 'folderName', folderName, (x) => x.data || x)
-      || findByField(allFolders, 'name', folderName, (x) => x.data || x);
+    const folder = findByField(allFolders, 'folderName', folderName);
     if (!folder) return null;
-    if (parentFolderId != null) {
-      const data = folder.data || folder;
-      const pid = data.parentFolderId || data.parentId;
-      if (pid !== parentFolderId) return null;
+    if (parentFolderId != null && folder.parentFolderId !== parentFolderId) {
+      return null;
     }
-    return folder;
+    return convertToModel({ data: folder }, FolderResponseSchema, 'FolderResponse');
   }
 
   /**

package/src/api/FormsApi.js

@@ -1,5 +1,8 @@
 'use strict';
 
+const { convertToModel } = require('../models/convert');
+const { FormsListResponseSchema, FormResponseSchema } = require('../models/forms');
+
 /**
  * API methods for forms on a project.
  */
@@ -16,10 +19,11 @@ class FormsApi {
    * GET /2.1/projects/{projectId}/forms
    * @param {string} projectId
    * @param {object} [params] - Optional filters (e.g. updatedAfter)
-   * @returns {Promise<object>}
+   * @returns {Promise<object>} FormsListResponse ({ items, metadata?, links? })
    */
-  getProjectForms(projectId, params = {}) {
-    return this._client.get(`/2.1/projects/${projectId}/forms`, params);
+  async getProjectForms(projectId, params = {}) {
+    const response = await this._client.get(`/2.1/projects/${projectId}/forms`, params);
+    return convertToModel(response, FormsListResponseSchema, 'FormsListResponse');
   }
 
   /**
@@ -27,10 +31,11 @@ class FormsApi {
    * GET /1.2/projects/{projectId}/forms/{formId}
    * @param {string} projectId
    * @param {string} formId
-   * @returns {Promise<object>}
+   * @returns {Promise<object>} FormResponse ({ data, links? })
    */
-  getForm(projectId, formId) {
-    return this._client.get(`/1.2/projects/${projectId}/forms/${formId}`);
+  async getForm(projectId, formId) {
+    const response = await this._client.get(`/1.2/projects/${projectId}/forms/${formId}`);
+    return convertToModel(response, FormResponseSchema, 'FormResponse');
   }
 
   /**

package/src/api/InspectionPlansApi.js

@@ -1,5 +1,18 @@
 'use strict';
 
+const { convertToModel, convertToModelList } = require('../models/convert');
+const { paginate } = require('../utils/pagination');
+const {
+  InspectionPlanSchema,
+  InspectionPlanItemSchema,
+  InspectionPlanItemZoneSchema,
+  InspectionPlanRegistrationSchema,
+  InspectionPlansListResponseSchema,
+  InspectionPlanItemsListResponseSchema,
+  InspectionPlanItemZonesListResponseSchema,
+  InspectionPlanRegistrationsListResponseSchema,
+} = require('../models/inspectionPlans');
+
 /**
  * API methods for inspection plans.
  */
@@ -16,10 +29,27 @@ class InspectionPlansApi {
    * GET /1.2/projects/{projectId}/inspectionPlans
    * @param {string} projectId
    * @param {object} [params]
-   * @returns {Promise<object>}
+   * @param {boolean} [fullResponse=false]
+   * @returns {Promise<object[]|object>}
    */
-  listInspectionPlans(projectId, params = {}) {
-    return this._client.get(`/1.2/projects/${projectId}/inspectionPlans`, params);
+  async listInspectionPlans(projectId, params = {}, fullResponse = false) {
+    const response = await this._client.get(`/1.2/projects/${projectId}/inspectionPlans`, params);
+    const result = convertToModel(
+      response,
+      InspectionPlansListResponseSchema,
+      'InspectionPlansListResponse',
+    );
+    return fullResponse ? result : (result?.items || []);
+  }
+
+  async getAllInspectionPlans(projectId, params = {}, verbose = false) {
+    const items = await paginate(
+      `/1.2/projects/${projectId}/inspectionPlans`,
+      this._client,
+      params,
+      verbose,
+    );
+    return convertToModelList(items, InspectionPlanSchema, 'InspectionPlan');
   }
 
   /**
@@ -29,8 +59,24 @@ class InspectionPlansApi {
    * @param {object} [params]
    * @returns {Promise<object>}
    */
-  listInspectionPlanItems(projectId, params = {}) {
-    return this._client.get(`/1.1/projects/${projectId}/inspectionPlanItems`, params);
+  async listInspectionPlanItems(projectId, params = {}, fullResponse = false) {
+    const response = await this._client.get(`/1.1/projects/${projectId}/inspectionPlanItems`, params);
+    const result = convertToModel(
+      response,
+      InspectionPlanItemsListResponseSchema,
+      'InspectionPlanItemsListResponse',
+    );
+    return fullResponse ? result : (result?.items || []);
+  }
+
+  async getAllInspectionPlanItems(projectId, params = {}, verbose = false) {
+    const items = await paginate(
+      `/1.1/projects/${projectId}/inspectionPlanItems`,
+      this._client,
+      params,
+      verbose,
+    );
+    return convertToModelList(items, InspectionPlanItemSchema, 'InspectionPlanItem');
   }
 
   /**
@@ -40,8 +86,24 @@ class InspectionPlansApi {
    * @param {object} [params]
    * @returns {Promise<object>}
    */
-  listInspectionPlanItemZones(projectId, params = {}) {
-    return this._client.get(`/1.1/projects/${projectId}/inspectionPlanItemZones`, params);
+  async listInspectionPlanItemZones(projectId, params = {}, fullResponse = false) {
+    const response = await this._client.get(`/1.1/projects/${projectId}/inspectionPlanItemZones`, params);
+    const result = convertToModel(
+      response,
+      InspectionPlanItemZonesListResponseSchema,
+      'InspectionPlanItemZonesListResponse',
+    );
+    return fullResponse ? result : (result?.items || []);
+  }
+
+  async getAllInspectionPlanItemZones(projectId, params = {}, verbose = false) {
+    const items = await paginate(
+      `/1.1/projects/${projectId}/inspectionPlanItemZones`,
+      this._client,
+      params,
+      verbose,
+    );
+    return convertToModelList(items, InspectionPlanItemZoneSchema, 'InspectionPlanItemZone');
   }
 
   /**
@@ -51,11 +113,27 @@ class InspectionPlansApi {
    * @param {object} [params]
    * @returns {Promise<object>}
    */
-  listInspectionPlanRegistrations(projectId, params = {}) {
-    return this._client.get(
+  async listInspectionPlanRegistrations(projectId, params = {}, fullResponse = false) {
+    const response = await this._client.get(
+      `/2.1/projects/${projectId}/inspectionPlanRegistrations`,
+      params,
+    );
+    const result = convertToModel(
+      response,
+      InspectionPlanRegistrationsListResponseSchema,
+      'InspectionPlanRegistrationsListResponse',
+    );
+    return fullResponse ? result : (result?.items || []);
+  }
+
+  async getAllInspectionPlanRegistrations(projectId, params = {}, verbose = false) {
+    const items = await paginate(
       `/2.1/projects/${projectId}/inspectionPlanRegistrations`,
+      this._client,
       params,
+      verbose,
     );
+    return convertToModelList(items, InspectionPlanRegistrationSchema, 'InspectionPlanRegistration');
   }
 }
 

package/src/api/ProjectsApi.js

@@ -1,5 +1,9 @@
 'use strict';
 
+const { findByField } = require('../utils/search');
+const { convertToModel } = require('../models/convert');
+const { ProjectsListResponseSchema, ProjectResponseSchema } = require('../models/projects');
+
 /**
  * API methods for project management.
  */
@@ -15,30 +19,33 @@ class ProjectsApi {
    * Get all available projects.
    * GET /5.1/projects
    * @param {object} [params] - Optional query parameters (e.g. updatedAfter)
-   * @returns {Promise<object>}
+   * @returns {Promise<object>} ProjectsListResponse ({ items: Project[], metadata?, links? })
    */
-  listProjects(params = {}) {
-    return this._client.get('/5.1/projects', params);
+  async listProjects(params = {}) {
+    const response = await this._client.get('/5.1/projects', params);
+    return convertToModel(response, ProjectsListResponseSchema, 'ProjectsListResponse');
   }
 
   /**
    * Get a specific project.
    * GET /5.0/projects/{projectId}
    * @param {string} projectId
-   * @returns {Promise<object>}
+   * @returns {Promise<object>} ProjectResponse ({ data: Project, links? })
    */
-  getProject(projectId) {
-    return this._client.get(`/5.0/projects/${projectId}`);
+  async getProject(projectId) {
+    const response = await this._client.get(`/5.0/projects/${projectId}`);
+    return convertToModel(response, ProjectResponseSchema, 'ProjectResponse');
   }
 
   /**
    * Create a new project.
    * POST /5.0/projects
    * @param {object} body
-   * @returns {Promise<object>}
+   * @returns {Promise<object>} ProjectResponse
    */
-  createProject(body) {
-    return this._client.post('/5.0/projects', body);
+  async createProject(body) {
+    const response = await this._client.post('/5.0/projects', body);
+    return convertToModel(response, ProjectResponseSchema, 'ProjectResponse');
   }
 
   /**
@@ -46,10 +53,11 @@ class ProjectsApi {
    * PATCH /5.0/projects/{projectId}
    * @param {string} projectId
    * @param {object} body
-   * @returns {Promise<object>}
+   * @returns {Promise<object>} ProjectResponse
    */
-  updateProject(projectId, body) {
-    return this._client.patch(`/5.0/projects/${projectId}`, body);
+  async updateProject(projectId, body) {
+    const response = await this._client.patch(`/5.0/projects/${projectId}`, body);
+    return convertToModel(response, ProjectResponseSchema, 'ProjectResponse');
   }
 
   /**
@@ -108,15 +116,11 @@ class ProjectsApi {
    * @returns {Promise<string|null>} The projectId, or null if not found.
    */
   async getProjectByName(projectName) {
-    const { findByField } = require('../utils/search');
     const response = await this.listProjects();
     const items = (response && response.items) || [];
-    const project =
-      findByField(items, 'projectName', projectName, (x) => x.data || x) ||
-      findByField(items, 'name', projectName, (x) => x.data || x);
+    const project = findByField(items, 'projectName', projectName);
     if (!project) return null;
-    const data = project.data || project;
-    return data.projectId || data.id || null;
+    return project.projectId || null;
   }
 }