@nyar/valkyrie 0.0.0 → 0.0.14

package/README.md

@@ -0,0 +1,34 @@
+# @nyar/valkyrie
+
+Valkyrie npm 包装层。安装后提供 `asgard` 与 `legion` 两个命令；命令的参数解析、
+编译与执行由 `valkyrie-napi` 原生绑定承担，Rust 实现位于
+`projects/nyar.rs/languages/rusty-valkyrie`，绑定 crate 为
+`projects/nyar.rs/ffis/valkyrie-napi`。本包不重复实现 CLI 或编译逻辑。
+
+## 依赖顺序
+
+```text
+@nyar/valkyrie ──► @nyar/valkyrie-<platform> ──► valkyrie-napi ──► rusty-valkyrie product
+```
+
+平台包按当前 OS/arch 选择；`@nyar/valkyrie` 不依赖 `@nyar/nyar`，Nyar 宿主 API
+与 Valkyrie 产品面各自独立。
+
+## 用法
+
+```bash
+legion --help
+asgard --help
+```
+
+`--help` / `--version` 等选项由 Rust 侧解析，JS 入口只转发命令名与 argv。
+
+## 导出
+
+- `PACKAGE_NAME` / `PACKAGE_VERSION`：包装层身份与版本
+- `COMMANDS`：本包提供的命令名
+- `runValkyrieCli`：来自本包 `valkyrie-napi` 绑定的命令执行入口
+
+## License
+
+MIT

package/bin/asgard.mjs

@@ -1,4 +1,4 @@
-#!/usr/bin/env node --experimental-strip-types
+#!/usr/bin/env node
 /**
  * `asgard` 命令入口。
  *
@@ -6,6 +6,6 @@
  * 转发命令名与 argv，不复制 `--help` / `--version` 等 CLI 语义。
  */
 
-import {runValkyrieCli} from '../src/index.ts';
+import {runValkyrieCli} from '../dist/index.js';
 
 process.exit(await runValkyrieCli('asgard', process.argv.slice(2)));

package/bin/legion.mjs

@@ -1,4 +1,4 @@
-#!/usr/bin/env node --experimental-strip-types
+#!/usr/bin/env node
 /**
  * `legion` 命令入口。
  *
@@ -6,6 +6,6 @@
  * 转发命令名与 argv，不复制 `--help` / `--version` 等 CLI 语义。
  */
 
-import {runValkyrieCli} from '../src/index.ts';
+import {runValkyrieCli} from '../dist/index.js';
 
 process.exit(await runValkyrieCli('legion', process.argv.slice(2)));

package/dist/index.js

@@ -0,0 +1,20 @@
+/**
+ * `@nyar/valkyrie` —— Valkyrie npm 包装层。
+ *
+ * 本包只声明命令与导出身份；CLI 解析、编译与平台绑定选择全部委托给
+ * `valkyrie-napi`，Rust 实现位于 `projects/nyar.rs/languages/rusty-valkyrie`。
+ */
+
+/** npm 包名。 */
+export const PACKAGE_NAME = '@nyar/valkyrie';
+
+/** 包装层版本。 */
+export const PACKAGE_VERSION = '0.0.14';
+
+/** 本包安装后提供的命令。 */
+export const COMMANDS = ['legion', 'asgard']         ;
+
+/** 命令名。 */
+                                                
+
+export {runValkyrieCli,                     } from './native.js';

package/dist/native.js

