@kravc/serverless 0.10.1 → 0.11.0

package/bin/build.js

@@ -1,19 +1,19 @@
 #!/usr/bin/env node
 
-'use strict'
+'use strict';
 
-const fs        = require('fs')
-const config    = require('config')
-const { dump }  = require('js-yaml')
-const { build } = require('../src')
+const fs = require('fs');
+const config = require('config');
+const { dump } = require('js-yaml');
+const { build } = require('../src');
 
 const main = () => {
-  const input = JSON.parse(JSON.stringify(config))
+  const input = JSON.parse(JSON.stringify(config));
 
-  const result = build(input)
-  const yaml   = dump(result)
+  const result = build(input);
+  const yaml = dump(result);
 
-  fs.writeFileSync('serverless.yaml', yaml)
-}
+  fs.writeFileSync('serverless.yaml', yaml);
+};
 
-main()
+main();

package/eslint.config.mjs

@@ -1,55 +1,19 @@
-import globals from "globals";
-import path from "node:path";
-import { fileURLToPath } from "node:url";
-import js from "@eslint/js";
-import { FlatCompat } from "@eslint/eslintrc";
+import eslint from '@eslint/js';
+import globals from 'globals';
+import { globalIgnores, defineConfig } from 'eslint/config';
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
-const compat = new FlatCompat({
-    baseDirectory: __dirname,
-    recommendedConfig: js.configs.recommended,
-    allConfig: js.configs.all
-});
-
-export default [...compat.extends("eslint:recommended"), {
+export default defineConfig(
+  globalIgnores([ '**/dist/', '**/coverage/' ]),
+  {
     languageOptions: {
-        globals: {
-            ...globals.node,
-            ...globals.mocha,
-        },
-
-        ecmaVersion: 2018,
-        sourceType: "commonjs",
+      globals: {
+        ...globals.node,
+      },
     },
-
     rules: {
-        "comma-style": "error",
-        "consistent-this": ["error", "_this"],
-
-        indent: ["error", 2, {
-            SwitchCase: 1,
-            VariableDeclarator: 2,
-        }],
-
-        "keyword-spacing": "error",
-        "no-multi-spaces": "off",
-        "no-spaced-func": "error",
-        "no-trailing-spaces": "error",
-        quotes: ["error", "single"],
-        semi: ["error", "never"],
-        curly: ["error"],
-        "prefer-arrow-callback": "error",
-        "space-before-blocks": "error",
-
-        "space-before-function-paren": [1, {
-            anonymous: "always",
-            named: "never",
-        }],
-
-        "space-infix-ops": "error",
-        "space-unary-ops": "error",
-        "no-return-await": "error",
-        eqeqeq: "error",
+      semi: ['error', 'always'],
+      quotes: ['error', 'single'],
     },
-}];
+  },
+  eslint.configs.recommended,
+);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kravc/serverless",
-  "version": "0.10.1",
+  "version": "0.11.0",
   "description": "Serverless configuration builder and deployment tool for @kravc/dos service.",
   "main": "src/index.js",
   "repository": {
@@ -8,7 +8,7 @@
     "url": "http://github.com/alexkravets/serverless.git"
   },
   "scripts": {
-    "test": "eslint src/ test/ && NODE_PATH=./ nyc --reporter text mocha --exit"
+    "test": "eslint --fix src/ bin/"
   },
   "bin": {
     "build": "bin/build.js",
@@ -19,18 +19,14 @@
   "author": "Alexander Kravets <a@kra.vc>",
   "license": "ISC",
   "dependencies": {
-    "config": "^4.1.0",
-    "js-yaml": "^4.1.0",
-    "lodash": "^4.17.21",
-    "serverless": "^3.39.0"
+    "config": "^4.3.0",
+    "js-yaml": "^4.1.1",
+    "lodash": "^4.17.23",
+    "serverless": "^3.40.0-19128fad"
   },
   "devDependencies": {
-    "@eslint/eslintrc": "^3.2.0",
-    "@eslint/js": "^9.15.0",
-    "chai": "^5.1.2",
-    "eslint": "^9.15.0",
-    "globals": "^15.12.0",
-    "mocha": "^10.8.2",
-    "nyc": "^17.1.0"
+    "@eslint/js": "^10.0.1",
+    "eslint": "^10.0.0",
+    "globals": "^17.3.0"
   }
 }

package/src/build.js

@@ -1,25 +1,25 @@
-'use strict'
+'use strict';
 
-const { get } = require('lodash')
+const { get } = require('lodash');
 
-const NODE_ENV  = process.env.NODE_ENV || 'serverless'
-const INSTANCE  = process.env.NODE_APP_INSTANCE || 'localhost'
-const ROOT_PATH = process.cwd()
+const NODE_ENV  = process.env.NODE_ENV || 'serverless';
+const INSTANCE  = process.env.NODE_APP_INSTANCE || 'localhost';
+const ROOT_PATH = process.cwd();
 
