fix(format): apply prettier changes post bestpracts upgrade

package.json

@@ -41,6 +41,7 @@
     "build:ts": "tsc -p ./tsconfig.build.json",
     "prepublish": "npm run build",
     "commit:with-cli": "npx cz",
+    "fix:format:terraform": "echo 'no terraform'",
     "fix:format:prettier": "prettier --write '**/*.ts' --config ./prettier.config.js",
     "fix:format": "npm run fix:format:prettier && npm run fix:format:terraform",
     "fix:lint": "eslint -c ./.eslintrc.js src/**/*.ts --fix",
@@ -52,6 +53,7 @@
     "provision:integration-test-db": "npm run provision:docker:up && npm run provision:docker:await",
     "test:commits": "LAST_TAG=$(git describe --tags --abbrev=0 @^ 2> /dev/null || git rev-list --max-parents=0 HEAD) && npx commitlint --from $LAST_TAG --to HEAD --verbose",
     "test:types": "tsc -p ./tsconfig.build.json --noEmit",
+    "test:format:terraform": "echo 'no terraform'",
     "test:format:prettier": "prettier --parser typescript --check 'src/**/*.ts' --config ./prettier.config.js",
     "test:format": "npm run test:format:prettier && npm run test:format:terraform",
     "test:lint": "npm run test:lint:eslint && npm run test:lint:deps",
@@ -79,6 +81,7 @@
     "listr": "0.14.3",
     "mysql2": "1.6.5",
     "oclif": "3.3.1",
+    "pascal-case": "3.1.2",
     "schematic-joi-model": "1.2.2",
     "simple-sha256": "1.0.0",
     "sql-strip-comments": "0.0.23",

src/contract/commands/generate.integration.test.ts

@@ -2,9 +2,15 @@ import SqlCodeGenerator from './generate';
 
 describe('generate', () => {
   it('should be able to generate code for valid config and sql, generating both types and query functions', async () => {
-    await SqlCodeGenerator.run(['-c', `${__dirname}/../__test_assets__/codegen.sql.yml`]);
+    await SqlCodeGenerator.run([
+      '-c',
+      `${__dirname}/../__test_assets__/codegen.sql.yml`,
+    ]);
   });
   it('should be able to generate code for valid config and sql, only generating types', async () => {
-    await SqlCodeGenerator.run(['-c', `${__dirname}/../__test_assets__/codegen.sql.only-types.yml`]);
+    await SqlCodeGenerator.run([
+      '-c',
+      `${__dirname}/../__test_assets__/codegen.sql.only-types.yml`,
+    ]);
   });
 });

src/contract/commands/generate.ts

@@ -1,8 +1,10 @@
 import { Command, Flags } from '@oclif/core';
