fastify-flux-cli 2.23.0 → 2.26.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastify-flux-cli",
-  "version": "2.23.0",
+  "version": "2.26.3",
   "description": "",
   "main": "./dist/index.js",
   "exports": "./dist/index.js",
@@ -10,30 +10,30 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@apidevtools/json-schema-ref-parser": "^9.1.0",
+    "@apidevtools/json-schema-ref-parser": "^10.1.0",
     "@types/lodash": "^4.14.191",
     "chalk": "^5.2.0",
     "chokidar": "^3.5.3",
-    "commander": "^9.4.1",
+    "commander": "^10.0.0",
     "esbuild": "0.x",
-    "execa": "^6.1.0",
+    "execa": "^7.0.0",
     "fast-glob": "^3.2.12",
     "lodash": "^4.17.21",
     "p-map": "5.5.0",
     "pidtree": "^0.6.0",
     "piscina": "^3.2.0",
     "source-map-support": "^0.5.21",
-    "swagger-typescript-api": "^12.0.2",
+    "swagger-typescript-api": "^12.0.3",
     "ts-json-schema-generator": "^1.2.0",
     "ts-morph": "^17.0.1",
-    "typescript": "4.9.4"
+    "typescript": "4.9.5"
   },
   "devDependencies": {
-    "@types/fs-extra": "^9.0.13",
-    "@types/jest": "^29.2.4",
-    "@types/node": "^18.11.18",
-    "jest": "^29.3.1",
-    "ts-jest": "^29.0.3"
+    "@types/fs-extra": "^11.0.1",
+    "@types/jest": "^29.4.0",
+    "@types/node": "^18.14.1",
+    "jest": "^29.4.3",
+    "ts-jest": "^29.0.5"
   },
   "peerDependencies": {
     "esbuild": "0.x"

package/dist/commands/new.d.ts

@@ -1 +0,0 @@
-//# sourceMappingURL=new.d.ts.map

package/dist/commands/new.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"new.d.ts","sourceRoot":"","sources":["../../src/commands/new.ts"],"names":[],"mappings":""}

package/dist/commands/new.js

@@ -1,2 +0,0 @@
-"use strict";
-//# sourceMappingURL=new.js.map

package/dist/commands/new.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"new.js","sourceRoot":"","sources":["../../src/commands/new.ts"],"names":[],"mappings":""}

package/dist/helper/api-sdk.js

@@ -1,16 +0,0 @@
-import { dirname, join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import swagger from 'swagger-typescript-api';
-const __dirname = dirname(fileURLToPath(import.meta.url));
-export async function createApiSdk(file) {
-    const result = await swagger.generateApi({
-        name: 'Api.ts',
-        input: file,
-        templates: join(__dirname, '/../templates/api/'),
-        moduleNameIndex: 1,
-        httpClientType: 'axios',
-        defaultResponseType: 'any',
-    });
-    return result.files[0].content;
-}
-//# sourceMappingURL=api-sdk.js.map

package/dist/helper/api-sdk.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"api-sdk.js","sourceRoot":"","sources":["../../src/helper/api-sdk.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAE7C,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAE1D,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAY;IAC7C,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,WAAW,CAAC;QACvC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,IAAI;QACX,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,oBAAoB,CAAC;QAChD,eAAe,EAAE,CAAC;QAClB,cAAc,EAAE,OAAO;QACvB,mBAAmB,EAAE,KAAK;KACpB,CAAC,CAAC;IAEV,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;AACjC,CAAC"}

package/dist/helper/generateSchema.d.ts

@@ -1,13 +0,0 @@
-interface GenerateSchemaOptions {
-    removeDateTime: boolean;
-}
-export declare class GenerateGlobalSchema {
-    private base;
-    private params;
-    constructor(base: string, params: GenerateSchemaOptions);
-    getSchema(): Promise<string>;
-    handle(): Promise<string>;
-}
-export declare function generateSchema(path: string, options: GenerateSchemaOptions): Promise<string>;
-export {};
-//# sourceMappingURL=generateSchema.d.ts.map

package/dist/helper/generateSchema.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"generateSchema.d.ts","sourceRoot":"","sources":["../../src/helper/generateSchema.ts"],"names":[],"mappings":"AAGA,UAAU,qBAAqB;IAC7B,cAAc,EAAE,OAAO,CAAC;CACzB;AAUD,qBAAa,oBAAoB;IACnB,OAAO,CAAC,IAAI;IAAU,OAAO,CAAC,MAAM;gBAA5B,IAAI,EAAE,MAAM,EAAU,MAAM,EAAE,qBAAqB;IAEjE,SAAS;IAyCT,MAAM;CAcb;AAED,wBAAsB,cAAc,CAClC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,qBAAqB,mBAK/B"}

