@morphllm/morphcode 1.0.1 → 1.0.3

package/bin/morphcode

@@ -1,84 +1,38 @@
 #!/usr/bin/env node
 
-const childProcess = require("child_process")
-const fs = require("fs")
-const path = require("path")
 const os = require("os")
+const { execSync, spawn } = require("child_process")
+const path = require("path")
 
-function run(target) {
-  const result = childProcess.spawnSync(target, process.argv.slice(2), {
-    stdio: "inherit",
-  })
-  if (result.error) {
-    console.error(result.error.message)
-    process.exit(1)
-  }
-  const code = typeof result.status === "number" ? result.status : 0
-  process.exit(code)
-}
-
-const envPath = process.env.MORPHCODE_BIN_PATH
-if (envPath) {
-  run(envPath)
-}
-
-const scriptPath = fs.realpathSync(__filename)
-const scriptDir = path.dirname(scriptPath)
-
-const platformMap = {
-  darwin: "darwin",
-  linux: "linux",
-  win32: "windows",
-}
-const archMap = {
-  x64: "x64",
-  arm64: "arm64",
-  arm: "arm",
-}
+const platform = process.platform === "win32" ? "windows" : process.platform
+const arch = process.arch
 
-let platform = platformMap[os.platform()]
-if (!platform) {
-  platform = os.platform()
-}
-let arch = archMap[os.arch()]
-if (!arch) {
-  arch = os.arch()
-}
 const base = "@morphllm/morphcode-" + platform + "-" + arch
 const binary = platform === "windows" ? "morphcode.exe" : "morphcode"
 
