fix(core): update

This commit is contained in:
Philipp Kunz 2022-08-03 17:07:11 +02:00
parent f7c24a0bd2
commit db1e866fe1
6 changed files with 28 additions and 58 deletions

View File

@ -12,20 +12,12 @@ stages:
- release - release
- metadata - metadata
before_script:
- npm install -g @shipzone/npmci
# ==================== # ====================
# security stage # security stage
# ==================== # ====================
mirror:
stage: security
script:
- npmci git mirror
only:
- tags
tags:
- lossless
- docker
- notpriv
auditProductionDependencies: auditProductionDependencies:
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
stage: security stage: security
@ -36,6 +28,7 @@ auditProductionDependencies:
- npmci command npm audit --audit-level=high --only=prod --production - npmci command npm audit --audit-level=high --only=prod --production
tags: tags:
- docker - docker
allow_failure: true
auditDevDependencies: auditDevDependencies:
image: registry.gitlab.com/hosttoday/ht-docker-node:npmci image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
@ -96,10 +89,9 @@ codequality:
only: only:
- tags - tags
script: script:
- npmci command npm install -g tslint typescript - npmci command npm install -g typescript
- npmci npm prepare - npmci npm prepare
- npmci npm install - npmci npm install
- npmci command "tslint -c tslint.json ./ts/**/*.ts"
tags: tags:
- lossless - lossless
- docker - docker
@ -119,11 +111,10 @@ trigger:
pages: pages:
stage: metadata stage: metadata
script: script:
- npmci node install lts - npmci node install stable
- npmci command npm install -g @gitzone/tsdoc
- npmci npm prepare - npmci npm prepare
- npmci npm install - npmci npm install
- npmci command tsdoc - npmci command npm run buildDocs
tags: tags:
- lossless - lossless
- docker - docker

24
.vscode/launch.json vendored
View File

@ -2,28 +2,10 @@
"version": "0.2.0", "version": "0.2.0",
"configurations": [ "configurations": [
{ {
"name": "current file", "command": "npm test",
"type": "node", "name": "Run npm test",
"request": "launch", "request": "launch",
"args": [ "type": "node-terminal"
"${relativeFile}"
],
"runtimeArgs": ["-r", "@gitzone/tsrun"],
"cwd": "${workspaceRoot}",
"protocol": "inspector",
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": "test.ts",
"type": "node",
"request": "launch",
"args": [
"test/test.ts"
],
"runtimeArgs": ["-r", "@gitzone/tsrun"],
"cwd": "${workspaceRoot}",
"protocol": "inspector",
"internalConsoleOptions": "openOnSessionStart"
} }
] ]
} }

View File

@ -8,7 +8,8 @@
"type": "module", "type": "module",
"scripts": { "scripts": {
"test": "(tstest test/ --web)", "test": "(tstest test/ --web)",
"build": "(tsbuild --web)" "build": "(tsbuild --web)",
"buildDocs": "tsdoc"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
@ -58,4 +59,4 @@
"browserslist": [ "browserslist": [
"last 1 chrome versions" "last 1 chrome versions"
] ]
} }

View File

@ -3,6 +3,6 @@
*/ */
export const commitinfo = { export const commitinfo = {
name: '@pushrocks/smartcli', name: '@pushrocks/smartcli',
version: '4.0.0', version: '4.0.1',
description: 'easy observable cli tasks' description: 'easy observable cli tasks'
} }

View File

