arkos 1.4.0-canary.28 → 1.4.0-canary.29
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/modules/swagger/swagger.router.js +5 -3
- package/dist/cjs/modules/swagger/swagger.router.js.map +1 -1
- package/dist/cjs/utils/cli/utils/cli.helpers.js +1 -1
- package/dist/esm/modules/swagger/swagger.router.js +5 -3
- package/dist/esm/modules/swagger/swagger.router.js.map +1 -1
- package/dist/esm/utils/cli/utils/cli.helpers.js +1 -1
- package/package.json +1 -1
|
@@ -16,9 +16,11 @@ const arkos_router_1 = require("../../utils/arkos-router");
|
|
|
16
16
|
const get_file_upload_json_schema_paths_1 = __importDefault(require("./utils/helpers/get-file-upload-json-schema-paths"));
|
|
17
17
|
const swaggerRouter = (0, express_1.Router)();
|
|
18
18
|
async function getSwaggerRouter(arkosConfig, app) {
|
|
19
|
-
let defaultJsonSchemas = await
|
|
20
|
-
|
|
21
|
-
|
|
19
|
+
let [defaultJsonSchemas, defaultModelsPaths, pathsFromCustomArkosRouters] = await Promise.all([
|
|
20
|
+
await (0, swagger_router_helpers_1.getOpenAPIJsonSchemasByConfigMode)(arkosConfig),
|
|
21
|
+
await (0, swagger_router_helpers_1.generatePathsForModels)(arkosConfig),
|
|
22
|
+
await (0, arkos_router_1.generateOpenAPIFromApp)(app),
|
|
23
|
+
]);
|
|
22
24
|
const fileUploadDefaultPaths = (0, get_file_upload_json_schema_paths_1.default)(arkosConfig);
|
|
23
25
|
const missingJsonSchemas = await missing_json_schemas_generator_1.default.generateMissingJsonSchemas(defaultModelsPaths, defaultJsonSchemas, arkosConfig);
|
|
24
26
|
defaultJsonSchemas = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swagger.router.js","sourceRoot":"","sources":["../../../../src/modules/swagger/swagger.router.ts"],"names":[],"mappings":";;;;;AAkBA,
|
|
1
|
+
{"version":3,"file":"swagger.router.js","sourceRoot":"","sources":["../../../../src/modules/swagger/swagger.router.ts"],"names":[],"mappings":";;;;;AAkBA,4CAyDC;AA3ED,qCAAiC;AACjC,kEAAyC;AAEzC,4FAA6D;AAC7D,mFAGgD;AAChD,oHAAwF;AACxF,8GAAkF;AAClF,uEAAyF;AACzF,uIAA4G;AAC5G,2DAAkE;AAElE,0HAA6F;AAE7F,MAAM,aAAa,GAAG,IAAA,gBAAM,GAAE,CAAC;AAExB,KAAK,UAAU,gBAAgB,CACpC,WAAwB,EACxB,GAAoB;IAEpB,IAAI,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,2BAA2B,CAAC,GACvE,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,MAAM,IAAA,0DAAiC,EAAC,WAAW,CAAC;QACpD,MAAM,IAAA,+CAAsB,EAAC,WAAW,CAAC;QACzC,MAAM,IAAA,qCAAsB,EAAC,GAAG,CAAC;KAClC,CAAC,CAAC;IAEL,MAAM,sBAAsB,GAAG,IAAA,2CAA4B,EAAC,WAAW,CAAC,CAAC;IACzE,MAAM,kBAAkB,GACtB,MAAM,wCAA0B,CAAC,0BAA0B,CACzD,kBAAkB,EAClB,kBAAkB,EAClB,WAAW,CACZ,CAAC;IAEJ,kBAAkB,GAAG;QACnB,GAAG,kBAAkB;QACrB,GAAG,kBAAkB;QACrB,GAAG,IAAA,sCAAyB,EAAC,WAAW,CAAC;KAC1C,CAAC;IAEF,MAAM,cAAc,GAAG,IAAA,0BAAS,EAC9B,CAAC,MAAM,IAAA,qCAAuB,EAC5B;QACE,GAAG,kBAAkB;QACrB,GAAG,sBAAsB;QACzB,GAAG,2BAA2B;KAC/B,EACD,kBAAkB,CACnB,CAAC,IAAI,EAAE,EACR,WAAW,CAAC,OAAO,IAAI,EAAE,CACA,CAAC;IAE5B,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,EAAE,GAAG,cAAc,EAAE,OAAQ,CAAC;IAE5D,MAAM,oBAAoB,GAAG,IAAA,uBAAY,EAAC;QACxC,UAAU,EAAE,UAA4C;QACxD,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAM,IAAA,oDAAmC,EACtD,+BAA+B,CAChC,CAAC;IAEF,aAAa,CAAC,GAAG,CACf,cAAe,CAAC,QAAS,EACzB,MAAM,CAAC,YAAY,CAAC;QAClB,OAAO,EAAE,oBAAoB;QAC7B,GAAG,cAAc,EAAE,+BAA+B;KACnD,CAAC,CACH,CAAC;IAEF,OAAO,aAAa,CAAC;AACvB,CAAC","sourcesContent":["import { Router } from \"express\";\nimport swaggerJsdoc from \"swagger-jsdoc\";\nimport { ArkosConfig } from \"../../types/arkos-config\";\nimport deepmerge from \"../../utils/helpers/deepmerge.helper\";\nimport {\n generatePathsForModels,\n getOpenAPIJsonSchemasByConfigMode,\n} from \"./utils/helpers/swagger.router.helpers\";\nimport missingJsonSchemaGenerator from \"./utils/helpers/missing-json-schemas-generator\";\nimport getSwaggerDefaultConfig from \"./utils/helpers/get-swagger-default-configs\";\nimport { importEsmPreventingTsTransformation } from \"../../utils/helpers/global.helpers\";\nimport generateSystemJsonSchemas from \"./utils/helpers/json-schema-generators/generate-system-json-schemas\";\nimport { generateOpenAPIFromApp } from \"../../utils/arkos-router\";\nimport express from \"express\";\nimport getFileUploadJsonSchemaPaths from \"./utils/helpers/get-file-upload-json-schema-paths\";\n\nconst swaggerRouter = Router();\n\nexport async function getSwaggerRouter(\n arkosConfig: ArkosConfig,\n app: express.Express\n): Promise<Router> {\n let [defaultJsonSchemas, defaultModelsPaths, pathsFromCustomArkosRouters] =\n await Promise.all([\n await getOpenAPIJsonSchemasByConfigMode(arkosConfig),\n await generatePathsForModels(arkosConfig),\n await generateOpenAPIFromApp(app),\n ]);\n\n const fileUploadDefaultPaths = getFileUploadJsonSchemaPaths(arkosConfig);\n const missingJsonSchemas =\n await missingJsonSchemaGenerator.generateMissingJsonSchemas(\n defaultModelsPaths,\n defaultJsonSchemas,\n arkosConfig\n );\n\n defaultJsonSchemas = {\n ...defaultJsonSchemas,\n ...missingJsonSchemas,\n ...generateSystemJsonSchemas(arkosConfig),\n };\n\n const swaggerConfigs = deepmerge(\n (await getSwaggerDefaultConfig(\n {\n ...defaultModelsPaths,\n ...fileUploadDefaultPaths,\n ...pathsFromCustomArkosRouters,\n },\n defaultJsonSchemas\n )) || {},\n arkosConfig.swagger || {}\n ) as ArkosConfig[\"swagger\"];\n\n const { definition, ...options } = swaggerConfigs?.options!;\n\n const swaggerSpecification = swaggerJsdoc({\n definition: definition as swaggerJsdoc.SwaggerDefinition,\n ...options,\n });\n\n const scalar = await importEsmPreventingTsTransformation(\n \"@scalar/express-api-reference\"\n );\n\n swaggerRouter.use(\n swaggerConfigs!.endpoint!,\n scalar.apiReference({\n content: swaggerSpecification,\n ...swaggerConfigs?.scalarApiReferenceConfiguration,\n })\n );\n\n return swaggerRouter;\n}\n"]}
|
|
@@ -10,9 +10,11 @@ import { generateOpenAPIFromApp } from "../../utils/arkos-router/index.js";
|
|
|
10
10
|
import getFileUploadJsonSchemaPaths from "./utils/helpers/get-file-upload-json-schema-paths.js";
|
|
11
11
|
const swaggerRouter = Router();
|
|
12
12
|
export async function getSwaggerRouter(arkosConfig, app) {
|
|
13
|
-
let defaultJsonSchemas = await
|
|
14
|
-
|
|
15
|
-
|
|
13
|
+
let [defaultJsonSchemas, defaultModelsPaths, pathsFromCustomArkosRouters] = await Promise.all([
|
|
14
|
+
await getOpenAPIJsonSchemasByConfigMode(arkosConfig),
|
|
15
|
+
await generatePathsForModels(arkosConfig),
|
|
16
|
+
await generateOpenAPIFromApp(app),
|
|
17
|
+
]);
|
|
16
18
|
const fileUploadDefaultPaths = getFileUploadJsonSchemaPaths(arkosConfig);
|
|
17
19
|
const missingJsonSchemas = await missingJsonSchemaGenerator.generateMissingJsonSchemas(defaultModelsPaths, defaultJsonSchemas, arkosConfig);
|
|
18
20
|
defaultJsonSchemas = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swagger.router.js","sourceRoot":"","sources":["../../../../src/modules/swagger/swagger.router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,YAAY,MAAM,eAAe,CAAC;AAEzC,OAAO,SAAS,MAAM,sCAAsC,CAAC;AAC7D,OAAO,EACL,sBAAsB,EACtB,iCAAiC,GAClC,MAAM,wCAAwC,CAAC;AAChD,OAAO,0BAA0B,MAAM,gDAAgD,CAAC;AACxF,OAAO,uBAAuB,MAAM,6CAA6C,CAAC;AAClF,OAAO,EAAE,mCAAmC,EAAE,MAAM,oCAAoC,CAAC;AACzF,OAAO,yBAAyB,MAAM,qEAAqE,CAAC;AAC5G,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,OAAO,4BAA4B,MAAM,mDAAmD,CAAC;AAE7F,MAAM,aAAa,GAAG,MAAM,EAAE,CAAC;AAE/B,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,WAAwB,EACxB,GAAoB;IAEpB,IAAI,kBAAkB,
|
|
1
|
+
{"version":3,"file":"swagger.router.js","sourceRoot":"","sources":["../../../../src/modules/swagger/swagger.router.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,YAAY,MAAM,eAAe,CAAC;AAEzC,OAAO,SAAS,MAAM,sCAAsC,CAAC;AAC7D,OAAO,EACL,sBAAsB,EACtB,iCAAiC,GAClC,MAAM,wCAAwC,CAAC;AAChD,OAAO,0BAA0B,MAAM,gDAAgD,CAAC;AACxF,OAAO,uBAAuB,MAAM,6CAA6C,CAAC;AAClF,OAAO,EAAE,mCAAmC,EAAE,MAAM,oCAAoC,CAAC;AACzF,OAAO,yBAAyB,MAAM,qEAAqE,CAAC;AAC5G,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,OAAO,4BAA4B,MAAM,mDAAmD,CAAC;AAE7F,MAAM,aAAa,GAAG,MAAM,EAAE,CAAC;AAE/B,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,WAAwB,EACxB,GAAoB;IAEpB,IAAI,CAAC,kBAAkB,EAAE,kBAAkB,EAAE,2BAA2B,CAAC,GACvE,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,MAAM,iCAAiC,CAAC,WAAW,CAAC;QACpD,MAAM,sBAAsB,CAAC,WAAW,CAAC;QACzC,MAAM,sBAAsB,CAAC,GAAG,CAAC;KAClC,CAAC,CAAC;IAEL,MAAM,sBAAsB,GAAG,4BAA4B,CAAC,WAAW,CAAC,CAAC;IACzE,MAAM,kBAAkB,GACtB,MAAM,0BAA0B,CAAC,0BAA0B,CACzD,kBAAkB,EAClB,kBAAkB,EAClB,WAAW,CACZ,CAAC;IAEJ,kBAAkB,GAAG;QACnB,GAAG,kBAAkB;QACrB,GAAG,kBAAkB;QACrB,GAAG,yBAAyB,CAAC,WAAW,CAAC;KAC1C,CAAC;IAEF,MAAM,cAAc,GAAG,SAAS,CAC9B,CAAC,MAAM,uBAAuB,CAC5B;QACE,GAAG,kBAAkB;QACrB,GAAG,sBAAsB;QACzB,GAAG,2BAA2B;KAC/B,EACD,kBAAkB,CACnB,CAAC,IAAI,EAAE,EACR,WAAW,CAAC,OAAO,IAAI,EAAE,CACA,CAAC;IAE5B,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,EAAE,GAAG,cAAc,EAAE,OAAQ,CAAC;IAE5D,MAAM,oBAAoB,GAAG,YAAY,CAAC;QACxC,UAAU,EAAE,UAA4C;QACxD,GAAG,OAAO;KACX,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAM,mCAAmC,CACtD,+BAA+B,CAChC,CAAC;IAEF,aAAa,CAAC,GAAG,CACf,cAAe,CAAC,QAAS,EACzB,MAAM,CAAC,YAAY,CAAC;QAClB,OAAO,EAAE,oBAAoB;QAC7B,GAAG,cAAc,EAAE,+BAA+B;KACnD,CAAC,CACH,CAAC;IAEF,OAAO,aAAa,CAAC;AACvB,CAAC","sourcesContent":["import { Router } from \"express\";\nimport swaggerJsdoc from \"swagger-jsdoc\";\nimport { ArkosConfig } from \"../../types/arkos-config\";\nimport deepmerge from \"../../utils/helpers/deepmerge.helper\";\nimport {\n generatePathsForModels,\n getOpenAPIJsonSchemasByConfigMode,\n} from \"./utils/helpers/swagger.router.helpers\";\nimport missingJsonSchemaGenerator from \"./utils/helpers/missing-json-schemas-generator\";\nimport getSwaggerDefaultConfig from \"./utils/helpers/get-swagger-default-configs\";\nimport { importEsmPreventingTsTransformation } from \"../../utils/helpers/global.helpers\";\nimport generateSystemJsonSchemas from \"./utils/helpers/json-schema-generators/generate-system-json-schemas\";\nimport { generateOpenAPIFromApp } from \"../../utils/arkos-router\";\nimport express from \"express\";\nimport getFileUploadJsonSchemaPaths from \"./utils/helpers/get-file-upload-json-schema-paths\";\n\nconst swaggerRouter = Router();\n\nexport async function getSwaggerRouter(\n arkosConfig: ArkosConfig,\n app: express.Express\n): Promise<Router> {\n let [defaultJsonSchemas, defaultModelsPaths, pathsFromCustomArkosRouters] =\n await Promise.all([\n await getOpenAPIJsonSchemasByConfigMode(arkosConfig),\n await generatePathsForModels(arkosConfig),\n await generateOpenAPIFromApp(app),\n ]);\n\n const fileUploadDefaultPaths = getFileUploadJsonSchemaPaths(arkosConfig);\n const missingJsonSchemas =\n await missingJsonSchemaGenerator.generateMissingJsonSchemas(\n defaultModelsPaths,\n defaultJsonSchemas,\n arkosConfig\n );\n\n defaultJsonSchemas = {\n ...defaultJsonSchemas,\n ...missingJsonSchemas,\n ...generateSystemJsonSchemas(arkosConfig),\n };\n\n const swaggerConfigs = deepmerge(\n (await getSwaggerDefaultConfig(\n {\n ...defaultModelsPaths,\n ...fileUploadDefaultPaths,\n ...pathsFromCustomArkosRouters,\n },\n defaultJsonSchemas\n )) || {},\n arkosConfig.swagger || {}\n ) as ArkosConfig[\"swagger\"];\n\n const { definition, ...options } = swaggerConfigs?.options!;\n\n const swaggerSpecification = swaggerJsdoc({\n definition: definition as swaggerJsdoc.SwaggerDefinition,\n ...options,\n });\n\n const scalar = await importEsmPreventingTsTransformation(\n \"@scalar/express-api-reference\"\n );\n\n swaggerRouter.use(\n swaggerConfigs!.endpoint!,\n scalar.apiReference({\n content: swaggerSpecification,\n ...swaggerConfigs?.scalarApiReferenceConfiguration,\n })\n );\n\n return swaggerRouter;\n}\n"]}
|