pear-build 1.1.2 → 1.3.0

package/README.md

@@ -26,21 +26,32 @@ pear-build \
     --target=./my-build
 ```
 
+Each `*-app` flag can be passed more than once to place several artifacts under the same architecture. Every artifact must be named after `productName` (or `name`), or after one of the `bin` names when `bin` is an object:
+
+```bash
+pear-build \
+    --package=./my-app/package.json \
+    --darwin-arm64-app ./my-app/MyApp-darwin-arm64/MyApp.app \
+    --darwin-arm64-app ./my-app/MyApp-darwin-arm64/my-app \
+    --target=./my-build
+```
+
 ## Example
 
 ```bash
 node bin.js \
     --package ./test/fixtures/hello-pear-electron/package.json \
-    --darwin-arm64-app ./test/fixtures/hello-pear-electron/out/HelloPear-darwin-arm64/HelloPear.app \
-    --darwin-x64-app ./test/fixtures/hello-pear-electron/out/HelloPear-darwin-x64/HelloPear.app \
-    --linux-arm64-app ./test/fixtures/hello-pear-electron/out/HelloPear-linux-arm64/HelloPear.AppImage \
-    --linux-x64-app ./test/fixtures/hello-pear-electron/out/HelloPear-linux-x64/HelloPear.AppImage \
-    --win32-x64-app ./test/fixtures/hello-pear-electron/out/HelloPear-win32-x64/HelloPear.msix \
-    --win32-arm64-app ./test/fixtures/hello-pear-electron/out/HelloPear-win32-arm64/HelloPear.msix \
+    --darwin-arm64-app ./test/fixtures/hello-pear-electron/by-arch/HelloPear-darwin-arm64/HelloPear.app \
+    --darwin-x64-app ./test/fixtures/hello-pear-electron/by-arch/HelloPear-darwin-x64/HelloPear.app \
+    --linux-arm64-app ./test/fixtures/hello-pear-electron/by-arch/HelloPear-linux-arm64/HelloPear.AppImage \
+    --linux-x64-app ./test/fixtures/hello-pear-electron/by-arch/HelloPear-linux-x64/HelloPear.AppImage \
+    --win32-x64-app ./test/fixtures/hello-pear-electron/by-arch/HelloPear-win32-x64/HelloPear.msix \
+    --win32-arm64-app ./test/fixtures/hello-pear-electron/by-arch/HelloPear-win32-arm64/HelloPear.msix \
     --ios-arm64 ./test/fixtures/hello-pear-react-native/ota/ios/HelloPear \
     --ios-arm64-simulator ./test/fixtures/hello-pear-react-native/ota/ios/HelloPear \
     --ios-x64-simulator ./test/fixtures/hello-pear-react-native/ota/ios/HelloPear \
     --android-arm64 ./test/fixtures/hello-pear-react-native/ota/android/HelloPear \
+    --config ./test/fixtures/hello-pear-react-native/pear.json \
     --target ./my-build
 ```
 
@@ -84,6 +95,7 @@ my-build
 │       └── app
 │           └── HelloPear.msix
 └── package.json
+└── pear.json
 ```
 
 ## License

package/index.js

