@zhin.js/command 1.0.3 → 1.0.4

package/lib/provider.js

@@ -1,4 +1,4 @@
-import { basename, join, parse } from 'node:path';
+import { basename, join, parse, sep } from 'node:path';
 import { featureId } from '@zhin.js/plugin-runtime';
 import { defineFeatureProvider, } from '@zhin.js/feature-kit';
 import { CommandIndex } from './command-index.js';
@@ -20,6 +20,23 @@ const commandFiles = {
 async function* discoverCommandDirectory(context, directory, ancestors) {
     const entries = [...await context.host.list(directory)]
         .sort((left, right) => left.name < right.name ? -1 : left.name > right.name ? 1 : 0);
+    const files = entries.flatMap((entry) => {
+        if (entry.kind !== 'file')
+            return [];
+        const parsed = parseCommandFile(entry.name);
+        return parsed ? [{ entry, parsed }] : [];
+    });
+    const preferJavaScript = context.packageRoot
+        .split(sep)
+        .includes('node_modules');
+    const preferredFiles = new Map();
+    for (const { entry, parsed } of files) {
+        const current = preferredFiles.get(parsed.localSegment);
+        if (!current || commandFilePriority(entry.name, preferJavaScript)
+            < commandFilePriority(current, preferJavaScript)) {
+            preferredFiles.set(parsed.localSegment, entry.name);
+        }
+    }
     for (const entry of entries) {
         if (entry.kind === 'directory' && isCommandSegment(entry.name)) {
             yield* discoverCommandDirectory(context, join(directory, entry.name), [...ancestors, entry.name]);
@@ -30,6 +47,8 @@ async function* discoverCommandDirectory(context, directory, ancestors) {
         const file = parseCommandFile(entry.name);
         if (!file)
             continue;
+        if (preferredFiles.get(file.localSegment) !== entry.name)
+            continue;
         yield {
             localName: [...ancestors, file.localSegment].join('/'),
             source: join(directory, entry.name),
@@ -40,7 +59,7 @@ async function* discoverCommandDirectory(context, directory, ancestors) {
 function isCommandSegment(value) {
     return /^[a-z0-9][a-z0-9-]*$/.test(value);
 }
-const dynamicCommandFilePattern = /^\[([a-z][a-zA-Z0-9]*):([a-z][a-z0-9-]*)(?:=([^\]]*))?\]\.tsx?$/;
+const dynamicCommandFilePattern = /^\[([a-z][a-zA-Z0-9]*):([a-z][a-z0-9-]*)(?:=([^\]]*))?\]\.(?:tsx?|[cm]?js)$/;
 const commandParameterTypes = new Set([
     'string',
     'number',
@@ -58,7 +77,7 @@ const commandParameterTypes = new Set([
     'rps',
 ]);
 function parseCommandFile(value) {
-    if (/^[a-z0-9][a-z0-9-]*\.tsx?$/.test(value)) {
+    if (/^[a-z0-9][a-z0-9-]*\.(?:tsx?|[cm]?js)$/.test(value)) {
         return { localSegment: parse(value).name };
     }
     const match = dynamicCommandFilePattern.exec(value);
@@ -79,6 +98,14 @@ function parseCommandFile(value) {
     }
     return undefined;
 }
+function commandFilePriority(value, preferJavaScript) {
+    const extension = value.slice(value.lastIndexOf('.') + 1);
+    const order = preferJavaScript
+        ? ['js', 'mjs', 'cjs', 'ts', 'tsx']
+        : ['ts', 'tsx', 'js', 'mjs', 'cjs'];
+    const priority = order.indexOf(extension);
+    return priority < 0 ? Number.MAX_SAFE_INTEGER : priority;
+}
 function parseParameterValue(name, type, value, source) {
     if (type === 'string' || type === 'word' || type === 'text')
         return value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/command",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Convention-based Command Feature for Zhin Plugin Runtime",
   "type": "module",
   "main": "./lib/index.js",
@@ -18,7 +18,7 @@
   ],
   "dependencies": {
     "segment-matcher": "^1.0.5",
-    "@zhin.js/feature-kit": "1.0.3",
+    "@zhin.js/feature-kit": "1.0.4",
     "@zhin.js/plugin-runtime": "1.1.1"
   },
   "devDependencies": {

package/src/provider.ts

@@ -1,4 +1,4 @@
-import { basename, join, parse } from 'node:path';
+import { basename, join, parse, sep } from 'node:path';
 import { featureId } from '@zhin.js/plugin-runtime';
 import {
   defineFeatureProvider,
@@ -38,6 +38,22 @@ async function* discoverCommandDirectory(
 ): AsyncIterable<DiscoveredSource> {
   const entries = [...await context.host.list(directory)]
     .sort((left, right) => left.name < right.name ? -1 : left.name > right.name ? 1 : 0);
+  const files = entries.flatMap((entry) => {
+    if (entry.kind !== 'file') return [];
+    const parsed = parseCommandFile(entry.name);
+    return parsed ? [{ entry, parsed }] : [];
+  });
+  const preferJavaScript = context.packageRoot
+    .split(sep)
+    .includes('node_modules');
+  const preferredFiles = new Map<string, string>();
+  for (const { entry, parsed } of files) {
+    const current = preferredFiles.get(parsed.localSegment);
+    if (!current || commandFilePriority(entry.name, preferJavaScript)
+      < commandFilePriority(current, preferJavaScript)) {
+      preferredFiles.set(parsed.localSegment, entry.name);
+    }
+  }
   for (const entry of entries) {
     if (entry.kind === 'directory' && isCommandSegment(entry.name)) {
       yield* discoverCommandDirectory(
@@ -50,6 +66,7 @@ async function* discoverCommandDirectory(
     if (entry.kind !== 'file') continue;
     const file = parseCommandFile(entry.name);
     if (!file) continue;
+    if (preferredFiles.get(file.localSegment) !== entry.name) continue;
     yield {
       localName: [...ancestors, file.localSegment].join('/'),
       source: join(directory, entry.name),
@@ -68,7 +85,7 @@ interface ParsedCommandFile {
 }
 
 const dynamicCommandFilePattern =
-  /^\[([a-z][a-zA-Z0-9]*):([a-z][a-z0-9-]*)(?:=([^\]]*))?\]\.tsx?$/;
+  /^\[([a-z][a-zA-Z0-9]*):([a-z][a-z0-9-]*)(?:=([^\]]*))?\]\.(?:tsx?|[cm]?js)$/;
 
 const commandParameterTypes = new Set<CommandParameterType>([
   'string',
@@ -88,7 +105,7 @@ const commandParameterTypes = new Set<CommandParameterType>([
 ]);
 
 function parseCommandFile(value: string): ParsedCommandFile | undefined {
-  if (/^[a-z0-9][a-z0-9-]*\.tsx?$/.test(value)) {
+  if (/^[a-z0-9][a-z0-9-]*\.(?:tsx?|[cm]?js)$/.test(value)) {
     return { localSegment: parse(value).name };
   }
   const match = dynamicCommandFilePattern.exec(value);
@@ -110,6 +127,15 @@ function parseCommandFile(value: string): ParsedCommandFile | undefined {
   return undefined;
 }
 
+function commandFilePriority(value: string, preferJavaScript: boolean): number {
+  const extension = value.slice(value.lastIndexOf('.') + 1);
+  const order = preferJavaScript
+    ? ['js', 'mjs', 'cjs', 'ts', 'tsx']
+    : ['ts', 'tsx', 'js', 'mjs', 'cjs'];
+  const priority = order.indexOf(extension);
+  return priority < 0 ? Number.MAX_SAFE_INTEGER : priority;
+}
+
 function parseParameterValue(
   name: string,
   type: CommandParameterType,