@kravc/dos 1.8.4 → 1.8.6

package/eslint.config.mjs

@@ -0,0 +1,55 @@
+import globals from "globals";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+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"), {
+    languageOptions: {
+        globals: {
+            ...globals.node,
+            ...globals.mocha,
+        },
+
+        ecmaVersion: 2018,
+        sourceType: "commonjs",
+    },
+
+    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",
+    },
+}];

package/examples/CreateProfile.js

@@ -7,6 +7,14 @@ const { publicKey }    = require('../src/test/keys')
 const JwtAuthorization = require('../src/security/JwtAuthorization')
 
 class CreateProfile extends Create(Profile) {
+  static get tags() {
+    return [
+      'Profiles',
+      'profiles-write',
+      'System'
+    ]
+  }
+
   static get security() {
     const algorithm = 'RS256'
 

package/examples/UpdateProfile.js

@@ -7,6 +7,13 @@ const JwtAuthorization = require('../src/security/JwtAuthorization')
 const SystemAuthorization = require('../src/security/SystemAuthorization')
 
 class UpdateProfile extends Update(Profile) {
+  static get tags() {
+    return [
+      'profiles-write',
+      'Profiles',
+    ]
+  }
+
   static get security() {
     return [
       SystemAuthorization.createRequirement(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kravc/dos",
-  "version": "1.8.4",
+  "version": "1.8.6",
   "description": "Convention-based, easy-to-use library for building API-driven serverless services.",
   "keywords": [
     "Service",
@@ -25,33 +25,24 @@
   "author": "Alexander Kravets <a@kra.vc>",
   "license": "ISC",
   "dependencies": {
-    "@kravc/schema": "^2.7.0",
-    "cookie": "^0.5.0",
+    "@kravc/schema": "^2.7.1",
+    "cookie": "^1.0.1",
     "js-yaml": "^4.1.0",
     "jsonwebtoken": "^9.0.2",
-    "lodash.capitalize": "^4.2.1",
-    "lodash.clonedeep": "^4.5.0",
-    "lodash.compact": "^3.0.1",
-    "lodash.get": "^4.4.2",
-    "lodash.isempty": "^4.4.0",
-    "lodash.isobject": "^3.0.2",
-    "lodash.isstring": "^4.0.1",
-    "lodash.isundefined": "^3.0.1",
-    "lodash.keyby": "^4.6.0",
-    "lodash.omit": "^4.5.0",
-    "lodash.pick": "^4.4.0",
-    "lodash.startcase": "^4.4.0",
-    "lodash.uniq": "^4.5.0",
+    "lodash": "^4.17.21",
     "pluralize": "^8.0.0",
     "ulid": "^2.3.0",
     "uuid": "^9.0.1",
     "z-schema": "^6.0.1"
   },
   "devDependencies": {
-    "chai": "^4.3.10",
-    "eslint": "^8.51.0",
-    "mocha": "^10.2.0",
-    "nyc": "^15.1.0"
+    "@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"
   },
   "nyc": {
     "include": "src",

package/src/Document.js

@@ -1,10 +1,8 @@
 'use strict'
 
-const get                   = require('lodash.get')
-const omit                  = require('lodash.omit')
+const { get, omit, capitalize } = require('lodash')
 const { ulid }              = require('ulid')
 const Component             = require('./Component')
-const capitalize            = require('lodash.capitalize')
 const getIdPrefix           = require('./helpers/getIdPrefix')
 const getComponentTitle     = require('./helpers/getComponentTitle')
 const DocumentExistsError   = require('./errors/DocumentExistsError')

package/src/Operation.js

@@ -1,8 +1,7 @@
 'use strict'
 
-const isEmpty = require('lodash.isempty')
-const cloneDeep = require('lodash.clonedeep')
 const { Schema } = require('@kravc/schema')
+const { isEmpty, cloneDeep } = require('lodash')
 
 const defaultId = require('./helpers/defaultId')
 const defaultTags = require('./helpers/defaultTags')

package/src/Service.js

@@ -1,9 +1,7 @@
 'use strict'
 
-const get                = require('lodash.get')
-const uniq               = require('lodash.uniq')
+const { get, uniq, compact } = require('lodash')
 const handler            = require('./helpers/handler')
-const compact            = require('lodash.compact')
 const authorize          = require('./helpers/authorize')
 const createSpec         = require('./helpers/createSpec')
 const { Validator }      = require('@kravc/schema')

package/src/helpers/asSafeClass.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const asSafeClass = classTarget => {
-  // eslint-disable-next-line no-undef
   return new Proxy(classTarget, {
     get(target, prop) {
       const isPropertyDefined = (prop in target)

package/src/helpers/createContext.js

@@ -1,7 +1,6 @@
 'use strict'
 
-const get          = require('lodash.get')
-const isString     = require('lodash.isstring')
+const { get, isString } = require('lodash')
 const { parse }    = require('url')
 const { v4: uuid } = require('uuid')
 

package/src/helpers/createSchemasMap.js

@@ -1,8 +1,8 @@
 'use strict'
 
-const path     = require('path')
-const keyBy    = require('lodash.keyby')
-const loadSync = require('./loadSync')
+const path      = require('path')
+const { keyBy } = require('lodash')
+const loadSync  = require('./loadSync')
 const { readdirSync, statSync } = require('fs')
 
 const ROOT_PATH = process.cwd()

package/src/helpers/createSpec.js

@@ -1,7 +1,6 @@
 'use strict'
 
-const omit          = require('lodash.omit')
-const uniq          = require('lodash.uniq')
+const { omit, uniq } = require('lodash')
 const ZSchema       = require('z-schema')
 const { parse }     = require('url')
 const jsonSchema    = require('../../assets/schemas/oas2.json')
@@ -159,7 +158,19 @@ const createSpec = (operations, schemasMap, url) => {
   }
 
   serviceTags = uniq(serviceTags)
-  serviceTags.sort((a, b) => a.localeCompare(b))
+
+  console.log(serviceTags)
+
+  serviceTags.sort((a, b) => {
+    const aStartsWithUpper = /^[A-Z]/.test(a)
+    const bStartsWithUpper = /^[A-Z]/.test(b)
+
+    if (aStartsWithUpper && !bStartsWithUpper) { return -1 }
+
+    if (!aStartsWithUpper && bStartsWithUpper) { return 1 }
+
+    return a.localeCompare(b)
+  })
   spec.tags = serviceTags.map(name => ({ name }))
 
   const json = JSON

package/src/helpers/defaultId.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const startCase = require('lodash.startcase')
+const { startCase } = require('lodash')
 const pluralize = require('pluralize')
 
 const defaultId = Operation => {

package/src/helpers/defaultSummary.js

@@ -1,7 +1,6 @@
 'use strict'
 
-const startCase  = require('lodash.startcase')
-const capitalize = require('lodash.capitalize')
+const { startCase, capitalize } = require('lodash')
 
 const defaultSummary = (Component, componentAction) => {
   if (!Component) { return '' }

package/src/helpers/defaultTags.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const startCase = require('lodash.startcase')
+const { startCase } = require('lodash')
 const pluralize = require('pluralize')
 
 const defaultTags = Component => {

package/src/helpers/getComponentTitle.js

@@ -1,8 +1,7 @@
 'use strict'
 
-const startCase  = require('lodash.startcase')
-const pluralize  = require('pluralize')
-const capitalize = require('lodash.capitalize')
+const { startCase, capitalize } = require('lodash')
+const pluralize = require('pluralize')
 
 const getComponentTitle = (Component, isCapitalized = true, isPlural = false) => {
   const { name } = Component

package/src/helpers/logError.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const pick        = require('lodash.pick')
+const { pick }    = require('lodash')
 const maskSecrets = require('./maskSecrets')
 
 const OPERATION_CONTEXT_FIELDS = [

package/src/helpers/maskSecrets.js

@@ -1,7 +1,6 @@
 'use strict'
 
-const isObject    = require('lodash.isobject')
-const cloneDeep   = require('lodash.clonedeep')
+const { isObject, cloneDeep } = require('lodash')
 const { isArray } = Array
 
 const SECRET_REGEXP = /(password|code|token|authorization|cookie)/i

package/src/operations/Index.js

@@ -1,7 +1,7 @@
 'use strict'
 
+const { capitalize }    = require('lodash')
 const Operation         = require('../Operation')
-const capitalize        = require('lodash.capitalize')
 const getComponentTitle = require('../helpers/getComponentTitle')
 
 const Index = (Component, componentAction = 'index') => {

package/src/security/JwtAuthorization.js

@@ -1,9 +1,8 @@
 'use strict'
 
-const get               = require('lodash.get')
+const { get, capitalize } = require('lodash')
 const cookie            = require('cookie')
 const { decode }        = require('jsonwebtoken')
-const capitalize        = require('lodash.capitalize')
 const verifyToken       = require('./verifyToken')
 const AccessDeniedError = require('../errors/AccessDeniedError')
 const UnauthorizedError = require('../errors/UnauthorizedError')

package/src/security/SystemAuthorization.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const get = require('lodash.get')
+const { get } = require('lodash')
 const AccessDeniedError = require('../errors/AccessDeniedError')
 
 class SystemAuthorization {

package/.eslintrc.yaml

@@ -1,41 +0,0 @@
-extends: 'eslint:recommended'
-
-parserOptions:
-  ecmaVersion: 2018
-
-env:
-  node: true
-  mocha: true
-
-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