-const { name, version } = require(`${ROOT_PATH}/package.json`)
-const [ MAJOR_VERSION ] = version.split('.')
-const DEFAULT_SERVICE   = name.replace('@', '').replace('/', '-') + `-v${MAJOR_VERSION}`
-const DEFAULT_TABLE     = name.replace('@', '').replace('/', '-')
-const DEFAULT_RUNTIME   = 'nodejs22.x'
+const { name, version } = require(`${ROOT_PATH}/package.json`);
+const [ MAJOR_VERSION ] = version.split('.');
+const DEFAULT_SERVICE   = name.replace('@', '').replace('/', '-') + `-v${MAJOR_VERSION}`;
+const DEFAULT_TABLE     = name.replace('@', '').replace('/', '-');
+const DEFAULT_RUNTIME   = 'nodejs22.x';
 
 const build = config => {
-  const AWS = get(config, 'aws', {})
-  const SERVERLESS = get(config, 'serverless', {})
+  const AWS = get(config, 'aws', {});
+  const SERVERLESS = get(config, 'serverless', {});
 
   const result = {
     service: SERVERLESS.service || DEFAULT_SERVICE,
     variablesResolutionMode: 20210326
-  }
+  };
 
   result.provider = {
     name:    'aws',
@@ -44,14 +44,14 @@ const build = config => {
       shouldStartNameWithService: true
     },
     lambdaHashingVersion: '20201221'
-  }
+  };
 
   if (AWS.region) {
-    result.provider.region = AWS.region
+    result.provider.region = AWS.region;
   }
 
   if (AWS.profile) {
-    result.provider.profile = AWS.profile
+    result.provider.profile = AWS.profile;
   }
 
   result.package = {
@@ -59,7 +59,7 @@ const build = config => {
       '!test/**',
       '!bin/**'
     ]
-  }
+  };
 
   result.functions = {
     api: {
@@ -73,7 +73,7 @@ const build = config => {
         }
       ]
     }
-  }
+  };
 
   const DEFAULT_HTTP_METHODS = [
     'get',
@@ -81,10 +81,10 @@ const build = config => {
     'patch',
     'delete',
     'options'
-  ]
+  ];
 
   for (const method of DEFAULT_HTTP_METHODS) {
-    const path = '/{operationId}'
+    const path = '/{operationId}';
     const http = {
       path,
       method,
@@ -95,25 +95,25 @@ const build = config => {
           }
         }
       }
-    }
+    };
 
-    result.functions.api.events.push({ http })
+    result.functions.api.events.push({ http });
   }
 
   if (SERVERLESS.iamRoleStatements) {
     result.provider.iamRoleStatements =
-      result.provider.iamRoleStatements.concat(SERVERLESS.iamRoleStatements)
+      result.provider.iamRoleStatements.concat(SERVERLESS.iamRoleStatements);
   }
 
   if (SERVERLESS.timeout) {
-    result.provider.timeout = SERVERLESS.timeout
+    result.provider.timeout = SERVERLESS.timeout;
   }
 
   if (SERVERLESS.custom) {
-    result.custom = SERVERLESS.custom
+    result.custom = SERVERLESS.custom;
   }
 
-  const TABLES = get(config, 'tables')
+  const TABLES = get(config, 'tables');
 
   if (TABLES) {
     const DEFAULT_TABLE_ACTIONS = [
@@ -123,13 +123,13 @@ const build = config => {
       'dynamodb:PutItem',
       'dynamodb:UpdateItem',
       'dynamodb:DeleteItem'
-    ]
+    ];
 
     for (const tableKey in TABLES) {
-      const tableConfig = TABLES[tableKey]
-      const { name = DEFAULT_TABLE, actions = DEFAULT_TABLE_ACTIONS } = tableConfig
+      const tableConfig = TABLES[tableKey];
+      const { name = DEFAULT_TABLE, actions = DEFAULT_TABLE_ACTIONS } = tableConfig;
 
-      const tableName = `${name}-${INSTANCE}`
+      const tableName = `${name}-${INSTANCE}`;
 
       const statement = {
         Effect: 'Allow',
@@ -138,18 +138,18 @@ const build = config => {
           `arn:aws:dynamodb:\${opt:region, self:provider.region}:*:table/${tableName}`,
           `arn:aws:dynamodb:\${opt:region, self:provider.region}:*:table/${tableName}/*`
         ]
-      }
+      };
 
-      result.provider.iamRoleStatements.push(statement)
+      result.provider.iamRoleStatements.push(statement);
     }
   }
 
   if (result.provider.iamRoleStatements) {
-    result.provider.iam = { role: { statements: result.provider.iamRoleStatements } }
-    delete result.provider.iamRoleStatements
+    result.provider.iam = { role: { statements: result.provider.iamRoleStatements } };
+    delete result.provider.iamRoleStatements;
   }
 
-  return result
-}
+  return result;
+};
 
-module.exports = build
+module.exports = build;

package/src/index.js

@@ -1,5 +1,5 @@
-'use strict'
+'use strict';
 
 module.exports = {
   build: require('./build')
-}
+};

package/test/index.js

@@ -1,3 +0,0 @@
-'use strict'
-
-require('../src')