@@ -15,47 +15,33 @@ class Build extends EventEmitter {
   async run(opts) {
     if (!opts.package) throw ERR_INVALID_INPUT('package.json path must be specified.')
     const pkgPath = path.resolve(opts.package)
+    const pkg = await getParsedJSON('package.json', pkgPath)
 
-    const pkgFile = await fs.promises.readFile(pkgPath, 'utf8').catch((err) => {
-      if (err.code === 'ENOENT') {
-        throw ERR_NOT_FOUND('package.json not found', { path: pkgPath, cause: err })
-      }
-      if (err.code === 'EISDIR') {
-        throw ERR_INVALID_INPUT('package.json must be a file', { path: pkgPath, cause: err })
-      }
-      throw err
-    })
-
-    let pkg
-    try {
-      pkg = JSON.parse(pkgFile)
-    } catch (err) {
-      throw ERR_INVALID_INPUT('package.json is not a valid JSON', { path: pkgPath })
-    }
+    const isMobile = !!pkg.dependencies?.['react-native-bare-kit'] // in mobile react-native-bare-kit needs to be listed in project's deps
+    if (!opts.config && isMobile) throw ERR_INVALID_INPUT('pear.json path must be specified.')
+    const configPath = opts.config && path.resolve(opts.config)
+    const config = configPath && (await getParsedJSON('pear.json', configPath))
 
     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 win32Arm64App = opts.win32Arm64App
-      ? ['win32-arm64', path.resolve(opts.win32Arm64App)]
-      : 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 archs = {
+      'darwin-arm64': opts.darwinArm64App,
+      'darwin-x64': opts.darwinX64App,
+      'linux-arm64': opts.linuxArm64App,
+      'linux-x64': opts.linuxX64App,
+      'win32-x64': opts.win32X64App,
+      'win32-arm64': opts.win32Arm64App,
+      'ios-arm64': opts.iosArm64,
+      'ios-arm64-simulator': opts.iosArm64Simulator,
+      'ios-x64-simulator': opts.iosX64Simulator,
+      'android-arm64': opts.androidArm64
+    }
+    const apps = []
+    for (const [arch, app] of Object.entries(archs)) {
+      if (!app) continue
+      for (const each of Array.isArray(app) ? app : [app]) {
+        if (each) apps.push([arch, path.resolve(each)])
+      }
+    }
 
     const byArch = path.join(target, 'by-arch')
 
@@ -66,27 +52,26 @@ class Build extends EventEmitter {
       await fs.promises.readFile(pkgPath)
     )
 
-    const apps = [
-      darwinArm64App,
-      darwinX64App,
-      linuxArm64App,
-      linuxX64App,
-      win32X64App,
-      win32Arm64App,
-      iosArm64,
-      iosArm64Sim,
-      iosx64Sim,
-      androidArm64
-    ].filter(Boolean)
+    if (config) {
+      await fs.promises.writeFile(
+        path.join(target, 'pear.json'),
+        await fs.promises.readFile(configPath)
+      )
+    }
 
     const appName = pkg.productName ?? pkg.name
+    const binNames = pkg.bin && typeof pkg.bin === 'object' ? Object.keys(pkg.bin) : []
+    const appNames = [...new Set([appName, ...binNames])]
 
     const noop = () => {}
     const promises = []
     for (const [arch, app] of apps) {
-      if (path.basename(app, path.extname(app)) !== appName) {
+      if (!fs.existsSync(app)) {
+        throw new Error(`${app} does not exists`)
+      }
+      if (appNames.includes(path.basename(app, path.extname(app))) === false) {
         throw ERR_INVALID_APP_NAME(
-          `expected directory ${appName} but got ${path.basename(app)} for ${arch}`,
+          `expected ${appNames.join(' or ')} but got ${path.basename(app)} for ${arch}`,
           { arch, app }
         )
       }
@@ -118,6 +103,24 @@ class Build extends EventEmitter {
   }
 }
 
+async function getParsedJSON(name, path) {
+  const file = await fs.promises.readFile(path, 'utf8').catch((err) => {
+    if (err.code === 'ENOENT') {
+      throw ERR_NOT_FOUND(name + ' not found', { path, cause: err })
+    }
+    if (err.code === 'EISDIR') {
+      throw ERR_INVALID_INPUT(name + ' must be a file', { path, cause: err })
+    }
+    throw err
+  })
+
+  try {
+    return JSON.parse(file)
+  } catch (err) {
+    throw ERR_INVALID_INPUT(name + ' is not a valid JSON', { path, cause: err })
+  }
+}
+
 module.exports = function build(opts) {
   return new Build(opts)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pear-build",
-  "version": "1.1.2",
+  "version": "1.3.0",
   "main": "index.js",
   "type": "commonjs",
   "bin": {
@@ -17,12 +17,43 @@
     "summary": "Create project deployment folder",
     "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 --win32-arm64-app [path]": "Path to Windows ARM64 app",
+    "flag --config [path]": "Path to project pear.json (mandatory for mobile)",
+    "flag --darwin-arm64-app [path]": [
+      "Path to Mac ARM64 app",
+      {
+        "multiple": true
+      }
+    ],
+    "flag --darwin-x64-app [path]": [
+      "Path to Mac x64 app",
+      {
+        "multiple": true
+      }
+    ],
+    "flag --linux-arm64-app [path]": [
+      "Path to Linux ARM64 app",
+      {
+        "multiple": true
+      }
+    ],
+    "flag --linux-x64-app [path]": [
+      "Path to Linux x64 app",
+      {
+        "multiple": true
+      }
+    ],
+    "flag --win32-x64-app [path]": [
+      "Path to Windows x64 app",
+      {
+        "multiple": true
+      }
+    ],
+    "flag --win32-arm64-app [path]": [
+      "Path to Windows ARM64 app",
+      {
+        "multiple": true
+      }
+    ],
     "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 asset)",
     "flag --ios-x64-simulator [path]": "Path to iOS x64-Simulator folder (ota bundle and assets)",