pear-build 0.0.2 → 0.1.1

package/README.md

@@ -10,7 +10,7 @@ npm install -g pear-build
 
 Create a build dir outside the project root.
 
-```
+```bash
 pear-build --package=./my-app/package.json --darwin-arm64-app ./my-app/dist/macos/Keet.app --linux-x64-app=./my-linux-build/Keet.AppImage --target=./my-build
 ```
 

package/bin.js

@@ -0,0 +1,48 @@
+#!/usr/bin/env node
+const { command, flag, summary } = require('paparam')
+const pkg = require('./package')
+const build = require('.')
+
+const cmd = command(
+  pkg.name,
+  summary(pkg.description),
+  flag('--version|-v', 'Print the current version'),
+  flag('--package [path]', 'Path to project package.json'),
+  flag('--target [path]', 'Target build dir'),
+  flag('--darwin-arm64-app [path]', 'Path to Mac ARM64 app'),
+  flag('--darwin-x64-app [path]', 'Path to Mac x64 app'),
+  flag('--linux-arm64-app [path]', 'Path to Linux ARM64 app'),
+  flag('--linux-x64-app [path]', 'Path to Linux x64 app'),
+  flag('--win32-x64-app [path]', 'Path to Windows x64 app'),
+  flag('--ios-arm64 [path]', 'Path to iOS ARM64 folder (ota bundle and assets)'),
+  flag(
+    '--ios-arm64-simulator [path]',
+    'Path to iOS ARM64-Simulator folder (ota bundle and assets)'
+  ),
+  flag('--ios-x64-simulator [path]', 'Path to iOS x64-Simulator folder (ota bundle and assets)'),
+  flag('--android-arm64 [path]', 'Path to android ARM64 folder (ota bundle and assets)'),
+  async function (cmd) {
+    if (cmd.flags.version) return console.log(`v${pkg.version}`)
+    const dir = cmd.flags.package
+    const opts = {
+      target: cmd.flags.target,
+      darwinArm64App: cmd.flags.darwinArm64App,
+      darwinX64App: cmd.flags.darwinX64App,
+      linuxArm64App: cmd.flags.linuxArm64App,
+      linuxX64App: cmd.flags.linuxX64App,
+      win32X64App: cmd.flags.win32X64App,
+      iosArm64: cmd.flags.iosArm64,
+      iosArm64Simulator: cmd.flags.iosArm64Simulator,
+      iosX64Simulator: cmd.flags.iosX64Simulator,
+      androidArm64: cmd.flags.androidArm64
+    }
+    try {
+      await build(dir, opts)
+    } catch (err) {
+      if (err) console.error(err)
+      if (typeof process !== 'undefined') process.exitCode = 1
+    }
+  }
+)
+
+cmd.parse()

package/index.js

@@ -1,72 +1,86 @@
-#!/usr/bin/env node
 const path = require('path')
 const fs = require('fs')
 const Localdrive = require('localdrive')
-const { command, flag, bail } = require('paparam')
 
-const program = command(
-  'build',
-  flag('--package [path]', 'Path to project package.json'),
-  flag('--darwin-arm64-app [path]', 'Path to Mac ARM64 app'),
-  flag('--darwin-x64-app [path]', 'Path to Mac x64 app'),
-  flag('--linux-arm64-app [path]', 'Path to Linux ARM64 app'),
-  flag('--linux-x64-app [path]', 'Path to Linux x64 app'),
-  flag('--win32-x64-app [path]', 'Path to Windows x64 app'),
-  flag('--target [path]', 'Target build dir'),
-  async function (cmd) {
-    const package = path.resolve(cmd.flags.package)
-    const pkg = require(package)
-    const { target = path.resolve(pkg.name + '-' + pkg.version) } = cmd.flags
-    const darwinArm64App = cmd.flags.darwinArm64App
-      ? ['darwin-arm64', path.resolve(cmd.flags.darwinArm64App)]
-      : null
-    const darwinX64App = cmd.flags.darwinX64App
-      ? ['darwin-x64', path.resolve(cmd.flags.darwinX64App)]
-      : null
-    const linuxArm64App = cmd.flags.linuxArm64App
-      ? ['linux-arm64', path.resolve(cmd.flags.linuxArm64App)]
-      : null
-    const linuxX64App = cmd.flags.linuxX64App
-      ? ['linux-x64', path.resolve(cmd.flags.linuxX64App)]
-      : null
-    const win32X64App = cmd.flags.win32X64App
-      ? ['window-x64', path.resolve(cmd.flags.win32X64App)]
-      : null
+module.exports = async function build(dir, opts = {}) {
+  const pkgPath = path.resolve(dir)
+  const pkg = require(pkgPath)
+  const { target = path.resolve(pkg.name + '-' + pkg.version) } = opts
+  const darwinArm64App = opts.darwinArm64App
+    ? ['darwin-arm64', path.resolve(opts.darwinArm64App)]
+    : null
+  const darwinX64App = opts.darwinX64App ? ['darwin-x64', path.resolve(opts.darwinX64App)] : null
+  const linuxArm64App = opts.linuxArm64App
+    ? ['linux-arm64', path.resolve(opts.linuxArm64App)]
+    : null
+  const linuxX64App = opts.linuxX64App ? ['linux-x64', path.resolve(opts.linuxX64App)] : null
+  const win32X64App = opts.win32X64App ? ['win32-x64', path.resolve(opts.win32X64App)] : null
+  const iosArm64 = opts.iosArm64 ? ['ios-arm64', path.resolve(opts.iosArm64)] : null
+  const iosArm64Sim = opts.iosArm64Simulator
+    ? ['ios-arm64-simulator', path.resolve(opts.iosArm64Simulator)]
+    : null
+  const iosx64Sim = opts.iosX64Simulator
+    ? ['ios-x64-simulator', path.resolve(opts.iosX64Simulator)]
+    : null
+  const androidArm64 = opts.androidArm64 ? ['android-arm64', path.resolve(opts.androidArm64)] : null
 
-    const byArch = path.join(target, 'by-arch')
+  const byArch = path.join(target, 'by-arch')
 
-    await fs.promises.mkdir(byArch, { recursive: true })
+  await fs.promises.mkdir(byArch, { recursive: true })
 
-    fs.writeFileSync(path.join(target, 'package.json'), fs.readFileSync(package))
+  await fs.promises.writeFile(
+    path.join(target, 'package.json'),
+    await fs.promises.readFile(pkgPath)
+  )
 
-    const apps = [darwinArm64App, darwinX64App, linuxArm64App, linuxX64App, win32X64App].filter(
-      Boolean
-    )
-    const noop = () => {}
-    const promises = []
-    for (const [arch, app] of apps) {
-      const archApp = path.join(byArch, arch, 'app', path.basename(app))
-      await fs.promises.mkdir(archApp, { recursive: true })
-      const src = new Localdrive(app)
-      const dst = new Localdrive(archApp)
-      await src.ready()
-      await dst.ready()
-      const mirror = src.mirror(dst)
-      console.log(app, 'mirroring to', archApp)
-      const promise = mirror.done()
-      promises.push(promise)
-      promise.then(() => {
-        console.log(app, 'mirrored to', archApp)
-      }, noop)
-      await src.close()
-      await dst.close()
+  const apps = [
+    darwinArm64App,
+    darwinX64App,
+    linuxArm64App,
+    linuxX64App,
+    win32X64App,
+    iosArm64,
+    iosArm64Sim,
+    iosx64Sim,
+    androidArm64
+  ].filter(Boolean)
+
+  const noop = () => {}
+  const promises = []
+  for (const [arch, app] of apps) {
+    const isMobile = arch.startsWith('ios') || arch.startsWith('android')
+    const appName = isMobile ? (pkg.productName ?? pkg.name) : path.basename(app)
+    if (typeof appName !== 'string') {
+      throw new Error('package.json productName or name is a required field string')
+    }
+    const archApp = path.join(byArch, arch, 'app')
+    await fs.promises.mkdir(archApp, { recursive: true })
+
+    const stat = await fs.promises.stat(app)
+    let src, dst, mirror
+    if (stat.isDirectory()) {
+      const appDir = path.join(archApp, appName)
+      await fs.promises.mkdir(appDir, { recursive: true })
+      src = new Localdrive(app)
+      dst = new Localdrive(appDir)
+      mirror = src.mirror(dst)
+    } else {
+      src = new Localdrive(path.dirname(app))
+      dst = new Localdrive(archApp)
+      mirror = src.mirror(dst, { prefix: '/' + path.basename(app) })
     }
 
-    await Promise.all(promises)
-  },
-  bail((bailed) => {
-    console.error('bailed', bailed.reason)
-  })
-)
+    await src.ready()
+    await dst.ready()
+    console.log(app, 'mirroring to', archApp)
+    const promise = mirror.done()
+    promises.push(promise)
+    promise.then(() => {
+      console.log(app, 'mirrored to', archApp)
+    }, noop)
+    await src.close()
+    await dst.close()
+  }
 
-program.parse(global.Bare ? global.Bare.argv.slice(2) : process.argv.slice(2))
+  await Promise.all(promises)
+}

package/package.json

@@ -1,13 +1,16 @@
 {
   "name": "pear-build",
-  "version": "0.0.2",
+  "version": "0.1.1",
   "main": "index.js",
   "type": "commonjs",
-  "bin": "index.js",
+  "bin": "bin.js",
   "description": "Build appling for a Pear application",
   "author": "Holepunch Inc",
   "license": "Apache-2.0",
-  "files": [],
+  "files": [
+    "index.js",
+    "bin.js"
+  ],
   "imports": {
     "path": {
       "bare": "bare-path",
@@ -20,21 +23,18 @@
   },
   "scripts": {
     "format": "prettier --write .",
-    "lint": "prettier --check ."
+    "lint": "prettier --check . && lunte",
+    "test": "brittle-node test/all.js"
   },
   "dependencies": {
-    "bare-build": "^0.4.1",
     "bare-fs": "^4.5.3",
     "bare-path": "^3.0.0",
-    "hypercore-id-encoding": "^1.3.0",
     "localdrive": "^2.2.0",
-    "pear-link": "^4.2.1",
-    "pear-opstream": "^1.0.1",
-    "pear-opwait": "^1.0.0",
-    "pear-terminal": "^1.1.3",
-    "which-runtime": "^1.3.2"
+    "paparam": "^1.10.0"
   },
   "devDependencies": {
+    "brittle": "^3.19.1",
+    "lunte": "^1.6.0",
     "prettier": "^3.7.4",
     "prettier-config-holepunch": "^2.0.0"
   }