+
 import { generate } from '../../logic/commands/generate/generate';
 
 export default class Generate extends Command {
-  public static description = 'generate typescript code by parsing sql definitions for types and usage';
+  public static description =
+    'generate typescript code by parsing sql definitions for types and usage';
 
   public static flags = {
     help: Flags.help({ char: 'h' }),
@@ -19,7 +21,8 @@ export default class Generate extends Command {
     const config = flags.config!;
 
     // generate the code
-    const configPath = config.slice(0, 1) === '/' ? config : `${process.cwd()}/${config}`; // if starts with /, consider it as an absolute path
+    const configPath =
+      config.slice(0, 1) === '/' ? config : `${process.cwd()}/${config}`; // if starts with /, consider it as an absolute path
     await generate({ configPath });
   }
 }

src/domain/objects/GeneratorConfig.test.ts

@@ -1,7 +1,7 @@
+import { DatabaseLanguage } from '../constants';
+import { GeneratorConfig } from './GeneratorConfig';
 import { QueryDeclaration } from './QueryDeclaration';
 import { ResourceDeclaration } from './ResourceDeclaration';
-import { GeneratorConfig } from './GeneratorConfig';
-import { DatabaseLanguage } from '../constants';
 
 describe('GeneratorConfig', () => {
   const queryDec = new QueryDeclaration({
@@ -17,14 +17,20 @@ describe('GeneratorConfig', () => {
       rootDir: '__DIR__',
       language: DatabaseLanguage.MYSQL,
       dialect: '5.7',
-      generates: { types: '__TYPES_PATH__', queryFunctions: '__QUERY_FUNCTIONS_PATH__' },
+      generates: {
+        types: '__TYPES_PATH__',
+        queryFunctions: '__QUERY_FUNCTIONS_PATH__',
+      },
       declarations: [queryDec, resourceDec],
     });
     expect(config).toMatchObject({
       rootDir: '__DIR__',
       language: DatabaseLanguage.MYSQL,
       dialect: '5.7',
-      generates: { types: '__TYPES_PATH__', queryFunctions: '__QUERY_FUNCTIONS_PATH__' },
+      generates: {
+        types: '__TYPES_PATH__',
+        queryFunctions: '__QUERY_FUNCTIONS_PATH__',
+      },
       declarations: [queryDec, resourceDec],
     });
   });

src/domain/objects/GeneratorConfig.ts

@@ -1,5 +1,6 @@
-import Joi from 'joi';
 import { DomainObject } from 'domain-objects';
+import Joi from 'joi';
+
 import { DatabaseLanguage, GeneratedOutputPaths } from '../constants';
 import { QueryDeclaration } from './QueryDeclaration';
 import { ResourceDeclaration } from './ResourceDeclaration';
@@ -12,7 +13,10 @@ const generatorConfigSchema = Joi.object().keys({
     types: Joi.string().required(),
     queryFunctions: Joi.string().optional(),
   }),
-  declarations: Joi.array().items(QueryDeclaration.schema, ResourceDeclaration.schema),
+  declarations: Joi.array().items(
+    QueryDeclaration.schema,
+    ResourceDeclaration.schema,
+  ),
 });
 
 type DeclarationObject = QueryDeclaration | ResourceDeclaration;
@@ -23,6 +27,9 @@ export interface GeneratorConfig {
   dialect: string;
   declarations: DeclarationObject[];
 }
-export class GeneratorConfig extends DomainObject<GeneratorConfig> implements GeneratorConfig {
+export class GeneratorConfig
+  extends DomainObject<GeneratorConfig>
+  implements GeneratorConfig
+{
   public static schema = generatorConfigSchema;
 }

src/domain/objects/QueryDeclaration.ts

@@ -1,5 +1,5 @@
-import Joi from 'joi';
 import { DomainObject } from 'domain-objects';
+import Joi from 'joi';
 
 const schema = Joi.object().keys({
   path: Joi.string().required(),
@@ -9,6 +9,9 @@ export interface QueryDeclaration {
   path: string;
   sql: string;
 }
-export class QueryDeclaration extends DomainObject<QueryDeclaration> implements QueryDeclaration {
+export class QueryDeclaration
+  extends DomainObject<QueryDeclaration>
+  implements QueryDeclaration
+{
   public static schema = schema;
 }

src/domain/objects/ResourceDeclaration.ts

@@ -1,5 +1,5 @@
-import Joi from 'joi';
 import { DomainObject } from 'domain-objects';
+import Joi from 'joi';
 
 const schema = Joi.object().keys({
   path: Joi.string().required(),
@@ -10,6 +10,9 @@ export interface ResourceDeclaration {
   path: string;
   sql: string;
 }
-export class ResourceDeclaration extends DomainObject<ResourceDeclaration> implements ResourceDeclaration {
+export class ResourceDeclaration
+  extends DomainObject<ResourceDeclaration>
+  implements ResourceDeclaration
+{
   public static schema = schema;
 }

src/domain/objects/SqlSubqueryReference.ts

@@ -1,5 +1,5 @@
-import Joi from 'joi';
 import { DomainObject } from 'domain-objects';
+import Joi from 'joi';
 
 const schema = Joi.object().keys({
   id: Joi.string().required(),
@@ -9,6 +9,9 @@ export interface SqlSubqueryReference {
   id: string;
   sql: string;
 }
-export class SqlSubqueryReference extends DomainObject<SqlSubqueryReference> implements SqlSubqueryReference {
+export class SqlSubqueryReference
+  extends DomainObject<SqlSubqueryReference>
+  implements SqlSubqueryReference
+{
   public static schema = schema;
 }

src/domain/objects/TypeDefinitionOfQuery.ts

@@ -1,9 +1,9 @@
-import Joi from 'joi';
 import { DomainObject } from 'domain-objects';
+import Joi from 'joi';
 
+import { TypeDefinitionOfQueryInputVariable } from './TypeDefinitionOfQueryInputVariable';
 import { TypeDefinitionOfQuerySelectExpression } from './TypeDefinitionOfQuerySelectExpression';
 import { TypeDefinitionOfQueryTableReference } from './TypeDefinitionOfQueryTableReference';
-import { TypeDefinitionOfQueryInputVariable } from './TypeDefinitionOfQueryInputVariable';
 
 const schema = Joi.object().keys({
   name: Joi.string().required(),
@@ -25,6 +25,9 @@ export interface TypeDefinitionOfQuery {
   tableReferences: TypeDefinitionOfQueryTableReference[];
   inputVariables: TypeDefinitionOfQueryInputVariable[];
 }
-export class TypeDefinitionOfQuery extends DomainObject<TypeDefinitionOfQuery> implements TypeDefinitionOfQuery {
+export class TypeDefinitionOfQuery
+  extends DomainObject<TypeDefinitionOfQuery>
+  implements TypeDefinitionOfQuery
+{
   public static schema = schema;
 }

src/domain/objects/TypeDefinitionOfQueryInputVariable.test.ts

@@ -1,6 +1,6 @@
+import { DataType } from '../constants';
 import { TypeDefinitionOfQueryInputVariable } from './TypeDefinitionOfQueryInputVariable';
 import { TypeDefinitionReference } from './TypeDefinitionReference';
-import { DataType } from '../constants';
 
 describe('TypeDefinitionOfQueryInputVariable', () => {
   it('should initialize for valid inputs', () => {

src/domain/objects/TypeDefinitionOfQueryInputVariable.ts

@@ -1,7 +1,8 @@
-import Joi from 'joi';
 import { DomainObject } from 'domain-objects';
-import { TypeDefinitionReference } from './TypeDefinitionReference';
+import Joi from 'joi';
+
 import { DataType } from '../constants';
+import { TypeDefinitionReference } from './TypeDefinitionReference';
 
 const schema = Joi.object().keys({
   name: Joi.string().required(),
@@ -21,7 +22,9 @@ export interface TypeDefinitionOfQueryInputVariable {
    */
   type: TypeDefinitionReference | DataType[];
 }
-export class TypeDefinitionOfQueryInputVariable extends DomainObject<TypeDefinitionOfQueryInputVariable>
-  implements TypeDefinitionOfQueryInputVariable {
+export class TypeDefinitionOfQueryInputVariable
+  extends DomainObject<TypeDefinitionOfQueryInputVariable>
+  implements TypeDefinitionOfQueryInputVariable
+{
   public static schema = schema;
 }