revojs 0.2.26 → 0.2.28

package/dist/index.js

@@ -1,4 +1,4 @@
 import { mimeType, mimeTypes } from "./assets/index.js";
-import { STATE_CONTEXT, VARIABLE_CONTEXT, createRegisterHooks, createScope, defineContext, defineHook, definePlugin, dispatchHook, dispatchHookSingle, getContext, registerHook, setContext, useVariables } from "./scope/index.js";
-import { GROUP_MATCH, HOOK_MATCH, OPTIONAL_PARAMETER_MATCH, OPTIONAL_WILDCARD_MATCH, PARAMETER_MATCH, ROUTE_CONTEXT, ROUTE_RESOLVER_CONTEXT, Router, WILDCARD_MATCH, fillSegments, toSegments, useRoute } from "./router/index.js";
-export { GROUP_MATCH, HOOK_MATCH, OPTIONAL_PARAMETER_MATCH, OPTIONAL_WILDCARD_MATCH, PARAMETER_MATCH, ROUTE_CONTEXT, ROUTE_RESOLVER_CONTEXT, Router, STATE_CONTEXT, VARIABLE_CONTEXT, WILDCARD_MATCH, createRegisterHooks, createScope, defineContext, defineHook, definePlugin, dispatchHook, dispatchHookSingle, fillSegments, getContext, mimeType, mimeTypes, registerHook, setContext, toSegments, useRoute, useVariables };
+import { STATE_CONTEXT, VARIABLE_CONTEXT, createRegisterHooks, createScope, defineContext, defineHook, definePlugin, dispatchHook, dispatchHookSingle, getContext, registerHook, setContext, useVariableContext, useVariables } from "./scope/index.js";
+import { GROUP_MATCH, HOOK_MATCH, OPTIONAL_PARAMETER_MATCH, OPTIONAL_WILDCARD_MATCH, PARAMETER_MATCH, ROUTE_CONTEXT, ROUTE_RESOLVER_CONTEXT, Router, WILDCARD_MATCH, fillSegments, toSegments, useRoute, useRouteResolverContext } from "./router/index.js";
+export { GROUP_MATCH, HOOK_MATCH, OPTIONAL_PARAMETER_MATCH, OPTIONAL_WILDCARD_MATCH, PARAMETER_MATCH, ROUTE_CONTEXT, ROUTE_RESOLVER_CONTEXT, Router, STATE_CONTEXT, VARIABLE_CONTEXT, WILDCARD_MATCH, createRegisterHooks, createScope, defineContext, defineHook, definePlugin, dispatchHook, dispatchHookSingle, fillSegments, getContext, mimeType, mimeTypes, registerHook, setContext, toSegments, useRoute, useRouteResolverContext, useVariableContext, useVariables };

package/dist/module/index.d.ts

@@ -102,6 +102,7 @@ export declare function addTypes(config: Config, name: string, types: Template):
 export declare function posixPath(path: string): string;
 export declare function resolvePattern(pattern: string, cwd?: string): string[];
 export declare function resolvePaths(patterns: string | ArrayLike<string>, cwd?: string): string[];
+export declare function matchesConsumer(path: string, consumer: Consumer): boolean;
 export declare function resolveSource(source: Source): Map<string, Map<string, string>>;
 export declare function useModule(source: string | URL): {
     fromModule: (...paths: Array<string>) => string;

package/dist/module/index.js

@@ -54,6 +54,10 @@ function resolvePaths(patterns, cwd) {
 	}
 	return [...entries];
 }
