@skriptfabrik/json-schema-bundler 0.0.0-dev → 0.2.0

package/.github/workflows/ci.yml

@@ -30,11 +30,23 @@ jobs:
           node-version: ${{ env.NODE_VERSION }}
 
       - name: Install dependencies
-        run: npm ci
+        run: |-
+          npm ci
+
+      - name: Export short SHA
+        run: |-
+          echo "GITHUB_SHORT_SHA=$(echo $GITHUB_SHA | cut -c1-8)" >> ${GITHUB_ENV}
 
-      - name: Bump package version
+      - name: Set package version
+        if: github.ref_name == 'main'
+        run: |-
+          PACKAGE_VERSION=$(jq -r .version package.json)
+          npm version "${PACKAGE_VERSION%-*}-${GITHUB_SHORT_SHA}" --no-git-tag-version
+
+      - name: Set package version from Git
         if: github.ref_type == 'tag'
-        run: npm version from-git --no-git-tag-version
+        run: |-
+          npm version from-git --no-git-tag-version
 
       - name: Publish package
         uses: JS-DevTools/npm-publish@v1
@@ -61,7 +73,9 @@ jobs:
         with:
           build-args: |-
             BUILDKIT_INLINE_CACHE=${{ env.DOCKER_BUILDKIT_INLINE_CACHE }}
+            JSON_SCHEMA_BUNDLER_VERSION=${{ env.GITHUB_SHORT_SHA }}
           cache-from: type=registry,ref=${{ env.DOCKER_IMAGE_NAME }}:latest
+          context: .
           platforms: |-
             linux/amd64
             linux/arm64
@@ -83,6 +97,7 @@ jobs:
             BUILDKIT_INLINE_CACHE=${{ env.DOCKER_BUILDKIT_INLINE_CACHE }}
             JSON_SCHEMA_BUNDLER_VERSION=v${{ env.RELEASE_VERSION }}
           cache-from: type=registry,ref=${{ env.DOCKER_IMAGE_NAME }}:latest
+          context: .
           platforms: |-
             linux/amd64
             linux/arm64

package/Dockerfile

@@ -4,7 +4,6 @@ LABEL maintainer="Daniel Schröder <daniel.schroeder@skriptfabrik.com>"
 
 ARG JSON_SCHEMA_BUNDLER_VERSION=latest
 
-ENV JSON_SCHEMA_BUNDLER_VERSION=${JSON_SCHEMA_BUNDLER_VERSION}
 ENV NODE_ENV=production
 
 COPY . /opt/json-schema-bundler-${JSON_SCHEMA_BUNDLER_VERSION}

package/README.md

@@ -21,7 +21,7 @@ json-schema-bundler --help
 ```
 
 ```text
-JSON Schema Bundler (latest)
+JSON Schema Bundler
 
 Usage:
   json-schema-bundler [options] <input>
@@ -30,9 +30,10 @@ Arguments:
   input  The path or URL of the input schema file
 
 Options:
-  -h, --help    Display this help message
-  -p, --pretty  Pretty print output
-  -s, --silent  Silent mode
+  -h, --help     Display this help message
+  -p, --pretty   Pretty print output
+  -s, --silent   Silent mode
+  -v, --version  Print version number
 
 Examples:
   Bundle all references in schema.json and print output to stdout:

package/json-schema-bundler-cli.js

@@ -3,6 +3,7 @@
 const $RefParser = require('json-schema-ref-parser');
 const minimist = require('minimist');
 const path = require('path');
+const pkg = require('./package.json');
 
 const argv = minimist(process.argv.slice(2), {
     boolean: ['h', 'p', 's'],
@@ -10,6 +11,7 @@ const argv = minimist(process.argv.slice(2), {
         h: 'help',
         p: 'pretty',
         s: 'silent',
+        v: 'version',
     },
 });
 
@@ -20,16 +22,21 @@ const colors = {
     magenta: '\x1b[35m',
 };
 
+if (argv.v) {
+    console.log(pkg.version);
+    process.exit(0);
+}
+
 if (argv.h || argv._.length < 1) {
     console.error(
-        `JSON Schema Bundler (%s)\n\n${colors.yellow}Usage:${colors.end}\n  %s\n\n${colors.yellow}Arguments:${colors.end}\n  %s\n\n${colors.yellow}Options:${colors.end}\n  %s\n\n${colors.yellow}Examples:${colors.end}\n  %s`,
-        process.env['JSON_SCHEMA_BUNDLER_VERSION'],
+        `JSON Schema Bundler\n\n${colors.yellow}Usage:${colors.end}\n  %s\n\n${colors.yellow}Arguments:${colors.end}\n  %s\n\n${colors.yellow}Options:${colors.end}\n  %s\n\n${colors.yellow}Examples:${colors.end}\n  %s`,
         `${path.basename(process.argv[1])} [options] <input>`,
         `${colors.green}input${colors.end}  The path or URL of the input schema file`,
         [
-            `${colors.green}-h, --help${colors.end}    Display this help message`,
-            `${colors.green}-p, --pretty${colors.end}  Pretty print output`,
-            `${colors.green}-s, --silent${colors.end}  Silent mode`,
+            `${colors.green}-h, --help${colors.end}     Display this help message`,
+            `${colors.green}-p, --pretty${colors.end}   Pretty print output`,
+            `${colors.green}-s, --silent${colors.end}   Silent mode`,
+            `${colors.green}-v, --version${colors.end}  Print version number`,
         ].join('\n  '),
         [
             [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skriptfabrik/json-schema-bundler",
-  "version": "0.0.0-dev",
+  "version": "0.2.0",
   "description": "The missing CLI for the JSON Schema $Ref Parser",
   "keywords": [
     "json",

package/output.json

@@ -1,5 +0,0 @@
-{
-  "schema2": {
-    "foo": "bar"
-  }
-}

package/schema.json

@@ -1,5 +0,0 @@
-{
-  "schema2": {
-      "$ref": "schema2.json"
-  }
-}

package/schema2.json

@@ -1,3 +0,0 @@
-{
-  "foo": "bar"
-}