package/dist/helper/generateSchema.js

@@ -1,63 +0,0 @@
-import $RefParser from '@apidevtools/json-schema-ref-parser';
-import * as ts from 'ts-json-schema-generator';
-import { log } from '../log.js';
-function addId(schema) {
-    return Object.fromEntries(Object.entries(schema).map(([key, value]) => {
-        return [key, { ...value, $id: `${key}` }];
-    }));
-}
-export class GenerateGlobalSchema {
-    constructor(base, params) {
-        this.base = base;
-        this.params = params;
-    }
-    async getSchema() {
-        const config = {
-            path: `${this.base}/**/*schema.ts`,
-            tsconfig: './tsconfig.json',
-        };
-        try {
-            const schema = ts.createGenerator(config).createSchema();
-            const removedReferences = await $RefParser.dereference(schema);
-            if (!removedReferences.definitions) {
-                throw new Error('definitions are missing');
-            }
-            const withIds = addId(removedReferences.definitions);
-            return JSON.stringify(withIds, null, 2);
-        }
-        catch (e) {
-            if (e.message.includes('NoRootNamesError')) {
-                console.warn(`\nMissing interfaces for path: ${this.base}/controllers/*/interfaces.ts\n`);
-                return '';
-            }
-            if (e.diagnostics) {
-                e.diagnostics.forEach((element) => {
-                    log({
-                        component: 'cli',
-                        warning: element.messageText,
-                        details: element.file.fileName,
-                    });
-                });
-                return '';
-            }
-            throw e;
-        }
-    }
-    async handle() {
-        let schema = await this.getSchema();
-        /*
-        schema = schema.replace(/, format: 'date-time'/g, '');
-    
-        if (schema.includes('date-time')) {
-          console.warn(
-            `\ndate-time is used in schema. This causes issues with fastify serialization. Use string instead.\n`,
-          );
-        }*/
-        return schema;
-    }
-}
-export async function generateSchema(path, options) {
-    const instance = new GenerateGlobalSchema(path, options);
-    return instance.handle();
-}
-//# sourceMappingURL=generateSchema.js.map

