wp-typia 0.20.3 → 0.20.5

package/dist-bunli/{cli-add-43f9hqev.js → cli-add-6byyahb8.js}

@@ -11,6 +11,7 @@ import {
   parseCompoundInnerBlocksPreset,
   parseTemplateLocator,
   renderScaffoldCompatibilityConfig,
+  require_semver,
   resolveExternalTemplateLayers,
   resolveLocalCliPathOption,
   resolveOptionalInteractiveExternalLayerId,
@@ -19,7 +20,7 @@ import {
   scaffoldProject,
   syncPersistenceRestArtifacts,
   updatePluginHeaderCompatibility
-} from "./cli-8rnhjvb8.js";
+} from "./cli-j1tyw390.js";
 import {
   getPackageVersions
 } from "./cli-tesygdnr.js";
@@ -84,7 +85,8 @@ import {
   resolveWorkspaceProject
 } from "./cli-pd5pqgre.js";
 import {
-  __reExport
+  __reExport,
+  __toESM
 } from "./cli-xnn9xjcy.js";
 // ../wp-typia-project-tools/src/runtime/cli-add-block.ts
 import fs2 from "fs";
@@ -639,7 +641,7 @@ async function runAddBlockCommand({
     throw new Error("`wp-typia add block --template query-loop` is not supported. Query Loop is a create-time `core/query` variation scaffold, so use `wp-typia create <project-dir> --template query-loop` instead.");
   }
   if (!isAddBlockTemplateId(templateId)) {
-    throw new Error(`Unknown add-block template "${templateId}". Expected one of: ${ADD_BLOCK_TEMPLATE_IDS.join(", ")}`);
+    throw new Error(`Unknown add-block template "${templateId}". Expected one of: ${ADD_BLOCK_TEMPLATE_IDS.join(", ")}. Run \`wp-typia templates list\` to inspect available templates.`);
   }
   const resolvedTemplateId = templateId;
   assertPersistenceFlagsAllowed(resolvedTemplateId, {
@@ -2758,7 +2760,6 @@ async function runAddRestResourceCommand({
   const validatorsFilePath = path7.join(restResourceDir, "api-validators.ts");
   const apiFilePath = path7.join(restResourceDir, "api.ts");
   const dataFilePath = path7.join(restResourceDir, "data.ts");
-  const clientFilePath = path7.join(restResourceDir, "api-client.ts");
   const phpFilePath = path7.join(workspace.projectDir, "inc", "rest", `${restResourceSlug}.php`);
   const mutationSnapshot = {
     fileSources: await snapshotWorkspaceFiles([
@@ -2811,6 +2812,7 @@ async function runAddRestResourceCommand({
   }
 }
 // ../wp-typia-project-tools/src/runtime/cli-add-workspace-ability.ts
+var import_semver = __toESM(require_semver(), 1);
 import fs4 from "fs";
 import { promises as fsp5 } from "fs";
 import path8 from "path";
@@ -2820,14 +2822,60 @@ var ABILITY_EDITOR_SCRIPT = "build/abilities/index.js";
 var ABILITY_EDITOR_ASSET = "build/abilities/index.asset.php";
 var ABILITY_REGISTRY_END_MARKER = "// wp-typia add ability entries end";
 var ABILITY_REGISTRY_START_MARKER = "// wp-typia add ability entries start";
-var WP_ABILITIES_SCRIPT_HANDLE = "wp-abilities";
-var WP_CORE_ABILITIES_SCRIPT_HANDLE = "wp-core-abilities";
+var WP_ABILITIES_PACKAGE_VERSION = "^0.10.0";
+var WP_CORE_ABILITIES_PACKAGE_VERSION = "^0.9.0";
+var WP_ABILITIES_SCRIPT_MODULE_ID = "@wordpress/abilities";
+var WP_CORE_ABILITIES_SCRIPT_MODULE_ID = "@wordpress/core-abilities";
 function escapeRegex3(value) {
   return value.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
 }
 function quotePhpString3(value) {
   return `'${value.replace(/\\/gu, "\\\\").replace(/'/gu, "\\'")}'`;
 }
+function findPhpFunctionRange2(source, functionName) {
+  const functionPattern = new RegExp(`function\\s+${escapeRegex3(functionName)}\\s*\\([^)]*\\)\\s*\\{`, "u");
+  const match = functionPattern.exec(source);
+  if (!match) {
+    return null;
+  }
+  const openingBraceIndex = match.index + match[0].length - 1;
+  let depth = 0;
+  for (let index = openingBraceIndex;index < source.length; index += 1) {
+    const character = source[index];
+    if (character === "{") {
+      depth += 1;
+    } else if (character === "}") {
+      depth -= 1;
+      if (depth === 0) {
+        const end = index + 1;
+        return {
+          end,
+          source: source.slice(match.index, end),
+          start: match.index
+        };
+      }
+    }
+  }
+  return null;
+}
+function replacePhpFunctionDefinition2(source, functionName, replacement) {
+  const functionRange = findPhpFunctionRange2(source, functionName);
+  if (!functionRange) {
+    return source;
+  }
+  return `${source.slice(0, functionRange.start)}${replacement.trimStart()}${source.slice(functionRange.end)}`;
+}
+function resolveManagedDependencyVersion(existingVersion, requiredVersion) {
+  if (!existingVersion) {
+    return requiredVersion;
+  }
+  const existingMinimum = import_semver.default.minVersion(existingVersion);
+  const requiredMinimum = import_semver.default.minVersion(requiredVersion);
+  if (!existingMinimum || !requiredMinimum) {
+    return requiredVersion;
+  }
+  return import_semver.default.gte(existingMinimum, requiredMinimum) ? existingVersion : requiredVersion;
+}
 function toPascalCaseFromAbilitySlug(abilitySlug) {
   return normalizeBlockSlug(abilitySlug).split("-").filter(Boolean).map((segment) => segment.charAt(0).toUpperCase() + segment.slice(1)).join("");
 }
@@ -2897,7 +2945,14 @@ export interface ${pascalCase}AbilityOutput {
 function buildAbilityDataSource(abilitySlug) {
   const pascalCase = toPascalCaseFromAbilitySlug(abilitySlug);
   const abilityConstBase = abilitySlug.toUpperCase().replace(/[^A-Z0-9]+/gu, "_").replace(/_{2,}/gu, "_").replace(/^_|_$/gu, "");
-  return `import abilityConfig from './ability.config.json';
+  return `import {
+	executeAbility,
+	getAbilities,
+	getAbility as getRegisteredAbility,
+} from '@wordpress/abilities';
+import '@wordpress/core-abilities';
+
+import abilityConfig from './ability.config.json';
 
 import type { ${pascalCase}AbilityInput, ${pascalCase}AbilityOutput } from './types';
 
@@ -2909,55 +2964,56 @@ interface WordPressAbilityDefinition {
 	name?: string;
 }
 
-interface WordPressAbilitiesClient {
-	executeAbility( name: string, input?: unknown ): Promise< unknown >;
-	getAbilities( args?: { category?: string } ): WordPressAbilityDefinition[];
-	getAbility( name: string ): WordPressAbilityDefinition | undefined;
-}
-
-const ABILITY_CLIENT_UNAVAILABLE_MESSAGE =
-	'The WordPress abilities client is unavailable on this screen. Ensure the Abilities API and @wordpress/core-abilities integration are loaded before using this scaffold.';
-
 export const ${abilityConstBase}_ABILITY = abilityConfig;
 export const ${abilityConstBase}_ABILITY_CATEGORY = abilityConfig.category;
 export const ${abilityConstBase}_ABILITY_ID = abilityConfig.abilityId;
 export const ${abilityConstBase}_ABILITY_META = abilityConfig.meta;
+const ABILITY_DISCOVERY_POLL_INTERVAL_MS = 50;
+const ABILITY_DISCOVERY_TIMEOUT_MS = 5000;
 
 export type {
 	${pascalCase}AbilityInput,
 	${pascalCase}AbilityOutput,
 };
 
-function resolveAbilitiesClient(): WordPressAbilitiesClient {
-	const runtime = globalThis as typeof globalThis & {
-		window?: {
-			wp?: {
-				abilities?: WordPressAbilitiesClient;
-			};
-		};
-	};
-	const client = runtime.window?.wp?.abilities;
-	if ( ! client ) {
-		throw new Error( ABILITY_CLIENT_UNAVAILABLE_MESSAGE );
-	}
+function sleep( milliseconds: number ): Promise< void > {
+	return new Promise( ( resolve ) => {
+		setTimeout( resolve, milliseconds );
+	} );
+}
 
-	return client;
+async function waitFor${pascalCase}AbilityRegistration(): Promise< void > {
+	const deadline = Date.now() + ABILITY_DISCOVERY_TIMEOUT_MS;
+	while ( ! getRegisteredAbility( ${abilityConstBase}_ABILITY_ID ) ) {
+		if ( Date.now() >= deadline ) {
+			return;
+		}
+
+		await sleep( ABILITY_DISCOVERY_POLL_INTERVAL_MS );
+	}
 }
 
-export function list${pascalCase}CategoryAbilities(): WordPressAbilityDefinition[] {
-	return resolveAbilitiesClient().getAbilities( {
+export async function list${pascalCase}CategoryAbilities(): Promise< WordPressAbilityDefinition[] > {
+	await waitFor${pascalCase}AbilityRegistration();
+
+	return getAbilities( {
 		category: ${abilityConstBase}_ABILITY_CATEGORY.slug,
-	} );
+	} ) as WordPressAbilityDefinition[];
 }
 
-export function get${pascalCase}Ability():
+export async function get${pascalCase}Ability(): Promise<
 	| WordPressAbilityDefinition
-	| undefined {
-	return resolveAbilitiesClient().getAbility( ${abilityConstBase}_ABILITY_ID );
+	| undefined
+> {
+	await waitFor${pascalCase}AbilityRegistration();
+
+	return getRegisteredAbility( ${abilityConstBase}_ABILITY_ID ) as
+		| WordPressAbilityDefinition
+		| undefined;
 }
 
-export function require${pascalCase}Ability(): WordPressAbilityDefinition {
-	const ability = get${pascalCase}Ability();
+export async function require${pascalCase}Ability(): Promise< WordPressAbilityDefinition > {
+	const ability = await get${pascalCase}Ability();
 	if ( ability ) {
 		return ability;
 	}
@@ -2973,7 +3029,9 @@ export function require${pascalCase}Ability(): WordPressAbilityDefinition {
 export async function run${pascalCase}Ability(
 	input: ${pascalCase}AbilityInput
 ): Promise< ${pascalCase}AbilityOutput > {
-	return ( await resolveAbilitiesClient().executeAbility(
+	await waitFor${pascalCase}AbilityRegistration();
+
+	return ( await executeAbility(
 		${abilityConstBase}_ABILITY_ID,
 		input
 	) ) as ${pascalCase}AbilityOutput;
@@ -2985,8 +3043,8 @@ function buildAbilityClientSource(abilitySlug) {
   return `/**
  * Re-export the typed ${pascalCase} ability client helpers.
  *
- * The underlying WordPress abilities client is expected to have been hydrated
- * by the site's admin/editor bootstrap before these helpers execute.
+ * The helper methods load the WordPress core abilities integration and wait for
+ * this server-registered ability before reading or executing it.
  */
 export * from './data';
 `;
@@ -3352,22 +3410,31 @@ function ${enqueueFunctionName}() {
 		? $asset['dependencies']
 		: array();
 
-	foreach ( array( '${WP_CORE_ABILITIES_SCRIPT_HANDLE}', '${WP_ABILITIES_SCRIPT_HANDLE}' ) as $ability_dependency ) {
-		if (
-			function_exists( 'wp_script_is' ) &&
-			wp_script_is( $ability_dependency, 'registered' ) &&
-			! in_array( $ability_dependency, $dependencies, true )
-		) {
+	foreach ( array( '${WP_CORE_ABILITIES_SCRIPT_MODULE_ID}', '${WP_ABILITIES_SCRIPT_MODULE_ID}' ) as $ability_dependency ) {
+		$has_dependency = false;
+		foreach ( $dependencies as $dependency ) {
+			$dependency_id = is_array( $dependency ) && isset( $dependency['id'] )
+				? $dependency['id']
+				: $dependency;
+			if ( $dependency_id === $ability_dependency ) {
+				$has_dependency = true;
+				break;
+			}
+		}
+		if ( ! $has_dependency ) {
 			$dependencies[] = $ability_dependency;
 		}
 	}
 
-	wp_enqueue_script(
+	if ( ! function_exists( 'wp_enqueue_script_module' ) ) {
+		return;
+	}
+
+	wp_enqueue_script_module(
 		'${workspaceBaseName}-abilities',
 		plugins_url( '${ABILITY_EDITOR_SCRIPT}', __FILE__ ),
 		$dependencies,
-		isset( $asset['version'] ) ? $asset['version'] : filemtime( $script_path ),
-		true
+		isset( $asset['version'] ) ? $asset['version'] : filemtime( $script_path )
 	);
 }
 `;
@@ -3405,6 +3472,8 @@ ${snippet}
     }
     if (!hasPhpFunctionDefinition(enqueueFunctionName)) {
       insertPhpSnippet(enqueueFunction);
+    } else if (!findPhpFunctionRange2(nextSource, enqueueFunctionName)?.source.includes("wp_enqueue_script_module")) {
+      nextSource = replacePhpFunctionDefinition2(nextSource, enqueueFunctionName, enqueueFunction);
     }
     if (!nextSource.includes(loadHook)) {
       appendPhpSnippet(loadHook);
@@ -3425,10 +3494,16 @@ async function ensureAbilityPackageScripts(workspace) {
     ...packageJson.scripts ?? {},
     "sync-abilities": packageJson.scripts?.["sync-abilities"] ?? "tsx scripts/sync-abilities.ts"
   };
-  if (JSON.stringify(nextScripts) === JSON.stringify(packageJson.scripts ?? {})) {
+  const nextDependencies = {
+    ...packageJson.dependencies ?? {},
+    [WP_ABILITIES_SCRIPT_MODULE_ID]: resolveManagedDependencyVersion(packageJson.dependencies?.[WP_ABILITIES_SCRIPT_MODULE_ID], WP_ABILITIES_PACKAGE_VERSION),
+    [WP_CORE_ABILITIES_SCRIPT_MODULE_ID]: resolveManagedDependencyVersion(packageJson.dependencies?.[WP_CORE_ABILITIES_SCRIPT_MODULE_ID], WP_CORE_ABILITIES_PACKAGE_VERSION)
+  };
+  if (JSON.stringify(nextScripts) === JSON.stringify(packageJson.scripts ?? {}) && JSON.stringify(nextDependencies) === JSON.stringify(packageJson.dependencies ?? {})) {
     return;
   }
   packageJson.scripts = nextScripts;
+  packageJson.dependencies = nextDependencies;
   await fsp5.writeFile(packageJsonPath, `${JSON.stringify(packageJson, null, "\t")}
 `, "utf8");
 }
@@ -3504,6 +3579,28 @@ async function ensureAbilityWebpackAnchors(workspace) {
     if (/['"]abilities\/index['"]/u.test(source)) {
       return source;
     }
+    const optionalModuleReturnPattern = /(function\s+getOptionalModuleEntries\s*\(\)\s*\{[\s\S]*?)(\n\treturn Object\.fromEntries\(\s*entries\s*\);\n\})/u;
+    if (optionalModuleReturnPattern.test(source)) {
+      return source.replace(optionalModuleReturnPattern, `$1
+
+	for ( const [ entryName, candidates ] of [
+		[
+			'abilities/index',
+			[ 'src/abilities/index.ts', 'src/abilities/index.js' ],
+		],
+	] ) {
+		for ( const relativePath of candidates ) {
+			const entryPath = path.resolve( process.cwd(), relativePath );
+			if ( ! fs.existsSync( entryPath ) ) {
+				continue;
+			}
+
+			entries.push( [ entryName, entryPath ] );
+			break;
+		}
+	}
+$2`);
+    }
     const sharedEntriesPattern = /for\s*\(\s*const\s+\[\s*entryName\s*,\s*candidates\s*\]\s+of\s+\[([\s\S]*?)\]\s*\)\s*\{/u;
     const match = source.match(sharedEntriesPattern);
     if (!match || !match[1].includes("bindings/index") || !match[1].includes("editor-plugins/index")) {
@@ -5040,4 +5137,4 @@ export {
   ADD_BLOCK_TEMPLATE_IDS
 };
 
-//# debugId=2B54B495F629D39264756E2164756E21
+//# debugId=497A4F5F67BAF4EF64756E2164756E21

package/dist-bunli/{cli-diagnostics-db6kxv83.js → cli-diagnostics-zecc6w1f.js}

@@ -10,7 +10,7 @@ import {
   getFailingDoctorChecks,
   isCliDiagnosticError,
   serializeCliDiagnosticError
-} from "./cli-jcd4wgam.js";
+} from "./cli-xxzpb58s.js";
 import"./cli-xnn9xjcy.js";
 export {
   serializeCliDiagnosticError,

package/dist-bunli/{cli-doctor-wnx8rv84.js → cli-doctor-2bc4sq7v.js}

@@ -4,7 +4,7 @@ import {
   formatDoctorCheckLine,
   formatDoctorSummaryLine,
   getDoctorFailureDetailLines
-} from "./cli-jcd4wgam.js";
+} from "./cli-xxzpb58s.js";
 import {
   getBuiltInTemplateLayerDirs,
   isOmittableBuiltInTemplateLayerDir
@@ -391,7 +391,8 @@ function checkWorkspaceAbilityBootstrap(projectDir, packageName, phpPrefix) {
   const hasServerGlob = source.includes(WORKSPACE_ABILITY_GLOB);
   const hasEditorScript = source.includes(WORKSPACE_ABILITY_EDITOR_SCRIPT);
   const hasEditorAsset = source.includes(WORKSPACE_ABILITY_EDITOR_ASSET);
-  return createDoctorCheck2("Ability bootstrap", hasLoaderHook && hasAdminEnqueueHook && hasEditorEnqueueHook && hasServerGlob && hasEditorScript && hasEditorAsset ? "pass" : "fail", hasLoaderHook && hasAdminEnqueueHook && hasEditorEnqueueHook && hasServerGlob && hasEditorScript && hasEditorAsset ? "Ability loader and admin/editor client bootstrap hooks are present" : "Missing ability loader hook or build/abilities script asset references");
+  const hasScriptModuleEnqueue = source.includes("wp_enqueue_script_module");
+  return createDoctorCheck2("Ability bootstrap", hasLoaderHook && hasAdminEnqueueHook && hasEditorEnqueueHook && hasServerGlob && hasEditorScript && hasEditorAsset && hasScriptModuleEnqueue ? "pass" : "fail", hasLoaderHook && hasAdminEnqueueHook && hasEditorEnqueueHook && hasServerGlob && hasEditorScript && hasEditorAsset && hasScriptModuleEnqueue ? "Ability loader and admin/editor script-module bootstrap hooks are present" : "Missing ability loader hook, script-module enqueue, or build/abilities asset references");
 }
 function checkWorkspaceAbilityIndex(projectDir, abilities) {
   const indexRelativePath = [
@@ -647,4 +648,4 @@ export {
   getDoctorChecks
 };
 
-//# debugId=1F5A1F43481D5B9164756E2164756E21
+//# debugId=DA7EC2F06C52A22464756E2164756E21