Merge pull request #39 from advanced-rest-client/develop

feat: security namespace updates

Author: jarrodek

.github/workflows/deployment.yml

@@ -3,19 +3,18 @@ env:
   FORCE_COLOR: 1
 on:
   push:
+    branches:
+      - master
+      - main
+      - develop
   pull_request:
     branches:
       - master
       - main
 jobs:
   test_linux:
-    name: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-20.04]
-        # os: [ubuntu-18.04, ubuntu-20.04]
-    runs-on: ${{ matrix.os }}
+    name: Ubuntu
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
@@ -87,6 +86,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           tag_name: v${{ steps.package-node-version.outputs.version }}
+          release_name: v${{ steps.package-node-version.outputs.version }}
           body: |
             ${{ steps.Changelog.outputs.changelog }}
           draft: false

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@api-components/amf-helper-mixin",
   "description": "A mixin with common functions user by most AMF components to compute AMF values",
-  "version": "4.3.9",
+  "version": "4.3.10",
   "license": "Apache-2.0",
   "main": "index.js",
   "module": "index.js",
@@ -10,13 +10,15 @@
     "amf",
     "transformer"
   ],
-  "authors": [
-    "Pawel Psztyc"
-  ],
+  "author": {
+    "name": "Pawel Uchida-Psztyc",
+    "email": "[email protected]"
+  },
   "contributors": [
     "Leandro Bauret",
     "Francisco Di Giandomenico",
-    "Carolina Wright"
+    "Carolina Wright",
+    "Your name can be here!"
   ],
   "repository": {
     "type": "git",
@@ -27,20 +29,20 @@
     "email": "[email protected]"
   },
   "devDependencies": {
-    "@api-components/api-model-generator": "^0.2.10",
+    "@api-components/api-model-generator": "^0.2.11",
     "@open-wc/eslint-config": "^4.3.0",
     "@open-wc/testing": "^2.5.33",
-    "@web/dev-server": "^0.1.15",
-    "@web/test-runner": "^0.13.1",
-    "@web/test-runner-playwright": "^0.8.5",
-    "eslint": "^7.24.0",
-    "eslint-config-prettier": "^8.2.0",
+    "@web/dev-server": "^0.1.17",
+    "@web/test-runner": "^0.13.5",
+    "@web/test-runner-playwright": "^0.8.6",
+    "eslint": "^7.28.0",
+    "eslint-config-prettier": "^8.3.0",
     "husky": "^6.0.0",
-    "lint-staged": "^10.5.4",
-    "lit-element": "^2.4.0",
-    "lit-html": "^1.3.0",
-    "sinon": "^10.0.0",
-    "typescript": "^4.2.4",
+    "lint-staged": "^11.0.0",
+    "lit-element": "^2.5.1",
+    "lit-html": "^1.4.1",
+    "sinon": "^11.1.1",
+    "typescript": "^4.3.2",
     "typescript-lit-html-plugin": "^0.9.0"
   },
   "scripts": {

package.json

@@ -63,6 +63,7 @@ interface AmfHelperMixin {
    * It is only useful for the element to resolve references.
    */
   amf: object|object[]|undefined;
+  _amf: object|object[]|undefined;
 
   /**
    * This is an abstract method to be implemented by the components.

src/AmfHelperMixin.d.ts

@@ -54,6 +54,10 @@ interface Security {
   OAuth2Settings: string;
   OAuth2Flow: string;
   Scope: string;
+  Settings: string;
+  HttpSettings: string;
+  ApiKeySettings: string;
+  OpenIdConnectSettings: string;
   security: string;
   scheme: string;
   schemes: string;
@@ -70,6 +74,8 @@ interface Security {
   tokenCredentialsUri: string;
   requestTokenUri: string;
   securityRequirement: string;
+  openIdConnectUrl: string;
+  bearerFormat: string;
   in: string;
 }
 

src/Namespace.d.ts

@@ -70,6 +70,10 @@ ns.aml.vocabularies.security.OAuth1Settings = `${secKey}OAuth1Settings`;
 ns.aml.vocabularies.security.OAuth2Settings = `${secKey}OAuth2Settings`;
 ns.aml.vocabularies.security.OAuth2Flow = `${secKey}OAuth2Flow`;
 ns.aml.vocabularies.security.Scope = `${secKey}Scope`;
+ns.aml.vocabularies.security.Settings = `${secKey}Settings`;
+ns.aml.vocabularies.security.HttpSettings = `${secKey}HttpSettings`;
+ns.aml.vocabularies.security.ApiKeySettings = `${secKey}ApiKeySettings`;
+ns.aml.vocabularies.security.OpenIdConnectSettings = `${secKey}OpenIdConnectSettings`;
 ns.aml.vocabularies.security.security = `${secKey}security`;
 ns.aml.vocabularies.security.scheme = `${secKey}scheme`;
 ns.aml.vocabularies.security.schemes = `${secKey}schemes`;
@@ -86,6 +90,8 @@ ns.aml.vocabularies.security.signature = `${secKey}signature`;
 ns.aml.vocabularies.security.tokenCredentialsUri = `${secKey}tokenCredentialsUri`;
 ns.aml.vocabularies.security.requestTokenUri = `${secKey}requestTokenUri`;
 ns.aml.vocabularies.security.securityRequirement = `${secKey}SecurityRequirement`;
+ns.aml.vocabularies.security.openIdConnectUrl = `${secKey}openIdConnectUrl`;
+ns.aml.vocabularies.security.bearerFormat = `${secKey}bearerFormat`;
 ns.aml.vocabularies.security.in = `${secKey}in`;
 ns.aml.vocabularies.apiContract = {};
 ns.aml.vocabularies.http = ns.aml.vocabularies.apiContract;
@@ -222,7 +228,7 @@ ns.w3.key = 'http://www.w3.org/';
 ns.w3.rdfSyntax = {};
 ns.w3.rdfSyntax.key = `${ns.w3.key}1999/02/22-rdf-syntax-ns#`;
 ns.w3.rdfSyntax.toString = () => ns.w3.rdfSyntax.key;
-// TODO: is this unescesary?
+// TODO: is this unnecessary?
 ns.w3.rdfSyntax.member = `${ns.w3.rdfSyntax.key}member`;
 ns.w3.rdfSyntax.Seq = `${ns.w3.rdfSyntax.key}Seq`;
 ns.w3.rdfSchema = {};