From 9c3d6053705727d8e628719d30d69a54e8aa42eb Mon Sep 17 00:00:00 2001 From: Daniel Jeffery Date: Mon, 31 Jul 2023 20:20:41 -0700 Subject: [PATCH 1/3] chore: Hoist configuration to top level --- LICENSE | 178 ++++++++++++++++++ README.md | 2 +- client/package-lock.json | 11 +- client/package.json | 40 +--- client/src/extension.ts | 3 + client/tsconfig.json | 1 - ...ration.json => language-configuration.json | 0 package.json | 52 +++-- .../openfga.tmLanguage.json | 0 {client/src/themes => themes}/dark_vs.json | 0 .../src/themes => themes}/openfga-dark.json | 0 11 files changed, 224 insertions(+), 63 deletions(-) create mode 100644 LICENSE rename client/src/language-configuration.json => language-configuration.json (100%) rename {client/src/syntaxes => syntaxes}/openfga.tmLanguage.json (100%) rename {client/src/themes => themes}/dark_vs.json (100%) rename {client/src/themes => themes}/openfga-dark.json (100%) diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e454a52 --- /dev/null +++ b/LICENSE @@ -0,0 +1,178 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + diff --git a/README.md b/README.md index e06bf75..bf383c5 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ VSCode extension that provides syntax highlighting for the [OpenFGA](https://openfga.dev/) [language for authorization models](https://openfga.dev/docs/configuration-language). [![Release](https://img.shields.io/github/v/release/openfga/vscode-ext?sort=semver&color=green)](https://github.com/openfga/vscode-ext/releases) -[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](./LICENSE) +[![License](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://github.com/openfga/vscode-ext/blob/main/LICENSE) [![Discord Server](https://img.shields.io/discord/759188666072825867?color=7289da&logo=discord "Discord Server")](https://discord.gg/8naAwJfWN6) [![Twitter](https://img.shields.io/twitter/follow/openfga?color=%23179CF0&logo=twitter&style=flat-square "@openfga on Twitter")](https://twitter.com/openfga) diff --git a/client/package-lock.json b/client/package-lock.json index 52f9dcb..07ec2dc 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -10,12 +10,12 @@ "license": "Apache-2.0", "dependencies": { "@openfga/syntax-transformer": "^0.1.3", + "monaco-editor": "^0.40.0", "vscode-languageclient": "^8.1.0" }, "devDependencies": { "@types/vscode": "^1.75.1", - "@vscode/test-electron": "^2.2.3", - "monaco-editor": "0.37.1" + "@vscode/test-electron": "^2.2.3" }, "engines": { "vscode": "^1.75.0" @@ -393,10 +393,9 @@ } }, "node_modules/monaco-editor": { - "version": "0.37.1", - "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.37.1.tgz", - "integrity": "sha512-jLXEEYSbqMkT/FuJLBZAVWGuhIb4JNwHE9kPTorAVmsdZ4UzHAfgWxLsVtD7pLRFaOwYPhNG9nUCpmFL1t/dIg==", - "dev": true + "version": "0.40.0", + "resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.40.0.tgz", + "integrity": "sha512-1wymccLEuFSMBvCk/jT1YDW/GuxMLYwnFwF9CDyYCxoTw2Pt379J3FUhwy9c43j51JdcxVPjwk0jm0EVDsBS2g==" }, "node_modules/moo": { "version": "0.5.2", diff --git a/client/package.json b/client/package.json index ce2e78f..3f79b2d 100644 --- a/client/package.json +++ b/client/package.json @@ -17,52 +17,16 @@ "type": "git", "url": "https://github.com:openfga/openfga-vscode" }, - "contributes": { - "languages": [ - { - "id": "openfga", - "aliases": [ - "OpenFGA", - "openfga" - ], - "extensions": [ - ".fga", - ".openfga" - ], - "configuration": "./language-configuration.json" - } - ], - "grammars": [ - { - "language": "openfga", - "scopeName": "source.openfga", - "path": "./syntaxes/openfga.tmLanguage.json" - } - ], - "themes": [ - { - "label": "OpenFGA Dark", - "uiTheme": "vs-dark", - "path": "./themes/openfga-dark.json" - } - ], - "commands": [ - { - "command": "openfga.commands.transformToJson", - "title": "OpenFGA: Transform DSL to JSON" - } - ] - }, "engines": { "vscode": "^1.75.0" }, "dependencies": { "@openfga/syntax-transformer": "^0.1.3", + "monaco-editor": "^0.40.0", "vscode-languageclient": "^8.1.0" }, "devDependencies": { "@types/vscode": "^1.75.1", - "@vscode/test-electron": "^2.2.3", - "monaco-editor": "0.37.1" + "@vscode/test-electron": "^2.2.3" } } diff --git a/client/src/extension.ts b/client/src/extension.ts index c296145..b7da80e 100644 --- a/client/src/extension.ts +++ b/client/src/extension.ts @@ -29,3 +29,6 @@ export function activate(context: ExtensionContext) { context.subscriptions.push(transformCommand); } +export function deactivate() { + +} \ No newline at end of file diff --git a/client/tsconfig.json b/client/tsconfig.json index ed48ae9..0e33402 100644 --- a/client/tsconfig.json +++ b/client/tsconfig.json @@ -7,6 +7,5 @@ "rootDir": "src", "sourceMap": true }, - "include": ["src"], "exclude": ["node_modules", ".vscode-test"] } diff --git a/client/src/language-configuration.json b/language-configuration.json similarity index 100% rename from client/src/language-configuration.json rename to language-configuration.json diff --git a/package.json b/package.json index 68dde6e..5af20cd 100644 --- a/package.json +++ b/package.json @@ -27,30 +27,48 @@ }, "main": "./client/out/extension", "contributes": { - "languages": [{ - "id": "openfga", - "aliases": ["OpenFGA", "openfga"], - "extensions": [".fga", ".openfga"], - "configuration": "./client/src/language-configuration.json" - }], - "grammars": [{ - "language": "openfga", - "scopeName": "source.openfga", - "path": "./client/src/syntaxes/openfga.tmLanguage.json" - }], + "languages": [ + { + "id": "openfga", + "aliases": [ + "OpenFGA", + "openfga" + ], + "extensions": [ + ".fga", + ".openfga" + ], + "configuration": "./language-configuration.json" + } + ], + "grammars": [ + { + "language": "openfga", + "scopeName": "source.openfga", + "path": "./syntaxes/openfga.tmLanguage.json" + } + ], "themes": [ - { - "label": "OpenFGA Dark", - "uiTheme": "vs-dark", - "path": "./client/src/themes/openfga-dark.json" - } + { + "label": "OpenFGA Dark", + "uiTheme": "vs-dark", + "path": "./themes/openfga-dark.json" + } ], "commands": [ { "command": "openfga.commands.transformToJson", "title": "OpenFGA: Transform DSL to JSON" } - ] + ], + "menus": { + "commandPalette": [ + { + "command": "openfga.commands.transformToJson", + "when": "editorLangId == openfga" + } + ] + } }, "scripts": { "vscode:prepublish": "npm run compile", diff --git a/client/src/syntaxes/openfga.tmLanguage.json b/syntaxes/openfga.tmLanguage.json similarity index 100% rename from client/src/syntaxes/openfga.tmLanguage.json rename to syntaxes/openfga.tmLanguage.json diff --git a/client/src/themes/dark_vs.json b/themes/dark_vs.json similarity index 100% rename from client/src/themes/dark_vs.json rename to themes/dark_vs.json diff --git a/client/src/themes/openfga-dark.json b/themes/openfga-dark.json similarity index 100% rename from client/src/themes/openfga-dark.json rename to themes/openfga-dark.json From b154c95bd91778ba3a689c5c8d155ae29bf21232 Mon Sep 17 00:00:00 2001 From: Daniel Jeffery Date: Mon, 31 Jul 2023 20:33:51 -0700 Subject: [PATCH 2/3] chore: adjust for linting --- client/src/extension.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/client/src/extension.ts b/client/src/extension.ts index b7da80e..103ec31 100644 --- a/client/src/extension.ts +++ b/client/src/extension.ts @@ -28,7 +28,3 @@ export function activate(context: ExtensionContext) { context.subscriptions.push(transformCommand); } - -export function deactivate() { - -} \ No newline at end of file From 48a876f137b7653a69c77c169cc33d22e698ed0b Mon Sep 17 00:00:00 2001 From: Daniel Jeffery Date: Mon, 31 Jul 2023 20:39:03 -0700 Subject: [PATCH 3/3] Add back missing include --- client/tsconfig.json | 1 + 1 file changed, 1 insertion(+) diff --git a/client/tsconfig.json b/client/tsconfig.json index 0e33402..ed48ae9 100644 --- a/client/tsconfig.json +++ b/client/tsconfig.json @@ -7,5 +7,6 @@ "rootDir": "src", "sourceMap": true }, + "include": ["src"], "exclude": ["node_modules", ".vscode-test"] }