revojs 0.2.7 → 0.2.9

package/dist/{cli → commands}/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { createRunnableDevEnvironment, createServer, isRunnableDevEnvironment } from "vite";
+import { createRunnableDevEnvironment, createServer, isRunnableDevEnvironment, loadEnv } from "vite";
 import { parseArgs } from "util";
-//#region src/cli/index.ts
+//#region src/commands/index.ts
 function help() {
 	const environmentMeta = new Array();
 	for (const [name, environment] of Object.entries(server.environments)) if (isRunnableDevEnvironment(environment)) environmentMeta.push({
@@ -131,11 +131,14 @@ try {
 			}
 		});
 		if (context.values.help) help();
-		else await command.run({
-			args: context.positionals,
-			arguments: context.values,
-			environment
-		});
+		else {
+			const { createScope, VARIABLE_CONTEXT } = await environment.runner.import("revojs");
+			await command.run(await createScope({ context: { [VARIABLE_CONTEXT]: loadEnv(environment.config.mode, environment.config.envDir, "") } }), {
+				input: context.positionals,
+				arguments: context.values,
+				environment
+			});
+		}
 	} else {
 		help();
 		process.exitCode = helpRequested || command ? 0 : 1;

package/dist/index.js

@@ -1,4 +1,4 @@
 import { mimeType, mimeTypes } from "./assets/index.js";
-import { VARIABLE_CONTEXT, createRegisterHooks, createScope, defineContext, defineHook, definePlugin, dispatchHook, dispatchHookSingle, getContext, registerHook, setContext, useVariables } from "./scope/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, VARIABLE_CONTEXT, WILDCARD_MATCH, createRegisterHooks, createScope, defineContext, defineHook, definePlugin, dispatchHook, dispatchHookSingle, fillSegments, getContext, mimeType, mimeTypes, registerHook, setContext, toSegments, useRoute, useVariables };
+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 };

package/dist/module/index.d.ts

@@ -2,6 +2,7 @@ import type { parseArgs } from "node:util";
 import { type ParseArgsOptionDescriptor, type ParseArgsOptionsConfig } from "node:util";
 import type { RunnableDevEnvironment } from "vite";
 import { type PluginOption, type UserConfig } from "vite";
+import type { Scope } from "../scope/index.ts";
 import { type Awaitable, type Mergeable } from "../shared/index.ts";
 export type CommandValues<T extends ParseArgsOptionsConfig> = ReturnType<typeof parseArgs<{
     options: T;
@@ -35,14 +36,14 @@ export interface CommandArgument extends ParseArgsOptionDescriptor {
 }
 export type CommandArguments = ParseArgsOptionsConfig & Record<string, CommandArgument>;
 export interface CommandContext<T extends ParseArgsOptionsConfig = ParseArgsOptionsConfig> {
-    args: Array<string>;
+    input: Array<string>;
     arguments: CommandValues<T>;
     environment: RunnableDevEnvironment;
 }
 export interface Command<T extends ParseArgsOptionsConfig = ParseArgsOptionsConfig> {
     description?: string;
     arguments?: T;
-    run: (context: CommandContext<T>) => Awaitable<void>;
+    run: (scope: Scope, context: CommandContext<T>) => Awaitable<void>;
 }
 export type SourceFormat = "object" | "named";
 export interface Source {

package/dist/module/index.js

@@ -87,7 +87,7 @@ function useModule(source) {
 }
 async function createConfig(inputConfig) {
 	const { fromModule } = useModule(import.meta.url);
-	const defaultConfig = {
+	let config = mergeObjects(inputConfig, {
 		copy: [],
 		modules: [],
 		variables: {
@@ -120,15 +120,14 @@ async function createConfig(inputConfig) {
 			},
 			commands: {
 				match: ["**/*.{js,ts}", "!**/*.d.ts"],
-				from: ["./commands", fromModule("../../cli/commands")],
+				from: ["./commands"],
 				format: "object"
 			}
 		},
 		templates: {},
 		virtuals: {},
 		vite: {}
-	};
-	let config = mergeObjects(inputConfig, defaultConfig);
+	});
 	let index = 0;
 	while (index < config.modules.length) {
 		const module = config.modules[index];
@@ -226,7 +225,7 @@ async function core(config) {
 		},
 		async load(key) {
 			if (key.startsWith("\0")) {
-				const virtual = config.virtuals[key.slice(1)];
+				const virtual = config.virtuals[key.slice(1).split("?", 1)[0]];
 				return await virtual?.(this.environment.config.consumer);
 			}
 		}

package/dist/package.js

@@ -1,11 +1,11 @@
 //#region package.json
 var name = "revojs";
-var version = "0.2.7";
+var version = "0.2.9";
 var repository = {
 	"type": "git",
 	"url": "git+https://github.com/tellua/revojs.git"
 };
-var bin = { "revojs": "dist/cli/index.js" };
+var bin = { "revojs": "dist/commands/index.js" };
 var files = ["dist", "src/types"];
 var type = "module";
 var main = "./dist/index.js";
@@ -33,8 +33,8 @@ var scripts = {
 };
 var dependencies = {
 	"@standard-schema/spec": "^1.1.0",
-	"rolldown": "^1.2.12",
-	"vite": "^8.3.2"
+	"rolldown": "^1.2.13",
+	"vite": "^8.3.4"
 };
 var devDependencies = {
 	"@revojs/tsconfig": "*",

package/dist/scope/index.d.ts

@@ -8,6 +8,7 @@ export type Hooks<T extends Record<string, Descriptor<Hook>>> = {
     [Key in keyof T]: InferDescriptor<T[Key]>;
 };
 export type Intersection<T> = (T extends any ? (arg: T) => void : never) extends (arg: infer I) => void ? I : never;
+export type Resolvable<T> = (scope: Scope) => T;
 export type Source<T = unknown> = Record<string, Record<string, () => Promise<T>>>;
 export type SourceScope<TSource extends Source> = Extract<keyof TSource, string>;
 export type SourceValue<TSource extends Source, TScope extends SourceScope<TSource>> = Extract<keyof TSource[TScope], string>;
@@ -39,5 +40,6 @@ export declare function definePlugin<T extends Plugin>(plugin: T): T;
 export declare function defineHook<T extends Hook>(name: string): Descriptor<T>;
 export declare function defineContext<T>(name: string): Descriptor<T>;
 export declare const VARIABLE_CONTEXT: Descriptor<unknown>;
+export declare const STATE_CONTEXT: Descriptor<Record<string, unknown>>;
 declare const descriptor: unique symbol;
 export {};

package/dist/scope/index.js

@@ -72,5 +72,6 @@ function defineContext(name) {
 	return name;
 }
 var VARIABLE_CONTEXT = defineContext("VARIABLE_CONTEXT");
+var STATE_CONTEXT = defineContext("STATE_CONTEXT");
 //#endregion
-export { 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, useVariables };

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "revojs",
-    "version": "0.2.7",
+    "version": "0.2.9",
     "license": "MIT",
     "repository": {
         "type": "git",
         "url": "git+https://github.com/tellua/revojs.git"
     },
     "bin": {
-        "revojs": "dist/cli/index.js"
+        "revojs": "dist/commands/index.js"
     },
     "files": [
         "dist",
@@ -40,8 +40,8 @@
     },
     "dependencies": {
         "@standard-schema/spec": "^1.1.0",
-        "rolldown": "^1.2.12",
-        "vite": "^8.3.2"
+        "rolldown": "^1.2.13",
+        "vite": "^8.3.4"
     },
     "devDependencies": {
         "@revojs/tsconfig": "*",