@ -16,8 +16,7 @@ export class Smartcli {
* this Deferred contains the parsed result in the end * this Deferred contains the parsed result in the end
*/ */
public parseCompleted = plugins.smartpromise.defer<any>(); public parseCompleted = plugins.smartpromise.defer<any>();
public version: string; public version: string;
private checkForEnvCliCall = true; private checkForEnvCliCall = true;
@ -29,7 +28,7 @@ export class Smartcli {
/** /**
* maps alias * maps alias
*/ */
public aliasObject: {[key: string]: string[]} = {}; public aliasObject: { [key: string]: string[] } = {};
/** /**
* The constructor of Smartcli * The constructor of Smartcli
@ -46,7 +45,7 @@ export class Smartcli {
/** /**
* adds an alias, meaning one equals the other in terms of command execution. * adds an alias, meaning one equals the other in terms of command execution.
*/ */
public addCommandAlias(originalArg, aliasArg): void { public addCommandAlias(originalArg: string, aliasArg: string): void {
this.aliasObject[originalArg] = this.aliasObject[originalArg] || []; this.aliasObject[originalArg] = this.aliasObject[originalArg] || [];
this.aliasObject[originalArg].push(aliasArg); this.aliasObject[originalArg].push(aliasArg);
} }
@ -58,12 +57,12 @@ export class Smartcli {
public addCommand(commandNameArg: string): plugins.smartrx.rxjs.Subject<any> { public addCommand(commandNameArg: string): plugins.smartrx.rxjs.Subject<any> {
let commandSubject: plugins.smartrx.rxjs.Subject<any>; let commandSubject: plugins.smartrx.rxjs.Subject<any>;
const existingCommandSubject = this.getCommandSubject(commandNameArg); const existingCommandSubject = this.getCommandSubject(commandNameArg);
commandSubject = existingCommandSubject || new plugins.smartrx.rxjs.Subject<any>(); commandSubject = existingCommandSubject || new plugins.smartrx.rxjs.Subject<any>();
this.commandObservableMap.add({ this.commandObservableMap.add({
commandName: commandNameArg, commandName: commandNameArg,
subject: commandSubject, subject: commandSubject,
}) });
return commandSubject; return commandSubject;
} }
@ -105,7 +104,7 @@ export class Smartcli {
public addVersion(versionArg: string) { public addVersion(versionArg: string) {
this.version = versionArg; this.version = versionArg;
this.addCommandAlias('v', 'version'); this.addCommandAlias('v', 'version');
this.parseCompleted.promise.then(argv => { this.parseCompleted.promise.then((argv) => {
if (argv.v) { if (argv.v) {
console.log(this.version); console.log(this.version);
} }
@ -132,12 +131,12 @@ export class Smartcli {
return; return;
} }
const parsedYArgs = plugins.yargsParser(process.argv); const parsedYArgs = plugins.yargsParser(process.argv);
// lets handle commands // lets handle commands
let counter = 0; let counter = 0;
let foundCommand = false; let foundCommand = false;
parsedYArgs._.map((commandPartArg) => { parsedYArgs._.map((commandPartArg) => {
counter ++; counter++;
if (typeof commandPartArg === 'number') { if (typeof commandPartArg === 'number') {
return true; return true;
} }
@ -148,17 +147,17 @@ export class Smartcli {
} else { } else {
return true; return true;
} }
}) });
for (const command of this.commandObservableMap.getArray()) { for (const command of this.commandObservableMap.getArray()) {
if (!parsedYArgs._[0]) { if (!parsedYArgs._[0]) {
const standardCommand = this.commandObservableMap.findSync(commandArg => { const standardCommand = this.commandObservableMap.findSync((commandArg) => {
return commandArg.commandName === "standardCommand"; return commandArg.commandName === 'standardCommand';
}); });
if (standardCommand) { if (standardCommand) {
standardCommand.subject.next(parsedYArgs); standardCommand.subject.next(parsedYArgs);
} else { } else {
console.log('no smartcli standard task was created or assigned.'); console.log('no smartcli standard task was created or assigned.');
}; }
break; break;
} }
if (command.commandName === parsedYArgs._[0]) { if (command.commandName === parsedYArgs._[0]) {
@ -166,7 +165,6 @@ export class Smartcli {
break; break;
} }
if (this.aliasObject[parsedYArgs[0]]) { if (this.aliasObject[parsedYArgs[0]]) {
} }
} }
this.parseCompleted.resolve(parsedYArgs); this.parseCompleted.resolve(parsedYArgs);

View File

@ -11,6 +11,4 @@ export { smartlog, lik, path, smartparam, smartpromise, smartrx };
// thirdparty scope // thirdparty scope
import yargsParser from 'yargs-parser'; import yargsParser from 'yargs-parser';
export { export { yargsParser };
yargsParser
}