Skip to content
This repository was archived by the owner on Jan 15, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ jobs:

- script: 'rush test'
displayName: 'rush test'

- script: 'rush posttest'
displayName: 'rush posttest'

- script: 'node ./common/scripts/version-and-pack.js --version $(_version)'
displayName: 'Version and Pack'
Expand Down
8 changes: 8 additions & 0 deletions common/config/rush/command-line.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,14 @@
"summary": "clean everything up",
"shellCommand": "rush unlink & rush purge & npx rimraf ./node_modules ./packages/chatdown/node_modules ./packages/cli/node_modules ./packages/command/node_modules ./packages/config/node_modules ./packages/dialog/node_modules ./packages/lu/node_modules ./packages/luis/node_modules ./packages/qnamaker/node_modules & rush update",
"safeForSimultaneousRushProcesses": true
},
{
"commandKind": "bulk",
"name": "posttest",
"summary": "Run all posttest scripts",
"description": "This runs all posttest scrips which perform linting",
"enableParallelism": true,
"allowWarningsInSuccessfulBuild": true
}
// {
// /**
Expand Down
2 changes: 1 addition & 1 deletion packages/config/src/commands/config/show/luis.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ export default class ConfigShowLuis extends Command {
})
this.log(JSON.stringify(luis, null, 2))
}
}
}
39 changes: 19 additions & 20 deletions packages/dialog/src/commands/dialog/generate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,25 @@ import * as gen from '../../library/dialogGenerator'
import * as ppath from 'path'

