diff --git a/.travis.yml b/.travis.yml index 52ad4a03ce7..9739c019ad0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -124,7 +124,7 @@ before_install: fi; - pushd .; cd website; yarn install; popd # install Deno - - sh -s v1.1.2 < ./CI/deno_install.sh + - sh -s v1.6.2 < ./CI/deno_install.sh - export PATH="$HOME/.deno/bin:$PATH" install: diff --git a/modules/openapi-generator/src/main/resources/typescript/index.mustache b/modules/openapi-generator/src/main/resources/typescript/index.mustache index 3e4d0907d0e..b19f7f9348a 100644 --- a/modules/openapi-generator/src/main/resources/typescript/index.mustache +++ b/modules/openapi-generator/src/main/resources/typescript/index.mustache @@ -1,7 +1,8 @@ export * from "./http/http{{extensionForDeno}}"; export * from "./auth/auth{{extensionForDeno}}"; export * from "./models/all{{extensionForDeno}}"; -export { createConfiguration, Configuration } from "./configuration{{extensionForDeno}}" +export { createConfiguration } from "./configuration{{extensionForDeno}}" +export{{#platforms}}{{#deno}} type{{/deno}}{{/platforms}} { Configuration } from "./configuration{{extensionForDeno}}" export * from "./apis/exception{{extensionForDeno}}"; export * from "./servers{{extensionForDeno}}"; @@ -9,7 +10,7 @@ export * from "./servers{{extensionForDeno}}"; export { Middleware } from './middleware{{extensionForDeno}}'; {{/useRxJS}} {{^useRxJS}} -export { PromiseMiddleware as Middleware } from './middleware{{extensionForDeno}}'; +export{{#platforms}}{{#deno}} type{{/deno}}{{/platforms}} { PromiseMiddleware as Middleware } from './middleware{{extensionForDeno}}'; {{/useRxJS}} {{#useObjectParameters}} export { {{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}{{classname}}{{operationIdCamelCase}}Request, {{/operation}}Object{{classname}} as {{classname}}{{^-last}}, {{/-last}} {{/operations}}{{/apis}}{{/apiInfo}}} from './types/ObjectParamAPI{{extensionForDeno}}'; diff --git a/samples/openapi3/client/petstore/typescript/builds/default/index.ts b/samples/openapi3/client/petstore/typescript/builds/default/index.ts index fe00e36cbd8..de89bb05e70 100644 --- a/samples/openapi3/client/petstore/typescript/builds/default/index.ts +++ b/samples/openapi3/client/petstore/typescript/builds/default/index.ts @@ -1,7 +1,8 @@ export * from "./http/http"; export * from "./auth/auth"; export * from "./models/all"; -export { createConfiguration, Configuration } from "./configuration" +export { createConfiguration } from "./configuration" +export { Configuration } from "./configuration" export * from "./apis/exception"; export * from "./servers"; diff --git a/samples/openapi3/client/petstore/typescript/builds/deno/index.ts b/samples/openapi3/client/petstore/typescript/builds/deno/index.ts index b0cc9f0f93d..c81b0e2421d 100644 --- a/samples/openapi3/client/petstore/typescript/builds/deno/index.ts +++ b/samples/openapi3/client/petstore/typescript/builds/deno/index.ts @@ -1,10 +1,11 @@ export * from "./http/http.ts"; export * from "./auth/auth.ts"; export * from "./models/all.ts"; -export { createConfiguration, Configuration } from "./configuration.ts" +export { createConfiguration } from "./configuration.ts" +export type { Configuration } from "./configuration.ts" export * from "./apis/exception.ts"; export * from "./servers.ts"; -export { PromiseMiddleware as Middleware } from './middleware.ts'; +export type { PromiseMiddleware as Middleware } from './middleware.ts'; export { PromisePetApi as PetApi, PromiseStoreApi as StoreApi, PromiseUserApi as UserApi } from './types/PromiseAPI.ts'; diff --git a/samples/openapi3/client/petstore/typescript/builds/inversify/index.ts b/samples/openapi3/client/petstore/typescript/builds/inversify/index.ts index ddf4ed98b1d..4d48e5222ad 100644 --- a/samples/openapi3/client/petstore/typescript/builds/inversify/index.ts +++ b/samples/openapi3/client/petstore/typescript/builds/inversify/index.ts @@ -1,7 +1,8 @@ export * from "./http/http"; export * from "./auth/auth"; export * from "./models/all"; -export { createConfiguration, Configuration } from "./configuration" +export { createConfiguration } from "./configuration" +export { Configuration } from "./configuration" export * from "./apis/exception"; export * from "./servers"; diff --git a/samples/openapi3/client/petstore/typescript/builds/jquery/index.ts b/samples/openapi3/client/petstore/typescript/builds/jquery/index.ts index fe00e36cbd8..de89bb05e70 100644 --- a/samples/openapi3/client/petstore/typescript/builds/jquery/index.ts +++ b/samples/openapi3/client/petstore/typescript/builds/jquery/index.ts @@ -1,7 +1,8 @@ export * from "./http/http"; export * from "./auth/auth"; export * from "./models/all"; -export { createConfiguration, Configuration } from "./configuration" +export { createConfiguration } from "./configuration" +export { Configuration } from "./configuration" export * from "./apis/exception"; export * from "./servers"; diff --git a/samples/openapi3/client/petstore/typescript/builds/object_params/index.ts b/samples/openapi3/client/petstore/typescript/builds/object_params/index.ts index e3944796cfe..49a513cbb84 100644 --- a/samples/openapi3/client/petstore/typescript/builds/object_params/index.ts +++ b/samples/openapi3/client/petstore/typescript/builds/object_params/index.ts @@ -1,7 +1,8 @@ export * from "./http/http"; export * from "./auth/auth"; export * from "./models/all"; -export { createConfiguration, Configuration } from "./configuration" +export { createConfiguration } from "./configuration" +export { Configuration } from "./configuration" export * from "./apis/exception"; export * from "./servers"; diff --git a/samples/openapi3/client/petstore/typescript/tests/deno/test/api/PetApi_test.ts b/samples/openapi3/client/petstore/typescript/tests/deno/test/api/PetApi_test.ts index 9f56de86eab..f29199404e3 100644 --- a/samples/openapi3/client/petstore/typescript/tests/deno/test/api/PetApi_test.ts +++ b/samples/openapi3/client/petstore/typescript/tests/deno/test/api/PetApi_test.ts @@ -2,7 +2,7 @@ import { assertEquals, assert, fail, -} from "https://deno.land/std@0.58.0/testing/asserts.ts"; +} from "https://deno.land/std@0.82.0/testing/asserts.ts"; import * as petstore from "../../../../builds/deno/index.ts"; const configuration = petstore.createConfiguration();