Merge pull request #39 from guidesmiths/fix-38-object

Fix built manifest when extra parameters is a nested object

Author: Íñigo Marquínez

.github/workflows/cd.yml

@@ -8,10 +8,10 @@ jobs:
   publish-npm:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 14.x
+          node-version: 18
           registry-url: 'https://registry.npmjs.org'
       - run: npm ci
       - name: Publish

.github/workflows/ci.yml

@@ -11,14 +11,13 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [10.x, 12.x, 13.x, 14.x]
+        node-version: [14.x, 16.x, 18.x]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Set up Node.js version ${{ matrix.node-version }}
-      uses: actions/setup-node@v1
+      uses: actions/setup-node@v3
       with:
         node-version: ${{ matrix.node-version }}
         cache: 'npm'
-
     - run: npm install
     - run: npm run lint

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npm run lint

bin/make-manifest

@@ -1,19 +1,23 @@
 #!/usr/bin/env node
 
-var program = require('commander')
-var makeManifest = require('../')
+const program = require('commander');
+const _set = require('lodash.set');
+const path = require('path')
+
+const makeManifest = require('../');
+const pkg = require(path.join(process.cwd(), 'package.json'))
 
 const collect = (value, memo) => {
-    const values = value.split(/\s*:\s*/)
-    memo[values[0]] = values.splice(1).join(':')
-    return memo;
+  const values = value.split(/\s*:\s*/);
+  return _set(memo, values[0], values[1]);
 }
 
 program
-  .version('0.0.1')
-  .option('-x --extra [string]', 'colon separated key value pair', collect, {})
+  .version(pkg.version, '-v, --version', 'output the current version')
+  .option('-x, --extra [string]', 'colon separated key value pair', collect, {})
   .parse(process.argv);
 
-const extraArguments = { ...program.extra };
+program.parse();
+const options = program.opts();
 
-makeManifest(extraArguments)
+makeManifest(options.extra);

index.js

@@ -1,23 +1,25 @@
-const fs = require('fs')
-const path = require('path')
-const pkg = require(path.join(process.cwd(), 'package.json'))
+const fs = require('fs');
+const path = require('path');
 const gitCommit = require('git-rev-sync');
 const gitRemote = require('remote-origin-url');
 
+const pkg = require(path.join(process.cwd(), 'package.json'));
+
 module.exports = extra => {
-    const { name, version } = pkg;
-    let scm = {};
+  const { name, version } = pkg;
+  let scm = {};
 
-    // Without commits, .git/packed-refs does not exists
-    if( fs.existsSync(path.join(process.cwd(), '.git', 'packed-refs'))){
-      scm = {
-        remote: gitRemote.sync(),
-        branch: gitCommit.branch(),
-        commit: gitCommit.long()
-      }
+  // Without commits, .git/packed-refs does not exists
+  if (fs.existsSync(path.join(process.cwd(), '.git', 'packed-refs'))) {
+    scm = {
+      remote: gitRemote.sync(),
+      branch: gitCommit.branch(),
+      commit: gitCommit.long()
     }
+  }
+
+  const timestamp = new Date().toISOString();
+  const manifest = { name, version, scm, timestamp, ...extra };
 
-    const timestamp = new Date().toISOString();
-    const manifest = { name, version, scm, timestamp, ...extra };
-    fs.writeFileSync('manifest.json', `${JSON.stringify(manifest, null, 2)}\n`, 'utf-8')
+  fs.writeFileSync('manifest.json', `${JSON.stringify(manifest, null, 2)}\n`, 'utf-8');
 }