Merge pull request #894 from LeighFinegold/template

Refactoring logging to be at top level (#790)

cli/src/index.ts

@@ -6,7 +6,7 @@ import path from 'path';
 import { mkdirp } from 'mkdirp';
 import { writeFileSync } from 'fs';
 import { version } from '../package.json';
-import { initLogger } from '@finos/calm-shared/commands/helper';
+import { initLogger } from '@finos/calm-shared/logger';
 import { startServer } from './server/cli-server';
 
 const FORMAT_OPTION = '-f, --format <format>';

shared/src/commands/generate/components/instantiate.spec.ts

@@ -3,7 +3,7 @@
 import { SchemaDirectory } from '../../../schema-directory';
 import { instantiateGenericObject } from './instantiate';
 
-jest.mock('../../helper', () => {
+jest.mock('../../../logger', () => {
     return {
         initLogger: () => {
             return {

shared/src/commands/generate/components/instantiate.ts

@@ -1,5 +1,5 @@
 import { Logger } from 'winston';
-import { initLogger } from '../../helper.js';
+import { initLogger } from '../../../logger.js';
 import { SchemaDirectory } from '../../../schema-directory.js';
 import { appendPath, mergeSchemas, renderPath } from '../../../util.js';
 import { getConstValue, getEnumPlaceholder, getPropertyValue } from './property.js';

shared/src/commands/generate/components/metadata.spec.ts

@@ -1,7 +1,7 @@
 import { SchemaDirectory } from '../../../schema-directory';
 import { instantiateAllMetadata, instantiateMetadataObject } from './metadata';
 
-jest.mock('../../helper', () => {
+jest.mock('../../../logger', () => {
     return {
         initLogger: () => {
             return {

shared/src/commands/generate/components/metadata.ts

@@ -1,4 +1,4 @@
-import { initLogger } from '../../helper.js';
+import { initLogger } from '../../../logger.js';
 import { SchemaDirectory } from '../../../schema-directory.js';
 import { appendPath } from '../../../util.js';
 import { instantiateGenericObject } from './instantiate.js';

shared/src/commands/generate/components/node.spec.ts

@@ -3,7 +3,7 @@
 import { SchemaDirectory } from '../../../schema-directory';
 import { instantiateNodes } from './node';
 
-jest.mock('../../helper', () => {
+jest.mock('../../../logger', () => {
     return {
         initLogger: () => {
             return {

shared/src/commands/generate/components/node.ts

@@ -1,6 +1,6 @@
 /* eslint-disable  @typescript-eslint/no-explicit-any */
 
-import { initLogger } from '../../helper.js';
+import { initLogger } from '../../../logger.js';
 import { SchemaDirectory } from '../../../schema-directory.js';
 import { appendPath } from '../../../util.js';
 import { instantiateGenericObject } from './instantiate.js';

shared/src/commands/generate/components/property.spec.ts

@@ -2,7 +2,7 @@
 
 import { getConstValue, getEnumPlaceholder, getPropertyValue } from './property';
 
-jest.mock('../../helper', () => {
+jest.mock('../../../logger', () => {
     return {
         initLogger: () => {
             return {

shared/src/commands/generate/components/relationship.spec.ts

@@ -3,7 +3,7 @@
 import { SchemaDirectory } from '../../../schema-directory';
 import { instantiateRelationships } from './relationship';
 
-jest.mock('../../helper', () => {
+jest.mock('../../../logger', () => {
     return {
         initLogger: () => {
             return {

shared/src/commands/generate/components/relationship.ts

@@ -1,6 +1,6 @@
 /* eslint-disable  @typescript-eslint/no-explicit-any */
 
-import { initLogger } from '../../helper.js';
+import { initLogger } from '../../../logger.js';
 import { SchemaDirectory } from '../../../schema-directory.js';
 import { appendPath } from '../../../util.js';
 import { instantiateGenericObject } from './instantiate.js';

shared/src/commands/generate/generate.e2e.spec.ts

@@ -7,7 +7,7 @@ jest.mock('../../consts', () => ({
     get CALM_META_SCHEMA_DIRECTORY() { return 'test_fixtures/calm'; }
 }));
 
-jest.mock('../helper', () => {
+jest.mock('../../logger', () => {
     return {
         initLogger: () => {
             return {

shared/src/commands/generate/generate.spec.ts

@@ -3,7 +3,7 @@ import { tmpdir } from 'node:os';
 import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs';
 import path from 'node:path';
 
-jest.mock('../helper', () => {
+jest.mock('../../logger', () => {
     return {
         initLogger: () => {
             return {

shared/src/commands/generate/generate.ts

@@ -3,7 +3,7 @@ import * as path from 'node:path';
 import {mkdirp} from 'mkdirp';
 
 import * as winston from 'winston';
-import {initLogger} from '../helper.js';
+import {initLogger} from '../../logger.js';
 import {CALMArchitecture} from '../../types.js';
 import {SchemaDirectory} from '../../schema-directory.js';
 import {instantiateNodes} from './components/node.js';

shared/src/commands/validate/validate.spec.ts

@@ -21,7 +21,7 @@ jest.mock('@stoplight/spectral-core', () => {
     };
 });
 
-jest.mock('../helper.js', () => {
+jest.mock('../../logger.js', () => {
     return {
         initLogger: () => {
             return {

shared/src/commands/validate/validate.ts

@@ -6,7 +6,7 @@ import validationRulesForPattern from '../../spectral/rules-pattern';
 import validationRulesForArchitecture from '../../spectral/rules-architecture';
 import { DiagnosticSeverity } from '@stoplight/types';
 import * as winston from 'winston';
-import { initLogger } from '../helper.js';
+import { initLogger } from '../../logger.js';
 import { ValidationOutput, ValidationOutcome } from './validation.output.js';
 import { SpectralResult } from './spectral.result.js';
 import createJUnitReport from './output-formats/junit-output.js';

shared/src/index.ts

@@ -8,5 +8,5 @@ export { runGenerate } from './commands/generate/generate.js';
 export { ValidationOutput } from './commands/validate/validation.output.js';
 export { CALM_META_SCHEMA_DIRECTORY } from './consts.js';
 export { SchemaDirectory } from './schema-directory.js';
-export { initLogger } from './commands/helper.js';
+export { initLogger } from './logger.js';
 export * from './types';

shared/src/schema-directory.spec.ts

@@ -1,7 +1,7 @@
 import { SchemaDirectory } from './schema-directory';
 import { readFile } from 'node:fs/promises';
 
-jest.mock('./commands/helper', () => {
+jest.mock('./logger', () => {
     return {
         initLogger: () => {
             return {

shared/src/schema-directory.ts

@@ -3,7 +3,7 @@ import { join } from 'path';
 import pointer from 'json-pointer';
 import { mergeSchemas, updateStringValuesRecursively } from './util.js';
 import { Logger } from 'winston';
-import { initLogger } from './commands/helper.js';
+import { initLogger } from './logger.js';
 
 /**
  * Stores a directory of schemas and resolves references against that directory.