-function findBinary(startDir) {
-  let current = startDir
-  for (;;) {
-    const modules = path.join(current, "node_modules")
-    if (fs.existsSync(modules)) {
-      const entries = fs.readdirSync(modules)
-      for (const entry of entries) {
-        if (!entry.startsWith(base)) {
-          continue
-        }
-        const candidate = path.join(modules, entry, "bin", binary)
-        if (fs.existsSync(candidate)) {
-          return candidate
-        }
-      }
-    }
-    const parent = path.dirname(current)
-    if (parent === current) {
-      return
-    }
-    current = parent
+function getBinaryPath() {
+  try {
+    const pkgPath = require.resolve(base + "/package.json")
+    return path.join(path.dirname(pkgPath), "bin", binary)
+  } catch {}
+
+  // Try baseline for x64
+  if (arch === "x64") {
+    try {
+      const baselinePkg = base + "-baseline"
+      const pkgPath = require.resolve(baselinePkg + "/package.json")
+      return path.join(path.dirname(pkgPath), "bin", binary)
+    } catch {}
   }
-}
 
-const resolved = findBinary(scriptDir)
-if (!resolved) {
-  console.error(
-    'It seems that your package manager failed to install the right version of the morphcode CLI for your platform. You can try manually installing the "' +
-      base +
-      '" package',
-  )
+  console.error("Could not find morphcode binary for " + platform + "-" + arch)
   process.exit(1)
 }
 
-run(resolved)
+const binaryPath = getBinaryPath()
+const child = spawn(binaryPath, process.argv.slice(2), {
+  stdio: "inherit",
+  env: process.env,
+})
+
+child.on("exit", (code) => process.exit(code ?? 0))

package/package.json

@@ -1,23 +1,23 @@
 {
   "name": "@morphllm/morphcode",
   "bin": {
-    "@morphllm/morphcode": "./bin/@morphllm/morphcode"
+    "morphcode": "./bin/morphcode"
   },
   "scripts": {
-    "postinstall": "bun ./postinstall.mjs || node ./postinstall.mjs"
+    "postinstall": "node ./postinstall.mjs"
   },
-  "version": "1.0.1",
+  "version": "1.0.3",
   "optionalDependencies": {
-    "@morphllm/morphcode-linux-arm64": "1.0.1",
-    "@morphllm/morphcode-linux-x64": "1.0.1",
-    "@morphllm/morphcode-linux-x64-baseline": "1.0.1",
-    "@morphllm/morphcode-linux-arm64-musl": "1.0.1",
-    "@morphllm/morphcode-linux-x64-musl": "1.0.1",
-    "@morphllm/morphcode-linux-x64-baseline-musl": "1.0.1",
-    "@morphllm/morphcode-darwin-arm64": "1.0.1",
-    "@morphllm/morphcode-darwin-x64": "1.0.1",
-    "@morphllm/morphcode-darwin-x64-baseline": "1.0.1",
-    "@morphllm/morphcode-windows-x64": "1.0.1",
-    "@morphllm/morphcode-windows-x64-baseline": "1.0.1"
+    "@morphllm/morphcode-linux-arm64": "1.0.3",
+    "@morphllm/morphcode-linux-x64": "1.0.3",
+    "@morphllm/morphcode-linux-x64-baseline": "1.0.3",
+    "@morphllm/morphcode-linux-arm64-musl": "1.0.3",
+    "@morphllm/morphcode-linux-x64-musl": "1.0.3",
+    "@morphllm/morphcode-linux-x64-baseline-musl": "1.0.3",
+    "@morphllm/morphcode-darwin-arm64": "1.0.3",
+    "@morphllm/morphcode-darwin-x64": "1.0.3",
+    "@morphllm/morphcode-darwin-x64-baseline": "1.0.3",
+    "@morphllm/morphcode-windows-x64": "1.0.3",
+    "@morphllm/morphcode-windows-x64-baseline": "1.0.3"
   }
 }

package/postinstall.mjs

@@ -1,122 +1,3 @@
 #!/usr/bin/env node
-
-import fs from "fs"
-import path from "path"
-import os from "os"
-import { fileURLToPath } from "url"
-import { createRequire } from "module"
-
-const __dirname = path.dirname(fileURLToPath(import.meta.url))
-const require = createRequire(import.meta.url)
-
-function detectPlatformAndArch() {
-  // Map platform names
-  let platform
-  switch (os.platform()) {
-    case "darwin":
-      platform = "darwin"
-      break
-    case "linux":
-      platform = "linux"
-      break
-    case "win32":
-      platform = "windows"
-      break
-    default:
-      platform = os.platform()
-      break
-  }
-
-  // Map architecture names
-  let arch
-  switch (os.arch()) {
-    case "x64":
-      arch = "x64"
-      break
-    case "arm64":
-      arch = "arm64"
-      break
-    case "arm":
-      arch = "arm"
-      break
-    default:
-      arch = os.arch()
-      break
-  }
-
-  return { platform, arch }
-}
-
-function findBinary() {
-  const { platform, arch } = detectPlatformAndArch()
-  const packageName = `@morphllm/morphcode-${platform}-${arch}`
-  const binaryName = platform === "windows" ? "morphcode.exe" : "morphcode"
-
-  try {
-    // Use require.resolve to find the package
-    const packageJsonPath = require.resolve(`${packageName}/package.json`)
-    const packageDir = path.dirname(packageJsonPath)
-    const binaryPath = path.join(packageDir, "bin", binaryName)
-
-    if (!fs.existsSync(binaryPath)) {
-      throw new Error(`Binary not found at ${binaryPath}`)
-    }
-
-    return { binaryPath, binaryName }
-  } catch (error) {
-    throw new Error(`Could not find package ${packageName}: ${error.message}`)
-  }
-}
-
-function prepareBinDirectory(binaryName) {
-  const binDir = path.join(__dirname, "bin")
-  const targetPath = path.join(binDir, binaryName)
-
-  // Ensure bin directory exists
-  if (!fs.existsSync(binDir)) {
-    fs.mkdirSync(binDir, { recursive: true })
-  }
-
-  // Remove existing binary/symlink if it exists
-  if (fs.existsSync(targetPath)) {
-    fs.unlinkSync(targetPath)
-  }
-
-  return { binDir, targetPath }
-}
-
-function symlinkBinary(sourcePath, binaryName) {
-  const { targetPath } = prepareBinDirectory(binaryName)
-
-  fs.symlinkSync(sourcePath, targetPath)
-  console.log(`morphcode binary symlinked: ${targetPath} -> ${sourcePath}`)
-
-  // Verify the file exists after operation
-  if (!fs.existsSync(targetPath)) {
-    throw new Error(`Failed to symlink binary to ${targetPath}`)
-  }
-}
-
-async function main() {
-  try {
-    if (os.platform() === "win32") {
-      // On Windows, the .exe is already included in the package and bin field points to it
-      // No postinstall setup needed
-      console.log("Windows detected: binary setup not needed (using packaged .exe)")
-      return
-    }
-
-    const { binaryPath, binaryName } = findBinary()
-    symlinkBinary(binaryPath, binaryName)
-  } catch (error) {
-    console.error("Failed to setup morphcode binary:", error.message)
-    process.exit(1)
-  }
-}
-
-try {
-  main()
-} catch (error) {
-  console.error("Postinstall script error:", error.message)
-  process.exit(0)
-}
+// Postinstall script for morphcode
+console.log("morphcode installed successfully")