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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
ContributorAuthor

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
Copy Markdown
ContributorAuthor

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
ContributorAuthor

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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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;
Comment thread
fullstackfool marked this conversation as resolved.
}
}

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

export type Config = {
roles?: string[];
permissions?: string[];
forceRemove?: boolean;
accessor?: string
directives?: Directives
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
ContributorAuthor

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
Copy Markdown
ContributorAuthor

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
ContributorAuthor

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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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;
Comment thread
fullstackfool marked this conversation as resolved.
}
}

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

export type Config = {
roles?: string[];
permissions?: string[];
forceRemove?: boolean;
accessor?: string
directives?: Directives
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
ContributorAuthor

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
Copy Markdown
ContributorAuthor

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
ContributorAuthor

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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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;
Comment thread
fullstackfool marked this conversation as resolved.
}
}

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

export type Config = {
roles?: string[];
permissions?: string[];
forceRemove?: boolean;
accessor?: string
directives?: Directives
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
ContributorAuthor

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
Copy Markdown
ContributorAuthor

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
ContributorAuthor

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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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;
Comment thread
fullstackfool marked this conversation as resolved.
}
}

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

export type Config = {
roles?: string[];
permissions?: string[];
forceRemove?: boolean;
accessor?: string
directives?: Directives
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
ContributorAuthor

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
Copy Markdown
ContributorAuthor

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
ContributorAuthor

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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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;
Comment thread
fullstackfool marked this conversation as resolved.
}
}

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

export type Config = {
roles?: string[];
permissions?: string[];
forceRemove?: boolean;
accessor?: string
directives?: Directives
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
ContributorAuthor

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
Copy Markdown
ContributorAuthor

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
ContributorAuthor

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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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;
Comment thread
fullstackfool marked this conversation as resolved.
}
}

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

export type Config = {
roles?: string[];
permissions?: string[];
forceRemove?: boolean;
accessor?: string
directives?: Directives
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
ContributorAuthor

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
Copy Markdown
ContributorAuthor

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
ContributorAuthor

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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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;
Comment thread
fullstackfool marked this conversation as resolved.
}
}

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

export type Config = {
roles?: string[];
permissions?: string[];
forceRemove?: boolean;
accessor?: string
directives?: Directives
};
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
ContributorAuthor

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
Copy Markdown
ContributorAuthor

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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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 numberDiff line numberDiff 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
Copy Markdown
ContributorAuthor

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 numberDiff line numberDiff 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 DownExpand 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 numberDiff line numberDiff 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;
Comment thread
fullstackfool marked this conversation as resolved.
}
}

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

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