package/dist/helper/generateSchema.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"generateSchema.js","sourceRoot":"","sources":["../../src/helper/generateSchema.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,qCAAqC,CAAC;AAC7D,OAAO,KAAK,EAAE,MAAM,0BAA0B,CAAC;AAC/C,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAKhC,SAAS,KAAK,CAAC,MAA8B;IAC3C,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;QAC1C,OAAO,CAAC,GAAG,EAAE,EAAE,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,GAAG,EAAE,EAAE,CAAC,CAAC;IAC5C,CAAC,CAAC,CACH,CAAC;AACJ,CAAC;AAED,MAAM,OAAO,oBAAoB;IAC/B,YAAoB,IAAY,EAAU,MAA6B;QAAnD,SAAI,GAAJ,IAAI,CAAQ;QAAU,WAAM,GAAN,MAAM,CAAuB;IAAG,CAAC;IAE3E,KAAK,CAAC,SAAS;QACb,MAAM,MAAM,GAAG;YACb,IAAI,EAAE,GAAG,IAAI,CAAC,IAAI,gBAAgB;YAClC,QAAQ,EAAE,iBAAiB;SAC5B,CAAC;QAEF,IAAI;YACF,MAAM,MAAM,GAAG,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,YAAY,EAAE,CAAC;YAEzD,MAAM,iBAAiB,GAAG,MAAM,UAAU,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;YAC/D,IAAI,CAAC,iBAAiB,CAAC,WAAW,EAAE;gBAClC,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;aAC5C;YAED,MAAM,OAAO,GAAG,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;YAErD,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;SACzC;QAAC,OAAO,CAAM,EAAE;YACf,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;gBAC1C,OAAO,CAAC,IAAI,CACV,kCAAkC,IAAI,CAAC,IAAI,gCAAgC,CAC5E,CAAC;gBACF,OAAO,EAAE,CAAC;aACX;YAED,IAAI,CAAC,CAAC,WAAW,EAAE;gBACjB,CAAC,CAAC,WAAW,CAAC,OAAO,CACnB,CAAC,OAA4D,EAAE,EAAE;oBAC/D,GAAG,CAAC;wBACF,SAAS,EAAE,KAAK;wBAChB,OAAO,EAAE,OAAO,CAAC,WAAW;wBAC5B,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,QAAQ;qBAC/B,CAAC,CAAC;gBACL,CAAC,CACF,CAAC;gBACF,OAAO,EAAE,CAAC;aACX;YAED,MAAM,CAAC,CAAC;SACT;IACH,CAAC;IACD,KAAK,CAAC,MAAM;QACV,IAAI,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QAEpC;;;;;;;WAOG;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,IAAY,EACZ,OAA8B;IAE9B,MAAM,QAAQ,GAAG,IAAI,oBAAoB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEzD,OAAO,QAAQ,CAAC,MAAM,EAAE,CAAC;AAC3B,CAAC"}

package/dist/schema/convertNullToNullable.d.ts

@@ -1,3 +0,0 @@
-export declare function convertNullToNullable(object: any): any;
-export declare function convertEmptyObject(object: any): any;
-//# sourceMappingURL=convertNullToNullable.d.ts.map

package/dist/schema/convertNullToNullable.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"convertNullToNullable.d.ts","sourceRoot":"","sources":["../../src/schema/convertNullToNullable.ts"],"names":[],"mappings":"AAaA,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CAStD;AAED,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CAEnD"}

package/dist/schema/convertNullToNullable.js

@@ -1,23 +0,0 @@
-import _ from 'lodash';
-function handleAnyOf(anyOf) {
-    const hasTypeNull = anyOf.find((x) => x.type === 'null');
-    if (!hasTypeNull || anyOf.length !== 2) {
-        return;
-    }
-    const noneNull = anyOf.find((x) => x.type !== 'null');
-    return { nullable: true, ...noneNull };
-}
-export function convertNullToNullable(object) {
-    return _.cloneDeepWith(object, (value) => {
-        if (value['anyOf']) {
-            const result = handleAnyOf(value['anyOf']);
-            if (result) {
-                return convertNullToNullable(result);
-            }
-        }
-    });
-}
-export function convertEmptyObject(object) {
-    return _.cloneDeepWith(object, (value) => { });
-}
-//# sourceMappingURL=convertNullToNullable.js.map

package/dist/schema/convertNullToNullable.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"convertNullToNullable.js","sourceRoot":"","sources":["../../src/schema/convertNullToNullable.ts"],"names":[],"mappings":"AAAA,OAAO,CAAC,MAAM,QAAQ,CAAC;AAEvB,SAAS,WAAW,CAAC,KAA2B;IAC9C,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;IAC9D,IAAI,CAAC,WAAW,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACtC,OAAO;KACR;IAED,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;IAE3D,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,QAAQ,EAAE,CAAC;AACzC,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,MAAW;IAC/C,OAAO,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;QACvC,IAAI,KAAK,CAAC,OAAO,CAAC,EAAE;YAClB,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;YAC3C,IAAI,MAAM,EAAE;gBACV,OAAO,qBAAqB,CAAC,MAAM,CAAC,CAAC;aACtC;SACF;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,MAAW;IAC5C,OAAO,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,GAAE,CAAC,CAAC,CAAC;AAChD,CAAC"}

