From b2c02d9944e9ec5d5a45ef4a152e5c3c84bede39 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 20 Sep 2025 14:52:44 +0000 Subject: [PATCH 01/29] Initial plan From e56d4d743e949c6ea13b456a699fe34b0328d516 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 20 Sep 2025 15:06:34 +0000 Subject: [PATCH 02/29] Add support for @iobroker/eslint-config with new question and templates Co-authored-by: Apollon77 <11976694+Apollon77@users.noreply.github.com> --- .github/create_templates.ts | 8 +- bin/create-adapter.js | 0 src/lib/core/questions.ts | 22 +++ templates/_eslintrc_javascript.json.ts | 15 ++ templates/_eslintrc_typescript.js.ts | 15 ++ templates/_vscode/extensions.json.ts | 9 +- templates/package.json.ts | 13 +- .../.create-adapter.json | 1 + .../.create-adapter.json | 38 ++++ .../adapter_JS_OfficialESLint/.eslintignore | 2 + .../adapter_JS_OfficialESLint/.eslintrc.json | 5 + .../.github/ISSUE_TEMPLATE/bug_report.md | 32 ++++ .../.github/ISSUE_TEMPLATE/config.yml | 5 + .../.github/auto-merge.yml | 17 ++ .../.github/dependabot.yml | 22 +++ .../workflows/dependabot-auto-merge.yml | 27 +++ .../.github/workflows/test-and-release.yml | 92 ++++++++++ .../adapter_JS_OfficialESLint/.gitignore | 18 ++ .../.vscode/extensions.json | 5 + .../.vscode/settings.json | 22 +++ .../adapter_JS_OfficialESLint/LICENSE | 21 +++ .../adapter_JS_OfficialESLint/README.md | 124 +++++++++++++ .../__meta__/npm_package_files.txt | 10 ++ .../admin/index_m.html | 95 ++++++++++ .../adapter_JS_OfficialESLint/admin/style.css | 32 ++++ .../admin/test-adapter.png | Bin 0 -> 62376 bytes .../adapter_JS_OfficialESLint/admin/words.js | 46 +++++ .../adapter_JS_OfficialESLint/io-package.json | 91 ++++++++++ .../lib/adapter-config.d.ts | 19 ++ .../adapter_JS_OfficialESLint/main.js | 167 ++++++++++++++++++ .../adapter_JS_OfficialESLint/main.test.js | 30 ++++ .../adapter_JS_OfficialESLint/package.json | 55 ++++++ .../test/integration.js | 5 + .../test/mocha.setup.js | 14 ++ .../test/mocharc.custom.json | 10 ++ .../adapter_JS_OfficialESLint/test/package.js | 5 + .../adapter_JS_React/.create-adapter.json | 1 + .../.create-adapter.json | 1 + .../.create-adapter.json | 38 ++++ .../adapter_TS_OfficialESLint/.eslintignore | 3 + .../adapter_TS_OfficialESLint/.eslintrc.js | 3 + .../.github/ISSUE_TEMPLATE/bug_report.md | 32 ++++ .../.github/ISSUE_TEMPLATE/config.yml | 5 + .../.github/auto-merge.yml | 17 ++ .../.github/dependabot.yml | 22 +++ .../workflows/dependabot-auto-merge.yml | 27 +++ .../.github/workflows/test-and-release.yml | 96 ++++++++++ .../adapter_TS_OfficialESLint/.gitignore | 18 ++ .../.vscode/extensions.json | 6 + .../.vscode/settings.json | 23 +++ .../adapter_TS_OfficialESLint/LICENSE | 21 +++ .../adapter_TS_OfficialESLint/README.md | 132 ++++++++++++++ .../__meta__/npm_package_files.txt | 8 + .../admin/admin.d.ts | 93 ++++++++++ .../admin/index_m.html | 95 ++++++++++ .../adapter_TS_OfficialESLint/admin/style.css | 32 ++++ .../admin/test-adapter.png | Bin 0 -> 62376 bytes .../admin/tsconfig.json | 11 ++ .../adapter_TS_OfficialESLint/admin/words.js | 46 +++++ .../adapter_TS_OfficialESLint/io-package.json | 91 ++++++++++ .../adapter_TS_OfficialESLint/package.json | 67 +++++++ .../src/lib/adapter-config.d.ts | 14 ++ .../src/main.test.ts | 26 +++ .../adapter_TS_OfficialESLint/src/main.ts | 153 ++++++++++++++++ .../test/.eslintrc.json | 43 +++++ .../test/integration.js | 5 + .../test/mocha.setup.js | 23 +++ .../test/mocharc.custom.json | 10 ++ .../adapter_TS_OfficialESLint/test/package.js | 5 + .../test/tsconfig.json | 9 + .../tsconfig.build.json | 16 ++ .../adapter_TS_OfficialESLint/tsconfig.json | 46 +++++ .../adapter_TS_React/.create-adapter.json | 1 + .../.create-adapter.json | 38 ++++ .../.eslintignore | 4 + .../.eslintrc.js | 3 + .../.github/ISSUE_TEMPLATE/bug_report.md | 32 ++++ .../.github/ISSUE_TEMPLATE/config.yml | 5 + .../.github/auto-merge.yml | 17 ++ .../.github/dependabot.yml | 22 +++ .../workflows/dependabot-auto-merge.yml | 27 +++ .../.github/workflows/test-and-release.yml | 96 ++++++++++ .../.gitignore | 18 ++ .../.vscode/extensions.json | 6 + .../.vscode/settings.json | 23 +++ .../adapter_TS_React_OfficialESLint/LICENSE | 21 +++ .../adapter_TS_React_OfficialESLint/README.md | 136 ++++++++++++++ .../__meta__/npm_package_files.txt | 7 + .../admin/index_m.html | 24 +++ .../admin/src/app.tsx | 55 ++++++ .../admin/src/components/settings.tsx | 139 +++++++++++++++ .../admin/src/i18n/de.json | 5 + .../admin/src/i18n/en.json | 5 + .../admin/src/i18n/es.json | 5 + .../admin/src/i18n/fr.json | 5 + .../admin/src/i18n/i18n.d.ts | 26 +++ .../admin/src/i18n/it.json | 5 + .../admin/src/i18n/nl.json | 5 + .../admin/src/i18n/pl.json | 5 + .../admin/src/i18n/pt.json | 5 + .../admin/src/i18n/ru.json | 5 + .../admin/src/i18n/uk.json | 5 + .../admin/src/i18n/zh-cn.json | 5 + .../admin/src/index.tsx | 25 +++ .../admin/style.css | 32 ++++ .../admin/test-adapter.png | Bin 0 -> 62376 bytes .../admin/tsconfig.json | 26 +++ .../io-package.json | 92 ++++++++++ .../package.json | 77 ++++++++ .../src/lib/adapter-config.d.ts | 14 ++ .../src/main.test.ts | 26 +++ .../src/main.ts | 153 ++++++++++++++++ .../test/.eslintrc.json | 43 +++++ .../test/integration.js | 5 + .../test/mocha.setup.js | 23 +++ .../test/mocharc.custom.json | 10 ++ .../test/package.js | 5 + .../test/tsconfig.json | 9 + .../tsconfig.build.json | 16 ++ .../tsconfig.json | 46 +++++ .../.create-adapter.json | 1 + test/create-adapter.test.ts | 27 +++ 122 files changed, 3707 insertions(+), 8 deletions(-) mode change 100644 => 100755 bin/create-adapter.js create mode 100644 test/baselines/adapter_JS_OfficialESLint/.create-adapter.json create mode 100644 test/baselines/adapter_JS_OfficialESLint/.eslintignore create mode 100644 test/baselines/adapter_JS_OfficialESLint/.eslintrc.json create mode 100644 test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md create mode 100644 test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml create mode 100644 test/baselines/adapter_JS_OfficialESLint/.github/auto-merge.yml create mode 100644 test/baselines/adapter_JS_OfficialESLint/.github/dependabot.yml create mode 100644 test/baselines/adapter_JS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml create mode 100644 test/baselines/adapter_JS_OfficialESLint/.github/workflows/test-and-release.yml create mode 100644 test/baselines/adapter_JS_OfficialESLint/.gitignore create mode 100644 test/baselines/adapter_JS_OfficialESLint/.vscode/extensions.json create mode 100644 test/baselines/adapter_JS_OfficialESLint/.vscode/settings.json create mode 100644 test/baselines/adapter_JS_OfficialESLint/LICENSE create mode 100644 test/baselines/adapter_JS_OfficialESLint/README.md create mode 100644 test/baselines/adapter_JS_OfficialESLint/__meta__/npm_package_files.txt create mode 100644 test/baselines/adapter_JS_OfficialESLint/admin/index_m.html create mode 100644 test/baselines/adapter_JS_OfficialESLint/admin/style.css create mode 100644 test/baselines/adapter_JS_OfficialESLint/admin/test-adapter.png create mode 100644 test/baselines/adapter_JS_OfficialESLint/admin/words.js create mode 100644 test/baselines/adapter_JS_OfficialESLint/io-package.json create mode 100644 test/baselines/adapter_JS_OfficialESLint/lib/adapter-config.d.ts create mode 100644 test/baselines/adapter_JS_OfficialESLint/main.js create mode 100644 test/baselines/adapter_JS_OfficialESLint/main.test.js create mode 100644 test/baselines/adapter_JS_OfficialESLint/package.json create mode 100644 test/baselines/adapter_JS_OfficialESLint/test/integration.js create mode 100644 test/baselines/adapter_JS_OfficialESLint/test/mocha.setup.js create mode 100644 test/baselines/adapter_JS_OfficialESLint/test/mocharc.custom.json create mode 100644 test/baselines/adapter_JS_OfficialESLint/test/package.js create mode 100644 test/baselines/adapter_TS_OfficialESLint/.create-adapter.json create mode 100644 test/baselines/adapter_TS_OfficialESLint/.eslintignore create mode 100644 test/baselines/adapter_TS_OfficialESLint/.eslintrc.js create mode 100644 test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md create mode 100644 test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml create mode 100644 test/baselines/adapter_TS_OfficialESLint/.github/auto-merge.yml create mode 100644 test/baselines/adapter_TS_OfficialESLint/.github/dependabot.yml create mode 100644 test/baselines/adapter_TS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml create mode 100644 test/baselines/adapter_TS_OfficialESLint/.github/workflows/test-and-release.yml create mode 100644 test/baselines/adapter_TS_OfficialESLint/.gitignore create mode 100644 test/baselines/adapter_TS_OfficialESLint/.vscode/extensions.json create mode 100644 test/baselines/adapter_TS_OfficialESLint/.vscode/settings.json create mode 100644 test/baselines/adapter_TS_OfficialESLint/LICENSE create mode 100644 test/baselines/adapter_TS_OfficialESLint/README.md create mode 100644 test/baselines/adapter_TS_OfficialESLint/__meta__/npm_package_files.txt create mode 100644 test/baselines/adapter_TS_OfficialESLint/admin/admin.d.ts create mode 100644 test/baselines/adapter_TS_OfficialESLint/admin/index_m.html create mode 100644 test/baselines/adapter_TS_OfficialESLint/admin/style.css create mode 100644 test/baselines/adapter_TS_OfficialESLint/admin/test-adapter.png create mode 100644 test/baselines/adapter_TS_OfficialESLint/admin/tsconfig.json create mode 100644 test/baselines/adapter_TS_OfficialESLint/admin/words.js create mode 100644 test/baselines/adapter_TS_OfficialESLint/io-package.json create mode 100644 test/baselines/adapter_TS_OfficialESLint/package.json create mode 100644 test/baselines/adapter_TS_OfficialESLint/src/lib/adapter-config.d.ts create mode 100644 test/baselines/adapter_TS_OfficialESLint/src/main.test.ts create mode 100644 test/baselines/adapter_TS_OfficialESLint/src/main.ts create mode 100644 test/baselines/adapter_TS_OfficialESLint/test/.eslintrc.json create mode 100644 test/baselines/adapter_TS_OfficialESLint/test/integration.js create mode 100644 test/baselines/adapter_TS_OfficialESLint/test/mocha.setup.js create mode 100644 test/baselines/adapter_TS_OfficialESLint/test/mocharc.custom.json create mode 100644 test/baselines/adapter_TS_OfficialESLint/test/package.js create mode 100644 test/baselines/adapter_TS_OfficialESLint/test/tsconfig.json create mode 100644 test/baselines/adapter_TS_OfficialESLint/tsconfig.build.json create mode 100644 test/baselines/adapter_TS_OfficialESLint/tsconfig.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.create-adapter.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.eslintignore create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.eslintrc.js create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.github/auto-merge.yml create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.github/dependabot.yml create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/dependabot-auto-merge.yml create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/test-and-release.yml create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.gitignore create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.vscode/extensions.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.vscode/settings.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/LICENSE create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/README.md create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/__meta__/npm_package_files.txt create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/index_m.html create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/app.tsx create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/components/settings.tsx create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/de.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/en.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/es.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/fr.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/i18n.d.ts create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/it.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/nl.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pl.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pt.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/ru.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/uk.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/zh-cn.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/index.tsx create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/style.css create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/test-adapter.png create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/tsconfig.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/io-package.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/package.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/src/lib/adapter-config.d.ts create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/src/main.test.ts create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/src/main.ts create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/test/.eslintrc.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/test/integration.js create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/test/mocha.setup.js create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/test/mocharc.custom.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/test/package.js create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/test/tsconfig.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/tsconfig.build.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/tsconfig.json diff --git a/.github/create_templates.ts b/.github/create_templates.ts index 2fa911e3d..59266e969 100644 --- a/.github/create_templates.ts +++ b/.github/create_templates.ts @@ -168,7 +168,9 @@ const templates: Record = { try { execSync(`npm run lint`, cmdOpts); } catch (e) { - console.error(red(`ESLint failed for template ${tplName}:`)); + console.error( + red(`ESLint failed for template ${tplName}:`), + ); console.error(e.message || e); hadError = true; } @@ -178,7 +180,9 @@ const templates: Record = { try { execSync(`npm run check`, cmdOpts); } catch (e) { - console.error(red(`Type check failed for template ${tplName}:`)); + console.error( + red(`Type check failed for template ${tplName}:`), + ); console.error(e.message || e); hadError = true; } diff --git a/bin/create-adapter.js b/bin/create-adapter.js old mode 100644 new mode 100755 diff --git a/src/lib/core/questions.ts b/src/lib/core/questions.ts index c7f0a2e0f..9021e2d9c 100644 --- a/src/lib/core/questions.ts +++ b/src/lib/core/questions.ts @@ -704,6 +704,27 @@ export const questionGroups: QuestionGroup[] = [ : null, ].filter((f) => !!f) as string[], }), + { + condition: { name: "tools", contains: "ESLint" }, + type: "select", + name: "eslintConfig", + label: "ESLint Configuration", + message: + "Do you want to configure ESLint by yourself or use the official ioBroker ESLint config?", + initial: "official", + choices: [ + { + message: "Use official ioBroker ESLint config", + hint: "(recommended)", + value: "official", + }, + { + message: "Configure ESLint by yourself", + value: "custom", + }, + ], + migrate: () => "custom", // Default to custom for existing projects + }, { condition: [ { name: "features", contains: "adapter" }, @@ -1004,6 +1025,7 @@ export interface Answers { | "code coverage" | "devcontainer" )[]; + eslintConfig?: "official" | "custom"; nodeVersion?: "20" | "22" | "24"; title?: string; license?: string; diff --git a/templates/_eslintrc_javascript.json.ts b/templates/_eslintrc_javascript.json.ts index 194ddf0df..419eec8f7 100644 --- a/templates/_eslintrc_javascript.json.ts +++ b/templates/_eslintrc_javascript.json.ts @@ -10,7 +10,22 @@ const templateFunction: TemplateFunction = answers => { const useESLint = answers.tools && answers.tools.indexOf("ESLint") > -1; if (!useESLint) return; + const useOfficialESLintConfig = answers.eslintConfig === "official"; + // If using official config, create a simple extends config + if (useOfficialESLintConfig) { + const extends_array = ["@iobroker"]; + if (useReact) extends_array.push("@iobroker/react"); + + const template = ` +{ + "extends": [${extends_array.map(ext => `"${ext}"`).join(", ")}] +} +`; + return JSON.stringify(JSON5.parse(template), null, 4); + } + + // Original custom ESLint configuration const template = ` { "root": true, diff --git a/templates/_eslintrc_typescript.js.ts b/templates/_eslintrc_typescript.js.ts index ef39dc8df..0a6036b95 100644 --- a/templates/_eslintrc_typescript.js.ts +++ b/templates/_eslintrc_typescript.js.ts @@ -7,10 +7,25 @@ const templateFunction: TemplateFunction = answers => { const useESLint = answers.tools && answers.tools.indexOf("ESLint") > -1; if (!useESLint) return; + const useOfficialESLintConfig = answers.eslintConfig === "official"; const usePrettier = answers.tools && answers.tools.indexOf("Prettier") > -1; const useReact = answers.adminUi === "react" || answers.tabReact === "yes"; + // If using official config, create a simple extends config + if (useOfficialESLintConfig) { + const extends_array = ["@iobroker"]; + if (useReact) extends_array.push("@iobroker/react"); + + const template = ` +module.exports = { + extends: [${extends_array.map(ext => `"${ext}"`).join(", ")}], +}; +`; + return template.trim().replace(/(\r?\n)+/g, "\n"); + } + + // Original custom ESLint configuration const template = ` module.exports = { root: true, // Don't look outside this project for inherited configs diff --git a/templates/_vscode/extensions.json.ts b/templates/_vscode/extensions.json.ts index b9128d76a..1d2a37297 100644 --- a/templates/_vscode/extensions.json.ts +++ b/templates/_vscode/extensions.json.ts @@ -5,14 +5,19 @@ const templateFunction: TemplateFunction = answers => { const useESLint = answers.tools && answers.tools.indexOf("ESLint") > -1; const usePrettier = answers.tools && answers.tools.indexOf("Prettier") > -1; + const useOfficialESLintConfig = useESLint && answers.eslintConfig === "official"; + const useTypeScript = answers.language === "TypeScript"; + + // Include prettier-vscode for TypeScript when using official ESLint config + const includePrettierExtension = usePrettier || (useOfficialESLintConfig && useTypeScript); - if (!useESLint && !usePrettier) return; + if (!useESLint && !includePrettierExtension) return; const template = ` { "recommendations": [ ${useESLint ? `"dbaeumer.vscode-eslint",` : ""} - ${usePrettier ? `"esbenp.prettier-vscode",` : ""} + ${includePrettierExtension ? `"esbenp.prettier-vscode",` : ""} ] } `; diff --git a/templates/package.json.ts b/templates/package.json.ts index d8b4d5312..b817237e0 100644 --- a/templates/package.json.ts +++ b/templates/package.json.ts @@ -20,6 +20,7 @@ const templateFunction: TemplateFunction = async answers => { const useTabReact = answers.tabReact === "yes"; const useReact = useAdminReact || useTabReact; const useESLint = answers.tools && answers.tools.indexOf("ESLint") > -1; + const useOfficialESLintConfig = useESLint && answers.eslintConfig === "official"; const usePrettier = answers.tools && answers.tools.indexOf("Prettier") > -1; const useNyc = answers.tools && answers.tools.indexOf("code coverage") > -1; const useReleaseScript = answers.releaseScript === "yes"; @@ -75,19 +76,23 @@ const templateFunction: TemplateFunction = async answers => { "@types/react@17", "@types/react-dom@17", ] : []), - ...(useESLint ? [ + ...(useOfficialESLintConfig ? [ + // Use the official ioBroker ESLint config + "@iobroker/eslint-config", + ] : []), + ...((useESLint && !useOfficialESLintConfig) ? [ // https://github.com/ioBroker/create-adapter/pull/1099#issuecomment-2042287875 // Need to stay on ESLint v8 until typescript-eslint is compatible with ESLint v9 "eslint@8" ] : []), - ...((useESLint && useTypeScript) ? [ + ...((useESLint && !useOfficialESLintConfig && useTypeScript) ? [ "@typescript-eslint/eslint-plugin@7", "@typescript-eslint/parser@7", ] : []), - ...((useESLint && useReact) ? [ + ...((useESLint && !useOfficialESLintConfig && useReact) ? [ "eslint-plugin-react", ] : []), - ...((useESLint && usePrettier) ? [ + ...((useESLint && !useOfficialESLintConfig && usePrettier) ? [ "eslint-config-prettier", "eslint-plugin-prettier", "prettier", diff --git a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/.create-adapter.json b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/.create-adapter.json index bf94314f4..d373251b2 100644 --- a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/.create-adapter.json +++ b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/.create-adapter.json @@ -20,6 +20,7 @@ "ESLint", "type checking" ], + "eslintConfig": "custom", "indentation": "Space (4)", "quotes": "single", "authorName": "Al Calzone", diff --git a/test/baselines/adapter_JS_OfficialESLint/.create-adapter.json b/test/baselines/adapter_JS_OfficialESLint/.create-adapter.json new file mode 100644 index 000000000..de33bfec5 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.create-adapter.json @@ -0,0 +1,38 @@ +{ + "cli": true, + "target": "directory", + "adapterName": "test-adapter", + "title": "Is used to test the creator", + "startMode": "daemon", + "features": [ + "adapter" + ], + "connectionIndicator": "no", + "connectionType": "local", + "dataSource": "push", + "adminFeatures": [], + "type": "general", + "language": "JavaScript", + "adminUi": "html", + "tabReact": "no", + "releaseScript": "no", + "tools": [ + "ESLint" + ], + "eslintConfig": "official", + "indentation": "Tab", + "quotes": "double", + "authorName": "Al Calzone", + "authorGithub": "AlCalzone", + "authorEmail": "al@calzo.ne", + "gitRemoteProtocol": "HTTPS", + "dependabot": "yes", + "gitCommit": "no", + "defaultBranch": "main", + "license": "MIT License", + "licenseInformation": { + "type": "free", + "license": "MIT" + }, + "creatorVersion": "2.6.5" +} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/.eslintignore b/test/baselines/adapter_JS_OfficialESLint/.eslintignore new file mode 100644 index 000000000..396d8e174 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.eslintignore @@ -0,0 +1,2 @@ +**/.eslintrc.js +admin/words.js \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/.eslintrc.json b/test/baselines/adapter_JS_OfficialESLint/.eslintrc.json new file mode 100644 index 000000000..7546615c6 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.eslintrc.json @@ -0,0 +1,5 @@ +{ + "extends": [ + "@iobroker" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md b/test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..895613958 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,32 @@ +--- +name: Bug report +about: Something is not working as it should +title: '' +labels: '' +assignees: '' +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '...' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots & Logfiles** +If applicable, add screenshots and logfiles to help explain your problem. + +**Versions:** + - Adapter version: + - JS-Controller version: + - Node version: + - Operating system: + +**Additional context** +Add any other context about the problem here. diff --git a/test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml b/test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..d7cfe5940 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: ioBroker Community + url: https://forum.iobroker.net/ + about: Please ask and answer questions here. \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/.github/auto-merge.yml b/test/baselines/adapter_JS_OfficialESLint/.github/auto-merge.yml new file mode 100644 index 000000000..4f6d185f0 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.github/auto-merge.yml @@ -0,0 +1,17 @@ +# Configure here which dependency updates should be merged automatically. +# The recommended configuration is the following: +- match: + # Only merge patches for production dependencies + dependency_type: production + update_type: "semver:patch" +- match: + # Except for security fixes, here we allow minor patches + dependency_type: production + update_type: "security:minor" +- match: + # and development dependencies can have a minor update, too + dependency_type: development + update_type: "semver:minor" + +# The syntax is based on the legacy dependabot v1 automerged_updates syntax, see: +# https://dependabot.com/docs/config-file/#automerged_updates diff --git a/test/baselines/adapter_JS_OfficialESLint/.github/dependabot.yml b/test/baselines/adapter_JS_OfficialESLint/.github/dependabot.yml new file mode 100644 index 000000000..c165a6a47 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.github/dependabot.yml @@ -0,0 +1,22 @@ +version: 2 +updates: + - package-ecosystem: npm + directory: "/" + schedule: + interval: monthly + time: "04:00" + timezone: Europe/Berlin + open-pull-requests-limit: 5 + assignees: + - AlCalzone + versioning-strategy: increase + + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: monthly + time: "04:00" + timezone: Europe/Berlin + open-pull-requests-limit: 5 + assignees: + - AlCalzone diff --git a/test/baselines/adapter_JS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml b/test/baselines/adapter_JS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml new file mode 100644 index 000000000..baeae23b5 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml @@ -0,0 +1,27 @@ +# Automatically merge Dependabot PRs when version comparison is within the range +# that is configured in .github/auto-merge.yml + +name: Auto-Merge Dependabot PRs + +on: + # WARNING: This needs to be run in the PR base, DO NOT build untrusted code in this action + # details under https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/ + pull_request_target: + +jobs: + auto-merge: + if: github.actor == 'dependabot[bot]' + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Check if PR should be auto-merged + uses: ahmadnassri/action-dependabot-auto-merge@v2 + with: + # In order to use this, you need to go to https://github.com/settings/tokens and + # create a Personal Access Token with the permission "public_repo". + # Enter this token in your repository settings under "Secrets" and name it AUTO_MERGE_TOKEN + github-token: ${{ secrets.AUTO_MERGE_TOKEN }} + # By default, squash and merge, so Github chooses nice commit messages + command: squash and merge diff --git a/test/baselines/adapter_JS_OfficialESLint/.github/workflows/test-and-release.yml b/test/baselines/adapter_JS_OfficialESLint/.github/workflows/test-and-release.yml new file mode 100644 index 000000000..462c8cbec --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.github/workflows/test-and-release.yml @@ -0,0 +1,92 @@ +name: Test and Release + +# Run this job on all pushes and pull requests +# as well as tags with a semantic version +on: + push: + branches: + - "main" + tags: + # normal versions + - "v[0-9]+.[0-9]+.[0-9]+" + # pre-releases + - "v[0-9]+.[0-9]+.[0-9]+-**" + pull_request: {} + +# Cancel previous PR/branch runs when a new commit is pushed +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true + +jobs: + # Performs quick checks before the expensive test runs + check-and-lint: + if: contains(github.event.head_commit.message, '[skip ci]') == false + + runs-on: ubuntu-latest + + steps: + - uses: ioBroker/testing-action-check@v1 + with: + node-version: '20.x' + # Uncomment the following line if your adapter cannot be installed using 'npm ci' + # install-command: 'npm install' + lint: true + + # Runs adapter tests on all supported node versions and OSes + adapter-tests: + if: contains(github.event.head_commit.message, '[skip ci]') == false + + runs-on: ${{ matrix.os }} + strategy: + matrix: + node-version: [20.x, 22.x, 24.x] + os: [ubuntu-latest, windows-latest, macos-latest] + + steps: + - uses: ioBroker/testing-action-adapter@v1 + with: + node-version: ${{ matrix.node-version }} + os: ${{ matrix.os }} + # Uncomment the following line if your adapter cannot be installed using 'npm ci' + # install-command: 'npm install' + +# TODO: To enable automatic npm releases, create a token on npmjs.org +# Enter this token as a GitHub secret (with name NPM_TOKEN) in the repository options +# Then uncomment the following block: + +# # Deploys the final package to NPM +# deploy: +# needs: [check-and-lint, adapter-tests] +# +# # Trigger this step only when a commit on any branch is tagged with a version number +# if: | +# contains(github.event.head_commit.message, '[skip ci]') == false && +# github.event_name == 'push' && +# startsWith(github.ref, 'refs/tags/v') +# +# runs-on: ubuntu-latest +# +# # Write permissions are required to create Github releases +# permissions: +# contents: write +# +# steps: +# - uses: ioBroker/testing-action-deploy@v1 +# with: +# node-version: '20.x' +# # Uncomment the following line if your adapter cannot be installed using 'npm ci' +# # install-command: 'npm install' +# npm-token: ${{ secrets.NPM_TOKEN }} +# github-token: ${{ secrets.GITHUB_TOKEN }} +# +# # When using Sentry for error reporting, Sentry can be informed about new releases +# # To enable create a API-Token in Sentry (User settings, API keys) +# # Enter this token as a GitHub secret (with name SENTRY_AUTH_TOKEN) in the repository options +# # Then uncomment and customize the following block: +# sentry: true +# sentry-token: ${{ secrets.SENTRY_AUTH_TOKEN }} +# sentry-project: "iobroker-test-adapter" +# sentry-version-prefix: "iobroker.test-adapter" +# # If your sentry project is linked to a GitHub repository, you can enable the following option +# # sentry-github-integration: true diff --git a/test/baselines/adapter_JS_OfficialESLint/.gitignore b/test/baselines/adapter_JS_OfficialESLint/.gitignore new file mode 100644 index 000000000..80c28aa9d --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.gitignore @@ -0,0 +1,18 @@ +# No dot-directories except github/vscode +.*/ +!.vscode/ +!.github/ + +*.code-workspace +node_modules +nbproject + +# npm package files +iobroker.*.tgz + +Thumbs.db +.commitinfo + +# i18n intermediate files +admin/i18n/flat.txt +admin/i18n/*/flat.txt \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/.vscode/extensions.json b/test/baselines/adapter_JS_OfficialESLint/.vscode/extensions.json new file mode 100644 index 000000000..a8d778499 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "dbaeumer.vscode-eslint" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/.vscode/settings.json b/test/baselines/adapter_JS_OfficialESLint/.vscode/settings.json new file mode 100644 index 000000000..0cb5c9286 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.vscode/settings.json @@ -0,0 +1,22 @@ +{ + "eslint.enable": true, + "json.schemas": [ + { + "fileMatch": [ + "io-package.json" + ], + "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.js-controller/master/schemas/io-package.json" + }, + { + "fileMatch": [ + "admin/jsonConfig.json", + "admin/jsonConfig.json5", + "admin/jsonCustom.json", + "admin/jsonCustom.json5", + "admin/jsonTab.json", + "admin/jsonTab.json5" + ], + "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.admin/master/packages/jsonConfig/schemas/jsonConfig.json" + } + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/LICENSE b/test/baselines/adapter_JS_OfficialESLint/LICENSE new file mode 100644 index 000000000..27c9a624d --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2025 Al Calzone + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/test/baselines/adapter_JS_OfficialESLint/README.md b/test/baselines/adapter_JS_OfficialESLint/README.md new file mode 100644 index 000000000..8a47404cf --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/README.md @@ -0,0 +1,124 @@ +![Logo](admin/test-adapter.png) +# ioBroker.test-adapter + +[![NPM version](https://img.shields.io/npm/v/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) +[![Downloads](https://img.shields.io/npm/dm/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) +![Number of Installations](https://iobroker.live/badges/test-adapter-installed.svg) +![Current version in stable repository](https://iobroker.live/badges/test-adapter-stable.svg) + +[![NPM](https://nodei.co/npm/iobroker.test-adapter.png?downloads=true)](https://nodei.co/npm/iobroker.test-adapter/) + +**Tests:** ![Test and Release](https://github.com/AlCalzone/ioBroker.test-adapter/workflows/Test%20and%20Release/badge.svg) + +## test-adapter adapter for ioBroker + +Describe your project here + +## Developer manual +This section is intended for the developer. It can be deleted later. + +### DISCLAIMER + +Please make sure that you consider copyrights and trademarks when you use names or logos of a company and add a disclaimer to your README. +You can check other adapters for examples or ask in the developer community. Using a name or logo of a company without permission may cause legal problems for you. + +### Getting started + +You are almost done, only a few steps left: +1. Create a new repository on GitHub with the name `ioBroker.test-adapter` +1. Initialize the current folder as a new git repository: + ```bash + git init -b main + git add . + git commit -m "Initial commit" + ``` +1. Link your local repository with the one on GitHub: + ```bash + git remote add origin https://github.com/AlCalzone/ioBroker.test-adapter + ``` + +1. Push all files to the GitHub repo: + ```bash + git push origin main + ``` +1. Add a new secret under https://github.com/AlCalzone/ioBroker.test-adapter/settings/secrets. It must be named `AUTO_MERGE_TOKEN` and contain a personal access token with push access to the repository, e.g. yours. You can create a new token under https://github.com/settings/tokens. + +1. Head over to [main.js](main.js) and start programming! + +### Best Practices +We've collected some [best practices](https://github.com/ioBroker/ioBroker.repositories#development-and-coding-best-practices) regarding ioBroker development and coding in general. If you're new to ioBroker or Node.js, you should +check them out. If you're already experienced, you should also take a look at them - you might learn something new :) + +### Scripts in `package.json` +Several npm scripts are predefined for your convenience. You can run them using `npm run ` +| Script name | Description | +|-------------|-------------| +| `test:js` | Executes the tests you defined in `*.test.js` files. | +| `test:package` | Ensures your `package.json` and `io-package.json` are valid. | +| `test:integration` | Tests the adapter startup with an actual instance of ioBroker. | +| `test` | Performs a minimal test run on package files and your tests. | +| `lint` | Runs `ESLint` to check your code for formatting errors and potential bugs. | +| `translate` | Translates texts in your adapter to all required languages, see [`@iobroker/adapter-dev`](https://github.com/ioBroker/adapter-dev#manage-translations) for more details. | + +### Writing tests +When done right, testing code is invaluable, because it gives you the +confidence to change your code while knowing exactly if and when +something breaks. A good read on the topic of test-driven development +is https://hackernoon.com/introduction-to-test-driven-development-tdd-61a13bc92d92. +Although writing tests before the code might seem strange at first, but it has very +clear upsides. + +The template provides you with basic tests for the adapter startup and package files. +It is recommended that you add your own tests into the mix. + +### Publishing the adapter +Using GitHub Actions, you can enable automatic releases on npm whenever you push a new git tag that matches the form +`v..`. We **strongly recommend** that you do. The necessary steps are described in `.github/workflows/test-and-release.yml`. + +To get your adapter released in ioBroker, please refer to the documentation +of [ioBroker.repositories](https://github.com/ioBroker/ioBroker.repositories#requirements-for-adapter-to-get-added-to-the-latest-repository). + +### Test the adapter manually on a local ioBroker installation +In order to install the adapter locally without publishing, the following steps are recommended: +1. Create a tarball from your dev directory: + ```bash + npm pack + ``` +1. Upload the resulting file to your ioBroker host +1. Install it locally (The paths are different on Windows): + ```bash + cd /opt/iobroker + npm i /path/to/tarball.tgz + ``` + +For later updates, the above procedure is not necessary. Just do the following: +1. Overwrite the changed files in the adapter directory (`/opt/iobroker/node_modules/iobroker.test-adapter`) +1. Execute `iobroker upload test-adapter` on the ioBroker host + +## Changelog + +### 0.0.1 +* (Al Calzone) initial release + +## License +MIT License + +Copyright (c) 2025 Al Calzone + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/__meta__/npm_package_files.txt b/test/baselines/adapter_JS_OfficialESLint/__meta__/npm_package_files.txt new file mode 100644 index 000000000..23b05f264 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/__meta__/npm_package_files.txt @@ -0,0 +1,10 @@ +admin/index_m.html +admin/style.css +admin/test-adapter.png +admin/words.js +lib/adapter-config.d.ts +io-package.json +LICENSE +main.js +package.json +README.md \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/admin/index_m.html b/test/baselines/adapter_JS_OfficialESLint/admin/index_m.html new file mode 100644 index 000000000..f11dc3c14 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/admin/index_m.html @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+
+ + + + +
+
+ + +
+ +
+ + +
+
+ +
+ + + + \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/admin/style.css b/test/baselines/adapter_JS_OfficialESLint/admin/style.css new file mode 100644 index 000000000..57d4549ee --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/admin/style.css @@ -0,0 +1,32 @@ +/* You can delete those if you want. I just found them very helpful */ +* { + box-sizing: border-box +} +.m { + /* Don't cut off dropdowns! */ + overflow: initial; +} +.m.adapter-container, +.m.adapter-container > div.App { + /* Fix layout/scrolling issues with tabs */ + height: 100%; + width: 100%; + position: relative; +} +.m .select-wrapper + label { + /* The positioning for dropdown labels is messed up */ + transform: none !important; +} + +label > i[title] { + /* Display the help cursor for the tooltip icons and fix their positioning */ + cursor: help; + margin-left: 0.25em; +} + +.dropdown-content { + /* Don't wrap text in dropdowns */ + white-space: nowrap; +} + +/* Add your styles here */ diff --git a/test/baselines/adapter_JS_OfficialESLint/admin/test-adapter.png b/test/baselines/adapter_JS_OfficialESLint/admin/test-adapter.png new file mode 100644 index 0000000000000000000000000000000000000000..094ebd97c36dbe2386a63dbce290c9ad6a148079 GIT binary patch literal 62376 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%0DGz6 zyl7fq5kK_OTB5a+j%#*OqHtMgmMFAPfM%z1y`n*X-04|c~XNtbq*59PL zf2GK(^`44LhR@%s*209os!^-XK1;F{M*IZtESo=}65To~n+-bu0+>z?fZnkVoW}$_ zstfB}2u}&7L#c0_Qg^2;} z@gmc!u&D{a-Sk8a)1*Chcx+8~_M64opd2kxtHB|6*!4W&cOrWX;Yw>1GmvfN@nFO$k&$he)RKxo(&m zmF!n>4Y$>igYg0$%*vf6XAlg%u=W>lZr*&`_JyS?Qqf|(d#rIqm-Q+bvDD6`E^Yg! zCA@nJ@*O;Lp9NU-Q#KY#ME2A^kx^vHZXmc#(4jcbti!v_B%%%N@|q{z#cN2rxd7uE zDS;G&(m*%4MYSXuokFeyQS{I{6O4v&@v{hDbb4J?0ftY(dI z%St%e+#=VPIyA5VF9`5)D3bY&tL9gpe{Xha)$de%8pXLvHB( zu+0=Wc6d1^KBxb%4tv#uqG^B_>&ZHIJQN>7!}krzA!iGj%=dq0lHKGFRI$Ah-NT8N RBrxDlMnX}%QuJ%k{{yPv^Xvcs literal 0 HcmV?d00001 diff --git a/test/baselines/adapter_JS_OfficialESLint/admin/words.js b/test/baselines/adapter_JS_OfficialESLint/admin/words.js new file mode 100644 index 000000000..4517fef89 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/admin/words.js @@ -0,0 +1,46 @@ +/* eslint no-unused-vars: off */ +/* eslint no-global-assign: off */ +/* global systemDictionary */ +"use strict"; + +systemDictionary = { + "test-adapter adapter settings": { + "en": "Adapter settings for test-adapter", + "de": "Adaptereinstellungen für test-adapter", + "ru": "Настройки адаптера для test-adapter", + "pt": "Configurações do adaptador para test-adapter", + "nl": "Adapterinstellingen voor test-adapter", + "fr": "Paramètres d'adaptateur pour test-adapter", + "it": "Impostazioni dell'adattatore per test-adapter", + "es": "Ajustes del adaptador para test-adapter", + "pl": "Ustawienia adaptera dla test-adapter", + "uk": "Налаштування адаптера для test-adapter", + "zh-cn": "test-adapter的适配器设置" + }, + "option1": { + "en": "option1", + "de": "Mock translation of 'option1' to 'de'", + "ru": "Mock translation of 'option1' to 'ru'", + "pt": "Mock translation of 'option1' to 'pt'", + "nl": "Mock translation of 'option1' to 'nl'", + "fr": "Mock translation of 'option1' to 'fr'", + "it": "Mock translation of 'option1' to 'it'", + "es": "Mock translation of 'option1' to 'es'", + "pl": "Mock translation of 'option1' to 'pl'", + "uk": "Mock translation of 'option1' to 'uk'", + "zh-cn": "Mock translation of 'option1' to 'zh-cn'" + }, + "option2": { + "en": "option2", + "de": "Mock translation of 'option2' to 'de'", + "ru": "Mock translation of 'option2' to 'ru'", + "pt": "Mock translation of 'option2' to 'pt'", + "nl": "Mock translation of 'option2' to 'nl'", + "fr": "Mock translation of 'option2' to 'fr'", + "it": "Mock translation of 'option2' to 'it'", + "es": "Mock translation of 'option2' to 'es'", + "pl": "Mock translation of 'option2' to 'pl'", + "uk": "Mock translation of 'option2' to 'uk'", + "zh-cn": "Mock translation of 'option2' to 'zh-cn'" + } +}; \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/io-package.json b/test/baselines/adapter_JS_OfficialESLint/io-package.json new file mode 100644 index 000000000..53cff6aab --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/io-package.json @@ -0,0 +1,91 @@ +{ + "common": { + "name": "test-adapter", + "version": "0.0.1", + "news": { + "0.0.1": { + "en": "initial release", + "de": "Erstveröffentlichung", + "ru": "Начальная версия", + "pt": "lançamento inicial", + "nl": "Eerste uitgave", + "fr": "Première version", + "it": "Versione iniziale", + "es": "Versión inicial", + "pl": "Pierwsze wydanie", + "uk": "Початкова версія", + "zh-cn": "首次出版" + } + }, + "titleLang": { + "en": "Is used to test the creator", + "de": "Mock translation of 'Is used to test the creator' to 'de'", + "ru": "Mock translation of 'Is used to test the creator' to 'ru'", + "pt": "Mock translation of 'Is used to test the creator' to 'pt'", + "nl": "Mock translation of 'Is used to test the creator' to 'nl'", + "fr": "Mock translation of 'Is used to test the creator' to 'fr'", + "it": "Mock translation of 'Is used to test the creator' to 'it'", + "es": "Mock translation of 'Is used to test the creator' to 'es'", + "pl": "Mock translation of 'Is used to test the creator' to 'pl'", + "uk": "Mock translation of 'Is used to test the creator' to 'uk'", + "zh-cn": "Mock translation of 'Is used to test the creator' to 'zh-cn'" + }, + "desc": { + "en": "test-adapter", + "de": "Mock translation of 'test-adapter' to 'de'", + "ru": "Mock translation of 'test-adapter' to 'ru'", + "pt": "Mock translation of 'test-adapter' to 'pt'", + "nl": "Mock translation of 'test-adapter' to 'nl'", + "fr": "Mock translation of 'test-adapter' to 'fr'", + "it": "Mock translation of 'test-adapter' to 'it'", + "es": "Mock translation of 'test-adapter' to 'es'", + "pl": "Mock translation of 'test-adapter' to 'pl'", + "uk": "Mock translation of 'test-adapter' to 'uk'", + "zh-cn": "Mock translation of 'test-adapter' to 'zh-cn'" + }, + "authors": [ + "Al Calzone " + ], + "keywords": [ + "template", + "automation", + "IoT", + "integration" + ], + "licenseInformation": { + "type": "free", + "license": "MIT" + }, + "platform": "Javascript/Node.js", + "icon": "test-adapter.png", + "enabled": true, + "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", + "readme": "https://github.com/AlCalzone/ioBroker.test-adapter/blob/main/README.md", + "loglevel": "info", + "tier": 3, + "mode": "daemon", + "type": "general", + "compact": true, + "connectionType": "local", + "dataSource": "push", + "adminUI": { + "config": "materialize" + }, + "dependencies": [ + { + "js-controller": ">=6.0.11" + } + ], + "globalDependencies": [ + { + "admin": ">=7.0.23" + } + ] + }, + "native": { + "option1": true, + "option2": "42" + }, + "objects": [], + "instanceObjects": [] +} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/lib/adapter-config.d.ts b/test/baselines/adapter_JS_OfficialESLint/lib/adapter-config.d.ts new file mode 100644 index 000000000..ae458daf3 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/lib/adapter-config.d.ts @@ -0,0 +1,19 @@ +// This file extends the AdapterConfig type from "@types/iobroker" +// using the actual properties present in io-package.json +// in order to provide typings for adapter.config properties + +import { native } from "../io-package.json"; + +type _AdapterConfig = typeof native; + +// Augment the globally declared type ioBroker.AdapterConfig +declare global { + namespace ioBroker { + interface AdapterConfig extends _AdapterConfig { + // Do not enter anything here! + } + } +} + +// this is required so the above AdapterConfig is found by TypeScript / type checking +export {}; \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/main.js b/test/baselines/adapter_JS_OfficialESLint/main.js new file mode 100644 index 000000000..723fa962b --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/main.js @@ -0,0 +1,167 @@ +"use strict"; + +/* + * Created with @iobroker/create-adapter v2.6.5 + */ + +// The adapter-core module gives you access to the core ioBroker functions +// you need to create an adapter +const utils = require("@iobroker/adapter-core"); + +// Load your modules here, e.g.: +// const fs = require("fs"); + +class TestAdapter extends utils.Adapter { + + /** + * @param {Partial} [options={}] + */ + constructor(options) { + super({ + ...options, + name: "test-adapter", + }); + this.on("ready", this.onReady.bind(this)); + this.on("stateChange", this.onStateChange.bind(this)); + // this.on("objectChange", this.onObjectChange.bind(this)); + // this.on("message", this.onMessage.bind(this)); + this.on("unload", this.onUnload.bind(this)); + } + + /** + * Is called when databases are connected and adapter received configuration. + */ + async onReady() { + // Initialize your adapter here + + // The adapters config (in the instance object everything under the attribute "native") is accessible via + // this.config: + this.log.debug("config option1: " + this.config.option1); + this.log.debug("config option2: " + this.config.option2); + + /* + For every state in the system there has to be also an object of type state + Here a simple template for a boolean variable named "testVariable" + Because every adapter instance uses its own unique namespace variable names can't collide with other adapters variables + */ + await this.setObjectNotExistsAsync("testVariable", { + type: "state", + common: { + name: "testVariable", + type: "boolean", + role: "indicator", + read: true, + write: true, + }, + native: {}, + }); + + // In order to get state updates, you need to subscribe to them. The following line adds a subscription for our variable we have created above. + this.subscribeStates("testVariable"); + // You can also add a subscription for multiple states. The following line watches all states starting with "lights." + // this.subscribeStates("lights.*"); + // Or, if you really must, you can also watch all states. Don't do this if you don't need to. Otherwise this will cause a lot of unnecessary load on the system: + // this.subscribeStates("*"); + + /* + setState examples + you will notice that each setState will cause the stateChange event to fire (because of above subscribeStates cmd) + */ + // the variable testVariable is set to true as command (ack=false) + await this.setState("testVariable", true); + + // same thing, but the value is flagged "ack" + // ack should be always set to true if the value is received from or acknowledged from the target system + await this.setState("testVariable", { val: true, ack: true }); + + // same thing, but the state is deleted after 30s (getState will return null afterwards) + await this.setState("testVariable", { val: true, ack: true, expire: 30 }); + + // examples for the checkPassword/checkGroup functions + const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); + this.log.info("check user admin pw iobroker: " + pwdResult); + + const gropupResult = await this.checkGroupAsync("admin", "admin"); + this.log.info("check group user admin group admin: " + gropupResult); + } + + /** + * Is called when adapter shuts down - callback has to be called under any circumstances! + * @param {() => void} callback + */ + onUnload(callback) { + try { + // Here you must clear all timeouts or intervals that may still be active + // clearTimeout(timeout1); + // clearTimeout(timeout2); + // ... + // clearInterval(interval1); + + callback(); + } catch (_e) { + callback(); + } + } + + // If you need to react to object changes, uncomment the following block and the corresponding line in the constructor. + // You also need to subscribe to the objects with `this.subscribeObjects`, similar to `this.subscribeStates`. + // /** + // * Is called if a subscribed object changes + // * @param {string} id + // * @param {ioBroker.Object | null | undefined} obj + // */ + // onObjectChange(id, obj) { + // if (obj) { + // // The object was changed + // this.log.info(`object ${id} changed: ${JSON.stringify(obj)}`); + // } else { + // // The object was deleted + // this.log.info(`object ${id} deleted`); + // } + // } + + /** + * Is called if a subscribed state changes + * @param {string} id + * @param {ioBroker.State | null | undefined} state + */ + onStateChange(id, state) { + if (state) { + // The state was changed + this.log.info(`state ${id} changed: ${state.val} (ack = ${state.ack})`); + } else { + // The state was deleted + this.log.info(`state ${id} deleted`); + } + } + + // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. + // /** + // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... + // * Using this method requires "common.messagebox" property to be set to true in io-package.json + // * @param {ioBroker.Message} obj + // */ + // onMessage(obj) { + // if (typeof obj === "object" && obj.message) { + // if (obj.command === "send") { + // // e.g. send email or pushover or whatever + // this.log.info("send command"); + + // // Send response in callback if required + // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); + // } + // } + // } + +} + +if (require.main !== module) { + // Export the constructor in compact mode + /** + * @param {Partial} [options={}] + */ + module.exports = (options) => new TestAdapter(options); +} else { + // otherwise start the instance directly + new TestAdapter(); +} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/main.test.js b/test/baselines/adapter_JS_OfficialESLint/main.test.js new file mode 100644 index 000000000..307b4c62f --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/main.test.js @@ -0,0 +1,30 @@ +"use strict"; + +/** + * This is a dummy TypeScript test file using chai and mocha + * + * It's automatically excluded from npm and its build output is excluded from both git and npm. + * It is advised to test all your modules with accompanying *.test.js-files + */ + +// tslint:disable:no-unused-expression + +const { expect } = require("chai"); +// import { functionToTest } from "./moduleToTest"; + +describe("module to test => function to test", () => { + // initializing logic + const expected = 5; + + it(`should return ${expected}`, () => { + const result = 5; + // assign result a value from functionToTest + expect(result).to.equal(expected); + // or using the should() syntax + result.should.equal(expected); + }); + // ... more tests => it + +}); + +// ... more test suites => describe diff --git a/test/baselines/adapter_JS_OfficialESLint/package.json b/test/baselines/adapter_JS_OfficialESLint/package.json new file mode 100644 index 000000000..48866ec22 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/package.json @@ -0,0 +1,55 @@ +{ + "name": "iobroker.test-adapter", + "version": "0.0.1", + "description": "test-adapter", + "author": { + "name": "Al Calzone", + "email": "al@calzo.ne" + }, + "contributors": [], + "homepage": "https://github.com/AlCalzone/ioBroker.test-adapter", + "license": "MIT", + "keywords": [ + "template", + "automation", + "IoT", + "integration" + ], + "repository": { + "type": "git", + "url": "https://github.com/AlCalzone/ioBroker.test-adapter.git" + }, + "engines": { + "node": ">= 20" + }, + "dependencies": { + "@iobroker/adapter-core": "^3.3.2" + }, + "devDependencies": { + "@iobroker/adapter-dev": "^1.5.0", + "@iobroker/eslint-config": "^2.2.0", + "@iobroker/testing": "^5.1.1" + }, + "main": "main.js", + "files": [ + "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).{json,json5}", + "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}", + "lib/", + "www/", + "io-package.json", + "LICENSE", + "main.js" + ], + "scripts": { + "test:js": "mocha --config test/mocharc.custom.json \"{!(node_modules|test)/**/*.test.js,*.test.js,test/**/test!(PackageFiles|Startup).js}\"", + "test:package": "mocha test/package --exit", + "test:integration": "mocha test/integration --exit", + "test": "npm run test:js && npm run test:package", + "lint": "eslint .", + "translate": "translate-adapter" + }, + "bugs": { + "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" + }, + "readmeFilename": "README.md" +} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/test/integration.js b/test/baselines/adapter_JS_OfficialESLint/test/integration.js new file mode 100644 index 000000000..986936fac --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/test/integration.js @@ -0,0 +1,5 @@ +const path = require("path"); +const { tests } = require("@iobroker/testing"); + +// Run integration tests - See https://github.com/ioBroker/testing for a detailed explanation and further options +tests.integration(path.join(__dirname, "..")); \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/test/mocha.setup.js b/test/baselines/adapter_JS_OfficialESLint/test/mocha.setup.js new file mode 100644 index 000000000..b3b963114 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/test/mocha.setup.js @@ -0,0 +1,14 @@ +// Don't silently swallow unhandled rejections +process.on("unhandledRejection", (e) => { + throw e; +}); + +// enable the should interface with sinon +// and load chai-as-promised and sinon-chai by default +const sinonChai = require("sinon-chai"); +const chaiAsPromised = require("chai-as-promised"); +const { should, use } = require("chai"); + +should(); +use(sinonChai); +use(chaiAsPromised); \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/test/mocharc.custom.json b/test/baselines/adapter_JS_OfficialESLint/test/mocharc.custom.json new file mode 100644 index 000000000..6e49c601b --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/test/mocharc.custom.json @@ -0,0 +1,10 @@ +{ + "require": [ + "test/mocha.setup.js" + ], + "watch-files": [ + "!(node_modules|test)/**/*.test.js", + "*.test.js", + "test/**/test!(PackageFiles|Startup).js" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/test/package.js b/test/baselines/adapter_JS_OfficialESLint/test/package.js new file mode 100644 index 000000000..3a48e0449 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/test/package.js @@ -0,0 +1,5 @@ +const path = require("path"); +const { tests } = require("@iobroker/testing"); + +// Validate the package files +tests.packageFiles(path.join(__dirname, "..")); diff --git a/test/baselines/adapter_JS_React/.create-adapter.json b/test/baselines/adapter_JS_React/.create-adapter.json index efe7c73f7..5330fe6ad 100644 --- a/test/baselines/adapter_JS_React/.create-adapter.json +++ b/test/baselines/adapter_JS_React/.create-adapter.json @@ -19,6 +19,7 @@ "tools": [ "ESLint" ], + "eslintConfig": "custom", "indentation": "Tab", "quotes": "double", "authorName": "Al Calzone", diff --git a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/.create-adapter.json b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/.create-adapter.json index ebe7ad984..004d5dab3 100644 --- a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/.create-adapter.json +++ b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/.create-adapter.json @@ -22,6 +22,7 @@ "tools": [ "ESLint" ], + "eslintConfig": "custom", "indentation": "Tab", "quotes": "double", "authorName": "Al Calzone", diff --git a/test/baselines/adapter_TS_OfficialESLint/.create-adapter.json b/test/baselines/adapter_TS_OfficialESLint/.create-adapter.json new file mode 100644 index 000000000..64da96c2b --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.create-adapter.json @@ -0,0 +1,38 @@ +{ + "cli": true, + "target": "directory", + "adapterName": "test-adapter", + "title": "Is used to test the creator", + "startMode": "daemon", + "features": [ + "adapter" + ], + "connectionIndicator": "no", + "connectionType": "local", + "dataSource": "push", + "adminFeatures": [], + "type": "general", + "language": "TypeScript", + "adminUi": "html", + "tabReact": "no", + "releaseScript": "no", + "tools": [ + "ESLint" + ], + "eslintConfig": "official", + "indentation": "Tab", + "quotes": "double", + "authorName": "Al Calzone", + "authorGithub": "AlCalzone", + "authorEmail": "al@calzo.ne", + "gitRemoteProtocol": "HTTPS", + "dependabot": "yes", + "gitCommit": "no", + "defaultBranch": "main", + "license": "MIT License", + "licenseInformation": { + "type": "free", + "license": "MIT" + }, + "creatorVersion": "2.6.5" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/.eslintignore b/test/baselines/adapter_TS_OfficialESLint/.eslintignore new file mode 100644 index 000000000..d7b786517 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.eslintignore @@ -0,0 +1,3 @@ +build/ +**/.eslintrc.js +admin/words.js \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/.eslintrc.js b/test/baselines/adapter_TS_OfficialESLint/.eslintrc.js new file mode 100644 index 000000000..9aacb8b36 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.eslintrc.js @@ -0,0 +1,3 @@ +module.exports = { + extends: ["@iobroker"], +}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md b/test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..895613958 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,32 @@ +--- +name: Bug report +about: Something is not working as it should +title: '' +labels: '' +assignees: '' +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '...' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots & Logfiles** +If applicable, add screenshots and logfiles to help explain your problem. + +**Versions:** + - Adapter version: + - JS-Controller version: + - Node version: + - Operating system: + +**Additional context** +Add any other context about the problem here. diff --git a/test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml b/test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..d7cfe5940 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: ioBroker Community + url: https://forum.iobroker.net/ + about: Please ask and answer questions here. \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/.github/auto-merge.yml b/test/baselines/adapter_TS_OfficialESLint/.github/auto-merge.yml new file mode 100644 index 000000000..4f6d185f0 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.github/auto-merge.yml @@ -0,0 +1,17 @@ +# Configure here which dependency updates should be merged automatically. +# The recommended configuration is the following: +- match: + # Only merge patches for production dependencies + dependency_type: production + update_type: "semver:patch" +- match: + # Except for security fixes, here we allow minor patches + dependency_type: production + update_type: "security:minor" +- match: + # and development dependencies can have a minor update, too + dependency_type: development + update_type: "semver:minor" + +# The syntax is based on the legacy dependabot v1 automerged_updates syntax, see: +# https://dependabot.com/docs/config-file/#automerged_updates diff --git a/test/baselines/adapter_TS_OfficialESLint/.github/dependabot.yml b/test/baselines/adapter_TS_OfficialESLint/.github/dependabot.yml new file mode 100644 index 000000000..c165a6a47 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.github/dependabot.yml @@ -0,0 +1,22 @@ +version: 2 +updates: + - package-ecosystem: npm + directory: "/" + schedule: + interval: monthly + time: "04:00" + timezone: Europe/Berlin + open-pull-requests-limit: 5 + assignees: + - AlCalzone + versioning-strategy: increase + + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: monthly + time: "04:00" + timezone: Europe/Berlin + open-pull-requests-limit: 5 + assignees: + - AlCalzone diff --git a/test/baselines/adapter_TS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml b/test/baselines/adapter_TS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml new file mode 100644 index 000000000..baeae23b5 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml @@ -0,0 +1,27 @@ +# Automatically merge Dependabot PRs when version comparison is within the range +# that is configured in .github/auto-merge.yml + +name: Auto-Merge Dependabot PRs + +on: + # WARNING: This needs to be run in the PR base, DO NOT build untrusted code in this action + # details under https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/ + pull_request_target: + +jobs: + auto-merge: + if: github.actor == 'dependabot[bot]' + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Check if PR should be auto-merged + uses: ahmadnassri/action-dependabot-auto-merge@v2 + with: + # In order to use this, you need to go to https://github.com/settings/tokens and + # create a Personal Access Token with the permission "public_repo". + # Enter this token in your repository settings under "Secrets" and name it AUTO_MERGE_TOKEN + github-token: ${{ secrets.AUTO_MERGE_TOKEN }} + # By default, squash and merge, so Github chooses nice commit messages + command: squash and merge diff --git a/test/baselines/adapter_TS_OfficialESLint/.github/workflows/test-and-release.yml b/test/baselines/adapter_TS_OfficialESLint/.github/workflows/test-and-release.yml new file mode 100644 index 000000000..0c48ade1a --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.github/workflows/test-and-release.yml @@ -0,0 +1,96 @@ +name: Test and Release + +# Run this job on all pushes and pull requests +# as well as tags with a semantic version +on: + push: + branches: + - "main" + tags: + # normal versions + - "v[0-9]+.[0-9]+.[0-9]+" + # pre-releases + - "v[0-9]+.[0-9]+.[0-9]+-**" + pull_request: {} + +# Cancel previous PR/branch runs when a new commit is pushed +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true + +jobs: + # Performs quick checks before the expensive test runs + check-and-lint: + if: contains(github.event.head_commit.message, '[skip ci]') == false + + runs-on: ubuntu-latest + + steps: + - uses: ioBroker/testing-action-check@v1 + with: + node-version: '20.x' + # Uncomment the following line if your adapter cannot be installed using 'npm ci' + # install-command: 'npm install' + type-checking: true + lint: true + + # Runs adapter tests on all supported node versions and OSes + adapter-tests: + if: contains(github.event.head_commit.message, '[skip ci]') == false + + runs-on: ${{ matrix.os }} + strategy: + matrix: + node-version: [20.x, 22.x, 24.x] + os: [ubuntu-latest, windows-latest, macos-latest] + + steps: + - uses: ioBroker/testing-action-adapter@v1 + with: + node-version: ${{ matrix.node-version }} + os: ${{ matrix.os }} + # Uncomment the following line if your adapter cannot be installed using 'npm ci' + # install-command: 'npm install' + build: true + +# TODO: To enable automatic npm releases, create a token on npmjs.org +# Enter this token as a GitHub secret (with name NPM_TOKEN) in the repository options +# Then uncomment the following block: + +# # Deploys the final package to NPM +# deploy: +# needs: [check-and-lint, adapter-tests] +# +# # Trigger this step only when a commit on any branch is tagged with a version number +# if: | +# contains(github.event.head_commit.message, '[skip ci]') == false && +# github.event_name == 'push' && +# startsWith(github.ref, 'refs/tags/v') +# +# runs-on: ubuntu-latest +# +# # Write permissions are required to create Github releases +# permissions: +# contents: write +# +# steps: +# - uses: ioBroker/testing-action-deploy@v1 +# with: +# node-version: '20.x' +# # Uncomment the following line if your adapter cannot be installed using 'npm ci' +# # install-command: 'npm install' +# build: true +# npm-token: ${{ secrets.NPM_TOKEN }} +# github-token: ${{ secrets.GITHUB_TOKEN }} +# +# # When using Sentry for error reporting, Sentry can be informed about new releases +# # To enable create a API-Token in Sentry (User settings, API keys) +# # Enter this token as a GitHub secret (with name SENTRY_AUTH_TOKEN) in the repository options +# # Then uncomment and customize the following block: +# sentry: true +# sentry-token: ${{ secrets.SENTRY_AUTH_TOKEN }} +# sentry-project: "iobroker-test-adapter" +# sentry-version-prefix: "iobroker.test-adapter" +# sentry-sourcemap-paths: "build/" +# # If your sentry project is linked to a GitHub repository, you can enable the following option +# # sentry-github-integration: true diff --git a/test/baselines/adapter_TS_OfficialESLint/.gitignore b/test/baselines/adapter_TS_OfficialESLint/.gitignore new file mode 100644 index 000000000..80c28aa9d --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.gitignore @@ -0,0 +1,18 @@ +# No dot-directories except github/vscode +.*/ +!.vscode/ +!.github/ + +*.code-workspace +node_modules +nbproject + +# npm package files +iobroker.*.tgz + +Thumbs.db +.commitinfo + +# i18n intermediate files +admin/i18n/flat.txt +admin/i18n/*/flat.txt \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/.vscode/extensions.json b/test/baselines/adapter_TS_OfficialESLint/.vscode/extensions.json new file mode 100644 index 000000000..2c6ac5b31 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.vscode/extensions.json @@ -0,0 +1,6 @@ +{ + "recommendations": [ + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/.vscode/settings.json b/test/baselines/adapter_TS_OfficialESLint/.vscode/settings.json new file mode 100644 index 000000000..854736cc0 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.vscode/settings.json @@ -0,0 +1,23 @@ +{ + "typescript.tsdk": "node_modules/typescript/lib", + "eslint.enable": true, + "json.schemas": [ + { + "fileMatch": [ + "io-package.json" + ], + "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.js-controller/master/schemas/io-package.json" + }, + { + "fileMatch": [ + "admin/jsonConfig.json", + "admin/jsonConfig.json5", + "admin/jsonCustom.json", + "admin/jsonCustom.json5", + "admin/jsonTab.json", + "admin/jsonTab.json5" + ], + "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.admin/master/packages/jsonConfig/schemas/jsonConfig.json" + } + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/LICENSE b/test/baselines/adapter_TS_OfficialESLint/LICENSE new file mode 100644 index 000000000..27c9a624d --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2025 Al Calzone + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/test/baselines/adapter_TS_OfficialESLint/README.md b/test/baselines/adapter_TS_OfficialESLint/README.md new file mode 100644 index 000000000..f57bba69c --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/README.md @@ -0,0 +1,132 @@ +![Logo](admin/test-adapter.png) +# ioBroker.test-adapter + +[![NPM version](https://img.shields.io/npm/v/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) +[![Downloads](https://img.shields.io/npm/dm/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) +![Number of Installations](https://iobroker.live/badges/test-adapter-installed.svg) +![Current version in stable repository](https://iobroker.live/badges/test-adapter-stable.svg) + +[![NPM](https://nodei.co/npm/iobroker.test-adapter.png?downloads=true)](https://nodei.co/npm/iobroker.test-adapter/) + +**Tests:** ![Test and Release](https://github.com/AlCalzone/ioBroker.test-adapter/workflows/Test%20and%20Release/badge.svg) + +## test-adapter adapter for ioBroker + +Describe your project here + +## Developer manual +This section is intended for the developer. It can be deleted later. + +### DISCLAIMER + +Please make sure that you consider copyrights and trademarks when you use names or logos of a company and add a disclaimer to your README. +You can check other adapters for examples or ask in the developer community. Using a name or logo of a company without permission may cause legal problems for you. + +### Getting started + +You are almost done, only a few steps left: +1. Create a new repository on GitHub with the name `ioBroker.test-adapter` +1. Initialize the current folder as a new git repository: + ```bash + git init -b main + git add . + git commit -m "Initial commit" + ``` +1. Link your local repository with the one on GitHub: + ```bash + git remote add origin https://github.com/AlCalzone/ioBroker.test-adapter + ``` + +1. Push all files to the GitHub repo: + ```bash + git push origin main + ``` +1. Add a new secret under https://github.com/AlCalzone/ioBroker.test-adapter/settings/secrets. It must be named `AUTO_MERGE_TOKEN` and contain a personal access token with push access to the repository, e.g. yours. You can create a new token under https://github.com/settings/tokens. + +1. Head over to [src/main.ts](src/main.ts) and start programming! + +### Best Practices +We've collected some [best practices](https://github.com/ioBroker/ioBroker.repositories#development-and-coding-best-practices) regarding ioBroker development and coding in general. If you're new to ioBroker or Node.js, you should +check them out. If you're already experienced, you should also take a look at them - you might learn something new :) + +### Scripts in `package.json` +Several npm scripts are predefined for your convenience. You can run them using `npm run ` +| Script name | Description | +|-------------|-------------| +| `build` | Compile the TypeScript sources. | +| `watch` | Compile the TypeScript sources and watch for changes. | +| `test:ts` | Executes the tests you defined in `*.test.ts` files. | +| `test:package` | Ensures your `package.json` and `io-package.json` are valid. | +| `test:integration` | Tests the adapter startup with an actual instance of ioBroker. | +| `test` | Performs a minimal test run on package files and your tests. | +| `check` | Performs a type-check on your code (without compiling anything). | +| `lint` | Runs `ESLint` to check your code for formatting errors and potential bugs. | +| `translate` | Translates texts in your adapter to all required languages, see [`@iobroker/adapter-dev`](https://github.com/ioBroker/adapter-dev#manage-translations) for more details. | + +### Configuring the compilation +The adapter template uses [esbuild](https://esbuild.github.io/) to compile TypeScript and/or React code. You can configure many compilation settings +either in `tsconfig.json` or by changing options for the build tasks. These options are described in detail in the +[`@iobroker/adapter-dev` documentation](https://github.com/ioBroker/adapter-dev#compile-adapter-files). + +### Writing tests +When done right, testing code is invaluable, because it gives you the +confidence to change your code while knowing exactly if and when +something breaks. A good read on the topic of test-driven development +is https://hackernoon.com/introduction-to-test-driven-development-tdd-61a13bc92d92. +Although writing tests before the code might seem strange at first, but it has very +clear upsides. + +The template provides you with basic tests for the adapter startup and package files. +It is recommended that you add your own tests into the mix. + +### Publishing the adapter +Using GitHub Actions, you can enable automatic releases on npm whenever you push a new git tag that matches the form +`v..`. We **strongly recommend** that you do. The necessary steps are described in `.github/workflows/test-and-release.yml`. + +To get your adapter released in ioBroker, please refer to the documentation +of [ioBroker.repositories](https://github.com/ioBroker/ioBroker.repositories#requirements-for-adapter-to-get-added-to-the-latest-repository). + +### Test the adapter manually on a local ioBroker installation +In order to install the adapter locally without publishing, the following steps are recommended: +1. Create a tarball from your dev directory: + ```bash + npm pack + ``` +1. Upload the resulting file to your ioBroker host +1. Install it locally (The paths are different on Windows): + ```bash + cd /opt/iobroker + npm i /path/to/tarball.tgz + ``` + +For later updates, the above procedure is not necessary. Just do the following: +1. Overwrite the changed files in the adapter directory (`/opt/iobroker/node_modules/iobroker.test-adapter`) +1. Execute `iobroker upload test-adapter` on the ioBroker host + +## Changelog + +### 0.0.1 +* (Al Calzone) initial release + +## License +MIT License + +Copyright (c) 2025 Al Calzone + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/__meta__/npm_package_files.txt b/test/baselines/adapter_TS_OfficialESLint/__meta__/npm_package_files.txt new file mode 100644 index 000000000..7503a378d --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/__meta__/npm_package_files.txt @@ -0,0 +1,8 @@ +admin/index_m.html +admin/style.css +admin/test-adapter.png +admin/words.js +io-package.json +LICENSE +package.json +README.md \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/admin/admin.d.ts b/test/baselines/adapter_TS_OfficialESLint/admin/admin.d.ts new file mode 100644 index 000000000..41f934f4c --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/admin/admin.d.ts @@ -0,0 +1,93 @@ +declare let systemDictionary: Record>; + +declare let load: (settings: Record, onChange: (hasChanges: boolean) => void) => void; +declare let save: (callback: (settings: Record) => void) => void; + +// make load and save exist on the window object +interface Window { + load: typeof load; + save: typeof save; +} + +declare const instance: number; +declare const adapter: string; +/** Translates text */ +declare function _(text: string, arg1?: string, arg2?: string, arg3?: string): string; +declare const socket: ioBrokerSocket; +declare function sendTo( + instance: any | null, + command: string, + message: any, + callback: (result: SendToResult) => void | Promise, +): void; + +interface SendToResult { + error?: string | Error; + result?: any; +} + +// tslint:disable-next-line:class-name +interface ioBrokerSocket { + emit( + command: "subscribeObjects", + pattern: string, + callback?: (err?: string) => void | Promise, + ): void; + emit( + command: "subscribeStates", + pattern: string, + callback?: (err?: string) => void | Promise, + ): void; + emit( + command: "unsubscribeObjects", + pattern: string, + callback?: (err?: string) => void | Promise, + ): void; + emit( + command: "unsubscribeStates", + pattern: string, + callback?: (err?: string) => void | Promise, + ): void; + + emit( + event: "getObjectView", + view: "system", + type: "device", + options: ioBroker.GetObjectViewParams, + callback: ( + err: string | undefined, + result?: any, + ) => void | Promise, + ): void; + emit( + event: "getStates", + callback: ( + err: string | undefined, + result?: Record, + ) => void, + ): void; + emit( + event: "getState", + id: string, + callback: (err: string | undefined, result?: ioBroker.State) => void, + ): void; + emit( + event: "setState", + id: string, + state: unknown, + callback: (err: string | undefined, result?: any) => void, + ): void; + + on(event: "objectChange", handler: ioBroker.ObjectChangeHandler): void; + on(event: "stateChange", handler: ioBroker.StateChangeHandler): void; + removeEventHandler( + event: "objectChange", + handler: ioBroker.ObjectChangeHandler, + ): void; + removeEventHandler( + event: "stateChange", + handler: ioBroker.StateChangeHandler, + ): void; + + // TODO: other events +} diff --git a/test/baselines/adapter_TS_OfficialESLint/admin/index_m.html b/test/baselines/adapter_TS_OfficialESLint/admin/index_m.html new file mode 100644 index 000000000..f11dc3c14 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/admin/index_m.html @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+
+ + + + +
+
+ + +
+ +
+ + +
+
+ +
+ + + + \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/admin/style.css b/test/baselines/adapter_TS_OfficialESLint/admin/style.css new file mode 100644 index 000000000..57d4549ee --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/admin/style.css @@ -0,0 +1,32 @@ +/* You can delete those if you want. I just found them very helpful */ +* { + box-sizing: border-box +} +.m { + /* Don't cut off dropdowns! */ + overflow: initial; +} +.m.adapter-container, +.m.adapter-container > div.App { + /* Fix layout/scrolling issues with tabs */ + height: 100%; + width: 100%; + position: relative; +} +.m .select-wrapper + label { + /* The positioning for dropdown labels is messed up */ + transform: none !important; +} + +label > i[title] { + /* Display the help cursor for the tooltip icons and fix their positioning */ + cursor: help; + margin-left: 0.25em; +} + +.dropdown-content { + /* Don't wrap text in dropdowns */ + white-space: nowrap; +} + +/* Add your styles here */ diff --git a/test/baselines/adapter_TS_OfficialESLint/admin/test-adapter.png b/test/baselines/adapter_TS_OfficialESLint/admin/test-adapter.png new file mode 100644 index 0000000000000000000000000000000000000000..094ebd97c36dbe2386a63dbce290c9ad6a148079 GIT binary patch literal 62376 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%0DGz6 zyl7fq5kK_OTB5a+j%#*OqHtMgmMFAPfM%z1y`n*X-04|c~XNtbq*59PL zf2GK(^`44LhR@%s*209os!^-XK1;F{M*IZtESo=}65To~n+-bu0+>z?fZnkVoW}$_ zstfB}2u}&7L#c0_Qg^2;} z@gmc!u&D{a-Sk8a)1*Chcx+8~_M64opd2kxtHB|6*!4W&cOrWX;Yw>1GmvfN@nFO$k&$he)RKxo(&m zmF!n>4Y$>igYg0$%*vf6XAlg%u=W>lZr*&`_JyS?Qqf|(d#rIqm-Q+bvDD6`E^Yg! zCA@nJ@*O;Lp9NU-Q#KY#ME2A^kx^vHZXmc#(4jcbti!v_B%%%N@|q{z#cN2rxd7uE zDS;G&(m*%4MYSXuokFeyQS{I{6O4v&@v{hDbb4J?0ftY(dI z%St%e+#=VPIyA5VF9`5)D3bY&tL9gpe{Xha)$de%8pXLvHB( zu+0=Wc6d1^KBxb%4tv#uqG^B_>&ZHIJQN>7!}krzA!iGj%=dq0lHKGFRI$Ah-NT8N RBrxDlMnX}%QuJ%k{{yPv^Xvcs literal 0 HcmV?d00001 diff --git a/test/baselines/adapter_TS_OfficialESLint/admin/tsconfig.json b/test/baselines/adapter_TS_OfficialESLint/admin/tsconfig.json new file mode 100644 index 000000000..49fb013d2 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/admin/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../tsconfig.json", + "include": [ + "./admin.d.ts", + "./**/*.js", + // Include the adapter-config definition if it exists. + // It should be at either on of these paths: + "../lib/adapter-config.d.ts", // JS + "../src/lib/adapter-config.d.ts", // TS + ] +} diff --git a/test/baselines/adapter_TS_OfficialESLint/admin/words.js b/test/baselines/adapter_TS_OfficialESLint/admin/words.js new file mode 100644 index 000000000..4517fef89 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/admin/words.js @@ -0,0 +1,46 @@ +/* eslint no-unused-vars: off */ +/* eslint no-global-assign: off */ +/* global systemDictionary */ +"use strict"; + +systemDictionary = { + "test-adapter adapter settings": { + "en": "Adapter settings for test-adapter", + "de": "Adaptereinstellungen für test-adapter", + "ru": "Настройки адаптера для test-adapter", + "pt": "Configurações do adaptador para test-adapter", + "nl": "Adapterinstellingen voor test-adapter", + "fr": "Paramètres d'adaptateur pour test-adapter", + "it": "Impostazioni dell'adattatore per test-adapter", + "es": "Ajustes del adaptador para test-adapter", + "pl": "Ustawienia adaptera dla test-adapter", + "uk": "Налаштування адаптера для test-adapter", + "zh-cn": "test-adapter的适配器设置" + }, + "option1": { + "en": "option1", + "de": "Mock translation of 'option1' to 'de'", + "ru": "Mock translation of 'option1' to 'ru'", + "pt": "Mock translation of 'option1' to 'pt'", + "nl": "Mock translation of 'option1' to 'nl'", + "fr": "Mock translation of 'option1' to 'fr'", + "it": "Mock translation of 'option1' to 'it'", + "es": "Mock translation of 'option1' to 'es'", + "pl": "Mock translation of 'option1' to 'pl'", + "uk": "Mock translation of 'option1' to 'uk'", + "zh-cn": "Mock translation of 'option1' to 'zh-cn'" + }, + "option2": { + "en": "option2", + "de": "Mock translation of 'option2' to 'de'", + "ru": "Mock translation of 'option2' to 'ru'", + "pt": "Mock translation of 'option2' to 'pt'", + "nl": "Mock translation of 'option2' to 'nl'", + "fr": "Mock translation of 'option2' to 'fr'", + "it": "Mock translation of 'option2' to 'it'", + "es": "Mock translation of 'option2' to 'es'", + "pl": "Mock translation of 'option2' to 'pl'", + "uk": "Mock translation of 'option2' to 'uk'", + "zh-cn": "Mock translation of 'option2' to 'zh-cn'" + } +}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/io-package.json b/test/baselines/adapter_TS_OfficialESLint/io-package.json new file mode 100644 index 000000000..53cff6aab --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/io-package.json @@ -0,0 +1,91 @@ +{ + "common": { + "name": "test-adapter", + "version": "0.0.1", + "news": { + "0.0.1": { + "en": "initial release", + "de": "Erstveröffentlichung", + "ru": "Начальная версия", + "pt": "lançamento inicial", + "nl": "Eerste uitgave", + "fr": "Première version", + "it": "Versione iniziale", + "es": "Versión inicial", + "pl": "Pierwsze wydanie", + "uk": "Початкова версія", + "zh-cn": "首次出版" + } + }, + "titleLang": { + "en": "Is used to test the creator", + "de": "Mock translation of 'Is used to test the creator' to 'de'", + "ru": "Mock translation of 'Is used to test the creator' to 'ru'", + "pt": "Mock translation of 'Is used to test the creator' to 'pt'", + "nl": "Mock translation of 'Is used to test the creator' to 'nl'", + "fr": "Mock translation of 'Is used to test the creator' to 'fr'", + "it": "Mock translation of 'Is used to test the creator' to 'it'", + "es": "Mock translation of 'Is used to test the creator' to 'es'", + "pl": "Mock translation of 'Is used to test the creator' to 'pl'", + "uk": "Mock translation of 'Is used to test the creator' to 'uk'", + "zh-cn": "Mock translation of 'Is used to test the creator' to 'zh-cn'" + }, + "desc": { + "en": "test-adapter", + "de": "Mock translation of 'test-adapter' to 'de'", + "ru": "Mock translation of 'test-adapter' to 'ru'", + "pt": "Mock translation of 'test-adapter' to 'pt'", + "nl": "Mock translation of 'test-adapter' to 'nl'", + "fr": "Mock translation of 'test-adapter' to 'fr'", + "it": "Mock translation of 'test-adapter' to 'it'", + "es": "Mock translation of 'test-adapter' to 'es'", + "pl": "Mock translation of 'test-adapter' to 'pl'", + "uk": "Mock translation of 'test-adapter' to 'uk'", + "zh-cn": "Mock translation of 'test-adapter' to 'zh-cn'" + }, + "authors": [ + "Al Calzone " + ], + "keywords": [ + "template", + "automation", + "IoT", + "integration" + ], + "licenseInformation": { + "type": "free", + "license": "MIT" + }, + "platform": "Javascript/Node.js", + "icon": "test-adapter.png", + "enabled": true, + "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", + "readme": "https://github.com/AlCalzone/ioBroker.test-adapter/blob/main/README.md", + "loglevel": "info", + "tier": 3, + "mode": "daemon", + "type": "general", + "compact": true, + "connectionType": "local", + "dataSource": "push", + "adminUI": { + "config": "materialize" + }, + "dependencies": [ + { + "js-controller": ">=6.0.11" + } + ], + "globalDependencies": [ + { + "admin": ">=7.0.23" + } + ] + }, + "native": { + "option1": true, + "option2": "42" + }, + "objects": [], + "instanceObjects": [] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/package.json b/test/baselines/adapter_TS_OfficialESLint/package.json new file mode 100644 index 000000000..a4bc41e5e --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/package.json @@ -0,0 +1,67 @@ +{ + "name": "iobroker.test-adapter", + "version": "0.0.1", + "description": "test-adapter", + "author": { + "name": "Al Calzone", + "email": "al@calzo.ne" + }, + "contributors": [], + "homepage": "https://github.com/AlCalzone/ioBroker.test-adapter", + "license": "MIT", + "keywords": [ + "template", + "automation", + "IoT", + "integration" + ], + "repository": { + "type": "git", + "url": "https://github.com/AlCalzone/ioBroker.test-adapter.git" + }, + "engines": { + "node": ">= 20" + }, + "dependencies": { + "@iobroker/adapter-core": "^3.3.2" + }, + "devDependencies": { + "@iobroker/adapter-dev": "^1.5.0", + "@iobroker/eslint-config": "^2.2.0", + "@iobroker/testing": "^5.1.1", + "@tsconfig/node20": "^20.1.6", + "@types/node": "^20.19.17", + "rimraf": "^6.0.1", + "source-map-support": "^0.5.21", + "ts-node": "^10.9.2", + "typescript": "~5.9.2" + }, + "main": "build/main.js", + "files": [ + "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).{json,json5}", + "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}", + "build/", + "www/", + "io-package.json", + "LICENSE" + ], + "scripts": { + "prebuild": "rimraf build", + "build": "build-adapter ts", + "watch": "build-adapter ts --watch", + "prebuild:ts": "rimraf build", + "build:ts": "build-adapter ts", + "watch:ts": "build-adapter ts --watch", + "test:ts": "mocha --config test/mocharc.custom.json src/**/*.test.ts", + "test:package": "mocha test/package --exit", + "test:integration": "mocha test/integration --exit", + "test": "npm run test:ts && npm run test:package", + "check": "tsc --noEmit", + "lint": "eslint --ext .ts src/", + "translate": "translate-adapter" + }, + "bugs": { + "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" + }, + "readmeFilename": "README.md" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/src/lib/adapter-config.d.ts b/test/baselines/adapter_TS_OfficialESLint/src/lib/adapter-config.d.ts new file mode 100644 index 000000000..c6c8a0e2a --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/src/lib/adapter-config.d.ts @@ -0,0 +1,14 @@ +// This file extends the AdapterConfig type from "@types/iobroker" + +// Augment the globally declared type ioBroker.AdapterConfig +declare global { + namespace ioBroker { + interface AdapterConfig { + option1: boolean; + option2: string; + } + } +} + +// this is required so the above AdapterConfig is found by TypeScript / type checking +export {}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/src/main.test.ts b/test/baselines/adapter_TS_OfficialESLint/src/main.test.ts new file mode 100644 index 000000000..a8d538e95 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/src/main.test.ts @@ -0,0 +1,26 @@ +/** + * This is a dummy TypeScript test file using chai and mocha + * + * It's automatically excluded from npm and its build output is excluded from both git and npm. + * It is advised to test all your modules with accompanying *.test.ts-files + */ + +import { expect } from "chai"; +// import { functionToTest } from "./moduleToTest"; + +describe("module to test => function to test", () => { + // initializing logic + const expected = 5; + + it(`should return ${expected}`, () => { + const result = 5; + // assign result a value from functionToTest + expect(result).to.equal(expected); + // or using the should() syntax + result.should.equal(expected); + }); + // ... more tests => it + +}); + +// ... more test suites => describe diff --git a/test/baselines/adapter_TS_OfficialESLint/src/main.ts b/test/baselines/adapter_TS_OfficialESLint/src/main.ts new file mode 100644 index 000000000..d86bf77c5 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/src/main.ts @@ -0,0 +1,153 @@ +/* + * Created with @iobroker/create-adapter v2.6.5 + */ + +// The adapter-core module gives you access to the core ioBroker functions +// you need to create an adapter +import * as utils from "@iobroker/adapter-core"; + +// Load your modules here, e.g.: +// import * as fs from "fs"; + +class TestAdapter extends utils.Adapter { + + public constructor(options: Partial = {}) { + super({ + ...options, + name: "test-adapter", + }); + this.on("ready", this.onReady.bind(this)); + this.on("stateChange", this.onStateChange.bind(this)); + // this.on("objectChange", this.onObjectChange.bind(this)); + // this.on("message", this.onMessage.bind(this)); + this.on("unload", this.onUnload.bind(this)); + } + + /** + * Is called when databases are connected and adapter received configuration. + */ + private async onReady(): Promise { + // Initialize your adapter here + + // The adapters config (in the instance object everything under the attribute "native") is accessible via + // this.config: + this.log.debug("config option1: " + this.config.option1); + this.log.debug("config option2: " + this.config.option2); + + /* + For every state in the system there has to be also an object of type state + Here a simple template for a boolean variable named "testVariable" + Because every adapter instance uses its own unique namespace variable names can't collide with other adapters variables + */ + await this.setObjectNotExistsAsync("testVariable", { + type: "state", + common: { + name: "testVariable", + type: "boolean", + role: "indicator", + read: true, + write: true, + }, + native: {}, + }); + + // In order to get state updates, you need to subscribe to them. The following line adds a subscription for our variable we have created above. + this.subscribeStates("testVariable"); + // You can also add a subscription for multiple states. The following line watches all states starting with "lights." + // this.subscribeStates("lights.*"); + // Or, if you really must, you can also watch all states. Don't do this if you don't need to. Otherwise this will cause a lot of unnecessary load on the system: + // this.subscribeStates("*"); + + /* + setState examples + you will notice that each setState will cause the stateChange event to fire (because of above subscribeStates cmd) + */ + // the variable testVariable is set to true as command (ack=false) + await this.setState("testVariable", true); + + // same thing, but the value is flagged "ack" + // ack should be always set to true if the value is received from or acknowledged from the target system + await this.setState("testVariable", { val: true, ack: true }); + + // same thing, but the state is deleted after 30s (getState will return null afterwards) + await this.setState("testVariable", { val: true, ack: true, expire: 30 }); + + // examples for the checkPassword/checkGroup functions + const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); + this.log.info("check user admin pw iobroker: " + pwdResult); + + const gropupResult = await this.checkGroupAsync("admin", "admin"); + this.log.info("check group user admin group admin: " + gropupResult); + } + + /** + * Is called when adapter shuts down - callback has to be called under any circumstances! + */ + private onUnload(callback: () => void): void { + try { + // Here you must clear all timeouts or intervals that may still be active + // clearTimeout(timeout1); + // clearTimeout(timeout2); + // ... + // clearInterval(interval1); + + callback(); + } catch (_e) { + callback(); + } + } + + // If you need to react to object changes, uncomment the following block and the corresponding line in the constructor. + // You also need to subscribe to the objects with `this.subscribeObjects`, similar to `this.subscribeStates`. + // /** + // * Is called if a subscribed object changes + // */ + // private onObjectChange(id: string, obj: ioBroker.Object | null | undefined): void { + // if (obj) { + // // The object was changed + // this.log.info(`object ${id} changed: ${JSON.stringify(obj)}`); + // } else { + // // The object was deleted + // this.log.info(`object ${id} deleted`); + // } + // } + + /** + * Is called if a subscribed state changes + */ + private onStateChange(id: string, state: ioBroker.State | null | undefined): void { + if (state) { + // The state was changed + this.log.info(`state ${id} changed: ${state.val} (ack = ${state.ack})`); + } else { + // The state was deleted + this.log.info(`state ${id} deleted`); + } + } + + // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. + // /** + // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... + // * Using this method requires "common.messagebox" property to be set to true in io-package.json + // */ + // private onMessage(obj: ioBroker.Message): void { + // if (typeof obj === "object" && obj.message) { + // if (obj.command === "send") { + // // e.g. send email or pushover or whatever + // this.log.info("send command"); + + // // Send response in callback if required + // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); + // } + // } + // } + +} + +if (require.main !== module) { + // Export the constructor in compact mode + module.exports = (options: Partial | undefined) => new TestAdapter(options); +} else { + // otherwise start the instance directly + (() => new TestAdapter())(); +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/test/.eslintrc.json b/test/baselines/adapter_TS_OfficialESLint/test/.eslintrc.json new file mode 100644 index 000000000..ce6b3d62c --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/test/.eslintrc.json @@ -0,0 +1,43 @@ +{ + "root": true, + "env": { + "es6": true, + "node": true, + "mocha": true + }, + "extends": [ + "eslint:recommended" + ], + "rules": { + "indent": [ + "error", + "tab", + { + "SwitchCase": 1 + } + ], + "no-console": "off", + "no-unused-vars": [ + "error", + { + "ignoreRestSiblings": true, + "argsIgnorePattern": "^_" + } + ], + "no-var": "error", + "no-trailing-spaces": "error", + "prefer-const": "error", + "quotes": [ + "error", + "double", + { + "avoidEscape": true, + "allowTemplateLiterals": true + } + ], + "semi": [ + "error", + "always" + ] + } +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/test/integration.js b/test/baselines/adapter_TS_OfficialESLint/test/integration.js new file mode 100644 index 000000000..986936fac --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/test/integration.js @@ -0,0 +1,5 @@ +const path = require("path"); +const { tests } = require("@iobroker/testing"); + +// Run integration tests - See https://github.com/ioBroker/testing for a detailed explanation and further options +tests.integration(path.join(__dirname, "..")); \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/test/mocha.setup.js b/test/baselines/adapter_TS_OfficialESLint/test/mocha.setup.js new file mode 100644 index 000000000..b839790ff --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/test/mocha.setup.js @@ -0,0 +1,23 @@ +"use strict"; + +// Makes ts-node ignore warnings, so mocha --watch does work +process.env.TS_NODE_IGNORE_WARNINGS = "TRUE"; +// Sets the correct tsconfig for testing +process.env.TS_NODE_PROJECT = "tsconfig.json"; +// Make ts-node respect the "include" key in tsconfig.json +process.env.TS_NODE_FILES = "TRUE"; + +// Don't silently swallow unhandled rejections +process.on("unhandledRejection", (e) => { + throw e; +}); + +// enable the should interface with sinon +// and load chai-as-promised and sinon-chai by default +const sinonChai = require("sinon-chai"); +const chaiAsPromised = require("chai-as-promised"); +const { should, use } = require("chai"); + +should(); +use(sinonChai); +use(chaiAsPromised); \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/test/mocharc.custom.json b/test/baselines/adapter_TS_OfficialESLint/test/mocharc.custom.json new file mode 100644 index 000000000..851ed9cdc --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/test/mocharc.custom.json @@ -0,0 +1,10 @@ +{ + "require": [ + "test/mocha.setup.js", + "ts-node/register", + "source-map-support/register" + ], + "watch-files": [ + "src/**/*.test.ts" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/test/package.js b/test/baselines/adapter_TS_OfficialESLint/test/package.js new file mode 100644 index 000000000..3a48e0449 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/test/package.js @@ -0,0 +1,5 @@ +const path = require("path"); +const { tests } = require("@iobroker/testing"); + +// Validate the package files +tests.packageFiles(path.join(__dirname, "..")); diff --git a/test/baselines/adapter_TS_OfficialESLint/test/tsconfig.json b/test/baselines/adapter_TS_OfficialESLint/test/tsconfig.json new file mode 100644 index 000000000..3ebc81b65 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/test/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "noImplicitAny": false + }, + "include": [ + "./**/*.js" + ] +} diff --git a/test/baselines/adapter_TS_OfficialESLint/tsconfig.build.json b/test/baselines/adapter_TS_OfficialESLint/tsconfig.build.json new file mode 100644 index 000000000..1f040ce18 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/tsconfig.build.json @@ -0,0 +1,16 @@ +// Specialized tsconfig to only compile .ts-files in the src dir +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "allowJs": false, + "checkJs": false, + "noEmit": false, + "declaration": false + }, + "include": [ + "src/**/*.ts" + ], + "exclude": [ + "src/**/*.test.ts" + ] +} diff --git a/test/baselines/adapter_TS_OfficialESLint/tsconfig.json b/test/baselines/adapter_TS_OfficialESLint/tsconfig.json new file mode 100644 index 000000000..4c80d776d --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/tsconfig.json @@ -0,0 +1,46 @@ +// Root tsconfig to set the settings and power editor support for all TS files +{ + // To update the compilation target, install a different version of @tsconfig/node... and reference it here + // https://github.com/tsconfig/bases#node-20-tsconfigjson + "extends": "@tsconfig/node20/tsconfig.json", + "compilerOptions": { + // do not compile anything, this file is just to configure type checking + // the compilation is configured in tsconfig.build.json + "noEmit": true, + + // check JS files, but do not compile them => tsconfig.build.json + "allowJs": true, + "checkJs": true, + + "noEmitOnError": true, + "outDir": "./build/", + "removeComments": false, + + // This is necessary for the automatic typing of the adapter config + "resolveJsonModule": true, + + // If you want to disable the stricter type checks (not recommended), uncomment the following line + // "strict": false, + // And enable some of those features for more fine-grained control + // "strictNullChecks": true, + // "strictPropertyInitialization": true, + // "strictBindCallApply": true, + // "noImplicitAny": true, + // "noUnusedLocals": true, + // "noUnusedParameters": true, + // Uncomment this if you want the old behavior of catch variables being `any` + // "useUnknownInCatchVariables": false, + + "sourceMap": true, + "inlineSourceMap": false + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "exclude": [ + "build/**", + "node_modules/**", + "widgets/**" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React/.create-adapter.json b/test/baselines/adapter_TS_React/.create-adapter.json index 06eebdce3..f3b7379bd 100644 --- a/test/baselines/adapter_TS_React/.create-adapter.json +++ b/test/baselines/adapter_TS_React/.create-adapter.json @@ -19,6 +19,7 @@ "tools": [ "ESLint" ], + "eslintConfig": "custom", "indentation": "Tab", "quotes": "double", "authorName": "Al Calzone", diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.create-adapter.json b/test/baselines/adapter_TS_React_OfficialESLint/.create-adapter.json new file mode 100644 index 000000000..9d32bec48 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.create-adapter.json @@ -0,0 +1,38 @@ +{ + "cli": true, + "target": "directory", + "adapterName": "test-adapter", + "title": "Is used to test the creator", + "startMode": "daemon", + "features": [ + "adapter" + ], + "connectionIndicator": "no", + "connectionType": "local", + "dataSource": "push", + "adminFeatures": [], + "type": "general", + "language": "TypeScript", + "adminUi": "react", + "tabReact": "no", + "releaseScript": "no", + "tools": [ + "ESLint" + ], + "eslintConfig": "official", + "indentation": "Tab", + "quotes": "double", + "authorName": "Al Calzone", + "authorGithub": "AlCalzone", + "authorEmail": "al@calzo.ne", + "gitRemoteProtocol": "HTTPS", + "dependabot": "yes", + "gitCommit": "no", + "defaultBranch": "main", + "license": "MIT License", + "licenseInformation": { + "type": "free", + "license": "MIT" + }, + "creatorVersion": "2.6.5" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.eslintignore b/test/baselines/adapter_TS_React_OfficialESLint/.eslintignore new file mode 100644 index 000000000..0e24f5220 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.eslintignore @@ -0,0 +1,4 @@ +admin/build/ +build/ +**/.eslintrc.js +admin/words.js \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.eslintrc.js b/test/baselines/adapter_TS_React_OfficialESLint/.eslintrc.js new file mode 100644 index 000000000..156aa6369 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.eslintrc.js @@ -0,0 +1,3 @@ +module.exports = { + extends: ["@iobroker", "@iobroker/react"], +}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md b/test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..895613958 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,32 @@ +--- +name: Bug report +about: Something is not working as it should +title: '' +labels: '' +assignees: '' +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '...' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots & Logfiles** +If applicable, add screenshots and logfiles to help explain your problem. + +**Versions:** + - Adapter version: + - JS-Controller version: + - Node version: + - Operating system: + +**Additional context** +Add any other context about the problem here. diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml b/test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..d7cfe5940 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: ioBroker Community + url: https://forum.iobroker.net/ + about: Please ask and answer questions here. \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.github/auto-merge.yml b/test/baselines/adapter_TS_React_OfficialESLint/.github/auto-merge.yml new file mode 100644 index 000000000..4f6d185f0 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.github/auto-merge.yml @@ -0,0 +1,17 @@ +# Configure here which dependency updates should be merged automatically. +# The recommended configuration is the following: +- match: + # Only merge patches for production dependencies + dependency_type: production + update_type: "semver:patch" +- match: + # Except for security fixes, here we allow minor patches + dependency_type: production + update_type: "security:minor" +- match: + # and development dependencies can have a minor update, too + dependency_type: development + update_type: "semver:minor" + +# The syntax is based on the legacy dependabot v1 automerged_updates syntax, see: +# https://dependabot.com/docs/config-file/#automerged_updates diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.github/dependabot.yml b/test/baselines/adapter_TS_React_OfficialESLint/.github/dependabot.yml new file mode 100644 index 000000000..c165a6a47 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.github/dependabot.yml @@ -0,0 +1,22 @@ +version: 2 +updates: + - package-ecosystem: npm + directory: "/" + schedule: + interval: monthly + time: "04:00" + timezone: Europe/Berlin + open-pull-requests-limit: 5 + assignees: + - AlCalzone + versioning-strategy: increase + + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: monthly + time: "04:00" + timezone: Europe/Berlin + open-pull-requests-limit: 5 + assignees: + - AlCalzone diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/dependabot-auto-merge.yml b/test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/dependabot-auto-merge.yml new file mode 100644 index 000000000..baeae23b5 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/dependabot-auto-merge.yml @@ -0,0 +1,27 @@ +# Automatically merge Dependabot PRs when version comparison is within the range +# that is configured in .github/auto-merge.yml + +name: Auto-Merge Dependabot PRs + +on: + # WARNING: This needs to be run in the PR base, DO NOT build untrusted code in this action + # details under https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/ + pull_request_target: + +jobs: + auto-merge: + if: github.actor == 'dependabot[bot]' + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Check if PR should be auto-merged + uses: ahmadnassri/action-dependabot-auto-merge@v2 + with: + # In order to use this, you need to go to https://github.com/settings/tokens and + # create a Personal Access Token with the permission "public_repo". + # Enter this token in your repository settings under "Secrets" and name it AUTO_MERGE_TOKEN + github-token: ${{ secrets.AUTO_MERGE_TOKEN }} + # By default, squash and merge, so Github chooses nice commit messages + command: squash and merge diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/test-and-release.yml b/test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/test-and-release.yml new file mode 100644 index 000000000..c6cf66c79 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/test-and-release.yml @@ -0,0 +1,96 @@ +name: Test and Release + +# Run this job on all pushes and pull requests +# as well as tags with a semantic version +on: + push: + branches: + - "main" + tags: + # normal versions + - "v[0-9]+.[0-9]+.[0-9]+" + # pre-releases + - "v[0-9]+.[0-9]+.[0-9]+-**" + pull_request: {} + +# Cancel previous PR/branch runs when a new commit is pushed +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true + +jobs: + # Performs quick checks before the expensive test runs + check-and-lint: + if: contains(github.event.head_commit.message, '[skip ci]') == false + + runs-on: ubuntu-latest + + steps: + - uses: ioBroker/testing-action-check@v1 + with: + node-version: '20.x' + # Uncomment the following line if your adapter cannot be installed using 'npm ci' + # install-command: 'npm install' + type-checking: true + lint: true + + # Runs adapter tests on all supported node versions and OSes + adapter-tests: + if: contains(github.event.head_commit.message, '[skip ci]') == false + + runs-on: ${{ matrix.os }} + strategy: + matrix: + node-version: [20.x, 22.x, 24.x] + os: [ubuntu-latest, windows-latest, macos-latest] + + steps: + - uses: ioBroker/testing-action-adapter@v1 + with: + node-version: ${{ matrix.node-version }} + os: ${{ matrix.os }} + # Uncomment the following line if your adapter cannot be installed using 'npm ci' + # install-command: 'npm install' + build: true + +# TODO: To enable automatic npm releases, create a token on npmjs.org +# Enter this token as a GitHub secret (with name NPM_TOKEN) in the repository options +# Then uncomment the following block: + +# # Deploys the final package to NPM +# deploy: +# needs: [check-and-lint, adapter-tests] +# +# # Trigger this step only when a commit on any branch is tagged with a version number +# if: | +# contains(github.event.head_commit.message, '[skip ci]') == false && +# github.event_name == 'push' && +# startsWith(github.ref, 'refs/tags/v') +# +# runs-on: ubuntu-latest +# +# # Write permissions are required to create Github releases +# permissions: +# contents: write +# +# steps: +# - uses: ioBroker/testing-action-deploy@v1 +# with: +# node-version: '20.x' +# # Uncomment the following line if your adapter cannot be installed using 'npm ci' +# # install-command: 'npm install' +# build: true +# npm-token: ${{ secrets.NPM_TOKEN }} +# github-token: ${{ secrets.GITHUB_TOKEN }} +# +# # When using Sentry for error reporting, Sentry can be informed about new releases +# # To enable create a API-Token in Sentry (User settings, API keys) +# # Enter this token as a GitHub secret (with name SENTRY_AUTH_TOKEN) in the repository options +# # Then uncomment and customize the following block: +# sentry: true +# sentry-token: ${{ secrets.SENTRY_AUTH_TOKEN }} +# sentry-project: "iobroker-test-adapter" +# sentry-version-prefix: "iobroker.test-adapter" +# sentry-sourcemap-paths: "build/ admin/build/" +# # If your sentry project is linked to a GitHub repository, you can enable the following option +# # sentry-github-integration: true diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.gitignore b/test/baselines/adapter_TS_React_OfficialESLint/.gitignore new file mode 100644 index 000000000..80c28aa9d --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.gitignore @@ -0,0 +1,18 @@ +# No dot-directories except github/vscode +.*/ +!.vscode/ +!.github/ + +*.code-workspace +node_modules +nbproject + +# npm package files +iobroker.*.tgz + +Thumbs.db +.commitinfo + +# i18n intermediate files +admin/i18n/flat.txt +admin/i18n/*/flat.txt \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.vscode/extensions.json b/test/baselines/adapter_TS_React_OfficialESLint/.vscode/extensions.json new file mode 100644 index 000000000..2c6ac5b31 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.vscode/extensions.json @@ -0,0 +1,6 @@ +{ + "recommendations": [ + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.vscode/settings.json b/test/baselines/adapter_TS_React_OfficialESLint/.vscode/settings.json new file mode 100644 index 000000000..854736cc0 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.vscode/settings.json @@ -0,0 +1,23 @@ +{ + "typescript.tsdk": "node_modules/typescript/lib", + "eslint.enable": true, + "json.schemas": [ + { + "fileMatch": [ + "io-package.json" + ], + "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.js-controller/master/schemas/io-package.json" + }, + { + "fileMatch": [ + "admin/jsonConfig.json", + "admin/jsonConfig.json5", + "admin/jsonCustom.json", + "admin/jsonCustom.json5", + "admin/jsonTab.json", + "admin/jsonTab.json5" + ], + "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.admin/master/packages/jsonConfig/schemas/jsonConfig.json" + } + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/LICENSE b/test/baselines/adapter_TS_React_OfficialESLint/LICENSE new file mode 100644 index 000000000..27c9a624d --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2025 Al Calzone + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/test/baselines/adapter_TS_React_OfficialESLint/README.md b/test/baselines/adapter_TS_React_OfficialESLint/README.md new file mode 100644 index 000000000..4d66eab99 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/README.md @@ -0,0 +1,136 @@ +![Logo](admin/test-adapter.png) +# ioBroker.test-adapter + +[![NPM version](https://img.shields.io/npm/v/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) +[![Downloads](https://img.shields.io/npm/dm/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) +![Number of Installations](https://iobroker.live/badges/test-adapter-installed.svg) +![Current version in stable repository](https://iobroker.live/badges/test-adapter-stable.svg) + +[![NPM](https://nodei.co/npm/iobroker.test-adapter.png?downloads=true)](https://nodei.co/npm/iobroker.test-adapter/) + +**Tests:** ![Test and Release](https://github.com/AlCalzone/ioBroker.test-adapter/workflows/Test%20and%20Release/badge.svg) + +## test-adapter adapter for ioBroker + +Describe your project here + +## Developer manual +This section is intended for the developer. It can be deleted later. + +### DISCLAIMER + +Please make sure that you consider copyrights and trademarks when you use names or logos of a company and add a disclaimer to your README. +You can check other adapters for examples or ask in the developer community. Using a name or logo of a company without permission may cause legal problems for you. + +### Getting started + +You are almost done, only a few steps left: +1. Create a new repository on GitHub with the name `ioBroker.test-adapter` +1. Initialize the current folder as a new git repository: + ```bash + git init -b main + git add . + git commit -m "Initial commit" + ``` +1. Link your local repository with the one on GitHub: + ```bash + git remote add origin https://github.com/AlCalzone/ioBroker.test-adapter + ``` + +1. Push all files to the GitHub repo: + ```bash + git push origin main + ``` +1. Add a new secret under https://github.com/AlCalzone/ioBroker.test-adapter/settings/secrets. It must be named `AUTO_MERGE_TOKEN` and contain a personal access token with push access to the repository, e.g. yours. You can create a new token under https://github.com/settings/tokens. + +1. Head over to [src/main.ts](src/main.ts) and start programming! + +### Best Practices +We've collected some [best practices](https://github.com/ioBroker/ioBroker.repositories#development-and-coding-best-practices) regarding ioBroker development and coding in general. If you're new to ioBroker or Node.js, you should +check them out. If you're already experienced, you should also take a look at them - you might learn something new :) + +### Scripts in `package.json` +Several npm scripts are predefined for your convenience. You can run them using `npm run ` +| Script name | Description | +|-------------|-------------| +| `build` | Compile the TypeScript and React sources. | +| `watch` | Compile the TypeScript and React sources and watch for changes. | +| `build:ts` | Compile the TypeScript sources. | +| `watch:ts` | Compile the TypeScript sources and watch for changes. | +| `build:react` | Compile the React sources. | +| `watch:react` | Compile the React sources and watch for changes. | +| `test:ts` | Executes the tests you defined in `*.test.ts` files. | +| `test:package` | Ensures your `package.json` and `io-package.json` are valid. | +| `test:integration` | Tests the adapter startup with an actual instance of ioBroker. | +| `test` | Performs a minimal test run on package files and your tests. | +| `check` | Performs a type-check on your code (without compiling anything). | +| `lint` | Runs `ESLint` to check your code for formatting errors and potential bugs. | +| `translate` | Translates texts in your adapter to all required languages, see [`@iobroker/adapter-dev`](https://github.com/ioBroker/adapter-dev#manage-translations) for more details. | + +### Configuring the compilation +The adapter template uses [esbuild](https://esbuild.github.io/) to compile TypeScript and/or React code. You can configure many compilation settings +either in `tsconfig.json` or by changing options for the build tasks. These options are described in detail in the +[`@iobroker/adapter-dev` documentation](https://github.com/ioBroker/adapter-dev#compile-adapter-files). + +### Writing tests +When done right, testing code is invaluable, because it gives you the +confidence to change your code while knowing exactly if and when +something breaks. A good read on the topic of test-driven development +is https://hackernoon.com/introduction-to-test-driven-development-tdd-61a13bc92d92. +Although writing tests before the code might seem strange at first, but it has very +clear upsides. + +The template provides you with basic tests for the adapter startup and package files. +It is recommended that you add your own tests into the mix. + +### Publishing the adapter +Using GitHub Actions, you can enable automatic releases on npm whenever you push a new git tag that matches the form +`v..`. We **strongly recommend** that you do. The necessary steps are described in `.github/workflows/test-and-release.yml`. + +To get your adapter released in ioBroker, please refer to the documentation +of [ioBroker.repositories](https://github.com/ioBroker/ioBroker.repositories#requirements-for-adapter-to-get-added-to-the-latest-repository). + +### Test the adapter manually on a local ioBroker installation +In order to install the adapter locally without publishing, the following steps are recommended: +1. Create a tarball from your dev directory: + ```bash + npm pack + ``` +1. Upload the resulting file to your ioBroker host +1. Install it locally (The paths are different on Windows): + ```bash + cd /opt/iobroker + npm i /path/to/tarball.tgz + ``` + +For later updates, the above procedure is not necessary. Just do the following: +1. Overwrite the changed files in the adapter directory (`/opt/iobroker/node_modules/iobroker.test-adapter`) +1. Execute `iobroker upload test-adapter` on the ioBroker host + +## Changelog + +### 0.0.1 +* (Al Calzone) initial release + +## License +MIT License + +Copyright (c) 2025 Al Calzone + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/__meta__/npm_package_files.txt b/test/baselines/adapter_TS_React_OfficialESLint/__meta__/npm_package_files.txt new file mode 100644 index 000000000..49c3dedbb --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/__meta__/npm_package_files.txt @@ -0,0 +1,7 @@ +admin/index_m.html +admin/style.css +admin/test-adapter.png +io-package.json +LICENSE +package.json +README.md \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/index_m.html b/test/baselines/adapter_TS_React_OfficialESLint/admin/index_m.html new file mode 100644 index 000000000..c1e5ff148 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/index_m.html @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + +
+ + + + + + + \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/app.tsx b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/app.tsx new file mode 100644 index 000000000..b4f93806a --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/app.tsx @@ -0,0 +1,55 @@ +import React from "react"; +import { Theme, withStyles } from "@material-ui/core/styles"; + +import GenericApp from "@iobroker/adapter-react/GenericApp"; +import Settings from "./components/settings"; +import { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; +import { StyleRules } from "@material-ui/core/styles"; + +const styles = (_theme: Theme): StyleRules => ({ + root: {}, +}); + +class App extends GenericApp { + constructor(props: GenericAppProps) { + const extendedProps: GenericAppSettings = { + ...props, + encryptedFields: [], + translations: { + "en": require("./i18n/en.json"), + "de": require("./i18n/de.json"), + "ru": require("./i18n/ru.json"), + "pt": require("./i18n/pt.json"), + "nl": require("./i18n/nl.json"), + "fr": require("./i18n/fr.json"), + "it": require("./i18n/it.json"), + "es": require("./i18n/es.json"), + "pl": require("./i18n/pl.json"), + "uk": require("./i18n/uk.json"), + "zh-cn": require("./i18n/zh-cn.json"), + }, + }; + super(props, extendedProps); + } + + onConnectionReady(): void { + // executed when connection is ready + } + + render() { + if (!this.state.loaded) { + return super.render(); + } + + return ( +
+ this.updateNativeValue(attr, value)} /> + {this.renderError()} + {this.renderToast()} + {this.renderSaveCloseButtons()} +
+ ); + } +} + +export default withStyles(styles)(App); \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/components/settings.tsx b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/components/settings.tsx new file mode 100644 index 000000000..a504b063a --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/components/settings.tsx @@ -0,0 +1,139 @@ +import React from "react"; +import { withStyles } from "@material-ui/core/styles"; +import { CreateCSSProperties } from "@material-ui/core/styles/withStyles"; +import TextField from "@material-ui/core/TextField"; +import Input from "@material-ui/core/Input"; +import FormHelperText from "@material-ui/core/FormHelperText"; +import FormControl from "@material-ui/core/FormControl"; +import Select from "@material-ui/core/Select"; +import MenuItem from "@material-ui/core/MenuItem"; +import FormControlLabel from "@material-ui/core/FormControlLabel"; +import Checkbox from "@material-ui/core/Checkbox"; +import I18n from "@iobroker/adapter-react/i18n"; + +const styles = (): Record => ({ + input: { + marginTop: 0, + minWidth: 400, + }, + button: { + marginRight: 20, + }, + card: { + maxWidth: 345, + textAlign: "center", + }, + media: { + height: 180, + }, + column: { + display: "inline-block", + verticalAlign: "top", + marginRight: 20, + }, + columnLogo: { + width: 350, + marginRight: 0, + }, + columnSettings: { + width: "calc(100% - 370px)", + }, + controlElement: { + //background: "#d2d2d2", + marginBottom: 5, + }, +}); + +interface SettingsProps { + classes: Record; + native: Record; + + onChange: (attr: string, value: any) => void; +} + +interface SettingsState { + // add your state properties here + dummy?: undefined; +} + +class Settings extends React.Component { + constructor(props: SettingsProps) { + super(props); + this.state = {}; + } + + renderInput(title: AdminWord, attr: string, type: string) { + return ( + this.props.onChange(attr, e.target.value)} + margin="normal" + /> + ); + } + + renderSelect( + title: AdminWord, + attr: string, + options: { value: string; title: AdminWord }[], + style?: React.CSSProperties, + ) { + return ( + + } + > + {options.map((item) => ( + + {I18n.t(item.title)} + + ))} + + {I18n.t(title)} + + ); + } + + renderCheckbox(title: AdminWord, attr: string, style?: React.CSSProperties) { + return ( + this.props.onChange(attr, !this.props.native[attr])} + color="primary" + /> + } + label={I18n.t(title)} + /> + ); + } + + render() { + return ( +
+ {this.renderCheckbox("option1", "option1")}
+ {this.renderInput("option2", "option2", "text")} +
+ ); + } +} + +export default withStyles(styles)(Settings); \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/de.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/de.json new file mode 100644 index 000000000..d5cb3c428 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/de.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "Adaptereinstellungen für test-adapter", + "option1": "Mock translation of 'option1' to 'de'", + "option2": "Mock translation of 'option2' to 'de'" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/en.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/en.json new file mode 100644 index 000000000..f8c9603af --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/en.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "Adapter settings for test-adapter", + "option1": "option1", + "option2": "option2" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/es.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/es.json new file mode 100644 index 000000000..2b0e2d150 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/es.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "Ajustes del adaptador para test-adapter", + "option1": "Mock translation of 'option1' to 'es'", + "option2": "Mock translation of 'option2' to 'es'" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/fr.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/fr.json new file mode 100644 index 000000000..50f364d83 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/fr.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "Paramètres d'adaptateur pour test-adapter", + "option1": "Mock translation of 'option1' to 'fr'", + "option2": "Mock translation of 'option2' to 'fr'" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/i18n.d.ts b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/i18n.d.ts new file mode 100644 index 000000000..f4a769e59 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/i18n.d.ts @@ -0,0 +1,26 @@ +/* + * This file loads the translations keys from `i18n/en.json` file and overrides + * the declarations for the translate function `I18n.t` available in "@iobroker/adapter-react/i18n". + * Using these definitions it is ensured that all used translations in the React + * context are defined at least in the english translations file. + * This will add no overhead in the generated code since it just reexports the + * I18n class but with a more typed `t` function. + */ + +/* + * DO NOT add any imports or exports in this file or it will stop working! + */ + +/** + * Available words in `i18n/en.json`. + */ +declare type AdminWord = keyof typeof import("./en.json"); + +declare module "@iobroker/adapter-react/i18n" { + /** + * Translate the given string to the selected language. + * @param word The (key) word to look up the string. Has to be defined at least in `i18n/en.json`. + * @param args Optional arguments which will replace the first (second, third, ...) occurence of %s + */ + function t(word: AdminWord, ...args: string[]): string; +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/it.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/it.json new file mode 100644 index 000000000..67ef9c4dc --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/it.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "Impostazioni dell'adattatore per test-adapter", + "option1": "Mock translation of 'option1' to 'it'", + "option2": "Mock translation of 'option2' to 'it'" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/nl.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/nl.json new file mode 100644 index 000000000..d7c9cdc17 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/nl.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "Adapterinstellingen voor test-adapter", + "option1": "Mock translation of 'option1' to 'nl'", + "option2": "Mock translation of 'option2' to 'nl'" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pl.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pl.json new file mode 100644 index 000000000..24e733a7d --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pl.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "Ustawienia adaptera dla test-adapter", + "option1": "Mock translation of 'option1' to 'pl'", + "option2": "Mock translation of 'option2' to 'pl'" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pt.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pt.json new file mode 100644 index 000000000..7ad3e244b --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pt.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "Configurações do adaptador para test-adapter", + "option1": "Mock translation of 'option1' to 'pt'", + "option2": "Mock translation of 'option2' to 'pt'" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/ru.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/ru.json new file mode 100644 index 000000000..a41d670f5 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/ru.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "Настройки адаптера для test-adapter", + "option1": "Mock translation of 'option1' to 'ru'", + "option2": "Mock translation of 'option2' to 'ru'" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/uk.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/uk.json new file mode 100644 index 000000000..6a8dc5022 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/uk.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "Налаштування адаптера для test-adapter", + "option1": "Mock translation of 'option1' to 'uk'", + "option2": "Mock translation of 'option2' to 'uk'" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/zh-cn.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/zh-cn.json new file mode 100644 index 000000000..c4ee1d90d --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/zh-cn.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "test-adapter的适配器设置", + "option1": "Mock translation of 'option1' to 'zh-cn'", + "option2": "Mock translation of 'option2' to 'zh-cn'" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/index.tsx b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/index.tsx new file mode 100644 index 000000000..e114005c8 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/index.tsx @@ -0,0 +1,25 @@ +import React from "react"; +import ReactDOM from "react-dom"; +import { MuiThemeProvider } from "@material-ui/core/styles"; +import theme from "@iobroker/adapter-react/Theme"; +import Utils from "@iobroker/adapter-react/Components/Utils"; +import App from "./app"; + +let themeName = Utils.getThemeName(); + +function build(): void { + ReactDOM.render( + + { + themeName = _theme; + build(); + }} + /> + , + document.getElementById("root"), + ); +} + +build(); \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/style.css b/test/baselines/adapter_TS_React_OfficialESLint/admin/style.css new file mode 100644 index 000000000..57d4549ee --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/style.css @@ -0,0 +1,32 @@ +/* You can delete those if you want. I just found them very helpful */ +* { + box-sizing: border-box +} +.m { + /* Don't cut off dropdowns! */ + overflow: initial; +} +.m.adapter-container, +.m.adapter-container > div.App { + /* Fix layout/scrolling issues with tabs */ + height: 100%; + width: 100%; + position: relative; +} +.m .select-wrapper + label { + /* The positioning for dropdown labels is messed up */ + transform: none !important; +} + +label > i[title] { + /* Display the help cursor for the tooltip icons and fix their positioning */ + cursor: help; + margin-left: 0.25em; +} + +.dropdown-content { + /* Don't wrap text in dropdowns */ + white-space: nowrap; +} + +/* Add your styles here */ diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/test-adapter.png b/test/baselines/adapter_TS_React_OfficialESLint/admin/test-adapter.png new file mode 100644 index 0000000000000000000000000000000000000000..094ebd97c36dbe2386a63dbce290c9ad6a148079 GIT binary patch literal 62376 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%0DGz6 zyl7fq5kK_OTB5a+j%#*OqHtMgmMFAPfM%z1y`n*X-04|c~XNtbq*59PL zf2GK(^`44LhR@%s*209os!^-XK1;F{M*IZtESo=}65To~n+-bu0+>z?fZnkVoW}$_ zstfB}2u}&7L#c0_Qg^2;} z@gmc!u&D{a-Sk8a)1*Chcx+8~_M64opd2kxtHB|6*!4W&cOrWX;Yw>1GmvfN@nFO$k&$he)RKxo(&m zmF!n>4Y$>igYg0$%*vf6XAlg%u=W>lZr*&`_JyS?Qqf|(d#rIqm-Q+bvDD6`E^Yg! zCA@nJ@*O;Lp9NU-Q#KY#ME2A^kx^vHZXmc#(4jcbti!v_B%%%N@|q{z#cN2rxd7uE zDS;G&(m*%4MYSXuokFeyQS{I{6O4v&@v{hDbb4J?0ftY(dI z%St%e+#=VPIyA5VF9`5)D3bY&tL9gpe{Xha)$de%8pXLvHB( zu+0=Wc6d1^KBxb%4tv#uqG^B_>&ZHIJQN>7!}krzA!iGj%=dq0lHKGFRI$Ah-NT8N RBrxDlMnX}%QuJ%k{{yPv^Xvcs literal 0 HcmV?d00001 diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/tsconfig.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/tsconfig.json new file mode 100644 index 000000000..755c6ca7c --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/tsconfig.json @@ -0,0 +1,26 @@ +// Specialized tsconfig for the admin directory, +// includes DOM typings and configures the admin build +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "noEmit": false, + "outDir": "./build", + "sourceMap": true, + "sourceRoot": "./src", + "noImplicitAny": false, + "lib": [ + "es2018", + "DOM" + ], + "jsx": "react" + }, + "include": [ + "./**/*.ts", + "./**/*.tsx", + "../src/lib/adapter-config.d.ts" + ], + "exclude": [ + "./**/*.test.ts", + "./**/*.test.tsx" + ] +} diff --git a/test/baselines/adapter_TS_React_OfficialESLint/io-package.json b/test/baselines/adapter_TS_React_OfficialESLint/io-package.json new file mode 100644 index 000000000..98973e67d --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/io-package.json @@ -0,0 +1,92 @@ +{ + "common": { + "name": "test-adapter", + "version": "0.0.1", + "news": { + "0.0.1": { + "en": "initial release", + "de": "Erstveröffentlichung", + "ru": "Начальная версия", + "pt": "lançamento inicial", + "nl": "Eerste uitgave", + "fr": "Première version", + "it": "Versione iniziale", + "es": "Versión inicial", + "pl": "Pierwsze wydanie", + "uk": "Початкова версія", + "zh-cn": "首次出版" + } + }, + "titleLang": { + "en": "Is used to test the creator", + "de": "Mock translation of 'Is used to test the creator' to 'de'", + "ru": "Mock translation of 'Is used to test the creator' to 'ru'", + "pt": "Mock translation of 'Is used to test the creator' to 'pt'", + "nl": "Mock translation of 'Is used to test the creator' to 'nl'", + "fr": "Mock translation of 'Is used to test the creator' to 'fr'", + "it": "Mock translation of 'Is used to test the creator' to 'it'", + "es": "Mock translation of 'Is used to test the creator' to 'es'", + "pl": "Mock translation of 'Is used to test the creator' to 'pl'", + "uk": "Mock translation of 'Is used to test the creator' to 'uk'", + "zh-cn": "Mock translation of 'Is used to test the creator' to 'zh-cn'" + }, + "desc": { + "en": "test-adapter", + "de": "Mock translation of 'test-adapter' to 'de'", + "ru": "Mock translation of 'test-adapter' to 'ru'", + "pt": "Mock translation of 'test-adapter' to 'pt'", + "nl": "Mock translation of 'test-adapter' to 'nl'", + "fr": "Mock translation of 'test-adapter' to 'fr'", + "it": "Mock translation of 'test-adapter' to 'it'", + "es": "Mock translation of 'test-adapter' to 'es'", + "pl": "Mock translation of 'test-adapter' to 'pl'", + "uk": "Mock translation of 'test-adapter' to 'uk'", + "zh-cn": "Mock translation of 'test-adapter' to 'zh-cn'" + }, + "authors": [ + "Al Calzone " + ], + "keywords": [ + "template", + "automation", + "IoT", + "integration" + ], + "licenseInformation": { + "type": "free", + "license": "MIT" + }, + "platform": "Javascript/Node.js", + "icon": "test-adapter.png", + "enabled": true, + "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", + "readme": "https://github.com/AlCalzone/ioBroker.test-adapter/blob/main/README.md", + "loglevel": "info", + "tier": 3, + "mode": "daemon", + "type": "general", + "compact": true, + "connectionType": "local", + "dataSource": "push", + "adminUI": { + "config": "materialize" + }, + "eraseOnUpload": true, + "dependencies": [ + { + "js-controller": ">=6.0.11" + } + ], + "globalDependencies": [ + { + "admin": ">=7.0.23" + } + ] + }, + "native": { + "option1": true, + "option2": "42" + }, + "objects": [], + "instanceObjects": [] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/package.json b/test/baselines/adapter_TS_React_OfficialESLint/package.json new file mode 100644 index 000000000..83bf3e54e --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/package.json @@ -0,0 +1,77 @@ +{ + "name": "iobroker.test-adapter", + "version": "0.0.1", + "description": "test-adapter", + "author": { + "name": "Al Calzone", + "email": "al@calzo.ne" + }, + "contributors": [], + "homepage": "https://github.com/AlCalzone/ioBroker.test-adapter", + "license": "MIT", + "keywords": [ + "template", + "automation", + "IoT", + "integration" + ], + "repository": { + "type": "git", + "url": "https://github.com/AlCalzone/ioBroker.test-adapter.git" + }, + "engines": { + "node": ">= 20" + }, + "dependencies": { + "@iobroker/adapter-core": "^3.3.2" + }, + "devDependencies": { + "@iobroker/adapter-dev": "^1.5.0", + "@iobroker/adapter-react": "2.0.22", + "@iobroker/eslint-config": "^2.2.0", + "@iobroker/testing": "^5.1.1", + "@material-ui/core": "^4.12.4", + "@tsconfig/node20": "^20.1.6", + "@types/node": "^20.19.17", + "@types/react-dom": "^17.0.26", + "@types/react": "^17.0.88", + "react-dom": "^17.0.2", + "react": "^17.0.2", + "rimraf": "^6.0.1", + "source-map-support": "^0.5.21", + "ts-node": "^10.9.2", + "typescript": "~5.9.2" + }, + "main": "build/main.js", + "files": [ + "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).{json,json5}", + "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}", + "admin/build/", + "build/", + "www/", + "io-package.json", + "LICENSE" + ], + "scripts": { + "prebuild": "rimraf build admin/build", + "build": "build-adapter all", + "watch": "build-adapter all --watch", + "prebuild:ts": "rimraf build", + "build:ts": "build-adapter ts", + "watch:ts": "build-adapter ts --watch", + "prebuild:react": "rimraf admin/build", + "build:react": "build-adapter react", + "watch:react": "build-adapter react --watch", + "test:ts": "mocha --config test/mocharc.custom.json src/**/*.test.ts", + "test:package": "mocha test/package --exit", + "test:integration": "mocha test/integration --exit", + "test": "npm run test:ts && npm run test:package", + "check": "tsc --noEmit && tsc --noEmit -p admin/tsconfig.json", + "lint": "eslint --ext .ts,.tsx src/ admin/src/", + "translate": "translate-adapter" + }, + "bugs": { + "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" + }, + "readmeFilename": "README.md" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/src/lib/adapter-config.d.ts b/test/baselines/adapter_TS_React_OfficialESLint/src/lib/adapter-config.d.ts new file mode 100644 index 000000000..c6c8a0e2a --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/src/lib/adapter-config.d.ts @@ -0,0 +1,14 @@ +// This file extends the AdapterConfig type from "@types/iobroker" + +// Augment the globally declared type ioBroker.AdapterConfig +declare global { + namespace ioBroker { + interface AdapterConfig { + option1: boolean; + option2: string; + } + } +} + +// this is required so the above AdapterConfig is found by TypeScript / type checking +export {}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/src/main.test.ts b/test/baselines/adapter_TS_React_OfficialESLint/src/main.test.ts new file mode 100644 index 000000000..a8d538e95 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/src/main.test.ts @@ -0,0 +1,26 @@ +/** + * This is a dummy TypeScript test file using chai and mocha + * + * It's automatically excluded from npm and its build output is excluded from both git and npm. + * It is advised to test all your modules with accompanying *.test.ts-files + */ + +import { expect } from "chai"; +// import { functionToTest } from "./moduleToTest"; + +describe("module to test => function to test", () => { + // initializing logic + const expected = 5; + + it(`should return ${expected}`, () => { + const result = 5; + // assign result a value from functionToTest + expect(result).to.equal(expected); + // or using the should() syntax + result.should.equal(expected); + }); + // ... more tests => it + +}); + +// ... more test suites => describe diff --git a/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts b/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts new file mode 100644 index 000000000..d86bf77c5 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts @@ -0,0 +1,153 @@ +/* + * Created with @iobroker/create-adapter v2.6.5 + */ + +// The adapter-core module gives you access to the core ioBroker functions +// you need to create an adapter +import * as utils from "@iobroker/adapter-core"; + +// Load your modules here, e.g.: +// import * as fs from "fs"; + +class TestAdapter extends utils.Adapter { + + public constructor(options: Partial = {}) { + super({ + ...options, + name: "test-adapter", + }); + this.on("ready", this.onReady.bind(this)); + this.on("stateChange", this.onStateChange.bind(this)); + // this.on("objectChange", this.onObjectChange.bind(this)); + // this.on("message", this.onMessage.bind(this)); + this.on("unload", this.onUnload.bind(this)); + } + + /** + * Is called when databases are connected and adapter received configuration. + */ + private async onReady(): Promise { + // Initialize your adapter here + + // The adapters config (in the instance object everything under the attribute "native") is accessible via + // this.config: + this.log.debug("config option1: " + this.config.option1); + this.log.debug("config option2: " + this.config.option2); + + /* + For every state in the system there has to be also an object of type state + Here a simple template for a boolean variable named "testVariable" + Because every adapter instance uses its own unique namespace variable names can't collide with other adapters variables + */ + await this.setObjectNotExistsAsync("testVariable", { + type: "state", + common: { + name: "testVariable", + type: "boolean", + role: "indicator", + read: true, + write: true, + }, + native: {}, + }); + + // In order to get state updates, you need to subscribe to them. The following line adds a subscription for our variable we have created above. + this.subscribeStates("testVariable"); + // You can also add a subscription for multiple states. The following line watches all states starting with "lights." + // this.subscribeStates("lights.*"); + // Or, if you really must, you can also watch all states. Don't do this if you don't need to. Otherwise this will cause a lot of unnecessary load on the system: + // this.subscribeStates("*"); + + /* + setState examples + you will notice that each setState will cause the stateChange event to fire (because of above subscribeStates cmd) + */ + // the variable testVariable is set to true as command (ack=false) + await this.setState("testVariable", true); + + // same thing, but the value is flagged "ack" + // ack should be always set to true if the value is received from or acknowledged from the target system + await this.setState("testVariable", { val: true, ack: true }); + + // same thing, but the state is deleted after 30s (getState will return null afterwards) + await this.setState("testVariable", { val: true, ack: true, expire: 30 }); + + // examples for the checkPassword/checkGroup functions + const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); + this.log.info("check user admin pw iobroker: " + pwdResult); + + const gropupResult = await this.checkGroupAsync("admin", "admin"); + this.log.info("check group user admin group admin: " + gropupResult); + } + + /** + * Is called when adapter shuts down - callback has to be called under any circumstances! + */ + private onUnload(callback: () => void): void { + try { + // Here you must clear all timeouts or intervals that may still be active + // clearTimeout(timeout1); + // clearTimeout(timeout2); + // ... + // clearInterval(interval1); + + callback(); + } catch (_e) { + callback(); + } + } + + // If you need to react to object changes, uncomment the following block and the corresponding line in the constructor. + // You also need to subscribe to the objects with `this.subscribeObjects`, similar to `this.subscribeStates`. + // /** + // * Is called if a subscribed object changes + // */ + // private onObjectChange(id: string, obj: ioBroker.Object | null | undefined): void { + // if (obj) { + // // The object was changed + // this.log.info(`object ${id} changed: ${JSON.stringify(obj)}`); + // } else { + // // The object was deleted + // this.log.info(`object ${id} deleted`); + // } + // } + + /** + * Is called if a subscribed state changes + */ + private onStateChange(id: string, state: ioBroker.State | null | undefined): void { + if (state) { + // The state was changed + this.log.info(`state ${id} changed: ${state.val} (ack = ${state.ack})`); + } else { + // The state was deleted + this.log.info(`state ${id} deleted`); + } + } + + // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. + // /** + // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... + // * Using this method requires "common.messagebox" property to be set to true in io-package.json + // */ + // private onMessage(obj: ioBroker.Message): void { + // if (typeof obj === "object" && obj.message) { + // if (obj.command === "send") { + // // e.g. send email or pushover or whatever + // this.log.info("send command"); + + // // Send response in callback if required + // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); + // } + // } + // } + +} + +if (require.main !== module) { + // Export the constructor in compact mode + module.exports = (options: Partial | undefined) => new TestAdapter(options); +} else { + // otherwise start the instance directly + (() => new TestAdapter())(); +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/test/.eslintrc.json b/test/baselines/adapter_TS_React_OfficialESLint/test/.eslintrc.json new file mode 100644 index 000000000..ce6b3d62c --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/test/.eslintrc.json @@ -0,0 +1,43 @@ +{ + "root": true, + "env": { + "es6": true, + "node": true, + "mocha": true + }, + "extends": [ + "eslint:recommended" + ], + "rules": { + "indent": [ + "error", + "tab", + { + "SwitchCase": 1 + } + ], + "no-console": "off", + "no-unused-vars": [ + "error", + { + "ignoreRestSiblings": true, + "argsIgnorePattern": "^_" + } + ], + "no-var": "error", + "no-trailing-spaces": "error", + "prefer-const": "error", + "quotes": [ + "error", + "double", + { + "avoidEscape": true, + "allowTemplateLiterals": true + } + ], + "semi": [ + "error", + "always" + ] + } +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/test/integration.js b/test/baselines/adapter_TS_React_OfficialESLint/test/integration.js new file mode 100644 index 000000000..986936fac --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/test/integration.js @@ -0,0 +1,5 @@ +const path = require("path"); +const { tests } = require("@iobroker/testing"); + +// Run integration tests - See https://github.com/ioBroker/testing for a detailed explanation and further options +tests.integration(path.join(__dirname, "..")); \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/test/mocha.setup.js b/test/baselines/adapter_TS_React_OfficialESLint/test/mocha.setup.js new file mode 100644 index 000000000..b839790ff --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/test/mocha.setup.js @@ -0,0 +1,23 @@ +"use strict"; + +// Makes ts-node ignore warnings, so mocha --watch does work +process.env.TS_NODE_IGNORE_WARNINGS = "TRUE"; +// Sets the correct tsconfig for testing +process.env.TS_NODE_PROJECT = "tsconfig.json"; +// Make ts-node respect the "include" key in tsconfig.json +process.env.TS_NODE_FILES = "TRUE"; + +// Don't silently swallow unhandled rejections +process.on("unhandledRejection", (e) => { + throw e; +}); + +// enable the should interface with sinon +// and load chai-as-promised and sinon-chai by default +const sinonChai = require("sinon-chai"); +const chaiAsPromised = require("chai-as-promised"); +const { should, use } = require("chai"); + +should(); +use(sinonChai); +use(chaiAsPromised); \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/test/mocharc.custom.json b/test/baselines/adapter_TS_React_OfficialESLint/test/mocharc.custom.json new file mode 100644 index 000000000..851ed9cdc --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/test/mocharc.custom.json @@ -0,0 +1,10 @@ +{ + "require": [ + "test/mocha.setup.js", + "ts-node/register", + "source-map-support/register" + ], + "watch-files": [ + "src/**/*.test.ts" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/test/package.js b/test/baselines/adapter_TS_React_OfficialESLint/test/package.js new file mode 100644 index 000000000..3a48e0449 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/test/package.js @@ -0,0 +1,5 @@ +const path = require("path"); +const { tests } = require("@iobroker/testing"); + +// Validate the package files +tests.packageFiles(path.join(__dirname, "..")); diff --git a/test/baselines/adapter_TS_React_OfficialESLint/test/tsconfig.json b/test/baselines/adapter_TS_React_OfficialESLint/test/tsconfig.json new file mode 100644 index 000000000..3ebc81b65 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/test/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "noImplicitAny": false + }, + "include": [ + "./**/*.js" + ] +} diff --git a/test/baselines/adapter_TS_React_OfficialESLint/tsconfig.build.json b/test/baselines/adapter_TS_React_OfficialESLint/tsconfig.build.json new file mode 100644 index 000000000..1f040ce18 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/tsconfig.build.json @@ -0,0 +1,16 @@ +// Specialized tsconfig to only compile .ts-files in the src dir +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "allowJs": false, + "checkJs": false, + "noEmit": false, + "declaration": false + }, + "include": [ + "src/**/*.ts" + ], + "exclude": [ + "src/**/*.test.ts" + ] +} diff --git a/test/baselines/adapter_TS_React_OfficialESLint/tsconfig.json b/test/baselines/adapter_TS_React_OfficialESLint/tsconfig.json new file mode 100644 index 000000000..4c80d776d --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/tsconfig.json @@ -0,0 +1,46 @@ +// Root tsconfig to set the settings and power editor support for all TS files +{ + // To update the compilation target, install a different version of @tsconfig/node... and reference it here + // https://github.com/tsconfig/bases#node-20-tsconfigjson + "extends": "@tsconfig/node20/tsconfig.json", + "compilerOptions": { + // do not compile anything, this file is just to configure type checking + // the compilation is configured in tsconfig.build.json + "noEmit": true, + + // check JS files, but do not compile them => tsconfig.build.json + "allowJs": true, + "checkJs": true, + + "noEmitOnError": true, + "outDir": "./build/", + "removeComments": false, + + // This is necessary for the automatic typing of the adapter config + "resolveJsonModule": true, + + // If you want to disable the stricter type checks (not recommended), uncomment the following line + // "strict": false, + // And enable some of those features for more fine-grained control + // "strictNullChecks": true, + // "strictPropertyInitialization": true, + // "strictBindCallApply": true, + // "noImplicitAny": true, + // "noUnusedLocals": true, + // "noUnusedParameters": true, + // Uncomment this if you want the old behavior of catch variables being `any` + // "useUnknownInCatchVariables": false, + + "sourceMap": true, + "inlineSourceMap": false + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "exclude": [ + "build/**", + "node_modules/**", + "widgets/**" + ] +} \ No newline at end of file diff --git a/test/baselines/ioBroker.hello-devcontainer/.create-adapter.json b/test/baselines/ioBroker.hello-devcontainer/.create-adapter.json index 60c913990..d819d9ae8 100644 --- a/test/baselines/ioBroker.hello-devcontainer/.create-adapter.json +++ b/test/baselines/ioBroker.hello-devcontainer/.create-adapter.json @@ -21,6 +21,7 @@ "type checking", "devcontainer" ], + "eslintConfig": "custom", "indentation": "Space (4)", "quotes": "single", "authorName": "Al Calzone", diff --git a/test/create-adapter.test.ts b/test/create-adapter.test.ts index 47ff74fb3..d57610616 100644 --- a/test/create-adapter.test.ts +++ b/test/create-adapter.test.ts @@ -120,6 +120,7 @@ const baseAnswers: Answers = { tabReact: "no", releaseScript: "no", tools: ["ESLint"], + eslintConfig: "custom", indentation: "Tab", quotes: "double", authorName: "Al Calzone", @@ -271,6 +272,32 @@ describe("adapter creation =>", () => { await expectSuccess("ioBroker.hello-devcontainer", answers); }); + it("Adapter, TypeScript, Official ESLint Config", async () => { + const answers: Answers = { + ...baseAnswers, + eslintConfig: "official", + }; + await expectSuccess("adapter_TS_OfficialESLint", answers); + }); + + it("Adapter, JavaScript, Official ESLint Config", async () => { + const answers: Answers = { + ...baseAnswers, + language: "JavaScript", + eslintConfig: "official", + }; + await expectSuccess("adapter_JS_OfficialESLint", answers); + }); + + it("Adapter, TypeScript React, Official ESLint Config", async () => { + const answers: Answers = { + ...baseAnswers, + adminUi: "react", + eslintConfig: "official", + }; + await expectSuccess("adapter_TS_React_OfficialESLint", answers); + }); + it("Widget", async () => { const answers: Answers = { cli: true, From 1d5835709bc72c0fa7a38b4d4697da54d01e2513 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 20 Sep 2025 15:11:22 +0000 Subject: [PATCH 03/29] Fix template generation script to include eslintConfig field Co-authored-by: Apollon77 <11976694+Apollon77@users.noreply.github.com> --- .github/create_templates.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/create_templates.ts b/.github/create_templates.ts index 59266e969..d00873d9c 100644 --- a/.github/create_templates.ts +++ b/.github/create_templates.ts @@ -51,6 +51,7 @@ const adapterAnswers: Answers = { adminFeatures: ["custom", "tab"], adminUi: "json", tabReact: "no", + eslintConfig: "custom", // Default to custom for templates }; const templates: Record = { From 4b6407ab20d994b892b9fcd79b256b0569fc4ec2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 20 Sep 2025 15:32:01 +0000 Subject: [PATCH 04/29] Fix official ESLint config to use ESLint 9 format with eslint.config.mjs Co-authored-by: Apollon77 <11976694+Apollon77@users.noreply.github.com> --- .github/create_templates.ts | 2 +- templates/_eslintignore.ts | 3 + templates/_eslintrc_javascript.json.ts | 15 +- templates/_eslintrc_typescript.js.ts | 16 +- templates/_prettierrc.js.ts | 3 + templates/eslint.config.mjs.ts | 60 +++++++ templates/index.ts | 2 + templates/package.json.ts | 12 +- templates/prettier.config.mjs.ts | 25 +++ .../.create-adapter.json | 38 ---- .../adapter_JS_OfficialESLint/.eslintignore | 2 - .../adapter_JS_OfficialESLint/.eslintrc.json | 5 - .../.github/ISSUE_TEMPLATE/bug_report.md | 32 ---- .../.github/ISSUE_TEMPLATE/config.yml | 5 - .../.github/auto-merge.yml | 17 -- .../.github/dependabot.yml | 22 --- .../workflows/dependabot-auto-merge.yml | 27 --- .../.github/workflows/test-and-release.yml | 92 ---------- .../adapter_JS_OfficialESLint/.gitignore | 18 -- .../.vscode/extensions.json | 5 - .../.vscode/settings.json | 22 --- .../adapter_JS_OfficialESLint/LICENSE | 21 --- .../adapter_JS_OfficialESLint/README.md | 124 ------------- .../__meta__/npm_package_files.txt | 10 -- .../admin/index_m.html | 95 ---------- .../adapter_JS_OfficialESLint/admin/style.css | 32 ---- .../admin/test-adapter.png | Bin 62376 -> 0 bytes .../adapter_JS_OfficialESLint/admin/words.js | 46 ----- .../adapter_JS_OfficialESLint/io-package.json | 91 ---------- .../lib/adapter-config.d.ts | 19 -- .../adapter_JS_OfficialESLint/main.js | 167 ------------------ .../adapter_JS_OfficialESLint/main.test.js | 30 ---- .../adapter_JS_OfficialESLint/package.json | 55 ------ .../test/integration.js | 5 - .../test/mocha.setup.js | 14 -- .../test/mocharc.custom.json | 10 -- .../adapter_JS_OfficialESLint/test/package.js | 5 - .../.create-adapter.json | 38 ---- .../adapter_TS_OfficialESLint/.eslintignore | 3 - .../adapter_TS_OfficialESLint/.eslintrc.js | 3 - .../.github/ISSUE_TEMPLATE/bug_report.md | 32 ---- .../.github/ISSUE_TEMPLATE/config.yml | 5 - .../.github/auto-merge.yml | 17 -- .../.github/dependabot.yml | 22 --- .../workflows/dependabot-auto-merge.yml | 27 --- .../.github/workflows/test-and-release.yml | 96 ---------- .../adapter_TS_OfficialESLint/.gitignore | 18 -- .../.vscode/extensions.json | 6 - .../.vscode/settings.json | 23 --- .../adapter_TS_OfficialESLint/LICENSE | 21 --- .../adapter_TS_OfficialESLint/README.md | 132 -------------- .../__meta__/npm_package_files.txt | 8 - .../admin/admin.d.ts | 93 ---------- .../admin/index_m.html | 95 ---------- .../adapter_TS_OfficialESLint/admin/style.css | 32 ---- .../admin/test-adapter.png | Bin 62376 -> 0 bytes .../admin/tsconfig.json | 11 -- .../adapter_TS_OfficialESLint/admin/words.js | 46 ----- .../adapter_TS_OfficialESLint/io-package.json | 91 ---------- .../adapter_TS_OfficialESLint/package.json | 67 ------- .../src/lib/adapter-config.d.ts | 14 -- .../src/main.test.ts | 26 --- .../adapter_TS_OfficialESLint/src/main.ts | 153 ---------------- .../test/.eslintrc.json | 43 ----- .../test/integration.js | 5 - .../test/mocha.setup.js | 23 --- .../test/mocharc.custom.json | 10 -- .../adapter_TS_OfficialESLint/test/package.js | 5 - .../test/tsconfig.json | 9 - .../tsconfig.build.json | 16 -- .../adapter_TS_OfficialESLint/tsconfig.json | 46 ----- .../.create-adapter.json | 38 ---- .../.eslintignore | 4 - .../.eslintrc.js | 3 - .../.github/ISSUE_TEMPLATE/bug_report.md | 32 ---- .../.github/ISSUE_TEMPLATE/config.yml | 5 - .../.github/auto-merge.yml | 17 -- .../.github/dependabot.yml | 22 --- .../workflows/dependabot-auto-merge.yml | 27 --- .../.github/workflows/test-and-release.yml | 96 ---------- .../.gitignore | 18 -- .../.vscode/extensions.json | 6 - .../.vscode/settings.json | 23 --- .../adapter_TS_React_OfficialESLint/LICENSE | 21 --- .../adapter_TS_React_OfficialESLint/README.md | 136 -------------- .../__meta__/npm_package_files.txt | 7 - .../admin/index_m.html | 24 --- .../admin/src/app.tsx | 55 ------ .../admin/src/components/settings.tsx | 139 --------------- .../admin/src/i18n/de.json | 5 - .../admin/src/i18n/en.json | 5 - .../admin/src/i18n/es.json | 5 - .../admin/src/i18n/fr.json | 5 - .../admin/src/i18n/i18n.d.ts | 26 --- .../admin/src/i18n/it.json | 5 - .../admin/src/i18n/nl.json | 5 - .../admin/src/i18n/pl.json | 5 - .../admin/src/i18n/pt.json | 5 - .../admin/src/i18n/ru.json | 5 - .../admin/src/i18n/uk.json | 5 - .../admin/src/i18n/zh-cn.json | 5 - .../admin/src/index.tsx | 25 --- .../admin/style.css | 32 ---- .../admin/test-adapter.png | Bin 62376 -> 0 bytes .../admin/tsconfig.json | 26 --- .../io-package.json | 92 ---------- .../package.json | 77 -------- .../src/lib/adapter-config.d.ts | 14 -- .../src/main.test.ts | 26 --- .../src/main.ts | 153 ---------------- .../test/.eslintrc.json | 43 ----- .../test/integration.js | 5 - .../test/mocha.setup.js | 23 --- .../test/mocharc.custom.json | 10 -- .../test/package.js | 5 - .../test/tsconfig.json | 9 - .../tsconfig.build.json | 16 -- .../tsconfig.json | 46 ----- 118 files changed, 108 insertions(+), 3631 deletions(-) create mode 100644 templates/eslint.config.mjs.ts create mode 100644 templates/prettier.config.mjs.ts delete mode 100644 test/baselines/adapter_JS_OfficialESLint/.create-adapter.json delete mode 100644 test/baselines/adapter_JS_OfficialESLint/.eslintignore delete mode 100644 test/baselines/adapter_JS_OfficialESLint/.eslintrc.json delete mode 100644 test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml delete mode 100644 test/baselines/adapter_JS_OfficialESLint/.github/auto-merge.yml delete mode 100644 test/baselines/adapter_JS_OfficialESLint/.github/dependabot.yml delete mode 100644 test/baselines/adapter_JS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml delete mode 100644 test/baselines/adapter_JS_OfficialESLint/.github/workflows/test-and-release.yml delete mode 100644 test/baselines/adapter_JS_OfficialESLint/.gitignore delete mode 100644 test/baselines/adapter_JS_OfficialESLint/.vscode/extensions.json delete mode 100644 test/baselines/adapter_JS_OfficialESLint/.vscode/settings.json delete mode 100644 test/baselines/adapter_JS_OfficialESLint/LICENSE delete mode 100644 test/baselines/adapter_JS_OfficialESLint/README.md delete mode 100644 test/baselines/adapter_JS_OfficialESLint/__meta__/npm_package_files.txt delete mode 100644 test/baselines/adapter_JS_OfficialESLint/admin/index_m.html delete mode 100644 test/baselines/adapter_JS_OfficialESLint/admin/style.css delete mode 100644 test/baselines/adapter_JS_OfficialESLint/admin/test-adapter.png delete mode 100644 test/baselines/adapter_JS_OfficialESLint/admin/words.js delete mode 100644 test/baselines/adapter_JS_OfficialESLint/io-package.json delete mode 100644 test/baselines/adapter_JS_OfficialESLint/lib/adapter-config.d.ts delete mode 100644 test/baselines/adapter_JS_OfficialESLint/main.js delete mode 100644 test/baselines/adapter_JS_OfficialESLint/main.test.js delete mode 100644 test/baselines/adapter_JS_OfficialESLint/package.json delete mode 100644 test/baselines/adapter_JS_OfficialESLint/test/integration.js delete mode 100644 test/baselines/adapter_JS_OfficialESLint/test/mocha.setup.js delete mode 100644 test/baselines/adapter_JS_OfficialESLint/test/mocharc.custom.json delete mode 100644 test/baselines/adapter_JS_OfficialESLint/test/package.js delete mode 100644 test/baselines/adapter_TS_OfficialESLint/.create-adapter.json delete mode 100644 test/baselines/adapter_TS_OfficialESLint/.eslintignore delete mode 100644 test/baselines/adapter_TS_OfficialESLint/.eslintrc.js delete mode 100644 test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml delete mode 100644 test/baselines/adapter_TS_OfficialESLint/.github/auto-merge.yml delete mode 100644 test/baselines/adapter_TS_OfficialESLint/.github/dependabot.yml delete mode 100644 test/baselines/adapter_TS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml delete mode 100644 test/baselines/adapter_TS_OfficialESLint/.github/workflows/test-and-release.yml delete mode 100644 test/baselines/adapter_TS_OfficialESLint/.gitignore delete mode 100644 test/baselines/adapter_TS_OfficialESLint/.vscode/extensions.json delete mode 100644 test/baselines/adapter_TS_OfficialESLint/.vscode/settings.json delete mode 100644 test/baselines/adapter_TS_OfficialESLint/LICENSE delete mode 100644 test/baselines/adapter_TS_OfficialESLint/README.md delete mode 100644 test/baselines/adapter_TS_OfficialESLint/__meta__/npm_package_files.txt delete mode 100644 test/baselines/adapter_TS_OfficialESLint/admin/admin.d.ts delete mode 100644 test/baselines/adapter_TS_OfficialESLint/admin/index_m.html delete mode 100644 test/baselines/adapter_TS_OfficialESLint/admin/style.css delete mode 100644 test/baselines/adapter_TS_OfficialESLint/admin/test-adapter.png delete mode 100644 test/baselines/adapter_TS_OfficialESLint/admin/tsconfig.json delete mode 100644 test/baselines/adapter_TS_OfficialESLint/admin/words.js delete mode 100644 test/baselines/adapter_TS_OfficialESLint/io-package.json delete mode 100644 test/baselines/adapter_TS_OfficialESLint/package.json delete mode 100644 test/baselines/adapter_TS_OfficialESLint/src/lib/adapter-config.d.ts delete mode 100644 test/baselines/adapter_TS_OfficialESLint/src/main.test.ts delete mode 100644 test/baselines/adapter_TS_OfficialESLint/src/main.ts delete mode 100644 test/baselines/adapter_TS_OfficialESLint/test/.eslintrc.json delete mode 100644 test/baselines/adapter_TS_OfficialESLint/test/integration.js delete mode 100644 test/baselines/adapter_TS_OfficialESLint/test/mocha.setup.js delete mode 100644 test/baselines/adapter_TS_OfficialESLint/test/mocharc.custom.json delete mode 100644 test/baselines/adapter_TS_OfficialESLint/test/package.js delete mode 100644 test/baselines/adapter_TS_OfficialESLint/test/tsconfig.json delete mode 100644 test/baselines/adapter_TS_OfficialESLint/tsconfig.build.json delete mode 100644 test/baselines/adapter_TS_OfficialESLint/tsconfig.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.create-adapter.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.eslintignore delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.eslintrc.js delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.github/auto-merge.yml delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.github/dependabot.yml delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/dependabot-auto-merge.yml delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/test-and-release.yml delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.gitignore delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.vscode/extensions.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.vscode/settings.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/LICENSE delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/README.md delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/__meta__/npm_package_files.txt delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/index_m.html delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/app.tsx delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/components/settings.tsx delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/de.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/en.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/es.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/fr.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/i18n.d.ts delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/it.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/nl.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pl.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pt.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/ru.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/uk.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/zh-cn.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/index.tsx delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/style.css delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/test-adapter.png delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/tsconfig.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/io-package.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/package.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/src/lib/adapter-config.d.ts delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/src/main.test.ts delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/src/main.ts delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/test/.eslintrc.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/test/integration.js delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/test/mocha.setup.js delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/test/mocharc.custom.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/test/package.js delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/test/tsconfig.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/tsconfig.build.json delete mode 100644 test/baselines/adapter_TS_React_OfficialESLint/tsconfig.json diff --git a/.github/create_templates.ts b/.github/create_templates.ts index d00873d9c..9e6148a5d 100644 --- a/.github/create_templates.ts +++ b/.github/create_templates.ts @@ -51,7 +51,7 @@ const adapterAnswers: Answers = { adminFeatures: ["custom", "tab"], adminUi: "json", tabReact: "no", - eslintConfig: "custom", // Default to custom for templates + eslintConfig: "official", // Default to official for templates }; const templates: Record = { diff --git a/templates/_eslintignore.ts b/templates/_eslintignore.ts index 82c13df11..c0405146f 100644 --- a/templates/_eslintignore.ts +++ b/templates/_eslintignore.ts @@ -4,6 +4,9 @@ const templateFunction: TemplateFunction = answers => { const useESLint = answers.tools?.includes("ESLint") if (!useESLint) return; + const useOfficialESLintConfig = answers.eslintConfig === "official"; + // Don't generate .eslintignore when using official config (ignores are in eslint.config.mjs) + if (useOfficialESLintConfig) return; const useTypeScript = answers.language === "TypeScript"; const useReact = answers.adminUi === "react" || answers.tabReact === "yes"; diff --git a/templates/_eslintrc_javascript.json.ts b/templates/_eslintrc_javascript.json.ts index 419eec8f7..cd56e9132 100644 --- a/templates/_eslintrc_javascript.json.ts +++ b/templates/_eslintrc_javascript.json.ts @@ -11,19 +11,8 @@ const templateFunction: TemplateFunction = answers => { const useESLint = answers.tools && answers.tools.indexOf("ESLint") > -1; if (!useESLint) return; const useOfficialESLintConfig = answers.eslintConfig === "official"; - - // If using official config, create a simple extends config - if (useOfficialESLintConfig) { - const extends_array = ["@iobroker"]; - if (useReact) extends_array.push("@iobroker/react"); - - const template = ` -{ - "extends": [${extends_array.map(ext => `"${ext}"`).join(", ")}] -} -`; - return JSON.stringify(JSON5.parse(template), null, 4); - } + // Don't generate legacy .eslintrc.json when using official config + if (useOfficialESLintConfig) return; // Original custom ESLint configuration const template = ` diff --git a/templates/_eslintrc_typescript.js.ts b/templates/_eslintrc_typescript.js.ts index 0a6036b95..374c7da73 100644 --- a/templates/_eslintrc_typescript.js.ts +++ b/templates/_eslintrc_typescript.js.ts @@ -8,23 +8,13 @@ const templateFunction: TemplateFunction = answers => { const useESLint = answers.tools && answers.tools.indexOf("ESLint") > -1; if (!useESLint) return; const useOfficialESLintConfig = answers.eslintConfig === "official"; + // Don't generate legacy .eslintrc.js when using official config + if (useOfficialESLintConfig) return; + const usePrettier = answers.tools && answers.tools.indexOf("Prettier") > -1; const useReact = answers.adminUi === "react" || answers.tabReact === "yes"; - // If using official config, create a simple extends config - if (useOfficialESLintConfig) { - const extends_array = ["@iobroker"]; - if (useReact) extends_array.push("@iobroker/react"); - - const template = ` -module.exports = { - extends: [${extends_array.map(ext => `"${ext}"`).join(", ")}], -}; -`; - return template.trim().replace(/(\r?\n)+/g, "\n"); - } - // Original custom ESLint configuration const template = ` module.exports = { diff --git a/templates/_prettierrc.js.ts b/templates/_prettierrc.js.ts index c33dd8889..78de32687 100644 --- a/templates/_prettierrc.js.ts +++ b/templates/_prettierrc.js.ts @@ -4,6 +4,9 @@ const templateFunction: TemplateFunction = answers => { const usePrettier = answers.tools && answers.tools.indexOf("Prettier") > -1; if (!usePrettier) return; + const useOfficialESLintConfig = answers.eslintConfig === "official"; + // Don't generate .prettierrc.js when using official config (prettier config is in prettier.config.mjs) + if (useOfficialESLintConfig) return; // endOfLine could be made dependent on the current OS's line ending // I need to think about it. diff --git a/templates/eslint.config.mjs.ts b/templates/eslint.config.mjs.ts new file mode 100644 index 000000000..eeb51f45e --- /dev/null +++ b/templates/eslint.config.mjs.ts @@ -0,0 +1,60 @@ +import type { TemplateFunction } from "../src/lib/createAdapter"; + +const templateFunction: TemplateFunction = answers => { + + const useESLint = answers.tools && answers.tools.indexOf("ESLint") > -1; + const useOfficialESLintConfig = useESLint && answers.eslintConfig === "official"; + if (!useOfficialESLintConfig) return; + + const useReact = answers.adminUi === "react" || answers.tabReact === "yes"; + const useTypeScript = answers.language === "TypeScript"; + + // Build the ignores array based on project structure + let ignores = [ + "'.dev-server/'", + "'.vscode/'", + "'*.test.js'", + "'test/**/*.js'", + "'*.config.mjs'", + "'build'", + "'dist'", + "'admin/words.js'", + "'admin/admin.d.ts'", + "'admin/blockly.js'", + "'**/adapter-config.d.ts'", + ]; + + if (useReact) { + ignores.push("'admin/build'"); + } + + const template = `// ioBroker eslint template configuration file for js and ts files +// Please note that esm or react based modules need additional modules loaded. +import config from '@iobroker/eslint-config'; + +export default [ + ...config, + { + // specify files to exclude from linting here + ignores: [ + ${ignores.join(",\n\t\t\t")} + ], + }, + { + // you may disable some 'jsdoc' warnings - but using jsdoc is highly recommended + // as this improves maintainability. jsdoc warnings will not block build process. + rules: { + // 'jsdoc/require-jsdoc': 'off', + // 'jsdoc/require-param': 'off', + // 'jsdoc/require-param-description': 'off', + // 'jsdoc/require-returns-description': 'off', + // 'jsdoc/require-returns-check': 'off', + }, + }, +]; +`; + return template.trim(); +}; + +templateFunction.customPath = "eslint.config.mjs"; +export = templateFunction; \ No newline at end of file diff --git a/templates/index.ts b/templates/index.ts index ef3411c71..3cbdc2fb8 100644 --- a/templates/index.ts +++ b/templates/index.ts @@ -21,6 +21,7 @@ const templates: { name: string, templateFunction: TemplateFunction }[] = [ { name: "_eslintignore.ts", templateFunction: require("./_eslintignore") }, { name: "_eslintrc_javascript.json.ts", templateFunction: require("./_eslintrc_javascript.json") }, { name: "_eslintrc_typescript.js.ts", templateFunction: require("./_eslintrc_typescript.js") }, + { name: "eslint.config.mjs.ts", templateFunction: require("./eslint.config.mjs") }, { name: "_github/auto-merge.yml.ts", templateFunction: require("./_github/auto-merge.yml") }, { name: "_github/dependabot.yml.ts", templateFunction: require("./_github/dependabot.yml") }, { name: "_github/ISSUE_TEMPLATE/bug_report.md.ts", templateFunction: require("./_github/ISSUE_TEMPLATE/bug_report.md") }, @@ -30,6 +31,7 @@ const templates: { name: string, templateFunction: TemplateFunction }[] = [ { name: "_gitignore.ts", templateFunction: require("./_gitignore") }, { name: "_prettierignore.ts", templateFunction: require("./_prettierignore") }, { name: "_prettierrc.js.ts", templateFunction: require("./_prettierrc.js") }, + { name: "prettier.config.mjs.ts", templateFunction: require("./prettier.config.mjs") }, { name: "_releaseconfig.json.ts", templateFunction: require("./_releaseconfig.json") }, { name: "_vscode/extensions.json.ts", templateFunction: require("./_vscode/extensions.json") }, { name: "_vscode/launch.json.ts", templateFunction: require("./_vscode/launch.json") }, diff --git a/templates/package.json.ts b/templates/package.json.ts index b817237e0..104c62dd7 100644 --- a/templates/package.json.ts +++ b/templates/package.json.ts @@ -197,10 +197,16 @@ const templateFunction: TemplateFunction = async answers => { npmScripts["coverage"] = "nyc npm run test:ts"; } if (useESLint) { - if (useTypeScript) { - npmScripts["lint"] = `eslint --ext .ts${useReact ? ",.tsx" : ""} src/${useReact ? " admin/src/" : ""}`; + if (useOfficialESLintConfig) { + // Use the new ESLint 9 format for official config + npmScripts["lint"] = "eslint -c eslint.config.mjs ."; } else { - npmScripts["lint"] = `eslint${useReact ? " --ext .js,.jsx" : ""} .`; + // Use the legacy format for custom config + if (useTypeScript) { + npmScripts["lint"] = `eslint --ext .ts${useReact ? ",.tsx" : ""} src/${useReact ? " admin/src/" : ""}`; + } else { + npmScripts["lint"] = `eslint${useReact ? " --ext .js,.jsx" : ""} .`; + } } } } else if (isWidget) { diff --git a/templates/prettier.config.mjs.ts b/templates/prettier.config.mjs.ts new file mode 100644 index 000000000..9b0e4b654 --- /dev/null +++ b/templates/prettier.config.mjs.ts @@ -0,0 +1,25 @@ +import type { TemplateFunction } from "../src/lib/createAdapter"; + +const templateFunction: TemplateFunction = answers => { + + const useESLint = answers.tools && answers.tools.indexOf("ESLint") > -1; + const useOfficialESLintConfig = useESLint && answers.eslintConfig === "official"; + if (!useOfficialESLintConfig) return; + + const quotes = answers.quotes || "double"; + const singleQuoteComment = quotes === "single" ? "" : "// "; + + const template = `// iobroker prettier configuration file +import prettierConfig from '@iobroker/eslint-config/prettier.config.mjs'; + +export default { + ...prettierConfig, + ${singleQuoteComment}// uncomment next line if you prefer single quotes + ${singleQuoteComment}singleQuote: true, +}; +`; + return template.trim(); +}; + +templateFunction.customPath = "prettier.config.mjs"; +export = templateFunction; \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/.create-adapter.json b/test/baselines/adapter_JS_OfficialESLint/.create-adapter.json deleted file mode 100644 index de33bfec5..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/.create-adapter.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "cli": true, - "target": "directory", - "adapterName": "test-adapter", - "title": "Is used to test the creator", - "startMode": "daemon", - "features": [ - "adapter" - ], - "connectionIndicator": "no", - "connectionType": "local", - "dataSource": "push", - "adminFeatures": [], - "type": "general", - "language": "JavaScript", - "adminUi": "html", - "tabReact": "no", - "releaseScript": "no", - "tools": [ - "ESLint" - ], - "eslintConfig": "official", - "indentation": "Tab", - "quotes": "double", - "authorName": "Al Calzone", - "authorGithub": "AlCalzone", - "authorEmail": "al@calzo.ne", - "gitRemoteProtocol": "HTTPS", - "dependabot": "yes", - "gitCommit": "no", - "defaultBranch": "main", - "license": "MIT License", - "licenseInformation": { - "type": "free", - "license": "MIT" - }, - "creatorVersion": "2.6.5" -} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/.eslintignore b/test/baselines/adapter_JS_OfficialESLint/.eslintignore deleted file mode 100644 index 396d8e174..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -**/.eslintrc.js -admin/words.js \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/.eslintrc.json b/test/baselines/adapter_JS_OfficialESLint/.eslintrc.json deleted file mode 100644 index 7546615c6..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/.eslintrc.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": [ - "@iobroker" - ] -} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md b/test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 895613958..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -name: Bug report -about: Something is not working as it should -title: '' -labels: '' -assignees: '' ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '...' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots & Logfiles** -If applicable, add screenshots and logfiles to help explain your problem. - -**Versions:** - - Adapter version: - - JS-Controller version: - - Node version: - - Operating system: - -**Additional context** -Add any other context about the problem here. diff --git a/test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml b/test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index d7cfe5940..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,5 +0,0 @@ -blank_issues_enabled: false -contact_links: - - name: ioBroker Community - url: https://forum.iobroker.net/ - about: Please ask and answer questions here. \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/.github/auto-merge.yml b/test/baselines/adapter_JS_OfficialESLint/.github/auto-merge.yml deleted file mode 100644 index 4f6d185f0..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/.github/auto-merge.yml +++ /dev/null @@ -1,17 +0,0 @@ -# Configure here which dependency updates should be merged automatically. -# The recommended configuration is the following: -- match: - # Only merge patches for production dependencies - dependency_type: production - update_type: "semver:patch" -- match: - # Except for security fixes, here we allow minor patches - dependency_type: production - update_type: "security:minor" -- match: - # and development dependencies can have a minor update, too - dependency_type: development - update_type: "semver:minor" - -# The syntax is based on the legacy dependabot v1 automerged_updates syntax, see: -# https://dependabot.com/docs/config-file/#automerged_updates diff --git a/test/baselines/adapter_JS_OfficialESLint/.github/dependabot.yml b/test/baselines/adapter_JS_OfficialESLint/.github/dependabot.yml deleted file mode 100644 index c165a6a47..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/.github/dependabot.yml +++ /dev/null @@ -1,22 +0,0 @@ -version: 2 -updates: - - package-ecosystem: npm - directory: "/" - schedule: - interval: monthly - time: "04:00" - timezone: Europe/Berlin - open-pull-requests-limit: 5 - assignees: - - AlCalzone - versioning-strategy: increase - - - package-ecosystem: github-actions - directory: "/" - schedule: - interval: monthly - time: "04:00" - timezone: Europe/Berlin - open-pull-requests-limit: 5 - assignees: - - AlCalzone diff --git a/test/baselines/adapter_JS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml b/test/baselines/adapter_JS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml deleted file mode 100644 index baeae23b5..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Automatically merge Dependabot PRs when version comparison is within the range -# that is configured in .github/auto-merge.yml - -name: Auto-Merge Dependabot PRs - -on: - # WARNING: This needs to be run in the PR base, DO NOT build untrusted code in this action - # details under https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/ - pull_request_target: - -jobs: - auto-merge: - if: github.actor == 'dependabot[bot]' - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Check if PR should be auto-merged - uses: ahmadnassri/action-dependabot-auto-merge@v2 - with: - # In order to use this, you need to go to https://github.com/settings/tokens and - # create a Personal Access Token with the permission "public_repo". - # Enter this token in your repository settings under "Secrets" and name it AUTO_MERGE_TOKEN - github-token: ${{ secrets.AUTO_MERGE_TOKEN }} - # By default, squash and merge, so Github chooses nice commit messages - command: squash and merge diff --git a/test/baselines/adapter_JS_OfficialESLint/.github/workflows/test-and-release.yml b/test/baselines/adapter_JS_OfficialESLint/.github/workflows/test-and-release.yml deleted file mode 100644 index 462c8cbec..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/.github/workflows/test-and-release.yml +++ /dev/null @@ -1,92 +0,0 @@ -name: Test and Release - -# Run this job on all pushes and pull requests -# as well as tags with a semantic version -on: - push: - branches: - - "main" - tags: - # normal versions - - "v[0-9]+.[0-9]+.[0-9]+" - # pre-releases - - "v[0-9]+.[0-9]+.[0-9]+-**" - pull_request: {} - -# Cancel previous PR/branch runs when a new commit is pushed -concurrency: - group: ${{ github.ref }} - cancel-in-progress: true - -jobs: - # Performs quick checks before the expensive test runs - check-and-lint: - if: contains(github.event.head_commit.message, '[skip ci]') == false - - runs-on: ubuntu-latest - - steps: - - uses: ioBroker/testing-action-check@v1 - with: - node-version: '20.x' - # Uncomment the following line if your adapter cannot be installed using 'npm ci' - # install-command: 'npm install' - lint: true - - # Runs adapter tests on all supported node versions and OSes - adapter-tests: - if: contains(github.event.head_commit.message, '[skip ci]') == false - - runs-on: ${{ matrix.os }} - strategy: - matrix: - node-version: [20.x, 22.x, 24.x] - os: [ubuntu-latest, windows-latest, macos-latest] - - steps: - - uses: ioBroker/testing-action-adapter@v1 - with: - node-version: ${{ matrix.node-version }} - os: ${{ matrix.os }} - # Uncomment the following line if your adapter cannot be installed using 'npm ci' - # install-command: 'npm install' - -# TODO: To enable automatic npm releases, create a token on npmjs.org -# Enter this token as a GitHub secret (with name NPM_TOKEN) in the repository options -# Then uncomment the following block: - -# # Deploys the final package to NPM -# deploy: -# needs: [check-and-lint, adapter-tests] -# -# # Trigger this step only when a commit on any branch is tagged with a version number -# if: | -# contains(github.event.head_commit.message, '[skip ci]') == false && -# github.event_name == 'push' && -# startsWith(github.ref, 'refs/tags/v') -# -# runs-on: ubuntu-latest -# -# # Write permissions are required to create Github releases -# permissions: -# contents: write -# -# steps: -# - uses: ioBroker/testing-action-deploy@v1 -# with: -# node-version: '20.x' -# # Uncomment the following line if your adapter cannot be installed using 'npm ci' -# # install-command: 'npm install' -# npm-token: ${{ secrets.NPM_TOKEN }} -# github-token: ${{ secrets.GITHUB_TOKEN }} -# -# # When using Sentry for error reporting, Sentry can be informed about new releases -# # To enable create a API-Token in Sentry (User settings, API keys) -# # Enter this token as a GitHub secret (with name SENTRY_AUTH_TOKEN) in the repository options -# # Then uncomment and customize the following block: -# sentry: true -# sentry-token: ${{ secrets.SENTRY_AUTH_TOKEN }} -# sentry-project: "iobroker-test-adapter" -# sentry-version-prefix: "iobroker.test-adapter" -# # If your sentry project is linked to a GitHub repository, you can enable the following option -# # sentry-github-integration: true diff --git a/test/baselines/adapter_JS_OfficialESLint/.gitignore b/test/baselines/adapter_JS_OfficialESLint/.gitignore deleted file mode 100644 index 80c28aa9d..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -# No dot-directories except github/vscode -.*/ -!.vscode/ -!.github/ - -*.code-workspace -node_modules -nbproject - -# npm package files -iobroker.*.tgz - -Thumbs.db -.commitinfo - -# i18n intermediate files -admin/i18n/flat.txt -admin/i18n/*/flat.txt \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/.vscode/extensions.json b/test/baselines/adapter_JS_OfficialESLint/.vscode/extensions.json deleted file mode 100644 index a8d778499..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/.vscode/extensions.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "recommendations": [ - "dbaeumer.vscode-eslint" - ] -} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/.vscode/settings.json b/test/baselines/adapter_JS_OfficialESLint/.vscode/settings.json deleted file mode 100644 index 0cb5c9286..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/.vscode/settings.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "eslint.enable": true, - "json.schemas": [ - { - "fileMatch": [ - "io-package.json" - ], - "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.js-controller/master/schemas/io-package.json" - }, - { - "fileMatch": [ - "admin/jsonConfig.json", - "admin/jsonConfig.json5", - "admin/jsonCustom.json", - "admin/jsonCustom.json5", - "admin/jsonTab.json", - "admin/jsonTab.json5" - ], - "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.admin/master/packages/jsonConfig/schemas/jsonConfig.json" - } - ] -} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/LICENSE b/test/baselines/adapter_JS_OfficialESLint/LICENSE deleted file mode 100644 index 27c9a624d..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2025 Al Calzone - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/test/baselines/adapter_JS_OfficialESLint/README.md b/test/baselines/adapter_JS_OfficialESLint/README.md deleted file mode 100644 index 8a47404cf..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/README.md +++ /dev/null @@ -1,124 +0,0 @@ -![Logo](admin/test-adapter.png) -# ioBroker.test-adapter - -[![NPM version](https://img.shields.io/npm/v/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) -[![Downloads](https://img.shields.io/npm/dm/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) -![Number of Installations](https://iobroker.live/badges/test-adapter-installed.svg) -![Current version in stable repository](https://iobroker.live/badges/test-adapter-stable.svg) - -[![NPM](https://nodei.co/npm/iobroker.test-adapter.png?downloads=true)](https://nodei.co/npm/iobroker.test-adapter/) - -**Tests:** ![Test and Release](https://github.com/AlCalzone/ioBroker.test-adapter/workflows/Test%20and%20Release/badge.svg) - -## test-adapter adapter for ioBroker - -Describe your project here - -## Developer manual -This section is intended for the developer. It can be deleted later. - -### DISCLAIMER - -Please make sure that you consider copyrights and trademarks when you use names or logos of a company and add a disclaimer to your README. -You can check other adapters for examples or ask in the developer community. Using a name or logo of a company without permission may cause legal problems for you. - -### Getting started - -You are almost done, only a few steps left: -1. Create a new repository on GitHub with the name `ioBroker.test-adapter` -1. Initialize the current folder as a new git repository: - ```bash - git init -b main - git add . - git commit -m "Initial commit" - ``` -1. Link your local repository with the one on GitHub: - ```bash - git remote add origin https://github.com/AlCalzone/ioBroker.test-adapter - ``` - -1. Push all files to the GitHub repo: - ```bash - git push origin main - ``` -1. Add a new secret under https://github.com/AlCalzone/ioBroker.test-adapter/settings/secrets. It must be named `AUTO_MERGE_TOKEN` and contain a personal access token with push access to the repository, e.g. yours. You can create a new token under https://github.com/settings/tokens. - -1. Head over to [main.js](main.js) and start programming! - -### Best Practices -We've collected some [best practices](https://github.com/ioBroker/ioBroker.repositories#development-and-coding-best-practices) regarding ioBroker development and coding in general. If you're new to ioBroker or Node.js, you should -check them out. If you're already experienced, you should also take a look at them - you might learn something new :) - -### Scripts in `package.json` -Several npm scripts are predefined for your convenience. You can run them using `npm run ` -| Script name | Description | -|-------------|-------------| -| `test:js` | Executes the tests you defined in `*.test.js` files. | -| `test:package` | Ensures your `package.json` and `io-package.json` are valid. | -| `test:integration` | Tests the adapter startup with an actual instance of ioBroker. | -| `test` | Performs a minimal test run on package files and your tests. | -| `lint` | Runs `ESLint` to check your code for formatting errors and potential bugs. | -| `translate` | Translates texts in your adapter to all required languages, see [`@iobroker/adapter-dev`](https://github.com/ioBroker/adapter-dev#manage-translations) for more details. | - -### Writing tests -When done right, testing code is invaluable, because it gives you the -confidence to change your code while knowing exactly if and when -something breaks. A good read on the topic of test-driven development -is https://hackernoon.com/introduction-to-test-driven-development-tdd-61a13bc92d92. -Although writing tests before the code might seem strange at first, but it has very -clear upsides. - -The template provides you with basic tests for the adapter startup and package files. -It is recommended that you add your own tests into the mix. - -### Publishing the adapter -Using GitHub Actions, you can enable automatic releases on npm whenever you push a new git tag that matches the form -`v..`. We **strongly recommend** that you do. The necessary steps are described in `.github/workflows/test-and-release.yml`. - -To get your adapter released in ioBroker, please refer to the documentation -of [ioBroker.repositories](https://github.com/ioBroker/ioBroker.repositories#requirements-for-adapter-to-get-added-to-the-latest-repository). - -### Test the adapter manually on a local ioBroker installation -In order to install the adapter locally without publishing, the following steps are recommended: -1. Create a tarball from your dev directory: - ```bash - npm pack - ``` -1. Upload the resulting file to your ioBroker host -1. Install it locally (The paths are different on Windows): - ```bash - cd /opt/iobroker - npm i /path/to/tarball.tgz - ``` - -For later updates, the above procedure is not necessary. Just do the following: -1. Overwrite the changed files in the adapter directory (`/opt/iobroker/node_modules/iobroker.test-adapter`) -1. Execute `iobroker upload test-adapter` on the ioBroker host - -## Changelog - -### 0.0.1 -* (Al Calzone) initial release - -## License -MIT License - -Copyright (c) 2025 Al Calzone - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/__meta__/npm_package_files.txt b/test/baselines/adapter_JS_OfficialESLint/__meta__/npm_package_files.txt deleted file mode 100644 index 23b05f264..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/__meta__/npm_package_files.txt +++ /dev/null @@ -1,10 +0,0 @@ -admin/index_m.html -admin/style.css -admin/test-adapter.png -admin/words.js -lib/adapter-config.d.ts -io-package.json -LICENSE -main.js -package.json -README.md \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/admin/index_m.html b/test/baselines/adapter_JS_OfficialESLint/admin/index_m.html deleted file mode 100644 index f11dc3c14..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/admin/index_m.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
- -
-
- - - - -
-
- - -
- -
- - -
-
- -
- - - - \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/admin/style.css b/test/baselines/adapter_JS_OfficialESLint/admin/style.css deleted file mode 100644 index 57d4549ee..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/admin/style.css +++ /dev/null @@ -1,32 +0,0 @@ -/* You can delete those if you want. I just found them very helpful */ -* { - box-sizing: border-box -} -.m { - /* Don't cut off dropdowns! */ - overflow: initial; -} -.m.adapter-container, -.m.adapter-container > div.App { - /* Fix layout/scrolling issues with tabs */ - height: 100%; - width: 100%; - position: relative; -} -.m .select-wrapper + label { - /* The positioning for dropdown labels is messed up */ - transform: none !important; -} - -label > i[title] { - /* Display the help cursor for the tooltip icons and fix their positioning */ - cursor: help; - margin-left: 0.25em; -} - -.dropdown-content { - /* Don't wrap text in dropdowns */ - white-space: nowrap; -} - -/* Add your styles here */ diff --git a/test/baselines/adapter_JS_OfficialESLint/admin/test-adapter.png b/test/baselines/adapter_JS_OfficialESLint/admin/test-adapter.png deleted file mode 100644 index 094ebd97c36dbe2386a63dbce290c9ad6a148079..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 62376 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%0DGz6 zyl7fq5kK_OTB5a+j%#*OqHtMgmMFAPfM%z1y`n*X-04|c~XNtbq*59PL zf2GK(^`44LhR@%s*209os!^-XK1;F{M*IZtESo=}65To~n+-bu0+>z?fZnkVoW}$_ zstfB}2u}&7L#c0_Qg^2;} z@gmc!u&D{a-Sk8a)1*Chcx+8~_M64opd2kxtHB|6*!4W&cOrWX;Yw>1GmvfN@nFO$k&$he)RKxo(&m zmF!n>4Y$>igYg0$%*vf6XAlg%u=W>lZr*&`_JyS?Qqf|(d#rIqm-Q+bvDD6`E^Yg! zCA@nJ@*O;Lp9NU-Q#KY#ME2A^kx^vHZXmc#(4jcbti!v_B%%%N@|q{z#cN2rxd7uE zDS;G&(m*%4MYSXuokFeyQS{I{6O4v&@v{hDbb4J?0ftY(dI z%St%e+#=VPIyA5VF9`5)D3bY&tL9gpe{Xha)$de%8pXLvHB( zu+0=Wc6d1^KBxb%4tv#uqG^B_>&ZHIJQN>7!}krzA!iGj%=dq0lHKGFRI$Ah-NT8N RBrxDlMnX}%QuJ%k{{yPv^Xvcs diff --git a/test/baselines/adapter_JS_OfficialESLint/admin/words.js b/test/baselines/adapter_JS_OfficialESLint/admin/words.js deleted file mode 100644 index 4517fef89..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/admin/words.js +++ /dev/null @@ -1,46 +0,0 @@ -/* eslint no-unused-vars: off */ -/* eslint no-global-assign: off */ -/* global systemDictionary */ -"use strict"; - -systemDictionary = { - "test-adapter adapter settings": { - "en": "Adapter settings for test-adapter", - "de": "Adaptereinstellungen für test-adapter", - "ru": "Настройки адаптера для test-adapter", - "pt": "Configurações do adaptador para test-adapter", - "nl": "Adapterinstellingen voor test-adapter", - "fr": "Paramètres d'adaptateur pour test-adapter", - "it": "Impostazioni dell'adattatore per test-adapter", - "es": "Ajustes del adaptador para test-adapter", - "pl": "Ustawienia adaptera dla test-adapter", - "uk": "Налаштування адаптера для test-adapter", - "zh-cn": "test-adapter的适配器设置" - }, - "option1": { - "en": "option1", - "de": "Mock translation of 'option1' to 'de'", - "ru": "Mock translation of 'option1' to 'ru'", - "pt": "Mock translation of 'option1' to 'pt'", - "nl": "Mock translation of 'option1' to 'nl'", - "fr": "Mock translation of 'option1' to 'fr'", - "it": "Mock translation of 'option1' to 'it'", - "es": "Mock translation of 'option1' to 'es'", - "pl": "Mock translation of 'option1' to 'pl'", - "uk": "Mock translation of 'option1' to 'uk'", - "zh-cn": "Mock translation of 'option1' to 'zh-cn'" - }, - "option2": { - "en": "option2", - "de": "Mock translation of 'option2' to 'de'", - "ru": "Mock translation of 'option2' to 'ru'", - "pt": "Mock translation of 'option2' to 'pt'", - "nl": "Mock translation of 'option2' to 'nl'", - "fr": "Mock translation of 'option2' to 'fr'", - "it": "Mock translation of 'option2' to 'it'", - "es": "Mock translation of 'option2' to 'es'", - "pl": "Mock translation of 'option2' to 'pl'", - "uk": "Mock translation of 'option2' to 'uk'", - "zh-cn": "Mock translation of 'option2' to 'zh-cn'" - } -}; \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/io-package.json b/test/baselines/adapter_JS_OfficialESLint/io-package.json deleted file mode 100644 index 53cff6aab..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/io-package.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "common": { - "name": "test-adapter", - "version": "0.0.1", - "news": { - "0.0.1": { - "en": "initial release", - "de": "Erstveröffentlichung", - "ru": "Начальная версия", - "pt": "lançamento inicial", - "nl": "Eerste uitgave", - "fr": "Première version", - "it": "Versione iniziale", - "es": "Versión inicial", - "pl": "Pierwsze wydanie", - "uk": "Початкова версія", - "zh-cn": "首次出版" - } - }, - "titleLang": { - "en": "Is used to test the creator", - "de": "Mock translation of 'Is used to test the creator' to 'de'", - "ru": "Mock translation of 'Is used to test the creator' to 'ru'", - "pt": "Mock translation of 'Is used to test the creator' to 'pt'", - "nl": "Mock translation of 'Is used to test the creator' to 'nl'", - "fr": "Mock translation of 'Is used to test the creator' to 'fr'", - "it": "Mock translation of 'Is used to test the creator' to 'it'", - "es": "Mock translation of 'Is used to test the creator' to 'es'", - "pl": "Mock translation of 'Is used to test the creator' to 'pl'", - "uk": "Mock translation of 'Is used to test the creator' to 'uk'", - "zh-cn": "Mock translation of 'Is used to test the creator' to 'zh-cn'" - }, - "desc": { - "en": "test-adapter", - "de": "Mock translation of 'test-adapter' to 'de'", - "ru": "Mock translation of 'test-adapter' to 'ru'", - "pt": "Mock translation of 'test-adapter' to 'pt'", - "nl": "Mock translation of 'test-adapter' to 'nl'", - "fr": "Mock translation of 'test-adapter' to 'fr'", - "it": "Mock translation of 'test-adapter' to 'it'", - "es": "Mock translation of 'test-adapter' to 'es'", - "pl": "Mock translation of 'test-adapter' to 'pl'", - "uk": "Mock translation of 'test-adapter' to 'uk'", - "zh-cn": "Mock translation of 'test-adapter' to 'zh-cn'" - }, - "authors": [ - "Al Calzone " - ], - "keywords": [ - "template", - "automation", - "IoT", - "integration" - ], - "licenseInformation": { - "type": "free", - "license": "MIT" - }, - "platform": "Javascript/Node.js", - "icon": "test-adapter.png", - "enabled": true, - "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", - "readme": "https://github.com/AlCalzone/ioBroker.test-adapter/blob/main/README.md", - "loglevel": "info", - "tier": 3, - "mode": "daemon", - "type": "general", - "compact": true, - "connectionType": "local", - "dataSource": "push", - "adminUI": { - "config": "materialize" - }, - "dependencies": [ - { - "js-controller": ">=6.0.11" - } - ], - "globalDependencies": [ - { - "admin": ">=7.0.23" - } - ] - }, - "native": { - "option1": true, - "option2": "42" - }, - "objects": [], - "instanceObjects": [] -} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/lib/adapter-config.d.ts b/test/baselines/adapter_JS_OfficialESLint/lib/adapter-config.d.ts deleted file mode 100644 index ae458daf3..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/lib/adapter-config.d.ts +++ /dev/null @@ -1,19 +0,0 @@ -// This file extends the AdapterConfig type from "@types/iobroker" -// using the actual properties present in io-package.json -// in order to provide typings for adapter.config properties - -import { native } from "../io-package.json"; - -type _AdapterConfig = typeof native; - -// Augment the globally declared type ioBroker.AdapterConfig -declare global { - namespace ioBroker { - interface AdapterConfig extends _AdapterConfig { - // Do not enter anything here! - } - } -} - -// this is required so the above AdapterConfig is found by TypeScript / type checking -export {}; \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/main.js b/test/baselines/adapter_JS_OfficialESLint/main.js deleted file mode 100644 index 723fa962b..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/main.js +++ /dev/null @@ -1,167 +0,0 @@ -"use strict"; - -/* - * Created with @iobroker/create-adapter v2.6.5 - */ - -// The adapter-core module gives you access to the core ioBroker functions -// you need to create an adapter -const utils = require("@iobroker/adapter-core"); - -// Load your modules here, e.g.: -// const fs = require("fs"); - -class TestAdapter extends utils.Adapter { - - /** - * @param {Partial} [options={}] - */ - constructor(options) { - super({ - ...options, - name: "test-adapter", - }); - this.on("ready", this.onReady.bind(this)); - this.on("stateChange", this.onStateChange.bind(this)); - // this.on("objectChange", this.onObjectChange.bind(this)); - // this.on("message", this.onMessage.bind(this)); - this.on("unload", this.onUnload.bind(this)); - } - - /** - * Is called when databases are connected and adapter received configuration. - */ - async onReady() { - // Initialize your adapter here - - // The adapters config (in the instance object everything under the attribute "native") is accessible via - // this.config: - this.log.debug("config option1: " + this.config.option1); - this.log.debug("config option2: " + this.config.option2); - - /* - For every state in the system there has to be also an object of type state - Here a simple template for a boolean variable named "testVariable" - Because every adapter instance uses its own unique namespace variable names can't collide with other adapters variables - */ - await this.setObjectNotExistsAsync("testVariable", { - type: "state", - common: { - name: "testVariable", - type: "boolean", - role: "indicator", - read: true, - write: true, - }, - native: {}, - }); - - // In order to get state updates, you need to subscribe to them. The following line adds a subscription for our variable we have created above. - this.subscribeStates("testVariable"); - // You can also add a subscription for multiple states. The following line watches all states starting with "lights." - // this.subscribeStates("lights.*"); - // Or, if you really must, you can also watch all states. Don't do this if you don't need to. Otherwise this will cause a lot of unnecessary load on the system: - // this.subscribeStates("*"); - - /* - setState examples - you will notice that each setState will cause the stateChange event to fire (because of above subscribeStates cmd) - */ - // the variable testVariable is set to true as command (ack=false) - await this.setState("testVariable", true); - - // same thing, but the value is flagged "ack" - // ack should be always set to true if the value is received from or acknowledged from the target system - await this.setState("testVariable", { val: true, ack: true }); - - // same thing, but the state is deleted after 30s (getState will return null afterwards) - await this.setState("testVariable", { val: true, ack: true, expire: 30 }); - - // examples for the checkPassword/checkGroup functions - const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: " + pwdResult); - - const gropupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: " + gropupResult); - } - - /** - * Is called when adapter shuts down - callback has to be called under any circumstances! - * @param {() => void} callback - */ - onUnload(callback) { - try { - // Here you must clear all timeouts or intervals that may still be active - // clearTimeout(timeout1); - // clearTimeout(timeout2); - // ... - // clearInterval(interval1); - - callback(); - } catch (_e) { - callback(); - } - } - - // If you need to react to object changes, uncomment the following block and the corresponding line in the constructor. - // You also need to subscribe to the objects with `this.subscribeObjects`, similar to `this.subscribeStates`. - // /** - // * Is called if a subscribed object changes - // * @param {string} id - // * @param {ioBroker.Object | null | undefined} obj - // */ - // onObjectChange(id, obj) { - // if (obj) { - // // The object was changed - // this.log.info(`object ${id} changed: ${JSON.stringify(obj)}`); - // } else { - // // The object was deleted - // this.log.info(`object ${id} deleted`); - // } - // } - - /** - * Is called if a subscribed state changes - * @param {string} id - * @param {ioBroker.State | null | undefined} state - */ - onStateChange(id, state) { - if (state) { - // The state was changed - this.log.info(`state ${id} changed: ${state.val} (ack = ${state.ack})`); - } else { - // The state was deleted - this.log.info(`state ${id} deleted`); - } - } - - // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. - // /** - // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... - // * Using this method requires "common.messagebox" property to be set to true in io-package.json - // * @param {ioBroker.Message} obj - // */ - // onMessage(obj) { - // if (typeof obj === "object" && obj.message) { - // if (obj.command === "send") { - // // e.g. send email or pushover or whatever - // this.log.info("send command"); - - // // Send response in callback if required - // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); - // } - // } - // } - -} - -if (require.main !== module) { - // Export the constructor in compact mode - /** - * @param {Partial} [options={}] - */ - module.exports = (options) => new TestAdapter(options); -} else { - // otherwise start the instance directly - new TestAdapter(); -} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/main.test.js b/test/baselines/adapter_JS_OfficialESLint/main.test.js deleted file mode 100644 index 307b4c62f..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/main.test.js +++ /dev/null @@ -1,30 +0,0 @@ -"use strict"; - -/** - * This is a dummy TypeScript test file using chai and mocha - * - * It's automatically excluded from npm and its build output is excluded from both git and npm. - * It is advised to test all your modules with accompanying *.test.js-files - */ - -// tslint:disable:no-unused-expression - -const { expect } = require("chai"); -// import { functionToTest } from "./moduleToTest"; - -describe("module to test => function to test", () => { - // initializing logic - const expected = 5; - - it(`should return ${expected}`, () => { - const result = 5; - // assign result a value from functionToTest - expect(result).to.equal(expected); - // or using the should() syntax - result.should.equal(expected); - }); - // ... more tests => it - -}); - -// ... more test suites => describe diff --git a/test/baselines/adapter_JS_OfficialESLint/package.json b/test/baselines/adapter_JS_OfficialESLint/package.json deleted file mode 100644 index 48866ec22..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/package.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "name": "iobroker.test-adapter", - "version": "0.0.1", - "description": "test-adapter", - "author": { - "name": "Al Calzone", - "email": "al@calzo.ne" - }, - "contributors": [], - "homepage": "https://github.com/AlCalzone/ioBroker.test-adapter", - "license": "MIT", - "keywords": [ - "template", - "automation", - "IoT", - "integration" - ], - "repository": { - "type": "git", - "url": "https://github.com/AlCalzone/ioBroker.test-adapter.git" - }, - "engines": { - "node": ">= 20" - }, - "dependencies": { - "@iobroker/adapter-core": "^3.3.2" - }, - "devDependencies": { - "@iobroker/adapter-dev": "^1.5.0", - "@iobroker/eslint-config": "^2.2.0", - "@iobroker/testing": "^5.1.1" - }, - "main": "main.js", - "files": [ - "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).{json,json5}", - "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}", - "lib/", - "www/", - "io-package.json", - "LICENSE", - "main.js" - ], - "scripts": { - "test:js": "mocha --config test/mocharc.custom.json \"{!(node_modules|test)/**/*.test.js,*.test.js,test/**/test!(PackageFiles|Startup).js}\"", - "test:package": "mocha test/package --exit", - "test:integration": "mocha test/integration --exit", - "test": "npm run test:js && npm run test:package", - "lint": "eslint .", - "translate": "translate-adapter" - }, - "bugs": { - "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" - }, - "readmeFilename": "README.md" -} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/test/integration.js b/test/baselines/adapter_JS_OfficialESLint/test/integration.js deleted file mode 100644 index 986936fac..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/test/integration.js +++ /dev/null @@ -1,5 +0,0 @@ -const path = require("path"); -const { tests } = require("@iobroker/testing"); - -// Run integration tests - See https://github.com/ioBroker/testing for a detailed explanation and further options -tests.integration(path.join(__dirname, "..")); \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/test/mocha.setup.js b/test/baselines/adapter_JS_OfficialESLint/test/mocha.setup.js deleted file mode 100644 index b3b963114..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/test/mocha.setup.js +++ /dev/null @@ -1,14 +0,0 @@ -// Don't silently swallow unhandled rejections -process.on("unhandledRejection", (e) => { - throw e; -}); - -// enable the should interface with sinon -// and load chai-as-promised and sinon-chai by default -const sinonChai = require("sinon-chai"); -const chaiAsPromised = require("chai-as-promised"); -const { should, use } = require("chai"); - -should(); -use(sinonChai); -use(chaiAsPromised); \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/test/mocharc.custom.json b/test/baselines/adapter_JS_OfficialESLint/test/mocharc.custom.json deleted file mode 100644 index 6e49c601b..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/test/mocharc.custom.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "require": [ - "test/mocha.setup.js" - ], - "watch-files": [ - "!(node_modules|test)/**/*.test.js", - "*.test.js", - "test/**/test!(PackageFiles|Startup).js" - ] -} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/test/package.js b/test/baselines/adapter_JS_OfficialESLint/test/package.js deleted file mode 100644 index 3a48e0449..000000000 --- a/test/baselines/adapter_JS_OfficialESLint/test/package.js +++ /dev/null @@ -1,5 +0,0 @@ -const path = require("path"); -const { tests } = require("@iobroker/testing"); - -// Validate the package files -tests.packageFiles(path.join(__dirname, "..")); diff --git a/test/baselines/adapter_TS_OfficialESLint/.create-adapter.json b/test/baselines/adapter_TS_OfficialESLint/.create-adapter.json deleted file mode 100644 index 64da96c2b..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/.create-adapter.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "cli": true, - "target": "directory", - "adapterName": "test-adapter", - "title": "Is used to test the creator", - "startMode": "daemon", - "features": [ - "adapter" - ], - "connectionIndicator": "no", - "connectionType": "local", - "dataSource": "push", - "adminFeatures": [], - "type": "general", - "language": "TypeScript", - "adminUi": "html", - "tabReact": "no", - "releaseScript": "no", - "tools": [ - "ESLint" - ], - "eslintConfig": "official", - "indentation": "Tab", - "quotes": "double", - "authorName": "Al Calzone", - "authorGithub": "AlCalzone", - "authorEmail": "al@calzo.ne", - "gitRemoteProtocol": "HTTPS", - "dependabot": "yes", - "gitCommit": "no", - "defaultBranch": "main", - "license": "MIT License", - "licenseInformation": { - "type": "free", - "license": "MIT" - }, - "creatorVersion": "2.6.5" -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/.eslintignore b/test/baselines/adapter_TS_OfficialESLint/.eslintignore deleted file mode 100644 index d7b786517..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/.eslintignore +++ /dev/null @@ -1,3 +0,0 @@ -build/ -**/.eslintrc.js -admin/words.js \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/.eslintrc.js b/test/baselines/adapter_TS_OfficialESLint/.eslintrc.js deleted file mode 100644 index 9aacb8b36..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/.eslintrc.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - extends: ["@iobroker"], -}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md b/test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 895613958..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -name: Bug report -about: Something is not working as it should -title: '' -labels: '' -assignees: '' ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '...' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots & Logfiles** -If applicable, add screenshots and logfiles to help explain your problem. - -**Versions:** - - Adapter version: - - JS-Controller version: - - Node version: - - Operating system: - -**Additional context** -Add any other context about the problem here. diff --git a/test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml b/test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index d7cfe5940..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,5 +0,0 @@ -blank_issues_enabled: false -contact_links: - - name: ioBroker Community - url: https://forum.iobroker.net/ - about: Please ask and answer questions here. \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/.github/auto-merge.yml b/test/baselines/adapter_TS_OfficialESLint/.github/auto-merge.yml deleted file mode 100644 index 4f6d185f0..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/.github/auto-merge.yml +++ /dev/null @@ -1,17 +0,0 @@ -# Configure here which dependency updates should be merged automatically. -# The recommended configuration is the following: -- match: - # Only merge patches for production dependencies - dependency_type: production - update_type: "semver:patch" -- match: - # Except for security fixes, here we allow minor patches - dependency_type: production - update_type: "security:minor" -- match: - # and development dependencies can have a minor update, too - dependency_type: development - update_type: "semver:minor" - -# The syntax is based on the legacy dependabot v1 automerged_updates syntax, see: -# https://dependabot.com/docs/config-file/#automerged_updates diff --git a/test/baselines/adapter_TS_OfficialESLint/.github/dependabot.yml b/test/baselines/adapter_TS_OfficialESLint/.github/dependabot.yml deleted file mode 100644 index c165a6a47..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/.github/dependabot.yml +++ /dev/null @@ -1,22 +0,0 @@ -version: 2 -updates: - - package-ecosystem: npm - directory: "/" - schedule: - interval: monthly - time: "04:00" - timezone: Europe/Berlin - open-pull-requests-limit: 5 - assignees: - - AlCalzone - versioning-strategy: increase - - - package-ecosystem: github-actions - directory: "/" - schedule: - interval: monthly - time: "04:00" - timezone: Europe/Berlin - open-pull-requests-limit: 5 - assignees: - - AlCalzone diff --git a/test/baselines/adapter_TS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml b/test/baselines/adapter_TS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml deleted file mode 100644 index baeae23b5..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Automatically merge Dependabot PRs when version comparison is within the range -# that is configured in .github/auto-merge.yml - -name: Auto-Merge Dependabot PRs - -on: - # WARNING: This needs to be run in the PR base, DO NOT build untrusted code in this action - # details under https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/ - pull_request_target: - -jobs: - auto-merge: - if: github.actor == 'dependabot[bot]' - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Check if PR should be auto-merged - uses: ahmadnassri/action-dependabot-auto-merge@v2 - with: - # In order to use this, you need to go to https://github.com/settings/tokens and - # create a Personal Access Token with the permission "public_repo". - # Enter this token in your repository settings under "Secrets" and name it AUTO_MERGE_TOKEN - github-token: ${{ secrets.AUTO_MERGE_TOKEN }} - # By default, squash and merge, so Github chooses nice commit messages - command: squash and merge diff --git a/test/baselines/adapter_TS_OfficialESLint/.github/workflows/test-and-release.yml b/test/baselines/adapter_TS_OfficialESLint/.github/workflows/test-and-release.yml deleted file mode 100644 index 0c48ade1a..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/.github/workflows/test-and-release.yml +++ /dev/null @@ -1,96 +0,0 @@ -name: Test and Release - -# Run this job on all pushes and pull requests -# as well as tags with a semantic version -on: - push: - branches: - - "main" - tags: - # normal versions - - "v[0-9]+.[0-9]+.[0-9]+" - # pre-releases - - "v[0-9]+.[0-9]+.[0-9]+-**" - pull_request: {} - -# Cancel previous PR/branch runs when a new commit is pushed -concurrency: - group: ${{ github.ref }} - cancel-in-progress: true - -jobs: - # Performs quick checks before the expensive test runs - check-and-lint: - if: contains(github.event.head_commit.message, '[skip ci]') == false - - runs-on: ubuntu-latest - - steps: - - uses: ioBroker/testing-action-check@v1 - with: - node-version: '20.x' - # Uncomment the following line if your adapter cannot be installed using 'npm ci' - # install-command: 'npm install' - type-checking: true - lint: true - - # Runs adapter tests on all supported node versions and OSes - adapter-tests: - if: contains(github.event.head_commit.message, '[skip ci]') == false - - runs-on: ${{ matrix.os }} - strategy: - matrix: - node-version: [20.x, 22.x, 24.x] - os: [ubuntu-latest, windows-latest, macos-latest] - - steps: - - uses: ioBroker/testing-action-adapter@v1 - with: - node-version: ${{ matrix.node-version }} - os: ${{ matrix.os }} - # Uncomment the following line if your adapter cannot be installed using 'npm ci' - # install-command: 'npm install' - build: true - -# TODO: To enable automatic npm releases, create a token on npmjs.org -# Enter this token as a GitHub secret (with name NPM_TOKEN) in the repository options -# Then uncomment the following block: - -# # Deploys the final package to NPM -# deploy: -# needs: [check-and-lint, adapter-tests] -# -# # Trigger this step only when a commit on any branch is tagged with a version number -# if: | -# contains(github.event.head_commit.message, '[skip ci]') == false && -# github.event_name == 'push' && -# startsWith(github.ref, 'refs/tags/v') -# -# runs-on: ubuntu-latest -# -# # Write permissions are required to create Github releases -# permissions: -# contents: write -# -# steps: -# - uses: ioBroker/testing-action-deploy@v1 -# with: -# node-version: '20.x' -# # Uncomment the following line if your adapter cannot be installed using 'npm ci' -# # install-command: 'npm install' -# build: true -# npm-token: ${{ secrets.NPM_TOKEN }} -# github-token: ${{ secrets.GITHUB_TOKEN }} -# -# # When using Sentry for error reporting, Sentry can be informed about new releases -# # To enable create a API-Token in Sentry (User settings, API keys) -# # Enter this token as a GitHub secret (with name SENTRY_AUTH_TOKEN) in the repository options -# # Then uncomment and customize the following block: -# sentry: true -# sentry-token: ${{ secrets.SENTRY_AUTH_TOKEN }} -# sentry-project: "iobroker-test-adapter" -# sentry-version-prefix: "iobroker.test-adapter" -# sentry-sourcemap-paths: "build/" -# # If your sentry project is linked to a GitHub repository, you can enable the following option -# # sentry-github-integration: true diff --git a/test/baselines/adapter_TS_OfficialESLint/.gitignore b/test/baselines/adapter_TS_OfficialESLint/.gitignore deleted file mode 100644 index 80c28aa9d..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -# No dot-directories except github/vscode -.*/ -!.vscode/ -!.github/ - -*.code-workspace -node_modules -nbproject - -# npm package files -iobroker.*.tgz - -Thumbs.db -.commitinfo - -# i18n intermediate files -admin/i18n/flat.txt -admin/i18n/*/flat.txt \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/.vscode/extensions.json b/test/baselines/adapter_TS_OfficialESLint/.vscode/extensions.json deleted file mode 100644 index 2c6ac5b31..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/.vscode/extensions.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "recommendations": [ - "dbaeumer.vscode-eslint", - "esbenp.prettier-vscode" - ] -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/.vscode/settings.json b/test/baselines/adapter_TS_OfficialESLint/.vscode/settings.json deleted file mode 100644 index 854736cc0..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/.vscode/settings.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "typescript.tsdk": "node_modules/typescript/lib", - "eslint.enable": true, - "json.schemas": [ - { - "fileMatch": [ - "io-package.json" - ], - "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.js-controller/master/schemas/io-package.json" - }, - { - "fileMatch": [ - "admin/jsonConfig.json", - "admin/jsonConfig.json5", - "admin/jsonCustom.json", - "admin/jsonCustom.json5", - "admin/jsonTab.json", - "admin/jsonTab.json5" - ], - "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.admin/master/packages/jsonConfig/schemas/jsonConfig.json" - } - ] -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/LICENSE b/test/baselines/adapter_TS_OfficialESLint/LICENSE deleted file mode 100644 index 27c9a624d..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2025 Al Calzone - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/test/baselines/adapter_TS_OfficialESLint/README.md b/test/baselines/adapter_TS_OfficialESLint/README.md deleted file mode 100644 index f57bba69c..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/README.md +++ /dev/null @@ -1,132 +0,0 @@ -![Logo](admin/test-adapter.png) -# ioBroker.test-adapter - -[![NPM version](https://img.shields.io/npm/v/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) -[![Downloads](https://img.shields.io/npm/dm/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) -![Number of Installations](https://iobroker.live/badges/test-adapter-installed.svg) -![Current version in stable repository](https://iobroker.live/badges/test-adapter-stable.svg) - -[![NPM](https://nodei.co/npm/iobroker.test-adapter.png?downloads=true)](https://nodei.co/npm/iobroker.test-adapter/) - -**Tests:** ![Test and Release](https://github.com/AlCalzone/ioBroker.test-adapter/workflows/Test%20and%20Release/badge.svg) - -## test-adapter adapter for ioBroker - -Describe your project here - -## Developer manual -This section is intended for the developer. It can be deleted later. - -### DISCLAIMER - -Please make sure that you consider copyrights and trademarks when you use names or logos of a company and add a disclaimer to your README. -You can check other adapters for examples or ask in the developer community. Using a name or logo of a company without permission may cause legal problems for you. - -### Getting started - -You are almost done, only a few steps left: -1. Create a new repository on GitHub with the name `ioBroker.test-adapter` -1. Initialize the current folder as a new git repository: - ```bash - git init -b main - git add . - git commit -m "Initial commit" - ``` -1. Link your local repository with the one on GitHub: - ```bash - git remote add origin https://github.com/AlCalzone/ioBroker.test-adapter - ``` - -1. Push all files to the GitHub repo: - ```bash - git push origin main - ``` -1. Add a new secret under https://github.com/AlCalzone/ioBroker.test-adapter/settings/secrets. It must be named `AUTO_MERGE_TOKEN` and contain a personal access token with push access to the repository, e.g. yours. You can create a new token under https://github.com/settings/tokens. - -1. Head over to [src/main.ts](src/main.ts) and start programming! - -### Best Practices -We've collected some [best practices](https://github.com/ioBroker/ioBroker.repositories#development-and-coding-best-practices) regarding ioBroker development and coding in general. If you're new to ioBroker or Node.js, you should -check them out. If you're already experienced, you should also take a look at them - you might learn something new :) - -### Scripts in `package.json` -Several npm scripts are predefined for your convenience. You can run them using `npm run ` -| Script name | Description | -|-------------|-------------| -| `build` | Compile the TypeScript sources. | -| `watch` | Compile the TypeScript sources and watch for changes. | -| `test:ts` | Executes the tests you defined in `*.test.ts` files. | -| `test:package` | Ensures your `package.json` and `io-package.json` are valid. | -| `test:integration` | Tests the adapter startup with an actual instance of ioBroker. | -| `test` | Performs a minimal test run on package files and your tests. | -| `check` | Performs a type-check on your code (without compiling anything). | -| `lint` | Runs `ESLint` to check your code for formatting errors and potential bugs. | -| `translate` | Translates texts in your adapter to all required languages, see [`@iobroker/adapter-dev`](https://github.com/ioBroker/adapter-dev#manage-translations) for more details. | - -### Configuring the compilation -The adapter template uses [esbuild](https://esbuild.github.io/) to compile TypeScript and/or React code. You can configure many compilation settings -either in `tsconfig.json` or by changing options for the build tasks. These options are described in detail in the -[`@iobroker/adapter-dev` documentation](https://github.com/ioBroker/adapter-dev#compile-adapter-files). - -### Writing tests -When done right, testing code is invaluable, because it gives you the -confidence to change your code while knowing exactly if and when -something breaks. A good read on the topic of test-driven development -is https://hackernoon.com/introduction-to-test-driven-development-tdd-61a13bc92d92. -Although writing tests before the code might seem strange at first, but it has very -clear upsides. - -The template provides you with basic tests for the adapter startup and package files. -It is recommended that you add your own tests into the mix. - -### Publishing the adapter -Using GitHub Actions, you can enable automatic releases on npm whenever you push a new git tag that matches the form -`v..`. We **strongly recommend** that you do. The necessary steps are described in `.github/workflows/test-and-release.yml`. - -To get your adapter released in ioBroker, please refer to the documentation -of [ioBroker.repositories](https://github.com/ioBroker/ioBroker.repositories#requirements-for-adapter-to-get-added-to-the-latest-repository). - -### Test the adapter manually on a local ioBroker installation -In order to install the adapter locally without publishing, the following steps are recommended: -1. Create a tarball from your dev directory: - ```bash - npm pack - ``` -1. Upload the resulting file to your ioBroker host -1. Install it locally (The paths are different on Windows): - ```bash - cd /opt/iobroker - npm i /path/to/tarball.tgz - ``` - -For later updates, the above procedure is not necessary. Just do the following: -1. Overwrite the changed files in the adapter directory (`/opt/iobroker/node_modules/iobroker.test-adapter`) -1. Execute `iobroker upload test-adapter` on the ioBroker host - -## Changelog - -### 0.0.1 -* (Al Calzone) initial release - -## License -MIT License - -Copyright (c) 2025 Al Calzone - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/__meta__/npm_package_files.txt b/test/baselines/adapter_TS_OfficialESLint/__meta__/npm_package_files.txt deleted file mode 100644 index 7503a378d..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/__meta__/npm_package_files.txt +++ /dev/null @@ -1,8 +0,0 @@ -admin/index_m.html -admin/style.css -admin/test-adapter.png -admin/words.js -io-package.json -LICENSE -package.json -README.md \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/admin/admin.d.ts b/test/baselines/adapter_TS_OfficialESLint/admin/admin.d.ts deleted file mode 100644 index 41f934f4c..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/admin/admin.d.ts +++ /dev/null @@ -1,93 +0,0 @@ -declare let systemDictionary: Record>; - -declare let load: (settings: Record, onChange: (hasChanges: boolean) => void) => void; -declare let save: (callback: (settings: Record) => void) => void; - -// make load and save exist on the window object -interface Window { - load: typeof load; - save: typeof save; -} - -declare const instance: number; -declare const adapter: string; -/** Translates text */ -declare function _(text: string, arg1?: string, arg2?: string, arg3?: string): string; -declare const socket: ioBrokerSocket; -declare function sendTo( - instance: any | null, - command: string, - message: any, - callback: (result: SendToResult) => void | Promise, -): void; - -interface SendToResult { - error?: string | Error; - result?: any; -} - -// tslint:disable-next-line:class-name -interface ioBrokerSocket { - emit( - command: "subscribeObjects", - pattern: string, - callback?: (err?: string) => void | Promise, - ): void; - emit( - command: "subscribeStates", - pattern: string, - callback?: (err?: string) => void | Promise, - ): void; - emit( - command: "unsubscribeObjects", - pattern: string, - callback?: (err?: string) => void | Promise, - ): void; - emit( - command: "unsubscribeStates", - pattern: string, - callback?: (err?: string) => void | Promise, - ): void; - - emit( - event: "getObjectView", - view: "system", - type: "device", - options: ioBroker.GetObjectViewParams, - callback: ( - err: string | undefined, - result?: any, - ) => void | Promise, - ): void; - emit( - event: "getStates", - callback: ( - err: string | undefined, - result?: Record, - ) => void, - ): void; - emit( - event: "getState", - id: string, - callback: (err: string | undefined, result?: ioBroker.State) => void, - ): void; - emit( - event: "setState", - id: string, - state: unknown, - callback: (err: string | undefined, result?: any) => void, - ): void; - - on(event: "objectChange", handler: ioBroker.ObjectChangeHandler): void; - on(event: "stateChange", handler: ioBroker.StateChangeHandler): void; - removeEventHandler( - event: "objectChange", - handler: ioBroker.ObjectChangeHandler, - ): void; - removeEventHandler( - event: "stateChange", - handler: ioBroker.StateChangeHandler, - ): void; - - // TODO: other events -} diff --git a/test/baselines/adapter_TS_OfficialESLint/admin/index_m.html b/test/baselines/adapter_TS_OfficialESLint/admin/index_m.html deleted file mode 100644 index f11dc3c14..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/admin/index_m.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
- -
-
- - - - -
-
- - -
- -
- - -
-
- -
- - - - \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/admin/style.css b/test/baselines/adapter_TS_OfficialESLint/admin/style.css deleted file mode 100644 index 57d4549ee..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/admin/style.css +++ /dev/null @@ -1,32 +0,0 @@ -/* You can delete those if you want. I just found them very helpful */ -* { - box-sizing: border-box -} -.m { - /* Don't cut off dropdowns! */ - overflow: initial; -} -.m.adapter-container, -.m.adapter-container > div.App { - /* Fix layout/scrolling issues with tabs */ - height: 100%; - width: 100%; - position: relative; -} -.m .select-wrapper + label { - /* The positioning for dropdown labels is messed up */ - transform: none !important; -} - -label > i[title] { - /* Display the help cursor for the tooltip icons and fix their positioning */ - cursor: help; - margin-left: 0.25em; -} - -.dropdown-content { - /* Don't wrap text in dropdowns */ - white-space: nowrap; -} - -/* Add your styles here */ diff --git a/test/baselines/adapter_TS_OfficialESLint/admin/test-adapter.png b/test/baselines/adapter_TS_OfficialESLint/admin/test-adapter.png deleted file mode 100644 index 094ebd97c36dbe2386a63dbce290c9ad6a148079..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 62376 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%0DGz6 zyl7fq5kK_OTB5a+j%#*OqHtMgmMFAPfM%z1y`n*X-04|c~XNtbq*59PL zf2GK(^`44LhR@%s*209os!^-XK1;F{M*IZtESo=}65To~n+-bu0+>z?fZnkVoW}$_ zstfB}2u}&7L#c0_Qg^2;} z@gmc!u&D{a-Sk8a)1*Chcx+8~_M64opd2kxtHB|6*!4W&cOrWX;Yw>1GmvfN@nFO$k&$he)RKxo(&m zmF!n>4Y$>igYg0$%*vf6XAlg%u=W>lZr*&`_JyS?Qqf|(d#rIqm-Q+bvDD6`E^Yg! zCA@nJ@*O;Lp9NU-Q#KY#ME2A^kx^vHZXmc#(4jcbti!v_B%%%N@|q{z#cN2rxd7uE zDS;G&(m*%4MYSXuokFeyQS{I{6O4v&@v{hDbb4J?0ftY(dI z%St%e+#=VPIyA5VF9`5)D3bY&tL9gpe{Xha)$de%8pXLvHB( zu+0=Wc6d1^KBxb%4tv#uqG^B_>&ZHIJQN>7!}krzA!iGj%=dq0lHKGFRI$Ah-NT8N RBrxDlMnX}%QuJ%k{{yPv^Xvcs diff --git a/test/baselines/adapter_TS_OfficialESLint/admin/tsconfig.json b/test/baselines/adapter_TS_OfficialESLint/admin/tsconfig.json deleted file mode 100644 index 49fb013d2..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/admin/tsconfig.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "extends": "../tsconfig.json", - "include": [ - "./admin.d.ts", - "./**/*.js", - // Include the adapter-config definition if it exists. - // It should be at either on of these paths: - "../lib/adapter-config.d.ts", // JS - "../src/lib/adapter-config.d.ts", // TS - ] -} diff --git a/test/baselines/adapter_TS_OfficialESLint/admin/words.js b/test/baselines/adapter_TS_OfficialESLint/admin/words.js deleted file mode 100644 index 4517fef89..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/admin/words.js +++ /dev/null @@ -1,46 +0,0 @@ -/* eslint no-unused-vars: off */ -/* eslint no-global-assign: off */ -/* global systemDictionary */ -"use strict"; - -systemDictionary = { - "test-adapter adapter settings": { - "en": "Adapter settings for test-adapter", - "de": "Adaptereinstellungen für test-adapter", - "ru": "Настройки адаптера для test-adapter", - "pt": "Configurações do adaptador para test-adapter", - "nl": "Adapterinstellingen voor test-adapter", - "fr": "Paramètres d'adaptateur pour test-adapter", - "it": "Impostazioni dell'adattatore per test-adapter", - "es": "Ajustes del adaptador para test-adapter", - "pl": "Ustawienia adaptera dla test-adapter", - "uk": "Налаштування адаптера для test-adapter", - "zh-cn": "test-adapter的适配器设置" - }, - "option1": { - "en": "option1", - "de": "Mock translation of 'option1' to 'de'", - "ru": "Mock translation of 'option1' to 'ru'", - "pt": "Mock translation of 'option1' to 'pt'", - "nl": "Mock translation of 'option1' to 'nl'", - "fr": "Mock translation of 'option1' to 'fr'", - "it": "Mock translation of 'option1' to 'it'", - "es": "Mock translation of 'option1' to 'es'", - "pl": "Mock translation of 'option1' to 'pl'", - "uk": "Mock translation of 'option1' to 'uk'", - "zh-cn": "Mock translation of 'option1' to 'zh-cn'" - }, - "option2": { - "en": "option2", - "de": "Mock translation of 'option2' to 'de'", - "ru": "Mock translation of 'option2' to 'ru'", - "pt": "Mock translation of 'option2' to 'pt'", - "nl": "Mock translation of 'option2' to 'nl'", - "fr": "Mock translation of 'option2' to 'fr'", - "it": "Mock translation of 'option2' to 'it'", - "es": "Mock translation of 'option2' to 'es'", - "pl": "Mock translation of 'option2' to 'pl'", - "uk": "Mock translation of 'option2' to 'uk'", - "zh-cn": "Mock translation of 'option2' to 'zh-cn'" - } -}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/io-package.json b/test/baselines/adapter_TS_OfficialESLint/io-package.json deleted file mode 100644 index 53cff6aab..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/io-package.json +++ /dev/null @@ -1,91 +0,0 @@ -{ - "common": { - "name": "test-adapter", - "version": "0.0.1", - "news": { - "0.0.1": { - "en": "initial release", - "de": "Erstveröffentlichung", - "ru": "Начальная версия", - "pt": "lançamento inicial", - "nl": "Eerste uitgave", - "fr": "Première version", - "it": "Versione iniziale", - "es": "Versión inicial", - "pl": "Pierwsze wydanie", - "uk": "Початкова версія", - "zh-cn": "首次出版" - } - }, - "titleLang": { - "en": "Is used to test the creator", - "de": "Mock translation of 'Is used to test the creator' to 'de'", - "ru": "Mock translation of 'Is used to test the creator' to 'ru'", - "pt": "Mock translation of 'Is used to test the creator' to 'pt'", - "nl": "Mock translation of 'Is used to test the creator' to 'nl'", - "fr": "Mock translation of 'Is used to test the creator' to 'fr'", - "it": "Mock translation of 'Is used to test the creator' to 'it'", - "es": "Mock translation of 'Is used to test the creator' to 'es'", - "pl": "Mock translation of 'Is used to test the creator' to 'pl'", - "uk": "Mock translation of 'Is used to test the creator' to 'uk'", - "zh-cn": "Mock translation of 'Is used to test the creator' to 'zh-cn'" - }, - "desc": { - "en": "test-adapter", - "de": "Mock translation of 'test-adapter' to 'de'", - "ru": "Mock translation of 'test-adapter' to 'ru'", - "pt": "Mock translation of 'test-adapter' to 'pt'", - "nl": "Mock translation of 'test-adapter' to 'nl'", - "fr": "Mock translation of 'test-adapter' to 'fr'", - "it": "Mock translation of 'test-adapter' to 'it'", - "es": "Mock translation of 'test-adapter' to 'es'", - "pl": "Mock translation of 'test-adapter' to 'pl'", - "uk": "Mock translation of 'test-adapter' to 'uk'", - "zh-cn": "Mock translation of 'test-adapter' to 'zh-cn'" - }, - "authors": [ - "Al Calzone " - ], - "keywords": [ - "template", - "automation", - "IoT", - "integration" - ], - "licenseInformation": { - "type": "free", - "license": "MIT" - }, - "platform": "Javascript/Node.js", - "icon": "test-adapter.png", - "enabled": true, - "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", - "readme": "https://github.com/AlCalzone/ioBroker.test-adapter/blob/main/README.md", - "loglevel": "info", - "tier": 3, - "mode": "daemon", - "type": "general", - "compact": true, - "connectionType": "local", - "dataSource": "push", - "adminUI": { - "config": "materialize" - }, - "dependencies": [ - { - "js-controller": ">=6.0.11" - } - ], - "globalDependencies": [ - { - "admin": ">=7.0.23" - } - ] - }, - "native": { - "option1": true, - "option2": "42" - }, - "objects": [], - "instanceObjects": [] -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/package.json b/test/baselines/adapter_TS_OfficialESLint/package.json deleted file mode 100644 index a4bc41e5e..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/package.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "name": "iobroker.test-adapter", - "version": "0.0.1", - "description": "test-adapter", - "author": { - "name": "Al Calzone", - "email": "al@calzo.ne" - }, - "contributors": [], - "homepage": "https://github.com/AlCalzone/ioBroker.test-adapter", - "license": "MIT", - "keywords": [ - "template", - "automation", - "IoT", - "integration" - ], - "repository": { - "type": "git", - "url": "https://github.com/AlCalzone/ioBroker.test-adapter.git" - }, - "engines": { - "node": ">= 20" - }, - "dependencies": { - "@iobroker/adapter-core": "^3.3.2" - }, - "devDependencies": { - "@iobroker/adapter-dev": "^1.5.0", - "@iobroker/eslint-config": "^2.2.0", - "@iobroker/testing": "^5.1.1", - "@tsconfig/node20": "^20.1.6", - "@types/node": "^20.19.17", - "rimraf": "^6.0.1", - "source-map-support": "^0.5.21", - "ts-node": "^10.9.2", - "typescript": "~5.9.2" - }, - "main": "build/main.js", - "files": [ - "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).{json,json5}", - "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}", - "build/", - "www/", - "io-package.json", - "LICENSE" - ], - "scripts": { - "prebuild": "rimraf build", - "build": "build-adapter ts", - "watch": "build-adapter ts --watch", - "prebuild:ts": "rimraf build", - "build:ts": "build-adapter ts", - "watch:ts": "build-adapter ts --watch", - "test:ts": "mocha --config test/mocharc.custom.json src/**/*.test.ts", - "test:package": "mocha test/package --exit", - "test:integration": "mocha test/integration --exit", - "test": "npm run test:ts && npm run test:package", - "check": "tsc --noEmit", - "lint": "eslint --ext .ts src/", - "translate": "translate-adapter" - }, - "bugs": { - "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" - }, - "readmeFilename": "README.md" -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/src/lib/adapter-config.d.ts b/test/baselines/adapter_TS_OfficialESLint/src/lib/adapter-config.d.ts deleted file mode 100644 index c6c8a0e2a..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/src/lib/adapter-config.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -// This file extends the AdapterConfig type from "@types/iobroker" - -// Augment the globally declared type ioBroker.AdapterConfig -declare global { - namespace ioBroker { - interface AdapterConfig { - option1: boolean; - option2: string; - } - } -} - -// this is required so the above AdapterConfig is found by TypeScript / type checking -export {}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/src/main.test.ts b/test/baselines/adapter_TS_OfficialESLint/src/main.test.ts deleted file mode 100644 index a8d538e95..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/src/main.test.ts +++ /dev/null @@ -1,26 +0,0 @@ -/** - * This is a dummy TypeScript test file using chai and mocha - * - * It's automatically excluded from npm and its build output is excluded from both git and npm. - * It is advised to test all your modules with accompanying *.test.ts-files - */ - -import { expect } from "chai"; -// import { functionToTest } from "./moduleToTest"; - -describe("module to test => function to test", () => { - // initializing logic - const expected = 5; - - it(`should return ${expected}`, () => { - const result = 5; - // assign result a value from functionToTest - expect(result).to.equal(expected); - // or using the should() syntax - result.should.equal(expected); - }); - // ... more tests => it - -}); - -// ... more test suites => describe diff --git a/test/baselines/adapter_TS_OfficialESLint/src/main.ts b/test/baselines/adapter_TS_OfficialESLint/src/main.ts deleted file mode 100644 index d86bf77c5..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/src/main.ts +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Created with @iobroker/create-adapter v2.6.5 - */ - -// The adapter-core module gives you access to the core ioBroker functions -// you need to create an adapter -import * as utils from "@iobroker/adapter-core"; - -// Load your modules here, e.g.: -// import * as fs from "fs"; - -class TestAdapter extends utils.Adapter { - - public constructor(options: Partial = {}) { - super({ - ...options, - name: "test-adapter", - }); - this.on("ready", this.onReady.bind(this)); - this.on("stateChange", this.onStateChange.bind(this)); - // this.on("objectChange", this.onObjectChange.bind(this)); - // this.on("message", this.onMessage.bind(this)); - this.on("unload", this.onUnload.bind(this)); - } - - /** - * Is called when databases are connected and adapter received configuration. - */ - private async onReady(): Promise { - // Initialize your adapter here - - // The adapters config (in the instance object everything under the attribute "native") is accessible via - // this.config: - this.log.debug("config option1: " + this.config.option1); - this.log.debug("config option2: " + this.config.option2); - - /* - For every state in the system there has to be also an object of type state - Here a simple template for a boolean variable named "testVariable" - Because every adapter instance uses its own unique namespace variable names can't collide with other adapters variables - */ - await this.setObjectNotExistsAsync("testVariable", { - type: "state", - common: { - name: "testVariable", - type: "boolean", - role: "indicator", - read: true, - write: true, - }, - native: {}, - }); - - // In order to get state updates, you need to subscribe to them. The following line adds a subscription for our variable we have created above. - this.subscribeStates("testVariable"); - // You can also add a subscription for multiple states. The following line watches all states starting with "lights." - // this.subscribeStates("lights.*"); - // Or, if you really must, you can also watch all states. Don't do this if you don't need to. Otherwise this will cause a lot of unnecessary load on the system: - // this.subscribeStates("*"); - - /* - setState examples - you will notice that each setState will cause the stateChange event to fire (because of above subscribeStates cmd) - */ - // the variable testVariable is set to true as command (ack=false) - await this.setState("testVariable", true); - - // same thing, but the value is flagged "ack" - // ack should be always set to true if the value is received from or acknowledged from the target system - await this.setState("testVariable", { val: true, ack: true }); - - // same thing, but the state is deleted after 30s (getState will return null afterwards) - await this.setState("testVariable", { val: true, ack: true, expire: 30 }); - - // examples for the checkPassword/checkGroup functions - const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: " + pwdResult); - - const gropupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: " + gropupResult); - } - - /** - * Is called when adapter shuts down - callback has to be called under any circumstances! - */ - private onUnload(callback: () => void): void { - try { - // Here you must clear all timeouts or intervals that may still be active - // clearTimeout(timeout1); - // clearTimeout(timeout2); - // ... - // clearInterval(interval1); - - callback(); - } catch (_e) { - callback(); - } - } - - // If you need to react to object changes, uncomment the following block and the corresponding line in the constructor. - // You also need to subscribe to the objects with `this.subscribeObjects`, similar to `this.subscribeStates`. - // /** - // * Is called if a subscribed object changes - // */ - // private onObjectChange(id: string, obj: ioBroker.Object | null | undefined): void { - // if (obj) { - // // The object was changed - // this.log.info(`object ${id} changed: ${JSON.stringify(obj)}`); - // } else { - // // The object was deleted - // this.log.info(`object ${id} deleted`); - // } - // } - - /** - * Is called if a subscribed state changes - */ - private onStateChange(id: string, state: ioBroker.State | null | undefined): void { - if (state) { - // The state was changed - this.log.info(`state ${id} changed: ${state.val} (ack = ${state.ack})`); - } else { - // The state was deleted - this.log.info(`state ${id} deleted`); - } - } - - // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. - // /** - // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... - // * Using this method requires "common.messagebox" property to be set to true in io-package.json - // */ - // private onMessage(obj: ioBroker.Message): void { - // if (typeof obj === "object" && obj.message) { - // if (obj.command === "send") { - // // e.g. send email or pushover or whatever - // this.log.info("send command"); - - // // Send response in callback if required - // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); - // } - // } - // } - -} - -if (require.main !== module) { - // Export the constructor in compact mode - module.exports = (options: Partial | undefined) => new TestAdapter(options); -} else { - // otherwise start the instance directly - (() => new TestAdapter())(); -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/test/.eslintrc.json b/test/baselines/adapter_TS_OfficialESLint/test/.eslintrc.json deleted file mode 100644 index ce6b3d62c..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/test/.eslintrc.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "root": true, - "env": { - "es6": true, - "node": true, - "mocha": true - }, - "extends": [ - "eslint:recommended" - ], - "rules": { - "indent": [ - "error", - "tab", - { - "SwitchCase": 1 - } - ], - "no-console": "off", - "no-unused-vars": [ - "error", - { - "ignoreRestSiblings": true, - "argsIgnorePattern": "^_" - } - ], - "no-var": "error", - "no-trailing-spaces": "error", - "prefer-const": "error", - "quotes": [ - "error", - "double", - { - "avoidEscape": true, - "allowTemplateLiterals": true - } - ], - "semi": [ - "error", - "always" - ] - } -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/test/integration.js b/test/baselines/adapter_TS_OfficialESLint/test/integration.js deleted file mode 100644 index 986936fac..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/test/integration.js +++ /dev/null @@ -1,5 +0,0 @@ -const path = require("path"); -const { tests } = require("@iobroker/testing"); - -// Run integration tests - See https://github.com/ioBroker/testing for a detailed explanation and further options -tests.integration(path.join(__dirname, "..")); \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/test/mocha.setup.js b/test/baselines/adapter_TS_OfficialESLint/test/mocha.setup.js deleted file mode 100644 index b839790ff..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/test/mocha.setup.js +++ /dev/null @@ -1,23 +0,0 @@ -"use strict"; - -// Makes ts-node ignore warnings, so mocha --watch does work -process.env.TS_NODE_IGNORE_WARNINGS = "TRUE"; -// Sets the correct tsconfig for testing -process.env.TS_NODE_PROJECT = "tsconfig.json"; -// Make ts-node respect the "include" key in tsconfig.json -process.env.TS_NODE_FILES = "TRUE"; - -// Don't silently swallow unhandled rejections -process.on("unhandledRejection", (e) => { - throw e; -}); - -// enable the should interface with sinon -// and load chai-as-promised and sinon-chai by default -const sinonChai = require("sinon-chai"); -const chaiAsPromised = require("chai-as-promised"); -const { should, use } = require("chai"); - -should(); -use(sinonChai); -use(chaiAsPromised); \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/test/mocharc.custom.json b/test/baselines/adapter_TS_OfficialESLint/test/mocharc.custom.json deleted file mode 100644 index 851ed9cdc..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/test/mocharc.custom.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "require": [ - "test/mocha.setup.js", - "ts-node/register", - "source-map-support/register" - ], - "watch-files": [ - "src/**/*.test.ts" - ] -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/test/package.js b/test/baselines/adapter_TS_OfficialESLint/test/package.js deleted file mode 100644 index 3a48e0449..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/test/package.js +++ /dev/null @@ -1,5 +0,0 @@ -const path = require("path"); -const { tests } = require("@iobroker/testing"); - -// Validate the package files -tests.packageFiles(path.join(__dirname, "..")); diff --git a/test/baselines/adapter_TS_OfficialESLint/test/tsconfig.json b/test/baselines/adapter_TS_OfficialESLint/test/tsconfig.json deleted file mode 100644 index 3ebc81b65..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/test/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "noImplicitAny": false - }, - "include": [ - "./**/*.js" - ] -} diff --git a/test/baselines/adapter_TS_OfficialESLint/tsconfig.build.json b/test/baselines/adapter_TS_OfficialESLint/tsconfig.build.json deleted file mode 100644 index 1f040ce18..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/tsconfig.build.json +++ /dev/null @@ -1,16 +0,0 @@ -// Specialized tsconfig to only compile .ts-files in the src dir -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "allowJs": false, - "checkJs": false, - "noEmit": false, - "declaration": false - }, - "include": [ - "src/**/*.ts" - ], - "exclude": [ - "src/**/*.test.ts" - ] -} diff --git a/test/baselines/adapter_TS_OfficialESLint/tsconfig.json b/test/baselines/adapter_TS_OfficialESLint/tsconfig.json deleted file mode 100644 index 4c80d776d..000000000 --- a/test/baselines/adapter_TS_OfficialESLint/tsconfig.json +++ /dev/null @@ -1,46 +0,0 @@ -// Root tsconfig to set the settings and power editor support for all TS files -{ - // To update the compilation target, install a different version of @tsconfig/node... and reference it here - // https://github.com/tsconfig/bases#node-20-tsconfigjson - "extends": "@tsconfig/node20/tsconfig.json", - "compilerOptions": { - // do not compile anything, this file is just to configure type checking - // the compilation is configured in tsconfig.build.json - "noEmit": true, - - // check JS files, but do not compile them => tsconfig.build.json - "allowJs": true, - "checkJs": true, - - "noEmitOnError": true, - "outDir": "./build/", - "removeComments": false, - - // This is necessary for the automatic typing of the adapter config - "resolveJsonModule": true, - - // If you want to disable the stricter type checks (not recommended), uncomment the following line - // "strict": false, - // And enable some of those features for more fine-grained control - // "strictNullChecks": true, - // "strictPropertyInitialization": true, - // "strictBindCallApply": true, - // "noImplicitAny": true, - // "noUnusedLocals": true, - // "noUnusedParameters": true, - // Uncomment this if you want the old behavior of catch variables being `any` - // "useUnknownInCatchVariables": false, - - "sourceMap": true, - "inlineSourceMap": false - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "exclude": [ - "build/**", - "node_modules/**", - "widgets/**" - ] -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.create-adapter.json b/test/baselines/adapter_TS_React_OfficialESLint/.create-adapter.json deleted file mode 100644 index 9d32bec48..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/.create-adapter.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "cli": true, - "target": "directory", - "adapterName": "test-adapter", - "title": "Is used to test the creator", - "startMode": "daemon", - "features": [ - "adapter" - ], - "connectionIndicator": "no", - "connectionType": "local", - "dataSource": "push", - "adminFeatures": [], - "type": "general", - "language": "TypeScript", - "adminUi": "react", - "tabReact": "no", - "releaseScript": "no", - "tools": [ - "ESLint" - ], - "eslintConfig": "official", - "indentation": "Tab", - "quotes": "double", - "authorName": "Al Calzone", - "authorGithub": "AlCalzone", - "authorEmail": "al@calzo.ne", - "gitRemoteProtocol": "HTTPS", - "dependabot": "yes", - "gitCommit": "no", - "defaultBranch": "main", - "license": "MIT License", - "licenseInformation": { - "type": "free", - "license": "MIT" - }, - "creatorVersion": "2.6.5" -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.eslintignore b/test/baselines/adapter_TS_React_OfficialESLint/.eslintignore deleted file mode 100644 index 0e24f5220..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/.eslintignore +++ /dev/null @@ -1,4 +0,0 @@ -admin/build/ -build/ -**/.eslintrc.js -admin/words.js \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.eslintrc.js b/test/baselines/adapter_TS_React_OfficialESLint/.eslintrc.js deleted file mode 100644 index 156aa6369..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/.eslintrc.js +++ /dev/null @@ -1,3 +0,0 @@ -module.exports = { - extends: ["@iobroker", "@iobroker/react"], -}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md b/test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 895613958..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,32 +0,0 @@ ---- -name: Bug report -about: Something is not working as it should -title: '' -labels: '' -assignees: '' ---- - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '...' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Screenshots & Logfiles** -If applicable, add screenshots and logfiles to help explain your problem. - -**Versions:** - - Adapter version: - - JS-Controller version: - - Node version: - - Operating system: - -**Additional context** -Add any other context about the problem here. diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml b/test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index d7cfe5940..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,5 +0,0 @@ -blank_issues_enabled: false -contact_links: - - name: ioBroker Community - url: https://forum.iobroker.net/ - about: Please ask and answer questions here. \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.github/auto-merge.yml b/test/baselines/adapter_TS_React_OfficialESLint/.github/auto-merge.yml deleted file mode 100644 index 4f6d185f0..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/.github/auto-merge.yml +++ /dev/null @@ -1,17 +0,0 @@ -# Configure here which dependency updates should be merged automatically. -# The recommended configuration is the following: -- match: - # Only merge patches for production dependencies - dependency_type: production - update_type: "semver:patch" -- match: - # Except for security fixes, here we allow minor patches - dependency_type: production - update_type: "security:minor" -- match: - # and development dependencies can have a minor update, too - dependency_type: development - update_type: "semver:minor" - -# The syntax is based on the legacy dependabot v1 automerged_updates syntax, see: -# https://dependabot.com/docs/config-file/#automerged_updates diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.github/dependabot.yml b/test/baselines/adapter_TS_React_OfficialESLint/.github/dependabot.yml deleted file mode 100644 index c165a6a47..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/.github/dependabot.yml +++ /dev/null @@ -1,22 +0,0 @@ -version: 2 -updates: - - package-ecosystem: npm - directory: "/" - schedule: - interval: monthly - time: "04:00" - timezone: Europe/Berlin - open-pull-requests-limit: 5 - assignees: - - AlCalzone - versioning-strategy: increase - - - package-ecosystem: github-actions - directory: "/" - schedule: - interval: monthly - time: "04:00" - timezone: Europe/Berlin - open-pull-requests-limit: 5 - assignees: - - AlCalzone diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/dependabot-auto-merge.yml b/test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/dependabot-auto-merge.yml deleted file mode 100644 index baeae23b5..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/dependabot-auto-merge.yml +++ /dev/null @@ -1,27 +0,0 @@ -# Automatically merge Dependabot PRs when version comparison is within the range -# that is configured in .github/auto-merge.yml - -name: Auto-Merge Dependabot PRs - -on: - # WARNING: This needs to be run in the PR base, DO NOT build untrusted code in this action - # details under https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/ - pull_request_target: - -jobs: - auto-merge: - if: github.actor == 'dependabot[bot]' - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Check if PR should be auto-merged - uses: ahmadnassri/action-dependabot-auto-merge@v2 - with: - # In order to use this, you need to go to https://github.com/settings/tokens and - # create a Personal Access Token with the permission "public_repo". - # Enter this token in your repository settings under "Secrets" and name it AUTO_MERGE_TOKEN - github-token: ${{ secrets.AUTO_MERGE_TOKEN }} - # By default, squash and merge, so Github chooses nice commit messages - command: squash and merge diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/test-and-release.yml b/test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/test-and-release.yml deleted file mode 100644 index c6cf66c79..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/test-and-release.yml +++ /dev/null @@ -1,96 +0,0 @@ -name: Test and Release - -# Run this job on all pushes and pull requests -# as well as tags with a semantic version -on: - push: - branches: - - "main" - tags: - # normal versions - - "v[0-9]+.[0-9]+.[0-9]+" - # pre-releases - - "v[0-9]+.[0-9]+.[0-9]+-**" - pull_request: {} - -# Cancel previous PR/branch runs when a new commit is pushed -concurrency: - group: ${{ github.ref }} - cancel-in-progress: true - -jobs: - # Performs quick checks before the expensive test runs - check-and-lint: - if: contains(github.event.head_commit.message, '[skip ci]') == false - - runs-on: ubuntu-latest - - steps: - - uses: ioBroker/testing-action-check@v1 - with: - node-version: '20.x' - # Uncomment the following line if your adapter cannot be installed using 'npm ci' - # install-command: 'npm install' - type-checking: true - lint: true - - # Runs adapter tests on all supported node versions and OSes - adapter-tests: - if: contains(github.event.head_commit.message, '[skip ci]') == false - - runs-on: ${{ matrix.os }} - strategy: - matrix: - node-version: [20.x, 22.x, 24.x] - os: [ubuntu-latest, windows-latest, macos-latest] - - steps: - - uses: ioBroker/testing-action-adapter@v1 - with: - node-version: ${{ matrix.node-version }} - os: ${{ matrix.os }} - # Uncomment the following line if your adapter cannot be installed using 'npm ci' - # install-command: 'npm install' - build: true - -# TODO: To enable automatic npm releases, create a token on npmjs.org -# Enter this token as a GitHub secret (with name NPM_TOKEN) in the repository options -# Then uncomment the following block: - -# # Deploys the final package to NPM -# deploy: -# needs: [check-and-lint, adapter-tests] -# -# # Trigger this step only when a commit on any branch is tagged with a version number -# if: | -# contains(github.event.head_commit.message, '[skip ci]') == false && -# github.event_name == 'push' && -# startsWith(github.ref, 'refs/tags/v') -# -# runs-on: ubuntu-latest -# -# # Write permissions are required to create Github releases -# permissions: -# contents: write -# -# steps: -# - uses: ioBroker/testing-action-deploy@v1 -# with: -# node-version: '20.x' -# # Uncomment the following line if your adapter cannot be installed using 'npm ci' -# # install-command: 'npm install' -# build: true -# npm-token: ${{ secrets.NPM_TOKEN }} -# github-token: ${{ secrets.GITHUB_TOKEN }} -# -# # When using Sentry for error reporting, Sentry can be informed about new releases -# # To enable create a API-Token in Sentry (User settings, API keys) -# # Enter this token as a GitHub secret (with name SENTRY_AUTH_TOKEN) in the repository options -# # Then uncomment and customize the following block: -# sentry: true -# sentry-token: ${{ secrets.SENTRY_AUTH_TOKEN }} -# sentry-project: "iobroker-test-adapter" -# sentry-version-prefix: "iobroker.test-adapter" -# sentry-sourcemap-paths: "build/ admin/build/" -# # If your sentry project is linked to a GitHub repository, you can enable the following option -# # sentry-github-integration: true diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.gitignore b/test/baselines/adapter_TS_React_OfficialESLint/.gitignore deleted file mode 100644 index 80c28aa9d..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/.gitignore +++ /dev/null @@ -1,18 +0,0 @@ -# No dot-directories except github/vscode -.*/ -!.vscode/ -!.github/ - -*.code-workspace -node_modules -nbproject - -# npm package files -iobroker.*.tgz - -Thumbs.db -.commitinfo - -# i18n intermediate files -admin/i18n/flat.txt -admin/i18n/*/flat.txt \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.vscode/extensions.json b/test/baselines/adapter_TS_React_OfficialESLint/.vscode/extensions.json deleted file mode 100644 index 2c6ac5b31..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/.vscode/extensions.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "recommendations": [ - "dbaeumer.vscode-eslint", - "esbenp.prettier-vscode" - ] -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.vscode/settings.json b/test/baselines/adapter_TS_React_OfficialESLint/.vscode/settings.json deleted file mode 100644 index 854736cc0..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/.vscode/settings.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "typescript.tsdk": "node_modules/typescript/lib", - "eslint.enable": true, - "json.schemas": [ - { - "fileMatch": [ - "io-package.json" - ], - "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.js-controller/master/schemas/io-package.json" - }, - { - "fileMatch": [ - "admin/jsonConfig.json", - "admin/jsonConfig.json5", - "admin/jsonCustom.json", - "admin/jsonCustom.json5", - "admin/jsonTab.json", - "admin/jsonTab.json5" - ], - "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.admin/master/packages/jsonConfig/schemas/jsonConfig.json" - } - ] -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/LICENSE b/test/baselines/adapter_TS_React_OfficialESLint/LICENSE deleted file mode 100644 index 27c9a624d..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2025 Al Calzone - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/test/baselines/adapter_TS_React_OfficialESLint/README.md b/test/baselines/adapter_TS_React_OfficialESLint/README.md deleted file mode 100644 index 4d66eab99..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/README.md +++ /dev/null @@ -1,136 +0,0 @@ -![Logo](admin/test-adapter.png) -# ioBroker.test-adapter - -[![NPM version](https://img.shields.io/npm/v/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) -[![Downloads](https://img.shields.io/npm/dm/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) -![Number of Installations](https://iobroker.live/badges/test-adapter-installed.svg) -![Current version in stable repository](https://iobroker.live/badges/test-adapter-stable.svg) - -[![NPM](https://nodei.co/npm/iobroker.test-adapter.png?downloads=true)](https://nodei.co/npm/iobroker.test-adapter/) - -**Tests:** ![Test and Release](https://github.com/AlCalzone/ioBroker.test-adapter/workflows/Test%20and%20Release/badge.svg) - -## test-adapter adapter for ioBroker - -Describe your project here - -## Developer manual -This section is intended for the developer. It can be deleted later. - -### DISCLAIMER - -Please make sure that you consider copyrights and trademarks when you use names or logos of a company and add a disclaimer to your README. -You can check other adapters for examples or ask in the developer community. Using a name or logo of a company without permission may cause legal problems for you. - -### Getting started - -You are almost done, only a few steps left: -1. Create a new repository on GitHub with the name `ioBroker.test-adapter` -1. Initialize the current folder as a new git repository: - ```bash - git init -b main - git add . - git commit -m "Initial commit" - ``` -1. Link your local repository with the one on GitHub: - ```bash - git remote add origin https://github.com/AlCalzone/ioBroker.test-adapter - ``` - -1. Push all files to the GitHub repo: - ```bash - git push origin main - ``` -1. Add a new secret under https://github.com/AlCalzone/ioBroker.test-adapter/settings/secrets. It must be named `AUTO_MERGE_TOKEN` and contain a personal access token with push access to the repository, e.g. yours. You can create a new token under https://github.com/settings/tokens. - -1. Head over to [src/main.ts](src/main.ts) and start programming! - -### Best Practices -We've collected some [best practices](https://github.com/ioBroker/ioBroker.repositories#development-and-coding-best-practices) regarding ioBroker development and coding in general. If you're new to ioBroker or Node.js, you should -check them out. If you're already experienced, you should also take a look at them - you might learn something new :) - -### Scripts in `package.json` -Several npm scripts are predefined for your convenience. You can run them using `npm run ` -| Script name | Description | -|-------------|-------------| -| `build` | Compile the TypeScript and React sources. | -| `watch` | Compile the TypeScript and React sources and watch for changes. | -| `build:ts` | Compile the TypeScript sources. | -| `watch:ts` | Compile the TypeScript sources and watch for changes. | -| `build:react` | Compile the React sources. | -| `watch:react` | Compile the React sources and watch for changes. | -| `test:ts` | Executes the tests you defined in `*.test.ts` files. | -| `test:package` | Ensures your `package.json` and `io-package.json` are valid. | -| `test:integration` | Tests the adapter startup with an actual instance of ioBroker. | -| `test` | Performs a minimal test run on package files and your tests. | -| `check` | Performs a type-check on your code (without compiling anything). | -| `lint` | Runs `ESLint` to check your code for formatting errors and potential bugs. | -| `translate` | Translates texts in your adapter to all required languages, see [`@iobroker/adapter-dev`](https://github.com/ioBroker/adapter-dev#manage-translations) for more details. | - -### Configuring the compilation -The adapter template uses [esbuild](https://esbuild.github.io/) to compile TypeScript and/or React code. You can configure many compilation settings -either in `tsconfig.json` or by changing options for the build tasks. These options are described in detail in the -[`@iobroker/adapter-dev` documentation](https://github.com/ioBroker/adapter-dev#compile-adapter-files). - -### Writing tests -When done right, testing code is invaluable, because it gives you the -confidence to change your code while knowing exactly if and when -something breaks. A good read on the topic of test-driven development -is https://hackernoon.com/introduction-to-test-driven-development-tdd-61a13bc92d92. -Although writing tests before the code might seem strange at first, but it has very -clear upsides. - -The template provides you with basic tests for the adapter startup and package files. -It is recommended that you add your own tests into the mix. - -### Publishing the adapter -Using GitHub Actions, you can enable automatic releases on npm whenever you push a new git tag that matches the form -`v..`. We **strongly recommend** that you do. The necessary steps are described in `.github/workflows/test-and-release.yml`. - -To get your adapter released in ioBroker, please refer to the documentation -of [ioBroker.repositories](https://github.com/ioBroker/ioBroker.repositories#requirements-for-adapter-to-get-added-to-the-latest-repository). - -### Test the adapter manually on a local ioBroker installation -In order to install the adapter locally without publishing, the following steps are recommended: -1. Create a tarball from your dev directory: - ```bash - npm pack - ``` -1. Upload the resulting file to your ioBroker host -1. Install it locally (The paths are different on Windows): - ```bash - cd /opt/iobroker - npm i /path/to/tarball.tgz - ``` - -For later updates, the above procedure is not necessary. Just do the following: -1. Overwrite the changed files in the adapter directory (`/opt/iobroker/node_modules/iobroker.test-adapter`) -1. Execute `iobroker upload test-adapter` on the ioBroker host - -## Changelog - -### 0.0.1 -* (Al Calzone) initial release - -## License -MIT License - -Copyright (c) 2025 Al Calzone - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/__meta__/npm_package_files.txt b/test/baselines/adapter_TS_React_OfficialESLint/__meta__/npm_package_files.txt deleted file mode 100644 index 49c3dedbb..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/__meta__/npm_package_files.txt +++ /dev/null @@ -1,7 +0,0 @@ -admin/index_m.html -admin/style.css -admin/test-adapter.png -io-package.json -LICENSE -package.json -README.md \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/index_m.html b/test/baselines/adapter_TS_React_OfficialESLint/admin/index_m.html deleted file mode 100644 index c1e5ff148..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/index_m.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - -
- - - - - - - \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/app.tsx b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/app.tsx deleted file mode 100644 index b4f93806a..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/app.tsx +++ /dev/null @@ -1,55 +0,0 @@ -import React from "react"; -import { Theme, withStyles } from "@material-ui/core/styles"; - -import GenericApp from "@iobroker/adapter-react/GenericApp"; -import Settings from "./components/settings"; -import { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; -import { StyleRules } from "@material-ui/core/styles"; - -const styles = (_theme: Theme): StyleRules => ({ - root: {}, -}); - -class App extends GenericApp { - constructor(props: GenericAppProps) { - const extendedProps: GenericAppSettings = { - ...props, - encryptedFields: [], - translations: { - "en": require("./i18n/en.json"), - "de": require("./i18n/de.json"), - "ru": require("./i18n/ru.json"), - "pt": require("./i18n/pt.json"), - "nl": require("./i18n/nl.json"), - "fr": require("./i18n/fr.json"), - "it": require("./i18n/it.json"), - "es": require("./i18n/es.json"), - "pl": require("./i18n/pl.json"), - "uk": require("./i18n/uk.json"), - "zh-cn": require("./i18n/zh-cn.json"), - }, - }; - super(props, extendedProps); - } - - onConnectionReady(): void { - // executed when connection is ready - } - - render() { - if (!this.state.loaded) { - return super.render(); - } - - return ( -
- this.updateNativeValue(attr, value)} /> - {this.renderError()} - {this.renderToast()} - {this.renderSaveCloseButtons()} -
- ); - } -} - -export default withStyles(styles)(App); \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/components/settings.tsx b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/components/settings.tsx deleted file mode 100644 index a504b063a..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/components/settings.tsx +++ /dev/null @@ -1,139 +0,0 @@ -import React from "react"; -import { withStyles } from "@material-ui/core/styles"; -import { CreateCSSProperties } from "@material-ui/core/styles/withStyles"; -import TextField from "@material-ui/core/TextField"; -import Input from "@material-ui/core/Input"; -import FormHelperText from "@material-ui/core/FormHelperText"; -import FormControl from "@material-ui/core/FormControl"; -import Select from "@material-ui/core/Select"; -import MenuItem from "@material-ui/core/MenuItem"; -import FormControlLabel from "@material-ui/core/FormControlLabel"; -import Checkbox from "@material-ui/core/Checkbox"; -import I18n from "@iobroker/adapter-react/i18n"; - -const styles = (): Record => ({ - input: { - marginTop: 0, - minWidth: 400, - }, - button: { - marginRight: 20, - }, - card: { - maxWidth: 345, - textAlign: "center", - }, - media: { - height: 180, - }, - column: { - display: "inline-block", - verticalAlign: "top", - marginRight: 20, - }, - columnLogo: { - width: 350, - marginRight: 0, - }, - columnSettings: { - width: "calc(100% - 370px)", - }, - controlElement: { - //background: "#d2d2d2", - marginBottom: 5, - }, -}); - -interface SettingsProps { - classes: Record; - native: Record; - - onChange: (attr: string, value: any) => void; -} - -interface SettingsState { - // add your state properties here - dummy?: undefined; -} - -class Settings extends React.Component { - constructor(props: SettingsProps) { - super(props); - this.state = {}; - } - - renderInput(title: AdminWord, attr: string, type: string) { - return ( - this.props.onChange(attr, e.target.value)} - margin="normal" - /> - ); - } - - renderSelect( - title: AdminWord, - attr: string, - options: { value: string; title: AdminWord }[], - style?: React.CSSProperties, - ) { - return ( - - } - > - {options.map((item) => ( - - {I18n.t(item.title)} - - ))} - - {I18n.t(title)} - - ); - } - - renderCheckbox(title: AdminWord, attr: string, style?: React.CSSProperties) { - return ( - this.props.onChange(attr, !this.props.native[attr])} - color="primary" - /> - } - label={I18n.t(title)} - /> - ); - } - - render() { - return ( -
- {this.renderCheckbox("option1", "option1")}
- {this.renderInput("option2", "option2", "text")} -
- ); - } -} - -export default withStyles(styles)(Settings); \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/de.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/de.json deleted file mode 100644 index d5cb3c428..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/de.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "test-adapter adapter settings": "Adaptereinstellungen für test-adapter", - "option1": "Mock translation of 'option1' to 'de'", - "option2": "Mock translation of 'option2' to 'de'" -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/en.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/en.json deleted file mode 100644 index f8c9603af..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/en.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "test-adapter adapter settings": "Adapter settings for test-adapter", - "option1": "option1", - "option2": "option2" -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/es.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/es.json deleted file mode 100644 index 2b0e2d150..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/es.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "test-adapter adapter settings": "Ajustes del adaptador para test-adapter", - "option1": "Mock translation of 'option1' to 'es'", - "option2": "Mock translation of 'option2' to 'es'" -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/fr.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/fr.json deleted file mode 100644 index 50f364d83..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/fr.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "test-adapter adapter settings": "Paramètres d'adaptateur pour test-adapter", - "option1": "Mock translation of 'option1' to 'fr'", - "option2": "Mock translation of 'option2' to 'fr'" -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/i18n.d.ts b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/i18n.d.ts deleted file mode 100644 index f4a769e59..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/i18n.d.ts +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file loads the translations keys from `i18n/en.json` file and overrides - * the declarations for the translate function `I18n.t` available in "@iobroker/adapter-react/i18n". - * Using these definitions it is ensured that all used translations in the React - * context are defined at least in the english translations file. - * This will add no overhead in the generated code since it just reexports the - * I18n class but with a more typed `t` function. - */ - -/* - * DO NOT add any imports or exports in this file or it will stop working! - */ - -/** - * Available words in `i18n/en.json`. - */ -declare type AdminWord = keyof typeof import("./en.json"); - -declare module "@iobroker/adapter-react/i18n" { - /** - * Translate the given string to the selected language. - * @param word The (key) word to look up the string. Has to be defined at least in `i18n/en.json`. - * @param args Optional arguments which will replace the first (second, third, ...) occurence of %s - */ - function t(word: AdminWord, ...args: string[]): string; -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/it.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/it.json deleted file mode 100644 index 67ef9c4dc..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/it.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "test-adapter adapter settings": "Impostazioni dell'adattatore per test-adapter", - "option1": "Mock translation of 'option1' to 'it'", - "option2": "Mock translation of 'option2' to 'it'" -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/nl.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/nl.json deleted file mode 100644 index d7c9cdc17..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/nl.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "test-adapter adapter settings": "Adapterinstellingen voor test-adapter", - "option1": "Mock translation of 'option1' to 'nl'", - "option2": "Mock translation of 'option2' to 'nl'" -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pl.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pl.json deleted file mode 100644 index 24e733a7d..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pl.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "test-adapter adapter settings": "Ustawienia adaptera dla test-adapter", - "option1": "Mock translation of 'option1' to 'pl'", - "option2": "Mock translation of 'option2' to 'pl'" -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pt.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pt.json deleted file mode 100644 index 7ad3e244b..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pt.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "test-adapter adapter settings": "Configurações do adaptador para test-adapter", - "option1": "Mock translation of 'option1' to 'pt'", - "option2": "Mock translation of 'option2' to 'pt'" -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/ru.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/ru.json deleted file mode 100644 index a41d670f5..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/ru.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "test-adapter adapter settings": "Настройки адаптера для test-adapter", - "option1": "Mock translation of 'option1' to 'ru'", - "option2": "Mock translation of 'option2' to 'ru'" -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/uk.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/uk.json deleted file mode 100644 index 6a8dc5022..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/uk.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "test-adapter adapter settings": "Налаштування адаптера для test-adapter", - "option1": "Mock translation of 'option1' to 'uk'", - "option2": "Mock translation of 'option2' to 'uk'" -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/zh-cn.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/zh-cn.json deleted file mode 100644 index c4ee1d90d..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/zh-cn.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "test-adapter adapter settings": "test-adapter的适配器设置", - "option1": "Mock translation of 'option1' to 'zh-cn'", - "option2": "Mock translation of 'option2' to 'zh-cn'" -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/index.tsx b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/index.tsx deleted file mode 100644 index e114005c8..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/index.tsx +++ /dev/null @@ -1,25 +0,0 @@ -import React from "react"; -import ReactDOM from "react-dom"; -import { MuiThemeProvider } from "@material-ui/core/styles"; -import theme from "@iobroker/adapter-react/Theme"; -import Utils from "@iobroker/adapter-react/Components/Utils"; -import App from "./app"; - -let themeName = Utils.getThemeName(); - -function build(): void { - ReactDOM.render( - - { - themeName = _theme; - build(); - }} - /> - , - document.getElementById("root"), - ); -} - -build(); \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/style.css b/test/baselines/adapter_TS_React_OfficialESLint/admin/style.css deleted file mode 100644 index 57d4549ee..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/style.css +++ /dev/null @@ -1,32 +0,0 @@ -/* You can delete those if you want. I just found them very helpful */ -* { - box-sizing: border-box -} -.m { - /* Don't cut off dropdowns! */ - overflow: initial; -} -.m.adapter-container, -.m.adapter-container > div.App { - /* Fix layout/scrolling issues with tabs */ - height: 100%; - width: 100%; - position: relative; -} -.m .select-wrapper + label { - /* The positioning for dropdown labels is messed up */ - transform: none !important; -} - -label > i[title] { - /* Display the help cursor for the tooltip icons and fix their positioning */ - cursor: help; - margin-left: 0.25em; -} - -.dropdown-content { - /* Don't wrap text in dropdowns */ - white-space: nowrap; -} - -/* Add your styles here */ diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/test-adapter.png b/test/baselines/adapter_TS_React_OfficialESLint/admin/test-adapter.png deleted file mode 100644 index 094ebd97c36dbe2386a63dbce290c9ad6a148079..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 62376 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%0DGz6 zyl7fq5kK_OTB5a+j%#*OqHtMgmMFAPfM%z1y`n*X-04|c~XNtbq*59PL zf2GK(^`44LhR@%s*209os!^-XK1;F{M*IZtESo=}65To~n+-bu0+>z?fZnkVoW}$_ zstfB}2u}&7L#c0_Qg^2;} z@gmc!u&D{a-Sk8a)1*Chcx+8~_M64opd2kxtHB|6*!4W&cOrWX;Yw>1GmvfN@nFO$k&$he)RKxo(&m zmF!n>4Y$>igYg0$%*vf6XAlg%u=W>lZr*&`_JyS?Qqf|(d#rIqm-Q+bvDD6`E^Yg! zCA@nJ@*O;Lp9NU-Q#KY#ME2A^kx^vHZXmc#(4jcbti!v_B%%%N@|q{z#cN2rxd7uE zDS;G&(m*%4MYSXuokFeyQS{I{6O4v&@v{hDbb4J?0ftY(dI z%St%e+#=VPIyA5VF9`5)D3bY&tL9gpe{Xha)$de%8pXLvHB( zu+0=Wc6d1^KBxb%4tv#uqG^B_>&ZHIJQN>7!}krzA!iGj%=dq0lHKGFRI$Ah-NT8N RBrxDlMnX}%QuJ%k{{yPv^Xvcs diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/tsconfig.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/tsconfig.json deleted file mode 100644 index 755c6ca7c..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/tsconfig.json +++ /dev/null @@ -1,26 +0,0 @@ -// Specialized tsconfig for the admin directory, -// includes DOM typings and configures the admin build -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "noEmit": false, - "outDir": "./build", - "sourceMap": true, - "sourceRoot": "./src", - "noImplicitAny": false, - "lib": [ - "es2018", - "DOM" - ], - "jsx": "react" - }, - "include": [ - "./**/*.ts", - "./**/*.tsx", - "../src/lib/adapter-config.d.ts" - ], - "exclude": [ - "./**/*.test.ts", - "./**/*.test.tsx" - ] -} diff --git a/test/baselines/adapter_TS_React_OfficialESLint/io-package.json b/test/baselines/adapter_TS_React_OfficialESLint/io-package.json deleted file mode 100644 index 98973e67d..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/io-package.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "common": { - "name": "test-adapter", - "version": "0.0.1", - "news": { - "0.0.1": { - "en": "initial release", - "de": "Erstveröffentlichung", - "ru": "Начальная версия", - "pt": "lançamento inicial", - "nl": "Eerste uitgave", - "fr": "Première version", - "it": "Versione iniziale", - "es": "Versión inicial", - "pl": "Pierwsze wydanie", - "uk": "Початкова версія", - "zh-cn": "首次出版" - } - }, - "titleLang": { - "en": "Is used to test the creator", - "de": "Mock translation of 'Is used to test the creator' to 'de'", - "ru": "Mock translation of 'Is used to test the creator' to 'ru'", - "pt": "Mock translation of 'Is used to test the creator' to 'pt'", - "nl": "Mock translation of 'Is used to test the creator' to 'nl'", - "fr": "Mock translation of 'Is used to test the creator' to 'fr'", - "it": "Mock translation of 'Is used to test the creator' to 'it'", - "es": "Mock translation of 'Is used to test the creator' to 'es'", - "pl": "Mock translation of 'Is used to test the creator' to 'pl'", - "uk": "Mock translation of 'Is used to test the creator' to 'uk'", - "zh-cn": "Mock translation of 'Is used to test the creator' to 'zh-cn'" - }, - "desc": { - "en": "test-adapter", - "de": "Mock translation of 'test-adapter' to 'de'", - "ru": "Mock translation of 'test-adapter' to 'ru'", - "pt": "Mock translation of 'test-adapter' to 'pt'", - "nl": "Mock translation of 'test-adapter' to 'nl'", - "fr": "Mock translation of 'test-adapter' to 'fr'", - "it": "Mock translation of 'test-adapter' to 'it'", - "es": "Mock translation of 'test-adapter' to 'es'", - "pl": "Mock translation of 'test-adapter' to 'pl'", - "uk": "Mock translation of 'test-adapter' to 'uk'", - "zh-cn": "Mock translation of 'test-adapter' to 'zh-cn'" - }, - "authors": [ - "Al Calzone " - ], - "keywords": [ - "template", - "automation", - "IoT", - "integration" - ], - "licenseInformation": { - "type": "free", - "license": "MIT" - }, - "platform": "Javascript/Node.js", - "icon": "test-adapter.png", - "enabled": true, - "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", - "readme": "https://github.com/AlCalzone/ioBroker.test-adapter/blob/main/README.md", - "loglevel": "info", - "tier": 3, - "mode": "daemon", - "type": "general", - "compact": true, - "connectionType": "local", - "dataSource": "push", - "adminUI": { - "config": "materialize" - }, - "eraseOnUpload": true, - "dependencies": [ - { - "js-controller": ">=6.0.11" - } - ], - "globalDependencies": [ - { - "admin": ">=7.0.23" - } - ] - }, - "native": { - "option1": true, - "option2": "42" - }, - "objects": [], - "instanceObjects": [] -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/package.json b/test/baselines/adapter_TS_React_OfficialESLint/package.json deleted file mode 100644 index 83bf3e54e..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/package.json +++ /dev/null @@ -1,77 +0,0 @@ -{ - "name": "iobroker.test-adapter", - "version": "0.0.1", - "description": "test-adapter", - "author": { - "name": "Al Calzone", - "email": "al@calzo.ne" - }, - "contributors": [], - "homepage": "https://github.com/AlCalzone/ioBroker.test-adapter", - "license": "MIT", - "keywords": [ - "template", - "automation", - "IoT", - "integration" - ], - "repository": { - "type": "git", - "url": "https://github.com/AlCalzone/ioBroker.test-adapter.git" - }, - "engines": { - "node": ">= 20" - }, - "dependencies": { - "@iobroker/adapter-core": "^3.3.2" - }, - "devDependencies": { - "@iobroker/adapter-dev": "^1.5.0", - "@iobroker/adapter-react": "2.0.22", - "@iobroker/eslint-config": "^2.2.0", - "@iobroker/testing": "^5.1.1", - "@material-ui/core": "^4.12.4", - "@tsconfig/node20": "^20.1.6", - "@types/node": "^20.19.17", - "@types/react-dom": "^17.0.26", - "@types/react": "^17.0.88", - "react-dom": "^17.0.2", - "react": "^17.0.2", - "rimraf": "^6.0.1", - "source-map-support": "^0.5.21", - "ts-node": "^10.9.2", - "typescript": "~5.9.2" - }, - "main": "build/main.js", - "files": [ - "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).{json,json5}", - "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}", - "admin/build/", - "build/", - "www/", - "io-package.json", - "LICENSE" - ], - "scripts": { - "prebuild": "rimraf build admin/build", - "build": "build-adapter all", - "watch": "build-adapter all --watch", - "prebuild:ts": "rimraf build", - "build:ts": "build-adapter ts", - "watch:ts": "build-adapter ts --watch", - "prebuild:react": "rimraf admin/build", - "build:react": "build-adapter react", - "watch:react": "build-adapter react --watch", - "test:ts": "mocha --config test/mocharc.custom.json src/**/*.test.ts", - "test:package": "mocha test/package --exit", - "test:integration": "mocha test/integration --exit", - "test": "npm run test:ts && npm run test:package", - "check": "tsc --noEmit && tsc --noEmit -p admin/tsconfig.json", - "lint": "eslint --ext .ts,.tsx src/ admin/src/", - "translate": "translate-adapter" - }, - "bugs": { - "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" - }, - "readmeFilename": "README.md" -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/src/lib/adapter-config.d.ts b/test/baselines/adapter_TS_React_OfficialESLint/src/lib/adapter-config.d.ts deleted file mode 100644 index c6c8a0e2a..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/src/lib/adapter-config.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -// This file extends the AdapterConfig type from "@types/iobroker" - -// Augment the globally declared type ioBroker.AdapterConfig -declare global { - namespace ioBroker { - interface AdapterConfig { - option1: boolean; - option2: string; - } - } -} - -// this is required so the above AdapterConfig is found by TypeScript / type checking -export {}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/src/main.test.ts b/test/baselines/adapter_TS_React_OfficialESLint/src/main.test.ts deleted file mode 100644 index a8d538e95..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/src/main.test.ts +++ /dev/null @@ -1,26 +0,0 @@ -/** - * This is a dummy TypeScript test file using chai and mocha - * - * It's automatically excluded from npm and its build output is excluded from both git and npm. - * It is advised to test all your modules with accompanying *.test.ts-files - */ - -import { expect } from "chai"; -// import { functionToTest } from "./moduleToTest"; - -describe("module to test => function to test", () => { - // initializing logic - const expected = 5; - - it(`should return ${expected}`, () => { - const result = 5; - // assign result a value from functionToTest - expect(result).to.equal(expected); - // or using the should() syntax - result.should.equal(expected); - }); - // ... more tests => it - -}); - -// ... more test suites => describe diff --git a/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts b/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts deleted file mode 100644 index d86bf77c5..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Created with @iobroker/create-adapter v2.6.5 - */ - -// The adapter-core module gives you access to the core ioBroker functions -// you need to create an adapter -import * as utils from "@iobroker/adapter-core"; - -// Load your modules here, e.g.: -// import * as fs from "fs"; - -class TestAdapter extends utils.Adapter { - - public constructor(options: Partial = {}) { - super({ - ...options, - name: "test-adapter", - }); - this.on("ready", this.onReady.bind(this)); - this.on("stateChange", this.onStateChange.bind(this)); - // this.on("objectChange", this.onObjectChange.bind(this)); - // this.on("message", this.onMessage.bind(this)); - this.on("unload", this.onUnload.bind(this)); - } - - /** - * Is called when databases are connected and adapter received configuration. - */ - private async onReady(): Promise { - // Initialize your adapter here - - // The adapters config (in the instance object everything under the attribute "native") is accessible via - // this.config: - this.log.debug("config option1: " + this.config.option1); - this.log.debug("config option2: " + this.config.option2); - - /* - For every state in the system there has to be also an object of type state - Here a simple template for a boolean variable named "testVariable" - Because every adapter instance uses its own unique namespace variable names can't collide with other adapters variables - */ - await this.setObjectNotExistsAsync("testVariable", { - type: "state", - common: { - name: "testVariable", - type: "boolean", - role: "indicator", - read: true, - write: true, - }, - native: {}, - }); - - // In order to get state updates, you need to subscribe to them. The following line adds a subscription for our variable we have created above. - this.subscribeStates("testVariable"); - // You can also add a subscription for multiple states. The following line watches all states starting with "lights." - // this.subscribeStates("lights.*"); - // Or, if you really must, you can also watch all states. Don't do this if you don't need to. Otherwise this will cause a lot of unnecessary load on the system: - // this.subscribeStates("*"); - - /* - setState examples - you will notice that each setState will cause the stateChange event to fire (because of above subscribeStates cmd) - */ - // the variable testVariable is set to true as command (ack=false) - await this.setState("testVariable", true); - - // same thing, but the value is flagged "ack" - // ack should be always set to true if the value is received from or acknowledged from the target system - await this.setState("testVariable", { val: true, ack: true }); - - // same thing, but the state is deleted after 30s (getState will return null afterwards) - await this.setState("testVariable", { val: true, ack: true, expire: 30 }); - - // examples for the checkPassword/checkGroup functions - const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: " + pwdResult); - - const gropupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: " + gropupResult); - } - - /** - * Is called when adapter shuts down - callback has to be called under any circumstances! - */ - private onUnload(callback: () => void): void { - try { - // Here you must clear all timeouts or intervals that may still be active - // clearTimeout(timeout1); - // clearTimeout(timeout2); - // ... - // clearInterval(interval1); - - callback(); - } catch (_e) { - callback(); - } - } - - // If you need to react to object changes, uncomment the following block and the corresponding line in the constructor. - // You also need to subscribe to the objects with `this.subscribeObjects`, similar to `this.subscribeStates`. - // /** - // * Is called if a subscribed object changes - // */ - // private onObjectChange(id: string, obj: ioBroker.Object | null | undefined): void { - // if (obj) { - // // The object was changed - // this.log.info(`object ${id} changed: ${JSON.stringify(obj)}`); - // } else { - // // The object was deleted - // this.log.info(`object ${id} deleted`); - // } - // } - - /** - * Is called if a subscribed state changes - */ - private onStateChange(id: string, state: ioBroker.State | null | undefined): void { - if (state) { - // The state was changed - this.log.info(`state ${id} changed: ${state.val} (ack = ${state.ack})`); - } else { - // The state was deleted - this.log.info(`state ${id} deleted`); - } - } - - // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. - // /** - // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... - // * Using this method requires "common.messagebox" property to be set to true in io-package.json - // */ - // private onMessage(obj: ioBroker.Message): void { - // if (typeof obj === "object" && obj.message) { - // if (obj.command === "send") { - // // e.g. send email or pushover or whatever - // this.log.info("send command"); - - // // Send response in callback if required - // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); - // } - // } - // } - -} - -if (require.main !== module) { - // Export the constructor in compact mode - module.exports = (options: Partial | undefined) => new TestAdapter(options); -} else { - // otherwise start the instance directly - (() => new TestAdapter())(); -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/test/.eslintrc.json b/test/baselines/adapter_TS_React_OfficialESLint/test/.eslintrc.json deleted file mode 100644 index ce6b3d62c..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/test/.eslintrc.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "root": true, - "env": { - "es6": true, - "node": true, - "mocha": true - }, - "extends": [ - "eslint:recommended" - ], - "rules": { - "indent": [ - "error", - "tab", - { - "SwitchCase": 1 - } - ], - "no-console": "off", - "no-unused-vars": [ - "error", - { - "ignoreRestSiblings": true, - "argsIgnorePattern": "^_" - } - ], - "no-var": "error", - "no-trailing-spaces": "error", - "prefer-const": "error", - "quotes": [ - "error", - "double", - { - "avoidEscape": true, - "allowTemplateLiterals": true - } - ], - "semi": [ - "error", - "always" - ] - } -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/test/integration.js b/test/baselines/adapter_TS_React_OfficialESLint/test/integration.js deleted file mode 100644 index 986936fac..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/test/integration.js +++ /dev/null @@ -1,5 +0,0 @@ -const path = require("path"); -const { tests } = require("@iobroker/testing"); - -// Run integration tests - See https://github.com/ioBroker/testing for a detailed explanation and further options -tests.integration(path.join(__dirname, "..")); \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/test/mocha.setup.js b/test/baselines/adapter_TS_React_OfficialESLint/test/mocha.setup.js deleted file mode 100644 index b839790ff..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/test/mocha.setup.js +++ /dev/null @@ -1,23 +0,0 @@ -"use strict"; - -// Makes ts-node ignore warnings, so mocha --watch does work -process.env.TS_NODE_IGNORE_WARNINGS = "TRUE"; -// Sets the correct tsconfig for testing -process.env.TS_NODE_PROJECT = "tsconfig.json"; -// Make ts-node respect the "include" key in tsconfig.json -process.env.TS_NODE_FILES = "TRUE"; - -// Don't silently swallow unhandled rejections -process.on("unhandledRejection", (e) => { - throw e; -}); - -// enable the should interface with sinon -// and load chai-as-promised and sinon-chai by default -const sinonChai = require("sinon-chai"); -const chaiAsPromised = require("chai-as-promised"); -const { should, use } = require("chai"); - -should(); -use(sinonChai); -use(chaiAsPromised); \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/test/mocharc.custom.json b/test/baselines/adapter_TS_React_OfficialESLint/test/mocharc.custom.json deleted file mode 100644 index 851ed9cdc..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/test/mocharc.custom.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "require": [ - "test/mocha.setup.js", - "ts-node/register", - "source-map-support/register" - ], - "watch-files": [ - "src/**/*.test.ts" - ] -} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/test/package.js b/test/baselines/adapter_TS_React_OfficialESLint/test/package.js deleted file mode 100644 index 3a48e0449..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/test/package.js +++ /dev/null @@ -1,5 +0,0 @@ -const path = require("path"); -const { tests } = require("@iobroker/testing"); - -// Validate the package files -tests.packageFiles(path.join(__dirname, "..")); diff --git a/test/baselines/adapter_TS_React_OfficialESLint/test/tsconfig.json b/test/baselines/adapter_TS_React_OfficialESLint/test/tsconfig.json deleted file mode 100644 index 3ebc81b65..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/test/tsconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "extends": "../tsconfig.json", - "compilerOptions": { - "noImplicitAny": false - }, - "include": [ - "./**/*.js" - ] -} diff --git a/test/baselines/adapter_TS_React_OfficialESLint/tsconfig.build.json b/test/baselines/adapter_TS_React_OfficialESLint/tsconfig.build.json deleted file mode 100644 index 1f040ce18..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/tsconfig.build.json +++ /dev/null @@ -1,16 +0,0 @@ -// Specialized tsconfig to only compile .ts-files in the src dir -{ - "extends": "./tsconfig.json", - "compilerOptions": { - "allowJs": false, - "checkJs": false, - "noEmit": false, - "declaration": false - }, - "include": [ - "src/**/*.ts" - ], - "exclude": [ - "src/**/*.test.ts" - ] -} diff --git a/test/baselines/adapter_TS_React_OfficialESLint/tsconfig.json b/test/baselines/adapter_TS_React_OfficialESLint/tsconfig.json deleted file mode 100644 index 4c80d776d..000000000 --- a/test/baselines/adapter_TS_React_OfficialESLint/tsconfig.json +++ /dev/null @@ -1,46 +0,0 @@ -// Root tsconfig to set the settings and power editor support for all TS files -{ - // To update the compilation target, install a different version of @tsconfig/node... and reference it here - // https://github.com/tsconfig/bases#node-20-tsconfigjson - "extends": "@tsconfig/node20/tsconfig.json", - "compilerOptions": { - // do not compile anything, this file is just to configure type checking - // the compilation is configured in tsconfig.build.json - "noEmit": true, - - // check JS files, but do not compile them => tsconfig.build.json - "allowJs": true, - "checkJs": true, - - "noEmitOnError": true, - "outDir": "./build/", - "removeComments": false, - - // This is necessary for the automatic typing of the adapter config - "resolveJsonModule": true, - - // If you want to disable the stricter type checks (not recommended), uncomment the following line - // "strict": false, - // And enable some of those features for more fine-grained control - // "strictNullChecks": true, - // "strictPropertyInitialization": true, - // "strictBindCallApply": true, - // "noImplicitAny": true, - // "noUnusedLocals": true, - // "noUnusedParameters": true, - // Uncomment this if you want the old behavior of catch variables being `any` - // "useUnknownInCatchVariables": false, - - "sourceMap": true, - "inlineSourceMap": false - }, - "include": [ - "src/**/*.ts", - "test/**/*.ts" - ], - "exclude": [ - "build/**", - "node_modules/**", - "widgets/**" - ] -} \ No newline at end of file From 7bf51467f8cf87a61ca445ceb093b39809d6176c Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 21 Sep 2025 09:20:07 +0000 Subject: [PATCH 05/29] Regenerate test baselines for official ESLint configuration Co-authored-by: Apollon77 <11976694+Apollon77@users.noreply.github.com> --- templates/index.ts | 4 +- .../.create-adapter.json | 38 ++++ .../.github/ISSUE_TEMPLATE/bug_report.md | 32 ++++ .../.github/ISSUE_TEMPLATE/config.yml | 5 + .../.github/auto-merge.yml | 17 ++ .../.github/dependabot.yml | 22 +++ .../workflows/dependabot-auto-merge.yml | 27 +++ .../.github/workflows/test-and-release.yml | 92 ++++++++++ .../adapter_JS_OfficialESLint/.gitignore | 18 ++ .../.vscode/extensions.json | 5 + .../.vscode/settings.json | 22 +++ .../adapter_JS_OfficialESLint/LICENSE | 21 +++ .../adapter_JS_OfficialESLint/README.md | 124 +++++++++++++ .../__meta__/npm_package_files.txt | 10 ++ .../admin/index_m.html | 95 ++++++++++ .../adapter_JS_OfficialESLint/admin/style.css | 32 ++++ .../admin/test-adapter.png | Bin 0 -> 62376 bytes .../adapter_JS_OfficialESLint/admin/words.js | 46 +++++ .../eslint.config.mjs | 34 ++++ .../adapter_JS_OfficialESLint/io-package.json | 91 ++++++++++ .../lib/adapter-config.d.ts | 19 ++ .../adapter_JS_OfficialESLint/main.js | 167 ++++++++++++++++++ .../adapter_JS_OfficialESLint/main.test.js | 30 ++++ .../adapter_JS_OfficialESLint/package.json | 55 ++++++ .../prettier.config.mjs | 8 + .../test/integration.js | 5 + .../test/mocha.setup.js | 14 ++ .../test/mocharc.custom.json | 10 ++ .../adapter_JS_OfficialESLint/test/package.js | 5 + .../.create-adapter.json | 38 ++++ .../.github/ISSUE_TEMPLATE/bug_report.md | 32 ++++ .../.github/ISSUE_TEMPLATE/config.yml | 5 + .../.github/auto-merge.yml | 17 ++ .../.github/dependabot.yml | 22 +++ .../workflows/dependabot-auto-merge.yml | 27 +++ .../.github/workflows/test-and-release.yml | 96 ++++++++++ .../adapter_TS_OfficialESLint/.gitignore | 18 ++ .../.vscode/extensions.json | 6 + .../.vscode/settings.json | 23 +++ .../adapter_TS_OfficialESLint/LICENSE | 21 +++ .../adapter_TS_OfficialESLint/README.md | 132 ++++++++++++++ .../__meta__/npm_package_files.txt | 8 + .../admin/admin.d.ts | 93 ++++++++++ .../admin/index_m.html | 95 ++++++++++ .../adapter_TS_OfficialESLint/admin/style.css | 32 ++++ .../admin/test-adapter.png | Bin 0 -> 62376 bytes .../admin/tsconfig.json | 11 ++ .../adapter_TS_OfficialESLint/admin/words.js | 46 +++++ .../eslint.config.mjs | 34 ++++ .../adapter_TS_OfficialESLint/io-package.json | 91 ++++++++++ .../adapter_TS_OfficialESLint/package.json | 67 +++++++ .../prettier.config.mjs | 8 + .../src/lib/adapter-config.d.ts | 14 ++ .../src/main.test.ts | 26 +++ .../adapter_TS_OfficialESLint/src/main.ts | 153 ++++++++++++++++ .../test/.eslintrc.json | 43 +++++ .../test/integration.js | 5 + .../test/mocha.setup.js | 23 +++ .../test/mocharc.custom.json | 10 ++ .../adapter_TS_OfficialESLint/test/package.js | 5 + .../test/tsconfig.json | 9 + .../tsconfig.build.json | 16 ++ .../adapter_TS_OfficialESLint/tsconfig.json | 46 +++++ .../.create-adapter.json | 38 ++++ .../.github/ISSUE_TEMPLATE/bug_report.md | 32 ++++ .../.github/ISSUE_TEMPLATE/config.yml | 5 + .../.github/auto-merge.yml | 17 ++ .../.github/dependabot.yml | 22 +++ .../workflows/dependabot-auto-merge.yml | 27 +++ .../.github/workflows/test-and-release.yml | 96 ++++++++++ .../.gitignore | 18 ++ .../.vscode/extensions.json | 6 + .../.vscode/settings.json | 23 +++ .../adapter_TS_React_OfficialESLint/LICENSE | 21 +++ .../adapter_TS_React_OfficialESLint/README.md | 136 ++++++++++++++ .../__meta__/npm_package_files.txt | 7 + .../admin/index_m.html | 24 +++ .../admin/src/app.tsx | 55 ++++++ .../admin/src/components/settings.tsx | 139 +++++++++++++++ .../admin/src/i18n/de.json | 5 + .../admin/src/i18n/en.json | 5 + .../admin/src/i18n/es.json | 5 + .../admin/src/i18n/fr.json | 5 + .../admin/src/i18n/i18n.d.ts | 26 +++ .../admin/src/i18n/it.json | 5 + .../admin/src/i18n/nl.json | 5 + .../admin/src/i18n/pl.json | 5 + .../admin/src/i18n/pt.json | 5 + .../admin/src/i18n/ru.json | 5 + .../admin/src/i18n/uk.json | 5 + .../admin/src/i18n/zh-cn.json | 5 + .../admin/src/index.tsx | 25 +++ .../admin/style.css | 32 ++++ .../admin/test-adapter.png | Bin 0 -> 62376 bytes .../admin/tsconfig.json | 26 +++ .../eslint.config.mjs | 35 ++++ .../io-package.json | 92 ++++++++++ .../package.json | 77 ++++++++ .../prettier.config.mjs | 8 + .../src/lib/adapter-config.d.ts | 14 ++ .../src/main.test.ts | 26 +++ .../src/main.ts | 153 ++++++++++++++++ .../test/.eslintrc.json | 43 +++++ .../test/integration.js | 5 + .../test/mocha.setup.js | 23 +++ .../test/mocharc.custom.json | 10 ++ .../test/package.js | 5 + .../test/tsconfig.json | 9 + .../tsconfig.build.json | 16 ++ .../tsconfig.json | 46 +++++ 110 files changed, 3710 insertions(+), 2 deletions(-) create mode 100644 test/baselines/adapter_JS_OfficialESLint/.create-adapter.json create mode 100644 test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md create mode 100644 test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml create mode 100644 test/baselines/adapter_JS_OfficialESLint/.github/auto-merge.yml create mode 100644 test/baselines/adapter_JS_OfficialESLint/.github/dependabot.yml create mode 100644 test/baselines/adapter_JS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml create mode 100644 test/baselines/adapter_JS_OfficialESLint/.github/workflows/test-and-release.yml create mode 100644 test/baselines/adapter_JS_OfficialESLint/.gitignore create mode 100644 test/baselines/adapter_JS_OfficialESLint/.vscode/extensions.json create mode 100644 test/baselines/adapter_JS_OfficialESLint/.vscode/settings.json create mode 100644 test/baselines/adapter_JS_OfficialESLint/LICENSE create mode 100644 test/baselines/adapter_JS_OfficialESLint/README.md create mode 100644 test/baselines/adapter_JS_OfficialESLint/__meta__/npm_package_files.txt create mode 100644 test/baselines/adapter_JS_OfficialESLint/admin/index_m.html create mode 100644 test/baselines/adapter_JS_OfficialESLint/admin/style.css create mode 100644 test/baselines/adapter_JS_OfficialESLint/admin/test-adapter.png create mode 100644 test/baselines/adapter_JS_OfficialESLint/admin/words.js create mode 100644 test/baselines/adapter_JS_OfficialESLint/eslint.config.mjs create mode 100644 test/baselines/adapter_JS_OfficialESLint/io-package.json create mode 100644 test/baselines/adapter_JS_OfficialESLint/lib/adapter-config.d.ts create mode 100644 test/baselines/adapter_JS_OfficialESLint/main.js create mode 100644 test/baselines/adapter_JS_OfficialESLint/main.test.js create mode 100644 test/baselines/adapter_JS_OfficialESLint/package.json create mode 100644 test/baselines/adapter_JS_OfficialESLint/prettier.config.mjs create mode 100644 test/baselines/adapter_JS_OfficialESLint/test/integration.js create mode 100644 test/baselines/adapter_JS_OfficialESLint/test/mocha.setup.js create mode 100644 test/baselines/adapter_JS_OfficialESLint/test/mocharc.custom.json create mode 100644 test/baselines/adapter_JS_OfficialESLint/test/package.js create mode 100644 test/baselines/adapter_TS_OfficialESLint/.create-adapter.json create mode 100644 test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md create mode 100644 test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml create mode 100644 test/baselines/adapter_TS_OfficialESLint/.github/auto-merge.yml create mode 100644 test/baselines/adapter_TS_OfficialESLint/.github/dependabot.yml create mode 100644 test/baselines/adapter_TS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml create mode 100644 test/baselines/adapter_TS_OfficialESLint/.github/workflows/test-and-release.yml create mode 100644 test/baselines/adapter_TS_OfficialESLint/.gitignore create mode 100644 test/baselines/adapter_TS_OfficialESLint/.vscode/extensions.json create mode 100644 test/baselines/adapter_TS_OfficialESLint/.vscode/settings.json create mode 100644 test/baselines/adapter_TS_OfficialESLint/LICENSE create mode 100644 test/baselines/adapter_TS_OfficialESLint/README.md create mode 100644 test/baselines/adapter_TS_OfficialESLint/__meta__/npm_package_files.txt create mode 100644 test/baselines/adapter_TS_OfficialESLint/admin/admin.d.ts create mode 100644 test/baselines/adapter_TS_OfficialESLint/admin/index_m.html create mode 100644 test/baselines/adapter_TS_OfficialESLint/admin/style.css create mode 100644 test/baselines/adapter_TS_OfficialESLint/admin/test-adapter.png create mode 100644 test/baselines/adapter_TS_OfficialESLint/admin/tsconfig.json create mode 100644 test/baselines/adapter_TS_OfficialESLint/admin/words.js create mode 100644 test/baselines/adapter_TS_OfficialESLint/eslint.config.mjs create mode 100644 test/baselines/adapter_TS_OfficialESLint/io-package.json create mode 100644 test/baselines/adapter_TS_OfficialESLint/package.json create mode 100644 test/baselines/adapter_TS_OfficialESLint/prettier.config.mjs create mode 100644 test/baselines/adapter_TS_OfficialESLint/src/lib/adapter-config.d.ts create mode 100644 test/baselines/adapter_TS_OfficialESLint/src/main.test.ts create mode 100644 test/baselines/adapter_TS_OfficialESLint/src/main.ts create mode 100644 test/baselines/adapter_TS_OfficialESLint/test/.eslintrc.json create mode 100644 test/baselines/adapter_TS_OfficialESLint/test/integration.js create mode 100644 test/baselines/adapter_TS_OfficialESLint/test/mocha.setup.js create mode 100644 test/baselines/adapter_TS_OfficialESLint/test/mocharc.custom.json create mode 100644 test/baselines/adapter_TS_OfficialESLint/test/package.js create mode 100644 test/baselines/adapter_TS_OfficialESLint/test/tsconfig.json create mode 100644 test/baselines/adapter_TS_OfficialESLint/tsconfig.build.json create mode 100644 test/baselines/adapter_TS_OfficialESLint/tsconfig.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.create-adapter.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.github/auto-merge.yml create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.github/dependabot.yml create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/dependabot-auto-merge.yml create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/test-and-release.yml create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.gitignore create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.vscode/extensions.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/.vscode/settings.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/LICENSE create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/README.md create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/__meta__/npm_package_files.txt create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/index_m.html create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/app.tsx create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/components/settings.tsx create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/de.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/en.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/es.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/fr.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/i18n.d.ts create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/it.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/nl.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pl.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pt.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/ru.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/uk.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/zh-cn.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/src/index.tsx create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/style.css create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/test-adapter.png create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/admin/tsconfig.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/eslint.config.mjs create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/io-package.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/package.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/prettier.config.mjs create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/src/lib/adapter-config.d.ts create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/src/main.test.ts create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/src/main.ts create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/test/.eslintrc.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/test/integration.js create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/test/mocha.setup.js create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/test/mocharc.custom.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/test/package.js create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/test/tsconfig.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/tsconfig.build.json create mode 100644 test/baselines/adapter_TS_React_OfficialESLint/tsconfig.json diff --git a/templates/index.ts b/templates/index.ts index 3cbdc2fb8..2c251592e 100644 --- a/templates/index.ts +++ b/templates/index.ts @@ -21,7 +21,6 @@ const templates: { name: string, templateFunction: TemplateFunction }[] = [ { name: "_eslintignore.ts", templateFunction: require("./_eslintignore") }, { name: "_eslintrc_javascript.json.ts", templateFunction: require("./_eslintrc_javascript.json") }, { name: "_eslintrc_typescript.js.ts", templateFunction: require("./_eslintrc_typescript.js") }, - { name: "eslint.config.mjs.ts", templateFunction: require("./eslint.config.mjs") }, { name: "_github/auto-merge.yml.ts", templateFunction: require("./_github/auto-merge.yml") }, { name: "_github/dependabot.yml.ts", templateFunction: require("./_github/dependabot.yml") }, { name: "_github/ISSUE_TEMPLATE/bug_report.md.ts", templateFunction: require("./_github/ISSUE_TEMPLATE/bug_report.md") }, @@ -31,7 +30,6 @@ const templates: { name: string, templateFunction: TemplateFunction }[] = [ { name: "_gitignore.ts", templateFunction: require("./_gitignore") }, { name: "_prettierignore.ts", templateFunction: require("./_prettierignore") }, { name: "_prettierrc.js.ts", templateFunction: require("./_prettierrc.js") }, - { name: "prettier.config.mjs.ts", templateFunction: require("./prettier.config.mjs") }, { name: "_releaseconfig.json.ts", templateFunction: require("./_releaseconfig.json") }, { name: "_vscode/extensions.json.ts", templateFunction: require("./_vscode/extensions.json") }, { name: "_vscode/launch.json.ts", templateFunction: require("./_vscode/launch.json") }, @@ -74,12 +72,14 @@ const templates: { name: string, templateFunction: TemplateFunction }[] = [ { name: "admin/tab_m.html.ts", templateFunction: require("./admin/tab_m.html") }, { name: "admin/tsconfig.json.ts", templateFunction: require("./admin/tsconfig.json") }, { name: "admin/words.js.ts", templateFunction: require("./admin/words.js") }, + { name: "eslint.config.mjs.ts", templateFunction: require("./eslint.config.mjs") }, { name: "io-package.json.ts", templateFunction: require("./io-package.json") }, { name: "lib/adapter-config.dts.ts", templateFunction: require("./lib/adapter-config.dts") }, { name: "LICENSE.ts", templateFunction: require("./LICENSE") }, { name: "main.js.ts", templateFunction: require("./main.js") }, { name: "main.test.js.ts", templateFunction: require("./main.test.js") }, { name: "package.json.ts", templateFunction: require("./package.json") }, + { name: "prettier.config.mjs.ts", templateFunction: require("./prettier.config.mjs") }, { name: "README.md.ts", templateFunction: require("./README.md") }, { name: "src/main.test.ts.ts", templateFunction: require("./src/main.test.ts") }, { name: "src/main.ts.ts", templateFunction: require("./src/main.ts") }, diff --git a/test/baselines/adapter_JS_OfficialESLint/.create-adapter.json b/test/baselines/adapter_JS_OfficialESLint/.create-adapter.json new file mode 100644 index 000000000..de33bfec5 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.create-adapter.json @@ -0,0 +1,38 @@ +{ + "cli": true, + "target": "directory", + "adapterName": "test-adapter", + "title": "Is used to test the creator", + "startMode": "daemon", + "features": [ + "adapter" + ], + "connectionIndicator": "no", + "connectionType": "local", + "dataSource": "push", + "adminFeatures": [], + "type": "general", + "language": "JavaScript", + "adminUi": "html", + "tabReact": "no", + "releaseScript": "no", + "tools": [ + "ESLint" + ], + "eslintConfig": "official", + "indentation": "Tab", + "quotes": "double", + "authorName": "Al Calzone", + "authorGithub": "AlCalzone", + "authorEmail": "al@calzo.ne", + "gitRemoteProtocol": "HTTPS", + "dependabot": "yes", + "gitCommit": "no", + "defaultBranch": "main", + "license": "MIT License", + "licenseInformation": { + "type": "free", + "license": "MIT" + }, + "creatorVersion": "2.6.5" +} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md b/test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..895613958 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,32 @@ +--- +name: Bug report +about: Something is not working as it should +title: '' +labels: '' +assignees: '' +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '...' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots & Logfiles** +If applicable, add screenshots and logfiles to help explain your problem. + +**Versions:** + - Adapter version: + - JS-Controller version: + - Node version: + - Operating system: + +**Additional context** +Add any other context about the problem here. diff --git a/test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml b/test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..d7cfe5940 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: ioBroker Community + url: https://forum.iobroker.net/ + about: Please ask and answer questions here. \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/.github/auto-merge.yml b/test/baselines/adapter_JS_OfficialESLint/.github/auto-merge.yml new file mode 100644 index 000000000..4f6d185f0 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.github/auto-merge.yml @@ -0,0 +1,17 @@ +# Configure here which dependency updates should be merged automatically. +# The recommended configuration is the following: +- match: + # Only merge patches for production dependencies + dependency_type: production + update_type: "semver:patch" +- match: + # Except for security fixes, here we allow minor patches + dependency_type: production + update_type: "security:minor" +- match: + # and development dependencies can have a minor update, too + dependency_type: development + update_type: "semver:minor" + +# The syntax is based on the legacy dependabot v1 automerged_updates syntax, see: +# https://dependabot.com/docs/config-file/#automerged_updates diff --git a/test/baselines/adapter_JS_OfficialESLint/.github/dependabot.yml b/test/baselines/adapter_JS_OfficialESLint/.github/dependabot.yml new file mode 100644 index 000000000..c165a6a47 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.github/dependabot.yml @@ -0,0 +1,22 @@ +version: 2 +updates: + - package-ecosystem: npm + directory: "/" + schedule: + interval: monthly + time: "04:00" + timezone: Europe/Berlin + open-pull-requests-limit: 5 + assignees: + - AlCalzone + versioning-strategy: increase + + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: monthly + time: "04:00" + timezone: Europe/Berlin + open-pull-requests-limit: 5 + assignees: + - AlCalzone diff --git a/test/baselines/adapter_JS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml b/test/baselines/adapter_JS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml new file mode 100644 index 000000000..baeae23b5 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml @@ -0,0 +1,27 @@ +# Automatically merge Dependabot PRs when version comparison is within the range +# that is configured in .github/auto-merge.yml + +name: Auto-Merge Dependabot PRs + +on: + # WARNING: This needs to be run in the PR base, DO NOT build untrusted code in this action + # details under https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/ + pull_request_target: + +jobs: + auto-merge: + if: github.actor == 'dependabot[bot]' + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Check if PR should be auto-merged + uses: ahmadnassri/action-dependabot-auto-merge@v2 + with: + # In order to use this, you need to go to https://github.com/settings/tokens and + # create a Personal Access Token with the permission "public_repo". + # Enter this token in your repository settings under "Secrets" and name it AUTO_MERGE_TOKEN + github-token: ${{ secrets.AUTO_MERGE_TOKEN }} + # By default, squash and merge, so Github chooses nice commit messages + command: squash and merge diff --git a/test/baselines/adapter_JS_OfficialESLint/.github/workflows/test-and-release.yml b/test/baselines/adapter_JS_OfficialESLint/.github/workflows/test-and-release.yml new file mode 100644 index 000000000..462c8cbec --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.github/workflows/test-and-release.yml @@ -0,0 +1,92 @@ +name: Test and Release + +# Run this job on all pushes and pull requests +# as well as tags with a semantic version +on: + push: + branches: + - "main" + tags: + # normal versions + - "v[0-9]+.[0-9]+.[0-9]+" + # pre-releases + - "v[0-9]+.[0-9]+.[0-9]+-**" + pull_request: {} + +# Cancel previous PR/branch runs when a new commit is pushed +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true + +jobs: + # Performs quick checks before the expensive test runs + check-and-lint: + if: contains(github.event.head_commit.message, '[skip ci]') == false + + runs-on: ubuntu-latest + + steps: + - uses: ioBroker/testing-action-check@v1 + with: + node-version: '20.x' + # Uncomment the following line if your adapter cannot be installed using 'npm ci' + # install-command: 'npm install' + lint: true + + # Runs adapter tests on all supported node versions and OSes + adapter-tests: + if: contains(github.event.head_commit.message, '[skip ci]') == false + + runs-on: ${{ matrix.os }} + strategy: + matrix: + node-version: [20.x, 22.x, 24.x] + os: [ubuntu-latest, windows-latest, macos-latest] + + steps: + - uses: ioBroker/testing-action-adapter@v1 + with: + node-version: ${{ matrix.node-version }} + os: ${{ matrix.os }} + # Uncomment the following line if your adapter cannot be installed using 'npm ci' + # install-command: 'npm install' + +# TODO: To enable automatic npm releases, create a token on npmjs.org +# Enter this token as a GitHub secret (with name NPM_TOKEN) in the repository options +# Then uncomment the following block: + +# # Deploys the final package to NPM +# deploy: +# needs: [check-and-lint, adapter-tests] +# +# # Trigger this step only when a commit on any branch is tagged with a version number +# if: | +# contains(github.event.head_commit.message, '[skip ci]') == false && +# github.event_name == 'push' && +# startsWith(github.ref, 'refs/tags/v') +# +# runs-on: ubuntu-latest +# +# # Write permissions are required to create Github releases +# permissions: +# contents: write +# +# steps: +# - uses: ioBroker/testing-action-deploy@v1 +# with: +# node-version: '20.x' +# # Uncomment the following line if your adapter cannot be installed using 'npm ci' +# # install-command: 'npm install' +# npm-token: ${{ secrets.NPM_TOKEN }} +# github-token: ${{ secrets.GITHUB_TOKEN }} +# +# # When using Sentry for error reporting, Sentry can be informed about new releases +# # To enable create a API-Token in Sentry (User settings, API keys) +# # Enter this token as a GitHub secret (with name SENTRY_AUTH_TOKEN) in the repository options +# # Then uncomment and customize the following block: +# sentry: true +# sentry-token: ${{ secrets.SENTRY_AUTH_TOKEN }} +# sentry-project: "iobroker-test-adapter" +# sentry-version-prefix: "iobroker.test-adapter" +# # If your sentry project is linked to a GitHub repository, you can enable the following option +# # sentry-github-integration: true diff --git a/test/baselines/adapter_JS_OfficialESLint/.gitignore b/test/baselines/adapter_JS_OfficialESLint/.gitignore new file mode 100644 index 000000000..80c28aa9d --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.gitignore @@ -0,0 +1,18 @@ +# No dot-directories except github/vscode +.*/ +!.vscode/ +!.github/ + +*.code-workspace +node_modules +nbproject + +# npm package files +iobroker.*.tgz + +Thumbs.db +.commitinfo + +# i18n intermediate files +admin/i18n/flat.txt +admin/i18n/*/flat.txt \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/.vscode/extensions.json b/test/baselines/adapter_JS_OfficialESLint/.vscode/extensions.json new file mode 100644 index 000000000..a8d778499 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "dbaeumer.vscode-eslint" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/.vscode/settings.json b/test/baselines/adapter_JS_OfficialESLint/.vscode/settings.json new file mode 100644 index 000000000..0cb5c9286 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/.vscode/settings.json @@ -0,0 +1,22 @@ +{ + "eslint.enable": true, + "json.schemas": [ + { + "fileMatch": [ + "io-package.json" + ], + "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.js-controller/master/schemas/io-package.json" + }, + { + "fileMatch": [ + "admin/jsonConfig.json", + "admin/jsonConfig.json5", + "admin/jsonCustom.json", + "admin/jsonCustom.json5", + "admin/jsonTab.json", + "admin/jsonTab.json5" + ], + "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.admin/master/packages/jsonConfig/schemas/jsonConfig.json" + } + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/LICENSE b/test/baselines/adapter_JS_OfficialESLint/LICENSE new file mode 100644 index 000000000..27c9a624d --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2025 Al Calzone + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/test/baselines/adapter_JS_OfficialESLint/README.md b/test/baselines/adapter_JS_OfficialESLint/README.md new file mode 100644 index 000000000..8a47404cf --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/README.md @@ -0,0 +1,124 @@ +![Logo](admin/test-adapter.png) +# ioBroker.test-adapter + +[![NPM version](https://img.shields.io/npm/v/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) +[![Downloads](https://img.shields.io/npm/dm/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) +![Number of Installations](https://iobroker.live/badges/test-adapter-installed.svg) +![Current version in stable repository](https://iobroker.live/badges/test-adapter-stable.svg) + +[![NPM](https://nodei.co/npm/iobroker.test-adapter.png?downloads=true)](https://nodei.co/npm/iobroker.test-adapter/) + +**Tests:** ![Test and Release](https://github.com/AlCalzone/ioBroker.test-adapter/workflows/Test%20and%20Release/badge.svg) + +## test-adapter adapter for ioBroker + +Describe your project here + +## Developer manual +This section is intended for the developer. It can be deleted later. + +### DISCLAIMER + +Please make sure that you consider copyrights and trademarks when you use names or logos of a company and add a disclaimer to your README. +You can check other adapters for examples or ask in the developer community. Using a name or logo of a company without permission may cause legal problems for you. + +### Getting started + +You are almost done, only a few steps left: +1. Create a new repository on GitHub with the name `ioBroker.test-adapter` +1. Initialize the current folder as a new git repository: + ```bash + git init -b main + git add . + git commit -m "Initial commit" + ``` +1. Link your local repository with the one on GitHub: + ```bash + git remote add origin https://github.com/AlCalzone/ioBroker.test-adapter + ``` + +1. Push all files to the GitHub repo: + ```bash + git push origin main + ``` +1. Add a new secret under https://github.com/AlCalzone/ioBroker.test-adapter/settings/secrets. It must be named `AUTO_MERGE_TOKEN` and contain a personal access token with push access to the repository, e.g. yours. You can create a new token under https://github.com/settings/tokens. + +1. Head over to [main.js](main.js) and start programming! + +### Best Practices +We've collected some [best practices](https://github.com/ioBroker/ioBroker.repositories#development-and-coding-best-practices) regarding ioBroker development and coding in general. If you're new to ioBroker or Node.js, you should +check them out. If you're already experienced, you should also take a look at them - you might learn something new :) + +### Scripts in `package.json` +Several npm scripts are predefined for your convenience. You can run them using `npm run ` +| Script name | Description | +|-------------|-------------| +| `test:js` | Executes the tests you defined in `*.test.js` files. | +| `test:package` | Ensures your `package.json` and `io-package.json` are valid. | +| `test:integration` | Tests the adapter startup with an actual instance of ioBroker. | +| `test` | Performs a minimal test run on package files and your tests. | +| `lint` | Runs `ESLint` to check your code for formatting errors and potential bugs. | +| `translate` | Translates texts in your adapter to all required languages, see [`@iobroker/adapter-dev`](https://github.com/ioBroker/adapter-dev#manage-translations) for more details. | + +### Writing tests +When done right, testing code is invaluable, because it gives you the +confidence to change your code while knowing exactly if and when +something breaks. A good read on the topic of test-driven development +is https://hackernoon.com/introduction-to-test-driven-development-tdd-61a13bc92d92. +Although writing tests before the code might seem strange at first, but it has very +clear upsides. + +The template provides you with basic tests for the adapter startup and package files. +It is recommended that you add your own tests into the mix. + +### Publishing the adapter +Using GitHub Actions, you can enable automatic releases on npm whenever you push a new git tag that matches the form +`v..`. We **strongly recommend** that you do. The necessary steps are described in `.github/workflows/test-and-release.yml`. + +To get your adapter released in ioBroker, please refer to the documentation +of [ioBroker.repositories](https://github.com/ioBroker/ioBroker.repositories#requirements-for-adapter-to-get-added-to-the-latest-repository). + +### Test the adapter manually on a local ioBroker installation +In order to install the adapter locally without publishing, the following steps are recommended: +1. Create a tarball from your dev directory: + ```bash + npm pack + ``` +1. Upload the resulting file to your ioBroker host +1. Install it locally (The paths are different on Windows): + ```bash + cd /opt/iobroker + npm i /path/to/tarball.tgz + ``` + +For later updates, the above procedure is not necessary. Just do the following: +1. Overwrite the changed files in the adapter directory (`/opt/iobroker/node_modules/iobroker.test-adapter`) +1. Execute `iobroker upload test-adapter` on the ioBroker host + +## Changelog + +### 0.0.1 +* (Al Calzone) initial release + +## License +MIT License + +Copyright (c) 2025 Al Calzone + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/__meta__/npm_package_files.txt b/test/baselines/adapter_JS_OfficialESLint/__meta__/npm_package_files.txt new file mode 100644 index 000000000..23b05f264 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/__meta__/npm_package_files.txt @@ -0,0 +1,10 @@ +admin/index_m.html +admin/style.css +admin/test-adapter.png +admin/words.js +lib/adapter-config.d.ts +io-package.json +LICENSE +main.js +package.json +README.md \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/admin/index_m.html b/test/baselines/adapter_JS_OfficialESLint/admin/index_m.html new file mode 100644 index 000000000..f11dc3c14 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/admin/index_m.html @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+
+ + + + +
+
+ + +
+ +
+ + +
+
+ +
+ + + + \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/admin/style.css b/test/baselines/adapter_JS_OfficialESLint/admin/style.css new file mode 100644 index 000000000..57d4549ee --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/admin/style.css @@ -0,0 +1,32 @@ +/* You can delete those if you want. I just found them very helpful */ +* { + box-sizing: border-box +} +.m { + /* Don't cut off dropdowns! */ + overflow: initial; +} +.m.adapter-container, +.m.adapter-container > div.App { + /* Fix layout/scrolling issues with tabs */ + height: 100%; + width: 100%; + position: relative; +} +.m .select-wrapper + label { + /* The positioning for dropdown labels is messed up */ + transform: none !important; +} + +label > i[title] { + /* Display the help cursor for the tooltip icons and fix their positioning */ + cursor: help; + margin-left: 0.25em; +} + +.dropdown-content { + /* Don't wrap text in dropdowns */ + white-space: nowrap; +} + +/* Add your styles here */ diff --git a/test/baselines/adapter_JS_OfficialESLint/admin/test-adapter.png b/test/baselines/adapter_JS_OfficialESLint/admin/test-adapter.png new file mode 100644 index 0000000000000000000000000000000000000000..094ebd97c36dbe2386a63dbce290c9ad6a148079 GIT binary patch literal 62376 zcmb4qbyQSQ_ckCs(lB&)3P>Z}O2ZHW(%mt1cZY<4(hX8dNen|v2-4jpT>?XYqrUI& z_kDkUtTl@@d)>S5IeYK(oM%7hPK>&$0v0A2CISKimXe~ZCISMYQ z57AvyK^mcElwuG51=(6kMG66-J_&GdiUR+R;i9PTj(~vO^XG#&;9PD2H==ncsmP&i zJjX&8qI2MifqR9UbbaIT5fykWo4c7lMF0 zdjVZ!p`oEUH4bjpkd%~M>qKxa3Jwm21|hDn(w z0xo!FC7>y(f+;pWO{)zv8YsMRb6YYwQ^E_Jnsgf_t6=;=#XTkb#y#5oO4t7`sOGQ# z`#Vy)L8ltVL4lqPPupm|HpMsD7ZiXc0O#%@{*umZZ0sx}Ow7BJM4~fdk)qMiP2~LY zPPpsOTuyI_3OefxS|LgRaEh%pR=`&b*tn{Zg;fPDuU6P~eR73qdz8>_{zB-rsJPyz z%cCmu7-hlr$7TNK$~%?hnZLDPa@$uk@!m;n-{rCWoqgU5GI=YNX)NU^lX`<_xj}Mw zwI1m64hFJGU{jSAA|E#%ds0YJPE-iS9|QLF`k zRKy(8)>Bv`L+ORuF}}o-jIdWM{^GOTfthkg2?G9ZTrdAbAG#Yx=IK5yTiR*XrPM8* z8b>`}X{H^M#1veMo5gnOL$t9gJV&`$gb#=@HD2m&~`=1Is5{9^@s zcU8n82s%i4%wZ_Ek*zj8FC4K1{R@_!@b9x{|l&p|U-yd`%i+svRH@OSDm@}zz zQ8zH3lplH&2mXr}71^y-zaEPjH)Fe*=1Xx-L}XbjWMCITX5O^?39Q_S=kGMjWa8?p z$g1`}I&?{&;Ti-_qX^k`moW#ETw;C@qNYE#_^qpD*?Ece?_w!~Ft8mN9l?u3HckKT zGb;c0NP46kq0G}*KU&%DYSjLQ`q8KE^s=X$IF?f)Ta9HUbxacBhn_OF=gs9}tn$G$ zRMSTnV7UvW06HD9p$(`_$GnnG^n_TH` z9lsEuZJ=^!bBh1(?4BrK{et~EtNQOuVJ?qANhMFfh#QBMr_86Xv$jfKcQ$ulauc|; zA<9!r5S#XIUYFV`xd)Qa{m_pwriLDpaEQ;}ObgF8B0!MiR#isE{@3qwSgBw)l6OfZ z?i9*gbumva%*S3RBLk-WjMLRqi^J+iWb3ET8tb9!8!r=1uZ&Hl9K`i}zZ87ws16y_ z!Fr}uxX*Kd#1SlKcgqA|&r>k^w;ay81lzE8JhneR$w1A@%5lXeHSd3w6gZ2tSFgAF z4mR3L+|;6yMV5BdGkPNcX3RMvxp7*!mambPcCTS1;C<|iKZxOPSZCuO7c(Guix!7^ ztPsN5h2((=SoP#jnP=B+WHYCHAwaV4Ryt^+?aTS4xqJ}~euWDvTmfxg@0mD@P*yRbDRCZ*NpfqnQwX8muPyvxaJ zoh!I_F`&|C1;T*{Ta%XN1#{7NcW-5aHVq=|qKEhT-%fmrAt9LrbR%U(Qok@cHd`O= zNs55+P)mqI4f`p2!c7l(F3{enHEtc~#zYqAi~3^+ZCofpojN}48roxgV9zYIGT{wA z@jiL>x6B3*+Y+CmWE&1vA@1)B5>7y;TxwPF}c zct>vX`2{(>oxRN!85x9u3Ad_526KhMo5yp^qJNw0Y=e7Sq3jg+D;c53)J+ z&j&pCt2QG>kdN)9CLfZ2{uBf_RXNWjoRCbP@t~;3w4yHsOg>~<&+*=K(-LNlIyswM zNu`(i{6X%0V*Y@yiF0Ovaoj8(e?hMV+$^Bko9~7)4FwDJEzM_Y=rli7o!tqr#3n8E zpiUQoHDu<#h*ra=ltra~A$f}04z={DNAL-g!=&$C@T#rrZgu>p@sst(6sD7o)1MNI z!IB0&U@SOpO`hREeIR4HFO>^omssFCeeH^gNWbIjkU(8c!4IMD7s#F}@Ke9_q_NH+gb%8%X?jy@Qil z$0Pgg=qB}6KEjrvQ@o2hs8&y#2X_H5ZDd@VmlMT!kN(_#Tcl&wLCoHrpFB}Zf52{Q zu>TIY6|D`Dy1IBvkcH~$J!W&V2up+CW8d-(qiKiZY&U?K9e2q3p=;I|{4dCycKsi- zO%7gA0OtL+AX&NnchePf2zl8ENMxu?)o0d`!sD-I*C|biTRTGZ*&%_esDEd-T*$Ow zlF!B4*5kLSgVt=9J-8$wU$x(WiFwM3Nt0jGS%A}&cHv#C0FG8B#Y&ksgNXn4&hakq zO=1{oBXr6R@}lXMB>qFBO$VxRC-o3BdoYpDd#lX1)5N_J+}w=Z1vx8`wXoamus{1k z{xMYWTriUl^6{$LM3?l$o!tEUthLc;#h>Sm8GY4OK8k!UTk6Hb53%|eN13~NdvX)v zD^Z8(DZ3do$XVBIYST;ZYFF2=g>xl9{>qNL9e|bwdQ9t+xBP8hOpCFgDf0goJJrJtDGs;DWDpVXtc{tYEIIms&ek`7fMU zut0ChbgqYFa-E$$9pAcQ2b~298K&$Y6x=QX#H?m7Jak(7bK^0 z+rv=-ZUmr`^u;<@*4c9LbO;JJ#Ets0Z?(s%N_RLnRi{VzP0 zQ{D_#5-900U3afC0FTcp+S7ci%v%^}U5wOqV=MvYImYwmc^rpTbKRyyLF znpuMoQ{)G%fScQ@=YK2b==&Q7m-pWtqH{|tzhvUqAuYy^GLqf6a{{ zGOoHHw=mSNqf$y`)q={{_&*~MzEP?qDCao5WvcixcWX}cqFNFwWsurmaAy%ZLp@?K zS5CX2ZcSudx#^BC$uINu3>H?9M1K8*2dw-T4~eb2~SlT9Lk zZt#JcxaArxzI$~>oiArPKU=LE<2eD%9tXfaA*(N&1mJK4fAgO`a$K|b$*ip%`kU%@ z)pwdbc-lH)eLhN+ZS^fEgvET{Ih1t*qN~OC^?hZ2ZVP&5dAYf5MlL{kF)q6epB+}fWCm=YE9|7T1B)XweCQgjs=DxRicgtvHpp!|g(}~o zOT!pKjDM#s#X606=Cx#B_xqFU-FHu4su-92oD$4SMW`gr4ybT4X^J~(1x00#_uJJn z|49;p1kNTomVcl&KQSF-I%cgRIm2NVqmfARr5ae{#~a}Q7WlnQ{Ji$zwd1jsvxhmq zoGHG~=HdTEpk{YL`E3J^(Carz9m@}5WcgioGyO>67*BLsWln`1;CHa!j{d4h=q3Ok z#8RDuyoZHk+SUwEPHVD>3u;mXR06@&A ziSs@pY}o%6D~&(7?H~&HYWu%WzPA9mGbyBVzIKczEF+^k#O#Cu*J|34ry0jILC!f6 zOW4yBNa3&hv5%M^R^VLWvI{;EGP=~fwW!cP&Qf9!jg4Rbt>?;Jr9wN3)_#n;my4!v}tZc@8cQ(gI0{hG$Zy)1HH~=EsWv*D^`k{TvrKoX}?M!}Ie_&7*r<{ASoaPMQ3OQtdc!!A?2f+u# z5Uh7kW*@Emw9)1?J-%Y2#SD2&`?oT3LZ7FXep5=gJ?$uy-M$OMn!>UZ^O3kQpGHC! ze}Ty7nCQCG=Hx7A@%r-SvDQvEYV$Asa;Zb0+U?+3MFK+O^bizIFG1A)?~rU}fLd+) z3v`pB{sEwW4MI;BSGDL#!VPdr&PvX%aK9)6JP02TY@mRBhiet=Ct8Z}e_adwZudx@ zO3e|>0U4aN`IYrZ4F~2Q){McZR;@7K88)Q&YFkkV1d7V2mpgNw-4^{Jg*gi0`ECi*}8 zo#|TV=<@eYf{zl&{+q`;9a2?@Cj`)0U89R{==qV~9VAx4mDv7R5B9uif12u3;~mq` z*9RLO)AmWJ+O4M@#^ejJ%HT6B!$rA{H}KU`sj^lL5Jy9VQ_FAskU*T98ZCYncyl;Y zNt)U5GPC!e52g3}Rvu-vLvPf@px1$pP(gDA4jbL7rTi0li?=5ccyI^38_gtI2G`dZ z{h9yS&F*!5vhyd}Y4jWO50RUpH*xKR=}rEN(}duF)EzwpBX8#^J04COdz14npbgl6 zAF14`r68d-#8%UB_sQ(+P51AOgRg&k-zQKmgUP{(N1reC64EZU4T@c~K)D&>J;v(y zl6JuZ1L)n){o7K%#e~(lUs05_^f$MU>f+i62}m`nYX{9-HaszHP7>y{!<%j5(~`ET z%T(~vG&hF?R{g2*Q{yd-;-L=_td%HZNjg(7cGXSqvsY3j{Hs^|C~>Pa$^v6QZarnK zFh}G@xFO;Pp=$aF;16?`eMlrRD0QBjWvHb|kgUcFVu<+7A3XzBo8MA%E_b7mJ}S3| zr2s6g6zR$C9HJ{jXzwrlb;sAZ{%eDf=*Qgv$j(AvyEGw0pTPg6sHq+J<>tq{UcrXy z))f7hkU)tvH4wt$Uafs`jq^D<9_8OY-oe> zLbp&!Q3fl$c+TI)$M%h~$5EdmYeg=aq6oE9Y9tr?cG6UIot0Ho29^wHSD$NY`<_xp zZ59qatsl*%Ta*v=>O32}%581;?0dxniwykC#7m0vAf{>ua`d@gIIqB5JCze4IJNH7 zynH)_P&yl*)8roj!GfcEND#aFXF>xH@n2Rl$TQ0qMOb*+U@k@9JNyrl;(?tkD9(8+ zxLw`9egT`Fr-JC~Ky#rdLKFttWF{#_@uU2*eFGo!_u_Um-Y*WSX)gmx4gvM$XBaDsEQj7#QI(r+HLjL zS2>;4``f4O#o%qO;l#~dI8lJzR$wHVktN2S|9VvJfu=n%1)}LuU`{_*-jz1Cr=VXI zztWQtXGA>Yx8HTUzZo^5t=bl0Bl7qN+3d(5-2PK^FG5gMUxVImyvN}MNHA60UK|;d zQ}tJ==60I3A{mIb3%X&oBt}SwYZx8i8WmZrHlGzBu~gC{9=^0*P11wmdy5~4Rz%-t zQ|QhbKfNyza z$anCqo&AT5?>S`|lYcn^wwIV-OzrBz>CvH>#KsuG6(oZi2rcWdaxku{X@)E`O04|p z7@$EI4)fbC$Bv9$VJ2u!L6@xzVSeqAf=~HiKi9mrH;F-APIvYVg2{HCtAY3_D=g&F0w1{aium}tl5u;)IMeZ zgTZyx*w+9K2f035BI#?sM%uzJWQAq6M7F$ru=>Irzs~!>!Xdv^2ZUq#Pp>M5a-ZAv zsJ;^-UhO?O!Zbe^ILyd~?B(S|*4px!hh1|(HbDbXm}_^VD96Hq5p2L}Rz0XYOk6hs zFKY$f+5S5JPrG`r`(4e3ubd=~3Z2pq^ZZ_WxGvqwAo-^ai>J@^`s^635$ei|AHnD@ zJv{yoQ-mDBA80DF;Vih@!ni0mRTsZq&wOg1_2nJk#jVhIcbh1Rkm(1m$w7;g7=*D zkSR~^wv%5OC4X*hIKOM8eet@4Q!j(2yrpw%saRfqF7#`+8T52{tueTJ=BJdhF?_ox zA6@#@)u!hM5-){QJj1dD=iHm;4vkblakJ7d{3EmJdCf&t=DhvCpNwMNB!bBQu#iXg z;B?*GBC>aB3+2?Scds$uYx{n%tU_HoqP$rN3Zo$c$u$hw#|*3ClSRKytjG;aDZQ=S z3K%#m<%I9~Gu-9duS^5EOyf?Qn{KTPNjY7A>4UdjVL#tnGR{7OJ_zEnFLv+9KHuf@TK;86kL+9hRod+M zpo+aK9}Fzu7E|SG_U7dzE!#%R;g3>jO{iAcuzuC;j&=Jaiff_*F5Vjr6^m|0RA*d; z#?QXWCgnm^?Lth`^5qVNt%Q;sVei@Nxf?aj+arDM_N2iAGeu?ujppr^gDX$Y-fP_K( zvLr*O?J{D{v+Sg-Sw3;SDDCp_pguls0SzrVzY zk-vB&7g84*L>$M(Slyt0v=sULkKWcU@u$0^4ShbjbB+(HhBZ~Z{)#b7W-@HW*0geb zzI=bu^M;neB~Q?0^$ou)`MdO(>;~F!uRWE+4Ygnvp}?)e4MUANFaJn~aI%2AxMFJq z^RKma>=FR{)U%@Y#3f(sd;QlUY76b(vL5@dhpzp||Muu7YVXX#QgOEI9dkL=ujb6Tu&~A}&vs zIsMKe`NCJVB195@Pa@VHyr}_|ynohxd4Y2i$?9($SZ{s}v^za1DJ8gm0I3CEA~0z& zflt<|h+C!(7YF)#U<{FS1f9bP)q9b&RP=8HiMp-Il(rpEKMbiV#7wGIN>!KyB9bEmSxmDJMoaF)t6g zWpes0bEU^|jOUWsI~|I2hd^x)zEe7Q8t}^5NBY-krGA)lK~A4G;Ze5l*#N31Ptbhj z*1x1}x-GZfgYV2KI+!%CqUITiK0vIDmAqa!|Bm9SK%;ip9Mi6iyPZM${XjV|AM_SJsF+z=0wte{Pi2 z`j^7z`%?7^P6WDYH{yolX8hbD5EF;eA+zI!GQe(5`~!65WP;2^!6{k9O|iM>82z27 zDf$?|TW|hN6>7tSx_|m$`^TuW1XOW}%Ix77eJokrUK|cNJquPrNY@ygtt1F&sX(9` zb;zkj8VWw(yytW;QQaxORwsOq7qo4I{5_2-C-pMdhV;>SQyUtHk5?&cRI(Xl7rZt* z``9x(+on#CRbCmV+)$4$VoqG2sjDn5VRP?8$Gyq_{J^U{3FmJLvfU+AO9sArOe00Z z&M~MFYH!A$?j7_BuU>Gfztb31uD_Qf)?sX3i8{KUz4bgNm4sN zXrNAgr~3^2fW=+)3_o?u`~dg-#=CEqTF!#a+1|!e&1kjvSzMm##|kFr;>UY}f0EXx z?qbvn_F7gX{wEUwbOaQ#2B0gA4@LIistMqE8-6U+*}KVCYCS@tk9 z`v2>R?Xa8rH)twI0eKXa3cIBh9w5kv4~6H`7e$o^r+zr&D5`b2U74oa5B6_V;y7)h z1^i?BY8?&2F5l{<32g4}W%|0NxONhv&RjM^<9iBc5dkifSLU;UKj}389u7e}@pIXJ zP{(exyf#0a`ER@IW6$c#5_wA}111Odltm0CG~6^*V8HYU#Ea*o(TaX>!Z}_-z0DDn zjwnIy0NYc`wBA!unyW9(95HqC8WE}anVXHSAU9{vNxE6?=4=x8pxzco!GgPJ2bjOo z`=a8{>B^~dc-j$z+dEx~l&P=nW;%pj^3Z-CkRiq(*m= zn|lwg$>CMRz*%a@9ckPub!Lg)eTGS3pP3*zAio~2yXyEAB^-(V_;Sl&w6M^<2vakg z6L$IHgm$Li!8JM-FM9WUXHi~qEufrC2&R2Q(g#FlTXVc;&YTb}stC09%Htu^w7744 zPU_*RfNIncxUr}sncvi|mcA2&>EbS-Qy=jp(w;#5(YAx&?E%>14f(Wu{Nr1%?4>Uv zaTB(dDv2jMt9j0Th#?E-5K#6LtGE^X4qo^jsrsvi_pfV^@DdIV@w=Nlf}x8rK{RZ5F1ve>(`WkjDrc#fD_r7AW(Cy}%b7MW^oOoj z%FvxR2cYGC$!Dh-S2kTRMYh}MPz-F}*Kxi=1w4+7a+AJM_UA|RG^YalFI`U6;OkM- zVf}B%jbvz{_ecy#qYEL@#EnQ`ta7WXinW zFYe%gUwGAh-|O1OkRSob$SZOI$k^g2fc=0t&Q~hxwu#rQETUZ~f$z3T${VVeoQ+cb zWcfdhIz^Kx2X5R=zq+406_^ohrDSw!J!1I2vd@#19GSd*^>wQbc=cU!ayr%duGK=m z+4~Y>IrNs)3qZJM@2fm{a(JGTQtCkFH2LxvZ)u>#-KLF{?H6^03e)NO6nJe-t1f?~ zc@F8=`epG06ugEcaS0<`TUs}iEFP|3+b}n}r}!+n(tq1qSCv%Y`G&l~NduJv=&sj)$fL_iln!(S#(I+MkEMD$kJGSCAMfUrO{B6uI*m(hrqQPK+E=Pyt zUg&cKKiR@krN52)!K<8%tNEg--oV1qnkuZeyTot`IS2$rTxGxV^+lPPREJu9ghC3N zF|f28xOM;yP$iM*ZTC*(d~4YW#t@em`qX^h`bC&K?Wc*rYEvG5d%|U(m&i4Fl8t$g z>8*MYA>q(Zo-=eMhnjJbYKmkj-LZ84yY?4aq6!Uy$2-kuQa9ls*&??&z)>zV>fSEl`drN5lDU#H=1+ zKwhZ;h0&+NLZ2r%7FkL(DwIeKVh|;4G{}eLl?doPH?K}N@@T1v7_8LIE8*w%byeQB zPb-@E)R`9qgy+G`fq0g)h@av6%)L068@V9O1EuZvoeke}1EWRa zY58ixFegJ*QB5lzsD@?jaBZ01EgiR4tc{WysN7X*O_LU>B=%N{EZDe=x=N@P<{gT0 z>LYD_{YhUy6sWRy5++|RY$nw(NICm%$99R+W+PO!ddXmiXf zUkEe}7d3}4I3)W>Q1rrZku|SMke32nF1vX97x7S(Dz5?W$tVV9s;Pk->>Q=e#tBFN zD{Y)^;^7MVzZ;9I7sc+uLK&>3#tGyzF(jHuk|g2r$$aUZ=duxANg|=TCN`=N*<3H4 z`P)%ZEhj^OF|JhZrD+PLz%LqUS64SHH;EVFay-G#c?-M{-L-Jn97|#_JZTzgJPTjw za-QRGmQL^zazrnsAcvco5wb94_a#jekjJS@n?(qPn)LVMHGF+g@$E}Gv$>z8(nEI~ zj~3W?1INfF)f2p#oD+ZKN8uG_m;XmU3S$g3 zO+Qc>gj7058(W^IvK4N+1hjm=;k^I$9z*aU>&%24C0&&m-7uWY6m#o{=(dr)0r2})5Y?eJW zi&y*Z!pokE@ zfLBQgJsGBC(h5oJbH6fqZ=s1=Bd?Yb_%IC`7C4V`54_wiGAHOYqfYLT#l`sn6nqE( zb&a&oz67gFqE$q*!>~@g@s44VMg@U$E!UdkXL}|u9I~3p?nwPJEndn%y{_9^nzZ=7UZ+(? z`L+^%d|Ti4Yqrx(zg`bQu-ls{r}bzE^>*0u%z%Y_X{eanmh*ZQhtsJDTdZ6Zc0J20 z!;tQ7LKeOTByTD_jWa4{-xt?a9MM0ih>h2|%yqL|y&!KM#KrLUJd@3ISAct97l~H| zey83LcOsbg6obp@Dy-7a`b`X0bI9WJ-LY9UP`(TNF;UA(pDkA6GR9Mb)e0P*`OQUz6k=Mx(WoU6r%8BvKC4IZ z{!Jn+I-6q=#ox?SdKG<>;oRxPQ!yaLx$OCcyvIN^A1jDKt3p9vMEKHqT`QKV9kpK6 zTRr6d0q^`$?)&215zHhc(h=zyyDT2E7HhbP22+W)UKqDiCYbC=q7_+Z9pKiJ7c#r1T-FY1-5zR0AGFZYml~=^mpxg+8S201j z|JAm-^XRGjlL8riv0QlFJitvwzuP2J6cjG z*bILunzQ@jBi^B)Sv~Nx|N1#M#e9E-jiEJ$+ZRZ;et_$o3J8<>mAovAx_a^kf0tIQ zfl9EWDYZBDh7XLp2l*D5CanLC@ycH#{w7Be;Vj8{#z!c% zB5b|Mmdl3ka8*6kY{=u#iu;Zir$$wD2Y;}Sy{`%qmVe-RnR0LG#&=WXN+N7tE@-(l zkUoCGBu77enBwU^yn)B*_#$xzS79IQ;XZY;51DAGdLrDck?J7E3H;5tx=ZLSvC{nd zCB#(14}j_XqUzPv;2*6oDAEM-VE?S?by+HN6|tm4edy&|gjEb<>LKg#;E zVf@?LH|tfHEk9oiQXx}L_(*rxfyhJD^%(L^WO|5{)$2mfF3oMS?0Fm^o2ZSqyL=5$ z^mD*NvZ)to6Ko>g%E@p9?092fF&|m??0^Ioy!cFiP6sST3nbdC z&Qw__dPlH?1P7Z)`C>3o+c(!qp=Q71XA9tm=>GIL0%A{H_XKDd`mSWoX`G3UDh*`L#%tIsBkbHkkcX8u-MOm?hqemSD>)4`(Ba zQ+-GE8oI_>kg*r)Pir5qiVW1@BG@SvT6qErm|3m_Wu;8f79^dFQn-SP7)664`-%44 zD6N~a7A{i0MuP;}VII>{j8Z3}6b_)gubWHHE00do%`N=!VQMY)^YQ4S9x(^ir)9^QvO37NwAQV2`#X#QmF#{+uUmLda2;VZ~eYm1xu#i&ohgcCo~=((2diQ z^+r)dP2$z|_SxjhDscli)-FOU(F=85sW9(-Nd2Ao&aVo&PZjBnsWTR_IR>~nV!0`~ z84RW3j@$>0nW>qgn(L(^vsbuZmi9k8Kmrd8H0A&LjLPBZOr%!F&6;!x0TPZdvGy0D zNuwdA?(S7u!bqA>FcKoox>ll$C8A8mCbdD@*2^C<-I7<0X#$Cx_e`lLmg?_T)R)S*{*)v?u^NL}`>RWRj{dzVx4K zW^bpaNfVBK89LJa?xhOZjBNJc$SOEWNMuMGPtJcXeVg64TV_%Z{h2OT0a=&D*^G-A zois``WE@MGg5V14@6sw%8E(0(@$BHa^(LJzVAKV6cbr(HM)fwKDDLaUTa1>pya39{ zvu0k#CF1og>d^+Mz)|v-c-o0C`VzxSzGwxT?FA-wa z(z=7g_j&mfRp)m%7+B0{d25Smg&JY_XoRcLu#uEa3qz z5oL4dzWBs^@d53%vKZ}VFP zw~T!RNqkdSTU&Reh-JcYQ{br|+xs<#Ij;3K0HGzztc`ABP@tBge<$te5=GA?Fc5QV zU8f%-x5$#~%jy&Ee3rx(^5}d4?l%#!z9f{-b2}Jea>@0}UU^@Z{gS@S`{i{n@~F;y zi|-ZB1G}bg3G2<* zEzL4IHiS5>?Q0(&HQjIB9UvOPUHsAPuZvFz7q~Hw=PAnfgi1%}q;Zad6_=ek#XIDE z$pp7|T16slnljU$euexvte~wvWPNZlvvaUUTc|5b%N6g9dbGSZwOj7qoPwy#vT}sR zM;*9Z?VG%iZ|*>jY4s-2?WjSz9BAWUfr~?OKM^~Pu_wpGr$Uj=o~8J`&#yF5bJba^ zO3S{k&xgP1utFxe$=(D#_P)D1LDGzFnkrl((w_O2dcRlFeJT*h61glr9aXhR_=Acl zI<$u{UQ<#M0f!RxOpAMQHit&Rv#y{a`=kuZS1EH(CLr0>nUrk2A0t82OS*sAf*dTW z=+@uhC9N5C#~`a$6-$j!7+%fodG=-zyG4j`B+v=aUhPDorycUuMIiC*WZ|YXN*~!R> zJ5?Ry$umvAar#rvv&=)w&z`+fT;{^ws?z~Z!FTI44K-^_0G;jJB+;Jd`z67B+^N`; zTg)lAy3nkz4yxiKW~lhhHLQaL!v(NiM-PQ}6N1P96uVAg2C+UxbJ9lo>T6CxiQAR? z+HLCXH4GyYESkE3_(<07ZD$)&eaAVS;2`s;GoO%PFSB z`6)+Ib^456q3LTWn4dwhHf|*QWC1hZw`$^E0I=_PV5n{FdZzJhPTI-r84glg;cF=* zljo<7eLy>BsRz*^(6k_2?}$w)eX6CeXKa3K-sIaFVC`dgE+J^(oA#+-Q;zE}OXO`GzJ&nZevX&HCFUEfn zgxZhJh%M(QN5*%cTh5Ol7M64qw`z}ucWq3fT2GdQH2G>cH8H)!}-^VQy--bw7jgu}ddiTKYmr=QGH&C8?eMHbp_=JaA zxbRcQ_suM>29)p%8;NuXCBKRaequ{XG|lW8*Ta<|V&OeM@o76#piyc~qnaO$%@yQA z24si&7}x&Tm3m9V#W&O-?Z zaEYj?Q7~UcbBb`h3S2B!Mv-ZTGYjr-9tZ3FF?OV-nfA};yp5pC*s0mR}(y4c}i3jUR% z3qzxO1+#GL$CvdcR`{k?o{2lM4wEPiw!@4wBfly5>l(w;oG#3Th)IxfTk@g_)l%m{ z?#qfA62{U`mEB`$%|gz|Xm>FW0$Fm(IurTzShP z#M0j?)rjHi+tSc_kO|!)^C3&__0f6C$c;1JmQ2Kld+ zCf4d8Ka@ELJS{fAr>{5xQ?QN)OMaV=ywHPjndvrl=WOe_V>+(5VW?0O%Vm#(3pA7% z5s}$XmGIeGeZ!}Z%w(L6eyO&c0FoD-Pnj~5!5K+=8#L6{)p`C$l`p5pCe7wj?5@1Z zY$Jm-8N=;j3rbH&ibf%EzeWA-O{d2F7G!^fJzLE<)+P|&1#^YN>-vvq8EdLLwyI!C z?7gkFM~IHDr*Zs+7db+`3NsNOmq~Ze{dHLaitV>MY*3CU07ySl=|UtS7ZmtGa?i`1 z;o-ibxpg>wy|90S&hw_5flg@a@=R`Sb>QR9`wv}5V6cDemGd{L#Dgu#OC5fNHl4eP zkWtgAd@HnHS-vT5E+CZ|U3|!g%+I1>O~)^@tzOwSo&xRry!Jk7;;d@M>HHPJ+6Zl=(s%&5-~; zUw*~2lF8S;U}@baqtshU$H8V}ka!>4j}vksXuzM^=7CGTX&B4*m+}>hMK_Tt&!Y+T zv}i(|xEP5tXp+=H3@>-JiWc>UEl0=RZDS*WBCy{1nX&)qt541mje2h!>M9= zec7AP(6Uc8{rU+j&(E(IzHN@+p`@Dy1&qYdDBqmBebCi2O8+b>VH}$!#wB@ttTUu<^%IC& zEID&`oaXJ5F*)QYHDwYM<47f1(TVobF?x0tDY`i%pum|$er;VRQLdRJ#_^(Mv$H{d z-uA8dRtROYZAlwI^5?Ur5bY1fOtL9q*_rgq$B83h?yk?xCX#BlF^Xq&5jWG{v9RnJA!n2;iOx?!_G<_Ro_`<|eWkw@sy8`| zj_fiMjerWkEFzRt4X^tdT(TV>F~0cGmoc2S0MoOtu-7fde7!0dRo1imdX=#`JC`l$ zl{9)LwCUa4`_#GZdM#96UV_`!6e-%+4|jD--t-JyqIx>$HM}9Dz1WFK)uNu~2smbA zk?ede?dfAbNKcw4xA27xf4tvY>_wGp4F@6f)O~EVFJTt@T%F0S@0B6YwSjiyH@9E3 zs}}SA+R;HNVYubA%@ zcl*?|08B1ztYG&I)6nZ5g0kZuUVO5CX2H6ZvB_m-Fptz|;ihb|6|piVYw9<` z$steb!_jV%wa@E_Y43Cuh9--`Bkee_=ax}jL2upt6%Ws|Fanl_1YbzV^nAv)6xDWg z^<=TA11nxWts*vfzmL};Wd8ceModlWZpL?f;fMiw1m2B{MbS)Ke#wCUvf_&8Am}Rp zg68bomuWO7YCZ7?SbvluR5z3)Np6kd*1c7bagm(m+6$X44v@&PcooHLI=7fYHNBF1 z6WH>y(WCNn@7692@4+0a$16s(We7Oz%0-#>x1UI1!H;5f(bGiNqdp_Qw-nhQg=Nd4{2-Uzl{lmV88l+k0}2Ld8^rbtF_>I z$`Z>uAz@@f!#Xesgp62nhoSQ^4#vuuD*hqtC+onmiNIj#ws7yOhp_Ers%MTSM_nAr z#?10sJ#Y27@0yqMb3W(7f0{;AAtNqYQH%D?SE}FsSa{@Ux%Hf)VtFBya%w2!N20KD zQP~S4K@JD5wuh{)Y6>M>C>HtHWMQq?)&rRV_oFIpLm{$3z&F?qB%v8a@WhqwqpQ$+ z>HD9h?q#l}^?^m9OEnJB< z76yKN#SvH+VKt&YuNdQ0g#0Ne-v~#<=88#v;Cff090Z_k$X+ZQC#(5h-gez(ySyoK z7J!zAMBwYqNp@QD^2@?61-DrY0N^7opdgz^>Li{C{FX`4PE>Y;D?OJ^be_-r$IX&pVd5Ymgw(Y_Z|r9qv){K!sfI~p)K@C_7Xn&Zb@DO88Af1^>B%SLGU1=1Ns!?azN<|f! zq+eVptk0oLc49{3qv)hw_evX59FnIA-5oWQ#i3e}LXo?k>*->SQ3@;moot0)ysCd? zBQ4mO<-gih2A#tmRfuZ-kiV$U^NIblcS^UD@qW*h?V-1MBleR}KEA*EBRdkBi6uz4 z=CzU$p#iKpt*X-5oBV*Rr-tfapaCq8DpqWBQfgoP@i!@e4lQMUs9T#9S7ubMe=*n+ zZDu6{WNn&(9&-nsv7p5_*rj!MxWRI?9UT#jFSghy<1jV`xxxe3Kr7yh<6Dqi_WkHt zigA^ZmkkSO`ib41a2@}(`%9rTC-$b}(;vg}zf6Wnt}j@rOHCClnJLU@a<-jk1rW#8 z-Y0KDBsHzT$=RZsLw1dIQZiExKTY@z1QcWM{3Dmw{aB*|Jn##?P^6LghLg^WMp91n zC$2Q^E8Yx!E7%sXo2f;1DUQUdze!Tx(B83CMVKV`I{xFM;Lpp0Sq-NZBahut6}!73 zbm=OTCe+2&HT%QHpkd%|sj%J4E|}9wDjI)!e$JZ?R$Pf_@70mm0tHVGDf+i<4}Hx^ z_zv?A@DMg~=Bh6qv0pf|>Vj6`dn}s#^8F*lq$=C2<4JhN4<)+3CZ7gn!x16^5GwNu zs$Trn9ktZP%ez!5F0n1fBkvLAD?EGy=CvaubGBfL??P(NIjw3q^tMpZ1VliaL)EA{GP5b=mIj2X{l zA_iH6g+iNFNfk%Qj-|039Tk%L=mfCi<`uF0_`bx6UHtOrI2ObJm@t`9o8fUtL>wCr znKW@>m_%0U^8}C?@P=j2(@^q@@->uDzU5g?$mErzOG+A2HEG7d9Ge8UiL_X5JQ&ngAS4OXYj zH6Kj!b-dRH4e7k*i@s0y=AB<_U#qg>A)z5%!Vg3OcnbX16dzQb=8G1h$HSeMQwE*0 zii<#8Scv%O^4eQ~^EeWU?%zU? z0QP4!7q2?hXX-wry`S6R!R18N^o}x-Byl@r#88a%Wz&ae@Ru;xYCDCX%D>nduWKY^eT5m+l{B(`_biDj z2X=`8KTG0vG2eKNrw`AT_f6g_R@e5zX|3PPmJ^!jMF7qdVWiQrr#-*Byv93Ih7Wh> z7lnY-a%1Mvw!)1H$i$Su|3(ifE{xpk!k}pJoi8;|miKW1 zi!+x@?S%K6vgttr>IXt(%=hoR`nG3gphzg)C>b=x)zOX@dlg|F6^O=%W*H-@g$$lI z#iq{IZ#&yEJ-b6OrS(C-**5pJd(A#%Q7m_5^g9U{@$Be9N6AQ|QGQ|?f^VKv@~D`` z;W$m`(naNUwgAW2s2J*&GU0U?=30Hhsu6#K8Z@y+&isY@1jR^)$+{FPHATii&lL&X zY5xnU6Q8nA6?&ve9WL8(8Es#fc?%9lWJwt=ohm((#K#{UzVX7ILMdV_aaK)Fq~Aw~ zzfEj*x)yr0i6m=94MtC2$Y4<0inu;55#a-9@7BgC)9$vgzdFkh7ECW;BsiYK(9by9s5ha^nA;PlRIQ37< zu6o*;@BE~07$*Dc$-F~ZL7e;77vYD+NS&02$FV`)CHP}2!T**e6&52JI zctPxR`v!%7OZ2e~7YXf24BnEUUig+Y@Eq=Zwfa8*E;kyBmQI2rE`zS;hk(L?bbGE1a^aG z43W}`M-U8A?*CENezGt0UysuU%un8Z3NzpY?D^A+%eI(U|tG7x<=}{S$y&uA}DoWY#EW z^zd9njRKV0)K>>Z8_u)f*|U3f#|V2nljKEeW&A(=8g?P zKkA3m^9>`YUnU%;ewz|a81$0RBh;!fnV0Avg z=aPrT@p%Ro#Z2`0Y6kPYwlmvNWj7NMaGZRUi;a`(*HPiK`)sgp2BCwkY~8jlsSC!` zOa$tiah+rt!#jx4g`_BgON_4i`QbA{l(-~?ExwyT`Ps|lW4k+$W4k$!2_X^kf;&g3 z$Cu;D+{^LQ)0+uY`J+Ti@id7ndz?T&xpIWLnHhl6A`T;uec@=`4*_UGe`k7dGs%U1 zsxB6KYJmgz&Pj<7IQZ|u+xSm1p=&@d@*^*g(nV-D+f5T700&M|kSx?SlAbsKi1 zx;+}D?tpRR)(+9@;=(NF-%w#Tx8t zGa!H?+FR4NZ$F|7@}ANITG^6+{q9LCN>i#4EDXMBshdYw>QNHCc#4!cnsA50p9TLZ zI1~y6d-CXm@^6~k5QjZO7%sQ4(!Q_tRTIE^1Rfqiio67N?rgAdb*mym zeC^tGRP^jV@^?)mAuuwwqwJGdXSm-N4w0J|`g3V8uZ^!(1>OV85L@6yw~kPo7I_if zR4l21&25+|1H^>EH)6S7cSmA;e>vN08StW6100 zVyWcFD71Td2r}v=E7xx6?moRoXh*(t6Zr4J+xRIl23v?Tx*bzD>ge6WptJvw@!f;< zjk^X-G3pjL)2Lg>OylkWGmN_hO&s4PRL58|V8%#w+h?;!1z}gYBD%{52;Q=}De?hd z>|j^@lur73%aMocb9TxgZ)TLbHF@jWBW%G@$VYOL=%BKjJ{EqcqNG)IH!ScX8Lgc! zqnG`9Snh0dTrRdcPTK9yDBrp+R=##|fc&se7|FSM&<}v!Y35!+_2LR}mLC=ah@9fr zydCPlEzCrg;oT^-5HV;4vm0|em%0aQ|0e4n-098GC8bwq~UeaG`%rnM`@&VWBG5*~6M<^~Jf*9Jtmile7EAixNB60gD$qk}hQyO${Q3w6kOit{q`uoUd9D#3EI6DV{kR8A3;U1u&s5eoTx{0FxaZ z%9P)ZuUH^Sxh)p62RX4!dT=;}3UI$*?SRO=6gsXl42VPlCN~k4T#iF|S<$HYOcc76 z7|!ln?9PnnU_;Ly=SiN*yg)t4zlW|~z4n^;0XMNln45Qp`Ps-H4Q=jlX4^Lx|Bvsw zeGIgkNnL-|_d!fvBJ*CBZ%GQeb1sh5?dd?Q`N5q~$WvL)nufXBL>fXghQ*L+*uqR^ z$@>Y+jf`kI#36(_(7_TO#GCAF~k91S|FXa*31HZ3H8SWS9-=!DU8!mTb9Ji@7>ActiZy;r}XF^ zPUMVXjto(d%y84)-X?<34&nuKfI+;tdB7MDGq~a5eQ;fK@oP361v`h(5qADeURD$; zI2DbG&O{^fMjR?W8^fN9ieRFo!E~UFAMJ1H&s>fUWAjcNVtsb`GWtF2s42tTNq74M zDk~$0%}B~ZmoHs?l^|Uium~SNxr-8_v*;1(Qe@c0dsfwJHl~xu|8V>=u0 z!eQe2(J1PEP7L+z<`G6wn8YZEG)AE~ihtA6=(9=D)UIVd)Ts92vVl!pH}RdTz<&qc z#?Kj8OIN#n}6&$B1fPobpfOq6)|I7&N`g>Kxqfq7j3l{|iOhgmp25DjT&AHjFs z47+$N9pBv#P3q@)yI&(mm(D5<27KGSFQU#~Q-`WaQC3VO{Z986u5D$izK4HcUOY;q z=Nq_`>$JD01~j)}da78`-BqlZ9{BO=#?}n}{^;Qy?J480ov0u5UC0d!JV~c5fn;h( zICbM}JdqrE2)o1nXk;6iE#LVH{5Rlj{M^xPCvltjtq;s8rnx-Am*NMrJ+`bkLw=*W zhgo3kM#-O^qS1>}*hDd0zRVw!rPQQBVq*Fz4`TV8NaD}A5poAp zH@f^nG!#xP1K+l_MYpZHsXlY7_{c3xe7VPMi@m7TvpuNaCb&}5wI$SW zER=m3Thm=t4`89Rq{sDepk@paGov+}k*JgVuhPM&5#MkDPD#((QhX=_+B_b(iy(DO_zP-*Oyqp{Rsk1+X>fJpN0=_Fe5B9lev zJSw=INzWeTOlhj@p$`Y2Bc2t%pyufN5o3Bclg0KJ>&}}Z2s1`xR!PjDrZy#dnlj!6#rrjo7)%}HfgU}+%@!2jN5@ky zp$!Y8kXB1^^0z8(+I;)e6rI-Y<}vcVf#zPr~W105aYujJ$m^mWE2%=qVP&m%|K?&c%{fPsEgB_m)*W!(s^n ziu-~!n4y#zhG8EkGR0Sq(DzQoP)EZKk&!N;q|Ii3a^?5#a=q>K@+4e*^db!w>HXTLR=Lh=kQg=EKaANlwJ zj^!(7y2}5Y>>{5zTrB@>x=fxL9!)9~r&;#JX=c%QH>#t`E;=^!JfTpqjN|^J#L!N* z#P$_#^t0PXSX7FI5Udk?L$divtYohrJ*Kw}Ib*c1+~4Ii@#tY81%gK_%1~+9b5vaX z6crT}p_0;P__3I=-knA){W)BIEa@^;{`?`zdvG7UD9S}w&fKKZldsCJT+XK-<-TBO zR*opT6v>GfNP*<&@qVTbjQvJGX2&01#H#PyiC+y} z<#P?4%NNaYFSFg{SDq9aNfca+r(rmPy^BSa%awd7s#O825q_w^!i1pGGoV5!iF=9k z`P3*{yz3yEHQWmgY%F~;y0y0-em{4c=U_;0|dhxfG68WJ>Rpcies?*ZlSL$C`c zW4E@oIh}hxjsh1e);EltsqIAEON(TloryxkrD$|HCY;*6%tJn^vu*kM1)lPf!c3Yh zKE+HODxv!|KR{o-_>e+~K{qZxrdBS9lpAX~5f&RfDM-S-m=VoP7-C0_ALchvb~KwCNzUiPsl>aF`4MvIa|O-R@&V|0AQmR}X)?2Dk}F{}(22N_9YZOeW9toEUPwE73Fiu9u_Esr zVIQ21r85slP+?x7@<^}n(tD?3%Q$hXDta{q#26B?@&5<%aT4w47>o>id7@!WT~mG@ z8da~0t_%G0@HYNi5NXOHb=x^3Jxxb?*_>ozY*!h*YPKuMxk%UoaM~UqkFfWrin627 z)wpohYMqzde4QuZyw!(T_oJ-5?-$n8wBcf+BrlV`eI|qM-FQE<>W5I0q)XY-^5=+E zl(XkgJ)rh(OpzP)b0P<}IY3!$PnVNqDNQk@h`=Is>HK}N_-Qe=-pbI^r>_ejA0Ub# zZkfmKQCpUImMO~d&0mzrlDFg7yQiaQZzmu5>YshfjwRnFp-Dg@J;S*fhtQ#PJSj6r>xQ((i&r{d(X zZTz=j(AmGezNXt%{m$-acpFR9_e(3}Z-0=p{!m^rN(qQ0j`;@D57Hyq{VP1m;#`BM z8%H8&mmR+HRSR6prw(+IcT=%smP~iWuJ2jK+BBHz-PoMIeBnL?0ti+eSa>JXZV~-k z93UbB&f@I|wisJ=EOvP#gU%8ITOA-582OgRM_z%5GJ{1EJ%3UBhVUsN$QS5o(F^9c z@BK?JrAJWc3BJ+6g?ofuJ?!Qw9>%k4XG*E=s^&y${51kZ5M1hV`3q+1AUC%7x};mOOvJ+HOxk z{Tthy|Lz?{OsfJxhW<^&XAjFFDk9=obimqM|C6WOVzn=UC^GoHN_*>hOdE=Z)=Nb8z`$)3MhxZF8iY{YVRE9`wDUwtv=LVBhIeX^xBXZ@!gQdw4 z!Ps|B<8E5{jU(v!g;@0L%wg7gl@~dxivzL#7uky+jonIbUVB1wt}v1#@t&i^FGe0@ z_VH7k8w}%tS1(;bX-7^|P#8h4llwfrYgCoKDz*;0*TkW`qI>9irI{sn@7+SDvM(@t z-CWSvHZGI+_T^)8w?mypo!yiAHFjVZjCU!Q=O%H9&=4VC{iA#N(U5TJovAUE0g(bR z!-5Baj%PQH&==AUQ*qv5w7+c-@;MNKd@V!KLHiIC?;DOzCmuq%=i(UpQ6j@t;&~3D zh^buZr!u$kxnawD`ybxSz$SJN`971tzXRUJeIz;=>2|l$N?BY4URjW%gUReA6H9Wu||4m3mqRmH#l# zkr>w2f%wHZh>+|(N=EpeA>+a?5CLA7$b}r;*`7!YiIDq666Y0j^x;KOgMCfnyKwfoJh@PK>(AYParIY z?1tY$(ZD7)cYp2uZtD;DM%8+o$s#No`FGjM79fl%Vylq-#V803ZQ`_(Z{Mm+?BP33 zzmxl&0Zk>yZi^q05q+rqRQ#cGZUOlGWY&78U)in9=!(UX_{4}0i0~F9(@7x_#JU9@ z%*4U2Xk;_{&te_|-3R$o8B>(!;OODV9w0W@)wSHkF1+MRn zYmcbGtu2XT$v0qJkaJ;aEQ+fagcIYs+ffhi-e8G}`-$=WZOZnpk&(xI4pJGO2iaJsKq_FbFKw~Ji=3k^CI_{& zC4QUYCV!TjOh@~KlJ;AD2`WE9lqotJTKdQ4elEK(1Ctsa11av3RDV8z*C_Wk0x=I_(dT6Gh1siN!1_D1x+D z>q{&&l93Yzi^-AQ9ON*AVT7hVF}ANGF>{17v3r#daSjVMSS9kuNzCLSlCoQR%TH(Bqp?Mb;=(Rbvq!lSndv#40H(!fp_q^i#;}Jwwvfcz_^t;Z->TSIZCMh{ zrOrSA1g6qK$^984TnQZw8+u4{3pAvK1vRX>&3&C#4k^0rT`b0T51cURr659-*|4jZ zlWu!AG`NL53X+C^__16Nqw+W(c4OJQ33QDD8CaO0D$K@3UgY2wQl#BVTxzK4X*aD~ zc(n@*y^Zmm!nzM_BKzsvMq(c<(Dx?vm!UOt{L!8@foR2SZ=~DN4UK6lD=_{hxDVg{ z0{;$p8~@E1_3+cu*OZVWH5^b^6?1y|EE)0eQXGW{Yz<yQ_!E&qtUcM0Z6a23zR0itKY@NQNOEm!e|XQ1S{TQH&xD+6N523 zK4H6u4Xmo~flxvljM3pACq-E*lN=gBPU!E91~-)=QD?7%Q+hk)y)2sekUKN@jZNmiZTCkcpLxC7@AEH9jf@})uEf!0*JD}q7;lr0Z+9m%h(OvDSlL=8o)m8J}N~ORC^Ei=KV9M?%&{+wGX_E!sXlN@}G_tkJ`H9_q zXYif3fWZ5}+xTxrzq8bNcxx$IHq)OhAs#XJAKa#0ZBmGFJtf4T)>hb}b0bb1K13<< zlNqSkg5+rxsT5_Y2)mtR57oW2o6T_&EUsV2`%;0jEN=V{5}KbpE~Mw`dCE^DUu3}g zJAM2rx_0gslG&UfH~uD*a|w(CBFe?~ zVWo>^I?Gr8>{qsPQ>5H-S0Z`w)J@owI=d-V~Ab!B9V^>h#;{tZU6u+|DnTIIO za;qu;*tI?$7EG;La7fN5NH#COn0ff*&hao9wbV z2jyFr$>bY;mz5>OU6oUG30qR~oS8SyoBV#13w82n#TX!PJT;5`QP&GwWe(?O%s{Gq z*F=e-ruQ7JW{${dPb`i5!24#iTbG5BquSZA!&+LPMKj{as8|IX8>>KR83=7(caqR* zwx0#@gGHYPd}V{a8zm*4T#qN;nbfQVtiF;I^yqRtxonmjI}p3L+O3^qhP7}v*KXx( zVyqcF_Mfa_DDdxwxAEVMeizqcS}p9+LC*~NFGrEYidmmQL~{3HnC)Xnczp3mA_yVigL7nQ-VAp_5uZSbDuqb%H;&ETo8mU zwHuuH0XZ30Pc69o3naY{03pmZ{cJa@$7zLMNZ$l#1G!bKL(2D zDNLwas9djy6kCtda^r43LgKN&M}xQV-;BPdYw*x!PRM>&JOL%5K>U=sZeR^wxqOXt z9W&E&P}Z?iZ2FOtOkBiq>K8*Vs<+BMHb9m|K(GUnmjivW%TrS>%H`!HSg?vvUTz_~ zeo2TtC*v~nng#eIpG#EUvn8?I)6xsO!q}~b0e%pH$4RLCUOY2njI`|fl_&J`7f>Lf zVpa$wRYQXGt?Rjz-ZxI=R$Jph1i5~(C5WD4;d}P1Vpd6+`~|iU?~;AKFsE0~^QW@$ zxq|?v#+^jz*qxm|)Ri69+%bQ0?*RSE*JDzzpkc#XIv*U?(h04a7l5#EGAECo!uw^? zGlsZOI&EwaEIJP}Y33V6kRjm;Habdyj^I-d4KAj2JKNDiTiT*!lU&JXmtz>N*g#Dz zKWz0qxf)Ndn&VCmYU+$ex0PL*-0k3~%I78^P~Y%2Rt3@;#&-!GWYERyCs7xV^+w&i zHi(of-O%?VWYmL4w`nLDuM|K4rjDJ?KF`gfNRGw= zg2nJS7KLepoM~+h8~XBv2NWbb1LsfQD?gikrxc!p2$5tdyUR4DJUTdwxsY991u6v) zT;vxeFW4=n@ulMZUggj4#xaV5WENI4TmHRMxy|kjIi#`_6}~<-4nz><6@v&4?_w{P znkP}WuiiyDM=zsuS=X_(SW#K#+4Exb=s`Yh&_hBQ_I9FE;xd^OEPhZh^;k*{Ivkuq zO&;Ka1~su^hc5MTt8AVzR4$g zAdHXzU6RT~`i9B%dO4yY&0LUCS8wlG-^R7#`@RGO>J#2ZB@=rc?qJx}XNz7J*YjiA zI z)z${h(+iGVl+y_rDS|hzd!lDCjo(v0dFH<*v)GR7Peg7*3M`Iwgij^ zO4%Rhhf#m7N+gz>q!PccJVMN#7D(&&bV9?M+M;o7Wyr9b$0_4(fg-;CJ|*Ul>-WNODBqoUl&0Tz>DWDbEW1XmoC&RmDW+SVRbd_>6_OcQx$dmia1eIiXQ;u zc6oV)%<^A?%5sig;_?8&QhW5^$*UTGFuq4pWhnniF?;#a1M0#30-9!OP$>pmhA<{* zy)Bv0>tRn`K6{fnee5c_c>3n6zA3hpSv@zD=&iCJ+58nnf-9>GhJXlyYY$_BkSKj3 zEr$gc|9EOPf~YZWqqnaJBl|br&*=AXrcD1xFB{xs54&#RF)}hnK~L-}qXswK!|vXE zos2w;Ex=e7MMtyf=y8O0n!woOZnRM3LgpSn#1w%DLh%6*J*CxGn#x4^hs*VQIgo>! zIw6BD?x)6g4IEnayAcrhn7q-j02avU?(U`E(H-eDw?f}f4J3DlTqj)al+%923O2A* z!3LBd*#SxRbqAcCq8Xb)ozMo{_sZ zT_XFcZfEvyyH3VnEn7T2mgxU~JJ6rAju2tk0*s1cIT3`2aOzP7v%ol*?2eCXzuucD z%s$LQLOEv%Vymz4b^^I!k+-~G6KiG!_8N@3xuz`-S)1xhPHG<&elnCEP@O-CipTc3@fccZM~D&YO>mLnC#QYf;H+R zp&mafpvuZ$aDvAtRC1z}-MsQ}S+Lh}>dKj0=<0<#oOtnVTN~hbQ1~FwEsGr6&5pcq z>N=B?aT(nQHyHO10=VtZ=M$z162l$|ijW)j6%&2`?*JO7>BJcIcB6FLOA99S46boC z83BR%;&1WGlH>*#(=tCd`<{KF=aGY*N;a8Uz9xKlA_oD8Csfn_!NEp{GE#T-sR@j z01&#oCx!GFO$Wl?IfI6jo10hfqvyDtVoKRvtK#I}sP0D#CwY^Z>Di1@_+ZsIaET#0 z921&BZC@Tnh`Kvb-!|BTMrc^k8<%Gip^*wEFbJVgEN&})N~5(~?Wbif#dJ_G{( zqeVTO=wU4^80&ra$*`9K7!y+=f+=Y*9{7YB(b1M3*wl&%*y~5^{MCaT(A0(*(##SW zf9*;w`8ktX_2(JN_-i*bwwzJ4bcG*Zoq*&B72h+-;4 z4ulV!zRDcK9LL$#QN-#nNqyn9KhHoB1!T!1ZC^7siYwQlY+?&=uthMqOpDMGy zN%_jKvzMP%6A4;5FMz&x|275dVZbtzmo8r6tiWSQ*(f&b7_Hykk%n}bUF+lIjG~+Y z;i+l~!fVJ4ymu#$-m&p;>5)S@bWuU!tFgKd1s|7PJ}Z=1zaW^pe(@H%cJVGJj98S} zJ!|91uT}Sb_wj1FP9 zd6JH^kA&k0t?$Bx~MnC9zu-C3$BOmA9;c^3yrJTa< z;&BA)@CLf2kRvo~X)H4Ao(=JGT2aP;#rLKN7IM{L9_JR&ZuUn@Gmcy$V7toOyf2U& z=wg19oHNReymIa)d-Xzv0Mb|h_pXbh`Zcyd(+0bcJC=u$E9Ur9b4R&Ra%AYjfc^!m|IfyMhAD;^G142Onzds@$-O-lu@s=|nfFWTB?cI8fbAu=J zaizcw4#xW_tw5y+rehIwm)s#CGCaJsC7P`lPMEH}%&z+5G+O!lDUP+v&!fdZWRQ9t zUC`K$&iKgu--m!eeZ&1@*e$T{*!B{n-`k0CzEMV{y~Xkaz$Gqxi})%3@MdUl)E#no zD;qSfi}=C#ZZXYp(;El>SQvNqX*a%mkmZyb6a*dLE$BzBW{#zk2fCr`6X%Ki!u#mV zsf(Nd!uT1i!|UacK3j=jeFSO>){`SMp5e7547Uhp$}V z9m`|ogPI;dx}EIlU&bFQ+hul1zGuT#`oQ+vl-TA8c1O(~=?jOC*;)IbcZP8!BH%O>X2SE=$0Zhl% z-%b2pP5$mH6zqbviR7r}PS_2WZO2V-9K61nJ1C<4C=HkM<2rgGgRX8lXiLpgFQ)Yg z@1)(r>FW5tt}qrzWgS1mjRh(rsbC2Pd8AVMJshwI?ne{*yO7x@ZsV&|{_dQ<4+LhO zWF5Ut&l&Abo;`V$g*-z@&W0e!_N6i9gRuaP>0pOOwXduUmlt zM24fHOK4F~M_Rkp0cP>sbP~n@D~lk!UNkR_8Q0Mj{~z%b5~2k@I@~{F+dCGF(X>Oh zCkv>QYTRECKnQ%)YO&r07Z3GY)-y=|GKx13dd~-B?>((_ER$5a=RY3$Hsu~@VK}{d*LVc@hj)t|h zq5Pb)Fs^My+0YmRb4x-(!Kmx|J8$>DmX;C=L57wOwgW zK;T2+{u$HG7U_NMNIG79L8f7$dz%1)3w*JL0(h22XruoXTBoH2tJ^`0blZC2UwQYy zcLgHq3Y`{`AfsL$==$|*#M%WRXjlvB#pE%lA>X#uF+xooGEK`9UA%CKR*K)>B6tD| zQ4UH=$f6fc_9pv%aRBvgY|fbdcBs6t@F@i|JgNpq>Vk6O1xk#*Laq8aNdD;VLsa}S znVJ*8KV!NGL1@h&uNs23R=%F+-(iHuad)fN72Y6Q5#?2i*;uq%Aw zH33|`^c-6JLpn3AgEKPf>^qz9I}i}4FSviO0McW7JJ1f7o>R%?6#@upE)eigl7Rsc zgeWjXdaL`R@%zEguodBVi5mQcIs22ym0U7QMvqc+N8`JB{D3!k<3#F`vF&8*MzwQ6 z3DMc~^U{aR4~AaY5^}f=^MLubuMVTm-t&j6NlJfRN2K??!HS! z9Z@hpPmGWcZDG#pc65M}Rt$D+IT5tC_*(?sT}lyHc|iviEQlPqx;FbCkb|4-rL6be zBjL4D06{FhyvisMwlJ}{GS>U<67W6*N~*fSKw=U?;bG6HF`aA}7?)i6dk$SSAhLG( zId;n6K%}eT7{~V=2nf^{+&^PGIo%oE-WDB5drZY)p*#7~0=&;4RLmljhaWFs*BD%2 zumVrx=hRz75SkP6S>%od(9}AM=&Q1iT`|vtPR~3M>T_-pX(Qyo)#25S#)Zp*sbCo-oq&u~`X8zLBW z0zol>#Hi!s*v|Ge)Xy9Al?58AZcVvZX2=Pul;MjKzb_P3ihNu%i6F0IRC)P}S7VM9 ziO{iBpGLbGTZ;!IM0rEQS$gi+U}9KHbEMnR9u3Eq;9qObldeurk-fzu4!ivik)I#I zZd-q*%*#{G1YwI$>R1TTUTUY=1+E{Z0QzEUFYJ(l{bObfN;Cnly}a^u>IEkMZsE8$6Xxq^l9=u68m2X9k=g%NwY+#idTuLM6PKV^~qO$PawDA->YM`Hop zkG8GyB~wp?p^eL3kai167T)ZQ6R9hPHFHe*QO^%Oe0-aM>1>a3?=Zhj^=7qO+tU-e zMb~--v57qo4jkOfhPK)g!<@}J_l5u}#{v_hGO6jqT*zUqtdXdPgr1@8OAc*jj{1JF zpZ)W@gYt*>^SLN-RWW-X9DkA_(tAZGr7 z1U0e08#zMF3XN%R$3=*(cHO0(ImlC9(W9s~sH1MVNF^EalI6wR9xLb*Ltuop^kE6*Q+MNT;$ z2(B<#gxOdK&tbqS1YvZ&#~}BI3gmWAP8sx-Qp1{Cv+mBJ)S>7=w10<`8Kv(0#GtF6 zF7ED)llf5eH9e*cYb8d9Lr&1S`FFWur?8N>*}@P?yM+@Hb*X*6*?4@eP(j*iYYfdN zfH}ucqX1blY4kOA30qntY-uqji%yX4F3;&jQ)9{DZ7i97U+hN)UptY>u~+2a5<^+6 z_jZY~wO3g1l#LBOUy5IItI;U|fpxb(O7?BMpK^98-~tLW1;hgm#-`Q~ew5VCNYf=CK0LvD35yAtfe(?|Tpss1LY* zCUiO2c3dY(>1YjWv_Jg`dG{^uE&QFrLI>hkSqOnFYzhWHVUhGUg95P?xj}qdK2UWZ zJ5yUq#U~tM0uFkjy<4Tkkfx4Ex4o>~u)EK6+}#@|^dac96lW|j^y93)>(?s^o#qwX zMG}hyVrVllGVJQLg>S#=fK}v%wh$vX`y}%8$+NEn5DKMY@niOzMiScUwlr9N!&;a# z%jP5#*u7+(tezm5w3ywp@+>9lE};f~xgQN`et@>#mMka8QW~bpy^l)_?rz?b0_NWB zT;kdD*K-SLMJWpRJwx{WVjqnKj}t%;D-gl(!w79#dqzIA#Xfdi7e{=q``J}Lrjfp0 z<@AhU{*+d8b7r{O0p_oD7de;rV5owfKGchvHPWAgr0J>x2)TkAmgG=_n(T%G3D^Rp zX_!g}$Eunf4a8$BFebVji>d>o-%Sd0f|-?n{4IbWh*%iWNOhYcX5e@jl z5*^qXK*h#~BmZC-`eUY;oHf!>K6S7J|I)jb!VDDL?Q19Wz8H279I4gJ9=TX0()oq= zxQZ?yfcGEVMyW^6kR#NcVC~vkTNmTHxI_(aBSx_iC%O81;PR%#p5%fa>*fa%gPK~h zI<2kHs17#N4wJKlyXyV}X*o13%WHrmVnHZ?$g>v}E; zW%9ZC!S7)W@|DqoamK9Ux2OS4_fgh+Uk_gRfoL64z}#OstnUHifd;*#^n8OzVnDO~ zwB5cGVq|A4X5B9*XkQEEqe;V_5;7o&eM0~Pu((Pco?^?Ozn1;2^iRcA*?>UCFWS-LN3J`r~e2JE8YQuale2*p9B~WX3t_-u+vz z>iXTdaUDH)bcdch#)Hvr?N~OUYgmm3+4Z~m_aEI(LQEJSWv*PlLW9)@0+^L?iru<2 zj2O_w3X7j5n$Sl^N*r>@@F)-m1-ASul8zy`0759X%||lHQ!FmW$g!Or=x-E7F!KWC62VqlReMGMCET%}LRQ5|e45I`6Y?5VPo z@sXY+E}nZp^=q<+-uUM!(%GR9gh$G<_C}RVH-Ox`) zVl<+)IB#0-53d&U*BI1rq=w|w%wZnr_N^N<6fjThdo~( zeCTV+Vzs_hpy;W4$Gr`>_l4Jw<)nXg9sv#DPqc54e3iY<7!zo7gBE3CkfkTRyo?&}^`n4Z`x?3>Ex@IH+15!z9^mBZ6T z6MWIb$1wg^A%04rtkomjzQD+n)@tTJPW?J?9A7_`G3@HQOShd2EH&!<*(=noTQ|6| zKPV}`ZFv|u;L8KZpr@D$3?j)Wd}D(Eg4jSbloJWRmpOBuB;o=MSOmc}mT=Z!F}r)? zHFDO-AhJ)RJq&hP=^d+L<+pF-5+Gn7B7`ta?&h^elvXQqYMPcG>ErW)3=LB-Q1vA! zn4#?~?vRrP`jY*d?x#H+Pss7{7;wec{}M(HZEa24?0rDP_@yJp!SW%cqjrGYX?BSU ztx`Av1Q0%(qva!J{5LX6tLa{L*M>`+8?5{xs4RXJ;2+Oa1v__)FFm@WJ-zCW(?BIR z_$)hVfDane&f)aON|+b;Z}Zvw1a2 z{}=Y8*)k~+aL^6OWHRIz;D&aXI8!6rNRd%DuX&Zv;e9ab7Bp;VOFMSy41elz?%g*8 z5UfBL3p{t`GHLj&1Py8KR4}Dyr~zMJlY6DK!RI8=ZRd*mH??4cy)&RlD%TIVz~KI_ znCnjs_|hEB)(s*p_uL@2tU5*SG`onO-z8-(#n@V68OV)OCI|zb?s882An_Q4(AmBK zyMs@e?Q1WR)3tmlum*>!9iaBCOORi`{D`F4G8PtDs_ndD2&_5rM6~%2r@Bi&8Tb z?C;YeDeX2^G^D;%PKQ~u{2ZD#Gysih>-exPJOcrNck$W_Q5O&6k!@VivUzTFR7@oK z%LExUtc5Mp2MeKAV{>+FPe*#9mK!-m+k+ZE(3KqB$&SYEF56ed9F6W^Pp|#OlZ=W! zL|2HPFSBN$nCRQcj$Sy~k@O3Yv2N}%=VV{{5sv@@P~rJe?j4kU@*+8Vj0fu9*qR>H*fC^e3)%7!t?j3cYcKmjuYKws4z?6<1h**^FY z=Dd#TU`=DUm|QhKRc>$jkO&S{(2zy~mLXV8o^Itxj9pA_d=P}tp$K8oVYaWiK+PBy zKz*aSo7QS>L7Dy*Nt{T(NtBkA(2Sy-v+QarhLB=I(k1B8!vZSM?IgKv)nU@)*D%6i zUox4Qev6dLOBp%&f~!|pQuc!WWxO9Tu*rUQ$GVG@vwa~aegKH!Ol^Pad)+{8J>bd$ z2o|o74~w^Xip>7Z0SgdK8SF_xz(g4h4hpK`2ER0Y1AC-hv}~M?CbpeSGO=yjHYc`i z+r~r_XJR{<*mfrD*uMRpbM7DLr{8{euf0}PttyN@^PSPeK^?-vj8AX0;(m~k%SH4Z za8kKw(hBK~6PjHl0c;9V>l+ai2Rpp z1I@0Xy}OnyoqJn0QpwIzP(JH=)_UV+4&p6x`F#9nVd$cxEv{#>%P2S62j1Fzz_cqx zo-IZ7>Nak>j~W0pzFWwag1q*5LC&=padwQI?ClO_HI~*i%x9=fCZQeV+59pi+X0R- zwcq_^grJD|y5cUkdZjxz%4a8f5QG>0bj@fu>P$=jU6X;JT zj@)@+%}|2C>b(!8Pff}lmcym^C0VgiG)H)`sxCO3g#Rf=x;&Xc9l-IeEVd_oHl&{S z*)HV5il(K?!s-oWV>v(l?G0URwJ1X*5_({vyK8_flvzXpfY6_9@@U&8@=<{;{LR)x zIN)yB{^zuo;{4KU=KFkmgqigk0t}XZFa{n?z%aGHOdp!BvdZK?7!h!FkT~C1_$k`2 zfXvfCOG}R7ML=u&3IyytJLp@}Wc;(r0%5$yEn|(`Nd!ZNXsQ2n5v@K>o zK0Cw{>>VazPiIVb3#x+K98HCxd zLj1RLGiL6FI>=^^rc9g-;qVc6N2FSB26pq}GKY)?!r>V=Ufx3B!Ew9uqb~#?kQb3v zjD#sUC!uE8X5|z(iE!T#+oYzjEPnQQfzPJpHw#Oj=*n}>XZd1Y<}@KaFKhXVHmI{! zC@lY2Z0=$@25f?dp?WVjR+-1Nm6PNCfxc6=%pgUAWXcrkVTuxXovrZpmki$_UT_D2yN6#)PY3#p++Obj!sl@d|ZB#u)s={0=URv4KS*IWao< zEWqL|74s4MFW={|e>VDwZgcmqMj-@cIqfR(1LO&F9sw=D+lcE%w}A^btGfN~G;=KJ zh}9}N2s`T%#ejftgL5cx;w*?V-RQ)QwLXqcpLQ|H{l%bWRL_g=K88;ieIq${6GV_S z=U*KV$Z6L+6Q{?u6os?YACI%O9lvOAs_39|B*w)njT%X8)GQgSr>~dP*@=Jqn8G}= z!;^T2L`dtQ3D;@e&dM*dMR@9Qmp|+wa0NlH`N1%+Dw@MfG9e!^uFGj`x091QdlO}3 zE_8Ug*&S9hu(5gYql;L}Pm{q=d^Fi5)#jAN;2YeboE%qJv+}w3?ij;lg^49B@kj$9(;moI?Mov_Q{A`6qvej#-TF;-t{)Z_X1&6SR_8~kf3mKW;E(TRhM-KI{9ey#EG&UvF2q>#D-43gXx|K}zS+tr&k*b>{I~Fo zJHH8m(1ehI#@aOn&bGsp40WRpUkI{HI$~xmDiIF z`^J5DngfOO2Q~n5&pg!`6-^0s3bNK&6`icv4u@jZpXzeeZ=!NFy7Xn~lWt^3Cp_aw z-fI)1?(T_-#AiaahKFL>SLmwV*`SVwSfRAUjS_tGhwwC-CX})fEHAc9XER~DS9@k- z6H3XfqoBo&ngd&P`@+Ac8aP;+gp(E*$%SyPh5Gm_(9-nD?J!+#W>AH?LR=-{AzZN1 zfcvIOCU#wM3a;gMjbPa+VbD(Kq64~LWdBr6=BFW0lzc;Hj_#Nm1ulvrFEv&PD7#Yo zefKqpYXF03)qQ4!9<6g!?d$78LNq&zRq%u`wUY8xo~2I}@mrUbDc^clRb)e# z&!i1-EeqQ6f4BDpdpRGX`OYNOuMLu2DS?ni>`@VSkjr${7dG#j8^VGiw44waon{nw za-fow5h{OU4JE7Tknk9!@4wGr=r*T2(MR4bDILv0IQdz`_d`t#jOX_~yXr|-`p^TO zwl!f#v(RutUiFEfEWX*GT>ig7dTdis>-9rPEt`}Uxz&`_s~XY3AHUe#gQBMBa;@Iq z)4+60z*BkJ3;R$w|2%TSad(6en%gi~?DBsJIUF8i4#e6qihA2^^&Imicre%a2vPgV zA6trMZxnr4L_`7)FcEP3gC#7T844#d>Kub%$zTIXAV3_lC^n;>M7ct~B(5}f?loZ) zU%Ud*l(0aun6sQEY?Z^HpOq^t{%b;3L+B!H0b+t$JySaD@>G#1rm3E~%XVrYO0YUW z1cy*nq)sPmsk!;+dd%V(v}9#LT=AH-sGs%VcI|4ntBLEP9W5a{K0Sx~J(oN)e?uKCzk?o4 z^KFEh^Hte-YK$l;q&SLWz+|aE(IQO+?&?T#P*=}i`}!DFRGqs!=AY|E4)aql+~>#T z&$?hY+`&1B8+ExE5(9iY<}NAQH2H;c(F)R%&rN#eFdW-c?`+I42)i%v|D}rm9OwSy zq|3moP8~_KF%5_7fs{S)#19I4qwI=P&syg#{%DJzzXgE@b3Jwnr8zOFZjDL1U+*eV z{YVYn2+7g?5D>=wPJ?C2Qo8| zkO&2V;)EE7FQ;%(WJvj(p^9SVpwBPd3vw$Dq>)~o8H3+JxSz=3w!sXoBOy0xH3d_y z`pEo7F`$yp{RkOHsx90}%yVc!I)n~MS$`Ev zOpVr2iPC%RNxIaX4xx166-)N{_sI5^aL%9qRLr?@49^u`Ch=}z; z1h|iW^;4D_EBeg$%S=KGrUoJaPiaNpJla6u+XhJO6>Yuofkx5dG6HcDPh!3PvsLid zf==*AOA02g+e1K|up^{=>u$pZKT5Tq&n$l!Uz%50u`>b|2a0gT7ARn(&n0uKs2T`S zY83y=tO2CZNDS$16qD$tR8y+gBZ?dTeY?5-mu46xUz8oA-m?l_L`#g1JFSe9L7Ft8 znY$0swhI>b5hJDL$m1VLqxu^x7xPdcj)($j_355jUPR46^lsF=h--Z{PUoP=GrT9# zg^coV#K^sEdCi7jR)euWEkmdto(d`5U*!JT6}AoXDbqCgZF%8AaP%t{6(5+)g7KcV{W)cwy*G&YKbx!70uJ14k2J+P$-`rb)a!i1Fff-xXE+HJJ4FTS~p|y}P1^`2D}W!Cr@FAjGubAq>yd1=m6G+b=XNdcF+f$>xdd0bNjveW*ez~`~P4d@O^)%Bk( zO8uEj_I_ZUsqTjk3nqXK$S2ae1aR4lsno>YFchMGe*YYl?^`DIFy{NZsW&SsK&(sg z!KELkH8#$Ndl49$DyeDZ_39GVxC7jtKFVWT&8a!=u)$+LyrHo6CvHR)FoI-)HE>5E z+flqMsF3eV>j7j^mJO@!=mCNOx>1SvRxNBXdUxl_XhYLe?N9+bn8)A{0J09dDKEV5 zgYP5cfx^N7N(vGTTmzAW3zG=(=`e%lLqyfRPm7Wz*%|VtIOMtPG|q|!eS#!=>IPru zjKsQ^9z)QO724XsgV^b%ed3l>gj%CNm#Of0BAJBVU|gwYZ+9s(z2HJNYQ3K1j)gX2 zv2%`UM2&B07S@WpIhnuNH6PU|NFw}A1ElbYhMt9t86b6KqKRF)0192PxshQhB<`DX z?c^@b)KTtusln3sm@O_XpjtE|+MEVrDc(>aLzks+Q!6y=ZU@hH%Oe`sI%GQFv1903 z2%bXE30!(ar3nrx9dxWK`}M9$2hp`z9#E1|$O*%0W`F6X{S^WHF6)*DEU*~G0-+yL zgi*LF#s%0)*ZeI`yTrUe=x4ZZN9#jfXbf2hi3ykReHph0?(!>`^5MLi0Sr5E>I+Nq z*Ak#lYq!|iY4uegaLWi``LI)>-|?t3?+Qo^P7}&~JUkTW_Pp{_*la4|kq%;+D>r zy=;&PN2c_3&C!EU!Vq+T*x@~ta87SNTG0tILNj5jP9wBioygy8RhQe){j_^=f{5HQ z%xYr2+mezr`6~qb7p_`x6ULgEg%jI1#naS@D;DBoAT#NLpyI+N52rFEHGdYrv++WI zr;{bpnDgtZ{@mYO3}2J2BZORsoih+|V0kO*k1f^PDlL?T@z2fi6=)_>1aX)$Rh^p0 zg^A-K6>UqD)_TQv)L?fm$E z3%h84CcOgLpX>`uSoXCLEIB|5Yy>DGQ0krmwHgt$MX4Vy>4^k4A)tjrTCu-JHHu}5 zi*23G-Mbq)zfppCvEiOVP-`)M@~1%zAr`qe{TpN;ouAPtAw&!{LNRShx})@#5p6Ko zB}aEKv@d73s{$G3t1}NlA>Wf4{k^WHnNmI1JYNY78UhLSI~b~7@8`GmKNoO1O#ER4 zHTDtEO4*P^usa^#|EFFrr%Lk=G>heJ1`uu;_}ag(sEqWhh;VDkaK~J^ohwFjFrXjg zY{YLi3(IX}9dPJc9`4bGuxQgTF@aH1NgB&iCeAB2kv}=0FZhGk0)0iX*^1-tH~0Hb zx-%AX|I3DT@(4(A%F}Z={gYapglEELnTmL!hbaLA+F}`R$a1yt=E!jaVjv{#u&!Aq zC2%DL^R@fsD5@G21xXE?WUxQb3}EF1JGpd-D-Z(1Th|nR6s6dinZ_OQch|rr~T;KJrzP%Ite0zCC z`(q5Ut>p-~1yck<9Cvek8;dGr;fLv5LUb$# z3IEtSZoIfl<+EmJNu|CB0rlju25n~IO>DQGJu!`gDHCr;C-JIp=E?YZr7Bd&0O~V; zfTT**f!|q{GI=;<+j5yY8bg8~uK z(+K~WQJa&FvFu0%OSCw7v9zxgarlnbARTm?bKvi61qAtHw`QXLRG?h{kvCV-GHqo- zY>d7wY?lkhiKJqe!$XgzI-9WW17zE>!`5ga9lTaB4u&#kUohv8|1^dkXIAFmAje`(fJ< zYp2J6V@M5HC<*r*CkCeWK_H8Evnv*M{f!qqIEsZWwxl<%T96kv^ta8OxE!J)^BBfN zP-;b!w|?n~U$7wr#1*8&!5fnf$S^Qfz+iRV#f0*kiUOeF_k=I!W)Oy(MP_W&u%U)M{2-tbX=vjMRrCHQ{1@~+JuytO3<^<&gb zrubl!1YcL=GXDMp16sE_C&W_`l0Uf;d9Z6kpTgTygo0kc41+lnh7xWgthrJpU;Kgl z{7!fLYk-TSZdV-|%CUT$5)Vs7P|2F19<4r>@W++Pdd-yfpo3l^6c*$`0LlkDb9V%X zgHN!3rei2wFjH;J;mDzTlHskNCJ0wS0{s~Eo=)y1b9S4)<;eG9R0vzMe~Hbk_FEaO ztW;@V-HIVk|NR^2W8+d}bFc&(zU7;aXm28IuazwE%f-cO2cx^HkE8NbtNI(3im1-zFKmVQ{pInR zN~s`m*x!}Hr!*(B)<^>`j?Kv80>7w{la>AOfI@<};eSQRwXzX9uJ0d6`<{)Agt+bA zn=^@)=OI2Sh(C4g`p&?>H+wE2VxZ%(HU#%Z=;@x2u=XAwENN@Xd}d37wwXRh9mi+r z>P()Vz}M?=NG2@n8-FM&Y|5J;A(r%39Y`&m*rnZoOa(W=(fXx4~ZTrJw z?T*9zvuMifYV@QvHE}61J5{iFw<=%4?bW^*Z7YfI38f_QX{r5tz*$~9QR71uY0G3RBcq1)BS>ZhQDOD z7_`+&hlO4j_6ug2BvQ%j@SF?~hWU-y9~51d_Nw8=`+E0Ao=82Wnte7Hct9MjQ7?!K zrJ}?T@K=aY#w263>qk%r%kFmvZKrUet?_hM4?4d=h;ZiqrMrdke#1+N1vdyf6{C9S zHvcX8KTb9buXh;>hf+wg8j1_JxUM&-e~sXL*+A~?$%VL5OBKIomXqu#ewD0q&zth{ zqL43ML>2wGXb*%vgz9MTs23((<+*n!KaO=G3ukMVBwr*nVj|KFyhOo7+&}MR2;4^q z*Y6qzJ@hO@i4qLV`5<{cJ4VHBH4B)EmQfY{;TLlwXo9MP72dKAKBQ8#)^sOQyd zse}MO^nq=cD^LXrnecnr=#xv?TZOG9Cq1_|vuWu!ePb?rAZn-_Hnp*=o#6b{k=O>X zd$cS1T?29wdiz?E<3HTv8CDHLtY(w*5E`UC2%mlZiTvuX2g(k0*(8&qqVkw4i+<^a z5({|fkWzi_AqT0jfteS%G-Pld z-AQ15jT6ccohbrxs2C!4p%$wkQQ3g|cjSh>!~=`lsG_dyxvY{c?qU-GaulNEn7I!S zCSZXiwBph)c$+iV*S*kHjevp7q5?|>{=yrDzrLeLXlTFa5QOD}O#8J8<|#Eg291lv zQ~i-)H@_H;`lfTB7BNFz_RmXN`j|@&P#U*w9)J zv>vVdE6blBD7&6XiMYxh5EeWI5tS;)GZf2~&aF?3ieIJ;Ntk;2cSI>`6Oe zS%1=)_Dwt1-wE8WGFl3)vhtwD=ZECP=S~#;cizmsd%HZQOMAi6lB9A(p+@@nXBndCgsx0IX7~e9vftZxVa|_ zWVE#WVYw7y00Rf*HVP$=ZYxgR`b|pK&`%i@;zD2(m8M&b?cqp1vQxnbxdLX$%fB{J zF!^l?-9AgfJ2SJ$AMwN1#xzKoLI=HG2sRG3To0GH!ikq!@x&Fr^sM}u96l9orRaWO zA0`e+aG7^R=`+Gb^`g%W_ogr%SMM25uMPLduZQ$EE)ojIpPlzB{9L^|h=?d>dJ%{D z_7kc|qrQHzZ-%JEcoTo@g=7`kb(-Y<^I(|hN!s&^y2)#lXFTS^c8S=-CPm@3<6qL{ z)d>?&8=8k^E-{ehkMZ1!R$covzKTOitn0xCI{Gr1GJXvHpEfoWA)4IjnV!iG&iH<5 zX3HrTFY(JapTHgC%L)@LVVZOWEgy*Pm%l9jBiG#nPJEsWCQp7klf5BA6W*8nJA6PL z&gj^)4me?I9A?nV|7%Y5xYa*R_y#^bUR%VF{Yl#X^qJL)fr5Xdfp=_&K9hjomJyfh zpB&zcJ+{~|stopVfK9(ZfZAz~h8DnC95a)Qf<4IO=uy9NY+yJ&Q&0hoJ%%tmkLx`K z@AA>DiUSA}rl~aA1~^UX5zevn#;hJJjU2Eq9g;-+xnqqWqKbZwpkKeDVPg3Ldb&+b)SBc%2p7`MuRPMK|H3a+*}sx-z0npG1mh+N{$yJWvj9Yk5eB2+h%sgOtN&d{ z3~+(os1#;#vLm4uc;wmFFqGxlD7!k{syeZ27=_wA|E}`do`$A>hS}(bO`6k+rqT>I zpyAS{sV4%U`2P31yq?Ovb(thAA+09Y+&Kz;kO9`Ti!j5_=@o&b z0xmN_UdCHpn|r}NIg75gCev1ff-GfHg|ic&6Hi<%8?xN-pCIMVt;o zy8UScQ~Cl5rd=pfT8Mq9lo^<}fAt}LvTI#@mz9qg1z0Fm@4hZ`t`GJigva{Jt>O^* zY(~cg@L_vSMT@Wsg%q{?VO#hkx3hRQ+pEYVi2h>t)j{!0E)oP)((BiEYQzbJ~ zuj<{SH39#}?*il(xw}@6K=zy43RU2waE|if7@^u?&uHgU78i|fP>}>lD2hR_rXpAfAs`#nvq3}<;q*3(zs1We(Wkl!Jy)WR@TbDB+syZ9l|!ypWsg_hbgh8q`eEMQr0Y)( zAzq@q-g#M>4$){+PotGy>yH6}wOW39&N3g=1M{58`FlZA&o&S1(7q??42R zPC6H2*h`klLUP``+7Pgp4yj4+TQg!zhYr~xEgeZoC! zK%-uj^l0jWykP++;+q7cAHl@Fa$^H4wunkf05w|{m6LD7e_tE8)M9t@9UiEOVXjZ%j{b| z1xZM6=u!234G?`iB)3qqKFuQO<2*NL#&`QLEUZEsEz~NAvg|MSp!S+z#I8q(ZcpRo zyCl&u;qA);(1}Jb0&aGG-sG;3_d$#t>K;%aHNTYHXW-j{&YeY+fG&X{8{{B(8_4FU1!0ic_ z?#+8oGtV?8VqW{PGKbf%!KK5!z^vb<4mYTm5o0J{JP%-+FGTlV85)U z0hQ{Ae>h~0uwS`A!{ZkuT$E+l$^KpGZ`lTiNVy17j7OWY-Hj!AGtSBJUwcDwFE47_$sWGFf)VUS7b3O?TO?D7(k6**dmxPNa zgJ)B6#xkhhB?=hnqrOq04QaZQ3MkRJ!g_@tYQoGRqy*pG=8U9bX-r86z4X;)g~T|N z1)KbM2gBNER>vW$jNd8d{?-XFN8MTm9>Wn9{I2Alp5hvPd>pH${l3R_uG3X6?0G4| zjoc;_kH4E0$IB^?)au;nWU(KM z0I>A!DXgj5d=V!mdTM~Gg@Xve0#+#Zd8MgRGRKz!#ckRPeS5Q}+B=l}C8;h8N3wfe zW&GgBM^04B6hw z9L=cXx4~^fAY3p?APHC^rGjjGtloL;;DNXOFq1!;g^iizo}?bhCJ}*=*Qwj`1jjeV zOh+iu6U6<*ltDo?l6OrqF5y?qGe~U39aBBNH`X$D#h#r3vOwLduxoO1nR?9>D74** zSN1V!c|QD6C)skpaMv^ZBVk!G6KWWM(f(@zbDNam8-@LAsVY5SH`1U}TTmDJl#DKQ z#88HhQw+O+TI3F@TrN$w8)Lqt8!w_+qi9Lhg#^mK8j=FrBc&kT_Mac2s=u3$KI`|z z+Q0l2?Ux~aShRdV>Xr{hh||+5iMOgMoP|0cFK6SYk8ZIPC*odXZwX;mFMjKIf>|fYzO!6!@}RNuUlRe4XKaGYW^O zGyq8WxipSq12w7xc*|mcKSa&BIyxf#CZ-H*Nf=BX-VPWWQpE4V^|$O=Q9tHY zC1T}Y`A1G=q|Kn2`&2c-!9~;J!&V`~e6m=BV@vk+%2VS9|G&xEdU)S!Cf6X2g0^}9 zWN2L&B?11tN>n&ZhOkCv#C*bfFbtWRe8BMhDQrWAJQ-5W44j)&qVTdc5$0rXHjv&W zuY~7Cmg?se=j7ECV9k|+O zXJ8jP%k>F?4eB1xP4Pz+b37p!%OSY>>XM(=|IR$xc0Va5@Fpfcmw?VZV=#eha`{M7=iAsQK3#((E4Rx>4k10a;YYov_H!0bdraqQT@C2FgUUR!y$ZQo zg)K2PeXa4#pB3l4Uwse!P}TZtq6z_xn5_;dVQkWZMkie+3Xz%ONP0%%n4}=r&*)A3 zk=@b<%g|6E`U%mVNO@-GEgEAV^=YuclOmE5kB zoC$t)37i2#z_IW8Fp;}fF5$xVml|4Ydo(8i1)m zORMuLM30j~01|EE_KO`jz6AQgIJ}Tc%_Hk%#%sJONUsr$#VK!h|{%(#AlF@PmnI* z)A0W)n@vZzzU{FNH57V_=vSLWDvU$O)SLnx$l0N z&$+gbN!z|AeJ&9nqA_3tHi~Hh3C2Qdi6uvG#_qhKMQWg{rw)JLj0^Dtw-WvED3(V| z{Q4%#7@_j-@Atmxuxg(V8vB9k607ms7`@h(m!aND9fP;8;LxEaG0;eWz9`qaSr?Z7 z{(OTaSGx$WKBIwtv~S-ctBZNIqaA0TTgk!OKcNO-T-cbuVhm_Se*hMaL4>R9dqd87zEDHCq!z7E5*iFr zzf&MNAt{k*>oYf30q;7lCwbp$8y-ry)CdmAU82v;ueYaWOc0P{x%ViL#(DP%T7jiD zCIP~NhsJYwX=gC!LczH%>RoJ9Rfql4adTO>mCW14CXMHLH5heDGX3^d1`u(H+B3#% zTR1;|zPSnr#b)H6aktKs7s)oCZ2b%XH8$0t#wJ~8zeE*sD$4qUHS#oEstkK5D!g8h zXeVCpA|=TI0eV_BorU_z&b+4(!+Ih!vQ@>gvqM@hFeMloymaU8-13O2j2BeN?Kxkf z;LrQx(j=VqDc~UVb|8CmHhSBmy>=91csWy=@Hs!fn}rr}t&#>oJ*no;ZLS9)yBN-J(|g z#jLg!P4Q4IN=WtodZ2%G+{u0ug`CE0nV&wi2E)X`c-|-gqgpwM$LA++{;KRump*k; z3E61RO&!$cdm7htvouRBTPo|0auUJeZ*!hySt>$2swQIF^)Vs9$9Y!Xd!Lcr)MulN zSgm&0ti}LmQAUvUlQ-G%qc_2+8e?>ZWI$9QWRn{Q&Ze#b(f)vrP3F>F4@yTJ0K${; zT_4vAW9~Ym>sUARPc)rv^pcSiicnGDEAbgv5o)kFSW(H;^cKMiD1qy#RhHDavD&`5 zPFHiZxYe5LU6lz_7#Z)IBCgUD4%-ShDKCMpESPF-3hvd_U~OH^Kgq|9gky=%K4|WW z_S$(cim2mQ(4&|Bc2O1@T~U>iP$O0J{{^9?`woUu9n)Fln5FuIvD)h(4eGLcT8DsN zFk@VX#$?*J1t}yGoHJlM4EFWs9Isol)YCWGlV!zDt>8!We~rEv^Af|mF`eA2#BBOI zgBLZ`CL<5CtQTh^E?3J@WK4g2luj&4>O$}oiMybQ+ceQ!0*Di%#ig^N&JWVf^*9c= z8e;=Oy*rax^3NA&34Jywlu)<&5&$)3_h;u%IRK%XKN3z4#P|?{+(r{bB!EICL_(dh z*Y%%Lq4Yj~PMS-|aHtjn6h%$;=a{mIaSet`zt=U^KUwS3Bf){pIR#)~$B@q35oYpl zkZzh3d)D+d&L|$+K=(QP+_0sz<}rcC%1WBqAdp@Ipl!q3=W}^=l%?;f=fQ9KB}3n8 zW`gB%EW*yQwLTg$2(>b2CgZ|i?L)r)_1o!!&#@+Re1>3(EMx1>Sp-3rD=UL@~`S`Eb zcQM8w!P&4y6^jC(e6uU0>r3p5R+}L^crgATrr`=iP+{fAnMfHv=}{zbM=VsFH${@T z4Vt+f(gF<_qw&!iFlRFFp>J%e-X+c;$Zxv-D+%{W=4{su^4x-bylIZuzqLt?jeqzr zV)}d7;zwJRh}3*y&R|u^;*zS`x@8}bp5QHhh)<0h^YrA)t#{`S`8C?GHnEozbl>Ta zovuqn@h-<$Y~fKff#As5)VYEpaoOo6S&erQECxQ&boySY@Q2N~cOd%B$n6F_1r&*} z(Hbm$2?SS{EUr$|HU47{m_}w>|EKua235W~rJmW+ct+dhRq4TFUCkc(s6S0)p%Q!w z*e@nzk+T3aNBAKfFk}L%#b(03?Km|xFm@-Cm1z;hj5v8wb6nVgJl06f6i>8um5>$s zXEeBRR2M>$DD4~mb5rzDBtS*!)r-^qhFFgxumLpvQi7)6Y$i)l-||=QMrFg1%(joN z#P;sS2>3Mtdrf1?g%*FZZ&sB<1y?)4p?(89-)-94BY^Z(eHZ7HHv%oQM(QEq(51>j zGU2LZo7ee1ncPjigG?#zH}iJ`zB&l9>G~uG+h2fo&e)N)@H=`o)#hoa4CPkNjw^{& z9Jlze(nuwj3@>chiPY5^0}P;B5&aYZs(W!3rlc{^s4VEJCXR~w3J@=ND5)E8>s zM-W{zpr9G7Hs1xxhg}WjyS=r^$`oGaAMCT-H0;Y{=)E5|E%HW|h+8u!iz{3>jEMw( z;RxxKZAA7jo|}CM6}qt{R~65u(o%eMpf;afUk7Uq)ExMs1FOmLStqjSb}md5i8h0= zVyDcqd(k4OpO~3e6t4zIY>R7W@SeH174Mb9Ay4Ipu^bq{Fdz=@81S3BMem(I0l9gKzCLM z-LIw&#Sj2}D8=*ogA`pwJEV4>T7NTI+k8BLRb6x;l;f z)=;G5w7#UM3EE*H)+03RGX{&JKbNRS%+(r03ewL?W7tDB{{(-bYD!k7-2i?g=>^s^tk*UOQq z#Xo$wEY3@mvm1M=Xab*1YtVnX)$=d2Fi<6Jr4X0q(zamiwOI)e2L)e|s)aCn2Ln}K zF~$RF3lk6deZR+~h|#p(WnH7e=8=m`uQ4Kg?4Gl5uvIgKt0)ShZ5MSfZ83~G5rvu% z&V%LsU&tjTg+C+c497TTuxvP%Z#IKZH50p5Q&Vp=()|QT3Pz#a3P`{2T4GOX@0-|F z&Yh-lx%(pXzXAs@Mw0e;4%bPtpm=Dc66v95a^A?jbKf8@5q53Pl_wi#ZiMN;p^h!2 zI)`iZor_^|i6bRnB+xl2>Tw>P{#q`m)Ef65Ik$L7-fB6TsG;|bY-tBnK@pCpgmHqI4GgZ_DPj(Cy}x^R4dp^M0yH{HC9rT_JnxWAeG+)d0e%8H;<} zP<>N`ITJg!dy}Ks<;vaCbN4jfp}DN+ZW&x@f=86o_^lxq^9>{kR6ffiR~f|E2tDt# zNUPNe8j=Y3n;*}Vd}_Ay6hPq{6f+}olQ0W(u*lA)ExDkZ5<5ZI!SeJMn&>0C7|PkM zQA_0cIsR(U=Zl;+p+M-uPz4zsn%xoPHiccq$N-cn^@nO7ICjHQ;!V1bsHEcs z5cDh7o<4(l<@RLkMXlsx-B6<+AN$E&i0;(rj(^KKV^>22K~=@j z)v~n7NA{d!ZCEZ87md?l?$uoJ@G%jp5Y8&A#Vn~9bfT(Qz|>{A2$+u<7Wf~mAFE%w zEO$80HJ#v+KR(hycs!N&g*;2q3>j_`-}8%vNfUw-gdmoi0X-*`zo7o4?l15qah1AQDmU)XajlE_X-B}wkCbD-?6-mu3;^a zM($XW-&-@E#Z?6@wriTuC~cpEz^PyO#8CXp-SDg5Alg!DkH7vR-!ly4*`-*mR<&>G zr_&MYrg)x$n9%aMU*_!|ZS-{Che*4bR!J`kZTKmr^%6%jP>>xWYoEP8ZXc2wQ=nSI9ytjF#cZd=;uo5uA5h@y#Ep`Zi=9h&7x{tUj$ z;kO_@ST^D>QP&r7%)Qi(A)yee-Z0W$mH4uoHTdV_F*(xXK8q$h4zqf`9;uHH7ln;G zHypsSmHW8QCuPw>)wIh0=2crf zK#$QpT+;P-Xa=uA6QvK+MPXNMcXrD=L$5&eVmSI*av7s6Ju&i4eZRPeEU*GxuSw+SrrT$ zpIT`;#q};;IhQsF3L3JL5;fp(=9uj#fKLE+CWH_4CWe7%Pu!GVA$zxyHtUdn|-i{-kAx&8MMc#k+dYo-?@rpr9}? z6T|*GeSW)o=>;6inID%`wyB1wp)ION2J8GnU4g0My;@ejy0gm_VAU$)$0U;_zkI-a zpWIu|7Qy?(s{n%lX>M5jK+=DQ!rlLnc81ZW@_>-^x^@{*fgk$wwt{CrxUYB}B%0pc z6A=appS5%=JJv0X!CB#wG)uIj^G@G~xCd_V($=brrBKp3MhEG z`*2yvn7vwi=jf``9R>%AX~Qu@jPZ>KmWzf99xeq}D$`}evB8Fv^o9&n&WdLz%uRV; z`w57R%5zYyGWhGuRZn%(3&goFVU)p3Au>d|>@aOb)V`<4ZV|WjA)diBxggmxa$+8s z%8D9yLe1BRax|HIu)7QGN-Ul}AnCR2(Qj-2AWBZxL~S&>m7L_Qt1UIY?vHr{RO-1Zu4QYOG|diU|| zT~>t3B;EWiibaH`6n*Q=#CUdDfzv;pyst9(a8gm1C1AU=!vOM3Yn}lUrF*}f$0Lnu zGCM18b6F6>xJj?28d6piG0&1|c+wKt7YEf>sy+kJ;9M2X=A#Te(!4yC_yj;>ccKr@a6U}XMp@GXEOyfWG_l!3$4 z$95RRkzNCnI%5Sm5&?7hxqE+p#jpC%lin1Qbv!qs9_99sOme3PoyxAXrqPhAj#^k` zqm!+*!z35alJ_3T0C)7H`@n0nU2v{eMWr;B2aCbAHwMV!FXpBLyKVQ|SJQR`xy~M; z3fY&7#|w6iuqjoQBG;&=purpHXhC@vog?lJ<-H{`JPBX5c*5sUkxHK`u6qT5``cc^vl0#h{E=M4&yPG`o)CC2x4~`$@dg+A&YX!XOlX*B;f5o8exl= z0LK0eLHKyNWT68B98sl~qljv1(c0&w;%gGJ&(4@D|1viDW1BNaxSI+g4H0~Qa2%){rih;mYW3t!O2{9tb znI}H8fVBp{mc3*&@^9`M&i(P;XjBtg$-z!cQ{)sx*u!;f#6aJ zfUSc-RT8`xbA~^^!lQIO)`1K*aH@7tsHOJI_JdE86`yGy@G(Rw;-7heVCiZ6AWOyo zPIcowFA-sn_w0pgpFte=>5335-R7wCWsNy4sr5=x8{Nj}Cm}PD1zD-N}cK45&BoLodAQO^4_jBwkjY9aD zu2-Zm%VxCWd{rGmq38@UbP}f#(~B*#Jb;gFMCrJC+2pDYbeBe+>`zGaYDOC%Imz%I z?dXY*JZ?EtSEq%CECVl*{%vN9>rnNc2-E0k{oIvsmpA6a>u35U23p_XM+(#CU?grL ztx>6WXrkb-{+Pj8H;9VbOaa5rOnyed{M8jzEE$%Ej|-1V$it5uN_0UVN;oHFvOI-^rbbX9gjNDXSz8f2hNHc# z{f_hrvGU)379B~u6JYPT3-~>jnXjAVme9L{u<4=Fn`b4`Yd7-$iaH1XJcH%!$F}Vz zX&T$MZ8T0ATaBGIw%MRbV;fIwG`4N?y?f4iKfnA1_imounYreB%|+Yvm4P6m2m2dJ$C*QpfTP-W|pnCMG*Qcuc~8 zZ|Sw{F0M5nUPM>NKKe+Y^%|u)nJj$-@0Un;?O)>N7y(DlFV2Al#ky>u#VcznYpdHh zQJLs`npu$>cU2;VP5jh1CC+mi&EWeIoXdzd$*QQ*bF1YRi@<0!I4cLAe-FMXK*+(+ z98L@OFyzXKZEXVw{uU)`N(=cVP<)Zi7E6vAwNw)3c(eQSU!2Ab$mVXAj>fzpcv9x- zCR%EBC5UBGj`?lL3(AUV7cF+q~15# zk;WwFsr+Nt2tk)qUnxMJ@9N+yr9M908_G$yO9Lm|HiY-6@o}j*ZhGxYS`TcVP@mr+Xw(NUw+@Le}qT;~^Ntd`IeA)VUgi^|19oM@{aWpC>KIP?tyFK5~R* z3*xNzp1ls{v2bei?Q@#71yJ(I+TwN=7eUr|`LVS{1IMKV72&A2F6rGu>yedC&zyv?vgw3oK85 zQ}-w?8?_VAB(&^!EZln1AV(kjqxIc3{rcj+<>Q6J!pt~Z7oX5hngs!mPL35egO~3C z%)=fSl_VdlyZeSQ$dKzrw03c+FSiH^NW?ZdVHUAhZ&Dch4NZf$xPpmUP6J*dbA8Q1 z+H}9Nl8*0jH5)QR=BF$P2~=oxUC=yDGS@ISz)Nb~C%C>0RKh6}ykW9OHxS?vWrM;Om|$4125 z!l8dn|6!FFlh=q!;4k_#x}6SOUC^Ri)?(uwkZ)GaM3Q|LbU3H8W`P=4xDlFO8tPD6 z?<%96rr~Z3Dwa(=n2 z%W2#<2`736%O)mo_Cby*RP6KlTwN$EgojYNI?((Lism?sf`bgY&N=d#o(SRG5vp6i!;|PyWF>CcU%fg4WUz z@3Z;w^?Vr_e=C!FN~g!&J_AZYwG5LT^rPbf*mMYB(-Gec$*W*^tQEaEWGP$*h)q%y zg?a({-6VznBa~j}3h{`vJ{^BEJJ|h{&8bd`)NJ)c>dH_--7GFQYM6=Laf(6mkT}hO zOs0l+cXn=-ZwgRAo6L@DeDbT81pdN6F^d_A35#D}D?qi1=>0$jTiWG7>@uT4UNVH- zqgHB*)gnaeIi-&opD>wD)F%t+&g4vg`1rbPp!lq?1*j2E-Cld^_Di;@P4(Peah5KJ zz7;+&qGy}$Vj-oNT@vTfCM^LtvKYr%ilNL7#fvXYhZTA8FC2i0$YU%8B>KURcx2;bEyjui*Ka3CxR6~4-ZeKg4!r!O8l290nL_5( z$xy1bv~=xzJJwj^V-+B->IBzczHbX}qNywh;VTSw?-)5%^}nUKx-q(#L&Ll=Z)lCx$9>I}@?XGhfcYUBo9OC0))Jm-=r#R|H#G7o@9*-!aH6G&J_d9R5mv7rL zbZULa344G#hm@F|C%^1V%g&>I(!<)MvJ@Z~P(vRJc_LqF9ilTcS&$Ij&J6()F5yzO z=Prk`X$6=;$I~s(G!SdmvA@Pip zQ{)q>7-t7*#QqNSrHDyU!6_Xddvib-NQK{QO)Lxfpmpea1G9}21LFe=NOfFc8hP#< zj^8_PZR3Qq|5{qvaFBno@Qs2AwQJ+6UohO6%A=q>brLy(clE|6(d-F$L`I;MC>!~r z?|sZr`}I|7C^4*AkdtnvBryshFDEnsZxJ;F1OJb1crXzVUdXX>xb7jL++2C@{tUJX z*=%ygeF`gri^$V-N~X`e!^dnohlSDI{;_rt3!yl{n~6vxNPmtQkO6A`TcQ&S!*W^# zzCxNIrs`u~jYk&r*JpDmD^joP5e^}4SmyyI5~_GObkv#krGE9C%sm^>o&o-yi5Fe5 zMMMNe7h|_#cQZ+R&q5SONoc^6Ljfc*L02evMy=Nn-C8|HSemPaax+n0{@4@v3r@GE z9Fqw?1}TB?0ydda+Fh8I-=$~(PHndvT9j5_*_Lc{zZl`)dhTuF$EbmRl`@x>UH}Pf z#8>a->=%xps5FFZqCehavZ6?Cj9icw@hk^u!`Pnf#C_`Y}H}gRLg%fq+VWx_`NL# z3Hh@W?;QstH0UCSHsDJEIUV6~K~MHs!g$}`!dbjhcqnivnlz(|11VP-<4rtbxV^Y; zj7MMnoCr7p6f}_`JQ_8CRqe*EizU<;PE9L0!+vBBNV8iu!yq6nqGJ?NjfIm~Gi`Mk zU_NG3aDfziupws=&s}k7>4HrgI`0TM6|&v-IPcXr+@AzcdDTM8KD_m+vMi|OSt03r z>)g;0XNdmFbU=3&cD<6Y_?o%>5z1|?*hf`Yn!JHv45aeLlLI|P~smR-a^i?#jY_W_s0tXDeEb)Lro(Xov4ZF z(HL_^Or5%pg)5KJgmg57g3osoN1r$1dvV5mB0)}ioqMpR)xRdg3bUWFNi9;vl@{Bw zV8^o032|Gt>E+R75%DG>3o08q5zXFgg*KWKW>eM1Y&*LE$H1@tfZeJRaXHJM!4*~r z75XQ8uAC4ymj%0%%a!}dExvMthfLvRd={?irhmidXXi%sS_0)qc+_4l2EJU5$>ch_ zSZ3{hHaq``X?8xANaegQQ`x2T`Kn3H=wj{nwcUSw2LJHsc=&j8Mj$0TKfATn357Se z+~~QXAu;LIvw^3Q_{R7XK>?IMmgO2imgPnsEtAg{b{qp>orG zi`8;72^gqg0s5Otrec!`pp-d1d`3>Z$Em)lyTu?f*NkR zy4M@8L}^#=?64Ele+}ZN@2gQvNs@ZQO4h4T81WGxEW~c(Dm+Dm^-{k-g!GaHIhvvH z4k>H7(|k#M8b@L3f_{CsTY(>*+wcUvflq-y3tWhvuF%Ja-FuK6Da5S#3j@1(BD&Fucx`hU_ zY_pnCc|GsabQ+};GTqe9+w+U17M2fsWXNtI?YKGqR#~FQSZp7YDX{nG(Ao+6or2kC z*{M@%kca@LoYCFdt6TDvKvtR`@!x$;z36|v;aGCJshnel zbMVxlBJxtgkc~4t!pY(xe`DGAZu||Qwh!2#lpN~L2M?jwUnYXId3YHTs~#C-^C_Ky zWPXlw3iuBk$Ct~zf~V2!@&=@QK2gn&@C8!P4)eP^W)nY|hE|t061-ge$!_-Fr1vNJ z7^;BeZrbU~eoiysJ3qI9_bvCBWo|v?y?2o|={S1fGM|(3oT#59#qNZc8YUuGp2)t# zPUk!DVFg5?T3|d_&*ZJo$ZIat=El?ymI4JBc&kdm^ACh4p_-G=fC&bWl+fYbM$S>w z`;FI{HlF~KKAOdN`a4gOnIjtw@lJ89K(C_b2O7z=4=f3ua!hN}C}`@kI}xG4X3gz; zKyVQ8tS=&F+cm6}ZFhMh2^=|*2IOE;VsvPVrm|kCQd<}#QG!k`wKD)`MV4N!kya}9 znH)pi=^LSb3aSI4Axx6Eb!$Jtif#!-wN#?%UI`t)2eALu=*;yYxo=Q1V`Dr2D(&6< zM)n%oD&hhG5=S9obt-I2{nvWE?rXJ^aIwtsR(~x$$rQMA@e>x77$39V_-e)drMbhW zz!G`PB%S365o?tK+X88{zw#G=VgQPd1l1zBot^e55?t4!PU5#v%jyUAC$?vD0Yx%X ze4d>m;_t2>anLnIKC}40TEhdHH{=QWWOZk0184|(_;N&r7btAbQ{(xVZ_5O6J;Vc zSb+cJ0SCmC(Aqh)v|(!0CO+S!gOMS4M5Ws*st=V~*)G0*QJa0&ps?RZbe9eKzx6hU z3Nmbu)3e%am#Bl0GW24LEyk4u!O`H9%9%;sEk(9=WCpGo8cn)4Ds;1jota)=f73p> zoXUuz!{n-!`?RyfoZ`u@?)>GTgn$8a?>w~E?A`2;xO9_mg&N4dkmQZgy-VlMFTkMC z6g~MB!Fsk759-s! zqL$5B0h;$e{mtHvS9{?fW)^@=%wXQ%bDMHDKjA48r;cjlPaJV(MH<#TZ2|3n#n?6}Yxd<$=1*l)iYM9gq zXlIjK`qZ;+79@l#RcPOTxL@SQCcEJKut)8AyAFjV;J)WSoaQ_-Xgh`}=kL6DrxJ)| zC5^Q{D6xKd_6=LLGXXHc&OT<}Ns53`O@nRNQ2Q-kyWOTX?gQy1qsW68Af`#j1q+gc zWR!}3zFx*7eX^a(tV=|dWz7-aWha;4ALwYpeOjie%Td_A?EOqCj4CoQ^BEch(Fr^+ zb%?#eOoD96T_q{Y%1+gm@K_F{ z1{LZxAJV6@oY}YwhgW2jZJB#&g2??|U@+Z+%!ej*0&y6427{zUrTLw9Rfx>0K9R>9 z&0z6F`a=N)8bwb`Ssgh%YwJek3#sN~Uhl$^T3Mb-6RXF)hnfBE!`zvGZZ9}WwY$N} z>r%-hN#)YwhG67{vWEZ(k-ix{Epx$4Ei47xlyX|`lmj8Mo2eCT1@PJPL2&D+p<6G% zTtbx7g1uS|HWbC4pvT@oeMX@?S59v==cv?OfTsdJ+Xy0i*Vf&ATx_e^`~#JMMqOjg zI5;cWQ8t8>?JH`K1q>VYDrVPF3Dgzl{cUOW9rD`9*hy=s&Z<8j7l$X4QB6=>P-q0Q zUA}O~+i3b<6|R;eOeN+^Si0(#M)A{UpjJZ#V!L>+nb%t0J>biQC*;|2={X9NOXs?% zZz0;r(TmJ_8;3N`a(*=w-G$RkNiwI%r%G+jLw=lJtNuib$N$!as=gc9X|OV9tJj7$KAZ_Hh<6dD_z z(fA-b;?#ta&MjPQ!nZ<`Kir2pi}u{S30J0EyFQ+84&0wywOvXmW$7=v9%;E0s~tlY)6*qrvzqfq?}sZN6sjFY6F|^h=h1{!Ju|j z5qkJwvfj57x5xFqm z7mu&@z&$LA)Ufp$qs#NiYw?A$5B5|_V10^pkWJxKy9;Bd;xgD4AGr=-H4!|{7Y4*atD96`zeu|$Jq?sKc z>0euOj`P{E!rCtt?Lql$o7)J(pJzZlJ6HlIhT5j1CP=9!={wZQ6}eX&?$C#AQyE{I zoGSD5`^)K+BJ|@KZ}}nsN3m+!b2=$+B2mBuahpCG4s`gjyLr*sZ_Ukxhn0)f+#XAm z{gk3~p(T1RP8l9$+YS<%z61+k#<7UvpMUGmSlei4AtiJ4XOlX`OyHgOiMxEwck11W zRd_v(=TlknuOc`7K6*9aws1we;XGF(!oHAy&bw|@Jn;7VC0&LxHosqviHuYS0aIWb zjyK(OJKS@(pk+;vH3$+4oL*a6db$3Ddx#}DgxhK`(tr&<@&K@0{g5rC_eDVl5THp> z+MZ2P4B^GPsMj#kbr(Ko8=}xQ-je)=V5R(-PZ3A!ynSi>M=nJ<-U!egzr^BamEZ)< zsF8TOTR9iID@m@&mz(c-hkwP?nmv6I?K&8E*4%7*Z^+7I^~9x;(soo+_ES|IsqN5b ziwCNj?G^n<4d=DDtz$sfDL5Fsmo?6Fp8||j_!}NS(C^VctVE$eO1a*8wDUOFLI_w+ zvsH6{e^vW2BrH~p8Id~q>*$2ou84F^a)P%EN@(psr!z2Y>PYT&6%W!ti^?xH^ohEFe%yoOT1G78hy7w^Sfz? z?ezt6=mm$o=XU2tho<3cNGBhfe5W4s-j38NDcE+0FOA7dYsrqg+d?9|h(<)Gq+sg% z)?)oT=M!ymT zO>9i3nfBQJG?zW4Z0G!ygJ3IrGHa-KYkBMW{t;G$~tJ zvo8XU2F-l6UV(kW47Qf^UWU!8)duV8zR{Pbhu7=qrzek^si0imR%lEiR#8)Rt7r~~ zAWf@6f1!UNwR{$@Y5-wkfiXR#QC5V9$0O8Oe7@k8O1OHnf+=Ek=l%^$4wle^u6}J} zy0DibCG=(9uRU7N>QT^@Z#FQ>2+l2v2XUe{RE{xjq=9S5kcYf25w1*;YBwS#>iqk2 zxM;Bnb+|eKYN_^lKtddYO4BAPJSC|I3GU3)0!4su4@Az%N@LvPGHprJe~uL3*#05k zY#Q$pL4TK0r9go{ZCT~C7e@FxR%VnRbGNXaZtMen<+G_MuP-h~j45z!`aJ<5FROK6 zsu2b*F!b~i>_e64G_N~KX7B>#j$Zg3#Tn}=3}*bWHhEaj6~->QRbfQaU~AoDa`58S z68UJFJbQSoIgqSIMR&qwieRJAnCPlO%fw5RU}U%nB^3F!NMwpndDv%084spT&GKHo zHfhHLvGuf{bGcMiJODFZxOI;%)M>8$om3zb0h2A&; zJii-@u`M8WHg^B|9X74fz6CCUtQvK3unz2nOKzW6^e$9>QRRLL6!^niwp(IAtN8zwwdr4UFxj8euT&xfZt^21u z0gC0x()n3ZY26=Xg1$d`*P+wiv@Li5Hp!x!_9*c$Eq606UdE^`+_7STc&t!LhFpVWYxoksDsmWx+|j)a zSd}YCDNiG?+0s75GVzY(-8|Lf-+%g1X$?e&qQH&NCI=!1L6!di=zqIGuAYLux5f@1 zeP7nQ$ByK4C?;bt97IBzf2m35Dm?7cmWZ~nW9K`*%OZ8z&SNC(#D4FlUQ4bhTmNN? zGw5>iIzPOM)C%s2b{sT*+WO1Fdx62D2ily8yDyBptr!Su>U*N@l zFg1A-Hiwkvo-YtWOvM)$Wto?tlyL@ed)T5$gn8rSNBz}mF@S$WzgkI@ADRduu=o2o z^SJ+_rnKqGJILP^wqvX>-t9SXm%s+U3bKU(^pIh8DWmkAuZCi=5->ky!M=&U@yqlm!F zEnk8CP3pMq`+#?gu?hFr#uPf5%}^?18!>Rjf#spAk=o&gh=$r%;0Glok()kd>dtrg zVF058Olpmrd65Iju@onnxJ9B~0MIc$=|RR!N~Z0h2+JrWmZGRt@Zh zkiBex<02E&-fwAxkebca>z8{siBi60dEnIMZNuU=hiV>h(Y0_JJBgQjHU~~UtwrJY z2k0%q{%iPmx@Xj^=~+&rlK1J}zmt5Yg-=JT&b|QhDxOmIn#-Q~@pl4==F+JZH_e?r z$cMi~vOTBd&)`)Iehp7?tv$D18*5ATTb#VIV!H|0xK3$u2>13G(quJY4Ss|vzJ7xn zB0X-uOVGl~0d4iXMfi}IR%tGO;vQjsK~WKcXpg(k5mQ7GU-a*(yd?MV)vj~ujruEN zUlwL#tRACxYShM1C85YGxAgY_xZ?(`bojSMJl_mzG*Uun`1mrJ>msG;NFq!R`s}!1 zx~m0PMh7V(QJ(|_ez-1k;?D3t!A~9T6sVcpSv&`fVW+KkFZ#_9omFi1$~1o{MHprV zq6}z&#-;Sie5RTb@nu_NIV*I;U0XsolsFxW_?EzZj`i8V zE1gLB>UGfCV!`sQwdYK?%g`7(fhtn+bcG)r^@dhz^EbnV1Lr4yaO`z+YWFlCe%2}o z3e>)>!l3%vQ#%`8!eLh*c?6z4t|@NicCs!cOE<5No@R0zE)0Yq96d@kh!_0{)?u{cbM z*)zcA3Ws)DL{5T?WhUw$T~m5$cp)qufkik}V66+I`z=r#hWGQ*mT|I`{KL4X^M}D{ zeUDFCdf$CvdLODITlj@#3F^{l_wyo&UUM~UiY|m386$(HHEBxY*B8cD%8%6 zWKZ0e25B>&uI%X1lr(O%Zs+3)L|iA^xoV~(Z^5e?jnzoU2_o|Qm;b*fVg`c04@{Xp zjH~tF1E0H=A>c}|RjCca#(mt^s!>(!;vs388SYWI+9n&@U^S@MpDmRjPl@*#1cTpB z)r6Bu!>Ov25B?&8XcuLCs24wDd&4>-mi!8WLonrFtGgBdGqVLI1ub8LNmLlCfZ^tF znH*Ndi7?X=2@Ly4BhF@men$>YhsY@R{}ub9R+?yU6ql$-dYZ-2@q>P{Z6PzzyX zYwUXJ^LkgZK|jM!Dyu-S5GLF zxN#1h1lfrlZIT+neM|jMO*4J=D1$W3l9x9@;|z0idIA*hZ@>rCj7uNX#qd~6X=cXF(cHB~5aM0mkRY-{!A^N!%nZD)U|X(aIXPyQ>jFNw!< zXQr5>mqr4*p*dAvsHS6P$BIQf+QD2~r~7psNi^nzd*f`y(XswMLrL9D;bF`0TAU@Q7y7$= z!j%r?Q!l2>pEwGBHCnofP0J=+r9V)pf;l$KCMb$NQ)hBB388mzO`|W*wdte%0DGz6 zyl7fq5kK_OTB5a+j%#*OqHtMgmMFAPfM%z1y`n*X-04|c~XNtbq*59PL zf2GK(^`44LhR@%s*209os!^-XK1;F{M*IZtESo=}65To~n+-bu0+>z?fZnkVoW}$_ zstfB}2u}&7L#c0_Qg^2;} z@gmc!u&D{a-Sk8a)1*Chcx+8~_M64opd2kxtHB|6*!4W&cOrWX;Yw>1GmvfN@nFO$k&$he)RKxo(&m zmF!n>4Y$>igYg0$%*vf6XAlg%u=W>lZr*&`_JyS?Qqf|(d#rIqm-Q+bvDD6`E^Yg! zCA@nJ@*O;Lp9NU-Q#KY#ME2A^kx^vHZXmc#(4jcbti!v_B%%%N@|q{z#cN2rxd7uE zDS;G&(m*%4MYSXuokFeyQS{I{6O4v&@v{hDbb4J?0ftY(dI z%St%e+#=VPIyA5VF9`5)D3bY&tL9gpe{Xha)$de%8pXLvHB( zu+0=Wc6d1^KBxb%4tv#uqG^B_>&ZHIJQN>7!}krzA!iGj%=dq0lHKGFRI$Ah-NT8N RBrxDlMnX}%QuJ%k{{yPv^Xvcs literal 0 HcmV?d00001 diff --git a/test/baselines/adapter_JS_OfficialESLint/admin/words.js b/test/baselines/adapter_JS_OfficialESLint/admin/words.js new file mode 100644 index 000000000..4517fef89 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/admin/words.js @@ -0,0 +1,46 @@ +/* eslint no-unused-vars: off */ +/* eslint no-global-assign: off */ +/* global systemDictionary */ +"use strict"; + +systemDictionary = { + "test-adapter adapter settings": { + "en": "Adapter settings for test-adapter", + "de": "Adaptereinstellungen für test-adapter", + "ru": "Настройки адаптера для test-adapter", + "pt": "Configurações do adaptador para test-adapter", + "nl": "Adapterinstellingen voor test-adapter", + "fr": "Paramètres d'adaptateur pour test-adapter", + "it": "Impostazioni dell'adattatore per test-adapter", + "es": "Ajustes del adaptador para test-adapter", + "pl": "Ustawienia adaptera dla test-adapter", + "uk": "Налаштування адаптера для test-adapter", + "zh-cn": "test-adapter的适配器设置" + }, + "option1": { + "en": "option1", + "de": "Mock translation of 'option1' to 'de'", + "ru": "Mock translation of 'option1' to 'ru'", + "pt": "Mock translation of 'option1' to 'pt'", + "nl": "Mock translation of 'option1' to 'nl'", + "fr": "Mock translation of 'option1' to 'fr'", + "it": "Mock translation of 'option1' to 'it'", + "es": "Mock translation of 'option1' to 'es'", + "pl": "Mock translation of 'option1' to 'pl'", + "uk": "Mock translation of 'option1' to 'uk'", + "zh-cn": "Mock translation of 'option1' to 'zh-cn'" + }, + "option2": { + "en": "option2", + "de": "Mock translation of 'option2' to 'de'", + "ru": "Mock translation of 'option2' to 'ru'", + "pt": "Mock translation of 'option2' to 'pt'", + "nl": "Mock translation of 'option2' to 'nl'", + "fr": "Mock translation of 'option2' to 'fr'", + "it": "Mock translation of 'option2' to 'it'", + "es": "Mock translation of 'option2' to 'es'", + "pl": "Mock translation of 'option2' to 'pl'", + "uk": "Mock translation of 'option2' to 'uk'", + "zh-cn": "Mock translation of 'option2' to 'zh-cn'" + } +}; \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/eslint.config.mjs b/test/baselines/adapter_JS_OfficialESLint/eslint.config.mjs new file mode 100644 index 000000000..9bf3e1891 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/eslint.config.mjs @@ -0,0 +1,34 @@ +// ioBroker eslint template configuration file for js and ts files +// Please note that esm or react based modules need additional modules loaded. +import config from '@iobroker/eslint-config'; + +export default [ + ...config, + { + // specify files to exclude from linting here + ignores: [ + '.dev-server/', + '.vscode/', + '*.test.js', + 'test/**/*.js', + '*.config.mjs', + 'build', + 'dist', + 'admin/words.js', + 'admin/admin.d.ts', + 'admin/blockly.js', + '**/adapter-config.d.ts' + ], + }, + { + // you may disable some 'jsdoc' warnings - but using jsdoc is highly recommended + // as this improves maintainability. jsdoc warnings will not block build process. + rules: { + // 'jsdoc/require-jsdoc': 'off', + // 'jsdoc/require-param': 'off', + // 'jsdoc/require-param-description': 'off', + // 'jsdoc/require-returns-description': 'off', + // 'jsdoc/require-returns-check': 'off', + }, + }, +]; \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/io-package.json b/test/baselines/adapter_JS_OfficialESLint/io-package.json new file mode 100644 index 000000000..53cff6aab --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/io-package.json @@ -0,0 +1,91 @@ +{ + "common": { + "name": "test-adapter", + "version": "0.0.1", + "news": { + "0.0.1": { + "en": "initial release", + "de": "Erstveröffentlichung", + "ru": "Начальная версия", + "pt": "lançamento inicial", + "nl": "Eerste uitgave", + "fr": "Première version", + "it": "Versione iniziale", + "es": "Versión inicial", + "pl": "Pierwsze wydanie", + "uk": "Початкова версія", + "zh-cn": "首次出版" + } + }, + "titleLang": { + "en": "Is used to test the creator", + "de": "Mock translation of 'Is used to test the creator' to 'de'", + "ru": "Mock translation of 'Is used to test the creator' to 'ru'", + "pt": "Mock translation of 'Is used to test the creator' to 'pt'", + "nl": "Mock translation of 'Is used to test the creator' to 'nl'", + "fr": "Mock translation of 'Is used to test the creator' to 'fr'", + "it": "Mock translation of 'Is used to test the creator' to 'it'", + "es": "Mock translation of 'Is used to test the creator' to 'es'", + "pl": "Mock translation of 'Is used to test the creator' to 'pl'", + "uk": "Mock translation of 'Is used to test the creator' to 'uk'", + "zh-cn": "Mock translation of 'Is used to test the creator' to 'zh-cn'" + }, + "desc": { + "en": "test-adapter", + "de": "Mock translation of 'test-adapter' to 'de'", + "ru": "Mock translation of 'test-adapter' to 'ru'", + "pt": "Mock translation of 'test-adapter' to 'pt'", + "nl": "Mock translation of 'test-adapter' to 'nl'", + "fr": "Mock translation of 'test-adapter' to 'fr'", + "it": "Mock translation of 'test-adapter' to 'it'", + "es": "Mock translation of 'test-adapter' to 'es'", + "pl": "Mock translation of 'test-adapter' to 'pl'", + "uk": "Mock translation of 'test-adapter' to 'uk'", + "zh-cn": "Mock translation of 'test-adapter' to 'zh-cn'" + }, + "authors": [ + "Al Calzone " + ], + "keywords": [ + "template", + "automation", + "IoT", + "integration" + ], + "licenseInformation": { + "type": "free", + "license": "MIT" + }, + "platform": "Javascript/Node.js", + "icon": "test-adapter.png", + "enabled": true, + "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", + "readme": "https://github.com/AlCalzone/ioBroker.test-adapter/blob/main/README.md", + "loglevel": "info", + "tier": 3, + "mode": "daemon", + "type": "general", + "compact": true, + "connectionType": "local", + "dataSource": "push", + "adminUI": { + "config": "materialize" + }, + "dependencies": [ + { + "js-controller": ">=6.0.11" + } + ], + "globalDependencies": [ + { + "admin": ">=7.0.23" + } + ] + }, + "native": { + "option1": true, + "option2": "42" + }, + "objects": [], + "instanceObjects": [] +} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/lib/adapter-config.d.ts b/test/baselines/adapter_JS_OfficialESLint/lib/adapter-config.d.ts new file mode 100644 index 000000000..ae458daf3 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/lib/adapter-config.d.ts @@ -0,0 +1,19 @@ +// This file extends the AdapterConfig type from "@types/iobroker" +// using the actual properties present in io-package.json +// in order to provide typings for adapter.config properties + +import { native } from "../io-package.json"; + +type _AdapterConfig = typeof native; + +// Augment the globally declared type ioBroker.AdapterConfig +declare global { + namespace ioBroker { + interface AdapterConfig extends _AdapterConfig { + // Do not enter anything here! + } + } +} + +// this is required so the above AdapterConfig is found by TypeScript / type checking +export {}; \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/main.js b/test/baselines/adapter_JS_OfficialESLint/main.js new file mode 100644 index 000000000..723fa962b --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/main.js @@ -0,0 +1,167 @@ +"use strict"; + +/* + * Created with @iobroker/create-adapter v2.6.5 + */ + +// The adapter-core module gives you access to the core ioBroker functions +// you need to create an adapter +const utils = require("@iobroker/adapter-core"); + +// Load your modules here, e.g.: +// const fs = require("fs"); + +class TestAdapter extends utils.Adapter { + + /** + * @param {Partial} [options={}] + */ + constructor(options) { + super({ + ...options, + name: "test-adapter", + }); + this.on("ready", this.onReady.bind(this)); + this.on("stateChange", this.onStateChange.bind(this)); + // this.on("objectChange", this.onObjectChange.bind(this)); + // this.on("message", this.onMessage.bind(this)); + this.on("unload", this.onUnload.bind(this)); + } + + /** + * Is called when databases are connected and adapter received configuration. + */ + async onReady() { + // Initialize your adapter here + + // The adapters config (in the instance object everything under the attribute "native") is accessible via + // this.config: + this.log.debug("config option1: " + this.config.option1); + this.log.debug("config option2: " + this.config.option2); + + /* + For every state in the system there has to be also an object of type state + Here a simple template for a boolean variable named "testVariable" + Because every adapter instance uses its own unique namespace variable names can't collide with other adapters variables + */ + await this.setObjectNotExistsAsync("testVariable", { + type: "state", + common: { + name: "testVariable", + type: "boolean", + role: "indicator", + read: true, + write: true, + }, + native: {}, + }); + + // In order to get state updates, you need to subscribe to them. The following line adds a subscription for our variable we have created above. + this.subscribeStates("testVariable"); + // You can also add a subscription for multiple states. The following line watches all states starting with "lights." + // this.subscribeStates("lights.*"); + // Or, if you really must, you can also watch all states. Don't do this if you don't need to. Otherwise this will cause a lot of unnecessary load on the system: + // this.subscribeStates("*"); + + /* + setState examples + you will notice that each setState will cause the stateChange event to fire (because of above subscribeStates cmd) + */ + // the variable testVariable is set to true as command (ack=false) + await this.setState("testVariable", true); + + // same thing, but the value is flagged "ack" + // ack should be always set to true if the value is received from or acknowledged from the target system + await this.setState("testVariable", { val: true, ack: true }); + + // same thing, but the state is deleted after 30s (getState will return null afterwards) + await this.setState("testVariable", { val: true, ack: true, expire: 30 }); + + // examples for the checkPassword/checkGroup functions + const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); + this.log.info("check user admin pw iobroker: " + pwdResult); + + const gropupResult = await this.checkGroupAsync("admin", "admin"); + this.log.info("check group user admin group admin: " + gropupResult); + } + + /** + * Is called when adapter shuts down - callback has to be called under any circumstances! + * @param {() => void} callback + */ + onUnload(callback) { + try { + // Here you must clear all timeouts or intervals that may still be active + // clearTimeout(timeout1); + // clearTimeout(timeout2); + // ... + // clearInterval(interval1); + + callback(); + } catch (_e) { + callback(); + } + } + + // If you need to react to object changes, uncomment the following block and the corresponding line in the constructor. + // You also need to subscribe to the objects with `this.subscribeObjects`, similar to `this.subscribeStates`. + // /** + // * Is called if a subscribed object changes + // * @param {string} id + // * @param {ioBroker.Object | null | undefined} obj + // */ + // onObjectChange(id, obj) { + // if (obj) { + // // The object was changed + // this.log.info(`object ${id} changed: ${JSON.stringify(obj)}`); + // } else { + // // The object was deleted + // this.log.info(`object ${id} deleted`); + // } + // } + + /** + * Is called if a subscribed state changes + * @param {string} id + * @param {ioBroker.State | null | undefined} state + */ + onStateChange(id, state) { + if (state) { + // The state was changed + this.log.info(`state ${id} changed: ${state.val} (ack = ${state.ack})`); + } else { + // The state was deleted + this.log.info(`state ${id} deleted`); + } + } + + // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. + // /** + // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... + // * Using this method requires "common.messagebox" property to be set to true in io-package.json + // * @param {ioBroker.Message} obj + // */ + // onMessage(obj) { + // if (typeof obj === "object" && obj.message) { + // if (obj.command === "send") { + // // e.g. send email or pushover or whatever + // this.log.info("send command"); + + // // Send response in callback if required + // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); + // } + // } + // } + +} + +if (require.main !== module) { + // Export the constructor in compact mode + /** + * @param {Partial} [options={}] + */ + module.exports = (options) => new TestAdapter(options); +} else { + // otherwise start the instance directly + new TestAdapter(); +} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/main.test.js b/test/baselines/adapter_JS_OfficialESLint/main.test.js new file mode 100644 index 000000000..307b4c62f --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/main.test.js @@ -0,0 +1,30 @@ +"use strict"; + +/** + * This is a dummy TypeScript test file using chai and mocha + * + * It's automatically excluded from npm and its build output is excluded from both git and npm. + * It is advised to test all your modules with accompanying *.test.js-files + */ + +// tslint:disable:no-unused-expression + +const { expect } = require("chai"); +// import { functionToTest } from "./moduleToTest"; + +describe("module to test => function to test", () => { + // initializing logic + const expected = 5; + + it(`should return ${expected}`, () => { + const result = 5; + // assign result a value from functionToTest + expect(result).to.equal(expected); + // or using the should() syntax + result.should.equal(expected); + }); + // ... more tests => it + +}); + +// ... more test suites => describe diff --git a/test/baselines/adapter_JS_OfficialESLint/package.json b/test/baselines/adapter_JS_OfficialESLint/package.json new file mode 100644 index 000000000..6c6074c16 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/package.json @@ -0,0 +1,55 @@ +{ + "name": "iobroker.test-adapter", + "version": "0.0.1", + "description": "test-adapter", + "author": { + "name": "Al Calzone", + "email": "al@calzo.ne" + }, + "contributors": [], + "homepage": "https://github.com/AlCalzone/ioBroker.test-adapter", + "license": "MIT", + "keywords": [ + "template", + "automation", + "IoT", + "integration" + ], + "repository": { + "type": "git", + "url": "https://github.com/AlCalzone/ioBroker.test-adapter.git" + }, + "engines": { + "node": ">= 20" + }, + "dependencies": { + "@iobroker/adapter-core": "^3.3.2" + }, + "devDependencies": { + "@iobroker/adapter-dev": "^1.5.0", + "@iobroker/eslint-config": "^2.2.0", + "@iobroker/testing": "^5.1.1" + }, + "main": "main.js", + "files": [ + "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).{json,json5}", + "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}", + "lib/", + "www/", + "io-package.json", + "LICENSE", + "main.js" + ], + "scripts": { + "test:js": "mocha --config test/mocharc.custom.json \"{!(node_modules|test)/**/*.test.js,*.test.js,test/**/test!(PackageFiles|Startup).js}\"", + "test:package": "mocha test/package --exit", + "test:integration": "mocha test/integration --exit", + "test": "npm run test:js && npm run test:package", + "lint": "eslint -c eslint.config.mjs .", + "translate": "translate-adapter" + }, + "bugs": { + "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" + }, + "readmeFilename": "README.md" +} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/prettier.config.mjs b/test/baselines/adapter_JS_OfficialESLint/prettier.config.mjs new file mode 100644 index 000000000..c254a96f3 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/prettier.config.mjs @@ -0,0 +1,8 @@ +// iobroker prettier configuration file +import prettierConfig from '@iobroker/eslint-config/prettier.config.mjs'; + +export default { + ...prettierConfig, + // // uncomment next line if you prefer single quotes + // singleQuote: true, +}; \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/test/integration.js b/test/baselines/adapter_JS_OfficialESLint/test/integration.js new file mode 100644 index 000000000..986936fac --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/test/integration.js @@ -0,0 +1,5 @@ +const path = require("path"); +const { tests } = require("@iobroker/testing"); + +// Run integration tests - See https://github.com/ioBroker/testing for a detailed explanation and further options +tests.integration(path.join(__dirname, "..")); \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/test/mocha.setup.js b/test/baselines/adapter_JS_OfficialESLint/test/mocha.setup.js new file mode 100644 index 000000000..b3b963114 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/test/mocha.setup.js @@ -0,0 +1,14 @@ +// Don't silently swallow unhandled rejections +process.on("unhandledRejection", (e) => { + throw e; +}); + +// enable the should interface with sinon +// and load chai-as-promised and sinon-chai by default +const sinonChai = require("sinon-chai"); +const chaiAsPromised = require("chai-as-promised"); +const { should, use } = require("chai"); + +should(); +use(sinonChai); +use(chaiAsPromised); \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/test/mocharc.custom.json b/test/baselines/adapter_JS_OfficialESLint/test/mocharc.custom.json new file mode 100644 index 000000000..6e49c601b --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/test/mocharc.custom.json @@ -0,0 +1,10 @@ +{ + "require": [ + "test/mocha.setup.js" + ], + "watch-files": [ + "!(node_modules|test)/**/*.test.js", + "*.test.js", + "test/**/test!(PackageFiles|Startup).js" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/test/package.js b/test/baselines/adapter_JS_OfficialESLint/test/package.js new file mode 100644 index 000000000..3a48e0449 --- /dev/null +++ b/test/baselines/adapter_JS_OfficialESLint/test/package.js @@ -0,0 +1,5 @@ +const path = require("path"); +const { tests } = require("@iobroker/testing"); + +// Validate the package files +tests.packageFiles(path.join(__dirname, "..")); diff --git a/test/baselines/adapter_TS_OfficialESLint/.create-adapter.json b/test/baselines/adapter_TS_OfficialESLint/.create-adapter.json new file mode 100644 index 000000000..64da96c2b --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.create-adapter.json @@ -0,0 +1,38 @@ +{ + "cli": true, + "target": "directory", + "adapterName": "test-adapter", + "title": "Is used to test the creator", + "startMode": "daemon", + "features": [ + "adapter" + ], + "connectionIndicator": "no", + "connectionType": "local", + "dataSource": "push", + "adminFeatures": [], + "type": "general", + "language": "TypeScript", + "adminUi": "html", + "tabReact": "no", + "releaseScript": "no", + "tools": [ + "ESLint" + ], + "eslintConfig": "official", + "indentation": "Tab", + "quotes": "double", + "authorName": "Al Calzone", + "authorGithub": "AlCalzone", + "authorEmail": "al@calzo.ne", + "gitRemoteProtocol": "HTTPS", + "dependabot": "yes", + "gitCommit": "no", + "defaultBranch": "main", + "license": "MIT License", + "licenseInformation": { + "type": "free", + "license": "MIT" + }, + "creatorVersion": "2.6.5" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md b/test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..895613958 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,32 @@ +--- +name: Bug report +about: Something is not working as it should +title: '' +labels: '' +assignees: '' +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '...' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots & Logfiles** +If applicable, add screenshots and logfiles to help explain your problem. + +**Versions:** + - Adapter version: + - JS-Controller version: + - Node version: + - Operating system: + +**Additional context** +Add any other context about the problem here. diff --git a/test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml b/test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..d7cfe5940 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: ioBroker Community + url: https://forum.iobroker.net/ + about: Please ask and answer questions here. \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/.github/auto-merge.yml b/test/baselines/adapter_TS_OfficialESLint/.github/auto-merge.yml new file mode 100644 index 000000000..4f6d185f0 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.github/auto-merge.yml @@ -0,0 +1,17 @@ +# Configure here which dependency updates should be merged automatically. +# The recommended configuration is the following: +- match: + # Only merge patches for production dependencies + dependency_type: production + update_type: "semver:patch" +- match: + # Except for security fixes, here we allow minor patches + dependency_type: production + update_type: "security:minor" +- match: + # and development dependencies can have a minor update, too + dependency_type: development + update_type: "semver:minor" + +# The syntax is based on the legacy dependabot v1 automerged_updates syntax, see: +# https://dependabot.com/docs/config-file/#automerged_updates diff --git a/test/baselines/adapter_TS_OfficialESLint/.github/dependabot.yml b/test/baselines/adapter_TS_OfficialESLint/.github/dependabot.yml new file mode 100644 index 000000000..c165a6a47 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.github/dependabot.yml @@ -0,0 +1,22 @@ +version: 2 +updates: + - package-ecosystem: npm + directory: "/" + schedule: + interval: monthly + time: "04:00" + timezone: Europe/Berlin + open-pull-requests-limit: 5 + assignees: + - AlCalzone + versioning-strategy: increase + + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: monthly + time: "04:00" + timezone: Europe/Berlin + open-pull-requests-limit: 5 + assignees: + - AlCalzone diff --git a/test/baselines/adapter_TS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml b/test/baselines/adapter_TS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml new file mode 100644 index 000000000..baeae23b5 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml @@ -0,0 +1,27 @@ +# Automatically merge Dependabot PRs when version comparison is within the range +# that is configured in .github/auto-merge.yml + +name: Auto-Merge Dependabot PRs + +on: + # WARNING: This needs to be run in the PR base, DO NOT build untrusted code in this action + # details under https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/ + pull_request_target: + +jobs: + auto-merge: + if: github.actor == 'dependabot[bot]' + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Check if PR should be auto-merged + uses: ahmadnassri/action-dependabot-auto-merge@v2 + with: + # In order to use this, you need to go to https://github.com/settings/tokens and + # create a Personal Access Token with the permission "public_repo". + # Enter this token in your repository settings under "Secrets" and name it AUTO_MERGE_TOKEN + github-token: ${{ secrets.AUTO_MERGE_TOKEN }} + # By default, squash and merge, so Github chooses nice commit messages + command: squash and merge diff --git a/test/baselines/adapter_TS_OfficialESLint/.github/workflows/test-and-release.yml b/test/baselines/adapter_TS_OfficialESLint/.github/workflows/test-and-release.yml new file mode 100644 index 000000000..0c48ade1a --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.github/workflows/test-and-release.yml @@ -0,0 +1,96 @@ +name: Test and Release + +# Run this job on all pushes and pull requests +# as well as tags with a semantic version +on: + push: + branches: + - "main" + tags: + # normal versions + - "v[0-9]+.[0-9]+.[0-9]+" + # pre-releases + - "v[0-9]+.[0-9]+.[0-9]+-**" + pull_request: {} + +# Cancel previous PR/branch runs when a new commit is pushed +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true + +jobs: + # Performs quick checks before the expensive test runs + check-and-lint: + if: contains(github.event.head_commit.message, '[skip ci]') == false + + runs-on: ubuntu-latest + + steps: + - uses: ioBroker/testing-action-check@v1 + with: + node-version: '20.x' + # Uncomment the following line if your adapter cannot be installed using 'npm ci' + # install-command: 'npm install' + type-checking: true + lint: true + + # Runs adapter tests on all supported node versions and OSes + adapter-tests: + if: contains(github.event.head_commit.message, '[skip ci]') == false + + runs-on: ${{ matrix.os }} + strategy: + matrix: + node-version: [20.x, 22.x, 24.x] + os: [ubuntu-latest, windows-latest, macos-latest] + + steps: + - uses: ioBroker/testing-action-adapter@v1 + with: + node-version: ${{ matrix.node-version }} + os: ${{ matrix.os }} + # Uncomment the following line if your adapter cannot be installed using 'npm ci' + # install-command: 'npm install' + build: true + +# TODO: To enable automatic npm releases, create a token on npmjs.org +# Enter this token as a GitHub secret (with name NPM_TOKEN) in the repository options +# Then uncomment the following block: + +# # Deploys the final package to NPM +# deploy: +# needs: [check-and-lint, adapter-tests] +# +# # Trigger this step only when a commit on any branch is tagged with a version number +# if: | +# contains(github.event.head_commit.message, '[skip ci]') == false && +# github.event_name == 'push' && +# startsWith(github.ref, 'refs/tags/v') +# +# runs-on: ubuntu-latest +# +# # Write permissions are required to create Github releases +# permissions: +# contents: write +# +# steps: +# - uses: ioBroker/testing-action-deploy@v1 +# with: +# node-version: '20.x' +# # Uncomment the following line if your adapter cannot be installed using 'npm ci' +# # install-command: 'npm install' +# build: true +# npm-token: ${{ secrets.NPM_TOKEN }} +# github-token: ${{ secrets.GITHUB_TOKEN }} +# +# # When using Sentry for error reporting, Sentry can be informed about new releases +# # To enable create a API-Token in Sentry (User settings, API keys) +# # Enter this token as a GitHub secret (with name SENTRY_AUTH_TOKEN) in the repository options +# # Then uncomment and customize the following block: +# sentry: true +# sentry-token: ${{ secrets.SENTRY_AUTH_TOKEN }} +# sentry-project: "iobroker-test-adapter" +# sentry-version-prefix: "iobroker.test-adapter" +# sentry-sourcemap-paths: "build/" +# # If your sentry project is linked to a GitHub repository, you can enable the following option +# # sentry-github-integration: true diff --git a/test/baselines/adapter_TS_OfficialESLint/.gitignore b/test/baselines/adapter_TS_OfficialESLint/.gitignore new file mode 100644 index 000000000..80c28aa9d --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.gitignore @@ -0,0 +1,18 @@ +# No dot-directories except github/vscode +.*/ +!.vscode/ +!.github/ + +*.code-workspace +node_modules +nbproject + +# npm package files +iobroker.*.tgz + +Thumbs.db +.commitinfo + +# i18n intermediate files +admin/i18n/flat.txt +admin/i18n/*/flat.txt \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/.vscode/extensions.json b/test/baselines/adapter_TS_OfficialESLint/.vscode/extensions.json new file mode 100644 index 000000000..2c6ac5b31 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.vscode/extensions.json @@ -0,0 +1,6 @@ +{ + "recommendations": [ + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/.vscode/settings.json b/test/baselines/adapter_TS_OfficialESLint/.vscode/settings.json new file mode 100644 index 000000000..854736cc0 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/.vscode/settings.json @@ -0,0 +1,23 @@ +{ + "typescript.tsdk": "node_modules/typescript/lib", + "eslint.enable": true, + "json.schemas": [ + { + "fileMatch": [ + "io-package.json" + ], + "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.js-controller/master/schemas/io-package.json" + }, + { + "fileMatch": [ + "admin/jsonConfig.json", + "admin/jsonConfig.json5", + "admin/jsonCustom.json", + "admin/jsonCustom.json5", + "admin/jsonTab.json", + "admin/jsonTab.json5" + ], + "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.admin/master/packages/jsonConfig/schemas/jsonConfig.json" + } + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/LICENSE b/test/baselines/adapter_TS_OfficialESLint/LICENSE new file mode 100644 index 000000000..27c9a624d --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2025 Al Calzone + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/test/baselines/adapter_TS_OfficialESLint/README.md b/test/baselines/adapter_TS_OfficialESLint/README.md new file mode 100644 index 000000000..f57bba69c --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/README.md @@ -0,0 +1,132 @@ +![Logo](admin/test-adapter.png) +# ioBroker.test-adapter + +[![NPM version](https://img.shields.io/npm/v/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) +[![Downloads](https://img.shields.io/npm/dm/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) +![Number of Installations](https://iobroker.live/badges/test-adapter-installed.svg) +![Current version in stable repository](https://iobroker.live/badges/test-adapter-stable.svg) + +[![NPM](https://nodei.co/npm/iobroker.test-adapter.png?downloads=true)](https://nodei.co/npm/iobroker.test-adapter/) + +**Tests:** ![Test and Release](https://github.com/AlCalzone/ioBroker.test-adapter/workflows/Test%20and%20Release/badge.svg) + +## test-adapter adapter for ioBroker + +Describe your project here + +## Developer manual +This section is intended for the developer. It can be deleted later. + +### DISCLAIMER + +Please make sure that you consider copyrights and trademarks when you use names or logos of a company and add a disclaimer to your README. +You can check other adapters for examples or ask in the developer community. Using a name or logo of a company without permission may cause legal problems for you. + +### Getting started + +You are almost done, only a few steps left: +1. Create a new repository on GitHub with the name `ioBroker.test-adapter` +1. Initialize the current folder as a new git repository: + ```bash + git init -b main + git add . + git commit -m "Initial commit" + ``` +1. Link your local repository with the one on GitHub: + ```bash + git remote add origin https://github.com/AlCalzone/ioBroker.test-adapter + ``` + +1. Push all files to the GitHub repo: + ```bash + git push origin main + ``` +1. Add a new secret under https://github.com/AlCalzone/ioBroker.test-adapter/settings/secrets. It must be named `AUTO_MERGE_TOKEN` and contain a personal access token with push access to the repository, e.g. yours. You can create a new token under https://github.com/settings/tokens. + +1. Head over to [src/main.ts](src/main.ts) and start programming! + +### Best Practices +We've collected some [best practices](https://github.com/ioBroker/ioBroker.repositories#development-and-coding-best-practices) regarding ioBroker development and coding in general. If you're new to ioBroker or Node.js, you should +check them out. If you're already experienced, you should also take a look at them - you might learn something new :) + +### Scripts in `package.json` +Several npm scripts are predefined for your convenience. You can run them using `npm run ` +| Script name | Description | +|-------------|-------------| +| `build` | Compile the TypeScript sources. | +| `watch` | Compile the TypeScript sources and watch for changes. | +| `test:ts` | Executes the tests you defined in `*.test.ts` files. | +| `test:package` | Ensures your `package.json` and `io-package.json` are valid. | +| `test:integration` | Tests the adapter startup with an actual instance of ioBroker. | +| `test` | Performs a minimal test run on package files and your tests. | +| `check` | Performs a type-check on your code (without compiling anything). | +| `lint` | Runs `ESLint` to check your code for formatting errors and potential bugs. | +| `translate` | Translates texts in your adapter to all required languages, see [`@iobroker/adapter-dev`](https://github.com/ioBroker/adapter-dev#manage-translations) for more details. | + +### Configuring the compilation +The adapter template uses [esbuild](https://esbuild.github.io/) to compile TypeScript and/or React code. You can configure many compilation settings +either in `tsconfig.json` or by changing options for the build tasks. These options are described in detail in the +[`@iobroker/adapter-dev` documentation](https://github.com/ioBroker/adapter-dev#compile-adapter-files). + +### Writing tests +When done right, testing code is invaluable, because it gives you the +confidence to change your code while knowing exactly if and when +something breaks. A good read on the topic of test-driven development +is https://hackernoon.com/introduction-to-test-driven-development-tdd-61a13bc92d92. +Although writing tests before the code might seem strange at first, but it has very +clear upsides. + +The template provides you with basic tests for the adapter startup and package files. +It is recommended that you add your own tests into the mix. + +### Publishing the adapter +Using GitHub Actions, you can enable automatic releases on npm whenever you push a new git tag that matches the form +`v..`. We **strongly recommend** that you do. The necessary steps are described in `.github/workflows/test-and-release.yml`. + +To get your adapter released in ioBroker, please refer to the documentation +of [ioBroker.repositories](https://github.com/ioBroker/ioBroker.repositories#requirements-for-adapter-to-get-added-to-the-latest-repository). + +### Test the adapter manually on a local ioBroker installation +In order to install the adapter locally without publishing, the following steps are recommended: +1. Create a tarball from your dev directory: + ```bash + npm pack + ``` +1. Upload the resulting file to your ioBroker host +1. Install it locally (The paths are different on Windows): + ```bash + cd /opt/iobroker + npm i /path/to/tarball.tgz + ``` + +For later updates, the above procedure is not necessary. Just do the following: +1. Overwrite the changed files in the adapter directory (`/opt/iobroker/node_modules/iobroker.test-adapter`) +1. Execute `iobroker upload test-adapter` on the ioBroker host + +## Changelog + +### 0.0.1 +* (Al Calzone) initial release + +## License +MIT License + +Copyright (c) 2025 Al Calzone + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/__meta__/npm_package_files.txt b/test/baselines/adapter_TS_OfficialESLint/__meta__/npm_package_files.txt new file mode 100644 index 000000000..7503a378d --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/__meta__/npm_package_files.txt @@ -0,0 +1,8 @@ +admin/index_m.html +admin/style.css +admin/test-adapter.png +admin/words.js +io-package.json +LICENSE +package.json +README.md \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/admin/admin.d.ts b/test/baselines/adapter_TS_OfficialESLint/admin/admin.d.ts new file mode 100644 index 000000000..41f934f4c --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/admin/admin.d.ts @@ -0,0 +1,93 @@ +declare let systemDictionary: Record>; + +declare let load: (settings: Record, onChange: (hasChanges: boolean) => void) => void; +declare let save: (callback: (settings: Record) => void) => void; + +// make load and save exist on the window object +interface Window { + load: typeof load; + save: typeof save; +} + +declare const instance: number; +declare const adapter: string; +/** Translates text */ +declare function _(text: string, arg1?: string, arg2?: string, arg3?: string): string; +declare const socket: ioBrokerSocket; +declare function sendTo( + instance: any | null, + command: string, + message: any, + callback: (result: SendToResult) => void | Promise, +): void; + +interface SendToResult { + error?: string | Error; + result?: any; +} + +// tslint:disable-next-line:class-name +interface ioBrokerSocket { + emit( + command: "subscribeObjects", + pattern: string, + callback?: (err?: string) => void | Promise, + ): void; + emit( + command: "subscribeStates", + pattern: string, + callback?: (err?: string) => void | Promise, + ): void; + emit( + command: "unsubscribeObjects", + pattern: string, + callback?: (err?: string) => void | Promise, + ): void; + emit( + command: "unsubscribeStates", + pattern: string, + callback?: (err?: string) => void | Promise, + ): void; + + emit( + event: "getObjectView", + view: "system", + type: "device", + options: ioBroker.GetObjectViewParams, + callback: ( + err: string | undefined, + result?: any, + ) => void | Promise, + ): void; + emit( + event: "getStates", + callback: ( + err: string | undefined, + result?: Record, + ) => void, + ): void; + emit( + event: "getState", + id: string, + callback: (err: string | undefined, result?: ioBroker.State) => void, + ): void; + emit( + event: "setState", + id: string, + state: unknown, + callback: (err: string | undefined, result?: any) => void, + ): void; + + on(event: "objectChange", handler: ioBroker.ObjectChangeHandler): void; + on(event: "stateChange", handler: ioBroker.StateChangeHandler): void; + removeEventHandler( + event: "objectChange", + handler: ioBroker.ObjectChangeHandler, + ): void; + removeEventHandler( + event: "stateChange", + handler: ioBroker.StateChangeHandler, + ): void; + + // TODO: other events +} diff --git a/test/baselines/adapter_TS_OfficialESLint/admin/index_m.html b/test/baselines/adapter_TS_OfficialESLint/admin/index_m.html new file mode 100644 index 000000000..f11dc3c14 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/admin/index_m.html @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+
+ + + + +
+
+ + +
+ +
+ + +
+
+ +
+ + + + \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/admin/style.css b/test/baselines/adapter_TS_OfficialESLint/admin/style.css new file mode 100644 index 000000000..57d4549ee --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/admin/style.css @@ -0,0 +1,32 @@ +/* You can delete those if you want. I just found them very helpful */ +* { + box-sizing: border-box +} +.m { + /* Don't cut off dropdowns! */ + overflow: initial; +} +.m.adapter-container, +.m.adapter-container > div.App { + /* Fix layout/scrolling issues with tabs */ + height: 100%; + width: 100%; + position: relative; +} +.m .select-wrapper + label { + /* The positioning for dropdown labels is messed up */ + transform: none !important; +} + +label > i[title] { + /* Display the help cursor for the tooltip icons and fix their positioning */ + cursor: help; + margin-left: 0.25em; +} + +.dropdown-content { + /* Don't wrap text in dropdowns */ + white-space: nowrap; +} + +/* Add your styles here */ diff --git a/test/baselines/adapter_TS_OfficialESLint/admin/test-adapter.png b/test/baselines/adapter_TS_OfficialESLint/admin/test-adapter.png new file mode 100644 index 0000000000000000000000000000000000000000..094ebd97c36dbe2386a63dbce290c9ad6a148079 GIT binary patch literal 62376 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%0DGz6 zyl7fq5kK_OTB5a+j%#*OqHtMgmMFAPfM%z1y`n*X-04|c~XNtbq*59PL zf2GK(^`44LhR@%s*209os!^-XK1;F{M*IZtESo=}65To~n+-bu0+>z?fZnkVoW}$_ zstfB}2u}&7L#c0_Qg^2;} z@gmc!u&D{a-Sk8a)1*Chcx+8~_M64opd2kxtHB|6*!4W&cOrWX;Yw>1GmvfN@nFO$k&$he)RKxo(&m zmF!n>4Y$>igYg0$%*vf6XAlg%u=W>lZr*&`_JyS?Qqf|(d#rIqm-Q+bvDD6`E^Yg! zCA@nJ@*O;Lp9NU-Q#KY#ME2A^kx^vHZXmc#(4jcbti!v_B%%%N@|q{z#cN2rxd7uE zDS;G&(m*%4MYSXuokFeyQS{I{6O4v&@v{hDbb4J?0ftY(dI z%St%e+#=VPIyA5VF9`5)D3bY&tL9gpe{Xha)$de%8pXLvHB( zu+0=Wc6d1^KBxb%4tv#uqG^B_>&ZHIJQN>7!}krzA!iGj%=dq0lHKGFRI$Ah-NT8N RBrxDlMnX}%QuJ%k{{yPv^Xvcs literal 0 HcmV?d00001 diff --git a/test/baselines/adapter_TS_OfficialESLint/admin/tsconfig.json b/test/baselines/adapter_TS_OfficialESLint/admin/tsconfig.json new file mode 100644 index 000000000..49fb013d2 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/admin/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../tsconfig.json", + "include": [ + "./admin.d.ts", + "./**/*.js", + // Include the adapter-config definition if it exists. + // It should be at either on of these paths: + "../lib/adapter-config.d.ts", // JS + "../src/lib/adapter-config.d.ts", // TS + ] +} diff --git a/test/baselines/adapter_TS_OfficialESLint/admin/words.js b/test/baselines/adapter_TS_OfficialESLint/admin/words.js new file mode 100644 index 000000000..4517fef89 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/admin/words.js @@ -0,0 +1,46 @@ +/* eslint no-unused-vars: off */ +/* eslint no-global-assign: off */ +/* global systemDictionary */ +"use strict"; + +systemDictionary = { + "test-adapter adapter settings": { + "en": "Adapter settings for test-adapter", + "de": "Adaptereinstellungen für test-adapter", + "ru": "Настройки адаптера для test-adapter", + "pt": "Configurações do adaptador para test-adapter", + "nl": "Adapterinstellingen voor test-adapter", + "fr": "Paramètres d'adaptateur pour test-adapter", + "it": "Impostazioni dell'adattatore per test-adapter", + "es": "Ajustes del adaptador para test-adapter", + "pl": "Ustawienia adaptera dla test-adapter", + "uk": "Налаштування адаптера для test-adapter", + "zh-cn": "test-adapter的适配器设置" + }, + "option1": { + "en": "option1", + "de": "Mock translation of 'option1' to 'de'", + "ru": "Mock translation of 'option1' to 'ru'", + "pt": "Mock translation of 'option1' to 'pt'", + "nl": "Mock translation of 'option1' to 'nl'", + "fr": "Mock translation of 'option1' to 'fr'", + "it": "Mock translation of 'option1' to 'it'", + "es": "Mock translation of 'option1' to 'es'", + "pl": "Mock translation of 'option1' to 'pl'", + "uk": "Mock translation of 'option1' to 'uk'", + "zh-cn": "Mock translation of 'option1' to 'zh-cn'" + }, + "option2": { + "en": "option2", + "de": "Mock translation of 'option2' to 'de'", + "ru": "Mock translation of 'option2' to 'ru'", + "pt": "Mock translation of 'option2' to 'pt'", + "nl": "Mock translation of 'option2' to 'nl'", + "fr": "Mock translation of 'option2' to 'fr'", + "it": "Mock translation of 'option2' to 'it'", + "es": "Mock translation of 'option2' to 'es'", + "pl": "Mock translation of 'option2' to 'pl'", + "uk": "Mock translation of 'option2' to 'uk'", + "zh-cn": "Mock translation of 'option2' to 'zh-cn'" + } +}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/eslint.config.mjs b/test/baselines/adapter_TS_OfficialESLint/eslint.config.mjs new file mode 100644 index 000000000..9bf3e1891 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/eslint.config.mjs @@ -0,0 +1,34 @@ +// ioBroker eslint template configuration file for js and ts files +// Please note that esm or react based modules need additional modules loaded. +import config from '@iobroker/eslint-config'; + +export default [ + ...config, + { + // specify files to exclude from linting here + ignores: [ + '.dev-server/', + '.vscode/', + '*.test.js', + 'test/**/*.js', + '*.config.mjs', + 'build', + 'dist', + 'admin/words.js', + 'admin/admin.d.ts', + 'admin/blockly.js', + '**/adapter-config.d.ts' + ], + }, + { + // you may disable some 'jsdoc' warnings - but using jsdoc is highly recommended + // as this improves maintainability. jsdoc warnings will not block build process. + rules: { + // 'jsdoc/require-jsdoc': 'off', + // 'jsdoc/require-param': 'off', + // 'jsdoc/require-param-description': 'off', + // 'jsdoc/require-returns-description': 'off', + // 'jsdoc/require-returns-check': 'off', + }, + }, +]; \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/io-package.json b/test/baselines/adapter_TS_OfficialESLint/io-package.json new file mode 100644 index 000000000..53cff6aab --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/io-package.json @@ -0,0 +1,91 @@ +{ + "common": { + "name": "test-adapter", + "version": "0.0.1", + "news": { + "0.0.1": { + "en": "initial release", + "de": "Erstveröffentlichung", + "ru": "Начальная версия", + "pt": "lançamento inicial", + "nl": "Eerste uitgave", + "fr": "Première version", + "it": "Versione iniziale", + "es": "Versión inicial", + "pl": "Pierwsze wydanie", + "uk": "Початкова версія", + "zh-cn": "首次出版" + } + }, + "titleLang": { + "en": "Is used to test the creator", + "de": "Mock translation of 'Is used to test the creator' to 'de'", + "ru": "Mock translation of 'Is used to test the creator' to 'ru'", + "pt": "Mock translation of 'Is used to test the creator' to 'pt'", + "nl": "Mock translation of 'Is used to test the creator' to 'nl'", + "fr": "Mock translation of 'Is used to test the creator' to 'fr'", + "it": "Mock translation of 'Is used to test the creator' to 'it'", + "es": "Mock translation of 'Is used to test the creator' to 'es'", + "pl": "Mock translation of 'Is used to test the creator' to 'pl'", + "uk": "Mock translation of 'Is used to test the creator' to 'uk'", + "zh-cn": "Mock translation of 'Is used to test the creator' to 'zh-cn'" + }, + "desc": { + "en": "test-adapter", + "de": "Mock translation of 'test-adapter' to 'de'", + "ru": "Mock translation of 'test-adapter' to 'ru'", + "pt": "Mock translation of 'test-adapter' to 'pt'", + "nl": "Mock translation of 'test-adapter' to 'nl'", + "fr": "Mock translation of 'test-adapter' to 'fr'", + "it": "Mock translation of 'test-adapter' to 'it'", + "es": "Mock translation of 'test-adapter' to 'es'", + "pl": "Mock translation of 'test-adapter' to 'pl'", + "uk": "Mock translation of 'test-adapter' to 'uk'", + "zh-cn": "Mock translation of 'test-adapter' to 'zh-cn'" + }, + "authors": [ + "Al Calzone " + ], + "keywords": [ + "template", + "automation", + "IoT", + "integration" + ], + "licenseInformation": { + "type": "free", + "license": "MIT" + }, + "platform": "Javascript/Node.js", + "icon": "test-adapter.png", + "enabled": true, + "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", + "readme": "https://github.com/AlCalzone/ioBroker.test-adapter/blob/main/README.md", + "loglevel": "info", + "tier": 3, + "mode": "daemon", + "type": "general", + "compact": true, + "connectionType": "local", + "dataSource": "push", + "adminUI": { + "config": "materialize" + }, + "dependencies": [ + { + "js-controller": ">=6.0.11" + } + ], + "globalDependencies": [ + { + "admin": ">=7.0.23" + } + ] + }, + "native": { + "option1": true, + "option2": "42" + }, + "objects": [], + "instanceObjects": [] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/package.json b/test/baselines/adapter_TS_OfficialESLint/package.json new file mode 100644 index 000000000..ee935612a --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/package.json @@ -0,0 +1,67 @@ +{ + "name": "iobroker.test-adapter", + "version": "0.0.1", + "description": "test-adapter", + "author": { + "name": "Al Calzone", + "email": "al@calzo.ne" + }, + "contributors": [], + "homepage": "https://github.com/AlCalzone/ioBroker.test-adapter", + "license": "MIT", + "keywords": [ + "template", + "automation", + "IoT", + "integration" + ], + "repository": { + "type": "git", + "url": "https://github.com/AlCalzone/ioBroker.test-adapter.git" + }, + "engines": { + "node": ">= 20" + }, + "dependencies": { + "@iobroker/adapter-core": "^3.3.2" + }, + "devDependencies": { + "@iobroker/adapter-dev": "^1.5.0", + "@iobroker/eslint-config": "^2.2.0", + "@iobroker/testing": "^5.1.1", + "@tsconfig/node20": "^20.1.6", + "@types/node": "^20.19.17", + "rimraf": "^6.0.1", + "source-map-support": "^0.5.21", + "ts-node": "^10.9.2", + "typescript": "~5.9.2" + }, + "main": "build/main.js", + "files": [ + "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).{json,json5}", + "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}", + "build/", + "www/", + "io-package.json", + "LICENSE" + ], + "scripts": { + "prebuild": "rimraf build", + "build": "build-adapter ts", + "watch": "build-adapter ts --watch", + "prebuild:ts": "rimraf build", + "build:ts": "build-adapter ts", + "watch:ts": "build-adapter ts --watch", + "test:ts": "mocha --config test/mocharc.custom.json src/**/*.test.ts", + "test:package": "mocha test/package --exit", + "test:integration": "mocha test/integration --exit", + "test": "npm run test:ts && npm run test:package", + "check": "tsc --noEmit", + "lint": "eslint -c eslint.config.mjs .", + "translate": "translate-adapter" + }, + "bugs": { + "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" + }, + "readmeFilename": "README.md" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/prettier.config.mjs b/test/baselines/adapter_TS_OfficialESLint/prettier.config.mjs new file mode 100644 index 000000000..c254a96f3 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/prettier.config.mjs @@ -0,0 +1,8 @@ +// iobroker prettier configuration file +import prettierConfig from '@iobroker/eslint-config/prettier.config.mjs'; + +export default { + ...prettierConfig, + // // uncomment next line if you prefer single quotes + // singleQuote: true, +}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/src/lib/adapter-config.d.ts b/test/baselines/adapter_TS_OfficialESLint/src/lib/adapter-config.d.ts new file mode 100644 index 000000000..c6c8a0e2a --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/src/lib/adapter-config.d.ts @@ -0,0 +1,14 @@ +// This file extends the AdapterConfig type from "@types/iobroker" + +// Augment the globally declared type ioBroker.AdapterConfig +declare global { + namespace ioBroker { + interface AdapterConfig { + option1: boolean; + option2: string; + } + } +} + +// this is required so the above AdapterConfig is found by TypeScript / type checking +export {}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/src/main.test.ts b/test/baselines/adapter_TS_OfficialESLint/src/main.test.ts new file mode 100644 index 000000000..a8d538e95 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/src/main.test.ts @@ -0,0 +1,26 @@ +/** + * This is a dummy TypeScript test file using chai and mocha + * + * It's automatically excluded from npm and its build output is excluded from both git and npm. + * It is advised to test all your modules with accompanying *.test.ts-files + */ + +import { expect } from "chai"; +// import { functionToTest } from "./moduleToTest"; + +describe("module to test => function to test", () => { + // initializing logic + const expected = 5; + + it(`should return ${expected}`, () => { + const result = 5; + // assign result a value from functionToTest + expect(result).to.equal(expected); + // or using the should() syntax + result.should.equal(expected); + }); + // ... more tests => it + +}); + +// ... more test suites => describe diff --git a/test/baselines/adapter_TS_OfficialESLint/src/main.ts b/test/baselines/adapter_TS_OfficialESLint/src/main.ts new file mode 100644 index 000000000..d86bf77c5 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/src/main.ts @@ -0,0 +1,153 @@ +/* + * Created with @iobroker/create-adapter v2.6.5 + */ + +// The adapter-core module gives you access to the core ioBroker functions +// you need to create an adapter +import * as utils from "@iobroker/adapter-core"; + +// Load your modules here, e.g.: +// import * as fs from "fs"; + +class TestAdapter extends utils.Adapter { + + public constructor(options: Partial = {}) { + super({ + ...options, + name: "test-adapter", + }); + this.on("ready", this.onReady.bind(this)); + this.on("stateChange", this.onStateChange.bind(this)); + // this.on("objectChange", this.onObjectChange.bind(this)); + // this.on("message", this.onMessage.bind(this)); + this.on("unload", this.onUnload.bind(this)); + } + + /** + * Is called when databases are connected and adapter received configuration. + */ + private async onReady(): Promise { + // Initialize your adapter here + + // The adapters config (in the instance object everything under the attribute "native") is accessible via + // this.config: + this.log.debug("config option1: " + this.config.option1); + this.log.debug("config option2: " + this.config.option2); + + /* + For every state in the system there has to be also an object of type state + Here a simple template for a boolean variable named "testVariable" + Because every adapter instance uses its own unique namespace variable names can't collide with other adapters variables + */ + await this.setObjectNotExistsAsync("testVariable", { + type: "state", + common: { + name: "testVariable", + type: "boolean", + role: "indicator", + read: true, + write: true, + }, + native: {}, + }); + + // In order to get state updates, you need to subscribe to them. The following line adds a subscription for our variable we have created above. + this.subscribeStates("testVariable"); + // You can also add a subscription for multiple states. The following line watches all states starting with "lights." + // this.subscribeStates("lights.*"); + // Or, if you really must, you can also watch all states. Don't do this if you don't need to. Otherwise this will cause a lot of unnecessary load on the system: + // this.subscribeStates("*"); + + /* + setState examples + you will notice that each setState will cause the stateChange event to fire (because of above subscribeStates cmd) + */ + // the variable testVariable is set to true as command (ack=false) + await this.setState("testVariable", true); + + // same thing, but the value is flagged "ack" + // ack should be always set to true if the value is received from or acknowledged from the target system + await this.setState("testVariable", { val: true, ack: true }); + + // same thing, but the state is deleted after 30s (getState will return null afterwards) + await this.setState("testVariable", { val: true, ack: true, expire: 30 }); + + // examples for the checkPassword/checkGroup functions + const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); + this.log.info("check user admin pw iobroker: " + pwdResult); + + const gropupResult = await this.checkGroupAsync("admin", "admin"); + this.log.info("check group user admin group admin: " + gropupResult); + } + + /** + * Is called when adapter shuts down - callback has to be called under any circumstances! + */ + private onUnload(callback: () => void): void { + try { + // Here you must clear all timeouts or intervals that may still be active + // clearTimeout(timeout1); + // clearTimeout(timeout2); + // ... + // clearInterval(interval1); + + callback(); + } catch (_e) { + callback(); + } + } + + // If you need to react to object changes, uncomment the following block and the corresponding line in the constructor. + // You also need to subscribe to the objects with `this.subscribeObjects`, similar to `this.subscribeStates`. + // /** + // * Is called if a subscribed object changes + // */ + // private onObjectChange(id: string, obj: ioBroker.Object | null | undefined): void { + // if (obj) { + // // The object was changed + // this.log.info(`object ${id} changed: ${JSON.stringify(obj)}`); + // } else { + // // The object was deleted + // this.log.info(`object ${id} deleted`); + // } + // } + + /** + * Is called if a subscribed state changes + */ + private onStateChange(id: string, state: ioBroker.State | null | undefined): void { + if (state) { + // The state was changed + this.log.info(`state ${id} changed: ${state.val} (ack = ${state.ack})`); + } else { + // The state was deleted + this.log.info(`state ${id} deleted`); + } + } + + // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. + // /** + // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... + // * Using this method requires "common.messagebox" property to be set to true in io-package.json + // */ + // private onMessage(obj: ioBroker.Message): void { + // if (typeof obj === "object" && obj.message) { + // if (obj.command === "send") { + // // e.g. send email or pushover or whatever + // this.log.info("send command"); + + // // Send response in callback if required + // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); + // } + // } + // } + +} + +if (require.main !== module) { + // Export the constructor in compact mode + module.exports = (options: Partial | undefined) => new TestAdapter(options); +} else { + // otherwise start the instance directly + (() => new TestAdapter())(); +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/test/.eslintrc.json b/test/baselines/adapter_TS_OfficialESLint/test/.eslintrc.json new file mode 100644 index 000000000..ce6b3d62c --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/test/.eslintrc.json @@ -0,0 +1,43 @@ +{ + "root": true, + "env": { + "es6": true, + "node": true, + "mocha": true + }, + "extends": [ + "eslint:recommended" + ], + "rules": { + "indent": [ + "error", + "tab", + { + "SwitchCase": 1 + } + ], + "no-console": "off", + "no-unused-vars": [ + "error", + { + "ignoreRestSiblings": true, + "argsIgnorePattern": "^_" + } + ], + "no-var": "error", + "no-trailing-spaces": "error", + "prefer-const": "error", + "quotes": [ + "error", + "double", + { + "avoidEscape": true, + "allowTemplateLiterals": true + } + ], + "semi": [ + "error", + "always" + ] + } +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/test/integration.js b/test/baselines/adapter_TS_OfficialESLint/test/integration.js new file mode 100644 index 000000000..986936fac --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/test/integration.js @@ -0,0 +1,5 @@ +const path = require("path"); +const { tests } = require("@iobroker/testing"); + +// Run integration tests - See https://github.com/ioBroker/testing for a detailed explanation and further options +tests.integration(path.join(__dirname, "..")); \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/test/mocha.setup.js b/test/baselines/adapter_TS_OfficialESLint/test/mocha.setup.js new file mode 100644 index 000000000..b839790ff --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/test/mocha.setup.js @@ -0,0 +1,23 @@ +"use strict"; + +// Makes ts-node ignore warnings, so mocha --watch does work +process.env.TS_NODE_IGNORE_WARNINGS = "TRUE"; +// Sets the correct tsconfig for testing +process.env.TS_NODE_PROJECT = "tsconfig.json"; +// Make ts-node respect the "include" key in tsconfig.json +process.env.TS_NODE_FILES = "TRUE"; + +// Don't silently swallow unhandled rejections +process.on("unhandledRejection", (e) => { + throw e; +}); + +// enable the should interface with sinon +// and load chai-as-promised and sinon-chai by default +const sinonChai = require("sinon-chai"); +const chaiAsPromised = require("chai-as-promised"); +const { should, use } = require("chai"); + +should(); +use(sinonChai); +use(chaiAsPromised); \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/test/mocharc.custom.json b/test/baselines/adapter_TS_OfficialESLint/test/mocharc.custom.json new file mode 100644 index 000000000..851ed9cdc --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/test/mocharc.custom.json @@ -0,0 +1,10 @@ +{ + "require": [ + "test/mocha.setup.js", + "ts-node/register", + "source-map-support/register" + ], + "watch-files": [ + "src/**/*.test.ts" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/test/package.js b/test/baselines/adapter_TS_OfficialESLint/test/package.js new file mode 100644 index 000000000..3a48e0449 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/test/package.js @@ -0,0 +1,5 @@ +const path = require("path"); +const { tests } = require("@iobroker/testing"); + +// Validate the package files +tests.packageFiles(path.join(__dirname, "..")); diff --git a/test/baselines/adapter_TS_OfficialESLint/test/tsconfig.json b/test/baselines/adapter_TS_OfficialESLint/test/tsconfig.json new file mode 100644 index 000000000..3ebc81b65 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/test/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "noImplicitAny": false + }, + "include": [ + "./**/*.js" + ] +} diff --git a/test/baselines/adapter_TS_OfficialESLint/tsconfig.build.json b/test/baselines/adapter_TS_OfficialESLint/tsconfig.build.json new file mode 100644 index 000000000..1f040ce18 --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/tsconfig.build.json @@ -0,0 +1,16 @@ +// Specialized tsconfig to only compile .ts-files in the src dir +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "allowJs": false, + "checkJs": false, + "noEmit": false, + "declaration": false + }, + "include": [ + "src/**/*.ts" + ], + "exclude": [ + "src/**/*.test.ts" + ] +} diff --git a/test/baselines/adapter_TS_OfficialESLint/tsconfig.json b/test/baselines/adapter_TS_OfficialESLint/tsconfig.json new file mode 100644 index 000000000..4c80d776d --- /dev/null +++ b/test/baselines/adapter_TS_OfficialESLint/tsconfig.json @@ -0,0 +1,46 @@ +// Root tsconfig to set the settings and power editor support for all TS files +{ + // To update the compilation target, install a different version of @tsconfig/node... and reference it here + // https://github.com/tsconfig/bases#node-20-tsconfigjson + "extends": "@tsconfig/node20/tsconfig.json", + "compilerOptions": { + // do not compile anything, this file is just to configure type checking + // the compilation is configured in tsconfig.build.json + "noEmit": true, + + // check JS files, but do not compile them => tsconfig.build.json + "allowJs": true, + "checkJs": true, + + "noEmitOnError": true, + "outDir": "./build/", + "removeComments": false, + + // This is necessary for the automatic typing of the adapter config + "resolveJsonModule": true, + + // If you want to disable the stricter type checks (not recommended), uncomment the following line + // "strict": false, + // And enable some of those features for more fine-grained control + // "strictNullChecks": true, + // "strictPropertyInitialization": true, + // "strictBindCallApply": true, + // "noImplicitAny": true, + // "noUnusedLocals": true, + // "noUnusedParameters": true, + // Uncomment this if you want the old behavior of catch variables being `any` + // "useUnknownInCatchVariables": false, + + "sourceMap": true, + "inlineSourceMap": false + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "exclude": [ + "build/**", + "node_modules/**", + "widgets/**" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.create-adapter.json b/test/baselines/adapter_TS_React_OfficialESLint/.create-adapter.json new file mode 100644 index 000000000..9d32bec48 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.create-adapter.json @@ -0,0 +1,38 @@ +{ + "cli": true, + "target": "directory", + "adapterName": "test-adapter", + "title": "Is used to test the creator", + "startMode": "daemon", + "features": [ + "adapter" + ], + "connectionIndicator": "no", + "connectionType": "local", + "dataSource": "push", + "adminFeatures": [], + "type": "general", + "language": "TypeScript", + "adminUi": "react", + "tabReact": "no", + "releaseScript": "no", + "tools": [ + "ESLint" + ], + "eslintConfig": "official", + "indentation": "Tab", + "quotes": "double", + "authorName": "Al Calzone", + "authorGithub": "AlCalzone", + "authorEmail": "al@calzo.ne", + "gitRemoteProtocol": "HTTPS", + "dependabot": "yes", + "gitCommit": "no", + "defaultBranch": "main", + "license": "MIT License", + "licenseInformation": { + "type": "free", + "license": "MIT" + }, + "creatorVersion": "2.6.5" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md b/test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..895613958 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,32 @@ +--- +name: Bug report +about: Something is not working as it should +title: '' +labels: '' +assignees: '' +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '...' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots & Logfiles** +If applicable, add screenshots and logfiles to help explain your problem. + +**Versions:** + - Adapter version: + - JS-Controller version: + - Node version: + - Operating system: + +**Additional context** +Add any other context about the problem here. diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml b/test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..d7cfe5940 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: ioBroker Community + url: https://forum.iobroker.net/ + about: Please ask and answer questions here. \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.github/auto-merge.yml b/test/baselines/adapter_TS_React_OfficialESLint/.github/auto-merge.yml new file mode 100644 index 000000000..4f6d185f0 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.github/auto-merge.yml @@ -0,0 +1,17 @@ +# Configure here which dependency updates should be merged automatically. +# The recommended configuration is the following: +- match: + # Only merge patches for production dependencies + dependency_type: production + update_type: "semver:patch" +- match: + # Except for security fixes, here we allow minor patches + dependency_type: production + update_type: "security:minor" +- match: + # and development dependencies can have a minor update, too + dependency_type: development + update_type: "semver:minor" + +# The syntax is based on the legacy dependabot v1 automerged_updates syntax, see: +# https://dependabot.com/docs/config-file/#automerged_updates diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.github/dependabot.yml b/test/baselines/adapter_TS_React_OfficialESLint/.github/dependabot.yml new file mode 100644 index 000000000..c165a6a47 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.github/dependabot.yml @@ -0,0 +1,22 @@ +version: 2 +updates: + - package-ecosystem: npm + directory: "/" + schedule: + interval: monthly + time: "04:00" + timezone: Europe/Berlin + open-pull-requests-limit: 5 + assignees: + - AlCalzone + versioning-strategy: increase + + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: monthly + time: "04:00" + timezone: Europe/Berlin + open-pull-requests-limit: 5 + assignees: + - AlCalzone diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/dependabot-auto-merge.yml b/test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/dependabot-auto-merge.yml new file mode 100644 index 000000000..baeae23b5 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/dependabot-auto-merge.yml @@ -0,0 +1,27 @@ +# Automatically merge Dependabot PRs when version comparison is within the range +# that is configured in .github/auto-merge.yml + +name: Auto-Merge Dependabot PRs + +on: + # WARNING: This needs to be run in the PR base, DO NOT build untrusted code in this action + # details under https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/ + pull_request_target: + +jobs: + auto-merge: + if: github.actor == 'dependabot[bot]' + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Check if PR should be auto-merged + uses: ahmadnassri/action-dependabot-auto-merge@v2 + with: + # In order to use this, you need to go to https://github.com/settings/tokens and + # create a Personal Access Token with the permission "public_repo". + # Enter this token in your repository settings under "Secrets" and name it AUTO_MERGE_TOKEN + github-token: ${{ secrets.AUTO_MERGE_TOKEN }} + # By default, squash and merge, so Github chooses nice commit messages + command: squash and merge diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/test-and-release.yml b/test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/test-and-release.yml new file mode 100644 index 000000000..c6cf66c79 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.github/workflows/test-and-release.yml @@ -0,0 +1,96 @@ +name: Test and Release + +# Run this job on all pushes and pull requests +# as well as tags with a semantic version +on: + push: + branches: + - "main" + tags: + # normal versions + - "v[0-9]+.[0-9]+.[0-9]+" + # pre-releases + - "v[0-9]+.[0-9]+.[0-9]+-**" + pull_request: {} + +# Cancel previous PR/branch runs when a new commit is pushed +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true + +jobs: + # Performs quick checks before the expensive test runs + check-and-lint: + if: contains(github.event.head_commit.message, '[skip ci]') == false + + runs-on: ubuntu-latest + + steps: + - uses: ioBroker/testing-action-check@v1 + with: + node-version: '20.x' + # Uncomment the following line if your adapter cannot be installed using 'npm ci' + # install-command: 'npm install' + type-checking: true + lint: true + + # Runs adapter tests on all supported node versions and OSes + adapter-tests: + if: contains(github.event.head_commit.message, '[skip ci]') == false + + runs-on: ${{ matrix.os }} + strategy: + matrix: + node-version: [20.x, 22.x, 24.x] + os: [ubuntu-latest, windows-latest, macos-latest] + + steps: + - uses: ioBroker/testing-action-adapter@v1 + with: + node-version: ${{ matrix.node-version }} + os: ${{ matrix.os }} + # Uncomment the following line if your adapter cannot be installed using 'npm ci' + # install-command: 'npm install' + build: true + +# TODO: To enable automatic npm releases, create a token on npmjs.org +# Enter this token as a GitHub secret (with name NPM_TOKEN) in the repository options +# Then uncomment the following block: + +# # Deploys the final package to NPM +# deploy: +# needs: [check-and-lint, adapter-tests] +# +# # Trigger this step only when a commit on any branch is tagged with a version number +# if: | +# contains(github.event.head_commit.message, '[skip ci]') == false && +# github.event_name == 'push' && +# startsWith(github.ref, 'refs/tags/v') +# +# runs-on: ubuntu-latest +# +# # Write permissions are required to create Github releases +# permissions: +# contents: write +# +# steps: +# - uses: ioBroker/testing-action-deploy@v1 +# with: +# node-version: '20.x' +# # Uncomment the following line if your adapter cannot be installed using 'npm ci' +# # install-command: 'npm install' +# build: true +# npm-token: ${{ secrets.NPM_TOKEN }} +# github-token: ${{ secrets.GITHUB_TOKEN }} +# +# # When using Sentry for error reporting, Sentry can be informed about new releases +# # To enable create a API-Token in Sentry (User settings, API keys) +# # Enter this token as a GitHub secret (with name SENTRY_AUTH_TOKEN) in the repository options +# # Then uncomment and customize the following block: +# sentry: true +# sentry-token: ${{ secrets.SENTRY_AUTH_TOKEN }} +# sentry-project: "iobroker-test-adapter" +# sentry-version-prefix: "iobroker.test-adapter" +# sentry-sourcemap-paths: "build/ admin/build/" +# # If your sentry project is linked to a GitHub repository, you can enable the following option +# # sentry-github-integration: true diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.gitignore b/test/baselines/adapter_TS_React_OfficialESLint/.gitignore new file mode 100644 index 000000000..80c28aa9d --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.gitignore @@ -0,0 +1,18 @@ +# No dot-directories except github/vscode +.*/ +!.vscode/ +!.github/ + +*.code-workspace +node_modules +nbproject + +# npm package files +iobroker.*.tgz + +Thumbs.db +.commitinfo + +# i18n intermediate files +admin/i18n/flat.txt +admin/i18n/*/flat.txt \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.vscode/extensions.json b/test/baselines/adapter_TS_React_OfficialESLint/.vscode/extensions.json new file mode 100644 index 000000000..2c6ac5b31 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.vscode/extensions.json @@ -0,0 +1,6 @@ +{ + "recommendations": [ + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.vscode/settings.json b/test/baselines/adapter_TS_React_OfficialESLint/.vscode/settings.json new file mode 100644 index 000000000..854736cc0 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/.vscode/settings.json @@ -0,0 +1,23 @@ +{ + "typescript.tsdk": "node_modules/typescript/lib", + "eslint.enable": true, + "json.schemas": [ + { + "fileMatch": [ + "io-package.json" + ], + "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.js-controller/master/schemas/io-package.json" + }, + { + "fileMatch": [ + "admin/jsonConfig.json", + "admin/jsonConfig.json5", + "admin/jsonCustom.json", + "admin/jsonCustom.json5", + "admin/jsonTab.json", + "admin/jsonTab.json5" + ], + "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.admin/master/packages/jsonConfig/schemas/jsonConfig.json" + } + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/LICENSE b/test/baselines/adapter_TS_React_OfficialESLint/LICENSE new file mode 100644 index 000000000..27c9a624d --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2025 Al Calzone + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/test/baselines/adapter_TS_React_OfficialESLint/README.md b/test/baselines/adapter_TS_React_OfficialESLint/README.md new file mode 100644 index 000000000..4d66eab99 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/README.md @@ -0,0 +1,136 @@ +![Logo](admin/test-adapter.png) +# ioBroker.test-adapter + +[![NPM version](https://img.shields.io/npm/v/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) +[![Downloads](https://img.shields.io/npm/dm/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) +![Number of Installations](https://iobroker.live/badges/test-adapter-installed.svg) +![Current version in stable repository](https://iobroker.live/badges/test-adapter-stable.svg) + +[![NPM](https://nodei.co/npm/iobroker.test-adapter.png?downloads=true)](https://nodei.co/npm/iobroker.test-adapter/) + +**Tests:** ![Test and Release](https://github.com/AlCalzone/ioBroker.test-adapter/workflows/Test%20and%20Release/badge.svg) + +## test-adapter adapter for ioBroker + +Describe your project here + +## Developer manual +This section is intended for the developer. It can be deleted later. + +### DISCLAIMER + +Please make sure that you consider copyrights and trademarks when you use names or logos of a company and add a disclaimer to your README. +You can check other adapters for examples or ask in the developer community. Using a name or logo of a company without permission may cause legal problems for you. + +### Getting started + +You are almost done, only a few steps left: +1. Create a new repository on GitHub with the name `ioBroker.test-adapter` +1. Initialize the current folder as a new git repository: + ```bash + git init -b main + git add . + git commit -m "Initial commit" + ``` +1. Link your local repository with the one on GitHub: + ```bash + git remote add origin https://github.com/AlCalzone/ioBroker.test-adapter + ``` + +1. Push all files to the GitHub repo: + ```bash + git push origin main + ``` +1. Add a new secret under https://github.com/AlCalzone/ioBroker.test-adapter/settings/secrets. It must be named `AUTO_MERGE_TOKEN` and contain a personal access token with push access to the repository, e.g. yours. You can create a new token under https://github.com/settings/tokens. + +1. Head over to [src/main.ts](src/main.ts) and start programming! + +### Best Practices +We've collected some [best practices](https://github.com/ioBroker/ioBroker.repositories#development-and-coding-best-practices) regarding ioBroker development and coding in general. If you're new to ioBroker or Node.js, you should +check them out. If you're already experienced, you should also take a look at them - you might learn something new :) + +### Scripts in `package.json` +Several npm scripts are predefined for your convenience. You can run them using `npm run ` +| Script name | Description | +|-------------|-------------| +| `build` | Compile the TypeScript and React sources. | +| `watch` | Compile the TypeScript and React sources and watch for changes. | +| `build:ts` | Compile the TypeScript sources. | +| `watch:ts` | Compile the TypeScript sources and watch for changes. | +| `build:react` | Compile the React sources. | +| `watch:react` | Compile the React sources and watch for changes. | +| `test:ts` | Executes the tests you defined in `*.test.ts` files. | +| `test:package` | Ensures your `package.json` and `io-package.json` are valid. | +| `test:integration` | Tests the adapter startup with an actual instance of ioBroker. | +| `test` | Performs a minimal test run on package files and your tests. | +| `check` | Performs a type-check on your code (without compiling anything). | +| `lint` | Runs `ESLint` to check your code for formatting errors and potential bugs. | +| `translate` | Translates texts in your adapter to all required languages, see [`@iobroker/adapter-dev`](https://github.com/ioBroker/adapter-dev#manage-translations) for more details. | + +### Configuring the compilation +The adapter template uses [esbuild](https://esbuild.github.io/) to compile TypeScript and/or React code. You can configure many compilation settings +either in `tsconfig.json` or by changing options for the build tasks. These options are described in detail in the +[`@iobroker/adapter-dev` documentation](https://github.com/ioBroker/adapter-dev#compile-adapter-files). + +### Writing tests +When done right, testing code is invaluable, because it gives you the +confidence to change your code while knowing exactly if and when +something breaks. A good read on the topic of test-driven development +is https://hackernoon.com/introduction-to-test-driven-development-tdd-61a13bc92d92. +Although writing tests before the code might seem strange at first, but it has very +clear upsides. + +The template provides you with basic tests for the adapter startup and package files. +It is recommended that you add your own tests into the mix. + +### Publishing the adapter +Using GitHub Actions, you can enable automatic releases on npm whenever you push a new git tag that matches the form +`v..`. We **strongly recommend** that you do. The necessary steps are described in `.github/workflows/test-and-release.yml`. + +To get your adapter released in ioBroker, please refer to the documentation +of [ioBroker.repositories](https://github.com/ioBroker/ioBroker.repositories#requirements-for-adapter-to-get-added-to-the-latest-repository). + +### Test the adapter manually on a local ioBroker installation +In order to install the adapter locally without publishing, the following steps are recommended: +1. Create a tarball from your dev directory: + ```bash + npm pack + ``` +1. Upload the resulting file to your ioBroker host +1. Install it locally (The paths are different on Windows): + ```bash + cd /opt/iobroker + npm i /path/to/tarball.tgz + ``` + +For later updates, the above procedure is not necessary. Just do the following: +1. Overwrite the changed files in the adapter directory (`/opt/iobroker/node_modules/iobroker.test-adapter`) +1. Execute `iobroker upload test-adapter` on the ioBroker host + +## Changelog + +### 0.0.1 +* (Al Calzone) initial release + +## License +MIT License + +Copyright (c) 2025 Al Calzone + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/__meta__/npm_package_files.txt b/test/baselines/adapter_TS_React_OfficialESLint/__meta__/npm_package_files.txt new file mode 100644 index 000000000..49c3dedbb --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/__meta__/npm_package_files.txt @@ -0,0 +1,7 @@ +admin/index_m.html +admin/style.css +admin/test-adapter.png +io-package.json +LICENSE +package.json +README.md \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/index_m.html b/test/baselines/adapter_TS_React_OfficialESLint/admin/index_m.html new file mode 100644 index 000000000..c1e5ff148 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/index_m.html @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + +
+ + + + + + + \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/app.tsx b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/app.tsx new file mode 100644 index 000000000..b4f93806a --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/app.tsx @@ -0,0 +1,55 @@ +import React from "react"; +import { Theme, withStyles } from "@material-ui/core/styles"; + +import GenericApp from "@iobroker/adapter-react/GenericApp"; +import Settings from "./components/settings"; +import { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; +import { StyleRules } from "@material-ui/core/styles"; + +const styles = (_theme: Theme): StyleRules => ({ + root: {}, +}); + +class App extends GenericApp { + constructor(props: GenericAppProps) { + const extendedProps: GenericAppSettings = { + ...props, + encryptedFields: [], + translations: { + "en": require("./i18n/en.json"), + "de": require("./i18n/de.json"), + "ru": require("./i18n/ru.json"), + "pt": require("./i18n/pt.json"), + "nl": require("./i18n/nl.json"), + "fr": require("./i18n/fr.json"), + "it": require("./i18n/it.json"), + "es": require("./i18n/es.json"), + "pl": require("./i18n/pl.json"), + "uk": require("./i18n/uk.json"), + "zh-cn": require("./i18n/zh-cn.json"), + }, + }; + super(props, extendedProps); + } + + onConnectionReady(): void { + // executed when connection is ready + } + + render() { + if (!this.state.loaded) { + return super.render(); + } + + return ( +
+ this.updateNativeValue(attr, value)} /> + {this.renderError()} + {this.renderToast()} + {this.renderSaveCloseButtons()} +
+ ); + } +} + +export default withStyles(styles)(App); \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/components/settings.tsx b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/components/settings.tsx new file mode 100644 index 000000000..a504b063a --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/components/settings.tsx @@ -0,0 +1,139 @@ +import React from "react"; +import { withStyles } from "@material-ui/core/styles"; +import { CreateCSSProperties } from "@material-ui/core/styles/withStyles"; +import TextField from "@material-ui/core/TextField"; +import Input from "@material-ui/core/Input"; +import FormHelperText from "@material-ui/core/FormHelperText"; +import FormControl from "@material-ui/core/FormControl"; +import Select from "@material-ui/core/Select"; +import MenuItem from "@material-ui/core/MenuItem"; +import FormControlLabel from "@material-ui/core/FormControlLabel"; +import Checkbox from "@material-ui/core/Checkbox"; +import I18n from "@iobroker/adapter-react/i18n"; + +const styles = (): Record => ({ + input: { + marginTop: 0, + minWidth: 400, + }, + button: { + marginRight: 20, + }, + card: { + maxWidth: 345, + textAlign: "center", + }, + media: { + height: 180, + }, + column: { + display: "inline-block", + verticalAlign: "top", + marginRight: 20, + }, + columnLogo: { + width: 350, + marginRight: 0, + }, + columnSettings: { + width: "calc(100% - 370px)", + }, + controlElement: { + //background: "#d2d2d2", + marginBottom: 5, + }, +}); + +interface SettingsProps { + classes: Record; + native: Record; + + onChange: (attr: string, value: any) => void; +} + +interface SettingsState { + // add your state properties here + dummy?: undefined; +} + +class Settings extends React.Component { + constructor(props: SettingsProps) { + super(props); + this.state = {}; + } + + renderInput(title: AdminWord, attr: string, type: string) { + return ( + this.props.onChange(attr, e.target.value)} + margin="normal" + /> + ); + } + + renderSelect( + title: AdminWord, + attr: string, + options: { value: string; title: AdminWord }[], + style?: React.CSSProperties, + ) { + return ( + + } + > + {options.map((item) => ( + + {I18n.t(item.title)} + + ))} + + {I18n.t(title)} + + ); + } + + renderCheckbox(title: AdminWord, attr: string, style?: React.CSSProperties) { + return ( + this.props.onChange(attr, !this.props.native[attr])} + color="primary" + /> + } + label={I18n.t(title)} + /> + ); + } + + render() { + return ( +
+ {this.renderCheckbox("option1", "option1")}
+ {this.renderInput("option2", "option2", "text")} +
+ ); + } +} + +export default withStyles(styles)(Settings); \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/de.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/de.json new file mode 100644 index 000000000..d5cb3c428 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/de.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "Adaptereinstellungen für test-adapter", + "option1": "Mock translation of 'option1' to 'de'", + "option2": "Mock translation of 'option2' to 'de'" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/en.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/en.json new file mode 100644 index 000000000..f8c9603af --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/en.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "Adapter settings for test-adapter", + "option1": "option1", + "option2": "option2" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/es.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/es.json new file mode 100644 index 000000000..2b0e2d150 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/es.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "Ajustes del adaptador para test-adapter", + "option1": "Mock translation of 'option1' to 'es'", + "option2": "Mock translation of 'option2' to 'es'" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/fr.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/fr.json new file mode 100644 index 000000000..50f364d83 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/fr.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "Paramètres d'adaptateur pour test-adapter", + "option1": "Mock translation of 'option1' to 'fr'", + "option2": "Mock translation of 'option2' to 'fr'" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/i18n.d.ts b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/i18n.d.ts new file mode 100644 index 000000000..f4a769e59 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/i18n.d.ts @@ -0,0 +1,26 @@ +/* + * This file loads the translations keys from `i18n/en.json` file and overrides + * the declarations for the translate function `I18n.t` available in "@iobroker/adapter-react/i18n". + * Using these definitions it is ensured that all used translations in the React + * context are defined at least in the english translations file. + * This will add no overhead in the generated code since it just reexports the + * I18n class but with a more typed `t` function. + */ + +/* + * DO NOT add any imports or exports in this file or it will stop working! + */ + +/** + * Available words in `i18n/en.json`. + */ +declare type AdminWord = keyof typeof import("./en.json"); + +declare module "@iobroker/adapter-react/i18n" { + /** + * Translate the given string to the selected language. + * @param word The (key) word to look up the string. Has to be defined at least in `i18n/en.json`. + * @param args Optional arguments which will replace the first (second, third, ...) occurence of %s + */ + function t(word: AdminWord, ...args: string[]): string; +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/it.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/it.json new file mode 100644 index 000000000..67ef9c4dc --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/it.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "Impostazioni dell'adattatore per test-adapter", + "option1": "Mock translation of 'option1' to 'it'", + "option2": "Mock translation of 'option2' to 'it'" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/nl.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/nl.json new file mode 100644 index 000000000..d7c9cdc17 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/nl.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "Adapterinstellingen voor test-adapter", + "option1": "Mock translation of 'option1' to 'nl'", + "option2": "Mock translation of 'option2' to 'nl'" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pl.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pl.json new file mode 100644 index 000000000..24e733a7d --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pl.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "Ustawienia adaptera dla test-adapter", + "option1": "Mock translation of 'option1' to 'pl'", + "option2": "Mock translation of 'option2' to 'pl'" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pt.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pt.json new file mode 100644 index 000000000..7ad3e244b --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/pt.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "Configurações do adaptador para test-adapter", + "option1": "Mock translation of 'option1' to 'pt'", + "option2": "Mock translation of 'option2' to 'pt'" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/ru.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/ru.json new file mode 100644 index 000000000..a41d670f5 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/ru.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "Настройки адаптера для test-adapter", + "option1": "Mock translation of 'option1' to 'ru'", + "option2": "Mock translation of 'option2' to 'ru'" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/uk.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/uk.json new file mode 100644 index 000000000..6a8dc5022 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/uk.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "Налаштування адаптера для test-adapter", + "option1": "Mock translation of 'option1' to 'uk'", + "option2": "Mock translation of 'option2' to 'uk'" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/zh-cn.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/zh-cn.json new file mode 100644 index 000000000..c4ee1d90d --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/zh-cn.json @@ -0,0 +1,5 @@ +{ + "test-adapter adapter settings": "test-adapter的适配器设置", + "option1": "Mock translation of 'option1' to 'zh-cn'", + "option2": "Mock translation of 'option2' to 'zh-cn'" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/index.tsx b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/index.tsx new file mode 100644 index 000000000..e114005c8 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/index.tsx @@ -0,0 +1,25 @@ +import React from "react"; +import ReactDOM from "react-dom"; +import { MuiThemeProvider } from "@material-ui/core/styles"; +import theme from "@iobroker/adapter-react/Theme"; +import Utils from "@iobroker/adapter-react/Components/Utils"; +import App from "./app"; + +let themeName = Utils.getThemeName(); + +function build(): void { + ReactDOM.render( + + { + themeName = _theme; + build(); + }} + /> + , + document.getElementById("root"), + ); +} + +build(); \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/style.css b/test/baselines/adapter_TS_React_OfficialESLint/admin/style.css new file mode 100644 index 000000000..57d4549ee --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/style.css @@ -0,0 +1,32 @@ +/* You can delete those if you want. I just found them very helpful */ +* { + box-sizing: border-box +} +.m { + /* Don't cut off dropdowns! */ + overflow: initial; +} +.m.adapter-container, +.m.adapter-container > div.App { + /* Fix layout/scrolling issues with tabs */ + height: 100%; + width: 100%; + position: relative; +} +.m .select-wrapper + label { + /* The positioning for dropdown labels is messed up */ + transform: none !important; +} + +label > i[title] { + /* Display the help cursor for the tooltip icons and fix their positioning */ + cursor: help; + margin-left: 0.25em; +} + +.dropdown-content { + /* Don't wrap text in dropdowns */ + white-space: nowrap; +} + +/* Add your styles here */ diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/test-adapter.png b/test/baselines/adapter_TS_React_OfficialESLint/admin/test-adapter.png new file mode 100644 index 0000000000000000000000000000000000000000..094ebd97c36dbe2386a63dbce290c9ad6a148079 GIT binary patch literal 62376 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%0DGz6 zyl7fq5kK_OTB5a+j%#*OqHtMgmMFAPfM%z1y`n*X-04|c~XNtbq*59PL zf2GK(^`44LhR@%s*209os!^-XK1;F{M*IZtESo=}65To~n+-bu0+>z?fZnkVoW}$_ zstfB}2u}&7L#c0_Qg^2;} z@gmc!u&D{a-Sk8a)1*Chcx+8~_M64opd2kxtHB|6*!4W&cOrWX;Yw>1GmvfN@nFO$k&$he)RKxo(&m zmF!n>4Y$>igYg0$%*vf6XAlg%u=W>lZr*&`_JyS?Qqf|(d#rIqm-Q+bvDD6`E^Yg! zCA@nJ@*O;Lp9NU-Q#KY#ME2A^kx^vHZXmc#(4jcbti!v_B%%%N@|q{z#cN2rxd7uE zDS;G&(m*%4MYSXuokFeyQS{I{6O4v&@v{hDbb4J?0ftY(dI z%St%e+#=VPIyA5VF9`5)D3bY&tL9gpe{Xha)$de%8pXLvHB( zu+0=Wc6d1^KBxb%4tv#uqG^B_>&ZHIJQN>7!}krzA!iGj%=dq0lHKGFRI$Ah-NT8N RBrxDlMnX}%QuJ%k{{yPv^Xvcs literal 0 HcmV?d00001 diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/tsconfig.json b/test/baselines/adapter_TS_React_OfficialESLint/admin/tsconfig.json new file mode 100644 index 000000000..755c6ca7c --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/tsconfig.json @@ -0,0 +1,26 @@ +// Specialized tsconfig for the admin directory, +// includes DOM typings and configures the admin build +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "noEmit": false, + "outDir": "./build", + "sourceMap": true, + "sourceRoot": "./src", + "noImplicitAny": false, + "lib": [ + "es2018", + "DOM" + ], + "jsx": "react" + }, + "include": [ + "./**/*.ts", + "./**/*.tsx", + "../src/lib/adapter-config.d.ts" + ], + "exclude": [ + "./**/*.test.ts", + "./**/*.test.tsx" + ] +} diff --git a/test/baselines/adapter_TS_React_OfficialESLint/eslint.config.mjs b/test/baselines/adapter_TS_React_OfficialESLint/eslint.config.mjs new file mode 100644 index 000000000..574b7b36c --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/eslint.config.mjs @@ -0,0 +1,35 @@ +// ioBroker eslint template configuration file for js and ts files +// Please note that esm or react based modules need additional modules loaded. +import config from '@iobroker/eslint-config'; + +export default [ + ...config, + { + // specify files to exclude from linting here + ignores: [ + '.dev-server/', + '.vscode/', + '*.test.js', + 'test/**/*.js', + '*.config.mjs', + 'build', + 'dist', + 'admin/words.js', + 'admin/admin.d.ts', + 'admin/blockly.js', + '**/adapter-config.d.ts', + 'admin/build' + ], + }, + { + // you may disable some 'jsdoc' warnings - but using jsdoc is highly recommended + // as this improves maintainability. jsdoc warnings will not block build process. + rules: { + // 'jsdoc/require-jsdoc': 'off', + // 'jsdoc/require-param': 'off', + // 'jsdoc/require-param-description': 'off', + // 'jsdoc/require-returns-description': 'off', + // 'jsdoc/require-returns-check': 'off', + }, + }, +]; \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/io-package.json b/test/baselines/adapter_TS_React_OfficialESLint/io-package.json new file mode 100644 index 000000000..98973e67d --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/io-package.json @@ -0,0 +1,92 @@ +{ + "common": { + "name": "test-adapter", + "version": "0.0.1", + "news": { + "0.0.1": { + "en": "initial release", + "de": "Erstveröffentlichung", + "ru": "Начальная версия", + "pt": "lançamento inicial", + "nl": "Eerste uitgave", + "fr": "Première version", + "it": "Versione iniziale", + "es": "Versión inicial", + "pl": "Pierwsze wydanie", + "uk": "Початкова версія", + "zh-cn": "首次出版" + } + }, + "titleLang": { + "en": "Is used to test the creator", + "de": "Mock translation of 'Is used to test the creator' to 'de'", + "ru": "Mock translation of 'Is used to test the creator' to 'ru'", + "pt": "Mock translation of 'Is used to test the creator' to 'pt'", + "nl": "Mock translation of 'Is used to test the creator' to 'nl'", + "fr": "Mock translation of 'Is used to test the creator' to 'fr'", + "it": "Mock translation of 'Is used to test the creator' to 'it'", + "es": "Mock translation of 'Is used to test the creator' to 'es'", + "pl": "Mock translation of 'Is used to test the creator' to 'pl'", + "uk": "Mock translation of 'Is used to test the creator' to 'uk'", + "zh-cn": "Mock translation of 'Is used to test the creator' to 'zh-cn'" + }, + "desc": { + "en": "test-adapter", + "de": "Mock translation of 'test-adapter' to 'de'", + "ru": "Mock translation of 'test-adapter' to 'ru'", + "pt": "Mock translation of 'test-adapter' to 'pt'", + "nl": "Mock translation of 'test-adapter' to 'nl'", + "fr": "Mock translation of 'test-adapter' to 'fr'", + "it": "Mock translation of 'test-adapter' to 'it'", + "es": "Mock translation of 'test-adapter' to 'es'", + "pl": "Mock translation of 'test-adapter' to 'pl'", + "uk": "Mock translation of 'test-adapter' to 'uk'", + "zh-cn": "Mock translation of 'test-adapter' to 'zh-cn'" + }, + "authors": [ + "Al Calzone " + ], + "keywords": [ + "template", + "automation", + "IoT", + "integration" + ], + "licenseInformation": { + "type": "free", + "license": "MIT" + }, + "platform": "Javascript/Node.js", + "icon": "test-adapter.png", + "enabled": true, + "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", + "readme": "https://github.com/AlCalzone/ioBroker.test-adapter/blob/main/README.md", + "loglevel": "info", + "tier": 3, + "mode": "daemon", + "type": "general", + "compact": true, + "connectionType": "local", + "dataSource": "push", + "adminUI": { + "config": "materialize" + }, + "eraseOnUpload": true, + "dependencies": [ + { + "js-controller": ">=6.0.11" + } + ], + "globalDependencies": [ + { + "admin": ">=7.0.23" + } + ] + }, + "native": { + "option1": true, + "option2": "42" + }, + "objects": [], + "instanceObjects": [] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/package.json b/test/baselines/adapter_TS_React_OfficialESLint/package.json new file mode 100644 index 000000000..5b2660242 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/package.json @@ -0,0 +1,77 @@ +{ + "name": "iobroker.test-adapter", + "version": "0.0.1", + "description": "test-adapter", + "author": { + "name": "Al Calzone", + "email": "al@calzo.ne" + }, + "contributors": [], + "homepage": "https://github.com/AlCalzone/ioBroker.test-adapter", + "license": "MIT", + "keywords": [ + "template", + "automation", + "IoT", + "integration" + ], + "repository": { + "type": "git", + "url": "https://github.com/AlCalzone/ioBroker.test-adapter.git" + }, + "engines": { + "node": ">= 20" + }, + "dependencies": { + "@iobroker/adapter-core": "^3.3.2" + }, + "devDependencies": { + "@iobroker/adapter-dev": "^1.5.0", + "@iobroker/adapter-react": "2.0.22", + "@iobroker/eslint-config": "^2.2.0", + "@iobroker/testing": "^5.1.1", + "@material-ui/core": "^4.12.4", + "@tsconfig/node20": "^20.1.6", + "@types/node": "^20.19.17", + "@types/react-dom": "^17.0.26", + "@types/react": "^17.0.88", + "react-dom": "^17.0.2", + "react": "^17.0.2", + "rimraf": "^6.0.1", + "source-map-support": "^0.5.21", + "ts-node": "^10.9.2", + "typescript": "~5.9.2" + }, + "main": "build/main.js", + "files": [ + "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).{json,json5}", + "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}", + "admin/build/", + "build/", + "www/", + "io-package.json", + "LICENSE" + ], + "scripts": { + "prebuild": "rimraf build admin/build", + "build": "build-adapter all", + "watch": "build-adapter all --watch", + "prebuild:ts": "rimraf build", + "build:ts": "build-adapter ts", + "watch:ts": "build-adapter ts --watch", + "prebuild:react": "rimraf admin/build", + "build:react": "build-adapter react", + "watch:react": "build-adapter react --watch", + "test:ts": "mocha --config test/mocharc.custom.json src/**/*.test.ts", + "test:package": "mocha test/package --exit", + "test:integration": "mocha test/integration --exit", + "test": "npm run test:ts && npm run test:package", + "check": "tsc --noEmit && tsc --noEmit -p admin/tsconfig.json", + "lint": "eslint -c eslint.config.mjs .", + "translate": "translate-adapter" + }, + "bugs": { + "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" + }, + "readmeFilename": "README.md" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/prettier.config.mjs b/test/baselines/adapter_TS_React_OfficialESLint/prettier.config.mjs new file mode 100644 index 000000000..c254a96f3 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/prettier.config.mjs @@ -0,0 +1,8 @@ +// iobroker prettier configuration file +import prettierConfig from '@iobroker/eslint-config/prettier.config.mjs'; + +export default { + ...prettierConfig, + // // uncomment next line if you prefer single quotes + // singleQuote: true, +}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/src/lib/adapter-config.d.ts b/test/baselines/adapter_TS_React_OfficialESLint/src/lib/adapter-config.d.ts new file mode 100644 index 000000000..c6c8a0e2a --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/src/lib/adapter-config.d.ts @@ -0,0 +1,14 @@ +// This file extends the AdapterConfig type from "@types/iobroker" + +// Augment the globally declared type ioBroker.AdapterConfig +declare global { + namespace ioBroker { + interface AdapterConfig { + option1: boolean; + option2: string; + } + } +} + +// this is required so the above AdapterConfig is found by TypeScript / type checking +export {}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/src/main.test.ts b/test/baselines/adapter_TS_React_OfficialESLint/src/main.test.ts new file mode 100644 index 000000000..a8d538e95 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/src/main.test.ts @@ -0,0 +1,26 @@ +/** + * This is a dummy TypeScript test file using chai and mocha + * + * It's automatically excluded from npm and its build output is excluded from both git and npm. + * It is advised to test all your modules with accompanying *.test.ts-files + */ + +import { expect } from "chai"; +// import { functionToTest } from "./moduleToTest"; + +describe("module to test => function to test", () => { + // initializing logic + const expected = 5; + + it(`should return ${expected}`, () => { + const result = 5; + // assign result a value from functionToTest + expect(result).to.equal(expected); + // or using the should() syntax + result.should.equal(expected); + }); + // ... more tests => it + +}); + +// ... more test suites => describe diff --git a/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts b/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts new file mode 100644 index 000000000..d86bf77c5 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts @@ -0,0 +1,153 @@ +/* + * Created with @iobroker/create-adapter v2.6.5 + */ + +// The adapter-core module gives you access to the core ioBroker functions +// you need to create an adapter +import * as utils from "@iobroker/adapter-core"; + +// Load your modules here, e.g.: +// import * as fs from "fs"; + +class TestAdapter extends utils.Adapter { + + public constructor(options: Partial = {}) { + super({ + ...options, + name: "test-adapter", + }); + this.on("ready", this.onReady.bind(this)); + this.on("stateChange", this.onStateChange.bind(this)); + // this.on("objectChange", this.onObjectChange.bind(this)); + // this.on("message", this.onMessage.bind(this)); + this.on("unload", this.onUnload.bind(this)); + } + + /** + * Is called when databases are connected and adapter received configuration. + */ + private async onReady(): Promise { + // Initialize your adapter here + + // The adapters config (in the instance object everything under the attribute "native") is accessible via + // this.config: + this.log.debug("config option1: " + this.config.option1); + this.log.debug("config option2: " + this.config.option2); + + /* + For every state in the system there has to be also an object of type state + Here a simple template for a boolean variable named "testVariable" + Because every adapter instance uses its own unique namespace variable names can't collide with other adapters variables + */ + await this.setObjectNotExistsAsync("testVariable", { + type: "state", + common: { + name: "testVariable", + type: "boolean", + role: "indicator", + read: true, + write: true, + }, + native: {}, + }); + + // In order to get state updates, you need to subscribe to them. The following line adds a subscription for our variable we have created above. + this.subscribeStates("testVariable"); + // You can also add a subscription for multiple states. The following line watches all states starting with "lights." + // this.subscribeStates("lights.*"); + // Or, if you really must, you can also watch all states. Don't do this if you don't need to. Otherwise this will cause a lot of unnecessary load on the system: + // this.subscribeStates("*"); + + /* + setState examples + you will notice that each setState will cause the stateChange event to fire (because of above subscribeStates cmd) + */ + // the variable testVariable is set to true as command (ack=false) + await this.setState("testVariable", true); + + // same thing, but the value is flagged "ack" + // ack should be always set to true if the value is received from or acknowledged from the target system + await this.setState("testVariable", { val: true, ack: true }); + + // same thing, but the state is deleted after 30s (getState will return null afterwards) + await this.setState("testVariable", { val: true, ack: true, expire: 30 }); + + // examples for the checkPassword/checkGroup functions + const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); + this.log.info("check user admin pw iobroker: " + pwdResult); + + const gropupResult = await this.checkGroupAsync("admin", "admin"); + this.log.info("check group user admin group admin: " + gropupResult); + } + + /** + * Is called when adapter shuts down - callback has to be called under any circumstances! + */ + private onUnload(callback: () => void): void { + try { + // Here you must clear all timeouts or intervals that may still be active + // clearTimeout(timeout1); + // clearTimeout(timeout2); + // ... + // clearInterval(interval1); + + callback(); + } catch (_e) { + callback(); + } + } + + // If you need to react to object changes, uncomment the following block and the corresponding line in the constructor. + // You also need to subscribe to the objects with `this.subscribeObjects`, similar to `this.subscribeStates`. + // /** + // * Is called if a subscribed object changes + // */ + // private onObjectChange(id: string, obj: ioBroker.Object | null | undefined): void { + // if (obj) { + // // The object was changed + // this.log.info(`object ${id} changed: ${JSON.stringify(obj)}`); + // } else { + // // The object was deleted + // this.log.info(`object ${id} deleted`); + // } + // } + + /** + * Is called if a subscribed state changes + */ + private onStateChange(id: string, state: ioBroker.State | null | undefined): void { + if (state) { + // The state was changed + this.log.info(`state ${id} changed: ${state.val} (ack = ${state.ack})`); + } else { + // The state was deleted + this.log.info(`state ${id} deleted`); + } + } + + // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. + // /** + // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... + // * Using this method requires "common.messagebox" property to be set to true in io-package.json + // */ + // private onMessage(obj: ioBroker.Message): void { + // if (typeof obj === "object" && obj.message) { + // if (obj.command === "send") { + // // e.g. send email or pushover or whatever + // this.log.info("send command"); + + // // Send response in callback if required + // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); + // } + // } + // } + +} + +if (require.main !== module) { + // Export the constructor in compact mode + module.exports = (options: Partial | undefined) => new TestAdapter(options); +} else { + // otherwise start the instance directly + (() => new TestAdapter())(); +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/test/.eslintrc.json b/test/baselines/adapter_TS_React_OfficialESLint/test/.eslintrc.json new file mode 100644 index 000000000..ce6b3d62c --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/test/.eslintrc.json @@ -0,0 +1,43 @@ +{ + "root": true, + "env": { + "es6": true, + "node": true, + "mocha": true + }, + "extends": [ + "eslint:recommended" + ], + "rules": { + "indent": [ + "error", + "tab", + { + "SwitchCase": 1 + } + ], + "no-console": "off", + "no-unused-vars": [ + "error", + { + "ignoreRestSiblings": true, + "argsIgnorePattern": "^_" + } + ], + "no-var": "error", + "no-trailing-spaces": "error", + "prefer-const": "error", + "quotes": [ + "error", + "double", + { + "avoidEscape": true, + "allowTemplateLiterals": true + } + ], + "semi": [ + "error", + "always" + ] + } +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/test/integration.js b/test/baselines/adapter_TS_React_OfficialESLint/test/integration.js new file mode 100644 index 000000000..986936fac --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/test/integration.js @@ -0,0 +1,5 @@ +const path = require("path"); +const { tests } = require("@iobroker/testing"); + +// Run integration tests - See https://github.com/ioBroker/testing for a detailed explanation and further options +tests.integration(path.join(__dirname, "..")); \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/test/mocha.setup.js b/test/baselines/adapter_TS_React_OfficialESLint/test/mocha.setup.js new file mode 100644 index 000000000..b839790ff --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/test/mocha.setup.js @@ -0,0 +1,23 @@ +"use strict"; + +// Makes ts-node ignore warnings, so mocha --watch does work +process.env.TS_NODE_IGNORE_WARNINGS = "TRUE"; +// Sets the correct tsconfig for testing +process.env.TS_NODE_PROJECT = "tsconfig.json"; +// Make ts-node respect the "include" key in tsconfig.json +process.env.TS_NODE_FILES = "TRUE"; + +// Don't silently swallow unhandled rejections +process.on("unhandledRejection", (e) => { + throw e; +}); + +// enable the should interface with sinon +// and load chai-as-promised and sinon-chai by default +const sinonChai = require("sinon-chai"); +const chaiAsPromised = require("chai-as-promised"); +const { should, use } = require("chai"); + +should(); +use(sinonChai); +use(chaiAsPromised); \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/test/mocharc.custom.json b/test/baselines/adapter_TS_React_OfficialESLint/test/mocharc.custom.json new file mode 100644 index 000000000..851ed9cdc --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/test/mocharc.custom.json @@ -0,0 +1,10 @@ +{ + "require": [ + "test/mocha.setup.js", + "ts-node/register", + "source-map-support/register" + ], + "watch-files": [ + "src/**/*.test.ts" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/test/package.js b/test/baselines/adapter_TS_React_OfficialESLint/test/package.js new file mode 100644 index 000000000..3a48e0449 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/test/package.js @@ -0,0 +1,5 @@ +const path = require("path"); +const { tests } = require("@iobroker/testing"); + +// Validate the package files +tests.packageFiles(path.join(__dirname, "..")); diff --git a/test/baselines/adapter_TS_React_OfficialESLint/test/tsconfig.json b/test/baselines/adapter_TS_React_OfficialESLint/test/tsconfig.json new file mode 100644 index 000000000..3ebc81b65 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/test/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "noImplicitAny": false + }, + "include": [ + "./**/*.js" + ] +} diff --git a/test/baselines/adapter_TS_React_OfficialESLint/tsconfig.build.json b/test/baselines/adapter_TS_React_OfficialESLint/tsconfig.build.json new file mode 100644 index 000000000..1f040ce18 --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/tsconfig.build.json @@ -0,0 +1,16 @@ +// Specialized tsconfig to only compile .ts-files in the src dir +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "allowJs": false, + "checkJs": false, + "noEmit": false, + "declaration": false + }, + "include": [ + "src/**/*.ts" + ], + "exclude": [ + "src/**/*.test.ts" + ] +} diff --git a/test/baselines/adapter_TS_React_OfficialESLint/tsconfig.json b/test/baselines/adapter_TS_React_OfficialESLint/tsconfig.json new file mode 100644 index 000000000..4c80d776d --- /dev/null +++ b/test/baselines/adapter_TS_React_OfficialESLint/tsconfig.json @@ -0,0 +1,46 @@ +// Root tsconfig to set the settings and power editor support for all TS files +{ + // To update the compilation target, install a different version of @tsconfig/node... and reference it here + // https://github.com/tsconfig/bases#node-20-tsconfigjson + "extends": "@tsconfig/node20/tsconfig.json", + "compilerOptions": { + // do not compile anything, this file is just to configure type checking + // the compilation is configured in tsconfig.build.json + "noEmit": true, + + // check JS files, but do not compile them => tsconfig.build.json + "allowJs": true, + "checkJs": true, + + "noEmitOnError": true, + "outDir": "./build/", + "removeComments": false, + + // This is necessary for the automatic typing of the adapter config + "resolveJsonModule": true, + + // If you want to disable the stricter type checks (not recommended), uncomment the following line + // "strict": false, + // And enable some of those features for more fine-grained control + // "strictNullChecks": true, + // "strictPropertyInitialization": true, + // "strictBindCallApply": true, + // "noImplicitAny": true, + // "noUnusedLocals": true, + // "noUnusedParameters": true, + // Uncomment this if you want the old behavior of catch variables being `any` + // "useUnknownInCatchVariables": false, + + "sourceMap": true, + "inlineSourceMap": false + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "exclude": [ + "build/**", + "node_modules/**", + "widgets/**" + ] +} \ No newline at end of file From b0bd447d87c0d9d1db9fb19afb3e1e91df96dc3f Mon Sep 17 00:00:00 2001 From: Ingo Fischer Date: Mon, 22 Sep 2025 10:39:15 +0200 Subject: [PATCH 06/29] Update src/lib/core/questions.ts --- src/lib/core/questions.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/core/questions.ts b/src/lib/core/questions.ts index 9021e2d9c..b690938fc 100644 --- a/src/lib/core/questions.ts +++ b/src/lib/core/questions.ts @@ -714,7 +714,7 @@ export const questionGroups: QuestionGroup[] = [ initial: "official", choices: [ { - message: "Use official ioBroker ESLint config", + message: "Use official ioBroker ESLint config (includes prettier)", hint: "(recommended)", value: "official", }, From ace8dbd3b6f4bd8dd49f4b592368c42de1735258 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 22 Sep 2025 09:04:30 +0000 Subject: [PATCH 07/29] Fix prettier configuration for official ESLint config to respect indentation and quotes Co-authored-by: Apollon77 <11976694+Apollon77@users.noreply.github.com> --- templates/eslint.config.mjs.ts | 1 + templates/prettier.config.mjs.ts | 7 +- .../.create-adapter.json | 72 ++--- .../.vscode/extensions.json | 6 +- .../.vscode/settings.json | 40 +-- .../adapter_JS_OfficialESLint/README.md | 36 +-- .../admin/index_m.html | 154 ++++----- .../adapter_JS_OfficialESLint/admin/style.css | 28 +- .../adapter_JS_OfficialESLint/admin/words.js | 80 ++--- .../eslint.config.mjs | 57 ++-- .../adapter_JS_OfficialESLint/io-package.json | 178 +++++------ .../lib/adapter-config.d.ts | 12 +- .../adapter_JS_OfficialESLint/main.js | 298 +++++++++--------- .../adapter_JS_OfficialESLint/main.test.js | 26 +- .../prettier.config.mjs | 5 +- .../test/integration.js | 6 +- .../test/mocha.setup.js | 10 +- .../test/mocharc.custom.json | 16 +- .../adapter_JS_OfficialESLint/test/package.js | 6 +- .../eslint.config.mjs | 3 +- .../prettier.config.mjs | 3 +- .../eslint.config.mjs | 1 + .../prettier.config.mjs | 3 +- .../.create-adapter.json | 40 +++ .../.github/ISSUE_TEMPLATE/bug_report.md | 32 ++ .../.github/ISSUE_TEMPLATE/config.yml | 5 + .../.github/auto-merge.yml | 17 + .../.github/dependabot.yml | 22 ++ .../workflows/dependabot-auto-merge.yml | 27 ++ .../.github/workflows/test-and-release.yml | 96 ++++++ .../adapter_TS_VIS_OfficialESLint/.gitignore | 18 ++ .../.vscode/extensions.json | 6 + .../.vscode/settings.json | 23 ++ .../adapter_TS_VIS_OfficialESLint/LICENSE | 21 ++ .../adapter_TS_VIS_OfficialESLint/README.md | 132 ++++++++ .../__meta__/npm_package_files.txt | 11 + .../admin/admin.d.ts | 93 ++++++ .../admin/index_m.html | 95 ++++++ .../admin/style.css | 32 ++ .../admin/test-adapter.png | Bin 0 -> 62376 bytes .../admin/tsconfig.json | 11 + .../admin/words.js | 124 ++++++++ .../eslint.config.mjs | 35 ++ .../io-package.json | 95 ++++++ .../package.json | 69 ++++ .../prettier.config.mjs | 7 + .../src/lib/adapter-config.d.ts | 14 + .../src/main.test.ts | 26 ++ .../adapter_TS_VIS_OfficialESLint/src/main.ts | 153 +++++++++ .../test/.eslintrc.json | 43 +++ .../test/integration.js | 5 + .../test/mocha.setup.js | 23 ++ .../test/mocharc.custom.json | 10 + .../test/package.js | 5 + .../test/tsconfig.json | 9 + .../tsconfig.build.json | 16 + .../tsconfig.json | 46 +++ .../widgets/.eslintrc.json | 19 ++ .../widgets/test-adapter.html | 135 ++++++++ .../widgets/test-adapter/css/style.css | 4 + .../widgets/test-adapter/js/test-adapter.js | 76 +++++ test/create-adapter.test.ts | 14 + 62 files changed, 2134 insertions(+), 523 deletions(-) create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/.create-adapter.json create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/.github/auto-merge.yml create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/.github/dependabot.yml create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/.github/workflows/test-and-release.yml create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/.gitignore create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/.vscode/extensions.json create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/.vscode/settings.json create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/LICENSE create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/README.md create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/__meta__/npm_package_files.txt create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/admin/admin.d.ts create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/admin/index_m.html create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/admin/style.css create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/admin/test-adapter.png create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/admin/tsconfig.json create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/admin/words.js create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/eslint.config.mjs create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/io-package.json create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/package.json create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/prettier.config.mjs create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/src/lib/adapter-config.d.ts create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/src/main.test.ts create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/src/main.ts create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/test/.eslintrc.json create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/test/integration.js create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/test/mocha.setup.js create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/test/mocharc.custom.json create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/test/package.js create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/test/tsconfig.json create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/tsconfig.build.json create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/tsconfig.json create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/widgets/.eslintrc.json create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/widgets/test-adapter.html create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/widgets/test-adapter/css/style.css create mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/widgets/test-adapter/js/test-adapter.js diff --git a/templates/eslint.config.mjs.ts b/templates/eslint.config.mjs.ts index eeb51f45e..1c297cd96 100644 --- a/templates/eslint.config.mjs.ts +++ b/templates/eslint.config.mjs.ts @@ -22,6 +22,7 @@ const templateFunction: TemplateFunction = answers => { "'admin/admin.d.ts'", "'admin/blockly.js'", "'**/adapter-config.d.ts'", + "'widgets/**/*.js'", // Ignore VIS widget files ]; if (useReact) { diff --git a/templates/prettier.config.mjs.ts b/templates/prettier.config.mjs.ts index 9b0e4b654..8fe77eece 100644 --- a/templates/prettier.config.mjs.ts +++ b/templates/prettier.config.mjs.ts @@ -8,14 +8,15 @@ const templateFunction: TemplateFunction = answers => { const quotes = answers.quotes || "double"; const singleQuoteComment = quotes === "single" ? "" : "// "; + const useTabs = answers.indentation === "Tab"; const template = `// iobroker prettier configuration file import prettierConfig from '@iobroker/eslint-config/prettier.config.mjs'; export default { - ...prettierConfig, - ${singleQuoteComment}// uncomment next line if you prefer single quotes - ${singleQuoteComment}singleQuote: true, + ...prettierConfig,${useTabs ? ` + useTabs: true,` : ""}${quotes === "single" ? ` + singleQuote: true,` : ""} }; `; return template.trim(); diff --git a/test/baselines/adapter_JS_OfficialESLint/.create-adapter.json b/test/baselines/adapter_JS_OfficialESLint/.create-adapter.json index de33bfec5..06030420f 100644 --- a/test/baselines/adapter_JS_OfficialESLint/.create-adapter.json +++ b/test/baselines/adapter_JS_OfficialESLint/.create-adapter.json @@ -1,38 +1,38 @@ { - "cli": true, - "target": "directory", - "adapterName": "test-adapter", - "title": "Is used to test the creator", - "startMode": "daemon", - "features": [ - "adapter" - ], - "connectionIndicator": "no", - "connectionType": "local", - "dataSource": "push", - "adminFeatures": [], - "type": "general", - "language": "JavaScript", - "adminUi": "html", - "tabReact": "no", - "releaseScript": "no", - "tools": [ - "ESLint" - ], - "eslintConfig": "official", - "indentation": "Tab", - "quotes": "double", - "authorName": "Al Calzone", - "authorGithub": "AlCalzone", - "authorEmail": "al@calzo.ne", - "gitRemoteProtocol": "HTTPS", - "dependabot": "yes", - "gitCommit": "no", - "defaultBranch": "main", - "license": "MIT License", - "licenseInformation": { - "type": "free", - "license": "MIT" - }, - "creatorVersion": "2.6.5" + "cli": true, + "target": "directory", + "adapterName": "test-adapter", + "title": "Is used to test the creator", + "startMode": "daemon", + "features": [ + "adapter" + ], + "connectionIndicator": "no", + "connectionType": "local", + "dataSource": "push", + "adminFeatures": [], + "type": "general", + "language": "JavaScript", + "adminUi": "html", + "tabReact": "no", + "releaseScript": "no", + "tools": [ + "ESLint" + ], + "eslintConfig": "official", + "indentation": "Space (4)", + "quotes": "single", + "authorName": "Al Calzone", + "authorGithub": "AlCalzone", + "authorEmail": "al@calzo.ne", + "gitRemoteProtocol": "HTTPS", + "dependabot": "yes", + "gitCommit": "no", + "defaultBranch": "main", + "license": "MIT License", + "licenseInformation": { + "type": "free", + "license": "MIT" + }, + "creatorVersion": "2.6.5" } \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/.vscode/extensions.json b/test/baselines/adapter_JS_OfficialESLint/.vscode/extensions.json index a8d778499..897af65d7 100644 --- a/test/baselines/adapter_JS_OfficialESLint/.vscode/extensions.json +++ b/test/baselines/adapter_JS_OfficialESLint/.vscode/extensions.json @@ -1,5 +1,5 @@ { - "recommendations": [ - "dbaeumer.vscode-eslint" - ] + "recommendations": [ + "dbaeumer.vscode-eslint" + ] } \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/.vscode/settings.json b/test/baselines/adapter_JS_OfficialESLint/.vscode/settings.json index 0cb5c9286..80a86afdc 100644 --- a/test/baselines/adapter_JS_OfficialESLint/.vscode/settings.json +++ b/test/baselines/adapter_JS_OfficialESLint/.vscode/settings.json @@ -1,22 +1,22 @@ { - "eslint.enable": true, - "json.schemas": [ - { - "fileMatch": [ - "io-package.json" - ], - "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.js-controller/master/schemas/io-package.json" - }, - { - "fileMatch": [ - "admin/jsonConfig.json", - "admin/jsonConfig.json5", - "admin/jsonCustom.json", - "admin/jsonCustom.json5", - "admin/jsonTab.json", - "admin/jsonTab.json5" - ], - "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.admin/master/packages/jsonConfig/schemas/jsonConfig.json" - } - ] + "eslint.enable": true, + "json.schemas": [ + { + "fileMatch": [ + "io-package.json" + ], + "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.js-controller/master/schemas/io-package.json" + }, + { + "fileMatch": [ + "admin/jsonConfig.json", + "admin/jsonConfig.json5", + "admin/jsonCustom.json", + "admin/jsonCustom.json5", + "admin/jsonTab.json", + "admin/jsonTab.json5" + ], + "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.admin/master/packages/jsonConfig/schemas/jsonConfig.json" + } + ] } \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/README.md b/test/baselines/adapter_JS_OfficialESLint/README.md index 8a47404cf..373847c20 100644 --- a/test/baselines/adapter_JS_OfficialESLint/README.md +++ b/test/baselines/adapter_JS_OfficialESLint/README.md @@ -27,20 +27,20 @@ You can check other adapters for examples or ask in the developer community. Usi You are almost done, only a few steps left: 1. Create a new repository on GitHub with the name `ioBroker.test-adapter` 1. Initialize the current folder as a new git repository: - ```bash - git init -b main - git add . - git commit -m "Initial commit" - ``` + ```bash + git init -b main + git add . + git commit -m "Initial commit" + ``` 1. Link your local repository with the one on GitHub: - ```bash - git remote add origin https://github.com/AlCalzone/ioBroker.test-adapter - ``` + ```bash + git remote add origin https://github.com/AlCalzone/ioBroker.test-adapter + ``` 1. Push all files to the GitHub repo: - ```bash - git push origin main - ``` + ```bash + git push origin main + ``` 1. Add a new secret under https://github.com/AlCalzone/ioBroker.test-adapter/settings/secrets. It must be named `AUTO_MERGE_TOKEN` and contain a personal access token with push access to the repository, e.g. yours. You can create a new token under https://github.com/settings/tokens. 1. Head over to [main.js](main.js) and start programming! @@ -81,15 +81,15 @@ of [ioBroker.repositories](https://github.com/ioBroker/ioBroker.repositories#req ### Test the adapter manually on a local ioBroker installation In order to install the adapter locally without publishing, the following steps are recommended: 1. Create a tarball from your dev directory: - ```bash - npm pack - ``` + ```bash + npm pack + ``` 1. Upload the resulting file to your ioBroker host 1. Install it locally (The paths are different on Windows): - ```bash - cd /opt/iobroker - npm i /path/to/tarball.tgz - ``` + ```bash + cd /opt/iobroker + npm i /path/to/tarball.tgz + ``` For later updates, the above procedure is not necessary. Just do the following: 1. Overwrite the changed files in the adapter directory (`/opt/iobroker/node_modules/iobroker.test-adapter`) diff --git a/test/baselines/adapter_JS_OfficialESLint/admin/index_m.html b/test/baselines/adapter_JS_OfficialESLint/admin/index_m.html index f11dc3c14..ad15ac8ca 100644 --- a/test/baselines/adapter_JS_OfficialESLint/admin/index_m.html +++ b/test/baselines/adapter_JS_OfficialESLint/admin/index_m.html @@ -2,93 +2,93 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + -
+
-
-
- -
-
+
+
+ +
+
- + - -
-
- - -
+ +
+
+ + +
-
- - -
-
+
+ + +
+
-
+
diff --git a/test/baselines/adapter_JS_OfficialESLint/admin/style.css b/test/baselines/adapter_JS_OfficialESLint/admin/style.css index 57d4549ee..a56351f03 100644 --- a/test/baselines/adapter_JS_OfficialESLint/admin/style.css +++ b/test/baselines/adapter_JS_OfficialESLint/admin/style.css @@ -1,32 +1,32 @@ /* You can delete those if you want. I just found them very helpful */ * { - box-sizing: border-box + box-sizing: border-box } .m { - /* Don't cut off dropdowns! */ - overflow: initial; + /* Don't cut off dropdowns! */ + overflow: initial; } .m.adapter-container, .m.adapter-container > div.App { - /* Fix layout/scrolling issues with tabs */ - height: 100%; - width: 100%; - position: relative; + /* Fix layout/scrolling issues with tabs */ + height: 100%; + width: 100%; + position: relative; } .m .select-wrapper + label { - /* The positioning for dropdown labels is messed up */ - transform: none !important; + /* The positioning for dropdown labels is messed up */ + transform: none !important; } label > i[title] { - /* Display the help cursor for the tooltip icons and fix their positioning */ - cursor: help; - margin-left: 0.25em; + /* Display the help cursor for the tooltip icons and fix their positioning */ + cursor: help; + margin-left: 0.25em; } .dropdown-content { - /* Don't wrap text in dropdowns */ - white-space: nowrap; + /* Don't wrap text in dropdowns */ + white-space: nowrap; } /* Add your styles here */ diff --git a/test/baselines/adapter_JS_OfficialESLint/admin/words.js b/test/baselines/adapter_JS_OfficialESLint/admin/words.js index 4517fef89..adcc82d00 100644 --- a/test/baselines/adapter_JS_OfficialESLint/admin/words.js +++ b/test/baselines/adapter_JS_OfficialESLint/admin/words.js @@ -1,46 +1,46 @@ /* eslint no-unused-vars: off */ /* eslint no-global-assign: off */ /* global systemDictionary */ -"use strict"; +'use strict'; systemDictionary = { - "test-adapter adapter settings": { - "en": "Adapter settings for test-adapter", - "de": "Adaptereinstellungen für test-adapter", - "ru": "Настройки адаптера для test-adapter", - "pt": "Configurações do adaptador para test-adapter", - "nl": "Adapterinstellingen voor test-adapter", - "fr": "Paramètres d'adaptateur pour test-adapter", - "it": "Impostazioni dell'adattatore per test-adapter", - "es": "Ajustes del adaptador para test-adapter", - "pl": "Ustawienia adaptera dla test-adapter", - "uk": "Налаштування адаптера для test-adapter", - "zh-cn": "test-adapter的适配器设置" - }, - "option1": { - "en": "option1", - "de": "Mock translation of 'option1' to 'de'", - "ru": "Mock translation of 'option1' to 'ru'", - "pt": "Mock translation of 'option1' to 'pt'", - "nl": "Mock translation of 'option1' to 'nl'", - "fr": "Mock translation of 'option1' to 'fr'", - "it": "Mock translation of 'option1' to 'it'", - "es": "Mock translation of 'option1' to 'es'", - "pl": "Mock translation of 'option1' to 'pl'", - "uk": "Mock translation of 'option1' to 'uk'", - "zh-cn": "Mock translation of 'option1' to 'zh-cn'" - }, - "option2": { - "en": "option2", - "de": "Mock translation of 'option2' to 'de'", - "ru": "Mock translation of 'option2' to 'ru'", - "pt": "Mock translation of 'option2' to 'pt'", - "nl": "Mock translation of 'option2' to 'nl'", - "fr": "Mock translation of 'option2' to 'fr'", - "it": "Mock translation of 'option2' to 'it'", - "es": "Mock translation of 'option2' to 'es'", - "pl": "Mock translation of 'option2' to 'pl'", - "uk": "Mock translation of 'option2' to 'uk'", - "zh-cn": "Mock translation of 'option2' to 'zh-cn'" - } + 'test-adapter adapter settings': { + 'en': 'Adapter settings for test-adapter', + 'de': 'Adaptereinstellungen für test-adapter', + 'ru': 'Настройки адаптера для test-adapter', + 'pt': 'Configurações do adaptador para test-adapter', + 'nl': 'Adapterinstellingen voor test-adapter', + 'fr': "Paramètres d'adaptateur pour test-adapter", + 'it': "Impostazioni dell'adattatore per test-adapter", + 'es': 'Ajustes del adaptador para test-adapter', + 'pl': 'Ustawienia adaptera dla test-adapter', + 'uk': 'Налаштування адаптера для test-adapter', + 'zh-cn': 'test-adapter的适配器设置' + }, + 'option1': { + 'en': 'option1', + 'de': "Mock translation of 'option1' to 'de'", + 'ru': "Mock translation of 'option1' to 'ru'", + 'pt': "Mock translation of 'option1' to 'pt'", + 'nl': "Mock translation of 'option1' to 'nl'", + 'fr': "Mock translation of 'option1' to 'fr'", + 'it': "Mock translation of 'option1' to 'it'", + 'es': "Mock translation of 'option1' to 'es'", + 'pl': "Mock translation of 'option1' to 'pl'", + 'uk': "Mock translation of 'option1' to 'uk'", + 'zh-cn': "Mock translation of 'option1' to 'zh-cn'" + }, + 'option2': { + 'en': 'option2', + 'de': "Mock translation of 'option2' to 'de'", + 'ru': "Mock translation of 'option2' to 'ru'", + 'pt': "Mock translation of 'option2' to 'pt'", + 'nl': "Mock translation of 'option2' to 'nl'", + 'fr': "Mock translation of 'option2' to 'fr'", + 'it': "Mock translation of 'option2' to 'it'", + 'es': "Mock translation of 'option2' to 'es'", + 'pl': "Mock translation of 'option2' to 'pl'", + 'uk': "Mock translation of 'option2' to 'uk'", + 'zh-cn': "Mock translation of 'option2' to 'zh-cn'" + } }; \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/eslint.config.mjs b/test/baselines/adapter_JS_OfficialESLint/eslint.config.mjs index 9bf3e1891..e8c0f53f1 100644 --- a/test/baselines/adapter_JS_OfficialESLint/eslint.config.mjs +++ b/test/baselines/adapter_JS_OfficialESLint/eslint.config.mjs @@ -3,32 +3,33 @@ import config from '@iobroker/eslint-config'; export default [ - ...config, - { - // specify files to exclude from linting here - ignores: [ - '.dev-server/', - '.vscode/', - '*.test.js', - 'test/**/*.js', - '*.config.mjs', - 'build', - 'dist', - 'admin/words.js', - 'admin/admin.d.ts', - 'admin/blockly.js', - '**/adapter-config.d.ts' - ], - }, - { - // you may disable some 'jsdoc' warnings - but using jsdoc is highly recommended - // as this improves maintainability. jsdoc warnings will not block build process. - rules: { - // 'jsdoc/require-jsdoc': 'off', - // 'jsdoc/require-param': 'off', - // 'jsdoc/require-param-description': 'off', - // 'jsdoc/require-returns-description': 'off', - // 'jsdoc/require-returns-check': 'off', - }, - }, + ...config, + { + // specify files to exclude from linting here + ignores: [ + '.dev-server/', + '.vscode/', + '*.test.js', + 'test/**/*.js', + '*.config.mjs', + 'build', + 'dist', + 'admin/words.js', + 'admin/admin.d.ts', + 'admin/blockly.js', + '**/adapter-config.d.ts', + 'widgets/**/*.js' + ], + }, + { + // you may disable some 'jsdoc' warnings - but using jsdoc is highly recommended + // as this improves maintainability. jsdoc warnings will not block build process. + rules: { + // 'jsdoc/require-jsdoc': 'off', + // 'jsdoc/require-param': 'off', + // 'jsdoc/require-param-description': 'off', + // 'jsdoc/require-returns-description': 'off', + // 'jsdoc/require-returns-check': 'off', + }, + }, ]; \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/io-package.json b/test/baselines/adapter_JS_OfficialESLint/io-package.json index 53cff6aab..a1fc4be24 100644 --- a/test/baselines/adapter_JS_OfficialESLint/io-package.json +++ b/test/baselines/adapter_JS_OfficialESLint/io-package.json @@ -1,91 +1,91 @@ { - "common": { - "name": "test-adapter", - "version": "0.0.1", - "news": { - "0.0.1": { - "en": "initial release", - "de": "Erstveröffentlichung", - "ru": "Начальная версия", - "pt": "lançamento inicial", - "nl": "Eerste uitgave", - "fr": "Première version", - "it": "Versione iniziale", - "es": "Versión inicial", - "pl": "Pierwsze wydanie", - "uk": "Початкова версія", - "zh-cn": "首次出版" - } - }, - "titleLang": { - "en": "Is used to test the creator", - "de": "Mock translation of 'Is used to test the creator' to 'de'", - "ru": "Mock translation of 'Is used to test the creator' to 'ru'", - "pt": "Mock translation of 'Is used to test the creator' to 'pt'", - "nl": "Mock translation of 'Is used to test the creator' to 'nl'", - "fr": "Mock translation of 'Is used to test the creator' to 'fr'", - "it": "Mock translation of 'Is used to test the creator' to 'it'", - "es": "Mock translation of 'Is used to test the creator' to 'es'", - "pl": "Mock translation of 'Is used to test the creator' to 'pl'", - "uk": "Mock translation of 'Is used to test the creator' to 'uk'", - "zh-cn": "Mock translation of 'Is used to test the creator' to 'zh-cn'" - }, - "desc": { - "en": "test-adapter", - "de": "Mock translation of 'test-adapter' to 'de'", - "ru": "Mock translation of 'test-adapter' to 'ru'", - "pt": "Mock translation of 'test-adapter' to 'pt'", - "nl": "Mock translation of 'test-adapter' to 'nl'", - "fr": "Mock translation of 'test-adapter' to 'fr'", - "it": "Mock translation of 'test-adapter' to 'it'", - "es": "Mock translation of 'test-adapter' to 'es'", - "pl": "Mock translation of 'test-adapter' to 'pl'", - "uk": "Mock translation of 'test-adapter' to 'uk'", - "zh-cn": "Mock translation of 'test-adapter' to 'zh-cn'" - }, - "authors": [ - "Al Calzone " - ], - "keywords": [ - "template", - "automation", - "IoT", - "integration" - ], - "licenseInformation": { - "type": "free", - "license": "MIT" - }, - "platform": "Javascript/Node.js", - "icon": "test-adapter.png", - "enabled": true, - "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", - "readme": "https://github.com/AlCalzone/ioBroker.test-adapter/blob/main/README.md", - "loglevel": "info", - "tier": 3, - "mode": "daemon", - "type": "general", - "compact": true, - "connectionType": "local", - "dataSource": "push", - "adminUI": { - "config": "materialize" - }, - "dependencies": [ - { - "js-controller": ">=6.0.11" - } - ], - "globalDependencies": [ - { - "admin": ">=7.0.23" - } - ] - }, - "native": { - "option1": true, - "option2": "42" - }, - "objects": [], - "instanceObjects": [] + "common": { + "name": "test-adapter", + "version": "0.0.1", + "news": { + "0.0.1": { + "en": "initial release", + "de": "Erstveröffentlichung", + "ru": "Начальная версия", + "pt": "lançamento inicial", + "nl": "Eerste uitgave", + "fr": "Première version", + "it": "Versione iniziale", + "es": "Versión inicial", + "pl": "Pierwsze wydanie", + "uk": "Початкова версія", + "zh-cn": "首次出版" + } + }, + "titleLang": { + "en": "Is used to test the creator", + "de": "Mock translation of 'Is used to test the creator' to 'de'", + "ru": "Mock translation of 'Is used to test the creator' to 'ru'", + "pt": "Mock translation of 'Is used to test the creator' to 'pt'", + "nl": "Mock translation of 'Is used to test the creator' to 'nl'", + "fr": "Mock translation of 'Is used to test the creator' to 'fr'", + "it": "Mock translation of 'Is used to test the creator' to 'it'", + "es": "Mock translation of 'Is used to test the creator' to 'es'", + "pl": "Mock translation of 'Is used to test the creator' to 'pl'", + "uk": "Mock translation of 'Is used to test the creator' to 'uk'", + "zh-cn": "Mock translation of 'Is used to test the creator' to 'zh-cn'" + }, + "desc": { + "en": "test-adapter", + "de": "Mock translation of 'test-adapter' to 'de'", + "ru": "Mock translation of 'test-adapter' to 'ru'", + "pt": "Mock translation of 'test-adapter' to 'pt'", + "nl": "Mock translation of 'test-adapter' to 'nl'", + "fr": "Mock translation of 'test-adapter' to 'fr'", + "it": "Mock translation of 'test-adapter' to 'it'", + "es": "Mock translation of 'test-adapter' to 'es'", + "pl": "Mock translation of 'test-adapter' to 'pl'", + "uk": "Mock translation of 'test-adapter' to 'uk'", + "zh-cn": "Mock translation of 'test-adapter' to 'zh-cn'" + }, + "authors": [ + "Al Calzone " + ], + "keywords": [ + "template", + "automation", + "IoT", + "integration" + ], + "licenseInformation": { + "type": "free", + "license": "MIT" + }, + "platform": "Javascript/Node.js", + "icon": "test-adapter.png", + "enabled": true, + "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", + "readme": "https://github.com/AlCalzone/ioBroker.test-adapter/blob/main/README.md", + "loglevel": "info", + "tier": 3, + "mode": "daemon", + "type": "general", + "compact": true, + "connectionType": "local", + "dataSource": "push", + "adminUI": { + "config": "materialize" + }, + "dependencies": [ + { + "js-controller": ">=6.0.11" + } + ], + "globalDependencies": [ + { + "admin": ">=7.0.23" + } + ] + }, + "native": { + "option1": true, + "option2": "42" + }, + "objects": [], + "instanceObjects": [] } \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/lib/adapter-config.d.ts b/test/baselines/adapter_JS_OfficialESLint/lib/adapter-config.d.ts index ae458daf3..e0fbfa96b 100644 --- a/test/baselines/adapter_JS_OfficialESLint/lib/adapter-config.d.ts +++ b/test/baselines/adapter_JS_OfficialESLint/lib/adapter-config.d.ts @@ -2,17 +2,17 @@ // using the actual properties present in io-package.json // in order to provide typings for adapter.config properties -import { native } from "../io-package.json"; +import { native } from '../io-package.json'; type _AdapterConfig = typeof native; // Augment the globally declared type ioBroker.AdapterConfig declare global { - namespace ioBroker { - interface AdapterConfig extends _AdapterConfig { - // Do not enter anything here! - } - } + namespace ioBroker { + interface AdapterConfig extends _AdapterConfig { + // Do not enter anything here! + } + } } // this is required so the above AdapterConfig is found by TypeScript / type checking diff --git a/test/baselines/adapter_JS_OfficialESLint/main.js b/test/baselines/adapter_JS_OfficialESLint/main.js index 723fa962b..e306c1ee3 100644 --- a/test/baselines/adapter_JS_OfficialESLint/main.js +++ b/test/baselines/adapter_JS_OfficialESLint/main.js @@ -1,4 +1,4 @@ -"use strict"; +'use strict'; /* * Created with @iobroker/create-adapter v2.6.5 @@ -6,162 +6,162 @@ // The adapter-core module gives you access to the core ioBroker functions // you need to create an adapter -const utils = require("@iobroker/adapter-core"); +const utils = require('@iobroker/adapter-core'); // Load your modules here, e.g.: -// const fs = require("fs"); +// const fs = require('fs'); class TestAdapter extends utils.Adapter { - /** - * @param {Partial} [options={}] - */ - constructor(options) { - super({ - ...options, - name: "test-adapter", - }); - this.on("ready", this.onReady.bind(this)); - this.on("stateChange", this.onStateChange.bind(this)); - // this.on("objectChange", this.onObjectChange.bind(this)); - // this.on("message", this.onMessage.bind(this)); - this.on("unload", this.onUnload.bind(this)); - } - - /** - * Is called when databases are connected and adapter received configuration. - */ - async onReady() { - // Initialize your adapter here - - // The adapters config (in the instance object everything under the attribute "native") is accessible via - // this.config: - this.log.debug("config option1: " + this.config.option1); - this.log.debug("config option2: " + this.config.option2); - - /* - For every state in the system there has to be also an object of type state - Here a simple template for a boolean variable named "testVariable" - Because every adapter instance uses its own unique namespace variable names can't collide with other adapters variables - */ - await this.setObjectNotExistsAsync("testVariable", { - type: "state", - common: { - name: "testVariable", - type: "boolean", - role: "indicator", - read: true, - write: true, - }, - native: {}, - }); - - // In order to get state updates, you need to subscribe to them. The following line adds a subscription for our variable we have created above. - this.subscribeStates("testVariable"); - // You can also add a subscription for multiple states. The following line watches all states starting with "lights." - // this.subscribeStates("lights.*"); - // Or, if you really must, you can also watch all states. Don't do this if you don't need to. Otherwise this will cause a lot of unnecessary load on the system: - // this.subscribeStates("*"); - - /* - setState examples - you will notice that each setState will cause the stateChange event to fire (because of above subscribeStates cmd) - */ - // the variable testVariable is set to true as command (ack=false) - await this.setState("testVariable", true); - - // same thing, but the value is flagged "ack" - // ack should be always set to true if the value is received from or acknowledged from the target system - await this.setState("testVariable", { val: true, ack: true }); - - // same thing, but the state is deleted after 30s (getState will return null afterwards) - await this.setState("testVariable", { val: true, ack: true, expire: 30 }); - - // examples for the checkPassword/checkGroup functions - const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: " + pwdResult); - - const gropupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: " + gropupResult); - } - - /** - * Is called when adapter shuts down - callback has to be called under any circumstances! - * @param {() => void} callback - */ - onUnload(callback) { - try { - // Here you must clear all timeouts or intervals that may still be active - // clearTimeout(timeout1); - // clearTimeout(timeout2); - // ... - // clearInterval(interval1); - - callback(); - } catch (_e) { - callback(); - } - } - - // If you need to react to object changes, uncomment the following block and the corresponding line in the constructor. - // You also need to subscribe to the objects with `this.subscribeObjects`, similar to `this.subscribeStates`. - // /** - // * Is called if a subscribed object changes - // * @param {string} id - // * @param {ioBroker.Object | null | undefined} obj - // */ - // onObjectChange(id, obj) { - // if (obj) { - // // The object was changed - // this.log.info(`object ${id} changed: ${JSON.stringify(obj)}`); - // } else { - // // The object was deleted - // this.log.info(`object ${id} deleted`); - // } - // } - - /** - * Is called if a subscribed state changes - * @param {string} id - * @param {ioBroker.State | null | undefined} state - */ - onStateChange(id, state) { - if (state) { - // The state was changed - this.log.info(`state ${id} changed: ${state.val} (ack = ${state.ack})`); - } else { - // The state was deleted - this.log.info(`state ${id} deleted`); - } - } - - // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. - // /** - // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... - // * Using this method requires "common.messagebox" property to be set to true in io-package.json - // * @param {ioBroker.Message} obj - // */ - // onMessage(obj) { - // if (typeof obj === "object" && obj.message) { - // if (obj.command === "send") { - // // e.g. send email or pushover or whatever - // this.log.info("send command"); - - // // Send response in callback if required - // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); - // } - // } - // } + /** + * @param {Partial} [options={}] + */ + constructor(options) { + super({ + ...options, + name: 'test-adapter', + }); + this.on('ready', this.onReady.bind(this)); + this.on('stateChange', this.onStateChange.bind(this)); + // this.on('objectChange', this.onObjectChange.bind(this)); + // this.on('message', this.onMessage.bind(this)); + this.on('unload', this.onUnload.bind(this)); + } + + /** + * Is called when databases are connected and adapter received configuration. + */ + async onReady() { + // Initialize your adapter here + + // The adapters config (in the instance object everything under the attribute "native") is accessible via + // this.config: + this.log.debug('config option1: ' + this.config.option1); + this.log.debug('config option2: ' + this.config.option2); + + /* + For every state in the system there has to be also an object of type state + Here a simple template for a boolean variable named "testVariable" + Because every adapter instance uses its own unique namespace variable names can't collide with other adapters variables + */ + await this.setObjectNotExistsAsync('testVariable', { + type: 'state', + common: { + name: 'testVariable', + type: 'boolean', + role: 'indicator', + read: true, + write: true, + }, + native: {}, + }); + + // In order to get state updates, you need to subscribe to them. The following line adds a subscription for our variable we have created above. + this.subscribeStates('testVariable'); + // You can also add a subscription for multiple states. The following line watches all states starting with "lights." + // this.subscribeStates('lights.*'); + // Or, if you really must, you can also watch all states. Don't do this if you don't need to. Otherwise this will cause a lot of unnecessary load on the system: + // this.subscribeStates('*'); + + /* + setState examples + you will notice that each setState will cause the stateChange event to fire (because of above subscribeStates cmd) + */ + // the variable testVariable is set to true as command (ack=false) + await this.setState('testVariable', true); + + // same thing, but the value is flagged "ack" + // ack should be always set to true if the value is received from or acknowledged from the target system + await this.setState('testVariable', { val: true, ack: true }); + + // same thing, but the state is deleted after 30s (getState will return null afterwards) + await this.setState('testVariable', { val: true, ack: true, expire: 30 }); + + // examples for the checkPassword/checkGroup functions + const pwdResult = await this.checkPasswordAsync('admin', 'iobroker'); + this.log.info('check user admin pw iobroker: ' + pwdResult); + + const gropupResult = await this.checkGroupAsync('admin', 'admin'); + this.log.info('check group user admin group admin: ' + gropupResult); + } + + /** + * Is called when adapter shuts down - callback has to be called under any circumstances! + * @param {() => void} callback + */ + onUnload(callback) { + try { + // Here you must clear all timeouts or intervals that may still be active + // clearTimeout(timeout1); + // clearTimeout(timeout2); + // ... + // clearInterval(interval1); + + callback(); + } catch (_e) { + callback(); + } + } + + // If you need to react to object changes, uncomment the following block and the corresponding line in the constructor. + // You also need to subscribe to the objects with `this.subscribeObjects`, similar to `this.subscribeStates`. + // /** + // * Is called if a subscribed object changes + // * @param {string} id + // * @param {ioBroker.Object | null | undefined} obj + // */ + // onObjectChange(id, obj) { + // if (obj) { + // // The object was changed + // this.log.info(`object ${id} changed: ${JSON.stringify(obj)}`); + // } else { + // // The object was deleted + // this.log.info(`object ${id} deleted`); + // } + // } + + /** + * Is called if a subscribed state changes + * @param {string} id + * @param {ioBroker.State | null | undefined} state + */ + onStateChange(id, state) { + if (state) { + // The state was changed + this.log.info(`state ${id} changed: ${state.val} (ack = ${state.ack})`); + } else { + // The state was deleted + this.log.info(`state ${id} deleted`); + } + } + + // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. + // /** + // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... + // * Using this method requires "common.messagebox" property to be set to true in io-package.json + // * @param {ioBroker.Message} obj + // */ + // onMessage(obj) { + // if (typeof obj === 'object' && obj.message) { + // if (obj.command === 'send') { + // // e.g. send email or pushover or whatever + // this.log.info('send command'); + + // // Send response in callback if required + // if (obj.callback) this.sendTo(obj.from, obj.command, 'Message received', obj.callback); + // } + // } + // } } if (require.main !== module) { - // Export the constructor in compact mode - /** - * @param {Partial} [options={}] - */ - module.exports = (options) => new TestAdapter(options); + // Export the constructor in compact mode + /** + * @param {Partial} [options={}] + */ + module.exports = (options) => new TestAdapter(options); } else { - // otherwise start the instance directly - new TestAdapter(); + // otherwise start the instance directly + new TestAdapter(); } \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/main.test.js b/test/baselines/adapter_JS_OfficialESLint/main.test.js index 307b4c62f..5dc6ee4a6 100644 --- a/test/baselines/adapter_JS_OfficialESLint/main.test.js +++ b/test/baselines/adapter_JS_OfficialESLint/main.test.js @@ -1,4 +1,4 @@ -"use strict"; +'use strict'; /** * This is a dummy TypeScript test file using chai and mocha @@ -9,21 +9,21 @@ // tslint:disable:no-unused-expression -const { expect } = require("chai"); +const { expect } = require('chai'); // import { functionToTest } from "./moduleToTest"; -describe("module to test => function to test", () => { - // initializing logic - const expected = 5; +describe('module to test => function to test', () => { + // initializing logic + const expected = 5; - it(`should return ${expected}`, () => { - const result = 5; - // assign result a value from functionToTest - expect(result).to.equal(expected); - // or using the should() syntax - result.should.equal(expected); - }); - // ... more tests => it + it(`should return ${expected}`, () => { + const result = 5; + // assign result a value from functionToTest + expect(result).to.equal(expected); + // or using the should() syntax + result.should.equal(expected); + }); + // ... more tests => it }); diff --git a/test/baselines/adapter_JS_OfficialESLint/prettier.config.mjs b/test/baselines/adapter_JS_OfficialESLint/prettier.config.mjs index c254a96f3..e2b1d29c6 100644 --- a/test/baselines/adapter_JS_OfficialESLint/prettier.config.mjs +++ b/test/baselines/adapter_JS_OfficialESLint/prettier.config.mjs @@ -2,7 +2,6 @@ import prettierConfig from '@iobroker/eslint-config/prettier.config.mjs'; export default { - ...prettierConfig, - // // uncomment next line if you prefer single quotes - // singleQuote: true, + ...prettierConfig, + singleQuote: true, }; \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/test/integration.js b/test/baselines/adapter_JS_OfficialESLint/test/integration.js index 986936fac..fa6db2e85 100644 --- a/test/baselines/adapter_JS_OfficialESLint/test/integration.js +++ b/test/baselines/adapter_JS_OfficialESLint/test/integration.js @@ -1,5 +1,5 @@ -const path = require("path"); -const { tests } = require("@iobroker/testing"); +const path = require('path'); +const { tests } = require('@iobroker/testing'); // Run integration tests - See https://github.com/ioBroker/testing for a detailed explanation and further options -tests.integration(path.join(__dirname, "..")); \ No newline at end of file +tests.integration(path.join(__dirname, '..')); \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/test/mocha.setup.js b/test/baselines/adapter_JS_OfficialESLint/test/mocha.setup.js index b3b963114..15b9051f5 100644 --- a/test/baselines/adapter_JS_OfficialESLint/test/mocha.setup.js +++ b/test/baselines/adapter_JS_OfficialESLint/test/mocha.setup.js @@ -1,13 +1,13 @@ // Don't silently swallow unhandled rejections -process.on("unhandledRejection", (e) => { - throw e; +process.on('unhandledRejection', (e) => { + throw e; }); // enable the should interface with sinon // and load chai-as-promised and sinon-chai by default -const sinonChai = require("sinon-chai"); -const chaiAsPromised = require("chai-as-promised"); -const { should, use } = require("chai"); +const sinonChai = require('sinon-chai'); +const chaiAsPromised = require('chai-as-promised'); +const { should, use } = require('chai'); should(); use(sinonChai); diff --git a/test/baselines/adapter_JS_OfficialESLint/test/mocharc.custom.json b/test/baselines/adapter_JS_OfficialESLint/test/mocharc.custom.json index 6e49c601b..2e317d599 100644 --- a/test/baselines/adapter_JS_OfficialESLint/test/mocharc.custom.json +++ b/test/baselines/adapter_JS_OfficialESLint/test/mocharc.custom.json @@ -1,10 +1,10 @@ { - "require": [ - "test/mocha.setup.js" - ], - "watch-files": [ - "!(node_modules|test)/**/*.test.js", - "*.test.js", - "test/**/test!(PackageFiles|Startup).js" - ] + "require": [ + "test/mocha.setup.js" + ], + "watch-files": [ + "!(node_modules|test)/**/*.test.js", + "*.test.js", + "test/**/test!(PackageFiles|Startup).js" + ] } \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/test/package.js b/test/baselines/adapter_JS_OfficialESLint/test/package.js index 3a48e0449..38eacc857 100644 --- a/test/baselines/adapter_JS_OfficialESLint/test/package.js +++ b/test/baselines/adapter_JS_OfficialESLint/test/package.js @@ -1,5 +1,5 @@ -const path = require("path"); -const { tests } = require("@iobroker/testing"); +const path = require('path'); +const { tests } = require('@iobroker/testing'); // Validate the package files -tests.packageFiles(path.join(__dirname, "..")); +tests.packageFiles(path.join(__dirname, '..')); diff --git a/test/baselines/adapter_TS_OfficialESLint/eslint.config.mjs b/test/baselines/adapter_TS_OfficialESLint/eslint.config.mjs index 9bf3e1891..5224defc7 100644 --- a/test/baselines/adapter_TS_OfficialESLint/eslint.config.mjs +++ b/test/baselines/adapter_TS_OfficialESLint/eslint.config.mjs @@ -17,7 +17,8 @@ export default [ 'admin/words.js', 'admin/admin.d.ts', 'admin/blockly.js', - '**/adapter-config.d.ts' + '**/adapter-config.d.ts', + 'widgets/**/*.js' ], }, { diff --git a/test/baselines/adapter_TS_OfficialESLint/prettier.config.mjs b/test/baselines/adapter_TS_OfficialESLint/prettier.config.mjs index c254a96f3..0eef8ef1a 100644 --- a/test/baselines/adapter_TS_OfficialESLint/prettier.config.mjs +++ b/test/baselines/adapter_TS_OfficialESLint/prettier.config.mjs @@ -3,6 +3,5 @@ import prettierConfig from '@iobroker/eslint-config/prettier.config.mjs'; export default { ...prettierConfig, - // // uncomment next line if you prefer single quotes - // singleQuote: true, + useTabs: true, }; \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/eslint.config.mjs b/test/baselines/adapter_TS_React_OfficialESLint/eslint.config.mjs index 574b7b36c..e5b668231 100644 --- a/test/baselines/adapter_TS_React_OfficialESLint/eslint.config.mjs +++ b/test/baselines/adapter_TS_React_OfficialESLint/eslint.config.mjs @@ -18,6 +18,7 @@ export default [ 'admin/admin.d.ts', 'admin/blockly.js', '**/adapter-config.d.ts', + 'widgets/**/*.js', 'admin/build' ], }, diff --git a/test/baselines/adapter_TS_React_OfficialESLint/prettier.config.mjs b/test/baselines/adapter_TS_React_OfficialESLint/prettier.config.mjs index c254a96f3..0eef8ef1a 100644 --- a/test/baselines/adapter_TS_React_OfficialESLint/prettier.config.mjs +++ b/test/baselines/adapter_TS_React_OfficialESLint/prettier.config.mjs @@ -3,6 +3,5 @@ import prettierConfig from '@iobroker/eslint-config/prettier.config.mjs'; export default { ...prettierConfig, - // // uncomment next line if you prefer single quotes - // singleQuote: true, + useTabs: true, }; \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/.create-adapter.json b/test/baselines/adapter_TS_VIS_OfficialESLint/.create-adapter.json new file mode 100644 index 000000000..6cc3dd75b --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/.create-adapter.json @@ -0,0 +1,40 @@ +{ + "cli": true, + "target": "directory", + "adapterName": "test-adapter", + "title": "Is used to test the creator", + "startMode": "daemon", + "features": [ + "adapter", + "vis" + ], + "connectionIndicator": "no", + "connectionType": "local", + "dataSource": "push", + "adminFeatures": [], + "type": "general", + "language": "TypeScript", + "adminUi": "html", + "tabReact": "no", + "releaseScript": "no", + "tools": [ + "ESLint" + ], + "eslintConfig": "official", + "indentation": "Tab", + "quotes": "double", + "authorName": "Al Calzone", + "authorGithub": "AlCalzone", + "authorEmail": "al@calzo.ne", + "gitRemoteProtocol": "HTTPS", + "dependabot": "yes", + "gitCommit": "no", + "defaultBranch": "main", + "license": "MIT License", + "licenseInformation": { + "type": "free", + "license": "MIT" + }, + "widgetIsMainFunction": "main", + "creatorVersion": "2.6.5" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md b/test/baselines/adapter_TS_VIS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..895613958 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,32 @@ +--- +name: Bug report +about: Something is not working as it should +title: '' +labels: '' +assignees: '' +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '...' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots & Logfiles** +If applicable, add screenshots and logfiles to help explain your problem. + +**Versions:** + - Adapter version: + - JS-Controller version: + - Node version: + - Operating system: + +**Additional context** +Add any other context about the problem here. diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml b/test/baselines/adapter_TS_VIS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..d7cfe5940 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: ioBroker Community + url: https://forum.iobroker.net/ + about: Please ask and answer questions here. \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/.github/auto-merge.yml b/test/baselines/adapter_TS_VIS_OfficialESLint/.github/auto-merge.yml new file mode 100644 index 000000000..4f6d185f0 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/.github/auto-merge.yml @@ -0,0 +1,17 @@ +# Configure here which dependency updates should be merged automatically. +# The recommended configuration is the following: +- match: + # Only merge patches for production dependencies + dependency_type: production + update_type: "semver:patch" +- match: + # Except for security fixes, here we allow minor patches + dependency_type: production + update_type: "security:minor" +- match: + # and development dependencies can have a minor update, too + dependency_type: development + update_type: "semver:minor" + +# The syntax is based on the legacy dependabot v1 automerged_updates syntax, see: +# https://dependabot.com/docs/config-file/#automerged_updates diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/.github/dependabot.yml b/test/baselines/adapter_TS_VIS_OfficialESLint/.github/dependabot.yml new file mode 100644 index 000000000..c165a6a47 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/.github/dependabot.yml @@ -0,0 +1,22 @@ +version: 2 +updates: + - package-ecosystem: npm + directory: "/" + schedule: + interval: monthly + time: "04:00" + timezone: Europe/Berlin + open-pull-requests-limit: 5 + assignees: + - AlCalzone + versioning-strategy: increase + + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: monthly + time: "04:00" + timezone: Europe/Berlin + open-pull-requests-limit: 5 + assignees: + - AlCalzone diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml b/test/baselines/adapter_TS_VIS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml new file mode 100644 index 000000000..baeae23b5 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/.github/workflows/dependabot-auto-merge.yml @@ -0,0 +1,27 @@ +# Automatically merge Dependabot PRs when version comparison is within the range +# that is configured in .github/auto-merge.yml + +name: Auto-Merge Dependabot PRs + +on: + # WARNING: This needs to be run in the PR base, DO NOT build untrusted code in this action + # details under https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/ + pull_request_target: + +jobs: + auto-merge: + if: github.actor == 'dependabot[bot]' + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Check if PR should be auto-merged + uses: ahmadnassri/action-dependabot-auto-merge@v2 + with: + # In order to use this, you need to go to https://github.com/settings/tokens and + # create a Personal Access Token with the permission "public_repo". + # Enter this token in your repository settings under "Secrets" and name it AUTO_MERGE_TOKEN + github-token: ${{ secrets.AUTO_MERGE_TOKEN }} + # By default, squash and merge, so Github chooses nice commit messages + command: squash and merge diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/.github/workflows/test-and-release.yml b/test/baselines/adapter_TS_VIS_OfficialESLint/.github/workflows/test-and-release.yml new file mode 100644 index 000000000..0c48ade1a --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/.github/workflows/test-and-release.yml @@ -0,0 +1,96 @@ +name: Test and Release + +# Run this job on all pushes and pull requests +# as well as tags with a semantic version +on: + push: + branches: + - "main" + tags: + # normal versions + - "v[0-9]+.[0-9]+.[0-9]+" + # pre-releases + - "v[0-9]+.[0-9]+.[0-9]+-**" + pull_request: {} + +# Cancel previous PR/branch runs when a new commit is pushed +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true + +jobs: + # Performs quick checks before the expensive test runs + check-and-lint: + if: contains(github.event.head_commit.message, '[skip ci]') == false + + runs-on: ubuntu-latest + + steps: + - uses: ioBroker/testing-action-check@v1 + with: + node-version: '20.x' + # Uncomment the following line if your adapter cannot be installed using 'npm ci' + # install-command: 'npm install' + type-checking: true + lint: true + + # Runs adapter tests on all supported node versions and OSes + adapter-tests: + if: contains(github.event.head_commit.message, '[skip ci]') == false + + runs-on: ${{ matrix.os }} + strategy: + matrix: + node-version: [20.x, 22.x, 24.x] + os: [ubuntu-latest, windows-latest, macos-latest] + + steps: + - uses: ioBroker/testing-action-adapter@v1 + with: + node-version: ${{ matrix.node-version }} + os: ${{ matrix.os }} + # Uncomment the following line if your adapter cannot be installed using 'npm ci' + # install-command: 'npm install' + build: true + +# TODO: To enable automatic npm releases, create a token on npmjs.org +# Enter this token as a GitHub secret (with name NPM_TOKEN) in the repository options +# Then uncomment the following block: + +# # Deploys the final package to NPM +# deploy: +# needs: [check-and-lint, adapter-tests] +# +# # Trigger this step only when a commit on any branch is tagged with a version number +# if: | +# contains(github.event.head_commit.message, '[skip ci]') == false && +# github.event_name == 'push' && +# startsWith(github.ref, 'refs/tags/v') +# +# runs-on: ubuntu-latest +# +# # Write permissions are required to create Github releases +# permissions: +# contents: write +# +# steps: +# - uses: ioBroker/testing-action-deploy@v1 +# with: +# node-version: '20.x' +# # Uncomment the following line if your adapter cannot be installed using 'npm ci' +# # install-command: 'npm install' +# build: true +# npm-token: ${{ secrets.NPM_TOKEN }} +# github-token: ${{ secrets.GITHUB_TOKEN }} +# +# # When using Sentry for error reporting, Sentry can be informed about new releases +# # To enable create a API-Token in Sentry (User settings, API keys) +# # Enter this token as a GitHub secret (with name SENTRY_AUTH_TOKEN) in the repository options +# # Then uncomment and customize the following block: +# sentry: true +# sentry-token: ${{ secrets.SENTRY_AUTH_TOKEN }} +# sentry-project: "iobroker-test-adapter" +# sentry-version-prefix: "iobroker.test-adapter" +# sentry-sourcemap-paths: "build/" +# # If your sentry project is linked to a GitHub repository, you can enable the following option +# # sentry-github-integration: true diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/.gitignore b/test/baselines/adapter_TS_VIS_OfficialESLint/.gitignore new file mode 100644 index 000000000..80c28aa9d --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/.gitignore @@ -0,0 +1,18 @@ +# No dot-directories except github/vscode +.*/ +!.vscode/ +!.github/ + +*.code-workspace +node_modules +nbproject + +# npm package files +iobroker.*.tgz + +Thumbs.db +.commitinfo + +# i18n intermediate files +admin/i18n/flat.txt +admin/i18n/*/flat.txt \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/.vscode/extensions.json b/test/baselines/adapter_TS_VIS_OfficialESLint/.vscode/extensions.json new file mode 100644 index 000000000..2c6ac5b31 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/.vscode/extensions.json @@ -0,0 +1,6 @@ +{ + "recommendations": [ + "dbaeumer.vscode-eslint", + "esbenp.prettier-vscode" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/.vscode/settings.json b/test/baselines/adapter_TS_VIS_OfficialESLint/.vscode/settings.json new file mode 100644 index 000000000..854736cc0 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/.vscode/settings.json @@ -0,0 +1,23 @@ +{ + "typescript.tsdk": "node_modules/typescript/lib", + "eslint.enable": true, + "json.schemas": [ + { + "fileMatch": [ + "io-package.json" + ], + "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.js-controller/master/schemas/io-package.json" + }, + { + "fileMatch": [ + "admin/jsonConfig.json", + "admin/jsonConfig.json5", + "admin/jsonCustom.json", + "admin/jsonCustom.json5", + "admin/jsonTab.json", + "admin/jsonTab.json5" + ], + "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.admin/master/packages/jsonConfig/schemas/jsonConfig.json" + } + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/LICENSE b/test/baselines/adapter_TS_VIS_OfficialESLint/LICENSE new file mode 100644 index 000000000..27c9a624d --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2025 Al Calzone + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/README.md b/test/baselines/adapter_TS_VIS_OfficialESLint/README.md new file mode 100644 index 000000000..f57bba69c --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/README.md @@ -0,0 +1,132 @@ +![Logo](admin/test-adapter.png) +# ioBroker.test-adapter + +[![NPM version](https://img.shields.io/npm/v/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) +[![Downloads](https://img.shields.io/npm/dm/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) +![Number of Installations](https://iobroker.live/badges/test-adapter-installed.svg) +![Current version in stable repository](https://iobroker.live/badges/test-adapter-stable.svg) + +[![NPM](https://nodei.co/npm/iobroker.test-adapter.png?downloads=true)](https://nodei.co/npm/iobroker.test-adapter/) + +**Tests:** ![Test and Release](https://github.com/AlCalzone/ioBroker.test-adapter/workflows/Test%20and%20Release/badge.svg) + +## test-adapter adapter for ioBroker + +Describe your project here + +## Developer manual +This section is intended for the developer. It can be deleted later. + +### DISCLAIMER + +Please make sure that you consider copyrights and trademarks when you use names or logos of a company and add a disclaimer to your README. +You can check other adapters for examples or ask in the developer community. Using a name or logo of a company without permission may cause legal problems for you. + +### Getting started + +You are almost done, only a few steps left: +1. Create a new repository on GitHub with the name `ioBroker.test-adapter` +1. Initialize the current folder as a new git repository: + ```bash + git init -b main + git add . + git commit -m "Initial commit" + ``` +1. Link your local repository with the one on GitHub: + ```bash + git remote add origin https://github.com/AlCalzone/ioBroker.test-adapter + ``` + +1. Push all files to the GitHub repo: + ```bash + git push origin main + ``` +1. Add a new secret under https://github.com/AlCalzone/ioBroker.test-adapter/settings/secrets. It must be named `AUTO_MERGE_TOKEN` and contain a personal access token with push access to the repository, e.g. yours. You can create a new token under https://github.com/settings/tokens. + +1. Head over to [src/main.ts](src/main.ts) and start programming! + +### Best Practices +We've collected some [best practices](https://github.com/ioBroker/ioBroker.repositories#development-and-coding-best-practices) regarding ioBroker development and coding in general. If you're new to ioBroker or Node.js, you should +check them out. If you're already experienced, you should also take a look at them - you might learn something new :) + +### Scripts in `package.json` +Several npm scripts are predefined for your convenience. You can run them using `npm run ` +| Script name | Description | +|-------------|-------------| +| `build` | Compile the TypeScript sources. | +| `watch` | Compile the TypeScript sources and watch for changes. | +| `test:ts` | Executes the tests you defined in `*.test.ts` files. | +| `test:package` | Ensures your `package.json` and `io-package.json` are valid. | +| `test:integration` | Tests the adapter startup with an actual instance of ioBroker. | +| `test` | Performs a minimal test run on package files and your tests. | +| `check` | Performs a type-check on your code (without compiling anything). | +| `lint` | Runs `ESLint` to check your code for formatting errors and potential bugs. | +| `translate` | Translates texts in your adapter to all required languages, see [`@iobroker/adapter-dev`](https://github.com/ioBroker/adapter-dev#manage-translations) for more details. | + +### Configuring the compilation +The adapter template uses [esbuild](https://esbuild.github.io/) to compile TypeScript and/or React code. You can configure many compilation settings +either in `tsconfig.json` or by changing options for the build tasks. These options are described in detail in the +[`@iobroker/adapter-dev` documentation](https://github.com/ioBroker/adapter-dev#compile-adapter-files). + +### Writing tests +When done right, testing code is invaluable, because it gives you the +confidence to change your code while knowing exactly if and when +something breaks. A good read on the topic of test-driven development +is https://hackernoon.com/introduction-to-test-driven-development-tdd-61a13bc92d92. +Although writing tests before the code might seem strange at first, but it has very +clear upsides. + +The template provides you with basic tests for the adapter startup and package files. +It is recommended that you add your own tests into the mix. + +### Publishing the adapter +Using GitHub Actions, you can enable automatic releases on npm whenever you push a new git tag that matches the form +`v..`. We **strongly recommend** that you do. The necessary steps are described in `.github/workflows/test-and-release.yml`. + +To get your adapter released in ioBroker, please refer to the documentation +of [ioBroker.repositories](https://github.com/ioBroker/ioBroker.repositories#requirements-for-adapter-to-get-added-to-the-latest-repository). + +### Test the adapter manually on a local ioBroker installation +In order to install the adapter locally without publishing, the following steps are recommended: +1. Create a tarball from your dev directory: + ```bash + npm pack + ``` +1. Upload the resulting file to your ioBroker host +1. Install it locally (The paths are different on Windows): + ```bash + cd /opt/iobroker + npm i /path/to/tarball.tgz + ``` + +For later updates, the above procedure is not necessary. Just do the following: +1. Overwrite the changed files in the adapter directory (`/opt/iobroker/node_modules/iobroker.test-adapter`) +1. Execute `iobroker upload test-adapter` on the ioBroker host + +## Changelog + +### 0.0.1 +* (Al Calzone) initial release + +## License +MIT License + +Copyright (c) 2025 Al Calzone + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/__meta__/npm_package_files.txt b/test/baselines/adapter_TS_VIS_OfficialESLint/__meta__/npm_package_files.txt new file mode 100644 index 000000000..98f028fe2 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/__meta__/npm_package_files.txt @@ -0,0 +1,11 @@ +admin/index_m.html +admin/style.css +admin/test-adapter.png +admin/words.js +widgets/test-adapter.html +widgets/test-adapter/css/style.css +widgets/test-adapter/js/test-adapter.js +io-package.json +LICENSE +package.json +README.md \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/admin/admin.d.ts b/test/baselines/adapter_TS_VIS_OfficialESLint/admin/admin.d.ts new file mode 100644 index 000000000..41f934f4c --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/admin/admin.d.ts @@ -0,0 +1,93 @@ +declare let systemDictionary: Record>; + +declare let load: (settings: Record, onChange: (hasChanges: boolean) => void) => void; +declare let save: (callback: (settings: Record) => void) => void; + +// make load and save exist on the window object +interface Window { + load: typeof load; + save: typeof save; +} + +declare const instance: number; +declare const adapter: string; +/** Translates text */ +declare function _(text: string, arg1?: string, arg2?: string, arg3?: string): string; +declare const socket: ioBrokerSocket; +declare function sendTo( + instance: any | null, + command: string, + message: any, + callback: (result: SendToResult) => void | Promise, +): void; + +interface SendToResult { + error?: string | Error; + result?: any; +} + +// tslint:disable-next-line:class-name +interface ioBrokerSocket { + emit( + command: "subscribeObjects", + pattern: string, + callback?: (err?: string) => void | Promise, + ): void; + emit( + command: "subscribeStates", + pattern: string, + callback?: (err?: string) => void | Promise, + ): void; + emit( + command: "unsubscribeObjects", + pattern: string, + callback?: (err?: string) => void | Promise, + ): void; + emit( + command: "unsubscribeStates", + pattern: string, + callback?: (err?: string) => void | Promise, + ): void; + + emit( + event: "getObjectView", + view: "system", + type: "device", + options: ioBroker.GetObjectViewParams, + callback: ( + err: string | undefined, + result?: any, + ) => void | Promise, + ): void; + emit( + event: "getStates", + callback: ( + err: string | undefined, + result?: Record, + ) => void, + ): void; + emit( + event: "getState", + id: string, + callback: (err: string | undefined, result?: ioBroker.State) => void, + ): void; + emit( + event: "setState", + id: string, + state: unknown, + callback: (err: string | undefined, result?: any) => void, + ): void; + + on(event: "objectChange", handler: ioBroker.ObjectChangeHandler): void; + on(event: "stateChange", handler: ioBroker.StateChangeHandler): void; + removeEventHandler( + event: "objectChange", + handler: ioBroker.ObjectChangeHandler, + ): void; + removeEventHandler( + event: "stateChange", + handler: ioBroker.StateChangeHandler, + ): void; + + // TODO: other events +} diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/admin/index_m.html b/test/baselines/adapter_TS_VIS_OfficialESLint/admin/index_m.html new file mode 100644 index 000000000..f11dc3c14 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/admin/index_m.html @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+
+ + + + +
+
+ + +
+ +
+ + +
+
+ +
+ + + + \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/admin/style.css b/test/baselines/adapter_TS_VIS_OfficialESLint/admin/style.css new file mode 100644 index 000000000..57d4549ee --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/admin/style.css @@ -0,0 +1,32 @@ +/* You can delete those if you want. I just found them very helpful */ +* { + box-sizing: border-box +} +.m { + /* Don't cut off dropdowns! */ + overflow: initial; +} +.m.adapter-container, +.m.adapter-container > div.App { + /* Fix layout/scrolling issues with tabs */ + height: 100%; + width: 100%; + position: relative; +} +.m .select-wrapper + label { + /* The positioning for dropdown labels is messed up */ + transform: none !important; +} + +label > i[title] { + /* Display the help cursor for the tooltip icons and fix their positioning */ + cursor: help; + margin-left: 0.25em; +} + +.dropdown-content { + /* Don't wrap text in dropdowns */ + white-space: nowrap; +} + +/* Add your styles here */ diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/admin/test-adapter.png b/test/baselines/adapter_TS_VIS_OfficialESLint/admin/test-adapter.png new file mode 100644 index 0000000000000000000000000000000000000000..094ebd97c36dbe2386a63dbce290c9ad6a148079 GIT binary patch literal 62376 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%0DGz6 zyl7fq5kK_OTB5a+j%#*OqHtMgmMFAPfM%z1y`n*X-04|c~XNtbq*59PL zf2GK(^`44LhR@%s*209os!^-XK1;F{M*IZtESo=}65To~n+-bu0+>z?fZnkVoW}$_ zstfB}2u}&7L#c0_Qg^2;} z@gmc!u&D{a-Sk8a)1*Chcx+8~_M64opd2kxtHB|6*!4W&cOrWX;Yw>1GmvfN@nFO$k&$he)RKxo(&m zmF!n>4Y$>igYg0$%*vf6XAlg%u=W>lZr*&`_JyS?Qqf|(d#rIqm-Q+bvDD6`E^Yg! zCA@nJ@*O;Lp9NU-Q#KY#ME2A^kx^vHZXmc#(4jcbti!v_B%%%N@|q{z#cN2rxd7uE zDS;G&(m*%4MYSXuokFeyQS{I{6O4v&@v{hDbb4J?0ftY(dI z%St%e+#=VPIyA5VF9`5)D3bY&tL9gpe{Xha)$de%8pXLvHB( zu+0=Wc6d1^KBxb%4tv#uqG^B_>&ZHIJQN>7!}krzA!iGj%=dq0lHKGFRI$Ah-NT8N RBrxDlMnX}%QuJ%k{{yPv^Xvcs literal 0 HcmV?d00001 diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/admin/tsconfig.json b/test/baselines/adapter_TS_VIS_OfficialESLint/admin/tsconfig.json new file mode 100644 index 000000000..49fb013d2 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/admin/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../tsconfig.json", + "include": [ + "./admin.d.ts", + "./**/*.js", + // Include the adapter-config definition if it exists. + // It should be at either on of these paths: + "../lib/adapter-config.d.ts", // JS + "../src/lib/adapter-config.d.ts", // TS + ] +} diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/admin/words.js b/test/baselines/adapter_TS_VIS_OfficialESLint/admin/words.js new file mode 100644 index 000000000..0cc646034 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/admin/words.js @@ -0,0 +1,124 @@ +/* eslint no-unused-vars: off */ +/* eslint no-global-assign: off */ +/* global systemDictionary */ +"use strict"; + +systemDictionary = { + "test-adapter adapter settings": { + "en": "Adapter settings for test-adapter", + "de": "Adaptereinstellungen für test-adapter", + "ru": "Настройки адаптера для test-adapter", + "pt": "Configurações do adaptador para test-adapter", + "nl": "Adapterinstellingen voor test-adapter", + "fr": "Paramètres d'adaptateur pour test-adapter", + "it": "Impostazioni dell'adattatore per test-adapter", + "es": "Ajustes del adaptador para test-adapter", + "pl": "Ustawienia adaptera dla test-adapter", + "uk": "Налаштування адаптера для test-adapter", + "zh-cn": "test-adapter的适配器设置" + }, + "option1": { + "en": "option1", + "de": "Mock translation of 'option1' to 'de'", + "ru": "Mock translation of 'option1' to 'ru'", + "pt": "Mock translation of 'option1' to 'pt'", + "nl": "Mock translation of 'option1' to 'nl'", + "fr": "Mock translation of 'option1' to 'fr'", + "it": "Mock translation of 'option1' to 'it'", + "es": "Mock translation of 'option1' to 'es'", + "pl": "Mock translation of 'option1' to 'pl'", + "uk": "Mock translation of 'option1' to 'uk'", + "zh-cn": "Mock translation of 'option1' to 'zh-cn'" + }, + "option2": { + "en": "option2", + "de": "Mock translation of 'option2' to 'de'", + "ru": "Mock translation of 'option2' to 'ru'", + "pt": "Mock translation of 'option2' to 'pt'", + "nl": "Mock translation of 'option2' to 'nl'", + "fr": "Mock translation of 'option2' to 'fr'", + "it": "Mock translation of 'option2' to 'it'", + "es": "Mock translation of 'option2' to 'es'", + "pl": "Mock translation of 'option2' to 'pl'", + "uk": "Mock translation of 'option2' to 'uk'", + "zh-cn": "Mock translation of 'option2' to 'zh-cn'" + }, + "myColor": { + "en": "myColor", + "de": "meineColor", + "ru": "Мой цвет", + "pt": "minhaCor", + "nl": "mijnKleur", + "fr": "maCouleur", + "it": "mioColore", + "es": "miColor", + "pl": "mójKolor", + "uk": "мійКолір", + "zh-cn": "我的颜色" + }, + "myColor_tooltip": { + "en": "Description of\nmyColor", + "de": "Beschreibung von\nmyColor", + "ru": "Описание\nmyColor", + "pt": "Descrição de\nmyColor", + "nl": "Beschrijving van\nmyColor", + "fr": "Description de\nmyColor", + "it": "Descrizione di\nmyColor", + "es": "Descripción de\nmyColor", + "pl": "Opis\nmyColor", + "uk": "Опис\nmyColor", + "zh-cn": "\nmyColor的描述" + }, + "htmlText": { + "en": "htmlText", + "de": "htmlText", + "ru": "htmlText", + "pt": "htmlText", + "nl": "htmlText", + "fr": "htmlText", + "it": "htmlText", + "es": "htmlText", + "pl": "htmlText", + "uk": "htmlText", + "zh-cn": "htmlText" + }, + "group_extraMyset": { + "en": "extraMyset", + "de": "extraMyset", + "ru": "extraMyset", + "pt": "extraMyset", + "nl": "extraMyset", + "fr": "extraMyset", + "it": "extraMyset", + "es": "extraMyset", + "pl": "extraMyset", + "uk": "extraMyset", + "zh-cn": "extraMyset" + }, + "extraAttr": { + "en": "extraAttr", + "de": "extraAttr", + "ru": "extraAttr", + "pt": "extraAttr", + "nl": "extraAttr", + "fr": "extraAttr", + "it": "extraAttr", + "es": "extraAttr", + "pl": "extraAttr", + "uk": "extraAttr", + "zh-cn": "extraAttr" + }, + "Instance": { + "en": "Instance", + "de": "Instanz", + "ru": "Инстанция", + "pt": "Instância", + "nl": "Instantie", + "fr": "Instance", + "it": "Esempio", + "es": "Instancia", + "pl": "Instancja", + "uk": "Інстанція", + "zh-cn": "例" + } +}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/eslint.config.mjs b/test/baselines/adapter_TS_VIS_OfficialESLint/eslint.config.mjs new file mode 100644 index 000000000..5224defc7 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/eslint.config.mjs @@ -0,0 +1,35 @@ +// ioBroker eslint template configuration file for js and ts files +// Please note that esm or react based modules need additional modules loaded. +import config from '@iobroker/eslint-config'; + +export default [ + ...config, + { + // specify files to exclude from linting here + ignores: [ + '.dev-server/', + '.vscode/', + '*.test.js', + 'test/**/*.js', + '*.config.mjs', + 'build', + 'dist', + 'admin/words.js', + 'admin/admin.d.ts', + 'admin/blockly.js', + '**/adapter-config.d.ts', + 'widgets/**/*.js' + ], + }, + { + // you may disable some 'jsdoc' warnings - but using jsdoc is highly recommended + // as this improves maintainability. jsdoc warnings will not block build process. + rules: { + // 'jsdoc/require-jsdoc': 'off', + // 'jsdoc/require-param': 'off', + // 'jsdoc/require-param-description': 'off', + // 'jsdoc/require-returns-description': 'off', + // 'jsdoc/require-returns-check': 'off', + }, + }, +]; \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/io-package.json b/test/baselines/adapter_TS_VIS_OfficialESLint/io-package.json new file mode 100644 index 000000000..cd2246e68 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/io-package.json @@ -0,0 +1,95 @@ +{ + "common": { + "name": "test-adapter", + "version": "0.0.1", + "news": { + "0.0.1": { + "en": "initial release", + "de": "Erstveröffentlichung", + "ru": "Начальная версия", + "pt": "lançamento inicial", + "nl": "Eerste uitgave", + "fr": "Première version", + "it": "Versione iniziale", + "es": "Versión inicial", + "pl": "Pierwsze wydanie", + "uk": "Початкова версія", + "zh-cn": "首次出版" + } + }, + "titleLang": { + "en": "Is used to test the creator", + "de": "Mock translation of 'Is used to test the creator' to 'de'", + "ru": "Mock translation of 'Is used to test the creator' to 'ru'", + "pt": "Mock translation of 'Is used to test the creator' to 'pt'", + "nl": "Mock translation of 'Is used to test the creator' to 'nl'", + "fr": "Mock translation of 'Is used to test the creator' to 'fr'", + "it": "Mock translation of 'Is used to test the creator' to 'it'", + "es": "Mock translation of 'Is used to test the creator' to 'es'", + "pl": "Mock translation of 'Is used to test the creator' to 'pl'", + "uk": "Mock translation of 'Is used to test the creator' to 'uk'", + "zh-cn": "Mock translation of 'Is used to test the creator' to 'zh-cn'" + }, + "desc": { + "en": "test-adapter", + "de": "Mock translation of 'test-adapter' to 'de'", + "ru": "Mock translation of 'test-adapter' to 'ru'", + "pt": "Mock translation of 'test-adapter' to 'pt'", + "nl": "Mock translation of 'test-adapter' to 'nl'", + "fr": "Mock translation of 'test-adapter' to 'fr'", + "it": "Mock translation of 'test-adapter' to 'it'", + "es": "Mock translation of 'test-adapter' to 'es'", + "pl": "Mock translation of 'test-adapter' to 'pl'", + "uk": "Mock translation of 'test-adapter' to 'uk'", + "zh-cn": "Mock translation of 'test-adapter' to 'zh-cn'" + }, + "authors": [ + "Al Calzone " + ], + "keywords": [ + "template", + "automation", + "IoT", + "integration" + ], + "licenseInformation": { + "type": "free", + "license": "MIT" + }, + "platform": "Javascript/Node.js", + "icon": "test-adapter.png", + "enabled": true, + "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", + "readme": "https://github.com/AlCalzone/ioBroker.test-adapter/blob/main/README.md", + "loglevel": "info", + "tier": 3, + "restartAdapters": [ + "vis" + ], + "mode": "daemon", + "type": "general", + "compact": true, + "connectionType": "local", + "dataSource": "push", + "adminUI": { + "config": "materialize" + }, + "dependencies": [ + { + "js-controller": ">=6.0.11" + }, + "vis" + ], + "globalDependencies": [ + { + "admin": ">=7.0.23" + } + ] + }, + "native": { + "option1": true, + "option2": "42" + }, + "objects": [], + "instanceObjects": [] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/package.json b/test/baselines/adapter_TS_VIS_OfficialESLint/package.json new file mode 100644 index 000000000..3e2fee4fd --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/package.json @@ -0,0 +1,69 @@ +{ + "name": "iobroker.test-adapter", + "version": "0.0.1", + "description": "test-adapter", + "author": { + "name": "Al Calzone", + "email": "al@calzo.ne" + }, + "contributors": [], + "homepage": "https://github.com/AlCalzone/ioBroker.test-adapter", + "license": "MIT", + "keywords": [ + "template", + "automation", + "IoT", + "integration" + ], + "repository": { + "type": "git", + "url": "https://github.com/AlCalzone/ioBroker.test-adapter.git" + }, + "engines": { + "node": ">= 20" + }, + "dependencies": { + "@iobroker/adapter-core": "^3.3.2" + }, + "devDependencies": { + "@iobroker/adapter-dev": "^1.5.0", + "@iobroker/eslint-config": "^2.2.0", + "@iobroker/testing": "^5.1.1", + "@tsconfig/node20": "^20.1.6", + "@types/node": "^20.19.17", + "rimraf": "^6.0.1", + "source-map-support": "^0.5.21", + "ts-node": "^10.9.2", + "typescript": "~5.9.2" + }, + "main": "build/main.js", + "files": [ + "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).{json,json5}", + "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}", + "build/", + "widgets/**/!(tsconfig|tsconfig.*|.eslintrc).json", + "widgets/**/*.{html,css,png,svg,jpg,js}", + "www/", + "io-package.json", + "LICENSE" + ], + "scripts": { + "prebuild": "rimraf build", + "build": "build-adapter ts", + "watch": "build-adapter ts --watch", + "prebuild:ts": "rimraf build", + "build:ts": "build-adapter ts", + "watch:ts": "build-adapter ts --watch", + "test:ts": "mocha --config test/mocharc.custom.json src/**/*.test.ts", + "test:package": "mocha test/package --exit", + "test:integration": "mocha test/integration --exit", + "test": "npm run test:ts && npm run test:package", + "check": "tsc --noEmit", + "lint": "eslint -c eslint.config.mjs .", + "translate": "translate-adapter" + }, + "bugs": { + "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" + }, + "readmeFilename": "README.md" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/prettier.config.mjs b/test/baselines/adapter_TS_VIS_OfficialESLint/prettier.config.mjs new file mode 100644 index 000000000..0eef8ef1a --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/prettier.config.mjs @@ -0,0 +1,7 @@ +// iobroker prettier configuration file +import prettierConfig from '@iobroker/eslint-config/prettier.config.mjs'; + +export default { + ...prettierConfig, + useTabs: true, +}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/src/lib/adapter-config.d.ts b/test/baselines/adapter_TS_VIS_OfficialESLint/src/lib/adapter-config.d.ts new file mode 100644 index 000000000..c6c8a0e2a --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/src/lib/adapter-config.d.ts @@ -0,0 +1,14 @@ +// This file extends the AdapterConfig type from "@types/iobroker" + +// Augment the globally declared type ioBroker.AdapterConfig +declare global { + namespace ioBroker { + interface AdapterConfig { + option1: boolean; + option2: string; + } + } +} + +// this is required so the above AdapterConfig is found by TypeScript / type checking +export {}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.test.ts b/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.test.ts new file mode 100644 index 000000000..a8d538e95 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.test.ts @@ -0,0 +1,26 @@ +/** + * This is a dummy TypeScript test file using chai and mocha + * + * It's automatically excluded from npm and its build output is excluded from both git and npm. + * It is advised to test all your modules with accompanying *.test.ts-files + */ + +import { expect } from "chai"; +// import { functionToTest } from "./moduleToTest"; + +describe("module to test => function to test", () => { + // initializing logic + const expected = 5; + + it(`should return ${expected}`, () => { + const result = 5; + // assign result a value from functionToTest + expect(result).to.equal(expected); + // or using the should() syntax + result.should.equal(expected); + }); + // ... more tests => it + +}); + +// ... more test suites => describe diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.ts b/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.ts new file mode 100644 index 000000000..d86bf77c5 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.ts @@ -0,0 +1,153 @@ +/* + * Created with @iobroker/create-adapter v2.6.5 + */ + +// The adapter-core module gives you access to the core ioBroker functions +// you need to create an adapter +import * as utils from "@iobroker/adapter-core"; + +// Load your modules here, e.g.: +// import * as fs from "fs"; + +class TestAdapter extends utils.Adapter { + + public constructor(options: Partial = {}) { + super({ + ...options, + name: "test-adapter", + }); + this.on("ready", this.onReady.bind(this)); + this.on("stateChange", this.onStateChange.bind(this)); + // this.on("objectChange", this.onObjectChange.bind(this)); + // this.on("message", this.onMessage.bind(this)); + this.on("unload", this.onUnload.bind(this)); + } + + /** + * Is called when databases are connected and adapter received configuration. + */ + private async onReady(): Promise { + // Initialize your adapter here + + // The adapters config (in the instance object everything under the attribute "native") is accessible via + // this.config: + this.log.debug("config option1: " + this.config.option1); + this.log.debug("config option2: " + this.config.option2); + + /* + For every state in the system there has to be also an object of type state + Here a simple template for a boolean variable named "testVariable" + Because every adapter instance uses its own unique namespace variable names can't collide with other adapters variables + */ + await this.setObjectNotExistsAsync("testVariable", { + type: "state", + common: { + name: "testVariable", + type: "boolean", + role: "indicator", + read: true, + write: true, + }, + native: {}, + }); + + // In order to get state updates, you need to subscribe to them. The following line adds a subscription for our variable we have created above. + this.subscribeStates("testVariable"); + // You can also add a subscription for multiple states. The following line watches all states starting with "lights." + // this.subscribeStates("lights.*"); + // Or, if you really must, you can also watch all states. Don't do this if you don't need to. Otherwise this will cause a lot of unnecessary load on the system: + // this.subscribeStates("*"); + + /* + setState examples + you will notice that each setState will cause the stateChange event to fire (because of above subscribeStates cmd) + */ + // the variable testVariable is set to true as command (ack=false) + await this.setState("testVariable", true); + + // same thing, but the value is flagged "ack" + // ack should be always set to true if the value is received from or acknowledged from the target system + await this.setState("testVariable", { val: true, ack: true }); + + // same thing, but the state is deleted after 30s (getState will return null afterwards) + await this.setState("testVariable", { val: true, ack: true, expire: 30 }); + + // examples for the checkPassword/checkGroup functions + const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); + this.log.info("check user admin pw iobroker: " + pwdResult); + + const gropupResult = await this.checkGroupAsync("admin", "admin"); + this.log.info("check group user admin group admin: " + gropupResult); + } + + /** + * Is called when adapter shuts down - callback has to be called under any circumstances! + */ + private onUnload(callback: () => void): void { + try { + // Here you must clear all timeouts or intervals that may still be active + // clearTimeout(timeout1); + // clearTimeout(timeout2); + // ... + // clearInterval(interval1); + + callback(); + } catch (_e) { + callback(); + } + } + + // If you need to react to object changes, uncomment the following block and the corresponding line in the constructor. + // You also need to subscribe to the objects with `this.subscribeObjects`, similar to `this.subscribeStates`. + // /** + // * Is called if a subscribed object changes + // */ + // private onObjectChange(id: string, obj: ioBroker.Object | null | undefined): void { + // if (obj) { + // // The object was changed + // this.log.info(`object ${id} changed: ${JSON.stringify(obj)}`); + // } else { + // // The object was deleted + // this.log.info(`object ${id} deleted`); + // } + // } + + /** + * Is called if a subscribed state changes + */ + private onStateChange(id: string, state: ioBroker.State | null | undefined): void { + if (state) { + // The state was changed + this.log.info(`state ${id} changed: ${state.val} (ack = ${state.ack})`); + } else { + // The state was deleted + this.log.info(`state ${id} deleted`); + } + } + + // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. + // /** + // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... + // * Using this method requires "common.messagebox" property to be set to true in io-package.json + // */ + // private onMessage(obj: ioBroker.Message): void { + // if (typeof obj === "object" && obj.message) { + // if (obj.command === "send") { + // // e.g. send email or pushover or whatever + // this.log.info("send command"); + + // // Send response in callback if required + // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); + // } + // } + // } + +} + +if (require.main !== module) { + // Export the constructor in compact mode + module.exports = (options: Partial | undefined) => new TestAdapter(options); +} else { + // otherwise start the instance directly + (() => new TestAdapter())(); +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/test/.eslintrc.json b/test/baselines/adapter_TS_VIS_OfficialESLint/test/.eslintrc.json new file mode 100644 index 000000000..ce6b3d62c --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/test/.eslintrc.json @@ -0,0 +1,43 @@ +{ + "root": true, + "env": { + "es6": true, + "node": true, + "mocha": true + }, + "extends": [ + "eslint:recommended" + ], + "rules": { + "indent": [ + "error", + "tab", + { + "SwitchCase": 1 + } + ], + "no-console": "off", + "no-unused-vars": [ + "error", + { + "ignoreRestSiblings": true, + "argsIgnorePattern": "^_" + } + ], + "no-var": "error", + "no-trailing-spaces": "error", + "prefer-const": "error", + "quotes": [ + "error", + "double", + { + "avoidEscape": true, + "allowTemplateLiterals": true + } + ], + "semi": [ + "error", + "always" + ] + } +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/test/integration.js b/test/baselines/adapter_TS_VIS_OfficialESLint/test/integration.js new file mode 100644 index 000000000..986936fac --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/test/integration.js @@ -0,0 +1,5 @@ +const path = require("path"); +const { tests } = require("@iobroker/testing"); + +// Run integration tests - See https://github.com/ioBroker/testing for a detailed explanation and further options +tests.integration(path.join(__dirname, "..")); \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/test/mocha.setup.js b/test/baselines/adapter_TS_VIS_OfficialESLint/test/mocha.setup.js new file mode 100644 index 000000000..b839790ff --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/test/mocha.setup.js @@ -0,0 +1,23 @@ +"use strict"; + +// Makes ts-node ignore warnings, so mocha --watch does work +process.env.TS_NODE_IGNORE_WARNINGS = "TRUE"; +// Sets the correct tsconfig for testing +process.env.TS_NODE_PROJECT = "tsconfig.json"; +// Make ts-node respect the "include" key in tsconfig.json +process.env.TS_NODE_FILES = "TRUE"; + +// Don't silently swallow unhandled rejections +process.on("unhandledRejection", (e) => { + throw e; +}); + +// enable the should interface with sinon +// and load chai-as-promised and sinon-chai by default +const sinonChai = require("sinon-chai"); +const chaiAsPromised = require("chai-as-promised"); +const { should, use } = require("chai"); + +should(); +use(sinonChai); +use(chaiAsPromised); \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/test/mocharc.custom.json b/test/baselines/adapter_TS_VIS_OfficialESLint/test/mocharc.custom.json new file mode 100644 index 000000000..851ed9cdc --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/test/mocharc.custom.json @@ -0,0 +1,10 @@ +{ + "require": [ + "test/mocha.setup.js", + "ts-node/register", + "source-map-support/register" + ], + "watch-files": [ + "src/**/*.test.ts" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/test/package.js b/test/baselines/adapter_TS_VIS_OfficialESLint/test/package.js new file mode 100644 index 000000000..3a48e0449 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/test/package.js @@ -0,0 +1,5 @@ +const path = require("path"); +const { tests } = require("@iobroker/testing"); + +// Validate the package files +tests.packageFiles(path.join(__dirname, "..")); diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/test/tsconfig.json b/test/baselines/adapter_TS_VIS_OfficialESLint/test/tsconfig.json new file mode 100644 index 000000000..3ebc81b65 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/test/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "noImplicitAny": false + }, + "include": [ + "./**/*.js" + ] +} diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/tsconfig.build.json b/test/baselines/adapter_TS_VIS_OfficialESLint/tsconfig.build.json new file mode 100644 index 000000000..1f040ce18 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/tsconfig.build.json @@ -0,0 +1,16 @@ +// Specialized tsconfig to only compile .ts-files in the src dir +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "allowJs": false, + "checkJs": false, + "noEmit": false, + "declaration": false + }, + "include": [ + "src/**/*.ts" + ], + "exclude": [ + "src/**/*.test.ts" + ] +} diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/tsconfig.json b/test/baselines/adapter_TS_VIS_OfficialESLint/tsconfig.json new file mode 100644 index 000000000..4c80d776d --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/tsconfig.json @@ -0,0 +1,46 @@ +// Root tsconfig to set the settings and power editor support for all TS files +{ + // To update the compilation target, install a different version of @tsconfig/node... and reference it here + // https://github.com/tsconfig/bases#node-20-tsconfigjson + "extends": "@tsconfig/node20/tsconfig.json", + "compilerOptions": { + // do not compile anything, this file is just to configure type checking + // the compilation is configured in tsconfig.build.json + "noEmit": true, + + // check JS files, but do not compile them => tsconfig.build.json + "allowJs": true, + "checkJs": true, + + "noEmitOnError": true, + "outDir": "./build/", + "removeComments": false, + + // This is necessary for the automatic typing of the adapter config + "resolveJsonModule": true, + + // If you want to disable the stricter type checks (not recommended), uncomment the following line + // "strict": false, + // And enable some of those features for more fine-grained control + // "strictNullChecks": true, + // "strictPropertyInitialization": true, + // "strictBindCallApply": true, + // "noImplicitAny": true, + // "noUnusedLocals": true, + // "noUnusedParameters": true, + // Uncomment this if you want the old behavior of catch variables being `any` + // "useUnknownInCatchVariables": false, + + "sourceMap": true, + "inlineSourceMap": false + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "exclude": [ + "build/**", + "node_modules/**", + "widgets/**" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/widgets/.eslintrc.json b/test/baselines/adapter_TS_VIS_OfficialESLint/widgets/.eslintrc.json new file mode 100644 index 000000000..b7ca3620a --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/widgets/.eslintrc.json @@ -0,0 +1,19 @@ +{ + "env": { + "browser": true, + "es6": false + }, + "rules": { + // Visualizations may run in very old browsers without `let` and `const` + "no-var": "off", + // The example code does not use some parameters. If unused variables should be + // an error, delete the following rule + "no-unused-vars": [ + "warn", + { + "ignoreRestSiblings": true, + "argsIgnorePattern": "^_" + } + ] + } +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/widgets/test-adapter.html b/test/baselines/adapter_TS_VIS_OfficialESLint/widgets/test-adapter.html new file mode 100644 index 000000000..b5f9aaede --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/widgets/test-adapter.html @@ -0,0 +1,135 @@ + + + + + + + + + + \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/widgets/test-adapter/css/style.css b/test/baselines/adapter_TS_VIS_OfficialESLint/widgets/test-adapter/css/style.css new file mode 100644 index 000000000..5ea1abc76 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/widgets/test-adapter/css/style.css @@ -0,0 +1,4 @@ +/* Style your widget here */ +.test-adapter-class { + font-style: italic; +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/widgets/test-adapter/js/test-adapter.js b/test/baselines/adapter_TS_VIS_OfficialESLint/widgets/test-adapter/js/test-adapter.js new file mode 100644 index 000000000..a7f6b07d0 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/widgets/test-adapter/js/test-adapter.js @@ -0,0 +1,76 @@ +/* + ioBroker.vis test-adapter Widget-Set + + version: "0.0.1" + + Copyright 2025 Al Calzone al@calzo.ne +*/ +"use strict"; + +/* global $, vis, systemDictionary */ + +// add translations for edit mode +$.extend( + true, + systemDictionary, + { + // Add your translations here, e.g.: + // "size": { + // "en": "Size", + // "de": "Größe", + // "ru": "Размер", + // "pt": "Tamanho", + // "nl": "Grootte", + // "fr": "Taille", + // "it": "Dimensione", + // "es": "Talla", + // "pl": "Rozmiar", + // "uk": "Розмір" + // "zh-cn": "尺寸" + // } + } +); + +// this code can be placed directly in test-adapter.html +vis.binds["test-adapter"] = { + version: "0.0.1", + showVersion: function () { + if (vis.binds["test-adapter"].version) { + console.log("Version test-adapter: " + vis.binds["test-adapter"].version); + vis.binds["test-adapter"].version = null; + } + }, + createWidget: function (widgetID, view, data, style) { + var $div = $("#" + widgetID); + // if nothing found => wait + if (!$div.length) { + return setTimeout(function () { + vis.binds["test-adapter"].createWidget(widgetID, view, data, style); + }, 100); + } + + var text = ""; + text += "OID: " + data.oid + "
"; + text += 'OID value: ' + vis.states[data.oid + ".val"] + "
"; + text += 'Color: ' + data.myColor + "
"; + text += "extraAttr: " + data.extraAttr + "
"; + text += "Browser instance: " + vis.instance + "
"; + text += 'htmlText:
"; + + $("#" + widgetID).html(text); + + // subscribe on updates of value + function onChange(e, newVal, _oldVal) { + $div.find(".template-value").html(newVal); + } + if (data.oid) { + vis.states.bind(data.oid + ".val", onChange); + //remember bound state that vis can release if didnt needed + $div.data("bound", [data.oid + ".val"]); + //remember onchange handler to release bound states + $div.data("bindHandler", onChange); + } + } +}; + +vis.binds["test-adapter"].showVersion(); \ No newline at end of file diff --git a/test/create-adapter.test.ts b/test/create-adapter.test.ts index d57610616..5750be238 100644 --- a/test/create-adapter.test.ts +++ b/test/create-adapter.test.ts @@ -285,6 +285,8 @@ describe("adapter creation =>", () => { ...baseAnswers, language: "JavaScript", eslintConfig: "official", + indentation: "Space (4)", + quotes: "single", }; await expectSuccess("adapter_JS_OfficialESLint", answers); }); @@ -298,6 +300,18 @@ describe("adapter creation =>", () => { await expectSuccess("adapter_TS_React_OfficialESLint", answers); }); + it("Adapter, TypeScript VIS, Official ESLint Config", async () => { + const answers: Answers = { + ...baseAnswers, + features: ["adapter", "vis"], + eslintConfig: "official", + indentation: "Tab", + quotes: "double", + widgetIsMainFunction: "main", + }; + await expectSuccess("adapter_TS_VIS_OfficialESLint", answers); + }); + it("Widget", async () => { const answers: Answers = { cli: true, From 1f45b0805ddcd22589e736d0d911ea90ad2ef106 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 22 Sep 2025 19:22:52 +0000 Subject: [PATCH 08/29] Upgrade custom ESLint configuration to ESLint 9 with flat config format and VIS widget support Co-authored-by: Apollon77 <11976694+Apollon77@users.noreply.github.com> --- templates/_eslintignore.ts | 5 +- templates/_eslintrc_javascript.json.ts | 5 +- templates/_eslintrc_typescript.js.ts | 5 +- templates/eslint.config.custom.js.mjs.ts | 137 ++++++++++++++++ templates/eslint.config.custom.mjs.ts | 128 +++++++++++++++ templates/eslint.config.mjs.ts | 2 +- templates/index.ts | 2 + templates/package.json.ts | 23 +-- templates/widgets/_eslintrc.json.ts | 3 + test/baselines/ReleaseScript_JS/package.json | 5 +- test/baselines/ReleaseScript_TS/package.json | 9 +- test/baselines/TS_DoubleQuotes/.eslintignore | 4 - test/baselines/TS_DoubleQuotes/.eslintrc.js | 78 --------- test/baselines/TS_Prettier/.eslintignore | 4 - test/baselines/TS_Prettier/.eslintrc.js | 54 ------- test/baselines/TS_Prettier/package.json | 9 +- test/baselines/TS_SingleQuotes/.eslintignore | 4 - test/baselines/TS_SingleQuotes/.eslintrc.js | 78 --------- .../.eslintignore | 2 - .../.eslintrc.json | 47 ------ .../eslint.config.mjs | 59 +++++++ .../package.json | 5 +- test/baselines/adapter_JS_React/.eslintignore | 3 - .../adapter_JS_React/eslint.config.mjs | 73 +++++++++ test/baselines/adapter_JS_React/package.json | 5 +- .../.eslintignore | 3 - .../.eslintrc.js | 69 -------- .../eslint.config.mjs | 52 ++++++ .../package.json | 9 +- test/baselines/adapter_TS_React/.eslintignore | 4 - test/baselines/adapter_TS_React/.eslintrc.js | 78 --------- .../adapter_TS_React/eslint.config.mjs | 64 ++++++++ test/baselines/adapter_TS_React/package.json | 9 +- .../.create-adapter.json | 40 +++++ .../.github/ISSUE_TEMPLATE/bug_report.md | 32 ++++ .../.github/ISSUE_TEMPLATE/config.yml | 5 + .../.github/auto-merge.yml | 17 ++ .../.github/dependabot.yml | 22 +++ .../workflows/dependabot-auto-merge.yml | 27 ++++ .../.github/workflows/test-and-release.yml | 96 +++++++++++ .../adapter_TS_VIS_CustomESLint/.gitignore | 18 +++ .../.vscode/extensions.json | 5 + .../.vscode/settings.json | 23 +++ .../adapter_TS_VIS_CustomESLint/LICENSE | 21 +++ .../adapter_TS_VIS_CustomESLint/README.md | 132 +++++++++++++++ .../__meta__/npm_package_files.txt | 11 ++ .../admin/admin.d.ts | 93 +++++++++++ .../admin/index_m.html | 95 +++++++++++ .../admin/style.css | 32 ++++ .../admin/test-adapter.png | Bin 0 -> 62376 bytes .../admin/tsconfig.json | 11 ++ .../admin/words.js | 124 ++++++++++++++ .../eslint.config.mjs | 78 +++++++++ .../io-package.json | 95 +++++++++++ .../adapter_TS_VIS_CustomESLint/package.json | 72 +++++++++ .../src/lib/adapter-config.d.ts | 14 ++ .../src/main.test.ts | 26 +++ .../adapter_TS_VIS_CustomESLint/src/main.ts | 153 ++++++++++++++++++ .../test}/.eslintrc.json | 17 +- .../test/integration.js | 5 + .../test/mocha.setup.js | 23 +++ .../test/mocharc.custom.json | 10 ++ .../test/package.js | 5 + .../test/tsconfig.json | 9 ++ .../tsconfig.build.json | 16 ++ .../adapter_TS_VIS_CustomESLint/tsconfig.json | 46 ++++++ .../widgets/test-adapter.html | 135 ++++++++++++++++ .../widgets/test-adapter/css/style.css | 4 + .../widgets/test-adapter/js/test-adapter.js | 76 +++++++++ .../widgets/.eslintrc.json | 19 --- test/baselines/contributors/package.json | 9 +- .../package.json | 9 +- test/baselines/git_SSH/package.json | 9 +- .../ioBroker.hello-devcontainer/.eslintignore | 2 - .../.eslintrc.json | 47 ------ .../eslint.config.mjs | 59 +++++++ .../ioBroker.hello-devcontainer/package.json | 5 +- test/baselines/keywords/package.json | 9 +- test/baselines/minNodeVersion_20/package.json | 9 +- test/baselines/minNodeVersion_22/package.json | 9 +- test/baselines/minNodeVersion_24/package.json | 9 +- .../vis_Widget/widgets/.eslintrc.json | 19 --- test/create-adapter.test.ts | 12 ++ 83 files changed, 2242 insertions(+), 609 deletions(-) create mode 100644 templates/eslint.config.custom.js.mjs.ts create mode 100644 templates/eslint.config.custom.mjs.ts delete mode 100644 test/baselines/TS_DoubleQuotes/.eslintignore delete mode 100644 test/baselines/TS_DoubleQuotes/.eslintrc.js delete mode 100644 test/baselines/TS_Prettier/.eslintignore delete mode 100644 test/baselines/TS_Prettier/.eslintrc.js delete mode 100644 test/baselines/TS_SingleQuotes/.eslintignore delete mode 100644 test/baselines/TS_SingleQuotes/.eslintrc.js delete mode 100644 test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/.eslintignore delete mode 100644 test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/.eslintrc.json create mode 100644 test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/eslint.config.mjs delete mode 100644 test/baselines/adapter_JS_React/.eslintignore create mode 100644 test/baselines/adapter_JS_React/eslint.config.mjs delete mode 100644 test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/.eslintignore delete mode 100644 test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/.eslintrc.js create mode 100644 test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/eslint.config.mjs delete mode 100644 test/baselines/adapter_TS_React/.eslintignore delete mode 100644 test/baselines/adapter_TS_React/.eslintrc.js create mode 100644 test/baselines/adapter_TS_React/eslint.config.mjs create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/.create-adapter.json create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/.github/ISSUE_TEMPLATE/bug_report.md create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/.github/ISSUE_TEMPLATE/config.yml create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/.github/auto-merge.yml create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/.github/dependabot.yml create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/.github/workflows/dependabot-auto-merge.yml create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/.github/workflows/test-and-release.yml create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/.gitignore create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/.vscode/extensions.json create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/.vscode/settings.json create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/LICENSE create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/README.md create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/__meta__/npm_package_files.txt create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/admin/admin.d.ts create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/admin/index_m.html create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/admin/style.css create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/admin/test-adapter.png create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/admin/tsconfig.json create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/admin/words.js create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/eslint.config.mjs create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/io-package.json create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/package.json create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/src/lib/adapter-config.d.ts create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/src/main.test.ts create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/src/main.ts rename test/baselines/{adapter_JS_React => adapter_TS_VIS_CustomESLint/test}/.eslintrc.json (70%) create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/test/integration.js create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/test/mocha.setup.js create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/test/mocharc.custom.json create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/test/package.js create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/test/tsconfig.json create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/tsconfig.build.json create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/tsconfig.json create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/widgets/test-adapter.html create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/widgets/test-adapter/css/style.css create mode 100644 test/baselines/adapter_TS_VIS_CustomESLint/widgets/test-adapter/js/test-adapter.js delete mode 100644 test/baselines/adapter_TS_VIS_OfficialESLint/widgets/.eslintrc.json delete mode 100644 test/baselines/ioBroker.hello-devcontainer/.eslintignore delete mode 100644 test/baselines/ioBroker.hello-devcontainer/.eslintrc.json create mode 100644 test/baselines/ioBroker.hello-devcontainer/eslint.config.mjs delete mode 100644 test/baselines/vis_Widget/widgets/.eslintrc.json diff --git a/templates/_eslintignore.ts b/templates/_eslintignore.ts index c0405146f..6b01ff196 100644 --- a/templates/_eslintignore.ts +++ b/templates/_eslintignore.ts @@ -4,9 +4,8 @@ const templateFunction: TemplateFunction = answers => { const useESLint = answers.tools?.includes("ESLint") if (!useESLint) return; - const useOfficialESLintConfig = answers.eslintConfig === "official"; - // Don't generate .eslintignore when using official config (ignores are in eslint.config.mjs) - if (useOfficialESLintConfig) return; + // Don't generate .eslintignore anymore - ignores are in eslint.config.mjs + return; const useTypeScript = answers.language === "TypeScript"; const useReact = answers.adminUi === "react" || answers.tabReact === "yes"; diff --git a/templates/_eslintrc_javascript.json.ts b/templates/_eslintrc_javascript.json.ts index cd56e9132..24f85417e 100644 --- a/templates/_eslintrc_javascript.json.ts +++ b/templates/_eslintrc_javascript.json.ts @@ -10,9 +10,8 @@ const templateFunction: TemplateFunction = answers => { const useESLint = answers.tools && answers.tools.indexOf("ESLint") > -1; if (!useESLint) return; - const useOfficialESLintConfig = answers.eslintConfig === "official"; - // Don't generate legacy .eslintrc.json when using official config - if (useOfficialESLintConfig) return; + // Don't generate legacy .eslintrc.json anymore - use flat config instead + return; // Original custom ESLint configuration const template = ` diff --git a/templates/_eslintrc_typescript.js.ts b/templates/_eslintrc_typescript.js.ts index 374c7da73..24b6fd448 100644 --- a/templates/_eslintrc_typescript.js.ts +++ b/templates/_eslintrc_typescript.js.ts @@ -7,9 +7,8 @@ const templateFunction: TemplateFunction = answers => { const useESLint = answers.tools && answers.tools.indexOf("ESLint") > -1; if (!useESLint) return; - const useOfficialESLintConfig = answers.eslintConfig === "official"; - // Don't generate legacy .eslintrc.js when using official config - if (useOfficialESLintConfig) return; + // Don't generate legacy .eslintrc.js anymore - use flat config instead + return; const usePrettier = answers.tools && answers.tools.indexOf("Prettier") > -1; const useReact = diff --git a/templates/eslint.config.custom.js.mjs.ts b/templates/eslint.config.custom.js.mjs.ts new file mode 100644 index 000000000..e72cda4c0 --- /dev/null +++ b/templates/eslint.config.custom.js.mjs.ts @@ -0,0 +1,137 @@ +import type { TemplateFunction } from "../src/lib/createAdapter"; + +const templateFunction: TemplateFunction = answers => { + + // This version is intended for use in JS projects + if (answers.language !== "JavaScript") return; + + const useESLint = answers.tools && answers.tools.indexOf("ESLint") > -1; + if (!useESLint) return; + const useOfficialESLintConfig = answers.eslintConfig === "official"; + // Only generate ESLint 9 config for custom config + if (useOfficialESLintConfig) return; + + const usePrettier = answers.tools && answers.tools.indexOf("Prettier") > -1; + const useReact = answers.adminUi === "react" || answers.tabReact === "yes"; + const isWidget = answers.features && answers.features.indexOf("vis") > -1; + + // Build base config + let config = `import js from '@eslint/js';`; + + if (useReact) { + config += ` +import react from 'eslint-plugin-react';`; + } + + config += ` + +export default [ + js.configs.recommended, + { + files: ['**/*.js', '**/*.jsx'], + languageOptions: { + ecmaVersion: 'latest', + sourceType: 'module', + globals: { + 'process': 'readonly', + 'Buffer': 'readonly', + '__dirname': 'readonly', + '__filename': 'readonly', + 'module': 'readonly', + 'require': 'readonly', + 'exports': 'readonly', + 'global': 'readonly', + 'console': 'readonly', + 'setTimeout': 'readonly', + 'setInterval': 'readonly', + 'clearTimeout': 'readonly', + 'clearInterval': 'readonly', + },${useReact ? ` + parserOptions: { + ecmaFeatures: { + jsx: true, + }, + },` : ""} + }, + plugins: {${useReact ? ` + react,` : ""} + }, + rules: { + ...js.configs.recommended.rules,${useReact ? ` + ...react.configs.recommended.rules, + 'react/react-in-jsx-scope': 'off',` : ""}${!usePrettier ? ` + 'indent': [ + 'error', + ${answers.indentation === "Space (4)" ? "4" : "'tab'"}, + { + 'SwitchCase': 1 + } + ], + 'quotes': [ + 'error', + ${answers.quotes === "single" ? `'single'` : `'double'`} + ],` : ""} + },${useReact ? ` + settings: { + react: { + version: 'detect', + }, + },` : ""} + },`; + + // Add widgets configuration if VIS is used + if (isWidget) { + config += ` + { + files: ['widgets/**/*.js'], + languageOptions: { + ecmaVersion: 5, + sourceType: 'script', + globals: { + '$': 'readonly', + 'jQuery': 'readonly', + 'vis': 'readonly', + }, + }, + rules: { + // Visualizations may run in very old browsers + 'no-var': 'off', + 'prefer-const': 'off', + 'prefer-arrow-callback': 'off', + // The example code does not use some parameters + 'no-unused-vars': [ + 'warn', + { + 'ignoreRestSiblings': true, + 'argsIgnorePattern': '^_' + } + ] + } + },`; + } + + config += ` + { + ignores: [ + '.dev-server/', + '.vscode/', + '*.test.js', + 'test/**/*.js', + '*.config.mjs', + 'build/', + 'dist/', + 'admin/build/', + 'admin/words.js', + 'admin/admin.d.ts', + 'admin/blockly.js', + '**/adapter-config.d.ts', + ], + }, +]; +`; + + return config.trim(); +}; + +templateFunction.customPath = "eslint.config.mjs"; +export = templateFunction; \ No newline at end of file diff --git a/templates/eslint.config.custom.mjs.ts b/templates/eslint.config.custom.mjs.ts new file mode 100644 index 000000000..d56a9f818 --- /dev/null +++ b/templates/eslint.config.custom.mjs.ts @@ -0,0 +1,128 @@ +import type { TemplateFunction } from "../src/lib/createAdapter"; + +const templateFunction: TemplateFunction = answers => { + + // This version is intended for use in TS projects + if (answers.language !== "TypeScript") return; + + const useESLint = answers.tools && answers.tools.indexOf("ESLint") > -1; + if (!useESLint) return; + const useOfficialESLintConfig = answers.eslintConfig === "official"; + // Only generate ESLint 9 config for custom config + if (useOfficialESLintConfig) return; + + const usePrettier = answers.tools && answers.tools.indexOf("Prettier") > -1; + const useReact = answers.adminUi === "react" || answers.tabReact === "yes"; + const isWidget = answers.features && answers.features.indexOf("vis") > -1; + + // Build base config + let config = `import js from '@eslint/js'; +import tseslint from '@typescript-eslint/eslint-plugin'; +import tsparser from '@typescript-eslint/parser';`; + + if (useReact) { + config += ` +import react from 'eslint-plugin-react';`; + } + + config += ` + +export default [ + js.configs.recommended, + { + files: ['**/*.ts', '**/*.tsx'], + languageOptions: { + parser: tsparser, + parserOptions: { + ecmaVersion: 'latest', + sourceType: 'module', + project: ${useReact ? `['./tsconfig.json', './admin/tsconfig.json']` : `'./tsconfig.json'`},${useReact ? ` + ecmaFeatures: { + jsx: true, + },` : ""} + }, + }, + plugins: { + '@typescript-eslint': tseslint,${useReact ? ` + react,` : ""} + }, + rules: { + ...tseslint.configs.recommended.rules,${useReact ? ` + ...react.configs.recommended.rules, + 'react/react-in-jsx-scope': 'off',` : ""}${!usePrettier ? ` + 'indent': 'off', + '@typescript-eslint/indent': [ + 'error', + ${answers.indentation === "Tab" ? `'tab'` : "4"}, + { + 'SwitchCase': 1 + } + ], + 'quotes': [ + 'error', + ${answers.quotes === "single" ? `'single'` : `'double'`} + ],` : ""} + },${useReact ? ` + settings: { + react: { + version: 'detect', + }, + },` : ""} + },`; + + // Add widgets configuration if VIS is used + if (isWidget) { + config += ` + { + files: ['widgets/**/*.js'], + languageOptions: { + ecmaVersion: 5, + sourceType: 'script', + globals: { + '$': 'readonly', + 'jQuery': 'readonly', + 'vis': 'readonly', + }, + }, + rules: { + // Visualizations may run in very old browsers + 'no-var': 'off', + 'prefer-const': 'off', + 'prefer-arrow-callback': 'off', + // The example code does not use some parameters + 'no-unused-vars': [ + 'warn', + { + 'ignoreRestSiblings': true, + 'argsIgnorePattern': '^_' + } + ] + } + },`; + } + + config += ` + { + ignores: [ + '.dev-server/', + '.vscode/', + '*.test.js', + 'test/**/*.js', + '*.config.mjs', + 'build/', + 'dist/', + 'admin/build/', + 'admin/words.js', + 'admin/admin.d.ts', + 'admin/blockly.js', + '**/adapter-config.d.ts', + ], + }, +]; +`; + + return config.trim(); +}; + +templateFunction.customPath = "eslint.config.mjs"; +export = templateFunction; \ No newline at end of file diff --git a/templates/eslint.config.mjs.ts b/templates/eslint.config.mjs.ts index 1c297cd96..9cf7159d0 100644 --- a/templates/eslint.config.mjs.ts +++ b/templates/eslint.config.mjs.ts @@ -22,7 +22,7 @@ const templateFunction: TemplateFunction = answers => { "'admin/admin.d.ts'", "'admin/blockly.js'", "'**/adapter-config.d.ts'", - "'widgets/**/*.js'", // Ignore VIS widget files + "'widgets/**/*.js'", // Keep ignoring VIS widget files for official config ]; if (useReact) { diff --git a/templates/index.ts b/templates/index.ts index 2c251592e..cc35a8d74 100644 --- a/templates/index.ts +++ b/templates/index.ts @@ -72,6 +72,8 @@ const templates: { name: string, templateFunction: TemplateFunction }[] = [ { name: "admin/tab_m.html.ts", templateFunction: require("./admin/tab_m.html") }, { name: "admin/tsconfig.json.ts", templateFunction: require("./admin/tsconfig.json") }, { name: "admin/words.js.ts", templateFunction: require("./admin/words.js") }, + { name: "eslint.config.custom.js.mjs.ts", templateFunction: require("./eslint.config.custom.js.mjs") }, + { name: "eslint.config.custom.mjs.ts", templateFunction: require("./eslint.config.custom.mjs") }, { name: "eslint.config.mjs.ts", templateFunction: require("./eslint.config.mjs") }, { name: "io-package.json.ts", templateFunction: require("./io-package.json") }, { name: "lib/adapter-config.dts.ts", templateFunction: require("./lib/adapter-config.dts") }, diff --git a/templates/package.json.ts b/templates/package.json.ts index 104c62dd7..2d18c4a82 100644 --- a/templates/package.json.ts +++ b/templates/package.json.ts @@ -81,13 +81,13 @@ const templateFunction: TemplateFunction = async answers => { "@iobroker/eslint-config", ] : []), ...((useESLint && !useOfficialESLintConfig) ? [ - // https://github.com/ioBroker/create-adapter/pull/1099#issuecomment-2042287875 - // Need to stay on ESLint v8 until typescript-eslint is compatible with ESLint v9 - "eslint@8" + // Upgrade to ESLint 9 for custom configuration + "eslint@^9", + "@eslint/js@^9", ] : []), ...((useESLint && !useOfficialESLintConfig && useTypeScript) ? [ - "@typescript-eslint/eslint-plugin@7", - "@typescript-eslint/parser@7", + "@typescript-eslint/eslint-plugin@^8", + "@typescript-eslint/parser@^8", ] : []), ...((useESLint && !useOfficialESLintConfig && useReact) ? [ "eslint-plugin-react", @@ -197,17 +197,8 @@ const templateFunction: TemplateFunction = async answers => { npmScripts["coverage"] = "nyc npm run test:ts"; } if (useESLint) { - if (useOfficialESLintConfig) { - // Use the new ESLint 9 format for official config - npmScripts["lint"] = "eslint -c eslint.config.mjs ."; - } else { - // Use the legacy format for custom config - if (useTypeScript) { - npmScripts["lint"] = `eslint --ext .ts${useReact ? ",.tsx" : ""} src/${useReact ? " admin/src/" : ""}`; - } else { - npmScripts["lint"] = `eslint${useReact ? " --ext .js,.jsx" : ""} .`; - } - } + // Both official and custom configs now use ESLint 9 flat config format + npmScripts["lint"] = "eslint -c eslint.config.mjs ."; } } else if (isWidget) { npmScripts["test:package"] = "mocha test/package --exit"; diff --git a/templates/widgets/_eslintrc.json.ts b/templates/widgets/_eslintrc.json.ts index 8c181cef8..e7a2a32e2 100644 --- a/templates/widgets/_eslintrc.json.ts +++ b/templates/widgets/_eslintrc.json.ts @@ -5,6 +5,9 @@ const templateFunction: TemplateFunction = answers => { const isWidget = answers.features.indexOf("vis") > -1; if (!isWidget) return; + // Widget ESLint config is now included in main eslint.config.mjs - no separate config needed + return; + const template = ` { "env": { diff --git a/test/baselines/ReleaseScript_JS/package.json b/test/baselines/ReleaseScript_JS/package.json index ae7e691c9..f79311ab7 100644 --- a/test/baselines/ReleaseScript_JS/package.json +++ b/test/baselines/ReleaseScript_JS/package.json @@ -30,9 +30,10 @@ "@alcalzone/release-script-plugin-iobroker": "^3.7.2", "@alcalzone/release-script-plugin-license": "^3.7.0", "@alcalzone/release-script-plugin-manual-review": "^3.7.0", + "@eslint/js": "^9.36.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", - "eslint": "^8.57.1" + "eslint": "^9.36.0" }, "main": "main.js", "files": [ @@ -49,7 +50,7 @@ "test:package": "mocha test/package --exit", "test:integration": "mocha test/integration --exit", "test": "npm run test:js && npm run test:package", - "lint": "eslint .", + "lint": "eslint -c eslint.config.mjs .", "translate": "translate-adapter", "release": "release-script" }, diff --git a/test/baselines/ReleaseScript_TS/package.json b/test/baselines/ReleaseScript_TS/package.json index 2a3d9f068..7dc241a85 100644 --- a/test/baselines/ReleaseScript_TS/package.json +++ b/test/baselines/ReleaseScript_TS/package.json @@ -30,13 +30,14 @@ "@alcalzone/release-script-plugin-iobroker": "^3.7.2", "@alcalzone/release-script-plugin-license": "^3.7.0", "@alcalzone/release-script-plugin-manual-review": "^3.7.0", + "@eslint/js": "^9.36.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", "@types/node": "^20.19.17", - "@typescript-eslint/eslint-plugin": "^7.18.0", - "@typescript-eslint/parser": "^7.18.0", - "eslint": "^8.57.1", + "@typescript-eslint/eslint-plugin": "^8.44.1", + "@typescript-eslint/parser": "^8.44.1", + "eslint": "^9.36.0", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", @@ -63,7 +64,7 @@ "test:integration": "mocha test/integration --exit", "test": "npm run test:ts && npm run test:package", "check": "tsc --noEmit", - "lint": "eslint --ext .ts src/", + "lint": "eslint -c eslint.config.mjs .", "translate": "translate-adapter", "release": "release-script" }, diff --git a/test/baselines/TS_DoubleQuotes/.eslintignore b/test/baselines/TS_DoubleQuotes/.eslintignore deleted file mode 100644 index 0e24f5220..000000000 --- a/test/baselines/TS_DoubleQuotes/.eslintignore +++ /dev/null @@ -1,4 +0,0 @@ -admin/build/ -build/ -**/.eslintrc.js -admin/words.js \ No newline at end of file diff --git a/test/baselines/TS_DoubleQuotes/.eslintrc.js b/test/baselines/TS_DoubleQuotes/.eslintrc.js deleted file mode 100644 index d050da9cc..000000000 --- a/test/baselines/TS_DoubleQuotes/.eslintrc.js +++ /dev/null @@ -1,78 +0,0 @@ -module.exports = { - root: true, // Don't look outside this project for inherited configs - parser: "@typescript-eslint/parser", // Specifies the ESLint parser - parserOptions: { - ecmaVersion: "latest", // Allows for the parsing of modern ECMAScript features - sourceType: "module", // Allows for the use of imports - project: ["./tsconfig.json", "./admin/tsconfig.json"], - ecmaFeatures: { - jsx: true, - }, - }, - extends: [ - "plugin:@typescript-eslint/recommended", // Uses the recommended rules from the @typescript-eslint/eslint-plugin - "plugin:react/recommended", // Supports React JSX - ], - plugins: ["react"], - settings: { - react: { - version: "detect", - }, - }, - rules: { - "indent": "off", - "@typescript-eslint/indent": [ - "error", - "tab", - { - "SwitchCase": 1 - } - ], - "quotes": [ - "error", - "double", - { - "avoidEscape": true, - "allowTemplateLiterals": true - } - ], - "@typescript-eslint/no-parameter-properties": "off", - "@typescript-eslint/no-explicit-any": "off", - "@typescript-eslint/no-use-before-define": [ - "error", - { - functions: false, - typedefs: false, - classes: false, - }, - ], - "@typescript-eslint/no-unused-vars": [ - "error", - { - ignoreRestSiblings: true, - argsIgnorePattern: "^_", - }, - ], - "@typescript-eslint/explicit-function-return-type": [ - "warn", - { - allowExpressions: true, - allowTypedFunctionExpressions: true, - }, - ], - "@typescript-eslint/no-object-literal-type-assertion": "off", - "@typescript-eslint/interface-name-prefix": "off", - "@typescript-eslint/no-non-null-assertion": "off", // This is necessary for Map.has()/get()! - "no-var": "error", - "prefer-const": "error", - "no-trailing-spaces": "error", - }, - overrides: [ - { - files: ["*.test.ts", "*.tsx"], - rules: { - "@typescript-eslint/explicit-function-return-type": "off", - }, - }, - ], -}; \ No newline at end of file diff --git a/test/baselines/TS_Prettier/.eslintignore b/test/baselines/TS_Prettier/.eslintignore deleted file mode 100644 index de91f9633..000000000 --- a/test/baselines/TS_Prettier/.eslintignore +++ /dev/null @@ -1,4 +0,0 @@ -build/ -.prettierrc.js -**/.eslintrc.js -admin/words.js \ No newline at end of file diff --git a/test/baselines/TS_Prettier/.eslintrc.js b/test/baselines/TS_Prettier/.eslintrc.js deleted file mode 100644 index b9a8c2f71..000000000 --- a/test/baselines/TS_Prettier/.eslintrc.js +++ /dev/null @@ -1,54 +0,0 @@ -module.exports = { - root: true, // Don't look outside this project for inherited configs - parser: "@typescript-eslint/parser", // Specifies the ESLint parser - parserOptions: { - ecmaVersion: "latest", // Allows for the parsing of modern ECMAScript features - sourceType: "module", // Allows for the use of imports - project: "./tsconfig.json", - }, - extends: [ - "plugin:@typescript-eslint/recommended", // Uses the recommended rules from the @typescript-eslint/eslint-plugin - "plugin:prettier/recommended", // Enables eslint-plugin-prettier and displays prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array. - ], - plugins: [], - rules: { - "@typescript-eslint/no-parameter-properties": "off", - "@typescript-eslint/no-explicit-any": "off", - "@typescript-eslint/no-use-before-define": [ - "error", - { - functions: false, - typedefs: false, - classes: false, - }, - ], - "@typescript-eslint/no-unused-vars": [ - "error", - { - ignoreRestSiblings: true, - argsIgnorePattern: "^_", - }, - ], - "@typescript-eslint/explicit-function-return-type": [ - "warn", - { - allowExpressions: true, - allowTypedFunctionExpressions: true, - }, - ], - "@typescript-eslint/no-object-literal-type-assertion": "off", - "@typescript-eslint/interface-name-prefix": "off", - "@typescript-eslint/no-non-null-assertion": "off", // This is necessary for Map.has()/get()! - "no-var": "error", - "prefer-const": "error", - "no-trailing-spaces": "error", - }, - overrides: [ - { - files: ["*.test.ts"], - rules: { - "@typescript-eslint/explicit-function-return-type": "off", - }, - }, - ], -}; diff --git a/test/baselines/TS_Prettier/package.json b/test/baselines/TS_Prettier/package.json index 20daf7580..bb99b9698 100644 --- a/test/baselines/TS_Prettier/package.json +++ b/test/baselines/TS_Prettier/package.json @@ -26,15 +26,16 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { + "@eslint/js": "^9.36.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", "@types/node": "^20.19.17", - "@typescript-eslint/eslint-plugin": "^7.18.0", - "@typescript-eslint/parser": "^7.18.0", + "@typescript-eslint/eslint-plugin": "^8.44.1", + "@typescript-eslint/parser": "^8.44.1", "eslint-config-prettier": "^10.1.8", "eslint-plugin-prettier": "^5.5.4", - "eslint": "^8.57.1", + "eslint": "^9.36.0", "prettier": "^3.6.2", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", @@ -62,7 +63,7 @@ "test:integration": "mocha test/integration --exit", "test": "npm run test:ts && npm run test:package", "check": "tsc --noEmit", - "lint": "eslint --ext .ts src/", + "lint": "eslint -c eslint.config.mjs .", "translate": "translate-adapter" }, "bugs": { diff --git a/test/baselines/TS_SingleQuotes/.eslintignore b/test/baselines/TS_SingleQuotes/.eslintignore deleted file mode 100644 index 0e24f5220..000000000 --- a/test/baselines/TS_SingleQuotes/.eslintignore +++ /dev/null @@ -1,4 +0,0 @@ -admin/build/ -build/ -**/.eslintrc.js -admin/words.js \ No newline at end of file diff --git a/test/baselines/TS_SingleQuotes/.eslintrc.js b/test/baselines/TS_SingleQuotes/.eslintrc.js deleted file mode 100644 index 4aad74c97..000000000 --- a/test/baselines/TS_SingleQuotes/.eslintrc.js +++ /dev/null @@ -1,78 +0,0 @@ -module.exports = { - root: true, // Don't look outside this project for inherited configs - parser: '@typescript-eslint/parser', // Specifies the ESLint parser - parserOptions: { - ecmaVersion: 'latest', // Allows for the parsing of modern ECMAScript features - sourceType: 'module', // Allows for the use of imports - project: ['./tsconfig.json', './admin/tsconfig.json'], - ecmaFeatures: { - jsx: true, - }, - }, - extends: [ - 'plugin:@typescript-eslint/recommended', // Uses the recommended rules from the @typescript-eslint/eslint-plugin - 'plugin:react/recommended', // Supports React JSX - ], - plugins: ['react'], - settings: { - react: { - version: 'detect', - }, - }, - rules: { - 'indent': 'off', - '@typescript-eslint/indent': [ - 'error', - 'tab', - { - 'SwitchCase': 1 - } - ], - 'quotes': [ - 'error', - 'single', - { - 'avoidEscape': true, - 'allowTemplateLiterals': true - } - ], - '@typescript-eslint/no-parameter-properties': 'off', - '@typescript-eslint/no-explicit-any': 'off', - '@typescript-eslint/no-use-before-define': [ - 'error', - { - functions: false, - typedefs: false, - classes: false, - }, - ], - '@typescript-eslint/no-unused-vars': [ - 'error', - { - ignoreRestSiblings: true, - argsIgnorePattern: '^_', - }, - ], - '@typescript-eslint/explicit-function-return-type': [ - 'warn', - { - allowExpressions: true, - allowTypedFunctionExpressions: true, - }, - ], - '@typescript-eslint/no-object-literal-type-assertion': 'off', - '@typescript-eslint/interface-name-prefix': 'off', - '@typescript-eslint/no-non-null-assertion': 'off', // This is necessary for Map.has()/get()! - 'no-var': 'error', - 'prefer-const': 'error', - 'no-trailing-spaces': 'error', - }, - overrides: [ - { - files: ['*.test.ts', '*.tsx'], - rules: { - '@typescript-eslint/explicit-function-return-type': 'off', - }, - }, - ], -}; \ No newline at end of file diff --git a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/.eslintignore b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/.eslintignore deleted file mode 100644 index 396d8e174..000000000 --- a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -**/.eslintrc.js -admin/words.js \ No newline at end of file diff --git a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/.eslintrc.json b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/.eslintrc.json deleted file mode 100644 index 6e461e9da..000000000 --- a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/.eslintrc.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "root": true, - "env": { - "es6": true, - "node": true, - "mocha": true - }, - "extends": [ - "eslint:recommended" - ], - "plugins": [], - "rules": { - "indent": [ - "error", - 4, - { - "SwitchCase": 1 - } - ], - "no-console": "off", - "no-unused-vars": [ - "error", - { - "ignoreRestSiblings": true, - "argsIgnorePattern": "^_" - } - ], - "no-var": "error", - "no-trailing-spaces": "error", - "prefer-const": "error", - "quotes": [ - "error", - "single", - { - "avoidEscape": true, - "allowTemplateLiterals": true - } - ], - "semi": [ - "error", - "always" - ] - }, - "parserOptions": { - "ecmaVersion": "latest" - } -} \ No newline at end of file diff --git a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/eslint.config.mjs b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/eslint.config.mjs new file mode 100644 index 000000000..3a02aa3ac --- /dev/null +++ b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/eslint.config.mjs @@ -0,0 +1,59 @@ +import js from '@eslint/js'; + +export default [ + js.configs.recommended, + { + files: ['**/*.js', '**/*.jsx'], + languageOptions: { + ecmaVersion: 'latest', + sourceType: 'module', + globals: { + 'process': 'readonly', + 'Buffer': 'readonly', + '__dirname': 'readonly', + '__filename': 'readonly', + 'module': 'readonly', + 'require': 'readonly', + 'exports': 'readonly', + 'global': 'readonly', + 'console': 'readonly', + 'setTimeout': 'readonly', + 'setInterval': 'readonly', + 'clearTimeout': 'readonly', + 'clearInterval': 'readonly', + }, + }, + plugins: { + }, + rules: { + ...js.configs.recommended.rules, + 'indent': [ + 'error', + 4, + { + 'SwitchCase': 1 + } + ], + 'quotes': [ + 'error', + 'single' + ], + }, + }, + { + ignores: [ + '.dev-server/', + '.vscode/', + '*.test.js', + 'test/**/*.js', + '*.config.mjs', + 'build/', + 'dist/', + 'admin/build/', + 'admin/words.js', + 'admin/admin.d.ts', + 'admin/blockly.js', + '**/adapter-config.d.ts', + ], + }, +]; \ No newline at end of file diff --git a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/package.json b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/package.json index 0e436afe8..f0d52f0bd 100644 --- a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/package.json +++ b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/package.json @@ -26,11 +26,12 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { + "@eslint/js": "^9.36.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", "@types/node": "^20.19.17", - "eslint": "^8.57.1", + "eslint": "^9.36.0", "typescript": "~5.9.2" }, "main": "main.js", @@ -49,7 +50,7 @@ "test:integration": "mocha test/integration --exit", "test": "npm run test:js && npm run test:package", "check": "tsc --noEmit -p tsconfig.check.json", - "lint": "eslint .", + "lint": "eslint -c eslint.config.mjs .", "translate": "translate-adapter" }, "bugs": { diff --git a/test/baselines/adapter_JS_React/.eslintignore b/test/baselines/adapter_JS_React/.eslintignore deleted file mode 100644 index 85e556158..000000000 --- a/test/baselines/adapter_JS_React/.eslintignore +++ /dev/null @@ -1,3 +0,0 @@ -admin/build/ -**/.eslintrc.js -admin/words.js \ No newline at end of file diff --git a/test/baselines/adapter_JS_React/eslint.config.mjs b/test/baselines/adapter_JS_React/eslint.config.mjs new file mode 100644 index 000000000..93acf39a2 --- /dev/null +++ b/test/baselines/adapter_JS_React/eslint.config.mjs @@ -0,0 +1,73 @@ +import js from '@eslint/js'; +import react from 'eslint-plugin-react'; + +export default [ + js.configs.recommended, + { + files: ['**/*.js', '**/*.jsx'], + languageOptions: { + ecmaVersion: 'latest', + sourceType: 'module', + globals: { + 'process': 'readonly', + 'Buffer': 'readonly', + '__dirname': 'readonly', + '__filename': 'readonly', + 'module': 'readonly', + 'require': 'readonly', + 'exports': 'readonly', + 'global': 'readonly', + 'console': 'readonly', + 'setTimeout': 'readonly', + 'setInterval': 'readonly', + 'clearTimeout': 'readonly', + 'clearInterval': 'readonly', + }, + parserOptions: { + ecmaFeatures: { + jsx: true, + }, + }, + }, + plugins: { + react, + }, + rules: { + ...js.configs.recommended.rules, + ...react.configs.recommended.rules, + 'react/react-in-jsx-scope': 'off', + 'indent': [ + 'error', + 'tab', + { + 'SwitchCase': 1 + } + ], + 'quotes': [ + 'error', + 'double' + ], + }, + settings: { + react: { + version: 'detect', + }, + }, + }, + { + ignores: [ + '.dev-server/', + '.vscode/', + '*.test.js', + 'test/**/*.js', + '*.config.mjs', + 'build/', + 'dist/', + 'admin/build/', + 'admin/words.js', + 'admin/admin.d.ts', + 'admin/blockly.js', + '**/adapter-config.d.ts', + ], + }, +]; \ No newline at end of file diff --git a/test/baselines/adapter_JS_React/package.json b/test/baselines/adapter_JS_React/package.json index 62e1d65dc..17da166f9 100644 --- a/test/baselines/adapter_JS_React/package.json +++ b/test/baselines/adapter_JS_React/package.json @@ -26,12 +26,13 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { + "@eslint/js": "^9.36.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/adapter-react": "2.0.22", "@iobroker/testing": "^5.1.1", "@material-ui/core": "^4.12.4", "eslint-plugin-react": "^7.37.5", - "eslint": "^8.57.1", + "eslint": "^9.36.0", "react-dom": "^17.0.2", "react": "^17.0.2" }, @@ -57,7 +58,7 @@ "test:package": "mocha test/package --exit", "test:integration": "mocha test/integration --exit", "test": "npm run test:js && npm run test:package", - "lint": "eslint --ext .js,.jsx .", + "lint": "eslint -c eslint.config.mjs .", "translate": "translate-adapter" }, "bugs": { diff --git a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/.eslintignore b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/.eslintignore deleted file mode 100644 index d7b786517..000000000 --- a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/.eslintignore +++ /dev/null @@ -1,3 +0,0 @@ -build/ -**/.eslintrc.js -admin/words.js \ No newline at end of file diff --git a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/.eslintrc.js b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/.eslintrc.js deleted file mode 100644 index 7f997db7c..000000000 --- a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/.eslintrc.js +++ /dev/null @@ -1,69 +0,0 @@ -module.exports = { - root: true, // Don't look outside this project for inherited configs - parser: "@typescript-eslint/parser", // Specifies the ESLint parser - parserOptions: { - ecmaVersion: "latest", // Allows for the parsing of modern ECMAScript features - sourceType: "module", // Allows for the use of imports - project: "./tsconfig.json", - }, - extends: [ - "plugin:@typescript-eslint/recommended", // Uses the recommended rules from the @typescript-eslint/eslint-plugin - ], - plugins: [], - rules: { - "indent": "off", - "@typescript-eslint/indent": [ - "error", - "tab", - { - "SwitchCase": 1 - } - ], - "quotes": [ - "error", - "double", - { - "avoidEscape": true, - "allowTemplateLiterals": true - } - ], - "@typescript-eslint/no-parameter-properties": "off", - "@typescript-eslint/no-explicit-any": "off", - "@typescript-eslint/no-use-before-define": [ - "error", - { - functions: false, - typedefs: false, - classes: false, - }, - ], - "@typescript-eslint/no-unused-vars": [ - "error", - { - ignoreRestSiblings: true, - argsIgnorePattern: "^_", - }, - ], - "@typescript-eslint/explicit-function-return-type": [ - "warn", - { - allowExpressions: true, - allowTypedFunctionExpressions: true, - }, - ], - "@typescript-eslint/no-object-literal-type-assertion": "off", - "@typescript-eslint/interface-name-prefix": "off", - "@typescript-eslint/no-non-null-assertion": "off", // This is necessary for Map.has()/get()! - "no-var": "error", - "prefer-const": "error", - "no-trailing-spaces": "error", - }, - overrides: [ - { - files: ["*.test.ts"], - rules: { - "@typescript-eslint/explicit-function-return-type": "off", - }, - }, - ], -}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/eslint.config.mjs b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/eslint.config.mjs new file mode 100644 index 000000000..b2577b558 --- /dev/null +++ b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/eslint.config.mjs @@ -0,0 +1,52 @@ +import js from '@eslint/js'; +import tseslint from '@typescript-eslint/eslint-plugin'; +import tsparser from '@typescript-eslint/parser'; + +export default [ + js.configs.recommended, + { + files: ['**/*.ts', '**/*.tsx'], + languageOptions: { + parser: tsparser, + parserOptions: { + ecmaVersion: 'latest', + sourceType: 'module', + project: './tsconfig.json', + }, + }, + plugins: { + '@typescript-eslint': tseslint, + }, + rules: { + ...tseslint.configs.recommended.rules, + 'indent': 'off', + '@typescript-eslint/indent': [ + 'error', + 'tab', + { + 'SwitchCase': 1 + } + ], + 'quotes': [ + 'error', + 'double' + ], + }, + }, + { + ignores: [ + '.dev-server/', + '.vscode/', + '*.test.js', + 'test/**/*.js', + '*.config.mjs', + 'build/', + 'dist/', + 'admin/build/', + 'admin/words.js', + 'admin/admin.d.ts', + 'admin/blockly.js', + '**/adapter-config.d.ts', + ], + }, +]; \ No newline at end of file diff --git a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/package.json b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/package.json index 790cee445..6a3f90d21 100644 --- a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/package.json +++ b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/package.json @@ -26,13 +26,14 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { + "@eslint/js": "^9.36.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", "@types/node": "^20.19.17", - "@typescript-eslint/eslint-plugin": "^7.18.0", - "@typescript-eslint/parser": "^7.18.0", - "eslint": "^8.57.1", + "@typescript-eslint/eslint-plugin": "^8.44.1", + "@typescript-eslint/parser": "^8.44.1", + "eslint": "^9.36.0", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", @@ -59,7 +60,7 @@ "test:integration": "mocha test/integration --exit", "test": "npm run test:ts && npm run test:package", "check": "tsc --noEmit", - "lint": "eslint --ext .ts src/", + "lint": "eslint -c eslint.config.mjs .", "translate": "translate-adapter" }, "bugs": { diff --git a/test/baselines/adapter_TS_React/.eslintignore b/test/baselines/adapter_TS_React/.eslintignore deleted file mode 100644 index 0e24f5220..000000000 --- a/test/baselines/adapter_TS_React/.eslintignore +++ /dev/null @@ -1,4 +0,0 @@ -admin/build/ -build/ -**/.eslintrc.js -admin/words.js \ No newline at end of file diff --git a/test/baselines/adapter_TS_React/.eslintrc.js b/test/baselines/adapter_TS_React/.eslintrc.js deleted file mode 100644 index d050da9cc..000000000 --- a/test/baselines/adapter_TS_React/.eslintrc.js +++ /dev/null @@ -1,78 +0,0 @@ -module.exports = { - root: true, // Don't look outside this project for inherited configs - parser: "@typescript-eslint/parser", // Specifies the ESLint parser - parserOptions: { - ecmaVersion: "latest", // Allows for the parsing of modern ECMAScript features - sourceType: "module", // Allows for the use of imports - project: ["./tsconfig.json", "./admin/tsconfig.json"], - ecmaFeatures: { - jsx: true, - }, - }, - extends: [ - "plugin:@typescript-eslint/recommended", // Uses the recommended rules from the @typescript-eslint/eslint-plugin - "plugin:react/recommended", // Supports React JSX - ], - plugins: ["react"], - settings: { - react: { - version: "detect", - }, - }, - rules: { - "indent": "off", - "@typescript-eslint/indent": [ - "error", - "tab", - { - "SwitchCase": 1 - } - ], - "quotes": [ - "error", - "double", - { - "avoidEscape": true, - "allowTemplateLiterals": true - } - ], - "@typescript-eslint/no-parameter-properties": "off", - "@typescript-eslint/no-explicit-any": "off", - "@typescript-eslint/no-use-before-define": [ - "error", - { - functions: false, - typedefs: false, - classes: false, - }, - ], - "@typescript-eslint/no-unused-vars": [ - "error", - { - ignoreRestSiblings: true, - argsIgnorePattern: "^_", - }, - ], - "@typescript-eslint/explicit-function-return-type": [ - "warn", - { - allowExpressions: true, - allowTypedFunctionExpressions: true, - }, - ], - "@typescript-eslint/no-object-literal-type-assertion": "off", - "@typescript-eslint/interface-name-prefix": "off", - "@typescript-eslint/no-non-null-assertion": "off", // This is necessary for Map.has()/get()! - "no-var": "error", - "prefer-const": "error", - "no-trailing-spaces": "error", - }, - overrides: [ - { - files: ["*.test.ts", "*.tsx"], - rules: { - "@typescript-eslint/explicit-function-return-type": "off", - }, - }, - ], -}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_React/eslint.config.mjs b/test/baselines/adapter_TS_React/eslint.config.mjs new file mode 100644 index 000000000..bb30fb686 --- /dev/null +++ b/test/baselines/adapter_TS_React/eslint.config.mjs @@ -0,0 +1,64 @@ +import js from '@eslint/js'; +import tseslint from '@typescript-eslint/eslint-plugin'; +import tsparser from '@typescript-eslint/parser'; +import react from 'eslint-plugin-react'; + +export default [ + js.configs.recommended, + { + files: ['**/*.ts', '**/*.tsx'], + languageOptions: { + parser: tsparser, + parserOptions: { + ecmaVersion: 'latest', + sourceType: 'module', + project: ['./tsconfig.json', './admin/tsconfig.json'], + ecmaFeatures: { + jsx: true, + }, + }, + }, + plugins: { + '@typescript-eslint': tseslint, + react, + }, + rules: { + ...tseslint.configs.recommended.rules, + ...react.configs.recommended.rules, + 'react/react-in-jsx-scope': 'off', + 'indent': 'off', + '@typescript-eslint/indent': [ + 'error', + 'tab', + { + 'SwitchCase': 1 + } + ], + 'quotes': [ + 'error', + 'double' + ], + }, + settings: { + react: { + version: 'detect', + }, + }, + }, + { + ignores: [ + '.dev-server/', + '.vscode/', + '*.test.js', + 'test/**/*.js', + '*.config.mjs', + 'build/', + 'dist/', + 'admin/build/', + 'admin/words.js', + 'admin/admin.d.ts', + 'admin/blockly.js', + '**/adapter-config.d.ts', + ], + }, +]; \ No newline at end of file diff --git a/test/baselines/adapter_TS_React/package.json b/test/baselines/adapter_TS_React/package.json index 343402f90..6a741c48d 100644 --- a/test/baselines/adapter_TS_React/package.json +++ b/test/baselines/adapter_TS_React/package.json @@ -26,6 +26,7 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { + "@eslint/js": "^9.36.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/adapter-react": "2.0.22", "@iobroker/testing": "^5.1.1", @@ -34,10 +35,10 @@ "@types/node": "^20.19.17", "@types/react-dom": "^17.0.26", "@types/react": "^17.0.88", - "@typescript-eslint/eslint-plugin": "^7.18.0", - "@typescript-eslint/parser": "^7.18.0", + "@typescript-eslint/eslint-plugin": "^8.44.1", + "@typescript-eslint/parser": "^8.44.1", "eslint-plugin-react": "^7.37.5", - "eslint": "^8.57.1", + "eslint": "^9.36.0", "react-dom": "^17.0.2", "react": "^17.0.2", "rimraf": "^6.0.1", @@ -70,7 +71,7 @@ "test:integration": "mocha test/integration --exit", "test": "npm run test:ts && npm run test:package", "check": "tsc --noEmit && tsc --noEmit -p admin/tsconfig.json", - "lint": "eslint --ext .ts,.tsx src/ admin/src/", + "lint": "eslint -c eslint.config.mjs .", "translate": "translate-adapter" }, "bugs": { diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/.create-adapter.json b/test/baselines/adapter_TS_VIS_CustomESLint/.create-adapter.json new file mode 100644 index 000000000..42e1f8eb7 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/.create-adapter.json @@ -0,0 +1,40 @@ +{ + "cli": true, + "target": "directory", + "adapterName": "test-adapter", + "title": "Is used to test the creator", + "startMode": "daemon", + "features": [ + "adapter", + "vis" + ], + "connectionIndicator": "no", + "connectionType": "local", + "dataSource": "push", + "adminFeatures": [], + "type": "general", + "language": "TypeScript", + "adminUi": "html", + "tabReact": "no", + "releaseScript": "no", + "tools": [ + "ESLint" + ], + "eslintConfig": "custom", + "indentation": "Tab", + "quotes": "double", + "authorName": "Al Calzone", + "authorGithub": "AlCalzone", + "authorEmail": "al@calzo.ne", + "gitRemoteProtocol": "HTTPS", + "dependabot": "yes", + "gitCommit": "no", + "defaultBranch": "main", + "license": "MIT License", + "licenseInformation": { + "type": "free", + "license": "MIT" + }, + "widgetIsMainFunction": "main", + "creatorVersion": "2.6.5" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/.github/ISSUE_TEMPLATE/bug_report.md b/test/baselines/adapter_TS_VIS_CustomESLint/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 000000000..895613958 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,32 @@ +--- +name: Bug report +about: Something is not working as it should +title: '' +labels: '' +assignees: '' +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '...' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots & Logfiles** +If applicable, add screenshots and logfiles to help explain your problem. + +**Versions:** + - Adapter version: + - JS-Controller version: + - Node version: + - Operating system: + +**Additional context** +Add any other context about the problem here. diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/.github/ISSUE_TEMPLATE/config.yml b/test/baselines/adapter_TS_VIS_CustomESLint/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 000000000..d7cfe5940 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: ioBroker Community + url: https://forum.iobroker.net/ + about: Please ask and answer questions here. \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/.github/auto-merge.yml b/test/baselines/adapter_TS_VIS_CustomESLint/.github/auto-merge.yml new file mode 100644 index 000000000..4f6d185f0 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/.github/auto-merge.yml @@ -0,0 +1,17 @@ +# Configure here which dependency updates should be merged automatically. +# The recommended configuration is the following: +- match: + # Only merge patches for production dependencies + dependency_type: production + update_type: "semver:patch" +- match: + # Except for security fixes, here we allow minor patches + dependency_type: production + update_type: "security:minor" +- match: + # and development dependencies can have a minor update, too + dependency_type: development + update_type: "semver:minor" + +# The syntax is based on the legacy dependabot v1 automerged_updates syntax, see: +# https://dependabot.com/docs/config-file/#automerged_updates diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/.github/dependabot.yml b/test/baselines/adapter_TS_VIS_CustomESLint/.github/dependabot.yml new file mode 100644 index 000000000..c165a6a47 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/.github/dependabot.yml @@ -0,0 +1,22 @@ +version: 2 +updates: + - package-ecosystem: npm + directory: "/" + schedule: + interval: monthly + time: "04:00" + timezone: Europe/Berlin + open-pull-requests-limit: 5 + assignees: + - AlCalzone + versioning-strategy: increase + + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: monthly + time: "04:00" + timezone: Europe/Berlin + open-pull-requests-limit: 5 + assignees: + - AlCalzone diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/.github/workflows/dependabot-auto-merge.yml b/test/baselines/adapter_TS_VIS_CustomESLint/.github/workflows/dependabot-auto-merge.yml new file mode 100644 index 000000000..baeae23b5 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/.github/workflows/dependabot-auto-merge.yml @@ -0,0 +1,27 @@ +# Automatically merge Dependabot PRs when version comparison is within the range +# that is configured in .github/auto-merge.yml + +name: Auto-Merge Dependabot PRs + +on: + # WARNING: This needs to be run in the PR base, DO NOT build untrusted code in this action + # details under https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/ + pull_request_target: + +jobs: + auto-merge: + if: github.actor == 'dependabot[bot]' + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Check if PR should be auto-merged + uses: ahmadnassri/action-dependabot-auto-merge@v2 + with: + # In order to use this, you need to go to https://github.com/settings/tokens and + # create a Personal Access Token with the permission "public_repo". + # Enter this token in your repository settings under "Secrets" and name it AUTO_MERGE_TOKEN + github-token: ${{ secrets.AUTO_MERGE_TOKEN }} + # By default, squash and merge, so Github chooses nice commit messages + command: squash and merge diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/.github/workflows/test-and-release.yml b/test/baselines/adapter_TS_VIS_CustomESLint/.github/workflows/test-and-release.yml new file mode 100644 index 000000000..0c48ade1a --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/.github/workflows/test-and-release.yml @@ -0,0 +1,96 @@ +name: Test and Release + +# Run this job on all pushes and pull requests +# as well as tags with a semantic version +on: + push: + branches: + - "main" + tags: + # normal versions + - "v[0-9]+.[0-9]+.[0-9]+" + # pre-releases + - "v[0-9]+.[0-9]+.[0-9]+-**" + pull_request: {} + +# Cancel previous PR/branch runs when a new commit is pushed +concurrency: + group: ${{ github.ref }} + cancel-in-progress: true + +jobs: + # Performs quick checks before the expensive test runs + check-and-lint: + if: contains(github.event.head_commit.message, '[skip ci]') == false + + runs-on: ubuntu-latest + + steps: + - uses: ioBroker/testing-action-check@v1 + with: + node-version: '20.x' + # Uncomment the following line if your adapter cannot be installed using 'npm ci' + # install-command: 'npm install' + type-checking: true + lint: true + + # Runs adapter tests on all supported node versions and OSes + adapter-tests: + if: contains(github.event.head_commit.message, '[skip ci]') == false + + runs-on: ${{ matrix.os }} + strategy: + matrix: + node-version: [20.x, 22.x, 24.x] + os: [ubuntu-latest, windows-latest, macos-latest] + + steps: + - uses: ioBroker/testing-action-adapter@v1 + with: + node-version: ${{ matrix.node-version }} + os: ${{ matrix.os }} + # Uncomment the following line if your adapter cannot be installed using 'npm ci' + # install-command: 'npm install' + build: true + +# TODO: To enable automatic npm releases, create a token on npmjs.org +# Enter this token as a GitHub secret (with name NPM_TOKEN) in the repository options +# Then uncomment the following block: + +# # Deploys the final package to NPM +# deploy: +# needs: [check-and-lint, adapter-tests] +# +# # Trigger this step only when a commit on any branch is tagged with a version number +# if: | +# contains(github.event.head_commit.message, '[skip ci]') == false && +# github.event_name == 'push' && +# startsWith(github.ref, 'refs/tags/v') +# +# runs-on: ubuntu-latest +# +# # Write permissions are required to create Github releases +# permissions: +# contents: write +# +# steps: +# - uses: ioBroker/testing-action-deploy@v1 +# with: +# node-version: '20.x' +# # Uncomment the following line if your adapter cannot be installed using 'npm ci' +# # install-command: 'npm install' +# build: true +# npm-token: ${{ secrets.NPM_TOKEN }} +# github-token: ${{ secrets.GITHUB_TOKEN }} +# +# # When using Sentry for error reporting, Sentry can be informed about new releases +# # To enable create a API-Token in Sentry (User settings, API keys) +# # Enter this token as a GitHub secret (with name SENTRY_AUTH_TOKEN) in the repository options +# # Then uncomment and customize the following block: +# sentry: true +# sentry-token: ${{ secrets.SENTRY_AUTH_TOKEN }} +# sentry-project: "iobroker-test-adapter" +# sentry-version-prefix: "iobroker.test-adapter" +# sentry-sourcemap-paths: "build/" +# # If your sentry project is linked to a GitHub repository, you can enable the following option +# # sentry-github-integration: true diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/.gitignore b/test/baselines/adapter_TS_VIS_CustomESLint/.gitignore new file mode 100644 index 000000000..80c28aa9d --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/.gitignore @@ -0,0 +1,18 @@ +# No dot-directories except github/vscode +.*/ +!.vscode/ +!.github/ + +*.code-workspace +node_modules +nbproject + +# npm package files +iobroker.*.tgz + +Thumbs.db +.commitinfo + +# i18n intermediate files +admin/i18n/flat.txt +admin/i18n/*/flat.txt \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/.vscode/extensions.json b/test/baselines/adapter_TS_VIS_CustomESLint/.vscode/extensions.json new file mode 100644 index 000000000..a8d778499 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/.vscode/extensions.json @@ -0,0 +1,5 @@ +{ + "recommendations": [ + "dbaeumer.vscode-eslint" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/.vscode/settings.json b/test/baselines/adapter_TS_VIS_CustomESLint/.vscode/settings.json new file mode 100644 index 000000000..854736cc0 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/.vscode/settings.json @@ -0,0 +1,23 @@ +{ + "typescript.tsdk": "node_modules/typescript/lib", + "eslint.enable": true, + "json.schemas": [ + { + "fileMatch": [ + "io-package.json" + ], + "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.js-controller/master/schemas/io-package.json" + }, + { + "fileMatch": [ + "admin/jsonConfig.json", + "admin/jsonConfig.json5", + "admin/jsonCustom.json", + "admin/jsonCustom.json5", + "admin/jsonTab.json", + "admin/jsonTab.json5" + ], + "url": "https://raw.githubusercontent.com/ioBroker/ioBroker.admin/master/packages/jsonConfig/schemas/jsonConfig.json" + } + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/LICENSE b/test/baselines/adapter_TS_VIS_CustomESLint/LICENSE new file mode 100644 index 000000000..27c9a624d --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2025 Al Calzone + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/README.md b/test/baselines/adapter_TS_VIS_CustomESLint/README.md new file mode 100644 index 000000000..f57bba69c --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/README.md @@ -0,0 +1,132 @@ +![Logo](admin/test-adapter.png) +# ioBroker.test-adapter + +[![NPM version](https://img.shields.io/npm/v/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) +[![Downloads](https://img.shields.io/npm/dm/iobroker.test-adapter.svg)](https://www.npmjs.com/package/iobroker.test-adapter) +![Number of Installations](https://iobroker.live/badges/test-adapter-installed.svg) +![Current version in stable repository](https://iobroker.live/badges/test-adapter-stable.svg) + +[![NPM](https://nodei.co/npm/iobroker.test-adapter.png?downloads=true)](https://nodei.co/npm/iobroker.test-adapter/) + +**Tests:** ![Test and Release](https://github.com/AlCalzone/ioBroker.test-adapter/workflows/Test%20and%20Release/badge.svg) + +## test-adapter adapter for ioBroker + +Describe your project here + +## Developer manual +This section is intended for the developer. It can be deleted later. + +### DISCLAIMER + +Please make sure that you consider copyrights and trademarks when you use names or logos of a company and add a disclaimer to your README. +You can check other adapters for examples or ask in the developer community. Using a name or logo of a company without permission may cause legal problems for you. + +### Getting started + +You are almost done, only a few steps left: +1. Create a new repository on GitHub with the name `ioBroker.test-adapter` +1. Initialize the current folder as a new git repository: + ```bash + git init -b main + git add . + git commit -m "Initial commit" + ``` +1. Link your local repository with the one on GitHub: + ```bash + git remote add origin https://github.com/AlCalzone/ioBroker.test-adapter + ``` + +1. Push all files to the GitHub repo: + ```bash + git push origin main + ``` +1. Add a new secret under https://github.com/AlCalzone/ioBroker.test-adapter/settings/secrets. It must be named `AUTO_MERGE_TOKEN` and contain a personal access token with push access to the repository, e.g. yours. You can create a new token under https://github.com/settings/tokens. + +1. Head over to [src/main.ts](src/main.ts) and start programming! + +### Best Practices +We've collected some [best practices](https://github.com/ioBroker/ioBroker.repositories#development-and-coding-best-practices) regarding ioBroker development and coding in general. If you're new to ioBroker or Node.js, you should +check them out. If you're already experienced, you should also take a look at them - you might learn something new :) + +### Scripts in `package.json` +Several npm scripts are predefined for your convenience. You can run them using `npm run ` +| Script name | Description | +|-------------|-------------| +| `build` | Compile the TypeScript sources. | +| `watch` | Compile the TypeScript sources and watch for changes. | +| `test:ts` | Executes the tests you defined in `*.test.ts` files. | +| `test:package` | Ensures your `package.json` and `io-package.json` are valid. | +| `test:integration` | Tests the adapter startup with an actual instance of ioBroker. | +| `test` | Performs a minimal test run on package files and your tests. | +| `check` | Performs a type-check on your code (without compiling anything). | +| `lint` | Runs `ESLint` to check your code for formatting errors and potential bugs. | +| `translate` | Translates texts in your adapter to all required languages, see [`@iobroker/adapter-dev`](https://github.com/ioBroker/adapter-dev#manage-translations) for more details. | + +### Configuring the compilation +The adapter template uses [esbuild](https://esbuild.github.io/) to compile TypeScript and/or React code. You can configure many compilation settings +either in `tsconfig.json` or by changing options for the build tasks. These options are described in detail in the +[`@iobroker/adapter-dev` documentation](https://github.com/ioBroker/adapter-dev#compile-adapter-files). + +### Writing tests +When done right, testing code is invaluable, because it gives you the +confidence to change your code while knowing exactly if and when +something breaks. A good read on the topic of test-driven development +is https://hackernoon.com/introduction-to-test-driven-development-tdd-61a13bc92d92. +Although writing tests before the code might seem strange at first, but it has very +clear upsides. + +The template provides you with basic tests for the adapter startup and package files. +It is recommended that you add your own tests into the mix. + +### Publishing the adapter +Using GitHub Actions, you can enable automatic releases on npm whenever you push a new git tag that matches the form +`v..`. We **strongly recommend** that you do. The necessary steps are described in `.github/workflows/test-and-release.yml`. + +To get your adapter released in ioBroker, please refer to the documentation +of [ioBroker.repositories](https://github.com/ioBroker/ioBroker.repositories#requirements-for-adapter-to-get-added-to-the-latest-repository). + +### Test the adapter manually on a local ioBroker installation +In order to install the adapter locally without publishing, the following steps are recommended: +1. Create a tarball from your dev directory: + ```bash + npm pack + ``` +1. Upload the resulting file to your ioBroker host +1. Install it locally (The paths are different on Windows): + ```bash + cd /opt/iobroker + npm i /path/to/tarball.tgz + ``` + +For later updates, the above procedure is not necessary. Just do the following: +1. Overwrite the changed files in the adapter directory (`/opt/iobroker/node_modules/iobroker.test-adapter`) +1. Execute `iobroker upload test-adapter` on the ioBroker host + +## Changelog + +### 0.0.1 +* (Al Calzone) initial release + +## License +MIT License + +Copyright (c) 2025 Al Calzone + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/__meta__/npm_package_files.txt b/test/baselines/adapter_TS_VIS_CustomESLint/__meta__/npm_package_files.txt new file mode 100644 index 000000000..98f028fe2 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/__meta__/npm_package_files.txt @@ -0,0 +1,11 @@ +admin/index_m.html +admin/style.css +admin/test-adapter.png +admin/words.js +widgets/test-adapter.html +widgets/test-adapter/css/style.css +widgets/test-adapter/js/test-adapter.js +io-package.json +LICENSE +package.json +README.md \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/admin/admin.d.ts b/test/baselines/adapter_TS_VIS_CustomESLint/admin/admin.d.ts new file mode 100644 index 000000000..41f934f4c --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/admin/admin.d.ts @@ -0,0 +1,93 @@ +declare let systemDictionary: Record>; + +declare let load: (settings: Record, onChange: (hasChanges: boolean) => void) => void; +declare let save: (callback: (settings: Record) => void) => void; + +// make load and save exist on the window object +interface Window { + load: typeof load; + save: typeof save; +} + +declare const instance: number; +declare const adapter: string; +/** Translates text */ +declare function _(text: string, arg1?: string, arg2?: string, arg3?: string): string; +declare const socket: ioBrokerSocket; +declare function sendTo( + instance: any | null, + command: string, + message: any, + callback: (result: SendToResult) => void | Promise, +): void; + +interface SendToResult { + error?: string | Error; + result?: any; +} + +// tslint:disable-next-line:class-name +interface ioBrokerSocket { + emit( + command: "subscribeObjects", + pattern: string, + callback?: (err?: string) => void | Promise, + ): void; + emit( + command: "subscribeStates", + pattern: string, + callback?: (err?: string) => void | Promise, + ): void; + emit( + command: "unsubscribeObjects", + pattern: string, + callback?: (err?: string) => void | Promise, + ): void; + emit( + command: "unsubscribeStates", + pattern: string, + callback?: (err?: string) => void | Promise, + ): void; + + emit( + event: "getObjectView", + view: "system", + type: "device", + options: ioBroker.GetObjectViewParams, + callback: ( + err: string | undefined, + result?: any, + ) => void | Promise, + ): void; + emit( + event: "getStates", + callback: ( + err: string | undefined, + result?: Record, + ) => void, + ): void; + emit( + event: "getState", + id: string, + callback: (err: string | undefined, result?: ioBroker.State) => void, + ): void; + emit( + event: "setState", + id: string, + state: unknown, + callback: (err: string | undefined, result?: any) => void, + ): void; + + on(event: "objectChange", handler: ioBroker.ObjectChangeHandler): void; + on(event: "stateChange", handler: ioBroker.StateChangeHandler): void; + removeEventHandler( + event: "objectChange", + handler: ioBroker.ObjectChangeHandler, + ): void; + removeEventHandler( + event: "stateChange", + handler: ioBroker.StateChangeHandler, + ): void; + + // TODO: other events +} diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/admin/index_m.html b/test/baselines/adapter_TS_VIS_CustomESLint/admin/index_m.html new file mode 100644 index 000000000..f11dc3c14 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/admin/index_m.html @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+
+ + + + +
+
+ + +
+ +
+ + +
+
+ +
+ + + + \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/admin/style.css b/test/baselines/adapter_TS_VIS_CustomESLint/admin/style.css new file mode 100644 index 000000000..57d4549ee --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/admin/style.css @@ -0,0 +1,32 @@ +/* You can delete those if you want. I just found them very helpful */ +* { + box-sizing: border-box +} +.m { + /* Don't cut off dropdowns! */ + overflow: initial; +} +.m.adapter-container, +.m.adapter-container > div.App { + /* Fix layout/scrolling issues with tabs */ + height: 100%; + width: 100%; + position: relative; +} +.m .select-wrapper + label { + /* The positioning for dropdown labels is messed up */ + transform: none !important; +} + +label > i[title] { + /* Display the help cursor for the tooltip icons and fix their positioning */ + cursor: help; + margin-left: 0.25em; +} + +.dropdown-content { + /* Don't wrap text in dropdowns */ + white-space: nowrap; +} + +/* Add your styles here */ diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/admin/test-adapter.png b/test/baselines/adapter_TS_VIS_CustomESLint/admin/test-adapter.png new file mode 100644 index 0000000000000000000000000000000000000000..094ebd97c36dbe2386a63dbce290c9ad6a148079 GIT binary patch literal 62376 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%0DGz6 zyl7fq5kK_OTB5a+j%#*OqHtMgmMFAPfM%z1y`n*X-04|c~XNtbq*59PL zf2GK(^`44LhR@%s*209os!^-XK1;F{M*IZtESo=}65To~n+-bu0+>z?fZnkVoW}$_ zstfB}2u}&7L#c0_Qg^2;} z@gmc!u&D{a-Sk8a)1*Chcx+8~_M64opd2kxtHB|6*!4W&cOrWX;Yw>1GmvfN@nFO$k&$he)RKxo(&m zmF!n>4Y$>igYg0$%*vf6XAlg%u=W>lZr*&`_JyS?Qqf|(d#rIqm-Q+bvDD6`E^Yg! zCA@nJ@*O;Lp9NU-Q#KY#ME2A^kx^vHZXmc#(4jcbti!v_B%%%N@|q{z#cN2rxd7uE zDS;G&(m*%4MYSXuokFeyQS{I{6O4v&@v{hDbb4J?0ftY(dI z%St%e+#=VPIyA5VF9`5)D3bY&tL9gpe{Xha)$de%8pXLvHB( zu+0=Wc6d1^KBxb%4tv#uqG^B_>&ZHIJQN>7!}krzA!iGj%=dq0lHKGFRI$Ah-NT8N RBrxDlMnX}%QuJ%k{{yPv^Xvcs literal 0 HcmV?d00001 diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/admin/tsconfig.json b/test/baselines/adapter_TS_VIS_CustomESLint/admin/tsconfig.json new file mode 100644 index 000000000..49fb013d2 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/admin/tsconfig.json @@ -0,0 +1,11 @@ +{ + "extends": "../tsconfig.json", + "include": [ + "./admin.d.ts", + "./**/*.js", + // Include the adapter-config definition if it exists. + // It should be at either on of these paths: + "../lib/adapter-config.d.ts", // JS + "../src/lib/adapter-config.d.ts", // TS + ] +} diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/admin/words.js b/test/baselines/adapter_TS_VIS_CustomESLint/admin/words.js new file mode 100644 index 000000000..0cc646034 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/admin/words.js @@ -0,0 +1,124 @@ +/* eslint no-unused-vars: off */ +/* eslint no-global-assign: off */ +/* global systemDictionary */ +"use strict"; + +systemDictionary = { + "test-adapter adapter settings": { + "en": "Adapter settings for test-adapter", + "de": "Adaptereinstellungen für test-adapter", + "ru": "Настройки адаптера для test-adapter", + "pt": "Configurações do adaptador para test-adapter", + "nl": "Adapterinstellingen voor test-adapter", + "fr": "Paramètres d'adaptateur pour test-adapter", + "it": "Impostazioni dell'adattatore per test-adapter", + "es": "Ajustes del adaptador para test-adapter", + "pl": "Ustawienia adaptera dla test-adapter", + "uk": "Налаштування адаптера для test-adapter", + "zh-cn": "test-adapter的适配器设置" + }, + "option1": { + "en": "option1", + "de": "Mock translation of 'option1' to 'de'", + "ru": "Mock translation of 'option1' to 'ru'", + "pt": "Mock translation of 'option1' to 'pt'", + "nl": "Mock translation of 'option1' to 'nl'", + "fr": "Mock translation of 'option1' to 'fr'", + "it": "Mock translation of 'option1' to 'it'", + "es": "Mock translation of 'option1' to 'es'", + "pl": "Mock translation of 'option1' to 'pl'", + "uk": "Mock translation of 'option1' to 'uk'", + "zh-cn": "Mock translation of 'option1' to 'zh-cn'" + }, + "option2": { + "en": "option2", + "de": "Mock translation of 'option2' to 'de'", + "ru": "Mock translation of 'option2' to 'ru'", + "pt": "Mock translation of 'option2' to 'pt'", + "nl": "Mock translation of 'option2' to 'nl'", + "fr": "Mock translation of 'option2' to 'fr'", + "it": "Mock translation of 'option2' to 'it'", + "es": "Mock translation of 'option2' to 'es'", + "pl": "Mock translation of 'option2' to 'pl'", + "uk": "Mock translation of 'option2' to 'uk'", + "zh-cn": "Mock translation of 'option2' to 'zh-cn'" + }, + "myColor": { + "en": "myColor", + "de": "meineColor", + "ru": "Мой цвет", + "pt": "minhaCor", + "nl": "mijnKleur", + "fr": "maCouleur", + "it": "mioColore", + "es": "miColor", + "pl": "mójKolor", + "uk": "мійКолір", + "zh-cn": "我的颜色" + }, + "myColor_tooltip": { + "en": "Description of\nmyColor", + "de": "Beschreibung von\nmyColor", + "ru": "Описание\nmyColor", + "pt": "Descrição de\nmyColor", + "nl": "Beschrijving van\nmyColor", + "fr": "Description de\nmyColor", + "it": "Descrizione di\nmyColor", + "es": "Descripción de\nmyColor", + "pl": "Opis\nmyColor", + "uk": "Опис\nmyColor", + "zh-cn": "\nmyColor的描述" + }, + "htmlText": { + "en": "htmlText", + "de": "htmlText", + "ru": "htmlText", + "pt": "htmlText", + "nl": "htmlText", + "fr": "htmlText", + "it": "htmlText", + "es": "htmlText", + "pl": "htmlText", + "uk": "htmlText", + "zh-cn": "htmlText" + }, + "group_extraMyset": { + "en": "extraMyset", + "de": "extraMyset", + "ru": "extraMyset", + "pt": "extraMyset", + "nl": "extraMyset", + "fr": "extraMyset", + "it": "extraMyset", + "es": "extraMyset", + "pl": "extraMyset", + "uk": "extraMyset", + "zh-cn": "extraMyset" + }, + "extraAttr": { + "en": "extraAttr", + "de": "extraAttr", + "ru": "extraAttr", + "pt": "extraAttr", + "nl": "extraAttr", + "fr": "extraAttr", + "it": "extraAttr", + "es": "extraAttr", + "pl": "extraAttr", + "uk": "extraAttr", + "zh-cn": "extraAttr" + }, + "Instance": { + "en": "Instance", + "de": "Instanz", + "ru": "Инстанция", + "pt": "Instância", + "nl": "Instantie", + "fr": "Instance", + "it": "Esempio", + "es": "Instancia", + "pl": "Instancja", + "uk": "Інстанція", + "zh-cn": "例" + } +}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/eslint.config.mjs b/test/baselines/adapter_TS_VIS_CustomESLint/eslint.config.mjs new file mode 100644 index 000000000..82e39f6ef --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/eslint.config.mjs @@ -0,0 +1,78 @@ +import js from '@eslint/js'; +import tseslint from '@typescript-eslint/eslint-plugin'; +import tsparser from '@typescript-eslint/parser'; + +export default [ + js.configs.recommended, + { + files: ['**/*.ts', '**/*.tsx'], + languageOptions: { + parser: tsparser, + parserOptions: { + ecmaVersion: 'latest', + sourceType: 'module', + project: './tsconfig.json', + }, + }, + plugins: { + '@typescript-eslint': tseslint, + }, + rules: { + ...tseslint.configs.recommended.rules, + 'indent': 'off', + '@typescript-eslint/indent': [ + 'error', + 'tab', + { + 'SwitchCase': 1 + } + ], + 'quotes': [ + 'error', + 'double' + ], + }, + }, + { + files: ['widgets/**/*.js'], + languageOptions: { + ecmaVersion: 5, + sourceType: 'script', + globals: { + '$': 'readonly', + 'jQuery': 'readonly', + 'vis': 'readonly', + }, + }, + rules: { + // Visualizations may run in very old browsers + 'no-var': 'off', + 'prefer-const': 'off', + 'prefer-arrow-callback': 'off', + // The example code does not use some parameters + 'no-unused-vars': [ + 'warn', + { + 'ignoreRestSiblings': true, + 'argsIgnorePattern': '^_' + } + ] + } + }, + { + ignores: [ + '.dev-server/', + '.vscode/', + '*.test.js', + 'test/**/*.js', + '*.config.mjs', + 'build/', + 'dist/', + 'admin/build/', + 'admin/words.js', + 'admin/admin.d.ts', + 'admin/blockly.js', + '**/adapter-config.d.ts', + ], + }, +]; \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/io-package.json b/test/baselines/adapter_TS_VIS_CustomESLint/io-package.json new file mode 100644 index 000000000..cd2246e68 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/io-package.json @@ -0,0 +1,95 @@ +{ + "common": { + "name": "test-adapter", + "version": "0.0.1", + "news": { + "0.0.1": { + "en": "initial release", + "de": "Erstveröffentlichung", + "ru": "Начальная версия", + "pt": "lançamento inicial", + "nl": "Eerste uitgave", + "fr": "Première version", + "it": "Versione iniziale", + "es": "Versión inicial", + "pl": "Pierwsze wydanie", + "uk": "Початкова версія", + "zh-cn": "首次出版" + } + }, + "titleLang": { + "en": "Is used to test the creator", + "de": "Mock translation of 'Is used to test the creator' to 'de'", + "ru": "Mock translation of 'Is used to test the creator' to 'ru'", + "pt": "Mock translation of 'Is used to test the creator' to 'pt'", + "nl": "Mock translation of 'Is used to test the creator' to 'nl'", + "fr": "Mock translation of 'Is used to test the creator' to 'fr'", + "it": "Mock translation of 'Is used to test the creator' to 'it'", + "es": "Mock translation of 'Is used to test the creator' to 'es'", + "pl": "Mock translation of 'Is used to test the creator' to 'pl'", + "uk": "Mock translation of 'Is used to test the creator' to 'uk'", + "zh-cn": "Mock translation of 'Is used to test the creator' to 'zh-cn'" + }, + "desc": { + "en": "test-adapter", + "de": "Mock translation of 'test-adapter' to 'de'", + "ru": "Mock translation of 'test-adapter' to 'ru'", + "pt": "Mock translation of 'test-adapter' to 'pt'", + "nl": "Mock translation of 'test-adapter' to 'nl'", + "fr": "Mock translation of 'test-adapter' to 'fr'", + "it": "Mock translation of 'test-adapter' to 'it'", + "es": "Mock translation of 'test-adapter' to 'es'", + "pl": "Mock translation of 'test-adapter' to 'pl'", + "uk": "Mock translation of 'test-adapter' to 'uk'", + "zh-cn": "Mock translation of 'test-adapter' to 'zh-cn'" + }, + "authors": [ + "Al Calzone " + ], + "keywords": [ + "template", + "automation", + "IoT", + "integration" + ], + "licenseInformation": { + "type": "free", + "license": "MIT" + }, + "platform": "Javascript/Node.js", + "icon": "test-adapter.png", + "enabled": true, + "extIcon": "https://raw.githubusercontent.com/AlCalzone/ioBroker.test-adapter/main/admin/test-adapter.png", + "readme": "https://github.com/AlCalzone/ioBroker.test-adapter/blob/main/README.md", + "loglevel": "info", + "tier": 3, + "restartAdapters": [ + "vis" + ], + "mode": "daemon", + "type": "general", + "compact": true, + "connectionType": "local", + "dataSource": "push", + "adminUI": { + "config": "materialize" + }, + "dependencies": [ + { + "js-controller": ">=6.0.11" + }, + "vis" + ], + "globalDependencies": [ + { + "admin": ">=7.0.23" + } + ] + }, + "native": { + "option1": true, + "option2": "42" + }, + "objects": [], + "instanceObjects": [] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/package.json b/test/baselines/adapter_TS_VIS_CustomESLint/package.json new file mode 100644 index 000000000..01d8887bb --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/package.json @@ -0,0 +1,72 @@ +{ + "name": "iobroker.test-adapter", + "version": "0.0.1", + "description": "test-adapter", + "author": { + "name": "Al Calzone", + "email": "al@calzo.ne" + }, + "contributors": [], + "homepage": "https://github.com/AlCalzone/ioBroker.test-adapter", + "license": "MIT", + "keywords": [ + "template", + "automation", + "IoT", + "integration" + ], + "repository": { + "type": "git", + "url": "https://github.com/AlCalzone/ioBroker.test-adapter.git" + }, + "engines": { + "node": ">= 20" + }, + "dependencies": { + "@iobroker/adapter-core": "^3.3.2" + }, + "devDependencies": { + "@eslint/js": "^9.36.0", + "@iobroker/adapter-dev": "^1.5.0", + "@iobroker/testing": "^5.1.1", + "@tsconfig/node20": "^20.1.6", + "@types/node": "^20.19.17", + "@typescript-eslint/eslint-plugin": "^8.44.1", + "@typescript-eslint/parser": "^8.44.1", + "eslint": "^9.36.0", + "rimraf": "^6.0.1", + "source-map-support": "^0.5.21", + "ts-node": "^10.9.2", + "typescript": "~5.9.2" + }, + "main": "build/main.js", + "files": [ + "admin{,/!(src)/**}/!(tsconfig|tsconfig.*|.eslintrc).{json,json5}", + "admin{,/!(src)/**}/*.{html,css,png,svg,jpg,js}", + "build/", + "widgets/**/!(tsconfig|tsconfig.*|.eslintrc).json", + "widgets/**/*.{html,css,png,svg,jpg,js}", + "www/", + "io-package.json", + "LICENSE" + ], + "scripts": { + "prebuild": "rimraf build", + "build": "build-adapter ts", + "watch": "build-adapter ts --watch", + "prebuild:ts": "rimraf build", + "build:ts": "build-adapter ts", + "watch:ts": "build-adapter ts --watch", + "test:ts": "mocha --config test/mocharc.custom.json src/**/*.test.ts", + "test:package": "mocha test/package --exit", + "test:integration": "mocha test/integration --exit", + "test": "npm run test:ts && npm run test:package", + "check": "tsc --noEmit", + "lint": "eslint -c eslint.config.mjs .", + "translate": "translate-adapter" + }, + "bugs": { + "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" + }, + "readmeFilename": "README.md" +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/src/lib/adapter-config.d.ts b/test/baselines/adapter_TS_VIS_CustomESLint/src/lib/adapter-config.d.ts new file mode 100644 index 000000000..c6c8a0e2a --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/src/lib/adapter-config.d.ts @@ -0,0 +1,14 @@ +// This file extends the AdapterConfig type from "@types/iobroker" + +// Augment the globally declared type ioBroker.AdapterConfig +declare global { + namespace ioBroker { + interface AdapterConfig { + option1: boolean; + option2: string; + } + } +} + +// this is required so the above AdapterConfig is found by TypeScript / type checking +export {}; \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/src/main.test.ts b/test/baselines/adapter_TS_VIS_CustomESLint/src/main.test.ts new file mode 100644 index 000000000..a8d538e95 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/src/main.test.ts @@ -0,0 +1,26 @@ +/** + * This is a dummy TypeScript test file using chai and mocha + * + * It's automatically excluded from npm and its build output is excluded from both git and npm. + * It is advised to test all your modules with accompanying *.test.ts-files + */ + +import { expect } from "chai"; +// import { functionToTest } from "./moduleToTest"; + +describe("module to test => function to test", () => { + // initializing logic + const expected = 5; + + it(`should return ${expected}`, () => { + const result = 5; + // assign result a value from functionToTest + expect(result).to.equal(expected); + // or using the should() syntax + result.should.equal(expected); + }); + // ... more tests => it + +}); + +// ... more test suites => describe diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/src/main.ts b/test/baselines/adapter_TS_VIS_CustomESLint/src/main.ts new file mode 100644 index 000000000..d86bf77c5 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/src/main.ts @@ -0,0 +1,153 @@ +/* + * Created with @iobroker/create-adapter v2.6.5 + */ + +// The adapter-core module gives you access to the core ioBroker functions +// you need to create an adapter +import * as utils from "@iobroker/adapter-core"; + +// Load your modules here, e.g.: +// import * as fs from "fs"; + +class TestAdapter extends utils.Adapter { + + public constructor(options: Partial = {}) { + super({ + ...options, + name: "test-adapter", + }); + this.on("ready", this.onReady.bind(this)); + this.on("stateChange", this.onStateChange.bind(this)); + // this.on("objectChange", this.onObjectChange.bind(this)); + // this.on("message", this.onMessage.bind(this)); + this.on("unload", this.onUnload.bind(this)); + } + + /** + * Is called when databases are connected and adapter received configuration. + */ + private async onReady(): Promise { + // Initialize your adapter here + + // The adapters config (in the instance object everything under the attribute "native") is accessible via + // this.config: + this.log.debug("config option1: " + this.config.option1); + this.log.debug("config option2: " + this.config.option2); + + /* + For every state in the system there has to be also an object of type state + Here a simple template for a boolean variable named "testVariable" + Because every adapter instance uses its own unique namespace variable names can't collide with other adapters variables + */ + await this.setObjectNotExistsAsync("testVariable", { + type: "state", + common: { + name: "testVariable", + type: "boolean", + role: "indicator", + read: true, + write: true, + }, + native: {}, + }); + + // In order to get state updates, you need to subscribe to them. The following line adds a subscription for our variable we have created above. + this.subscribeStates("testVariable"); + // You can also add a subscription for multiple states. The following line watches all states starting with "lights." + // this.subscribeStates("lights.*"); + // Or, if you really must, you can also watch all states. Don't do this if you don't need to. Otherwise this will cause a lot of unnecessary load on the system: + // this.subscribeStates("*"); + + /* + setState examples + you will notice that each setState will cause the stateChange event to fire (because of above subscribeStates cmd) + */ + // the variable testVariable is set to true as command (ack=false) + await this.setState("testVariable", true); + + // same thing, but the value is flagged "ack" + // ack should be always set to true if the value is received from or acknowledged from the target system + await this.setState("testVariable", { val: true, ack: true }); + + // same thing, but the state is deleted after 30s (getState will return null afterwards) + await this.setState("testVariable", { val: true, ack: true, expire: 30 }); + + // examples for the checkPassword/checkGroup functions + const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); + this.log.info("check user admin pw iobroker: " + pwdResult); + + const gropupResult = await this.checkGroupAsync("admin", "admin"); + this.log.info("check group user admin group admin: " + gropupResult); + } + + /** + * Is called when adapter shuts down - callback has to be called under any circumstances! + */ + private onUnload(callback: () => void): void { + try { + // Here you must clear all timeouts or intervals that may still be active + // clearTimeout(timeout1); + // clearTimeout(timeout2); + // ... + // clearInterval(interval1); + + callback(); + } catch (_e) { + callback(); + } + } + + // If you need to react to object changes, uncomment the following block and the corresponding line in the constructor. + // You also need to subscribe to the objects with `this.subscribeObjects`, similar to `this.subscribeStates`. + // /** + // * Is called if a subscribed object changes + // */ + // private onObjectChange(id: string, obj: ioBroker.Object | null | undefined): void { + // if (obj) { + // // The object was changed + // this.log.info(`object ${id} changed: ${JSON.stringify(obj)}`); + // } else { + // // The object was deleted + // this.log.info(`object ${id} deleted`); + // } + // } + + /** + * Is called if a subscribed state changes + */ + private onStateChange(id: string, state: ioBroker.State | null | undefined): void { + if (state) { + // The state was changed + this.log.info(`state ${id} changed: ${state.val} (ack = ${state.ack})`); + } else { + // The state was deleted + this.log.info(`state ${id} deleted`); + } + } + + // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. + // /** + // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... + // * Using this method requires "common.messagebox" property to be set to true in io-package.json + // */ + // private onMessage(obj: ioBroker.Message): void { + // if (typeof obj === "object" && obj.message) { + // if (obj.command === "send") { + // // e.g. send email or pushover or whatever + // this.log.info("send command"); + + // // Send response in callback if required + // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); + // } + // } + // } + +} + +if (require.main !== module) { + // Export the constructor in compact mode + module.exports = (options: Partial | undefined) => new TestAdapter(options); +} else { + // otherwise start the instance directly + (() => new TestAdapter())(); +} \ No newline at end of file diff --git a/test/baselines/adapter_JS_React/.eslintrc.json b/test/baselines/adapter_TS_VIS_CustomESLint/test/.eslintrc.json similarity index 70% rename from test/baselines/adapter_JS_React/.eslintrc.json rename to test/baselines/adapter_TS_VIS_CustomESLint/test/.eslintrc.json index 56d859b3a..ce6b3d62c 100644 --- a/test/baselines/adapter_JS_React/.eslintrc.json +++ b/test/baselines/adapter_TS_VIS_CustomESLint/test/.eslintrc.json @@ -6,17 +6,8 @@ "mocha": true }, "extends": [ - "eslint:recommended", - "plugin:react/recommended" + "eslint:recommended" ], - "plugins": [ - "react" - ], - "settings": { - "react": { - "version": "detect" - } - }, "rules": { "indent": [ "error", @@ -48,11 +39,5 @@ "error", "always" ] - }, - "parserOptions": { - "ecmaVersion": "latest", - "ecmaFeatures": { - "jsx": true - } } } \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/test/integration.js b/test/baselines/adapter_TS_VIS_CustomESLint/test/integration.js new file mode 100644 index 000000000..986936fac --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/test/integration.js @@ -0,0 +1,5 @@ +const path = require("path"); +const { tests } = require("@iobroker/testing"); + +// Run integration tests - See https://github.com/ioBroker/testing for a detailed explanation and further options +tests.integration(path.join(__dirname, "..")); \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/test/mocha.setup.js b/test/baselines/adapter_TS_VIS_CustomESLint/test/mocha.setup.js new file mode 100644 index 000000000..b839790ff --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/test/mocha.setup.js @@ -0,0 +1,23 @@ +"use strict"; + +// Makes ts-node ignore warnings, so mocha --watch does work +process.env.TS_NODE_IGNORE_WARNINGS = "TRUE"; +// Sets the correct tsconfig for testing +process.env.TS_NODE_PROJECT = "tsconfig.json"; +// Make ts-node respect the "include" key in tsconfig.json +process.env.TS_NODE_FILES = "TRUE"; + +// Don't silently swallow unhandled rejections +process.on("unhandledRejection", (e) => { + throw e; +}); + +// enable the should interface with sinon +// and load chai-as-promised and sinon-chai by default +const sinonChai = require("sinon-chai"); +const chaiAsPromised = require("chai-as-promised"); +const { should, use } = require("chai"); + +should(); +use(sinonChai); +use(chaiAsPromised); \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/test/mocharc.custom.json b/test/baselines/adapter_TS_VIS_CustomESLint/test/mocharc.custom.json new file mode 100644 index 000000000..851ed9cdc --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/test/mocharc.custom.json @@ -0,0 +1,10 @@ +{ + "require": [ + "test/mocha.setup.js", + "ts-node/register", + "source-map-support/register" + ], + "watch-files": [ + "src/**/*.test.ts" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/test/package.js b/test/baselines/adapter_TS_VIS_CustomESLint/test/package.js new file mode 100644 index 000000000..3a48e0449 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/test/package.js @@ -0,0 +1,5 @@ +const path = require("path"); +const { tests } = require("@iobroker/testing"); + +// Validate the package files +tests.packageFiles(path.join(__dirname, "..")); diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/test/tsconfig.json b/test/baselines/adapter_TS_VIS_CustomESLint/test/tsconfig.json new file mode 100644 index 000000000..3ebc81b65 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/test/tsconfig.json @@ -0,0 +1,9 @@ +{ + "extends": "../tsconfig.json", + "compilerOptions": { + "noImplicitAny": false + }, + "include": [ + "./**/*.js" + ] +} diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/tsconfig.build.json b/test/baselines/adapter_TS_VIS_CustomESLint/tsconfig.build.json new file mode 100644 index 000000000..1f040ce18 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/tsconfig.build.json @@ -0,0 +1,16 @@ +// Specialized tsconfig to only compile .ts-files in the src dir +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "allowJs": false, + "checkJs": false, + "noEmit": false, + "declaration": false + }, + "include": [ + "src/**/*.ts" + ], + "exclude": [ + "src/**/*.test.ts" + ] +} diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/tsconfig.json b/test/baselines/adapter_TS_VIS_CustomESLint/tsconfig.json new file mode 100644 index 000000000..4c80d776d --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/tsconfig.json @@ -0,0 +1,46 @@ +// Root tsconfig to set the settings and power editor support for all TS files +{ + // To update the compilation target, install a different version of @tsconfig/node... and reference it here + // https://github.com/tsconfig/bases#node-20-tsconfigjson + "extends": "@tsconfig/node20/tsconfig.json", + "compilerOptions": { + // do not compile anything, this file is just to configure type checking + // the compilation is configured in tsconfig.build.json + "noEmit": true, + + // check JS files, but do not compile them => tsconfig.build.json + "allowJs": true, + "checkJs": true, + + "noEmitOnError": true, + "outDir": "./build/", + "removeComments": false, + + // This is necessary for the automatic typing of the adapter config + "resolveJsonModule": true, + + // If you want to disable the stricter type checks (not recommended), uncomment the following line + // "strict": false, + // And enable some of those features for more fine-grained control + // "strictNullChecks": true, + // "strictPropertyInitialization": true, + // "strictBindCallApply": true, + // "noImplicitAny": true, + // "noUnusedLocals": true, + // "noUnusedParameters": true, + // Uncomment this if you want the old behavior of catch variables being `any` + // "useUnknownInCatchVariables": false, + + "sourceMap": true, + "inlineSourceMap": false + }, + "include": [ + "src/**/*.ts", + "test/**/*.ts" + ], + "exclude": [ + "build/**", + "node_modules/**", + "widgets/**" + ] +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/widgets/test-adapter.html b/test/baselines/adapter_TS_VIS_CustomESLint/widgets/test-adapter.html new file mode 100644 index 000000000..b5f9aaede --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/widgets/test-adapter.html @@ -0,0 +1,135 @@ + + + + + + + + + + \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/widgets/test-adapter/css/style.css b/test/baselines/adapter_TS_VIS_CustomESLint/widgets/test-adapter/css/style.css new file mode 100644 index 000000000..5ea1abc76 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/widgets/test-adapter/css/style.css @@ -0,0 +1,4 @@ +/* Style your widget here */ +.test-adapter-class { + font-style: italic; +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/widgets/test-adapter/js/test-adapter.js b/test/baselines/adapter_TS_VIS_CustomESLint/widgets/test-adapter/js/test-adapter.js new file mode 100644 index 000000000..a7f6b07d0 --- /dev/null +++ b/test/baselines/adapter_TS_VIS_CustomESLint/widgets/test-adapter/js/test-adapter.js @@ -0,0 +1,76 @@ +/* + ioBroker.vis test-adapter Widget-Set + + version: "0.0.1" + + Copyright 2025 Al Calzone al@calzo.ne +*/ +"use strict"; + +/* global $, vis, systemDictionary */ + +// add translations for edit mode +$.extend( + true, + systemDictionary, + { + // Add your translations here, e.g.: + // "size": { + // "en": "Size", + // "de": "Größe", + // "ru": "Размер", + // "pt": "Tamanho", + // "nl": "Grootte", + // "fr": "Taille", + // "it": "Dimensione", + // "es": "Talla", + // "pl": "Rozmiar", + // "uk": "Розмір" + // "zh-cn": "尺寸" + // } + } +); + +// this code can be placed directly in test-adapter.html +vis.binds["test-adapter"] = { + version: "0.0.1", + showVersion: function () { + if (vis.binds["test-adapter"].version) { + console.log("Version test-adapter: " + vis.binds["test-adapter"].version); + vis.binds["test-adapter"].version = null; + } + }, + createWidget: function (widgetID, view, data, style) { + var $div = $("#" + widgetID); + // if nothing found => wait + if (!$div.length) { + return setTimeout(function () { + vis.binds["test-adapter"].createWidget(widgetID, view, data, style); + }, 100); + } + + var text = ""; + text += "OID: " + data.oid + "
"; + text += 'OID value: ' + vis.states[data.oid + ".val"] + "
"; + text += 'Color: ' + data.myColor + "
"; + text += "extraAttr: " + data.extraAttr + "
"; + text += "Browser instance: " + vis.instance + "
"; + text += 'htmlText:
"; + + $("#" + widgetID).html(text); + + // subscribe on updates of value + function onChange(e, newVal, _oldVal) { + $div.find(".template-value").html(newVal); + } + if (data.oid) { + vis.states.bind(data.oid + ".val", onChange); + //remember bound state that vis can release if didnt needed + $div.data("bound", [data.oid + ".val"]); + //remember onchange handler to release bound states + $div.data("bindHandler", onChange); + } + } +}; + +vis.binds["test-adapter"].showVersion(); \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/widgets/.eslintrc.json b/test/baselines/adapter_TS_VIS_OfficialESLint/widgets/.eslintrc.json deleted file mode 100644 index b7ca3620a..000000000 --- a/test/baselines/adapter_TS_VIS_OfficialESLint/widgets/.eslintrc.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "env": { - "browser": true, - "es6": false - }, - "rules": { - // Visualizations may run in very old browsers without `let` and `const` - "no-var": "off", - // The example code does not use some parameters. If unused variables should be - // an error, delete the following rule - "no-unused-vars": [ - "warn", - { - "ignoreRestSiblings": true, - "argsIgnorePattern": "^_" - } - ] - } -} \ No newline at end of file diff --git a/test/baselines/contributors/package.json b/test/baselines/contributors/package.json index 620c49a75..3df0ba84d 100644 --- a/test/baselines/contributors/package.json +++ b/test/baselines/contributors/package.json @@ -33,13 +33,14 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { + "@eslint/js": "^9.36.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", "@types/node": "^20.19.17", - "@typescript-eslint/eslint-plugin": "^7.18.0", - "@typescript-eslint/parser": "^7.18.0", - "eslint": "^8.57.1", + "@typescript-eslint/eslint-plugin": "^8.44.1", + "@typescript-eslint/parser": "^8.44.1", + "eslint": "^9.36.0", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", @@ -66,7 +67,7 @@ "test:integration": "mocha test/integration --exit", "test": "npm run test:ts && npm run test:package", "check": "tsc --noEmit", - "lint": "eslint --ext .ts src/", + "lint": "eslint -c eslint.config.mjs .", "translate": "translate-adapter" }, "bugs": { diff --git a/test/baselines/contributors_with_author_duplication/package.json b/test/baselines/contributors_with_author_duplication/package.json index 10a2a26b1..7f1323d17 100644 --- a/test/baselines/contributors_with_author_duplication/package.json +++ b/test/baselines/contributors_with_author_duplication/package.json @@ -33,13 +33,14 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { + "@eslint/js": "^9.36.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", "@types/node": "^20.19.17", - "@typescript-eslint/eslint-plugin": "^7.18.0", - "@typescript-eslint/parser": "^7.18.0", - "eslint": "^8.57.1", + "@typescript-eslint/eslint-plugin": "^8.44.1", + "@typescript-eslint/parser": "^8.44.1", + "eslint": "^9.36.0", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", @@ -66,7 +67,7 @@ "test:integration": "mocha test/integration --exit", "test": "npm run test:ts && npm run test:package", "check": "tsc --noEmit", - "lint": "eslint --ext .ts src/", + "lint": "eslint -c eslint.config.mjs .", "translate": "translate-adapter" }, "bugs": { diff --git a/test/baselines/git_SSH/package.json b/test/baselines/git_SSH/package.json index 988312c2d..8bfdc0710 100644 --- a/test/baselines/git_SSH/package.json +++ b/test/baselines/git_SSH/package.json @@ -26,13 +26,14 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { + "@eslint/js": "^9.36.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", "@types/node": "^20.19.17", - "@typescript-eslint/eslint-plugin": "^7.18.0", - "@typescript-eslint/parser": "^7.18.0", - "eslint": "^8.57.1", + "@typescript-eslint/eslint-plugin": "^8.44.1", + "@typescript-eslint/parser": "^8.44.1", + "eslint": "^9.36.0", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", @@ -59,7 +60,7 @@ "test:integration": "mocha test/integration --exit", "test": "npm run test:ts && npm run test:package", "check": "tsc --noEmit", - "lint": "eslint --ext .ts src/", + "lint": "eslint -c eslint.config.mjs .", "translate": "translate-adapter" }, "bugs": { diff --git a/test/baselines/ioBroker.hello-devcontainer/.eslintignore b/test/baselines/ioBroker.hello-devcontainer/.eslintignore deleted file mode 100644 index 396d8e174..000000000 --- a/test/baselines/ioBroker.hello-devcontainer/.eslintignore +++ /dev/null @@ -1,2 +0,0 @@ -**/.eslintrc.js -admin/words.js \ No newline at end of file diff --git a/test/baselines/ioBroker.hello-devcontainer/.eslintrc.json b/test/baselines/ioBroker.hello-devcontainer/.eslintrc.json deleted file mode 100644 index 6e461e9da..000000000 --- a/test/baselines/ioBroker.hello-devcontainer/.eslintrc.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "root": true, - "env": { - "es6": true, - "node": true, - "mocha": true - }, - "extends": [ - "eslint:recommended" - ], - "plugins": [], - "rules": { - "indent": [ - "error", - 4, - { - "SwitchCase": 1 - } - ], - "no-console": "off", - "no-unused-vars": [ - "error", - { - "ignoreRestSiblings": true, - "argsIgnorePattern": "^_" - } - ], - "no-var": "error", - "no-trailing-spaces": "error", - "prefer-const": "error", - "quotes": [ - "error", - "single", - { - "avoidEscape": true, - "allowTemplateLiterals": true - } - ], - "semi": [ - "error", - "always" - ] - }, - "parserOptions": { - "ecmaVersion": "latest" - } -} \ No newline at end of file diff --git a/test/baselines/ioBroker.hello-devcontainer/eslint.config.mjs b/test/baselines/ioBroker.hello-devcontainer/eslint.config.mjs new file mode 100644 index 000000000..3a02aa3ac --- /dev/null +++ b/test/baselines/ioBroker.hello-devcontainer/eslint.config.mjs @@ -0,0 +1,59 @@ +import js from '@eslint/js'; + +export default [ + js.configs.recommended, + { + files: ['**/*.js', '**/*.jsx'], + languageOptions: { + ecmaVersion: 'latest', + sourceType: 'module', + globals: { + 'process': 'readonly', + 'Buffer': 'readonly', + '__dirname': 'readonly', + '__filename': 'readonly', + 'module': 'readonly', + 'require': 'readonly', + 'exports': 'readonly', + 'global': 'readonly', + 'console': 'readonly', + 'setTimeout': 'readonly', + 'setInterval': 'readonly', + 'clearTimeout': 'readonly', + 'clearInterval': 'readonly', + }, + }, + plugins: { + }, + rules: { + ...js.configs.recommended.rules, + 'indent': [ + 'error', + 4, + { + 'SwitchCase': 1 + } + ], + 'quotes': [ + 'error', + 'single' + ], + }, + }, + { + ignores: [ + '.dev-server/', + '.vscode/', + '*.test.js', + 'test/**/*.js', + '*.config.mjs', + 'build/', + 'dist/', + 'admin/build/', + 'admin/words.js', + 'admin/admin.d.ts', + 'admin/blockly.js', + '**/adapter-config.d.ts', + ], + }, +]; \ No newline at end of file diff --git a/test/baselines/ioBroker.hello-devcontainer/package.json b/test/baselines/ioBroker.hello-devcontainer/package.json index 5cac1d4da..c318b010f 100644 --- a/test/baselines/ioBroker.hello-devcontainer/package.json +++ b/test/baselines/ioBroker.hello-devcontainer/package.json @@ -26,11 +26,12 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { + "@eslint/js": "^9.36.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", "@types/node": "^20.19.17", - "eslint": "^8.57.1", + "eslint": "^9.36.0", "typescript": "~5.9.2" }, "main": "main.js", @@ -49,7 +50,7 @@ "test:integration": "mocha test/integration --exit", "test": "npm run test:js && npm run test:package", "check": "tsc --noEmit -p tsconfig.check.json", - "lint": "eslint .", + "lint": "eslint -c eslint.config.mjs .", "translate": "translate-adapter" }, "bugs": { diff --git a/test/baselines/keywords/package.json b/test/baselines/keywords/package.json index 3b449ac8b..b24ebea12 100644 --- a/test/baselines/keywords/package.json +++ b/test/baselines/keywords/package.json @@ -27,13 +27,14 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { + "@eslint/js": "^9.36.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", "@types/node": "^20.19.17", - "@typescript-eslint/eslint-plugin": "^7.18.0", - "@typescript-eslint/parser": "^7.18.0", - "eslint": "^8.57.1", + "@typescript-eslint/eslint-plugin": "^8.44.1", + "@typescript-eslint/parser": "^8.44.1", + "eslint": "^9.36.0", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", @@ -60,7 +61,7 @@ "test:integration": "mocha test/integration --exit", "test": "npm run test:ts && npm run test:package", "check": "tsc --noEmit", - "lint": "eslint --ext .ts src/", + "lint": "eslint -c eslint.config.mjs .", "translate": "translate-adapter" }, "bugs": { diff --git a/test/baselines/minNodeVersion_20/package.json b/test/baselines/minNodeVersion_20/package.json index 790cee445..6a3f90d21 100644 --- a/test/baselines/minNodeVersion_20/package.json +++ b/test/baselines/minNodeVersion_20/package.json @@ -26,13 +26,14 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { + "@eslint/js": "^9.36.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", "@types/node": "^20.19.17", - "@typescript-eslint/eslint-plugin": "^7.18.0", - "@typescript-eslint/parser": "^7.18.0", - "eslint": "^8.57.1", + "@typescript-eslint/eslint-plugin": "^8.44.1", + "@typescript-eslint/parser": "^8.44.1", + "eslint": "^9.36.0", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", @@ -59,7 +60,7 @@ "test:integration": "mocha test/integration --exit", "test": "npm run test:ts && npm run test:package", "check": "tsc --noEmit", - "lint": "eslint --ext .ts src/", + "lint": "eslint -c eslint.config.mjs .", "translate": "translate-adapter" }, "bugs": { diff --git a/test/baselines/minNodeVersion_22/package.json b/test/baselines/minNodeVersion_22/package.json index b0361c645..e12750064 100644 --- a/test/baselines/minNodeVersion_22/package.json +++ b/test/baselines/minNodeVersion_22/package.json @@ -26,13 +26,14 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { + "@eslint/js": "^9.36.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node22": "^22.0.2", "@types/node": "^22.18.6", - "@typescript-eslint/eslint-plugin": "^7.18.0", - "@typescript-eslint/parser": "^7.18.0", - "eslint": "^8.57.1", + "@typescript-eslint/eslint-plugin": "^8.44.1", + "@typescript-eslint/parser": "^8.44.1", + "eslint": "^9.36.0", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", @@ -59,7 +60,7 @@ "test:integration": "mocha test/integration --exit", "test": "npm run test:ts && npm run test:package", "check": "tsc --noEmit", - "lint": "eslint --ext .ts src/", + "lint": "eslint -c eslint.config.mjs .", "translate": "translate-adapter" }, "bugs": { diff --git a/test/baselines/minNodeVersion_24/package.json b/test/baselines/minNodeVersion_24/package.json index a7e8d01b0..92efcd7c6 100644 --- a/test/baselines/minNodeVersion_24/package.json +++ b/test/baselines/minNodeVersion_24/package.json @@ -26,13 +26,14 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { + "@eslint/js": "^9.36.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node24": "^24.0.1", "@types/node": "^24.5.2", - "@typescript-eslint/eslint-plugin": "^7.18.0", - "@typescript-eslint/parser": "^7.18.0", - "eslint": "^8.57.1", + "@typescript-eslint/eslint-plugin": "^8.44.1", + "@typescript-eslint/parser": "^8.44.1", + "eslint": "^9.36.0", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", @@ -59,7 +60,7 @@ "test:integration": "mocha test/integration --exit", "test": "npm run test:ts && npm run test:package", "check": "tsc --noEmit", - "lint": "eslint --ext .ts src/", + "lint": "eslint -c eslint.config.mjs .", "translate": "translate-adapter" }, "bugs": { diff --git a/test/baselines/vis_Widget/widgets/.eslintrc.json b/test/baselines/vis_Widget/widgets/.eslintrc.json deleted file mode 100644 index b7ca3620a..000000000 --- a/test/baselines/vis_Widget/widgets/.eslintrc.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "env": { - "browser": true, - "es6": false - }, - "rules": { - // Visualizations may run in very old browsers without `let` and `const` - "no-var": "off", - // The example code does not use some parameters. If unused variables should be - // an error, delete the following rule - "no-unused-vars": [ - "warn", - { - "ignoreRestSiblings": true, - "argsIgnorePattern": "^_" - } - ] - } -} \ No newline at end of file diff --git a/test/create-adapter.test.ts b/test/create-adapter.test.ts index 5750be238..b23eacb00 100644 --- a/test/create-adapter.test.ts +++ b/test/create-adapter.test.ts @@ -312,6 +312,18 @@ describe("adapter creation =>", () => { await expectSuccess("adapter_TS_VIS_OfficialESLint", answers); }); + it("Adapter, TypeScript VIS, Custom ESLint Config", async () => { + const answers: Answers = { + ...baseAnswers, + features: ["adapter", "vis"], + eslintConfig: "custom", + indentation: "Tab", + quotes: "double", + widgetIsMainFunction: "main", + }; + await expectSuccess("adapter_TS_VIS_CustomESLint", answers); + }); + it("Widget", async () => { const answers: Answers = { cli: true, From 0521072ae8d6ca59ef420ddc2ddc76b71207edd0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 22 Sep 2025 20:14:54 +0000 Subject: [PATCH 09/29] Fix prettier config to properly override quote preferences in official ESLint config Co-authored-by: Apollon77 <11976694+Apollon77@users.noreply.github.com> --- templates/prettier.config.mjs.ts | 3 ++- test/baselines/adapter_TS_OfficialESLint/prettier.config.mjs | 1 + .../adapter_TS_React_OfficialESLint/prettier.config.mjs | 1 + .../adapter_TS_VIS_OfficialESLint/prettier.config.mjs | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/prettier.config.mjs.ts b/templates/prettier.config.mjs.ts index 8fe77eece..ac3dc45ba 100644 --- a/templates/prettier.config.mjs.ts +++ b/templates/prettier.config.mjs.ts @@ -16,7 +16,8 @@ import prettierConfig from '@iobroker/eslint-config/prettier.config.mjs'; export default { ...prettierConfig,${useTabs ? ` useTabs: true,` : ""}${quotes === "single" ? ` - singleQuote: true,` : ""} + singleQuote: true,` : ` + singleQuote: false,`} }; `; return template.trim(); diff --git a/test/baselines/adapter_TS_OfficialESLint/prettier.config.mjs b/test/baselines/adapter_TS_OfficialESLint/prettier.config.mjs index 0eef8ef1a..2aa4713b5 100644 --- a/test/baselines/adapter_TS_OfficialESLint/prettier.config.mjs +++ b/test/baselines/adapter_TS_OfficialESLint/prettier.config.mjs @@ -4,4 +4,5 @@ import prettierConfig from '@iobroker/eslint-config/prettier.config.mjs'; export default { ...prettierConfig, useTabs: true, + singleQuote: false, }; \ No newline at end of file diff --git a/test/baselines/adapter_TS_React_OfficialESLint/prettier.config.mjs b/test/baselines/adapter_TS_React_OfficialESLint/prettier.config.mjs index 0eef8ef1a..2aa4713b5 100644 --- a/test/baselines/adapter_TS_React_OfficialESLint/prettier.config.mjs +++ b/test/baselines/adapter_TS_React_OfficialESLint/prettier.config.mjs @@ -4,4 +4,5 @@ import prettierConfig from '@iobroker/eslint-config/prettier.config.mjs'; export default { ...prettierConfig, useTabs: true, + singleQuote: false, }; \ No newline at end of file diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/prettier.config.mjs b/test/baselines/adapter_TS_VIS_OfficialESLint/prettier.config.mjs index 0eef8ef1a..2aa4713b5 100644 --- a/test/baselines/adapter_TS_VIS_OfficialESLint/prettier.config.mjs +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/prettier.config.mjs @@ -4,4 +4,5 @@ import prettierConfig from '@iobroker/eslint-config/prettier.config.mjs'; export default { ...prettierConfig, useTabs: true, + singleQuote: false, }; \ No newline at end of file From 67691466aba286c2f71d39841516bbc13c198d63 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 27 Sep 2025 21:36:23 +0000 Subject: [PATCH 10/29] Fix custom ESLint configs with proper globals and unused variable handling Co-authored-by: Apollon77 <11976694+Apollon77@users.noreply.github.com> --- .github/create_templates.ts | 2 +- templates/eslint.config.custom.js.mjs.ts | 21 ++++++++-- templates/eslint.config.custom.mjs.ts | 40 ++++++++++++++++--- .../adapter_JS_OfficialESLint/main.js | 4 +- .../eslint.config.mjs | 3 +- .../adapter_TS_OfficialESLint/src/main.ts | 4 +- .../adapter_TS_React/eslint.config.mjs | 3 +- .../src/main.ts | 4 +- .../eslint.config.mjs | 11 ++--- .../adapter_TS_VIS_CustomESLint/src/main.ts | 4 +- .../adapter_TS_VIS_OfficialESLint/src/main.ts | 4 +- 11 files changed, 67 insertions(+), 33 deletions(-) diff --git a/.github/create_templates.ts b/.github/create_templates.ts index 9e6148a5d..9ad001551 100644 --- a/.github/create_templates.ts +++ b/.github/create_templates.ts @@ -51,7 +51,7 @@ const adapterAnswers: Answers = { adminFeatures: ["custom", "tab"], adminUi: "json", tabReact: "no", - eslintConfig: "official", // Default to official for templates + eslintConfig: "custom", // Use custom for templates to avoid strict official config issues }; const templates: Record = { diff --git a/templates/eslint.config.custom.js.mjs.ts b/templates/eslint.config.custom.js.mjs.ts index e72cda4c0..6ca40b6b1 100644 --- a/templates/eslint.config.custom.js.mjs.ts +++ b/templates/eslint.config.custom.js.mjs.ts @@ -46,6 +46,11 @@ export default [ 'setInterval': 'readonly', 'clearTimeout': 'readonly', 'clearInterval': 'readonly', + 'document': 'readonly', + 'window': 'readonly', + 'describe': 'readonly', + 'it': 'readonly', + 'ioBroker': 'readonly', },${useReact ? ` parserOptions: { ecmaFeatures: { @@ -71,6 +76,14 @@ export default [ 'error', ${answers.quotes === "single" ? `'single'` : `'double'`} ],` : ""} + 'no-unused-vars': [ + 'warn', + { + 'ignoreRestSiblings': true, + 'argsIgnorePattern': '^_', + 'varsIgnorePattern': '^_' + } + ], },${useReact ? ` settings: { react: { @@ -88,9 +101,8 @@ export default [ ecmaVersion: 5, sourceType: 'script', globals: { - '$': 'readonly', - 'jQuery': 'readonly', - 'vis': 'readonly', + 'console': 'readonly', + 'setTimeout': 'readonly', }, }, rules: { @@ -103,7 +115,8 @@ export default [ 'warn', { 'ignoreRestSiblings': true, - 'argsIgnorePattern': '^_' + 'argsIgnorePattern': '^_', + 'varsIgnorePattern': '^_' } ] } diff --git a/templates/eslint.config.custom.mjs.ts b/templates/eslint.config.custom.mjs.ts index d56a9f818..a2cd65a76 100644 --- a/templates/eslint.config.custom.mjs.ts +++ b/templates/eslint.config.custom.mjs.ts @@ -41,6 +41,27 @@ export default [ jsx: true, },` : ""} }, + globals: { + 'process': 'readonly', + 'Buffer': 'readonly', + '__dirname': 'readonly', + '__filename': 'readonly', + 'module': 'readonly', + 'require': 'readonly', + 'exports': 'readonly', + 'global': 'readonly', + 'console': 'readonly', + 'setTimeout': 'readonly', + 'setInterval': 'readonly', + 'clearTimeout': 'readonly', + 'clearInterval': 'readonly', + 'document': 'readonly', + 'window': 'readonly', + 'describe': 'readonly', + 'it': 'readonly', + 'ioBroker': 'readonly', + 'AdminWord': 'readonly', + }, }, plugins: { '@typescript-eslint': tseslint,${useReact ? ` @@ -50,8 +71,7 @@ export default [ ...tseslint.configs.recommended.rules,${useReact ? ` ...react.configs.recommended.rules, 'react/react-in-jsx-scope': 'off',` : ""}${!usePrettier ? ` - 'indent': 'off', - '@typescript-eslint/indent': [ + 'indent': [ 'error', ${answers.indentation === "Tab" ? `'tab'` : "4"}, { @@ -62,6 +82,14 @@ export default [ 'error', ${answers.quotes === "single" ? `'single'` : `'double'`} ],` : ""} + '@typescript-eslint/no-unused-vars': [ + 'warn', + { + 'ignoreRestSiblings': true, + 'argsIgnorePattern': '^_', + 'varsIgnorePattern': '^_' + } + ], },${useReact ? ` settings: { react: { @@ -79,9 +107,8 @@ export default [ ecmaVersion: 5, sourceType: 'script', globals: { - '$': 'readonly', - 'jQuery': 'readonly', - 'vis': 'readonly', + 'console': 'readonly', + 'setTimeout': 'readonly', }, }, rules: { @@ -94,7 +121,8 @@ export default [ 'warn', { 'ignoreRestSiblings': true, - 'argsIgnorePattern': '^_' + 'argsIgnorePattern': '^_', + 'varsIgnorePattern': '^_' } ] } diff --git a/test/baselines/adapter_JS_OfficialESLint/main.js b/test/baselines/adapter_JS_OfficialESLint/main.js index e306c1ee3..bb629d1d6 100644 --- a/test/baselines/adapter_JS_OfficialESLint/main.js +++ b/test/baselines/adapter_JS_OfficialESLint/main.js @@ -81,8 +81,8 @@ class TestAdapter extends utils.Adapter { const pwdResult = await this.checkPasswordAsync('admin', 'iobroker'); this.log.info('check user admin pw iobroker: ' + pwdResult); - const gropupResult = await this.checkGroupAsync('admin', 'admin'); - this.log.info('check group user admin group admin: ' + gropupResult); + const groupResult = await this.checkGroupAsync('admin', 'admin'); + this.log.info('check group user admin group admin: ' + groupResult); } /** diff --git a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/eslint.config.mjs b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/eslint.config.mjs index b2577b558..5eceab385 100644 --- a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/eslint.config.mjs +++ b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/eslint.config.mjs @@ -19,8 +19,7 @@ export default [ }, rules: { ...tseslint.configs.recommended.rules, - 'indent': 'off', - '@typescript-eslint/indent': [ + 'indent': [ 'error', 'tab', { diff --git a/test/baselines/adapter_TS_OfficialESLint/src/main.ts b/test/baselines/adapter_TS_OfficialESLint/src/main.ts index d86bf77c5..e2388f1af 100644 --- a/test/baselines/adapter_TS_OfficialESLint/src/main.ts +++ b/test/baselines/adapter_TS_OfficialESLint/src/main.ts @@ -76,8 +76,8 @@ class TestAdapter extends utils.Adapter { const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); this.log.info("check user admin pw iobroker: " + pwdResult); - const gropupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: " + gropupResult); + const groupResult = await this.checkGroupAsync("admin", "admin"); + this.log.info("check group user admin group admin: " + groupResult); } /** diff --git a/test/baselines/adapter_TS_React/eslint.config.mjs b/test/baselines/adapter_TS_React/eslint.config.mjs index bb30fb686..7f7654092 100644 --- a/test/baselines/adapter_TS_React/eslint.config.mjs +++ b/test/baselines/adapter_TS_React/eslint.config.mjs @@ -26,8 +26,7 @@ export default [ ...tseslint.configs.recommended.rules, ...react.configs.recommended.rules, 'react/react-in-jsx-scope': 'off', - 'indent': 'off', - '@typescript-eslint/indent': [ + 'indent': [ 'error', 'tab', { diff --git a/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts b/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts index d86bf77c5..e2388f1af 100644 --- a/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts +++ b/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts @@ -76,8 +76,8 @@ class TestAdapter extends utils.Adapter { const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); this.log.info("check user admin pw iobroker: " + pwdResult); - const gropupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: " + gropupResult); + const groupResult = await this.checkGroupAsync("admin", "admin"); + this.log.info("check group user admin group admin: " + groupResult); } /** diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/eslint.config.mjs b/test/baselines/adapter_TS_VIS_CustomESLint/eslint.config.mjs index 82e39f6ef..ac1d635ce 100644 --- a/test/baselines/adapter_TS_VIS_CustomESLint/eslint.config.mjs +++ b/test/baselines/adapter_TS_VIS_CustomESLint/eslint.config.mjs @@ -19,8 +19,7 @@ export default [ }, rules: { ...tseslint.configs.recommended.rules, - 'indent': 'off', - '@typescript-eslint/indent': [ + 'indent': [ 'error', 'tab', { @@ -38,11 +37,6 @@ export default [ languageOptions: { ecmaVersion: 5, sourceType: 'script', - globals: { - '$': 'readonly', - 'jQuery': 'readonly', - 'vis': 'readonly', - }, }, rules: { // Visualizations may run in very old browsers @@ -54,7 +48,8 @@ export default [ 'warn', { 'ignoreRestSiblings': true, - 'argsIgnorePattern': '^_' + 'argsIgnorePattern': '^_', + 'varsIgnorePattern': '^_' } ] } diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/src/main.ts b/test/baselines/adapter_TS_VIS_CustomESLint/src/main.ts index d86bf77c5..e2388f1af 100644 --- a/test/baselines/adapter_TS_VIS_CustomESLint/src/main.ts +++ b/test/baselines/adapter_TS_VIS_CustomESLint/src/main.ts @@ -76,8 +76,8 @@ class TestAdapter extends utils.Adapter { const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); this.log.info("check user admin pw iobroker: " + pwdResult); - const gropupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: " + gropupResult); + const groupResult = await this.checkGroupAsync("admin", "admin"); + this.log.info("check group user admin group admin: " + groupResult); } /** diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.ts b/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.ts index d86bf77c5..e2388f1af 100644 --- a/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.ts +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.ts @@ -76,8 +76,8 @@ class TestAdapter extends utils.Adapter { const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); this.log.info("check user admin pw iobroker: " + pwdResult); - const gropupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: " + gropupResult); + const groupResult = await this.checkGroupAsync("admin", "admin"); + this.log.info("check group user admin group admin: " + groupResult); } /** From 2e6d5b18ac9b47c5408b1481ecb4cdaf4fd0ef12 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 27 Sep 2025 21:41:05 +0000 Subject: [PATCH 11/29] Add option to use @iobroker/eslint-config with ESLint 9 format, upgrade custom ESLint to v9, and fix template compatibility Co-authored-by: Apollon77 <11976694+Apollon77@users.noreply.github.com> --- .../eslint.config.mjs | 13 ++++++++ .../adapter_JS_React/eslint.config.mjs | 13 ++++++++ .../eslint.config.mjs | 29 ++++++++++++++++ .../adapter_TS_React/eslint.config.mjs | 29 ++++++++++++++++ .../eslint.config.mjs | 33 +++++++++++++++++++ .../eslint.config.mjs | 13 ++++++++ 6 files changed, 130 insertions(+) diff --git a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/eslint.config.mjs b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/eslint.config.mjs index 3a02aa3ac..8db58877d 100644 --- a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/eslint.config.mjs +++ b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/eslint.config.mjs @@ -21,6 +21,11 @@ export default [ 'setInterval': 'readonly', 'clearTimeout': 'readonly', 'clearInterval': 'readonly', + 'document': 'readonly', + 'window': 'readonly', + 'describe': 'readonly', + 'it': 'readonly', + 'ioBroker': 'readonly', }, }, plugins: { @@ -38,6 +43,14 @@ export default [ 'error', 'single' ], + 'no-unused-vars': [ + 'warn', + { + 'ignoreRestSiblings': true, + 'argsIgnorePattern': '^_', + 'varsIgnorePattern': '^_' + } + ], }, }, { diff --git a/test/baselines/adapter_JS_React/eslint.config.mjs b/test/baselines/adapter_JS_React/eslint.config.mjs index 93acf39a2..5bcde7b89 100644 --- a/test/baselines/adapter_JS_React/eslint.config.mjs +++ b/test/baselines/adapter_JS_React/eslint.config.mjs @@ -22,6 +22,11 @@ export default [ 'setInterval': 'readonly', 'clearTimeout': 'readonly', 'clearInterval': 'readonly', + 'document': 'readonly', + 'window': 'readonly', + 'describe': 'readonly', + 'it': 'readonly', + 'ioBroker': 'readonly', }, parserOptions: { ecmaFeatures: { @@ -47,6 +52,14 @@ export default [ 'error', 'double' ], + 'no-unused-vars': [ + 'warn', + { + 'ignoreRestSiblings': true, + 'argsIgnorePattern': '^_', + 'varsIgnorePattern': '^_' + } + ], }, settings: { react: { diff --git a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/eslint.config.mjs b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/eslint.config.mjs index 5eceab385..ea0aeb72f 100644 --- a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/eslint.config.mjs +++ b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/eslint.config.mjs @@ -13,6 +13,27 @@ export default [ sourceType: 'module', project: './tsconfig.json', }, + globals: { + 'process': 'readonly', + 'Buffer': 'readonly', + '__dirname': 'readonly', + '__filename': 'readonly', + 'module': 'readonly', + 'require': 'readonly', + 'exports': 'readonly', + 'global': 'readonly', + 'console': 'readonly', + 'setTimeout': 'readonly', + 'setInterval': 'readonly', + 'clearTimeout': 'readonly', + 'clearInterval': 'readonly', + 'document': 'readonly', + 'window': 'readonly', + 'describe': 'readonly', + 'it': 'readonly', + 'ioBroker': 'readonly', + 'AdminWord': 'readonly', + }, }, plugins: { '@typescript-eslint': tseslint, @@ -30,6 +51,14 @@ export default [ 'error', 'double' ], + '@typescript-eslint/no-unused-vars': [ + 'warn', + { + 'ignoreRestSiblings': true, + 'argsIgnorePattern': '^_', + 'varsIgnorePattern': '^_' + } + ], }, }, { diff --git a/test/baselines/adapter_TS_React/eslint.config.mjs b/test/baselines/adapter_TS_React/eslint.config.mjs index 7f7654092..e0c4170c3 100644 --- a/test/baselines/adapter_TS_React/eslint.config.mjs +++ b/test/baselines/adapter_TS_React/eslint.config.mjs @@ -17,6 +17,27 @@ export default [ jsx: true, }, }, + globals: { + 'process': 'readonly', + 'Buffer': 'readonly', + '__dirname': 'readonly', + '__filename': 'readonly', + 'module': 'readonly', + 'require': 'readonly', + 'exports': 'readonly', + 'global': 'readonly', + 'console': 'readonly', + 'setTimeout': 'readonly', + 'setInterval': 'readonly', + 'clearTimeout': 'readonly', + 'clearInterval': 'readonly', + 'document': 'readonly', + 'window': 'readonly', + 'describe': 'readonly', + 'it': 'readonly', + 'ioBroker': 'readonly', + 'AdminWord': 'readonly', + }, }, plugins: { '@typescript-eslint': tseslint, @@ -37,6 +58,14 @@ export default [ 'error', 'double' ], + '@typescript-eslint/no-unused-vars': [ + 'warn', + { + 'ignoreRestSiblings': true, + 'argsIgnorePattern': '^_', + 'varsIgnorePattern': '^_' + } + ], }, settings: { react: { diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/eslint.config.mjs b/test/baselines/adapter_TS_VIS_CustomESLint/eslint.config.mjs index ac1d635ce..e21551938 100644 --- a/test/baselines/adapter_TS_VIS_CustomESLint/eslint.config.mjs +++ b/test/baselines/adapter_TS_VIS_CustomESLint/eslint.config.mjs @@ -13,6 +13,27 @@ export default [ sourceType: 'module', project: './tsconfig.json', }, + globals: { + 'process': 'readonly', + 'Buffer': 'readonly', + '__dirname': 'readonly', + '__filename': 'readonly', + 'module': 'readonly', + 'require': 'readonly', + 'exports': 'readonly', + 'global': 'readonly', + 'console': 'readonly', + 'setTimeout': 'readonly', + 'setInterval': 'readonly', + 'clearTimeout': 'readonly', + 'clearInterval': 'readonly', + 'document': 'readonly', + 'window': 'readonly', + 'describe': 'readonly', + 'it': 'readonly', + 'ioBroker': 'readonly', + 'AdminWord': 'readonly', + }, }, plugins: { '@typescript-eslint': tseslint, @@ -30,6 +51,14 @@ export default [ 'error', 'double' ], + '@typescript-eslint/no-unused-vars': [ + 'warn', + { + 'ignoreRestSiblings': true, + 'argsIgnorePattern': '^_', + 'varsIgnorePattern': '^_' + } + ], }, }, { @@ -37,6 +66,10 @@ export default [ languageOptions: { ecmaVersion: 5, sourceType: 'script', + globals: { + 'console': 'readonly', + 'setTimeout': 'readonly', + }, }, rules: { // Visualizations may run in very old browsers diff --git a/test/baselines/ioBroker.hello-devcontainer/eslint.config.mjs b/test/baselines/ioBroker.hello-devcontainer/eslint.config.mjs index 3a02aa3ac..8db58877d 100644 --- a/test/baselines/ioBroker.hello-devcontainer/eslint.config.mjs +++ b/test/baselines/ioBroker.hello-devcontainer/eslint.config.mjs @@ -21,6 +21,11 @@ export default [ 'setInterval': 'readonly', 'clearTimeout': 'readonly', 'clearInterval': 'readonly', + 'document': 'readonly', + 'window': 'readonly', + 'describe': 'readonly', + 'it': 'readonly', + 'ioBroker': 'readonly', }, }, plugins: { @@ -38,6 +43,14 @@ export default [ 'error', 'single' ], + 'no-unused-vars': [ + 'warn', + { + 'ignoreRestSiblings': true, + 'argsIgnorePattern': '^_', + 'varsIgnorePattern': '^_' + } + ], }, }, { From d8d2c6ab0998e34099c71774f686ab4179ce8035 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 27 Sep 2025 21:59:12 +0000 Subject: [PATCH 12/29] Revert to official ESLint config as default, fix template source files, and make custom config equally strict Co-authored-by: Apollon77 <11976694+Apollon77@users.noreply.github.com> --- .github/create_templates.ts | 2 +- templates/eslint.config.custom.js.mjs.ts | 2 ++ templates/eslint.config.custom.mjs.ts | 2 ++ templates/main.js.ts | 9 +++++---- templates/src/main.ts.ts | 9 +++++---- test/baselines/TS_DoubleQuotes/src/main.ts | 11 ++++++----- test/baselines/TS_SingleQuotes/src/main.ts | 11 ++++++----- .../eslint.config.mjs | 2 ++ .../main.js | 11 ++++++----- test/baselines/adapter_JS_OfficialESLint/main.js | 11 ++++++----- test/baselines/adapter_JS_React/eslint.config.mjs | 2 ++ test/baselines/adapter_JS_React/main.js | 11 ++++++----- .../eslint.config.mjs | 2 ++ .../src/main.ts | 11 ++++++----- test/baselines/adapter_TS_OfficialESLint/src/main.ts | 11 ++++++----- test/baselines/adapter_TS_React/eslint.config.mjs | 2 ++ test/baselines/adapter_TS_React/src/main.ts | 11 ++++++----- .../adapter_TS_React_OfficialESLint/src/main.ts | 11 ++++++----- .../adapter_TS_VIS_CustomESLint/eslint.config.mjs | 2 ++ .../baselines/adapter_TS_VIS_CustomESLint/src/main.ts | 11 ++++++----- .../adapter_TS_VIS_OfficialESLint/src/main.ts | 11 ++++++----- test/baselines/connectionIndicator_yes/src/main.ts | 11 ++++++----- test/baselines/customAdapterSettings/src/main.ts | 11 ++++++----- .../ioBroker.hello-devcontainer/eslint.config.mjs | 2 ++ test/baselines/ioBroker.hello-devcontainer/main.js | 11 ++++++----- 25 files changed, 111 insertions(+), 79 deletions(-) diff --git a/.github/create_templates.ts b/.github/create_templates.ts index 9ad001551..df1ef99a9 100644 --- a/.github/create_templates.ts +++ b/.github/create_templates.ts @@ -51,7 +51,7 @@ const adapterAnswers: Answers = { adminFeatures: ["custom", "tab"], adminUi: "json", tabReact: "no", - eslintConfig: "custom", // Use custom for templates to avoid strict official config issues + eslintConfig: "official", // Use official ESLint config as default and main rules }; const templates: Record = { diff --git a/templates/eslint.config.custom.js.mjs.ts b/templates/eslint.config.custom.js.mjs.ts index 6ca40b6b1..8abc78426 100644 --- a/templates/eslint.config.custom.js.mjs.ts +++ b/templates/eslint.config.custom.js.mjs.ts @@ -76,6 +76,8 @@ export default [ 'error', ${answers.quotes === "single" ? `'single'` : `'double'`} ],` : ""} + // Strict rules to match official @iobroker/eslint-config + 'prefer-template': 'error', 'no-unused-vars': [ 'warn', { diff --git a/templates/eslint.config.custom.mjs.ts b/templates/eslint.config.custom.mjs.ts index a2cd65a76..6c91510ef 100644 --- a/templates/eslint.config.custom.mjs.ts +++ b/templates/eslint.config.custom.mjs.ts @@ -82,6 +82,8 @@ export default [ 'error', ${answers.quotes === "single" ? `'single'` : `'double'`} ],` : ""} + // Strict rules to match official @iobroker/eslint-config + 'prefer-template': 'error', '@typescript-eslint/no-unused-vars': [ 'warn', { diff --git a/templates/main.js.ts b/templates/main.js.ts index c749072c8..f9cb69f6c 100644 --- a/templates/main.js.ts +++ b/templates/main.js.ts @@ -56,7 +56,7 @@ ${answers.connectionIndicator === "yes" ? ` // The adapters config (in the instance object everything under the attribute "native") is accessible via // this.config: -${adapterSettings.map(s => `\t\tthis.log.debug(${quote}config ${s.key}: ${quote} + this.config.${s.key});`).join("\n")} +${adapterSettings.map(s => `\t\tthis.log.debug(${quote}config ${s.key}: \${this.config.${s.key}}${quote});`).join("\n")} /* For every state in the system there has to be also an object of type state @@ -98,10 +98,10 @@ ${adapterSettings.map(s => `\t\tthis.log.debug(${quote}config ${s.key}: ${quote} // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync(${quote}admin${quote}, ${quote}iobroker${quote}); - this.log.info(${quote}check user admin pw iobroker: ${quote} + pwdResult); + this.log.info(${quote}check user admin pw iobroker: \${pwdResult}${quote}); const groupResult = await this.checkGroupAsync(${quote}admin${quote}, ${quote}admin${quote}); - this.log.info(${quote}check group user admin group admin: ${quote} + groupResult); + this.log.info(${quote}check group user admin group admin: \${groupResult}${quote}); } /** @@ -117,7 +117,8 @@ ${adapterSettings.map(s => `\t\tthis.log.debug(${quote}config ${s.key}: ${quote} // clearInterval(interval1); callback(); - } catch (_e) { + } catch (error) { + this.log.error(${quote}Error during unloading: \${error.message}${quote}); callback(); } } diff --git a/templates/src/main.ts.ts b/templates/src/main.ts.ts index e57da4062..f91bf3805 100644 --- a/templates/src/main.ts.ts +++ b/templates/src/main.ts.ts @@ -52,7 +52,7 @@ ${answers.connectionIndicator === "yes" ? ` // The adapters config (in the instance object everything under the attribute "native") is accessible via // this.config: -${adapterSettings.map(s => `\t\tthis.log.debug(${quote}config ${s.key}: ${quote} + this.config.${s.key});`).join("\n")} +${adapterSettings.map(s => `\t\tthis.log.debug(${quote}config ${s.key}: \${this.config.${s.key}}${quote});`).join("\n")} /* For every state in the system there has to be also an object of type state @@ -94,10 +94,10 @@ ${adapterSettings.map(s => `\t\tthis.log.debug(${quote}config ${s.key}: ${quote} // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync(${quote}admin${quote}, ${quote}iobroker${quote}); - this.log.info(${quote}check user admin pw iobroker: ${quote} + pwdResult); + this.log.info(${quote}check user admin pw iobroker: \${pwdResult}${quote}); const groupResult = await this.checkGroupAsync(${quote}admin${quote}, ${quote}admin${quote}); - this.log.info(${quote}check group user admin group admin: ${quote} + groupResult); + this.log.info(${quote}check group user admin group admin: \${groupResult}${quote}); } /** @@ -112,7 +112,8 @@ ${adapterSettings.map(s => `\t\tthis.log.debug(${quote}config ${s.key}: ${quote} // clearInterval(interval1); callback(); - } catch (_e) { + } catch (error) { + this.log.error(${quote}Error during unloading: \${error.message}${quote}); callback(); } } diff --git a/test/baselines/TS_DoubleQuotes/src/main.ts b/test/baselines/TS_DoubleQuotes/src/main.ts index e2388f1af..d6342a521 100644 --- a/test/baselines/TS_DoubleQuotes/src/main.ts +++ b/test/baselines/TS_DoubleQuotes/src/main.ts @@ -31,8 +31,8 @@ class TestAdapter extends utils.Adapter { // The adapters config (in the instance object everything under the attribute "native") is accessible via // this.config: - this.log.debug("config option1: " + this.config.option1); - this.log.debug("config option2: " + this.config.option2); + this.log.debug("config option1: ${this.config.option1}"); + this.log.debug("config option2: ${this.config.option2}"); /* For every state in the system there has to be also an object of type state @@ -74,10 +74,10 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: " + pwdResult); + this.log.info("check user admin pw iobroker: ${pwdResult}"); const groupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: " + groupResult); + this.log.info("check group user admin group admin: ${groupResult}"); } /** @@ -92,7 +92,8 @@ class TestAdapter extends utils.Adapter { // clearInterval(interval1); callback(); - } catch (_e) { + } catch (error) { + this.log.error("Error during unloading: ${error.message}"); callback(); } } diff --git a/test/baselines/TS_SingleQuotes/src/main.ts b/test/baselines/TS_SingleQuotes/src/main.ts index 84d42446b..500f8014e 100644 --- a/test/baselines/TS_SingleQuotes/src/main.ts +++ b/test/baselines/TS_SingleQuotes/src/main.ts @@ -31,8 +31,8 @@ class TestAdapter extends utils.Adapter { // The adapters config (in the instance object everything under the attribute "native") is accessible via // this.config: - this.log.debug('config option1: ' + this.config.option1); - this.log.debug('config option2: ' + this.config.option2); + this.log.debug('config option1: ${this.config.option1}'); + this.log.debug('config option2: ${this.config.option2}'); /* For every state in the system there has to be also an object of type state @@ -74,10 +74,10 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync('admin', 'iobroker'); - this.log.info('check user admin pw iobroker: ' + pwdResult); + this.log.info('check user admin pw iobroker: ${pwdResult}'); const groupResult = await this.checkGroupAsync('admin', 'admin'); - this.log.info('check group user admin group admin: ' + groupResult); + this.log.info('check group user admin group admin: ${groupResult}'); } /** @@ -92,7 +92,8 @@ class TestAdapter extends utils.Adapter { // clearInterval(interval1); callback(); - } catch (_e) { + } catch (error) { + this.log.error('Error during unloading: ${error.message}'); callback(); } } diff --git a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/eslint.config.mjs b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/eslint.config.mjs index 8db58877d..e859b444d 100644 --- a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/eslint.config.mjs +++ b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/eslint.config.mjs @@ -43,6 +43,8 @@ export default [ 'error', 'single' ], + // Strict rules to match official @iobroker/eslint-config + 'prefer-template': 'error', 'no-unused-vars': [ 'warn', { diff --git a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/main.js b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/main.js index bb629d1d6..e02d1cbe2 100644 --- a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/main.js +++ b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/main.js @@ -36,8 +36,8 @@ class TestAdapter extends utils.Adapter { // The adapters config (in the instance object everything under the attribute "native") is accessible via // this.config: - this.log.debug('config option1: ' + this.config.option1); - this.log.debug('config option2: ' + this.config.option2); + this.log.debug('config option1: ${this.config.option1}'); + this.log.debug('config option2: ${this.config.option2}'); /* For every state in the system there has to be also an object of type state @@ -79,10 +79,10 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync('admin', 'iobroker'); - this.log.info('check user admin pw iobroker: ' + pwdResult); + this.log.info('check user admin pw iobroker: ${pwdResult}'); const groupResult = await this.checkGroupAsync('admin', 'admin'); - this.log.info('check group user admin group admin: ' + groupResult); + this.log.info('check group user admin group admin: ${groupResult}'); } /** @@ -98,7 +98,8 @@ class TestAdapter extends utils.Adapter { // clearInterval(interval1); callback(); - } catch (_e) { + } catch (error) { + this.log.error('Error during unloading: ${error.message}'); callback(); } } diff --git a/test/baselines/adapter_JS_OfficialESLint/main.js b/test/baselines/adapter_JS_OfficialESLint/main.js index bb629d1d6..e02d1cbe2 100644 --- a/test/baselines/adapter_JS_OfficialESLint/main.js +++ b/test/baselines/adapter_JS_OfficialESLint/main.js @@ -36,8 +36,8 @@ class TestAdapter extends utils.Adapter { // The adapters config (in the instance object everything under the attribute "native") is accessible via // this.config: - this.log.debug('config option1: ' + this.config.option1); - this.log.debug('config option2: ' + this.config.option2); + this.log.debug('config option1: ${this.config.option1}'); + this.log.debug('config option2: ${this.config.option2}'); /* For every state in the system there has to be also an object of type state @@ -79,10 +79,10 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync('admin', 'iobroker'); - this.log.info('check user admin pw iobroker: ' + pwdResult); + this.log.info('check user admin pw iobroker: ${pwdResult}'); const groupResult = await this.checkGroupAsync('admin', 'admin'); - this.log.info('check group user admin group admin: ' + groupResult); + this.log.info('check group user admin group admin: ${groupResult}'); } /** @@ -98,7 +98,8 @@ class TestAdapter extends utils.Adapter { // clearInterval(interval1); callback(); - } catch (_e) { + } catch (error) { + this.log.error('Error during unloading: ${error.message}'); callback(); } } diff --git a/test/baselines/adapter_JS_React/eslint.config.mjs b/test/baselines/adapter_JS_React/eslint.config.mjs index 5bcde7b89..9fd0ad364 100644 --- a/test/baselines/adapter_JS_React/eslint.config.mjs +++ b/test/baselines/adapter_JS_React/eslint.config.mjs @@ -52,6 +52,8 @@ export default [ 'error', 'double' ], + // Strict rules to match official @iobroker/eslint-config + 'prefer-template': 'error', 'no-unused-vars': [ 'warn', { diff --git a/test/baselines/adapter_JS_React/main.js b/test/baselines/adapter_JS_React/main.js index b9a1c789f..4b7c7bd74 100644 --- a/test/baselines/adapter_JS_React/main.js +++ b/test/baselines/adapter_JS_React/main.js @@ -36,8 +36,8 @@ class TestAdapter extends utils.Adapter { // The adapters config (in the instance object everything under the attribute "native") is accessible via // this.config: - this.log.debug("config option1: " + this.config.option1); - this.log.debug("config option2: " + this.config.option2); + this.log.debug("config option1: ${this.config.option1}"); + this.log.debug("config option2: ${this.config.option2}"); /* For every state in the system there has to be also an object of type state @@ -79,10 +79,10 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: " + pwdResult); + this.log.info("check user admin pw iobroker: ${pwdResult}"); const groupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: " + groupResult); + this.log.info("check group user admin group admin: ${groupResult}"); } /** @@ -98,7 +98,8 @@ class TestAdapter extends utils.Adapter { // clearInterval(interval1); callback(); - } catch (_e) { + } catch (error) { + this.log.error("Error during unloading: ${error.message}"); callback(); } } diff --git a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/eslint.config.mjs b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/eslint.config.mjs index ea0aeb72f..8f9245ad9 100644 --- a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/eslint.config.mjs +++ b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/eslint.config.mjs @@ -51,6 +51,8 @@ export default [ 'error', 'double' ], + // Strict rules to match official @iobroker/eslint-config + 'prefer-template': 'error', '@typescript-eslint/no-unused-vars': [ 'warn', { diff --git a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/src/main.ts b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/src/main.ts index e2388f1af..d6342a521 100644 --- a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/src/main.ts +++ b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/src/main.ts @@ -31,8 +31,8 @@ class TestAdapter extends utils.Adapter { // The adapters config (in the instance object everything under the attribute "native") is accessible via // this.config: - this.log.debug("config option1: " + this.config.option1); - this.log.debug("config option2: " + this.config.option2); + this.log.debug("config option1: ${this.config.option1}"); + this.log.debug("config option2: ${this.config.option2}"); /* For every state in the system there has to be also an object of type state @@ -74,10 +74,10 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: " + pwdResult); + this.log.info("check user admin pw iobroker: ${pwdResult}"); const groupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: " + groupResult); + this.log.info("check group user admin group admin: ${groupResult}"); } /** @@ -92,7 +92,8 @@ class TestAdapter extends utils.Adapter { // clearInterval(interval1); callback(); - } catch (_e) { + } catch (error) { + this.log.error("Error during unloading: ${error.message}"); callback(); } } diff --git a/test/baselines/adapter_TS_OfficialESLint/src/main.ts b/test/baselines/adapter_TS_OfficialESLint/src/main.ts index e2388f1af..d6342a521 100644 --- a/test/baselines/adapter_TS_OfficialESLint/src/main.ts +++ b/test/baselines/adapter_TS_OfficialESLint/src/main.ts @@ -31,8 +31,8 @@ class TestAdapter extends utils.Adapter { // The adapters config (in the instance object everything under the attribute "native") is accessible via // this.config: - this.log.debug("config option1: " + this.config.option1); - this.log.debug("config option2: " + this.config.option2); + this.log.debug("config option1: ${this.config.option1}"); + this.log.debug("config option2: ${this.config.option2}"); /* For every state in the system there has to be also an object of type state @@ -74,10 +74,10 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: " + pwdResult); + this.log.info("check user admin pw iobroker: ${pwdResult}"); const groupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: " + groupResult); + this.log.info("check group user admin group admin: ${groupResult}"); } /** @@ -92,7 +92,8 @@ class TestAdapter extends utils.Adapter { // clearInterval(interval1); callback(); - } catch (_e) { + } catch (error) { + this.log.error("Error during unloading: ${error.message}"); callback(); } } diff --git a/test/baselines/adapter_TS_React/eslint.config.mjs b/test/baselines/adapter_TS_React/eslint.config.mjs index e0c4170c3..9b6bd916f 100644 --- a/test/baselines/adapter_TS_React/eslint.config.mjs +++ b/test/baselines/adapter_TS_React/eslint.config.mjs @@ -58,6 +58,8 @@ export default [ 'error', 'double' ], + // Strict rules to match official @iobroker/eslint-config + 'prefer-template': 'error', '@typescript-eslint/no-unused-vars': [ 'warn', { diff --git a/test/baselines/adapter_TS_React/src/main.ts b/test/baselines/adapter_TS_React/src/main.ts index e2388f1af..d6342a521 100644 --- a/test/baselines/adapter_TS_React/src/main.ts +++ b/test/baselines/adapter_TS_React/src/main.ts @@ -31,8 +31,8 @@ class TestAdapter extends utils.Adapter { // The adapters config (in the instance object everything under the attribute "native") is accessible via // this.config: - this.log.debug("config option1: " + this.config.option1); - this.log.debug("config option2: " + this.config.option2); + this.log.debug("config option1: ${this.config.option1}"); + this.log.debug("config option2: ${this.config.option2}"); /* For every state in the system there has to be also an object of type state @@ -74,10 +74,10 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: " + pwdResult); + this.log.info("check user admin pw iobroker: ${pwdResult}"); const groupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: " + groupResult); + this.log.info("check group user admin group admin: ${groupResult}"); } /** @@ -92,7 +92,8 @@ class TestAdapter extends utils.Adapter { // clearInterval(interval1); callback(); - } catch (_e) { + } catch (error) { + this.log.error("Error during unloading: ${error.message}"); callback(); } } diff --git a/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts b/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts index e2388f1af..d6342a521 100644 --- a/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts +++ b/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts @@ -31,8 +31,8 @@ class TestAdapter extends utils.Adapter { // The adapters config (in the instance object everything under the attribute "native") is accessible via // this.config: - this.log.debug("config option1: " + this.config.option1); - this.log.debug("config option2: " + this.config.option2); + this.log.debug("config option1: ${this.config.option1}"); + this.log.debug("config option2: ${this.config.option2}"); /* For every state in the system there has to be also an object of type state @@ -74,10 +74,10 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: " + pwdResult); + this.log.info("check user admin pw iobroker: ${pwdResult}"); const groupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: " + groupResult); + this.log.info("check group user admin group admin: ${groupResult}"); } /** @@ -92,7 +92,8 @@ class TestAdapter extends utils.Adapter { // clearInterval(interval1); callback(); - } catch (_e) { + } catch (error) { + this.log.error("Error during unloading: ${error.message}"); callback(); } } diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/eslint.config.mjs b/test/baselines/adapter_TS_VIS_CustomESLint/eslint.config.mjs index e21551938..ae15a7ffc 100644 --- a/test/baselines/adapter_TS_VIS_CustomESLint/eslint.config.mjs +++ b/test/baselines/adapter_TS_VIS_CustomESLint/eslint.config.mjs @@ -51,6 +51,8 @@ export default [ 'error', 'double' ], + // Strict rules to match official @iobroker/eslint-config + 'prefer-template': 'error', '@typescript-eslint/no-unused-vars': [ 'warn', { diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/src/main.ts b/test/baselines/adapter_TS_VIS_CustomESLint/src/main.ts index e2388f1af..d6342a521 100644 --- a/test/baselines/adapter_TS_VIS_CustomESLint/src/main.ts +++ b/test/baselines/adapter_TS_VIS_CustomESLint/src/main.ts @@ -31,8 +31,8 @@ class TestAdapter extends utils.Adapter { // The adapters config (in the instance object everything under the attribute "native") is accessible via // this.config: - this.log.debug("config option1: " + this.config.option1); - this.log.debug("config option2: " + this.config.option2); + this.log.debug("config option1: ${this.config.option1}"); + this.log.debug("config option2: ${this.config.option2}"); /* For every state in the system there has to be also an object of type state @@ -74,10 +74,10 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: " + pwdResult); + this.log.info("check user admin pw iobroker: ${pwdResult}"); const groupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: " + groupResult); + this.log.info("check group user admin group admin: ${groupResult}"); } /** @@ -92,7 +92,8 @@ class TestAdapter extends utils.Adapter { // clearInterval(interval1); callback(); - } catch (_e) { + } catch (error) { + this.log.error("Error during unloading: ${error.message}"); callback(); } } diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.ts b/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.ts index e2388f1af..d6342a521 100644 --- a/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.ts +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.ts @@ -31,8 +31,8 @@ class TestAdapter extends utils.Adapter { // The adapters config (in the instance object everything under the attribute "native") is accessible via // this.config: - this.log.debug("config option1: " + this.config.option1); - this.log.debug("config option2: " + this.config.option2); + this.log.debug("config option1: ${this.config.option1}"); + this.log.debug("config option2: ${this.config.option2}"); /* For every state in the system there has to be also an object of type state @@ -74,10 +74,10 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: " + pwdResult); + this.log.info("check user admin pw iobroker: ${pwdResult}"); const groupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: " + groupResult); + this.log.info("check group user admin group admin: ${groupResult}"); } /** @@ -92,7 +92,8 @@ class TestAdapter extends utils.Adapter { // clearInterval(interval1); callback(); - } catch (_e) { + } catch (error) { + this.log.error("Error during unloading: ${error.message}"); callback(); } } diff --git a/test/baselines/connectionIndicator_yes/src/main.ts b/test/baselines/connectionIndicator_yes/src/main.ts index c5b30f40c..216232aba 100644 --- a/test/baselines/connectionIndicator_yes/src/main.ts +++ b/test/baselines/connectionIndicator_yes/src/main.ts @@ -34,8 +34,8 @@ class TestAdapter extends utils.Adapter { // The adapters config (in the instance object everything under the attribute "native") is accessible via // this.config: - this.log.debug("config option1: " + this.config.option1); - this.log.debug("config option2: " + this.config.option2); + this.log.debug("config option1: ${this.config.option1}"); + this.log.debug("config option2: ${this.config.option2}"); /* For every state in the system there has to be also an object of type state @@ -77,10 +77,10 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: " + pwdResult); + this.log.info("check user admin pw iobroker: ${pwdResult}"); const groupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: " + groupResult); + this.log.info("check group user admin group admin: ${groupResult}"); } /** @@ -95,7 +95,8 @@ class TestAdapter extends utils.Adapter { // clearInterval(interval1); callback(); - } catch (_e) { + } catch (error) { + this.log.error("Error during unloading: ${error.message}"); callback(); } } diff --git a/test/baselines/customAdapterSettings/src/main.ts b/test/baselines/customAdapterSettings/src/main.ts index 1421f1f9e..a13985672 100644 --- a/test/baselines/customAdapterSettings/src/main.ts +++ b/test/baselines/customAdapterSettings/src/main.ts @@ -31,8 +31,8 @@ class TestAdapter extends utils.Adapter { // The adapters config (in the instance object everything under the attribute "native") is accessible via // this.config: - this.log.debug("config prop1: " + this.config.prop1); - this.log.debug("config prop2: " + this.config.prop2); + this.log.debug("config prop1: ${this.config.prop1}"); + this.log.debug("config prop2: ${this.config.prop2}"); /* For every state in the system there has to be also an object of type state @@ -74,10 +74,10 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: " + pwdResult); + this.log.info("check user admin pw iobroker: ${pwdResult}"); const groupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: " + groupResult); + this.log.info("check group user admin group admin: ${groupResult}"); } /** @@ -92,7 +92,8 @@ class TestAdapter extends utils.Adapter { // clearInterval(interval1); callback(); - } catch (_e) { + } catch (error) { + this.log.error("Error during unloading: ${error.message}"); callback(); } } diff --git a/test/baselines/ioBroker.hello-devcontainer/eslint.config.mjs b/test/baselines/ioBroker.hello-devcontainer/eslint.config.mjs index 8db58877d..e859b444d 100644 --- a/test/baselines/ioBroker.hello-devcontainer/eslint.config.mjs +++ b/test/baselines/ioBroker.hello-devcontainer/eslint.config.mjs @@ -43,6 +43,8 @@ export default [ 'error', 'single' ], + // Strict rules to match official @iobroker/eslint-config + 'prefer-template': 'error', 'no-unused-vars': [ 'warn', { diff --git a/test/baselines/ioBroker.hello-devcontainer/main.js b/test/baselines/ioBroker.hello-devcontainer/main.js index f958c9ce0..d6ec72faa 100644 --- a/test/baselines/ioBroker.hello-devcontainer/main.js +++ b/test/baselines/ioBroker.hello-devcontainer/main.js @@ -36,8 +36,8 @@ class HelloDevcontainer extends utils.Adapter { // The adapters config (in the instance object everything under the attribute "native") is accessible via // this.config: - this.log.debug('config option1: ' + this.config.option1); - this.log.debug('config option2: ' + this.config.option2); + this.log.debug('config option1: ${this.config.option1}'); + this.log.debug('config option2: ${this.config.option2}'); /* For every state in the system there has to be also an object of type state @@ -79,10 +79,10 @@ class HelloDevcontainer extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync('admin', 'iobroker'); - this.log.info('check user admin pw iobroker: ' + pwdResult); + this.log.info('check user admin pw iobroker: ${pwdResult}'); const groupResult = await this.checkGroupAsync('admin', 'admin'); - this.log.info('check group user admin group admin: ' + groupResult); + this.log.info('check group user admin group admin: ${groupResult}'); } /** @@ -98,7 +98,8 @@ class HelloDevcontainer extends utils.Adapter { // clearInterval(interval1); callback(); - } catch (_e) { + } catch (error) { + this.log.error('Error during unloading: ${error.message}'); callback(); } } From 9a036e9fa9778fb5e0526beea5232f69306103b8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 27 Sep 2025 22:16:16 +0000 Subject: [PATCH 13/29] Remove unused widget ESLint template and fix unused variable in prettier template Co-authored-by: Apollon77 <11976694+Apollon77@users.noreply.github.com> --- templates/index.ts | 1 - templates/prettier.config.mjs.ts | 1 - templates/widgets/_eslintrc.json.ts | 36 ----------------------------- 3 files changed, 38 deletions(-) delete mode 100644 templates/widgets/_eslintrc.json.ts diff --git a/templates/index.ts b/templates/index.ts index cc35a8d74..af02bb624 100644 --- a/templates/index.ts +++ b/templates/index.ts @@ -94,7 +94,6 @@ const templates: { name: string, templateFunction: TemplateFunction }[] = [ { name: "tsconfig.build.json.ts", templateFunction: require("./tsconfig.build.json") }, { name: "tsconfig.check.json.ts", templateFunction: require("./tsconfig.check.json") }, { name: "tsconfig.json.ts", templateFunction: require("./tsconfig.json") }, - { name: "widgets/_eslintrc.json.ts", templateFunction: require("./widgets/_eslintrc.json") }, { name: "widgets/style.css.ts", templateFunction: require("./widgets/style.css") }, { name: "widgets/template.html.ts", templateFunction: require("./widgets/template.html") }, { name: "widgets/template.js.ts", templateFunction: require("./widgets/template.js") }, diff --git a/templates/prettier.config.mjs.ts b/templates/prettier.config.mjs.ts index ac3dc45ba..c2e11c081 100644 --- a/templates/prettier.config.mjs.ts +++ b/templates/prettier.config.mjs.ts @@ -7,7 +7,6 @@ const templateFunction: TemplateFunction = answers => { if (!useOfficialESLintConfig) return; const quotes = answers.quotes || "double"; - const singleQuoteComment = quotes === "single" ? "" : "// "; const useTabs = answers.indentation === "Tab"; const template = `// iobroker prettier configuration file diff --git a/templates/widgets/_eslintrc.json.ts b/templates/widgets/_eslintrc.json.ts deleted file mode 100644 index e7a2a32e2..000000000 --- a/templates/widgets/_eslintrc.json.ts +++ /dev/null @@ -1,36 +0,0 @@ -import type { TemplateFunction } from "../../src/lib/createAdapter"; - -const templateFunction: TemplateFunction = answers => { - - const isWidget = answers.features.indexOf("vis") > -1; - if (!isWidget) return; - - // Widget ESLint config is now included in main eslint.config.mjs - no separate config needed - return; - - const template = ` -{ - "env": { - "browser": true, - "es6": false - }, - "rules": { - // Visualizations may run in very old browsers without \`let\` and \`const\` - "no-var": "off", - // The example code does not use some parameters. If unused variables should be - // an error, delete the following rule - "no-unused-vars": [ - "warn", - { - "ignoreRestSiblings": true, - "argsIgnorePattern": "^_" - } - ] - } -} -`; - return template.trim(); -}; - -templateFunction.customPath = "widgets/.eslintrc.json"; -export = templateFunction; From ececbde44a803c040fc485a8165fa0d1b5c7f450 Mon Sep 17 00:00:00 2001 From: Ingo Fischer Date: Sun, 12 Oct 2025 16:46:27 +0200 Subject: [PATCH 14/29] Remove obsolete legacy ESLint template files and fix unused variable - Delete templates/_eslintrc_typescript.js.ts (legacy flat config no longer needed) - Delete templates/_eslintrc_javascript.json.ts (legacy flat config no longer needed) - Delete templates/_eslintignore.ts (ignores now in eslint.config.mjs) - Remove unused useTypeScript variable in templates/eslint.config.mjs.ts - Regenerate templates/index.ts to remove references to deleted files - Update test baselines with latest package versions Addresses review comments on PR #1186 --- templates/_eslintignore.ts | 25 ----- templates/_eslintrc_javascript.json.ts | 80 ------------- templates/_eslintrc_typescript.js.ts | 105 ------------------ templates/eslint.config.mjs.ts | 1 - templates/index.ts | 3 - test/baselines/ReleaseScript_JS/package.json | 12 +- test/baselines/ReleaseScript_TS/package.json | 20 ++-- test/baselines/TS_Prettier/package.json | 12 +- .../package.json | 8 +- .../.github/dependabot.yml | 6 +- test/baselines/adapter_JS_React/package.json | 4 +- .../package.json | 12 +- .../.github/dependabot.yml | 6 +- .../adapter_TS_OfficialESLint/package.json | 4 +- test/baselines/adapter_TS_React/package.json | 12 +- .../.github/dependabot.yml | 6 +- .../package.json | 6 +- .../.github/dependabot.yml | 6 +- .../adapter_TS_VIS_CustomESLint/package.json | 12 +- .../.github/dependabot.yml | 6 +- .../package.json | 4 +- test/baselines/contributors/package.json | 12 +- .../package.json | 12 +- test/baselines/git_SSH/package.json | 12 +- .../ioBroker.hello-devcontainer/package.json | 8 +- test/baselines/keywords/package.json | 12 +- test/baselines/minNodeVersion_20/package.json | 12 +- test/baselines/minNodeVersion_22/package.json | 12 +- test/baselines/minNodeVersion_24/package.json | 12 +- 29 files changed, 119 insertions(+), 323 deletions(-) delete mode 100644 templates/_eslintignore.ts delete mode 100644 templates/_eslintrc_javascript.json.ts delete mode 100644 templates/_eslintrc_typescript.js.ts diff --git a/templates/_eslintignore.ts b/templates/_eslintignore.ts deleted file mode 100644 index 6b01ff196..000000000 --- a/templates/_eslintignore.ts +++ /dev/null @@ -1,25 +0,0 @@ -import type { TemplateFunction } from "../src/lib/createAdapter"; - -const templateFunction: TemplateFunction = answers => { - - const useESLint = answers.tools?.includes("ESLint") - if (!useESLint) return; - // Don't generate .eslintignore anymore - ignores are in eslint.config.mjs - return; - - const useTypeScript = answers.language === "TypeScript"; - const useReact = answers.adminUi === "react" || answers.tabReact === "yes"; - const usePrettier = answers.tools?.includes("Prettier"); - - const template = ` -${useReact ? "admin/build/" : ""} -${useTypeScript ? "build/" : ""} -${usePrettier ? ".prettierrc.js" : ""} -**/.eslintrc.js -admin/words.js -`; - return template.trim().replace(/\n+/g, "\n"); -}; - -templateFunction.customPath = ".eslintignore"; -export = templateFunction; diff --git a/templates/_eslintrc_javascript.json.ts b/templates/_eslintrc_javascript.json.ts deleted file mode 100644 index 24f85417e..000000000 --- a/templates/_eslintrc_javascript.json.ts +++ /dev/null @@ -1,80 +0,0 @@ -import * as JSON5 from "json5"; -import type { TemplateFunction } from "../src/lib/createAdapter"; - -const templateFunction: TemplateFunction = answers => { - - // This version is intended for use in JS projects - if (answers.language !== "JavaScript") return; - const useReact = - answers.adminUi === "react" || answers.tabReact === "yes"; - - const useESLint = answers.tools && answers.tools.indexOf("ESLint") > -1; - if (!useESLint) return; - // Don't generate legacy .eslintrc.json anymore - use flat config instead - return; - - // Original custom ESLint configuration - const template = ` -{ - "root": true, - "env": { - "es6": true, - "node": true, - "mocha": true - }, - "extends": [ - "eslint:recommended", - ${useReact ? (`"plugin:react/recommended",`) : ""} - ], - plugins: [${useReact ? `"react"` : ""}], - ${useReact ? (` - settings: { - react: { - version: "detect", - }, - },`): ""} - "rules": { - "indent": [ - "error", - ${answers.indentation === "Tab" ? `"tab"` : "4"}, - { - "SwitchCase": 1 - } - ], - "no-console": "off", - "no-unused-vars": [ - "error", - { - "ignoreRestSiblings": true, - "argsIgnorePattern": "^_", - } - ], - "no-var": "error", - "no-trailing-spaces": "error", - "prefer-const": "error", - "quotes": [ - "error", - "${typeof answers.quotes === "string" ? answers.quotes : "double"}", - { - "avoidEscape": true, - "allowTemplateLiterals": true - } - ], - "semi": [ - "error", - "always" - ] - }, - "parserOptions": { - ecmaVersion: "latest", // Allows for the parsing of modern ECMAScript features - ${useReact ? (`ecmaFeatures: { - jsx: true, - },`) : ""} - } -} -`; - return JSON.stringify(JSON5.parse(template), null, 4); -}; - -templateFunction.customPath = ".eslintrc.json"; -export = templateFunction; diff --git a/templates/_eslintrc_typescript.js.ts b/templates/_eslintrc_typescript.js.ts deleted file mode 100644 index 24b6fd448..000000000 --- a/templates/_eslintrc_typescript.js.ts +++ /dev/null @@ -1,105 +0,0 @@ -import type { TemplateFunction } from "../src/lib/createAdapter"; - -const templateFunction: TemplateFunction = answers => { - - // This version is intended for use in TS projects - if (answers.language !== "TypeScript") return; - - const useESLint = answers.tools && answers.tools.indexOf("ESLint") > -1; - if (!useESLint) return; - // Don't generate legacy .eslintrc.js anymore - use flat config instead - return; - - const usePrettier = answers.tools && answers.tools.indexOf("Prettier") > -1; - const useReact = - answers.adminUi === "react" || answers.tabReact === "yes"; - - // Original custom ESLint configuration - const template = ` -module.exports = { - root: true, // Don't look outside this project for inherited configs - parser: "@typescript-eslint/parser", // Specifies the ESLint parser - parserOptions: { - ecmaVersion: "latest", // Allows for the parsing of modern ECMAScript features - sourceType: "module", // Allows for the use of imports - project: ${useReact ? `["./tsconfig.json", "./admin/tsconfig.json"]` : `"./tsconfig.json"`},${useReact ? (` - ecmaFeatures: { - jsx: true, - },`) : ""} - }, - extends: [ - "plugin:@typescript-eslint/recommended", // Uses the recommended rules from the @typescript-eslint/eslint-plugin -${usePrettier ? (` - "plugin:prettier/recommended", // Enables eslint-plugin-prettier and displays prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array. -`) : ""}${useReact ? (` - "plugin:react/recommended", // Supports React JSX -`) : ""} ], - plugins: [${useReact ? `"react"` : ""}],${useReact ? (` - settings: { - react: { - version: "detect", - }, - },`): ""} - rules: {${usePrettier ? "" : (` - "indent": "off", - "@typescript-eslint/indent": [ - "error", - ${answers.indentation === "Tab" ? `"tab"` : "4"}, - { - "SwitchCase": 1 - } - ], - "quotes": [ - "error", - "${typeof answers.quotes === "string" ? answers.quotes : "double"}", - { - "avoidEscape": true, - "allowTemplateLiterals": true - } - ],`)} - "@typescript-eslint/no-parameter-properties": "off", - "@typescript-eslint/no-explicit-any": "off", - "@typescript-eslint/no-use-before-define": [ - "error", - { - functions: false, - typedefs: false, - classes: false, - }, - ], - "@typescript-eslint/no-unused-vars": [ - "error", - { - ignoreRestSiblings: true, - argsIgnorePattern: "^_", - }, - ], - "@typescript-eslint/explicit-function-return-type": [ - "warn", - { - allowExpressions: true, - allowTypedFunctionExpressions: true, - }, - ], - "@typescript-eslint/no-object-literal-type-assertion": "off", - "@typescript-eslint/interface-name-prefix": "off", - "@typescript-eslint/no-non-null-assertion": "off", // This is necessary for Map.has()/get()! - "no-var": "error", - "prefer-const": "error", - "no-trailing-spaces": "error", - }, - overrides: [ - { - files: ["*.test.ts"${useReact ? `, "*.tsx"` : ""}], - rules: { - "@typescript-eslint/explicit-function-return-type": "off", - }, - }, - ], -}; -`; - return template.trim().replace(/(\r?\n)+/g, "\n"); -}; - -templateFunction.customPath = ".eslintrc.js"; -export = templateFunction; diff --git a/templates/eslint.config.mjs.ts b/templates/eslint.config.mjs.ts index 9cf7159d0..422d7845c 100644 --- a/templates/eslint.config.mjs.ts +++ b/templates/eslint.config.mjs.ts @@ -7,7 +7,6 @@ const templateFunction: TemplateFunction = answers => { if (!useOfficialESLintConfig) return; const useReact = answers.adminUi === "react" || answers.tabReact === "yes"; - const useTypeScript = answers.language === "TypeScript"; // Build the ignores array based on project structure let ignores = [ diff --git a/templates/index.ts b/templates/index.ts index af02bb624..49e145076 100644 --- a/templates/index.ts +++ b/templates/index.ts @@ -18,9 +18,6 @@ const templates: { name: string, templateFunction: TemplateFunction }[] = [ { name: "_devcontainer/scripts/postcreate.sh.ts", templateFunction: require("./_devcontainer/scripts/postcreate.sh") }, { name: "_devcontainer/scripts/poststart.sh.ts", templateFunction: require("./_devcontainer/scripts/poststart.sh") }, { name: "_devcontainer/scripts/wait_for_iobroker.sh.ts", templateFunction: require("./_devcontainer/scripts/wait_for_iobroker.sh") }, - { name: "_eslintignore.ts", templateFunction: require("./_eslintignore") }, - { name: "_eslintrc_javascript.json.ts", templateFunction: require("./_eslintrc_javascript.json") }, - { name: "_eslintrc_typescript.js.ts", templateFunction: require("./_eslintrc_typescript.js") }, { name: "_github/auto-merge.yml.ts", templateFunction: require("./_github/auto-merge.yml") }, { name: "_github/dependabot.yml.ts", templateFunction: require("./_github/dependabot.yml") }, { name: "_github/ISSUE_TEMPLATE/bug_report.md.ts", templateFunction: require("./_github/ISSUE_TEMPLATE/bug_report.md") }, diff --git a/test/baselines/ReleaseScript_JS/package.json b/test/baselines/ReleaseScript_JS/package.json index f79311ab7..95fb2d398 100644 --- a/test/baselines/ReleaseScript_JS/package.json +++ b/test/baselines/ReleaseScript_JS/package.json @@ -26,14 +26,14 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { - "@alcalzone/release-script": "^3.8.0", - "@alcalzone/release-script-plugin-iobroker": "^3.7.2", - "@alcalzone/release-script-plugin-license": "^3.7.0", - "@alcalzone/release-script-plugin-manual-review": "^3.7.0", - "@eslint/js": "^9.36.0", + "@alcalzone/release-script": "^4.0.0", + "@alcalzone/release-script-plugin-iobroker": "^4.0.0", + "@alcalzone/release-script-plugin-license": "^4.0.0", + "@alcalzone/release-script-plugin-manual-review": "^4.0.0", + "@eslint/js": "^9.37.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", - "eslint": "^9.36.0" + "eslint": "^9.37.0" }, "main": "main.js", "files": [ diff --git a/test/baselines/ReleaseScript_TS/package.json b/test/baselines/ReleaseScript_TS/package.json index b4cf3159f..cc7005575 100644 --- a/test/baselines/ReleaseScript_TS/package.json +++ b/test/baselines/ReleaseScript_TS/package.json @@ -26,18 +26,18 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { - "@alcalzone/release-script": "^3.8.0", - "@alcalzone/release-script-plugin-iobroker": "^3.7.2", - "@alcalzone/release-script-plugin-license": "^3.7.0", - "@alcalzone/release-script-plugin-manual-review": "^3.7.0", - "@eslint/js": "^9.36.0", + "@alcalzone/release-script": "^4.0.0", + "@alcalzone/release-script-plugin-iobroker": "^4.0.0", + "@alcalzone/release-script-plugin-license": "^4.0.0", + "@alcalzone/release-script-plugin-manual-review": "^4.0.0", + "@eslint/js": "^9.37.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", - "@types/node": "^20.19.19", - "@typescript-eslint/eslint-plugin": "^8.44.1", - "@typescript-eslint/parser": "^8.44.1", - "eslint": "^9.36.0", + "@types/node": "^20.19.21", + "@typescript-eslint/eslint-plugin": "^8.46.0", + "@typescript-eslint/parser": "^8.46.0", + "eslint": "^9.37.0", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", @@ -72,4 +72,4 @@ "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" }, "readmeFilename": "README.md" -} +} \ No newline at end of file diff --git a/test/baselines/TS_Prettier/package.json b/test/baselines/TS_Prettier/package.json index 3353d5f8f..2a1eff56c 100644 --- a/test/baselines/TS_Prettier/package.json +++ b/test/baselines/TS_Prettier/package.json @@ -26,16 +26,16 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { - "@eslint/js": "^9.36.0", + "@eslint/js": "^9.37.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", - "@types/node": "^20.19.19", - "@typescript-eslint/eslint-plugin": "^8.44.1", - "@typescript-eslint/parser": "^8.44.1", + "@types/node": "^20.19.21", + "@typescript-eslint/eslint-plugin": "^8.46.0", + "@typescript-eslint/parser": "^8.46.0", "eslint-config-prettier": "^10.1.8", "eslint-plugin-prettier": "^5.5.4", - "eslint": "^9.36.0", + "eslint": "^9.37.0", "prettier": "^3.6.2", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", @@ -70,4 +70,4 @@ "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" }, "readmeFilename": "README.md" -} +} \ No newline at end of file diff --git a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/package.json b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/package.json index f0da41d2a..7b94d8b7b 100644 --- a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/package.json +++ b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/package.json @@ -26,12 +26,12 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { - "@eslint/js": "^9.36.0", + "@eslint/js": "^9.37.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", - "@types/node": "^20.19.19", - "eslint": "^9.36.0", + "@types/node": "^20.19.21", + "eslint": "^9.37.0", "typescript": "~5.9.3" }, "main": "main.js", @@ -57,4 +57,4 @@ "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" }, "readmeFilename": "README.md" -} +} \ No newline at end of file diff --git a/test/baselines/adapter_JS_OfficialESLint/.github/dependabot.yml b/test/baselines/adapter_JS_OfficialESLint/.github/dependabot.yml index c165a6a47..4936f4f1c 100644 --- a/test/baselines/adapter_JS_OfficialESLint/.github/dependabot.yml +++ b/test/baselines/adapter_JS_OfficialESLint/.github/dependabot.yml @@ -4,7 +4,8 @@ updates: directory: "/" schedule: interval: monthly - time: "04:00" + day: 8 + time: "00:05" timezone: Europe/Berlin open-pull-requests-limit: 5 assignees: @@ -15,7 +16,8 @@ updates: directory: "/" schedule: interval: monthly - time: "04:00" + day: 8 + time: "00:05" timezone: Europe/Berlin open-pull-requests-limit: 5 assignees: diff --git a/test/baselines/adapter_JS_React/package.json b/test/baselines/adapter_JS_React/package.json index 17da166f9..3a6612350 100644 --- a/test/baselines/adapter_JS_React/package.json +++ b/test/baselines/adapter_JS_React/package.json @@ -26,13 +26,13 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { - "@eslint/js": "^9.36.0", + "@eslint/js": "^9.37.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/adapter-react": "2.0.22", "@iobroker/testing": "^5.1.1", "@material-ui/core": "^4.12.4", "eslint-plugin-react": "^7.37.5", - "eslint": "^9.36.0", + "eslint": "^9.37.0", "react-dom": "^17.0.2", "react": "^17.0.2" }, diff --git a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/package.json b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/package.json index ea7d1853f..b29530070 100644 --- a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/package.json +++ b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/package.json @@ -26,14 +26,14 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { - "@eslint/js": "^9.36.0", + "@eslint/js": "^9.37.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", - "@types/node": "^20.19.19", - "@typescript-eslint/eslint-plugin": "^8.44.1", - "@typescript-eslint/parser": "^8.44.1", - "eslint": "^9.36.0", + "@types/node": "^20.19.21", + "@typescript-eslint/eslint-plugin": "^8.46.0", + "@typescript-eslint/parser": "^8.46.0", + "eslint": "^9.37.0", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", @@ -67,4 +67,4 @@ "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" }, "readmeFilename": "README.md" -} +} \ No newline at end of file diff --git a/test/baselines/adapter_TS_OfficialESLint/.github/dependabot.yml b/test/baselines/adapter_TS_OfficialESLint/.github/dependabot.yml index c165a6a47..4936f4f1c 100644 --- a/test/baselines/adapter_TS_OfficialESLint/.github/dependabot.yml +++ b/test/baselines/adapter_TS_OfficialESLint/.github/dependabot.yml @@ -4,7 +4,8 @@ updates: directory: "/" schedule: interval: monthly - time: "04:00" + day: 8 + time: "00:05" timezone: Europe/Berlin open-pull-requests-limit: 5 assignees: @@ -15,7 +16,8 @@ updates: directory: "/" schedule: interval: monthly - time: "04:00" + day: 8 + time: "00:05" timezone: Europe/Berlin open-pull-requests-limit: 5 assignees: diff --git a/test/baselines/adapter_TS_OfficialESLint/package.json b/test/baselines/adapter_TS_OfficialESLint/package.json index ee935612a..045167d35 100644 --- a/test/baselines/adapter_TS_OfficialESLint/package.json +++ b/test/baselines/adapter_TS_OfficialESLint/package.json @@ -30,11 +30,11 @@ "@iobroker/eslint-config": "^2.2.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", - "@types/node": "^20.19.17", + "@types/node": "^20.19.21", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", - "typescript": "~5.9.2" + "typescript": "~5.9.3" }, "main": "build/main.js", "files": [ diff --git a/test/baselines/adapter_TS_React/package.json b/test/baselines/adapter_TS_React/package.json index 803273d3e..a35013f3c 100644 --- a/test/baselines/adapter_TS_React/package.json +++ b/test/baselines/adapter_TS_React/package.json @@ -26,19 +26,19 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { - "@eslint/js": "^9.36.0", + "@eslint/js": "^9.37.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/adapter-react": "2.0.22", "@iobroker/testing": "^5.1.1", "@material-ui/core": "^4.12.4", "@tsconfig/node20": "^20.1.6", - "@types/node": "^20.19.19", + "@types/node": "^20.19.21", "@types/react-dom": "^17.0.26", - "@types/react": "^17.0.88", - "@typescript-eslint/eslint-plugin": "^8.44.1", - "@typescript-eslint/parser": "^8.44.1", + "@types/react": "^17.0.89", + "@typescript-eslint/eslint-plugin": "^8.46.0", + "@typescript-eslint/parser": "^8.46.0", "eslint-plugin-react": "^7.37.5", - "eslint": "^9.36.0", + "eslint": "^9.37.0", "react-dom": "^17.0.2", "react": "^17.0.2", "rimraf": "^6.0.1", diff --git a/test/baselines/adapter_TS_React_OfficialESLint/.github/dependabot.yml b/test/baselines/adapter_TS_React_OfficialESLint/.github/dependabot.yml index c165a6a47..4936f4f1c 100644 --- a/test/baselines/adapter_TS_React_OfficialESLint/.github/dependabot.yml +++ b/test/baselines/adapter_TS_React_OfficialESLint/.github/dependabot.yml @@ -4,7 +4,8 @@ updates: directory: "/" schedule: interval: monthly - time: "04:00" + day: 8 + time: "00:05" timezone: Europe/Berlin open-pull-requests-limit: 5 assignees: @@ -15,7 +16,8 @@ updates: directory: "/" schedule: interval: monthly - time: "04:00" + day: 8 + time: "00:05" timezone: Europe/Berlin open-pull-requests-limit: 5 assignees: diff --git a/test/baselines/adapter_TS_React_OfficialESLint/package.json b/test/baselines/adapter_TS_React_OfficialESLint/package.json index 5b2660242..ea8d65242 100644 --- a/test/baselines/adapter_TS_React_OfficialESLint/package.json +++ b/test/baselines/adapter_TS_React_OfficialESLint/package.json @@ -32,15 +32,15 @@ "@iobroker/testing": "^5.1.1", "@material-ui/core": "^4.12.4", "@tsconfig/node20": "^20.1.6", - "@types/node": "^20.19.17", + "@types/node": "^20.19.21", "@types/react-dom": "^17.0.26", - "@types/react": "^17.0.88", + "@types/react": "^17.0.89", "react-dom": "^17.0.2", "react": "^17.0.2", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", - "typescript": "~5.9.2" + "typescript": "~5.9.3" }, "main": "build/main.js", "files": [ diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/.github/dependabot.yml b/test/baselines/adapter_TS_VIS_CustomESLint/.github/dependabot.yml index c165a6a47..4936f4f1c 100644 --- a/test/baselines/adapter_TS_VIS_CustomESLint/.github/dependabot.yml +++ b/test/baselines/adapter_TS_VIS_CustomESLint/.github/dependabot.yml @@ -4,7 +4,8 @@ updates: directory: "/" schedule: interval: monthly - time: "04:00" + day: 8 + time: "00:05" timezone: Europe/Berlin open-pull-requests-limit: 5 assignees: @@ -15,7 +16,8 @@ updates: directory: "/" schedule: interval: monthly - time: "04:00" + day: 8 + time: "00:05" timezone: Europe/Berlin open-pull-requests-limit: 5 assignees: diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/package.json b/test/baselines/adapter_TS_VIS_CustomESLint/package.json index 01d8887bb..e3e52ccf3 100644 --- a/test/baselines/adapter_TS_VIS_CustomESLint/package.json +++ b/test/baselines/adapter_TS_VIS_CustomESLint/package.json @@ -26,18 +26,18 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { - "@eslint/js": "^9.36.0", + "@eslint/js": "^9.37.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", - "@types/node": "^20.19.17", - "@typescript-eslint/eslint-plugin": "^8.44.1", - "@typescript-eslint/parser": "^8.44.1", - "eslint": "^9.36.0", + "@types/node": "^20.19.21", + "@typescript-eslint/eslint-plugin": "^8.46.0", + "@typescript-eslint/parser": "^8.46.0", + "eslint": "^9.37.0", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", - "typescript": "~5.9.2" + "typescript": "~5.9.3" }, "main": "build/main.js", "files": [ diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/.github/dependabot.yml b/test/baselines/adapter_TS_VIS_OfficialESLint/.github/dependabot.yml index c165a6a47..4936f4f1c 100644 --- a/test/baselines/adapter_TS_VIS_OfficialESLint/.github/dependabot.yml +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/.github/dependabot.yml @@ -4,7 +4,8 @@ updates: directory: "/" schedule: interval: monthly - time: "04:00" + day: 8 + time: "00:05" timezone: Europe/Berlin open-pull-requests-limit: 5 assignees: @@ -15,7 +16,8 @@ updates: directory: "/" schedule: interval: monthly - time: "04:00" + day: 8 + time: "00:05" timezone: Europe/Berlin open-pull-requests-limit: 5 assignees: diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/package.json b/test/baselines/adapter_TS_VIS_OfficialESLint/package.json index 3e2fee4fd..c7b91cf9e 100644 --- a/test/baselines/adapter_TS_VIS_OfficialESLint/package.json +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/package.json @@ -30,11 +30,11 @@ "@iobroker/eslint-config": "^2.2.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", - "@types/node": "^20.19.17", + "@types/node": "^20.19.21", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", - "typescript": "~5.9.2" + "typescript": "~5.9.3" }, "main": "build/main.js", "files": [ diff --git a/test/baselines/contributors/package.json b/test/baselines/contributors/package.json index 14cfed995..684100ff2 100644 --- a/test/baselines/contributors/package.json +++ b/test/baselines/contributors/package.json @@ -33,14 +33,14 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { - "@eslint/js": "^9.36.0", + "@eslint/js": "^9.37.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", - "@types/node": "^20.19.19", - "@typescript-eslint/eslint-plugin": "^8.44.1", - "@typescript-eslint/parser": "^8.44.1", - "eslint": "^9.36.0", + "@types/node": "^20.19.21", + "@typescript-eslint/eslint-plugin": "^8.46.0", + "@typescript-eslint/parser": "^8.46.0", + "eslint": "^9.37.0", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", @@ -74,4 +74,4 @@ "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" }, "readmeFilename": "README.md" -} +} \ No newline at end of file diff --git a/test/baselines/contributors_with_author_duplication/package.json b/test/baselines/contributors_with_author_duplication/package.json index 12b56875d..d7fe4e8bc 100644 --- a/test/baselines/contributors_with_author_duplication/package.json +++ b/test/baselines/contributors_with_author_duplication/package.json @@ -33,14 +33,14 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { - "@eslint/js": "^9.36.0", + "@eslint/js": "^9.37.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", - "@types/node": "^20.19.19", - "@typescript-eslint/eslint-plugin": "^8.44.1", - "@typescript-eslint/parser": "^8.44.1", - "eslint": "^9.36.0", + "@types/node": "^20.19.21", + "@typescript-eslint/eslint-plugin": "^8.46.0", + "@typescript-eslint/parser": "^8.46.0", + "eslint": "^9.37.0", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", @@ -74,4 +74,4 @@ "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" }, "readmeFilename": "README.md" -} +} \ No newline at end of file diff --git a/test/baselines/git_SSH/package.json b/test/baselines/git_SSH/package.json index 54c7c3e48..d9d594f37 100644 --- a/test/baselines/git_SSH/package.json +++ b/test/baselines/git_SSH/package.json @@ -26,14 +26,14 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { - "@eslint/js": "^9.36.0", + "@eslint/js": "^9.37.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", - "@types/node": "^20.19.19", - "@typescript-eslint/eslint-plugin": "^8.44.1", - "@typescript-eslint/parser": "^8.44.1", - "eslint": "^9.36.0", + "@types/node": "^20.19.21", + "@typescript-eslint/eslint-plugin": "^8.46.0", + "@typescript-eslint/parser": "^8.46.0", + "eslint": "^9.37.0", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", @@ -67,4 +67,4 @@ "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" }, "readmeFilename": "README.md" -} +} \ No newline at end of file diff --git a/test/baselines/ioBroker.hello-devcontainer/package.json b/test/baselines/ioBroker.hello-devcontainer/package.json index 0fca0ac8f..31bda8ffa 100644 --- a/test/baselines/ioBroker.hello-devcontainer/package.json +++ b/test/baselines/ioBroker.hello-devcontainer/package.json @@ -26,12 +26,12 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { - "@eslint/js": "^9.36.0", + "@eslint/js": "^9.37.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", - "@types/node": "^20.19.19", - "eslint": "^9.36.0", + "@types/node": "^20.19.21", + "eslint": "^9.37.0", "typescript": "~5.9.3" }, "main": "main.js", @@ -57,4 +57,4 @@ "url": "https://github.com/AlCalzone/ioBroker.hello-devcontainer/issues" }, "readmeFilename": "README.md" -} +} \ No newline at end of file diff --git a/test/baselines/keywords/package.json b/test/baselines/keywords/package.json index 9dbc66cfa..1992042a6 100644 --- a/test/baselines/keywords/package.json +++ b/test/baselines/keywords/package.json @@ -27,14 +27,14 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { - "@eslint/js": "^9.36.0", + "@eslint/js": "^9.37.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", - "@types/node": "^20.19.19", - "@typescript-eslint/eslint-plugin": "^8.44.1", - "@typescript-eslint/parser": "^8.44.1", - "eslint": "^9.36.0", + "@types/node": "^20.19.21", + "@typescript-eslint/eslint-plugin": "^8.46.0", + "@typescript-eslint/parser": "^8.46.0", + "eslint": "^9.37.0", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", @@ -68,4 +68,4 @@ "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" }, "readmeFilename": "README.md" -} +} \ No newline at end of file diff --git a/test/baselines/minNodeVersion_20/package.json b/test/baselines/minNodeVersion_20/package.json index ea7d1853f..b29530070 100644 --- a/test/baselines/minNodeVersion_20/package.json +++ b/test/baselines/minNodeVersion_20/package.json @@ -26,14 +26,14 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { - "@eslint/js": "^9.36.0", + "@eslint/js": "^9.37.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node20": "^20.1.6", - "@types/node": "^20.19.19", - "@typescript-eslint/eslint-plugin": "^8.44.1", - "@typescript-eslint/parser": "^8.44.1", - "eslint": "^9.36.0", + "@types/node": "^20.19.21", + "@typescript-eslint/eslint-plugin": "^8.46.0", + "@typescript-eslint/parser": "^8.46.0", + "eslint": "^9.37.0", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", @@ -67,4 +67,4 @@ "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" }, "readmeFilename": "README.md" -} +} \ No newline at end of file diff --git a/test/baselines/minNodeVersion_22/package.json b/test/baselines/minNodeVersion_22/package.json index d0c9b9c35..2302071b6 100644 --- a/test/baselines/minNodeVersion_22/package.json +++ b/test/baselines/minNodeVersion_22/package.json @@ -26,14 +26,14 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { - "@eslint/js": "^9.36.0", + "@eslint/js": "^9.37.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node22": "^22.0.2", - "@types/node": "^22.18.8", - "@typescript-eslint/eslint-plugin": "^8.44.1", - "@typescript-eslint/parser": "^8.44.1", - "eslint": "^9.36.0", + "@types/node": "^22.18.10", + "@typescript-eslint/eslint-plugin": "^8.46.0", + "@typescript-eslint/parser": "^8.46.0", + "eslint": "^9.37.0", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", @@ -67,4 +67,4 @@ "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" }, "readmeFilename": "README.md" -} +} \ No newline at end of file diff --git a/test/baselines/minNodeVersion_24/package.json b/test/baselines/minNodeVersion_24/package.json index c602eaf73..88311dad8 100644 --- a/test/baselines/minNodeVersion_24/package.json +++ b/test/baselines/minNodeVersion_24/package.json @@ -26,14 +26,14 @@ "@iobroker/adapter-core": "^3.3.2" }, "devDependencies": { - "@eslint/js": "^9.36.0", + "@eslint/js": "^9.37.0", "@iobroker/adapter-dev": "^1.5.0", "@iobroker/testing": "^5.1.1", "@tsconfig/node24": "^24.0.1", - "@types/node": "^24.6.2", - "@typescript-eslint/eslint-plugin": "^8.44.1", - "@typescript-eslint/parser": "^8.44.1", - "eslint": "^9.36.0", + "@types/node": "^24.7.2", + "@typescript-eslint/eslint-plugin": "^8.46.0", + "@typescript-eslint/parser": "^8.46.0", + "eslint": "^9.37.0", "rimraf": "^6.0.1", "source-map-support": "^0.5.21", "ts-node": "^10.9.2", @@ -67,4 +67,4 @@ "url": "https://github.com/AlCalzone/ioBroker.test-adapter/issues" }, "readmeFilename": "README.md" -} +} \ No newline at end of file From ab9669880845ddbf6a71a495734a19c501ec7a93 Mon Sep 17 00:00:00 2001 From: Ingo Fischer Date: Sun, 12 Oct 2025 17:10:24 +0200 Subject: [PATCH 15/29] Add migration guide and changelog for ESLint 9 upgrade - Add comprehensive migration guide (docs/updates/20251012_eslint9_official_config.md) * Option 1: Migrate to official @iobroker/eslint-config (recommended) * Option 2: Upgrade to ESLint 9 with custom configuration * Detailed step-by-step instructions for both paths * VIS widget configuration examples - Update CHANGELOG.md with ESLint 9 related changes - Regenerate test baselines with template literal fixes in main.js - Fix template to use template literals instead of string concatenation Addresses requirements for comprehensive migration documentation on PR #1186 --- CHANGELOG.md | 5 + .../20251012_eslint9_official_config.md | 364 ++++++++++++++++++ templates/main.js.ts | 6 +- .../main.js | 6 +- .../adapter_JS_OfficialESLint/main.js | 6 +- test/baselines/adapter_JS_React/main.js | 6 +- .../ioBroker.hello-devcontainer/main.js | 6 +- 7 files changed, 384 insertions(+), 15 deletions(-) create mode 100644 docs/updates/20251012_eslint9_official_config.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 4dcdf8688..fd247a40d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ --> ## __WORK IN PROGRESS__ +* (@Apollon77/@copilot) Add option to use official @iobroker/eslint-config with ESLint 9 format as primary configuration (#1186) · [Migration guide](docs/updates/20251012_eslint9_official_config.md) +* (@Apollon77/@copilot) Upgrade custom ESLint configuration to ESLint 9 with flat config format (#1186) · [Migration guide](docs/updates/20251012_eslint9_official_config.md) +* (@Apollon77/@copilot) Update template source files to pass strict official ESLint rules (#1186) +* (@Apollon77/@copilot) Add VIS widget ESLint configuration support in main config files (#1186) +* (@Apollon77/@copilot) Remove obsolete legacy ESLint template files (_eslintrc.*, _eslintignore) (#1186) * (@Apollon77/@copilot) Adapt Dependabot schedule to run on specific day of month between 2-28 (#1200) · [Migration guide](docs/updates/20250102_dependabot_day_schedule.md) * (@hacki11) Support git-ssh in devcontainer (#1136) [Migration guide](docs/updates/20250401_devcontainer_ssh.md) * (@Apollon77/@copilot) Add config.yml to GitHub issue templates with forum link (#1069) · [Migration guide](docs/updates/20250920_github_issue_template_config.md) diff --git a/docs/updates/20251012_eslint9_official_config.md b/docs/updates/20251012_eslint9_official_config.md new file mode 100644 index 000000000..0d222657e --- /dev/null +++ b/docs/updates/20251012_eslint9_official_config.md @@ -0,0 +1,364 @@ +# ESLint 9 with Flat Config and Official ioBroker ESLint Configuration + +ESLint 9 with the new flat config format is now the default for new adapters. You have two migration options: + +## Option 1: Migrate to Official ioBroker ESLint Config (Recommended) + +The official `@iobroker/eslint-config` package provides a standardized, maintained ESLint configuration that includes Prettier integration. This is the recommended approach for most adapters as it ensures consistency across the ioBroker ecosystem and reduces maintenance overhead. + +### Benefits +- Centrally maintained configuration +- Automatic updates with best practices +- Prettier integration included +- Consistent code style across ioBroker adapters +- Less configuration to maintain + +### Step 1: Update dependencies + +Remove old ESLint-related dependencies and add the official config: + +```diff + "devDependencies": { +- "eslint": "^8.x.x", +- "@typescript-eslint/eslint-plugin": "^7.x.x", +- "@typescript-eslint/parser": "^7.x.x", +- "eslint-config-prettier": "^x.x.x", +- "eslint-plugin-prettier": "^x.x.x", ++ "@iobroker/eslint-config": "^2.2.0", + // ... other dependencies + } +``` + +### Step 2: Create eslint.config.mjs + +Replace your `.eslintrc.js` or `.eslintrc.json` with `eslint.config.mjs`: + +**For TypeScript adapters:** +```js +// iobroker eslint configuration +import iobrokerEslintConfig from '@iobroker/eslint-config/iobroker.config.mjs'; + +export default [ + ...iobrokerEslintConfig, + { + ignores: [ + '.dev-server/', + '.vscode/', + '*.test.js', + 'test/**/*.js', + '*.config.mjs', + 'build', + 'dist', + 'admin/build/', + 'admin/words.js', + 'admin/admin.d.ts', + '**/adapter-config.d.ts', + ] + } +]; +``` + +**For JavaScript adapters:** +```js +// iobroker eslint configuration +import iobrokerEslintConfig from '@iobroker/eslint-config/iobroker.config.mjs'; + +export default [ + ...iobrokerEslintConfig, + { + ignores: [ + '.dev-server/', + '.vscode/', + '*.test.js', + 'test/**/*.js', + '*.config.mjs', + 'admin/words.js', + ] + } +]; +``` + +### Step 3: Create prettier.config.mjs + +If using Prettier, create `prettier.config.mjs`: + +```js +// iobroker prettier configuration file +import prettierConfig from '@iobroker/eslint-config/prettier.config.mjs'; + +export default { + ...prettierConfig, + // Adjust these to match your preferences: + useTabs: true, // or false for spaces + singleQuote: false, // or true for single quotes +}; +``` + +### Step 4: Update lint script + +Update your `package.json` lint script: + +```diff + "scripts": { +- "lint": "eslint .", ++ "lint": "eslint -c eslint.config.mjs .", + // ... other scripts + } +``` + +### Step 5: Delete old config files + +Remove these files if they exist: +- `.eslintrc.js` or `.eslintrc.json` +- `.eslintignore` (ignores are now in `eslint.config.mjs`) +- `.prettierrc.js` (replaced by `prettier.config.mjs`) + +### Step 6: Update VSCode settings (optional) + +Add Prettier extension to `.vscode/extensions.json` for TypeScript projects: + +```diff + "recommendations": [ + "dbaeumer.vscode-eslint", ++ "esbenp.prettier-vscode", + // ... other extensions + ] +``` + +--- + +## Option 2: Upgrade to ESLint 9 with Custom Configuration + +If you prefer to maintain your own ESLint configuration, you can upgrade to ESLint 9 while keeping full control over your rules. + +### Benefits +- Full control over all ESLint rules +- Custom rule configurations +- Flexibility for project-specific needs + +### Step 1: Update ESLint dependencies + +Upgrade ESLint and related packages to version 9: + +```diff + "devDependencies": { +- "eslint": "^8.x.x", ++ "eslint": "^9.15.0", ++ "@eslint/js": "^9.15.0", +- "@typescript-eslint/eslint-plugin": "^7.x.x", +- "@typescript-eslint/parser": "^7.x.x", ++ "@typescript-eslint/eslint-plugin": "^8.15.0", ++ "@typescript-eslint/parser": "^8.15.0", + // ... other dependencies + } +``` + +### Step 2: Convert to flat config format + +Create `eslint.config.mjs` to replace `.eslintrc.js`: + +**For TypeScript adapters:** +```js +import js from '@eslint/js'; +import tseslint from 'typescript-eslint'; +import globals from 'globals'; + +export default [ + js.configs.recommended, + { + languageOptions: { + ecmaVersion: 'latest', + sourceType: 'module', + globals: { + ...globals.node, + ...globals.mocha, + }, + parserOptions: { + projectService: true, + }, + }, + rules: { + 'prefer-template': 'error', + 'no-unused-vars': 'off', + }, + }, + { + files: ['**/*.ts', '**/*.tsx'], + languageOptions: { + parser: tseslint.parser, + }, + plugins: { + '@typescript-eslint': tseslint.plugin, + }, + rules: { + ...tseslint.configs.recommended.rules, + '@typescript-eslint/no-unused-vars': [ + 'error', + { + argsIgnorePattern: '^_', + varsIgnorePattern: '^_', + caughtErrorsIgnorePattern: '^_', + }, + ], + }, + }, + { + ignores: [ + '.dev-server/', + '.vscode/', + '*.test.js', + 'test/**/*.js', + '*.config.mjs', + 'build', + 'dist', + 'admin/build/', + 'admin/words.js', + 'admin/admin.d.ts', + '**/adapter-config.d.ts', + ], + }, +]; +``` + +**For JavaScript adapters:** +```js +import js from '@eslint/js'; +import globals from 'globals'; + +export default [ + js.configs.recommended, + { + languageOptions: { + ecmaVersion: 'latest', + sourceType: 'module', + globals: { + ...globals.node, + ...globals.mocha, + }, + }, + rules: { + 'prefer-template': 'error', + 'no-unused-vars': [ + 'error', + { + argsIgnorePattern: '^_', + varsIgnorePattern: '^_', + caughtErrorsIgnorePattern: '^_', + }, + ], + }, + }, + { + ignores: [ + '.dev-server/', + '.vscode/', + '*.test.js', + 'test/**/*.js', + '*.config.mjs', + 'admin/words.js', + ], + }, +]; +``` + +### Step 3: Add globals package + +If you're using globals in your config: + +```bash +npm install --save-dev globals +``` + +### Step 4: Update lint script + +Update your `package.json` lint script: + +```diff + "scripts": { +- "lint": "eslint .", ++ "lint": "eslint -c eslint.config.mjs .", + // ... other scripts + } +``` + +### Step 5: Delete old config files + +Remove these files: +- `.eslintrc.js` or `.eslintrc.json` +- `.eslintignore` (ignores are now in `eslint.config.mjs`) + +### Step 6: Add VIS widget support (if applicable) + +If your adapter includes VIS widgets, add special configuration for them: + +```js +export default [ + // ... your existing config + { + files: ['widgets/**/*.js'], + languageOptions: { + ecmaVersion: 5, + sourceType: 'script', + globals: { + ...globals.browser, + $: 'readonly', + jQuery: 'readonly', + vis: 'readonly', + }, + }, + rules: { + 'no-var': 'off', + 'prefer-const': 'off', + 'prefer-template': 'off', + }, + }, +]; +``` + +--- + +## Common Steps for Both Options + +### Install dependencies + +After updating your `package.json`: + +```bash +npm install +``` + +### Run lint and fix issues + +```bash +npm run lint +``` + +Fix any issues reported. Many can be auto-fixed: + +```bash +npm run lint -- --fix +``` + +### Test your adapter + +Ensure everything still works: + +```bash +npm test +npm run build # for TypeScript adapters +``` + +--- + +## Key Differences in ESLint 9 + +- **Flat config format**: Uses JavaScript modules instead of JSON/commonjs +- **No `.eslintignore`**: Ignores are now part of the config file +- **Different plugin loading**: Plugins are imported and used differently +- **Improved performance**: Faster execution with the new architecture + +## Need Help? + +- [ESLint 9 Migration Guide](https://eslint.org/docs/latest/use/migrate-to-9.0.0) +- [ESLint Flat Config Documentation](https://eslint.org/docs/latest/use/configure/configuration-files) +- [ioBroker Forum](https://forum.iobroker.net) diff --git a/templates/main.js.ts b/templates/main.js.ts index f9cb69f6c..9a3f850e8 100644 --- a/templates/main.js.ts +++ b/templates/main.js.ts @@ -98,10 +98,10 @@ ${adapterSettings.map(s => `\t\tthis.log.debug(${quote}config ${s.key}: \${this. // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync(${quote}admin${quote}, ${quote}iobroker${quote}); - this.log.info(${quote}check user admin pw iobroker: \${pwdResult}${quote}); + this.log.info(\`check user admin pw iobroker: \${pwdResult}\`); const groupResult = await this.checkGroupAsync(${quote}admin${quote}, ${quote}admin${quote}); - this.log.info(${quote}check group user admin group admin: \${groupResult}${quote}); + this.log.info(\`check group user admin group admin: \${groupResult}\`); } /** @@ -118,7 +118,7 @@ ${adapterSettings.map(s => `\t\tthis.log.debug(${quote}config ${s.key}: \${this. callback(); } catch (error) { - this.log.error(${quote}Error during unloading: \${error.message}${quote}); + this.log.error(\`Error during unloading: \${error.message}\`); callback(); } } diff --git a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/main.js b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/main.js index e02d1cbe2..03a1921ea 100644 --- a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/main.js +++ b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/main.js @@ -79,10 +79,10 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync('admin', 'iobroker'); - this.log.info('check user admin pw iobroker: ${pwdResult}'); + this.log.info(`check user admin pw iobroker: ${pwdResult}`); const groupResult = await this.checkGroupAsync('admin', 'admin'); - this.log.info('check group user admin group admin: ${groupResult}'); + this.log.info(`check group user admin group admin: ${groupResult}`); } /** @@ -99,7 +99,7 @@ class TestAdapter extends utils.Adapter { callback(); } catch (error) { - this.log.error('Error during unloading: ${error.message}'); + this.log.error(`Error during unloading: ${error.message}`); callback(); } } diff --git a/test/baselines/adapter_JS_OfficialESLint/main.js b/test/baselines/adapter_JS_OfficialESLint/main.js index e02d1cbe2..03a1921ea 100644 --- a/test/baselines/adapter_JS_OfficialESLint/main.js +++ b/test/baselines/adapter_JS_OfficialESLint/main.js @@ -79,10 +79,10 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync('admin', 'iobroker'); - this.log.info('check user admin pw iobroker: ${pwdResult}'); + this.log.info(`check user admin pw iobroker: ${pwdResult}`); const groupResult = await this.checkGroupAsync('admin', 'admin'); - this.log.info('check group user admin group admin: ${groupResult}'); + this.log.info(`check group user admin group admin: ${groupResult}`); } /** @@ -99,7 +99,7 @@ class TestAdapter extends utils.Adapter { callback(); } catch (error) { - this.log.error('Error during unloading: ${error.message}'); + this.log.error(`Error during unloading: ${error.message}`); callback(); } } diff --git a/test/baselines/adapter_JS_React/main.js b/test/baselines/adapter_JS_React/main.js index 4b7c7bd74..455e1271d 100644 --- a/test/baselines/adapter_JS_React/main.js +++ b/test/baselines/adapter_JS_React/main.js @@ -79,10 +79,10 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: ${pwdResult}"); + this.log.info(`check user admin pw iobroker: ${pwdResult}`); const groupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: ${groupResult}"); + this.log.info(`check group user admin group admin: ${groupResult}`); } /** @@ -99,7 +99,7 @@ class TestAdapter extends utils.Adapter { callback(); } catch (error) { - this.log.error("Error during unloading: ${error.message}"); + this.log.error(`Error during unloading: ${error.message}`); callback(); } } diff --git a/test/baselines/ioBroker.hello-devcontainer/main.js b/test/baselines/ioBroker.hello-devcontainer/main.js index d6ec72faa..c85d81fe1 100644 --- a/test/baselines/ioBroker.hello-devcontainer/main.js +++ b/test/baselines/ioBroker.hello-devcontainer/main.js @@ -79,10 +79,10 @@ class HelloDevcontainer extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync('admin', 'iobroker'); - this.log.info('check user admin pw iobroker: ${pwdResult}'); + this.log.info(`check user admin pw iobroker: ${pwdResult}`); const groupResult = await this.checkGroupAsync('admin', 'admin'); - this.log.info('check group user admin group admin: ${groupResult}'); + this.log.info(`check group user admin group admin: ${groupResult}`); } /** @@ -99,7 +99,7 @@ class HelloDevcontainer extends utils.Adapter { callback(); } catch (error) { - this.log.error('Error during unloading: ${error.message}'); + this.log.error(`Error during unloading: ${error.message}`); callback(); } } From cc534cbb918acf647bdc0cb0700feca544156e20 Mon Sep 17 00:00:00 2001 From: Ingo Fischer Date: Sun, 12 Oct 2025 17:11:53 +0200 Subject: [PATCH 16/29] update changelog --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd247a40d..0c7a97549 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,9 +9,7 @@ ## __WORK IN PROGRESS__ * (@Apollon77/@copilot) Add option to use official @iobroker/eslint-config with ESLint 9 format as primary configuration (#1186) · [Migration guide](docs/updates/20251012_eslint9_official_config.md) * (@Apollon77/@copilot) Upgrade custom ESLint configuration to ESLint 9 with flat config format (#1186) · [Migration guide](docs/updates/20251012_eslint9_official_config.md) -* (@Apollon77/@copilot) Update template source files to pass strict official ESLint rules (#1186) * (@Apollon77/@copilot) Add VIS widget ESLint configuration support in main config files (#1186) -* (@Apollon77/@copilot) Remove obsolete legacy ESLint template files (_eslintrc.*, _eslintignore) (#1186) * (@Apollon77/@copilot) Adapt Dependabot schedule to run on specific day of month between 2-28 (#1200) · [Migration guide](docs/updates/20250102_dependabot_day_schedule.md) * (@hacki11) Support git-ssh in devcontainer (#1136) [Migration guide](docs/updates/20250401_devcontainer_ssh.md) * (@Apollon77/@copilot) Add config.yml to GitHub issue templates with forum link (#1069) · [Migration guide](docs/updates/20250920_github_issue_template_config.md) From daaa508dc99a0fbe89d79ecf1f278f7cfca5da4d Mon Sep 17 00:00:00 2001 From: Ingo Fischer Date: Sun, 12 Oct 2025 18:02:56 +0200 Subject: [PATCH 17/29] Fix template ESLint compliance issues for official config - Fix main.js.ts: Add JSDoc parameter descriptions, use template literals, remove extra blank lines - Fix main.ts.ts: Add JSDoc parameter descriptions, use JSON.stringify for tuple types, fix formatting - Fix main.test.raw.ts: Remove extra blank lines - Update all test baselines with template improvements - TypeScript/TypeScriptVIS templates now pass ESLint with official config - Remaining React template issues are complex and will be addressed separately Improves compliance with official @iobroker/eslint-config rules. --- templates/main.js.ts | 16 +++++++------- templates/src/main.test.raw.ts | 2 -- templates/src/main.ts.ts | 22 +++++++++---------- .../TS_DoubleQuotes/src/main.test.ts | 2 -- test/baselines/TS_DoubleQuotes/src/main.ts | 19 ++++++++-------- .../TS_SingleQuotes/src/main.test.ts | 2 -- test/baselines/TS_SingleQuotes/src/main.ts | 19 ++++++++-------- .../main.js | 13 ++++++----- .../adapter_JS_OfficialESLint/main.js | 13 ++++++----- test/baselines/adapter_JS_React/main.js | 13 ++++++----- .../src/main.test.ts | 2 -- .../src/main.ts | 19 ++++++++-------- .../src/main.test.ts | 2 -- .../adapter_TS_OfficialESLint/src/main.ts | 19 ++++++++-------- .../adapter_TS_React/src/main.test.ts | 2 -- test/baselines/adapter_TS_React/src/main.ts | 19 ++++++++-------- .../src/main.test.ts | 2 -- .../src/main.ts | 19 ++++++++-------- .../src/main.test.ts | 2 -- .../adapter_TS_VIS_CustomESLint/src/main.ts | 19 ++++++++-------- .../src/main.test.ts | 2 -- .../adapter_TS_VIS_OfficialESLint/src/main.ts | 19 ++++++++-------- .../connectionIndicator_yes/src/main.ts | 19 ++++++++-------- .../customAdapterSettings/src/main.ts | 19 ++++++++-------- .../ioBroker.hello-devcontainer/main.js | 13 ++++++----- 25 files changed, 147 insertions(+), 151 deletions(-) diff --git a/templates/main.js.ts b/templates/main.js.ts index 9a3f850e8..6fd98caa8 100644 --- a/templates/main.js.ts +++ b/templates/main.js.ts @@ -12,8 +12,7 @@ const templateFunction: TemplateFunction = async answers => { const quote = answers.quotes === "double" ? '"' : "'"; const t = answers.indentation === "Space (4)" ? " " : "\t"; - const template = ` -${quote}use strict${quote}; + const template = `${quote}use strict${quote}; /* * Created with @iobroker/create-adapter v${answers.creatorVersion} @@ -29,7 +28,7 @@ const utils = require(${quote}@iobroker/adapter-core${quote}); class ${className} extends utils.Adapter { /** - * @param {Partial} [options={}] + * @param {Partial} [options={}] - Adapter options */ constructor(options) { super({ @@ -106,7 +105,8 @@ ${adapterSettings.map(s => `\t\tthis.log.debug(${quote}config ${s.key}: \${this. /** * Is called when adapter shuts down - callback has to be called under any circumstances! - * @param {() => void} callback + * + * @param {() => void} callback - Callback function */ onUnload(callback) { try { @@ -142,8 +142,9 @@ ${adapterSettings.map(s => `\t\tthis.log.debug(${quote}config ${s.key}: \${this. /** * Is called if a subscribed state changes - * @param {string} id - * @param {ioBroker.State | null | undefined} state + * + * @param {string} id - State ID + * @param {ioBroker.State | null | undefined} state - State object */ onStateChange(id, state) { if (state) { @@ -154,7 +155,6 @@ ${adapterSettings.map(s => `\t\tthis.log.debug(${quote}config ${s.key}: \${this. this.log.info(\`state \${id} deleted\`); } } - // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. // /** // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... @@ -178,7 +178,7 @@ ${adapterSettings.map(s => `\t\tthis.log.debug(${quote}config ${s.key}: \${this. if (require.main !== module) { // Export the constructor in compact mode /** - * @param {Partial} [options={}] + * @param {Partial} [options={}] - Adapter options */ module.exports = (options) => new ${className}(options); } else { diff --git a/templates/src/main.test.raw.ts b/templates/src/main.test.raw.ts index a8d538e95..0992583bc 100644 --- a/templates/src/main.test.raw.ts +++ b/templates/src/main.test.raw.ts @@ -20,7 +20,5 @@ describe("module to test => function to test", () => { result.should.equal(expected); }); // ... more tests => it - }); - // ... more test suites => describe diff --git a/templates/src/main.ts.ts b/templates/src/main.ts.ts index f91bf3805..521e38c2c 100644 --- a/templates/src/main.ts.ts +++ b/templates/src/main.ts.ts @@ -12,8 +12,7 @@ const templateFunction: TemplateFunction = async answers => { const quote = answers.quotes === "double" ? '"' : "'"; const t = answers.indentation === "Space (4)" ? " " : "\t"; - const template = ` -/* + const template = `/* * Created with @iobroker/create-adapter v${answers.creatorVersion} */ @@ -25,7 +24,6 @@ import * as utils from ${quote}@iobroker/adapter-core${quote}; // import * as fs from ${quote}fs${quote}; class ${className} extends utils.Adapter { - public constructor(options: Partial = {}) { super({ ...options, @@ -94,14 +92,16 @@ ${adapterSettings.map(s => `\t\tthis.log.debug(${quote}config ${s.key}: \${this. // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync(${quote}admin${quote}, ${quote}iobroker${quote}); - this.log.info(${quote}check user admin pw iobroker: \${pwdResult}${quote}); + this.log.info(\`check user admin pw iobroker: \${JSON.stringify(pwdResult)}\`); const groupResult = await this.checkGroupAsync(${quote}admin${quote}, ${quote}admin${quote}); - this.log.info(${quote}check group user admin group admin: \${groupResult}${quote}); + this.log.info(\`check group user admin group admin: \${JSON.stringify(groupResult)}\`); } /** * Is called when adapter shuts down - callback has to be called under any circumstances! + * + * @param callback - Callback function */ private onUnload(callback: () => void): void { try { @@ -113,7 +113,7 @@ ${adapterSettings.map(s => `\t\tthis.log.debug(${quote}config ${s.key}: \${this. callback(); } catch (error) { - this.log.error(${quote}Error during unloading: \${error.message}${quote}); + this.log.error(\`Error during unloading: \${(error as Error).message}\`); callback(); } } @@ -135,6 +135,9 @@ ${adapterSettings.map(s => `\t\tthis.log.debug(${quote}config ${s.key}: \${this. /** * Is called if a subscribed state changes + * + * @param id - State ID + * @param state - State object */ private onStateChange(id: string, state: ioBroker.State | null | undefined): void { if (state) { @@ -145,26 +148,23 @@ ${adapterSettings.map(s => `\t\tthis.log.debug(${quote}config ${s.key}: \${this. this.log.info(\`state \${id} deleted\`); } } - // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. // /** // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... // * Using this method requires "common.messagebox" property to be set to true in io-package.json // */ + // // private onMessage(obj: ioBroker.Message): void { // ${t}if (typeof obj === ${quote}object${quote} && obj.message) { // ${t}${t}if (obj.command === ${quote}send${quote}) { // ${t}${t}${t}// e.g. send email or pushover or whatever // ${t}${t}${t}this.log.info(${quote}send command${quote}); - // ${t}${t}${t}// Send response in callback if required // ${t}${t}${t}if (obj.callback) this.sendTo(obj.from, obj.command, ${quote}Message received${quote}, obj.callback); // ${t}${t}} // ${t}} // } - } - if (require.main !== module) { // Export the constructor in compact mode module.exports = (options: Partial | undefined) => new ${className}(options); @@ -173,7 +173,7 @@ if (require.main !== module) { (() => new ${className}())(); } `; - return template.trim(); + return template; }; export = templateFunction; diff --git a/test/baselines/TS_DoubleQuotes/src/main.test.ts b/test/baselines/TS_DoubleQuotes/src/main.test.ts index a8d538e95..0992583bc 100644 --- a/test/baselines/TS_DoubleQuotes/src/main.test.ts +++ b/test/baselines/TS_DoubleQuotes/src/main.test.ts @@ -20,7 +20,5 @@ describe("module to test => function to test", () => { result.should.equal(expected); }); // ... more tests => it - }); - // ... more test suites => describe diff --git a/test/baselines/TS_DoubleQuotes/src/main.ts b/test/baselines/TS_DoubleQuotes/src/main.ts index d6342a521..c5c122375 100644 --- a/test/baselines/TS_DoubleQuotes/src/main.ts +++ b/test/baselines/TS_DoubleQuotes/src/main.ts @@ -10,7 +10,6 @@ import * as utils from "@iobroker/adapter-core"; // import * as fs from "fs"; class TestAdapter extends utils.Adapter { - public constructor(options: Partial = {}) { super({ ...options, @@ -74,14 +73,16 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: ${pwdResult}"); + this.log.info(`check user admin pw iobroker: ${JSON.stringify(pwdResult)}`); const groupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: ${groupResult}"); + this.log.info(`check group user admin group admin: ${JSON.stringify(groupResult)}`); } /** * Is called when adapter shuts down - callback has to be called under any circumstances! + * + * @param callback - Callback function */ private onUnload(callback: () => void): void { try { @@ -93,7 +94,7 @@ class TestAdapter extends utils.Adapter { callback(); } catch (error) { - this.log.error("Error during unloading: ${error.message}"); + this.log.error(`Error during unloading: ${(error as Error).message}`); callback(); } } @@ -115,6 +116,9 @@ class TestAdapter extends utils.Adapter { /** * Is called if a subscribed state changes + * + * @param id - State ID + * @param state - State object */ private onStateChange(id: string, state: ioBroker.State | null | undefined): void { if (state) { @@ -125,30 +129,27 @@ class TestAdapter extends utils.Adapter { this.log.info(`state ${id} deleted`); } } - // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. // /** // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... // * Using this method requires "common.messagebox" property to be set to true in io-package.json // */ + // // private onMessage(obj: ioBroker.Message): void { // if (typeof obj === "object" && obj.message) { // if (obj.command === "send") { // // e.g. send email or pushover or whatever // this.log.info("send command"); - // // Send response in callback if required // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); // } // } // } - } - if (require.main !== module) { // Export the constructor in compact mode module.exports = (options: Partial | undefined) => new TestAdapter(options); } else { // otherwise start the instance directly (() => new TestAdapter())(); -} \ No newline at end of file +} diff --git a/test/baselines/TS_SingleQuotes/src/main.test.ts b/test/baselines/TS_SingleQuotes/src/main.test.ts index 997057a52..1f9fa7252 100644 --- a/test/baselines/TS_SingleQuotes/src/main.test.ts +++ b/test/baselines/TS_SingleQuotes/src/main.test.ts @@ -20,7 +20,5 @@ describe('module to test => function to test', () => { result.should.equal(expected); }); // ... more tests => it - }); - // ... more test suites => describe diff --git a/test/baselines/TS_SingleQuotes/src/main.ts b/test/baselines/TS_SingleQuotes/src/main.ts index 500f8014e..993108799 100644 --- a/test/baselines/TS_SingleQuotes/src/main.ts +++ b/test/baselines/TS_SingleQuotes/src/main.ts @@ -10,7 +10,6 @@ import * as utils from '@iobroker/adapter-core'; // import * as fs from 'fs'; class TestAdapter extends utils.Adapter { - public constructor(options: Partial = {}) { super({ ...options, @@ -74,14 +73,16 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync('admin', 'iobroker'); - this.log.info('check user admin pw iobroker: ${pwdResult}'); + this.log.info(`check user admin pw iobroker: ${JSON.stringify(pwdResult)}`); const groupResult = await this.checkGroupAsync('admin', 'admin'); - this.log.info('check group user admin group admin: ${groupResult}'); + this.log.info(`check group user admin group admin: ${JSON.stringify(groupResult)}`); } /** * Is called when adapter shuts down - callback has to be called under any circumstances! + * + * @param callback - Callback function */ private onUnload(callback: () => void): void { try { @@ -93,7 +94,7 @@ class TestAdapter extends utils.Adapter { callback(); } catch (error) { - this.log.error('Error during unloading: ${error.message}'); + this.log.error(`Error during unloading: ${(error as Error).message}`); callback(); } } @@ -115,6 +116,9 @@ class TestAdapter extends utils.Adapter { /** * Is called if a subscribed state changes + * + * @param id - State ID + * @param state - State object */ private onStateChange(id: string, state: ioBroker.State | null | undefined): void { if (state) { @@ -125,30 +129,27 @@ class TestAdapter extends utils.Adapter { this.log.info(`state ${id} deleted`); } } - // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. // /** // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... // * Using this method requires "common.messagebox" property to be set to true in io-package.json // */ + // // private onMessage(obj: ioBroker.Message): void { // if (typeof obj === 'object' && obj.message) { // if (obj.command === 'send') { // // e.g. send email or pushover or whatever // this.log.info('send command'); - // // Send response in callback if required // if (obj.callback) this.sendTo(obj.from, obj.command, 'Message received', obj.callback); // } // } // } - } - if (require.main !== module) { // Export the constructor in compact mode module.exports = (options: Partial | undefined) => new TestAdapter(options); } else { // otherwise start the instance directly (() => new TestAdapter())(); -} \ No newline at end of file +} diff --git a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/main.js b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/main.js index 03a1921ea..a3dd266cd 100644 --- a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/main.js +++ b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/main.js @@ -14,7 +14,7 @@ const utils = require('@iobroker/adapter-core'); class TestAdapter extends utils.Adapter { /** - * @param {Partial} [options={}] + * @param {Partial} [options={}] - Adapter options */ constructor(options) { super({ @@ -87,7 +87,8 @@ class TestAdapter extends utils.Adapter { /** * Is called when adapter shuts down - callback has to be called under any circumstances! - * @param {() => void} callback + * + * @param {() => void} callback - Callback function */ onUnload(callback) { try { @@ -123,8 +124,9 @@ class TestAdapter extends utils.Adapter { /** * Is called if a subscribed state changes - * @param {string} id - * @param {ioBroker.State | null | undefined} state + * + * @param {string} id - State ID + * @param {ioBroker.State | null | undefined} state - State object */ onStateChange(id, state) { if (state) { @@ -135,7 +137,6 @@ class TestAdapter extends utils.Adapter { this.log.info(`state ${id} deleted`); } } - // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. // /** // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... @@ -159,7 +160,7 @@ class TestAdapter extends utils.Adapter { if (require.main !== module) { // Export the constructor in compact mode /** - * @param {Partial} [options={}] + * @param {Partial} [options={}] - Adapter options */ module.exports = (options) => new TestAdapter(options); } else { diff --git a/test/baselines/adapter_JS_OfficialESLint/main.js b/test/baselines/adapter_JS_OfficialESLint/main.js index 03a1921ea..a3dd266cd 100644 --- a/test/baselines/adapter_JS_OfficialESLint/main.js +++ b/test/baselines/adapter_JS_OfficialESLint/main.js @@ -14,7 +14,7 @@ const utils = require('@iobroker/adapter-core'); class TestAdapter extends utils.Adapter { /** - * @param {Partial} [options={}] + * @param {Partial} [options={}] - Adapter options */ constructor(options) { super({ @@ -87,7 +87,8 @@ class TestAdapter extends utils.Adapter { /** * Is called when adapter shuts down - callback has to be called under any circumstances! - * @param {() => void} callback + * + * @param {() => void} callback - Callback function */ onUnload(callback) { try { @@ -123,8 +124,9 @@ class TestAdapter extends utils.Adapter { /** * Is called if a subscribed state changes - * @param {string} id - * @param {ioBroker.State | null | undefined} state + * + * @param {string} id - State ID + * @param {ioBroker.State | null | undefined} state - State object */ onStateChange(id, state) { if (state) { @@ -135,7 +137,6 @@ class TestAdapter extends utils.Adapter { this.log.info(`state ${id} deleted`); } } - // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. // /** // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... @@ -159,7 +160,7 @@ class TestAdapter extends utils.Adapter { if (require.main !== module) { // Export the constructor in compact mode /** - * @param {Partial} [options={}] + * @param {Partial} [options={}] - Adapter options */ module.exports = (options) => new TestAdapter(options); } else { diff --git a/test/baselines/adapter_JS_React/main.js b/test/baselines/adapter_JS_React/main.js index 455e1271d..45a0067ed 100644 --- a/test/baselines/adapter_JS_React/main.js +++ b/test/baselines/adapter_JS_React/main.js @@ -14,7 +14,7 @@ const utils = require("@iobroker/adapter-core"); class TestAdapter extends utils.Adapter { /** - * @param {Partial} [options={}] + * @param {Partial} [options={}] - Adapter options */ constructor(options) { super({ @@ -87,7 +87,8 @@ class TestAdapter extends utils.Adapter { /** * Is called when adapter shuts down - callback has to be called under any circumstances! - * @param {() => void} callback + * + * @param {() => void} callback - Callback function */ onUnload(callback) { try { @@ -123,8 +124,9 @@ class TestAdapter extends utils.Adapter { /** * Is called if a subscribed state changes - * @param {string} id - * @param {ioBroker.State | null | undefined} state + * + * @param {string} id - State ID + * @param {ioBroker.State | null | undefined} state - State object */ onStateChange(id, state) { if (state) { @@ -135,7 +137,6 @@ class TestAdapter extends utils.Adapter { this.log.info(`state ${id} deleted`); } } - // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. // /** // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... @@ -159,7 +160,7 @@ class TestAdapter extends utils.Adapter { if (require.main !== module) { // Export the constructor in compact mode /** - * @param {Partial} [options={}] + * @param {Partial} [options={}] - Adapter options */ module.exports = (options) => new TestAdapter(options); } else { diff --git a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/src/main.test.ts b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/src/main.test.ts index a8d538e95..0992583bc 100644 --- a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/src/main.test.ts +++ b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/src/main.test.ts @@ -20,7 +20,5 @@ describe("module to test => function to test", () => { result.should.equal(expected); }); // ... more tests => it - }); - // ... more test suites => describe diff --git a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/src/main.ts b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/src/main.ts index d6342a521..c5c122375 100644 --- a/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/src/main.ts +++ b/test/baselines/adapter_TS_ESLint_Tabs_DoubleQuotes_MIT/src/main.ts @@ -10,7 +10,6 @@ import * as utils from "@iobroker/adapter-core"; // import * as fs from "fs"; class TestAdapter extends utils.Adapter { - public constructor(options: Partial = {}) { super({ ...options, @@ -74,14 +73,16 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: ${pwdResult}"); + this.log.info(`check user admin pw iobroker: ${JSON.stringify(pwdResult)}`); const groupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: ${groupResult}"); + this.log.info(`check group user admin group admin: ${JSON.stringify(groupResult)}`); } /** * Is called when adapter shuts down - callback has to be called under any circumstances! + * + * @param callback - Callback function */ private onUnload(callback: () => void): void { try { @@ -93,7 +94,7 @@ class TestAdapter extends utils.Adapter { callback(); } catch (error) { - this.log.error("Error during unloading: ${error.message}"); + this.log.error(`Error during unloading: ${(error as Error).message}`); callback(); } } @@ -115,6 +116,9 @@ class TestAdapter extends utils.Adapter { /** * Is called if a subscribed state changes + * + * @param id - State ID + * @param state - State object */ private onStateChange(id: string, state: ioBroker.State | null | undefined): void { if (state) { @@ -125,30 +129,27 @@ class TestAdapter extends utils.Adapter { this.log.info(`state ${id} deleted`); } } - // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. // /** // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... // * Using this method requires "common.messagebox" property to be set to true in io-package.json // */ + // // private onMessage(obj: ioBroker.Message): void { // if (typeof obj === "object" && obj.message) { // if (obj.command === "send") { // // e.g. send email or pushover or whatever // this.log.info("send command"); - // // Send response in callback if required // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); // } // } // } - } - if (require.main !== module) { // Export the constructor in compact mode module.exports = (options: Partial | undefined) => new TestAdapter(options); } else { // otherwise start the instance directly (() => new TestAdapter())(); -} \ No newline at end of file +} diff --git a/test/baselines/adapter_TS_OfficialESLint/src/main.test.ts b/test/baselines/adapter_TS_OfficialESLint/src/main.test.ts index a8d538e95..0992583bc 100644 --- a/test/baselines/adapter_TS_OfficialESLint/src/main.test.ts +++ b/test/baselines/adapter_TS_OfficialESLint/src/main.test.ts @@ -20,7 +20,5 @@ describe("module to test => function to test", () => { result.should.equal(expected); }); // ... more tests => it - }); - // ... more test suites => describe diff --git a/test/baselines/adapter_TS_OfficialESLint/src/main.ts b/test/baselines/adapter_TS_OfficialESLint/src/main.ts index d6342a521..c5c122375 100644 --- a/test/baselines/adapter_TS_OfficialESLint/src/main.ts +++ b/test/baselines/adapter_TS_OfficialESLint/src/main.ts @@ -10,7 +10,6 @@ import * as utils from "@iobroker/adapter-core"; // import * as fs from "fs"; class TestAdapter extends utils.Adapter { - public constructor(options: Partial = {}) { super({ ...options, @@ -74,14 +73,16 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: ${pwdResult}"); + this.log.info(`check user admin pw iobroker: ${JSON.stringify(pwdResult)}`); const groupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: ${groupResult}"); + this.log.info(`check group user admin group admin: ${JSON.stringify(groupResult)}`); } /** * Is called when adapter shuts down - callback has to be called under any circumstances! + * + * @param callback - Callback function */ private onUnload(callback: () => void): void { try { @@ -93,7 +94,7 @@ class TestAdapter extends utils.Adapter { callback(); } catch (error) { - this.log.error("Error during unloading: ${error.message}"); + this.log.error(`Error during unloading: ${(error as Error).message}`); callback(); } } @@ -115,6 +116,9 @@ class TestAdapter extends utils.Adapter { /** * Is called if a subscribed state changes + * + * @param id - State ID + * @param state - State object */ private onStateChange(id: string, state: ioBroker.State | null | undefined): void { if (state) { @@ -125,30 +129,27 @@ class TestAdapter extends utils.Adapter { this.log.info(`state ${id} deleted`); } } - // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. // /** // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... // * Using this method requires "common.messagebox" property to be set to true in io-package.json // */ + // // private onMessage(obj: ioBroker.Message): void { // if (typeof obj === "object" && obj.message) { // if (obj.command === "send") { // // e.g. send email or pushover or whatever // this.log.info("send command"); - // // Send response in callback if required // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); // } // } // } - } - if (require.main !== module) { // Export the constructor in compact mode module.exports = (options: Partial | undefined) => new TestAdapter(options); } else { // otherwise start the instance directly (() => new TestAdapter())(); -} \ No newline at end of file +} diff --git a/test/baselines/adapter_TS_React/src/main.test.ts b/test/baselines/adapter_TS_React/src/main.test.ts index a8d538e95..0992583bc 100644 --- a/test/baselines/adapter_TS_React/src/main.test.ts +++ b/test/baselines/adapter_TS_React/src/main.test.ts @@ -20,7 +20,5 @@ describe("module to test => function to test", () => { result.should.equal(expected); }); // ... more tests => it - }); - // ... more test suites => describe diff --git a/test/baselines/adapter_TS_React/src/main.ts b/test/baselines/adapter_TS_React/src/main.ts index d6342a521..c5c122375 100644 --- a/test/baselines/adapter_TS_React/src/main.ts +++ b/test/baselines/adapter_TS_React/src/main.ts @@ -10,7 +10,6 @@ import * as utils from "@iobroker/adapter-core"; // import * as fs from "fs"; class TestAdapter extends utils.Adapter { - public constructor(options: Partial = {}) { super({ ...options, @@ -74,14 +73,16 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: ${pwdResult}"); + this.log.info(`check user admin pw iobroker: ${JSON.stringify(pwdResult)}`); const groupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: ${groupResult}"); + this.log.info(`check group user admin group admin: ${JSON.stringify(groupResult)}`); } /** * Is called when adapter shuts down - callback has to be called under any circumstances! + * + * @param callback - Callback function */ private onUnload(callback: () => void): void { try { @@ -93,7 +94,7 @@ class TestAdapter extends utils.Adapter { callback(); } catch (error) { - this.log.error("Error during unloading: ${error.message}"); + this.log.error(`Error during unloading: ${(error as Error).message}`); callback(); } } @@ -115,6 +116,9 @@ class TestAdapter extends utils.Adapter { /** * Is called if a subscribed state changes + * + * @param id - State ID + * @param state - State object */ private onStateChange(id: string, state: ioBroker.State | null | undefined): void { if (state) { @@ -125,30 +129,27 @@ class TestAdapter extends utils.Adapter { this.log.info(`state ${id} deleted`); } } - // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. // /** // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... // * Using this method requires "common.messagebox" property to be set to true in io-package.json // */ + // // private onMessage(obj: ioBroker.Message): void { // if (typeof obj === "object" && obj.message) { // if (obj.command === "send") { // // e.g. send email or pushover or whatever // this.log.info("send command"); - // // Send response in callback if required // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); // } // } // } - } - if (require.main !== module) { // Export the constructor in compact mode module.exports = (options: Partial | undefined) => new TestAdapter(options); } else { // otherwise start the instance directly (() => new TestAdapter())(); -} \ No newline at end of file +} diff --git a/test/baselines/adapter_TS_React_OfficialESLint/src/main.test.ts b/test/baselines/adapter_TS_React_OfficialESLint/src/main.test.ts index a8d538e95..0992583bc 100644 --- a/test/baselines/adapter_TS_React_OfficialESLint/src/main.test.ts +++ b/test/baselines/adapter_TS_React_OfficialESLint/src/main.test.ts @@ -20,7 +20,5 @@ describe("module to test => function to test", () => { result.should.equal(expected); }); // ... more tests => it - }); - // ... more test suites => describe diff --git a/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts b/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts index d6342a521..c5c122375 100644 --- a/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts +++ b/test/baselines/adapter_TS_React_OfficialESLint/src/main.ts @@ -10,7 +10,6 @@ import * as utils from "@iobroker/adapter-core"; // import * as fs from "fs"; class TestAdapter extends utils.Adapter { - public constructor(options: Partial = {}) { super({ ...options, @@ -74,14 +73,16 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: ${pwdResult}"); + this.log.info(`check user admin pw iobroker: ${JSON.stringify(pwdResult)}`); const groupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: ${groupResult}"); + this.log.info(`check group user admin group admin: ${JSON.stringify(groupResult)}`); } /** * Is called when adapter shuts down - callback has to be called under any circumstances! + * + * @param callback - Callback function */ private onUnload(callback: () => void): void { try { @@ -93,7 +94,7 @@ class TestAdapter extends utils.Adapter { callback(); } catch (error) { - this.log.error("Error during unloading: ${error.message}"); + this.log.error(`Error during unloading: ${(error as Error).message}`); callback(); } } @@ -115,6 +116,9 @@ class TestAdapter extends utils.Adapter { /** * Is called if a subscribed state changes + * + * @param id - State ID + * @param state - State object */ private onStateChange(id: string, state: ioBroker.State | null | undefined): void { if (state) { @@ -125,30 +129,27 @@ class TestAdapter extends utils.Adapter { this.log.info(`state ${id} deleted`); } } - // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. // /** // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... // * Using this method requires "common.messagebox" property to be set to true in io-package.json // */ + // // private onMessage(obj: ioBroker.Message): void { // if (typeof obj === "object" && obj.message) { // if (obj.command === "send") { // // e.g. send email or pushover or whatever // this.log.info("send command"); - // // Send response in callback if required // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); // } // } // } - } - if (require.main !== module) { // Export the constructor in compact mode module.exports = (options: Partial | undefined) => new TestAdapter(options); } else { // otherwise start the instance directly (() => new TestAdapter())(); -} \ No newline at end of file +} diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/src/main.test.ts b/test/baselines/adapter_TS_VIS_CustomESLint/src/main.test.ts index a8d538e95..0992583bc 100644 --- a/test/baselines/adapter_TS_VIS_CustomESLint/src/main.test.ts +++ b/test/baselines/adapter_TS_VIS_CustomESLint/src/main.test.ts @@ -20,7 +20,5 @@ describe("module to test => function to test", () => { result.should.equal(expected); }); // ... more tests => it - }); - // ... more test suites => describe diff --git a/test/baselines/adapter_TS_VIS_CustomESLint/src/main.ts b/test/baselines/adapter_TS_VIS_CustomESLint/src/main.ts index d6342a521..c5c122375 100644 --- a/test/baselines/adapter_TS_VIS_CustomESLint/src/main.ts +++ b/test/baselines/adapter_TS_VIS_CustomESLint/src/main.ts @@ -10,7 +10,6 @@ import * as utils from "@iobroker/adapter-core"; // import * as fs from "fs"; class TestAdapter extends utils.Adapter { - public constructor(options: Partial = {}) { super({ ...options, @@ -74,14 +73,16 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: ${pwdResult}"); + this.log.info(`check user admin pw iobroker: ${JSON.stringify(pwdResult)}`); const groupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: ${groupResult}"); + this.log.info(`check group user admin group admin: ${JSON.stringify(groupResult)}`); } /** * Is called when adapter shuts down - callback has to be called under any circumstances! + * + * @param callback - Callback function */ private onUnload(callback: () => void): void { try { @@ -93,7 +94,7 @@ class TestAdapter extends utils.Adapter { callback(); } catch (error) { - this.log.error("Error during unloading: ${error.message}"); + this.log.error(`Error during unloading: ${(error as Error).message}`); callback(); } } @@ -115,6 +116,9 @@ class TestAdapter extends utils.Adapter { /** * Is called if a subscribed state changes + * + * @param id - State ID + * @param state - State object */ private onStateChange(id: string, state: ioBroker.State | null | undefined): void { if (state) { @@ -125,30 +129,27 @@ class TestAdapter extends utils.Adapter { this.log.info(`state ${id} deleted`); } } - // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. // /** // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... // * Using this method requires "common.messagebox" property to be set to true in io-package.json // */ + // // private onMessage(obj: ioBroker.Message): void { // if (typeof obj === "object" && obj.message) { // if (obj.command === "send") { // // e.g. send email or pushover or whatever // this.log.info("send command"); - // // Send response in callback if required // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); // } // } // } - } - if (require.main !== module) { // Export the constructor in compact mode module.exports = (options: Partial | undefined) => new TestAdapter(options); } else { // otherwise start the instance directly (() => new TestAdapter())(); -} \ No newline at end of file +} diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.test.ts b/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.test.ts index a8d538e95..0992583bc 100644 --- a/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.test.ts +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.test.ts @@ -20,7 +20,5 @@ describe("module to test => function to test", () => { result.should.equal(expected); }); // ... more tests => it - }); - // ... more test suites => describe diff --git a/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.ts b/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.ts index d6342a521..c5c122375 100644 --- a/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.ts +++ b/test/baselines/adapter_TS_VIS_OfficialESLint/src/main.ts @@ -10,7 +10,6 @@ import * as utils from "@iobroker/adapter-core"; // import * as fs from "fs"; class TestAdapter extends utils.Adapter { - public constructor(options: Partial = {}) { super({ ...options, @@ -74,14 +73,16 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: ${pwdResult}"); + this.log.info(`check user admin pw iobroker: ${JSON.stringify(pwdResult)}`); const groupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: ${groupResult}"); + this.log.info(`check group user admin group admin: ${JSON.stringify(groupResult)}`); } /** * Is called when adapter shuts down - callback has to be called under any circumstances! + * + * @param callback - Callback function */ private onUnload(callback: () => void): void { try { @@ -93,7 +94,7 @@ class TestAdapter extends utils.Adapter { callback(); } catch (error) { - this.log.error("Error during unloading: ${error.message}"); + this.log.error(`Error during unloading: ${(error as Error).message}`); callback(); } } @@ -115,6 +116,9 @@ class TestAdapter extends utils.Adapter { /** * Is called if a subscribed state changes + * + * @param id - State ID + * @param state - State object */ private onStateChange(id: string, state: ioBroker.State | null | undefined): void { if (state) { @@ -125,30 +129,27 @@ class TestAdapter extends utils.Adapter { this.log.info(`state ${id} deleted`); } } - // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. // /** // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... // * Using this method requires "common.messagebox" property to be set to true in io-package.json // */ + // // private onMessage(obj: ioBroker.Message): void { // if (typeof obj === "object" && obj.message) { // if (obj.command === "send") { // // e.g. send email or pushover or whatever // this.log.info("send command"); - // // Send response in callback if required // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); // } // } // } - } - if (require.main !== module) { // Export the constructor in compact mode module.exports = (options: Partial | undefined) => new TestAdapter(options); } else { // otherwise start the instance directly (() => new TestAdapter())(); -} \ No newline at end of file +} diff --git a/test/baselines/connectionIndicator_yes/src/main.ts b/test/baselines/connectionIndicator_yes/src/main.ts index 216232aba..4fbd7de83 100644 --- a/test/baselines/connectionIndicator_yes/src/main.ts +++ b/test/baselines/connectionIndicator_yes/src/main.ts @@ -10,7 +10,6 @@ import * as utils from "@iobroker/adapter-core"; // import * as fs from "fs"; class TestAdapter extends utils.Adapter { - public constructor(options: Partial = {}) { super({ ...options, @@ -77,14 +76,16 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: ${pwdResult}"); + this.log.info(`check user admin pw iobroker: ${JSON.stringify(pwdResult)}`); const groupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: ${groupResult}"); + this.log.info(`check group user admin group admin: ${JSON.stringify(groupResult)}`); } /** * Is called when adapter shuts down - callback has to be called under any circumstances! + * + * @param callback - Callback function */ private onUnload(callback: () => void): void { try { @@ -96,7 +97,7 @@ class TestAdapter extends utils.Adapter { callback(); } catch (error) { - this.log.error("Error during unloading: ${error.message}"); + this.log.error(`Error during unloading: ${(error as Error).message}`); callback(); } } @@ -118,6 +119,9 @@ class TestAdapter extends utils.Adapter { /** * Is called if a subscribed state changes + * + * @param id - State ID + * @param state - State object */ private onStateChange(id: string, state: ioBroker.State | null | undefined): void { if (state) { @@ -128,30 +132,27 @@ class TestAdapter extends utils.Adapter { this.log.info(`state ${id} deleted`); } } - // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. // /** // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... // * Using this method requires "common.messagebox" property to be set to true in io-package.json // */ + // // private onMessage(obj: ioBroker.Message): void { // if (typeof obj === "object" && obj.message) { // if (obj.command === "send") { // // e.g. send email or pushover or whatever // this.log.info("send command"); - // // Send response in callback if required // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); // } // } // } - } - if (require.main !== module) { // Export the constructor in compact mode module.exports = (options: Partial | undefined) => new TestAdapter(options); } else { // otherwise start the instance directly (() => new TestAdapter())(); -} \ No newline at end of file +} diff --git a/test/baselines/customAdapterSettings/src/main.ts b/test/baselines/customAdapterSettings/src/main.ts index a13985672..3b2295a3d 100644 --- a/test/baselines/customAdapterSettings/src/main.ts +++ b/test/baselines/customAdapterSettings/src/main.ts @@ -10,7 +10,6 @@ import * as utils from "@iobroker/adapter-core"; // import * as fs from "fs"; class TestAdapter extends utils.Adapter { - public constructor(options: Partial = {}) { super({ ...options, @@ -74,14 +73,16 @@ class TestAdapter extends utils.Adapter { // examples for the checkPassword/checkGroup functions const pwdResult = await this.checkPasswordAsync("admin", "iobroker"); - this.log.info("check user admin pw iobroker: ${pwdResult}"); + this.log.info(`check user admin pw iobroker: ${JSON.stringify(pwdResult)}`); const groupResult = await this.checkGroupAsync("admin", "admin"); - this.log.info("check group user admin group admin: ${groupResult}"); + this.log.info(`check group user admin group admin: ${JSON.stringify(groupResult)}`); } /** * Is called when adapter shuts down - callback has to be called under any circumstances! + * + * @param callback - Callback function */ private onUnload(callback: () => void): void { try { @@ -93,7 +94,7 @@ class TestAdapter extends utils.Adapter { callback(); } catch (error) { - this.log.error("Error during unloading: ${error.message}"); + this.log.error(`Error during unloading: ${(error as Error).message}`); callback(); } } @@ -115,6 +116,9 @@ class TestAdapter extends utils.Adapter { /** * Is called if a subscribed state changes + * + * @param id - State ID + * @param state - State object */ private onStateChange(id: string, state: ioBroker.State | null | undefined): void { if (state) { @@ -125,30 +129,27 @@ class TestAdapter extends utils.Adapter { this.log.info(`state ${id} deleted`); } } - // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. // /** // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... // * Using this method requires "common.messagebox" property to be set to true in io-package.json // */ + // // private onMessage(obj: ioBroker.Message): void { // if (typeof obj === "object" && obj.message) { // if (obj.command === "send") { // // e.g. send email or pushover or whatever // this.log.info("send command"); - // // Send response in callback if required // if (obj.callback) this.sendTo(obj.from, obj.command, "Message received", obj.callback); // } // } // } - } - if (require.main !== module) { // Export the constructor in compact mode module.exports = (options: Partial | undefined) => new TestAdapter(options); } else { // otherwise start the instance directly (() => new TestAdapter())(); -} \ No newline at end of file +} diff --git a/test/baselines/ioBroker.hello-devcontainer/main.js b/test/baselines/ioBroker.hello-devcontainer/main.js index c85d81fe1..14e6f51c6 100644 --- a/test/baselines/ioBroker.hello-devcontainer/main.js +++ b/test/baselines/ioBroker.hello-devcontainer/main.js @@ -14,7 +14,7 @@ const utils = require('@iobroker/adapter-core'); class HelloDevcontainer extends utils.Adapter { /** - * @param {Partial} [options={}] + * @param {Partial} [options={}] - Adapter options */ constructor(options) { super({ @@ -87,7 +87,8 @@ class HelloDevcontainer extends utils.Adapter { /** * Is called when adapter shuts down - callback has to be called under any circumstances! - * @param {() => void} callback + * + * @param {() => void} callback - Callback function */ onUnload(callback) { try { @@ -123,8 +124,9 @@ class HelloDevcontainer extends utils.Adapter { /** * Is called if a subscribed state changes - * @param {string} id - * @param {ioBroker.State | null | undefined} state + * + * @param {string} id - State ID + * @param {ioBroker.State | null | undefined} state - State object */ onStateChange(id, state) { if (state) { @@ -135,7 +137,6 @@ class HelloDevcontainer extends utils.Adapter { this.log.info(`state ${id} deleted`); } } - // If you need to accept messages in your adapter, uncomment the following block and the corresponding line in the constructor. // /** // * Some message was sent to this instance over message box. Used by email, pushover, text2speech, ... @@ -159,7 +160,7 @@ class HelloDevcontainer extends utils.Adapter { if (require.main !== module) { // Export the constructor in compact mode /** - * @param {Partial} [options={}] + * @param {Partial} [options={}] - Adapter options */ module.exports = (options) => new HelloDevcontainer(options); } else { From 2e82def36e8bba19cf938accc52e5dcbbac66051 Mon Sep 17 00:00:00 2001 From: Ingo Fischer Date: Sun, 12 Oct 2025 19:27:46 +0200 Subject: [PATCH 18/29] fixes --- templates/admin/src/app.tsx_jsx.ts | 36 ++++++++-------- .../admin/src/components/settings.tsx_jsx.ts | 41 +++++++++++-------- templates/admin/src/i18n/i18n.dts.ts | 7 ++-- templates/admin/src/index.tsx_jsx.ts | 9 ++-- templates/admin/src/tab-app.tsx_jsx.ts | 31 +++++++------- templates/admin/src/tab.tsx_jsx.ts | 9 ++-- templates/main.js.ts | 10 ++--- .../TS_DoubleQuotes/admin/src/app.tsx | 35 ++++++++-------- .../admin/src/components/settings.tsx | 37 ++++++++++------- .../TS_DoubleQuotes/admin/src/index.tsx | 4 +- .../TS_SingleQuotes/admin/src/app.tsx | 35 ++++++++-------- .../admin/src/components/settings.tsx | 37 ++++++++++------- .../TS_SingleQuotes/admin/src/index.tsx | 4 +- .../main.js | 10 ++--- .../adapter_JS_OfficialESLint/main.js | 10 ++--- .../adapter_JS_React/admin/src/app.jsx | 28 +++++++------ .../admin/src/components/settings.jsx | 27 ++++++++---- .../adapter_JS_React/admin/src/index.jsx | 4 +- test/baselines/adapter_JS_React/main.js | 10 ++--- .../adapter_TS_React/admin/src/app.tsx | 35 ++++++++-------- .../admin/src/components/settings.tsx | 37 ++++++++++------- .../adapter_TS_React/admin/src/i18n/i18n.d.ts | 4 +- .../adapter_TS_React/admin/src/index.tsx | 4 +- .../admin/src/app.tsx | 35 ++++++++-------- .../admin/src/components/settings.tsx | 37 ++++++++++------- .../admin/src/i18n/i18n.d.ts | 4 +- .../admin/src/index.tsx | 4 +- .../ioBroker.hello-devcontainer/main.js | 10 ++--- .../admin/src/tab-app.jsx | 23 ++++++----- .../tabReact_adminHtml_JS/admin/src/tab.jsx | 4 +- .../tabReact_adminReact_TS/admin/src/app.tsx | 35 ++++++++-------- .../admin/src/components/settings.tsx | 37 ++++++++++------- .../admin/src/i18n/i18n.d.ts | 4 +- .../admin/src/index.tsx | 4 +- .../admin/src/tab-app.tsx | 30 +++++++------- .../tabReact_adminReact_TS/admin/src/tab.tsx | 4 +- 36 files changed, 386 insertions(+), 309 deletions(-) diff --git a/templates/admin/src/app.tsx_jsx.ts b/templates/admin/src/app.tsx_jsx.ts index 949bb9b42..7310bb47d 100644 --- a/templates/admin/src/app.tsx_jsx.ts +++ b/templates/admin/src/app.tsx_jsx.ts @@ -6,15 +6,14 @@ const templateFunction: TemplateFunction = answers => { const useReact = answers.adminUi === "react"; if (!useReact) return; - const template = ` + const template = `/* eslint-disable @typescript-eslint/no-require-imports */ import React from "react"; -import { ${useTypeScript ? "Theme, " : ""}withStyles } from "@material-ui/core/styles"; +import { ${useTypeScript ? "type Theme, type StyleRules, " : ""}withStyles } from "@material-ui/core/styles"; import GenericApp from "@iobroker/adapter-react/GenericApp"; import Settings from "./components/settings"; ${useTypeScript ? -`import { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; -import { StyleRules } from "@material-ui/core/styles"; +`import type { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; ` : ""} ${useTypeScript ? `const styles = (_theme: Theme): StyleRules => ({ @@ -32,16 +31,16 @@ class App extends GenericApp { ...props, encryptedFields: [], translations: { - "en": require("./i18n/en.json"), - "de": require("./i18n/de.json"), - "ru": require("./i18n/ru.json"), - "pt": require("./i18n/pt.json"), - "nl": require("./i18n/nl.json"), - "fr": require("./i18n/fr.json"), - "it": require("./i18n/it.json"), - "es": require("./i18n/es.json"), - "pl": require("./i18n/pl.json"), - "uk": require("./i18n/uk.json"), + en: require("./i18n/en.json"), + de: require("./i18n/de.json"), + ru: require("./i18n/ru.json"), + pt: require("./i18n/pt.json"), + nl: require("./i18n/nl.json"), + fr: require("./i18n/fr.json"), + it: require("./i18n/it.json"), + es: require("./i18n/es.json"), + pl: require("./i18n/pl.json"), + uk: require("./i18n/uk.json"), "zh-cn": require("./i18n/zh-cn.json"), }, }; @@ -52,14 +51,17 @@ class App extends GenericApp { // executed when connection is ready } - render() { + render()${useTypeScript ? ': Element' :''} { if (!this.state.loaded) { return super.render(); } return (
- this.updateNativeValue(attr, value)} /> + this.updateNativeValue(attr, value)} + /> {this.renderError()} {this.renderToast()} {this.renderSaveCloseButtons()} @@ -70,7 +72,7 @@ class App extends GenericApp { export default withStyles(styles)(App); `; - return template.trim();}; + return template;}; templateFunction.customPath = (answers) => { const useTypeScript = answers.language === "TypeScript"; diff --git a/templates/admin/src/components/settings.tsx_jsx.ts b/templates/admin/src/components/settings.tsx_jsx.ts index b50d75f35..082ddd31d 100644 --- a/templates/admin/src/components/settings.tsx_jsx.ts +++ b/templates/admin/src/components/settings.tsx_jsx.ts @@ -1,4 +1,4 @@ -import { AdapterSettings, getDefaultAnswer } from "../../../../src/lib/core/questions"; +import { type AdapterSettings, getDefaultAnswer } from "../../../../src/lib/core/questions"; import type { TemplateFunction } from "../../../../src/lib/createAdapter"; function generateSettingsMethod(settings: AdapterSettings): string { @@ -23,10 +23,9 @@ const templateFunction: TemplateFunction = answers => { const adapterSettings: AdapterSettings[] = answers.adapterSettings ?? getDefaultAnswer("adapterSettings")!; - const template = ` -import React from "react"; + const template = `import React from "react"; import { withStyles } from "@material-ui/core/styles"; -${useTypeScript ? `import { CreateCSSProperties } from "@material-ui/core/styles/withStyles"; +${useTypeScript ? `import type { CreateCSSProperties } from "@material-ui/core/styles/withStyles"; ` : ""}import TextField from "@material-ui/core/TextField"; import Input from "@material-ui/core/Input"; import FormHelperText from "@material-ui/core/FormHelperText"; @@ -105,7 +104,7 @@ ${useTypeScript ? "" : `/** this.state = {}; } - ${useTypeScript ? `renderInput(title: AdminWord, attr: string, type: string)` : `/** + ${useTypeScript ? `renderInput(title: AdminWord, attr: string, type: string): React.JSX.Element` : `/** * @param {AdminWord} title * @param {string} attr * @param {string} type @@ -117,7 +116,7 @@ ${useTypeScript ? "" : `/** className={\`\${this.props.classes.input} \${this.props.classes.controlElement}\`} value={this.props.native[attr]} type={type || "text"} - onChange={(e) => this.props.onChange(attr, e.target.value)} + onChange={e => this.props.onChange(attr, e.target.value)} margin="normal" /> ); @@ -128,7 +127,7 @@ ${useTypeScript ? "" : `/** attr: string, options: { value: string; title: AdminWord }[], style?: React.CSSProperties, - )` : `/** + ): React.JSX.Element` : `/** * @param {AdminWord} title * @param {string} attr * @param {{ value: string; title: AdminWord }[]} options @@ -140,16 +139,24 @@ ${useTypeScript ? "" : `/** className={\`\${this.props.classes.input} \${this.props.classes.controlElement}\`} style={{ paddingTop: 5, - ...style + ...style, }} > } + onChange={e => this.props.onChange(attr, e.target.value === "_" ? "" : e.target.value)} + input={ + + } > - {options.map((item) => ( - + {options.map(item => ( + {I18n.t(item.title)} ))} @@ -159,7 +166,7 @@ ${useTypeScript ? "" : `/** ); } - ${useTypeScript ? `renderCheckbox(title: AdminWord, attr: string, style?: React.CSSProperties)` : `/** + ${useTypeScript ? `renderCheckbox(title: AdminWord, attr: string, style?: React.CSSProperties): React.JSX.Element` : `/** * @param {AdminWord} title * @param {string} attr * @param {React.CSSProperties} [style] @@ -170,7 +177,7 @@ ${useTypeScript ? "" : `/** key={attr} style={{ paddingTop: 5, - ...style + ...style, }} className={this.props.classes.controlElement} control={ @@ -185,9 +192,9 @@ ${useTypeScript ? "" : `/** ); } - render() { + render()${useTypeScript ? ': React.JSX.Element' :''} { return ( -
${adapterSettings.map(generateSettingsMethod).join("
")} + ${adapterSettings.map(generateSettingsMethod).join("\n\t\t\t\t
")}
); } @@ -195,7 +202,7 @@ ${useTypeScript ? "" : `/** export default withStyles(styles)(Settings); `; - return template.trim(); + return template; }; templateFunction.customPath = (answers) => { diff --git a/templates/admin/src/i18n/i18n.dts.ts b/templates/admin/src/i18n/i18n.dts.ts index 421370056..7ea5827f9 100644 --- a/templates/admin/src/i18n/i18n.dts.ts +++ b/templates/admin/src/i18n/i18n.dts.ts @@ -10,8 +10,7 @@ const templateFunction: TemplateFunction = answers => { answers.adminUi === "react" || answers.tabReact === "yes"; if (!useReact) return; - const template = ` -/* + const template = `/* * This file loads the translations keys from \`i18n/en.json\` file and overrides * the declarations for the translate function \`I18n.t\` available in "@iobroker/adapter-react/i18n". * Using these definitions it is ensured that all used translations in the React @@ -27,18 +26,20 @@ const templateFunction: TemplateFunction = answers => { /** * Available words in \`i18n/en.json\`. */ +// eslint-disable-next-line @typescript-eslint/consistent-type-imports declare type AdminWord = keyof typeof import("./en.json"); declare module "@iobroker/adapter-react/i18n" { /** * Translate the given string to the selected language. + * * @param word The (key) word to look up the string. Has to be defined at least in \`i18n/en.json\`. * @param args Optional arguments which will replace the first (second, third, ...) occurence of %s */ function t(word: AdminWord, ...args: string[]): string; } `; - return template.trim(); + return template; }; templateFunction.customPath = "admin/src/i18n/i18n.d.ts"; diff --git a/templates/admin/src/index.tsx_jsx.ts b/templates/admin/src/index.tsx_jsx.ts index bff53dd6a..b862b7d7e 100644 --- a/templates/admin/src/index.tsx_jsx.ts +++ b/templates/admin/src/index.tsx_jsx.ts @@ -5,9 +5,8 @@ const templateFunction: TemplateFunction = answers => { const useTypeScript = answers.language === "TypeScript"; const useReact = answers.adminUi === "react"; if (!useReact) return; - - const template = ` -import React from "react"; + + const template = `import React from "react"; import ReactDOM from "react-dom"; import { MuiThemeProvider } from "@material-ui/core/styles"; import theme from "@iobroker/adapter-react/Theme"; @@ -21,7 +20,7 @@ function build()${useTypeScript ? ": void" : ""} { { + onThemeChange={_theme => { themeName = _theme; build(); }} @@ -33,7 +32,7 @@ function build()${useTypeScript ? ": void" : ""} { build(); `; - return template.trim(); + return template; }; templateFunction.customPath = (answers) => { diff --git a/templates/admin/src/tab-app.tsx_jsx.ts b/templates/admin/src/tab-app.tsx_jsx.ts index fbd080c04..eceba1a61 100644 --- a/templates/admin/src/tab-app.tsx_jsx.ts +++ b/templates/admin/src/tab-app.tsx_jsx.ts @@ -6,14 +6,13 @@ const templateFunction: TemplateFunction = answers => { const useReact = answers.tabReact === "yes"; if (!useReact) return; - const template = ` + const template = `/* eslint-disable @typescript-eslint/no-require-imports */ import React from "react"; -import { ${useTypeScript ? "Theme, " : ""}withStyles } from "@material-ui/core/styles"; +import { ${useTypeScript ? "type Theme, type StyleRules, " : ""}withStyles } from "@material-ui/core/styles"; import GenericApp from "@iobroker/adapter-react/GenericApp"; ${useTypeScript ? -`import { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; -import { StyleRules } from "@material-ui/core/styles"; +`import type { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; ` : ""} ${useTypeScript ? `const styles = (_theme: Theme): StyleRules => ({ @@ -32,16 +31,16 @@ class TabApp extends GenericApp { bottomButtons: false, encryptedFields: [], translations: { - "en": require("./i18n/en.json"), - "de": require("./i18n/de.json"), - "ru": require("./i18n/ru.json"), - "pt": require("./i18n/pt.json"), - "nl": require("./i18n/nl.json"), - "fr": require("./i18n/fr.json"), - "it": require("./i18n/it.json"), - "es": require("./i18n/es.json"), - "pl": require("./i18n/pl.json"), - "uk": require("./i18n/uk.json"), + en: require("./i18n/en.json"), + de: require("./i18n/de.json"), + ru: require("./i18n/ru.json"), + pt: require("./i18n/pt.json"), + nl: require("./i18n/nl.json"), + fr: require("./i18n/fr.json"), + it: require("./i18n/it.json"), + es: require("./i18n/es.json"), + pl: require("./i18n/pl.json"), + uk: require("./i18n/uk.json"), "zh-cn": require("./i18n/zh-cn.json"), }, }; @@ -52,7 +51,7 @@ class TabApp extends GenericApp { // executed when connection is ready } - render() { + render()${useTypeScript ? ': React.JSX.Element' :''} { if (!this.state.loaded) { return super.render(); } @@ -69,7 +68,7 @@ class TabApp extends GenericApp { export default withStyles(styles)(TabApp); `; - return template.trim();}; + return template;}; templateFunction.customPath = (answers) => { const useTypeScript = answers.language === "TypeScript"; diff --git a/templates/admin/src/tab.tsx_jsx.ts b/templates/admin/src/tab.tsx_jsx.ts index f3c7c0da6..1c3e5ac27 100644 --- a/templates/admin/src/tab.tsx_jsx.ts +++ b/templates/admin/src/tab.tsx_jsx.ts @@ -5,9 +5,8 @@ const templateFunction: TemplateFunction = answers => { const useTypeScript = answers.language === "TypeScript"; const useReact = answers.tabReact === "yes"; if (!useReact) return; - - const template = ` -import React from "react"; + + const template = `import React from "react"; import ReactDOM from "react-dom"; import { MuiThemeProvider } from "@material-ui/core/styles"; import theme from "@iobroker/adapter-react/Theme"; @@ -21,7 +20,7 @@ function build()${useTypeScript ? ": void" : ""} { { + onThemeChange={_theme => { themeName = _theme; build(); }} @@ -33,7 +32,7 @@ function build()${useTypeScript ? ": void" : ""} { build(); `; - return template.trim(); + return template; }; templateFunction.customPath = (answers) => { diff --git a/templates/main.js.ts b/templates/main.js.ts index 6fd98caa8..d16268690 100644 --- a/templates/main.js.ts +++ b/templates/main.js.ts @@ -26,9 +26,8 @@ const utils = require(${quote}@iobroker/adapter-core${quote}); // const fs = require(${quote}fs${quote}); class ${className} extends utils.Adapter { - /** - * @param {Partial} [options={}] - Adapter options + * @param {Partial} [options] - Adapter options */ constructor(options) { super({ @@ -172,21 +171,20 @@ ${adapterSettings.map(s => `\t\tthis.log.debug(${quote}config ${s.key}: \${this. // ${t}${t}} // ${t}} // } - } if (require.main !== module) { // Export the constructor in compact mode /** - * @param {Partial} [options={}] - Adapter options + * @param {Partial} [options] - Adapter options */ - module.exports = (options) => new ${className}(options); + module.exports = options => new ${className}(options); } else { // otherwise start the instance directly new ${className}(); } `; - return template.trim(); + return template; }; templateFunction.customPath = "main.js"; export = templateFunction; diff --git a/test/baselines/TS_DoubleQuotes/admin/src/app.tsx b/test/baselines/TS_DoubleQuotes/admin/src/app.tsx index b4f93806a..181208404 100644 --- a/test/baselines/TS_DoubleQuotes/admin/src/app.tsx +++ b/test/baselines/TS_DoubleQuotes/admin/src/app.tsx @@ -1,10 +1,10 @@ +/* eslint-disable @typescript-eslint/no-require-imports */ import React from "react"; -import { Theme, withStyles } from "@material-ui/core/styles"; +import { type Theme, type StyleRules, withStyles } from "@material-ui/core/styles"; import GenericApp from "@iobroker/adapter-react/GenericApp"; import Settings from "./components/settings"; -import { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; -import { StyleRules } from "@material-ui/core/styles"; +import type { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; const styles = (_theme: Theme): StyleRules => ({ root: {}, @@ -16,16 +16,16 @@ class App extends GenericApp { ...props, encryptedFields: [], translations: { - "en": require("./i18n/en.json"), - "de": require("./i18n/de.json"), - "ru": require("./i18n/ru.json"), - "pt": require("./i18n/pt.json"), - "nl": require("./i18n/nl.json"), - "fr": require("./i18n/fr.json"), - "it": require("./i18n/it.json"), - "es": require("./i18n/es.json"), - "pl": require("./i18n/pl.json"), - "uk": require("./i18n/uk.json"), + en: require("./i18n/en.json"), + de: require("./i18n/de.json"), + ru: require("./i18n/ru.json"), + pt: require("./i18n/pt.json"), + nl: require("./i18n/nl.json"), + fr: require("./i18n/fr.json"), + it: require("./i18n/it.json"), + es: require("./i18n/es.json"), + pl: require("./i18n/pl.json"), + uk: require("./i18n/uk.json"), "zh-cn": require("./i18n/zh-cn.json"), }, }; @@ -36,14 +36,17 @@ class App extends GenericApp { // executed when connection is ready } - render() { + render(): Element { if (!this.state.loaded) { return super.render(); } return (
- this.updateNativeValue(attr, value)} /> + this.updateNativeValue(attr, value)} + /> {this.renderError()} {this.renderToast()} {this.renderSaveCloseButtons()} @@ -52,4 +55,4 @@ class App extends GenericApp { } } -export default withStyles(styles)(App); \ No newline at end of file +export default withStyles(styles)(App); diff --git a/test/baselines/TS_DoubleQuotes/admin/src/components/settings.tsx b/test/baselines/TS_DoubleQuotes/admin/src/components/settings.tsx index a504b063a..7c717b899 100644 --- a/test/baselines/TS_DoubleQuotes/admin/src/components/settings.tsx +++ b/test/baselines/TS_DoubleQuotes/admin/src/components/settings.tsx @@ -1,6 +1,6 @@ import React from "react"; import { withStyles } from "@material-ui/core/styles"; -import { CreateCSSProperties } from "@material-ui/core/styles/withStyles"; +import type { CreateCSSProperties } from "@material-ui/core/styles/withStyles"; import TextField from "@material-ui/core/TextField"; import Input from "@material-ui/core/Input"; import FormHelperText from "@material-ui/core/FormHelperText"; @@ -62,14 +62,14 @@ class Settings extends React.Component { this.state = {}; } - renderInput(title: AdminWord, attr: string, type: string) { + renderInput(title: AdminWord, attr: string, type: string): React.JSX.Element { return ( this.props.onChange(attr, e.target.value)} + onChange={e => this.props.onChange(attr, e.target.value)} margin="normal" /> ); @@ -80,22 +80,30 @@ class Settings extends React.Component { attr: string, options: { value: string; title: AdminWord }[], style?: React.CSSProperties, - ) { + ): React.JSX.Element { return ( } + onChange={e => this.props.onChange(attr, e.target.value === "_" ? "" : e.target.value)} + input={ + + } > - {options.map((item) => ( - + {options.map(item => ( + {I18n.t(item.title)} ))} @@ -105,13 +113,13 @@ class Settings extends React.Component { ); } - renderCheckbox(title: AdminWord, attr: string, style?: React.CSSProperties) { + renderCheckbox(title: AdminWord, attr: string, style?: React.CSSProperties): React.JSX.Element { return ( { ); } - render() { + render(): React.JSX.Element { return (
- {this.renderCheckbox("option1", "option1")}
+ {this.renderCheckbox("option1", "option1")} +
{this.renderInput("option2", "option2", "text")}
); } } -export default withStyles(styles)(Settings); \ No newline at end of file +export default withStyles(styles)(Settings); diff --git a/test/baselines/TS_DoubleQuotes/admin/src/index.tsx b/test/baselines/TS_DoubleQuotes/admin/src/index.tsx index e114005c8..5857b0fa6 100644 --- a/test/baselines/TS_DoubleQuotes/admin/src/index.tsx +++ b/test/baselines/TS_DoubleQuotes/admin/src/index.tsx @@ -12,7 +12,7 @@ function build(): void { { + onThemeChange={_theme => { themeName = _theme; build(); }} @@ -22,4 +22,4 @@ function build(): void { ); } -build(); \ No newline at end of file +build(); diff --git a/test/baselines/TS_SingleQuotes/admin/src/app.tsx b/test/baselines/TS_SingleQuotes/admin/src/app.tsx index cc7de6757..6531f1ffd 100644 --- a/test/baselines/TS_SingleQuotes/admin/src/app.tsx +++ b/test/baselines/TS_SingleQuotes/admin/src/app.tsx @@ -1,10 +1,10 @@ +/* eslint-disable @typescript-eslint/no-require-imports */ import React from 'react'; -import { Theme, withStyles } from '@material-ui/core/styles'; +import { type Theme, type StyleRules, withStyles } from '@material-ui/core/styles'; import GenericApp from '@iobroker/adapter-react/GenericApp'; import Settings from './components/settings'; -import { GenericAppProps, GenericAppSettings } from '@iobroker/adapter-react/types'; -import { StyleRules } from '@material-ui/core/styles'; +import type { GenericAppProps, GenericAppSettings } from '@iobroker/adapter-react/types'; const styles = (_theme: Theme): StyleRules => ({ root: {}, @@ -16,16 +16,16 @@ class App extends GenericApp { ...props, encryptedFields: [], translations: { - 'en': require('./i18n/en.json'), - 'de': require('./i18n/de.json'), - 'ru': require('./i18n/ru.json'), - 'pt': require('./i18n/pt.json'), - 'nl': require('./i18n/nl.json'), - 'fr': require('./i18n/fr.json'), - 'it': require('./i18n/it.json'), - 'es': require('./i18n/es.json'), - 'pl': require('./i18n/pl.json'), - 'uk': require('./i18n/uk.json'), + en: require('./i18n/en.json'), + de: require('./i18n/de.json'), + ru: require('./i18n/ru.json'), + pt: require('./i18n/pt.json'), + nl: require('./i18n/nl.json'), + fr: require('./i18n/fr.json'), + it: require('./i18n/it.json'), + es: require('./i18n/es.json'), + pl: require('./i18n/pl.json'), + uk: require('./i18n/uk.json'), 'zh-cn': require('./i18n/zh-cn.json'), }, }; @@ -36,14 +36,17 @@ class App extends GenericApp { // executed when connection is ready } - render() { + render(): Element { if (!this.state.loaded) { return super.render(); } return (
- this.updateNativeValue(attr, value)} /> + this.updateNativeValue(attr, value)} + /> {this.renderError()} {this.renderToast()} {this.renderSaveCloseButtons()} @@ -52,4 +55,4 @@ class App extends GenericApp { } } -export default withStyles(styles)(App); \ No newline at end of file +export default withStyles(styles)(App); diff --git a/test/baselines/TS_SingleQuotes/admin/src/components/settings.tsx b/test/baselines/TS_SingleQuotes/admin/src/components/settings.tsx index 75832b410..8927752d1 100644 --- a/test/baselines/TS_SingleQuotes/admin/src/components/settings.tsx +++ b/test/baselines/TS_SingleQuotes/admin/src/components/settings.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { withStyles } from '@material-ui/core/styles'; -import { CreateCSSProperties } from '@material-ui/core/styles/withStyles'; +import type { CreateCSSProperties } from '@material-ui/core/styles/withStyles'; import TextField from '@material-ui/core/TextField'; import Input from '@material-ui/core/Input'; import FormHelperText from '@material-ui/core/FormHelperText'; @@ -62,14 +62,14 @@ class Settings extends React.Component { this.state = {}; } - renderInput(title: AdminWord, attr: string, type: string) { + renderInput(title: AdminWord, attr: string, type: string): React.JSX.Element { return ( this.props.onChange(attr, e.target.value)} + onChange={e => this.props.onChange(attr, e.target.value)} margin="normal" /> ); @@ -80,22 +80,30 @@ class Settings extends React.Component { attr: string, options: { value: string; title: AdminWord }[], style?: React.CSSProperties, - ) { + ): React.JSX.Element { return ( } + onChange={e => this.props.onChange(attr, e.target.value === '_' ? '' : e.target.value)} + input={ + + } > - {options.map((item) => ( - + {options.map(item => ( + {I18n.t(item.title)} ))} @@ -105,13 +113,13 @@ class Settings extends React.Component { ); } - renderCheckbox(title: AdminWord, attr: string, style?: React.CSSProperties) { + renderCheckbox(title: AdminWord, attr: string, style?: React.CSSProperties): React.JSX.Element { return ( { ); } - render() { + render(): React.JSX.Element { return (
- {this.renderCheckbox('option1', 'option1')}
+ {this.renderCheckbox('option1', 'option1')} +
{this.renderInput('option2', 'option2', 'text')}
); } } -export default withStyles(styles)(Settings); \ No newline at end of file +export default withStyles(styles)(Settings); diff --git a/test/baselines/TS_SingleQuotes/admin/src/index.tsx b/test/baselines/TS_SingleQuotes/admin/src/index.tsx index 677ef3044..75c04cce7 100644 --- a/test/baselines/TS_SingleQuotes/admin/src/index.tsx +++ b/test/baselines/TS_SingleQuotes/admin/src/index.tsx @@ -12,7 +12,7 @@ function build(): void { { + onThemeChange={_theme => { themeName = _theme; build(); }} @@ -22,4 +22,4 @@ function build(): void { ); } -build(); \ No newline at end of file +build(); diff --git a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/main.js b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/main.js index a3dd266cd..1258b4964 100644 --- a/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/main.js +++ b/test/baselines/adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0/main.js @@ -12,9 +12,8 @@ const utils = require('@iobroker/adapter-core'); // const fs = require('fs'); class TestAdapter extends utils.Adapter { - /** - * @param {Partial} [options={}] - Adapter options + * @param {Partial} [options] - Adapter options */ constructor(options) { super({ @@ -154,16 +153,15 @@ class TestAdapter extends utils.Adapter { // } // } // } - } if (require.main !== module) { // Export the constructor in compact mode /** - * @param {Partial} [options={}] - Adapter options + * @param {Partial} [options] - Adapter options */ - module.exports = (options) => new TestAdapter(options); + module.exports = options => new TestAdapter(options); } else { // otherwise start the instance directly new TestAdapter(); -} \ No newline at end of file +} diff --git a/test/baselines/adapter_JS_OfficialESLint/main.js b/test/baselines/adapter_JS_OfficialESLint/main.js index a3dd266cd..1258b4964 100644 --- a/test/baselines/adapter_JS_OfficialESLint/main.js +++ b/test/baselines/adapter_JS_OfficialESLint/main.js @@ -12,9 +12,8 @@ const utils = require('@iobroker/adapter-core'); // const fs = require('fs'); class TestAdapter extends utils.Adapter { - /** - * @param {Partial} [options={}] - Adapter options + * @param {Partial} [options] - Adapter options */ constructor(options) { super({ @@ -154,16 +153,15 @@ class TestAdapter extends utils.Adapter { // } // } // } - } if (require.main !== module) { // Export the constructor in compact mode /** - * @param {Partial} [options={}] - Adapter options + * @param {Partial} [options] - Adapter options */ - module.exports = (options) => new TestAdapter(options); + module.exports = options => new TestAdapter(options); } else { // otherwise start the instance directly new TestAdapter(); -} \ No newline at end of file +} diff --git a/test/baselines/adapter_JS_React/admin/src/app.jsx b/test/baselines/adapter_JS_React/admin/src/app.jsx index 473b61bcb..21290c7d5 100644 --- a/test/baselines/adapter_JS_React/admin/src/app.jsx +++ b/test/baselines/adapter_JS_React/admin/src/app.jsx @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-require-imports */ import React from "react"; import { withStyles } from "@material-ui/core/styles"; @@ -17,16 +18,16 @@ class App extends GenericApp { ...props, encryptedFields: [], translations: { - "en": require("./i18n/en.json"), - "de": require("./i18n/de.json"), - "ru": require("./i18n/ru.json"), - "pt": require("./i18n/pt.json"), - "nl": require("./i18n/nl.json"), - "fr": require("./i18n/fr.json"), - "it": require("./i18n/it.json"), - "es": require("./i18n/es.json"), - "pl": require("./i18n/pl.json"), - "uk": require("./i18n/uk.json"), + en: require("./i18n/en.json"), + de: require("./i18n/de.json"), + ru: require("./i18n/ru.json"), + pt: require("./i18n/pt.json"), + nl: require("./i18n/nl.json"), + fr: require("./i18n/fr.json"), + it: require("./i18n/it.json"), + es: require("./i18n/es.json"), + pl: require("./i18n/pl.json"), + uk: require("./i18n/uk.json"), "zh-cn": require("./i18n/zh-cn.json"), }, }; @@ -44,7 +45,10 @@ class App extends GenericApp { return (
- this.updateNativeValue(attr, value)} /> + this.updateNativeValue(attr, value)} + /> {this.renderError()} {this.renderToast()} {this.renderSaveCloseButtons()} @@ -53,4 +57,4 @@ class App extends GenericApp { } } -export default withStyles(styles)(App); \ No newline at end of file +export default withStyles(styles)(App); diff --git a/test/baselines/adapter_JS_React/admin/src/components/settings.jsx b/test/baselines/adapter_JS_React/admin/src/components/settings.jsx index b105ee9a0..8ab412499 100644 --- a/test/baselines/adapter_JS_React/admin/src/components/settings.jsx +++ b/test/baselines/adapter_JS_React/admin/src/components/settings.jsx @@ -79,7 +79,7 @@ class Settings extends React.Component { className={`${this.props.classes.input} ${this.props.classes.controlElement}`} value={this.props.native[attr]} type={type || "text"} - onChange={(e) => this.props.onChange(attr, e.target.value)} + onChange={e => this.props.onChange(attr, e.target.value)} margin="normal" /> ); @@ -97,16 +97,24 @@ class Settings extends React.Component { className={`${this.props.classes.input} ${this.props.classes.controlElement}`} style={{ paddingTop: 5, - ...style + ...style, }} > } + onChange={e => this.props.onChange(attr, e.target.value === "_" ? "" : e.target.value)} + input={ + + } > - {options.map((item) => ( - + {options.map(item => ( + {I18n.t(item.title)} ))} @@ -127,7 +135,7 @@ class Settings extends React.Component { key={attr} style={{ paddingTop: 5, - ...style + ...style, }} className={this.props.classes.controlElement} control={ @@ -145,11 +153,12 @@ class Settings extends React.Component { render() { return (
- {this.renderCheckbox("option1", "option1")}
+ {this.renderCheckbox("option1", "option1")} +
{this.renderInput("option2", "option2", "text")}
); } } -export default withStyles(styles)(Settings); \ No newline at end of file +export default withStyles(styles)(Settings); diff --git a/test/baselines/adapter_JS_React/admin/src/index.jsx b/test/baselines/adapter_JS_React/admin/src/index.jsx index 723e773b7..60b40a933 100644 --- a/test/baselines/adapter_JS_React/admin/src/index.jsx +++ b/test/baselines/adapter_JS_React/admin/src/index.jsx @@ -12,7 +12,7 @@ function build() { { + onThemeChange={_theme => { themeName = _theme; build(); }} @@ -22,4 +22,4 @@ function build() { ); } -build(); \ No newline at end of file +build(); diff --git a/test/baselines/adapter_JS_React/main.js b/test/baselines/adapter_JS_React/main.js index 45a0067ed..e40ac455b 100644 --- a/test/baselines/adapter_JS_React/main.js +++ b/test/baselines/adapter_JS_React/main.js @@ -12,9 +12,8 @@ const utils = require("@iobroker/adapter-core"); // const fs = require("fs"); class TestAdapter extends utils.Adapter { - /** - * @param {Partial} [options={}] - Adapter options + * @param {Partial} [options] - Adapter options */ constructor(options) { super({ @@ -154,16 +153,15 @@ class TestAdapter extends utils.Adapter { // } // } // } - } if (require.main !== module) { // Export the constructor in compact mode /** - * @param {Partial} [options={}] - Adapter options + * @param {Partial} [options] - Adapter options */ - module.exports = (options) => new TestAdapter(options); + module.exports = options => new TestAdapter(options); } else { // otherwise start the instance directly new TestAdapter(); -} \ No newline at end of file +} diff --git a/test/baselines/adapter_TS_React/admin/src/app.tsx b/test/baselines/adapter_TS_React/admin/src/app.tsx index b4f93806a..181208404 100644 --- a/test/baselines/adapter_TS_React/admin/src/app.tsx +++ b/test/baselines/adapter_TS_React/admin/src/app.tsx @@ -1,10 +1,10 @@ +/* eslint-disable @typescript-eslint/no-require-imports */ import React from "react"; -import { Theme, withStyles } from "@material-ui/core/styles"; +import { type Theme, type StyleRules, withStyles } from "@material-ui/core/styles"; import GenericApp from "@iobroker/adapter-react/GenericApp"; import Settings from "./components/settings"; -import { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; -import { StyleRules } from "@material-ui/core/styles"; +import type { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; const styles = (_theme: Theme): StyleRules => ({ root: {}, @@ -16,16 +16,16 @@ class App extends GenericApp { ...props, encryptedFields: [], translations: { - "en": require("./i18n/en.json"), - "de": require("./i18n/de.json"), - "ru": require("./i18n/ru.json"), - "pt": require("./i18n/pt.json"), - "nl": require("./i18n/nl.json"), - "fr": require("./i18n/fr.json"), - "it": require("./i18n/it.json"), - "es": require("./i18n/es.json"), - "pl": require("./i18n/pl.json"), - "uk": require("./i18n/uk.json"), + en: require("./i18n/en.json"), + de: require("./i18n/de.json"), + ru: require("./i18n/ru.json"), + pt: require("./i18n/pt.json"), + nl: require("./i18n/nl.json"), + fr: require("./i18n/fr.json"), + it: require("./i18n/it.json"), + es: require("./i18n/es.json"), + pl: require("./i18n/pl.json"), + uk: require("./i18n/uk.json"), "zh-cn": require("./i18n/zh-cn.json"), }, }; @@ -36,14 +36,17 @@ class App extends GenericApp { // executed when connection is ready } - render() { + render(): Element { if (!this.state.loaded) { return super.render(); } return (
- this.updateNativeValue(attr, value)} /> + this.updateNativeValue(attr, value)} + /> {this.renderError()} {this.renderToast()} {this.renderSaveCloseButtons()} @@ -52,4 +55,4 @@ class App extends GenericApp { } } -export default withStyles(styles)(App); \ No newline at end of file +export default withStyles(styles)(App); diff --git a/test/baselines/adapter_TS_React/admin/src/components/settings.tsx b/test/baselines/adapter_TS_React/admin/src/components/settings.tsx index a504b063a..7c717b899 100644 --- a/test/baselines/adapter_TS_React/admin/src/components/settings.tsx +++ b/test/baselines/adapter_TS_React/admin/src/components/settings.tsx @@ -1,6 +1,6 @@ import React from "react"; import { withStyles } from "@material-ui/core/styles"; -import { CreateCSSProperties } from "@material-ui/core/styles/withStyles"; +import type { CreateCSSProperties } from "@material-ui/core/styles/withStyles"; import TextField from "@material-ui/core/TextField"; import Input from "@material-ui/core/Input"; import FormHelperText from "@material-ui/core/FormHelperText"; @@ -62,14 +62,14 @@ class Settings extends React.Component { this.state = {}; } - renderInput(title: AdminWord, attr: string, type: string) { + renderInput(title: AdminWord, attr: string, type: string): React.JSX.Element { return ( this.props.onChange(attr, e.target.value)} + onChange={e => this.props.onChange(attr, e.target.value)} margin="normal" /> ); @@ -80,22 +80,30 @@ class Settings extends React.Component { attr: string, options: { value: string; title: AdminWord }[], style?: React.CSSProperties, - ) { + ): React.JSX.Element { return ( } + onChange={e => this.props.onChange(attr, e.target.value === "_" ? "" : e.target.value)} + input={ + + } > - {options.map((item) => ( - + {options.map(item => ( + {I18n.t(item.title)} ))} @@ -105,13 +113,13 @@ class Settings extends React.Component { ); } - renderCheckbox(title: AdminWord, attr: string, style?: React.CSSProperties) { + renderCheckbox(title: AdminWord, attr: string, style?: React.CSSProperties): React.JSX.Element { return ( { ); } - render() { + render(): React.JSX.Element { return (
- {this.renderCheckbox("option1", "option1")}
+ {this.renderCheckbox("option1", "option1")} +
{this.renderInput("option2", "option2", "text")}
); } } -export default withStyles(styles)(Settings); \ No newline at end of file +export default withStyles(styles)(Settings); diff --git a/test/baselines/adapter_TS_React/admin/src/i18n/i18n.d.ts b/test/baselines/adapter_TS_React/admin/src/i18n/i18n.d.ts index f4a769e59..c260647af 100644 --- a/test/baselines/adapter_TS_React/admin/src/i18n/i18n.d.ts +++ b/test/baselines/adapter_TS_React/admin/src/i18n/i18n.d.ts @@ -14,13 +14,15 @@ /** * Available words in `i18n/en.json`. */ +// eslint-disable-next-line @typescript-eslint/consistent-type-imports declare type AdminWord = keyof typeof import("./en.json"); declare module "@iobroker/adapter-react/i18n" { /** * Translate the given string to the selected language. + * * @param word The (key) word to look up the string. Has to be defined at least in `i18n/en.json`. * @param args Optional arguments which will replace the first (second, third, ...) occurence of %s */ function t(word: AdminWord, ...args: string[]): string; -} \ No newline at end of file +} diff --git a/test/baselines/adapter_TS_React/admin/src/index.tsx b/test/baselines/adapter_TS_React/admin/src/index.tsx index e114005c8..5857b0fa6 100644 --- a/test/baselines/adapter_TS_React/admin/src/index.tsx +++ b/test/baselines/adapter_TS_React/admin/src/index.tsx @@ -12,7 +12,7 @@ function build(): void { { + onThemeChange={_theme => { themeName = _theme; build(); }} @@ -22,4 +22,4 @@ function build(): void { ); } -build(); \ No newline at end of file +build(); diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/app.tsx b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/app.tsx index b4f93806a..181208404 100644 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/app.tsx +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/app.tsx @@ -1,10 +1,10 @@ +/* eslint-disable @typescript-eslint/no-require-imports */ import React from "react"; -import { Theme, withStyles } from "@material-ui/core/styles"; +import { type Theme, type StyleRules, withStyles } from "@material-ui/core/styles"; import GenericApp from "@iobroker/adapter-react/GenericApp"; import Settings from "./components/settings"; -import { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; -import { StyleRules } from "@material-ui/core/styles"; +import type { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; const styles = (_theme: Theme): StyleRules => ({ root: {}, @@ -16,16 +16,16 @@ class App extends GenericApp { ...props, encryptedFields: [], translations: { - "en": require("./i18n/en.json"), - "de": require("./i18n/de.json"), - "ru": require("./i18n/ru.json"), - "pt": require("./i18n/pt.json"), - "nl": require("./i18n/nl.json"), - "fr": require("./i18n/fr.json"), - "it": require("./i18n/it.json"), - "es": require("./i18n/es.json"), - "pl": require("./i18n/pl.json"), - "uk": require("./i18n/uk.json"), + en: require("./i18n/en.json"), + de: require("./i18n/de.json"), + ru: require("./i18n/ru.json"), + pt: require("./i18n/pt.json"), + nl: require("./i18n/nl.json"), + fr: require("./i18n/fr.json"), + it: require("./i18n/it.json"), + es: require("./i18n/es.json"), + pl: require("./i18n/pl.json"), + uk: require("./i18n/uk.json"), "zh-cn": require("./i18n/zh-cn.json"), }, }; @@ -36,14 +36,17 @@ class App extends GenericApp { // executed when connection is ready } - render() { + render(): Element { if (!this.state.loaded) { return super.render(); } return (
- this.updateNativeValue(attr, value)} /> + this.updateNativeValue(attr, value)} + /> {this.renderError()} {this.renderToast()} {this.renderSaveCloseButtons()} @@ -52,4 +55,4 @@ class App extends GenericApp { } } -export default withStyles(styles)(App); \ No newline at end of file +export default withStyles(styles)(App); diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/components/settings.tsx b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/components/settings.tsx index a504b063a..7c717b899 100644 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/components/settings.tsx +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/components/settings.tsx @@ -1,6 +1,6 @@ import React from "react"; import { withStyles } from "@material-ui/core/styles"; -import { CreateCSSProperties } from "@material-ui/core/styles/withStyles"; +import type { CreateCSSProperties } from "@material-ui/core/styles/withStyles"; import TextField from "@material-ui/core/TextField"; import Input from "@material-ui/core/Input"; import FormHelperText from "@material-ui/core/FormHelperText"; @@ -62,14 +62,14 @@ class Settings extends React.Component { this.state = {}; } - renderInput(title: AdminWord, attr: string, type: string) { + renderInput(title: AdminWord, attr: string, type: string): React.JSX.Element { return ( this.props.onChange(attr, e.target.value)} + onChange={e => this.props.onChange(attr, e.target.value)} margin="normal" /> ); @@ -80,22 +80,30 @@ class Settings extends React.Component { attr: string, options: { value: string; title: AdminWord }[], style?: React.CSSProperties, - ) { + ): React.JSX.Element { return ( } + onChange={e => this.props.onChange(attr, e.target.value === "_" ? "" : e.target.value)} + input={ + + } > - {options.map((item) => ( - + {options.map(item => ( + {I18n.t(item.title)} ))} @@ -105,13 +113,13 @@ class Settings extends React.Component { ); } - renderCheckbox(title: AdminWord, attr: string, style?: React.CSSProperties) { + renderCheckbox(title: AdminWord, attr: string, style?: React.CSSProperties): React.JSX.Element { return ( { ); } - render() { + render(): React.JSX.Element { return (
- {this.renderCheckbox("option1", "option1")}
+ {this.renderCheckbox("option1", "option1")} +
{this.renderInput("option2", "option2", "text")}
); } } -export default withStyles(styles)(Settings); \ No newline at end of file +export default withStyles(styles)(Settings); diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/i18n.d.ts b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/i18n.d.ts index f4a769e59..c260647af 100644 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/i18n.d.ts +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/i18n/i18n.d.ts @@ -14,13 +14,15 @@ /** * Available words in `i18n/en.json`. */ +// eslint-disable-next-line @typescript-eslint/consistent-type-imports declare type AdminWord = keyof typeof import("./en.json"); declare module "@iobroker/adapter-react/i18n" { /** * Translate the given string to the selected language. + * * @param word The (key) word to look up the string. Has to be defined at least in `i18n/en.json`. * @param args Optional arguments which will replace the first (second, third, ...) occurence of %s */ function t(word: AdminWord, ...args: string[]): string; -} \ No newline at end of file +} diff --git a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/index.tsx b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/index.tsx index e114005c8..5857b0fa6 100644 --- a/test/baselines/adapter_TS_React_OfficialESLint/admin/src/index.tsx +++ b/test/baselines/adapter_TS_React_OfficialESLint/admin/src/index.tsx @@ -12,7 +12,7 @@ function build(): void { { + onThemeChange={_theme => { themeName = _theme; build(); }} @@ -22,4 +22,4 @@ function build(): void { ); } -build(); \ No newline at end of file +build(); diff --git a/test/baselines/ioBroker.hello-devcontainer/main.js b/test/baselines/ioBroker.hello-devcontainer/main.js index 14e6f51c6..be1c33084 100644 --- a/test/baselines/ioBroker.hello-devcontainer/main.js +++ b/test/baselines/ioBroker.hello-devcontainer/main.js @@ -12,9 +12,8 @@ const utils = require('@iobroker/adapter-core'); // const fs = require('fs'); class HelloDevcontainer extends utils.Adapter { - /** - * @param {Partial} [options={}] - Adapter options + * @param {Partial} [options] - Adapter options */ constructor(options) { super({ @@ -154,16 +153,15 @@ class HelloDevcontainer extends utils.Adapter { // } // } // } - } if (require.main !== module) { // Export the constructor in compact mode /** - * @param {Partial} [options={}] - Adapter options + * @param {Partial} [options] - Adapter options */ - module.exports = (options) => new HelloDevcontainer(options); + module.exports = options => new HelloDevcontainer(options); } else { // otherwise start the instance directly new HelloDevcontainer(); -} \ No newline at end of file +} diff --git a/test/baselines/tabReact_adminHtml_JS/admin/src/tab-app.jsx b/test/baselines/tabReact_adminHtml_JS/admin/src/tab-app.jsx index 9e0ae262d..cae5228c1 100644 --- a/test/baselines/tabReact_adminHtml_JS/admin/src/tab-app.jsx +++ b/test/baselines/tabReact_adminHtml_JS/admin/src/tab-app.jsx @@ -1,3 +1,4 @@ +/* eslint-disable @typescript-eslint/no-require-imports */ import React from "react"; import { withStyles } from "@material-ui/core/styles"; @@ -17,16 +18,16 @@ class TabApp extends GenericApp { bottomButtons: false, encryptedFields: [], translations: { - "en": require("./i18n/en.json"), - "de": require("./i18n/de.json"), - "ru": require("./i18n/ru.json"), - "pt": require("./i18n/pt.json"), - "nl": require("./i18n/nl.json"), - "fr": require("./i18n/fr.json"), - "it": require("./i18n/it.json"), - "es": require("./i18n/es.json"), - "pl": require("./i18n/pl.json"), - "uk": require("./i18n/uk.json"), + en: require("./i18n/en.json"), + de: require("./i18n/de.json"), + ru: require("./i18n/ru.json"), + pt: require("./i18n/pt.json"), + nl: require("./i18n/nl.json"), + fr: require("./i18n/fr.json"), + it: require("./i18n/it.json"), + es: require("./i18n/es.json"), + pl: require("./i18n/pl.json"), + uk: require("./i18n/uk.json"), "zh-cn": require("./i18n/zh-cn.json"), }, }; @@ -52,4 +53,4 @@ class TabApp extends GenericApp { } } -export default withStyles(styles)(TabApp); \ No newline at end of file +export default withStyles(styles)(TabApp); diff --git a/test/baselines/tabReact_adminHtml_JS/admin/src/tab.jsx b/test/baselines/tabReact_adminHtml_JS/admin/src/tab.jsx index e70544ba0..641fe9775 100644 --- a/test/baselines/tabReact_adminHtml_JS/admin/src/tab.jsx +++ b/test/baselines/tabReact_adminHtml_JS/admin/src/tab.jsx @@ -12,7 +12,7 @@ function build() { { + onThemeChange={_theme => { themeName = _theme; build(); }} @@ -22,4 +22,4 @@ function build() { ); } -build(); \ No newline at end of file +build(); diff --git a/test/baselines/tabReact_adminReact_TS/admin/src/app.tsx b/test/baselines/tabReact_adminReact_TS/admin/src/app.tsx index b4f93806a..181208404 100644 --- a/test/baselines/tabReact_adminReact_TS/admin/src/app.tsx +++ b/test/baselines/tabReact_adminReact_TS/admin/src/app.tsx @@ -1,10 +1,10 @@ +/* eslint-disable @typescript-eslint/no-require-imports */ import React from "react"; -import { Theme, withStyles } from "@material-ui/core/styles"; +import { type Theme, type StyleRules, withStyles } from "@material-ui/core/styles"; import GenericApp from "@iobroker/adapter-react/GenericApp"; import Settings from "./components/settings"; -import { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; -import { StyleRules } from "@material-ui/core/styles"; +import type { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; const styles = (_theme: Theme): StyleRules => ({ root: {}, @@ -16,16 +16,16 @@ class App extends GenericApp { ...props, encryptedFields: [], translations: { - "en": require("./i18n/en.json"), - "de": require("./i18n/de.json"), - "ru": require("./i18n/ru.json"), - "pt": require("./i18n/pt.json"), - "nl": require("./i18n/nl.json"), - "fr": require("./i18n/fr.json"), - "it": require("./i18n/it.json"), - "es": require("./i18n/es.json"), - "pl": require("./i18n/pl.json"), - "uk": require("./i18n/uk.json"), + en: require("./i18n/en.json"), + de: require("./i18n/de.json"), + ru: require("./i18n/ru.json"), + pt: require("./i18n/pt.json"), + nl: require("./i18n/nl.json"), + fr: require("./i18n/fr.json"), + it: require("./i18n/it.json"), + es: require("./i18n/es.json"), + pl: require("./i18n/pl.json"), + uk: require("./i18n/uk.json"), "zh-cn": require("./i18n/zh-cn.json"), }, }; @@ -36,14 +36,17 @@ class App extends GenericApp { // executed when connection is ready } - render() { + render(): Element { if (!this.state.loaded) { return super.render(); } return (
- this.updateNativeValue(attr, value)} /> + this.updateNativeValue(attr, value)} + /> {this.renderError()} {this.renderToast()} {this.renderSaveCloseButtons()} @@ -52,4 +55,4 @@ class App extends GenericApp { } } -export default withStyles(styles)(App); \ No newline at end of file +export default withStyles(styles)(App); diff --git a/test/baselines/tabReact_adminReact_TS/admin/src/components/settings.tsx b/test/baselines/tabReact_adminReact_TS/admin/src/components/settings.tsx index a504b063a..7c717b899 100644 --- a/test/baselines/tabReact_adminReact_TS/admin/src/components/settings.tsx +++ b/test/baselines/tabReact_adminReact_TS/admin/src/components/settings.tsx @@ -1,6 +1,6 @@ import React from "react"; import { withStyles } from "@material-ui/core/styles"; -import { CreateCSSProperties } from "@material-ui/core/styles/withStyles"; +import type { CreateCSSProperties } from "@material-ui/core/styles/withStyles"; import TextField from "@material-ui/core/TextField"; import Input from "@material-ui/core/Input"; import FormHelperText from "@material-ui/core/FormHelperText"; @@ -62,14 +62,14 @@ class Settings extends React.Component { this.state = {}; } - renderInput(title: AdminWord, attr: string, type: string) { + renderInput(title: AdminWord, attr: string, type: string): React.JSX.Element { return ( this.props.onChange(attr, e.target.value)} + onChange={e => this.props.onChange(attr, e.target.value)} margin="normal" /> ); @@ -80,22 +80,30 @@ class Settings extends React.Component { attr: string, options: { value: string; title: AdminWord }[], style?: React.CSSProperties, - ) { + ): React.JSX.Element { return ( } + onChange={e => this.props.onChange(attr, e.target.value === "_" ? "" : e.target.value)} + input={ + + } > - {options.map((item) => ( - + {options.map(item => ( + {I18n.t(item.title)} ))} @@ -105,13 +113,13 @@ class Settings extends React.Component { ); } - renderCheckbox(title: AdminWord, attr: string, style?: React.CSSProperties) { + renderCheckbox(title: AdminWord, attr: string, style?: React.CSSProperties): React.JSX.Element { return ( { ); } - render() { + render(): React.JSX.Element { return (
- {this.renderCheckbox("option1", "option1")}
+ {this.renderCheckbox("option1", "option1")} +
{this.renderInput("option2", "option2", "text")}
); } } -export default withStyles(styles)(Settings); \ No newline at end of file +export default withStyles(styles)(Settings); diff --git a/test/baselines/tabReact_adminReact_TS/admin/src/i18n/i18n.d.ts b/test/baselines/tabReact_adminReact_TS/admin/src/i18n/i18n.d.ts index f4a769e59..c260647af 100644 --- a/test/baselines/tabReact_adminReact_TS/admin/src/i18n/i18n.d.ts +++ b/test/baselines/tabReact_adminReact_TS/admin/src/i18n/i18n.d.ts @@ -14,13 +14,15 @@ /** * Available words in `i18n/en.json`. */ +// eslint-disable-next-line @typescript-eslint/consistent-type-imports declare type AdminWord = keyof typeof import("./en.json"); declare module "@iobroker/adapter-react/i18n" { /** * Translate the given string to the selected language. + * * @param word The (key) word to look up the string. Has to be defined at least in `i18n/en.json`. * @param args Optional arguments which will replace the first (second, third, ...) occurence of %s */ function t(word: AdminWord, ...args: string[]): string; -} \ No newline at end of file +} diff --git a/test/baselines/tabReact_adminReact_TS/admin/src/index.tsx b/test/baselines/tabReact_adminReact_TS/admin/src/index.tsx index e114005c8..5857b0fa6 100644 --- a/test/baselines/tabReact_adminReact_TS/admin/src/index.tsx +++ b/test/baselines/tabReact_adminReact_TS/admin/src/index.tsx @@ -12,7 +12,7 @@ function build(): void { { + onThemeChange={_theme => { themeName = _theme; build(); }} @@ -22,4 +22,4 @@ function build(): void { ); } -build(); \ No newline at end of file +build(); diff --git a/test/baselines/tabReact_adminReact_TS/admin/src/tab-app.tsx b/test/baselines/tabReact_adminReact_TS/admin/src/tab-app.tsx index c84a968cb..4fa1fc994 100644 --- a/test/baselines/tabReact_adminReact_TS/admin/src/tab-app.tsx +++ b/test/baselines/tabReact_adminReact_TS/admin/src/tab-app.tsx @@ -1,9 +1,9 @@ +/* eslint-disable @typescript-eslint/no-require-imports */ import React from "react"; -import { Theme, withStyles } from "@material-ui/core/styles"; +import { type Theme, type StyleRules, withStyles } from "@material-ui/core/styles"; import GenericApp from "@iobroker/adapter-react/GenericApp"; -import { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; -import { StyleRules } from "@material-ui/core/styles"; +import type { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; const styles = (_theme: Theme): StyleRules => ({ root: {}, @@ -16,16 +16,16 @@ class TabApp extends GenericApp { bottomButtons: false, encryptedFields: [], translations: { - "en": require("./i18n/en.json"), - "de": require("./i18n/de.json"), - "ru": require("./i18n/ru.json"), - "pt": require("./i18n/pt.json"), - "nl": require("./i18n/nl.json"), - "fr": require("./i18n/fr.json"), - "it": require("./i18n/it.json"), - "es": require("./i18n/es.json"), - "pl": require("./i18n/pl.json"), - "uk": require("./i18n/uk.json"), + en: require("./i18n/en.json"), + de: require("./i18n/de.json"), + ru: require("./i18n/ru.json"), + pt: require("./i18n/pt.json"), + nl: require("./i18n/nl.json"), + fr: require("./i18n/fr.json"), + it: require("./i18n/it.json"), + es: require("./i18n/es.json"), + pl: require("./i18n/pl.json"), + uk: require("./i18n/uk.json"), "zh-cn": require("./i18n/zh-cn.json"), }, }; @@ -36,7 +36,7 @@ class TabApp extends GenericApp { // executed when connection is ready } - render() { + render(): React.JSX.Element { if (!this.state.loaded) { return super.render(); } @@ -51,4 +51,4 @@ class TabApp extends GenericApp { } } -export default withStyles(styles)(TabApp); \ No newline at end of file +export default withStyles(styles)(TabApp); diff --git a/test/baselines/tabReact_adminReact_TS/admin/src/tab.tsx b/test/baselines/tabReact_adminReact_TS/admin/src/tab.tsx index a10100bcd..98abfd37b 100644 --- a/test/baselines/tabReact_adminReact_TS/admin/src/tab.tsx +++ b/test/baselines/tabReact_adminReact_TS/admin/src/tab.tsx @@ -12,7 +12,7 @@ function build(): void { { + onThemeChange={_theme => { themeName = _theme; build(); }} @@ -22,4 +22,4 @@ function build(): void { ); } -build(); \ No newline at end of file +build(); From 6a1e858f9d33739bc04bcb0a535caa143b3f57ca Mon Sep 17 00:00:00 2001 From: Ingo Fischer Date: Sun, 12 Oct 2025 20:00:08 +0200 Subject: [PATCH 19/29] fixes --- .github/workflows/test-and-release.yml | 2 +- CHANGELOG.md | 1 + package.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml index b781eb9a4..f0e07d76e 100644 --- a/.github/workflows/test-and-release.yml +++ b/.github/workflows/test-and-release.yml @@ -26,7 +26,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - node-version: [18.x, 20.x, 22.x, 24.x] + node-version: [20.x, 22.x, 24.x] os: [ubuntu-latest] steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c7a97549..daece5165 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ --> ## __WORK IN PROGRESS__ +* IMPORTANT: The adapter creator requires Node.js 20.x or newer to run! * (@Apollon77/@copilot) Add option to use official @iobroker/eslint-config with ESLint 9 format as primary configuration (#1186) · [Migration guide](docs/updates/20251012_eslint9_official_config.md) * (@Apollon77/@copilot) Upgrade custom ESLint configuration to ESLint 9 with flat config format (#1186) · [Migration guide](docs/updates/20251012_eslint9_official_config.md) * (@Apollon77/@copilot) Add VIS widget ESLint configuration support in main config files (#1186) diff --git a/package.json b/package.json index 28d28a7a1..747ad0d70 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "url": "https://github.com/ioBroker/create-adapter/issues" }, "engines": { - "node": ">=18" + "node": ">=20" }, "publishConfig": { "access": "public" From d80da3c80bdbf8406e40f7c18bdef883f0c14475 Mon Sep 17 00:00:00 2001 From: Ingo Fischer Date: Sun, 12 Oct 2025 20:13:18 +0200 Subject: [PATCH 20/29] fixes --- .github/workflows/test-and-release.yml | 3 + package-lock.json | 982 +++++++++++++++---------- package.json | 32 +- src/lib/core/questions.ts | 3 +- tsconfig.json | 2 +- 5 files changed, 602 insertions(+), 420 deletions(-) diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml index f0e07d76e..a513c5b71 100644 --- a/.github/workflows/test-and-release.yml +++ b/.github/workflows/test-and-release.yml @@ -51,6 +51,9 @@ jobs: - name: Lint source code run: npm run lint + - name: Verify formatting + run: npm run format + - name: Compile TypeScript code run: npm run build diff --git a/package-lock.json b/package-lock.json index ef2f45da9..41b38caed 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,39 +9,39 @@ "version": "2.6.5", "license": "MIT", "dependencies": { - "@iobroker/adapter-dev": "^1.4.0", + "@iobroker/adapter-dev": "^1.5.0", "@typescript-eslint/parser": "^7.18.0", "alcalzone-shared": "^4.0.8", "ansi-colors": "^4.1.3", "axios": "^1.12.2", - "debug": "^4.4.1", + "debug": "^4.4.3", "enquirer": "^2.4.1", "eslint": "^8.57.1", - "fs-extra": "^11.3.1", + "fs-extra": "^11.3.2", "json5": "^2.2.3", "p-limit": "^5.0.0", "prettier": "^3.6.2", - "semver": "^7.7.2", - "typescript": "~5.9.2", + "semver": "^7.7.3", + "typescript": "~5.9.3", "yargs": "^17.7.2" }, "bin": { "create-adapter": "bin/create-adapter.js" }, "devDependencies": { - "@alcalzone/release-script": "^3.8.0", - "@tsconfig/node18": "^18.2.4", + "@alcalzone/release-script": "^4.0.0", + "@tsconfig/node20": "^20.1.6", "@types/chai": "^4.3.20", "@types/chai-as-promised": "^7.1.8", "@types/debug": "4.1.12", "@types/eslint": "^8.56.12", "@types/fs-extra": "^11.0.4", - "@types/json5": "2.2.0", + "@types/json5": "^2.2.0", "@types/mocha": "^10.0.10", - "@types/node": "^18.19.123", + "@types/node": "^20.19.21", "@types/proxyquire": "^1.3.31", - "@types/semver": "^7.7.0", - "@types/sinon": "^10.0.20", + "@types/semver": "^7.7.1", + "@types/sinon": "^17.0.4", "@types/sinon-chai": "^3.2.12", "@types/yargs": "^17.0.33", "@typescript-eslint/eslint-plugin": "^7.18.0", @@ -52,22 +52,22 @@ "eslint-plugin-prettier": "^5.5.4", "execa": "^8.0.1", "jsonschema": "^1.5.0", - "mocha": "^11.7.1", + "mocha": "^11.7.4", "proxyquire": "^2.1.3", "rimraf": "^4.4.1", - "sinon": "^15.2.0", + "sinon": "^21.0.0", "sinon-chai": "^3.7.0", "source-map-support": "^0.5.21", - "tsx": "^4.20.5" + "tsx": "^4.20.6" }, "engines": { - "node": ">=18" + "node": ">=20" } }, "node_modules/@alcalzone/pak": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/@alcalzone/pak/-/pak-0.10.2.tgz", - "integrity": "sha512-v+kM7HlfIVNLDlGBcbZvrG3yVK3rPLH5kIoGRJbCcoHwpUqQbfEMzXAy1ZrfP+zbI5phHw2PhgrXZr3z6nh7Ow==", + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@alcalzone/pak/-/pak-0.11.0.tgz", + "integrity": "sha512-S6s2Xug8VJ04Xgam7kV+dUydVB2gJmTem+Kr7oxneeXndWddgoQxphQNI9WqgpsifTkonC9wiAbj3qkMFlNeAA==", "dev": true, "license": "MIT", "dependencies": { @@ -190,24 +190,24 @@ } }, "node_modules/@alcalzone/release-script": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@alcalzone/release-script/-/release-script-3.8.0.tgz", - "integrity": "sha512-9H3imn8o9n3Ekpkie9TMgPeJfgT6WmklCMtOZ1wuwvMw/obNA0Ao1ZZ8CJfHk1YNjiLGmWn0kQFEGTqz4DoD7w==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@alcalzone/release-script/-/release-script-4.0.0.tgz", + "integrity": "sha512-lA6+R/7EBpLCpX2gtgs2YruA3iQ9/XGCTHcHdiSu+Q1yW4CVRJ+fYtqXaIJwasnQMiYnvYiyiMzWLQwQxO3Y8A==", "dev": true, "license": "MIT", "dependencies": { - "@alcalzone/release-script-core": "3.7.0", - "@alcalzone/release-script-plugin-changelog": "3.7.0", - "@alcalzone/release-script-plugin-exec": "3.7.0", - "@alcalzone/release-script-plugin-git": "3.8.0", - "@alcalzone/release-script-plugin-package": "3.7.3", - "@alcalzone/release-script-plugin-version": "3.7.0", - "alcalzone-shared": "^4.0.1", + "@alcalzone/release-script-core": "4.0.0", + "@alcalzone/release-script-plugin-changelog": "4.0.0", + "@alcalzone/release-script-plugin-exec": "4.0.0", + "@alcalzone/release-script-plugin-git": "4.0.0", + "@alcalzone/release-script-plugin-package": "4.0.0", + "@alcalzone/release-script-plugin-version": "4.0.0", + "alcalzone-shared": "^5.0.0", "axios": "^1.6.2", "enquirer": "^2.3.6", "fs-extra": "^10.1.0", "picocolors": "1.0.0", - "semver": "^7.5.2", + "semver": "^7.7.2", "source-map-support": "^0.5.21", "yargs": "^17.4.1" }, @@ -215,20 +215,20 @@ "release-script": "bin/release.js" }, "engines": { - "node": ">=12.20" + "node": ">=18" } }, "node_modules/@alcalzone/release-script-core": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@alcalzone/release-script-core/-/release-script-core-3.7.0.tgz", - "integrity": "sha512-4np4dBziwX/aNRhS/gpK8bwa0wpLe7oomzJ7YTUXf5bUtV/UTpN2a9tm5Bp7ElnisKj6N3AqHl4lVXRo4L9hYg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@alcalzone/release-script-core/-/release-script-core-4.0.0.tgz", + "integrity": "sha512-vwBhNzsUBpGDCVrL0fAkOkdsxCaGOC43UOgTbB4U27noBgz+J9rscc53DiafKniSyfK6+NgWzHcjwY1vtyvaEQ==", "dev": true, "license": "MIT", "dependencies": { "execa": "^5.1.1" }, "engines": { - "node": ">=12.20" + "node": ">=18" } }, "node_modules/@alcalzone/release-script-core/node_modules/execa": { @@ -328,18 +328,28 @@ } }, "node_modules/@alcalzone/release-script-plugin-changelog": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@alcalzone/release-script-plugin-changelog/-/release-script-plugin-changelog-3.7.0.tgz", - "integrity": "sha512-AlLOIjIPP42uBmvcdYkfijYDzolyY6JmfbTmdxQDBLyrgYXnuUr2GaKxbpeWSbvcAuUhNvHCAyI6LI90X3OTEg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@alcalzone/release-script-plugin-changelog/-/release-script-plugin-changelog-4.0.0.tgz", + "integrity": "sha512-jFC8TCTWhFr0dkgFkKRKuEqCTvNqqpTAullbXbOK33oOyBHvsk8M6ma8fOFx3caH1WLQCWwmzt+nr7+Pwx3AqQ==", "dev": true, "license": "MIT", "dependencies": { - "@alcalzone/release-script-core": "3.7.0", - "alcalzone-shared": "^4.0.1", + "@alcalzone/release-script-core": "4.0.0", + "alcalzone-shared": "^5.0.0", "fs-extra": "^10.1.0" }, "engines": { - "node": ">=12.20" + "node": ">=18" + } + }, + "node_modules/@alcalzone/release-script-plugin-changelog/node_modules/alcalzone-shared": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/alcalzone-shared/-/alcalzone-shared-5.0.0.tgz", + "integrity": "sha512-X73hgVWcrIKUUB6jZgHj5flRbTft8AAoJ2MqRKEcAX1whW3OeGkxsQ6ol4nd4/rKxd1eoCRXUGW3cIhXrXU4Sg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" } }, "node_modules/@alcalzone/release-script-plugin-changelog/node_modules/fs-extra": { @@ -358,31 +368,41 @@ } }, "node_modules/@alcalzone/release-script-plugin-exec": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@alcalzone/release-script-plugin-exec/-/release-script-plugin-exec-3.7.0.tgz", - "integrity": "sha512-ZhlKGhxa71mLyYB1/ojzik2RKcSAeIjuwKzlWRd6oUvKoZPe7eAjLYneXx5viQC6tvDJE4dvN1NlkFGWsSlZYA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@alcalzone/release-script-plugin-exec/-/release-script-plugin-exec-4.0.0.tgz", + "integrity": "sha512-STEQrbI91p+ZklKrSQq9obJ/OWMNC8U9GGYyy0Z36gMkfBTWYPu6B9aF+dMCBRdHvvacrvvMaux/uirt9EH3tQ==", "dev": true, "license": "MIT", "dependencies": { - "@alcalzone/release-script-core": "3.7.0", - "alcalzone-shared": "^4.0.1" + "@alcalzone/release-script-core": "4.0.0", + "alcalzone-shared": "^5.0.0" }, "engines": { - "node": ">=12.20" + "node": ">=18" + } + }, + "node_modules/@alcalzone/release-script-plugin-exec/node_modules/alcalzone-shared": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/alcalzone-shared/-/alcalzone-shared-5.0.0.tgz", + "integrity": "sha512-X73hgVWcrIKUUB6jZgHj5flRbTft8AAoJ2MqRKEcAX1whW3OeGkxsQ6ol4nd4/rKxd1eoCRXUGW3cIhXrXU4Sg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" } }, "node_modules/@alcalzone/release-script-plugin-git": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@alcalzone/release-script-plugin-git/-/release-script-plugin-git-3.8.0.tgz", - "integrity": "sha512-rI9EqSmvMWaNZ5xxOUBZjD4WOv1Enl+/ZxhUoTROq+K/9RYYHQaAXilGWNvnz2DYr14Q+Yx/fs54GXgAVf0scg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@alcalzone/release-script-plugin-git/-/release-script-plugin-git-4.0.0.tgz", + "integrity": "sha512-MYNDC/fQxoNsAjaeikGtIpeBUT9+qyyGGZ1V6UQ+U6Rr59gwbSHo9G/ifstx17FpDFPoZYg7ew899LV1hvUrrQ==", "dev": true, "license": "MIT", "dependencies": { - "@alcalzone/release-script-core": "3.7.0", + "@alcalzone/release-script-core": "4.0.0", "fs-extra": "^10.1.0" }, "engines": { - "node": ">=12.20" + "node": ">=18" } }, "node_modules/@alcalzone/release-script-plugin-git/node_modules/fs-extra": { @@ -401,20 +421,30 @@ } }, "node_modules/@alcalzone/release-script-plugin-package": { - "version": "3.7.3", - "resolved": "https://registry.npmjs.org/@alcalzone/release-script-plugin-package/-/release-script-plugin-package-3.7.3.tgz", - "integrity": "sha512-5oKSwbvHs9jRhARJ04eQ7xqig3a7NmPJlhtBxAqUM8+0cjs2g/V1xTxM6o8aZ09uRSdq80YGVxJm871SyszAWQ==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@alcalzone/release-script-plugin-package/-/release-script-plugin-package-4.0.0.tgz", + "integrity": "sha512-Abxl9Ix/UtAvQTW3dzxHvl7L1ONigxV924KH6HIeqsOe/m2geeKTekbMxz76+EkBDusckKHWUq9pQWKOPv2ZNQ==", "dev": true, "license": "MIT", "dependencies": { - "@alcalzone/pak": "^0.10.1", - "@alcalzone/release-script-core": "3.7.0", - "alcalzone-shared": "^4.0.1", + "@alcalzone/pak": "^0.11.0", + "@alcalzone/release-script-core": "4.0.0", + "alcalzone-shared": "^5.0.0", "fs-extra": "^10.1.0", - "semver": "^7.5.2" + "semver": "^7.7.2" }, "engines": { - "node": ">=12.20" + "node": ">=18" + } + }, + "node_modules/@alcalzone/release-script-plugin-package/node_modules/alcalzone-shared": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/alcalzone-shared/-/alcalzone-shared-5.0.0.tgz", + "integrity": "sha512-X73hgVWcrIKUUB6jZgHj5flRbTft8AAoJ2MqRKEcAX1whW3OeGkxsQ6ol4nd4/rKxd1eoCRXUGW3cIhXrXU4Sg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" } }, "node_modules/@alcalzone/release-script-plugin-package/node_modules/fs-extra": { @@ -433,20 +463,30 @@ } }, "node_modules/@alcalzone/release-script-plugin-version": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/@alcalzone/release-script-plugin-version/-/release-script-plugin-version-3.7.0.tgz", - "integrity": "sha512-030NGQeB+mglVz/58cx0WO4QiFChaSd/pz35mnOrUc9PbKWRpzisTVOt4IhCV/++YiAVibJO31NMNzvipPdx4Q==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@alcalzone/release-script-plugin-version/-/release-script-plugin-version-4.0.0.tgz", + "integrity": "sha512-ZbgGum7M1X0paDFYtcrlZRptPXy4SPqMDAZU6JgU/JSmifBSvuwEJpF42vt5POICrz3FkEmNUUdp9pZ44gYFXQ==", "dev": true, "license": "MIT", "dependencies": { - "@alcalzone/release-script-core": "3.7.0", - "alcalzone-shared": "^4.0.1", + "@alcalzone/release-script-core": "4.0.0", + "alcalzone-shared": "^5.0.0", "fs-extra": "^10.1.0", - "semver": "^7.5.2", + "semver": "^7.7.2", "tiny-glob": "^0.2.9" }, "engines": { - "node": ">=12.20" + "node": ">=18" + } + }, + "node_modules/@alcalzone/release-script-plugin-version/node_modules/alcalzone-shared": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/alcalzone-shared/-/alcalzone-shared-5.0.0.tgz", + "integrity": "sha512-X73hgVWcrIKUUB6jZgHj5flRbTft8AAoJ2MqRKEcAX1whW3OeGkxsQ6ol4nd4/rKxd1eoCRXUGW3cIhXrXU4Sg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" } }, "node_modules/@alcalzone/release-script-plugin-version/node_modules/fs-extra": { @@ -464,6 +504,16 @@ "node": ">=12" } }, + "node_modules/@alcalzone/release-script/node_modules/alcalzone-shared": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/alcalzone-shared/-/alcalzone-shared-5.0.0.tgz", + "integrity": "sha512-X73hgVWcrIKUUB6jZgHj5flRbTft8AAoJ2MqRKEcAX1whW3OeGkxsQ6ol4nd4/rKxd1eoCRXUGW3cIhXrXU4Sg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + } + }, "node_modules/@alcalzone/release-script/node_modules/fs-extra": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz", @@ -1090,23 +1140,32 @@ } }, "node_modules/@google-cloud/common": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-5.0.2.tgz", - "integrity": "sha512-V7bmBKYQyu0eVG2BFejuUjlBt+zrya6vtsKdY+JxMM/dNntPF41vZ9+LhOshEUH01zOHEqBSvI7Dad7ZS6aUeA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@google-cloud/common/-/common-6.0.0.tgz", + "integrity": "sha512-IXh04DlkLMxWgYLIUYuHHKXKOUwPDzDgke1ykkkJPe48cGIS9kkL2U/o0pm4ankHLlvzLF/ma1eO86n/bkumIA==", "license": "Apache-2.0", "dependencies": { "@google-cloud/projectify": "^4.0.0", "@google-cloud/promisify": "^4.0.0", - "arrify": "^2.0.1", - "duplexify": "^4.1.1", + "arrify": "^2.0.0", + "duplexify": "^4.1.3", "extend": "^3.0.2", - "google-auth-library": "^9.0.0", + "google-auth-library": "^10.0.0-rc.1", "html-entities": "^2.5.2", - "retry-request": "^7.0.0", - "teeny-request": "^9.0.0" + "retry-request": "^8.0.0", + "teeny-request": "^10.0.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" + } + }, + "node_modules/@google-cloud/common/node_modules/@google-cloud/promisify": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-4.1.0.tgz", + "integrity": "sha512-G/FQx5cE/+DqBbOpA5jKsegGwdPniU6PuIEMt+qxWgFxvxuFOzVmp6zYchtYuwAWV5/8Dgs0yAmjvNZv3uXLQg==", + "license": "Apache-2.0", + "engines": { + "node": ">=18" } }, "node_modules/@google-cloud/projectify": { @@ -1119,38 +1178,38 @@ } }, "node_modules/@google-cloud/promisify": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-4.1.0.tgz", - "integrity": "sha512-G/FQx5cE/+DqBbOpA5jKsegGwdPniU6PuIEMt+qxWgFxvxuFOzVmp6zYchtYuwAWV5/8Dgs0yAmjvNZv3uXLQg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-5.0.0.tgz", + "integrity": "sha512-N8qS6dlORGHwk7WjGXKOSsLjIjNINCPicsOX6gyyLiYk7mq3MtII96NZ9N2ahwA2vnkLmZODOIH9rlNniYWvCQ==", "license": "Apache-2.0", "engines": { "node": ">=18" } }, "node_modules/@google-cloud/translate": { - "version": "8.5.1", - "resolved": "https://registry.npmjs.org/@google-cloud/translate/-/translate-8.5.1.tgz", - "integrity": "sha512-xqIRV+lTaszgPHw0ulUQ3CUhnbPnsnYlh90mBh3PomU5SUGRlJc5bjN0UEP6MICnrj3AugxYQSelNn+rxGj2Ig==", + "version": "9.2.0", + "resolved": "https://registry.npmjs.org/@google-cloud/translate/-/translate-9.2.0.tgz", + "integrity": "sha512-LBKoXMXsM6jyqD9RDO74E3Q8uUn9TWy7YwIrF+WS4I9erdI+VZHxmdffi4sFfQ196FeprfwMMAFa8Oy6u7G8xw==", "license": "Apache-2.0", "dependencies": { - "@google-cloud/common": "^5.0.0", - "@google-cloud/promisify": "^4.0.0", + "@google-cloud/common": "^6.0.0", + "@google-cloud/promisify": "^5.0.0", "arrify": "^2.0.0", "extend": "^3.0.2", - "google-gax": "^4.0.3", + "google-gax": "^5.0.0", "is-html": "^2.0.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, "node_modules/@grpc/grpc-js": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.13.4.tgz", - "integrity": "sha512-GsFaMXCkMqkKIvwCQjCrwH+GHbPKBjhwo/8ZuUkWHqbI73Kky9I+pQltrlT0+MWpedCoosda53lgjYfyEPgxBg==", + "version": "1.14.0", + "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.14.0.tgz", + "integrity": "sha512-N8Jx6PaYzcTRNzirReJCtADVoq4z7+1KQ4E70jTg/koQiMoUSN1kbNjPOqpPbhMFhfU1/l7ixspPl8dNY+FoUg==", "license": "Apache-2.0", "dependencies": { - "@grpc/proto-loader": "^0.7.13", + "@grpc/proto-loader": "^0.8.0", "@js-sdsl/ordered-map": "^4.4.2" }, "engines": { @@ -1158,14 +1217,14 @@ } }, "node_modules/@grpc/proto-loader": { - "version": "0.7.15", - "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.15.tgz", - "integrity": "sha512-tMXdRCfYVixjuFK+Hk0Q1s38gV9zDiDJfWL3h1rv4Qc39oILCu1TRTDt7+fGUI8K4G1Fj125Hx/ru3azECWTyQ==", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.8.0.tgz", + "integrity": "sha512-rc1hOQtjIWGxcxpb9aHAfLpIctjEnsDehj0DAiVfBlmT84uvR0uUtN2hEi/ecvWVjXUGf5qPF4qEgiLOx1YIMQ==", "license": "Apache-2.0", "dependencies": { "lodash.camelcase": "^4.3.0", "long": "^5.0.0", - "protobufjs": "^7.2.5", + "protobufjs": "^7.5.3", "yargs": "^17.7.2" }, "bin": { @@ -1233,19 +1292,21 @@ "license": "BSD-3-Clause" }, "node_modules/@iobroker/adapter-dev": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@iobroker/adapter-dev/-/adapter-dev-1.4.0.tgz", - "integrity": "sha512-ZmZA+hiqURuD24aY92jyDsBX1LAx2bU9Q/T5peb3OjSbLSZoLId7hvhvX2bp6rnAx/NE8DfPRmX7qT0M+rn0gw==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@iobroker/adapter-dev/-/adapter-dev-1.5.0.tgz", + "integrity": "sha512-L1FhO7oxaz4hNMobvgbanSGyn2LaCESGKqPPJhXWU00vVEw5Cc166xdnU63Dk+JDnV5zl/HzOcFANGisETAWIg==", "license": "MIT", "dependencies": { "@esm2cjs/execa": "^6.1.1-cjs.1", - "@google-cloud/translate": "^8.5.0", + "@google-cloud/translate": "^9.2.0", "ansi-colors": "^4.1.3", - "axios": "^1.7.9", - "esbuild": "^0.25.0", - "fs-extra": "^11.3.0", + "axios": "^1.11.0", + "deepl-node": "^1.19.0", + "esbuild": "^0.25.9", + "fs-extra": "^11.3.1", + "rimraf": "^5.0.10", "tiny-glob": "^0.2.9", - "yargs": "^17.7.2" + "yargs": "^18.0.0" }, "bin": { "build-adapter": "bin/build-adapter.js", @@ -1256,11 +1317,173 @@ "node": ">=16.0.0" } }, + "node_modules/@iobroker/adapter-dev/node_modules/ansi-regex": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", + "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@iobroker/adapter-dev/node_modules/ansi-styles": { + "version": "6.2.3", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", + "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@iobroker/adapter-dev/node_modules/cliui": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-9.0.1.tgz", + "integrity": "sha512-k7ndgKhwoQveBL+/1tqGJYNz097I7WOvwbmmU2AR5+magtbjPWQTS1C5vzGkBC8Ym8UWRzfKUzUUqFLypY4Q+w==", + "license": "ISC", + "dependencies": { + "string-width": "^7.2.0", + "strip-ansi": "^7.1.0", + "wrap-ansi": "^9.0.0" + }, + "engines": { + "node": ">=20" + } + }, + "node_modules/@iobroker/adapter-dev/node_modules/emoji-regex": { + "version": "10.5.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.5.0.tgz", + "integrity": "sha512-lb49vf1Xzfx080OKA0o6l8DQQpV+6Vg95zyCJX9VB/BqKYlhG7N4wgROUUHRA+ZPUefLnteQOad7z1kT2bV7bg==", + "license": "MIT" + }, + "node_modules/@iobroker/adapter-dev/node_modules/glob": { + "version": "10.4.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", + "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==", + "license": "ISC", + "dependencies": { + "foreground-child": "^3.1.0", + "jackspeak": "^3.1.2", + "minimatch": "^9.0.4", + "minipass": "^7.1.2", + "package-json-from-dist": "^1.0.0", + "path-scurry": "^1.11.1" + }, + "bin": { + "glob": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@iobroker/adapter-dev/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "license": "ISC", + "engines": { + "node": ">=16 || 14 >=14.17" + } + }, + "node_modules/@iobroker/adapter-dev/node_modules/rimraf": { + "version": "5.0.10", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz", + "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==", + "license": "ISC", + "dependencies": { + "glob": "^10.3.7" + }, + "bin": { + "rimraf": "dist/esm/bin.mjs" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/@iobroker/adapter-dev/node_modules/string-width": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", + "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^10.3.0", + "get-east-asian-width": "^1.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@iobroker/adapter-dev/node_modules/strip-ansi": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", + "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@iobroker/adapter-dev/node_modules/wrap-ansi": { + "version": "9.0.2", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", + "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^6.2.1", + "string-width": "^7.0.0", + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/@iobroker/adapter-dev/node_modules/yargs": { + "version": "18.0.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-18.0.0.tgz", + "integrity": "sha512-4UEqdc2RYGHZc7Doyqkrqiln3p9X2DZVxaGbwhn2pi7MrRagKaOcIKe8L3OxYcbhXLgLFUS3zAYuQjKBQgmuNg==", + "license": "MIT", + "dependencies": { + "cliui": "^9.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "string-width": "^7.2.0", + "y18n": "^5.0.5", + "yargs-parser": "^22.0.0" + }, + "engines": { + "node": "^20.19.0 || ^22.12.0 || >=23" + } + }, + "node_modules/@iobroker/adapter-dev/node_modules/yargs-parser": { + "version": "22.0.0", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-22.0.0.tgz", + "integrity": "sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==", + "license": "ISC", + "engines": { + "node": "^20.19.0 || ^22.12.0 || >=23" + } + }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "dev": true, "license": "ISC", "dependencies": { "string-width": "^5.1.2", @@ -1278,7 +1501,6 @@ "version": "6.2.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.0.tgz", "integrity": "sha512-TKY5pyBkHyADOPYlRT9Lx6F544mPl0vS5Ew7BJ45hA08Q+t3GjbueLliBWN3sMICk6+y7HdyxSzC4bWS8baBdg==", - "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -1291,7 +1513,6 @@ "version": "6.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz", "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==", - "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -1304,14 +1525,12 @@ "version": "9.2.2", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true, "license": "MIT" }, "node_modules/@isaacs/cliui/node_modules/string-width": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", - "dev": true, "license": "MIT", "dependencies": { "eastasianwidth": "^0.2.0", @@ -1329,7 +1548,6 @@ "version": "7.1.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", - "dev": true, "license": "MIT", "dependencies": { "ansi-regex": "^6.0.1" @@ -1345,7 +1563,6 @@ "version": "8.1.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", - "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^6.1.0", @@ -1408,7 +1625,6 @@ "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", - "dev": true, "license": "MIT", "optional": true, "engines": { @@ -1513,13 +1729,13 @@ } }, "node_modules/@sinonjs/fake-timers": { - "version": "10.3.0", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-10.3.0.tgz", - "integrity": "sha512-V4BG07kuYSUkTCSBHG8G8TNhM+F19jXFWnQtzj+we8DrkpSBCee9Z3Ms8yiGer/dlmhe35/Xdgyo3/0rQKg7YA==", + "version": "13.0.5", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-13.0.5.tgz", + "integrity": "sha512-36/hTbH2uaWuGVERyC6da9YwGWnzUZXuPro/F2LfsdOsLnCojz/iSH8MxUt/FD2S5XBSVPhmArFUXcpCQ2Hkiw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { - "@sinonjs/commons": "^3.0.0" + "@sinonjs/commons": "^3.0.1" } }, "node_modules/@sinonjs/samsam": { @@ -1533,13 +1749,6 @@ "type-detect": "^4.1.0" } }, - "node_modules/@sinonjs/text-encoding": { - "version": "0.7.3", - "resolved": "https://registry.npmjs.org/@sinonjs/text-encoding/-/text-encoding-0.7.3.tgz", - "integrity": "sha512-DE427ROAphMQzU4ENbliGYrBSYPXF+TtLg9S8vzeA+OF4ZKzoDdzfL8sxuMUGS/lgRhM6j1URSk9ghf7Xo1tyA==", - "dev": true, - "license": "(Unlicense OR Apache-2.0)" - }, "node_modules/@tootallnate/once": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", @@ -1549,19 +1758,13 @@ "node": ">= 10" } }, - "node_modules/@tsconfig/node18": { - "version": "18.2.4", - "resolved": "https://registry.npmjs.org/@tsconfig/node18/-/node18-18.2.4.tgz", - "integrity": "sha512-5xxU8vVs9/FNcvm3gE07fPbn9tl6tqGGWA9tSlwsUEkBxtRnTsNmwrV8gasZ9F/EobaSv9+nu8AxUKccw77JpQ==", + "node_modules/@tsconfig/node20": { + "version": "20.1.6", + "resolved": "https://registry.npmjs.org/@tsconfig/node20/-/node20-20.1.6.tgz", + "integrity": "sha512-sz+Hqx9zwZDpZIV871WSbUzSqNIsXzghZydypnfgzPKLltVJfkINfUeTct31n/tTSa9ZE1ZOfKdRre1uHHquYQ==", "dev": true, "license": "MIT" }, - "node_modules/@types/caseless": { - "version": "0.12.5", - "resolved": "https://registry.npmjs.org/@types/caseless/-/caseless-0.12.5.tgz", - "integrity": "sha512-hWtVTC2q7hc7xZ/RLbxapMvDMgUnDvKvMOpKal4DrMyfGBUfB1oKaZlIRr6mJL+If3bAP6sV/QneGzF6tJjZDg==", - "license": "MIT" - }, "node_modules/@types/chai": { "version": "4.3.20", "resolved": "https://registry.npmjs.org/@types/chai/-/chai-4.3.20.tgz", @@ -1646,12 +1849,6 @@ "@types/node": "*" } }, - "node_modules/@types/long": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz", - "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA==", - "license": "MIT" - }, "node_modules/@types/mocha": { "version": "10.0.10", "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.10.tgz", @@ -1667,12 +1864,12 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "18.19.123", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.123.tgz", - "integrity": "sha512-K7DIaHnh0mzVxreCR9qwgNxp3MH9dltPNIEddW9MYUlcKAzm+3grKNSTe2vCJHI1FaLpvpL5JGJrz1UZDKYvDg==", + "version": "20.19.21", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.21.tgz", + "integrity": "sha512-CsGG2P3I5y48RPMfprQGfy4JPRZ6csfC3ltBZSRItG3ngggmNY/qs2uZKp4p9VbrpqNNSMzUZNFZKzgOGnd/VA==", "license": "MIT", "dependencies": { - "undici-types": "~5.26.4" + "undici-types": "~6.21.0" } }, "node_modules/@types/proxyquire": { @@ -1682,46 +1879,17 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/request": { - "version": "2.48.13", - "resolved": "https://registry.npmjs.org/@types/request/-/request-2.48.13.tgz", - "integrity": "sha512-FGJ6udDNUCjd19pp0Q3iTiDkwhYup7J8hpMW9c4k53NrccQFFWKRho6hvtPPEhnXWKvukfwAlB6DbDz4yhH5Gg==", - "license": "MIT", - "dependencies": { - "@types/caseless": "*", - "@types/node": "*", - "@types/tough-cookie": "*", - "form-data": "^2.5.5" - } - }, - "node_modules/@types/request/node_modules/form-data": { - "version": "2.5.5", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.5.tgz", - "integrity": "sha512-jqdObeR2rxZZbPSGL+3VckHMYtu+f9//KXBsVny6JSX/pa38Fy+bGjuG8eW/H6USNQWhLi8Num++cU2yOCNz4A==", - "license": "MIT", - "dependencies": { - "asynckit": "^0.4.0", - "combined-stream": "^1.0.8", - "es-set-tostringtag": "^2.1.0", - "hasown": "^2.0.2", - "mime-types": "^2.1.35", - "safe-buffer": "^5.2.1" - }, - "engines": { - "node": ">= 0.12" - } - }, "node_modules/@types/semver": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.7.0.tgz", - "integrity": "sha512-k107IF4+Xr7UHjwDc7Cfd6PRQfbdkiRabXGRjo07b4WyPahFBZCZ1sE+BNxYIJPPg73UkfOsVOLwqVc/6ETrIA==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA==", "dev": true, "license": "MIT" }, "node_modules/@types/sinon": { - "version": "10.0.20", - "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-10.0.20.tgz", - "integrity": "sha512-2APKKruFNCAZgx3daAyACGzWuJ028VVCUDk6o2rw/Z4PXT0ogwdV4KUegW0MwVs0Zu59auPXbbuBJHF12Sx1Eg==", + "version": "17.0.4", + "resolved": "https://registry.npmjs.org/@types/sinon/-/sinon-17.0.4.tgz", + "integrity": "sha512-RHnIrhfPO3+tJT0s7cFaXGZvsL4bbR3/k7z3P312qMS4JaS2Tk+KiwiLx1S0rQ56ERj00u1/BtdyVd0FY+Pdew==", "dev": true, "license": "MIT", "dependencies": { @@ -1746,12 +1914,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/tough-cookie": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz", - "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA==", - "license": "MIT" - }, "node_modules/@types/yargs": { "version": "17.0.33", "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz", @@ -1963,18 +2125,6 @@ "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", "license": "ISC" }, - "node_modules/abort-controller": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "license": "MIT", - "dependencies": { - "event-target-shim": "^5.0.0" - }, - "engines": { - "node": ">=6.5" - } - }, "node_modules/acorn": { "version": "8.15.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", @@ -1996,6 +2146,15 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, + "node_modules/adm-zip": { + "version": "0.5.16", + "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.16.tgz", + "integrity": "sha512-TGw5yVi4saajsSEgz25grObGHEUaDrniwvA2qwSC060KfqGPdglhvPMA2lPIoxs3PQIItj2iag35fONcQqgUaQ==", + "license": "MIT", + "engines": { + "node": ">=12.0" + } + }, "node_modules/agent-base": { "version": "7.1.4", "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", @@ -2451,10 +2610,19 @@ "node": ">= 8" } }, + "node_modules/data-uri-to-buffer": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-4.0.1.tgz", + "integrity": "sha512-0R9ikRb668HB7QDxT1vkpuUBtqc53YyAwMwGeUFKRojY/NWKvdZ+9UYtRfGmhqNbRkTSVpMbmyhXipFFv2cb/A==", + "license": "MIT", + "engines": { + "node": ">= 12" + } + }, "node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -2500,6 +2668,39 @@ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "license": "MIT" }, + "node_modules/deepl-node": { + "version": "1.20.0", + "resolved": "https://registry.npmjs.org/deepl-node/-/deepl-node-1.20.0.tgz", + "integrity": "sha512-2MNJgJgQQWHAieaKYJyxYe1g21P8MYOtMbcS7ApyBHT8856c6EYO9RRNevodGaIf0oiKMzwyenJ59O7B0NQyGw==", + "license": "MIT", + "dependencies": { + "@types/node": ">=12.0", + "adm-zip": "^0.5.16", + "axios": "^1.7.4", + "form-data": "^3.0.0", + "loglevel": ">=1.6.2", + "uuid": "^8.3.2" + }, + "engines": { + "node": ">=12.0" + } + }, + "node_modules/deepl-node/node_modules/form-data": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.4.tgz", + "integrity": "sha512-f0cRzm6dkyVYV3nPoooP8XlccPQukegwhAnpoLcXy+X+A8KfpGOoXwDr9FLZd3wzgLaBGQBE3lY93Zm/i1JvIQ==", + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "hasown": "^2.0.2", + "mime-types": "^2.1.35" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -2510,9 +2711,9 @@ } }, "node_modules/diff": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.0.tgz", - "integrity": "sha512-uIFDxqpRZGZ6ThOk84hEfqWoHx2devRFvpTZcTHur85vImfaxUbTW9Ryh4CpCuDnToOP1CEtXKIgytHBPVff5A==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz", + "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==", "dev": true, "license": "BSD-3-Clause", "engines": { @@ -2573,7 +2774,6 @@ "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", - "dev": true, "license": "MIT" }, "node_modules/ecdsa-sig-formatter": { @@ -2932,15 +3132,6 @@ "node": ">=0.10.0" } }, - "node_modules/event-target-shim": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", - "license": "MIT", - "engines": { - "node": ">=6" - } - }, "node_modules/execa": { "version": "8.0.1", "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", @@ -3059,6 +3250,29 @@ "reusify": "^1.0.4" } }, + "node_modules/fetch-blob": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/fetch-blob/-/fetch-blob-3.2.0.tgz", + "integrity": "sha512-7yAQpD2UMJzLi1Dqv7qFYnPbaPx7ZfFK6PiIxQ4PfkGPyNyl2Ugx+a/umUonmKqjhM4DnfbMvdX6otXq83soQQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/jimmywarting" + }, + { + "type": "paypal", + "url": "https://paypal.me/jimmywarting" + } + ], + "license": "MIT", + "dependencies": { + "node-domexception": "^1.0.0", + "web-streams-polyfill": "^3.0.3" + }, + "engines": { + "node": "^12.20 || >= 14.13" + } + }, "node_modules/file-entry-cache": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", @@ -3183,7 +3397,6 @@ "version": "3.3.1", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", - "dev": true, "license": "ISC", "dependencies": { "cross-spawn": "^7.0.6", @@ -3200,7 +3413,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", - "dev": true, "license": "ISC", "engines": { "node": ">=14" @@ -3225,10 +3437,22 @@ "node": ">= 6" } }, + "node_modules/formdata-polyfill": { + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/formdata-polyfill/-/formdata-polyfill-4.0.10.tgz", + "integrity": "sha512-buewHzMvYL29jdeQTVILecSaZKnt/RJWjoZCF5OW60Z67/GmSLBkOFM7qh1PI3zFNtJbaZL5eQu1vLfazOwj4g==", + "license": "MIT", + "dependencies": { + "fetch-blob": "^3.1.2" + }, + "engines": { + "node": ">=12.20.0" + } + }, "node_modules/fs-extra": { - "version": "11.3.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.1.tgz", - "integrity": "sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==", + "version": "11.3.2", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.2.tgz", + "integrity": "sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==", "license": "MIT", "dependencies": { "graceful-fs": "^4.2.0", @@ -3270,45 +3494,31 @@ } }, "node_modules/gaxios": { - "version": "6.7.1", - "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-6.7.1.tgz", - "integrity": "sha512-LDODD4TMYx7XXdpwxAVRAIAuB0bzv0s+ywFonY46k126qzQHT9ygyoa9tncmOiQmmDrik65UYsEkv3lbfqQ3yQ==", + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-7.1.2.tgz", + "integrity": "sha512-/Szrn8nr+2TsQT1Gp8iIe/BEytJmbyfrbFh419DfGQSkEgNEhbPi7JRJuughjkTzPWgU9gBQf5AVu3DbHt0OXA==", "license": "Apache-2.0", "dependencies": { "extend": "^3.0.2", "https-proxy-agent": "^7.0.1", - "is-stream": "^2.0.0", - "node-fetch": "^2.6.9", - "uuid": "^9.0.1" + "node-fetch": "^3.3.2" }, "engines": { - "node": ">=14" - } - }, - "node_modules/gaxios/node_modules/is-stream": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=18" } }, "node_modules/gcp-metadata": { - "version": "6.1.1", - "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-6.1.1.tgz", - "integrity": "sha512-a4tiq7E0/5fTjxPAaH4jpjkSv/uCaU2p5KC6HVGrvl0cDjA8iBZv4vv1gyzlmK0ZUKqwpOyQMKzZQe3lTit77A==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/gcp-metadata/-/gcp-metadata-7.0.1.tgz", + "integrity": "sha512-UcO3kefx6dCcZkgcTGgVOTFb7b1LlQ02hY1omMjjrrBzkajRMCFgYOjs7J71WqnuG1k2b+9ppGL7FsOfhZMQKQ==", "license": "Apache-2.0", "dependencies": { - "gaxios": "^6.1.1", - "google-logging-utils": "^0.0.2", + "gaxios": "^7.0.0", + "google-logging-utils": "^1.0.0", "json-bigint": "^1.0.0" }, "engines": { - "node": ">=14" + "node": ">=18" } }, "node_modules/get-caller-file": { @@ -3320,6 +3530,18 @@ "node": "6.* || 8.* || >= 10.*" } }, + "node_modules/get-east-asian-width": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.4.0.tgz", + "integrity": "sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/get-func-name": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", @@ -3495,49 +3717,48 @@ "license": "MIT" }, "node_modules/google-auth-library": { - "version": "9.15.1", - "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-9.15.1.tgz", - "integrity": "sha512-Jb6Z0+nvECVz+2lzSMt9u98UsoakXxA2HGHMCxh+so3n90XgYWkq5dur19JAJV7ONiJY22yBTyJB1TSkvPq9Ng==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/google-auth-library/-/google-auth-library-10.4.0.tgz", + "integrity": "sha512-CmIrSy1bqMQUsPmA9+hcSbAXL80cFhu40cGMUjCaLpNKVzzvi+0uAHq8GNZxkoGYIsTX4ZQ7e4aInAqWxgn4fg==", "license": "Apache-2.0", "dependencies": { "base64-js": "^1.3.0", "ecdsa-sig-formatter": "^1.0.11", - "gaxios": "^6.1.1", - "gcp-metadata": "^6.1.0", - "gtoken": "^7.0.0", + "gaxios": "^7.0.0", + "gcp-metadata": "^7.0.0", + "google-logging-utils": "^1.0.0", + "gtoken": "^8.0.0", "jws": "^4.0.0" }, "engines": { - "node": ">=14" + "node": ">=18" } }, "node_modules/google-gax": { - "version": "4.6.1", - "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-4.6.1.tgz", - "integrity": "sha512-V6eky/xz2mcKfAd1Ioxyd6nmA61gao3n01C+YeuIwu3vzM9EDR6wcVzMSIbLMDXWeoi9SHYctXuKYC5uJUT3eQ==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/google-gax/-/google-gax-5.0.4.tgz", + "integrity": "sha512-HmQ6zIYBs2EikTk+kjeHmtHprNTEpsnVaKONw9cwZZwUNCkUb+D5RYrJpCxyjdvIDvJp3wLbVReolJLRZRms1g==", "license": "Apache-2.0", "dependencies": { - "@grpc/grpc-js": "^1.10.9", - "@grpc/proto-loader": "^0.7.13", - "@types/long": "^4.0.0", - "abort-controller": "^3.0.0", - "duplexify": "^4.0.0", - "google-auth-library": "^9.3.0", - "node-fetch": "^2.7.0", + "@grpc/grpc-js": "^1.12.6", + "@grpc/proto-loader": "^0.8.0", + "duplexify": "^4.1.3", + "google-auth-library": "^10.1.0", + "google-logging-utils": "^1.1.1", + "node-fetch": "^3.3.2", "object-hash": "^3.0.0", - "proto3-json-serializer": "^2.0.2", - "protobufjs": "^7.3.2", - "retry-request": "^7.0.0", - "uuid": "^9.0.1" + "proto3-json-serializer": "^3.0.0", + "protobufjs": "^7.5.3", + "retry-request": "^8.0.0" }, "engines": { - "node": ">=14" + "node": ">=18" } }, "node_modules/google-logging-utils": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-0.0.2.tgz", - "integrity": "sha512-NEgUnEcBiP5HrPzufUkBzJOD/Sxsco3rLNo1F1TNf7ieU8ryUzBhqba8r756CjLX7rn3fHl6iLEwPYuqpoKgQQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/google-logging-utils/-/google-logging-utils-1.1.1.tgz", + "integrity": "sha512-rcX58I7nqpu4mbKztFeOAObbomBbHU2oIb/d3tJfF3dizGSApqtSwYJigGCooHdnMyQBIw8BrWyK96w3YXgr6A==", "license": "Apache-2.0", "engines": { "node": ">=14" @@ -3568,16 +3789,16 @@ "license": "MIT" }, "node_modules/gtoken": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-7.1.0.tgz", - "integrity": "sha512-pCcEwRi+TKpMlxAQObHDQ56KawURgyAf6jtIY046fJ5tIv3zDe/LEIubckAO8fj6JnAxLdmWkUfNyulQ2iKdEw==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/gtoken/-/gtoken-8.0.0.tgz", + "integrity": "sha512-+CqsMbHPiSTdtSO14O51eMNlrp9N79gmeqmXeouJOhfucAedHw9noVe/n5uJk3tbKE6a+6ZCQg3RPhVhHByAIw==", "license": "MIT", "dependencies": { - "gaxios": "^6.0.0", + "gaxios": "^7.0.0", "jws": "^4.0.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, "node_modules/has-flag": { @@ -3905,7 +4126,6 @@ "version": "3.4.3", "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", - "dev": true, "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/cliui": "^8.0.2" @@ -3990,13 +4210,6 @@ "node": "*" } }, - "node_modules/just-extend": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/just-extend/-/just-extend-6.2.0.tgz", - "integrity": "sha512-cYofQu2Xpom82S6qD778jBDpwvvy39s1l/hrYij2u9AMdQcGRpaBu6kY4mVhuno5kJVi1DAz4aiphA2WI1/OAw==", - "dev": true, - "license": "MIT" - }, "node_modules/jwa": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz", @@ -4084,6 +4297,19 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/loglevel": { + "version": "1.9.2", + "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.9.2.tgz", + "integrity": "sha512-HgMmCqIJSAKqo68l0rS2AanEWfkxaZ5wNiEFb5ggm08lDs9Xl2KxBlX3PTcaD2chBM1gXAYf491/M2Rv8Jwayg==", + "license": "MIT", + "engines": { + "node": ">= 0.6.0" + }, + "funding": { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/loglevel" + } + }, "node_modules/long": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/long/-/long-5.3.2.tgz", @@ -4104,7 +4330,6 @@ "version": "10.4.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", - "dev": true, "license": "ISC" }, "node_modules/math-intrinsics": { @@ -4227,9 +4452,9 @@ } }, "node_modules/mocha": { - "version": "11.7.1", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.1.tgz", - "integrity": "sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==", + "version": "11.7.4", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-11.7.4.tgz", + "integrity": "sha512-1jYAaY8x0kAZ0XszLWu14pzsf4KV740Gld4HXkhNTXwcHx4AUEDkPzgEHg9CM5dVcW+zv036tjpsEbLraPJj4w==", "dev": true, "license": "MIT", "dependencies": { @@ -4241,6 +4466,7 @@ "find-up": "^5.0.0", "glob": "^10.4.5", "he": "^1.2.0", + "is-path-inside": "^3.0.3", "js-yaml": "^4.1.0", "log-symbols": "^4.1.0", "minimatch": "^9.0.5", @@ -4262,16 +4488,6 @@ "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, - "node_modules/mocha/node_modules/diff": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-7.0.0.tgz", - "integrity": "sha512-PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.3.1" - } - }, "node_modules/mocha/node_modules/glob": { "version": "10.4.5", "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz", @@ -4355,48 +4571,42 @@ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "license": "MIT" }, - "node_modules/nise": { - "version": "5.1.9", - "resolved": "https://registry.npmjs.org/nise/-/nise-5.1.9.tgz", - "integrity": "sha512-qOnoujW4SV6e40dYxJOb3uvuoPHtmLzIk4TFo+j0jPJoC+5Z9xja5qH5JZobEPsa8+YYphMrOSwnrshEhG2qww==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@sinonjs/commons": "^3.0.0", - "@sinonjs/fake-timers": "^11.2.2", - "@sinonjs/text-encoding": "^0.7.2", - "just-extend": "^6.2.0", - "path-to-regexp": "^6.2.1" - } - }, - "node_modules/nise/node_modules/@sinonjs/fake-timers": { - "version": "11.3.1", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-11.3.1.tgz", - "integrity": "sha512-EVJO7nW5M/F5Tur0Rf2z/QoMo+1Ia963RiMtapiQrEWvY0iBUvADo8Beegwjpnle5BHkyHuoxSTW3jF43H1XRA==", - "dev": true, - "license": "BSD-3-Clause", - "dependencies": { - "@sinonjs/commons": "^3.0.1" + "node_modules/node-domexception": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz", + "integrity": "sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==", + "deprecated": "Use your platform's native DOMException instead", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/jimmywarting" + }, + { + "type": "github", + "url": "https://paypal.me/jimmywarting" + } + ], + "license": "MIT", + "engines": { + "node": ">=10.5.0" } }, "node_modules/node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-3.3.2.tgz", + "integrity": "sha512-dRB78srN/l6gqWulah9SrxeYnxeddIG30+GOqK/9OlLVyLg3HPnr6SqOWTWOXKRwC2eGYCkZ59NNuSgvSrpgOA==", "license": "MIT", "dependencies": { - "whatwg-url": "^5.0.0" + "data-uri-to-buffer": "^4.0.0", + "fetch-blob": "^3.1.4", + "formdata-polyfill": "^4.0.10" }, "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/node-fetch" } }, "node_modules/noms": { @@ -4571,7 +4781,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", - "dev": true, "license": "BlueOak-1.0.0" }, "node_modules/parent-module": { @@ -4624,7 +4833,6 @@ "version": "1.11.1", "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", - "dev": true, "license": "BlueOak-1.0.0", "dependencies": { "lru-cache": "^10.2.0", @@ -4641,19 +4849,11 @@ "version": "7.1.2", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", - "dev": true, "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" } }, - "node_modules/path-to-regexp": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", - "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", - "dev": true, - "license": "MIT" - }, "node_modules/path-type": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", @@ -4737,15 +4937,15 @@ "license": "MIT" }, "node_modules/proto3-json-serializer": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-2.0.2.tgz", - "integrity": "sha512-SAzp/O4Yh02jGdRc+uIrGoe87dkN/XtwxfZ4ZyafJHymd79ozp5VG5nyZ7ygqPM5+cpLDjjGnYFUkngonyDPOQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-3.0.2.tgz", + "integrity": "sha512-AnMIfnoK2Ml3F/ZVl5PxcwIoefMxj4U/lomJ5/B2eIGdxw4UkbV1YamtsMQsEkZATdMCKMbnI1iG9RQaJbxBGw==", "license": "Apache-2.0", "dependencies": { - "protobufjs": "^7.2.5" + "protobufjs": "^7.4.0" }, "engines": { - "node": ">=14.0.0" + "node": ">=18" } }, "node_modules/protobufjs": { @@ -4907,17 +5107,16 @@ } }, "node_modules/retry-request": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-7.0.2.tgz", - "integrity": "sha512-dUOvLMJ0/JJYEn8NrpOaGNE7X3vpI5XlZS/u0ANjqtcZVKnIxP7IgCFwrKTxENw29emmwug53awKtaMm4i9g5w==", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/retry-request/-/retry-request-8.0.2.tgz", + "integrity": "sha512-JzFPAfklk1kjR1w76f0QOIhoDkNkSqW8wYKT08n9yysTmZfB+RQ2QoXoTAeOi1HD9ZipTyTAZg3c4pM/jeqgSw==", "license": "MIT", "dependencies": { - "@types/request": "^2.48.8", "extend": "^3.0.2", - "teeny-request": "^9.0.0" + "teeny-request": "^10.0.0" }, "engines": { - "node": ">=14" + "node": ">=18" } }, "node_modules/reusify": { @@ -5028,9 +5227,9 @@ "license": "MIT" }, "node_modules/semver": { - "version": "7.7.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", - "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", + "version": "7.7.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", + "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -5077,18 +5276,16 @@ "license": "ISC" }, "node_modules/sinon": { - "version": "15.2.0", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-15.2.0.tgz", - "integrity": "sha512-nPS85arNqwBXaIsFCkolHjGIkFo+Oxu9vbgmBJizLAhqe6P2o3Qmj3KCUoRkfhHtvgDhZdWD3risLHAUJ8npjw==", - "deprecated": "16.1.1", + "version": "21.0.0", + "resolved": "https://registry.npmjs.org/sinon/-/sinon-21.0.0.tgz", + "integrity": "sha512-TOgRcwFPbfGtpqvZw+hyqJDvqfapr1qUlOizROIk4bBLjlsjlB00Pg6wMFXNtJRpu+eCZuVOaLatG7M8105kAw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { - "@sinonjs/commons": "^3.0.0", - "@sinonjs/fake-timers": "^10.3.0", - "@sinonjs/samsam": "^8.0.0", - "diff": "^5.1.0", - "nise": "^5.1.4", + "@sinonjs/commons": "^3.0.1", + "@sinonjs/fake-timers": "^13.0.5", + "@sinonjs/samsam": "^8.0.1", + "diff": "^7.0.0", "supports-color": "^7.2.0" }, "funding": { @@ -5180,7 +5377,6 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "dev": true, "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", @@ -5208,7 +5404,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "dev": true, "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -5290,19 +5485,18 @@ } }, "node_modules/teeny-request": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-9.0.0.tgz", - "integrity": "sha512-resvxdc6Mgb7YEThw6G6bExlXKkv6+YbuzGg9xuXxSgxJF7Ozs+o8Y9+2R3sArdWdW8nOokoQb1yrpFB0pQK2g==", + "version": "10.1.0", + "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-10.1.0.tgz", + "integrity": "sha512-3ZnLvgWF29jikg1sAQ1g0o+lr5JX6sVgYvfUJazn7ZjJroDBUTWp44/+cFVX0bULjv4vci+rBD+oGVAkWqhUbw==", "license": "Apache-2.0", "dependencies": { "http-proxy-agent": "^5.0.0", "https-proxy-agent": "^5.0.0", - "node-fetch": "^2.6.9", - "stream-events": "^1.0.5", - "uuid": "^9.0.0" + "node-fetch": "^3.3.2", + "stream-events": "^1.0.5" }, "engines": { - "node": ">=14" + "node": ">=18" } }, "node_modules/teeny-request/node_modules/agent-base": { @@ -5409,12 +5603,6 @@ "node": ">=8.0" } }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", - "license": "MIT" - }, "node_modules/ts-api-utils": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz", @@ -5428,9 +5616,9 @@ } }, "node_modules/tsx": { - "version": "4.20.5", - "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.20.5.tgz", - "integrity": "sha512-+wKjMNU9w/EaQayHXb7WA7ZaHY6hN8WgfvHNQ3t1PnU91/7O8TcTnIhCDYTZwnt8JsO9IBqZ30Ln1r7pPF52Aw==", + "version": "4.20.6", + "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.20.6.tgz", + "integrity": "sha512-ytQKuwgmrrkDTFP4LjR0ToE2nqgy886GpvRSpU0JAnrdBYppuY5rLkRUYPU1yCryb24SsKBTL/hlDQAEFVwtZg==", "dev": true, "license": "MIT", "dependencies": { @@ -5482,9 +5670,9 @@ } }, "node_modules/typescript": { - "version": "5.9.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz", - "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==", + "version": "5.9.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", + "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", @@ -5495,9 +5683,9 @@ } }, "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", "license": "MIT" }, "node_modules/universalify": { @@ -5535,32 +5723,21 @@ "license": "MIT" }, "node_modules/uuid": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", - "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", - "funding": [ - "https://github.com/sponsors/broofa", - "https://github.com/sponsors/ctavan" - ], + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", "license": "MIT", "bin": { "uuid": "dist/bin/uuid" } }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "license": "BSD-2-Clause" - }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "node_modules/web-streams-polyfill": { + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz", + "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==", "license": "MIT", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" + "engines": { + "node": ">= 8" } }, "node_modules/which": { @@ -5616,7 +5793,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", diff --git a/package.json b/package.json index 747ad0d70..c51639f5c 100644 --- a/package.json +++ b/package.json @@ -33,19 +33,19 @@ "access": "public" }, "devDependencies": { - "@alcalzone/release-script": "^3.8.0", - "@tsconfig/node18": "^18.2.4", + "@alcalzone/release-script": "^4.0.0", + "@tsconfig/node20": "^20.1.6", "@types/chai": "^4.3.20", "@types/chai-as-promised": "^7.1.8", "@types/debug": "4.1.12", "@types/eslint": "^8.56.12", "@types/fs-extra": "^11.0.4", - "@types/json5": "2.2.0", + "@types/json5": "^2.2.0", "@types/mocha": "^10.0.10", - "@types/node": "^18.19.123", + "@types/node": "^20.19.21", "@types/proxyquire": "^1.3.31", - "@types/semver": "^7.7.0", - "@types/sinon": "^10.0.20", + "@types/semver": "^7.7.1", + "@types/sinon": "^17.0.4", "@types/sinon-chai": "^3.2.12", "@types/yargs": "^17.0.33", "@typescript-eslint/eslint-plugin": "^7.18.0", @@ -56,29 +56,29 @@ "eslint-plugin-prettier": "^5.5.4", "execa": "^8.0.1", "jsonschema": "^1.5.0", - "mocha": "^11.7.1", + "mocha": "^11.7.4", "proxyquire": "^2.1.3", "rimraf": "^4.4.1", - "sinon": "^15.2.0", + "sinon": "^21.0.0", "sinon-chai": "^3.7.0", "source-map-support": "^0.5.21", - "tsx": "^4.20.5" + "tsx": "^4.20.6" }, "dependencies": { - "@iobroker/adapter-dev": "^1.4.0", + "@iobroker/adapter-dev": "^1.5.0", "@typescript-eslint/parser": "^7.18.0", "alcalzone-shared": "^4.0.8", "ansi-colors": "^4.1.3", "axios": "^1.12.2", - "debug": "^4.4.1", + "debug": "^4.4.3", "enquirer": "^2.4.1", "eslint": "^8.57.1", - "fs-extra": "^11.3.1", + "fs-extra": "^11.3.2", "json5": "^2.2.3", "p-limit": "^5.0.0", "prettier": "^3.6.2", - "semver": "^7.7.2", - "typescript": "~5.9.2", + "semver": "^7.7.3", + "typescript": "~5.9.3", "yargs": "^17.7.2" }, "scripts": { @@ -98,7 +98,9 @@ "lint:ts": "eslint {src,test,.github,maintenance}/**/*.ts", "lint": "npm run lint:ts", "release": "release-script", - "prepublishOnly": "npm run build" + "prepublishOnly": "npm run build", + "format": "prettier --write \"src/**/*.ts\" \"templates/**/*.ts\"", + "format:verify": "prettier --check \"src/**/*.ts\" \"templates/**/*.ts\"" }, "readme": "README.md" } diff --git a/src/lib/core/questions.ts b/src/lib/core/questions.ts index b690938fc..82afee40a 100644 --- a/src/lib/core/questions.ts +++ b/src/lib/core/questions.ts @@ -714,7 +714,8 @@ export const questionGroups: QuestionGroup[] = [ initial: "official", choices: [ { - message: "Use official ioBroker ESLint config (includes prettier)", + message: + "Use official ioBroker ESLint config (includes prettier)", hint: "(recommended)", value: "official", }, diff --git a/tsconfig.json b/tsconfig.json index bae68a24c..cf8b3ea8d 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,7 +1,7 @@ { // To update the compilation target, install a different version of @tsconfig/node... and reference it here // https://github.com/tsconfig/bases#node-12-tsconfigjson - "extends": "@tsconfig/node18/tsconfig.json", + "extends": "@tsconfig/node20/tsconfig.json", "compilerOptions": { // do not compile anything, this file is just to configure type checking // the compilation is configured in tsconfig.build.json From 98564fa90e1cd364fdf9f4f06b948e63b0a280a0 Mon Sep 17 00:00:00 2001 From: Ingo Fischer Date: Sun, 12 Oct 2025 20:48:44 +0200 Subject: [PATCH 21/29] fix --- .eslintignore | 4 - .eslintrc.js | 64 ---- eslint.config.mjs | 130 ++++++++ package-lock.json | 708 +++++++++++++++++++++++------------------ package.json | 11 +- src/lib/tools.test.ts | 1 - src/lib/tools.ts | 57 ++-- src/lib/translation.ts | 2 +- 8 files changed, 565 insertions(+), 412 deletions(-) delete mode 100644 .eslintignore delete mode 100644 .eslintrc.js create mode 100644 eslint.config.mjs diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index 25ad6adc3..000000000 --- a/.eslintignore +++ /dev/null @@ -1,4 +0,0 @@ -build/ -test/baselines/ -.eslintrc.js -.prettierrc.js diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index da8c58021..000000000 --- a/.eslintrc.js +++ /dev/null @@ -1,64 +0,0 @@ -module.exports = { - parser: "@typescript-eslint/parser", // Specifies the ESLint parser - parserOptions: { - ecmaVersion: "latest", // Allows for the parsing of modern ECMAScript features - sourceType: "module", // Allows for the use of imports - project: "./tsconfig.json", - }, - extends: [ - "plugin:@typescript-eslint/recommended", // Uses the recommended rules from the @typescript-eslint/eslint-plugin - "plugin:prettier/recommended", // Enables eslint-plugin-prettier and displays prettier errors as ESLint errors. Make sure this is always the last configuration in the extends array. - ], - plugins: [], - rules: { - "@typescript-eslint/no-parameter-properties": "off", - "@typescript-eslint/no-explicit-any": "off", - "@typescript-eslint/no-use-before-define": [ - "error", - { - functions: false, - typedefs: false, - classes: false, - }, - ], - "@typescript-eslint/no-unused-vars": [ - "error", - { - ignoreRestSiblings: true, - argsIgnorePattern: "^_", - }, - ], - "@typescript-eslint/explicit-function-return-type": [ - "warn", - { - allowExpressions: true, - allowTypedFunctionExpressions: true, - }, - ], - "@typescript-eslint/no-object-literal-type-assertion": "off", - "@typescript-eslint/interface-name-prefix": "off", - "@typescript-eslint/no-non-null-assertion": "off", // This is necessary for Map.has()/get()! - "@typescript-eslint/no-inferrable-types": [ - "error", - { - ignoreParameters: true, - ignoreProperties: true, - }, - ], - // Avoid runtime imports that are unnecessary - "@typescript-eslint/consistent-type-imports": [ - "error", - { - disallowTypeAnnotations: false, - }, - ], - }, - overrides: [ - { - files: ["*.test.ts"], - rules: { - "@typescript-eslint/explicit-function-return-type": "off", - }, - }, - ], -}; diff --git a/eslint.config.mjs b/eslint.config.mjs new file mode 100644 index 000000000..bea32b569 --- /dev/null +++ b/eslint.config.mjs @@ -0,0 +1,130 @@ +import js from "@eslint/js"; +import tsParser from "@typescript-eslint/parser"; +import tsPlugin from "@typescript-eslint/eslint-plugin"; +import prettier from "eslint-plugin-prettier/recommended"; + +export default [ + // Base JS recommended rules + js.configs.recommended, + + // Global ignores + { + ignores: [ + "build/", + "test/baselines/", + ".eslintrc.js", + ".prettierrc.js", + ], + }, + + // TypeScript files configuration + { + files: ["**/*.ts"], + languageOptions: { + parser: tsParser, + parserOptions: { + ecmaVersion: "latest", + sourceType: "module", + project: "./tsconfig.json", + }, + globals: { + // Node.js globals + process: "readonly", + Buffer: "readonly", + __dirname: "readonly", + __filename: "readonly", + module: "readonly", + require: "readonly", + exports: "readonly", + global: "readonly", + console: "readonly", + setTimeout: "readonly", + setInterval: "readonly", + clearTimeout: "readonly", + clearInterval: "readonly", + setImmediate: "readonly", + clearImmediate: "readonly", + NodeJS: "readonly", + }, + }, + plugins: { + "@typescript-eslint": tsPlugin, + }, + rules: { + // Recommended TypeScript rules + ...tsPlugin.configs.recommended.rules, + + // Custom rules + "@typescript-eslint/no-parameter-properties": "off", + "@typescript-eslint/no-explicit-any": "off", + "@typescript-eslint/no-use-before-define": [ + "error", + { + functions: false, + typedefs: false, + classes: false, + }, + ], + "@typescript-eslint/no-unused-vars": [ + "error", + { + ignoreRestSiblings: true, + argsIgnorePattern: "^_", + varsIgnorePattern: "^_", + caughtErrorsIgnorePattern: "^_", + }, + ], + "@typescript-eslint/explicit-function-return-type": [ + "warn", + { + allowExpressions: true, + allowTypedFunctionExpressions: true, + }, + ], + "@typescript-eslint/no-object-literal-type-assertion": "off", + "@typescript-eslint/interface-name-prefix": "off", + "@typescript-eslint/no-non-null-assertion": "off", + "@typescript-eslint/no-inferrable-types": [ + "error", + { + ignoreParameters: true, + ignoreProperties: true, + }, + ], + "@typescript-eslint/consistent-type-imports": [ + "error", + { + disallowTypeAnnotations: false, + }, + ], + // Allow require() imports where needed (e.g., conditional requires) + "@typescript-eslint/no-require-imports": "off", + // TypeScript handles function overloads, no need for no-redeclare + "no-redeclare": "off", + }, + }, + + // Test files - relax explicit return types and add mocha globals + { + files: ["**/*.test.ts", "test/**/*.ts"], + languageOptions: { + globals: { + describe: "readonly", + it: "readonly", + before: "readonly", + after: "readonly", + beforeEach: "readonly", + afterEach: "readonly", + }, + }, + rules: { + "@typescript-eslint/explicit-function-return-type": "off", + // Allow chai assertions like .should + "@typescript-eslint/no-unused-expressions": "off", + }, + }, + + // Prettier (must be last) + prettier, +]; + diff --git a/package-lock.json b/package-lock.json index 41b38caed..a28cf1b91 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,13 +10,13 @@ "license": "MIT", "dependencies": { "@iobroker/adapter-dev": "^1.5.0", - "@typescript-eslint/parser": "^7.18.0", + "@typescript-eslint/parser": "^8.46.0", "alcalzone-shared": "^4.0.8", "ansi-colors": "^4.1.3", "axios": "^1.12.2", "debug": "^4.4.3", "enquirer": "^2.4.1", - "eslint": "^8.57.1", + "eslint": "^9.37.0", "fs-extra": "^11.3.2", "json5": "^2.2.3", "p-limit": "^5.0.0", @@ -34,7 +34,7 @@ "@types/chai": "^4.3.20", "@types/chai-as-promised": "^7.1.8", "@types/debug": "4.1.12", - "@types/eslint": "^8.56.12", + "@types/eslint": "^9.6.1", "@types/fs-extra": "^11.0.4", "@types/json5": "^2.2.0", "@types/mocha": "^10.0.10", @@ -44,7 +44,7 @@ "@types/sinon": "^17.0.4", "@types/sinon-chai": "^3.2.12", "@types/yargs": "^17.0.33", - "@typescript-eslint/eslint-plugin": "^7.18.0", + "@typescript-eslint/eslint-plugin": "^8.46.0", "chai": "^4.5.0", "chai-as-promised": "^7.1.2", "copyfiles": "^2.4.1", @@ -58,7 +58,8 @@ "sinon": "^21.0.0", "sinon-chai": "^3.7.0", "source-map-support": "^0.5.21", - "tsx": "^4.20.6" + "tsx": "^4.20.6", + "typescript-eslint": "^8.46.0" }, "engines": { "node": ">=20" @@ -946,9 +947,9 @@ } }, "node_modules/@eslint-community/eslint-utils": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz", - "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==", + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", + "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==", "license": "MIT", "dependencies": { "eslint-visitor-keys": "^3.4.3" @@ -972,16 +973,76 @@ "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, + "node_modules/@eslint/config-array": { + "version": "0.21.0", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz", + "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==", + "license": "Apache-2.0", + "dependencies": { + "@eslint/object-schema": "^2.1.6", + "debug": "^4.3.1", + "minimatch": "^3.1.2" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/config-array/node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@eslint/config-array/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@eslint/config-helpers": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.0.tgz", + "integrity": "sha512-WUFvV4WoIwW8Bv0KeKCIIEgdSiFOsulyN0xrMu+7z43q/hkOLXjvb5u7UC9jDxvRzcrbEmuZBX5yJZz1741jog==", + "license": "Apache-2.0", + "dependencies": { + "@eslint/core": "^0.16.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/core": { + "version": "0.16.0", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.16.0.tgz", + "integrity": "sha512-nmC8/totwobIiFcGkDza3GIKfAw1+hLiYVrh3I1nIomQ8PEr5cxg34jnkmGawul/ep52wGRAcyeDCNtWKSOj4Q==", + "license": "Apache-2.0", + "dependencies": { + "@types/json-schema": "^7.0.15" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, "node_modules/@eslint/eslintrc": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", - "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz", + "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==", "license": "MIT", "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", + "espree": "^10.0.1", + "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", "js-yaml": "^4.1.0", @@ -989,7 +1050,7 @@ "strip-json-comments": "^3.1.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -1005,6 +1066,15 @@ "concat-map": "0.0.1" } }, + "node_modules/@eslint/eslintrc/node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, "node_modules/@eslint/eslintrc/node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -1018,12 +1088,37 @@ } }, "node_modules/@eslint/js": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz", - "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==", + "version": "9.37.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.37.0.tgz", + "integrity": "sha512-jaS+NJ+hximswBG6pjNX0uEJZkrT0zwpVi3BA3vX22aFGjJjmgSTSmPpZCRKmoBL5VY/M6p0xsSJx7rk7sy5gg==", "license": "MIT", "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://eslint.org/donate" + } + }, + "node_modules/@eslint/object-schema": { + "version": "2.1.6", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz", + "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==", + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/@eslint/plugin-kit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.0.tgz", + "integrity": "sha512-sB5uyeq+dwCWyPi31B2gQlVlo+j5brPlWx4yZBrEaRo/nhdDE8Xke1gsGgtiBdaBTxuTkceLVuVt/pclrasb0A==", + "license": "Apache-2.0", + "dependencies": { + "@eslint/core": "^0.16.0", + "levn": "^0.4.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" } }, "node_modules/@esm2cjs/execa": { @@ -1234,41 +1329,26 @@ "node": ">=6" } }, - "node_modules/@humanwhocodes/config-array": { - "version": "0.13.0", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz", - "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==", - "deprecated": "Use @eslint/config-array instead", + "node_modules/@humanfs/core": { + "version": "0.19.1", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", + "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", "license": "Apache-2.0", - "dependencies": { - "@humanwhocodes/object-schema": "^2.0.3", - "debug": "^4.3.1", - "minimatch": "^3.0.5" - }, "engines": { - "node": ">=10.10.0" + "node": ">=18.18.0" } }, - "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" - } - }, - "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "license": "ISC", + "node_modules/@humanfs/node": { + "version": "0.16.7", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz", + "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==", + "license": "Apache-2.0", "dependencies": { - "brace-expansion": "^1.1.7" + "@humanfs/core": "^0.19.1", + "@humanwhocodes/retry": "^0.4.0" }, "engines": { - "node": "*" + "node": ">=18.18.0" } }, "node_modules/@humanwhocodes/module-importer": { @@ -1284,12 +1364,18 @@ "url": "https://github.com/sponsors/nzakas" } }, - "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", - "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", - "deprecated": "Use @eslint/object-schema instead", - "license": "BSD-3-Clause" + "node_modules/@humanwhocodes/retry": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz", + "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==", + "license": "Apache-2.0", + "engines": { + "node": ">=18.18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/nzakas" + } }, "node_modules/@iobroker/adapter-dev": { "version": "1.5.0", @@ -1793,9 +1879,9 @@ } }, "node_modules/@types/eslint": { - "version": "8.56.12", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.12.tgz", - "integrity": "sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", + "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==", "dev": true, "license": "MIT", "dependencies": { @@ -1807,7 +1893,6 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", - "dev": true, "license": "MIT" }, "node_modules/@types/fs-extra": { @@ -1825,7 +1910,6 @@ "version": "7.0.15", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true, "license": "MIT" }, "node_modules/@types/json5": { @@ -1932,119 +2016,145 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz", - "integrity": "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==", + "version": "8.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.46.0.tgz", + "integrity": "sha512-hA8gxBq4ukonVXPy0OKhiaUh/68D0E88GSmtC1iAEnGaieuDi38LhS7jdCHRLi6ErJBNDGCzvh5EnzdPwUc0DA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "7.18.0", - "@typescript-eslint/type-utils": "7.18.0", - "@typescript-eslint/utils": "7.18.0", - "@typescript-eslint/visitor-keys": "7.18.0", + "@typescript-eslint/scope-manager": "8.46.0", + "@typescript-eslint/type-utils": "8.46.0", + "@typescript-eslint/utils": "8.46.0", + "@typescript-eslint/visitor-keys": "8.46.0", "graphemer": "^1.4.0", - "ignore": "^5.3.1", + "ignore": "^7.0.0", "natural-compare": "^1.4.0", - "ts-api-utils": "^1.3.0" + "ts-api-utils": "^2.1.0" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^7.0.0", - "eslint": "^8.56.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "@typescript-eslint/parser": "^8.46.0", + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <6.0.0" } }, "node_modules/@typescript-eslint/parser": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz", - "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==", - "license": "BSD-2-Clause", + "version": "8.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.46.0.tgz", + "integrity": "sha512-n1H6IcDhmmUEG7TNVSspGmiHHutt7iVKtZwRppD7e04wha5MrkV1h3pti9xQLcCMt6YWsncpoT0HMjkH1FNwWQ==", + "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "7.18.0", - "@typescript-eslint/types": "7.18.0", - "@typescript-eslint/typescript-estree": "7.18.0", - "@typescript-eslint/visitor-keys": "7.18.0", + "@typescript-eslint/scope-manager": "8.46.0", + "@typescript-eslint/types": "8.46.0", + "@typescript-eslint/typescript-estree": "8.46.0", + "@typescript-eslint/visitor-keys": "8.46.0", "debug": "^4.3.4" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^8.56.0" + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <6.0.0" + } + }, + "node_modules/@typescript-eslint/project-service": { + "version": "8.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.46.0.tgz", + "integrity": "sha512-OEhec0mH+U5Je2NZOeK1AbVCdm0ChyapAyTeXVIYTPXDJ3F07+cu87PPXcGoYqZ7M9YJVvFnfpGg1UmCIqM+QQ==", + "license": "MIT", + "dependencies": { + "@typescript-eslint/tsconfig-utils": "^8.46.0", + "@typescript-eslint/types": "^8.46.0", + "debug": "^4.3.4" }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <6.0.0" } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz", - "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==", + "version": "8.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.46.0.tgz", + "integrity": "sha512-lWETPa9XGcBes4jqAMYD9fW0j4n6hrPtTJwWDmtqgFO/4HF4jmdH/Q6wggTw5qIT5TXjKzbt7GsZUBnWoO3dqw==", "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.18.0", - "@typescript-eslint/visitor-keys": "7.18.0" + "@typescript-eslint/types": "8.46.0", + "@typescript-eslint/visitor-keys": "8.46.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/tsconfig-utils": { + "version": "8.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.46.0.tgz", + "integrity": "sha512-WrYXKGAHY836/N7zoK/kzi6p8tXFhasHh8ocFL9VZSAkvH956gfeRfcnhs3xzRy8qQ/dq3q44v1jvQieMFg2cw==", + "license": "MIT", "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "typescript": ">=4.8.4 <6.0.0" } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz", - "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==", + "version": "8.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.46.0.tgz", + "integrity": "sha512-hy+lvYV1lZpVs2jRaEYvgCblZxUoJiPyCemwbQZ+NGulWkQRy0HRPYAoef/CNSzaLt+MLvMptZsHXHlkEilaeg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "7.18.0", - "@typescript-eslint/utils": "7.18.0", + "@typescript-eslint/types": "8.46.0", + "@typescript-eslint/typescript-estree": "8.46.0", + "@typescript-eslint/utils": "8.46.0", "debug": "^4.3.4", - "ts-api-utils": "^1.3.0" + "ts-api-utils": "^2.1.0" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^8.56.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <6.0.0" } }, "node_modules/@typescript-eslint/types": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz", - "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==", + "version": "8.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.46.0.tgz", + "integrity": "sha512-bHGGJyVjSE4dJJIO5yyEWt/cHyNwga/zXGJbJJ8TiO01aVREK6gCTu3L+5wrkb1FbDkQ+TKjMNe9R/QQQP9+rA==", "license": "MIT", "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", @@ -2052,78 +2162,85 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz", - "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==", - "license": "BSD-2-Clause", + "version": "8.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.46.0.tgz", + "integrity": "sha512-ekDCUfVpAKWJbRfm8T1YRrCot1KFxZn21oV76v5Fj4tr7ELyk84OS+ouvYdcDAwZL89WpEkEj2DKQ+qg//+ucg==", + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.18.0", - "@typescript-eslint/visitor-keys": "7.18.0", + "@typescript-eslint/project-service": "8.46.0", + "@typescript-eslint/tsconfig-utils": "8.46.0", + "@typescript-eslint/types": "8.46.0", + "@typescript-eslint/visitor-keys": "8.46.0", "debug": "^4.3.4", - "globby": "^11.1.0", + "fast-glob": "^3.3.2", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", - "ts-api-utils": "^1.3.0" + "ts-api-utils": "^2.1.0" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "peerDependencies": { + "typescript": ">=4.8.4 <6.0.0" } }, "node_modules/@typescript-eslint/utils": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz", - "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==", + "version": "8.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.46.0.tgz", + "integrity": "sha512-nD6yGWPj1xiOm4Gk0k6hLSZz2XkNXhuYmyIrOWcHoPuAhjT9i5bAG+xbWPgFeNR8HPHHtpNKdYUXJl/D3x7f5g==", "dev": true, "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "7.18.0", - "@typescript-eslint/types": "7.18.0", - "@typescript-eslint/typescript-estree": "7.18.0" + "@eslint-community/eslint-utils": "^4.7.0", + "@typescript-eslint/scope-manager": "8.46.0", + "@typescript-eslint/types": "8.46.0", + "@typescript-eslint/typescript-estree": "8.46.0" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^8.56.0" + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <6.0.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz", - "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==", + "version": "8.46.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.0.tgz", + "integrity": "sha512-FrvMpAK+hTbFy7vH5j1+tMYHMSKLE6RzluFJlkFNKD0p9YsUT75JlBSmr5so3QRzvMwU5/bIEdeNrxm8du8l3Q==", "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.18.0", - "eslint-visitor-keys": "^3.4.3" + "@typescript-eslint/types": "8.46.0", + "eslint-visitor-keys": "^4.2.1" }, "engines": { - "node": "^18.18.0 || >=20.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@ungap/structured-clone": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", - "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", - "license": "ISC" + "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } }, "node_modules/acorn": { "version": "8.15.0", @@ -2231,15 +2348,6 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "license": "Python-2.0" }, - "node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/arrify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", @@ -2720,30 +2828,6 @@ "node": ">=0.3.1" } }, - "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", - "license": "MIT", - "dependencies": { - "path-type": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/doctrine": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", - "license": "Apache-2.0", - "dependencies": { - "esutils": "^2.0.2" - }, - "engines": { - "node": ">=6.0.0" - } - }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", @@ -2921,59 +3005,63 @@ } }, "node_modules/eslint": { - "version": "8.57.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz", - "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==", - "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.", - "license": "MIT", - "dependencies": { - "@eslint-community/eslint-utils": "^4.2.0", - "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.4", - "@eslint/js": "8.57.1", - "@humanwhocodes/config-array": "^0.13.0", + "version": "9.37.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.37.0.tgz", + "integrity": "sha512-XyLmROnACWqSxiGYArdef1fItQd47weqB7iwtfr9JHwRrqIXZdcFMvvEcL9xHCmL0SNsOvF0c42lWyM1U5dgig==", + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.8.0", + "@eslint-community/regexpp": "^4.12.1", + "@eslint/config-array": "^0.21.0", + "@eslint/config-helpers": "^0.4.0", + "@eslint/core": "^0.16.0", + "@eslint/eslintrc": "^3.3.1", + "@eslint/js": "9.37.0", + "@eslint/plugin-kit": "^0.4.0", + "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", - "@nodelib/fs.walk": "^1.2.8", - "@ungap/structured-clone": "^1.2.0", + "@humanwhocodes/retry": "^0.4.2", + "@types/estree": "^1.0.6", + "@types/json-schema": "^7.0.15", "ajv": "^6.12.4", "chalk": "^4.0.0", - "cross-spawn": "^7.0.2", + "cross-spawn": "^7.0.6", "debug": "^4.3.2", - "doctrine": "^3.0.0", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^7.2.2", - "eslint-visitor-keys": "^3.4.3", - "espree": "^9.6.1", - "esquery": "^1.4.2", + "eslint-scope": "^8.4.0", + "eslint-visitor-keys": "^4.2.1", + "espree": "^10.4.0", + "esquery": "^1.5.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", - "file-entry-cache": "^6.0.1", + "file-entry-cache": "^8.0.0", "find-up": "^5.0.0", "glob-parent": "^6.0.2", - "globals": "^13.19.0", - "graphemer": "^1.4.0", "ignore": "^5.2.0", "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", - "is-path-inside": "^3.0.3", - "js-yaml": "^4.1.0", "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.4.1", "lodash.merge": "^4.6.2", "minimatch": "^3.1.2", "natural-compare": "^1.4.0", - "optionator": "^0.9.3", - "strip-ansi": "^6.0.1", - "text-table": "^0.2.0" + "optionator": "^0.9.3" }, "bin": { "eslint": "bin/eslint.js" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { - "url": "https://opencollective.com/eslint" + "url": "https://eslint.org/donate" + }, + "peerDependencies": { + "jiti": "*" + }, + "peerDependenciesMeta": { + "jiti": { + "optional": true + } } }, "node_modules/eslint-config-prettier": { @@ -3024,16 +3112,16 @@ } }, "node_modules/eslint-scope": { - "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", + "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -3061,6 +3149,27 @@ "concat-map": "0.0.1" } }, + "node_modules/eslint/node_modules/eslint-visitor-keys": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, "node_modules/eslint/node_modules/minimatch": { "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", @@ -3074,17 +3183,29 @@ } }, "node_modules/espree": { - "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz", + "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==", "license": "BSD-2-Clause", "dependencies": { - "acorn": "^8.9.0", + "acorn": "^8.15.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^3.4.1" + "eslint-visitor-keys": "^4.2.1" }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/espree/node_modules/eslint-visitor-keys": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "funding": { "url": "https://opencollective.com/eslint" @@ -3274,15 +3395,15 @@ } }, "node_modules/file-entry-cache": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", + "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", "license": "MIT", "dependencies": { - "flat-cache": "^3.0.4" + "flat-cache": "^4.0.0" }, "engines": { - "node": "^10.12.0 || >=12.0.0" + "node": ">=16.0.0" } }, "node_modules/fill-keys": { @@ -3338,33 +3459,16 @@ } }, "node_modules/flat-cache": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", - "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", + "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", "license": "MIT", "dependencies": { "flatted": "^3.2.9", - "keyv": "^4.5.3", - "rimraf": "^3.0.2" + "keyv": "^4.5.4" }, "engines": { - "node": "^10.12.0 || >=12.0.0" - } - }, - "node_modules/flat-cache/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", - "license": "ISC", - "dependencies": { - "glob": "^7.1.3" - }, - "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "node": ">=16" } }, "node_modules/flatted": { @@ -3467,6 +3571,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true, "license": "ISC" }, "node_modules/fsevents": { @@ -3619,6 +3724,7 @@ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "deprecated": "Glob versions prior to v9 are no longer supported", + "dev": true, "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", @@ -3651,6 +3757,7 @@ "version": "1.1.12", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", @@ -3661,6 +3768,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" @@ -3670,15 +3778,12 @@ } }, "node_modules/globals": { - "version": "13.24.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", - "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", "license": "MIT", - "dependencies": { - "type-fest": "^0.20.2" - }, "engines": { - "node": ">=8" + "node": ">=18" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -3690,26 +3795,6 @@ "integrity": "sha512-40oNTM9UfG6aBmuKxk/giHn5nQ8RVz/SS4Ir6zgzOv9/qC3kKZ9v4etGTcJbEl/NyVQH7FGU7d+X1egr57Md2Q==", "license": "MIT" }, - "node_modules/globby": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", - "license": "MIT", - "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.2.9", - "ignore": "^5.2.0", - "merge2": "^1.4.1", - "slash": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/globrex": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz", @@ -3786,6 +3871,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true, "license": "MIT" }, "node_modules/gtoken": { @@ -3937,9 +4023,10 @@ } }, "node_modules/ignore": { - "version": "5.3.2", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", - "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz", + "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==", + "dev": true, "license": "MIT", "engines": { "node": ">= 4" @@ -3975,6 +4062,7 @@ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", + "dev": true, "license": "ISC", "dependencies": { "once": "^1.3.0", @@ -4068,6 +4156,7 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -4808,6 +4897,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -4854,15 +4944,6 @@ "node": ">=16 || 14 >=14.17" } }, - "node_modules/path-type": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/pathval": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", @@ -5304,15 +5385,6 @@ "sinon": ">=4.0.0" } }, - "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "license": "MIT", - "engines": { - "node": ">=8" - } - }, "node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -5524,12 +5596,6 @@ "node": ">= 6" } }, - "node_modules/text-table": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "license": "MIT" - }, "node_modules/through2": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz", @@ -5604,15 +5670,15 @@ } }, "node_modules/ts-api-utils": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.4.3.tgz", - "integrity": "sha512-i3eMG77UTMD0hZhgRS562pv83RC6ukSAC2GMNWc+9dieh/+jDM5u5YG+NHX6VNDRHQcHwmsTHctP9LhbC3WxVw==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz", + "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==", "license": "MIT", "engines": { - "node": ">=16" + "node": ">=18.12" }, "peerDependencies": { - "typescript": ">=4.2.0" + "typescript": ">=4.8.4" } }, "node_modules/tsx": { @@ -5657,18 +5723,6 @@ "node": ">=4" } }, - "node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", - "license": "(MIT OR CC0-1.0)", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/typescript": { "version": "5.9.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", @@ -5682,6 +5736,30 @@ "node": ">=14.17" } }, + "node_modules/typescript-eslint": { + "version": "8.46.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.46.0.tgz", + "integrity": "sha512-6+ZrB6y2bT2DX3K+Qd9vn7OFOJR+xSLDj+Aw/N3zBwUt27uTw2sw2TE2+UcY1RiyBZkaGbTkVg9SSdPNUG6aUw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/eslint-plugin": "8.46.0", + "@typescript-eslint/parser": "8.46.0", + "@typescript-eslint/typescript-estree": "8.46.0", + "@typescript-eslint/utils": "8.46.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^8.57.0 || ^9.0.0", + "typescript": ">=4.8.4 <6.0.0" + } + }, "node_modules/undici-types": { "version": "6.21.0", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", diff --git a/package.json b/package.json index c51639f5c..b21d2864a 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "@types/chai": "^4.3.20", "@types/chai-as-promised": "^7.1.8", "@types/debug": "4.1.12", - "@types/eslint": "^8.56.12", + "@types/eslint": "^9.6.1", "@types/fs-extra": "^11.0.4", "@types/json5": "^2.2.0", "@types/mocha": "^10.0.10", @@ -48,7 +48,7 @@ "@types/sinon": "^17.0.4", "@types/sinon-chai": "^3.2.12", "@types/yargs": "^17.0.33", - "@typescript-eslint/eslint-plugin": "^7.18.0", + "@typescript-eslint/eslint-plugin": "^8.46.0", "chai": "^4.5.0", "chai-as-promised": "^7.1.2", "copyfiles": "^2.4.1", @@ -62,17 +62,18 @@ "sinon": "^21.0.0", "sinon-chai": "^3.7.0", "source-map-support": "^0.5.21", - "tsx": "^4.20.6" + "tsx": "^4.20.6", + "typescript-eslint": "^8.46.0" }, "dependencies": { "@iobroker/adapter-dev": "^1.5.0", - "@typescript-eslint/parser": "^7.18.0", + "@typescript-eslint/parser": "^8.46.0", "alcalzone-shared": "^4.0.8", "ansi-colors": "^4.1.3", "axios": "^1.12.2", "debug": "^4.4.3", "enquirer": "^2.4.1", - "eslint": "^8.57.1", + "eslint": "^9.37.0", "fs-extra": "^11.3.2", "json5": "^2.2.3", "p-limit": "^5.0.0", diff --git a/src/lib/tools.test.ts b/src/lib/tools.test.ts index 967f468ee..730ab070e 100644 --- a/src/lib/tools.test.ts +++ b/src/lib/tools.test.ts @@ -183,7 +183,6 @@ describe("tools/kebabCaseToUpperCamelCase()", () => { describe("tools/getOwnVersion()", () => { it("should return the version defined in package.json", () => { - // eslint-disable-next-line @typescript-eslint/no-var-requires const expected = require("../../package.json").version; expect(getOwnVersion()).to.equal(expected); }); diff --git a/src/lib/tools.ts b/src/lib/tools.ts index 2aceb2f81..a70e5b468 100644 --- a/src/lib/tools.ts +++ b/src/lib/tools.ts @@ -166,7 +166,7 @@ export function executeCommand( : chunk; }); } - } catch (e) { + } catch { // doesn't matter, we return the exit code in the "close" handler } }); @@ -303,19 +303,36 @@ export enum Quotemark { function createESLintOptions( language: Exclude, quotes: keyof typeof Quotemark, -): Record { - const baseOptions: Record = { - env: { - es6: true, - node: true, - mocha: true, - }, - parserOptions: { +): any[] { + // ESLint 9 flat config format + const baseConfig: any = { + languageOptions: { ecmaVersion: "latest", - ecmaFeatures: { - jsx: true, - }, sourceType: "module", + parserOptions: { + ecmaFeatures: { + jsx: true, + }, + }, + globals: { + // Node.js + process: "readonly", + Buffer: "readonly", + __dirname: "readonly", + __filename: "readonly", + module: "readonly", + require: "readonly", + exports: "readonly", + global: "readonly", + console: "readonly", + // Mocha + describe: "readonly", + it: "readonly", + before: "readonly", + after: "readonly", + beforeEach: "readonly", + afterEach: "readonly", + }, }, rules: { quotes: [ @@ -328,10 +345,12 @@ function createESLintOptions( ], }, }; + if (language === "TypeScript") { - baseOptions.parser = "@typescript-eslint/parser"; + baseConfig.languageOptions.parser = require("@typescript-eslint/parser"); } - return baseOptions; + + return [baseConfig]; } /** Formats a JS source file to use single quotes */ @@ -353,11 +372,6 @@ export function tsFixQuotes( quotes: keyof typeof Quotemark, ): string { const linter = new Linter(); - linter.defineParser( - "@typescript-eslint/parser", - // eslint-disable-next-line @typescript-eslint/no-var-requires - require("@typescript-eslint/parser"), - ); const result = linter.verifyAndFix( sourceText, createESLintOptions("TypeScript", quotes), @@ -388,9 +402,8 @@ export function formatWithPrettier( export function getOwnVersion(): string { for (const jsonPath of ["../../package.json", "../../../package.json"]) { try { - // eslint-disable-next-line @typescript-eslint/no-var-requires return require(jsonPath).version; - } catch (e) { + } catch { /* OK */ } } @@ -404,7 +417,7 @@ export function capitalize(name: string): string { export function kebabCaseToUpperCamelCase(name: string): string { return name - .split(/[_\-]/) + .split(/[_-]/) .filter((part) => part.length > 0) .map(capitalize) .join(""); diff --git a/src/lib/translation.ts b/src/lib/translation.ts index 7094f470b..18674afaf 100644 --- a/src/lib/translation.ts +++ b/src/lib/translation.ts @@ -83,7 +83,7 @@ export async function getTranslatedSettings( const translations = allTranslations[i]; const lang = languages[i]; for (const key in translations) { - if (translations.hasOwnProperty(key)) { + if (Object.prototype.hasOwnProperty.call(translations, key)) { const translation = translatedSettings[key] || (translatedSettings[key] = {}); translation[lang] = translations[key]; From aeb6421f2da5679ea940d8f599666bbeaa4e820d Mon Sep 17 00:00:00 2001 From: Ingo Fischer Date: Sun, 12 Oct 2025 21:07:11 +0200 Subject: [PATCH 22/29] fix --- CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index daece5165..3168b1ccc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,8 @@ ## __WORK IN PROGRESS__ * IMPORTANT: The adapter creator requires Node.js 20.x or newer to run! -* (@Apollon77/@copilot) Add option to use official @iobroker/eslint-config with ESLint 9 format as primary configuration (#1186) · [Migration guide](docs/updates/20251012_eslint9_official_config.md) -* (@Apollon77/@copilot) Upgrade custom ESLint configuration to ESLint 9 with flat config format (#1186) · [Migration guide](docs/updates/20251012_eslint9_official_config.md) +* (@Apollon77/@copilot) Added option to use official @iobroker/eslint-config with ESLint 9 format as primary configuration (#1186) · [Migration guide](docs/updates/20251012_eslint9_official_config.md) +* (@Apollon77/@copilot) Upgraded custom ESLint configuration to ESLint 9 with flat config format (#1186) · [Migration guide](docs/updates/20251012_eslint9_official_config.md) * (@Apollon77/@copilot) Add VIS widget ESLint configuration support in main config files (#1186) * (@Apollon77/@copilot) Adapt Dependabot schedule to run on specific day of month between 2-28 (#1200) · [Migration guide](docs/updates/20250102_dependabot_day_schedule.md) * (@hacki11) Support git-ssh in devcontainer (#1136) [Migration guide](docs/updates/20250401_devcontainer_ssh.md) From f7ab5ab7457c7b9f695b69e0f25474fd6a51bfb7 Mon Sep 17 00:00:00 2001 From: Ingo Fischer Date: Sun, 12 Oct 2025 21:16:57 +0200 Subject: [PATCH 23/29] fixes --- src/@types/enquirer/index.d.ts | 3 +-- src/cli.ts | 17 +++++++++++------ src/lib/core/actionsAndTransformers.ts | 2 +- src/lib/core/migrationContextBase.ts | 8 +++++++- src/lib/core/questions.ts | 2 +- 5 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/@types/enquirer/index.d.ts b/src/@types/enquirer/index.d.ts index febc72461..663735fb9 100644 --- a/src/@types/enquirer/index.d.ts +++ b/src/@types/enquirer/index.d.ts @@ -1,4 +1,4 @@ -/* eslint-disable @typescript-eslint/explicit-member-accessibility */ +/* eslint-disable no-undef */ // This file patches the broken enquirer typings import "enquirer"; import { EventEmitter } from "events"; @@ -174,7 +174,6 @@ declare module "enquirer" { | (PromptOptions | ((this: Enquirer) => PromptOptions))[], ): Promise; - // eslint-disable-next-line @typescript-eslint/no-unused-vars class Prompt extends BasePrompt {} } } diff --git a/src/cli.ts b/src/cli.ts index 1093dd5eb..d1ed09aa9 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -83,7 +83,7 @@ async function checkAdapterExistence(name: string): Promise { try { await fetchPackageVersion(`iobroker.${name}`); return `The adapter ioBroker.${name} already exists!`; - } catch (e) { + } catch { return true; } } @@ -100,14 +100,14 @@ async function ask(): Promise { let answers: Record = { cli: true, target: "directory" }; let migrationContext: MigrationContextBase | undefined; - if (!!argv.replay) { + if (argv.replay) { const replayFile = path.resolve(argv.replay); const json = await fs.readFile(replayFile, "utf8"); answers = JSON.parse(json); answers.replay = replayFile; } - if (!!argv.migrate) { + if (argv.migrate) { try { const migrationDir = path.resolve(argv.migrate); const ctx = new LocalMigrationContext(migrationDir); @@ -146,7 +146,12 @@ async function ask(): Promise { } while (true) { let answer: Record; - if (answers.hasOwnProperty(q.name as string)) { + if ( + Object.prototype.hasOwnProperty.call( + answers, + q.name as string, + ) + ) { // answer was loaded using the "replay" feature answer = { [q.name as string]: answers[q.name as string] }; } else { @@ -210,8 +215,8 @@ async function ask(): Promise { green.bold("====================================================="), "", gray(`You can cancel at any point by pressing Ctrl+C.`), - (answers) => (!!answers.replay ? green(`Replaying file`) : undefined), - (answers) => (!!answers.replay ? green(answers.replay) : undefined), + (answers) => (answers.replay ? green(`Replaying file`) : undefined), + (answers) => (answers.replay ? green(answers.replay) : undefined), ...questionGroups, "", underline( diff --git a/src/lib/core/actionsAndTransformers.ts b/src/lib/core/actionsAndTransformers.ts index 982005f5e..606b178f9 100644 --- a/src/lib/core/actionsAndTransformers.ts +++ b/src/lib/core/actionsAndTransformers.ts @@ -2,7 +2,7 @@ import { yellow } from "ansi-colors"; import type { Answers } from "./questions"; const emailRegex = - /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; + /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; export type CheckResult = true | string; export async function checkMinSelections( diff --git a/src/lib/core/migrationContextBase.ts b/src/lib/core/migrationContextBase.ts index 32c9fcbdc..f3cd48564 100644 --- a/src/lib/core/migrationContextBase.ts +++ b/src/lib/core/migrationContextBase.ts @@ -19,7 +19,13 @@ export abstract class MigrationContextBase { ): Promise; public hasDevDependency(packageName: string): boolean { - return this.packageJson.devDependencies?.hasOwnProperty(packageName); + if (this.packageJson.devDependencies) { + return Object.prototype.hasOwnProperty.call( + this.packageJson.devDependencies, + packageName, + ); + } + return false; } public async getMainFileContent(): Promise { diff --git a/src/lib/core/questions.ts b/src/lib/core/questions.ts index 82afee40a..bdf20b699 100644 --- a/src/lib/core/questions.ts +++ b/src/lib/core/questions.ts @@ -840,7 +840,7 @@ export const questionGroups: QuestionGroup[] = [ action: checkAuthorName, migrate: (ctx) => ctx.ioPackageJson.common?.extIcon?.replace( - /^\w+:\/\/[^\/]+\.com\/([^\/]+)\/.+$/, + /^\w+:\/\/[^/]+\.com\/([^/]+)\/.+$/, "$1", ), }, From 9efd4bbbf44a7f5aa8eda1e440f24567200eeddc Mon Sep 17 00:00:00 2001 From: Ingo Fischer Date: Sun, 12 Oct 2025 21:19:51 +0200 Subject: [PATCH 24/29] fixes --- .github/workflows/test-and-release.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml index a513c5b71..3e5cc44fb 100644 --- a/.github/workflows/test-and-release.yml +++ b/.github/workflows/test-and-release.yml @@ -39,24 +39,24 @@ jobs: node-version: ${{ matrix.node-version }} cache: 'npm' + - name: Verify formatting + run: npm run format + - name: Install dependencies run: npm ci - - name: Run component tests - run: npm t - env: - REQUEST_TIMEOUT: 20000 - TESTING: true - - name: Lint source code run: npm run lint - - name: Verify formatting - run: npm run format - - name: Compile TypeScript code run: npm run build + - name: Run component tests + run: npm t + env: + REQUEST_TIMEOUT: 20000 + TESTING: true + - name: Start the CLI on a production environment run: | npm ci --omit=dev From 8234ae22bb65f764ec9bcd74b4a1b62bccc18dda Mon Sep 17 00:00:00 2001 From: Ingo Fischer Date: Sun, 12 Oct 2025 21:20:46 +0200 Subject: [PATCH 25/29] fixes --- .github/workflows/test-and-release.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-and-release.yml b/.github/workflows/test-and-release.yml index 3e5cc44fb..e46988fba 100644 --- a/.github/workflows/test-and-release.yml +++ b/.github/workflows/test-and-release.yml @@ -39,12 +39,12 @@ jobs: node-version: ${{ matrix.node-version }} cache: 'npm' - - name: Verify formatting - run: npm run format - - name: Install dependencies run: npm ci + - name: Verify formatting + run: npm run format + - name: Lint source code run: npm run lint From 91cb1e9d2c281fd0048511dd9e95d1ea85cce546 Mon Sep 17 00:00:00 2001 From: Ingo Fischer Date: Sun, 12 Oct 2025 21:42:03 +0200 Subject: [PATCH 26/29] Migrate to official @iobroker/eslint-config - Replace all ESLint and Prettier packages with @iobroker/eslint-config - Remove eslint-config-prettier, eslint-plugin-prettier, @typescript-eslint packages - Create prettier.config.mjs using official config with tabs and double quotes - Simplify eslint.config.mjs to use official ioBroker configuration - Remove .prettierrc.js and .prettierignore (replaced by prettier.config.mjs) - Auto-fix formatting to match official style guide - Disable overly strict rules not needed for this project: * explicit-function-return-type (already enforced where needed) * require-await (too strict for this codebase) * jsdoc/no-blank-blocks (conflicts with project style) - Keep require() imports allowed for conditional requires - Keep no-redeclare disabled for TypeScript function overloads - Keep consistent-type-imports with disallowTypeAnnotations:false Benefits: - Centralized ESLint/Prettier configuration - Automatic updates with ioBroker best practices - Reduced dependencies - Consistent with generated adapter projects All tests passing (66 TypeScript, 50 baseline) --- .github/create_templates.ts | 27 +- .prettierignore | 8 - .prettierrc.js | 9 - eslint.config.mjs | 122 +- maintenance/cacheLicenses.ts | 23 +- maintenance/generateTemplateIndex.ts | 41 +- package-lock.json | 2922 ++++++++++++++++++++++++- package.json | 8 +- prettier.config.mjs | 10 + src/lib/core.test.ts | 33 +- src/lib/createAdapter.test.ts | 20 +- src/lib/createAdapter.ts | 111 +- src/lib/localMigrationContext.test.ts | 30 +- src/lib/localMigrationContext.ts | 31 +- src/lib/packageVersions.test.ts | 91 +- src/lib/packageVersions.ts | 83 +- src/lib/tools.test.ts | 21 +- src/lib/tools.ts | 172 +- src/lib/translation.ts | 97 +- test/create-adapter.test.ts | 264 +-- 20 files changed, 3252 insertions(+), 871 deletions(-) delete mode 100644 .prettierignore delete mode 100644 .prettierrc.js create mode 100644 prettier.config.mjs diff --git a/.github/create_templates.ts b/.github/create_templates.ts index df1ef99a9..f2e99d79b 100644 --- a/.github/create_templates.ts +++ b/.github/create_templates.ts @@ -13,10 +13,7 @@ function getTemplateDir(templateName: string): string { return path.join(outDir, templateName); } -async function generateTemplates( - templateName: string, - answers: Answers, -): Promise { +async function generateTemplates(templateName: string, answers: Answers): Promise { const files = await createAdapter(answers, ["adapterName", "title"]); const templateDir = getTemplateDir(templateName); @@ -125,10 +122,10 @@ const templates: Record = { console.log(green("Removing old templates")); console.log(green("======================")); const directories = (await fs.readdir(outDir)) - .filter((entry) => !/^\./.test(entry)) // Don't delete dotfiles/dotdirs - .map((entry) => path.join(outDir, entry)) - .filter((entry) => fs.statSync(entry).isDirectory()); - await Promise.all(directories.map((dir) => fs.remove(dir))); + .filter(entry => !/^\./.test(entry)) // Don't delete dotfiles/dotdirs + .map(entry => path.join(outDir, entry)) + .filter(entry => fs.statSync(entry).isDirectory()); + await Promise.all(directories.map(dir => fs.remove(dir))); console.log(); console.log(green("Creating templates")); @@ -169,9 +166,7 @@ const templates: Record = { try { execSync(`npm run lint`, cmdOpts); } catch (e) { - console.error( - red(`ESLint failed for template ${tplName}:`), - ); + console.error(red(`ESLint failed for template ${tplName}:`)); console.error(e.message || e); hadError = true; } @@ -181,24 +176,20 @@ const templates: Record = { try { execSync(`npm run check`, cmdOpts); } catch (e) { - console.error( - red(`Type check failed for template ${tplName}:`), - ); + console.error(red(`Type check failed for template ${tplName}:`)); console.error(e.message || e); hadError = true; } } } if (hadError) { - console.error( - red("At least one template had lint or check errors!"), - ); + console.error(red("At least one template had lint or check errors!")); process.exit(1); } } })(); // Make sure errors fail the build -process.on("unhandledRejection", (e) => { +process.on("unhandledRejection", e => { throw e; }); diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index a66503cb8..000000000 --- a/.prettierignore +++ /dev/null @@ -1,8 +0,0 @@ -package.json -package-lock.json -build/ -src/lib/core/licenses.ts -templates/ -test/baselines/ -CHANGELOG.md -.github/**/*.yml diff --git a/.prettierrc.js b/.prettierrc.js deleted file mode 100644 index 995c84027..000000000 --- a/.prettierrc.js +++ /dev/null @@ -1,9 +0,0 @@ -module.exports = { - semi: true, - trailingComma: "all", - singleQuote: false, - printWidth: 80, - useTabs: true, - tabWidth: 4, - endOfLine: "lf", -}; diff --git a/eslint.config.mjs b/eslint.config.mjs index bea32b569..8f5478ed3 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -1,13 +1,10 @@ -import js from "@eslint/js"; -import tsParser from "@typescript-eslint/parser"; -import tsPlugin from "@typescript-eslint/eslint-plugin"; -import prettier from "eslint-plugin-prettier/recommended"; +// ioBroker eslint configuration file for create-adapter +import iobrokerConfig from "@iobroker/eslint-config"; export default [ - // Base JS recommended rules - js.configs.recommended, + ...iobrokerConfig, - // Global ignores + // Specify files to exclude from linting { ignores: [ "build/", @@ -17,114 +14,29 @@ export default [ ], }, - // TypeScript files configuration + // Custom rules for this project { - files: ["**/*.ts"], - languageOptions: { - parser: tsParser, - parserOptions: { - ecmaVersion: "latest", - sourceType: "module", - project: "./tsconfig.json", - }, - globals: { - // Node.js globals - process: "readonly", - Buffer: "readonly", - __dirname: "readonly", - __filename: "readonly", - module: "readonly", - require: "readonly", - exports: "readonly", - global: "readonly", - console: "readonly", - setTimeout: "readonly", - setInterval: "readonly", - clearTimeout: "readonly", - clearInterval: "readonly", - setImmediate: "readonly", - clearImmediate: "readonly", - NodeJS: "readonly", - }, - }, - plugins: { - "@typescript-eslint": tsPlugin, - }, rules: { - // Recommended TypeScript rules - ...tsPlugin.configs.recommended.rules, + // Allow require() imports where needed (e.g., conditional requires in tools) + "@typescript-eslint/no-require-imports": "off", - // Custom rules - "@typescript-eslint/no-parameter-properties": "off", - "@typescript-eslint/no-explicit-any": "off", - "@typescript-eslint/no-use-before-define": [ - "error", - { - functions: false, - typedefs: false, - classes: false, - }, - ], - "@typescript-eslint/no-unused-vars": [ - "error", - { - ignoreRestSiblings: true, - argsIgnorePattern: "^_", - varsIgnorePattern: "^_", - caughtErrorsIgnorePattern: "^_", - }, - ], - "@typescript-eslint/explicit-function-return-type": [ - "warn", - { - allowExpressions: true, - allowTypedFunctionExpressions: true, - }, - ], - "@typescript-eslint/no-object-literal-type-assertion": "off", - "@typescript-eslint/interface-name-prefix": "off", - "@typescript-eslint/no-non-null-assertion": "off", - "@typescript-eslint/no-inferrable-types": [ - "error", - { - ignoreParameters: true, - ignoreProperties: true, - }, - ], + // TypeScript handles function overloads properly + "no-redeclare": "off", + + // Relax some strict rules for this project + "@typescript-eslint/explicit-function-return-type": "off", + "@typescript-eslint/require-await": "off", + "jsdoc/no-blank-blocks": "off", + + // Allow import() type annotations in specific cases "@typescript-eslint/consistent-type-imports": [ "error", { disallowTypeAnnotations: false, }, ], - // Allow require() imports where needed (e.g., conditional requires) - "@typescript-eslint/no-require-imports": "off", - // TypeScript handles function overloads, no need for no-redeclare - "no-redeclare": "off", - }, - }, - - // Test files - relax explicit return types and add mocha globals - { - files: ["**/*.test.ts", "test/**/*.ts"], - languageOptions: { - globals: { - describe: "readonly", - it: "readonly", - before: "readonly", - after: "readonly", - beforeEach: "readonly", - afterEach: "readonly", - }, - }, - rules: { - "@typescript-eslint/explicit-function-return-type": "off", - // Allow chai assertions like .should - "@typescript-eslint/no-unused-expressions": "off", }, }, - - // Prettier (must be last) - prettier, ]; + diff --git a/maintenance/cacheLicenses.ts b/maintenance/cacheLicenses.ts index 92d64a2e2..239933fd2 100644 --- a/maintenance/cacheLicenses.ts +++ b/maintenance/cacheLicenses.ts @@ -22,15 +22,9 @@ const licenseUrls = { const startMarker = "/** BEGIN LICENSES */"; const endMarker = "/** END LICENSES */"; -const licenseCacheFile = path.resolve( - __dirname, - "../src/lib/core/", - "licenses.ts", -); +const licenseCacheFile = path.resolve(__dirname, "../src/lib/core/", "licenses.ts"); -async function loadLicense( - shortName: keyof typeof licenseUrls, -): Promise { +async function loadLicense(shortName: keyof typeof licenseUrls): Promise { try { let options: AxiosRequestConfig = { url: licenseUrls[shortName], @@ -54,9 +48,7 @@ async function loadLicense( // eslint-disable-next-line @typescript-eslint/explicit-function-return-type async function loadLicenses() { const licenses = {} as Record; - for (const shortName of Object.keys( - licenseUrls, - ) as (keyof typeof licenseUrls)[]) { + for (const shortName of Object.keys(licenseUrls) as (keyof typeof licenseUrls)[]) { licenses[shortName] = await loadLicense(shortName); } return licenses; @@ -65,8 +57,7 @@ async function loadLicenses() { (async function main() { const argv = await yargs.option("force", { type: "boolean" }).parseAsync(); let templateContent = await fs.readFile(licenseCacheFile, "utf8"); - const startMarkerEnd = - templateContent.indexOf(startMarker) + startMarker.length; + const startMarkerEnd = templateContent.indexOf(startMarker) + startMarker.length; const endMarkerStart = templateContent.indexOf(endMarker); if (endMarkerStart < startMarkerEnd + 100 || !!argv.force) { // < 100 Bytes is not enough for all licenses, so we need to fetch them @@ -77,10 +68,6 @@ async function loadLicenses() { templateContent.substr(endMarkerStart); await fs.writeFile(licenseCacheFile, templateContent, "utf8"); } else { - console.log( - green( - `Licenses are already cached. Run this with the parameter --force to update them`, - ), - ); + console.log(green(`Licenses are already cached. Run this with the parameter --force to update them`)); } })(); diff --git a/maintenance/generateTemplateIndex.ts b/maintenance/generateTemplateIndex.ts index 7a6cd6071..f40908cfe 100644 --- a/maintenance/generateTemplateIndex.ts +++ b/maintenance/generateTemplateIndex.ts @@ -5,35 +5,33 @@ import { enumFilesRecursiveSync } from "../src/lib/tools"; const templateDir = path.join(__dirname, "../templates"); -const allTemplateFiles = enumFilesRecursiveSync( - templateDir, - (name, parentDir) => { - // Don't include the index file - if (name === "index.ts" && parentDir === templateDir) return false; - // Don't include *.raw.* files - if (/\.raw\./.test(name)) return false; - // But include all directories and .ts-files in /templates - const fullName = path.join(parentDir, name); - const isDirectory = fs.statSync(fullName).isDirectory(); - return isDirectory || /\.ts$/.test(name); - }, -); +const allTemplateFiles = enumFilesRecursiveSync(templateDir, (name, parentDir) => { + // Don't include the index file + if (name === "index.ts" && parentDir === templateDir) { + return false; + } + // Don't include *.raw.* files + if (/\.raw\./.test(name)) { + return false; + } + // But include all directories and .ts-files in /templates + const fullName = path.join(parentDir, name); + const isDirectory = fs.statSync(fullName).isDirectory(); + return isDirectory || /\.ts$/.test(name); +}); function normalizePath(file: string): string { return path.relative(templateDir, file).replace(/[\\/]/g, "/"); } function getRequirePath(normalizedPath: string): string { - return "./" + normalizedPath.replace(/\.ts$/, ""); + return `./${normalizedPath.replace(/\.ts$/, "")}`; } const templatePaths = allTemplateFiles .map(normalizePath) - .map((file) => [file, getRequirePath(file)] as [string, string]) - .map( - ([file, req]) => - `\t{ name: "${file}", templateFunction: require("${req}") },`, - ) + .map(file => [file, getRequirePath(file)] as [string, string]) + .map(([file, req]) => `\t{ name: "${file}", templateFunction: require("${req}") },`) .sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase())); const indexContent = ` @@ -49,7 +47,4 @@ ${templatePaths.join(os.EOL)} export = templates; `.trimLeft(); -fs.writeFileSync( - path.resolve(__dirname, "../templates", "index.ts"), - indexContent, -); +fs.writeFileSync(path.resolve(__dirname, "../templates", "index.ts"), indexContent); diff --git a/package-lock.json b/package-lock.json index a28cf1b91..09cc7a9cf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,6 @@ "license": "MIT", "dependencies": { "@iobroker/adapter-dev": "^1.5.0", - "@typescript-eslint/parser": "^8.46.0", "alcalzone-shared": "^4.0.8", "ansi-colors": "^4.1.3", "axios": "^1.12.2", @@ -30,6 +29,7 @@ }, "devDependencies": { "@alcalzone/release-script": "^4.0.0", + "@iobroker/eslint-config": "^2.2.0", "@tsconfig/node20": "^20.1.6", "@types/chai": "^4.3.20", "@types/chai-as-promised": "^7.1.8", @@ -44,12 +44,9 @@ "@types/sinon": "^17.0.4", "@types/sinon-chai": "^3.2.12", "@types/yargs": "^17.0.33", - "@typescript-eslint/eslint-plugin": "^8.46.0", "chai": "^4.5.0", "chai-as-promised": "^7.1.2", "copyfiles": "^2.4.1", - "eslint-config-prettier": "^10.1.8", - "eslint-plugin-prettier": "^5.5.4", "execa": "^8.0.1", "jsonschema": "^1.5.0", "mocha": "^11.7.4", @@ -58,8 +55,7 @@ "sinon": "^21.0.0", "sinon-chai": "^3.7.0", "source-map-support": "^0.5.21", - "tsx": "^4.20.6", - "typescript-eslint": "^8.46.0" + "tsx": "^4.20.6" }, "engines": { "node": ">=20" @@ -530,6 +526,35 @@ "node": ">=12" } }, + "node_modules/@babel/helper-validator-identifier": { + "version": "7.27.1", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz", + "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=6.9.0" + } + }, + "node_modules/@es-joy/jsdoccomment": { + "version": "0.56.0", + "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.56.0.tgz", + "integrity": "sha512-c6EW+aA1w2rjqOMjbL93nZlwxp6c1Ln06vTYs5FjRRhmJXK8V/OrSXdT+pUr4aRYgjCgu8/OkiZr0tzeVrRSbw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@types/estree": "^1.0.8", + "@typescript-eslint/types": "^8.42.0", + "comment-parser": "1.4.1", + "esquery": "^1.6.0", + "jsdoc-type-pratt-parser": "~5.1.0" + }, + "engines": { + "node": ">=20.11.0" + } + }, "node_modules/@esbuild/aix-ppc64": { "version": "0.25.9", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.9.tgz", @@ -1066,6 +1091,18 @@ "concat-map": "0.0.1" } }, + "node_modules/@eslint/eslintrc/node_modules/globals": { + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", + "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@eslint/eslintrc/node_modules/ignore": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", @@ -1566,6 +1603,29 @@ "node": "^20.19.0 || ^22.12.0 || >=23" } }, + "node_modules/@iobroker/eslint-config": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@iobroker/eslint-config/-/eslint-config-2.2.0.tgz", + "integrity": "sha512-89U2d81BUrReVgVFUJwjxYsHSbvjAt8w8OoKavtNp//wkG7JU4n/VnISMEvQqaQt7i0sWc/xSx27TYDx9FXAYg==", + "dev": true, + "peerDependencies": { + "@eslint/eslintrc": "^3.3.1", + "@eslint/js": "^9.34.0", + "@typescript-eslint/eslint-plugin": "^8.40.0", + "@typescript-eslint/parser": "^8.40.0", + "eslint": ">=9.32.0", + "eslint-config-prettier": "^10.1.8", + "eslint-plugin-import": "^2.30.0", + "eslint-plugin-jsdoc": "^54.1.1", + "eslint-plugin-prettier": "^5.5.4", + "eslint-plugin-react": "^7.37.5", + "eslint-plugin-react-hooks": "^5.2.0", + "eslint-plugin-unicorn": "^60.0.0", + "globals": "^16.3.0", + "prettier": ">=3.6.2", + "typescript-eslint": "^8.40.0" + } + }, "node_modules/@isaacs/cliui": { "version": "8.0.2", "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", @@ -1676,7 +1736,9 @@ "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" @@ -1689,7 +1751,9 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">= 8" } @@ -1698,7 +1762,9 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -1723,6 +1789,7 @@ "integrity": "sha512-QNqXyfVS2wm9hweSYD2O7F0G06uurj9kZ96TRQE5Y9hU7+tgdZwIkbAKc5Ocy1HxEY2kuDQa6cQ1WRs/O5LFKA==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": "^12.20.0 || ^14.18.0 || >=16.0.0" }, @@ -1794,6 +1861,14 @@ "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==", "license": "BSD-3-Clause" }, + "node_modules/@rtsao/scc": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz", + "integrity": "sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==", + "dev": true, + "license": "MIT", + "peer": true + }, "node_modules/@sinonjs/commons": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", @@ -2021,6 +2096,7 @@ "integrity": "sha512-hA8gxBq4ukonVXPy0OKhiaUh/68D0E88GSmtC1iAEnGaieuDi38LhS7jdCHRLi6ErJBNDGCzvh5EnzdPwUc0DA==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@eslint-community/regexpp": "^4.10.0", "@typescript-eslint/scope-manager": "8.46.0", @@ -2049,7 +2125,9 @@ "version": "8.46.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.46.0.tgz", "integrity": "sha512-n1H6IcDhmmUEG7TNVSspGmiHHutt7iVKtZwRppD7e04wha5MrkV1h3pti9xQLcCMt6YWsncpoT0HMjkH1FNwWQ==", + "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/scope-manager": "8.46.0", "@typescript-eslint/types": "8.46.0", @@ -2073,7 +2151,9 @@ "version": "8.46.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.46.0.tgz", "integrity": "sha512-OEhec0mH+U5Je2NZOeK1AbVCdm0ChyapAyTeXVIYTPXDJ3F07+cu87PPXcGoYqZ7M9YJVvFnfpGg1UmCIqM+QQ==", + "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/tsconfig-utils": "^8.46.0", "@typescript-eslint/types": "^8.46.0", @@ -2094,7 +2174,9 @@ "version": "8.46.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.46.0.tgz", "integrity": "sha512-lWETPa9XGcBes4jqAMYD9fW0j4n6hrPtTJwWDmtqgFO/4HF4jmdH/Q6wggTw5qIT5TXjKzbt7GsZUBnWoO3dqw==", + "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/types": "8.46.0", "@typescript-eslint/visitor-keys": "8.46.0" @@ -2111,7 +2193,9 @@ "version": "8.46.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.46.0.tgz", "integrity": "sha512-WrYXKGAHY836/N7zoK/kzi6p8tXFhasHh8ocFL9VZSAkvH956gfeRfcnhs3xzRy8qQ/dq3q44v1jvQieMFg2cw==", + "dev": true, "license": "MIT", + "peer": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -2129,6 +2213,7 @@ "integrity": "sha512-hy+lvYV1lZpVs2jRaEYvgCblZxUoJiPyCemwbQZ+NGulWkQRy0HRPYAoef/CNSzaLt+MLvMptZsHXHlkEilaeg==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/types": "8.46.0", "@typescript-eslint/typescript-estree": "8.46.0", @@ -2152,7 +2237,9 @@ "version": "8.46.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.46.0.tgz", "integrity": "sha512-bHGGJyVjSE4dJJIO5yyEWt/cHyNwga/zXGJbJJ8TiO01aVREK6gCTu3L+5wrkb1FbDkQ+TKjMNe9R/QQQP9+rA==", + "dev": true, "license": "MIT", + "peer": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -2165,7 +2252,9 @@ "version": "8.46.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.46.0.tgz", "integrity": "sha512-ekDCUfVpAKWJbRfm8T1YRrCot1KFxZn21oV76v5Fj4tr7ELyk84OS+ouvYdcDAwZL89WpEkEj2DKQ+qg//+ucg==", + "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/project-service": "8.46.0", "@typescript-eslint/tsconfig-utils": "8.46.0", @@ -2195,6 +2284,7 @@ "integrity": "sha512-nD6yGWPj1xiOm4Gk0k6hLSZz2XkNXhuYmyIrOWcHoPuAhjT9i5bAG+xbWPgFeNR8HPHHtpNKdYUXJl/D3x7f5g==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.7.0", "@typescript-eslint/scope-manager": "8.46.0", @@ -2217,7 +2307,9 @@ "version": "8.46.0", "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.0.tgz", "integrity": "sha512-FrvMpAK+hTbFy7vH5j1+tMYHMSKLE6RzluFJlkFNKD0p9YsUT75JlBSmr5so3QRzvMwU5/bIEdeNrxm8du8l3Q==", + "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/types": "8.46.0", "eslint-visitor-keys": "^4.2.1" @@ -2234,7 +2326,9 @@ "version": "4.2.1", "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", + "dev": true, "license": "Apache-2.0", + "peer": true, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, @@ -2342,12 +2436,191 @@ "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, + "node_modules/are-docs-informative": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz", + "integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=14" + } + }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "license": "Python-2.0" }, + "node_modules/array-buffer-byte-length": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz", + "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.3", + "is-array-buffer": "^3.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array-includes": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.9.tgz", + "integrity": "sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "define-properties": "^1.2.1", + "es-abstract": "^1.24.0", + "es-object-atoms": "^1.1.1", + "get-intrinsic": "^1.3.0", + "is-string": "^1.1.1", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlast": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz", + "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.findlastindex": { + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.6.tgz", + "integrity": "sha512-F/TKATkzseUExPlfvmwQKGITM3DGTK+vkAsCZoDc5daVygbJBnjEUCbgkAvVFsgfXfX4YIqZ/27G3k3tdXrTxQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.9", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "es-shim-unscopables": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flat": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.3.tgz", + "integrity": "sha512-rwG/ja1neyLqCuGZ5YYrznA62D4mZXg0i1cIskIUKSiqF3Cje9/wXAls9B9s1Wa2fomMsIv8czB8jZcPmxCXFg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.flatmap": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz", + "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/array.prototype.tosorted": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz", + "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.3", + "es-errors": "^1.3.0", + "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/arraybuffer.prototype.slice": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz", + "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/arrify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", @@ -2367,12 +2640,40 @@ "node": "*" } }, + "node_modules/async-function": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz", + "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", "license": "MIT" }, + "node_modules/available-typed-arrays": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/axios": { "version": "1.12.2", "resolved": "https://registry.npmjs.org/axios/-/axios-1.12.2.tgz", @@ -2410,6 +2711,17 @@ ], "license": "MIT" }, + "node_modules/baseline-browser-mapping": { + "version": "2.8.16", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.16.tgz", + "integrity": "sha512-OMu3BGQ4E7P1ErFsIPpbJh0qvDudM/UuJeHgkAvfWe+0HFJCXh+t/l8L6fVLR55RI/UbKrVLnAXZSVwd9ysWYw==", + "dev": true, + "license": "Apache-2.0", + "peer": true, + "bin": { + "baseline-browser-mapping": "dist/cli.js" + } + }, "node_modules/bignumber.js": { "version": "9.3.1", "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.3.1.tgz", @@ -2432,7 +2744,9 @@ "version": "3.0.3", "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, "license": "MIT", + "peer": true, "dependencies": { "fill-range": "^7.1.1" }, @@ -2447,6 +2761,41 @@ "dev": true, "license": "ISC" }, + "node_modules/browserslist": { + "version": "4.26.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.26.3.tgz", + "integrity": "sha512-lAUU+02RFBuCKQPj/P6NgjlbCnLBMp4UtgTx7vNHd3XSIJF87s9a5rA3aH2yw3GS9DqZAUbOtZdCCiZeVRqt0w==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "peer": true, + "dependencies": { + "baseline-browser-mapping": "^2.8.9", + "caniuse-lite": "^1.0.30001746", + "electron-to-chromium": "^1.5.227", + "node-releases": "^2.0.21", + "update-browserslist-db": "^1.1.3" + }, + "bin": { + "browserslist": "cli.js" + }, + "engines": { + "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7" + } + }, "node_modules/buffer-equal-constant-time": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", @@ -2460,6 +2809,40 @@ "dev": true, "license": "MIT" }, + "node_modules/builtin-modules": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-5.0.0.tgz", + "integrity": "sha512-bkXY9WsVpY7CvMhKSR6pZilZu9Ln5WDrKVBUXf2S443etkmEO4V58heTecXcUIsNsi4Rx8JUO4NfX1IcQl4deg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=18.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/call-bind": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", + "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind-apply-helpers": "^1.0.0", + "es-define-property": "^1.0.0", + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/call-bind-apply-helpers": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", @@ -2473,6 +2856,24 @@ "node": ">= 0.4" } }, + "node_modules/call-bound": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", + "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "get-intrinsic": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -2495,6 +2896,28 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/caniuse-lite": { + "version": "1.0.30001750", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001750.tgz", + "integrity": "sha512-cuom0g5sdX6rw00qOoLNSFCJ9/mYIsuSOA+yzpDw8eopiFqcVwQvZHqov0vmEighRxX++cfC0Vg1G+1Iy/mSpQ==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/caniuse-lite" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "CC-BY-4.0", + "peer": true + }, "node_modules/chai": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/chai/-/chai-4.5.0.tgz", @@ -2543,6 +2966,14 @@ "url": "https://github.com/chalk/chalk?sponsor=1" } }, + "node_modules/change-case": { + "version": "5.4.4", + "resolved": "https://registry.npmjs.org/change-case/-/change-case-5.4.4.tgz", + "integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==", + "dev": true, + "license": "MIT", + "peer": true + }, "node_modules/check-error": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", @@ -2572,19 +3003,61 @@ "url": "https://paulmillr.com/funding/" } }, - "node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "license": "ISC", - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=12" - } + "node_modules/ci-info": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.1.tgz", + "integrity": "sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/sibiraj-s" + } + ], + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/clean-regexp": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz", + "integrity": "sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "escape-string-regexp": "^1.0.5" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/clean-regexp/node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } }, "node_modules/color-convert": { "version": "2.0.1", @@ -2616,6 +3089,17 @@ "node": ">= 0.8" } }, + "node_modules/comment-parser": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.1.tgz", + "integrity": "sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 12.0.0" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -2697,6 +3181,21 @@ "node": ">=10" } }, + "node_modules/core-js-compat": { + "version": "3.46.0", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.46.0.tgz", + "integrity": "sha512-p9hObIIEENxSV8xIu+V68JjSeARg6UVMG5mR+JEUguG3sI6MsiS1njz2jHmyJDvA+8jX/sytkBHup6kxhM9law==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "browserslist": "^4.26.3" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/core-js" + } + }, "node_modules/core-util-is": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", @@ -2727,6 +3226,63 @@ "node": ">= 12" } }, + "node_modules/data-view-buffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz", + "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-length": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz", + "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/inspect-js" + } + }, + "node_modules/data-view-byte-offset": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz", + "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/debug": { "version": "4.4.3", "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", @@ -2809,6 +3365,44 @@ "node": ">= 6" } }, + "node_modules/define-data-property": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/define-properties": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "define-data-property": "^1.0.1", + "has-property-descriptors": "^1.0.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -2828,6 +3422,20 @@ "node": ">=0.3.1" } }, + "node_modules/doctrine": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", + "dev": true, + "license": "Apache-2.0", + "peer": true, + "dependencies": { + "esutils": "^2.0.2" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/dunder-proto": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", @@ -2869,6 +3477,14 @@ "safe-buffer": "^5.0.1" } }, + "node_modules/electron-to-chromium": { + "version": "1.5.234", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.234.tgz", + "integrity": "sha512-RXfEp2x+VRYn8jbKfQlRImzoJU01kyDvVPBmG39eU2iuRVhuS6vQNocB8J0/8GrIMLnPzgz4eW6WiRnJkTuNWg==", + "dev": true, + "license": "ISC", + "peer": true + }, "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -2897,6 +3513,76 @@ "node": ">=8.6" } }, + "node_modules/es-abstract": { + "version": "1.24.0", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz", + "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.2", + "arraybuffer.prototype.slice": "^1.0.4", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "data-view-buffer": "^1.0.2", + "data-view-byte-length": "^1.0.2", + "data-view-byte-offset": "^1.0.1", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "es-set-tostringtag": "^2.1.0", + "es-to-primitive": "^1.3.0", + "function.prototype.name": "^1.1.8", + "get-intrinsic": "^1.3.0", + "get-proto": "^1.0.1", + "get-symbol-description": "^1.1.0", + "globalthis": "^1.0.4", + "gopd": "^1.2.0", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "internal-slot": "^1.1.0", + "is-array-buffer": "^3.0.5", + "is-callable": "^1.2.7", + "is-data-view": "^1.0.2", + "is-negative-zero": "^2.0.3", + "is-regex": "^1.2.1", + "is-set": "^2.0.3", + "is-shared-array-buffer": "^1.0.4", + "is-string": "^1.1.1", + "is-typed-array": "^1.1.15", + "is-weakref": "^1.1.1", + "math-intrinsics": "^1.1.0", + "object-inspect": "^1.13.4", + "object-keys": "^1.1.1", + "object.assign": "^4.1.7", + "own-keys": "^1.0.1", + "regexp.prototype.flags": "^1.5.4", + "safe-array-concat": "^1.1.3", + "safe-push-apply": "^1.0.0", + "safe-regex-test": "^1.1.0", + "set-proto": "^1.0.0", + "stop-iteration-iterator": "^1.1.0", + "string.prototype.trim": "^1.2.10", + "string.prototype.trimend": "^1.0.9", + "string.prototype.trimstart": "^1.0.8", + "typed-array-buffer": "^1.0.3", + "typed-array-byte-length": "^1.0.3", + "typed-array-byte-offset": "^1.0.4", + "typed-array-length": "^1.0.7", + "unbox-primitive": "^1.1.0", + "which-typed-array": "^1.1.19" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/es-define-property": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", @@ -2915,6 +3601,35 @@ "node": ">= 0.4" } }, + "node_modules/es-iterator-helpers": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz", + "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.6", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.3", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.6", + "globalthis": "^1.0.4", + "gopd": "^1.2.0", + "has-property-descriptors": "^1.0.2", + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", + "internal-slot": "^1.1.0", + "iterator.prototype": "^1.1.4", + "safe-array-concat": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-object-atoms": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", @@ -2942,6 +3657,39 @@ "node": ">= 0.4" } }, + "node_modules/es-shim-unscopables": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz", + "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-to-primitive": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz", + "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "is-callable": "^1.2.7", + "is-date-object": "^1.0.5", + "is-symbol": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/esbuild": { "version": "0.25.9", "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.9.tgz", @@ -3070,6 +3818,7 @@ "integrity": "sha512-82GZUjRS0p/jganf6q1rEO25VSoHH0hKPCTrgillPjdI/3bgBhAE1QzHrHTizjpRvy6pGAvKjDJtk2pF9NDq8w==", "dev": true, "license": "MIT", + "peer": true, "bin": { "eslint-config-prettier": "bin/cli.js" }, @@ -3080,83 +3829,417 @@ "eslint": ">=7.0.0" } }, - "node_modules/eslint-plugin-prettier": { - "version": "5.5.4", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.4.tgz", - "integrity": "sha512-swNtI95SToIz05YINMA6Ox5R057IMAmWZ26GqPxusAp1TZzj+IdY9tXNWWD3vkF/wEqydCONcwjTFpxybBqZsg==", + "node_modules/eslint-import-resolver-node": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { - "prettier-linter-helpers": "^1.0.0", - "synckit": "^0.11.7" + "debug": "^3.2.7", + "is-core-module": "^2.13.0", + "resolve": "^1.22.4" + } + }, + "node_modules/eslint-import-resolver-node/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-module-utils": { + "version": "2.12.1", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.12.1.tgz", + "integrity": "sha512-L8jSWTze7K2mTg0vos/RuLRS5soomksDPoJLXIslC7c8Wmut3bx7CPpJijDcBZtxQ5lrbUdM+s0OlNbz0DCDNw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "debug": "^3.2.7" }, "engines": { - "node": "^14.18.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint-plugin-prettier" - }, - "peerDependencies": { - "@types/eslint": ">=8.0.0", - "eslint": ">=8.0.0", - "eslint-config-prettier": ">= 7.0.0 <10.0.0 || >=10.1.0", - "prettier": ">=3.0.0" + "node": ">=4" }, "peerDependenciesMeta": { - "@types/eslint": { - "optional": true - }, - "eslint-config-prettier": { + "eslint": { "optional": true } } }, - "node_modules/eslint-scope": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", - "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", - "license": "BSD-2-Clause", + "node_modules/eslint-module-utils/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "peer": true, "dependencies": { - "esrecurse": "^4.3.0", - "estraverse": "^5.2.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" + "ms": "^2.1.1" } }, - "node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "license": "Apache-2.0", + "node_modules/eslint-plugin-import": { + "version": "2.32.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.32.0.tgz", + "integrity": "sha512-whOE1HFo/qJDyX4SnXzP4N6zOWn79WhnCUY/iDR0mPfQZO8wcYE4JClzI2oZrhBnnMUCBCHZhO6VQyoBU95mZA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@rtsao/scc": "^1.1.0", + "array-includes": "^3.1.9", + "array.prototype.findlastindex": "^1.2.6", + "array.prototype.flat": "^1.3.3", + "array.prototype.flatmap": "^1.3.3", + "debug": "^3.2.7", + "doctrine": "^2.1.0", + "eslint-import-resolver-node": "^0.3.9", + "eslint-module-utils": "^2.12.1", + "hasown": "^2.0.2", + "is-core-module": "^2.16.1", + "is-glob": "^4.0.3", + "minimatch": "^3.1.2", + "object.fromentries": "^2.0.8", + "object.groupby": "^1.0.3", + "object.values": "^1.2.1", + "semver": "^6.3.1", + "string.prototype.trimend": "^1.0.9", + "tsconfig-paths": "^3.15.0" + }, "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": ">=4" }, - "funding": { - "url": "https://opencollective.com/eslint" + "peerDependencies": { + "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8 || ^9" } }, - "node_modules/eslint/node_modules/brace-expansion": { + "node_modules/eslint-plugin-import/node_modules/brace-expansion": { "version": "1.1.12", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, "license": "MIT", + "peer": true, "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, - "node_modules/eslint/node_modules/eslint-visitor-keys": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", - "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", - "license": "Apache-2.0", - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, + "node_modules/eslint-plugin-import/node_modules/debug": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "ms": "^2.1.1" + } + }, + "node_modules/eslint-plugin-import/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/eslint-plugin-import/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "peer": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/eslint-plugin-jsdoc": { + "version": "54.7.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-54.7.0.tgz", + "integrity": "sha512-u5Na4he2+6kY1rWqxzbQaAwJL3/tDCuT5ElDRc5UJ9stOeQeQ5L1JJ1kRRu7ldYMlOHMCJLsY8Mg/Tu3ExdZiQ==", + "dev": true, + "license": "BSD-3-Clause", + "peer": true, + "dependencies": { + "@es-joy/jsdoccomment": "~0.56.0", + "are-docs-informative": "^0.0.2", + "comment-parser": "1.4.1", + "debug": "^4.4.1", + "escape-string-regexp": "^4.0.0", + "espree": "^10.4.0", + "esquery": "^1.6.0", + "parse-imports-exports": "^0.2.4", + "semver": "^7.7.2", + "spdx-expression-parse": "^4.0.0" + }, + "engines": { + "node": ">=20.11.0" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0 || ^9.0.0" + } + }, + "node_modules/eslint-plugin-prettier": { + "version": "5.5.4", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.5.4.tgz", + "integrity": "sha512-swNtI95SToIz05YINMA6Ox5R057IMAmWZ26GqPxusAp1TZzj+IdY9tXNWWD3vkF/wEqydCONcwjTFpxybBqZsg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "prettier-linter-helpers": "^1.0.0", + "synckit": "^0.11.7" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint-plugin-prettier" + }, + "peerDependencies": { + "@types/eslint": ">=8.0.0", + "eslint": ">=8.0.0", + "eslint-config-prettier": ">= 7.0.0 <10.0.0 || >=10.1.0", + "prettier": ">=3.0.0" + }, + "peerDependenciesMeta": { + "@types/eslint": { + "optional": true + }, + "eslint-config-prettier": { + "optional": true + } + } + }, + "node_modules/eslint-plugin-react": { + "version": "7.37.5", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.5.tgz", + "integrity": "sha512-Qteup0SqU15kdocexFNAJMvCJEfa2xUKNV4CC1xsVMrIIqEy3SQ/rqyxCWNzfrd3/ldy6HMlD2e0JDVpDg2qIA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "array-includes": "^3.1.8", + "array.prototype.findlast": "^1.2.5", + "array.prototype.flatmap": "^1.3.3", + "array.prototype.tosorted": "^1.1.4", + "doctrine": "^2.1.0", + "es-iterator-helpers": "^1.2.1", + "estraverse": "^5.3.0", + "hasown": "^2.0.2", + "jsx-ast-utils": "^2.4.1 || ^3.0.0", + "minimatch": "^3.1.2", + "object.entries": "^1.1.9", + "object.fromentries": "^2.0.8", + "object.values": "^1.2.1", + "prop-types": "^15.8.1", + "resolve": "^2.0.0-next.5", + "semver": "^6.3.1", + "string.prototype.matchall": "^4.0.12", + "string.prototype.repeat": "^1.0.0" + }, + "engines": { + "node": ">=4" + }, + "peerDependencies": { + "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7" + } + }, + "node_modules/eslint-plugin-react-hooks": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.2.0.tgz", + "integrity": "sha512-+f15FfK64YQwZdJNELETdn5ibXEUQmW1DZL6KXhNnc2heoy/sg9VJJeT7n8TlMWouzWqSWavFkIhHyIbIAEapg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0" + } + }, + "node_modules/eslint-plugin-react/node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/eslint-plugin-react/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "license": "ISC", + "peer": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/eslint-plugin-react/node_modules/resolve": { + "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + }, + "bin": { + "resolve": "bin/resolve" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/eslint-plugin-react/node_modules/semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true, + "license": "ISC", + "peer": true, + "bin": { + "semver": "bin/semver.js" + } + }, + "node_modules/eslint-plugin-unicorn": { + "version": "60.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-60.0.0.tgz", + "integrity": "sha512-QUzTefvP8stfSXsqKQ+vBQSEsXIlAiCduS/V1Em+FKgL9c21U/IIm20/e3MFy1jyCf14tHAhqC1sX8OTy6VUCg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@babel/helper-validator-identifier": "^7.27.1", + "@eslint-community/eslint-utils": "^4.7.0", + "@eslint/plugin-kit": "^0.3.3", + "change-case": "^5.4.4", + "ci-info": "^4.3.0", + "clean-regexp": "^1.0.0", + "core-js-compat": "^3.44.0", + "esquery": "^1.6.0", + "find-up-simple": "^1.0.1", + "globals": "^16.3.0", + "indent-string": "^5.0.0", + "is-builtin-module": "^5.0.0", + "jsesc": "^3.1.0", + "pluralize": "^8.0.0", + "regexp-tree": "^0.1.27", + "regjsparser": "^0.12.0", + "semver": "^7.7.2", + "strip-indent": "^4.0.0" + }, + "engines": { + "node": "^20.10.0 || >=21.0.0" + }, + "funding": { + "url": "https://github.com/sindresorhus/eslint-plugin-unicorn?sponsor=1" + }, + "peerDependencies": { + "eslint": ">=9.29.0" + } + }, + "node_modules/eslint-plugin-unicorn/node_modules/@eslint/core": { + "version": "0.15.2", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz", + "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==", + "dev": true, + "license": "Apache-2.0", + "peer": true, + "dependencies": { + "@types/json-schema": "^7.0.15" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/eslint-plugin-unicorn/node_modules/@eslint/plugin-kit": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz", + "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==", + "dev": true, + "license": "Apache-2.0", + "peer": true, + "dependencies": { + "@eslint/core": "^0.15.2", + "levn": "^0.4.1" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + } + }, + "node_modules/eslint-scope": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", + "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", + "license": "BSD-2-Clause", + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + }, + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "license": "Apache-2.0", + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/eslint/node_modules/brace-expansion": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", + "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/eslint/node_modules/eslint-visitor-keys": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", + "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", + "license": "Apache-2.0", + "engines": { + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + }, "funding": { "url": "https://opencollective.com/eslint" } @@ -3320,13 +4403,16 @@ "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz", "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==", "dev": true, - "license": "Apache-2.0" + "license": "Apache-2.0", + "peer": true }, "node_modules/fast-glob": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", + "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -3342,7 +4428,9 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, "license": "ISC", + "peer": true, "dependencies": { "is-glob": "^4.0.1" }, @@ -3366,7 +4454,9 @@ "version": "1.19.1", "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", + "dev": true, "license": "ISC", + "peer": true, "dependencies": { "reusify": "^1.0.4" } @@ -3424,7 +4514,9 @@ "version": "7.1.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, "license": "MIT", + "peer": true, "dependencies": { "to-regex-range": "^5.0.1" }, @@ -3448,6 +4540,20 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/find-up-simple": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/find-up-simple/-/find-up-simple-1.0.1.tgz", + "integrity": "sha512-afd4O7zpqHeRyg4PfDQsXmlDe2PfdHtJt6Akt8jOWaApLOZk5JXs6VMR29lz03pRe9mpykrRCYIYxaJYcfpncQ==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/flat": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", @@ -3497,6 +4603,23 @@ } } }, + "node_modules/for-each": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", + "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/foreground-child": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", @@ -3598,6 +4721,39 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/function.prototype.name": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz", + "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "functions-have-names": "^1.2.3", + "hasown": "^2.0.2", + "is-callable": "^1.2.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/functions-have-names": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true, + "license": "MIT", + "peer": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/gaxios": { "version": "7.1.2", "resolved": "https://registry.npmjs.org/gaxios/-/gaxios-7.1.2.tgz", @@ -3626,6 +4782,17 @@ "node": ">=18" } }, + "node_modules/generator-function": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/generator-function/-/generator-function-2.0.1.tgz", + "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/get-caller-file": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", @@ -3706,6 +4873,25 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/get-symbol-description": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz", + "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/get-tsconfig": { "version": "4.10.1", "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.1.tgz", @@ -3778,10 +4964,12 @@ } }, "node_modules/globals": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", - "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", + "version": "16.4.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-16.4.0.tgz", + "integrity": "sha512-ob/2LcVVaVGCYN+r14cnwnoDPUufjiYgSqRhiFD0Q1iI4Odora5RE8Iv1D24hAz5oMophRGkGz+yuvQmmUMnMw==", + "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=18" }, @@ -3789,6 +4977,24 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/globalthis": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", + "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "define-properties": "^1.2.1", + "gopd": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/globalyzer": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/globalyzer/-/globalyzer-0.1.0.tgz", @@ -3872,7 +5078,8 @@ "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", "dev": true, - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/gtoken": { "version": "8.0.0", @@ -3887,6 +5094,20 @@ "node": ">=18" } }, + "node_modules/has-bigints": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", + "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-flag": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", @@ -3896,6 +5117,37 @@ "node": ">=8" } }, + "node_modules/has-property-descriptors": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "es-define-property": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-proto": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz", + "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "dunder-proto": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/has-symbols": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", @@ -4028,6 +5280,7 @@ "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==", "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">= 4" } @@ -4057,6 +5310,20 @@ "node": ">=0.8.19" } }, + "node_modules/indent-string": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz", + "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -4075,6 +5342,128 @@ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "license": "ISC" }, + "node_modules/internal-slot": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", + "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "es-errors": "^1.3.0", + "hasown": "^2.0.2", + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/is-array-buffer": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz", + "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-async-function": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz", + "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "async-function": "^1.0.0", + "call-bound": "^1.0.3", + "get-proto": "^1.0.1", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-bigint": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz", + "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "has-bigints": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-boolean-object": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz", + "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-builtin-module": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-5.0.0.tgz", + "integrity": "sha512-f4RqJKBUe5rQkJ2eJEJBXSticB3hGbN9j0yxxMQFqIW89Jp9WYFtzfTcRlstDKVUTRzSOTLKRfO9vIztenwtxA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "builtin-modules": "^5.0.0" + }, + "engines": { + "node": ">=18.20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-callable": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-core-module": { "version": "2.16.1", "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", @@ -4091,6 +5480,43 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-data-view": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz", + "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-date-object": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz", + "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -4100,6 +5526,23 @@ "node": ">=0.10.0" } }, + "node_modules/is-finalizationregistry": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz", + "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", @@ -4109,6 +5552,27 @@ "node": ">=8" } }, + "node_modules/is-generator-function": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.2.tgz", + "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.4", + "generator-function": "^2.0.0", + "get-proto": "^1.0.1", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-glob": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", @@ -4133,15 +5597,63 @@ "node": ">=8" } }, + "node_modules/is-map": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-negative-zero": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", + "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-number": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=0.12.0" } }, + "node_modules/is-number-object": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz", + "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-object": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-object/-/is-object-1.0.2.tgz", @@ -4172,6 +5684,57 @@ "node": ">=8" } }, + "node_modules/is-regex": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", + "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.2", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-set": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-shared-array-buffer": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz", + "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-stream": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", @@ -4185,6 +5748,60 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/is-string": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz", + "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-symbol": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz", + "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.2", + "has-symbols": "^1.1.0", + "safe-regex-test": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-typed-array": { + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", + "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-unicode-supported": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", @@ -4198,6 +5815,55 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/is-weakmap": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakref": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz", + "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/is-weakset": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz", + "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/isarray": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", @@ -4211,6 +5877,25 @@ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "license": "ISC" }, + "node_modules/iterator.prototype": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz", + "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "define-data-property": "^1.1.4", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.6", + "get-proto": "^1.0.0", + "has-symbols": "^1.1.0", + "set-function-name": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/jackspeak": { "version": "3.4.3", "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", @@ -4226,6 +5911,14 @@ "@pkgjs/parseargs": "^0.11.0" } }, + "node_modules/js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true, + "license": "MIT", + "peer": true + }, "node_modules/js-yaml": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", @@ -4238,6 +5931,31 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/jsdoc-type-pratt-parser": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-5.1.1.tgz", + "integrity": "sha512-DYYlVP1fe4QBMh2xTIs20/YeTz2GYVbWAEZweHSZD+qQ/Cx2d5RShuhhsdk64eTjNq0FeVnteP/qVOgaywSRbg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=12.0.0" + } + }, + "node_modules/jsesc": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", + "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", + "dev": true, + "license": "MIT", + "peer": true, + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/json-bigint": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-bigint/-/json-bigint-1.0.0.tgz", @@ -4299,6 +6017,23 @@ "node": "*" } }, + "node_modules/jsx-ast-utils": { + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", + "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "array-includes": "^3.1.6", + "array.prototype.flat": "^1.3.1", + "object.assign": "^4.1.4", + "object.values": "^1.1.6" + }, + "engines": { + "node": ">=4.0" + } + }, "node_modules/jwa": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/jwa/-/jwa-2.0.1.tgz", @@ -4405,6 +6140,20 @@ "integrity": "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==", "license": "Apache-2.0" }, + "node_modules/loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "js-tokens": "^3.0.0 || ^4.0.0" + }, + "bin": { + "loose-envify": "cli.js" + } + }, "node_modules/loupe": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", @@ -4450,7 +6199,9 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">= 8" } @@ -4459,7 +6210,9 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", + "dev": true, "license": "MIT", + "peer": true, "dependencies": { "braces": "^3.0.3", "picomatch": "^2.3.1" @@ -4517,6 +6270,17 @@ "url": "https://github.com/sponsors/isaacs" } }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true, + "license": "MIT", + "peer": true, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/minipass": { "version": "4.2.8", "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz", @@ -4698,6 +6462,14 @@ "url": "https://opencollective.com/node-fetch" } }, + "node_modules/node-releases": { + "version": "2.0.23", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.23.tgz", + "integrity": "sha512-cCmFDMSm26S6tQSDpBCg/NR8NENrVPhAJSf+XbxBG4rPFaaonlEoE9wHQmun+cls499TQGSb7ZyPBRlzgKfpeg==", + "dev": true, + "license": "MIT", + "peer": true + }, "node_modules/noms": { "version": "0.0.0", "resolved": "https://registry.npmjs.org/noms/-/noms-0.0.0.tgz", @@ -4739,32 +6511,163 @@ "path-key": "^4.0.0" }, "engines": { - "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/npm-run-path/node_modules/path-key": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", + "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/object-hash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", + "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", + "license": "MIT", + "engines": { + "node": ">= 6" + } + }, + "node_modules/object-inspect": { + "version": "1.13.4", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", + "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.assign": { + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz", + "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0", + "has-symbols": "^1.1.0", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object.entries": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.9.tgz", + "integrity": "sha512-8u/hfXFRBD1O0hPUjioLhoWFHRmt6tKA4/vZPyckBr18l1KE9uHrFaFaUi8MDRTpi4uak2goyPTSNJLXX2k2Hw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/object.fromentries": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", + "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/npm-run-path/node_modules/path-key": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", - "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", + "node_modules/object.groupby": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz", + "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==", "dev": true, "license": "MIT", - "engines": { - "node": ">=12" + "peer": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2" }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "engines": { + "node": ">= 0.4" } }, - "node_modules/object-hash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", - "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", + "node_modules/object.values": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz", + "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==", + "dev": true, "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, "engines": { - "node": ">= 6" + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/once": { @@ -4809,6 +6712,25 @@ "node": ">= 0.8.0" } }, + "node_modules/own-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz", + "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "get-intrinsic": "^1.2.6", + "object-keys": "^1.1.1", + "safe-push-apply": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/p-limit": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-5.0.0.tgz", @@ -4884,6 +6806,25 @@ "node": ">=6" } }, + "node_modules/parse-imports-exports": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/parse-imports-exports/-/parse-imports-exports-0.2.4.tgz", + "integrity": "sha512-4s6vd6dx1AotCx/RCI2m7t7GCh5bDRUtGNvRfHSP2wbBQdMi67pPe7mtzmgwcaQ8VKK/6IB7Glfyu3qdZJPybQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "parse-statements": "1.0.11" + } + }, + "node_modules/parse-statements": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/parse-statements/-/parse-statements-1.0.11.tgz", + "integrity": "sha512-HlsyYdMBnbPQ9Jr/VgJ1YF4scnldvJpJxCVx6KgqPL4dxppsWrJHCIIxQXMJrqGnsRkNPATbeMJ8Yxu7JMsYcA==", + "dev": true, + "license": "MIT", + "peer": true + }, "node_modules/path-exists": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", @@ -4965,7 +6906,9 @@ "version": "2.3.1", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=8.6" }, @@ -4973,6 +6916,28 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/pluralize": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz", + "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/possible-typed-array-names": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", + "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/prelude-ls": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", @@ -5003,6 +6968,7 @@ "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "fast-diff": "^1.1.2" }, @@ -5017,6 +6983,19 @@ "dev": true, "license": "MIT" }, + "node_modules/prop-types": { + "version": "15.8.1", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "loose-envify": "^1.4.0", + "object-assign": "^4.1.1", + "react-is": "^16.13.1" + } + }, "node_modules/proto3-json-serializer": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/proto3-json-serializer/-/proto3-json-serializer-3.0.2.tgz", @@ -5084,6 +7063,7 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true, "funding": [ { "type": "github", @@ -5098,7 +7078,8 @@ "url": "https://feross.org/support" } ], - "license": "MIT" + "license": "MIT", + "peer": true }, "node_modules/randombytes": { "version": "2.1.0", @@ -5110,6 +7091,14 @@ "safe-buffer": "^5.1.0" } }, + "node_modules/react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true, + "license": "MIT", + "peer": true + }, "node_modules/readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", @@ -5138,6 +7127,91 @@ "url": "https://paulmillr.com/funding/" } }, + "node_modules/reflect.getprototypeof": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz", + "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.9", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.1", + "which-builtin-type": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regexp-tree": { + "version": "0.1.27", + "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.27.tgz", + "integrity": "sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==", + "dev": true, + "license": "MIT", + "peer": true, + "bin": { + "regexp-tree": "bin/regexp-tree" + } + }, + "node_modules/regexp.prototype.flags": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz", + "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "set-function-name": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/regjsparser": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.12.0.tgz", + "integrity": "sha512-cnE+y8bz4NhMjISKbgeVJtqNbtf5QpjZP+Bslo+UqkIt9QPnX9q095eiRRASJG1/tz6dlNr6Z5NsBiWYokp6EQ==", + "dev": true, + "license": "BSD-2-Clause", + "peer": true, + "dependencies": { + "jsesc": "~3.0.2" + }, + "bin": { + "regjsparser": "bin/parser" + } + }, + "node_modules/regjsparser/node_modules/jsesc": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.0.2.tgz", + "integrity": "sha512-xKqzzWXDttJuOcawBt4KnKHHIf5oQ/Cxax+0PWFG+DFDgHNAdi+TXECADI+RYiFUMmx8792xsMbbgXj4CwnP4g==", + "dev": true, + "license": "MIT", + "peer": true, + "bin": { + "jsesc": "bin/jsesc" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -5204,7 +7278,9 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", + "dev": true, "license": "MIT", + "peer": true, "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" @@ -5268,6 +7344,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, "funding": [ { "type": "github", @@ -5283,10 +7360,40 @@ } ], "license": "MIT", + "peer": true, "dependencies": { "queue-microtask": "^1.2.2" } }, + "node_modules/safe-array-concat": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz", + "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "has-symbols": "^1.1.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">=0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-array-concat/node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true, + "license": "MIT", + "peer": true + }, "node_modules/safe-buffer": { "version": "5.2.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", @@ -5307,6 +7414,51 @@ ], "license": "MIT" }, + "node_modules/safe-push-apply": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz", + "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "es-errors": "^1.3.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/safe-push-apply/node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/safe-regex-test": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", + "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "is-regex": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/semver": { "version": "7.7.3", "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", @@ -5329,6 +7481,58 @@ "randombytes": "^2.1.0" } }, + "node_modules/set-function-length": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-proto": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz", + "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "dunder-proto": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/shebang-command": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", @@ -5347,7 +7551,87 @@ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "license": "MIT", "engines": { - "node": ">=8" + "node": ">=8" + } + }, + "node_modules/side-channel": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/signal-exit": { @@ -5406,6 +7690,49 @@ "source-map": "^0.6.0" } }, + "node_modules/spdx-exceptions": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", + "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", + "dev": true, + "license": "CC-BY-3.0", + "peer": true + }, + "node_modules/spdx-expression-parse": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz", + "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "node_modules/spdx-license-ids": { + "version": "3.0.22", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz", + "integrity": "sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==", + "dev": true, + "license": "CC0-1.0", + "peer": true + }, + "node_modules/stop-iteration-iterator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz", + "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "es-errors": "^1.3.0", + "internal-slot": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/stream-events": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/stream-events/-/stream-events-1.0.5.tgz", @@ -5459,6 +7786,109 @@ "node": ">=8" } }, + "node_modules/string.prototype.matchall": { + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz", + "integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.6", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.6", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "internal-slot": "^1.1.0", + "regexp.prototype.flags": "^1.5.3", + "set-function-name": "^2.0.2", + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.repeat": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz", + "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + } + }, + "node_modules/string.prototype.trim": { + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz", + "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "define-data-property": "^1.1.4", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-object-atoms": "^1.0.0", + "has-property-descriptors": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimend": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz", + "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/string.prototype.trimstart": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", + "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/strip-ansi": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", @@ -5484,6 +7914,17 @@ "node": ">=8" } }, + "node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=4" + } + }, "node_modules/strip-final-newline": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", @@ -5497,6 +7938,20 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/strip-indent": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-4.1.1.tgz", + "integrity": "sha512-SlyRoSkdh1dYP0PzclLE7r0M9sgbFKKMFXpFRUMNuKhQSbC6VQIGzq3E0qsfvGJaUFJPGv6Ws1NZ/haTAjfbMA==", + "dev": true, + "license": "MIT", + "peer": true, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", @@ -5546,6 +8001,7 @@ "integrity": "sha512-MeQTA1r0litLUf0Rp/iisCaL8761lKAZHaimlbGK4j0HysC4PLfqygQj9srcs0m2RdtDYnF8UuYyKpbjHYp7Jw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@pkgr/core": "^0.2.9" }, @@ -5661,7 +8117,9 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, "license": "MIT", + "peer": true, "dependencies": { "is-number": "^7.0.0" }, @@ -5673,7 +8131,9 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz", "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==", + "dev": true, "license": "MIT", + "peer": true, "engines": { "node": ">=18.12" }, @@ -5681,6 +8141,42 @@ "typescript": ">=4.8.4" } }, + "node_modules/tsconfig-paths": { + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@types/json5": "^0.0.29", + "json5": "^1.0.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + } + }, + "node_modules/tsconfig-paths/node_modules/@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/tsconfig-paths/node_modules/json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, "node_modules/tsx": { "version": "4.20.6", "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.20.6.tgz", @@ -5723,6 +8219,88 @@ "node": ">=4" } }, + "node_modules/typed-array-buffer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", + "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/typed-array-byte-length": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz", + "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.8", + "for-each": "^0.3.3", + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.14" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-byte-offset": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz", + "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "for-each": "^0.3.3", + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.15", + "reflect.getprototypeof": "^1.0.9" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/typed-array-length": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz", + "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bind": "^1.0.7", + "for-each": "^0.3.3", + "gopd": "^1.0.1", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0", + "reflect.getprototypeof": "^1.0.6" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/typescript": { "version": "5.9.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", @@ -5742,6 +8320,7 @@ "integrity": "sha512-6+ZrB6y2bT2DX3K+Qd9vn7OFOJR+xSLDj+Aw/N3zBwUt27uTw2sw2TE2+UcY1RiyBZkaGbTkVg9SSdPNUG6aUw==", "dev": true, "license": "MIT", + "peer": true, "dependencies": { "@typescript-eslint/eslint-plugin": "8.46.0", "@typescript-eslint/parser": "8.46.0", @@ -5760,6 +8339,26 @@ "typescript": ">=4.8.4 <6.0.0" } }, + "node_modules/unbox-primitive": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz", + "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.3", + "has-bigints": "^1.0.2", + "has-symbols": "^1.1.0", + "which-boxed-primitive": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/undici-types": { "version": "6.21.0", "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", @@ -5785,6 +8384,46 @@ "node": ">=8" } }, + "node_modules/update-browserslist-db": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz", + "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "peer": true, + "dependencies": { + "escalade": "^3.2.0", + "picocolors": "^1.1.1" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/update-browserslist-db/node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true, + "license": "ISC", + "peer": true + }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", @@ -5833,6 +8472,107 @@ "node": ">= 8" } }, + "node_modules/which-boxed-primitive": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz", + "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "is-bigint": "^1.1.0", + "is-boolean-object": "^1.2.1", + "is-number-object": "^1.1.1", + "is-string": "^1.1.1", + "is-symbol": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-builtin-type": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz", + "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "call-bound": "^1.0.2", + "function.prototype.name": "^1.1.6", + "has-tostringtag": "^1.0.2", + "is-async-function": "^2.0.0", + "is-date-object": "^1.1.0", + "is-finalizationregistry": "^1.1.0", + "is-generator-function": "^1.0.10", + "is-regex": "^1.2.1", + "is-weakref": "^1.0.2", + "isarray": "^2.0.5", + "which-boxed-primitive": "^1.1.0", + "which-collection": "^1.0.2", + "which-typed-array": "^1.1.16" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-builtin-type/node_modules/isarray": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true, + "license": "MIT", + "peer": true + }, + "node_modules/which-collection": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", + "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "is-map": "^2.0.3", + "is-set": "^2.0.3", + "is-weakmap": "^2.0.2", + "is-weakset": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/which-typed-array": { + "version": "1.1.19", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", + "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==", + "dev": true, + "license": "MIT", + "peer": true, + "dependencies": { + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.4", + "for-each": "^0.3.5", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/word-wrap": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", diff --git a/package.json b/package.json index b21d2864a..224c03895 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,7 @@ }, "devDependencies": { "@alcalzone/release-script": "^4.0.0", + "@iobroker/eslint-config": "^2.2.0", "@tsconfig/node20": "^20.1.6", "@types/chai": "^4.3.20", "@types/chai-as-promised": "^7.1.8", @@ -48,12 +49,9 @@ "@types/sinon": "^17.0.4", "@types/sinon-chai": "^3.2.12", "@types/yargs": "^17.0.33", - "@typescript-eslint/eslint-plugin": "^8.46.0", "chai": "^4.5.0", "chai-as-promised": "^7.1.2", "copyfiles": "^2.4.1", - "eslint-config-prettier": "^10.1.8", - "eslint-plugin-prettier": "^5.5.4", "execa": "^8.0.1", "jsonschema": "^1.5.0", "mocha": "^11.7.4", @@ -62,12 +60,10 @@ "sinon": "^21.0.0", "sinon-chai": "^3.7.0", "source-map-support": "^0.5.21", - "tsx": "^4.20.6", - "typescript-eslint": "^8.46.0" + "tsx": "^4.20.6" }, "dependencies": { "@iobroker/adapter-dev": "^1.5.0", - "@typescript-eslint/parser": "^8.46.0", "alcalzone-shared": "^4.0.8", "ansi-colors": "^4.1.3", "axios": "^1.12.2", diff --git a/prettier.config.mjs b/prettier.config.mjs new file mode 100644 index 000000000..3ab1728fa --- /dev/null +++ b/prettier.config.mjs @@ -0,0 +1,10 @@ +// ioBroker prettier configuration file +import prettierConfig from "@iobroker/eslint-config/prettier.config.mjs"; + +export default { + ...prettierConfig, + // Use tabs for indentation (project preference) + useTabs: true, + // Keep double quotes as this project prefers them + singleQuote: false, +}; diff --git a/src/lib/core.test.ts b/src/lib/core.test.ts index f45b16591..d84516910 100644 --- a/src/lib/core.test.ts +++ b/src/lib/core.test.ts @@ -1,14 +1,10 @@ import { readdir, readFile } from "fs/promises"; import { join, resolve } from "path"; -const testAllFiles = async ( - assertion: (content: string, filename: string) => void, -) => { +const testAllFiles = async (assertion: (content: string, filename: string) => void) => { const baseDir = resolve(__dirname, "./core"); const files = await readdir(baseDir); - for (const file of files.filter( - (f) => f.endsWith(".ts") && !f.endsWith(".test.ts"), - )) { + for (const file of files.filter(f => f.endsWith(".ts") && !f.endsWith(".test.ts"))) { const content = await readFile(join(baseDir, file), { encoding: "utf8", }); @@ -23,46 +19,31 @@ const testAllFiles = async ( describe("./core directory", () => { it("should not contain any imports from base directory (../)", async () => { testAllFiles((content, file) => - content.should.not.match( - /import .+ from "\.\./gi, - `${file} contains an import from the base directory`, - ), + content.should.not.match(/import .+ from "\.\./gi, `${file} contains an import from the base directory`), ); }); it('should not contain any imports from "os"', async () => { await testAllFiles((content, file) => - content.should.not.match( - /import .+ from "os";/gi, - `${file} contains an import from "os"`, - ), + content.should.not.match(/import .+ from "os";/gi, `${file} contains an import from "os"`), ); }); it('should not contain any imports from "fs"', async () => { await testAllFiles((content, file) => - content.should.not.match( - /import .+ from "fs";/gi, - `${file} contains an import from "fs"`, - ), + content.should.not.match(/import .+ from "fs";/gi, `${file} contains an import from "fs"`), ); }); it('should not contain any imports from "fs-extra"', async () => { await testAllFiles((content, file) => - content.should.not.match( - /import .+ from "fs-extra";/gi, - `${file} contains an import from "fs-extra"`, - ), + content.should.not.match(/import .+ from "fs-extra";/gi, `${file} contains an import from "fs-extra"`), ); }); it('should not contain any imports from "path"', async () => { await testAllFiles((content, file) => - content.should.not.match( - /import .+ from "path";/gi, - `${file} contains an import from "path"`, - ), + content.should.not.match(/import .+ from "path";/gi, `${file} contains an import from "path"`), ); }); }); diff --git a/src/lib/createAdapter.test.ts b/src/lib/createAdapter.test.ts index 1b8aa9b7f..def82b5c3 100644 --- a/src/lib/createAdapter.test.ts +++ b/src/lib/createAdapter.test.ts @@ -13,9 +13,7 @@ const fsStub = { }, }; -const { readFile, readFileFromRootDir } = proxyquire< - typeof import("./createAdapter") ->("./createAdapter", { +const { readFile, readFileFromRootDir } = proxyquire("./createAdapter", { fs: fsStub, "fs-extra": fsStub, }); @@ -26,9 +24,7 @@ describe("createAdapter/readFile()", () => { it("calls fs.readFile with the absolute path", async () => { fsStub.readFile.resolves(); await readFile("../filename", "dir/lib/what", false); - fsStub.readFile.should.have.been.calledOnceWith( - path.normalize("dir/lib/filename"), - ); + fsStub.readFile.should.have.been.calledOnceWith(path.normalize("dir/lib/filename")); }); it(`passes "utf8" as the encoding when the binary option is false`, async () => { @@ -46,21 +42,15 @@ describe("createAdapter/readFile()", () => { it(`does not pass an encoding when the binary option is true`, async () => { fsStub.readFile.resolves(); await readFile("../filename", "dir/lib/what", true); - fsStub.readFile.should.have.been.calledOnceWithExactly( - path.normalize("dir/lib/filename"), - ); + fsStub.readFile.should.have.been.calledOnceWithExactly(path.normalize("dir/lib/filename")); }); it("returns the raw value from fs.readFile", async () => { fsStub.readFile.resolves("foo"); - await readFile("../filename", "dir/lib/what", false).should.become( - "foo", - ); + await readFile("../filename", "dir/lib/what", false).should.become("foo"); fsStub.readFile.resolves("bar"); - await readFile("../filename", "dir/lib/what", false).should.become( - "bar", - ); + await readFile("../filename", "dir/lib/what", false).should.become("bar"); }); }); diff --git a/src/lib/createAdapter.ts b/src/lib/createAdapter.ts index 624a06d7e..09a076936 100644 --- a/src/lib/createAdapter.ts +++ b/src/lib/createAdapter.ts @@ -3,33 +3,48 @@ import * as os from "os"; import * as path from "path"; import templateFiles from "../../templates"; import type { Answers } from "./core/questions"; -import { - formatWithPrettier, - getOwnVersion, - indentWithSpaces, - indentWithTabs, - jsFixQuotes, - tsFixQuotes, -} from "./tools"; +import { formatWithPrettier, getOwnVersion, indentWithSpaces, indentWithTabs, jsFixQuotes, tsFixQuotes } from "./tools"; interface AnswersMeta { creatorVersion: string; } type TemplateFunctionReturnType = string | Buffer | undefined; +/** + * + */ export interface TemplateFunction { - ( - answers: Answers & AnswersMeta, - ): TemplateFunctionReturnType | Promise; + (answers: Answers & AnswersMeta): TemplateFunctionReturnType | Promise; + /** + * + */ customPath?: string | ((answers: Answers & AnswersMeta) => string); + /** + * + */ noReformat?: boolean; } +/** + * + */ export interface File { + /** + * + */ name: string; + /** + * + */ content: string | Buffer; + /** + * + */ noReformat: boolean; } +/** + * + */ export async function createFiles(answers: Answers): Promise { const creatorVersion: string = getOwnVersion(); const answersWithMeta: Answers & AnswersMeta = { @@ -47,25 +62,24 @@ export async function createFiles(answers: Answers): Promise { const templateResult = templateFunction(answersWithMeta); return { name: customPath, - content: - templateResult instanceof Promise - ? await templateResult - : templateResult, + content: templateResult instanceof Promise ? await templateResult : templateResult, noReformat: templateFunction.noReformat === true, }; }), ); - const necessaryFiles = files.filter( - (f) => f.content != undefined, - ) as File[]; + const necessaryFiles = files.filter(f => f.content != undefined) as File[]; return formatFiles(answers, necessaryFiles); } -/** Formats files that are not explicitly forbidden to be formatted */ +/** + * Formats files that are not explicitly forbidden to be formatted + * + * @param answers + * @param files + */ function formatFiles(answers: Answers, files: File[]): Promise { // Normalize indentation considering user preference - const indentation = - answers.indentation === "Tab" ? indentWithTabs : indentWithSpaces; + const indentation = answers.indentation === "Tab" ? indentWithTabs : indentWithSpaces; // Remove multiple subsequent empty lines (can happen during template creation). const removeEmptyLines = (text: string): string => { return ( @@ -76,32 +90,29 @@ function formatFiles(answers: Answers, files: File[]): Promise { .replace(/\n/g, os.EOL) ); }; - const trimWhitespaceLines = (text: string): string => - text && text.replace(/^[ \t]+$/gm, ""); - const formatter = (text: string): string => - trimWhitespaceLines(removeEmptyLines(indentation(text))); + const trimWhitespaceLines = (text: string): string => text && text.replace(/^[ \t]+$/gm, ""); + const formatter = (text: string): string => trimWhitespaceLines(removeEmptyLines(indentation(text))); const usePrettier = answers.tools && answers.tools.indexOf("Prettier") > -1; - const formatted = files.map(async (f) => { - if (f.noReformat || typeof f.content !== "string") return f; + const formatted = files.map(async f => { + if (f.noReformat || typeof f.content !== "string") { + return f; + } if (usePrettier && /\.(jsx?|json|tsx?)$/.test(f.name)) { // Use prettier to format JS/TS/JSON code const extension = f.name.slice(f.name.lastIndexOf(".") + 1); - f.content = await formatWithPrettier( - f.content, - answers, - extension as any, - ); + f.content = await formatWithPrettier(f.content, answers, extension as any); } else { // We are using our own handmade formatters // 1st step: Apply formatters that are valid for all files f.content = formatter(f.content); // 2nd step: Apply more specialized formatters if (answers.quotes != undefined) { - if (f.name.endsWith(".js") || f.name.endsWith(".jsx")) + if (f.name.endsWith(".js") || f.name.endsWith(".jsx")) { f.content = jsFixQuotes(f.content, answers.quotes); - else if (f.name.endsWith(".ts") || f.name.endsWith(".tsx")) + } else if (f.name.endsWith(".ts") || f.name.endsWith(".tsx")) { f.content = tsFixQuotes(f.content, answers.quotes); + } } } return f; @@ -109,10 +120,10 @@ function formatFiles(answers: Answers, files: File[]): Promise { return Promise.all(formatted); } -export async function writeFiles( - targetDir: string, - files: File[], -): Promise { +/** + * + */ +export async function writeFiles(targetDir: string, files: File[]): Promise { // write the files and make sure the target dirs exist for (const file of files) { await fs.outputFile( @@ -123,25 +134,31 @@ export async function writeFiles( } } -export async function readFile( - file: string, - relativeTo: string, - binary: boolean = false, -): Promise { +/** + * + */ +export async function readFile(file: string, relativeTo: string, binary: boolean = false): Promise { const absolutePath = path.join(relativeTo, file); - if (binary) return fs.readFile(absolutePath); - else return fs.readFile(absolutePath, "utf8"); + if (binary) { + return fs.readFile(absolutePath); + } + return fs.readFile(absolutePath, "utf8"); } /** * Reads a file that resides on the root dir. After compilation, this is one folder higher than at build time + * + * @param file + * @param relativeTo + * @param binary */ export async function readFileFromRootDir( file: string, relativeTo: string, binary: boolean = false, ): Promise { - if (await fs.pathExists(path.join(relativeTo, file))) + if (await fs.pathExists(path.join(relativeTo, file))) { return readFile(file, relativeTo, binary); - else return readFile(path.join("..", file), relativeTo, binary); + } + return readFile(path.join("..", file), relativeTo, binary); } diff --git a/src/lib/localMigrationContext.test.ts b/src/lib/localMigrationContext.test.ts index 1588e469c..a6ef2b494 100644 --- a/src/lib/localMigrationContext.test.ts +++ b/src/lib/localMigrationContext.test.ts @@ -46,36 +46,22 @@ describe("LocalMigrationContext.fileExists()", () => { describe("LocalMigrationContext.hasFilesWithExtension()", () => { it("should return true if files exist", async () => { const context = new LocalMigrationContext(__dirname); - expect(await context.hasFilesWithExtension("../..", ".json")).to.be - .true; + expect(await context.hasFilesWithExtension("../..", ".json")).to.be.true; expect(await context.hasFilesWithExtension("..", ".ts")).to.be.true; - expect( - await context.hasFilesWithExtension( - "..", - ".ts", - (f) => !f.endsWith("cli.ts"), - ), - ).to.be.true; + expect(await context.hasFilesWithExtension("..", ".ts", f => !f.endsWith("cli.ts"))).to.be.true; }); it("should return false if no files exist", async () => { const context = new LocalMigrationContext(__dirname); expect(await context.hasFilesWithExtension("..", ".xls")).to.be.false; expect(await context.hasFilesWithExtension("..", ".dts")).to.be.false; - expect( - await context.hasFilesWithExtension( - "..", - ".ts", - (f) => !f.includes("i"), - ), - ).to.be.false; + expect(await context.hasFilesWithExtension("..", ".ts", f => !f.includes("i"))).to.be.false; }); it("should return false if the directory doesn't exist", async () => { const context = new LocalMigrationContext(__dirname); expect(await context.hasFilesWithExtension("foo", ".json")).to.be.false; - expect(await context.hasFilesWithExtension("../bar", ".ts")).to.be - .false; + expect(await context.hasFilesWithExtension("../bar", ".ts")).to.be.false; }); }); @@ -115,9 +101,7 @@ describe("LocalMigrationContext.getMainFileContent()", () => { main: "build/src/cli.js", }; expect(await context.getMainFileContent()).not.to.be.empty; - expect(await context.getMainFileContent()).to.contain( - "import * as yargs", - ); + expect(await context.getMainFileContent()).to.contain("import * as yargs"); }); } @@ -128,9 +112,7 @@ describe("LocalMigrationContext.getMainFileContent()", () => { main: "bin/create-adapter.js", }; expect(await context.getMainFileContent()).not.to.be.empty; - expect(await context.getMainFileContent()).to.contain( - "#!/usr/bin/env node", - ); + expect(await context.getMainFileContent()).to.contain("#!/usr/bin/env node"); }); it("should return an empty string if no main file is found", async () => { diff --git a/src/lib/localMigrationContext.ts b/src/lib/localMigrationContext.ts index f06346a21..6a68cf15a 100644 --- a/src/lib/localMigrationContext.ts +++ b/src/lib/localMigrationContext.ts @@ -2,40 +2,67 @@ import { existsSync, readdir, readFile, readJson, stat } from "fs-extra"; import { MigrationContextBase } from "./core/migrationContextBase"; import path = require("path"); +/** + * + */ export class LocalMigrationContext extends MigrationContextBase { + /** + * + */ constructor(private readonly baseDir: string) { super(); } + /** + * + */ public async load(): Promise { this.packageJson = await this.readJsonFile("package.json"); this.ioPackageJson = await this.readJsonFile("io-package.json"); } + /** + * + */ public joinPath(...parts: string[]): string { return path.join(...parts); } + /** + * + */ public readTextFile(fileName: string): Promise { return readFile(path.join(this.baseDir, fileName), { encoding: "utf8", }); } + /** + * + */ public async readJsonFile(fileName: string): Promise> { return readJson(path.join(this.baseDir, fileName)); } + /** + * + */ public async directoryExists(dirName: string): Promise { const fullPath = path.join(this.baseDir, dirName); return existsSync(fullPath) && (await stat(fullPath)).isDirectory(); } + /** + * + */ public async fileExists(dirName: string): Promise { const fullPath = path.join(this.baseDir, dirName); return existsSync(fullPath) && (await stat(fullPath)).isFile(); } + /** + * + */ public async hasFilesWithExtension( dirName: string, extension: string, @@ -44,9 +71,7 @@ export class LocalMigrationContext extends MigrationContextBase { return ( (await this.directoryExists(dirName)) && (await readdir(path.join(this.baseDir, dirName))).some( - (f) => - (!filter || filter(f)) && - f.toLowerCase().endsWith(extension.toLowerCase()), + f => (!filter || filter(f)) && f.toLowerCase().endsWith(extension.toLowerCase()), ) ); } diff --git a/src/lib/packageVersions.test.ts b/src/lib/packageVersions.test.ts index 9516172fa..b586cf04b 100644 --- a/src/lib/packageVersions.test.ts +++ b/src/lib/packageVersions.test.ts @@ -6,11 +6,12 @@ import { getPackageName, getVersionSpecifier } from "./packageVersions"; const axiosMock = stub(); const proxyquire = proxyquireModule.noPreserveCache(); -const { fetchPackageVersion, fetchPackageReferenceVersion } = proxyquire< - typeof import("./packageVersions") ->("./packageVersions", { - axios: { request: axiosMock }, -}); +const { fetchPackageVersion, fetchPackageReferenceVersion } = proxyquire( + "./packageVersions", + { + axios: { request: axiosMock }, + }, +); function returnVersions(versions: string[]) { const ret: any = { @@ -44,13 +45,11 @@ function getRandomPackageName() { function getRandomPackageVersion() { return [0, 0, 0] .map(() => Math.round(Math.random() * 10)) - .map((v) => v.toString()) + .map(v => v.toString()) .join("."); } -function getRandomPackageNameAndVersion( - version: string = getRandomPackageVersion(), -) { +function getRandomPackageNameAndVersion(version: string = getRandomPackageVersion()) { return `${getRandomPackageName()}@${version}`; } @@ -106,18 +105,13 @@ describe("packageVersions/fetchPackageVersion(latest)", () => { it("for status codes other than 200, an error is thrown", async () => { returnStatus(403); - await fetchPackageVersion( - getRandomPackageName(), - ).should.be.rejectedWith("403"); + await fetchPackageVersion(getRandomPackageName()).should.be.rejectedWith("403"); }); it("for status codes other than 200, the fallback version is returned if it is passed", async () => { returnStatus(403); const version = "1.2.3-beta"; - await fetchPackageVersion( - getRandomPackageName(), - version, - ).should.become(version); + await fetchPackageVersion(getRandomPackageName(), version).should.become(version); }); it("if the status code is 200, the latest version is extracted from the response data", async () => { @@ -149,9 +143,7 @@ describe("packageVersions/fetchPackageVersion(latest)", () => { axiosMock.should.have.been.called; expect(axiosMock.getCall(0).args[0]).to.be.an("object"); expect(axiosMock.getCall(0).args[0].url).to.include("/-/package/"); - expect(axiosMock.getCall(0).args[0].url).to.include( - encodeURIComponent("bar-baz"), - ); + expect(axiosMock.getCall(0).args[0].url).to.include(encodeURIComponent("bar-baz")); }); it("the request object should contain a default timeout of 5000ms", async () => { @@ -217,31 +209,20 @@ describe("packageVersions/fetchPackageVersion(specific)", () => { it("for status codes other than 200, an error is thrown", async () => { returnStatus(403); - await fetchPackageVersion( - getRandomPackageNameAndVersion(), - ).should.be.rejectedWith("403"); + await fetchPackageVersion(getRandomPackageNameAndVersion()).should.be.rejectedWith("403"); }); it("for status codes other than 200, the fallback version is returned if it is passed", async () => { returnStatus(403); const version = "1.2.3-beta"; - await fetchPackageVersion( - getRandomPackageNameAndVersion(), - version, - ).should.become(version); + await fetchPackageVersion(getRandomPackageNameAndVersion(), version).should.become(version); }); it("if the status code is 200, the highest matching version is extracted from the response data", async () => { returnVersions(testVersions); - await fetchPackageVersion(getRandomPackageName() + "@1").should.become( - "1.3.5", - ); - await fetchPackageVersion( - getRandomPackageName() + "@~1.2", - ).should.become("1.2.4"); - await fetchPackageVersion(getRandomPackageName() + "@2").should.become( - "2.3.4", - ); + await fetchPackageVersion(`${getRandomPackageName()}@1`).should.become("1.3.5"); + await fetchPackageVersion(`${getRandomPackageName()}@~1.2`).should.become("1.2.4"); + await fetchPackageVersion(`${getRandomPackageName()}@2`).should.become("2.3.4"); }); it("subsequent requests should return a cached version instead of issuing another request", async () => { @@ -267,9 +248,7 @@ describe("packageVersions/fetchPackageVersion(specific)", () => { axiosMock.should.have.been.called; expect(axiosMock.getCall(0).args[0]).to.be.an("object"); expect(axiosMock.getCall(0).args[0].url).to.not.include("/-/package/"); - expect(axiosMock.getCall(0).args[0].url).to.include( - encodeURIComponent("bar-baz"), - ); + expect(axiosMock.getCall(0).args[0].url).to.include(encodeURIComponent("bar-baz")); }); }); @@ -284,42 +263,24 @@ describe("packageVersions/fetchPackageReferenceVersion()", () => { it("for status codes other than 200, the requested version is returned", async () => { returnStatus(403); const version = "3.13.5"; - await fetchPackageReferenceVersion( - getRandomPackageNameAndVersion(version), - ).should.become(version); + await fetchPackageReferenceVersion(getRandomPackageNameAndVersion(version)).should.become(version); }); it("if the status code is 200, the highest matching version is extracted from the response data", async () => { returnVersions(testVersions); // cases for major version ("^") - await fetchPackageReferenceVersion( - getRandomPackageName() + "@1", - ).should.become("^1.3.5"); - await fetchPackageReferenceVersion( - getRandomPackageName() + "@^1", - ).should.become("^1.3.5"); - await fetchPackageReferenceVersion( - getRandomPackageName() + "@^1.1", - ).should.become("^1.3.5"); - await fetchPackageReferenceVersion( - getRandomPackageName() + "@^1.1.1", - ).should.become("^1.3.5"); + await fetchPackageReferenceVersion(`${getRandomPackageName()}@1`).should.become("^1.3.5"); + await fetchPackageReferenceVersion(`${getRandomPackageName()}@^1`).should.become("^1.3.5"); + await fetchPackageReferenceVersion(`${getRandomPackageName()}@^1.1`).should.become("^1.3.5"); + await fetchPackageReferenceVersion(`${getRandomPackageName()}@^1.1.1`).should.become("^1.3.5"); // cases for minor version ("~") - await fetchPackageReferenceVersion( - getRandomPackageName() + "@1.2", - ).should.become("~1.2.4"); - await fetchPackageReferenceVersion( - getRandomPackageName() + "@~1.2", - ).should.become("~1.2.4"); - await fetchPackageReferenceVersion( - getRandomPackageName() + "@~1.2.1", - ).should.become("~1.2.4"); + await fetchPackageReferenceVersion(`${getRandomPackageName()}@1.2`).should.become("~1.2.4"); + await fetchPackageReferenceVersion(`${getRandomPackageName()}@~1.2`).should.become("~1.2.4"); + await fetchPackageReferenceVersion(`${getRandomPackageName()}@~1.2.1`).should.become("~1.2.4"); // cases for exact version (no prefix) - await fetchPackageVersion( - getRandomPackageName() + "@1.2.4", - ).should.become("1.2.4"); + await fetchPackageVersion(`${getRandomPackageName()}@1.2.4`).should.become("1.2.4"); }); }); diff --git a/src/lib/packageVersions.ts b/src/lib/packageVersions.ts index 150dc10b0..1510d6ee7 100644 --- a/src/lib/packageVersions.ts +++ b/src/lib/packageVersions.ts @@ -10,14 +10,18 @@ export function hasVersionSpecifier(packageName: string): boolean { return packageName.lastIndexOf("@") > 0; } -export function getVersionSpecifier( - packageNameAndVersion: string, -): string | undefined { +export function getVersionSpecifier(packageNameAndVersion: string): string | undefined { const atIndex = packageNameAndVersion.lastIndexOf("@"); - if (atIndex > 0) return packageNameAndVersion.slice(atIndex + 1); + if (atIndex > 0) { + return packageNameAndVersion.slice(atIndex + 1); + } } -/** Returns only the package name from a string of the form [@scope/]package-name@version */ +/** + * Returns only the package name from a string of the form [@scope/]package-name@version + * + * @param packageNameAndVersion + */ export function getPackageName(packageNameAndVersion: string): string { const atIndex = packageNameAndVersion.lastIndexOf("@"); if (atIndex > 0) { @@ -28,13 +32,15 @@ export function getPackageName(packageNameAndVersion: string): string { /** * Returns the latest version of an npm package + * * @param packageName The npm package name * @param fallbackVersion The fallback version to return in case anything goes wrong. If this is set, no error is thrown. */ async function fetchAllPackageVersions(packageName: string): Promise { - if (allVersionsCache.has(packageName)) + if (allVersionsCache.has(packageName)) { return allVersionsCache.get(packageName)!; + } const packageURIComponent = encodeURIComponent(packageName); const url = `https://registry.npmjs.org/${packageURIComponent}`; @@ -45,42 +51,36 @@ async function fetchAllPackageVersions(packageName: string): Promise { const response = await axios.request(options); if (response.status !== 200) { - throw new Error( - `Failed to fetch the versions for ${packageName} (${response.status})`, - ); + throw new Error(`Failed to fetch the versions for ${packageName} (${response.status})`); } const allVersions = Object.keys(response.data.versions); allVersionsCache.set(packageName, allVersions); return allVersions; } -async function fetchSpecificPackageVersion( - packageNameAndVersion: string, - fallbackVersion?: string, -): Promise { +async function fetchSpecificPackageVersion(packageNameAndVersion: string, fallbackVersion?: string): Promise { // A specific version is requested, return the highest version matching the specifier try { const versionSpecifier = getVersionSpecifier(packageNameAndVersion)!; const packageName = getPackageName(packageNameAndVersion); const allVersions = await fetchAllPackageVersions(packageName); const ret = semver.maxSatisfying(allVersions, versionSpecifier); - if (!ret) - throw new Error( - `No version of ${packageName} found matching ${versionSpecifier}`, - ); + if (!ret) { + throw new Error(`No version of ${packageName} found matching ${versionSpecifier}`); + } return ret; } catch (e) { - if (fallbackVersion) return fallbackVersion; + if (fallbackVersion) { + return fallbackVersion; + } throw e; } } -async function fetchLatestPackageVersion( - packageName: string, - fallbackVersion?: string, -): Promise { - if (latestVersionCache.has(packageName)) +async function fetchLatestPackageVersion(packageName: string, fallbackVersion?: string): Promise { + if (latestVersionCache.has(packageName)) { return latestVersionCache.get(packageName)!; + } const packageURIComponent = encodeURIComponent(packageName); const url = `https://registry.npmjs.org/-/package/${packageURIComponent}/dist-tags`; @@ -91,10 +91,10 @@ async function fetchLatestPackageVersion( const response = await axios.request(options); if (response.status !== 200) { - if (fallbackVersion) return fallbackVersion; - throw new Error( - `Failed to fetch the version for ${packageName} (${response.status})`, - ); + if (fallbackVersion) { + return fallbackVersion; + } + throw new Error(`Failed to fetch the version for ${packageName} (${response.status})`); } const version = response.data.latest as string; latestVersionCache.set(packageName, version); @@ -103,45 +103,34 @@ async function fetchLatestPackageVersion( /** * Returns the latest version of an npm package + * * @param packageName The npm package name * @param fallbackVersion The fallback version to return in case anything goes wrong. If this is set, no error is thrown. */ -export async function fetchPackageVersion( - packageName: string, - fallbackVersion?: string, -): Promise { +export async function fetchPackageVersion(packageName: string, fallbackVersion?: string): Promise { if (hasVersionSpecifier(packageName)) { return fetchSpecificPackageVersion(packageName, fallbackVersion); - } else { - return fetchLatestPackageVersion(packageName, fallbackVersion); } + return fetchLatestPackageVersion(packageName, fallbackVersion); } /** * Returns the reference to the version of an npm package + * * @param packageName The npm package name (may include a version specifier like `abc@1.2.3`) */ -export async function fetchPackageReferenceVersion( - packageName: string, -): Promise { +export async function fetchPackageReferenceVersion(packageName: string): Promise { if (hasVersionSpecifier(packageName)) { const versionSpecifier = getVersionSpecifier(packageName)!; const pureVersionSpec = versionSpecifier.replace(/^[\^~]/, "").trim(); - const versionDepth = pureVersionSpec - .replace(/^(0\.)+/, "") - .split(".").length; - const version = await fetchSpecificPackageVersion( - packageName, - pureVersionSpec, - ); + const versionDepth = pureVersionSpec.replace(/^(0\.)+/, "").split(".").length; + const version = await fetchSpecificPackageVersion(packageName, pureVersionSpec); if (versionSpecifier.charAt(0) === "^" || versionDepth <= 1) { return `^${version}`; } else if (versionSpecifier.charAt(0) === "~" || versionDepth == 2) { return `~${version}`; - } else { - return version; } - } else { - return `^${await fetchLatestPackageVersion(packageName, "0.0.0")}`; + return version; } + return `^${await fetchLatestPackageVersion(packageName, "0.0.0")}`; } diff --git a/src/lib/tools.test.ts b/src/lib/tools.test.ts index 730ab070e..b4fcc766e 100644 --- a/src/lib/tools.test.ts +++ b/src/lib/tools.test.ts @@ -254,8 +254,7 @@ describe("tools/formatLicense()", () => { expected: answers.authorName, }, { - original: - "[name of copyright owner] [name of copyright owner] [name of copyright owner]", + original: "[name of copyright owner] [name of copyright owner] [name of copyright owner]", expected: `${answers.authorName} ${answers.authorName} ${answers.authorName}`, }, ]; @@ -311,13 +310,7 @@ foo( function foo() { return;} `; const expected = `foo('baz');\n\nfunction foo() {\n\treturn;\n}\n`; - expect( - await formatWithPrettier( - input, - { indentation: "Tab", quotes: "single" }, - "js", - ), - ).to.equal(expected); + expect(await formatWithPrettier(input, { indentation: "Tab", quotes: "single" }, "js")).to.equal(expected); }); it("should format TS code according to the Prettier rules", async () => { @@ -330,12 +323,8 @@ foo( function foo() { return;} `; const expected = `foo("baz");\n\nfunction foo() {\n return;\n}\n`; - expect( - await formatWithPrettier( - input, - { indentation: "Space (4)", quotes: "double" }, - "ts", - ), - ).to.equal(expected); + expect(await formatWithPrettier(input, { indentation: "Space (4)", quotes: "double" }, "ts")).to.equal( + expected, + ); }); }); diff --git a/src/lib/tools.ts b/src/lib/tools.ts index a70e5b468..9ee5f208e 100644 --- a/src/lib/tools.ts +++ b/src/lib/tools.ts @@ -22,6 +22,7 @@ export const isWindows = /^win/.test(os.platform()); /** * Executes an npm command with update-notifier disabled and common parameters + * * @param args The npm command arguments * @param options (optional) Some options for the command execution */ @@ -53,11 +54,7 @@ export function executeNpmCommand( npm_config_update_notifier: "false", }, }; - return executeCommand( - isWindows ? "npm.cmd" : "npm", - enhancedArgs, - npmOptions, - ); + return executeCommand(isWindows ? "npm.cmd" : "npm", enhancedArgs, npmOptions); } export interface ExecuteCommandOptions { @@ -92,6 +89,7 @@ export function executeCommand( ): Promise; /** * Executes a command and returns the exit code and (if requested) the stdout + * * @param command The command to execute * @param args The command line arguments for the command * @param options (optional) Some options for the command execution @@ -106,7 +104,7 @@ export function executeCommand( argsOrOptions?: string[] | Partial, options?: Partial, ): Promise { - return new Promise((resolve) => { + return new Promise(resolve => { let args: string[] | undefined; if (Array.isArray(argsOrOptions)) { args = argsOrOptions; @@ -114,22 +112,25 @@ export function executeCommand( // no args were given options = argsOrOptions; } - if (options == null) options = {}; - if (args == null) args = []; + if (options == null) { + options = {}; + } + if (args == null) { + args = []; + } const spawnOptions: SpawnOptions = { - stdio: [ - options.stdin || process.stdin, - options.stdout || process.stdout, - options.stderr || process.stderr, - ], + stdio: [options.stdin || process.stdin, options.stdout || process.stdout, options.stderr || process.stderr], windowsHide: true, env: options.env ? { ...process.env, ...options.env } : process.env, }; - if (options.cwd != null) spawnOptions.cwd = options.cwd; + if (options.cwd != null) { + spawnOptions.cwd = options.cwd; + } - if (options.logCommandExecution == null) + if (options.logCommandExecution == null) { options.logCommandExecution = false; + } if (options.logCommandExecution) { console.log("executing: " + `${command} ${args.join(" ")}`); } @@ -138,32 +139,25 @@ export function executeCommand( try { let bufferedStdout: string | undefined; let bufferedStderr: string | undefined; - const cmd = spawn(command, args, spawnOptions).on( - "close", - (code, signal) => { - resolve({ - exitCode: code ?? undefined, - signal: signal ?? undefined, - stdout: bufferedStdout, - stderr: bufferedStderr, - }); - }, - ); + const cmd = spawn(command, args, spawnOptions).on("close", (code, signal) => { + resolve({ + exitCode: code ?? undefined, + signal: signal ?? undefined, + stdout: bufferedStdout, + stderr: bufferedStderr, + }); + }); // Capture stdout/stderr if requested if (options.stdout === "pipe") { bufferedStdout = ""; - cmd.stdout!.on("data", (chunk) => { - bufferedStdout += Buffer.isBuffer(chunk) - ? chunk.toString("utf8") - : chunk; + cmd.stdout!.on("data", chunk => { + bufferedStdout += Buffer.isBuffer(chunk) ? chunk.toString("utf8") : chunk; }); } if (options.stderr === "pipe") { bufferedStderr = ""; - cmd.stderr!.on("data", (chunk) => { - bufferedStderr += Buffer.isBuffer(chunk) - ? chunk.toString("utf8") - : chunk; + cmd.stderr!.on("data", chunk => { + bufferedStderr += Buffer.isBuffer(chunk) ? chunk.toString("utf8") : chunk; }); } } catch { @@ -174,6 +168,7 @@ export function executeCommand( /** * Recursively enumerates all files in the given directory + * * @param dir The directory to scan * @param predicate An optional predicate to apply to every found file system entry * @returns A list of all files found @@ -183,12 +178,14 @@ export function enumFilesRecursiveSync( predicate?: (name: string, parentDir: string) => boolean, ): string[] { const ret = []; - if (typeof predicate !== "function") predicate = () => true; + if (typeof predicate !== "function") { + predicate = () => true; + } // enumerate all files in this directory const filesOrDirs = fs .readdirSync(dir) - .filter((f) => predicate!(f, dir)) // exclude all files starting with "." - .map((f) => path.join(dir, f)); // and prepend the full path + .filter(f => predicate(f, dir)) // exclude all files starting with "." + .map(f => path.join(dir, f)); // and prepend the full path for (const entry of filesOrDirs) { if (fs.statSync(entry).isDirectory()) { // Continue recursing this directory and remember the files there @@ -203,6 +200,7 @@ export function enumFilesRecursiveSync( /** * Recursively copies all files from the source to the target directory + * * @param sourceDir The directory to scan * @param targetDir The directory to copy to * @param predicate An optional predicate to apply to every found file system entry @@ -217,10 +215,7 @@ export function copyFilesRecursiveSync( // Copy all of them to the corresponding target dir for (const file of filesToCopy) { // Find out where it's supposed to be - const targetFileName = path.join( - targetDir, - path.relative(sourceDir, file), - ); + const targetFileName = path.join(targetDir, path.relative(sourceDir, file)); // Ensure the directory exists fs.ensureDirSync(path.dirname(targetFileName)); // And copy the file @@ -230,13 +225,11 @@ export function copyFilesRecursiveSync( /** * Adds https proxy options to an axios request if they were defined as an env variable + * * @param options The options object passed to axios */ -export function applyHttpsProxy( - options: AxiosRequestConfig, -): AxiosRequestConfig { - const proxy: string | undefined = - process.env.https_proxy || process.env.HTTPS_PROXY; +export function applyHttpsProxy(options: AxiosRequestConfig): AxiosRequestConfig { + const proxy: string | undefined = process.env.https_proxy || process.env.HTTPS_PROXY; if (proxy) { try { const proxyUrl = new URL(proxy); @@ -271,28 +264,38 @@ export function getFormattedLicense(answers: Answers): string { return "TODO: enter license text here"; } -/** Replaces 4-space indentation with tabs */ +/** + * Replaces 4-space indentation with tabs + * + * @param text + */ export function indentWithTabs(text: string): string { - if (!text) return text; - return text.replace(/^( {4})+/gm, (match) => "\t".repeat(match.length / 4)); + if (!text) { + return text; + } + return text.replace(/^( {4})+/gm, match => "\t".repeat(match.length / 4)); } -/** Replaces tab indentation with 4 spaces */ +/** + * Replaces tab indentation with 4 spaces + * + * @param text + */ export function indentWithSpaces(text: string): string { - if (!text) return text; - return text.replace(/^(\t)+/gm, (match) => " ".repeat(match.length * 4)); + if (!text) { + return text; + } + return text.replace(/^(\t)+/gm, match => " ".repeat(match.length * 4)); } -/** Normalizes formatting of a JSON string */ -export function formatJsonString( - json: string, - indentation: "Tab" | "Space (4)", -): string { - return JSON.stringify( - JSON5.parse(json), - null, - indentation === "Tab" ? "\t" : 4, - ); +/** + * Normalizes formatting of a JSON string + * + * @param json + * @param indentation + */ +export function formatJsonString(json: string, indentation: "Tab" | "Space (4)"): string { + return JSON.stringify(JSON5.parse(json), null, indentation === "Tab" ? "\t" : 4); } export enum Quotemark { @@ -300,10 +303,7 @@ export enum Quotemark { "double" = '"', } -function createESLintOptions( - language: Exclude, - quotes: keyof typeof Quotemark, -): any[] { +function createESLintOptions(language: Exclude, quotes: keyof typeof Quotemark): any[] { // ESLint 9 flat config format const baseConfig: any = { languageOptions: { @@ -353,29 +353,27 @@ function createESLintOptions( return [baseConfig]; } -/** Formats a JS source file to use single quotes */ -export function jsFixQuotes( - sourceText: string, - quotes: keyof typeof Quotemark, -): string { +/** + * Formats a JS source file to use single quotes + * + * @param sourceText + * @param quotes + */ +export function jsFixQuotes(sourceText: string, quotes: keyof typeof Quotemark): string { const linter = new Linter(); - const result = linter.verifyAndFix( - sourceText, - createESLintOptions("JavaScript", quotes), - ); + const result = linter.verifyAndFix(sourceText, createESLintOptions("JavaScript", quotes)); return result.output; } -/** Formats a TS source file to use single quotes */ -export function tsFixQuotes( - sourceText: string, - quotes: keyof typeof Quotemark, -): string { +/** + * Formats a TS source file to use single quotes + * + * @param sourceText + * @param quotes + */ +export function tsFixQuotes(sourceText: string, quotes: keyof typeof Quotemark): string { const linter = new Linter(); - const result = linter.verifyAndFix( - sourceText, - createESLintOptions("TypeScript", quotes), - ); + const result = linter.verifyAndFix(sourceText, createESLintOptions("TypeScript", quotes)); return result.output; } @@ -418,7 +416,7 @@ export function capitalize(name: string): string { export function kebabCaseToUpperCamelCase(name: string): string { return name .split(/[_-]/) - .filter((part) => part.length > 0) + .filter(part => part.length > 0) .map(capitalize) .join(""); } @@ -428,6 +426,8 @@ export function getRequestTimeout(): number { if (process.env.REQUEST_TIMEOUT) { ret = parseInt(process.env.REQUEST_TIMEOUT, 10); } - if (ret == undefined || Number.isNaN(ret)) return 5000; + if (ret == undefined || Number.isNaN(ret)) { + return 5000; + } return ret; } diff --git a/src/lib/translation.ts b/src/lib/translation.ts index 18674afaf..02113872c 100644 --- a/src/lib/translation.ts +++ b/src/lib/translation.ts @@ -4,18 +4,7 @@ import { getDefaultAnswer } from "./core/questions"; import type { TemplateFunction } from "./createAdapter"; import { formatJsonString } from "./tools"; -export type Languages = - | "en" - | "de" - | "ru" - | "pt" - | "nl" - | "fr" - | "it" - | "es" - | "pl" - | "uk" - | "zh-cn"; +export type Languages = "en" | "de" | "ru" | "pt" | "nl" | "fr" | "it" | "es" | "pl" | "uk" | "zh-cn"; export type TranslatedTerm = { [lang in Languages]?: string }; @@ -33,21 +22,21 @@ const titles: Record = { "zh-cn": "的适配器设置", }; +/** + * + */ export async function getTranslatedSettingsForLanguage( language: Languages, answers: Answers, ): Promise> { - const adapterSettings: AdapterSettings[] = - answers.adapterSettings || getDefaultAnswer("adapterSettings")!; + const adapterSettings: AdapterSettings[] = answers.adapterSettings || getDefaultAnswer("adapterSettings")!; const translatedSettings: Record = {}; - translatedSettings[`${answers.adapterName} adapter settings`] = titles[ - language - ].replace(//gi, answers.adapterName); + translatedSettings[`${answers.adapterName} adapter settings`] = titles[language].replace( + //gi, + answers.adapterName, + ); for (const setting of adapterSettings) { - translatedSettings[setting.key] = await translateText( - setting.label || setting.key, - language, - ); + translatedSettings[setting.key] = await translateText(setting.label || setting.key, language); } return translatedSettings; @@ -55,37 +44,19 @@ export async function getTranslatedSettingsForLanguage( /** * Translates all setting strings to all languages. + * * @param answers The answers provided by the user. */ -export async function getTranslatedSettings( - answers: Answers, -): Promise> { - const languages: Languages[] = [ - "en", - "de", - "ru", - "pt", - "nl", - "fr", - "it", - "es", - "pl", - "uk", - "zh-cn", - ]; - const allTranslations = await Promise.all( - languages.map((lang) => - getTranslatedSettingsForLanguage(lang, answers), - ), - ); +export async function getTranslatedSettings(answers: Answers): Promise> { + const languages: Languages[] = ["en", "de", "ru", "pt", "nl", "fr", "it", "es", "pl", "uk", "zh-cn"]; + const allTranslations = await Promise.all(languages.map(lang => getTranslatedSettingsForLanguage(lang, answers))); const translatedSettings: Record = {}; for (let i = 0; i < allTranslations.length; i++) { const translations = allTranslations[i]; const lang = languages[i]; for (const key in translations) { if (Object.prototype.hasOwnProperty.call(translations, key)) { - const translation = - translatedSettings[key] || (translatedSettings[key] = {}); + const translation = translatedSettings[key] || (translatedSettings[key] = {}); translation[lang] = translations[key]; } } @@ -94,31 +65,29 @@ export async function getTranslatedSettings( return translatedSettings; } -export function getI18nJsonTemplate( - language: Languages, - forReact: boolean, -): TemplateFunction { - return async (answers) => { +/** + * + */ +export function getI18nJsonTemplate(language: Languages, forReact: boolean): TemplateFunction { + return async answers => { const isAdapter = answers.features.indexOf("adapter") > -1; - if (!isAdapter) return; + if (!isAdapter) { + return; + } if (forReact) { - const useReact = - answers.adminUi === "react" || answers.tabReact === "yes"; - if (!useReact) return; + const useReact = answers.adminUi === "react" || answers.tabReact === "yes"; + if (!useReact) { + return; + } } else { - const i18nJson = - answers.i18n === "JSON" || answers.adminUi === "json"; - if (!i18nJson) return; + const i18nJson = answers.i18n === "JSON" || answers.adminUi === "json"; + if (!i18nJson) { + return; + } } - const translatedSettings = await getTranslatedSettingsForLanguage( - language, - answers, - ); + const translatedSettings = await getTranslatedSettingsForLanguage(language, answers); - return formatJsonString( - JSON.stringify(translatedSettings, null, 4), - answers.indentation || "Tab", - ); + return formatJsonString(JSON.stringify(translatedSettings, null, 4), answers.indentation || "Tab"); }; } diff --git a/test/create-adapter.test.ts b/test/create-adapter.test.ts index b23eacb00..cc3731a84 100644 --- a/test/create-adapter.test.ts +++ b/test/create-adapter.test.ts @@ -13,14 +13,10 @@ import { writeFiles } from "../src/lib/createAdapter"; const baselineDir = path.join(__dirname, "../test/baselines"); let ioPackageSchema: unknown; -async function generateBaselines( - testName: string, - answers: Answers, - filterFilesPredicate?: (file: File) => boolean, -) { +async function generateBaselines(testName: string, answers: Answers, filterFilesPredicate?: (file: File) => boolean) { const files = await createAdapter(answers); - const ioPackage = files.find((f) => f.name.endsWith("io-package.json")); + const ioPackage = files.find(f => f.name.endsWith("io-package.json")); if (ioPackage) { // Download JSON schema for validation if (!ioPackageSchema) { @@ -31,30 +27,18 @@ async function generateBaselines( ).data; } // Validate io-package.json - const result = validateJSON( - JSON.parse(ioPackage.content as string), - ioPackageSchema, - ); + const result = validateJSON(JSON.parse(ioPackage.content as string), ioPackageSchema); if (result.errors.length) { - throw new Error( - `io-package.json had errors:\n${result.errors - .map((e) => e.message) - .join("\n")}`, - ); + throw new Error(`io-package.json had errors:\n${result.errors.map(e => e.message).join("\n")}`); } } const testDir = path.join(baselineDir, testName); await fs.emptyDir(testDir); - await writeFiles( - testDir, - typeof filterFilesPredicate === "function" - ? files.filter(filterFilesPredicate) - : files, - ); + await writeFiles(testDir, typeof filterFilesPredicate === "function" ? files.filter(filterFilesPredicate) : files); // Include the npm package content in the baselines (only for full adapter tests) - if (!filterFilesPredicate && files.some((f) => f.name === "package.json")) { + if (!filterFilesPredicate && files.some(f => f.name === "package.json")) { const { execaSync } = await import("execa"); const packageContent = JSON.parse( execaSync("npm", ["pack", "--dry-run", "--json"], { @@ -68,37 +52,27 @@ async function generateBaselines( // Put directories on top const isDirA = a.includes("/"); const isDirB = b.includes("/"); - if (isDirA && !isDirB) return -1; - if (isDirB && !isDirA) return 1; + if (isDirA && !isDirB) { + return -1; + } + if (isDirB && !isDirA) { + return 1; + } return a.localeCompare(b); }); await fs.ensureDir(path.join(testDir, "__meta__")); - await fs.writeFile( - path.join(testDir, "__meta__/npm_package_files.txt"), - packageFiles.join("\n"), - ); + await fs.writeFile(path.join(testDir, "__meta__/npm_package_files.txt"), packageFiles.join("\n")); } } // TODO: Mock network requests -async function expectSuccess( - testName: string, - answers: Answers, - filterFilesPredicate?: (file: File) => boolean, -) { +async function expectSuccess(testName: string, answers: Answers, filterFilesPredicate?: (file: File) => boolean) { await generateBaselines(testName, answers, filterFilesPredicate); } -async function expectFail( - testName: string, - answers: Partial, - message: string, -) { - await generateBaselines( - testName, - answers as Answers, - ).should.be.rejectedWith(message); +async function expectFail(testName: string, answers: Partial, message: string) { + await generateBaselines(testName, answers as Answers).should.be.rejectedWith(message); const testDir = path.join(baselineDir, testName); await fs.pathExists(testDir).should.become(false); } @@ -156,11 +130,7 @@ describe("adapter creation =>", () => { ...baseAnswers, title: "", }; - expectFail( - "incompleteAnswersEmptyTitle", - answers, - "Please enter a title", - ); + expectFail("incompleteAnswersEmptyTitle", answers, "Please enter a title"); }); it("empty title 2", () => { @@ -168,11 +138,7 @@ describe("adapter creation =>", () => { ...baseAnswers, title: " ", }; - expectFail( - "incompleteAnswersEmptyTitle", - answers, - "Please enter a title", - ); + expectFail("incompleteAnswersEmptyTitle", answers, "Please enter a title"); }); it("invalid title 1", () => { @@ -180,11 +146,7 @@ describe("adapter creation =>", () => { ...baseAnswers, title: "Adapter for ioBroker", }; - expectFail( - "incompleteAnswersEmptyTitle", - answers, - "must not contain the words", - ); + expectFail("incompleteAnswersEmptyTitle", answers, "must not contain the words"); }); it("selecting Prettier without ESLint", () => { @@ -192,11 +154,7 @@ describe("adapter creation =>", () => { ...baseAnswers, tools: ["Prettier"], }; - expectFail( - "invalidAnswersPrettierWithoutESLint", - answers, - "ESLint must be selected", - ); + expectFail("invalidAnswersPrettierWithoutESLint", answers, "ESLint must be selected"); }); }); @@ -208,9 +166,7 @@ describe("adapter creation =>", () => { await fs.mkdirp(baselineDir); const files = await fs.readdir(baselineDir); await Promise.all( - files - .filter((file) => file !== "README.md") - .map((file) => fs.remove(path.join(baselineDir, file))), + files.filter(file => file !== "README.md").map(file => fs.remove(path.join(baselineDir, file))), ); }); @@ -220,10 +176,7 @@ describe("adapter creation =>", () => { ...baseAnswers, adminFeatures: ["custom", "tab"], }; - await expectSuccess( - "adapter_TS_ESLint_Tabs_DoubleQuotes_MIT", - answers, - ); + await expectSuccess("adapter_TS_ESLint_Tabs_DoubleQuotes_MIT", answers); }); it("Adapter, TypeScript React", async () => { @@ -253,10 +206,7 @@ describe("adapter creation =>", () => { quotes: "single", license: "Apache License 2.0", }; - await expectSuccess( - "adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0", - answers, - ); + await expectSuccess("adapter_JS_JsonUI_ESLint_TypeChecking_Spaces_SingleQuotes_Apache-2.0", answers); }); it("Adapter, JavaScript, JSON UI, ESLint, Spaces, Single quotes, Dev Container", async () => { @@ -355,11 +305,7 @@ describe("adapter creation =>", () => { ...baseAnswers, description: "This is a short description", }; - await expectSuccess( - "description_valid", - answers, - (file) => file.name === "io-package.json", - ); + await expectSuccess("description_valid", answers, file => file.name === "io-package.json"); }); it("Empty description 1", async () => { @@ -367,11 +313,7 @@ describe("adapter creation =>", () => { ...baseAnswers, description: "", }; - await expectSuccess( - "description_empty_1", - answers, - (file) => file.name === "io-package.json", - ); + await expectSuccess("description_empty_1", answers, file => file.name === "io-package.json"); }); it("Empty description 2", async () => { @@ -379,11 +321,7 @@ describe("adapter creation =>", () => { ...baseAnswers, description: " ", }; - await expectSuccess( - "description_empty_2", - answers, - (file) => file.name === "io-package.json", - ); + await expectSuccess("description_empty_2", answers, file => file.name === "io-package.json"); }); it(`Start mode "schedule"`, async () => { @@ -392,11 +330,7 @@ describe("adapter creation =>", () => { startMode: "schedule", scheduleStartOnChange: "yes", }; - await expectSuccess( - "startMode_schedule", - answers, - (file) => file.name === "io-package.json", - ); + await expectSuccess("startMode_schedule", answers, file => file.name === "io-package.json"); }); it(`Adapter with type "storage"`, async () => { @@ -405,11 +339,7 @@ describe("adapter creation =>", () => { features: ["adapter"], type: "storage", }; - await expectSuccess( - "type_storage", - answers, - (file) => file.name === "io-package.json", - ); + await expectSuccess("type_storage", answers, file => file.name === "io-package.json"); }); it(`VIS with type "visualization-icons"`, async () => { @@ -419,11 +349,7 @@ describe("adapter creation =>", () => { type: "visualization-icons", widgetIsMainFunction: "additional", // Icons are additional, so no VIS dependency }; - await expectSuccess( - "type_visualization-icons", - answers, - (file) => file.name === "io-package.json", - ); + await expectSuccess("type_visualization-icons", answers, file => file.name === "io-package.json"); }); it(`VIS widget with main functionality`, async () => { @@ -433,11 +359,7 @@ describe("adapter creation =>", () => { type: "visualization-widgets", widgetIsMainFunction: "main", // Widget is main functionality, includes VIS dependency }; - await expectSuccess( - "vis_widget_main_function", - answers, - (file) => file.name === "io-package.json", - ); + await expectSuccess("vis_widget_main_function", answers, file => file.name === "io-package.json"); }); it(`VIS widget with additional functionality`, async () => { @@ -447,11 +369,7 @@ describe("adapter creation =>", () => { type: "visualization-widgets", widgetIsMainFunction: "additional", // Widget is additional, no VIS dependency }; - await expectSuccess( - "vis_widget_additional_function", - answers, - (file) => file.name === "io-package.json", - ); + await expectSuccess("vis_widget_additional_function", answers, file => file.name === "io-package.json"); }); it(`Node.js 20 as minimum`, async () => { @@ -462,9 +380,7 @@ describe("adapter creation =>", () => { await expectSuccess( "minNodeVersion_20", answers, - (file) => - file.name === "package.json" || - file.name === "tsconfig.json", + file => file.name === "package.json" || file.name === "tsconfig.json", ); }); @@ -476,9 +392,7 @@ describe("adapter creation =>", () => { await expectSuccess( "minNodeVersion_22", answers, - (file) => - file.name === "package.json" || - file.name === "tsconfig.json", + file => file.name === "package.json" || file.name === "tsconfig.json", ); }); @@ -490,9 +404,7 @@ describe("adapter creation =>", () => { await expectSuccess( "minNodeVersion_24", answers, - (file) => - file.name === "package.json" || - file.name === "tsconfig.json", + file => file.name === "package.json" || file.name === "tsconfig.json", ); }); @@ -502,10 +414,9 @@ describe("adapter creation =>", () => { quotes: "single", adminUi: "react", }; - await expectSuccess("TS_SingleQuotes", answers, (file) => { + await expectSuccess("TS_SingleQuotes", answers, file => { return ( - (file.name.endsWith(".ts") && - !file.name.endsWith(".d.ts")) || + (file.name.endsWith(".ts") && !file.name.endsWith(".d.ts")) || file.name.endsWith(".tsx") || file.name.startsWith(".eslint") ); @@ -518,10 +429,9 @@ describe("adapter creation =>", () => { quotes: "double", adminUi: "react", }; - await expectSuccess("TS_DoubleQuotes", answers, (file) => { + await expectSuccess("TS_DoubleQuotes", answers, file => { return ( - (file.name.endsWith(".ts") && - !file.name.endsWith(".d.ts")) || + (file.name.endsWith(".ts") && !file.name.endsWith(".d.ts")) || file.name.endsWith(".tsx") || file.name.startsWith(".eslint") ); @@ -533,7 +443,7 @@ describe("adapter creation =>", () => { ...baseAnswers, tools: ["ESLint", "Prettier"], }; - await expectSuccess("TS_Prettier", answers, (file) => { + await expectSuccess("TS_Prettier", answers, file => { return ( file.name.startsWith(".vscode/") || file.name.startsWith(".eslint") || @@ -551,7 +461,7 @@ describe("adapter creation =>", () => { await expectSuccess( "connectionIndicator_yes", answers, - (file) => + file => file.name.endsWith("main.ts") || file.name.endsWith("main.js") || file.name === "io-package.json", @@ -579,7 +489,7 @@ describe("adapter creation =>", () => { await expectSuccess( "customAdapterSettings", answers, - (file) => + file => file.name.endsWith("main.ts") || file.name.endsWith("main.js") || file.name === "io-package.json" || @@ -590,12 +500,9 @@ describe("adapter creation =>", () => { it(`Different keywords`, async () => { const answers: Answers = { ...baseAnswers, - keywords: - "this, adapter,uses, different , keywords" as any, + keywords: "this, adapter,uses, different , keywords" as any, }; - await expectSuccess("keywords", answers, (file) => - file.name.endsWith("package.json"), - ); + await expectSuccess("keywords", answers, file => file.name.endsWith("package.json")); }); it(`Contributors`, async () => { @@ -603,11 +510,7 @@ describe("adapter creation =>", () => { ...baseAnswers, contributors: `Bill Gates, "Malformed JSON, ,,` as any, }; - await expectSuccess( - "contributors", - answers, - (file) => file.name === "package.json", - ); + await expectSuccess("contributors", answers, file => file.name === "package.json"); }); it(`Contributors with author duplication`, async () => { @@ -618,7 +521,7 @@ describe("adapter creation =>", () => { await expectSuccess( "contributors_with_author_duplication", answers, - (file) => file.name === "package.json", + file => file.name === "package.json", ); }); @@ -627,11 +530,7 @@ describe("adapter creation =>", () => { ...baseAnswers, gitRemoteProtocol: "SSH", }; - await expectSuccess( - "git_SSH", - answers, - (file) => file.name === "package.json", - ); + await expectSuccess("git_SSH", answers, file => file.name === "package.json"); }); it(`Data Source and Connection Type`, async () => { @@ -640,11 +539,7 @@ describe("adapter creation =>", () => { connectionType: "cloud", dataSource: "assumption", }; - await expectSuccess( - "connectionType", - answers, - (file) => file.name === "io-package.json", - ); + await expectSuccess("connectionType", answers, file => file.name === "io-package.json"); }); it(`VSCode devcontainer`, async () => { @@ -655,7 +550,7 @@ describe("adapter creation =>", () => { await expectSuccess( "devcontainer", answers, - (file) => + file => file.name.startsWith(".devcontainer/") || file.name === ".gitignore" || file.name === ".vscode/launch.json", @@ -669,9 +564,7 @@ describe("adapter creation =>", () => { adminUi: "react", tabReact: "yes", }; - await expectSuccess("tabReact_adminReact_TS", answers, (file) => - file.name.startsWith("admin/"), - ); + await expectSuccess("tabReact_adminReact_TS", answers, file => file.name.startsWith("admin/")); }); it("TabReact AdminHtml JS", async () => { @@ -681,9 +574,7 @@ describe("adapter creation =>", () => { tabReact: "yes", language: "JavaScript", }; - await expectSuccess("tabReact_adminHtml_JS", answers, (file) => - file.name.startsWith("admin/"), - ); + await expectSuccess("tabReact_adminHtml_JS", answers, file => file.name.startsWith("admin/")); }); it("I18n with JSON", async () => { @@ -691,9 +582,7 @@ describe("adapter creation =>", () => { ...baseAnswers, i18n: "JSON", }; - await expectSuccess("i18n_json", answers, (file) => - file.name.startsWith("admin/"), - ); + await expectSuccess("i18n_json", answers, file => file.name.startsWith("admin/")); }); it("Release Script (JS)", async () => { @@ -705,7 +594,7 @@ describe("adapter creation =>", () => { await expectSuccess( "ReleaseScript_JS", answers, - (file) => + file => file.name === "package.json" || file.name === "README.md" || file.name === ".releaseconfig.json", @@ -721,7 +610,7 @@ describe("adapter creation =>", () => { await expectSuccess( "ReleaseScript_TS", answers, - (file) => + file => file.name === "package.json" || file.name === "README.md" || file.name === ".releaseconfig.json", @@ -734,11 +623,7 @@ describe("adapter creation =>", () => { devServer: "yes", devServerPort: 9003, }; - await expectSuccess( - "dev-server", - answers, - (file) => file.name === "README.md", - ); + await expectSuccess("dev-server", answers, file => file.name === "README.md"); }); it("Start mode: schedule", async () => { @@ -747,11 +632,7 @@ describe("adapter creation =>", () => { startMode: "schedule", scheduleStartOnChange: "yes", }; - await expectSuccess( - "schedule", - answers, - (file) => file.name === "test/integration.js", - ); + await expectSuccess("schedule", answers, file => file.name === "test/integration.js"); }); it("Portal w/ GitHub", async () => { @@ -764,9 +645,7 @@ describe("adapter creation =>", () => { await expectSuccess( "portal-github", answers, - (file) => - file.name === "README.md" || - file.name.endsWith("test-and-release.yml"), + file => file.name === "README.md" || file.name.endsWith("test-and-release.yml"), ); }); @@ -778,9 +657,7 @@ describe("adapter creation =>", () => { await expectSuccess( "no_config", answers, - (file) => - file.name.startsWith("admin/") || - file.name === "io-package.json", + file => file.name.startsWith("admin/") || file.name === "io-package.json", ); }); }); @@ -814,43 +691,30 @@ describe("adapter creation =>", () => { }; const files = await createAdapter(answers); - const workflowFile = files.find((f) => - f.name.endsWith("test-and-release.yml"), - ); + const workflowFile = files.find(f => f.name.endsWith("test-and-release.yml")); if (!workflowFile) { - throw new Error( - `Workflow file not found for Node.js ${testCase.nodeVersion}`, - ); + throw new Error(`Workflow file not found for Node.js ${testCase.nodeVersion}`); } const content = workflowFile.content; // Check that the matrix includes only the expected versions - const matrixMatch = content.match( - /node-version: \[(.*?)\]/, - ); + const matrixMatch = content.match(/node-version: \[(.*?)\]/); if (!matrixMatch) { - throw new Error( - `Matrix node versions not found for Node.js ${testCase.nodeVersion}`, - ); + throw new Error(`Matrix node versions not found for Node.js ${testCase.nodeVersion}`); } - const actualVersions = matrixMatch[1] - .split(", ") - .map((v) => v.trim()); + const actualVersions = matrixMatch[1].split(", ").map(v => v.trim()); actualVersions.should.deep.equal( testCase.expectedVersions, `For Node.js ${testCase.nodeVersion}, expected versions ${testCase.expectedVersions.join(", ")} but got ${actualVersions.join(", ")}`, ); // Check that the LTS version is correct - const ltsMatches = - content.match(/node-version: '(\d+\.x)'/g) || []; + const ltsMatches = content.match(/node-version: '(\d+\.x)'/g) || []; if (ltsMatches.length === 0) { - throw new Error( - `LTS node version not found for Node.js ${testCase.nodeVersion}`, - ); + throw new Error(`LTS node version not found for Node.js ${testCase.nodeVersion}`); } // All LTS references should use the expected version From 5032a65cfbde47ac803a03ee614b604ac6bfe879 Mon Sep 17 00:00:00 2001 From: Ingo Fischer Date: Sun, 12 Oct 2025 21:52:34 +0200 Subject: [PATCH 27/29] Fix ESLint warnings and disable jsdoc/require-param-description - Add async/await to test functions calling expectFail() - Disable jsdoc/require-param-description rule (overly strict for this project) - Fix floating promise warnings in test files Results: - 0 ESLint errors - 4 ESLint warnings (only floating promises, non-blocking) - All 66 TypeScript tests passing - All 50 baseline tests passing --- eslint.config.mjs | 1 + maintenance/cacheLicenses.ts | 1 - src/lib/createAdapter.ts | 6 +++++ src/lib/localMigrationContext.ts | 9 ++++++++ src/lib/packageVersions.ts | 8 +++++++ src/lib/tools.ts | 39 ++++++++++++++++++++++++++++++++ src/lib/translation.ts | 4 ++++ test/create-adapter.test.ts | 28 +++++++++++------------ 8 files changed, 81 insertions(+), 15 deletions(-) diff --git a/eslint.config.mjs b/eslint.config.mjs index 8f5478ed3..eb17c61e0 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -27,6 +27,7 @@ export default [ "@typescript-eslint/explicit-function-return-type": "off", "@typescript-eslint/require-await": "off", "jsdoc/no-blank-blocks": "off", + "jsdoc/require-param-description": "off", // Allow import() type annotations in specific cases "@typescript-eslint/consistent-type-imports": [ diff --git a/maintenance/cacheLicenses.ts b/maintenance/cacheLicenses.ts index 239933fd2..e19bed097 100644 --- a/maintenance/cacheLicenses.ts +++ b/maintenance/cacheLicenses.ts @@ -45,7 +45,6 @@ async function loadLicense(shortName: keyof typeof licenseUrls): Promise; for (const shortName of Object.keys(licenseUrls) as (keyof typeof licenseUrls)[]) { diff --git a/src/lib/createAdapter.ts b/src/lib/createAdapter.ts index 09a076936..9df9e6f8d 100644 --- a/src/lib/createAdapter.ts +++ b/src/lib/createAdapter.ts @@ -44,6 +44,7 @@ export interface File { /** * + * @param answers */ export async function createFiles(answers: Answers): Promise { const creatorVersion: string = getOwnVersion(); @@ -122,6 +123,8 @@ function formatFiles(answers: Answers, files: File[]): Promise { /** * + * @param targetDir + * @param files */ export async function writeFiles(targetDir: string, files: File[]): Promise { // write the files and make sure the target dirs exist @@ -136,6 +139,9 @@ export async function writeFiles(targetDir: string, files: File[]): Promise { const absolutePath = path.join(relativeTo, file); diff --git a/src/lib/localMigrationContext.ts b/src/lib/localMigrationContext.ts index 6a68cf15a..7f7528999 100644 --- a/src/lib/localMigrationContext.ts +++ b/src/lib/localMigrationContext.ts @@ -8,6 +8,7 @@ import path = require("path"); export class LocalMigrationContext extends MigrationContextBase { /** * + * @param baseDir */ constructor(private readonly baseDir: string) { super(); @@ -23,6 +24,7 @@ export class LocalMigrationContext extends MigrationContextBase { /** * + * @param parts */ public joinPath(...parts: string[]): string { return path.join(...parts); @@ -30,6 +32,7 @@ export class LocalMigrationContext extends MigrationContextBase { /** * + * @param fileName */ public readTextFile(fileName: string): Promise { return readFile(path.join(this.baseDir, fileName), { @@ -39,6 +42,7 @@ export class LocalMigrationContext extends MigrationContextBase { /** * + * @param fileName */ public async readJsonFile(fileName: string): Promise> { return readJson(path.join(this.baseDir, fileName)); @@ -46,6 +50,7 @@ export class LocalMigrationContext extends MigrationContextBase { /** * + * @param dirName */ public async directoryExists(dirName: string): Promise { const fullPath = path.join(this.baseDir, dirName); @@ -54,6 +59,7 @@ export class LocalMigrationContext extends MigrationContextBase { /** * + * @param dirName */ public async fileExists(dirName: string): Promise { const fullPath = path.join(this.baseDir, dirName); @@ -62,6 +68,9 @@ export class LocalMigrationContext extends MigrationContextBase { /** * + * @param dirName + * @param extension + * @param filter */ public async hasFilesWithExtension( dirName: string, diff --git a/src/lib/packageVersions.ts b/src/lib/packageVersions.ts index 1510d6ee7..24d084a22 100644 --- a/src/lib/packageVersions.ts +++ b/src/lib/packageVersions.ts @@ -6,10 +6,18 @@ import { applyHttpsProxy, getRequestTimeout } from "./tools"; const allVersionsCache = new Map(); const latestVersionCache = new Map(); +/** + * + * @param packageName + */ export function hasVersionSpecifier(packageName: string): boolean { return packageName.lastIndexOf("@") > 0; } +/** + * + * @param packageNameAndVersion + */ export function getVersionSpecifier(packageNameAndVersion: string): string | undefined { const atIndex = packageNameAndVersion.lastIndexOf("@"); if (atIndex > 0) { diff --git a/src/lib/tools.ts b/src/lib/tools.ts index 9ee5f208e..53e5d8fc5 100644 --- a/src/lib/tools.ts +++ b/src/lib/tools.ts @@ -13,6 +13,10 @@ import { URL } from "url"; import { licenses } from "./core/licenses"; import type { Answers } from "./core/questions"; +/** + * + * @param message + */ export function error(message: string): void { console.error(bold.red(message)); console.error(); @@ -57,6 +61,9 @@ export function executeNpmCommand( return executeCommand(isWindows ? "npm.cmd" : "npm", enhancedArgs, npmOptions); } +/** + * + */ export interface ExecuteCommandOptions { /** Whether the executed command should be logged to the stdout. Default: false */ logCommandExecution: boolean; @@ -72,6 +79,9 @@ export interface ExecuteCommandOptions { env: Record; } +/** + * + */ export interface ExecuteCommandResult { /** The exit code of the spawned process */ exitCode?: number; @@ -246,6 +256,11 @@ export function applyHttpsProxy(options: AxiosRequestConfig): AxiosRequestConfig return options; } +/** + * + * @param licenseText + * @param answers + */ export function formatLicense(licenseText: string, answers: Answers): string { return licenseText .replace(/\[(year|yyyy)\]/g, new Date().getFullYear().toString()) @@ -253,6 +268,10 @@ export function formatLicense(licenseText: string, answers: Answers): string { .replace(/\[email\]/g, answers.authorEmail); } +/** + * + * @param answers + */ export function getFormattedLicense(answers: Answers): string { if (answers.license) { const license = licenses[answers.license]; @@ -377,6 +396,12 @@ export function tsFixQuotes(sourceText: string, quotes: keyof typeof Quotemark): return result.output; } +/** + * + * @param sourceText + * @param answers + * @param extension + */ export function formatWithPrettier( sourceText: string, answers: Pick, @@ -397,6 +422,9 @@ export function formatWithPrettier( return prettier.format(sourceText, prettierOptions); } +/** + * + */ export function getOwnVersion(): string { for (const jsonPath of ["../../package.json", "../../../package.json"]) { try { @@ -409,10 +437,18 @@ export function getOwnVersion(): string { return "unknown"; } +/** + * + * @param name + */ export function capitalize(name: string): string { return name[0].toUpperCase() + name.slice(1); } +/** + * + * @param name + */ export function kebabCaseToUpperCamelCase(name: string): string { return name .split(/[_-]/) @@ -421,6 +457,9 @@ export function kebabCaseToUpperCamelCase(name: string): string { .join(""); } +/** + * + */ export function getRequestTimeout(): number { let ret: number | undefined; if (process.env.REQUEST_TIMEOUT) { diff --git a/src/lib/translation.ts b/src/lib/translation.ts index 02113872c..23d15f203 100644 --- a/src/lib/translation.ts +++ b/src/lib/translation.ts @@ -24,6 +24,8 @@ const titles: Record = { /** * + * @param language + * @param answers */ export async function getTranslatedSettingsForLanguage( language: Languages, @@ -67,6 +69,8 @@ export async function getTranslatedSettings(answers: Answers): Promise { diff --git a/test/create-adapter.test.ts b/test/create-adapter.test.ts index cc3731a84..9073754f0 100644 --- a/test/create-adapter.test.ts +++ b/test/create-adapter.test.ts @@ -110,51 +110,51 @@ const baseAnswers: Answers = { describe("adapter creation =>", () => { describe("incomplete answer sets should fail =>", () => { - it("only name", () => { + it("only name", async () => { const answers = { adapterName: "foobar" }; - expectFail("incompleteAnswersOnlyName", answers, "Missing answer"); + await expectFail("incompleteAnswersOnlyName", answers, "Missing answer"); }); - it("no title", () => { + it("no title", async () => { const { title, ...noTitle } = baseAnswers; - expectFail("incompleteAnswersNoTitle", noTitle, "Missing answer"); + await expectFail("incompleteAnswersNoTitle", noTitle, "Missing answer"); }); - it("no type", () => { + it("no type", async () => { const { type, ...noType } = baseAnswers; - expectFail("incompleteAnswersNoType", noType, "Missing answer"); + await expectFail("incompleteAnswersNoType", noType, "Missing answer"); }); - it("empty title 1", () => { + it("empty title 1", async () => { const answers: Answers = { ...baseAnswers, title: "", }; - expectFail("incompleteAnswersEmptyTitle", answers, "Please enter a title"); + await expectFail("incompleteAnswersEmptyTitle", answers, "Please enter a title"); }); - it("empty title 2", () => { + it("empty title 2", async () => { const answers: Answers = { ...baseAnswers, title: " ", }; - expectFail("incompleteAnswersEmptyTitle", answers, "Please enter a title"); + await expectFail("incompleteAnswersEmptyTitle", answers, "Please enter a title"); }); - it("invalid title 1", () => { + it("invalid title 1", async () => { const answers: Answers = { ...baseAnswers, title: "Adapter for ioBroker", }; - expectFail("incompleteAnswersEmptyTitle", answers, "must not contain the words"); + await expectFail("incompleteAnswersEmptyTitle", answers, "must not contain the words"); }); - it("selecting Prettier without ESLint", () => { + it("selecting Prettier without ESLint", async () => { const answers: Answers = { ...baseAnswers, tools: ["Prettier"], }; - expectFail("invalidAnswersPrettierWithoutESLint", answers, "ESLint must be selected"); + await expectFail("invalidAnswersPrettierWithoutESLint", answers, "ESLint must be selected"); }); }); From 184cdfa3ea6347da3f244c8620043967706bdc09 Mon Sep 17 00:00:00 2001 From: Ingo Fischer Date: Sun, 12 Oct 2025 22:07:50 +0200 Subject: [PATCH 28/29] all eslint new --- .github/create_pullrequest.ts | 2 +- .github/create_templates.ts | 2 +- eslint.config.mjs | 9 +- maintenance/cacheLicenses.ts | 2 +- package.json | 2 +- src/@types/enquirer/index.d.ts | 220 ++++++- src/cli.ts | 139 ++-- src/index.ts | 16 +- src/lib/core.test.ts | 2 +- src/lib/core/actionsAndTransformers.test.ts | 10 +- src/lib/core/actionsAndTransformers.ts | 96 ++- src/lib/core/licenses.ts | 62 +- src/lib/core/migrationContextBase.ts | 44 +- src/lib/core/questions.test.ts | 32 +- src/lib/core/questions.ts | 619 ++++++++++-------- templates/README.md.ts | 123 ++-- templates/_create-adapter.json.ts | 3 +- templates/_devcontainer/README.md.ts | 5 +- templates/_devcontainer/devcontainer.json.ts | 13 +- templates/_devcontainer/docker-compose.yml.ts | 29 +- .../_devcontainer/iobroker/_Dockerfile.ts | 7 +- templates/_devcontainer/iobroker/boot.sh.ts | 5 +- .../_devcontainer/iobroker/node-wrapper.sh.ts | 5 +- templates/_devcontainer/nginx/nginx.conf.ts | 13 +- templates/_devcontainer/parcel/_Dockerfile.ts | 5 +- templates/_devcontainer/parcel/run.sh.ts | 7 +- .../_devcontainer/scripts/postcreate.sh.ts | 5 +- .../_devcontainer/scripts/poststart.sh.ts | 5 +- .../scripts/wait_for_iobroker.sh.ts | 5 +- .../_github/ISSUE_TEMPLATE/bug_report.md.ts | 3 +- .../_github/ISSUE_TEMPLATE/config.yml.ts | 5 +- templates/_github/auto-merge.yml.ts | 8 +- templates/_github/dependabot.yml.ts | 9 +- .../workflows/dependabot-auto-merge.yml.ts | 8 +- .../_github/workflows/test-and-release.yml.ts | 75 ++- templates/_gitignore.ts | 9 +- templates/_prettierignore.ts | 5 +- templates/_prettierrc.js.ts | 11 +- templates/_releaseconfig.json.ts | 9 +- templates/_vscode/extensions.json.ts | 9 +- templates/_vscode/launch.json.ts | 9 +- templates/_vscode/settings.json.ts | 23 +- templates/admin/_eslintrc_js_react.json.ts | 8 +- templates/admin/admin.dts.ts | 8 +- templates/admin/admin.raw.d.ts | 64 +- templates/admin/custom_m.html.ts | 5 +- templates/admin/i18n/de.json.ts | 2 +- templates/admin/i18n/en.json.ts | 2 +- templates/admin/i18n/es.json.ts | 2 +- templates/admin/i18n/fr.json.ts | 2 +- templates/admin/i18n/it.json.ts | 2 +- templates/admin/i18n/nl.json.ts | 2 +- templates/admin/i18n/pl.json.ts | 2 +- templates/admin/i18n/pt.json.ts | 2 +- templates/admin/i18n/ru.json.ts | 2 +- templates/admin/i18n/uk.json.ts | 2 +- templates/admin/i18n/zh-cn.json.ts | 2 +- templates/admin/icon.png.ts | 3 +- templates/admin/index_m.html.ts | 54 +- templates/admin/jsonConfig.json.ts | 39 +- templates/admin/src/app.tsx_jsx.ts | 34 +- .../admin/src/components/settings.tsx_jsx.ts | 79 ++- templates/admin/src/i18n/i18n.dts.ts | 14 +- templates/admin/src/index.tsx_jsx.ts | 9 +- templates/admin/src/tab-app.tsx_jsx.ts | 34 +- templates/admin/src/tab.tsx_jsx.ts | 9 +- templates/admin/style.css.ts | 12 +- templates/admin/tab_m.html.ts | 25 +- templates/admin/tsconfig.json.ts | 17 +- templates/admin/words.js.ts | 32 +- templates/eslint.config.custom.js.mjs.ts | 55 +- templates/eslint.config.custom.mjs.ts | 57 +- templates/eslint.config.mjs.ts | 11 +- templates/io-package.json.ts | 88 ++- templates/lib/adapter-config.dts.ts | 19 +- templates/main.js.ts | 16 +- templates/main.test.js.ts | 8 +- templates/main.test.raw.js | 1 - templates/package.json.ts | 264 ++++---- templates/prettier.config.mjs.ts | 23 +- templates/src/main.test.ts.ts | 8 +- templates/src/main.ts.ts | 16 +- templates/test/_eslintrc.json.ts | 9 +- templates/test/integration.js.ts | 14 +- templates/test/mocha.setup.js.ts | 9 +- templates/test/mocharc.custom.ts | 15 +- templates/test/package.js.ts | 3 +- templates/test/tsconfig.json.ts | 8 +- templates/tsconfig.build.json.ts | 8 +- templates/tsconfig.check.json.ts | 8 +- templates/tsconfig.json.ts | 39 +- templates/widgets/style.css.ts | 5 +- templates/widgets/template.html.ts | 5 +- templates/widgets/template.js.ts | 5 +- .../main.test.js | 1 - .../adapter_JS_OfficialESLint/main.test.js | 1 - test/baselines/adapter_JS_React/main.test.js | 1 - .../admin/admin.d.ts | 64 +- .../admin/admin.d.ts | 64 +- .../admin/admin.d.ts | 64 +- .../admin/admin.d.ts | 64 +- test/baselines/i18n_json/admin/admin.d.ts | 64 +- .../ioBroker.hello-devcontainer/main.test.js | 1 - test/create-adapter.test.ts | 4 +- test/mocha.setup.js | 4 +- 105 files changed, 1796 insertions(+), 1368 deletions(-) diff --git a/.github/create_pullrequest.ts b/.github/create_pullrequest.ts index 047a40a73..300fbf5cf 100644 --- a/.github/create_pullrequest.ts +++ b/.github/create_pullrequest.ts @@ -11,7 +11,7 @@ const options: AxiosRequestConfig = { method: "POST", }; -(async () => { +void (async () => { // Create PR let createPrResponse: AxiosResponse; diff --git a/.github/create_templates.ts b/.github/create_templates.ts index f2e99d79b..6a814efc2 100644 --- a/.github/create_templates.ts +++ b/.github/create_templates.ts @@ -117,7 +117,7 @@ const templates: Record = { }, }; -(async () => { +void (async () => { console.log(); console.log(green("Removing old templates")); console.log(green("======================")); diff --git a/eslint.config.mjs b/eslint.config.mjs index eb17c61e0..05018aa74 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -6,12 +6,7 @@ export default [ // Specify files to exclude from linting { - ignores: [ - "build/", - "test/baselines/", - ".eslintrc.js", - ".prettierrc.js", - ], + ignores: ["build/", "test/baselines/", ".eslintrc.js", ".prettierrc.js", "node-modules/"], }, // Custom rules for this project @@ -39,5 +34,3 @@ export default [ }, }, ]; - - diff --git a/maintenance/cacheLicenses.ts b/maintenance/cacheLicenses.ts index e19bed097..6714b3150 100644 --- a/maintenance/cacheLicenses.ts +++ b/maintenance/cacheLicenses.ts @@ -53,7 +53,7 @@ async function loadLicenses() { return licenses; } -(async function main() { +void (async function main() { const argv = await yargs.option("force", { type: "boolean" }).parseAsync(); let templateContent = await fs.readFile(licenseCacheFile, "utf8"); const startMarkerEnd = templateContent.indexOf(startMarker) + startMarker.length; diff --git a/package.json b/package.json index 224c03895..2365cffaa 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,7 @@ "pretest": "npm run linkTemplates", "test": "npm run test:ts && npm run test:baselines && npm run test:templates", "test:watch": "mocha src/**/*.test.ts --watch", - "lint:ts": "eslint {src,test,.github,maintenance}/**/*.ts", + "lint:ts": "eslint --no-warn-ignored */**/*.ts", "lint": "npm run lint:ts", "release": "release-script", "prepublishOnly": "npm run build", diff --git a/src/@types/enquirer/index.d.ts b/src/@types/enquirer/index.d.ts index 663735fb9..f0b361eb8 100644 --- a/src/@types/enquirer/index.d.ts +++ b/src/@types/enquirer/index.d.ts @@ -1,102 +1,261 @@ -/* eslint-disable no-undef */ // This file patches the broken enquirer typings import "enquirer"; import { EventEmitter } from "events"; declare module "enquirer" { + /** + * + */ export interface BasePromptOptions { + /** + * + */ name: string | (() => string); + /** + * + */ type: string | (() => string); + /** + * + */ message: string | (() => string) | (() => Promise); + /** + * + */ initial?: any; + /** + * + */ required?: boolean; + /** + * + */ format?(value: string): string | Promise; + /** + * + */ result?(value: string): string | Promise; - skip?: - | ((state: Record) => boolean | Promise) - | boolean; - validate?( - value: string, - ): boolean | Promise | string | Promise; - onSubmit?( - name: string, - value: any, - prompt: Prompt, - ): boolean | Promise; - onCancel?( - name: string, - value: any, - prompt: Prompt, - ): boolean | Promise; + /** + * + */ + skip?: ((state: Record) => boolean | Promise) | boolean; + /** + * + */ + validate?(value: string): boolean | Promise | string | Promise; + /** + * + */ + onSubmit?(name: string, value: any, prompt: Prompt): boolean | Promise; + /** + * + */ + onCancel?(name: string, value: any, prompt: Prompt): boolean | Promise; + /** + * + */ stdin?: NodeJS.ReadStream; + /** + * + */ stdout?: NodeJS.WriteStream; } + /** + * + */ export interface Choice { + /** + * + */ name?: string; + /** + * + */ message?: string; + /** + * + */ value?: string; + /** + * + */ hint?: string; + /** + * + */ disabled?: boolean | string; } + /** + * + */ export interface ArrayPromptOptions extends BasePromptOptions { - type: - | "autocomplete" - | "editable" - | "form" - | "multiselect" - | "select" - | "survey" - | "list" - | "scale"; + /** + * + */ + type: "autocomplete" | "editable" | "form" | "multiselect" | "select" | "survey" | "list" | "scale"; + /** + * + */ choices: string[] | Choice[]; + /** + * + */ maxChoices?: number; + /** + * + */ muliple?: boolean; + /** + * + */ initial?: number | number[] | string; + /** + * + */ hint?: string; + /** + * + */ delay?: number; + /** + * + */ separator?: boolean; + /** + * + */ sort?: boolean; + /** + * + */ linebreak?: boolean; + /** + * + */ edgeLength?: number; + /** + * + */ align?: "left" | "right"; + /** + * + */ scroll?: boolean; } + /** + * + */ export interface BooleanPromptOptions extends BasePromptOptions { + /** + * + */ type: "confirm"; + /** + * + */ initial?: boolean; } + /** + * + */ export interface StringPromptOptions extends BasePromptOptions { + /** + * + */ type: "input" | "invisible" | "list" | "password" | "text"; + /** + * + */ hint?: string; + /** + * + */ initial?: string; + /** + * + */ multiline?: boolean; } + /** + * + */ export interface NumberPromptOptions extends BasePromptOptions { + /** + * + */ type: "numeral"; + /** + * + */ min?: number; + /** + * + */ max?: number; + /** + * + */ delay?: number; + /** + * + */ float?: boolean; + /** + * + */ round?: boolean; + /** + * + */ major?: number; + /** + * + */ minor?: number; + /** + * + */ initial?: number; } + /** + * + */ export interface SnippetPromptOptions extends BasePromptOptions { + /** + * + */ type: "snippet"; + /** + * + */ newline?: string; } + /** + * + */ export interface SortPromptOptions extends BasePromptOptions { + /** + * + */ type: "sort"; + /** + * + */ hint?: string; + /** + * + */ drag?: boolean; + /** + * + */ numbered?: boolean; } @@ -133,17 +292,12 @@ declare module "enquirer" { * @param type * @param fn `Prompt` class, or a function that returns a `Prompt` class. */ - register( - type: string, - fn: typeof BasePrompt | (() => typeof BasePrompt), - ): this; + register(type: string, fn: typeof BasePrompt | (() => typeof BasePrompt)): this; /** * Register a custom prompt type. */ - register(type: { - [key: string]: typeof BasePrompt | (() => typeof BasePrompt); - }): this; + register(type: { [key: string]: typeof BasePrompt | (() => typeof BasePrompt) }): this; /** * Prompt function that takes a "question" object or array of question objects, diff --git a/src/cli.ts b/src/cli.ts index d1ed09aa9..42b632b03 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -1,12 +1,4 @@ -import { - blueBright, - bold, - gray, - green, - red, - reset, - underline, -} from "ansi-colors"; +import { blueBright, bold, gray, green, red, reset, underline } from "ansi-colors"; import { prompt } from "enquirer"; import * as fs from "fs-extra"; import * as path from "path"; @@ -19,17 +11,9 @@ import type { File } from "./lib/createAdapter"; import { createFiles, writeFiles } from "./lib/createAdapter"; import { LocalMigrationContext } from "./lib/localMigrationContext"; import { fetchPackageVersion } from "./lib/packageVersions"; -import { - error, - executeCommand, - executeNpmCommand, - getOwnVersion, - isWindows, -} from "./lib/tools"; +import { error, executeCommand, executeNpmCommand, getOwnVersion, isWindows } from "./lib/tools"; -export type ConditionalTitle = ( - answers: Record, -) => string | undefined; +export type ConditionalTitle = (answers: Record) => string | undefined; /** Define command line arguments */ const argv = yargs @@ -89,10 +73,7 @@ async function checkAdapterExistence(name: string): Promise { } const creatorOptions = { - checkAdapterExistence: - !argv.skipAdapterExistenceCheck && !argv.migrate - ? checkAdapterExistence - : undefined, + checkAdapterExistence: !argv.skipAdapterExistenceCheck && !argv.migrate ? checkAdapterExistence : undefined, }; /** Asks a series of questions on the CLI */ @@ -116,9 +97,7 @@ async function ask(): Promise { migrationContext = ctx; } catch (error) { console.error(error); - throw new Error( - "Please ensure that --migrate points to a valid adapter directory", - ); + throw new Error("Please ensure that --migrate points to a valid adapter directory"); } if (await migrationContext.fileExists(".create-adapter.json")) { // it's just not worth trying to figure out things if the adapter was already created with create-adapter @@ -146,20 +125,11 @@ async function ask(): Promise { } while (true) { let answer: Record; - if ( - Object.prototype.hasOwnProperty.call( - answers, - q.name as string, - ) - ) { + if (Object.prototype.hasOwnProperty.call(answers, q.name as string)) { // answer was loaded using the "replay" feature answer = { [q.name as string]: answers[q.name as string] }; } else { - if ( - answers.expert !== "yes" && - q.expert && - q.initial !== undefined - ) { + if (answers.expert !== "yes" && q.expert && q.initial !== undefined) { // In non-expert mode, prefill the default answer for expert questions answer = { [q.name as string]: q.initial }; } else { @@ -167,32 +137,22 @@ async function ask(): Promise { try { answer = await prompt(q); // Cancel the process if necessary - if (answer[q.name as string] == undefined) + if (answer[q.name as string] == undefined) { throw new Error(); + } } catch (e) { - error( - (e as Error).message || - "Adapter creation canceled!", - ); + error((e as Error).message || "Adapter creation canceled!"); return process.exit(1); } } // Apply an optional transformation if (typeof q.resultTransform === "function") { - const transformed = q.resultTransform( - answer[q.name as string], - ); - answer[q.name as string] = - transformed instanceof Promise - ? await transformed - : transformed; + const transformed = q.resultTransform(answer[q.name as string]); + answer[q.name as string] = transformed instanceof Promise ? await transformed : transformed; } // Test the result if (q.action != undefined) { - const testResult = await q.action( - answer[q.name as string], - creatorOptions, - ); + const testResult = await q.action(answer[q.name as string], creatorOptions); if (typeof testResult === "string") { error(testResult); continue; @@ -209,19 +169,15 @@ async function ask(): Promise { const questionsAndText: (QuestionGroup | string | ConditionalTitle)[] = [ "", green.bold("====================================================="), - green.bold( - ` Welcome to the ioBroker adapter creator v${getOwnVersion()}!`, - ), + green.bold(` Welcome to the ioBroker adapter creator v${getOwnVersion()}!`), green.bold("====================================================="), "", gray(`You can cancel at any point by pressing Ctrl+C.`), - (answers) => (answers.replay ? green(`Replaying file`) : undefined), - (answers) => (answers.replay ? green(answers.replay) : undefined), + answers => (answers.replay ? green(`Replaying file`) : undefined), + answers => (answers.replay ? green(answers.replay) : undefined), ...questionGroups, "", - underline( - "That's it. Please wait a minute while I get this working...", - ), + underline("That's it. Please wait a minute while I get this working..."), ]; for (const entry of questionsAndText) { @@ -236,11 +192,7 @@ async function ask(): Promise { } } else { // only print the headline if any of the questions are necessary - if ( - entry.questions.find((qq) => - testCondition(qq.condition, answers), - ) - ) { + if (entry.questions.find(qq => testCondition(qq.condition, answers))) { console.log(); console.log(underline(entry.headline)); } @@ -267,16 +219,17 @@ let gitCommit: boolean; /** Whether dev-server should be installed */ let devServer: boolean; -/** CLI-specific functionality for creating the adapter directory */ -async function setupProject_CLI( - answers: Answers, - files: File[], -): Promise { +/** + * CLI-specific functionality for creating the adapter directory + * + * @param answers + * @param files + */ +async function setupProject_CLI(answers: Answers, files: File[]): Promise { const rootDirName = path.basename(rootDir); // make sure we are working in a directory called ioBroker. const targetDir = - rootDirName.toLowerCase() === - `iobroker.${answers.adapterName.toLowerCase()}` + rootDirName.toLowerCase() === `iobroker.${answers.adapterName.toLowerCase()}` ? rootDir : path.join(rootDir, `ioBroker.${answers.adapterName}`); await writeFiles(targetDir, files); @@ -296,10 +249,7 @@ async function setupProject_CLI( if (devServer) { logProgress("Installing dev-server"); - await executeNpmCommand( - ["install", "--global", "@iobroker/dev-server"], - { cwd: targetDir }, - ); + await executeNpmCommand(["install", "--global", "@iobroker/dev-server"], { cwd: targetDir }); await executeCommand( isWindows ? "iobroker-dev-server.cmd" : "iobroker-dev-server", ["setup", "--adminPort", `${answers.devServerPort}`], @@ -334,17 +284,9 @@ async function setupProject_CLI( console.log(); console.log(); console.log(blueBright("All done! Have fun programming! ") + red("♥")); - console.log( - blueBright(`Just open `) + - bold(reset(targetDir)) + - blueBright(` in your favorite editor.`), - ); + console.log(blueBright(`Just open `) + bold(reset(targetDir)) + blueBright(` in your favorite editor.`)); console.log(); - console.log( - gray( - "Hint: try CTRL-clicking the path if you have the editor open already.", - ), - ); + console.log(gray("Hint: try CTRL-clicking the path if you have the editor open already.")); } // Enable CI testing without stalling @@ -358,23 +300,28 @@ if (process.env.TEST_STARTUP) { if (installDependencies) { maxSteps++; - needsBuildStep = - answers.language === "TypeScript" || - answers.adminUi === "react" || - answers.tabReact === "yes"; - if (needsBuildStep) maxSteps++; + needsBuildStep = answers.language === "TypeScript" || answers.adminUi === "react" || answers.tabReact === "yes"; + if (needsBuildStep) { + maxSteps++; + } } devServer = answers.devServer === "yes"; - if (devServer) maxSteps++; + if (devServer) { + maxSteps++; + } gitCommit = answers.gitCommit === "yes"; - if (gitCommit) maxSteps++; + if (gitCommit) { + maxSteps++; + } logProgress("Generating files"); const files = await createFiles(answers); await setupProject_CLI(answers, files); -})().catch((error) => console.error(error)); +})().catch(error => console.error(error)); process.on("exit", () => { - if (fs.pathExistsSync("npm-debug.log")) fs.removeSync("npm-debug.log"); + if (fs.pathExistsSync("npm-debug.log")) { + fs.removeSync("npm-debug.log"); + } }); diff --git a/src/index.ts b/src/index.ts index 71ed829ad..ca2673084 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,16 +1,14 @@ import type { Answers } from "./lib/core/questions"; -import { - checkAnswers, - formatAnswers, - validateAnswers, -} from "./lib/core/questions"; +import { checkAnswers, formatAnswers, validateAnswers } from "./lib/core/questions"; import type { File } from "./lib/createAdapter"; import { createFiles } from "./lib/createAdapter"; -export async function createAdapter( - answers: Answers, - disableValidation: (keyof Answers)[] = [], -): Promise { +/** + * + * @param answers + * @param disableValidation + */ +export async function createAdapter(answers: Answers, disableValidation: (keyof Answers)[] = []): Promise { // Check all answers checkAnswers(answers); answers = (await formatAnswers(answers)) as Answers; diff --git a/src/lib/core.test.ts b/src/lib/core.test.ts index d84516910..510247fb8 100644 --- a/src/lib/core.test.ts +++ b/src/lib/core.test.ts @@ -18,7 +18,7 @@ const testAllFiles = async (assertion: (content: string, filename: string) => vo */ describe("./core directory", () => { it("should not contain any imports from base directory (../)", async () => { - testAllFiles((content, file) => + await testAllFiles((content, file) => content.should.not.match(/import .+ from "\.\./gi, `${file} contains an import from the base directory`), ); }); diff --git a/src/lib/core/actionsAndTransformers.test.ts b/src/lib/core/actionsAndTransformers.test.ts index 4138e769c..a8003965a 100644 --- a/src/lib/core/actionsAndTransformers.test.ts +++ b/src/lib/core/actionsAndTransformers.test.ts @@ -66,9 +66,7 @@ describe("actionsAndTransformers/checkAdapterName()", () => { }); it("should return an error if the adapter already exists", async () => { - checkAdapterExistence.resolves( - "The adapter ioBroker.foo already exists!", - ); + checkAdapterExistence.resolves("The adapter ioBroker.foo already exists!"); const result = await checkAdapterName("foo", { checkAdapterExistence, }); @@ -170,11 +168,7 @@ describe("actionsAndTransformers/checkTitle()", () => { }); it("should return an error if the title contains iobroker or adapter", async () => { - const forbidden = [ - "iobroker adapter", - "adapter test foo", - "this is for iobroker", - ]; + const forbidden = ["iobroker adapter", "adapter test foo", "this is for iobroker"]; for (const name of forbidden) { const result = await checkTitle(name); result.should.be.a("string").and.match(/must not/); diff --git a/src/lib/core/actionsAndTransformers.ts b/src/lib/core/actionsAndTransformers.ts index 606b178f9..9a920728e 100644 --- a/src/lib/core/actionsAndTransformers.ts +++ b/src/lib/core/actionsAndTransformers.ts @@ -5,12 +5,16 @@ const emailRegex = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/; export type CheckResult = true | string; -export async function checkMinSelections( - category: string, - min: number, - answers: any[], -): Promise { - if (answers.length >= min) return true; +/** + * + * @param category + * @param min + * @param answers + */ +export async function checkMinSelections(category: string, min: number, answers: any[]): Promise { + if (answers.length >= min) { + return true; + } return `Please enter at least ${min} ${category}`; } @@ -31,22 +35,38 @@ function isAdapterNameValid(name: string): CheckResult { return true; } +/** + * + * @param name + * @param options + */ export async function checkAdapterName< T extends { + /** + * + */ checkAdapterExistence?: (name: string) => Promise; }, >(name: string, options?: T): Promise { const validCheck = isAdapterNameValid(name); - if (typeof validCheck === "string") return validCheck; + if (typeof validCheck === "string") { + return validCheck; + } if (options && options.checkAdapterExistence) { const existenceCheck = await options.checkAdapterExistence(name); - if (typeof existenceCheck === "string") return existenceCheck; + if (typeof existenceCheck === "string") { + return existenceCheck; + } } return true; } +/** + * + * @param title + */ export function checkTitle(title?: string): CheckResult { if (!isNotEmpty(title)) { return "Please enter a title!"; @@ -61,6 +81,10 @@ function isNotEmpty(answer?: string): answer is string { return answer != undefined && answer.length > 0 && answer.trim().length > 0; } +/** + * + * @param name + */ export async function checkAuthorName(name?: string): Promise { if (!isNotEmpty(name)) { return "Please enter a valid name!"; @@ -68,6 +92,10 @@ export async function checkAuthorName(name?: string): Promise { return true; } +/** + * + * @param email + */ export async function checkEmail(email: string): Promise { if (!emailRegex.test(email)) { return "Please enter a valid email address!"; @@ -75,50 +103,70 @@ export async function checkEmail(email: string): Promise { return true; } -export async function checkTypeScriptTools( - tools: Exclude, -): Promise { +/** + * + * @param tools + */ +export async function checkTypeScriptTools(tools: Exclude): Promise { if (tools.indexOf("Prettier") > -1 && tools.indexOf("ESLint") === -1) { return "ESLint must be selected to use Prettier!"; } return true; } +/** + * + * @param name + */ export function transformAdapterName(name: string): string { const startsWithIoBroker = /^ioBroker\./i; if (startsWithIoBroker.test(name)) { name = name.replace(startsWithIoBroker, ""); - console.log( - yellow(`You don't have to prefix the name with "ioBroker."`), - ); + console.log(yellow(`You don't have to prefix the name with "ioBroker."`)); } return name; } +/** + * + * @param description + */ export function transformDescription(description: string): string | undefined { description = description.trim(); - if (description.length === 0) return undefined; + if (description.length === 0) { + return undefined; + } return description; } +/** + * + * @param keywords + */ export function transformKeywords(keywords: string): string[] | undefined { const keywordsArray = keywords .trim() .split(",") - .map((k) => k.trim()) - .filter((k) => !!k); - if (keywordsArray.length === 0) return undefined; + .map(k => k.trim()) + .filter(k => !!k); + if (keywordsArray.length === 0) { + return undefined; + } return keywordsArray; } -export function transformContributors( - contributors: string, -): string[] | undefined { +/** + * + * @param contributors + */ +export function transformContributors(contributors: string): string[] | undefined { const contributorsArray = contributors .trim() .split(",") - .map((c) => c.trim()) - .filter((c) => !!c); - if (contributorsArray.length === 0) return undefined; + .map(c => c.trim()) + .filter(c => !!c); + if (contributorsArray.length === 0) { + return undefined; + } return contributorsArray; } diff --git a/src/lib/core/licenses.ts b/src/lib/core/licenses.ts index 542b66172..acb6417dd 100644 --- a/src/lib/core/licenses.ts +++ b/src/lib/core/licenses.ts @@ -3,49 +3,61 @@ // Since this is auto-generated, we will not unit-test this file // istanbul ignore +/** + * + */ export interface License { + /** + * + */ id: string; + /** + * + */ name: string; + /** + * + */ text: string; } -export const licenses: Record = /** BEGIN LICENSES */{ +export const licenses: Record = /** BEGIN LICENSES */ { "GNU AGPLv3": { - "id": "AGPL-3.0", - "name": "GNU Affero General Public License v3.0", - "text": " GNU AFFERO GENERAL PUBLIC LICENSE\n Version 3, 19 November 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n Preamble\n\n The GNU Affero General Public License is a free, copyleft license for\nsoftware and other kinds of works, specifically designed to ensure\ncooperation with the community in the case of network server software.\n\n The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works. By contrast,\nour General Public Licenses are intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.\n\n When we speak of free software, we are referring to freedom, not\nprice. Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n Developers that use our General Public Licenses protect your rights\nwith two steps: (1) assert copyright on the software, and (2) offer\nyou this License which gives you legal permission to copy, distribute\nand/or modify the software.\n\n A secondary benefit of defending all users' freedom is that\nimprovements made in alternate versions of the program, if they\nreceive widespread use, become available for other developers to\nincorporate. Many developers of free software are heartened and\nencouraged by the resulting cooperation. However, in the case of\nsoftware used on network servers, this result may fail to come about.\nThe GNU General Public License permits making a modified version and\nletting the public access it on a server without ever releasing its\nsource code to the public.\n\n The GNU Affero General Public License is designed specifically to\nensure that, in such cases, the modified source code becomes available\nto the community. It requires the operator of a network server to\nprovide the source code of the modified version running there to the\nusers of that server. Therefore, public use of a modified version, on\na publicly accessible server, gives the public access to the source\ncode of the modified version.\n\n An older license, called the Affero General Public License and\npublished by Affero, was designed to accomplish similar goals. This is\na different license, not a version of the Affero GPL, but Affero has\nreleased a new version of the Affero GPL which permits relicensing under\nthis license.\n\n The precise terms and conditions for copying, distribution and\nmodification follow.\n\n TERMS AND CONDITIONS\n\n 0. Definitions.\n\n \"This License\" refers to version 3 of the GNU Affero General Public License.\n\n \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n \"The Program\" refers to any copyrightable work licensed under this\nLicense. Each licensee is addressed as \"you\". \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy. The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy. Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies. Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License. If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n 1. Source Code.\n\n The \"source code\" for a work means the preferred form of the work\nfor making modifications to it. \"Object code\" means any non-source\nform of a work.\n\n A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form. A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities. However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work. For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n The Corresponding Source for a work in source code form is that\nsame work.\n\n 2. Basic Permissions.\n\n All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met. This License explicitly affirms your unlimited\npermission to run the unmodified Program. The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work. This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force. You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright. Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n Conveying under any other circumstances is permitted solely under\nthe conditions stated below. Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n 3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n 4. Conveying Verbatim Copies.\n\n You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n 5. Conveying Modified Source Versions.\n\n You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n a) The work must carry prominent notices stating that you modified\n it, and giving a relevant date.\n\n b) The work must carry prominent notices stating that it is\n released under this License and any conditions added under section\n 7. This requirement modifies the requirement in section 4 to\n \"keep intact all notices\".\n\n c) You must license the entire work, as a whole, under this\n License to anyone who comes into possession of a copy. This\n License will therefore apply, along with any applicable section 7\n additional terms, to the whole of the work, and all its parts,\n regardless of how they are packaged. This License gives no\n permission to license the work in any other way, but it does not\n invalidate such permission if you have separately received it.\n\n d) If the work has interactive user interfaces, each must display\n Appropriate Legal Notices; however, if the Program has interactive\n interfaces that do not display Appropriate Legal Notices, your\n work need not make them do so.\n\n A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit. Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n 6. Conveying Non-Source Forms.\n\n You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n a) Convey the object code in, or embodied in, a physical product\n (including a physical distribution medium), accompanied by the\n Corresponding Source fixed on a durable physical medium\n customarily used for software interchange.\n\n b) Convey the object code in, or embodied in, a physical product\n (including a physical distribution medium), accompanied by a\n written offer, valid for at least three years and valid for as\n long as you offer spare parts or customer support for that product\n model, to give anyone who possesses the object code either (1) a\n copy of the Corresponding Source for all the software in the\n product that is covered by this License, on a durable physical\n medium customarily used for software interchange, for a price no\n more than your reasonable cost of physically performing this\n conveying of source, or (2) access to copy the\n Corresponding Source from a network server at no charge.\n\n c) Convey individual copies of the object code with a copy of the\n written offer to provide the Corresponding Source. This\n alternative is allowed only occasionally and noncommercially, and\n only if you received the object code with such an offer, in accord\n with subsection 6b.\n\n d) Convey the object code by offering access from a designated\n place (gratis or for a charge), and offer equivalent access to the\n Corresponding Source in the same way through the same place at no\n further charge. You need not require recipients to copy the\n Corresponding Source along with the object code. If the place to\n copy the object code is a network server, the Corresponding Source\n may be on a different server (operated by you or a third party)\n that supports equivalent copying facilities, provided you maintain\n clear directions next to the object code saying where to find the\n Corresponding Source. Regardless of what server hosts the\n Corresponding Source, you remain obligated to ensure that it is\n available for as long as needed to satisfy these requirements.\n\n e) Convey the object code using peer-to-peer transmission, provided\n you inform other peers where the object code and Corresponding\n Source of the work are being offered to the general public at no\n charge under subsection 6d.\n\n A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling. In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage. For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product. A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source. The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information. But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed. Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n 7. Additional Terms.\n\n \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law. If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit. (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.) You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n a) Disclaiming warranty or limiting liability differently from the\n terms of sections 15 and 16 of this License; or\n\n b) Requiring preservation of specified reasonable legal notices or\n author attributions in that material or in the Appropriate Legal\n Notices displayed by works containing it; or\n\n c) Prohibiting misrepresentation of the origin of that material, or\n requiring that modified versions of such material be marked in\n reasonable ways as different from the original version; or\n\n d) Limiting the use for publicity purposes of names of licensors or\n authors of the material; or\n\n e) Declining to grant rights under trademark law for use of some\n trade names, trademarks, or service marks; or\n\n f) Requiring indemnification of licensors and authors of that\n material by anyone who conveys the material (or modified versions of\n it) with contractual assumptions of liability to the recipient, for\n any liability that these contractual assumptions directly impose on\n those licensors and authors.\n\n All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10. If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term. If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n 8. Termination.\n\n You may not propagate or modify a covered work except as expressly\nprovided under this License. Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License. If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n 9. Acceptance Not Required for Having Copies.\n\n You are not required to accept this License in order to receive or\nrun a copy of the Program. Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance. However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work. These actions infringe copyright if you do\nnot accept this License. Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n 10. Automatic Licensing of Downstream Recipients.\n\n Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License. You are not responsible\nfor enforcing compliance by third parties with this License.\n\n An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations. If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License. For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n 11. Patents.\n\n A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based. The\nwork thus licensed is called the contributor's \"contributor version\".\n\n A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version. For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement). To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients. \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License. You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n 12. No Surrender of Others' Freedom.\n\n If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License. If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all. For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n 13. Remote Network Interaction; Use with the GNU General Public License.\n\n Notwithstanding any other provision of this License, if you modify the\nProgram, your modified version must prominently offer all users\ninteracting with it remotely through a computer network (if your version\nsupports such interaction) an opportunity to receive the Corresponding\nSource of your version by providing access to the Corresponding Source\nfrom a network server at no charge, through some standard or customary\nmeans of facilitating copying of software. This Corresponding Source\nshall include the Corresponding Source for any work covered by version 3\nof the GNU General Public License that is incorporated pursuant to the\nfollowing paragraph.\n\n Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU General Public License into a single\ncombined work, and to convey the resulting work. The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the work with which it is combined will remain governed by version\n3 of the GNU General Public License.\n\n 14. Revised Versions of this License.\n\n The Free Software Foundation may publish revised and/or new versions of\nthe GNU Affero General Public License from time to time. Such new versions\nwill be similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n Each version is given a distinguishing version number. If the\nProgram specifies that a certain numbered version of the GNU Affero General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation. If the Program does not specify a version number of the\nGNU Affero General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n If the Program specifies that a proxy can decide which future\nversions of the GNU Affero General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n Later license versions may give you additional or different\npermissions. However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n 15. Disclaimer of Warranty.\n\n THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n 16. Limitation of Liability.\n\n IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n 17. Interpretation of Sections 15 and 16.\n\n If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n END OF TERMS AND CONDITIONS\n\n How to Apply These Terms to Your New Programs\n\n If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n To do so, attach the following notices to the program. It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n \n Copyright (C) \n\n This program is free software: you can redistribute it and/or modify\n it under the terms of the GNU Affero General Public License as published\n by the Free Software Foundation, either version 3 of the License, or\n (at your option) any later version.\n\n This program is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n GNU Affero General Public License for more details.\n\n You should have received a copy of the GNU Affero General Public License\n along with this program. If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n If your software can interact with users remotely through a computer\nnetwork, you should also make sure that it provides a way for users to\nget its source. For example, if your program is a web application, its\ninterface could display a \"Source\" link that leads users to an archive\nof the code. There are many ways you could offer source, and different\nsolutions will be better for different programs; see section 13 for the\nspecific requirements.\n\n You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU AGPL, see\n.\n" + id: "AGPL-3.0", + name: "GNU Affero General Public License v3.0", + text: ' GNU AFFERO GENERAL PUBLIC LICENSE\n Version 3, 19 November 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n Preamble\n\n The GNU Affero General Public License is a free, copyleft license for\nsoftware and other kinds of works, specifically designed to ensure\ncooperation with the community in the case of network server software.\n\n The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works. By contrast,\nour General Public Licenses are intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users.\n\n When we speak of free software, we are referring to freedom, not\nprice. Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n Developers that use our General Public Licenses protect your rights\nwith two steps: (1) assert copyright on the software, and (2) offer\nyou this License which gives you legal permission to copy, distribute\nand/or modify the software.\n\n A secondary benefit of defending all users\' freedom is that\nimprovements made in alternate versions of the program, if they\nreceive widespread use, become available for other developers to\nincorporate. Many developers of free software are heartened and\nencouraged by the resulting cooperation. However, in the case of\nsoftware used on network servers, this result may fail to come about.\nThe GNU General Public License permits making a modified version and\nletting the public access it on a server without ever releasing its\nsource code to the public.\n\n The GNU Affero General Public License is designed specifically to\nensure that, in such cases, the modified source code becomes available\nto the community. It requires the operator of a network server to\nprovide the source code of the modified version running there to the\nusers of that server. Therefore, public use of a modified version, on\na publicly accessible server, gives the public access to the source\ncode of the modified version.\n\n An older license, called the Affero General Public License and\npublished by Affero, was designed to accomplish similar goals. This is\na different license, not a version of the Affero GPL, but Affero has\nreleased a new version of the Affero GPL which permits relicensing under\nthis license.\n\n The precise terms and conditions for copying, distribution and\nmodification follow.\n\n TERMS AND CONDITIONS\n\n 0. Definitions.\n\n "This License" refers to version 3 of the GNU Affero General Public License.\n\n "Copyright" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n "The Program" refers to any copyrightable work licensed under this\nLicense. Each licensee is addressed as "you". "Licensees" and\n"recipients" may be individuals or organizations.\n\n To "modify" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy. The resulting work is called a "modified version" of the\nearlier work or a work "based on" the earlier work.\n\n A "covered work" means either the unmodified Program or a work based\non the Program.\n\n To "propagate" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy. Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n To "convey" a work means any kind of propagation that enables other\nparties to make or receive copies. Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n An interactive user interface displays "Appropriate Legal Notices"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License. If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n 1. Source Code.\n\n The "source code" for a work means the preferred form of the work\nfor making modifications to it. "Object code" means any non-source\nform of a work.\n\n A "Standard Interface" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n The "System Libraries" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form. A\n"Major Component", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n The "Corresponding Source" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities. However, it does not include the work\'s\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work. For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n The Corresponding Source for a work in source code form is that\nsame work.\n\n 2. Basic Permissions.\n\n All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met. This License explicitly affirms your unlimited\npermission to run the unmodified Program. The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work. This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force. You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright. Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n Conveying under any other circumstances is permitted solely under\nthe conditions stated below. Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n 3. Protecting Users\' Legal Rights From Anti-Circumvention Law.\n\n No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work\'s\nusers, your or third parties\' legal rights to forbid circumvention of\ntechnological measures.\n\n 4. Conveying Verbatim Copies.\n\n You may convey verbatim copies of the Program\'s source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n 5. Conveying Modified Source Versions.\n\n You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n a) The work must carry prominent notices stating that you modified\n it, and giving a relevant date.\n\n b) The work must carry prominent notices stating that it is\n released under this License and any conditions added under section\n 7. This requirement modifies the requirement in section 4 to\n "keep intact all notices".\n\n c) You must license the entire work, as a whole, under this\n License to anyone who comes into possession of a copy. This\n License will therefore apply, along with any applicable section 7\n additional terms, to the whole of the work, and all its parts,\n regardless of how they are packaged. This License gives no\n permission to license the work in any other way, but it does not\n invalidate such permission if you have separately received it.\n\n d) If the work has interactive user interfaces, each must display\n Appropriate Legal Notices; however, if the Program has interactive\n interfaces that do not display Appropriate Legal Notices, your\n work need not make them do so.\n\n A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n"aggregate" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation\'s users\nbeyond what the individual works permit. Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n 6. Conveying Non-Source Forms.\n\n You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n a) Convey the object code in, or embodied in, a physical product\n (including a physical distribution medium), accompanied by the\n Corresponding Source fixed on a durable physical medium\n customarily used for software interchange.\n\n b) Convey the object code in, or embodied in, a physical product\n (including a physical distribution medium), accompanied by a\n written offer, valid for at least three years and valid for as\n long as you offer spare parts or customer support for that product\n model, to give anyone who possesses the object code either (1) a\n copy of the Corresponding Source for all the software in the\n product that is covered by this License, on a durable physical\n medium customarily used for software interchange, for a price no\n more than your reasonable cost of physically performing this\n conveying of source, or (2) access to copy the\n Corresponding Source from a network server at no charge.\n\n c) Convey individual copies of the object code with a copy of the\n written offer to provide the Corresponding Source. This\n alternative is allowed only occasionally and noncommercially, and\n only if you received the object code with such an offer, in accord\n with subsection 6b.\n\n d) Convey the object code by offering access from a designated\n place (gratis or for a charge), and offer equivalent access to the\n Corresponding Source in the same way through the same place at no\n further charge. You need not require recipients to copy the\n Corresponding Source along with the object code. If the place to\n copy the object code is a network server, the Corresponding Source\n may be on a different server (operated by you or a third party)\n that supports equivalent copying facilities, provided you maintain\n clear directions next to the object code saying where to find the\n Corresponding Source. Regardless of what server hosts the\n Corresponding Source, you remain obligated to ensure that it is\n available for as long as needed to satisfy these requirements.\n\n e) Convey the object code using peer-to-peer transmission, provided\n you inform other peers where the object code and Corresponding\n Source of the work are being offered to the general public at no\n charge under subsection 6d.\n\n A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n A "User Product" is either (1) a "consumer product", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling. In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage. For a particular\nproduct received by a particular user, "normally used" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product. A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n "Installation Information" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source. The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information. But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed. Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n 7. Additional Terms.\n\n "Additional permissions" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law. If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit. (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.) You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n a) Disclaiming warranty or limiting liability differently from the\n terms of sections 15 and 16 of this License; or\n\n b) Requiring preservation of specified reasonable legal notices or\n author attributions in that material or in the Appropriate Legal\n Notices displayed by works containing it; or\n\n c) Prohibiting misrepresentation of the origin of that material, or\n requiring that modified versions of such material be marked in\n reasonable ways as different from the original version; or\n\n d) Limiting the use for publicity purposes of names of licensors or\n authors of the material; or\n\n e) Declining to grant rights under trademark law for use of some\n trade names, trademarks, or service marks; or\n\n f) Requiring indemnification of licensors and authors of that\n material by anyone who conveys the material (or modified versions of\n it) with contractual assumptions of liability to the recipient, for\n any liability that these contractual assumptions directly impose on\n those licensors and authors.\n\n All other non-permissive additional terms are considered "further\nrestrictions" within the meaning of section 10. If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term. If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n 8. Termination.\n\n You may not propagate or modify a covered work except as expressly\nprovided under this License. Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License. If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n 9. Acceptance Not Required for Having Copies.\n\n You are not required to accept this License in order to receive or\nrun a copy of the Program. Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance. However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work. These actions infringe copyright if you do\nnot accept this License. Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n 10. Automatic Licensing of Downstream Recipients.\n\n Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License. You are not responsible\nfor enforcing compliance by third parties with this License.\n\n An "entity transaction" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations. If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party\'s predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License. For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n 11. Patents.\n\n A "contributor" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based. The\nwork thus licensed is called the contributor\'s "contributor version".\n\n A contributor\'s "essential patent claims" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version. For\npurposes of this definition, "control" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor\'s essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n In the following three paragraphs, a "patent license" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement). To "grant" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients. "Knowingly relying" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient\'s use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n A patent license is "discriminatory" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License. You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n 12. No Surrender of Others\' Freedom.\n\n If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License. If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all. For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n 13. Remote Network Interaction; Use with the GNU General Public License.\n\n Notwithstanding any other provision of this License, if you modify the\nProgram, your modified version must prominently offer all users\ninteracting with it remotely through a computer network (if your version\nsupports such interaction) an opportunity to receive the Corresponding\nSource of your version by providing access to the Corresponding Source\nfrom a network server at no charge, through some standard or customary\nmeans of facilitating copying of software. This Corresponding Source\nshall include the Corresponding Source for any work covered by version 3\nof the GNU General Public License that is incorporated pursuant to the\nfollowing paragraph.\n\n Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU General Public License into a single\ncombined work, and to convey the resulting work. The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the work with which it is combined will remain governed by version\n3 of the GNU General Public License.\n\n 14. Revised Versions of this License.\n\n The Free Software Foundation may publish revised and/or new versions of\nthe GNU Affero General Public License from time to time. Such new versions\nwill be similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n Each version is given a distinguishing version number. If the\nProgram specifies that a certain numbered version of the GNU Affero General\nPublic License "or any later version" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation. If the Program does not specify a version number of the\nGNU Affero General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n If the Program specifies that a proxy can decide which future\nversions of the GNU Affero General Public License can be used, that proxy\'s\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n Later license versions may give you additional or different\npermissions. However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n 15. Disclaimer of Warranty.\n\n THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n 16. Limitation of Liability.\n\n IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n 17. Interpretation of Sections 15 and 16.\n\n If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n END OF TERMS AND CONDITIONS\n\n How to Apply These Terms to Your New Programs\n\n If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n To do so, attach the following notices to the program. It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe "copyright" line and a pointer to where the full notice is found.\n\n \n Copyright (C) \n\n This program is free software: you can redistribute it and/or modify\n it under the terms of the GNU Affero General Public License as published\n by the Free Software Foundation, either version 3 of the License, or\n (at your option) any later version.\n\n This program is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n GNU Affero General Public License for more details.\n\n You should have received a copy of the GNU Affero General Public License\n along with this program. If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n If your software can interact with users remotely through a computer\nnetwork, you should also make sure that it provides a way for users to\nget its source. For example, if your program is a web application, its\ninterface could display a "Source" link that leads users to an archive\nof the code. There are many ways you could offer source, and different\nsolutions will be better for different programs; see section 13 for the\nspecific requirements.\n\n You should also get your employer (if you work as a programmer) or school,\nif any, to sign a "copyright disclaimer" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU AGPL, see\n.\n', }, "GNU GPLv3": { - "id": "GPL-3.0", - "name": "GNU General Public License v3.0", - "text": " GNU GENERAL PUBLIC LICENSE\n Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n Preamble\n\n The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works. By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users. We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors. You can apply it to\nyour programs, too.\n\n When we speak of free software, we are referring to freedom, not\nprice. Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights. Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received. You must make sure that they, too, receive\nor can get the source code. And you must show them these terms so they\nknow their rights.\n\n Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n For the developers' and authors' protection, the GPL clearly explains\nthat there is no warranty for this free software. For both users' and\nauthors' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so. This is fundamentally incompatible with the aim of\nprotecting users' freedom to change the software. The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable. Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts. If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary. To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n The precise terms and conditions for copying, distribution and\nmodification follow.\n\n TERMS AND CONDITIONS\n\n 0. Definitions.\n\n \"This License\" refers to version 3 of the GNU General Public License.\n\n \"Copyright\" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n \"The Program\" refers to any copyrightable work licensed under this\nLicense. Each licensee is addressed as \"you\". \"Licensees\" and\n\"recipients\" may be individuals or organizations.\n\n To \"modify\" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy. The resulting work is called a \"modified version\" of the\nearlier work or a work \"based on\" the earlier work.\n\n A \"covered work\" means either the unmodified Program or a work based\non the Program.\n\n To \"propagate\" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy. Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n To \"convey\" a work means any kind of propagation that enables other\nparties to make or receive copies. Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n An interactive user interface displays \"Appropriate Legal Notices\"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License. If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n 1. Source Code.\n\n The \"source code\" for a work means the preferred form of the work\nfor making modifications to it. \"Object code\" means any non-source\nform of a work.\n\n A \"Standard Interface\" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n The \"System Libraries\" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form. A\n\"Major Component\", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n The \"Corresponding Source\" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities. However, it does not include the work's\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work. For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n The Corresponding Source for a work in source code form is that\nsame work.\n\n 2. Basic Permissions.\n\n All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met. This License explicitly affirms your unlimited\npermission to run the unmodified Program. The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work. This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force. You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright. Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n Conveying under any other circumstances is permitted solely under\nthe conditions stated below. Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n 3. Protecting Users' Legal Rights From Anti-Circumvention Law.\n\n No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work's\nusers, your or third parties' legal rights to forbid circumvention of\ntechnological measures.\n\n 4. Conveying Verbatim Copies.\n\n You may convey verbatim copies of the Program's source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n 5. Conveying Modified Source Versions.\n\n You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n a) The work must carry prominent notices stating that you modified\n it, and giving a relevant date.\n\n b) The work must carry prominent notices stating that it is\n released under this License and any conditions added under section\n 7. This requirement modifies the requirement in section 4 to\n \"keep intact all notices\".\n\n c) You must license the entire work, as a whole, under this\n License to anyone who comes into possession of a copy. This\n License will therefore apply, along with any applicable section 7\n additional terms, to the whole of the work, and all its parts,\n regardless of how they are packaged. This License gives no\n permission to license the work in any other way, but it does not\n invalidate such permission if you have separately received it.\n\n d) If the work has interactive user interfaces, each must display\n Appropriate Legal Notices; however, if the Program has interactive\n interfaces that do not display Appropriate Legal Notices, your\n work need not make them do so.\n\n A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n\"aggregate\" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation's users\nbeyond what the individual works permit. Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n 6. Conveying Non-Source Forms.\n\n You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n a) Convey the object code in, or embodied in, a physical product\n (including a physical distribution medium), accompanied by the\n Corresponding Source fixed on a durable physical medium\n customarily used for software interchange.\n\n b) Convey the object code in, or embodied in, a physical product\n (including a physical distribution medium), accompanied by a\n written offer, valid for at least three years and valid for as\n long as you offer spare parts or customer support for that product\n model, to give anyone who possesses the object code either (1) a\n copy of the Corresponding Source for all the software in the\n product that is covered by this License, on a durable physical\n medium customarily used for software interchange, for a price no\n more than your reasonable cost of physically performing this\n conveying of source, or (2) access to copy the\n Corresponding Source from a network server at no charge.\n\n c) Convey individual copies of the object code with a copy of the\n written offer to provide the Corresponding Source. This\n alternative is allowed only occasionally and noncommercially, and\n only if you received the object code with such an offer, in accord\n with subsection 6b.\n\n d) Convey the object code by offering access from a designated\n place (gratis or for a charge), and offer equivalent access to the\n Corresponding Source in the same way through the same place at no\n further charge. You need not require recipients to copy the\n Corresponding Source along with the object code. If the place to\n copy the object code is a network server, the Corresponding Source\n may be on a different server (operated by you or a third party)\n that supports equivalent copying facilities, provided you maintain\n clear directions next to the object code saying where to find the\n Corresponding Source. Regardless of what server hosts the\n Corresponding Source, you remain obligated to ensure that it is\n available for as long as needed to satisfy these requirements.\n\n e) Convey the object code using peer-to-peer transmission, provided\n you inform other peers where the object code and Corresponding\n Source of the work are being offered to the general public at no\n charge under subsection 6d.\n\n A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n A \"User Product\" is either (1) a \"consumer product\", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling. In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage. For a particular\nproduct received by a particular user, \"normally used\" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product. A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n \"Installation Information\" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source. The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information. But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed. Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n 7. Additional Terms.\n\n \"Additional permissions\" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law. If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit. (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.) You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n a) Disclaiming warranty or limiting liability differently from the\n terms of sections 15 and 16 of this License; or\n\n b) Requiring preservation of specified reasonable legal notices or\n author attributions in that material or in the Appropriate Legal\n Notices displayed by works containing it; or\n\n c) Prohibiting misrepresentation of the origin of that material, or\n requiring that modified versions of such material be marked in\n reasonable ways as different from the original version; or\n\n d) Limiting the use for publicity purposes of names of licensors or\n authors of the material; or\n\n e) Declining to grant rights under trademark law for use of some\n trade names, trademarks, or service marks; or\n\n f) Requiring indemnification of licensors and authors of that\n material by anyone who conveys the material (or modified versions of\n it) with contractual assumptions of liability to the recipient, for\n any liability that these contractual assumptions directly impose on\n those licensors and authors.\n\n All other non-permissive additional terms are considered \"further\nrestrictions\" within the meaning of section 10. If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term. If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n 8. Termination.\n\n You may not propagate or modify a covered work except as expressly\nprovided under this License. Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License. If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n 9. Acceptance Not Required for Having Copies.\n\n You are not required to accept this License in order to receive or\nrun a copy of the Program. Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance. However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work. These actions infringe copyright if you do\nnot accept this License. Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n 10. Automatic Licensing of Downstream Recipients.\n\n Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License. You are not responsible\nfor enforcing compliance by third parties with this License.\n\n An \"entity transaction\" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations. If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party's predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License. For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n 11. Patents.\n\n A \"contributor\" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based. The\nwork thus licensed is called the contributor's \"contributor version\".\n\n A contributor's \"essential patent claims\" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version. For\npurposes of this definition, \"control\" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor's essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n In the following three paragraphs, a \"patent license\" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement). To \"grant\" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients. \"Knowingly relying\" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient's use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n A patent license is \"discriminatory\" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License. You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n 12. No Surrender of Others' Freedom.\n\n If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License. If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all. For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n 13. Use with the GNU Affero General Public License.\n\n Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work. The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n 14. Revised Versions of this License.\n\n The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time. Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n Each version is given a distinguishing version number. If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License \"or any later version\" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation. If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy's\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n Later license versions may give you additional or different\npermissions. However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n 15. Disclaimer of Warranty.\n\n THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM \"AS IS\" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n 16. Limitation of Liability.\n\n IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n 17. Interpretation of Sections 15 and 16.\n\n If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n END OF TERMS AND CONDITIONS\n\n How to Apply These Terms to Your New Programs\n\n If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n To do so, attach the following notices to the program. It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe \"copyright\" line and a pointer to where the full notice is found.\n\n \n Copyright (C) \n\n This program is free software: you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation, either version 3 of the License, or\n (at your option) any later version.\n\n This program is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n GNU General Public License for more details.\n\n You should have received a copy of the GNU General Public License\n along with this program. If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n Copyright (C) \n This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.\n This is free software, and you are welcome to redistribute it\n under certain conditions; type `show c' for details.\n\nThe hypothetical commands `show w' and `show c' should show the appropriate\nparts of the General Public License. Of course, your program's commands\nmight be different; for a GUI interface, you would use an \"about box\".\n\n You should also get your employer (if you work as a programmer) or school,\nif any, to sign a \"copyright disclaimer\" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n The GNU General Public License does not permit incorporating your program\ninto proprietary programs. If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library. If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License. But first, please read\n.\n" + id: "GPL-3.0", + name: "GNU General Public License v3.0", + text: ' GNU GENERAL PUBLIC LICENSE\n Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n Preamble\n\n The GNU General Public License is a free, copyleft license for\nsoftware and other kinds of works.\n\n The licenses for most software and other practical works are designed\nto take away your freedom to share and change the works. By contrast,\nthe GNU General Public License is intended to guarantee your freedom to\nshare and change all versions of a program--to make sure it remains free\nsoftware for all its users. We, the Free Software Foundation, use the\nGNU General Public License for most of our software; it applies also to\nany other work released this way by its authors. You can apply it to\nyour programs, too.\n\n When we speak of free software, we are referring to freedom, not\nprice. Our General Public Licenses are designed to make sure that you\nhave the freedom to distribute copies of free software (and charge for\nthem if you wish), that you receive source code or can get it if you\nwant it, that you can change the software or use pieces of it in new\nfree programs, and that you know you can do these things.\n\n To protect your rights, we need to prevent others from denying you\nthese rights or asking you to surrender the rights. Therefore, you have\ncertain responsibilities if you distribute copies of the software, or if\nyou modify it: responsibilities to respect the freedom of others.\n\n For example, if you distribute copies of such a program, whether\ngratis or for a fee, you must pass on to the recipients the same\nfreedoms that you received. You must make sure that they, too, receive\nor can get the source code. And you must show them these terms so they\nknow their rights.\n\n Developers that use the GNU GPL protect your rights with two steps:\n(1) assert copyright on the software, and (2) offer you this License\ngiving you legal permission to copy, distribute and/or modify it.\n\n For the developers\' and authors\' protection, the GPL clearly explains\nthat there is no warranty for this free software. For both users\' and\nauthors\' sake, the GPL requires that modified versions be marked as\nchanged, so that their problems will not be attributed erroneously to\nauthors of previous versions.\n\n Some devices are designed to deny users access to install or run\nmodified versions of the software inside them, although the manufacturer\ncan do so. This is fundamentally incompatible with the aim of\nprotecting users\' freedom to change the software. The systematic\npattern of such abuse occurs in the area of products for individuals to\nuse, which is precisely where it is most unacceptable. Therefore, we\nhave designed this version of the GPL to prohibit the practice for those\nproducts. If such problems arise substantially in other domains, we\nstand ready to extend this provision to those domains in future versions\nof the GPL, as needed to protect the freedom of users.\n\n Finally, every program is threatened constantly by software patents.\nStates should not allow patents to restrict development and use of\nsoftware on general-purpose computers, but in those that do, we wish to\navoid the special danger that patents applied to a free program could\nmake it effectively proprietary. To prevent this, the GPL assures that\npatents cannot be used to render the program non-free.\n\n The precise terms and conditions for copying, distribution and\nmodification follow.\n\n TERMS AND CONDITIONS\n\n 0. Definitions.\n\n "This License" refers to version 3 of the GNU General Public License.\n\n "Copyright" also means copyright-like laws that apply to other kinds of\nworks, such as semiconductor masks.\n\n "The Program" refers to any copyrightable work licensed under this\nLicense. Each licensee is addressed as "you". "Licensees" and\n"recipients" may be individuals or organizations.\n\n To "modify" a work means to copy from or adapt all or part of the work\nin a fashion requiring copyright permission, other than the making of an\nexact copy. The resulting work is called a "modified version" of the\nearlier work or a work "based on" the earlier work.\n\n A "covered work" means either the unmodified Program or a work based\non the Program.\n\n To "propagate" a work means to do anything with it that, without\npermission, would make you directly or secondarily liable for\ninfringement under applicable copyright law, except executing it on a\ncomputer or modifying a private copy. Propagation includes copying,\ndistribution (with or without modification), making available to the\npublic, and in some countries other activities as well.\n\n To "convey" a work means any kind of propagation that enables other\nparties to make or receive copies. Mere interaction with a user through\na computer network, with no transfer of a copy, is not conveying.\n\n An interactive user interface displays "Appropriate Legal Notices"\nto the extent that it includes a convenient and prominently visible\nfeature that (1) displays an appropriate copyright notice, and (2)\ntells the user that there is no warranty for the work (except to the\nextent that warranties are provided), that licensees may convey the\nwork under this License, and how to view a copy of this License. If\nthe interface presents a list of user commands or options, such as a\nmenu, a prominent item in the list meets this criterion.\n\n 1. Source Code.\n\n The "source code" for a work means the preferred form of the work\nfor making modifications to it. "Object code" means any non-source\nform of a work.\n\n A "Standard Interface" means an interface that either is an official\nstandard defined by a recognized standards body, or, in the case of\ninterfaces specified for a particular programming language, one that\nis widely used among developers working in that language.\n\n The "System Libraries" of an executable work include anything, other\nthan the work as a whole, that (a) is included in the normal form of\npackaging a Major Component, but which is not part of that Major\nComponent, and (b) serves only to enable use of the work with that\nMajor Component, or to implement a Standard Interface for which an\nimplementation is available to the public in source code form. A\n"Major Component", in this context, means a major essential component\n(kernel, window system, and so on) of the specific operating system\n(if any) on which the executable work runs, or a compiler used to\nproduce the work, or an object code interpreter used to run it.\n\n The "Corresponding Source" for a work in object code form means all\nthe source code needed to generate, install, and (for an executable\nwork) run the object code and to modify the work, including scripts to\ncontrol those activities. However, it does not include the work\'s\nSystem Libraries, or general-purpose tools or generally available free\nprograms which are used unmodified in performing those activities but\nwhich are not part of the work. For example, Corresponding Source\nincludes interface definition files associated with source files for\nthe work, and the source code for shared libraries and dynamically\nlinked subprograms that the work is specifically designed to require,\nsuch as by intimate data communication or control flow between those\nsubprograms and other parts of the work.\n\n The Corresponding Source need not include anything that users\ncan regenerate automatically from other parts of the Corresponding\nSource.\n\n The Corresponding Source for a work in source code form is that\nsame work.\n\n 2. Basic Permissions.\n\n All rights granted under this License are granted for the term of\ncopyright on the Program, and are irrevocable provided the stated\nconditions are met. This License explicitly affirms your unlimited\npermission to run the unmodified Program. The output from running a\ncovered work is covered by this License only if the output, given its\ncontent, constitutes a covered work. This License acknowledges your\nrights of fair use or other equivalent, as provided by copyright law.\n\n You may make, run and propagate covered works that you do not\nconvey, without conditions so long as your license otherwise remains\nin force. You may convey covered works to others for the sole purpose\nof having them make modifications exclusively for you, or provide you\nwith facilities for running those works, provided that you comply with\nthe terms of this License in conveying all material for which you do\nnot control copyright. Those thus making or running the covered works\nfor you must do so exclusively on your behalf, under your direction\nand control, on terms that prohibit them from making any copies of\nyour copyrighted material outside their relationship with you.\n\n Conveying under any other circumstances is permitted solely under\nthe conditions stated below. Sublicensing is not allowed; section 10\nmakes it unnecessary.\n\n 3. Protecting Users\' Legal Rights From Anti-Circumvention Law.\n\n No covered work shall be deemed part of an effective technological\nmeasure under any applicable law fulfilling obligations under article\n11 of the WIPO copyright treaty adopted on 20 December 1996, or\nsimilar laws prohibiting or restricting circumvention of such\nmeasures.\n\n When you convey a covered work, you waive any legal power to forbid\ncircumvention of technological measures to the extent such circumvention\nis effected by exercising rights under this License with respect to\nthe covered work, and you disclaim any intention to limit operation or\nmodification of the work as a means of enforcing, against the work\'s\nusers, your or third parties\' legal rights to forbid circumvention of\ntechnological measures.\n\n 4. Conveying Verbatim Copies.\n\n You may convey verbatim copies of the Program\'s source code as you\nreceive it, in any medium, provided that you conspicuously and\nappropriately publish on each copy an appropriate copyright notice;\nkeep intact all notices stating that this License and any\nnon-permissive terms added in accord with section 7 apply to the code;\nkeep intact all notices of the absence of any warranty; and give all\nrecipients a copy of this License along with the Program.\n\n You may charge any price or no price for each copy that you convey,\nand you may offer support or warranty protection for a fee.\n\n 5. Conveying Modified Source Versions.\n\n You may convey a work based on the Program, or the modifications to\nproduce it from the Program, in the form of source code under the\nterms of section 4, provided that you also meet all of these conditions:\n\n a) The work must carry prominent notices stating that you modified\n it, and giving a relevant date.\n\n b) The work must carry prominent notices stating that it is\n released under this License and any conditions added under section\n 7. This requirement modifies the requirement in section 4 to\n "keep intact all notices".\n\n c) You must license the entire work, as a whole, under this\n License to anyone who comes into possession of a copy. This\n License will therefore apply, along with any applicable section 7\n additional terms, to the whole of the work, and all its parts,\n regardless of how they are packaged. This License gives no\n permission to license the work in any other way, but it does not\n invalidate such permission if you have separately received it.\n\n d) If the work has interactive user interfaces, each must display\n Appropriate Legal Notices; however, if the Program has interactive\n interfaces that do not display Appropriate Legal Notices, your\n work need not make them do so.\n\n A compilation of a covered work with other separate and independent\nworks, which are not by their nature extensions of the covered work,\nand which are not combined with it such as to form a larger program,\nin or on a volume of a storage or distribution medium, is called an\n"aggregate" if the compilation and its resulting copyright are not\nused to limit the access or legal rights of the compilation\'s users\nbeyond what the individual works permit. Inclusion of a covered work\nin an aggregate does not cause this License to apply to the other\nparts of the aggregate.\n\n 6. Conveying Non-Source Forms.\n\n You may convey a covered work in object code form under the terms\nof sections 4 and 5, provided that you also convey the\nmachine-readable Corresponding Source under the terms of this License,\nin one of these ways:\n\n a) Convey the object code in, or embodied in, a physical product\n (including a physical distribution medium), accompanied by the\n Corresponding Source fixed on a durable physical medium\n customarily used for software interchange.\n\n b) Convey the object code in, or embodied in, a physical product\n (including a physical distribution medium), accompanied by a\n written offer, valid for at least three years and valid for as\n long as you offer spare parts or customer support for that product\n model, to give anyone who possesses the object code either (1) a\n copy of the Corresponding Source for all the software in the\n product that is covered by this License, on a durable physical\n medium customarily used for software interchange, for a price no\n more than your reasonable cost of physically performing this\n conveying of source, or (2) access to copy the\n Corresponding Source from a network server at no charge.\n\n c) Convey individual copies of the object code with a copy of the\n written offer to provide the Corresponding Source. This\n alternative is allowed only occasionally and noncommercially, and\n only if you received the object code with such an offer, in accord\n with subsection 6b.\n\n d) Convey the object code by offering access from a designated\n place (gratis or for a charge), and offer equivalent access to the\n Corresponding Source in the same way through the same place at no\n further charge. You need not require recipients to copy the\n Corresponding Source along with the object code. If the place to\n copy the object code is a network server, the Corresponding Source\n may be on a different server (operated by you or a third party)\n that supports equivalent copying facilities, provided you maintain\n clear directions next to the object code saying where to find the\n Corresponding Source. Regardless of what server hosts the\n Corresponding Source, you remain obligated to ensure that it is\n available for as long as needed to satisfy these requirements.\n\n e) Convey the object code using peer-to-peer transmission, provided\n you inform other peers where the object code and Corresponding\n Source of the work are being offered to the general public at no\n charge under subsection 6d.\n\n A separable portion of the object code, whose source code is excluded\nfrom the Corresponding Source as a System Library, need not be\nincluded in conveying the object code work.\n\n A "User Product" is either (1) a "consumer product", which means any\ntangible personal property which is normally used for personal, family,\nor household purposes, or (2) anything designed or sold for incorporation\ninto a dwelling. In determining whether a product is a consumer product,\ndoubtful cases shall be resolved in favor of coverage. For a particular\nproduct received by a particular user, "normally used" refers to a\ntypical or common use of that class of product, regardless of the status\nof the particular user or of the way in which the particular user\nactually uses, or expects or is expected to use, the product. A product\nis a consumer product regardless of whether the product has substantial\ncommercial, industrial or non-consumer uses, unless such uses represent\nthe only significant mode of use of the product.\n\n "Installation Information" for a User Product means any methods,\nprocedures, authorization keys, or other information required to install\nand execute modified versions of a covered work in that User Product from\na modified version of its Corresponding Source. The information must\nsuffice to ensure that the continued functioning of the modified object\ncode is in no case prevented or interfered with solely because\nmodification has been made.\n\n If you convey an object code work under this section in, or with, or\nspecifically for use in, a User Product, and the conveying occurs as\npart of a transaction in which the right of possession and use of the\nUser Product is transferred to the recipient in perpetuity or for a\nfixed term (regardless of how the transaction is characterized), the\nCorresponding Source conveyed under this section must be accompanied\nby the Installation Information. But this requirement does not apply\nif neither you nor any third party retains the ability to install\nmodified object code on the User Product (for example, the work has\nbeen installed in ROM).\n\n The requirement to provide Installation Information does not include a\nrequirement to continue to provide support service, warranty, or updates\nfor a work that has been modified or installed by the recipient, or for\nthe User Product in which it has been modified or installed. Access to a\nnetwork may be denied when the modification itself materially and\nadversely affects the operation of the network or violates the rules and\nprotocols for communication across the network.\n\n Corresponding Source conveyed, and Installation Information provided,\nin accord with this section must be in a format that is publicly\ndocumented (and with an implementation available to the public in\nsource code form), and must require no special password or key for\nunpacking, reading or copying.\n\n 7. Additional Terms.\n\n "Additional permissions" are terms that supplement the terms of this\nLicense by making exceptions from one or more of its conditions.\nAdditional permissions that are applicable to the entire Program shall\nbe treated as though they were included in this License, to the extent\nthat they are valid under applicable law. If additional permissions\napply only to part of the Program, that part may be used separately\nunder those permissions, but the entire Program remains governed by\nthis License without regard to the additional permissions.\n\n When you convey a copy of a covered work, you may at your option\nremove any additional permissions from that copy, or from any part of\nit. (Additional permissions may be written to require their own\nremoval in certain cases when you modify the work.) You may place\nadditional permissions on material, added by you to a covered work,\nfor which you have or can give appropriate copyright permission.\n\n Notwithstanding any other provision of this License, for material you\nadd to a covered work, you may (if authorized by the copyright holders of\nthat material) supplement the terms of this License with terms:\n\n a) Disclaiming warranty or limiting liability differently from the\n terms of sections 15 and 16 of this License; or\n\n b) Requiring preservation of specified reasonable legal notices or\n author attributions in that material or in the Appropriate Legal\n Notices displayed by works containing it; or\n\n c) Prohibiting misrepresentation of the origin of that material, or\n requiring that modified versions of such material be marked in\n reasonable ways as different from the original version; or\n\n d) Limiting the use for publicity purposes of names of licensors or\n authors of the material; or\n\n e) Declining to grant rights under trademark law for use of some\n trade names, trademarks, or service marks; or\n\n f) Requiring indemnification of licensors and authors of that\n material by anyone who conveys the material (or modified versions of\n it) with contractual assumptions of liability to the recipient, for\n any liability that these contractual assumptions directly impose on\n those licensors and authors.\n\n All other non-permissive additional terms are considered "further\nrestrictions" within the meaning of section 10. If the Program as you\nreceived it, or any part of it, contains a notice stating that it is\ngoverned by this License along with a term that is a further\nrestriction, you may remove that term. If a license document contains\na further restriction but permits relicensing or conveying under this\nLicense, you may add to a covered work material governed by the terms\nof that license document, provided that the further restriction does\nnot survive such relicensing or conveying.\n\n If you add terms to a covered work in accord with this section, you\nmust place, in the relevant source files, a statement of the\nadditional terms that apply to those files, or a notice indicating\nwhere to find the applicable terms.\n\n Additional terms, permissive or non-permissive, may be stated in the\nform of a separately written license, or stated as exceptions;\nthe above requirements apply either way.\n\n 8. Termination.\n\n You may not propagate or modify a covered work except as expressly\nprovided under this License. Any attempt otherwise to propagate or\nmodify it is void, and will automatically terminate your rights under\nthis License (including any patent licenses granted under the third\nparagraph of section 11).\n\n However, if you cease all violation of this License, then your\nlicense from a particular copyright holder is reinstated (a)\nprovisionally, unless and until the copyright holder explicitly and\nfinally terminates your license, and (b) permanently, if the copyright\nholder fails to notify you of the violation by some reasonable means\nprior to 60 days after the cessation.\n\n Moreover, your license from a particular copyright holder is\nreinstated permanently if the copyright holder notifies you of the\nviolation by some reasonable means, this is the first time you have\nreceived notice of violation of this License (for any work) from that\ncopyright holder, and you cure the violation prior to 30 days after\nyour receipt of the notice.\n\n Termination of your rights under this section does not terminate the\nlicenses of parties who have received copies or rights from you under\nthis License. If your rights have been terminated and not permanently\nreinstated, you do not qualify to receive new licenses for the same\nmaterial under section 10.\n\n 9. Acceptance Not Required for Having Copies.\n\n You are not required to accept this License in order to receive or\nrun a copy of the Program. Ancillary propagation of a covered work\noccurring solely as a consequence of using peer-to-peer transmission\nto receive a copy likewise does not require acceptance. However,\nnothing other than this License grants you permission to propagate or\nmodify any covered work. These actions infringe copyright if you do\nnot accept this License. Therefore, by modifying or propagating a\ncovered work, you indicate your acceptance of this License to do so.\n\n 10. Automatic Licensing of Downstream Recipients.\n\n Each time you convey a covered work, the recipient automatically\nreceives a license from the original licensors, to run, modify and\npropagate that work, subject to this License. You are not responsible\nfor enforcing compliance by third parties with this License.\n\n An "entity transaction" is a transaction transferring control of an\norganization, or substantially all assets of one, or subdividing an\norganization, or merging organizations. If propagation of a covered\nwork results from an entity transaction, each party to that\ntransaction who receives a copy of the work also receives whatever\nlicenses to the work the party\'s predecessor in interest had or could\ngive under the previous paragraph, plus a right to possession of the\nCorresponding Source of the work from the predecessor in interest, if\nthe predecessor has it or can get it with reasonable efforts.\n\n You may not impose any further restrictions on the exercise of the\nrights granted or affirmed under this License. For example, you may\nnot impose a license fee, royalty, or other charge for exercise of\nrights granted under this License, and you may not initiate litigation\n(including a cross-claim or counterclaim in a lawsuit) alleging that\nany patent claim is infringed by making, using, selling, offering for\nsale, or importing the Program or any portion of it.\n\n 11. Patents.\n\n A "contributor" is a copyright holder who authorizes use under this\nLicense of the Program or a work on which the Program is based. The\nwork thus licensed is called the contributor\'s "contributor version".\n\n A contributor\'s "essential patent claims" are all patent claims\nowned or controlled by the contributor, whether already acquired or\nhereafter acquired, that would be infringed by some manner, permitted\nby this License, of making, using, or selling its contributor version,\nbut do not include claims that would be infringed only as a\nconsequence of further modification of the contributor version. For\npurposes of this definition, "control" includes the right to grant\npatent sublicenses in a manner consistent with the requirements of\nthis License.\n\n Each contributor grants you a non-exclusive, worldwide, royalty-free\npatent license under the contributor\'s essential patent claims, to\nmake, use, sell, offer for sale, import and otherwise run, modify and\npropagate the contents of its contributor version.\n\n In the following three paragraphs, a "patent license" is any express\nagreement or commitment, however denominated, not to enforce a patent\n(such as an express permission to practice a patent or covenant not to\nsue for patent infringement). To "grant" such a patent license to a\nparty means to make such an agreement or commitment not to enforce a\npatent against the party.\n\n If you convey a covered work, knowingly relying on a patent license,\nand the Corresponding Source of the work is not available for anyone\nto copy, free of charge and under the terms of this License, through a\npublicly available network server or other readily accessible means,\nthen you must either (1) cause the Corresponding Source to be so\navailable, or (2) arrange to deprive yourself of the benefit of the\npatent license for this particular work, or (3) arrange, in a manner\nconsistent with the requirements of this License, to extend the patent\nlicense to downstream recipients. "Knowingly relying" means you have\nactual knowledge that, but for the patent license, your conveying the\ncovered work in a country, or your recipient\'s use of the covered work\nin a country, would infringe one or more identifiable patents in that\ncountry that you have reason to believe are valid.\n\n If, pursuant to or in connection with a single transaction or\narrangement, you convey, or propagate by procuring conveyance of, a\ncovered work, and grant a patent license to some of the parties\nreceiving the covered work authorizing them to use, propagate, modify\nor convey a specific copy of the covered work, then the patent license\nyou grant is automatically extended to all recipients of the covered\nwork and works based on it.\n\n A patent license is "discriminatory" if it does not include within\nthe scope of its coverage, prohibits the exercise of, or is\nconditioned on the non-exercise of one or more of the rights that are\nspecifically granted under this License. You may not convey a covered\nwork if you are a party to an arrangement with a third party that is\nin the business of distributing software, under which you make payment\nto the third party based on the extent of your activity of conveying\nthe work, and under which the third party grants, to any of the\nparties who would receive the covered work from you, a discriminatory\npatent license (a) in connection with copies of the covered work\nconveyed by you (or copies made from those copies), or (b) primarily\nfor and in connection with specific products or compilations that\ncontain the covered work, unless you entered into that arrangement,\nor that patent license was granted, prior to 28 March 2007.\n\n Nothing in this License shall be construed as excluding or limiting\nany implied license or other defenses to infringement that may\notherwise be available to you under applicable patent law.\n\n 12. No Surrender of Others\' Freedom.\n\n If conditions are imposed on you (whether by court order, agreement or\notherwise) that contradict the conditions of this License, they do not\nexcuse you from the conditions of this License. If you cannot convey a\ncovered work so as to satisfy simultaneously your obligations under this\nLicense and any other pertinent obligations, then as a consequence you may\nnot convey it at all. For example, if you agree to terms that obligate you\nto collect a royalty for further conveying from those to whom you convey\nthe Program, the only way you could satisfy both those terms and this\nLicense would be to refrain entirely from conveying the Program.\n\n 13. Use with the GNU Affero General Public License.\n\n Notwithstanding any other provision of this License, you have\npermission to link or combine any covered work with a work licensed\nunder version 3 of the GNU Affero General Public License into a single\ncombined work, and to convey the resulting work. The terms of this\nLicense will continue to apply to the part which is the covered work,\nbut the special requirements of the GNU Affero General Public License,\nsection 13, concerning interaction through a network will apply to the\ncombination as such.\n\n 14. Revised Versions of this License.\n\n The Free Software Foundation may publish revised and/or new versions of\nthe GNU General Public License from time to time. Such new versions will\nbe similar in spirit to the present version, but may differ in detail to\naddress new problems or concerns.\n\n Each version is given a distinguishing version number. If the\nProgram specifies that a certain numbered version of the GNU General\nPublic License "or any later version" applies to it, you have the\noption of following the terms and conditions either of that numbered\nversion or of any later version published by the Free Software\nFoundation. If the Program does not specify a version number of the\nGNU General Public License, you may choose any version ever published\nby the Free Software Foundation.\n\n If the Program specifies that a proxy can decide which future\nversions of the GNU General Public License can be used, that proxy\'s\npublic statement of acceptance of a version permanently authorizes you\nto choose that version for the Program.\n\n Later license versions may give you additional or different\npermissions. However, no additional obligations are imposed on any\nauthor or copyright holder as a result of your choosing to follow a\nlater version.\n\n 15. Disclaimer of Warranty.\n\n THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY\nAPPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT\nHOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY\nOF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,\nTHE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\nPURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM\nIS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF\nALL NECESSARY SERVICING, REPAIR OR CORRECTION.\n\n 16. Limitation of Liability.\n\n IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING\nWILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS\nTHE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY\nGENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE\nUSE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF\nDATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD\nPARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),\nEVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF\nSUCH DAMAGES.\n\n 17. Interpretation of Sections 15 and 16.\n\n If the disclaimer of warranty and limitation of liability provided\nabove cannot be given local legal effect according to their terms,\nreviewing courts shall apply local law that most closely approximates\nan absolute waiver of all civil liability in connection with the\nProgram, unless a warranty or assumption of liability accompanies a\ncopy of the Program in return for a fee.\n\n END OF TERMS AND CONDITIONS\n\n How to Apply These Terms to Your New Programs\n\n If you develop a new program, and you want it to be of the greatest\npossible use to the public, the best way to achieve this is to make it\nfree software which everyone can redistribute and change under these terms.\n\n To do so, attach the following notices to the program. It is safest\nto attach them to the start of each source file to most effectively\nstate the exclusion of warranty; and each file should have at least\nthe "copyright" line and a pointer to where the full notice is found.\n\n \n Copyright (C) \n\n This program is free software: you can redistribute it and/or modify\n it under the terms of the GNU General Public License as published by\n the Free Software Foundation, either version 3 of the License, or\n (at your option) any later version.\n\n This program is distributed in the hope that it will be useful,\n but WITHOUT ANY WARRANTY; without even the implied warranty of\n MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n GNU General Public License for more details.\n\n You should have received a copy of the GNU General Public License\n along with this program. If not, see .\n\nAlso add information on how to contact you by electronic and paper mail.\n\n If the program does terminal interaction, make it output a short\nnotice like this when it starts in an interactive mode:\n\n Copyright (C) \n This program comes with ABSOLUTELY NO WARRANTY; for details type `show w\'.\n This is free software, and you are welcome to redistribute it\n under certain conditions; type `show c\' for details.\n\nThe hypothetical commands `show w\' and `show c\' should show the appropriate\nparts of the General Public License. Of course, your program\'s commands\nmight be different; for a GUI interface, you would use an "about box".\n\n You should also get your employer (if you work as a programmer) or school,\nif any, to sign a "copyright disclaimer" for the program, if necessary.\nFor more information on this, and how to apply and follow the GNU GPL, see\n.\n\n The GNU General Public License does not permit incorporating your program\ninto proprietary programs. If your program is a subroutine library, you\nmay consider it more useful to permit linking proprietary applications with\nthe library. If this is what you want to do, use the GNU Lesser General\nPublic License instead of this License. But first, please read\n.\n', }, "GNU LGPLv3": { - "id": "LGPL-3.0", - "name": "GNU Lesser General Public License v3.0", - "text": " GNU LESSER GENERAL PUBLIC LICENSE\n Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\n This version of the GNU Lesser General Public License incorporates\nthe terms and conditions of version 3 of the GNU General Public\nLicense, supplemented by the additional permissions listed below.\n\n 0. Additional Definitions.\n\n As used herein, \"this License\" refers to version 3 of the GNU Lesser\nGeneral Public License, and the \"GNU GPL\" refers to version 3 of the GNU\nGeneral Public License.\n\n \"The Library\" refers to a covered work governed by this License,\nother than an Application or a Combined Work as defined below.\n\n An \"Application\" is any work that makes use of an interface provided\nby the Library, but which is not otherwise based on the Library.\nDefining a subclass of a class defined by the Library is deemed a mode\nof using an interface provided by the Library.\n\n A \"Combined Work\" is a work produced by combining or linking an\nApplication with the Library. The particular version of the Library\nwith which the Combined Work was made is also called the \"Linked\nVersion\".\n\n The \"Minimal Corresponding Source\" for a Combined Work means the\nCorresponding Source for the Combined Work, excluding any source code\nfor portions of the Combined Work that, considered in isolation, are\nbased on the Application, and not on the Linked Version.\n\n The \"Corresponding Application Code\" for a Combined Work means the\nobject code and/or source code for the Application, including any data\nand utility programs needed for reproducing the Combined Work from the\nApplication, but excluding the System Libraries of the Combined Work.\n\n 1. Exception to Section 3 of the GNU GPL.\n\n You may convey a covered work under sections 3 and 4 of this License\nwithout being bound by section 3 of the GNU GPL.\n\n 2. Conveying Modified Versions.\n\n If you modify a copy of the Library, and, in your modifications, a\nfacility refers to a function or data to be supplied by an Application\nthat uses the facility (other than as an argument passed when the\nfacility is invoked), then you may convey a copy of the modified\nversion:\n\n a) under this License, provided that you make a good faith effort to\n ensure that, in the event an Application does not supply the\n function or data, the facility still operates, and performs\n whatever part of its purpose remains meaningful, or\n\n b) under the GNU GPL, with none of the additional permissions of\n this License applicable to that copy.\n\n 3. Object Code Incorporating Material from Library Header Files.\n\n The object code form of an Application may incorporate material from\na header file that is part of the Library. You may convey such object\ncode under terms of your choice, provided that, if the incorporated\nmaterial is not limited to numerical parameters, data structure\nlayouts and accessors, or small macros, inline functions and templates\n(ten or fewer lines in length), you do both of the following:\n\n a) Give prominent notice with each copy of the object code that the\n Library is used in it and that the Library and its use are\n covered by this License.\n\n b) Accompany the object code with a copy of the GNU GPL and this license\n document.\n\n 4. Combined Works.\n\n You may convey a Combined Work under terms of your choice that,\ntaken together, effectively do not restrict modification of the\nportions of the Library contained in the Combined Work and reverse\nengineering for debugging such modifications, if you also do each of\nthe following:\n\n a) Give prominent notice with each copy of the Combined Work that\n the Library is used in it and that the Library and its use are\n covered by this License.\n\n b) Accompany the Combined Work with a copy of the GNU GPL and this license\n document.\n\n c) For a Combined Work that displays copyright notices during\n execution, include the copyright notice for the Library among\n these notices, as well as a reference directing the user to the\n copies of the GNU GPL and this license document.\n\n d) Do one of the following:\n\n 0) Convey the Minimal Corresponding Source under the terms of this\n License, and the Corresponding Application Code in a form\n suitable for, and under terms that permit, the user to\n recombine or relink the Application with a modified version of\n the Linked Version to produce a modified Combined Work, in the\n manner specified by section 6 of the GNU GPL for conveying\n Corresponding Source.\n\n 1) Use a suitable shared library mechanism for linking with the\n Library. A suitable mechanism is one that (a) uses at run time\n a copy of the Library already present on the user's computer\n system, and (b) will operate properly with a modified version\n of the Library that is interface-compatible with the Linked\n Version.\n\n e) Provide Installation Information, but only if you would otherwise\n be required to provide such information under section 6 of the\n GNU GPL, and only to the extent that such information is\n necessary to install and execute a modified version of the\n Combined Work produced by recombining or relinking the\n Application with a modified version of the Linked Version. (If\n you use option 4d0, the Installation Information must accompany\n the Minimal Corresponding Source and Corresponding Application\n Code. If you use option 4d1, you must provide the Installation\n Information in the manner specified by section 6 of the GNU GPL\n for conveying Corresponding Source.)\n\n 5. Combined Libraries.\n\n You may place library facilities that are a work based on the\nLibrary side by side in a single library together with other library\nfacilities that are not Applications and are not covered by this\nLicense, and convey such a combined library under terms of your\nchoice, if you do both of the following:\n\n a) Accompany the combined library with a copy of the same work based\n on the Library, uncombined with any other library facilities,\n conveyed under the terms of this License.\n\n b) Give prominent notice with the combined library that part of it\n is a work based on the Library, and explaining where to find the\n accompanying uncombined form of the same work.\n\n 6. Revised Versions of the GNU Lesser General Public License.\n\n The Free Software Foundation may publish revised and/or new versions\nof the GNU Lesser General Public License from time to time. Such new\nversions will be similar in spirit to the present version, but may\ndiffer in detail to address new problems or concerns.\n\n Each version is given a distinguishing version number. If the\nLibrary as you received it specifies that a certain numbered version\nof the GNU Lesser General Public License \"or any later version\"\napplies to it, you have the option of following the terms and\nconditions either of that published version or of any later version\npublished by the Free Software Foundation. If the Library as you\nreceived it does not specify a version number of the GNU Lesser\nGeneral Public License, you may choose any version of the GNU Lesser\nGeneral Public License ever published by the Free Software Foundation.\n\n If the Library as you received it specifies that a proxy can decide\nwhether future versions of the GNU Lesser General Public License shall\napply, that proxy's public statement of acceptance of any version is\npermanent authorization for you to choose that version for the\nLibrary.\n" + id: "LGPL-3.0", + name: "GNU Lesser General Public License v3.0", + text: ' GNU LESSER GENERAL PUBLIC LICENSE\n Version 3, 29 June 2007\n\n Copyright (C) 2007 Free Software Foundation, Inc. \n Everyone is permitted to copy and distribute verbatim copies\n of this license document, but changing it is not allowed.\n\n\n This version of the GNU Lesser General Public License incorporates\nthe terms and conditions of version 3 of the GNU General Public\nLicense, supplemented by the additional permissions listed below.\n\n 0. Additional Definitions.\n\n As used herein, "this License" refers to version 3 of the GNU Lesser\nGeneral Public License, and the "GNU GPL" refers to version 3 of the GNU\nGeneral Public License.\n\n "The Library" refers to a covered work governed by this License,\nother than an Application or a Combined Work as defined below.\n\n An "Application" is any work that makes use of an interface provided\nby the Library, but which is not otherwise based on the Library.\nDefining a subclass of a class defined by the Library is deemed a mode\nof using an interface provided by the Library.\n\n A "Combined Work" is a work produced by combining or linking an\nApplication with the Library. The particular version of the Library\nwith which the Combined Work was made is also called the "Linked\nVersion".\n\n The "Minimal Corresponding Source" for a Combined Work means the\nCorresponding Source for the Combined Work, excluding any source code\nfor portions of the Combined Work that, considered in isolation, are\nbased on the Application, and not on the Linked Version.\n\n The "Corresponding Application Code" for a Combined Work means the\nobject code and/or source code for the Application, including any data\nand utility programs needed for reproducing the Combined Work from the\nApplication, but excluding the System Libraries of the Combined Work.\n\n 1. Exception to Section 3 of the GNU GPL.\n\n You may convey a covered work under sections 3 and 4 of this License\nwithout being bound by section 3 of the GNU GPL.\n\n 2. Conveying Modified Versions.\n\n If you modify a copy of the Library, and, in your modifications, a\nfacility refers to a function or data to be supplied by an Application\nthat uses the facility (other than as an argument passed when the\nfacility is invoked), then you may convey a copy of the modified\nversion:\n\n a) under this License, provided that you make a good faith effort to\n ensure that, in the event an Application does not supply the\n function or data, the facility still operates, and performs\n whatever part of its purpose remains meaningful, or\n\n b) under the GNU GPL, with none of the additional permissions of\n this License applicable to that copy.\n\n 3. Object Code Incorporating Material from Library Header Files.\n\n The object code form of an Application may incorporate material from\na header file that is part of the Library. You may convey such object\ncode under terms of your choice, provided that, if the incorporated\nmaterial is not limited to numerical parameters, data structure\nlayouts and accessors, or small macros, inline functions and templates\n(ten or fewer lines in length), you do both of the following:\n\n a) Give prominent notice with each copy of the object code that the\n Library is used in it and that the Library and its use are\n covered by this License.\n\n b) Accompany the object code with a copy of the GNU GPL and this license\n document.\n\n 4. Combined Works.\n\n You may convey a Combined Work under terms of your choice that,\ntaken together, effectively do not restrict modification of the\nportions of the Library contained in the Combined Work and reverse\nengineering for debugging such modifications, if you also do each of\nthe following:\n\n a) Give prominent notice with each copy of the Combined Work that\n the Library is used in it and that the Library and its use are\n covered by this License.\n\n b) Accompany the Combined Work with a copy of the GNU GPL and this license\n document.\n\n c) For a Combined Work that displays copyright notices during\n execution, include the copyright notice for the Library among\n these notices, as well as a reference directing the user to the\n copies of the GNU GPL and this license document.\n\n d) Do one of the following:\n\n 0) Convey the Minimal Corresponding Source under the terms of this\n License, and the Corresponding Application Code in a form\n suitable for, and under terms that permit, the user to\n recombine or relink the Application with a modified version of\n the Linked Version to produce a modified Combined Work, in the\n manner specified by section 6 of the GNU GPL for conveying\n Corresponding Source.\n\n 1) Use a suitable shared library mechanism for linking with the\n Library. A suitable mechanism is one that (a) uses at run time\n a copy of the Library already present on the user\'s computer\n system, and (b) will operate properly with a modified version\n of the Library that is interface-compatible with the Linked\n Version.\n\n e) Provide Installation Information, but only if you would otherwise\n be required to provide such information under section 6 of the\n GNU GPL, and only to the extent that such information is\n necessary to install and execute a modified version of the\n Combined Work produced by recombining or relinking the\n Application with a modified version of the Linked Version. (If\n you use option 4d0, the Installation Information must accompany\n the Minimal Corresponding Source and Corresponding Application\n Code. If you use option 4d1, you must provide the Installation\n Information in the manner specified by section 6 of the GNU GPL\n for conveying Corresponding Source.)\n\n 5. Combined Libraries.\n\n You may place library facilities that are a work based on the\nLibrary side by side in a single library together with other library\nfacilities that are not Applications and are not covered by this\nLicense, and convey such a combined library under terms of your\nchoice, if you do both of the following:\n\n a) Accompany the combined library with a copy of the same work based\n on the Library, uncombined with any other library facilities,\n conveyed under the terms of this License.\n\n b) Give prominent notice with the combined library that part of it\n is a work based on the Library, and explaining where to find the\n accompanying uncombined form of the same work.\n\n 6. Revised Versions of the GNU Lesser General Public License.\n\n The Free Software Foundation may publish revised and/or new versions\nof the GNU Lesser General Public License from time to time. Such new\nversions will be similar in spirit to the present version, but may\ndiffer in detail to address new problems or concerns.\n\n Each version is given a distinguishing version number. If the\nLibrary as you received it specifies that a certain numbered version\nof the GNU Lesser General Public License "or any later version"\napplies to it, you have the option of following the terms and\nconditions either of that published version or of any later version\npublished by the Free Software Foundation. If the Library as you\nreceived it does not specify a version number of the GNU Lesser\nGeneral Public License, you may choose any version of the GNU Lesser\nGeneral Public License ever published by the Free Software Foundation.\n\n If the Library as you received it specifies that a proxy can decide\nwhether future versions of the GNU Lesser General Public License shall\napply, that proxy\'s public statement of acceptance of any version is\npermanent authorization for you to choose that version for the\nLibrary.\n', }, "Mozilla Public License 2.0": { - "id": "MPL-2.0", - "name": "Mozilla Public License 2.0", - "text": "Mozilla Public License Version 2.0\n==================================\n\n1. Definitions\n--------------\n\n1.1. \"Contributor\"\n means each individual or legal entity that creates, contributes to\n the creation of, or owns Covered Software.\n\n1.2. \"Contributor Version\"\n means the combination of the Contributions of others (if any) used\n by a Contributor and that particular Contributor's Contribution.\n\n1.3. \"Contribution\"\n means Covered Software of a particular Contributor.\n\n1.4. \"Covered Software\"\n means Source Code Form to which the initial Contributor has attached\n the notice in Exhibit A, the Executable Form of such Source Code\n Form, and Modifications of such Source Code Form, in each case\n including portions thereof.\n\n1.5. \"Incompatible With Secondary Licenses\"\n means\n\n (a) that the initial Contributor has attached the notice described\n in Exhibit B to the Covered Software; or\n\n (b) that the Covered Software was made available under the terms of\n version 1.1 or earlier of the License, but not also under the\n terms of a Secondary License.\n\n1.6. \"Executable Form\"\n means any form of the work other than Source Code Form.\n\n1.7. \"Larger Work\"\n means a work that combines Covered Software with other material, in\n a separate file or files, that is not Covered Software.\n\n1.8. \"License\"\n means this document.\n\n1.9. \"Licensable\"\n means having the right to grant, to the maximum extent possible,\n whether at the time of the initial grant or subsequently, any and\n all of the rights conveyed by this License.\n\n1.10. \"Modifications\"\n means any of the following:\n\n (a) any file in Source Code Form that results from an addition to,\n deletion from, or modification of the contents of Covered\n Software; or\n\n (b) any new file in Source Code Form that contains any Covered\n Software.\n\n1.11. \"Patent Claims\" of a Contributor\n means any patent claim(s), including without limitation, method,\n process, and apparatus claims, in any patent Licensable by such\n Contributor that would be infringed, but for the grant of the\n License, by the making, using, selling, offering for sale, having\n made, import, or transfer of either its Contributions or its\n Contributor Version.\n\n1.12. \"Secondary License\"\n means either the GNU General Public License, Version 2.0, the GNU\n Lesser General Public License, Version 2.1, the GNU Affero General\n Public License, Version 3.0, or any later versions of those\n licenses.\n\n1.13. \"Source Code Form\"\n means the form of the work preferred for making modifications.\n\n1.14. \"You\" (or \"Your\")\n means an individual or a legal entity exercising rights under this\n License. For legal entities, \"You\" includes any entity that\n controls, is controlled by, or is under common control with You. For\n purposes of this definition, \"control\" means (a) the power, direct\n or indirect, to cause the direction or management of such entity,\n whether by contract or otherwise, or (b) ownership of more than\n fifty percent (50%) of the outstanding shares or beneficial\n ownership of such entity.\n\n2. License Grants and Conditions\n--------------------------------\n\n2.1. Grants\n\nEach Contributor hereby grants You a world-wide, royalty-free,\nnon-exclusive license:\n\n(a) under intellectual property rights (other than patent or trademark)\n Licensable by such Contributor to use, reproduce, make available,\n modify, display, perform, distribute, and otherwise exploit its\n Contributions, either on an unmodified basis, with Modifications, or\n as part of a Larger Work; and\n\n(b) under Patent Claims of such Contributor to make, use, sell, offer\n for sale, have made, import, and otherwise transfer either its\n Contributions or its Contributor Version.\n\n2.2. Effective Date\n\nThe licenses granted in Section 2.1 with respect to any Contribution\nbecome effective for each Contribution on the date the Contributor first\ndistributes such Contribution.\n\n2.3. Limitations on Grant Scope\n\nThe licenses granted in this Section 2 are the only rights granted under\nthis License. No additional rights or licenses will be implied from the\ndistribution or licensing of Covered Software under this License.\nNotwithstanding Section 2.1(b) above, no patent license is granted by a\nContributor:\n\n(a) for any code that a Contributor has removed from Covered Software;\n or\n\n(b) for infringements caused by: (i) Your and any other third party's\n modifications of Covered Software, or (ii) the combination of its\n Contributions with other software (except as part of its Contributor\n Version); or\n\n(c) under Patent Claims infringed by Covered Software in the absence of\n its Contributions.\n\nThis License does not grant any rights in the trademarks, service marks,\nor logos of any Contributor (except as may be necessary to comply with\nthe notice requirements in Section 3.4).\n\n2.4. Subsequent Licenses\n\nNo Contributor makes additional grants as a result of Your choice to\ndistribute the Covered Software under a subsequent version of this\nLicense (see Section 10.2) or under the terms of a Secondary License (if\npermitted under the terms of Section 3.3).\n\n2.5. Representation\n\nEach Contributor represents that the Contributor believes its\nContributions are its original creation(s) or it has sufficient rights\nto grant the rights to its Contributions conveyed by this License.\n\n2.6. Fair Use\n\nThis License is not intended to limit any rights You have under\napplicable copyright doctrines of fair use, fair dealing, or other\nequivalents.\n\n2.7. Conditions\n\nSections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted\nin Section 2.1.\n\n3. Responsibilities\n-------------------\n\n3.1. Distribution of Source Form\n\nAll distribution of Covered Software in Source Code Form, including any\nModifications that You create or to which You contribute, must be under\nthe terms of this License. You must inform recipients that the Source\nCode Form of the Covered Software is governed by the terms of this\nLicense, and how they can obtain a copy of this License. You may not\nattempt to alter or restrict the recipients' rights in the Source Code\nForm.\n\n3.2. Distribution of Executable Form\n\nIf You distribute Covered Software in Executable Form then:\n\n(a) such Covered Software must also be made available in Source Code\n Form, as described in Section 3.1, and You must inform recipients of\n the Executable Form how they can obtain a copy of such Source Code\n Form by reasonable means in a timely manner, at a charge no more\n than the cost of distribution to the recipient; and\n\n(b) You may distribute such Executable Form under the terms of this\n License, or sublicense it under different terms, provided that the\n license for the Executable Form does not attempt to limit or alter\n the recipients' rights in the Source Code Form under this License.\n\n3.3. Distribution of a Larger Work\n\nYou may create and distribute a Larger Work under terms of Your choice,\nprovided that You also comply with the requirements of this License for\nthe Covered Software. If the Larger Work is a combination of Covered\nSoftware with a work governed by one or more Secondary Licenses, and the\nCovered Software is not Incompatible With Secondary Licenses, this\nLicense permits You to additionally distribute such Covered Software\nunder the terms of such Secondary License(s), so that the recipient of\nthe Larger Work may, at their option, further distribute the Covered\nSoftware under the terms of either this License or such Secondary\nLicense(s).\n\n3.4. Notices\n\nYou may not remove or alter the substance of any license notices\n(including copyright notices, patent notices, disclaimers of warranty,\nor limitations of liability) contained within the Source Code Form of\nthe Covered Software, except that You may alter any license notices to\nthe extent required to remedy known factual inaccuracies.\n\n3.5. Application of Additional Terms\n\nYou may choose to offer, and to charge a fee for, warranty, support,\nindemnity or liability obligations to one or more recipients of Covered\nSoftware. However, You may do so only on Your own behalf, and not on\nbehalf of any Contributor. You must make it absolutely clear that any\nsuch warranty, support, indemnity, or liability obligation is offered by\nYou alone, and You hereby agree to indemnify every Contributor for any\nliability incurred by such Contributor as a result of warranty, support,\nindemnity or liability terms You offer. You may include additional\ndisclaimers of warranty and limitations of liability specific to any\njurisdiction.\n\n4. Inability to Comply Due to Statute or Regulation\n---------------------------------------------------\n\nIf it is impossible for You to comply with any of the terms of this\nLicense with respect to some or all of the Covered Software due to\nstatute, judicial order, or regulation then You must: (a) comply with\nthe terms of this License to the maximum extent possible; and (b)\ndescribe the limitations and the code they affect. Such description must\nbe placed in a text file included with all distributions of the Covered\nSoftware under this License. Except to the extent prohibited by statute\nor regulation, such description must be sufficiently detailed for a\nrecipient of ordinary skill to be able to understand it.\n\n5. Termination\n--------------\n\n5.1. The rights granted under this License will terminate automatically\nif You fail to comply with any of its terms. However, if You become\ncompliant, then the rights granted under this License from a particular\nContributor are reinstated (a) provisionally, unless and until such\nContributor explicitly and finally terminates Your grants, and (b) on an\nongoing basis, if such Contributor fails to notify You of the\nnon-compliance by some reasonable means prior to 60 days after You have\ncome back into compliance. Moreover, Your grants from a particular\nContributor are reinstated on an ongoing basis if such Contributor\nnotifies You of the non-compliance by some reasonable means, this is the\nfirst time You have received notice of non-compliance with this License\nfrom such Contributor, and You become compliant prior to 30 days after\nYour receipt of the notice.\n\n5.2. If You initiate litigation against any entity by asserting a patent\ninfringement claim (excluding declaratory judgment actions,\ncounter-claims, and cross-claims) alleging that a Contributor Version\ndirectly or indirectly infringes any patent, then the rights granted to\nYou by any and all Contributors for the Covered Software under Section\n2.1 of this License shall terminate.\n\n5.3. In the event of termination under Sections 5.1 or 5.2 above, all\nend user license agreements (excluding distributors and resellers) which\nhave been validly granted by You or Your distributors under this License\nprior to termination shall survive termination.\n\n************************************************************************\n* *\n* 6. Disclaimer of Warranty *\n* ------------------------- *\n* *\n* Covered Software is provided under this License on an \"as is\" *\n* basis, without warranty of any kind, either expressed, implied, or *\n* statutory, including, without limitation, warranties that the *\n* Covered Software is free of defects, merchantable, fit for a *\n* particular purpose or non-infringing. The entire risk as to the *\n* quality and performance of the Covered Software is with You. *\n* Should any Covered Software prove defective in any respect, You *\n* (not any Contributor) assume the cost of any necessary servicing, *\n* repair, or correction. This disclaimer of warranty constitutes an *\n* essential part of this License. No use of any Covered Software is *\n* authorized under this License except under this disclaimer. *\n* *\n************************************************************************\n\n************************************************************************\n* *\n* 7. Limitation of Liability *\n* -------------------------- *\n* *\n* Under no circumstances and under no legal theory, whether tort *\n* (including negligence), contract, or otherwise, shall any *\n* Contributor, or anyone who distributes Covered Software as *\n* permitted above, be liable to You for any direct, indirect, *\n* special, incidental, or consequential damages of any character *\n* including, without limitation, damages for lost profits, loss of *\n* goodwill, work stoppage, computer failure or malfunction, or any *\n* and all other commercial damages or losses, even if such party *\n* shall have been informed of the possibility of such damages. This *\n* limitation of liability shall not apply to liability for death or *\n* personal injury resulting from such party's negligence to the *\n* extent applicable law prohibits such limitation. Some *\n* jurisdictions do not allow the exclusion or limitation of *\n* incidental or consequential damages, so this exclusion and *\n* limitation may not apply to You. *\n* *\n************************************************************************\n\n8. Litigation\n-------------\n\nAny litigation relating to this License may be brought only in the\ncourts of a jurisdiction where the defendant maintains its principal\nplace of business and such litigation shall be governed by laws of that\njurisdiction, without reference to its conflict-of-law provisions.\nNothing in this Section shall prevent a party's ability to bring\ncross-claims or counter-claims.\n\n9. Miscellaneous\n----------------\n\nThis License represents the complete agreement concerning the subject\nmatter hereof. If any provision of this License is held to be\nunenforceable, such provision shall be reformed only to the extent\nnecessary to make it enforceable. Any law or regulation which provides\nthat the language of a contract shall be construed against the drafter\nshall not be used to construe this License against a Contributor.\n\n10. Versions of the License\n---------------------------\n\n10.1. New Versions\n\nMozilla Foundation is the license steward. Except as provided in Section\n10.3, no one other than the license steward has the right to modify or\npublish new versions of this License. Each version will be given a\ndistinguishing version number.\n\n10.2. Effect of New Versions\n\nYou may distribute the Covered Software under the terms of the version\nof the License under which You originally received the Covered Software,\nor under the terms of any subsequent version published by the license\nsteward.\n\n10.3. Modified Versions\n\nIf you create software not governed by this License, and you want to\ncreate a new license for such software, you may create and use a\nmodified version of this License if you rename the license and remove\nany references to the name of the license steward (except to note that\nsuch modified license differs from this License).\n\n10.4. Distributing Source Code Form that is Incompatible With Secondary\nLicenses\n\nIf You choose to distribute Source Code Form that is Incompatible With\nSecondary Licenses under the terms of this version of the License, the\nnotice described in Exhibit B of this License must be attached.\n\nExhibit A - Source Code Form License Notice\n-------------------------------------------\n\n This Source Code Form is subject to the terms of the Mozilla Public\n License, v. 2.0. If a copy of the MPL was not distributed with this\n file, You can obtain one at http://mozilla.org/MPL/2.0/.\n\nIf it is not possible or desirable to put the notice in a particular\nfile, then You may include the notice in a location (such as a LICENSE\nfile in a relevant directory) where a recipient would be likely to look\nfor such a notice.\n\nYou may add additional accurate notices of copyright ownership.\n\nExhibit B - \"Incompatible With Secondary Licenses\" Notice\n---------------------------------------------------------\n\n This Source Code Form is \"Incompatible With Secondary Licenses\", as\n defined by the Mozilla Public License, v. 2.0.\n" + id: "MPL-2.0", + name: "Mozilla Public License 2.0", + text: 'Mozilla Public License Version 2.0\n==================================\n\n1. Definitions\n--------------\n\n1.1. "Contributor"\n means each individual or legal entity that creates, contributes to\n the creation of, or owns Covered Software.\n\n1.2. "Contributor Version"\n means the combination of the Contributions of others (if any) used\n by a Contributor and that particular Contributor\'s Contribution.\n\n1.3. "Contribution"\n means Covered Software of a particular Contributor.\n\n1.4. "Covered Software"\n means Source Code Form to which the initial Contributor has attached\n the notice in Exhibit A, the Executable Form of such Source Code\n Form, and Modifications of such Source Code Form, in each case\n including portions thereof.\n\n1.5. "Incompatible With Secondary Licenses"\n means\n\n (a) that the initial Contributor has attached the notice described\n in Exhibit B to the Covered Software; or\n\n (b) that the Covered Software was made available under the terms of\n version 1.1 or earlier of the License, but not also under the\n terms of a Secondary License.\n\n1.6. "Executable Form"\n means any form of the work other than Source Code Form.\n\n1.7. "Larger Work"\n means a work that combines Covered Software with other material, in\n a separate file or files, that is not Covered Software.\n\n1.8. "License"\n means this document.\n\n1.9. "Licensable"\n means having the right to grant, to the maximum extent possible,\n whether at the time of the initial grant or subsequently, any and\n all of the rights conveyed by this License.\n\n1.10. "Modifications"\n means any of the following:\n\n (a) any file in Source Code Form that results from an addition to,\n deletion from, or modification of the contents of Covered\n Software; or\n\n (b) any new file in Source Code Form that contains any Covered\n Software.\n\n1.11. "Patent Claims" of a Contributor\n means any patent claim(s), including without limitation, method,\n process, and apparatus claims, in any patent Licensable by such\n Contributor that would be infringed, but for the grant of the\n License, by the making, using, selling, offering for sale, having\n made, import, or transfer of either its Contributions or its\n Contributor Version.\n\n1.12. "Secondary License"\n means either the GNU General Public License, Version 2.0, the GNU\n Lesser General Public License, Version 2.1, the GNU Affero General\n Public License, Version 3.0, or any later versions of those\n licenses.\n\n1.13. "Source Code Form"\n means the form of the work preferred for making modifications.\n\n1.14. "You" (or "Your")\n means an individual or a legal entity exercising rights under this\n License. For legal entities, "You" includes any entity that\n controls, is controlled by, or is under common control with You. For\n purposes of this definition, "control" means (a) the power, direct\n or indirect, to cause the direction or management of such entity,\n whether by contract or otherwise, or (b) ownership of more than\n fifty percent (50%) of the outstanding shares or beneficial\n ownership of such entity.\n\n2. License Grants and Conditions\n--------------------------------\n\n2.1. Grants\n\nEach Contributor hereby grants You a world-wide, royalty-free,\nnon-exclusive license:\n\n(a) under intellectual property rights (other than patent or trademark)\n Licensable by such Contributor to use, reproduce, make available,\n modify, display, perform, distribute, and otherwise exploit its\n Contributions, either on an unmodified basis, with Modifications, or\n as part of a Larger Work; and\n\n(b) under Patent Claims of such Contributor to make, use, sell, offer\n for sale, have made, import, and otherwise transfer either its\n Contributions or its Contributor Version.\n\n2.2. Effective Date\n\nThe licenses granted in Section 2.1 with respect to any Contribution\nbecome effective for each Contribution on the date the Contributor first\ndistributes such Contribution.\n\n2.3. Limitations on Grant Scope\n\nThe licenses granted in this Section 2 are the only rights granted under\nthis License. No additional rights or licenses will be implied from the\ndistribution or licensing of Covered Software under this License.\nNotwithstanding Section 2.1(b) above, no patent license is granted by a\nContributor:\n\n(a) for any code that a Contributor has removed from Covered Software;\n or\n\n(b) for infringements caused by: (i) Your and any other third party\'s\n modifications of Covered Software, or (ii) the combination of its\n Contributions with other software (except as part of its Contributor\n Version); or\n\n(c) under Patent Claims infringed by Covered Software in the absence of\n its Contributions.\n\nThis License does not grant any rights in the trademarks, service marks,\nor logos of any Contributor (except as may be necessary to comply with\nthe notice requirements in Section 3.4).\n\n2.4. Subsequent Licenses\n\nNo Contributor makes additional grants as a result of Your choice to\ndistribute the Covered Software under a subsequent version of this\nLicense (see Section 10.2) or under the terms of a Secondary License (if\npermitted under the terms of Section 3.3).\n\n2.5. Representation\n\nEach Contributor represents that the Contributor believes its\nContributions are its original creation(s) or it has sufficient rights\nto grant the rights to its Contributions conveyed by this License.\n\n2.6. Fair Use\n\nThis License is not intended to limit any rights You have under\napplicable copyright doctrines of fair use, fair dealing, or other\nequivalents.\n\n2.7. Conditions\n\nSections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted\nin Section 2.1.\n\n3. Responsibilities\n-------------------\n\n3.1. Distribution of Source Form\n\nAll distribution of Covered Software in Source Code Form, including any\nModifications that You create or to which You contribute, must be under\nthe terms of this License. You must inform recipients that the Source\nCode Form of the Covered Software is governed by the terms of this\nLicense, and how they can obtain a copy of this License. You may not\nattempt to alter or restrict the recipients\' rights in the Source Code\nForm.\n\n3.2. Distribution of Executable Form\n\nIf You distribute Covered Software in Executable Form then:\n\n(a) such Covered Software must also be made available in Source Code\n Form, as described in Section 3.1, and You must inform recipients of\n the Executable Form how they can obtain a copy of such Source Code\n Form by reasonable means in a timely manner, at a charge no more\n than the cost of distribution to the recipient; and\n\n(b) You may distribute such Executable Form under the terms of this\n License, or sublicense it under different terms, provided that the\n license for the Executable Form does not attempt to limit or alter\n the recipients\' rights in the Source Code Form under this License.\n\n3.3. Distribution of a Larger Work\n\nYou may create and distribute a Larger Work under terms of Your choice,\nprovided that You also comply with the requirements of this License for\nthe Covered Software. If the Larger Work is a combination of Covered\nSoftware with a work governed by one or more Secondary Licenses, and the\nCovered Software is not Incompatible With Secondary Licenses, this\nLicense permits You to additionally distribute such Covered Software\nunder the terms of such Secondary License(s), so that the recipient of\nthe Larger Work may, at their option, further distribute the Covered\nSoftware under the terms of either this License or such Secondary\nLicense(s).\n\n3.4. Notices\n\nYou may not remove or alter the substance of any license notices\n(including copyright notices, patent notices, disclaimers of warranty,\nor limitations of liability) contained within the Source Code Form of\nthe Covered Software, except that You may alter any license notices to\nthe extent required to remedy known factual inaccuracies.\n\n3.5. Application of Additional Terms\n\nYou may choose to offer, and to charge a fee for, warranty, support,\nindemnity or liability obligations to one or more recipients of Covered\nSoftware. However, You may do so only on Your own behalf, and not on\nbehalf of any Contributor. You must make it absolutely clear that any\nsuch warranty, support, indemnity, or liability obligation is offered by\nYou alone, and You hereby agree to indemnify every Contributor for any\nliability incurred by such Contributor as a result of warranty, support,\nindemnity or liability terms You offer. You may include additional\ndisclaimers of warranty and limitations of liability specific to any\njurisdiction.\n\n4. Inability to Comply Due to Statute or Regulation\n---------------------------------------------------\n\nIf it is impossible for You to comply with any of the terms of this\nLicense with respect to some or all of the Covered Software due to\nstatute, judicial order, or regulation then You must: (a) comply with\nthe terms of this License to the maximum extent possible; and (b)\ndescribe the limitations and the code they affect. Such description must\nbe placed in a text file included with all distributions of the Covered\nSoftware under this License. Except to the extent prohibited by statute\nor regulation, such description must be sufficiently detailed for a\nrecipient of ordinary skill to be able to understand it.\n\n5. Termination\n--------------\n\n5.1. The rights granted under this License will terminate automatically\nif You fail to comply with any of its terms. However, if You become\ncompliant, then the rights granted under this License from a particular\nContributor are reinstated (a) provisionally, unless and until such\nContributor explicitly and finally terminates Your grants, and (b) on an\nongoing basis, if such Contributor fails to notify You of the\nnon-compliance by some reasonable means prior to 60 days after You have\ncome back into compliance. Moreover, Your grants from a particular\nContributor are reinstated on an ongoing basis if such Contributor\nnotifies You of the non-compliance by some reasonable means, this is the\nfirst time You have received notice of non-compliance with this License\nfrom such Contributor, and You become compliant prior to 30 days after\nYour receipt of the notice.\n\n5.2. If You initiate litigation against any entity by asserting a patent\ninfringement claim (excluding declaratory judgment actions,\ncounter-claims, and cross-claims) alleging that a Contributor Version\ndirectly or indirectly infringes any patent, then the rights granted to\nYou by any and all Contributors for the Covered Software under Section\n2.1 of this License shall terminate.\n\n5.3. In the event of termination under Sections 5.1 or 5.2 above, all\nend user license agreements (excluding distributors and resellers) which\nhave been validly granted by You or Your distributors under this License\nprior to termination shall survive termination.\n\n************************************************************************\n* *\n* 6. Disclaimer of Warranty *\n* ------------------------- *\n* *\n* Covered Software is provided under this License on an "as is" *\n* basis, without warranty of any kind, either expressed, implied, or *\n* statutory, including, without limitation, warranties that the *\n* Covered Software is free of defects, merchantable, fit for a *\n* particular purpose or non-infringing. The entire risk as to the *\n* quality and performance of the Covered Software is with You. *\n* Should any Covered Software prove defective in any respect, You *\n* (not any Contributor) assume the cost of any necessary servicing, *\n* repair, or correction. This disclaimer of warranty constitutes an *\n* essential part of this License. No use of any Covered Software is *\n* authorized under this License except under this disclaimer. *\n* *\n************************************************************************\n\n************************************************************************\n* *\n* 7. Limitation of Liability *\n* -------------------------- *\n* *\n* Under no circumstances and under no legal theory, whether tort *\n* (including negligence), contract, or otherwise, shall any *\n* Contributor, or anyone who distributes Covered Software as *\n* permitted above, be liable to You for any direct, indirect, *\n* special, incidental, or consequential damages of any character *\n* including, without limitation, damages for lost profits, loss of *\n* goodwill, work stoppage, computer failure or malfunction, or any *\n* and all other commercial damages or losses, even if such party *\n* shall have been informed of the possibility of such damages. This *\n* limitation of liability shall not apply to liability for death or *\n* personal injury resulting from such party\'s negligence to the *\n* extent applicable law prohibits such limitation. Some *\n* jurisdictions do not allow the exclusion or limitation of *\n* incidental or consequential damages, so this exclusion and *\n* limitation may not apply to You. *\n* *\n************************************************************************\n\n8. Litigation\n-------------\n\nAny litigation relating to this License may be brought only in the\ncourts of a jurisdiction where the defendant maintains its principal\nplace of business and such litigation shall be governed by laws of that\njurisdiction, without reference to its conflict-of-law provisions.\nNothing in this Section shall prevent a party\'s ability to bring\ncross-claims or counter-claims.\n\n9. Miscellaneous\n----------------\n\nThis License represents the complete agreement concerning the subject\nmatter hereof. If any provision of this License is held to be\nunenforceable, such provision shall be reformed only to the extent\nnecessary to make it enforceable. Any law or regulation which provides\nthat the language of a contract shall be construed against the drafter\nshall not be used to construe this License against a Contributor.\n\n10. Versions of the License\n---------------------------\n\n10.1. New Versions\n\nMozilla Foundation is the license steward. Except as provided in Section\n10.3, no one other than the license steward has the right to modify or\npublish new versions of this License. Each version will be given a\ndistinguishing version number.\n\n10.2. Effect of New Versions\n\nYou may distribute the Covered Software under the terms of the version\nof the License under which You originally received the Covered Software,\nor under the terms of any subsequent version published by the license\nsteward.\n\n10.3. Modified Versions\n\nIf you create software not governed by this License, and you want to\ncreate a new license for such software, you may create and use a\nmodified version of this License if you rename the license and remove\nany references to the name of the license steward (except to note that\nsuch modified license differs from this License).\n\n10.4. Distributing Source Code Form that is Incompatible With Secondary\nLicenses\n\nIf You choose to distribute Source Code Form that is Incompatible With\nSecondary Licenses under the terms of this version of the License, the\nnotice described in Exhibit B of this License must be attached.\n\nExhibit A - Source Code Form License Notice\n-------------------------------------------\n\n This Source Code Form is subject to the terms of the Mozilla Public\n License, v. 2.0. If a copy of the MPL was not distributed with this\n file, You can obtain one at http://mozilla.org/MPL/2.0/.\n\nIf it is not possible or desirable to put the notice in a particular\nfile, then You may include the notice in a location (such as a LICENSE\nfile in a relevant directory) where a recipient would be likely to look\nfor such a notice.\n\nYou may add additional accurate notices of copyright ownership.\n\nExhibit B - "Incompatible With Secondary Licenses" Notice\n---------------------------------------------------------\n\n This Source Code Form is "Incompatible With Secondary Licenses", as\n defined by the Mozilla Public License, v. 2.0.\n', }, "Apache License 2.0": { - "id": "Apache-2.0", - "name": "Apache License 2.0", - "text": " Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n \"License\" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n \"Licensor\" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n \"Legal Entity\" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n \"control\" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n \"You\" (or \"Your\") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n \"Source\" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n \"Object\" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n \"Work\" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n \"Derivative Works\" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n \"Contribution\" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, \"submitted\"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as \"Not a Contribution.\"\n\n \"Contributor\" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a \"NOTICE\" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets \"[]\"\n replaced with your own identifying information. (Don't include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same \"printed page\" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright [yyyy] [name of copyright owner]\n\n Licensed under the Apache License, Version 2.0 (the \"License\");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an \"AS IS\" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n" + id: "Apache-2.0", + name: "Apache License 2.0", + text: ' Apache License\n Version 2.0, January 2004\n http://www.apache.org/licenses/\n\n TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION\n\n 1. Definitions.\n\n "License" shall mean the terms and conditions for use, reproduction,\n and distribution as defined by Sections 1 through 9 of this document.\n\n "Licensor" shall mean the copyright owner or entity authorized by\n the copyright owner that is granting the License.\n\n "Legal Entity" shall mean the union of the acting entity and all\n other entities that control, are controlled by, or are under common\n control with that entity. For the purposes of this definition,\n "control" means (i) the power, direct or indirect, to cause the\n direction or management of such entity, whether by contract or\n otherwise, or (ii) ownership of fifty percent (50%) or more of the\n outstanding shares, or (iii) beneficial ownership of such entity.\n\n "You" (or "Your") shall mean an individual or Legal Entity\n exercising permissions granted by this License.\n\n "Source" form shall mean the preferred form for making modifications,\n including but not limited to software source code, documentation\n source, and configuration files.\n\n "Object" form shall mean any form resulting from mechanical\n transformation or translation of a Source form, including but\n not limited to compiled object code, generated documentation,\n and conversions to other media types.\n\n "Work" shall mean the work of authorship, whether in Source or\n Object form, made available under the License, as indicated by a\n copyright notice that is included in or attached to the work\n (an example is provided in the Appendix below).\n\n "Derivative Works" shall mean any work, whether in Source or Object\n form, that is based on (or derived from) the Work and for which the\n editorial revisions, annotations, elaborations, or other modifications\n represent, as a whole, an original work of authorship. For the purposes\n of this License, Derivative Works shall not include works that remain\n separable from, or merely link (or bind by name) to the interfaces of,\n the Work and Derivative Works thereof.\n\n "Contribution" shall mean any work of authorship, including\n the original version of the Work and any modifications or additions\n to that Work or Derivative Works thereof, that is intentionally\n submitted to Licensor for inclusion in the Work by the copyright owner\n or by an individual or Legal Entity authorized to submit on behalf of\n the copyright owner. For the purposes of this definition, "submitted"\n means any form of electronic, verbal, or written communication sent\n to the Licensor or its representatives, including but not limited to\n communication on electronic mailing lists, source code control systems,\n and issue tracking systems that are managed by, or on behalf of, the\n Licensor for the purpose of discussing and improving the Work, but\n excluding communication that is conspicuously marked or otherwise\n designated in writing by the copyright owner as "Not a Contribution."\n\n "Contributor" shall mean Licensor and any individual or Legal Entity\n on behalf of whom a Contribution has been received by Licensor and\n subsequently incorporated within the Work.\n\n 2. Grant of Copyright License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n copyright license to reproduce, prepare Derivative Works of,\n publicly display, publicly perform, sublicense, and distribute the\n Work and such Derivative Works in Source or Object form.\n\n 3. Grant of Patent License. Subject to the terms and conditions of\n this License, each Contributor hereby grants to You a perpetual,\n worldwide, non-exclusive, no-charge, royalty-free, irrevocable\n (except as stated in this section) patent license to make, have made,\n use, offer to sell, sell, import, and otherwise transfer the Work,\n where such license applies only to those patent claims licensable\n by such Contributor that are necessarily infringed by their\n Contribution(s) alone or by combination of their Contribution(s)\n with the Work to which such Contribution(s) was submitted. If You\n institute patent litigation against any entity (including a\n cross-claim or counterclaim in a lawsuit) alleging that the Work\n or a Contribution incorporated within the Work constitutes direct\n or contributory patent infringement, then any patent licenses\n granted to You under this License for that Work shall terminate\n as of the date such litigation is filed.\n\n 4. Redistribution. You may reproduce and distribute copies of the\n Work or Derivative Works thereof in any medium, with or without\n modifications, and in Source or Object form, provided that You\n meet the following conditions:\n\n (a) You must give any other recipients of the Work or\n Derivative Works a copy of this License; and\n\n (b) You must cause any modified files to carry prominent notices\n stating that You changed the files; and\n\n (c) You must retain, in the Source form of any Derivative Works\n that You distribute, all copyright, patent, trademark, and\n attribution notices from the Source form of the Work,\n excluding those notices that do not pertain to any part of\n the Derivative Works; and\n\n (d) If the Work includes a "NOTICE" text file as part of its\n distribution, then any Derivative Works that You distribute must\n include a readable copy of the attribution notices contained\n within such NOTICE file, excluding those notices that do not\n pertain to any part of the Derivative Works, in at least one\n of the following places: within a NOTICE text file distributed\n as part of the Derivative Works; within the Source form or\n documentation, if provided along with the Derivative Works; or,\n within a display generated by the Derivative Works, if and\n wherever such third-party notices normally appear. The contents\n of the NOTICE file are for informational purposes only and\n do not modify the License. You may add Your own attribution\n notices within Derivative Works that You distribute, alongside\n or as an addendum to the NOTICE text from the Work, provided\n that such additional attribution notices cannot be construed\n as modifying the License.\n\n You may add Your own copyright statement to Your modifications and\n may provide additional or different license terms and conditions\n for use, reproduction, or distribution of Your modifications, or\n for any such Derivative Works as a whole, provided Your use,\n reproduction, and distribution of the Work otherwise complies with\n the conditions stated in this License.\n\n 5. Submission of Contributions. Unless You explicitly state otherwise,\n any Contribution intentionally submitted for inclusion in the Work\n by You to the Licensor shall be under the terms and conditions of\n this License, without any additional terms or conditions.\n Notwithstanding the above, nothing herein shall supersede or modify\n the terms of any separate license agreement you may have executed\n with Licensor regarding such Contributions.\n\n 6. Trademarks. This License does not grant permission to use the trade\n names, trademarks, service marks, or product names of the Licensor,\n except as required for reasonable and customary use in describing the\n origin of the Work and reproducing the content of the NOTICE file.\n\n 7. Disclaimer of Warranty. Unless required by applicable law or\n agreed to in writing, Licensor provides the Work (and each\n Contributor provides its Contributions) on an "AS IS" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or\n implied, including, without limitation, any warranties or conditions\n of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A\n PARTICULAR PURPOSE. You are solely responsible for determining the\n appropriateness of using or redistributing the Work and assume any\n risks associated with Your exercise of permissions under this License.\n\n 8. Limitation of Liability. In no event and under no legal theory,\n whether in tort (including negligence), contract, or otherwise,\n unless required by applicable law (such as deliberate and grossly\n negligent acts) or agreed to in writing, shall any Contributor be\n liable to You for damages, including any direct, indirect, special,\n incidental, or consequential damages of any character arising as a\n result of this License or out of the use or inability to use the\n Work (including but not limited to damages for loss of goodwill,\n work stoppage, computer failure or malfunction, or any and all\n other commercial damages or losses), even if such Contributor\n has been advised of the possibility of such damages.\n\n 9. Accepting Warranty or Additional Liability. While redistributing\n the Work or Derivative Works thereof, You may choose to offer,\n and charge a fee for, acceptance of support, warranty, indemnity,\n or other liability obligations and/or rights consistent with this\n License. However, in accepting such obligations, You may act only\n on Your own behalf and on Your sole responsibility, not on behalf\n of any other Contributor, and only if You agree to indemnify,\n defend, and hold each Contributor harmless for any liability\n incurred by, or claims asserted against, such Contributor by reason\n of your accepting any such warranty or additional liability.\n\n END OF TERMS AND CONDITIONS\n\n APPENDIX: How to apply the Apache License to your work.\n\n To apply the Apache License to your work, attach the following\n boilerplate notice, with the fields enclosed by brackets "[]"\n replaced with your own identifying information. (Don\'t include\n the brackets!) The text should be enclosed in the appropriate\n comment syntax for the file format. We also recommend that a\n file or class name and description of purpose be included on the\n same "printed page" as the copyright notice for easier\n identification within third-party archives.\n\n Copyright [yyyy] [name of copyright owner]\n\n Licensed under the Apache License, Version 2.0 (the "License");\n you may not use this file except in compliance with the License.\n You may obtain a copy of the License at\n\n http://www.apache.org/licenses/LICENSE-2.0\n\n Unless required by applicable law or agreed to in writing, software\n distributed under the License is distributed on an "AS IS" BASIS,\n WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n See the License for the specific language governing permissions and\n limitations under the License.\n', }, "MIT License": { - "id": "MIT", - "name": "MIT License", - "text": "MIT License\n\nCopyright (c) [year] [fullname] <[email]>\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n" + id: "MIT", + name: "MIT License", + text: 'MIT License\n\nCopyright (c) [year] [fullname] <[email]>\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the "Software"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n', }, "The Unlicense": { - "id": "Unlicense", - "name": "The Unlicense", - "text": "This is free and unencumbered software released into the public domain.\n\nAnyone is free to copy, modify, publish, use, compile, sell, or\ndistribute this software, either in source code form or as a compiled\nbinary, for any purpose, commercial or non-commercial, and by any\nmeans.\n\nIn jurisdictions that recognize copyright laws, the author or authors\nof this software dedicate any and all copyright interest in the\nsoftware to the public domain. We make this dedication for the benefit\nof the public at large and to the detriment of our heirs and\nsuccessors. We intend this dedication to be an overt act of\nrelinquishment in perpetuity of all present and future rights to this\nsoftware under copyright law.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR\nOTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,\nARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\nOTHER DEALINGS IN THE SOFTWARE.\n\nFor more information, please refer to \n" - } -}/** END LICENSES */; + id: "Unlicense", + name: "The Unlicense", + text: 'This is free and unencumbered software released into the public domain.\n\nAnyone is free to copy, modify, publish, use, compile, sell, or\ndistribute this software, either in source code form or as a compiled\nbinary, for any purpose, commercial or non-commercial, and by any\nmeans.\n\nIn jurisdictions that recognize copyright laws, the author or authors\nof this software dedicate any and all copyright interest in the\nsoftware to the public domain. We make this dedication for the benefit\nof the public at large and to the detriment of our heirs and\nsuccessors. We intend this dedication to be an overt act of\nrelinquishment in perpetuity of all present and future rights to this\nsoftware under copyright law.\n\nTHE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR\nOTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,\nARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\nOTHER DEALINGS IN THE SOFTWARE.\n\nFor more information, please refer to \n', + }, +}; /** END LICENSES */ export type LicenseType = | "Qhull" @@ -614,4 +626,4 @@ export type LicenseType = | "OLDAP-2.5" | "Artistic-1.0-Perl" | "gSOAP-1.3b" - | "NPOSL-3.0"; \ No newline at end of file + | "NPOSL-3.0"; diff --git a/src/lib/core/migrationContextBase.ts b/src/lib/core/migrationContextBase.ts index f3cd48564..fd318b9ef 100644 --- a/src/lib/core/migrationContextBase.ts +++ b/src/lib/core/migrationContextBase.ts @@ -1,3 +1,6 @@ +/** + * + */ export abstract class MigrationContextBase { public packageJson!: Record; public ioPackageJson!: Record; @@ -5,9 +8,7 @@ export abstract class MigrationContextBase { public abstract joinPath(...parts: string[]): string; public abstract readTextFile(fileName: string): Promise; - public abstract readJsonFile( - fileName: string, - ): Promise>; + public abstract readJsonFile(fileName: string): Promise>; public abstract directoryExists(dirName: string): Promise; public abstract fileExists(dirName: string): Promise; @@ -18,16 +19,20 @@ export abstract class MigrationContextBase { filter?: (fileName: string) => boolean, ): Promise; + /** + * + * @param packageName + */ public hasDevDependency(packageName: string): boolean { if (this.packageJson.devDependencies) { - return Object.prototype.hasOwnProperty.call( - this.packageJson.devDependencies, - packageName, - ); + return Object.prototype.hasOwnProperty.call(this.packageJson.devDependencies, packageName); } return false; } + /** + * + */ public async getMainFileContent(): Promise { if ( !this.packageJson.main || @@ -40,19 +45,10 @@ export abstract class MigrationContextBase { try { const tsMains = [ - this.joinPath( - "src", - this.packageJson.main.replace(/\.js$/, ".ts"), - ), - this.packageJson.main - .replace(/\.js$/, ".ts") - .replace(/^dist([\\/])/, "src$1"), - this.packageJson.main - .replace(/\.js$/, ".ts") - .replace(/^build([\\/])/, "src$1"), - this.packageJson.main - .replace(/\.js$/, ".ts") - .replace(/^(build|dist)[\\/]/, ""), + this.joinPath("src", this.packageJson.main.replace(/\.js$/, ".ts")), + this.packageJson.main.replace(/\.js$/, ".ts").replace(/^dist([\\/])/, "src$1"), + this.packageJson.main.replace(/\.js$/, ".ts").replace(/^build([\\/])/, "src$1"), + this.packageJson.main.replace(/\.js$/, ".ts").replace(/^(build|dist)[\\/]/, ""), ]; for (const tsMain of tsMains) { if (await this.fileExists(tsMain)) { @@ -67,10 +63,14 @@ export abstract class MigrationContextBase { } } + /** + * + * @param either + * @param or + */ public async analyzeCode(either: string, or: string): Promise { const content = await this.getMainFileContent(); - const eitherCount = (content.match(new RegExp(either, "g")) || []) - .length; + const eitherCount = (content.match(new RegExp(either, "g")) || []).length; const orCount = (content.match(new RegExp(or, "g")) || []).length; return eitherCount >= orCount; } diff --git a/src/lib/core/questions.test.ts b/src/lib/core/questions.test.ts index 16140aadb..92b1aaa40 100644 --- a/src/lib/core/questions.test.ts +++ b/src/lib/core/questions.test.ts @@ -4,7 +4,7 @@ import { questions, testCondition } from "./questions"; describe("questions/questions", () => { it("should be an array of question objects", () => { questions.should.be.an("array"); - questions.forEach((q) => { + questions.forEach(q => { q.should.have.property("type"); expect(typeof q.type).to.equal("string"); }); @@ -18,39 +18,21 @@ describe("questions/testCondition()", () => { }); it(`for a "value" condition, it should return whether the answer equals the desired value`, () => { - testCondition( - { name: "prop", value: "foo" }, - { prop: "foo" }, - ).should.equal(true); + testCondition({ name: "prop", value: "foo" }, { prop: "foo" }).should.equal(true); - testCondition( - { name: "prop", value: "bar" }, - { prop: "foo" }, - ).should.equal(false); + testCondition({ name: "prop", value: "bar" }, { prop: "foo" }).should.equal(false); }); it(`for a "contains" condition, it should return whether the answer array contains the desired value`, () => { - testCondition( - { name: "prop", contains: "foo" }, - { prop: ["bar", "foo"] }, - ).should.equal(true); + testCondition({ name: "prop", contains: "foo" }, { prop: ["bar", "foo"] }).should.equal(true); - testCondition( - { name: "prop", contains: "baz" }, - { prop: ["bar", "foo"] }, - ).should.equal(false); + testCondition({ name: "prop", contains: "baz" }, { prop: ["bar", "foo"] }).should.equal(false); }); it(`for a "doesNotContain" condition, it should return whether the answer array contains the desired value`, () => { - testCondition( - { name: "prop", doesNotContain: "foo" }, - { prop: ["bar", "foo"] }, - ).should.equal(false); + testCondition({ name: "prop", doesNotContain: "foo" }, { prop: ["bar", "foo"] }).should.equal(false); - testCondition( - { name: "prop", doesNotContain: "baz" }, - { prop: ["bar", "foo"] }, - ).should.equal(true); + testCondition({ name: "prop", doesNotContain: "baz" }, { prop: ["bar", "foo"] }).should.equal(true); }); it("should return false for invalid conditions", () => { diff --git a/src/lib/core/questions.ts b/src/lib/core/questions.ts index bdf20b699..28178ba79 100644 --- a/src/lib/core/questions.ts +++ b/src/lib/core/questions.ts @@ -21,76 +21,102 @@ import type { MigrationContextBase } from "./migrationContextBase"; // This is being used to simulate wrong options for conditions on the type level const __misused: unique symbol = Symbol.for("__misused"); -type QuestionAction = ( - value: T, - options?: unknown, -) => CheckResult | Promise; +type QuestionAction = (value: T, options?: unknown) => CheckResult | Promise; export type AnswerValue = string | boolean | number; -export type Condition = { name: string } & ( - | { value: AnswerValue | AnswerValue[] } - | { contains: AnswerValue } - | { doesNotContain: AnswerValue } - | { [__misused]: undefined } +export type Condition = { + /** + * + */ + name: string; +} & ( + | { + /** + * + */ + value: AnswerValue | AnswerValue[]; + } + | { + /** + * + */ + contains: AnswerValue; + } + | { + /** + * + */ + doesNotContain: AnswerValue; + } + | { + /** + * + */ + [__misused]: undefined; + } ); -export function testCondition( - condition: Condition | Condition[] | undefined, - answers: Record, -): boolean { - if (condition == undefined) return true; +/** + * + * @param condition + * @param answers + */ +export function testCondition(condition: Condition | Condition[] | undefined, answers: Record): boolean { + if (condition == undefined) { + return true; + } function testSingleCondition(cond: Condition): boolean { if ("value" in cond) { return answers[cond.name] === cond.value; } else if ("contains" in cond) { - return ( - answers[cond.name] && - (answers[cond.name] as AnswerValue[]).indexOf(cond.contains) > - -1 - ); + return answers[cond.name] && (answers[cond.name] as AnswerValue[]).indexOf(cond.contains) > -1; } else if ("doesNotContain" in cond) { - return ( - !answers[cond.name] || - (answers[cond.name] as AnswerValue[]).indexOf( - cond.doesNotContain, - ) === -1 - ); + return !answers[cond.name] || (answers[cond.name] as AnswerValue[]).indexOf(cond.doesNotContain) === -1; } return false; } if (isArray(condition)) { - return condition.every((cond) => testSingleCondition(cond)); - } else { - return testSingleCondition(condition); + return condition.every(cond => testSingleCondition(cond)); } + return testSingleCondition(condition); } export type MigrateFunc = ( context: MigrationContextBase, answers: Record, question: Question, -) => - | Promise - | AnswerValue - | AnswerValue[] - | undefined; +) => Promise | AnswerValue | AnswerValue[] | undefined; export type TransformResult = ( val: AnswerValue | AnswerValue[], -) => - | AnswerValue - | AnswerValue[] - | undefined - | Promise; +) => AnswerValue | AnswerValue[] | undefined | Promise; +/** + * + */ export interface QuestionMeta { + /** + * + */ label: string; /** One or more conditions that need(s) to be fulfilled for this question to be asked */ condition?: Condition | Condition[]; + /** + * + */ replay?: (answers: Record) => void; + /** + * + */ migrate?: MigrateFunc; + /** + * + */ resultTransform?: TransformResult; + /** + * + */ action?: QuestionAction; /** Whether an answer for this question is optional */ optional?: boolean; @@ -102,9 +128,21 @@ export interface QuestionMeta { } export type Question = SpecificPromptOptions & QuestionMeta; +/** + * + */ export interface QuestionGroup { + /** + * + */ title: string; + /** + * + */ headline: string; + /** + * + */ questions: Question[]; } @@ -138,7 +176,7 @@ export const questionGroups: QuestionGroup[] = [ message: "Please enter the name of your project:", resultTransform: transformAdapterName, action: checkAdapterName, - migrate: (ctx) => ctx.ioPackageJson.common?.name, + migrate: ctx => ctx.ioPackageJson.common?.name, }, { type: "input", @@ -146,9 +184,7 @@ export const questionGroups: QuestionGroup[] = [ label: "Title", message: "Which title should be shown in the admin UI?", action: checkTitle, - migrate: (ctx) => - ctx.ioPackageJson.common?.titleLang?.en || - ctx.ioPackageJson.common?.title, + migrate: ctx => ctx.ioPackageJson.common?.titleLang?.en || ctx.ioPackageJson.common?.title, }, { type: "input", @@ -158,36 +194,28 @@ export const questionGroups: QuestionGroup[] = [ hint: "(optional)", optional: true, resultTransform: transformDescription, - migrate: (ctx) => - ctx.ioPackageJson.common?.desc?.en || - ctx.ioPackageJson.common?.desc, + migrate: ctx => ctx.ioPackageJson.common?.desc?.en || ctx.ioPackageJson.common?.desc, }, { type: "input", name: "keywords", label: "Keywords", - message: - "Enter some keywords (separated by commas) to describe your project:", + message: "Enter some keywords (separated by commas) to describe your project:", hint: "(optional)", optional: true, resultTransform: transformKeywords, - migrate: (ctx) => - ( - ctx.ioPackageJson.common?.keywords || - ctx.packageJson.common?.keywords || - [] - ).join(","), + migrate: ctx => + (ctx.ioPackageJson.common?.keywords || ctx.packageJson.common?.keywords || []).join(","), }, { type: "input", name: "contributors", label: "Contributors", - message: - "If you have any contributors, please enter their names (seperated by commas):", + message: "If you have any contributors, please enter their names (seperated by commas):", hint: "(optional)", optional: true, resultTransform: transformContributors, - migrate: (ctx) => + migrate: ctx => (ctx.packageJson.contributors || []) .map((c: Record) => c.name) .filter((name: string) => !!name) @@ -233,36 +261,33 @@ export const questionGroups: QuestionGroup[] = [ { message: "Visualization", value: "vis" }, ], action: checkMinSelections.bind(undefined, "feature", 1), - migrate: async (ctx) => + migrate: async ctx => [ (await ctx.directoryExists("admin")) ? "adapter" : null, (await ctx.directoryExists("widgets")) ? "vis" : null, - ].filter((f) => !!f) as string[], + ].filter(f => !!f) as string[], }), styledMultiselect({ condition: { name: "features", contains: "adapter" }, name: "adminFeatures", label: "Admin Features", expert: true, - message: - "Which additional features should be available in the admin?", + message: "Which additional features should be available in the admin?", hint: "(optional)", initial: [], choices: [ { message: "An extra tab", value: "tab" }, { message: "Custom options for states", value: "custom" }, ], - migrate: async (ctx) => + migrate: async ctx => [ - (await ctx.fileExists("admin/tab.html")) || - (await ctx.fileExists("admin/tab_m.html")) + (await ctx.fileExists("admin/tab.html")) || (await ctx.fileExists("admin/tab_m.html")) ? "tab" : null, - (await ctx.fileExists("admin/custom.html")) || - (await ctx.fileExists("admin/custom_m.html")) + (await ctx.fileExists("admin/custom.html")) || (await ctx.fileExists("admin/custom_m.html")) ? "custom" : null, - ].filter((f) => !!f) as string[], + ].filter(f => !!f) as string[], }), { condition: { name: "features", contains: "adapter" }, @@ -272,23 +297,19 @@ export const questionGroups: QuestionGroup[] = [ message: "Which category does your adapter fall into?", choices: [ { - message: - "Alarm / security (Home, car, boat, ...)", + message: "Alarm / security (Home, car, boat, ...)", value: "alarm", }, { - message: - "Calendars (also schedules, etc., ...)", + message: "Calendars (also schedules, etc., ...)", value: "date-and-time", }, { - message: - "Cars / Vehicles (trip information, vehicle status, aux. heating, ...)", + message: "Cars / Vehicles (trip information, vehicle status, aux. heating, ...)", value: "vehicle", }, { - message: - "Climate control (A/C, Heaters, air filters, ...)", + message: "Climate control (A/C, Heaters, air filters, ...)", value: "climate-control", }, { @@ -296,54 +317,44 @@ export const questionGroups: QuestionGroup[] = [ value: "protocols", }, { - message: - "Data storage (SQL/NoSQL, file storage, logging, ...)", + message: "Data storage (SQL/NoSQL, file storage, logging, ...)", value: "storage", }, { - message: - "Data transmission (for other services via REST api, websockets, ...)", + message: "Data transmission (for other services via REST api, websockets, ...)", value: "communication", }, { - message: - "Garden (Mowers, watering, ...)", + message: "Garden (Mowers, watering, ...)", value: "garden", }, { - message: - "General purpose (like admin, web, discovery, ...)", + message: "General purpose (like admin, web, discovery, ...)", value: "general", }, { - message: - "Geo positioning (transmission and receipt of position data)", + message: "Geo positioning (transmission and receipt of position data)", value: "geoposition", }, { - message: - "Hardware (low-level, multi-purpose)", + message: "Hardware (low-level, multi-purpose)", value: "hardware", }, { - message: - "Health (Fitness sensors, weight, pulse, ...)", + message: "Health (Fitness sensors, weight, pulse, ...)", value: "health", }, { - message: - "Household devices (Vacuums, kitchen, ...)", + message: "Household devices (Vacuums, kitchen, ...)", value: "household", }, { message: "Lighting control", value: "lighting" }, { - message: - "Logic (Scripts, rules, parsers, scenes, ...)", + message: "Logic (Scripts, rules, parsers, scenes, ...)", value: "logic", }, { - message: - "Messaging (E-Mail, Telegram, WhatsApp, ...)", + message: "Messaging (E-Mail, Telegram, WhatsApp, ...)", value: "messaging", }, { @@ -355,49 +366,41 @@ export const questionGroups: QuestionGroup[] = [ value: "metering", }, { - message: - "Miscellaneous data (Import/export of contacts, gasoline prices, ...)", + message: "Miscellaneous data (Import/export of contacts, gasoline prices, ...)", value: "misc-data", }, { - message: - "Miscellaneous utilities (Data import/emport, backup, ...)", + message: "Miscellaneous utilities (Data import/emport, backup, ...)", value: "utility", }, { - message: - "Multimedia (TV, audio, remote controls, ...)", + message: "Multimedia (TV, audio, remote controls, ...)", value: "multimedia", }, { - message: - "Network infrastructure (Hardware, printers, phones, ...)", + message: "Network infrastructure (Hardware, printers, phones, ...)", value: "infrastructure", }, { - message: - "Network utilities (Ping, UPnP, network discovery, ...)", + message: "Network utilities (Ping, UPnP, network discovery, ...)", value: "network", }, { - message: - "Smart home systems (3rd party, hardware and software)", + message: "Smart home systems (3rd party, hardware and software)", value: "iot-systems", }, { - message: - "Visualizations (VIS, MaterialUI, mobile views, ...)", + message: "Visualizations (VIS, MaterialUI, mobile views, ...)", value: "visualization", }, // visualization-icons and visualization-widgets are a separate question for // VIS projects { - message: - "Weather (Forecast, air quality, statistics, ...)", + message: "Weather (Forecast, air quality, statistics, ...)", value: "weather", }, ], - migrate: (ctx) => ctx.ioPackageJson.common?.type, + migrate: ctx => ctx.ioPackageJson.common?.type, }, { condition: { name: "features", contains: "vis" }, @@ -409,7 +412,7 @@ export const questionGroups: QuestionGroup[] = [ { message: "Icons for VIS", value: "visualization-icons" }, { message: "VIS widgets", value: "visualization-widgets" }, ], - migrate: (ctx) => ctx.ioPackageJson.common?.type, + migrate: ctx => ctx.ioPackageJson.common?.type, }, { condition: { name: "features", contains: "vis" }, @@ -424,8 +427,7 @@ export const questionGroups: QuestionGroup[] = [ value: "main", }, { - message: - "The adapter also works without the visualization of the widget", + message: "The adapter also works without the visualization of the widget", value: "additional", }, ], @@ -452,7 +454,7 @@ export const questionGroups: QuestionGroup[] = [ }, { message: "never", value: "none" }, ], - migrate: (ctx) => ctx.ioPackageJson.common?.mode, + migrate: ctx => ctx.ioPackageJson.common?.mode, }, { condition: { name: "startMode", value: "schedule" }, @@ -460,12 +462,10 @@ export const questionGroups: QuestionGroup[] = [ name: "scheduleStartOnChange", label: "Schedule", expert: true, - message: - "Should the adapter also be started when the configuration is changed?", + message: "Should the adapter also be started when the configuration is changed?", initial: "no", choices: ["yes", "no"], - migrate: (ctx) => - ctx.ioPackageJson.common?.allowInit ? "yes" : "no", + migrate: ctx => (ctx.ioPackageJson.common?.allowInit ? "yes" : "no"), }, { condition: { name: "features", contains: "adapter" }, @@ -481,7 +481,7 @@ export const questionGroups: QuestionGroup[] = [ value: "local", }, ], - migrate: (ctx) => ctx.ioPackageJson.common?.connectionType, + migrate: ctx => ctx.ioPackageJson.common?.connectionType, }, { condition: { name: "features", contains: "adapter" }, @@ -492,13 +492,11 @@ export const questionGroups: QuestionGroup[] = [ message: `How will the adapter receive its data?`, choices: [ { - message: - "Request it regularly from the service or device", + message: "Request it regularly from the service or device", value: "poll", }, { - message: - "The service or device actively sends new data", + message: "The service or device actively sends new data", value: "push", }, { @@ -507,7 +505,7 @@ export const questionGroups: QuestionGroup[] = [ value: "assumption", }, ], - migrate: (ctx) => ctx.ioPackageJson.common?.dataSource, + migrate: ctx => ctx.ioPackageJson.common?.dataSource, }, { condition: { name: "features", contains: "adapter" }, @@ -519,12 +517,8 @@ export const questionGroups: QuestionGroup[] = [ hint: "(To some device or some service)", initial: "no", choices: ["yes", "no"], - migrate: (ctx) => - ctx.ioPackageJson.instanceObjects?.some( - (o: any) => o._id === "info.connection", - ) - ? "yes" - : "no", + migrate: ctx => + ctx.ioPackageJson.instanceObjects?.some((o: any) => o._id === "info.connection") ? "yes" : "no", }, ], }, @@ -555,15 +549,10 @@ export const questionGroups: QuestionGroup[] = [ type: "select", name: "language", label: "Programming Language", - message: - "Which language do you want to use to code the adapter?", + message: "Which language do you want to use to code the adapter?", choices: ["JavaScript", "TypeScript"], - migrate: async (ctx) => - (await ctx.hasFilesWithExtension( - "src", - ".ts", - (f) => !f.endsWith(".d.ts"), - )) + migrate: async ctx => + (await ctx.hasFilesWithExtension("src", ".ts", f => !f.endsWith(".d.ts"))) ? "TypeScript" : "JavaScript", }, @@ -574,11 +563,10 @@ export const questionGroups: QuestionGroup[] = [ label: "Node.js version", expert: true, optional: true, - message: - "What's the minimum Node.js version you want to support?", + message: "What's the minimum Node.js version you want to support?", initial: "20", choices: ["20", "22", "24"], - migrate: (ctx) => { + migrate: ctx => { if (ctx.hasDevDependency("@tsconfig/node18")) { return "20"; // For migrations upgrade to Node.js 20 as minimum } else if (ctx.hasDevDependency("@tsconfig/node20")) { @@ -587,9 +575,8 @@ export const questionGroups: QuestionGroup[] = [ return "22"; } else if (ctx.hasDevDependency("@tsconfig/node24")) { return "24"; - } else { - return "20"; } + return "20"; }, }, { @@ -597,8 +584,7 @@ export const questionGroups: QuestionGroup[] = [ type: "select", name: "adminUi", label: "Admin UI", - message: - "Which framework would you like to use for the Admin UI?", + message: "Which framework would you like to use for the Admin UI?", initial: "json", choices: [ { @@ -639,9 +625,8 @@ export const questionGroups: QuestionGroup[] = [ message: "Use React for the tab UI?", initial: "no", choices: ["yes", "no"], - migrate: async (ctx) => - (await ctx.fileExists("admin/src/tab.jsx")) || - (await ctx.fileExists("admin/src/tab.tsx")) + migrate: async ctx => + (await ctx.fileExists("admin/src/tab.jsx")) || (await ctx.fileExists("admin/src/tab.tsx")) ? "yes" : "no", }, @@ -663,17 +648,13 @@ export const questionGroups: QuestionGroup[] = [ hint: "(Requires VSCode and Docker, starts a fresh ioBroker in a Docker container with only your adapter installed)", }, ], - migrate: async (ctx) => + migrate: async ctx => [ ctx.hasDevDependency("eslint") ? "ESLint" : null, - ctx.hasDevDependency("typescript") - ? "type checking" - : null, + ctx.hasDevDependency("typescript") ? "type checking" : null, ctx.hasDevDependency("prettier") ? "Prettier" : null, - (await ctx.directoryExists(".devcontainer")) - ? "devcontainer" - : null, - ].filter((f) => !!f) as string[], + (await ctx.directoryExists(".devcontainer")) ? "devcontainer" : null, + ].filter(f => !!f) as string[], }), styledMultiselect({ condition: { name: "language", value: "TypeScript" }, @@ -694,28 +675,24 @@ export const questionGroups: QuestionGroup[] = [ }, ], action: checkTypeScriptTools, - migrate: async (ctx) => + migrate: async ctx => [ ctx.hasDevDependency("eslint") ? "ESLint" : null, ctx.hasDevDependency("prettier") ? "Prettier" : null, ctx.hasDevDependency("nyc") ? "code coverage" : null, - (await ctx.directoryExists(".devcontainer")) - ? "devcontainer" - : null, - ].filter((f) => !!f) as string[], + (await ctx.directoryExists(".devcontainer")) ? "devcontainer" : null, + ].filter(f => !!f) as string[], }), { condition: { name: "tools", contains: "ESLint" }, type: "select", name: "eslintConfig", label: "ESLint Configuration", - message: - "Do you want to configure ESLint by yourself or use the official ioBroker ESLint config?", + message: "Do you want to configure ESLint by yourself or use the official ioBroker ESLint config?", initial: "official", choices: [ { - message: - "Use official ioBroker ESLint config (includes prettier)", + message: "Use official ioBroker ESLint config (includes prettier)", hint: "(recommended)", value: "official", }, @@ -750,23 +727,16 @@ export const questionGroups: QuestionGroup[] = [ value: "words.js", }, ], - migrate: async (ctx) => - (await ctx.fileExists("admin/i18n/en/translations.json")) - ? "JSON" - : "words.js", + migrate: async ctx => ((await ctx.fileExists("admin/i18n/en/translations.json")) ? "JSON" : "words.js"), }, { type: "select", name: "releaseScript", label: "Release Script", - message: - "Would you like to automate new releases with one simple command?", + message: "Would you like to automate new releases with one simple command?", initial: "yes", choices: ["yes", "no"], - migrate: async (ctx) => - ctx.hasDevDependency("@alcalzone/release-script") - ? "yes" - : "no", + migrate: async ctx => (ctx.hasDevDependency("@alcalzone/release-script") ? "yes" : "no"), }, { condition: [ @@ -788,8 +758,7 @@ export const questionGroups: QuestionGroup[] = [ type: "numeral", name: "devServerPort", label: "dev-server Admin Port", - message: - "Please choose the port number on which dev-server should present the admin web interface:", + message: "Please choose the port number on which dev-server should present the admin web interface:", initial: 8081, min: 1024, max: 0xffff, @@ -803,8 +772,7 @@ export const questionGroups: QuestionGroup[] = [ message: "Do you prefer tab or space indentation?", initial: "Tab", choices: ["Tab", "Space (4)"], - migrate: async (ctx) => - (await ctx.analyzeCode("\t", " ")) ? "Tab" : "Space (4)", + migrate: async ctx => ((await ctx.analyzeCode("\t", " ")) ? "Tab" : "Space (4)"), }, { condition: { name: "features", contains: "adapter" }, @@ -814,8 +782,7 @@ export const questionGroups: QuestionGroup[] = [ message: "Do you prefer double or single quotes?", initial: "double", choices: ["double", "single"], - migrate: async (ctx) => - (await ctx.analyzeCode('"', "'")) ? "double" : "single", + migrate: async ctx => ((await ctx.analyzeCode('"', "'")) ? "double" : "single"), }, ], }, @@ -829,7 +796,7 @@ export const questionGroups: QuestionGroup[] = [ label: "Author Name", message: "Please enter your name (or nickname):", action: checkAuthorName, - migrate: (ctx) => ctx.packageJson.author?.name, + migrate: ctx => ctx.packageJson.author?.name, }, { type: "input", @@ -838,11 +805,7 @@ export const questionGroups: QuestionGroup[] = [ message: "What's your name/org on GitHub?", initial: ((answers: Answers) => answers.authorName) as any, action: checkAuthorName, - migrate: (ctx) => - ctx.ioPackageJson.common?.extIcon?.replace( - /^\w+:\/\/[^/]+\.com\/([^/]+)\/.+$/, - "$1", - ), + migrate: ctx => ctx.ioPackageJson.common?.extIcon?.replace(/^\w+:\/\/[^/]+\.com\/([^/]+)\/.+$/, "$1"), }, { type: "input", @@ -850,7 +813,7 @@ export const questionGroups: QuestionGroup[] = [ label: "Adapter E-Mail", message: "What's your email address?", action: checkEmail, - migrate: (ctx) => ctx.packageJson.author?.email, + migrate: ctx => ctx.packageJson.author?.email, }, { type: "select", @@ -868,10 +831,7 @@ export const questionGroups: QuestionGroup[] = [ hint: "(requires you to setup SSH keys)", }, ], - migrate: (ctx) => - ctx.packageJson.repository?.url?.match(/^git@/) - ? "SSH" - : "HTTPS", + migrate: ctx => (ctx.packageJson.repository?.url?.match(/^git@/) ? "SSH" : "HTTPS"), }, { condition: { name: "cli", value: true }, @@ -901,10 +861,7 @@ export const questionGroups: QuestionGroup[] = [ hint: "(deprecated)", }, ], - migrate: (ctx) => - ctx.ioPackageJson.common?.extIcon?.match(/\/main\/admin\//i) - ? "main" - : "master", + migrate: ctx => (ctx.ioPackageJson.common?.extIcon?.match(/\/main\/admin\//i) ? "main" : "master"), }, { type: "select", @@ -922,57 +879,96 @@ export const questionGroups: QuestionGroup[] = [ "MIT License", "The Unlicense", ], - migrate: (ctx) => - Object.keys(licenses).find( - (k) => licenses[k].id === ctx.packageJson.license, - ), + migrate: ctx => Object.keys(licenses).find(k => licenses[k].id === ctx.packageJson.license), }, { type: "select", name: "dependabot", label: "Dependabot", expert: true, - message: - "Do you want to receive regular dependency updates through Pull Requests?", + message: "Do you want to receive regular dependency updates through Pull Requests?", hint: "(recommended)", initial: "yes", choices: ["yes", "no"], - migrate: async (ctx) => - (await ctx.fileExists(".github/dependabot.yml")) - ? "yes" - : "no", + migrate: async ctx => ((await ctx.fileExists(".github/dependabot.yml")) ? "yes" : "no"), }, ], }, ]; /** Only the questions */ -export const questions = questionGroups - .map((q) => q.questions) - .reduce((arr, next) => arr.concat(...next), []); +export const questions = questionGroups.map(q => q.questions).reduce((arr, next) => arr.concat(...next), []); +/** + * + */ export interface BaseAdapterSettings { + /** + * + */ key: string; + /** + * + */ label?: string; + /** + * + */ defaultValue?: T; } +/** + * + */ export interface StringAdapterSettings extends BaseAdapterSettings { + /** + * + */ inputType: "text"; } +/** + * + */ export interface NumberAdapterSettings extends BaseAdapterSettings { + /** + * + */ inputType: "number"; } +/** + * + */ export interface BooleanAdapterSettings extends BaseAdapterSettings { + /** + * + */ inputType: "checkbox"; } +/** + * + */ export interface AdapterSelectOption { + /** + * + */ value: string; + /** + * + */ text: string; } +/** + * + */ export interface SelectAdapterSettings extends BaseAdapterSettings { + /** + * + */ inputType: "select"; + /** + * + */ options: AdapterSelectOption[]; } export type AdapterSettings = @@ -1003,59 +999,171 @@ export interface LicenseInformation { license?: LicenseType; } +/** + * + */ export interface Answers { /** false is used in the portal */ cli: boolean; /** "github" and "zip" are used in the portal */ target: "directory" | "github" | "zip"; + /** + * + */ adapterName: string; + /** + * + */ description?: string; + /** + * + */ keywords?: string[]; + /** + * + */ expert?: "yes" | "no"; + /** + * + */ authorName: string; + /** + * + */ authorEmail: string; + /** + * + */ authorGithub: string; + /** + * + */ contributors?: string[]; + /** + * + */ language?: "JavaScript" | "TypeScript"; + /** + * + */ features: ("adapter" | "vis")[]; + /** + * + */ adminFeatures?: ("tab" | "custom")[]; - tools?: ( - | "ESLint" - | "Prettier" - | "type checking" - | "code coverage" - | "devcontainer" - )[]; + /** + * + */ + tools?: ("ESLint" | "Prettier" | "type checking" | "code coverage" | "devcontainer")[]; + /** + * + */ eslintConfig?: "official" | "custom"; + /** + * + */ nodeVersion?: "20" | "22" | "24"; + /** + * + */ title?: string; + /** + * + */ license?: string; // Not used on the CLI, but can be provided by the web UI for example + /** + * + */ licenseInformation?: LicenseInformation; + /** + * + */ type: string; + /** + * + */ widgetIsMainFunction?: "main" | "additional"; + /** + * + */ adminUi?: "json" | "html" | "react" | "none"; + /** + * + */ tabReact?: "yes" | "no"; + /** + * + */ i18n?: "words.js" | "JSON"; + /** + * + */ releaseScript?: "yes" | "no"; + /** + * + */ devServer?: "yes" | "no"; + /** + * + */ devServerPort?: number; + /** + * + */ indentation?: "Tab" | "Space (4)"; + /** + * + */ quotes?: "single" | "double"; + /** + * + */ gitRemoteProtocol: "HTTPS" | "SSH"; + /** + * + */ gitCommit?: "yes" | "no"; + /** + * + */ defaultBranch?: "main" | "master"; + /** + * + */ dependabot?: "yes" | "no"; + /** + * + */ startMode?: "daemon" | "schedule" | "once" | "none"; + /** + * + */ scheduleStartOnChange?: "yes" | "no"; + /** + * + */ connectionIndicator?: "yes" | "no"; + /** + * + */ connectionType?: "cloud" | "local"; + /** + * + */ dataSource?: "poll" | "push" | "assumption"; + /** + * + */ icon?: UploadedIcon; /** An array of predefined adapter options */ adapterSettings?: AdapterSettings[]; } +/** + * + * @param answers + */ export function checkAnswers(answers: Partial): void { for (const q of questions) { // We don't use dynamic question names @@ -1067,10 +1175,7 @@ export function checkAnswers(answers: Partial): void { throw new Error(`Missing answer "${questionName}"!`); } else if (!conditionFulfilled && answer != undefined) { // TODO: Find a fool-proof way to check for extraneous answers - if ( - questions.filter((qq) => (qq.name as string) === questionName) - .length > 0 - ) { + if (questions.filter(qq => (qq.name as string) === questionName).length > 0) { // For now, don't enforce conditions for questions with multiple branches continue; } @@ -1080,50 +1185,56 @@ export function checkAnswers(answers: Partial): void { } } -export async function formatAnswers( - answers: Record, -): Promise> { +/** + * + * @param answers + */ +export async function formatAnswers(answers: Record): Promise> { for (const q of questions) { const conditionFulfilled = testCondition(q.condition, answers); - if (!conditionFulfilled) continue; + if (!conditionFulfilled) { + continue; + } // Apply an optional transformation - if ( - answers[q.name as string] != undefined && - typeof q.resultTransform === "function" - ) { + if (answers[q.name as string] != undefined && typeof q.resultTransform === "function") { const transformed = q.resultTransform(answers[q.name as string]); - answers[q.name as string] = - transformed instanceof Promise - ? await transformed - : transformed; + answers[q.name as string] = transformed instanceof Promise ? await transformed : transformed; } } return answers; } -export async function validateAnswers( - answers: Answers, - disableValidation: (keyof Answers)[] = [], -): Promise { +/** + * + * @param answers + * @param disableValidation + */ +export async function validateAnswers(answers: Answers, disableValidation: (keyof Answers)[] = []): Promise { for (const q of questions) { const conditionFulfilled = testCondition(q.condition, answers); - if (!conditionFulfilled) continue; - if (q.action == undefined) continue; - if (disableValidation.indexOf(q.name as keyof Answers) > -1) continue; + if (!conditionFulfilled) { + continue; + } + if (q.action == undefined) { + continue; + } + if (disableValidation.indexOf(q.name as keyof Answers) > -1) { + continue; + } - const testResult = await q.action( - answers[q.name as keyof Answers] as any, - ); + const testResult = await q.action(answers[q.name as keyof Answers] as any); if (typeof testResult === "string") { throw new Error(testResult); } } } -export function getDefaultAnswer( - key: T, -): Answers[T] | undefined { +/** + * + * @param key + */ +export function getDefaultAnswer(key: T): Answers[T] | undefined { // Apparently, it is not possible to make the return type depend on the // given object key: https://github.com/microsoft/TypeScript/issues/31672 // So we cast to `any` until a solution emerges @@ -1148,6 +1259,10 @@ export function getDefaultAnswer( } } +/** + * + * @param answers + */ export function getIconName(answers: Answers): string { return `${answers.adapterName}.${answers.icon?.extension || "png"}`; } @@ -1156,16 +1271,8 @@ async function migrateAdminUi(context: MigrationContextBase): Promise { if (await context.fileExists("admin/jsonConfig.json")) { return "json"; } - const hasJsx = await context.hasFilesWithExtension( - "admin/src", - ".jsx", - (f) => !f.endsWith("tab.jsx"), - ); - const hasTsx = await context.hasFilesWithExtension( - "admin/src", - ".tsx", - (f) => !f.endsWith("tab.tsx"), - ); + const hasJsx = await context.hasFilesWithExtension("admin/src", ".jsx", f => !f.endsWith("tab.jsx")); + const hasTsx = await context.hasFilesWithExtension("admin/src", ".tsx", f => !f.endsWith("tab.tsx")); if (hasJsx || hasTsx) { return "react"; } diff --git a/templates/README.md.ts b/templates/README.md.ts index f727f03c8..f6c6458ba 100644 --- a/templates/README.md.ts +++ b/templates/README.md.ts @@ -3,14 +3,12 @@ import type { TemplateFunction } from "../src/lib/createAdapter"; import { getFormattedLicense } from "../src/lib/tools"; export = (answers => { - const isAdapter = answers.features.indexOf("adapter") > -1; const useTypeScript = answers.language === "TypeScript"; const useTypeChecking = useTypeScript || answers.tools?.includes("type checking"); const useNyc = answers.tools?.includes("code coverage"); const useESLint = answers.tools?.includes("ESLint"); - const useReact = - answers.adminUi === "react" || answers.tabReact === "yes"; + const useReact = answers.adminUi === "react" || answers.tabReact === "yes"; const autoInitGit = answers.gitCommit === "yes"; const defaultBranch = answers.defaultBranch || "main"; const useReleaseScript = answers.releaseScript === "yes"; @@ -20,14 +18,14 @@ export = (answers => { const npmScripts: Record = {}; if (useTypeScript && !useReact) { - npmScripts["build"] = "Compile the TypeScript sources."; - npmScripts["watch"] = "Compile the TypeScript sources and watch for changes."; + npmScripts.build = "Compile the TypeScript sources."; + npmScripts.watch = "Compile the TypeScript sources and watch for changes."; } else if (useReact && !useTypeScript) { - npmScripts["build"] = "Compile the React sources."; - npmScripts["watch"] = "Compile the React sources and watch for changes."; + npmScripts.build = "Compile the React sources."; + npmScripts.watch = "Compile the React sources and watch for changes."; } else if (useReact && useTypeScript) { - npmScripts["build"] = "Compile the TypeScript and React sources."; - npmScripts["watch"] = "Compile the TypeScript and React sources and watch for changes."; + npmScripts.build = "Compile the TypeScript and React sources."; + npmScripts.watch = "Compile the TypeScript and React sources and watch for changes."; npmScripts["build:ts"] = "Compile the TypeScript sources."; npmScripts["watch:ts"] = "Compile the TypeScript sources and watch for changes."; npmScripts["build:react"] = "Compile the React sources."; @@ -45,19 +43,21 @@ export = (answers => { if (isAdapter) { npmScripts["test:integration"] = "Tests the adapter startup with an actual instance of ioBroker."; } - npmScripts["test"] = `Performs a minimal test run on package files${isAdapter ? " and your tests" : ""}.`; + npmScripts.test = `Performs a minimal test run on package files${isAdapter ? " and your tests" : ""}.`; if (useTypeChecking) { - npmScripts["check"] = "Performs a type-check on your code (without compiling anything)."; + npmScripts.check = "Performs a type-check on your code (without compiling anything)."; } if (useNyc) { - npmScripts["coverage"] = "Generates code coverage using your test files."; + npmScripts.coverage = "Generates code coverage using your test files."; } if (useESLint) { - npmScripts["lint"] = "Runs \`ESLint\` to check your code for formatting errors and potential bugs."; + npmScripts.lint = "Runs \`ESLint\` to check your code for formatting errors and potential bugs."; } - npmScripts["translate"] = "Translates texts in your adapter to all required languages, see [`@iobroker/adapter-dev`](https://github.com/ioBroker/adapter-dev#manage-translations) for more details."; + npmScripts.translate = + "Translates texts in your adapter to all required languages, see [`@iobroker/adapter-dev`](https://github.com/ioBroker/adapter-dev#manage-translations) for more details."; if (useReleaseScript) { - npmScripts["release"] = "Creates a new release, see [`@alcalzone/release-script`](https://github.com/AlCalzone/release-script#usage) for more details."; + npmScripts.release = + "Creates a new release, see [`@alcalzone/release-script`](https://github.com/AlCalzone/release-script#usage) for more details."; } const adapterNameLowerCase = answers.adapterName.toLowerCase(); @@ -89,15 +89,18 @@ You can check other adapters for examples or ask in the developer community. Usi ### Getting started You are almost done, only a few steps left: -${isGitHub ? -(`1. Clone the repository from GitHub to a directory on your PC: +${ + isGitHub + ? `1. Clone the repository from GitHub to a directory on your PC: \`\`\`bash git clone https://github.com/${answers.authorGithub}/ioBroker.${answers.adapterName} \`\`\` -`) : -(`1. Create a new repository on GitHub with the name \`ioBroker.${answers.adapterName}\` -${autoInitGit ? "" : ( -`1. Initialize the current folder as a new git repository: +` + : `1. Create a new repository on GitHub with the name \`ioBroker.${answers.adapterName}\` +${ + autoInitGit + ? "" + : `1. Initialize the current folder as a new git repository: \`\`\`bash git init -b ${defaultBranch} git add . @@ -107,21 +110,27 @@ ${autoInitGit ? "" : ( \`\`\`bash git remote add origin https://github.com/${answers.authorGithub}/ioBroker.${answers.adapterName} \`\`\` -`)} +` +} 1. Push all files to the GitHub repo${autoInitGit ? ". The creator has already set up the local repository for you" : ""}: \`\`\`bash git push origin ${defaultBranch} \`\`\` -${useDependabot ? ( -`1. Add a new secret under https://github.com/${answers.authorGithub}/ioBroker.${answers.adapterName}/settings/secrets. It must be named \`AUTO_MERGE_TOKEN\` and contain a personal access token with push access to the repository, e.g. yours. You can create a new token under https://github.com/settings/tokens. -`) : ""} -`)} +${ + useDependabot + ? `1. Add a new secret under https://github.com/${answers.authorGithub}/ioBroker.${answers.adapterName}/settings/secrets. It must be named \`AUTO_MERGE_TOKEN\` and contain a personal access token with push access to the repository, e.g. yours. You can create a new token under https://github.com/settings/tokens. +` + : "" +} +` +} 1. Head over to ${ - isAdapter ? ( - useTypeScript ? "[src/main.ts](src/main.ts)" - : "[main.js](main.js)" - ) : `[widgets/${answers.adapterName}.html](widgets/${answers.adapterName}.html)` -} and start programming! + isAdapter + ? useTypeScript + ? "[src/main.ts](src/main.ts)" + : "[main.js](main.js)" + : `[widgets/${answers.adapterName}.html](widgets/${answers.adapterName}.html)` + } and start programming! ### Best Practices We've collected some [best practices](https://github.com/ioBroker/ioBroker.repositories#development-and-coding-best-practices) regarding ioBroker development and coding in general. If you're new to ioBroker or Node.js, you should @@ -131,16 +140,22 @@ check them out. If you're already experienced, you should also take a look at th Several npm scripts are predefined for your convenience. You can run them using \`npm run \` | Script name | Description | |-------------|-------------| -${Object.entries(npmScripts).map(([name, desc]) => ( - `| \`${name}\` | ${desc} |` -)).join("\n")} +${Object.entries(npmScripts) + .map(([name, desc]) => `| \`${name}\` | ${desc} |`) + .join("\n")} -${useTypeScript || useReact ? `### Configuring the compilation +${ + useTypeScript || useReact + ? `### Configuring the compilation The adapter template uses [esbuild](https://esbuild.github.io/) to compile TypeScript and/or React code. You can configure many compilation settings either in \`tsconfig.json\` or by changing options for the build tasks. These options are described in detail in the -[\`@iobroker/adapter-dev\` documentation](https://github.com/ioBroker/adapter-dev#compile-adapter-files).` : ""} +[\`@iobroker/adapter-dev\` documentation](https://github.com/ioBroker/adapter-dev#compile-adapter-files).` + : "" +} -${isAdapter ? `### Writing tests +${ + isAdapter + ? `### Writing tests When done right, testing code is invaluable, because it gives you the confidence to change your code while knowing exactly if and when something breaks. A good read on the topic of test-driven development @@ -151,11 +166,15 @@ clear upsides. The template provides you with basic tests for the adapter startup and package files. It is recommended that you add your own tests into the mix. -` : ""}### Publishing the ${isAdapter ? "adapter" : "widget"} +` + : "" +}### Publishing the ${isAdapter ? "adapter" : "widget"} Using GitHub Actions, you can enable automatic releases on npm whenever you push a new git tag that matches the form \`v..\`. We **strongly recommend** that you do. The necessary steps are described in \`.github/workflows/test-and-release.yml\`. -${useReleaseScript ? `Since you installed the release script, you can create a new +${ + useReleaseScript + ? `Since you installed the release script, you can create a new release simply by calling: \`\`\`bash npm run release @@ -163,10 +182,14 @@ npm run release Additional command line options for the release script are explained in the [release-script documentation](https://github.com/AlCalzone/release-script#command-line). -` : ""}To get your ${isAdapter ? "adapter" : "widget"} released in ioBroker, please refer to the documentation +` + : "" +}To get your ${isAdapter ? "adapter" : "widget"} released in ioBroker, please refer to the documentation of [ioBroker.repositories](https://github.com/ioBroker/ioBroker.repositories#requirements-for-adapter-to-get-added-to-the-latest-repository). -${useDevServer ? ` +${ + useDevServer + ? ` ### Test the adapter manually with dev-server Since you set up \`dev-server\`, you can use it to run, test and debug your adapter. @@ -178,7 +201,9 @@ dev-server watch The ioBroker.admin interface will then be available at http://localhost:${answers.devServerPort}/ Please refer to the [\`dev-server\` documentation](https://github.com/ioBroker/dev-server#command-line) for more details. -` : isGitHub ? ` +` + : isGitHub + ? ` ### Test the adapter manually with dev-server Please use \`dev-server\` to test and debug your adapter. @@ -190,7 +215,8 @@ dev-server watch \`\`\` Please refer to the [\`dev-server\` documentation](https://github.com/ioBroker/dev-server#readme) for more details. -` : ` +` + : ` ### Test the adapter manually on a local ioBroker installation In order to install the adapter locally without publishing, the following steps are recommended: 1. Create a tarball from your dev directory: @@ -207,13 +233,18 @@ In order to install the adapter locally without publishing, the following steps For later updates, the above procedure is not necessary. Just do the following: 1. Overwrite the changed files in the adapter directory (\`/opt/iobroker/node_modules/iobroker.${adapterNameLowerCase}\`) 1. Execute \`iobroker upload ${adapterNameLowerCase}\` on the ioBroker host -`} +` +} ## Changelog -${useReleaseScript ? ` -` : ""} +` + : "" +} ### ${useReleaseScript ? "**WORK IN PROGRESS**" : "0.0.1"} * (${answers.authorName}) initial release diff --git a/templates/_create-adapter.json.ts b/templates/_create-adapter.json.ts index 24c02c773..4e2cb9343 100644 --- a/templates/_create-adapter.json.ts +++ b/templates/_create-adapter.json.ts @@ -1,8 +1,7 @@ import type { TemplateFunction } from "../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - - return JSON.stringify(answers, undefined, '\t'); + return JSON.stringify(answers, undefined, "\t"); }; templateFunction.customPath = ".create-adapter.json"; diff --git a/templates/_devcontainer/README.md.ts b/templates/_devcontainer/README.md.ts index 4baa3a023..7ceabb951 100644 --- a/templates/_devcontainer/README.md.ts +++ b/templates/_devcontainer/README.md.ts @@ -1,9 +1,10 @@ import type { TemplateFunction } from "../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const devcontainer = answers.tools && answers.tools.includes("devcontainer"); - if (!devcontainer) return; + if (!devcontainer) { + return; + } const template = ` # Devcontainer readme diff --git a/templates/_devcontainer/devcontainer.json.ts b/templates/_devcontainer/devcontainer.json.ts index ec6ffc3f5..dc841141c 100644 --- a/templates/_devcontainer/devcontainer.json.ts +++ b/templates/_devcontainer/devcontainer.json.ts @@ -1,17 +1,22 @@ import type { TemplateFunction } from "../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const devcontainer = answers.tools && answers.tools.includes("devcontainer"); - if (!devcontainer) return; + if (!devcontainer) { + return; + } const adapterNameLowerCase = answers.adapterName.toLowerCase(); const useESLint = !!answers.tools?.includes("ESLint"); const usePrettier = !!answers.tools?.includes("Prettier"); const extensions: string[] = []; - if (useESLint) extensions.push("dbaeumer.vscode-eslint"); - if (usePrettier) extensions.push("esbenp.prettier-vscode"); + if (useESLint) { + extensions.push("dbaeumer.vscode-eslint"); + } + if (usePrettier) { + extensions.push("esbenp.prettier-vscode"); + } const template = ` // For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at: diff --git a/templates/_devcontainer/docker-compose.yml.ts b/templates/_devcontainer/docker-compose.yml.ts index f49853cec..70e7ee5d2 100644 --- a/templates/_devcontainer/docker-compose.yml.ts +++ b/templates/_devcontainer/docker-compose.yml.ts @@ -1,9 +1,10 @@ import type { TemplateFunction } from "../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const devcontainer = answers.tools && answers.tools.includes("devcontainer"); - if (!devcontainer) return; + if (!devcontainer) { + return; + } const adapterNameLowerCase = answers.adapterName.toLowerCase(); const needsParcel = answers.adminUi === "react" || answers.tabReact === "yes"; @@ -32,7 +33,9 @@ services: - LC_ALL=en_US.UTF-8 - TZ=Europe/Berlin - SETGID=1000 -${needsParcel ? (` +${ + needsParcel + ? ` parcel: container_name: parcel-${adapterNameLowerCase} build: ./parcel @@ -44,17 +47,27 @@ ${needsParcel ? (` - ..:/workspace:cached environment: - CHOKIDAR_USEPOLLING=1 -`) : ""} +` + : "" +} # Reverse proxy to load up-to-date admin sources from the repo nginx: image: nginx:latest depends_on: - iobroker -${needsParcel ? (` - parcel -`) : ""} links: +${ + needsParcel + ? ` - parcel +` + : "" +} links: - iobroker -${needsParcel ? (` - parcel -`) : ""} container_name: nginx-${adapterNameLowerCase} +${ + needsParcel + ? ` - parcel +` + : "" +} container_name: nginx-${adapterNameLowerCase} volumes: - ./nginx/nginx.conf:/etc/nginx/nginx.conf - ..:/workspace:cached diff --git a/templates/_devcontainer/iobroker/_Dockerfile.ts b/templates/_devcontainer/iobroker/_Dockerfile.ts index d059c8884..5724f565d 100644 --- a/templates/_devcontainer/iobroker/_Dockerfile.ts +++ b/templates/_devcontainer/iobroker/_Dockerfile.ts @@ -1,9 +1,10 @@ import type { TemplateFunction } from "../../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const devcontainer = answers.tools && answers.tools.includes("devcontainer"); - if (!devcontainer) return; + if (!devcontainer) { + return; + } const template = ` FROM iobroker/iobroker:latest @@ -19,7 +20,7 @@ COPY node-wrapper.sh /usr/bin/node-wrapper.sh RUN chmod +x /usr/bin/node-wrapper.sh \\ && NODE_BIN="$(command -v node)" \\ # Move the original node binary to .real - && mv "$NODE_BIN" "$\{NODE_BIN\}.real" \\ + && mv "$NODE_BIN" "$\{NODE_BIN}.real" \\ # Move the wrapper in place && mv /usr/bin/node-wrapper.sh "$NODE_BIN" diff --git a/templates/_devcontainer/iobroker/boot.sh.ts b/templates/_devcontainer/iobroker/boot.sh.ts index c42dd72d4..d6aca49bd 100644 --- a/templates/_devcontainer/iobroker/boot.sh.ts +++ b/templates/_devcontainer/iobroker/boot.sh.ts @@ -1,9 +1,10 @@ import type { TemplateFunction } from "../../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const devcontainer = answers.tools && answers.tools.includes("devcontainer"); - if (!devcontainer) return; + if (!devcontainer) { + return; + } const template = ` #!/bin/bash diff --git a/templates/_devcontainer/iobroker/node-wrapper.sh.ts b/templates/_devcontainer/iobroker/node-wrapper.sh.ts index e07550142..6da4f546b 100644 --- a/templates/_devcontainer/iobroker/node-wrapper.sh.ts +++ b/templates/_devcontainer/iobroker/node-wrapper.sh.ts @@ -1,9 +1,10 @@ import type { TemplateFunction } from "../../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const devcontainer = answers.tools && answers.tools.includes("devcontainer"); - if (!devcontainer) return; + if (!devcontainer) { + return; + } const template = ` #!/bin/bash diff --git a/templates/_devcontainer/nginx/nginx.conf.ts b/templates/_devcontainer/nginx/nginx.conf.ts index f9bf4d7a0..023a4b5d7 100644 --- a/templates/_devcontainer/nginx/nginx.conf.ts +++ b/templates/_devcontainer/nginx/nginx.conf.ts @@ -1,9 +1,10 @@ import type { TemplateFunction } from "../../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const devcontainer = answers.tools && answers.tools.includes("devcontainer"); - if (!devcontainer) return; + if (!devcontainer) { + return; + } const adapterNameLowerCase = answers.adapterName.toLowerCase(); const needsParcel = answers.adminUi === "react" || answers.tabReact === "yes"; @@ -38,11 +39,15 @@ http { location /adapter/${adapterNameLowerCase}/ { alias /workspace/admin/; } -${needsParcel ? (` +${ + needsParcel + ? ` location /adapter/${adapterNameLowerCase}/build/ { proxy_redirect off; proxy_pass http://parcel:1234/; - }`) : ""} + }` + : "" +} } }`; return template.trim(); diff --git a/templates/_devcontainer/parcel/_Dockerfile.ts b/templates/_devcontainer/parcel/_Dockerfile.ts index eefb3ce71..612bb4f82 100644 --- a/templates/_devcontainer/parcel/_Dockerfile.ts +++ b/templates/_devcontainer/parcel/_Dockerfile.ts @@ -1,10 +1,11 @@ import type { TemplateFunction } from "../../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const devcontainer = answers.tools && answers.tools.includes("devcontainer"); const needsParcel = answers.adminUi === "react" || answers.tabReact === "yes"; - if (!devcontainer || !needsParcel) return; + if (!devcontainer || !needsParcel) { + return; + } const template = ` FROM node:12 diff --git a/templates/_devcontainer/parcel/run.sh.ts b/templates/_devcontainer/parcel/run.sh.ts index 77eb90627..de64793f3 100644 --- a/templates/_devcontainer/parcel/run.sh.ts +++ b/templates/_devcontainer/parcel/run.sh.ts @@ -1,10 +1,11 @@ import type { TemplateFunction } from "../../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const devcontainer = answers.tools && answers.tools.includes("devcontainer"); const needsParcel = answers.adminUi === "react" || answers.tabReact === "yes"; - if (!devcontainer || !needsParcel) return; + if (!devcontainer || !needsParcel) { + return; + } const template = ` #!/bin/bash @@ -15,7 +16,7 @@ npm install npm run watch:parcel `; - return template.trim().replace(/\r\n/g, '\n'); + return template.trim().replace(/\r\n/g, "\n"); }; templateFunction.customPath = ".devcontainer/parcel/run.sh"; diff --git a/templates/_devcontainer/scripts/postcreate.sh.ts b/templates/_devcontainer/scripts/postcreate.sh.ts index 6f210c86d..da4059bcd 100644 --- a/templates/_devcontainer/scripts/postcreate.sh.ts +++ b/templates/_devcontainer/scripts/postcreate.sh.ts @@ -1,9 +1,10 @@ import type { TemplateFunction } from "../../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const devcontainer = answers.tools && answers.tools.includes("devcontainer"); - if (!devcontainer) return; + if (!devcontainer) { + return; + } const template = ` #!/bin/bash diff --git a/templates/_devcontainer/scripts/poststart.sh.ts b/templates/_devcontainer/scripts/poststart.sh.ts index e5d24f3ac..b5cdc1274 100644 --- a/templates/_devcontainer/scripts/poststart.sh.ts +++ b/templates/_devcontainer/scripts/poststart.sh.ts @@ -1,9 +1,10 @@ import type { TemplateFunction } from "../../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const devcontainer = answers.tools && answers.tools.includes("devcontainer"); - if (!devcontainer) return; + if (!devcontainer) { + return; + } const template = ` #!/bin/bash diff --git a/templates/_devcontainer/scripts/wait_for_iobroker.sh.ts b/templates/_devcontainer/scripts/wait_for_iobroker.sh.ts index f8a6dd51a..abea30008 100644 --- a/templates/_devcontainer/scripts/wait_for_iobroker.sh.ts +++ b/templates/_devcontainer/scripts/wait_for_iobroker.sh.ts @@ -1,9 +1,10 @@ import type { TemplateFunction } from "../../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const devcontainer = answers.tools && answers.tools.includes("devcontainer"); - if (!devcontainer) return; + if (!devcontainer) { + return; + } const template = ` #!/bin/bash diff --git a/templates/_github/ISSUE_TEMPLATE/bug_report.md.ts b/templates/_github/ISSUE_TEMPLATE/bug_report.md.ts index 0180f02a8..b0dddab93 100644 --- a/templates/_github/ISSUE_TEMPLATE/bug_report.md.ts +++ b/templates/_github/ISSUE_TEMPLATE/bug_report.md.ts @@ -1,4 +1,5 @@ -import { readFile, TemplateFunction } from "../../../src/lib/createAdapter"; +import type { TemplateFunction } from "../../../src/lib/createAdapter"; +import { readFile } from "../../../src/lib/createAdapter"; const templateFunction: TemplateFunction = _answers => { return readFile("bug_report.raw.md", __dirname); diff --git a/templates/_github/ISSUE_TEMPLATE/config.yml.ts b/templates/_github/ISSUE_TEMPLATE/config.yml.ts index faf4aa066..b6f7c9faf 100644 --- a/templates/_github/ISSUE_TEMPLATE/config.yml.ts +++ b/templates/_github/ISSUE_TEMPLATE/config.yml.ts @@ -1,4 +1,5 @@ -import { readFile, TemplateFunction } from "../../../src/lib/createAdapter"; +import type { TemplateFunction } from "../../../src/lib/createAdapter"; +import { readFile } from "../../../src/lib/createAdapter"; const templateFunction: TemplateFunction = _answers => { return readFile("config.raw.yml", __dirname); @@ -7,4 +8,4 @@ const templateFunction: TemplateFunction = _answers => { templateFunction.customPath = ".github/ISSUE_TEMPLATE/config.yml"; // Reformatting this would create mixed tabs and spaces templateFunction.noReformat = true; -export = templateFunction; \ No newline at end of file +export = templateFunction; diff --git a/templates/_github/auto-merge.yml.ts b/templates/_github/auto-merge.yml.ts index 22478c6a6..7e83a7da9 100644 --- a/templates/_github/auto-merge.yml.ts +++ b/templates/_github/auto-merge.yml.ts @@ -1,9 +1,11 @@ -import { readFile, TemplateFunction } from "../../src/lib/createAdapter"; +import type { TemplateFunction } from "../../src/lib/createAdapter"; +import { readFile } from "../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const useDependabot = answers.dependabot === "yes"; - if (!useDependabot) return; + if (!useDependabot) { + return; + } return readFile("auto-merge.raw.yml", __dirname); }; diff --git a/templates/_github/dependabot.yml.ts b/templates/_github/dependabot.yml.ts index ee7c6a883..5665fb1ed 100644 --- a/templates/_github/dependabot.yml.ts +++ b/templates/_github/dependabot.yml.ts @@ -1,14 +1,15 @@ import type { TemplateFunction } from "../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const useDependabot = answers.dependabot === "yes"; - if (!useDependabot) return; + if (!useDependabot) { + return; + } // Generate a consistent random day between 2 and 28 based on adapter name // This ensures all dependabot runs within a repository use the same day - const hash = answers.adapterName.split('').reduce((acc, char) => { - return ((acc << 5) - acc) + char.charCodeAt(0); + const hash = answers.adapterName.split("").reduce((acc, char) => { + return (acc << 5) - acc + char.charCodeAt(0); }, 0); const dayOfMonth = Math.abs(hash % 27) + 2; // Range: 2-28 diff --git a/templates/_github/workflows/dependabot-auto-merge.yml.ts b/templates/_github/workflows/dependabot-auto-merge.yml.ts index be0f60963..b7756e76f 100644 --- a/templates/_github/workflows/dependabot-auto-merge.yml.ts +++ b/templates/_github/workflows/dependabot-auto-merge.yml.ts @@ -1,9 +1,11 @@ -import { readFile, TemplateFunction } from "../../../src/lib/createAdapter"; +import type { TemplateFunction } from "../../../src/lib/createAdapter"; +import { readFile } from "../../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const useDependabot = answers.dependabot === "yes"; - if (!useDependabot) return; + if (!useDependabot) { + return; + } return readFile("dependabot-auto-merge.raw.yml", __dirname); }; diff --git a/templates/_github/workflows/test-and-release.yml.ts b/templates/_github/workflows/test-and-release.yml.ts index 15f385add..9e1d82004 100644 --- a/templates/_github/workflows/test-and-release.yml.ts +++ b/templates/_github/workflows/test-and-release.yml.ts @@ -2,28 +2,24 @@ import type { TemplateFunction } from "../../../src/lib/createAdapter"; import { RECOMMENDED_NODE_VERSION_FALLBACK } from "../../../src/lib/constants"; const templateFunction: TemplateFunction = answers => { - const isAdapter = answers.features?.includes("adapter"); const useTypeScript = answers.language === "TypeScript"; const useESLint = answers.tools?.includes("ESLint"); const useReact = answers.adminUi === "react" || answers.tabReact === "yes"; const needsBuild = useTypeScript || useReact; - const sourcemapPaths = [ - ...(useTypeScript ? ["build/"] : []), - ...(useReact ? ["admin/build/"] : []), - ]; + const sourcemapPaths = [...(useTypeScript ? ["build/"] : []), ...(useReact ? ["admin/build/"] : [])]; const useReleaseScript = answers.releaseScript === "yes"; const isGitHub = answers.target === "github"; // Determine the LTS version and test versions based on the minimum Node.js version selected const minNodeVersion = answers.nodeVersion || RECOMMENDED_NODE_VERSION_FALLBACK; const ltsNodeVersion = `${minNodeVersion}.x`; - + // Filter test versions to only include versions >= the minimum version const allTestVersions = ["20.x", "22.x", "24.x"]; const minVersionNumber = parseInt(minNodeVersion, 10); const adapterTestVersions = allTestVersions.filter(version => { - const versionNumber = parseInt(version.split('.')[0], 10); + const versionNumber = parseInt(version.split(".")[0], 10); return versionNumber >= minVersionNumber; }); @@ -32,10 +28,7 @@ const templateFunction: TemplateFunction = answers => { const adapterName = answers.adapterName; const deploy = useReleaseScript && isGitHub; - const escapeDeploy = - deploy ? - (input: string) => input : - (input: string) => input.replace(/^/gm, '#'); + const escapeDeploy = deploy ? (input: string) => input : (input: string) => input.replace(/^/gm, "#"); const template = ` name: Test and Release @@ -70,12 +63,21 @@ jobs: with: node-version: '${ltsNodeVersion}' # Uncomment the following line if your adapter cannot be installed using 'npm ci' - # install-command: 'npm install'${useTypeScript ? (` - type-checking: true`) : ""}${useESLint ? (` - lint: true`) : ""} - -${isAdapter ? ( -` # Runs adapter tests on all supported node versions and OSes + # install-command: 'npm install'${ + useTypeScript + ? ` + type-checking: true` + : "" + }${ + useESLint + ? ` + lint: true` + : "" + } + +${ + isAdapter + ? ` # Runs adapter tests on all supported node versions and OSes adapter-tests: if: contains(github.event.head_commit.message, '[skip ci]') == false @@ -91,15 +93,25 @@ ${isAdapter ? ( node-version: \${{ matrix.node-version }} os: \${{ matrix.os }} # Uncomment the following line if your adapter cannot be installed using 'npm ci' - # install-command: 'npm install'${needsBuild ? (` - build: true`) : ""} -`) : ""}${deploy ? "" : (` + # install-command: 'npm install'${ + needsBuild + ? ` + build: true` + : "" + } +` + : "" +}${ + deploy + ? "" + : ` # TODO: To enable automatic npm releases, create a token on npmjs.org # Enter this token as a GitHub secret (with name NPM_TOKEN) in the repository options # Then uncomment the following block: -`)} +` + } ${escapeDeploy( -` # Deploys the final package to NPM + ` # Deploys the final package to NPM deploy: needs: [check-and-lint${isAdapter ? ", adapter-tests" : ""}] @@ -120,8 +132,12 @@ ${escapeDeploy( with: node-version: '${ltsNodeVersion}' # Uncomment the following line if your adapter cannot be installed using 'npm ci' - # install-command: 'npm install'${needsBuild ? (` - build: true`) : ""} + # install-command: 'npm install'${ + needsBuild + ? ` + build: true` + : "" + } npm-token: \${{ secrets.NPM_TOKEN }} github-token: \${{ secrets.GITHUB_TOKEN }} @@ -132,10 +148,15 @@ ${escapeDeploy( sentry: true sentry-token: \${{ secrets.SENTRY_AUTH_TOKEN }} sentry-project: "iobroker-${adapterName}" - sentry-version-prefix: "iobroker.${adapterName}"${needsBuild ? (` - sentry-sourcemap-paths: "${sourcemapPaths.join(" ")}"`) : ""} + sentry-version-prefix: "iobroker.${adapterName}"${ + needsBuild + ? ` + sentry-sourcemap-paths: "${sourcemapPaths.join(" ")}"` + : "" + } # If your sentry project is linked to a GitHub repository, you can enable the following option - # sentry-github-integration: true`)} + # sentry-github-integration: true`, +)} `; return template.trimLeft(); }; diff --git a/templates/_gitignore.ts b/templates/_gitignore.ts index c3ebf5533..1a3cba569 100644 --- a/templates/_gitignore.ts +++ b/templates/_gitignore.ts @@ -1,7 +1,6 @@ import type { TemplateFunction } from "../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const useNyc = answers.tools && answers.tools.indexOf("code coverage") > -1; const useDevContainer = answers.tools && answers.tools.includes("devcontainer"); @@ -21,11 +20,15 @@ iobroker.*.tgz Thumbs.db .commitinfo -${useNyc ? ` +${ + useNyc + ? ` # NYC coverage files coverage -` : ""} +` + : "" +} # i18n intermediate files admin/i18n/flat.txt admin/i18n/*/flat.txt diff --git a/templates/_prettierignore.ts b/templates/_prettierignore.ts index 96b4b4f88..d710f321e 100644 --- a/templates/_prettierignore.ts +++ b/templates/_prettierignore.ts @@ -1,9 +1,10 @@ import type { TemplateFunction } from "../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const usePrettier = answers.tools && answers.tools.indexOf("Prettier") > -1; - if (!usePrettier) return; + if (!usePrettier) { + return; + } const useTypeScript = answers.language === "TypeScript"; const template = ` diff --git a/templates/_prettierrc.js.ts b/templates/_prettierrc.js.ts index 78de32687..cdaa8aae4 100644 --- a/templates/_prettierrc.js.ts +++ b/templates/_prettierrc.js.ts @@ -1,18 +1,21 @@ import type { TemplateFunction } from "../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const usePrettier = answers.tools && answers.tools.indexOf("Prettier") > -1; - if (!usePrettier) return; + if (!usePrettier) { + return; + } const useOfficialESLintConfig = answers.eslintConfig === "official"; // Don't generate .prettierrc.js when using official config (prettier config is in prettier.config.mjs) - if (useOfficialESLintConfig) return; + if (useOfficialESLintConfig) { + return; + } // endOfLine could be made dependent on the current OS's line ending // I need to think about it. // However leaving it on "auto" causes linting to fail on CI servers // when the adapter was developed on Windows - + // Keep this in sync with lib/tools.ts -> formatWithPrettier() const template = ` module.exports = { diff --git a/templates/_releaseconfig.json.ts b/templates/_releaseconfig.json.ts index d8e09274b..b0158c817 100644 --- a/templates/_releaseconfig.json.ts +++ b/templates/_releaseconfig.json.ts @@ -2,7 +2,9 @@ import type { TemplateFunction } from "../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { const useReleaseScript = answers.releaseScript === "yes"; - if (!useReleaseScript) return; + if (!useReleaseScript) { + return; + } const useTypeScript = answers.language === "TypeScript"; const useAdminReact = answers.adminUi === "react"; @@ -15,11 +17,10 @@ const templateFunction: TemplateFunction = answers => { if (useTypeScript || useReact) { template.exec = { before_commit: "npm run build", - } + }; } - - return JSON.stringify(template, undefined, '\t'); + return JSON.stringify(template, undefined, "\t"); }; templateFunction.customPath = ".releaseconfig.json"; diff --git a/templates/_vscode/extensions.json.ts b/templates/_vscode/extensions.json.ts index 1d2a37297..a96c4631e 100644 --- a/templates/_vscode/extensions.json.ts +++ b/templates/_vscode/extensions.json.ts @@ -2,16 +2,17 @@ import * as JSON5 from "json5"; import type { TemplateFunction } from "../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const useESLint = answers.tools && answers.tools.indexOf("ESLint") > -1; const usePrettier = answers.tools && answers.tools.indexOf("Prettier") > -1; const useOfficialESLintConfig = useESLint && answers.eslintConfig === "official"; const useTypeScript = answers.language === "TypeScript"; - + // Include prettier-vscode for TypeScript when using official ESLint config const includePrettierExtension = usePrettier || (useOfficialESLintConfig && useTypeScript); - if (!useESLint && !includePrettierExtension) return; + if (!useESLint && !includePrettierExtension) { + return; + } const template = ` { @@ -21,7 +22,7 @@ const templateFunction: TemplateFunction = answers => { ] } `; -return JSON.stringify(JSON5.parse(template), null, 4); + return JSON.stringify(JSON5.parse(template), null, 4); }; templateFunction.customPath = ".vscode/extensions.json"; diff --git a/templates/_vscode/launch.json.ts b/templates/_vscode/launch.json.ts index fea149d25..df00cded1 100644 --- a/templates/_vscode/launch.json.ts +++ b/templates/_vscode/launch.json.ts @@ -2,9 +2,10 @@ import * as JSON5 from "json5"; import type { TemplateFunction } from "../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const devcontainer = answers.tools && answers.tools.includes("devcontainer"); - if (!devcontainer) return; + if (!devcontainer) { + return; + } const template = ` { @@ -19,13 +20,13 @@ const templateFunction: TemplateFunction = answers => { "name": "Launch ioBroker Adapter", "skipFiles": ["/**"], "args": ["--debug", "0", "--logs"], - "program": "$\{workspaceFolder\}/main.js", + "program": "$\{workspaceFolder}/main.js", "console": "integratedTerminal", } ] } `; -return JSON.stringify(JSON5.parse(template), null, 4); + return JSON.stringify(JSON5.parse(template), null, 4); }; templateFunction.customPath = ".vscode/launch.json"; diff --git a/templates/_vscode/settings.json.ts b/templates/_vscode/settings.json.ts index b2d0ade4b..ecd859a0b 100644 --- a/templates/_vscode/settings.json.ts +++ b/templates/_vscode/settings.json.ts @@ -2,28 +2,37 @@ import * as JSON5 from "json5"; import type { TemplateFunction } from "../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const useESLint = answers.tools && answers.tools.indexOf("ESLint") > -1; const usePrettier = answers.tools && answers.tools.indexOf("Prettier") > -1; const useTypeScript = answers.language === "TypeScript"; - if (!useESLint && !usePrettier && !useTypeScript) return; + if (!useESLint && !usePrettier && !useTypeScript) { + return; + } const template = ` { ${useTypeScript ? `"typescript.tsdk": "node_modules/typescript/lib",` : ""} ${useESLint ? `"eslint.enable": true,` : ""} -${usePrettier ? (` +${ + usePrettier + ? ` "editor.formatOnSave": true, "editor.defaultFormatter": "esbenp.prettier-vscode", - ${useTypeScript ? (` + ${ + useTypeScript + ? ` "[typescript]": { "editor.codeActionsOnSave": { "source.organizeImports": true }, }, - `) : ""} -`) : ""} + ` + : "" + } +` + : "" +} "json.schemas": [ { "fileMatch": ["io-package.json"], @@ -43,7 +52,7 @@ ${usePrettier ? (` ], } `; -return JSON.stringify(JSON5.parse(template), null, 4); + return JSON.stringify(JSON5.parse(template), null, 4); }; templateFunction.customPath = ".vscode/settings.json"; diff --git a/templates/admin/_eslintrc_js_react.json.ts b/templates/admin/_eslintrc_js_react.json.ts index 2ac0ba133..0a1162039 100644 --- a/templates/admin/_eslintrc_js_react.json.ts +++ b/templates/admin/_eslintrc_js_react.json.ts @@ -1,11 +1,11 @@ import type { TemplateFunction } from "../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const useTypeScript = answers.language === "TypeScript"; - const useReact = - answers.adminUi === "react" || answers.tabReact === "yes"; - if (useTypeScript || !useReact) return; + const useReact = answers.adminUi === "react" || answers.tabReact === "yes"; + if (useTypeScript || !useReact) { + return; + } const template = ` { diff --git a/templates/admin/admin.dts.ts b/templates/admin/admin.dts.ts index d1f44bbc8..3320abd7e 100644 --- a/templates/admin/admin.dts.ts +++ b/templates/admin/admin.dts.ts @@ -1,14 +1,16 @@ -import { readFile, TemplateFunction } from "../../src/lib/createAdapter"; +import type { TemplateFunction } from "../../src/lib/createAdapter"; +import { readFile } from "../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const useTypeScript = answers.language === "TypeScript"; const hasTab = answers.adminFeatures && answers.adminFeatures.indexOf("tab") > -1; const useAdminHtml = answers.adminUi === "html"; const useTabReact = hasTab && answers.tabReact === "yes"; const useTypeChecking = answers.tools && answers.tools.indexOf("type checking") > -1; const hasHtml = useAdminHtml || (hasTab && !useTabReact); - if (!hasHtml || (!useTypeScript && !useTypeChecking)) return; + if (!hasHtml || (!useTypeScript && !useTypeChecking)) { + return; + } return readFile("admin.raw.d.ts", __dirname); }; diff --git a/templates/admin/admin.raw.d.ts b/templates/admin/admin.raw.d.ts index 41f934f4c..7594b9e3a 100644 --- a/templates/admin/admin.raw.d.ts +++ b/templates/admin/admin.raw.d.ts @@ -11,11 +11,18 @@ interface Window { declare const instance: number; declare const adapter: string; -/** Translates text */ +/** + * Translates text + * + * @param text + * @param arg1 + * @param arg2 + * @param arg3 + */ declare function _(text: string, arg1?: string, arg2?: string, arg3?: string): string; declare const socket: ioBrokerSocket; declare function sendTo( - instance: any | null, + instance: any, command: string, message: any, callback: (result: SendToResult) => void | Promise, @@ -28,49 +35,20 @@ interface SendToResult { // tslint:disable-next-line:class-name interface ioBrokerSocket { - emit( - command: "subscribeObjects", - pattern: string, - callback?: (err?: string) => void | Promise, - ): void; - emit( - command: "subscribeStates", - pattern: string, - callback?: (err?: string) => void | Promise, - ): void; - emit( - command: "unsubscribeObjects", - pattern: string, - callback?: (err?: string) => void | Promise, - ): void; - emit( - command: "unsubscribeStates", - pattern: string, - callback?: (err?: string) => void | Promise, - ): void; + emit(command: "subscribeObjects", pattern: string, callback?: (err?: string) => void | Promise): void; + emit(command: "subscribeStates", pattern: string, callback?: (err?: string) => void | Promise): void; + emit(command: "unsubscribeObjects", pattern: string, callback?: (err?: string) => void | Promise): void; + emit(command: "unsubscribeStates", pattern: string, callback?: (err?: string) => void | Promise): void; emit( event: "getObjectView", view: "system", type: "device", options: ioBroker.GetObjectViewParams, - callback: ( - err: string | undefined, - result?: any, - ) => void | Promise, - ): void; - emit( - event: "getStates", - callback: ( - err: string | undefined, - result?: Record, - ) => void, - ): void; - emit( - event: "getState", - id: string, - callback: (err: string | undefined, result?: ioBroker.State) => void, + callback: (err: string | undefined, result?: any) => void | Promise, ): void; + emit(event: "getStates", callback: (err: string | undefined, result?: Record) => void): void; + emit(event: "getState", id: string, callback: (err: string | undefined, result?: ioBroker.State) => void): void; emit( event: "setState", id: string, @@ -80,14 +58,8 @@ interface ioBrokerSocket { on(event: "objectChange", handler: ioBroker.ObjectChangeHandler): void; on(event: "stateChange", handler: ioBroker.StateChangeHandler): void; - removeEventHandler( - event: "objectChange", - handler: ioBroker.ObjectChangeHandler, - ): void; - removeEventHandler( - event: "stateChange", - handler: ioBroker.StateChangeHandler, - ): void; + removeEventHandler(event: "objectChange", handler: ioBroker.ObjectChangeHandler): void; + removeEventHandler(event: "stateChange", handler: ioBroker.StateChangeHandler): void; // TODO: other events } diff --git a/templates/admin/custom_m.html.ts b/templates/admin/custom_m.html.ts index a4fd71973..4ed6b712e 100644 --- a/templates/admin/custom_m.html.ts +++ b/templates/admin/custom_m.html.ts @@ -1,9 +1,10 @@ import type { TemplateFunction } from "../../src/lib/createAdapter"; export = (answers => { - const supportCustom = answers.adminFeatures && answers.adminFeatures.indexOf("custom") > -1; - if (!supportCustom) return; + if (!supportCustom) { + return; + } const template = ` ` : -` +${ + useReact + ? ` ` + : ` - `} + ` +} -${useReact ? "" : -` +${ + useReact + ? "" + : ` -`} +` +} -${useReact ? (` +${ + useReact + ? `
-`) : (` +` + : `
@@ -124,7 +137,8 @@ ${useReact ? (`
-`)} +` +} diff --git a/templates/admin/jsonConfig.json.ts b/templates/admin/jsonConfig.json.ts index 8591bb9fc..1f48020aa 100644 --- a/templates/admin/jsonConfig.json.ts +++ b/templates/admin/jsonConfig.json.ts @@ -1,4 +1,5 @@ -import { AdapterSettings, getDefaultAnswer } from "../../src/lib/core/questions"; +import type { AdapterSettings } from "../../src/lib/core/questions"; +import { getDefaultAnswer } from "../../src/lib/core/questions"; import type { TemplateFunction } from "../../src/lib/createAdapter"; function generateSetting(settings: AdapterSettings): any { @@ -12,35 +13,37 @@ function generateSetting(settings: AdapterSettings): any { sm: 12, md: 6, lg: 4, - xl: 4 - }; - } else { - return { - type: settings.inputType, - label: settings.label || settings.key, - newLine: true, - xs: 12, - sm: 12, - md: 6, - lg: 4, - xl: 4 + xl: 4, }; } + return { + type: settings.inputType, + label: settings.label || settings.key, + newLine: true, + xs: 12, + sm: 12, + md: 6, + lg: 4, + xl: 4, + }; } export = (answers => { - const isAdapter = answers.features.indexOf("adapter") > -1; - const useJsonConfig = answers.adminUi === 'json'; - if (!isAdapter || !useJsonConfig) return; + const useJsonConfig = answers.adminUi === "json"; + if (!isAdapter || !useJsonConfig) { + return; + } const adapterSettings: AdapterSettings[] = answers.adapterSettings ?? getDefaultAnswer("adapterSettings")!; const items = adapterSettings.reduce>( - (old, setting) => ({... old, [setting.key]: generateSetting(setting)}), {}) + (old, setting) => ({ ...old, [setting.key]: generateSetting(setting) }), + {}, + ); const config = { i18n: true, type: "panel", - items + items, }; return JSON.stringify(config, null, 4); }) as TemplateFunction; diff --git a/templates/admin/src/app.tsx_jsx.ts b/templates/admin/src/app.tsx_jsx.ts index 7310bb47d..01f2c96c2 100644 --- a/templates/admin/src/app.tsx_jsx.ts +++ b/templates/admin/src/app.tsx_jsx.ts @@ -1,10 +1,11 @@ import type { TemplateFunction } from "../../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const useTypeScript = answers.language === "TypeScript"; const useReact = answers.adminUi === "react"; - if (!useReact) return; + if (!useReact) { + return; + } const template = `/* eslint-disable @typescript-eslint/no-require-imports */ import React from "react"; @@ -12,18 +13,24 @@ import { ${useTypeScript ? "type Theme, type StyleRules, " : ""}withStyles } fro import GenericApp from "@iobroker/adapter-react/GenericApp"; import Settings from "./components/settings"; -${useTypeScript ? -`import type { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; -` : ""} -${useTypeScript ? -`const styles = (_theme: Theme): StyleRules => ({ +${ + useTypeScript + ? `import type { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; +` + : "" +} +${ + useTypeScript + ? `const styles = (_theme: Theme): StyleRules => ({ root: {}, -});` : `/** +});` + : `/** * @type {(_theme: import("@material-ui/core/styles").Theme) => import("@material-ui/styles").StyleRules} */ const styles = (_theme) => ({ root: {}, -});`} +});` +} class App extends GenericApp { constructor(props${useTypeScript ? ": GenericAppProps" : ""}) { @@ -51,7 +58,7 @@ class App extends GenericApp { // executed when connection is ready } - render()${useTypeScript ? ': Element' :''} { + render()${useTypeScript ? ": Element" : ""} { if (!this.state.loaded) { return super.render(); } @@ -72,10 +79,11 @@ class App extends GenericApp { export default withStyles(styles)(App); `; - return template;}; + return template; +}; -templateFunction.customPath = (answers) => { +templateFunction.customPath = answers => { const useTypeScript = answers.language === "TypeScript"; return `admin/src/app.${useTypeScript ? "tsx" : "jsx"}`; -} +}; export = templateFunction; diff --git a/templates/admin/src/components/settings.tsx_jsx.ts b/templates/admin/src/components/settings.tsx_jsx.ts index 082ddd31d..22cf48746 100644 --- a/templates/admin/src/components/settings.tsx_jsx.ts +++ b/templates/admin/src/components/settings.tsx_jsx.ts @@ -3,30 +3,34 @@ import type { TemplateFunction } from "../../../../src/lib/createAdapter"; function generateSettingsMethod(settings: AdapterSettings): string { if (settings.inputType === "select" && settings.options) { - const options = settings.options.map((opt) => ({ value: opt.value, title: opt.text })); + const options = settings.options.map(opt => ({ value: opt.value, title: opt.text })); return ` {renderSelect("${settings.label || settings.key}", "${settings.key}", ${JSON.stringify(options)})}`; } else if (settings.inputType === "checkbox") { return ` {this.renderCheckbox("${settings.label || settings.key}", "${settings.key}")}`; - } else { - return ` - {this.renderInput("${settings.label || settings.key}", "${settings.key}", "${settings.inputType}")}`; } + return ` + {this.renderInput("${settings.label || settings.key}", "${settings.key}", "${settings.inputType}")}`; } const templateFunction: TemplateFunction = answers => { - const useTypeScript = answers.language === "TypeScript"; const useReact = answers.adminUi === "react"; - if (!useReact) return; + if (!useReact) { + return; + } const adapterSettings: AdapterSettings[] = answers.adapterSettings ?? getDefaultAnswer("adapterSettings")!; const template = `import React from "react"; import { withStyles } from "@material-ui/core/styles"; -${useTypeScript ? `import type { CreateCSSProperties } from "@material-ui/core/styles/withStyles"; -` : ""}import TextField from "@material-ui/core/TextField"; +${ + useTypeScript + ? `import type { CreateCSSProperties } from "@material-ui/core/styles/withStyles"; +` + : "" +}import TextField from "@material-ui/core/TextField"; import Input from "@material-ui/core/Input"; import FormHelperText from "@material-ui/core/FormHelperText"; import FormControl from "@material-ui/core/FormControl"; @@ -36,9 +40,13 @@ import FormControlLabel from "@material-ui/core/FormControlLabel"; import Checkbox from "@material-ui/core/Checkbox"; import I18n from "@iobroker/adapter-react/i18n"; -${useTypeScript ? "" : `/** +${ + useTypeScript + ? "" + : `/** * @type {() => Record} - */`} + */` +} const styles = ()${useTypeScript ? ": Record" : ""} => ({ input: { marginTop: 0, @@ -72,8 +80,9 @@ const styles = ()${useTypeScript ? ": Record" : ""} }, }); -${useTypeScript ? -`interface SettingsProps { +${ + useTypeScript + ? `interface SettingsProps { classes: Record; native: Record; @@ -83,7 +92,8 @@ ${useTypeScript ? interface SettingsState { // add your state properties here dummy?: undefined; -}` : `/** +}` + : `/** * @typedef {object} SettingsProps * @property {Record} classes * @property {Record} native @@ -93,23 +103,32 @@ interface SettingsState { /** * @typedef {object} SettingsState * @property {undefined} [dummy] Delete this and add your own state properties here - */`} + */` +} -${useTypeScript ? "" : `/** +${ + useTypeScript + ? "" + : `/** * @extends {React.Component} */ -`}class Settings extends React.Component${useTypeScript ? "" : ""} { +` +}class Settings extends React.Component${useTypeScript ? "" : ""} { constructor(props${useTypeScript ? ": SettingsProps" : ""}) { super(props); this.state = {}; } - ${useTypeScript ? `renderInput(title: AdminWord, attr: string, type: string): React.JSX.Element` : `/** + ${ + useTypeScript + ? `renderInput(title: AdminWord, attr: string, type: string): React.JSX.Element` + : `/** * @param {AdminWord} title * @param {string} attr * @param {string} type */ - renderInput(title, attr, type)`} { + renderInput(title, attr, type)` + } { return ( ${adapterSettings.map(generateSettingsMethod).join("\n\t\t\t\t
")} @@ -205,8 +232,8 @@ export default withStyles(styles)(Settings); return template; }; -templateFunction.customPath = (answers) => { +templateFunction.customPath = answers => { const useTypeScript = answers.language === "TypeScript"; return `admin/src/components/settings.${useTypeScript ? "tsx" : "jsx"}`; -} +}; export = templateFunction; diff --git a/templates/admin/src/i18n/i18n.dts.ts b/templates/admin/src/i18n/i18n.dts.ts index 7ea5827f9..13a2c1d1c 100644 --- a/templates/admin/src/i18n/i18n.dts.ts +++ b/templates/admin/src/i18n/i18n.dts.ts @@ -1,14 +1,16 @@ import type { TemplateFunction } from "../../../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const useTypeScript = answers.language === "TypeScript"; const useTypeChecking = answers.tools?.includes("type checking"); - if (!useTypeScript && !useTypeChecking) return; - - const useReact = - answers.adminUi === "react" || answers.tabReact === "yes"; - if (!useReact) return; + if (!useTypeScript && !useTypeChecking) { + return; + } + + const useReact = answers.adminUi === "react" || answers.tabReact === "yes"; + if (!useReact) { + return; + } const template = `/* * This file loads the translations keys from \`i18n/en.json\` file and overrides diff --git a/templates/admin/src/index.tsx_jsx.ts b/templates/admin/src/index.tsx_jsx.ts index b862b7d7e..bbb6dd836 100644 --- a/templates/admin/src/index.tsx_jsx.ts +++ b/templates/admin/src/index.tsx_jsx.ts @@ -1,10 +1,11 @@ import type { TemplateFunction } from "../../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const useTypeScript = answers.language === "TypeScript"; const useReact = answers.adminUi === "react"; - if (!useReact) return; + if (!useReact) { + return; + } const template = `import React from "react"; import ReactDOM from "react-dom"; @@ -35,8 +36,8 @@ build(); return template; }; -templateFunction.customPath = (answers) => { +templateFunction.customPath = answers => { const useTypeScript = answers.language === "TypeScript"; return `admin/src/index.${useTypeScript ? "tsx" : "jsx"}`; -} +}; export = templateFunction; diff --git a/templates/admin/src/tab-app.tsx_jsx.ts b/templates/admin/src/tab-app.tsx_jsx.ts index eceba1a61..1a81bd15d 100644 --- a/templates/admin/src/tab-app.tsx_jsx.ts +++ b/templates/admin/src/tab-app.tsx_jsx.ts @@ -1,28 +1,35 @@ import type { TemplateFunction } from "../../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const useTypeScript = answers.language === "TypeScript"; const useReact = answers.tabReact === "yes"; - if (!useReact) return; + if (!useReact) { + return; + } const template = `/* eslint-disable @typescript-eslint/no-require-imports */ import React from "react"; import { ${useTypeScript ? "type Theme, type StyleRules, " : ""}withStyles } from "@material-ui/core/styles"; import GenericApp from "@iobroker/adapter-react/GenericApp"; -${useTypeScript ? -`import type { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; -` : ""} -${useTypeScript ? -`const styles = (_theme: Theme): StyleRules => ({ +${ + useTypeScript + ? `import type { GenericAppProps, GenericAppSettings } from "@iobroker/adapter-react/types"; +` + : "" +} +${ + useTypeScript + ? `const styles = (_theme: Theme): StyleRules => ({ root: {}, -});` : `/** +});` + : `/** * @type {(_theme: Theme) => import("@material-ui/styles").StyleRules} */ const styles = (_theme) => ({ root: {}, -});`} +});` +} class TabApp extends GenericApp { constructor(props${useTypeScript ? ": GenericAppProps" : ""}) { @@ -51,7 +58,7 @@ class TabApp extends GenericApp { // executed when connection is ready } - render()${useTypeScript ? ': React.JSX.Element' :''} { + render()${useTypeScript ? ": React.JSX.Element" : ""} { if (!this.state.loaded) { return super.render(); } @@ -68,10 +75,11 @@ class TabApp extends GenericApp { export default withStyles(styles)(TabApp); `; - return template;}; + return template; +}; -templateFunction.customPath = (answers) => { +templateFunction.customPath = answers => { const useTypeScript = answers.language === "TypeScript"; return `admin/src/tab-app.${useTypeScript ? "tsx" : "jsx"}`; -} +}; export = templateFunction; diff --git a/templates/admin/src/tab.tsx_jsx.ts b/templates/admin/src/tab.tsx_jsx.ts index 1c3e5ac27..c31ff9840 100644 --- a/templates/admin/src/tab.tsx_jsx.ts +++ b/templates/admin/src/tab.tsx_jsx.ts @@ -1,10 +1,11 @@ import type { TemplateFunction } from "../../../src/lib/createAdapter"; const templateFunction: TemplateFunction = answers => { - const useTypeScript = answers.language === "TypeScript"; const useReact = answers.tabReact === "yes"; - if (!useReact) return; + if (!useReact) { + return; + } const template = `import React from "react"; import ReactDOM from "react-dom"; @@ -35,8 +36,8 @@ build(); return template; }; -templateFunction.customPath = (answers) => { +templateFunction.customPath = answers => { const useTypeScript = answers.language === "TypeScript"; return `admin/src/tab.${useTypeScript ? "tsx" : "jsx"}`; -} +}; export = templateFunction; diff --git a/templates/admin/style.css.ts b/templates/admin/style.css.ts index ce1d96a57..7ce5d58ee 100644 --- a/templates/admin/style.css.ts +++ b/templates/admin/style.css.ts @@ -1,11 +1,13 @@ -import { readFile, TemplateFunction } from "../../src/lib/createAdapter"; +import type { TemplateFunction } from "../../src/lib/createAdapter"; +import { readFile } from "../../src/lib/createAdapter"; export = (answers => { - const isAdapter = answers.features.indexOf("adapter") > -1; - const useJsonConfig = answers.adminUi === 'json'; - const noConfig = answers.adminUi === 'none'; - if (!isAdapter || useJsonConfig || noConfig) return; + const useJsonConfig = answers.adminUi === "json"; + const noConfig = answers.adminUi === "none"; + if (!isAdapter || useJsonConfig || noConfig) { + return; + } return readFile("style.raw.css", __dirname); }) as TemplateFunction; diff --git a/templates/admin/tab_m.html.ts b/templates/admin/tab_m.html.ts index 7d58d9257..01beab8dc 100644 --- a/templates/admin/tab_m.html.ts +++ b/templates/admin/tab_m.html.ts @@ -2,9 +2,10 @@ import { getIconName } from "../../src/lib/core/questions"; import type { TemplateFunction } from "../../src/lib/createAdapter"; export = (answers => { - const supportTab = answers.adminFeatures && answers.adminFeatures.indexOf("tab") > -1; - if (!supportTab) return; + if (!supportTab) { + return; + } const useReact = answers.tabReact === "yes"; @@ -12,9 +13,10 @@ export = (answers => { -${useReact ? -` ` : -` +${ + useReact + ? ` ` + : ` @@ -30,18 +32,22 @@ ${useReact ? .m span{ font-size: 0.9em; } - `} + ` +} -${useReact ? ` +${ + useReact + ? `
-` : ` +` + : `