pear-build 1.1.1 → 1.2.0

package/README.md

@@ -41,6 +41,7 @@ node bin.js \
     --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 +85,7 @@ my-build
 │       └── app
 │           └── HelloPear.msix
 └── package.json
+└── pear.json
 ```
 
 ## License

package/index.js

@@ -3,6 +3,7 @@ const path = require('path')
 const fs = require('fs')
 const { EventEmitter } = require('events')
 const Localdrive = require('localdrive')
+const { ERR_NOT_FOUND, ERR_INVALID_INPUT, ERR_INVALID_APP_NAME } = require('pear-errors')
 
 class Build extends EventEmitter {
   constructor(opts) {
@@ -12,9 +13,15 @@ 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 pkgFile = await fs.promises.readFile(pkgPath, 'utf-8')
-    const pkg = JSON.parse(pkgFile)
+    const pkg = await getParsedJSON('package.json', 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)]
@@ -48,6 +55,13 @@ class Build extends EventEmitter {
       await fs.promises.readFile(pkgPath)
     )
 
+    if (config) {
+      await fs.promises.writeFile(
+        path.join(target, 'pear.json'),
+        await fs.promises.readFile(configPath)
+      )
+    }
+
     const apps = [
       darwinArm64App,
       darwinX64App,
@@ -66,8 +80,14 @@ class Build extends EventEmitter {
     const noop = () => {}
     const promises = []
     for (const [arch, app] of apps) {
+      if (!fs.existsSync(app)) {
+        throw new Error(`${app} does not exists`)
+      }
       if (path.basename(app, path.extname(app)) !== appName) {
-        throw new Error(`expected directory ${appName} but got ${path.basename(app)} for ${arch}`)
+        throw ERR_INVALID_APP_NAME(
+          `expected directory ${appName} but got ${path.basename(app)} for ${arch}`,
+          { arch, app }
+        )
       }
       const archApp = path.join(byArch, arch, 'app')
       await fs.promises.mkdir(archApp, { recursive: true })
@@ -97,6 +117,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.1",
+  "version": "1.2.0",
   "main": "index.js",
   "type": "commonjs",
   "bin": {
@@ -17,6 +17,7 @@
     "summary": "Create project deployment folder",
     "flag --package [path]": "Path to project package.json",
     "flag --target [path]": "Target build dir",
+    "flag --config [path]": "Path to project pear.json (mandatory for mobile)",
     "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",
@@ -56,7 +57,8 @@
     "bare-fs": "^4.5.3",
     "bare-path": "^3.0.0",
     "localdrive": "^2.2.0",
-    "paparam": "^1.10.0"
+    "paparam": "^1.10.0",
+    "pear-errors": "^1.0.1"
   },
   "devDependencies": {
     "brittle": "^4.0.0",