Skip to content

[v6] adds uuid support #586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chradek merged 4 commits into from
Mar 19, 2020
Merged

[v6] adds uuid support #586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5f6de1
[v6] adds uuid support
chradek Mar 19, 2020
2edc0b1
generate bodyArray client
chradek Mar 19, 2020
ce1af0f
update test server
chradek Mar 19, 2020
a4ab690
add azure report
chradek Mar 19, 2020
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
10,764 changes: 5,407 additions & 5,357 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,13 @@
"unit-test": "mocha -r ts-node/register './test/unit/**/*spec.ts'",
"integration-test": "start-server-and-test start-test-server:v1 http://localhost:3000 generate-and-test",
"integration-test:new": "npm-run-all start-test-server generate-and-test integration-test:alone stop-test-server",
"generate-and-test": "npm-run-all -s build -p generate-bodystring generate-bodycomplex generate-url generate-customurl generate-xmlservice generate-header generate-paging generate-mediatypes -s integration-test:alone",
"generate-and-test": "npm-run-all -s build -p generate-bodyarray generate-bodystring generate-bodycomplex generate-url generate-customurl generate-xmlservice generate-header generate-paging generate-mediatypes -s integration-test:alone",
"integration-test:alone": "mocha -r ts-node/register './test/integration/**/*spec.ts'",
"start-test-server": "ts-node test/utils/start-server.ts",
"start-test-server:v1": "start-autorest-express node",
"stop-test-server": "stop-autorest-testserver",
"debug": "node --inspect-brk ./dist/src/main.js",
"generate-bodyarray": "autorest --add-credentials=false --typescript --output-folder=./test/integration/generated/bodyArray --use=. --title=BodyArrayClient --input-file=node_modules/@microsoft.azure/autorest.testserver/swagger/body-array.json --package-name=bodyArary --package-version=1.0.0-preview1",
"generate-bodystring": "autorest --add-credentials=false --typescript --output-folder=./test/integration/generated/bodyString --use=. --title=BodyStringClient --input-file=node_modules/@microsoft.azure/autorest.testserver/swagger/body-string.json --package-name=bodyString --package-version=1.0.0-preview1",
"generate-bodycomplex": "autorest --add-credentials=false --typescript --output-folder=./test/integration/generated/bodyComplex --use=. --title=BodyComplexClient --input-file=node_modules/@microsoft.azure/autorest.testserver/swagger/body-complex.json --package-name=bodyString --package-version=1.0.0-preview1",
"generate-url": "autorest --add-credentials=false --typescript --output-folder=./test/integration/generated/url --use=. --title=UrlClient --input-file=node_modules/@microsoft.azure/autorest.testserver/swagger/url.json --package-name=url --package-version=1.0.0-preview1",
Expand All @@ -23,6 +24,7 @@
"generate-xmlservice": "autorest --add-credentials=false --typescript --output-folder=./test/integration/generated/xmlservice --use=. --title=XmlServiceClient --input-file=node_modules/@microsoft.azure/autorest.testserver/swagger/xml-service.json --package-name=xmlservice --package-version=1.0.0-preview1",
"generate-paging": "autorest --typescript --add-credentials=false --output-folder=./test/integration/generated/paging --use=. --title=PagingClient --input-file=node_modules/@microsoft.azure/autorest.testserver/swagger/paging.json --package-name=pagingservice --package-version=1.0.0-preview1",
"generate-report": "autorest --typescript --add-credentials=false --output-folder=./test/integration/generated/report --use=. --title=ReportClient --input-file=node_modules/@microsoft.azure/autorest.testserver/swagger/report.json --package-name=zzzReport --package-version=1.0.0-preview1",
"generate-azurereport": "autorest --typescript --add-credentials=false --output-folder=./test/integration/generated/azureReport --use=. --title=ReportClient --input-file=node_modules/@microsoft.azure/autorest.testserver/swagger/azure-report.json --package-name=zzzAzureReport --package-version=1.0.0-preview1",
"generate-mediatypes": "autorest --typescript --add-credentials=false --output-folder=./test/integration/generated/mediaTypes --use=. --title=MediaTypesClient --input-file=node_modules/@microsoft.azure/autorest.testserver/swagger/media_types.json --package-name=media-types-service --package-version=1.0.0-preview1"
},
"files": [
Expand All @@ -38,7 +40,7 @@
"@azure-tools/codemodel": "3.4.302",
"@azure-tools/linq": "3.1.206",
"@azure-tools/openapi": "3.0.209",
"@azure/core-http": "^1.0.0",
"@azure/core-http": "^1.0.4",
"@azure/core-paging": "^1.0.0",
"@azure/logger": "^1.0.0",
"@types/lodash": "^4.14.149",
Expand All @@ -48,9 +50,9 @@
"ts-morph": "^5.0.0"
},
"devDependencies": {
"@autorest/test-server": "^3.0.26",
"@autorest/test-server": "^3.0.27",
"@azure/abort-controller": "^1.0.1",
"@microsoft.azure/autorest.testserver": "^2.10.10",
"@microsoft.azure/autorest.testserver": "^2.10.14",
"@types/chai": "^4.2.8",
"@types/express": "^4.17.2",
"@types/js-yaml": "3.12.1",
Expand Down
2 changes: 1 addition & 1 deletion src/generators/static/packageFileGenerator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export function generatePackageJson(
`A generated SDK for ${clientDetails.name}.`,
version: packageDetails.version,
dependencies: {
"@azure/core-http": "^1.0.0",
"@azure/core-http": "^1.0.4",
tslib: "^1.9.3"
},
keywords: ["node", "azure", "typescript", "browser", "isomorphic"],
Expand Down
19 changes: 18 additions & 1 deletion src/transforms/mapperTransforms.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,8 @@ export function transformMapper({ schema, options }: MapperInput) {
transformBinaryMapper,
transformObjectMapper,
transformArrayMapper,
transformDictionaryMapper
transformDictionaryMapper,
transformUuidMapper
);
const { mapper } = processMapper({ schema, options });

Expand Down Expand Up @@ -547,6 +548,22 @@ function transformNumberMapper(pipelineValue: PipelineValue): PipelineValue {
};
}

function transformUuidMapper(pipelineValue: PipelineValue): PipelineValue {
const { schema, options } = pipelineValue;

if (!isSchemaType([SchemaType.Uuid], schema)) {
return pipelineValue;
}

const mapper: BaseMapper = buildMapper(schema, { name: "Uuid" }, options);

return {
schema,
mapper,
isHandled: true
};
}

function processProperties(
properties: Property[] = [],
options: EntityOptions = {}
Expand Down
1 change: 1 addition & 0 deletions src/utils/schemaHelpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ export function getTypeForSchema(schema: Schema): TypeDetails {
kind = PropertyKind.Composite;
break;
case SchemaType.String:
case SchemaType.Uuid:
typeName = "string";
break;
default:
Expand Down
Loading