@@ -0,0 +1,99 @@
+import {createRequire} from 'node:module';
+import {existsSync} from 'node:fs';
+import {arch, platform} from 'node:os';
+import path from 'node:path';
+import {fileURLToPath} from 'node:url';
+
+/** Valkyrie 编译器 CLI 产品名。 */
+                                                  
+
+/** `valkyrie-napi` 导出的产品面。 */
+                            
+                                                            
+  
+
+const pkgRoot = path.dirname(fileURLToPath(import.meta.url));
+const require = createRequire(import.meta.url);
+
+/** Host triple used for platform-named native binaries (`valkyrie.<triple>.node`). */
+export function platformTriple()         {
+    const os = platform();
+    const cpu = arch();
+    if (os === 'win32' && cpu === 'x64') return 'win32-x64-msvc';
+    if (os === 'linux' && cpu === 'x64') return 'linux-x64-gnu';
+    if (os === 'darwin' && cpu === 'arm64') return 'darwin-arm64';
+    if (os === 'darwin' && cpu === 'x64') return 'darwin-x64';
+    return `${os}-${cpu}`;
+}
+
+/** npm platform short id (`win32-x64`, …) from host OS. */
+export function platformShort(triple         = platformTriple())         {
+    if (triple.startsWith('win32-')) return 'win32-x64';
+    if (triple.startsWith('linux-')) return 'linux-x64';
+    if (triple === 'darwin-arm64') return 'darwin-arm64';
+    if (triple === 'darwin-x64') return 'darwin-x64';
+    return triple;
+}
+
+/** Host triple used for platform-named native binaries (`valkyrie.<triple>.node`). */
+export function nativeBinaryName(triple         = platformTriple())         {
+    return `valkyrie.${triple}.node`;
+}
+
+/** 当前宿主 OS/arch 的 npm 平台标识。 */
+export function hostPlatformKey()         {
+    return `${platform()}-${arch()}`;
+}
+
+/**
+ * Resolve native `.node` via the platform optionalDependency (`@nyar/valkyrie-<short>`).
+ */
+export function resolveNativePath()         {
+    const triple = platformTriple();
+    const short = platformShort(triple);
+    const packageName = `@nyar/valkyrie-${short}`;
+    const binary = nativeBinaryName(triple);
+    const candidates           = [];
+
+    try {
+        const pkgJson = require.resolve(`${packageName}/package.json`);
+        const pkgDir = path.dirname(pkgJson);
+        candidates.push(path.join(pkgDir, 'lib', binary));
+        candidates.push(path.join(pkgDir, binary));
+    } catch {
+        /* optional dep not installed */
+    }
+
+    candidates.push(path.join(pkgRoot, '..', '..', '..', 'platforms', `valkyrie-${short}`, 'lib', binary));
+    candidates.push(path.join(pkgRoot, '..', '..', '..', 'platforms', `valkyrie-${short}`, binary));
+    candidates.push(path.join(pkgRoot, '..', 'node_modules', packageName, 'lib', binary));
+    candidates.push(path.join(pkgRoot, 'node_modules', packageName, 'lib', binary));
+
+    for (const candidate of candidates) {
+        if (existsSync(candidate)) return candidate;
+    }
+
+    throw new Error(
+        `valkyrie native addon not found for ${packageName}. Run: node scripts/build.mjs napi\n` +
+        `Looked in:\n${candidates.map((c) => `  - ${c}`).join('\n')}\n` +
+        `(host ${hostPlatformKey()})`,
+    );
+}
+
+let nativeAddon                                 ;
+
+/** 加载当前平台的 valkyrie-napi 绑定。 */
+export function loadNative()                      {
+    if (nativeAddon) return nativeAddon;
+    nativeAddon = require(resolveNativePath())                       ;
+    return nativeAddon;
+}
+
+/**
+ * 通过 valkyrie-napi 执行 Valkyrie CLI，原样返回退出码。
+ *
+ * argv 不解析、不改写；`--help` / `--version` 等语义全部由 Rust CLI 承担。
+ */
+export async function runValkyrieCli(product                 , argv          )                  {
+    return loadNative().runValkyrieCli(product, argv);
+}

package/package.json

@@ -1,20 +1,35 @@
 {
-  "bin": {
-    "asgard": "bin/asgard.mjs",
-    "legion": "bin/legion.mjs"
-  },
+  "name": "@nyar/valkyrie",
+  "version": "0.0.14",
   "description": "Valkyrie language package  - Asgard and Legion commands",
-  "engines": {
-    "node": ">=20"
-  },
+  "type": "module",
+  "license": "MIT",
+  "main": "./dist/index.js",
   "exports": {
-    ".": "./src/index.ts"
+    ".": "./dist/index.js"
+  },
+  "bin": {
+    "legion": "bin/legion.mjs",
+    "asgard": "bin/asgard.mjs"
   },
   "files": [
     "bin",
+    "dist",
     "src",
     "readme.md"
   ],
+  "scripts": {
+    "build": "node ../../../../scripts/build-npm-package-js.mjs projects/nyar.ts/emulators/valkyrie"
+  },
+  "optionalDependencies": {
+    "@nyar/valkyrie-darwin-arm64": "0.0.14",
+    "@nyar/valkyrie-darwin-x64": "0.0.14",
+    "@nyar/valkyrie-linux-x64": "0.0.14",
+    "@nyar/valkyrie-win32-x64": "0.0.14"
+  },
+  "engines": {
+    "node": ">=22.18.0"
+  },
   "keywords": [
     "nyar",
     "nyar-vm",
@@ -22,23 +37,12 @@
     "asgard",
     "legion"
   ],
-  "license": "MIT",
-  "main": "src/index.ts",
-  "name": "@nyar/valkyrie",
-  "optionalDependencies": {
-    "@nyar/valkyrie-darwin-arm64": "0.0.0",
-    "@nyar/valkyrie-darwin-x64": "0.0.0",
-    "@nyar/valkyrie-linux-x64": "0.0.0",
-    "@nyar/valkyrie-win32-x64": "0.0.0"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
   "repository": {
-    "directory": "projects/nyar.ts/emulators/valkyrie",
     "type": "git",
-    "url": "git+https://github.com/nyar-vm/nyar-vm.git"
+    "url": "git+https://github.com/nyar-vm/nyar-vm.git",
+    "directory": "projects/nyar.ts/emulators/valkyrie"
   },
-  "type": "module",
-  "version": "0.0.0"
+  "publishConfig": {
+    "access": "public"
+  }
 }

package/src/index.ts

@@ -9,7 +9,7 @@
 export const PACKAGE_NAME = '@nyar/valkyrie';
 
 /** 包装层版本。 */
-export const PACKAGE_VERSION = '0.0.13';
+export const PACKAGE_VERSION = '0.0.14';
 
 /** 本包安装后提供的命令。 */
 export const COMMANDS = ['legion', 'asgard'] as const;