@harmonyos-arkts/d2h 0.1.11 → 0.1.13

package/skills/managing-d2h-toolchain/scripts/manage-toolchain.mjs

@@ -1,98 +1,98 @@
-#!/usr/bin/env node
-import fs from 'node:fs';
-import path from 'node:path';
-import { spawnSync } from 'node:child_process';
-import { fileURLToPath } from 'node:url';
-
-const skillDir = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
-
-export function loadManifest(file = path.join(skillDir, 'toolchain.json')) {
-  const manifest = JSON.parse(fs.readFileSync(file, 'utf8'));
-  if (manifest?.schemaVersion !== 1 || !manifest.tools || Array.isArray(manifest.tools) ||
-      !Object.keys(manifest.tools).length) throw new Error('invalid toolchain manifest');
-  for (const [name, tool] of Object.entries(manifest.tools)) {
-    if (!/^[a-z][a-z0-9-]*$/.test(name) || tool?.package !== `@harmonyos-arkts/${name}` ||
-        !/^\d+\.\d+\.\d+$/.test(tool.version) || !tool.capabilities ||
-        !Object.keys(tool.capabilities).length || Object.values(tool.capabilities).some(args =>
-          !Array.isArray(args) || !args.length || args.some(arg => typeof arg !== 'string' || !arg))) {
-      throw new Error(`invalid toolchain entry: ${name}`);
-    }
-  }
-  return manifest;
-}
-
-export function run(command, args) {
-  let executable = command;
-  let parameters = args;
-  if (process.platform === 'win32') {
-    const quote = value => `'${value.replaceAll("'", "''")}'`;
-    const binary = /^(npm|appgraph|droid2hmos)$/.test(command) ? `${command}.cmd` : command;
-    const script = `& ${[binary, ...args].map(quote).join(' ')}; exit $LASTEXITCODE`;
-    executable = 'powershell.exe';
-    parameters = ['-NoProfile', '-NonInteractive', '-EncodedCommand', Buffer.from(script, 'utf16le').toString('base64')];
-  }
-  const result = spawnSync(executable, parameters, { encoding: 'utf8', windowsHide: true, timeout: 300000 });
-  return { status: result.status, stdout: result.stdout ?? '', stderr: result.stderr ?? '', error: result.error };
-}
-
-export function inspect(name, tool, runner = run) {
-  const result = runner(name, ['--version']);
-  const installedVersion = result.status === 0 ? /\b\d+\.\d+\.\d+\b/.exec(`${result.stdout}\n${result.stderr}`)?.[0] ?? null : null;
-  const capabilities = Object.fromEntries(Object.entries(tool.capabilities).map(([capability, args]) => {
-    const probe = installedVersion ? runner(name, args) : null;
-    const command = capability === 'analyze-android' ? 'analyze' : capability === 'build-android' ? 'build' : capability;
-    return [capability, probe?.status === 0 && `${probe.stdout}\n${probe.stderr}`.includes(command)];
-  }));
-  return { name, package: tool.package, expectedVersion: tool.version, installedVersion,
-    status: installedVersion === tool.version && Object.values(capabilities).every(Boolean) ? 'passed' : 'failed', capabilities };
-}
-
-export function manage({ action = 'check', manifestFile, force = false, runner = run, log = console.log } = {}) {
-  if (!['check', 'install'].includes(action)) throw new Error(`unsupported action: ${action}`);
-  const manifest = loadManifest(manifestFile);
-  const results = Object.entries(manifest.tools).map(([name, tool]) => inspect(name, tool, runner));
-  for (const item of results) log(`${item.status}: ${item.package} expected ${item.expectedVersion}, installed ${item.installedVersion ?? 'missing'}; capabilities ${JSON.stringify(item.capabilities)}`);
-  if (action === 'check') return results.every(item => item.status === 'passed');
-  const targets = force ? results : results.filter(item => item.status !== 'passed');
-  if (!targets.length) return true;
-  const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-  const root = runner(npm, ['root', '--global']);
-  if (root.status !== 0 || !root.stdout.trim()) throw new Error(`cannot inspect global npm installation: ${root.stderr || root.error?.message || 'empty root'}`);
-  // Check every target before making changes, so a protected npm link cannot cause a partial installation.
-  for (const item of targets) {
-    const target = path.join(root.stdout.trim(), ...item.package.split('/'));
-    if (fs.existsSync(target) && fs.lstatSync(target).isSymbolicLink() && !force) {
-      throw new Error(`${item.package} is an npm link at ${target}; rerun with --force to replace it`);
-    }
-  }
-  for (const item of targets) {
-    const coordinate = `${item.package}@${item.expectedVersion}`;
-    const target = path.join(root.stdout.trim(), ...item.package.split('/'));
-    const result = runner(npm, ['install', '--global', coordinate, ...(force ? ['--force'] : [])]);
-    if (result.status !== 0) throw new Error(`failed to install ${coordinate}: ${result.stderr || result.error?.message}`);
-    if (fs.existsSync(target) && fs.lstatSync(target).isSymbolicLink()) {
-      throw new Error(`${coordinate} installation completed but npm link remains at ${target}`);
-    }
-    const verified = inspect(item.name, manifest.tools[item.name], runner);
-    if (verified.status !== 'passed') throw new Error(`${coordinate} installed but CLI version or capabilities failed verification`);
-    log(`installed and verified ${coordinate}`);
-  }
-  return true;
-}
-
-if (process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url)) {
-  try {
-    const [action = 'check', ...args] = process.argv.slice(2);
-    if (action === '--help' || action === '-h') {
-      console.log('Usage: node manage-toolchain.mjs check|install [--force]\nChecks exact AppGraph/droid2hmos versions and capabilities; install only changes missing or incompatible packages.');
-    } else {
-      if (args.some(arg => arg !== '--force') || args.filter(arg => arg === '--force').length > 1 || (action === 'check' && args.length)) {
-        throw new Error('usage: node manage-toolchain.mjs check|install [--force]');
-      }
-      if (!manage({ action, force: args.includes('--force') })) process.exitCode = 1;
-    }
-  } catch (error) {
-    console.error(`manage-toolchain: ${error instanceof Error ? error.message : String(error)}`);
-    process.exitCode = 1;
-  }
-}
+#!/usr/bin/env node
+import fs from 'node:fs';
+import path from 'node:path';
+import { spawnSync } from 'node:child_process';
+import { fileURLToPath } from 'node:url';
+
+const skillDir = path.dirname(path.dirname(fileURLToPath(import.meta.url)));
+
+export function loadManifest(file = path.join(skillDir, 'toolchain.json')) {
+  const manifest = JSON.parse(fs.readFileSync(file, 'utf8'));
+  if (manifest?.schemaVersion !== 1 || !manifest.tools || Array.isArray(manifest.tools) ||
+      !Object.keys(manifest.tools).length) throw new Error('invalid toolchain manifest');
+  for (const [name, tool] of Object.entries(manifest.tools)) {
+    if (!/^[a-z][a-z0-9-]*$/.test(name) || tool?.package !== `@harmonyos-arkts/${name}` ||
+        !/^\d+\.\d+\.\d+$/.test(tool.version) || !tool.capabilities ||
+        !Object.keys(tool.capabilities).length || Object.values(tool.capabilities).some(args =>
+          !Array.isArray(args) || !args.length || args.some(arg => typeof arg !== 'string' || !arg))) {
+      throw new Error(`invalid toolchain entry: ${name}`);
+    }
+  }
+  return manifest;
+}
+
+export function run(command, args) {
+  let executable = command;
+  let parameters = args;
+  if (process.platform === 'win32') {
+    const quote = value => `'${value.replaceAll("'", "''")}'`;
+    const binary = /^(npm|appgraph|droid2hmos)$/.test(command) ? `${command}.cmd` : command;
+    const script = `& ${[binary, ...args].map(quote).join(' ')}; exit $LASTEXITCODE`;
+    executable = 'powershell.exe';
+    parameters = ['-NoProfile', '-NonInteractive', '-EncodedCommand', Buffer.from(script, 'utf16le').toString('base64')];
+  }
+  const result = spawnSync(executable, parameters, { encoding: 'utf8', windowsHide: true, timeout: 300000 });
+  return { status: result.status, stdout: result.stdout ?? '', stderr: result.stderr ?? '', error: result.error };
+}
+
+export function inspect(name, tool, runner = run) {
+  const result = runner(name, ['--version']);
+  const installedVersion = result.status === 0 ? /\b\d+\.\d+\.\d+\b/.exec(`${result.stdout}\n${result.stderr}`)?.[0] ?? null : null;
+  const capabilities = Object.fromEntries(Object.entries(tool.capabilities).map(([capability, args]) => {
+    const probe = installedVersion ? runner(name, args) : null;
+    const command = capability === 'analyze-android' ? 'analyze' : capability === 'build-android' ? 'build' : capability;
+    return [capability, probe?.status === 0 && `${probe.stdout}\n${probe.stderr}`.includes(command)];
+  }));
+  return { name, package: tool.package, expectedVersion: tool.version, installedVersion,
+    status: installedVersion === tool.version && Object.values(capabilities).every(Boolean) ? 'passed' : 'failed', capabilities };
+}
+
+export function manage({ action = 'check', manifestFile, force = false, runner = run, log = console.log } = {}) {
+  if (!['check', 'install'].includes(action)) throw new Error(`unsupported action: ${action}`);
+  const manifest = loadManifest(manifestFile);
+  const results = Object.entries(manifest.tools).map(([name, tool]) => inspect(name, tool, runner));
+  for (const item of results) log(`${item.status}: ${item.package} expected ${item.expectedVersion}, installed ${item.installedVersion ?? 'missing'}; capabilities ${JSON.stringify(item.capabilities)}`);
+  if (action === 'check') return results.every(item => item.status === 'passed');
+  const targets = force ? results : results.filter(item => item.status !== 'passed');
+  if (!targets.length) return true;
+  const npm = process.platform === 'win32' ? 'npm.cmd' : 'npm';
+  const root = runner(npm, ['root', '--global']);
+  if (root.status !== 0 || !root.stdout.trim()) throw new Error(`cannot inspect global npm installation: ${root.stderr || root.error?.message || 'empty root'}`);
+  // Check every target before making changes, so a protected npm link cannot cause a partial installation.
+  for (const item of targets) {
+    const target = path.join(root.stdout.trim(), ...item.package.split('/'));
+    if (fs.existsSync(target) && fs.lstatSync(target).isSymbolicLink() && !force) {
+      throw new Error(`${item.package} is an npm link at ${target}; rerun with --force to replace it`);
+    }
+  }
+  for (const item of targets) {
+    const coordinate = `${item.package}@${item.expectedVersion}`;
+    const target = path.join(root.stdout.trim(), ...item.package.split('/'));
+    const result = runner(npm, ['install', '--global', coordinate, ...(force ? ['--force'] : [])]);
+    if (result.status !== 0) throw new Error(`failed to install ${coordinate}: ${result.stderr || result.error?.message}`);
+    if (fs.existsSync(target) && fs.lstatSync(target).isSymbolicLink()) {
+      throw new Error(`${coordinate} installation completed but npm link remains at ${target}`);
+    }
+    const verified = inspect(item.name, manifest.tools[item.name], runner);
+    if (verified.status !== 'passed') throw new Error(`${coordinate} installed but CLI version or capabilities failed verification`);
+    log(`installed and verified ${coordinate}`);
+  }
+  return true;
+}
+
+if (process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url)) {
+  try {
+    const [action = 'check', ...args] = process.argv.slice(2);
+    if (action === '--help' || action === '-h') {
+      console.log('Usage: node manage-toolchain.mjs check|install [--force]\nChecks exact AppGraph/droid2hmos versions and capabilities; install only changes missing or incompatible packages.');
+    } else {
+      if (args.some(arg => arg !== '--force') || args.filter(arg => arg === '--force').length > 1 || (action === 'check' && args.length)) {
+        throw new Error('usage: node manage-toolchain.mjs check|install [--force]');
+      }
+      if (!manage({ action, force: args.includes('--force') })) process.exitCode = 1;
+    }
+  } catch (error) {
+    console.error(`manage-toolchain: ${error instanceof Error ? error.message : String(error)}`);
+    process.exitCode = 1;
+  }
+}