export default class GenerateDialog extends Command {
static description = '[PREVIEW] Generate localized .lu, .lg, .qna and .dialog assets to define a bot based on a schema using templates.'

static examples = [`
$ bf dialog:generate sandwich.schema --output c:/tmp
`]

static args = [
{ name: 'schema', required: true, description: 'JSON Schema .schema file used to drive generation.' }
]

static flags: flags.Input<any> = {
force: flags.boolean({ char: 'f', description: 'Force overwriting generated files.' }),
help: flags.help({ char: 'h' }),
locale: flags.string({ char: 'l', description: 'Locales to generate. [default: en-us]', multiple: true }),
output: flags.string({ char: 'o', description: 'Output path for where to put generated .lu, .lg, .qna and .dialog files. [default: .]', default: '.', required: false }),
schema: flags.string({ char: 's', description: 'Path to your app.schema file.', required: false }),
templates: flags.string({ char: 't', description: 'Directory with templates to use for generating assets.', multiple: true }),
verbose: flags.boolean({ description: 'Output verbose logging of files as they are processed', default: false }),
}

async run() {
const { args, flags } = this.parse(GenerateDialog)
Expand Down Expand Up @@ -38,24 +57,4 @@ export default class GenerateDialog extends Command {
progress(msg: string): void {
this.error(msg)
}

static description = '[PREVIEW] Generate localized .lu, .lg, .qna and .dialog assets to define a bot based on a schema using templates.'

static examples = [`
$ bf dialog:generate sandwich.schema --output c:/tmp
`]

static args = [
{ name: 'schema', required: true, description: 'JSON Schema .schema file used to drive generation.' }
]

static flags: flags.Input<any> = {
force: flags.boolean({ char: 'f', description: 'Force overwriting generated files.' }),
help: flags.help({ char: 'h' }),
locale: flags.string({ char: 'l', description: 'Locales to generate. [default: en-us]', multiple: true }),
output: flags.string({ char: 'o', description: 'Output path for where to put generated .lu, .lg, .qna and .dialog files. [default: .]', default: '.', required: false }),
schema: flags.string({ char: 's', description: 'Path to your app.schema file.', required: false }),
templates: flags.string({ char: 't', description: 'Directory with templates to use for generating assets.', multiple: true }),
verbose: flags.boolean({ description: 'Output verbose logging of files as they are processed', default: false }),
}
}
40 changes: 20 additions & 20 deletions packages/dialog/src/commands/dialog/merge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,26 @@ let exec: any = util.promisify(require('child_process').exec)

export default class DialogMerge extends Command {

static args = [
{ name: 'glob1', required: true },
{ name: 'glob2', required: false },
{ name: 'glob3', required: false },
{ name: 'glob4', required: false },
{ name: 'glob5', required: false },
{ name: 'glob6', required: false },
{ name: 'glob7', required: false },
{ name: 'glob8', required: false },
{ name: 'glob9', required: false },
]

static flags: flags.Input<any> = {
help: flags.help({ char: 'h' }),
output: flags.string({ char: 'o', description: 'Output path and filename for merged schema. [default: app.schema]', default: 'app.schema', required: false }),
branch: flags.string({ char: 'b', description: 'The branch to use for the meta-schema component.schema.', default: 'master', required: false }),
update: flags.boolean({ char: 'u', description: 'Update .schema files to point the <branch> component.schema and regenerate component.schema if baseComponent.schema is present.', default: false, required: false }),
verbose: flags.boolean({ description: 'output verbose logging of files as they are processed', default: false }),
}

private verbose? = false
private failed = false
private missingKinds = new Set()
Expand Down Expand Up @@ -533,25 +553,5 @@ export default class DialogMerge extends Command {
this.error(`${this.currentFile}: error:${kind}: ${message}`)
this.failed = true
}

static args = [
{ name: 'glob1', required: true },
{ name: 'glob2', required: false },
{ name: 'glob3', required: false },
{ name: 'glob4', required: false },
{ name: 'glob5', required: false },
{ name: 'glob6', required: false },
{ name: 'glob7', required: false },
{ name: 'glob8', required: false },
{ name: 'glob9', required: false },
]

static flags: flags.Input<any> = {
help: flags.help({ char: 'h' }),
output: flags.string({ char: 'o', description: 'Output path and filename for merged schema. [default: app.schema]', default: 'app.schema', required: false }),
branch: flags.string({ char: 'b', description: 'The branch to use for the meta-schema component.schema.', default: 'master', required: false }),
update: flags.boolean({ char: 'u', description: 'Update .schema files to point the <branch> component.schema and regenerate component.schema if baseComponent.schema is present.', default: false, required: false }),
verbose: flags.boolean({ description: 'output verbose logging of files as they are processed', default: false }),
}

}
33 changes: 17 additions & 16 deletions packages/dialog/src/commands/dialog/verify.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,23 @@ import { Definition, DialogTracker, SchemaTracker } from '../../library/dialogTr

export default class DialogVerify extends Command {

static args = [
{ name: 'glob1', required: true },
{ name: 'glob2', required: false },
{ name: 'glob3', required: false },
{ name: 'glob4', required: false },
{ name: 'glob5', required: false },
{ name: 'glob6', required: false },
{ name: 'glob7', required: false },
{ name: 'glob8', required: false },
{ name: 'glob9', required: false },
]

static flags: flags.Input<any> = {
help: flags.help({ char: 'h' }),
verbose: flags.boolean({ description: 'Show verbose output', default: false }),
}

private currentFile = ''
private files = 0
private errors = 0
Expand Down Expand Up @@ -99,20 +116,4 @@ export default class DialogVerify extends Command {
this.error(`${this.currentFile} - error ${code || ''}: ${msg}`)
}

static args = [
{ name: 'glob1', required: true },
{ name: 'glob2', required: false },
{ name: 'glob3', required: false },
{ name: 'glob4', required: false },
{ name: 'glob5', required: false },
{ name: 'glob6', required: false },
{ name: 'glob7', required: false },
{ name: 'glob8', required: false },
{ name: 'glob9', required: false },
]

static flags: flags.Input<any> = {
help: flags.help({ char: 'h' }),
verbose: flags.boolean({ description: 'Show verbose output', default: false }),
}
}
2 changes: 1 addition & 1 deletion packages/luis/src/commands/luis/application/delete.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default class LuisApplicationDelete extends Command {

const client = utils.getLUISClient(subscriptionKey, endpoint)

if(!flags.appId) {
if (!flags.appId) {
const deleteAppConfirmation = await cli.confirm(`Are you sure you would like to delete app with id: ${appId}? (Y/N)`)
if (!deleteAppConfirmation) {
return this.log('No action taken')
Expand Down
2 changes: 1 addition & 1 deletion packages/luis/src/commands/luis/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ export default class LuisIndex extends Command {
async run() {
this._help()
}
}
}
2 changes: 1 addition & 1 deletion packages/luis/src/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -135,4 +135,4 @@ module.exports.processInputs = processInputs
module.exports.validateRequiredProps = validateRequiredProps
module.exports.writeToConsole = writeToConsole
module.exports.writeToFile = writeToFile
module.exports.writeUserConfig = writeUserConfig
module.exports.writeUserConfig = writeUserConfig