+function matchesConsumer(path, consumer) {
+	const marker = /\.(client|server)\.[^./]+$/.exec(path)?.[1];
+	return marker === void 0 || marker === consumer;
+}
 function resolveSource(source) {
 	const scopes = /* @__PURE__ */ new Map();
 	for (const directory of source.from) {
@@ -163,11 +167,15 @@ async function core(config) {
 					addVirtual(config, name, (consumer) => {
 						if (!source.consumers.includes(consumer)) return "export {};";
 						const cwd = posixPath(resolve("."));
-						const lines = entries.map(([, path], index) => {
-							const entry = posixPath(relative(cwd, path));
-							return `export { default as ${names[index]} } from "${entry.startsWith(".") ? entry : "./" + entry}";`;
-						});
-						return lines.length > 0 ? lines.join("\n") : "export {};";
+						const lines = new Array();
+						for (const [index, [, path]] of entries.entries()) {
+							if (!matchesConsumer(path, consumer)) continue;
+							let entry = posixPath(relative(cwd, path));
+							if (!entry.startsWith(".")) entry = "./" + entry;
+							lines.push(`export { default as ${names[index]} } from "${entry}";`);
+						}
+						if (lines.length === 0) return "export {};";
+						return lines.join("\n");
 					});
 					addTypes(config, name, () => {
 						const declarations = entries.map(([, path], index) => `export const ${names[index]}: typeof import("${posixPath(path)}").default;`);
@@ -177,12 +185,18 @@ async function core(config) {
 					addVirtual(config, name, (consumer) => {
 						if (!source.consumers.includes(consumer)) return "export default {};";
 						const cwd = posixPath(resolve("."));
-						return `export default { ${[...resolved].map(([scope, files]) => {
-							return `"${scope}": { ${[...files].map(([key, path]) => {
-								const entry = posixPath(relative(cwd, path));
-								return `"${key}": () => import("${entry.startsWith(".") ? entry : "./" + entry}").then((module) => module.default)`;
-							}).join(",")} }`;
-						}).join(",")} }`;
+						const result = new Array();
+						for (const [scope, files] of resolved) {
+							const entries = new Array();
+							for (const [key, path] of files) {
+								if (!matchesConsumer(path, consumer)) continue;
+								let entry = posixPath(relative(cwd, path));
+								if (!entry.startsWith(".")) entry = "./" + entry;
+								entries.push(`"${key}": () => import("${entry}").then((module) => module.default)`);
+							}
+							result.push(`"${scope}": { ${entries.join(",")} }`);
+						}
+						return `export default { ${result.join(",")} }`;
 					});
 					addTypes(config, name, () => {
 						const scopes = [...resolved].map(([scope, files]) => {
@@ -328,4 +342,4 @@ async function revojs(inputConfig) {
 }
 var PACKAGE_CACHE = /* @__PURE__ */ new Map();
 //#endregion
-export { addTemplate, addTypes, addVirtual, core, createConfig, defineCommand, defineModule, module, posixPath, resolvePaths, resolvePattern, resolveSource, revojs, useModule };
+export { addTemplate, addTypes, addVirtual, core, createConfig, defineCommand, defineModule, matchesConsumer, module, posixPath, resolvePaths, resolvePattern, resolveSource, revojs, useModule };

package/dist/package.js

@@ -1,6 +1,6 @@
 //#region package.json
 var name = "revojs";
-var version = "0.2.26";
+var version = "0.2.28";
 var repository = {
 	"type": "git",
 	"url": "git+https://github.com/tellua/revojs.git"

package/dist/router/index.d.ts

@@ -33,6 +33,7 @@ export declare class Router<T> {
 export declare function toSegments(route: string): string[];
 export declare function fillSegments(segments: Array<string>, parameters: Record<string, string>): string[];
 export declare function useRoute(scope: Scope): RouteContext;
+export declare function useRouteResolverContext(scope: Scope): RouteResolver;
 export declare const ROUTE_CONTEXT: import("..").Descriptor<RouteContext>;
 export declare const ROUTE_RESOLVER_CONTEXT: import("..").Descriptor<RouteResolver>;
 export declare const WILDCARD_MATCH: RegExp;

package/dist/router/index.js

@@ -109,7 +109,7 @@ var Router = class {
 		return context;
 	}
 	async resolve(scope, segments) {
-		const resolver = getContext(scope, ROUTE_RESOLVER_CONTEXT);
+		const resolver = useRouteResolverContext(scope);
 		const result = typeof resolver === "function" ? await resolver(segments) : segments;
 		return setContext(scope, ROUTE_CONTEXT, result ? this.match(result) : {
 			segments,
@@ -172,6 +172,9 @@ function fillSegments(segments, parameters) {
 function useRoute(scope) {
 	return getContext(scope, ROUTE_CONTEXT);
 }
+function useRouteResolverContext(scope) {
+	return getContext(scope, ROUTE_RESOLVER_CONTEXT);
+}
 var ROUTE_CONTEXT = defineContext("ROUTE_CONTEXT");
 var ROUTE_RESOLVER_CONTEXT = defineContext("ROUTE_RESOLVER_CONTEXT");
 var WILDCARD_MATCH = /^\[\.\.\.(.*)\]$/;
@@ -181,4 +184,4 @@ var OPTIONAL_PARAMETER_MATCH = /^\[\[(.*)\]\]$/;
 var GROUP_MATCH = /^\((.*)\)$/;
 var HOOK_MATCH = /^\+(.+)$/;
 //#endregion
-export { GROUP_MATCH, HOOK_MATCH, OPTIONAL_PARAMETER_MATCH, OPTIONAL_WILDCARD_MATCH, PARAMETER_MATCH, ROUTE_CONTEXT, ROUTE_RESOLVER_CONTEXT, Router, WILDCARD_MATCH, fillSegments, toSegments, useRoute };
+export { GROUP_MATCH, HOOK_MATCH, OPTIONAL_PARAMETER_MATCH, OPTIONAL_WILDCARD_MATCH, PARAMETER_MATCH, ROUTE_CONTEXT, ROUTE_RESOLVER_CONTEXT, Router, WILDCARD_MATCH, fillSegments, toSegments, useRoute, useRouteResolverContext };

package/dist/scope/index.d.ts

@@ -38,6 +38,7 @@ export declare function createScope(inputScope?: Mergeable<Scope>): Promise<{
         [x: string]: {} | undefined;
     } | undefined;
 } & Scope>;
+export declare function useVariableContext(scope: Scope): unknown;
 export declare function useVariables<T = typeof import("#variables")>(scope: Scope): T;
 export declare function definePlugin<T extends Plugin>(plugin: T): T;
 export declare function defineHook<T extends Hook>(name: string): Descriptor<T>;

package/dist/scope/index.js

@@ -41,15 +41,18 @@ async function createScope(inputScope) {
 		hooks: {},
 		context: {}
 	});
-	for (const source of Object.values(plugins)) for (const resolve of Object.values(source)) {
-		const plugin = await resolve();
-		if (plugin) await plugin.setup(scope);
-	}
+	const pending = new Array();
+	for (const source of Object.values(plugins)) for (const resolve of Object.values(source)) pending.push(resolve());
+	for (const plugin of await Promise.all(pending)) if (plugin) await plugin.setup(scope);
 	return scope;
 }
+function useVariableContext(scope) {
+	return getContext(scope, VARIABLE_CONTEXT);
+}
 function useVariables(scope) {
 	const normalize = (name) => name.toLowerCase().replace(/[^a-z0-9]/g, "");
-	const entries = new Map(Object.entries(getContext(scope, VARIABLE_CONTEXT)).map(([name, value]) => [normalize(name), [name, value]]));
+	const entries = /* @__PURE__ */ new Map();
+	for (const [name, value] of Object.entries(useVariableContext(scope))) entries.set(normalize(name), [name, value]);
 	for (const [name, variable] of Object.entries(variables)) {
 		const key = normalize(name);
 		let value = entries.get(key)?.[1] ?? variable.default;
@@ -74,4 +77,4 @@ function defineContext(name) {
 var VARIABLE_CONTEXT = defineContext("VARIABLE_CONTEXT");
 var STATE_CONTEXT = defineContext("STATE_CONTEXT");
 //#endregion
-export { STATE_CONTEXT, VARIABLE_CONTEXT, createRegisterHooks, createScope, defineContext, defineHook, definePlugin, dispatchHook, dispatchHookSingle, getContext, registerHook, setContext, useVariables };
+export { STATE_CONTEXT, VARIABLE_CONTEXT, createRegisterHooks, createScope, defineContext, defineHook, definePlugin, dispatchHook, dispatchHookSingle, getContext, registerHook, setContext, useVariableContext, useVariables };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "revojs",
-    "version": "0.2.26",
+    "version": "0.2.28",
     "license": "MIT",
     "repository": {
         "type": "git",