@umbraco/playwright-testhelpers 2.0.0-beta.3 → 2.0.0-beta.31

package/dist/lib/helpers/ApiHelpers.d.ts

@@ -1,28 +1,36 @@
 import { Page } from "@playwright/test";
 import { ReportHelper } from "./ReportHelper";
 import { TelemetryDataApiHelper } from "./TelemetryDataApiHelper";
-import { LanguagesApiHelper } from "./LanguageApiHelper";
+import { LanguageApiHelper } from "./LanguageApiHelper";
 import { DictionaryApiHelper } from "./DictionaryApiHelper";
-import { RelationTypeApiHelper } from "./RelationType";
+import { RelationTypeApiHelper } from "./RelationTypeApiHelper";
 import { UserGroupApiHelper } from "./UserGroupApiHelper";
 import { TemplateApiHelper } from "./TemplateApiHelper";
 import { AliasHelper } from "./AliasHelper";
 import { DataTypeApiHelper } from "./DataTypeApiHelper";
 import { UserApiHelper } from "./UserApiHelper";
 import { TemporaryFileApiHelper } from "./TemporaryFileApiHelper";
-import { DocumentApiHelper } from "./DocumentApiHelper";
 import { PackageApiHelper } from "./PackageApiHelper";
 import { ScriptApiHelper } from "./ScriptApiHelper";
 import { PartialViewApiHelper } from "./PartialViewApiHelper";
 import { StylesheetApiHelper } from "./StylesheetApiHelper";
 import { LogViewerApiHelper } from "./LogViewerApiHelper";
