diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..849ddff --- /dev/null +++ b/.eslintignore @@ -0,0 +1 @@ +dist/ diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 0000000..97d8597 --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,356 @@ +"use strict"; +module.exports = { + "plugins": [ + "node", + ], + "env": { + "node": true, + "commonjs": true, + "es6": true, + }, + "parserOptions": { + "ecmaVersion": 11, + }, + + "overrides": [ + { + "files": ["test/**/*.js"], + "env": { + "mocha": "true", + }, + "rules": { + "prefer-arrow-callback": "off", + "no-invalid-this": "off", + "node/no-unpublished-import": "off", + "node/no-unpublished-require": "off", + }, + }, + { + "files": ["web/**/*.jsx"], + "env": { + "browser": true, + }, + "parserOptions": { + "sourceType": "module", + "ecmaFeatures": { + "jsx": true, + }, + }, + "rules": { + "node/callback-return": "off", + "node/exports-style": "off", + "node/file-extension-in-import": "off", + "node/global-require": "off", + "node/handle-callback-err": "off", + "node/no-callback-literal": "off", + "node/no-deprecated-api": "off", + "node/no-exports-assign": "off", + "node/no-extraneous-import": "off", + "node/no-extraneous-require": "off", + "node/no-missing-import": "off", + "node/no-missing-require": "off", + "node/no-mixed-requires": "off", + "node/no-new-require": "off", + "node/no-path-concat": "off", + "node/no-process-env": "off", + "node/no-process-exit": "off", + "node/no-restricted-require": "off", + "node/no-sync": "off", + "node/no-unpublished-bin": "off", + "node/no-unpublished-import": "off", + "node/no-unpublished-require": "off", + "node/no-unsupported-features/es-builtins": "off", + "node/no-unsupported-features/es-syntax": "off", + "node/no-unsupported-features/node-builtins": "off", + "node/prefer-global/buffer": "off", + "node/prefer-global/console": "off", + "node/prefer-global/process": "off", + "node/prefer-global/text-decoder": "off", + "node/prefer-global/text-encoder": "off", + "node/prefer-global/url-search-params": "off", + "node/prefer-global/url": "off", + "node/prefer-promises/dns": "off", + "node/prefer-promises/fs": "off", + "node/process-exit-as-throw": "off", + "node/shebang": "off", + }, + }, + ], + + "rules": { + "accessor-pairs": "error", + "array-bracket-newline": "off", + "array-bracket-spacing": ["error", "never"], + "array-callback-return": "error", + "array-element-newline": "off", + "arrow-body-style": "error", + "arrow-parens": "off", + "arrow-spacing": ["error", { "after": true, "before": true }], + "block-scoped-var": "error", + "block-spacing": "error", + "brace-style": ["error", "1tbs", { "allowSingleLine": true }], + "camelcase": "off", + "capitalized-comments": "off", + "class-methods-use-this": "off", + "comma-dangle": [ + "error", + { + "arrays": "always-multiline", + "objects": "always-multiline", + "imports": "always-multiline", + "exports": "always-multiline", + "functions": "only-multiline", + }, + ], + "comma-spacing": "error", + "comma-style": ["error", "last"], + "complexity": "error", + "computed-property-spacing": ["error", "never"], + "consistent-return": "error", + "consistent-this": "error", + "curly": "error", + "default-case": "error", + "default-case-last": "error", + "default-param-last": "error", + "dot-location": ["error", "property"], + "dot-notation": ["error", { "allowPattern": "^[a-z]+(_[a-z]+)*$" }], + "eol-last": "error", + "eqeqeq": "error", + "func-call-spacing": "error", + "func-name-matching": "error", + "func-names": "off", + "func-style": ["error", "declaration"], + "function-call-argument-newline": "off", + "function-paren-newline": "off", + "generator-star-spacing": ["error", { "before": false, "after": true }], + "grouped-accessor-pairs": "error", + "guard-for-in": "error", + "id-blacklist": "error", + "id-length": "off", + "id-match": "error", + "implicit-arrow-linebreak": "error", + "indent": ["error", "tab", { "SwitchCase": 1 }], + "indent-legacy": "off", + "init-declarations": "off", + "jsx-quotes": "error", + "key-spacing": "error", + "keyword-spacing": "error", + "line-comment-position": "off", + "linebreak-style": ["error", "unix"], + "lines-around-comment": "off", + "lines-around-directive": "off", + "lines-between-class-members": ["error", "always"], + "max-classes-per-file": "off", + "max-depth": "error", + "max-len": ["error", { "code": 120 }], + "max-lines": "off", + "max-lines-per-function": "off", + "max-nested-callbacks": "error", + "max-params": "off", + "max-statements": "off", + "max-statements-per-line": "off", + "multiline-comment-style": ["error", "separate-lines"], + "multiline-ternary": "off", + "new-cap": "error", + "new-parens": "error", + "newline-after-var": "off", + "newline-before-return": "off", + "newline-per-chained-call": "off", + "no-alert": "error", + "no-array-constructor": "error", + "no-await-in-loop": "off", + "no-bitwise": "off", + "no-buffer-constructor": "error", + "no-caller": "error", + "no-catch-shadow": "error", + "no-confusing-arrow": "error", + "no-console": "error", + "no-constant-condition": ["error", { "checkLoops": false }], + "no-constructor-return": "error", + "no-continue": "off", + "no-div-regex": "error", + "no-duplicate-imports": "error", + "no-else-return": "error", + "no-empty-function": "off", + "no-eq-null": "error", + "no-eval": "error", + "no-extend-native": "error", + "no-extra-bind": "error", + "no-extra-label": "error", + "no-extra-parens": "off", + "no-floating-decimal": "error", + "no-implicit-coercion": "error", + "no-implicit-globals": "error", + "no-implied-eval": "error", + "no-inline-comments": "off", + "no-invalid-this": "error", + "no-iterator": "error", + "no-label-var": "error", + "no-lone-blocks": "error", + "no-lonely-if": "error", + "no-loop-func": "error", + "no-magic-numbers": "off", + "no-mixed-operators": [ + "error", + { + "groups": [ + ["&", "|", "^", "~", "<<", ">>", ">>>"], + ["==", "!=", "===", "!==", ">", ">=", "<", "<="], + ["in", "instanceof"], + ], + }, + ], + "no-multi-assign": "error", + "no-multi-spaces": "error", + "no-multi-str": "error", + "no-multiple-empty-lines": "error", + "no-native-reassign": "error", + "no-negated-condition": "off", + "no-negated-in-lhs": "error", + "no-nested-ternary": "error", + "no-new": "error", + "no-new-func": "error", + "no-new-object": "error", + "no-new-wrappers": "error", + "no-octal-escape": "error", + "no-param-reassign": "off", + "no-plusplus": ["error", { "allowForLoopAfterthoughts": true }], + "no-proto": "error", + "no-restricted-exports": "error", + "no-restricted-globals": "error", + "no-restricted-imports": "error", + "no-restricted-properties": "error", + "no-restricted-syntax": "error", + "no-return-assign": "error", + "no-return-await": "off", + "no-script-url": "error", + "no-self-compare": "error", + "no-sequences": "error", + "no-shadow": ["error", { "allow": ["yargs"] }], + "no-spaced-func": "error", + "no-tabs": ["error", { "allowIndentationTabs": true }], + "no-template-curly-in-string": "error", + "no-ternary": "off", + "no-throw-literal": "error", + "no-trailing-spaces": "error", + "no-undef-init": "error", + "no-undefined": "off", + "no-unmodified-loop-condition": "error", + "no-unneeded-ternary": "error", + "no-unused-expressions": "error", + "no-use-before-define": "error", + "no-useless-backreference": "error", + "no-useless-call": "error", + "no-useless-computed-key": "error", + "no-useless-concat": "error", + "no-useless-constructor": "error", + "no-useless-rename": "error", + "no-useless-return": "error", + "no-var": "error", + "no-void": ["error", { "allowAsStatement": true }], + "no-warning-comments": "off", + "no-whitespace-before-property": "error", + "nonblock-statement-body-position": "error", + "object-curly-newline": "error", + "object-curly-spacing": "off", + "object-shorthand": "off", + "one-var": "off", + "one-var-declaration-per-line": "error", + "operator-assignment": "off", + "operator-linebreak": ["error", "after", { + "overrides": { + "?": "before", + ":": "before", + "||": "before", + "&&": "before", + }, + }], + "padded-blocks": "off", + "padding-line-between-statements": "error", + "prefer-arrow-callback": "error", + "prefer-const": "off", + "prefer-destructuring": "off", + "prefer-exponentiation-operator": "error", + "prefer-named-capture-group": "off", + "prefer-numeric-literals": "error", + "prefer-object-spread": "error", + "prefer-promise-reject-errors": "error", + "prefer-reflect": "off", + "prefer-regex-literals": "error", + "prefer-rest-params": "error", + "prefer-spread": "error", + "prefer-template": "error", + "quote-props": "off", + "quotes": ["error", "double", { "avoidEscape": true }], + "radix": ["error", "always"], + "require-atomic-updates": "off", // XXX Not sure why this triggers on process.title = ... + "require-await": "off", + "require-jsdoc": "off", + "require-unicode-regexp": "off", + "rest-spread-spacing": ["error", "never"], + "semi": "error", + "semi-spacing": "error", + "semi-style": "off", + "sort-imports": "off", + "sort-keys": "off", + "sort-vars": "error", + "space-before-blocks": "error", + "space-before-function-paren": "off", + "space-in-parens": ["error", "never"], + "space-infix-ops": "off", + "space-unary-ops": "error", + "spaced-comment": ["error", "always"], + "strict": "error", + "switch-colon-spacing": "error", + "symbol-description": "error", + "template-curly-spacing": ["error", "never"], + "template-tag-spacing": "error", + "unicode-bom": ["error", "never"], + "valid-jsdoc": ["error", { "requireReturn": false }], + "vars-on-top": "error", + "wrap-iife": "error", + "wrap-regex": "off", + "yield-star-spacing": "error", + "yoda": ["error", "never", { "exceptRange": true }], + + "node/callback-return": "off", + "node/exports-style": "off", + "node/file-extension-in-import": "off", + "node/global-require": "error", + "node/handle-callback-err": "error", + "node/no-callback-literal": "error", + "node/no-deprecated-api": "error", + "node/no-exports-assign": "error", + "node/no-extraneous-import": "error", + "node/no-extraneous-require": "error", + "node/no-missing-import": "error", + "node/no-missing-require": "error", + "node/no-mixed-requires": "error", + "node/no-new-require": "error", + "node/no-path-concat": "error", + "node/no-process-env": "error", + "node/no-process-exit": "error", + "node/no-restricted-require": "off", + "node/no-sync": "error", + "node/no-unpublished-bin": "error", + "node/no-unpublished-import": "error", + "node/no-unpublished-require": [ + "error", + { "allowModules": ["webpack", "webpack-merge", "webpack-dev-middleware"] }, + ], + "node/no-unsupported-features/es-builtins": "error", + "node/no-unsupported-features/es-syntax": "error", + "node/no-unsupported-features/node-builtins": "error", + "node/prefer-global/buffer": "error", + "node/prefer-global/console": "error", + "node/prefer-global/process": "error", + "node/prefer-global/text-decoder": "error", + "node/prefer-global/text-encoder": "error", + "node/prefer-global/url-search-params": "error", + "node/prefer-global/url": "error", + "node/prefer-promises/dns": "off", + "node/prefer-promises/fs": "off", + "node/process-exit-as-throw": "error", + "node/shebang": "error", + }, +}; diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..43bac01 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,31 @@ +name: CI + +on: + push: + pull_request: + + workflow_dispatch: + +jobs: + jslint: + name: Eslint + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - uses: actions/setup-node@v2 + with: + node-version: 16.x + - run: npm i --no-optional + - run: npm i eslint eslint-plugin-node + - run: npm run lint + lualint: + name: Luacheck + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - uses: nebularg/actions-luacheck@v1.1.0 + with: + files: module/ + annotate: "error" diff --git a/.github/workflows/lua.yml b/.github/workflows/lua.yml deleted file mode 100644 index e02f886..0000000 --- a/.github/workflows/lua.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: lua check - -on: - push: - pull_request: - - workflow_dispatch: - -jobs: - lualint: - runs-on: ubuntu-latest - - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - - uses: nebularg/actions-luacheck@v1.1.0 - with: - files: module/ - annotate: "error" diff --git a/info.js b/info.js index 3a378de..24cbcf2 100644 --- a/info.js +++ b/info.js @@ -122,7 +122,7 @@ module.exports = { type: "array", items: { type: "array", items: { type: "number" }, - } + }, }, edges: { type: "array", diff --git a/master.js b/master.js index 489c5a0..fb73257 100644 --- a/master.js +++ b/master.js @@ -68,31 +68,29 @@ class MasterPlugin extends libPlugin.BaseMasterPlugin { async getMapDataRequestHandler(message) { const instances = [...this.master.instances]; return { - map_data: instances.map(instance => { - return { - instance_id: instance[1].config.get("instance.id"), - center: [ - (instance[1].config.get("gridworld.grid_x_position") - 1) * instance[1].config.get("gridworld.grid_x_size") + instance[1].config.get("gridworld.grid_x_size") / 2, - (instance[1].config.get("gridworld.grid_y_position") - 1) * instance[1].config.get("gridworld.grid_y_size") + instance[1].config.get("gridworld.grid_y_size") / 2 + map_data: instances.map(instance => ({ + instance_id: instance[1].config.get("instance.id"), + center: [ + (instance[1].config.get("gridworld.grid_x_position") - 1) * instance[1].config.get("gridworld.grid_x_size") + instance[1].config.get("gridworld.grid_x_size") / 2, + (instance[1].config.get("gridworld.grid_y_position") - 1) * instance[1].config.get("gridworld.grid_y_size") + instance[1].config.get("gridworld.grid_y_size") / 2, + ], + bounds: [ + [ // Top left + (instance[1].config.get("gridworld.grid_x_position") - 1) * instance[1].config.get("gridworld.grid_x_size"), + (instance[1].config.get("gridworld.grid_y_position") - 1) * instance[1].config.get("gridworld.grid_y_size"), + ], [ // Bottom left + (instance[1].config.get("gridworld.grid_x_position") - 1) * instance[1].config.get("gridworld.grid_x_size"), + instance[1].config.get("gridworld.grid_y_position") * instance[1].config.get("gridworld.grid_y_size"), + ], [ // Bottom right + instance[1].config.get("gridworld.grid_x_position") * instance[1].config.get("gridworld.grid_x_size"), + instance[1].config.get("gridworld.grid_y_position") * instance[1].config.get("gridworld.grid_y_size"), + ], [ // Top right + instance[1].config.get("gridworld.grid_x_position") * instance[1].config.get("gridworld.grid_x_size"), + (instance[1].config.get("gridworld.grid_y_position") - 1) * instance[1].config.get("gridworld.grid_y_size"), ], - bounds: [ - [ // Top left - (instance[1].config.get("gridworld.grid_x_position") - 1) * instance[1].config.get("gridworld.grid_x_size"), - (instance[1].config.get("gridworld.grid_y_position") - 1) * instance[1].config.get("gridworld.grid_y_size") - ], [ // Bottom left - (instance[1].config.get("gridworld.grid_x_position") - 1) * instance[1].config.get("gridworld.grid_x_size"), - instance[1].config.get("gridworld.grid_y_position") * instance[1].config.get("gridworld.grid_y_size") - ], [ // Bottom right - instance[1].config.get("gridworld.grid_x_position") * instance[1].config.get("gridworld.grid_x_size"), - instance[1].config.get("gridworld.grid_y_position") * instance[1].config.get("gridworld.grid_y_size") - ], [ // Top right - instance[1].config.get("gridworld.grid_x_position") * instance[1].config.get("gridworld.grid_x_size"), - (instance[1].config.get("gridworld.grid_y_position") - 1) * instance[1].config.get("gridworld.grid_y_size") - ] - ], - edges: instance[1].config.get("edge_transports.internal").edges, - } - }) + ], + edges: instance[1].config.get("edge_transports.internal").edges, + })), }; } diff --git a/package.json b/package.json index 28a253a..65f46d8 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "repository": "Danielv123/gridworld", "scripts": { "build": "webpack-cli --env production", + "lint": "eslint \"*.js\" src web", "test": "echo \"Error: run tests from root\" && exit 1" }, "bugs": { diff --git a/web/components/GridVisualizer.jsx b/web/components/GridVisualizer.jsx index 9f6fa38..2aafda6 100644 --- a/web/components/GridVisualizer.jsx +++ b/web/components/GridVisualizer.jsx @@ -35,24 +35,23 @@ function GridVisualizer(props) { attributionControl={false} bounds={getBounds(mapData.map_data?.map?.(instance => instance.bounds.map(position => [-1 * position[1] / 100, position[0] / 100])).flat() ?? [])} > - {mapData?.map_data?.map?.(instance => -
This plugin handles creation, configuration and management of gridworlds.