Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vacl",
"version": "0.1.4",
"version": "0.1.5",
"description": "A Lightweight Typescript ACL directives library for Vue 3",
"files": [
"dist"
Expand Down
7 changes: 2 additions & 5 deletions rollup.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ import typescript from 'rollup-plugin-typescript2';
import pkg from './package.json';
import { terser } from 'rollup-plugin-terser';
import bundleSize from 'rollup-plugin-bundle-size';
import path from "path";

export default {
input: 'src/index.ts',
output: [
{
file: pkg.main,
format: 'cjs',
sourcemap: true
sourcemap: true,
exports: 'default'
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

rollup advised in the terminal so added itdocs

},
{
file: pkg.module,
Expand All @@ -21,9 +21,6 @@ export default {
external: [
...Object.keys(pkg.dependencies || {})
],
alias: {
'@/': path.resolve(__dirname, '/src/')
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ts takes care of this

},
plugins: [
typescript({
typescript: require('typescript'),
Expand Down
27 changes: 21 additions & 6 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,30 @@
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
import { can, cannot, has, hasnt } from './lib/Directives';
import type { App } from '@vue/runtime-core';
import type { Config } from '../types/config';
import type { Config, Directives } from '../types/config';
import ACL from './lib/ACL';

const defaults: Required<Config> = {
roles: [],
permissions: [],
forceRemove: false,
accessor: '$vacl',
directives: {
can: 'can',
cannot: 'cannot',
has: 'has',
hasnt: 'hasnt'
} as Required<Directives>
};

export default {
install: (app: App, options?: Config): void => {
const acl = app.config.globalProperties.$vacl = new ACL(options);
const directives = { ...defaults.directives, ...Object(options?.directives) };
const acl = app.config.globalProperties[options?.accessor ?? defaults.accessor] = new ACL(options);

app.directive('can', can(acl));
app.directive('cannot', cannot(acl));
app.directive('has', has(acl));
app.directive('hasnt', hasnt(acl));
app.directive(directives.can, can(acl));
app.directive(directives.cannot, cannot(acl));
app.directive(directives.has, has(acl));
app.directive(directives.hasnt, hasnt(acl));
}
};
10 changes: 5 additions & 5 deletions src/lib/ACL.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default class ACL {
*
* @returns {ACL}
*/
public constructor(config: Config | null = null) {
public constructor(config?: Config) {
this.roles = new Set(config?.roles ?? []);
this.permissions = new Set(config?.permissions ?? []);
this.forceRemove = config?.forceRemove ?? false;
Expand All @@ -41,7 +41,7 @@ export default class ACL {
/**
* Set the roles.
*
* @param {Roles} roles
* @param {string[]} roles
*
* @returns {ACL}
*/
Expand All @@ -54,7 +54,7 @@ export default class ACL {
/**
* Set the permissions.
*
* @param {Permissions} permissions
* @param {string[]} permissions
*
* @returns {ACL}
*/
Expand All @@ -67,7 +67,7 @@ export default class ACL {
/**
* Add roles to the existing store.
*
* @param {Roles | string} roles
* @param {string | string[]} roles
*
* @returns {ACL}
*/
Expand All @@ -80,7 +80,7 @@ export default class ACL {
/**
* Add permissions to the existing store.
*
* @param {Permissions | string} permissions
* @param {string | string[]} permissions
*
* @returns {ACL}
*/
Expand Down
7 changes: 7 additions & 0 deletions tests/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,13 @@ module.exports = {
"jest/prefer-expect-assertions": "off",
"jest/no-hooks": "off",
"jest/prefer-called-with": "off",
"jest/no-restricted-matchers": [
"error",
{
"toBeFalsy": 'Use toBe(false) instead to avoid unexpected type coercion.',
"toBeTruthy": 'Use toBe(true) instead to avoid unexpected type coercion.',
}
]
// "jest/valid-title": ["error", {
// mustMatch: {
// it: '^should '
Expand Down
25 changes: 25 additions & 0 deletions tests/helpers.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import type ACL from '@/lib/ACL';
import type { VueWrapper } from '@vue/test-utils';
import { shallowMount } from '@vue/test-utils';
import { can, cannot, has, hasnt } from '@/lib/Directives';

/**
* Create a test wrapper.
*
* @param {ACL} acl
* @param {string} template
*
* @returns {VueWrapper<any>}
*/
export function getWrapper(acl: ACL, template: string): VueWrapper<any> {
return shallowMount({ template }, {
global: {
directives: {
can: can(acl),
cannot: cannot(acl),
has: has(acl),
hasnt: hasnt(acl)
}
}
});
}
2 changes: 1 addition & 1 deletion tests/unit/ACL.test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import ACL from '@/lib/ACL';

describe('aCL', () => {
describe('acl', () => {
it('can_be_instantiated', () => {
const acl = new ACL();

Expand Down
53 changes: 39 additions & 14 deletions tests/vue/ACL.test.ts
Original file line number Diff line number Diff line change
@@ -1,32 +1,57 @@
import { mount } from '@vue/test-utils';
import { shallowMount, VueWrapper } from '@vue/test-utils';
import { createApp, h } from 'vue';
import ACL from '@/lib/ACL';
import Vacl from '@/index';

describe('reactivity', () => {
describe('vue', () => {
const component = {
render() {
return h('div');
}
};

it('can be installed correctly', () => {
const app = createApp({
template: '<div></div>'
}).use(Vacl);
const app = createApp(component).use(Vacl);

expect(app.config.globalProperties.$vacl).toBeInstanceOf(ACL);
});

it('provides the acl globally to all components', () => {
const component = {
render() {
return h('div');
const wrapper = shallowMount(component, {
global: {
plugins: [[Vacl, { permissions: ['view'] }]]
}
};
});

expect(wrapper.vm.$vacl).toBeInstanceOf(ACL);
expect(wrapper.vm.$vacl.can('view')).toBe(true);
expect(wrapper.vm.$vacl.has('admin')).toBe(false);
});

const app = mount(component, {
it('should be able to configure global accessor name', () => {
const wrapper = shallowMount(component, {
global: {
plugins: [[Vacl, { permissions: ['view'] }]]
plugins: [[Vacl, { accessor: '$acl' }]]
}
});

expect(app.vm.$vacl).toBeInstanceOf(ACL);
expect(app.vm.$vacl.can('view')).toBeTruthy();
expect(app.vm.$vacl.has('admin')).toBeFalsy();
expect(wrapper.vm.$acl).toBeInstanceOf(ACL);
});

it('should be able to set the directive names from the config', () => {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this needs to be tested for the other 3 directives as well

const div = document.createElement('div');
div.id = 'id';
document.body.appendChild(div);

const app = createApp({
template: `<div v-able="'view'" data-test='visible'></div>
<div v-able="'edit'" data-test='hidden'></div>`
})
.use(Vacl, { directives: { can: 'able' }, permissions: ['view'] });

const wrapper = new VueWrapper(app, app.mount('#id'));

expect(wrapper.find('[data-test="visible"]').isVisible()).toBe(true);
expect(wrapper.find('[data-test="hidden"]').isVisible()).toBe(false);
});
});
25 changes: 1 addition & 24 deletions tests/vue/Directives.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import type { VueWrapper } from '@vue/test-utils';
import { mount } from '@vue/test-utils';
import ACL from '@/lib/ACL';
import { can, cannot, has, hasnt } from '@/lib/Directives';
import { getWrapper } from '../helpers';

/******************************************************************************
* PERMISSIONS
Expand Down Expand Up @@ -215,24 +213,3 @@ describe('dom removal', () => {
// expect(incorrectType).toThrow("Value passed to v-can should be a non-empty string. \"1\" passed.");
// });
// });

/**
* Create a test wrapper.
*
* @param {ACL} acl
* @param {string} template
*
* @returns {VueWrapper<any>}
*/
function getWrapper(acl: ACL, template: string): VueWrapper<any> {
return mount({ template }, {
global: {
directives: {
can: can(acl),
cannot: cannot(acl),
has: has(acl),
hasnt: hasnt(acl)
}
}
});
}
11 changes: 10 additions & 1 deletion types/config.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,21 @@ import type ACL from '../src/lib/ACL';

declare module '@vue/runtime-core' {
interface ComponentCustomProperties {
$vacl: ACL;
[key: string]: ACL | any;
}
}

export type Directives = {
can?: string,
cannot?: string,
has?: string,
hasnt?: string
}

export type Config = {
roles?: string[];
permissions?: string[];
forceRemove?: boolean;
accessor?: string
directives?: Directives
};