+import { DocumentTypeApiHelper } from "./DocumentTypeApiHelper";
+import { DocumentApiHelper } from "./DocumentApiHelper";
+import { MediaTypeApiHelper } from "./MediaTypeApiHelper";
+import { MediaApiHelper } from "./MediaApiHelper";
+import { ObjectTypesApiHelper } from "./ObjectTypesApiHelper";
+import { ModelsBuilderApiHelper } from "./ModelsBuilderApiHelper";
+import { HealthCheckApiHelper } from "./HealthCheckApiHelper";
+import { IndexerApiHelper } from "./IndexerApiHelper";
+import { PublishedCacheApiHelper } from "./PublishedCacheApiHelper";
 export declare class ApiHelpers {
     baseUrl: string;
     page: Page;
     alias: AliasHelper;
     report: ReportHelper;
     telemetry: TelemetryDataApiHelper;
-    language: LanguagesApiHelper;
+    language: LanguageApiHelper;
     dictionary: DictionaryApiHelper;
     relationType: RelationTypeApiHelper;
     userGroup: UserGroupApiHelper;
@@ -30,12 +38,20 @@ export declare class ApiHelpers {
     dataType: DataTypeApiHelper;
     user: UserApiHelper;
     temporaryFile: TemporaryFileApiHelper;
+    documentType: DocumentTypeApiHelper;
     document: DocumentApiHelper;
     package: PackageApiHelper;
     script: ScriptApiHelper;
     partialView: PartialViewApiHelper;
     stylesheet: StylesheetApiHelper;
     logViewer: LogViewerApiHelper;
+    mediaType: MediaTypeApiHelper;
+    media: MediaApiHelper;
+    objectTypes: ObjectTypesApiHelper;
+    modelsBuilder: ModelsBuilderApiHelper;
+    healthCheck: HealthCheckApiHelper;
+    indexer: IndexerApiHelper;
+    publishedCache: PublishedCacheApiHelper;
     constructor(page: Page);
     getBearerToken(): Promise<string>;
     getCookie(): Promise<string>;

package/dist/lib/helpers/ApiHelpers.js

@@ -6,20 +6,28 @@ const ReportHelper_1 = require("./ReportHelper");
 const TelemetryDataApiHelper_1 = require("./TelemetryDataApiHelper");
 const LanguageApiHelper_1 = require("./LanguageApiHelper");
 const DictionaryApiHelper_1 = require("./DictionaryApiHelper");
-const RelationType_1 = require("./RelationType");
+const RelationTypeApiHelper_1 = require("./RelationTypeApiHelper");
 const UserGroupApiHelper_1 = require("./UserGroupApiHelper");
 const TemplateApiHelper_1 = require("./TemplateApiHelper");
 const AliasHelper_1 = require("./AliasHelper");
 const DataTypeApiHelper_1 = require("./DataTypeApiHelper");
 const UserApiHelper_1 = require("./UserApiHelper");
 const TemporaryFileApiHelper_1 = require("./TemporaryFileApiHelper");
-const DocumentApiHelper_1 = require("./DocumentApiHelper");
 const PackageApiHelper_1 = require("./PackageApiHelper");
 const ScriptApiHelper_1 = require("./ScriptApiHelper");
 const PartialViewApiHelper_1 = require("./PartialViewApiHelper");
 const StylesheetApiHelper_1 = require("./StylesheetApiHelper");
 const fs = require("fs");
 const LogViewerApiHelper_1 = require("./LogViewerApiHelper");
+const DocumentTypeApiHelper_1 = require("./DocumentTypeApiHelper");
+const DocumentApiHelper_1 = require("./DocumentApiHelper");
+const MediaTypeApiHelper_1 = require("./MediaTypeApiHelper");
+const MediaApiHelper_1 = require("./MediaApiHelper");
+const ObjectTypesApiHelper_1 = require("./ObjectTypesApiHelper");
+const ModelsBuilderApiHelper_1 = require("./ModelsBuilderApiHelper");
+const HealthCheckApiHelper_1 = require("./HealthCheckApiHelper");
+const IndexerApiHelper_1 = require("./IndexerApiHelper");
+const PublishedCacheApiHelper_1 = require("./PublishedCacheApiHelper");
 class ApiHelpers {
     baseUrl = umbraco_config_1.umbracoConfig.environment.baseUrl;
     page;
@@ -34,31 +42,47 @@ class ApiHelpers {
     dataType;
     user;
     temporaryFile;
+    documentType;
     document;
     package;
     script;
     partialView;
     stylesheet;
     logViewer;
+    mediaType;
+    media;
+    objectTypes;
+    modelsBuilder;
+    healthCheck;
+    indexer;
+    publishedCache;
     constructor(page) {
         this.page = page;
         this.alias = new AliasHelper_1.AliasHelper();
         this.report = new ReportHelper_1.ReportHelper(this);
         this.telemetry = new TelemetryDataApiHelper_1.TelemetryDataApiHelper(this);
-        this.language = new LanguageApiHelper_1.LanguagesApiHelper(this);
+        this.language = new LanguageApiHelper_1.LanguageApiHelper(this);
         this.dictionary = new DictionaryApiHelper_1.DictionaryApiHelper(this);
-        this.relationType = new RelationType_1.RelationTypeApiHelper(this);
+        this.relationType = new RelationTypeApiHelper_1.RelationTypeApiHelper(this);
         this.userGroup = new UserGroupApiHelper_1.UserGroupApiHelper(this);
         this.template = new TemplateApiHelper_1.TemplateApiHelper(this);
         this.dataType = new DataTypeApiHelper_1.DataTypeApiHelper(this);
         this.user = new UserApiHelper_1.UserApiHelper(this);
         this.temporaryFile = new TemporaryFileApiHelper_1.TemporaryFileApiHelper(this);
+        this.documentType = new DocumentTypeApiHelper_1.DocumentTypeApiHelper(this);
         this.document = new DocumentApiHelper_1.DocumentApiHelper(this);
         this.package = new PackageApiHelper_1.PackageApiHelper(this);
         this.script = new ScriptApiHelper_1.ScriptApiHelper(this);
         this.partialView = new PartialViewApiHelper_1.PartialViewApiHelper(this);
         this.stylesheet = new StylesheetApiHelper_1.StylesheetApiHelper(this);
         this.logViewer = new LogViewerApiHelper_1.LogViewerApiHelper(this);
+        this.mediaType = new MediaTypeApiHelper_1.MediaTypeApiHelper(this);
+        this.media = new MediaApiHelper_1.MediaApiHelper(this);
+        this.objectTypes = new ObjectTypesApiHelper_1.ObjectTypesApiHelper(this);
+        this.modelsBuilder = new ModelsBuilderApiHelper_1.ModelsBuilderApiHelper(this);
+        this.healthCheck = new HealthCheckApiHelper_1.HealthCheckApiHelper(this);
+        this.indexer = new IndexerApiHelper_1.IndexerApiHelper(this);
+        this.publishedCache = new PublishedCacheApiHelper_1.PublishedCacheApiHelper(this);
     }
     async getBearerToken() {
         let someStorage = await this.page.context().storageState();

package/dist/lib/helpers/ApiHelpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"ApiHelpers.js","sourceRoot":"","sources":["../../../lib/helpers/ApiHelpers.ts"],"names":[],"mappings":"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","sourcesContent":["import {Page} from \"@playwright/test\"\nimport {umbracoConfig} from \"../../umbraco.config\";\nimport {ReportHelper} from \"./ReportHelper\";\nimport {TelemetryDataApiHelper} from \"./TelemetryDataApiHelper\";\nimport {LanguagesApiHelper} from \"./LanguageApiHelper\";\nimport {DictionaryApiHelper} from \"./DictionaryApiHelper\";\nimport {RelationTypeApiHelper} from \"./RelationType\";\nimport {UserGroupApiHelper} from \"./UserGroupApiHelper\";\nimport {TemplateApiHelper} from \"./TemplateApiHelper\";\nimport {AliasHelper} from \"./AliasHelper\";\nimport {DataTypeApiHelper} from \"./DataTypeApiHelper\";\nimport {UserApiHelper} from \"./UserApiHelper\";\nimport {TemporaryFileApiHelper} from \"./TemporaryFileApiHelper\";\nimport {DocumentApiHelper} from \"./DocumentApiHelper\";\nimport {PackageApiHelper} from \"./PackageApiHelper\";\nimport {ScriptApiHelper} from \"./ScriptApiHelper\";\nimport {PartialViewApiHelper} from \"./PartialViewApiHelper\";\nimport {StylesheetApiHelper} from \"./StylesheetApiHelper\";\nimport * as fs from \"fs\";\nimport {LogViewerApiHelper} from \"./LogViewerApiHelper\";\n\nexport class ApiHelpers {\n  baseUrl: string = umbracoConfig.environment.baseUrl;\n  page: Page;\n  alias: AliasHelper;\n  report: ReportHelper;\n  telemetry: TelemetryDataApiHelper;\n  language: LanguagesApiHelper;\n  dictionary: DictionaryApiHelper;\n  relationType: RelationTypeApiHelper;\n  userGroup: UserGroupApiHelper;\n  template: TemplateApiHelper;\n  dataType: DataTypeApiHelper;\n  user: UserApiHelper;\n  temporaryFile: TemporaryFileApiHelper;\n  document: DocumentApiHelper;\n  package: PackageApiHelper;\n  script: ScriptApiHelper;\n  partialView: PartialViewApiHelper;\n  stylesheet: StylesheetApiHelper;\n  logViewer: LogViewerApiHelper;\n\n  constructor(page: Page) {\n    this.page = page;\n    this.alias = new AliasHelper();\n    this.report = new ReportHelper(this);\n    this.telemetry = new TelemetryDataApiHelper(this);\n    this.language = new LanguagesApiHelper(this);\n    this.dictionary = new DictionaryApiHelper(this);\n    this.relationType = new RelationTypeApiHelper(this);\n    this.userGroup = new UserGroupApiHelper(this);\n    this.template = new TemplateApiHelper(this);\n    this.dataType = new DataTypeApiHelper(this);\n    this.user = new UserApiHelper(this);\n    this.temporaryFile = new TemporaryFileApiHelper(this);\n    this.document = new DocumentApiHelper(this);\n    this.package = new PackageApiHelper(this);\n    this.script = new ScriptApiHelper(this);\n    this.partialView = new PartialViewApiHelper(this);\n    this.stylesheet = new StylesheetApiHelper(this);\n    this.logViewer = new LogViewerApiHelper(this);\n  }\n\n  async getBearerToken() {\n    let someStorage = await this.page.context().storageState();\n    let someObject = JSON.parse(someStorage.origins[0].localStorage[0].value);\n    return 'Bearer ' + someObject.access_token;\n  }\n\n  async getCookie() {\n    let someStorage = await this.page.context().storageState();\n\n    let cookieString = \"\";\n\n    for (let cookie of someStorage.cookies) {\n      cookieString += cookie.name + '=' + cookie.value + ';';\n    }\n\n    return cookieString;\n  }\n\n  async getHeaders() {\n    return {\n      'Authorization': await this.getBearerToken(),\n      'Cookie': await this.getCookie(),\n    }\n  }\n\n  async get(url: string, params?: { [key: string]: string | number | boolean; }) {\n    const options = {\n      headers: await this.getHeaders(),\n      params: params,\n      ignoreHTTPSErrors: true\n    }\n    return this.page.request.get(url, options);\n  }\n\n  async saveCodeFile(codeFile) {\n    if (codeFile == null) {\n      return;\n    }\n\n    return await this.post(umbracoConfig.environment.baseUrl + '/umbraco/backoffice/UmbracoApi/CodeFile/PostSave', codeFile);\n  }\n  \n  async post(url: string, data?: object) {\n    const options = {\n      headers: await this.getHeaders(),\n      data: data,\n      ignoreHTTPSErrors: true\n    }\n    return await this.page.request.post(url, options);\n  }\n\n  async delete(url: string, data?: object) {\n    const options = {\n      headers: await this.getHeaders(),\n      data: data,\n      ignoreHTTPSErrors: true\n    }\n    return await this.page.request.delete(url, options);\n  }\n\n  async put(url: string, data?: object) {\n    const options = {\n      headers: await this.getHeaders(),\n      data: data,\n      ignoreHTTPSErrors: true\n    }\n    return await this.page.request.put(url, options);\n  }\n\n  async postMultiPartForm(url: string, id, name: string, mimeType: string, filePath) {\n    const options = {\n      headers: await this.getHeaders(),\n      multipart: {\n        Id: id,\n        File: {\n          name: name,\n          mimeType: mimeType,\n          buffer: fs.readFileSync(filePath)\n        }\n      },\n      ignoreHTTPSErrors: true\n    }\n    return await this.page.request.post(url, options);\n  }\n}"]}
+{"version":3,"file":"ApiHelpers.js","sourceRoot":"","sources":["../../../lib/helpers/ApiHelpers.ts"],"names":[],"mappings":"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","sourcesContent":["import {Page} from \"@playwright/test\"\nimport {umbracoConfig} from \"../../umbraco.config\";\nimport {ReportHelper} from \"./ReportHelper\";\nimport {TelemetryDataApiHelper} from \"./TelemetryDataApiHelper\";\nimport {LanguageApiHelper} from \"./LanguageApiHelper\";\nimport {DictionaryApiHelper} from \"./DictionaryApiHelper\";\nimport {RelationTypeApiHelper} from \"./RelationTypeApiHelper\";\nimport {UserGroupApiHelper} from \"./UserGroupApiHelper\";\nimport {TemplateApiHelper} from \"./TemplateApiHelper\";\nimport {AliasHelper} from \"./AliasHelper\";\nimport {DataTypeApiHelper} from \"./DataTypeApiHelper\";\nimport {UserApiHelper} from \"./UserApiHelper\";\nimport {TemporaryFileApiHelper} from \"./TemporaryFileApiHelper\";\nimport {PackageApiHelper} from \"./PackageApiHelper\";\nimport {ScriptApiHelper} from \"./ScriptApiHelper\";\nimport {PartialViewApiHelper} from \"./PartialViewApiHelper\";\nimport {StylesheetApiHelper} from \"./StylesheetApiHelper\";\nimport * as fs from \"fs\";\nimport {LogViewerApiHelper} from \"./LogViewerApiHelper\";\nimport {DocumentTypeApiHelper} from \"./DocumentTypeApiHelper\";\nimport {DocumentApiHelper} from \"./DocumentApiHelper\";\nimport {MediaTypeApiHelper} from \"./MediaTypeApiHelper\";\nimport {MediaApiHelper} from \"./MediaApiHelper\";\nimport {ObjectTypesApiHelper} from \"./ObjectTypesApiHelper\";\nimport {ModelsBuilderApiHelper} from \"./ModelsBuilderApiHelper\";\nimport {HealthCheckApiHelper} from \"./HealthCheckApiHelper\";\nimport {IndexerApiHelper} from \"./IndexerApiHelper\";\nimport {PublishedCacheApiHelper} from \"./PublishedCacheApiHelper\";\n\nexport class ApiHelpers {\n  baseUrl: string = umbracoConfig.environment.baseUrl;\n  page: Page;\n  alias: AliasHelper;\n  report: ReportHelper;\n  telemetry: TelemetryDataApiHelper;\n  language: LanguageApiHelper;\n  dictionary: DictionaryApiHelper;\n  relationType: RelationTypeApiHelper;\n  userGroup: UserGroupApiHelper;\n  template: TemplateApiHelper;\n  dataType: DataTypeApiHelper;\n  user: UserApiHelper;\n  temporaryFile: TemporaryFileApiHelper;\n  documentType: DocumentTypeApiHelper;\n  document: DocumentApiHelper;\n  package: PackageApiHelper;\n  script: ScriptApiHelper;\n  partialView: PartialViewApiHelper;\n  stylesheet: StylesheetApiHelper;\n  logViewer: LogViewerApiHelper;\n  mediaType: MediaTypeApiHelper;\n  media: MediaApiHelper;\n  objectTypes: ObjectTypesApiHelper;\n  modelsBuilder: ModelsBuilderApiHelper;\n  healthCheck: HealthCheckApiHelper;\n  indexer: IndexerApiHelper;\n  publishedCache: PublishedCacheApiHelper;\n\n  constructor(page: Page) {\n    this.page = page;\n    this.alias = new AliasHelper();\n    this.report = new ReportHelper(this);\n    this.telemetry = new TelemetryDataApiHelper(this);\n    this.language = new LanguageApiHelper(this);\n    this.dictionary = new DictionaryApiHelper(this);\n    this.relationType = new RelationTypeApiHelper(this);\n    this.userGroup = new UserGroupApiHelper(this);\n    this.template = new TemplateApiHelper(this);\n    this.dataType = new DataTypeApiHelper(this);\n    this.user = new UserApiHelper(this);\n    this.temporaryFile = new TemporaryFileApiHelper(this);\n    this.documentType = new DocumentTypeApiHelper(this);\n    this.document = new DocumentApiHelper(this);\n    this.package = new PackageApiHelper(this);\n    this.script = new ScriptApiHelper(this);\n    this.partialView = new PartialViewApiHelper(this);\n    this.stylesheet = new StylesheetApiHelper(this);\n    this.logViewer = new LogViewerApiHelper(this);\n    this.mediaType = new MediaTypeApiHelper(this);\n    this.media = new MediaApiHelper(this);\n    this.objectTypes = new ObjectTypesApiHelper(this);\n    this.modelsBuilder = new ModelsBuilderApiHelper(this);\n    this.healthCheck = new HealthCheckApiHelper(this);\n    this.indexer = new IndexerApiHelper(this);\n    this.publishedCache = new PublishedCacheApiHelper(this);\n  }\n\n  async getBearerToken() {\n    let someStorage = await this.page.context().storageState();\n    let someObject = JSON.parse(someStorage.origins[0].localStorage[0].value);\n    return 'Bearer ' + someObject.access_token;\n  }\n\n  async getCookie() {\n    let someStorage = await this.page.context().storageState();\n    let cookieString = \"\";\n    for (let cookie of someStorage.cookies) {\n      cookieString += cookie.name + '=' + cookie.value + ';';\n    }\n    return cookieString;\n  }\n\n  async getHeaders() {\n    return {\n      'Authorization': await this.getBearerToken(),\n      'Cookie': await this.getCookie(),\n    }\n  }\n\n  async get(url: string, params?: { [key: string]: string | number | boolean; }) {\n    const options = {\n      headers: await this.getHeaders(),\n      params: params,\n      ignoreHTTPSErrors: true\n    }\n    return this.page.request.get(url, options);\n  }\n\n  async saveCodeFile(codeFile) {\n    if (codeFile == null) {\n      return;\n    }\n    return await this.post(umbracoConfig.environment.baseUrl + '/umbraco/backoffice/UmbracoApi/CodeFile/PostSave', codeFile);\n  }\n\n  async post(url: string, data?: object) {\n    const options = {\n      headers: await this.getHeaders(),\n      data: data,\n      ignoreHTTPSErrors: true\n    }\n    return await this.page.request.post(url, options);\n  }\n\n  async delete(url: string, data?: object) {\n    const options = {\n      headers: await this.getHeaders(),\n      data: data,\n      ignoreHTTPSErrors: true\n    }\n    return await this.page.request.delete(url, options);\n  }\n\n  async put(url: string, data?: object) {\n    const options = {\n      headers: await this.getHeaders(),\n      data: data,\n      ignoreHTTPSErrors: true\n    }\n    return await this.page.request.put(url, options);\n  }\n\n  async postMultiPartForm(url: string, id, name: string, mimeType: string, filePath) {\n    const options = {\n      headers: await this.getHeaders(),\n      multipart: {\n        Id: id,\n        File: {\n          name: name,\n          mimeType: mimeType,\n          buffer: fs.readFileSync(filePath)\n        }\n      },\n      ignoreHTTPSErrors: true\n    }\n    return await this.page.request.post(url, options);\n  }\n}"]}

package/dist/lib/helpers/ConstantHelper.d.ts

@@ -0,0 +1,11 @@
+export declare class ConstantHelper {
+    static readonly sections: {
+        content: string;
+        media: string;
+        settings: string;
+        packages: string;
+        members: string;
+        dictionary: string;
+        users: string;
+    };
+}

package/dist/lib/helpers/ConstantHelper.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConstantHelper = void 0;
+class ConstantHelper {
+    static sections = {
+        content: "Content",
+        media: "Media",
+        settings: "Settings",
+        packages: "Packages",
+        members: "Members",
+        dictionary: "Translation",
+        users: "Users"
+    };
+}
+exports.ConstantHelper = ConstantHelper;
+//# sourceMappingURL=ConstantHelper.js.map

package/dist/lib/helpers/ConstantHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ConstantHelper.js","sourceRoot":"","sources":["../../../lib/helpers/ConstantHelper.ts"],"names":[],"mappings":";;;AAAA,MAAa,cAAc;IAElB,MAAM,CAAU,QAAQ,GAAG;QAChC,OAAO,EAAE,SAAS;QAClB,KAAK,EAAE,OAAO;QACd,QAAQ,EAAE,UAAU;QACpB,QAAQ,EAAE,UAAU;QACpB,OAAO,EAAE,SAAS;QAClB,UAAU,EAAE,aAAa;QACzB,KAAK,EAAE,OAAO;KACf,CAAA;;AAVH,wCAWC","sourcesContent":["export class ConstantHelper {\n\n  public static readonly sections = {\n    content: \"Content\",\n    media: \"Media\",\n    settings: \"Settings\",\n    packages: \"Packages\",\n    members: \"Members\",\n    dictionary: \"Translation\",\n    users: \"Users\"\n  }\n}"]}

package/dist/lib/helpers/DataTypeApiHelper.d.ts

@@ -2,29 +2,29 @@ import { ApiHelpers } from "./ApiHelpers";
 export declare class DataTypeApiHelper {
     api: ApiHelpers;
     constructor(api: ApiHelpers);
-    ensureNameNotExistsAtRoot(name: string): Promise<void | import("playwright-core").APIResponse | null>;
     get(id: string): Promise<any>;
-    getByNameAtRoot(name: string): Promise<any>;
-    create(name: string, propertyEditorAlias: string, values: {
+    create(name: string, editorAlias: string, values: {
         alias: string;
         value: string;
-    }[], parentId?: string, propertyEditorUiAlias?: string): Promise<string | undefined>;
+    }[], parentId?: string, editorUiAlias?: string, id?: string): Promise<string | undefined>;
     update(id: string, dataType: any): Promise<import("playwright-core").APIResponse>;
     delete(id: string): Promise<import("playwright-core").APIResponse>;
-    deleteByNameAtRoot(name: string): Promise<import("playwright-core").APIResponse | null>;
+    getAllAtRoot(): Promise<import("playwright-core").APIResponse>;
+    doesExist(id: string): Promise<boolean>;
     getItems(ids: string[]): Promise<any>;
-    getAllAtRoot(): Promise<any>;
-    exists(id: string): Promise<boolean>;
-    nameExistsAtRoot(name: string): Promise<boolean>;
+    getByName(name: string): Promise<any>;
+    ensureNameNotExists(name: string): Promise<import("playwright-core").APIResponse | null>;
+    doesNameExist(name: string): Promise<any>;
     moveToFolder(dataTypeId: string, folderId: string): Promise<import("playwright-core").APIResponse>;
     copyToFolder(dataTypeId: string, folderId: string): Promise<string | undefined>;
     getFolder(id: string): Promise<any>;
-    folderExists(id: string): Promise<boolean>;
-    getFolderByName(name: string): Promise<any>;
-    createFolder(name: string, parentId?: string): Promise<string | undefined>;
-    updateFolder(id: string, dataTypeFolder: any): Promise<import("playwright-core").APIResponse>;
+    createFolder(name: string, id?: string, parentId?: string): Promise<string | undefined>;
+    renameFolder(id: string, name: string): Promise<import("playwright-core").APIResponse>;
     deleteFolder(id: string): Promise<import("playwright-core").APIResponse>;
-    deleteFolderByName(name: string): Promise<import("playwright-core").APIResponse | null>;
+    doesFolderExist(id: string): Promise<boolean>;
     getChildren(id: string): Promise<any>;
-    recurseFolderChildren(id: string): Promise<void>;
+    private recurseDeleteChildren;
+    private recurseChildren;
+    save(dataType: any): Promise<string | undefined>;
+    createDateTypeDataType(name: string): Promise<string | undefined>;
 }

package/dist/lib/helpers/DataTypeApiHelper.js

@@ -1,81 +1,47 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataTypeApiHelper = void 0;
+const json_models_builders_1 = require("@umbraco/json-models-builders");
 class DataTypeApiHelper {
     api;
     constructor(api) {
         this.api = api;
     }
-    async ensureNameNotExistsAtRoot(name) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/root?skip=0&take=10000&foldersOnly=false');
-        const json = await response.json();
-        for (const sb of json.items) {
-            if (sb.name === name) {
-                if (sb.isFolder == false) {
-                    return await this.api.delete(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + sb.id);
-                }
-                else {
-                    if (sb.hasChildren == true) {
-                        return await this.recurseFolderChildren(sb.id);
-                    }
-                    else {
-                        return await this.api.delete(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + sb.id);
-                    }
-                }
-            }
-        }
-        return null;
-    }
     async get(id) {
         const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + id);
-        const json = await response.json();
-        if (json !== null) {
-            return json;
-        }
-        return null;
-    }
-    async getByNameAtRoot(name) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/root?skip=0&take=10000&foldersOnly=false');
-        const json = await response.json();
-        for (const sb of json.items) {
-            if (sb.name === name) {
-                if (sb.id !== null) {
-                    const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + sb.id);
-                    return response.json();
-                }
-            }
-        }
-        return null;
+        return await response.json();
     }
-    async create(name, propertyEditorAlias, values, parentId, propertyEditorUiAlias) {
+    async create(name, editorAlias, values, parentId, editorUiAlias, id) {
         const dataType = {
             "name": name,
-            "propertyEditorAlias": propertyEditorAlias,
-            "propertyEditorUiAlias": propertyEditorUiAlias,
+            "editorAlias": editorAlias,
+            "editorUiAlias": editorUiAlias,
             "values": values,
-            "parentId": parentId
+            "id": id,
+            "parent": parentId ? { "id": parentId } : null
         };
         const response = await this.api.post(this.api.baseUrl + '/umbraco/management/api/v1/data-type', dataType);
         // Returns the id of the created dataType
-        return response.headers().location.split("/").pop();
+        return response.headers().location.split("v1/data-type/").pop();
     }
     async update(id, dataType) {
-        return await this.api.put(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + id, dataType);
+        const updateDataType = {
+            "name": dataType.name,
+            "editorAlias": dataType.editorAlias,
+            "editorUiAlias": dataType.editorUiAlias,
+            "values": dataType.values,
+        };
+        return await this.api.put(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + id, updateDataType);
     }
     async delete(id) {
         return await this.api.delete(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + id);
     }
-    async deleteByNameAtRoot(name) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/root?skip=0&take=10000&foldersOnly=false');
-        const json = await response.json();
-        for (const sb of json.items) {
-            if (sb.name === name) {
-                if (sb.id !== null) {
-                    return await this.api.delete(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + sb.id);
-                }
-            }
-        }
-        return null;
+    async getAllAtRoot() {
+        return await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/root?skip=0&take=10000&foldersOnly=false');
+    }
+    async doesExist(id) {
+        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + id);
+        return response.status() === 200;
     }
     async getItems(ids) {
         let idArray = 'id=' + ids[0];
@@ -84,124 +50,139 @@ class DataTypeApiHelper {
             idArray += '&id=' + ids[i];
         }
         const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/item?' + idArray);
-        const json = await response.json();
-        if (json !== null) {
-            return json;
-        }
-        return null;
+        return await response.json();
     }
-    async getAllAtRoot() {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/root?skip=0&take=10000&foldersOnly=false');
-        const json = await response.json();
-        if (json !== null) {
-            return json;
+    async getByName(name) {
+        const rootDataTypes = await this.getAllAtRoot();
+        const jsonDataTypes = await rootDataTypes.json();
+        for (const dataType of jsonDataTypes.items) {
+            if (dataType.name === name) {
+                return this.get(dataType.id);
+            }
+            else if (dataType.isContainer || dataType.hasChildren) {
+                const result = await this.recurseChildren(name, dataType.id, false);
+                if (result) {
+                    return result;
+                }
+            }
         }
-        return null;
-    }
-    async exists(id) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + id);
-        return response.status() === 200;
+        return false;
     }
-    async nameExistsAtRoot(name) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/root?skip=0&take=10000&foldersOnly=false');
-        const json = await response.json();
-        for (const sb of json.items) {
-            if (sb.name === name) {
-                return true;
+    async ensureNameNotExists(name) {
+        const rootDataTypes = await this.getAllAtRoot();
+        const jsonDataTypes = await rootDataTypes.json();
+        for (const dataType of jsonDataTypes.items) {
+            if (dataType.name === name) {
+                if (dataType.isFolder) {
+                    return await this.recurseDeleteChildren(dataType);
+                }
+                return await this.delete(dataType.id);
+            }
+            else if (dataType.hasChildren) {
+                await this.recurseChildren(name, dataType.id, true);
             }
         }
-        return false;
+        return null;
+    }
+    async doesNameExist(name) {
+        return await this.getByName(name);
     }
     async moveToFolder(dataTypeId, folderId) {
         const folderIdBody = {
-            "targetId": folderId
+            "target": { id: folderId }
         };
-        return await this.api.post(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + dataTypeId + '/move', folderIdBody);
+        return await this.api.put(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + dataTypeId + '/move', folderIdBody);
     }
     async copyToFolder(dataTypeId, folderId) {
         const folderIdBody = {
-            "targetId": folderId
+            "target": { id: folderId }
         };
         const response = await this.api.post(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + dataTypeId + '/copy', folderIdBody);
         // Returns the id of the copied dataType
-        return response.headers().location.split("/").pop();
+        return response.headers().location.split("v1/data-type/").pop();
     }
     // FOLDER
     async getFolder(id) {
         const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + id);
         return await response.json();
     }
-    async folderExists(id) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + id);
-        return response.status() === 200;
-    }
-    async getFolderByName(name) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/root?skip=0&take=10000&foldersOnly=true');
-        const json = await response.json();
-        for (const sb of json.items) {
-            if (sb.name === name) {
-                if (sb.id !== null) {
-                    const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + sb.id);
-                    return response.json();
-                }
-            }
-        }
-        return null;
-    }
-    async createFolder(name, parentId) {
+    async createFolder(name, id, parentId) {
         const folderData = {
             "name": name,
-            "parentId": parentId
+            "id": id,
+            "parent": parentId ? { "id": parentId } : null
         };
         const response = await this.api.post(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder', folderData);
         // Returns the id of the created dataTypeFolder
-        return response.headers().location.split("/").pop();
+        return response.headers().location.split("v1/data-type/folder/").pop();
     }
-    async updateFolder(id, dataTypeFolder) {
-        return await this.api.put(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + id, dataTypeFolder);
+    async renameFolder(id, name) {
+        const folderData = {
+            "name": name,
+        };
+        return await this.api.put(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + id, folderData);
     }
     async deleteFolder(id) {
         return await this.api.delete(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + id);
     }
-    async deleteFolderByName(name) {
-        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/root?skip=0&take=10000&foldersOnly=true');
-        const json = await response.json();
-        for (const sb of json.items) {
-            if (sb.name === name) {
-                if (sb.id !== null) {
-                    return await this.api.delete(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + sb.id);
-                }
-            }
-        }
-        return null;
+    async doesFolderExist(id) {
+        const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + id);
+        return response.status() === 200;
     }
     async getChildren(id) {
         const response = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/children?parentId=' + id + '&skip=0&take=100&foldersOnly=false');
-        const json = await response.json();
-        if (json !== null) {
-            return json;
-        }
-        return null;
+        const items = await response.json();
+        return items.items;
     }
-    async recurseFolderChildren(id) {
-        const parentDataType = await this.api.get(this.api.baseUrl + '/umbraco/management/api/v1/tree/data-type/children?parentId=' + id + '&skip=0&take=10000');
-        const itemsJson = await parentDataType.json();
-        for (const child of itemsJson.items) {
-            if (child.path !== null) {
-                if (child.isFolder == true) {
-                    if (child.hasChildren == true) {
-                        await this.recurseFolderChildren(child.path);
-                    }
-                    else {
-                        await this.api.delete(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + child.id);
+    async recurseDeleteChildren(dataFolder) {
+        if (!dataFolder.hasChildren) {
+            return await this.deleteFolder(dataFolder.id);
+        }
+        const items = await this.getChildren(dataFolder.id);
+        for (const child of items) {
+            if (child.hasChildren) {
+                await this.recurseDeleteChildren(child);
+            }
+            else if (child.isFolder) {
+                await this.deleteFolder(child.id);
+            }
+            else {
+                await this.delete(child.id);
+            }
+        }
+        return await this.deleteFolder(dataFolder.id);
+    }
+    async recurseChildren(name, id, toDelete) {
+        const items = await this.getChildren(id);
+        for (const child of items) {
+            if (child.name === name) {
+                if (!toDelete) {
+                    if (child.isFolder) {
+                        return await this.getFolder(child.id);
                     }
+                    return await this.get(child.id);
                 }
-                else {
-                    await this.api.delete(this.api.baseUrl + '/umbraco/management/api/v1/data-type/' + child.id);
+                if (child.isFolder) {
+                    return await this.recurseDeleteChildren(child);
                 }
+                return await this.delete(child.id);
+            }
+            else if (child.hasChildren) {
+                return await this.recurseChildren(name, child.id, toDelete);
             }
         }
-        await this.api.delete(this.api.baseUrl + '/umbraco/management/api/v1/data-type/folder/' + id);
+        return false;
+    }
+    async save(dataType) {
+        const response = await this.api.post(this.api.baseUrl + '/umbraco/management/api/v1/data-type', dataType);
+        return response.headers().location.split("v1/data-type/").pop();
+    }
+    async createDateTypeDataType(name) {
+        await this.ensureNameNotExists(name);
+        const dataType = new json_models_builders_1.DatePickerDataTypeBuilder()
+            .withName(name)
+            .build();
+        return await this.save(dataType);
     }
 }
 exports.DataTypeApiHelper = DataTypeApiHelper;