package/dist/schema/nullableSchema.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=nullableSchema.test.d.ts.map

package/dist/schema/nullableSchema.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"nullableSchema.test.d.ts","sourceRoot":"","sources":["../../src/schema/nullableSchema.test.ts"],"names":[],"mappings":""}

package/dist/schema/nullableSchema.test.js

@@ -1,93 +0,0 @@
-import { convertNullToNullable } from './convertNullToNullable';
-const input = {
-    UpdateTodo: {
-        type: 'object',
-        properties: {
-            text: {
-                type: 'string',
-            },
-            foo: {
-                anyOf: [
-                    {
-                        type: 'null',
-                    },
-                    {
-                        type: 'string',
-                    },
-                    {
-                        type: 'number',
-                    },
-                ],
-            },
-            user: {
-                anyOf: [
-                    {
-                        type: 'null',
-                    },
-                    {
-                        type: 'object',
-                        properties: {
-                            id: {
-                                type: 'number',
-                            },
-                            anyOf: [
-                                {
-                                    type: 'null',
-                                },
-                                {
-                                    type: 'object',
-                                    properties: {
-                                        id: {
-                                            type: 'number',
-                                        },
-                                    },
-                                },
-                            ],
-                        },
-                    },
-                ],
-            },
-        },
-    },
-};
-test('convert anyOf to nullable', () => {
-    expect(convertNullToNullable(input)).toMatchInlineSnapshot(`
-    Object {
-      "UpdateTodo": Object {
-        "properties": Object {
-          "foo": Object {
-            "anyOf": Array [
-              Object {
-                "type": "null",
-              },
-              Object {
-                "type": "string",
-              },
-              Object {
-                "type": "number",
-              },
-            ],
-          },
-          "text": Object {
-            "type": "string",
-          },
-          "user": Object {
-            "nullable": true,
-            "properties": Object {
-              "nullable": true,
-              "properties": Object {
-                "id": Object {
-                  "type": "number",
-                },
-              },
-              "type": "object",
-            },
-            "type": "object",
-          },
-        },
-        "type": "object",
-      },
-    }
-  `);
-});
-//# sourceMappingURL=nullableSchema.test.js.map

package/dist/schema/nullableSchema.test.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"nullableSchema.test.js","sourceRoot":"","sources":["../../src/schema/nullableSchema.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,KAAK,GAAG;IACZ,UAAU,EAAE;QACV,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,IAAI,EAAE;gBACJ,IAAI,EAAE,QAAQ;aACf;YACD,GAAG,EAAE;gBACH,KAAK,EAAE;oBACL;wBACE,IAAI,EAAE,MAAM;qBACb;oBACD;wBACE,IAAI,EAAE,QAAQ;qBACf;oBACD;wBACE,IAAI,EAAE,QAAQ;qBACf;iBACF;aACF;YACD,IAAI,EAAE;gBACJ,KAAK,EAAE;oBACL;wBACE,IAAI,EAAE,MAAM;qBACb;oBACD;wBACE,IAAI,EAAE,QAAQ;wBACd,UAAU,EAAE;4BACV,EAAE,EAAE;gCACF,IAAI,EAAE,QAAQ;6BACf;4BACD,KAAK,EAAE;gCACL;oCACE,IAAI,EAAE,MAAM;iCACb;gCACD;oCACE,IAAI,EAAE,QAAQ;oCACd,UAAU,EAAE;wCACV,EAAE,EAAE;4CACF,IAAI,EAAE,QAAQ;yCACf;qCACF;iCACF;6BACF;yBACF;qBACF;iBACF;aACF;SACF;KACF;CACF,CAAC;AAEF,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACrC,MAAM,CAAC,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAqC1D,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}