Skip to content

Commit

Permalink
Merge pull request #38 from boite-nl/version/v1.0.0
Browse files Browse the repository at this point in the history
v1.0.0
  • Loading branch information
boitewitte committed Jun 18, 2022
2 parents 93b48bd + 3d0d242 commit 3640a08
Show file tree
Hide file tree
Showing 9 changed files with 50 additions and 23 deletions.
2 changes: 2 additions & 0 deletions .github/release-drafter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,5 @@ exclude-contributors:
exclude-labels:
- 'skip-changelog'
- 'dependencies'
- 'release'
- 'prerelease'
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ on:
type: string
environment:
description: The environment to which to release
defualt: production
default: production
required: false
type: string

Expand Down
24 changes: 18 additions & 6 deletions dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16976,16 +16976,28 @@ var __importStar = (this && this.__importStar) || function (mod) {
__setModuleDefault(result, mod);
return result;
};
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", ({ value: true }));
exports.transformInputs = exports.transformers = void 0;
const core = __importStar(__nccwpck_require__(2186));
const valid_1 = __importDefault(__nccwpck_require__(9601));
const clean_1 = __importDefault(__nccwpck_require__(8848));
const select_release_1 = __nccwpck_require__(1394);
const utils_1 = __nccwpck_require__(1314);
function toSelectTypes(value) {
function isVersion(value) {
return (0, valid_1.default)((0, clean_1.default)(value));
}
function getSelectTypeVersion(value) {
return (isVersion(value) && (0, clean_1.default)(value)) || false;
}
function getSelectType(value) {
const cleanupValue = value.toLowerCase().trim();
return select_release_1.availableSelectionMethods.indexOf(cleanupValue) === -1 ?
false :
cleanupValue;
return select_release_1.availableSelectionMethods.indexOf(cleanupValue) === -1 ? false : cleanupValue;
}
function toSelectTypes(value) {
return getSelectType(value) || getSelectTypeVersion(value);
}
exports.transformers = {
draft: utils_1.toBoolean,
Expand Down Expand Up @@ -17061,7 +17073,7 @@ function ensureOrderDateForRelease(release) {
});
}
function sortByDate(releases, direction) {
return (0, lodash_orderby_1.default)(releases.map(ensureOrderDateForRelease), ['orderBy'], [direction]).map(release => (0, lodash_omit_1.default)(release, 'orderBy'));
return (0, lodash_orderby_1.default)(releases.map(ensureOrderDateForRelease), ['orderBy'], [direction]).map((release) => (0, lodash_omit_1.default)(release, 'orderBy'));
}
function sortBySemver(releases, direction) {
return releases.sort((a, b) => semverSort[direction](a.name, b.name, true));
Expand Down Expand Up @@ -17090,7 +17102,7 @@ function compareVersionToRelease({ name, tag_name: tagName }, version) {
false);
}
function findVersion(releases, version) {
return (releases.find(release => compareVersionToRelease(release, version)) || false);
return (releases.find((release) => compareVersionToRelease(release, version)) || false);
}
function selectVersion(releases, version) {
if ((0, valid_1.default)((0, clean_1.default)(version))) {
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

11 changes: 6 additions & 5 deletions features/select-release.feature
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ Feature: Select a Queried Release
"""

Examples:
| draft | prerelease | range | release | select | description | matchData |
| true | false | false | false | latest | Latest Draft | {"draft": true} |
| false | false | false | true | latest | Latest Release | {"draft": false, "prerelease": false} |
| false | false | false | true | previous | Previous Version | {"draft": false, "prerelease": false} |
| false | true | false | false | v2.0.1 | Specific prerelease Version | {"prerelease": true, "name": "v2.0.1"} |
| draft | prerelease | range | release | select | description | matchData |
| true | false | false | false | latest | Latest Draft | {"draft": true} |
| false | false | false | true | latest | Latest Release | {"draft": false, "prerelease": false} |
| false | false | false | true | previous | Previous Version | {"draft": false, "prerelease": false} |
| false | true | false | false | v2.0.1 | Specific prerelease Version | {"prerelease": true, "name": "v2.0.1"} |
| false | false | false | true | 2.0.0 | Specific release Version | {"prerelease": false, "draft": false, "name": "v2.0.0"} |
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,5 @@
"version": "npm run build && action-docs --toc-level 3 --update-readme --no-banner && doctoc README.md && git add -A dist README.md"
},
"snyk": true,
"version": "1.0.0-rc.0"
"version": "1.0.0"
}
20 changes: 16 additions & 4 deletions src/input.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import * as core from '@actions/core'
import valid from 'semver/functions/valid'
import clean from 'semver/functions/clean'
import {availableSelectionMethods, SelectRelease} from './select-release'
import {isEmptyString, isFalse, toBoolean} from './utils'

Expand All @@ -17,12 +19,22 @@ type InputTransform = {
[Property in keyof Inputs]: (value: string) => Inputs[Property]
}

function toSelectTypes(value: string): SelectRelease | false {
function isVersion (value: string) {
return valid(clean(value))
}

function getSelectTypeVersion(value:string) {
return (isVersion(value) && clean(value) as SelectRelease) || false
}

function getSelectType(value: string) {
const cleanupValue = value.toLowerCase().trim()

return availableSelectionMethods.indexOf(cleanupValue) === -1 ?
false :
(cleanupValue as SelectRelease)
return availableSelectionMethods.indexOf(cleanupValue) === -1 ? false : cleanupValue as SelectRelease
}

function toSelectTypes(value: string): SelectRelease | false {
return getSelectType(value) || getSelectTypeVersion(value)
}

export const transformers: InputTransform = {
Expand Down
6 changes: 3 additions & 3 deletions src/select-release.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ function sortByDate(releases: Releases, direction: OrderByDirection): Releases {
releases.map(ensureOrderDateForRelease),
['orderBy'],
[direction]
).map(release => omit(release, 'orderBy'))
).map((release) => omit(release, 'orderBy'))
}

function sortBySemver(releases, direction: OrderByDirection): Releases {
Expand Down Expand Up @@ -72,7 +72,7 @@ function compareVersionToRelease(

function findVersion(releases: Releases, version: string): Release | false {
return (
releases.find(release => compareVersionToRelease(release, version)) || false
releases.find((release) => compareVersionToRelease(release, version)) || false
)
}

Expand All @@ -84,7 +84,7 @@ function selectVersion(releases: Releases, version: string): Release | false {
}
}

export type SelectRelease = keyof typeof selectionMethods
export type SelectRelease = keyof typeof selectionMethods | string
export const availableSelectionMethods = Object.keys(selectionMethods)

export default function selectRelease(
Expand Down

0 comments on commit 3640a08

Please sign in to comment.