@axium/core 0.10.0 → 0.11.0

package/dist/access.d.ts

@@ -1,3 +1,4 @@
+import * as z from 'zod';
 import type { User } from './user.js';
 export interface AccessControl {
     itemId: string;
@@ -13,7 +14,7 @@ declare const _Permission: {
     readonly Edit: 3;
     readonly Manage: 5;
 };
-export declare const Permission: import("zod").ZodEnum<{
+export declare const Permission: z.ZodEnum<{
     readonly None: 0;
     readonly Read: 1;
     readonly Comment: 2;
@@ -39,5 +40,20 @@ export interface AccessControllable {
     publicPermission: Permission;
     acl?: AccessControl[];
 }
+export declare const AccessMap: z.ZodRecord<z.ZodUnion<readonly [z.ZodUUID, z.ZodLiteral<"public">]>, z.ZodEnum<{
+    readonly None: 0;
+    readonly Read: 1;
+    readonly Comment: 2;
+    readonly Edit: 3;
+    readonly Manage: 5;
+}> & {
+    readonly None: 0;
+    readonly Read: 1;
+    readonly Comment: 2;
+    readonly Edit: 3;
+    readonly Manage: 5;
+}>;
+export interface AccessMap extends z.infer<typeof AccessMap> {
+}
 export declare function hasPermission(item: AccessControllable, userId: string | undefined, permission: Permission): boolean;
 export {};

package/dist/access.js

@@ -1,4 +1,4 @@
-import { enum as zEnum } from 'zod';
+import * as z from 'zod';
 const _Permission = {
     None: 0,
     Read: 1,
@@ -6,7 +6,7 @@ const _Permission = {
     Edit: 3,
     Manage: 5,
 };
-export const Permission = Object.assign(zEnum(_Permission), _Permission);
+export const Permission = Object.assign(z.enum(_Permission), _Permission);
 export const permissionNames = {
     [Permission.None]: 'No Permissions',
     [Permission.Read]: 'Reader',
@@ -14,6 +14,7 @@ export const permissionNames = {
     [Permission.Edit]: 'Editor',
     [Permission.Manage]: 'Manager',
 };
+export const AccessMap = z.record(z.union([z.uuid(), z.literal('public')]), Permission);
 export function hasPermission(item, userId, permission) {
     if (item.publicPermission >= permission)
         return true;

package/dist/api.d.ts

@@ -1,6 +1,6 @@
 import type { PublicKeyCredentialCreationOptionsJSON, PublicKeyCredentialRequestOptionsJSON } from '@simplewebauthn/types';
 import type z from 'zod';
-import type { AccessControl } from './access.js';
+import type { AccessControl, AccessMap } from './access.js';
 import type { App } from './apps.js';
 import type { AuditEvent, AuditFilter, Severity } from './audit.js';
 import type { NewSessionResponse, Session, Verification } from './auth.js';
@@ -94,10 +94,8 @@ export interface $API {
         }];
     };
     'acl/:itemType/:itemId': {
-        PUT: [{
-            userId: string;
-            permission: number;
-        }, AccessControl];
+        GET: AccessControl[];
+        POST: [AccessMap, AccessControl[]];
     };
     'admin/summary': {
         GET: AdminSummary;

package/dist/node/plugins.js

@@ -20,8 +20,14 @@ export function* pluginText(plugin) {
     }
 }
 function _locatePlugin(specifier, _loadedBy) {
-    if (specifier[0] == '/' || specifier.startsWith('./') || specifier.startsWith('../')) {
-        return resolve(dirname(_loadedBy), specifier);
+    if (specifier[0] == '/' || ['.', '..'].includes(specifier.split('/')[0])) {
+        const path = resolve(dirname(_loadedBy), specifier);
+        const stats = fs.statSync(path);
+        if (stats.isFile())
+            return path;
+        if (!stats.isDirectory())
+            throw new Error('Can not resolve plugin path: ' + path);
+        return join(path, 'package.json');
     }
     let packageDir = dirname(fileURLToPath(import.meta.resolve(specifier)));
     for (; !fs.existsSync(join(packageDir, 'package.json')); packageDir = dirname(packageDir))
@@ -31,6 +37,7 @@ function _locatePlugin(specifier, _loadedBy) {
 export async function loadPlugin(mode, specifier, _loadedBy, safeMode = false) {
     try {
         const path = _locatePlugin(specifier, _loadedBy);
+        io.debug(`Loading plugin at ${path} (from ${_loadedBy})`);
         let imported;
         try {
             imported = JSON.parse(fs.readFileSync(path, 'utf8'));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@axium/core",
-	"version": "0.10.0",
+	"version": "0.11.0",
 	"author": "James Prevett <axium@jamespre.dev>",
 	"funding": {
 		"type": "individual",