package/skills/managing-d2h-toolchain/toolchain.json

@@ -1,16 +1,16 @@
-{
-  "schemaVersion": 1,
-  "node": { "minimum": "22.5.0", "maximumExclusive": "25.0.0" },
-  "tools": {
-    "appgraph": {
-      "package": "@harmonyos-arkts/appgraph",
-      "version": "0.0.10",
-      "capabilities": { "build-android": ["build", "--help"], "spec-analysis": ["spec-analysis", "--help"] }
-    },
-    "droid2hmos": {
-      "package": "@harmonyos-arkts/droid2hmos",
-      "version": "0.0.11",
-      "capabilities": { "analyze-android": ["--help"], "preflight": ["--help"], "status": ["--help"] }
-    }
-  }
-}
+{
+  "schemaVersion": 1,
+  "node": { "minimum": "22.5.0", "maximumExclusive": "25.0.0" },
+  "tools": {
+    "appgraph": {
+      "package": "@harmonyos-arkts/appgraph",
+      "version": "0.0.11",
+      "capabilities": { "build-android": ["build", "--help"], "spec-analysis": ["spec-analysis", "--help"] }
+    },
+    "droid2hmos": {
+      "package": "@harmonyos-arkts/droid2hmos",
+      "version": "0.0.12",
+      "capabilities": { "analyze-android": ["--help"], "preflight": ["--help"], "status": ["--help"] }
+    }
+  }
+}