enbu 0.4.3 → 0.5.0-beta.1

package/README.md

@@ -1,6 +1,6 @@
 # enbu
 
-[日本語版 README](./README-ja.md)
+[日本語版 README](https://github.com/9wick/enbu/README-ja.md)
 
 > In martial arts, Enbu (演武) is a choreographed demonstration where practitioners perform predefined sequences of techniques. Similarly, Enbu lets you define test sequences in YAML and performs them in the browser — a rehearsal before production.
 
@@ -52,10 +52,10 @@ steps:
   - open: https://example.com/login
   - click: Login
   - fill:
-      selector: Email
+      text: Email
       value: user@example.com
   - fill:
-      selector: Password
+      text: Password
       value: password123
   - click: Submit
   - assertVisible: Dashboard
@@ -84,12 +84,12 @@ steps:
 
 ```yaml
 steps:
-  # Semantic selector (text, label, ARIA role, etc.)
+  # Text selector
   - click: Login
 
   # CSS selector
-  - click: "#submit-button"
-  - click: "[data-testid='add-to-cart']"
+  - click:
+      css: "#submit-button"
 ```
 
 ### Text Input
@@ -98,12 +98,12 @@ steps:
 steps:
   # fill: Clear input field then type
   - fill:
-      selector: Username
+      text: Username
       value: John Doe
 
   # type: Append to existing text
   - type:
-      selector: Search box
+      text: Search box
       value: Additional text
 ```
 
@@ -136,7 +136,7 @@ steps:
 
   # Assert checkbox is not checked
   - assertChecked:
-      selector: Optional feature
+      text: Optional feature
       checked: false
 ```
 
@@ -153,15 +153,6 @@ steps:
       full: true
 ```
 
-### Snapshot (for debugging)
-
-```yaml
-steps:
-  - snapshot: {}
-```
-
-Captures the accessibility tree of the current page. Useful for debugging element selection.
-
 ### Scroll
 
 ```yaml
@@ -184,7 +175,7 @@ steps:
 
   # Wait for element to be visible
   - wait:
-      selector: "#loading-complete"
+      css: "#loading-complete"
 
   # Wait for text to appear
   - wait:
@@ -245,9 +236,11 @@ Each example includes a working Express server and `.enbuflow/` test files. See
 You can use environment variables in your flows:
 
 ```yaml
+env:
+  PASSWORD: secret123
 steps:
   - fill:
-      selector: Password
+      text: Password
       value: ${PASSWORD}
 ```
 
@@ -265,8 +258,12 @@ npx enbu --env PASSWORD=secret123
 ```yaml
 env:
   BASE_URL: https://staging.example.com
+  PASSWORD: secret123
 steps:
   - open: ${BASE_URL}/login
+  - fill:
+      text: Password
+      value: ${PASSWORD}
 ```
 
 ## CLI Options

package/dist/main.mjs

@@ -6,6 +6,7 @@ import { basename, join, posix, resolve, win32 } from "node:path";
 import { access, lstat, mkdir, readFile, readdir, readlink, realpath, writeFile } from "node:fs/promises";
 import * as actualFS from "node:fs";
 import { constants } from "node:fs";
+import { createHash } from "node:crypto";
 import { fileURLToPath } from "node:url";
 import { lstatSync, readdir as readdir$1, readdirSync, readlinkSync, realpathSync } from "fs";
 import { EventEmitter } from "node:events";
@@ -1142,7 +1143,7 @@ For more information, visit: https://github.com/9wick/enbu
 * フォールバック値として'0.0.0-dev'を使用します。
 */
 const showVersion = () => {
-	process.stdout.write(`0.4.3\n`);
+	process.stdout.write(`0.5.0-beta.1\n`);
 };
 
 //#endregion
@@ -14331,7 +14332,7 @@ var require_public_api = /* @__PURE__ */ __commonJSMin(((exports) => {
 		}
 		return doc;
 	}
-	function parse(src, reviver, options) {
+	function parse$1(src, reviver, options) {
 		let _reviver = void 0;
 		if (typeof reviver === "function") _reviver = reviver;
 		else if (options === void 0 && reviver && typeof reviver === "object") options = reviver;
@@ -14358,7 +14359,7 @@ var require_public_api = /* @__PURE__ */ __commonJSMin(((exports) => {
 		if (identity$1.isDocument(value) && !_replacer) return value.toString(options);
 		return new Document$1.Document(value, _replacer, options).toString(options);
 	}
-	exports.parse = parse;
+	exports.parse = parse$1;
 	exports.parseAllDocuments = parseAllDocuments;
 	exports.parseDocument = parseDocument;
 	exports.stringify = stringify;
@@ -14572,6 +14573,21 @@ function _joinExpects(values$1, separator) {
 	return list[0] ?? "never";
 }
 /**
+* A Valibot error with useful information.
+*/
+var ValiError = class extends Error {
+	/**
+	* Creates a Valibot error with useful information.
+	*
+	* @param issues The error issues.
+	*/
+	constructor(issues) {
+		super(issues[0].message);
+		this.name = "ValiError";
+		this.issues = issues;
+	}
+};
+/**
 * Creates a brand transformation action.
 *
 * @param name The brand name.
@@ -15039,6 +15055,20 @@ function unknown() {
 		}
 	};
 }
+/**
+* Parses an unknown input based on a schema.
+*
+* @param schema The schema to be used.
+* @param input The input to be parsed.
+* @param config The parse configuration.
+*
+* @returns The parsed input.
+*/
+function parse(schema$6, input, config$1) {
+	const dataset = schema$6["~run"]({ value: input }, /* @__PURE__ */ getGlobalConfig(config$1));
+	if (dataset.issues) throw new ValiError(dataset.issues);
+	return dataset.value;
+}
 /* @__NO_SIDE_EFFECTS__ */
 function pipe(...pipe$1) {
 	return {
@@ -15977,6 +16007,11 @@ const resolveEnvVariables = (rawFlow, processEnv, dotEnv) => {
 * - Runtime版スキーマのみを定義（brand/metadata込み）
 * - JSON Schema生成には typeMode: 'input' を使用
 *
+* 入出力変換:
+* - YAML入力では `text` キーを使用
+* - InteractableSelectorSpecSchema: text → interactableText に変換
+* - AnySelectorSpecSchema: text → anyText に変換
+*
 * 各セレクタはBranded Typeスキーマを使用し、format検証も行う。
 * これにより1段階で形式検証 + Branded Type化が完了する。
 *
@@ -15993,25 +16028,12 @@ const resolveEnvVariables = (rawFlow, processEnv, dotEnv) => {
 */
 const CssSelectorSchema$1 = object({ css: pipe(CssSelectorSchema, description("Specify element by CSS selector"), metadata({ exampleValues: ["#login-button", ".submit-btn"] })) });
 /**
-* InteractableTextセレクタスキーマ
-*
-* インタラクティブ要素（ボタン、リンク、入力欄等）をテキスト内容で検索する。
-* click, fill, type, hover, select, assertEnabled, assertChecked で使用。
-* 例: { interactableText: "Login" }
-*
-* 出力はBranded Type (InteractableTextSelector)
-*/
-const InteractableTextSelectorSchema$1 = object({ interactableText: pipe(InteractableTextSelectorSchema, description("Search for interactive elements by text content"), metadata({ exampleValues: ["Login", "Submit"] })) });
-/**
-* AnyTextセレクタスキーマ
-*
-* 全ての要素（静的テキスト含む）をテキスト内容で検索する。
-* assertVisible, assertNotVisible, scrollIntoView, wait で使用。
-* 例: { anyText: "Welcome" }
+* テキストセレクタ入力スキーマ（YAML入力用）
 *
-* 出力はBranded Type (AnyTextSelector)
+* ユーザーは text キーで指定し、内部で用途に応じて
+* interactableText または anyText に変換される。
 */
-const AnyTextSelectorSchema$1 = object({ anyText: pipe(AnyTextSelectorSchema, description("Search for any elements by text content"), metadata({ exampleValues: ["Welcome", "Error message"] })) });
+const TextInputSchema = object({ text: pipe(string(), minLength(1, "textセレクタは空文字列にできません"), description("テキスト内容で要素を検索"), metadata({ exampleValues: ["ログイン", "送信"] })) });
 /**
 * XPathセレクタスキーマ
 *
@@ -16024,26 +16046,31 @@ const XpathSelectorSchema$1 = object({ xpath: pipe(XpathSelectorSchema, descript
 /**
 * インタラクティブ要素用セレクタ指定スキーマ
 *
-* css, interactableText, xpath のいずれか1つのみを指定する。
+* 入力: css, text, xpath のいずれか1つのみを指定する。
+* text入力の場合、transformで `{ interactableText: ... }` に変換される。
 * click, fill, type, hover, select, assertEnabled, assertChecked で使用。
 */
-const InteractableSelectorSpecSchema = union([
+const InteractableSelectorSpecSchema = pipe(union([
 	CssSelectorSchema$1,
-	InteractableTextSelectorSchema$1,
+	TextInputSchema,
 	XpathSelectorSchema$1
-]);
+]), transform((input) => M(input).with({ text: z.string }, ({ text }) => {
+	return { interactableText: parse(InteractableTextSelectorSchema, text) };
+}).with({ css: z._ }, (cssInput) => cssInput).with({ xpath: z._ }, (xpathInput) => xpathInput).exhaustive()));
 /**
 * 全要素用セレクタ指定スキーマ
 *
-* css, anyText, xpath のいずれか1つのみを指定する。
+* 入力: css, text, xpath のいずれか1つのみを指定する。
+* text入力の場合、transformで `{ anyText: ... }` に変換される。
 * assertVisible, assertNotVisible, scrollIntoView, wait で使用。
 */
-const AnySelectorSpecSchema = union([
+const AnySelectorSpecSchema = pipe(union([
 	CssSelectorSchema$1,
-	AnyTextSelectorSchema$1,
+	TextInputSchema,
 	XpathSelectorSchema$1
-]);
-union([InteractableSelectorSpecSchema, AnySelectorSpecSchema]);
+]), transform((input) => M(input).with({ text: z.string }, ({ text }) => {
+	return { anyText: parse(AnyTextSelectorSchema, text) };
+}).with({ css: z._ }, (cssInput) => cssInput).with({ xpath: z._ }, (xpathInput) => xpathInput).exhaustive()));
 /**
 * Clickコマンドスキーマ定義
 *
@@ -16287,10 +16314,12 @@ const WaitCssSchema = pipe(object({ wait: object({ css: pipe(CssSelectorSchema,
 	command: "wait",
 	css: input.wait.css
 })));
-const WaitAnyTextSchema = pipe(object({ wait: object({ anyText: pipe(AnyTextSelectorSchema, description("Search for any elements by text content"), metadata({ exampleValues: ["Login", "Submit"] })) }) }), metadata({ description: "Wait until element specified by text is visible" }), transform((input) => ({
-	command: "wait",
-	anyText: input.wait.anyText
-})));
+const WaitTextSchema = pipe(object({ wait: object({ text: pipe(string(), minLength(1, "textセレクタは空文字列にできません"), description("テキスト内容で要素を検索"), metadata({ exampleValues: ["ログイン", "送信"] })) }) }), metadata({ description: "Wait until element specified by text is visible" }), transform((input) => {
+	return {
+		command: "wait",
+		anyText: parse(AnyTextSelectorSchema, input.wait.text)
+	};
+}));
 const WaitXpathSchema = pipe(object({ wait: object({ xpath: pipe(XpathSelectorSchema, description("Specify element by XPath"), metadata({ exampleValues: ["//button[@type='submit']"] })) }) }), metadata({ description: "Wait until element specified by XPath is visible" }), transform((input) => ({
 	command: "wait",
 	xpath: input.wait.xpath
@@ -16318,7 +16347,7 @@ const WaitFnSchema = pipe(object({ wait: object({ fn: pipe(JsExpressionSchema, d
 const WaitYamlSchema = pipe(union([
 	WaitMsSchema,
 	WaitCssSchema,
-	WaitAnyTextSchema,
+	WaitTextSchema,
 	WaitXpathSchema,
 	WaitLoadSchema,
 	WaitUrlSchema,
@@ -16487,16 +16516,20 @@ const AssertCheckedCssSchema = pipe(object({ assertChecked: object({
 	checked: input.assertChecked.checked ?? UseDefault
 })));
 /**
-* assertChecked: { interactableText: "...", checked?: boolean }
+* assertChecked: { text: "...", checked?: boolean }
+*
+* YAML入力形式は text を使用し、内部で interactableText に変換される。
 */
-const AssertCheckedInteractableTextSchema = pipe(object({ assertChecked: object({
-	interactableText: pipe(InteractableTextSelectorSchema, description("インタラクティブ要素をテキスト内容で検索"), metadata({ exampleValues: ["Agree to terms", "Enable email notifications"] })),
+const AssertCheckedTextSchema = pipe(object({ assertChecked: object({
+	text: pipe(string(), minLength(1, "textセレクタは空文字列にできません"), description("テキスト内容で要素を検索"), metadata({ exampleValues: ["同意する", "通知を有効にする"] })),
 	checked: CheckedFieldSchema
-}) }), metadata({ description: "テキストで要素を指定してチェック状態を検証" }), transform((input) => ({
-	command: "assertChecked",
-	interactableText: input.assertChecked.interactableText,
-	checked: input.assertChecked.checked ?? UseDefault
-})));
+}) }), metadata({ description: "テキストで要素を指定してチェック状態を検証" }), transform((input) => {
+	return {
+		command: "assertChecked",
+		interactableText: parse(InteractableTextSelectorSchema, input.assertChecked.text),
+		checked: input.assertChecked.checked ?? UseDefault
+	};
+}));
 /**
 * assertChecked: { xpath: "...", checked?: boolean }
 */
@@ -16513,10 +16546,12 @@ const AssertCheckedXpathSchema = pipe(object({ assertChecked: object({
 *
 * 3種類のセレクタをunionで組み合わせる。
 * checkedが省略された場合はUseDefaultになる。
+*
+* 注意: text キーを入力として受け入れ、内部で interactableText に変換する。
 */
 const AssertCheckedDetailedSchema = union([
 	AssertCheckedCssSchema,
-	AssertCheckedInteractableTextSchema,
+	AssertCheckedTextSchema,
 	AssertCheckedXpathSchema
 ]);
 /**
@@ -16565,16 +16600,20 @@ const TypeCssSchema = pipe(object({ type: object({
 	value: input.type.value
 })));
 /**
-* type: { interactableText: "...", value: "..." }
+* type: { text: "...", value: "..." }
+*
+* YAML入力形式は text を使用し、内部で interactableText に変換される。
 */
-const TypeInteractableTextSchema = pipe(object({ type: object({
-	interactableText: pipe(InteractableTextSelectorSchema, description("Search for interactive elements by text content"), metadata({ exampleValues: ["Email address", "Username"] })),
+const TypeTextSchema = pipe(object({ type: object({
+	text: pipe(string(), minLength(1, "textセレクタは空文字列にできません"), description("テキスト内容で要素を検索"), metadata({ exampleValues: ["メールアドレス", "ユーザー名"] })),
 	value: TypeValueSchema
-}) }), metadata({ description: "Input to element specified by text" }), transform((input) => ({
-	command: "type",
-	interactableText: input.type.interactableText,
-	value: input.type.value
-})));
+}) }), metadata({ description: "Input to element specified by text" }), transform((input) => {
+	return {
+		command: "type",
+		interactableText: parse(InteractableTextSelectorSchema, input.type.text),
+		value: input.type.value
+	};
+}));
 /**
 * type: { xpath: "...", value: "..." }
 */
@@ -16596,7 +16635,7 @@ const TypeXpathSchema = pipe(object({ type: object({
 */
 const TypeYamlSchema = pipe(union([
 	TypeCssSchema,
-	TypeInteractableTextSchema,
+	TypeTextSchema,
 	TypeXpathSchema
 ]), description("要素にテキストを入力する（既存テキストに追加）"), metadata({ category: "Input" }));
 /**
@@ -16615,16 +16654,20 @@ const FillCssSchema = pipe(object({ fill: object({
 	value: input.fill.value
 })));
 /**
-* fill: { interactableText: "...", value: "..." }
+* fill: { text: "...", value: "..." }
+*
+* YAML入力形式は text を使用し、内部で interactableText に変換される。
 */
-const FillInteractableTextSchema = pipe(object({ fill: object({
-	interactableText: pipe(InteractableTextSelectorSchema, description("Search for interactive elements by text content"), metadata({ exampleValues: ["Email address", "Password"] })),
+const FillTextSchema = pipe(object({ fill: object({
+	text: pipe(string(), minLength(1, "textセレクタは空文字列にできません"), description("テキスト内容で要素を検索"), metadata({ exampleValues: ["メールアドレス", "パスワード"] })),
 	value: FillValueSchema
-}) }), metadata({ description: "Fill element specified by text" }), transform((input) => ({
-	command: "fill",
-	interactableText: input.fill.interactableText,
-	value: input.fill.value
-})));
+}) }), metadata({ description: "Fill element specified by text" }), transform((input) => {
+	return {
+		command: "fill",
+		interactableText: parse(InteractableTextSelectorSchema, input.fill.text),
+		value: input.fill.value
+	};
+}));
 /**
 * fill: { xpath: "...", value: "..." }
 */
@@ -16646,7 +16689,7 @@ const FillXpathSchema = pipe(object({ fill: object({
 */
 const FillYamlSchema = pipe(union([
 	FillCssSchema,
-	FillInteractableTextSchema,
+	FillTextSchema,
 	FillXpathSchema
 ]), description("要素にテキストを入力する（既存テキストをクリアして入力）"), metadata({ category: "Input" }));
 /**
@@ -16665,16 +16708,20 @@ const SelectCssSchema = pipe(object({ select: object({
 	value: input.select.value
 })));
 /**
-* select: { interactableText: "...", value: "..." }
+* select: { text: "...", value: "..." }
+*
+* YAML入力形式は text を使用し、内部で interactableText に変換される。
 */
-const SelectInteractableTextSchema = pipe(object({ select: object({
-	interactableText: pipe(InteractableTextSelectorSchema, description("Search for interactive elements by text content"), metadata({ exampleValues: ["Select country", "Language"] })),
+const SelectTextSchema = pipe(object({ select: object({
+	text: pipe(string(), minLength(1, "textセレクタは空文字列にできません"), description("テキスト内容で要素を検索"), metadata({ exampleValues: ["国選択", "言語"] })),
 	value: SelectValueSchema
-}) }), metadata({ description: "Select option from element specified by text" }), transform((input) => ({
-	command: "select",
-	interactableText: input.select.interactableText,
-	value: input.select.value
-})));
+}) }), metadata({ description: "Select option from element specified by text" }), transform((input) => {
+	return {
+		command: "select",
+		interactableText: parse(InteractableTextSelectorSchema, input.select.text),
+		value: input.select.value
+	};
+}));
 /**
 * select: { xpath: "...", value: "..." }
 */
@@ -16696,7 +16743,7 @@ const SelectXpathSchema = pipe(object({ select: object({
 */
 const SelectYamlSchema = pipe(union([
 	SelectCssSchema,
-	SelectInteractableTextSchema,
+	SelectTextSchema,
 	SelectXpathSchema
 ]), description("セレクトボックスからオプションを選択する"), metadata({ category: "Input" }));
 /**
@@ -17160,13 +17207,18 @@ const buildRawFlowData = (root) => ({
 });
 /**
 * 解決済みRawFlowDataからFlowを構築する
+*
+* @param resolvedRawFlow - 環境変数解決済みのRawFlowData
+* @param filePath - フローファイルの絶対パス
+* @returns 成功時: Flowオブジェクト、失敗時: ParseError
 */
-const buildFlow = (resolvedRawFlow, fileName) => validateCommands(resolvedRawFlow.steps).map((validatedCommands) => ({
-	name: fileName.replace(/\.enbu\.yaml$/, ""),
+const buildFlow = (resolvedRawFlow, filePath) => validateCommands(resolvedRawFlow.steps).map((validatedCommands) => ({
+	name: path.basename(filePath).replace(/\.enbu\.yaml$/, ""),
 	env: resolvedRawFlow.env,
-	steps: validatedCommands
+	steps: validatedCommands,
+	filePath
 }));
-const parseFlowYaml = (yamlContent, fileName, processEnv, dotEnv) => safeYamlParse(yamlContent).andThen(validateRootStructure).map(buildRawFlowData).andThen((rawFlow) => resolveEnvVariables(rawFlow, processEnv, dotEnv)).andThen((resolvedRawFlow) => buildFlow(resolvedRawFlow, fileName));
+const parseFlowYaml = (yamlContent, filePath, processEnv, dotEnv) => safeYamlParse(yamlContent).andThen(validateRootStructure).map(buildRawFlowData).andThen((rawFlow) => resolveEnvVariables(rawFlow, processEnv, dotEnv)).andThen((resolvedRawFlow) => buildFlow(resolvedRawFlow, filePath));
 /**
 * SelectorSpecまたはResolvedSelectorSpecからセレクタ文字列を取得する
 *
@@ -18696,6 +18748,25 @@ const executeFlow = (flow, options) => {
 * eslint.config.mjsで除外設定済み。
 */
 /**
+* ファイルパスからセッション名を生成する
+*
+* ファイルパスに基づいて一意のセッション名を生成する。
+* SHA-256ハッシュの先頭6文字を使用し、衝突確率を低く抑えながら
+* 識別しやすい長さのセッション名を生成する。
+*
+* @param filePath - フローファイルの絶対パス
+* @returns `enbu-{flowName}-{hash}` 形式のセッション名
+*
+* @example
+* ```typescript
+* generateSessionNameFromPath('/path/to/login.enbu.yaml')
+* // => 'enbu-login-a1b2c3'
+* ```
+*/
+const generateSessionNameFromPath = (filePath) => {
+	return `enbu-${basename(filePath).replace(/\.enbu\.yaml$/, "")}-${createHash("sha256").update(filePath).digest("hex").slice(0, 6)}`;
+};
+/**
 * ScreenshotResultからパスを取得する
 *
 * スクリーンショットが撮影成功した場合はパスを返し、
@@ -18744,12 +18815,11 @@ const discoverFlowFiles = (files, cwd) => {
 * @returns 成功時: Flowオブジェクト、失敗時: OrchestratorError
 */
 const loadSingleFlow = (filePath, processEnv, inputEnv) => {
-	const fileName = basename(filePath);
 	return import_index_cjs$1.ResultAsync.fromPromise(readFile(filePath, "utf-8"), (error) => ({
 		type: "load_error",
 		message: `Failed to read file: ${error instanceof Error ? error.message : String(error)}`,
 		filePath
-	})).andThen((yamlContent) => parseFlowYaml(yamlContent, fileName, processEnv, inputEnv).mapErr((error) => ({
+	})).andThen((yamlContent) => parseFlowYaml(yamlContent, filePath, processEnv, inputEnv).mapErr((error) => ({
 		type: "load_error",
 		message: formatParseErrorMessage(error),
 		filePath
@@ -18784,16 +18854,20 @@ const loadAllFlows = (flowFiles, processEnv, inputEnv) => {
 /**
 * FlowExecutionOptionsを構築する
 *
+* @param flow - 実行対象のフロー
 * @param input - 実行オプション
 * @param cwd - 作業ディレクトリ
 * @returns FlowExecutionOptions
 */
-const buildFlowExecutionOptions = (input, cwd) => {
+const buildFlowExecutionOptions = (flow, input, cwd) => {
 	return {
 		session: input.sessionName !== void 0 ? {
 			type: "name",
 			value: input.sessionName
-		} : { type: "default" },
+		} : {
+			type: "name",
+			value: generateSessionNameFromPath(flow.filePath)
+		},
 		headed: input.headed ?? DEFAULT_OPTIONS.headed,
 		env: input.env ?? DEFAULT_OPTIONS.env,
 		commandTimeoutMs: input.commandTimeoutMs ?? DEFAULT_OPTIONS.commandTimeoutMs,
@@ -18838,7 +18912,7 @@ const notifyFlowProgress = async (input, flowName, status, duration, stepTotal)
 const executeSingleFlow = async (flow, input) => {
 	const startTime = Date.now();
 	await notifyFlowProgress(input, flow.name, "start", 0, flow.steps.length);
-	return (await executeFlow(flow, buildFlowExecutionOptions(input, input.cwd))).match(async (flowResult) => {
+	return (await executeFlow(flow, buildFlowExecutionOptions(flow, input, input.cwd))).match(async (flowResult) => {
 		const duration = Date.now() - startTime;
 		const status = flowResult.status;
 		await notifyFlowProgress(input, flow.name, status, duration, void 0);