From b356d771ab429f0eb927cb54d12f3c6f3d00b8b4 Mon Sep 17 00:00:00 2001 From: Dan Gowans Date: Fri, 25 Apr 2025 13:27:24 -0400 Subject: [PATCH] rename config files --- .github/workflows/coverage.yml | 2 +- data/{config.base.d.ts => base.config.d.ts} | 0 data/{config.base.js => base.config.js} | 0 data/{config.base.ts => base.config.ts} | 0 data/{config.defaultValues.d.ts => configDefaults.d.ts} | 1 + data/{config.defaultValues.js => configDefaults.js} | 1 + data/{config.defaultValues.ts => configDefaults.ts} | 2 ++ data/{config.baseOntario.d.ts => ontario.config.d.ts} | 0 data/{config.baseOntario.js => ontario.config.js} | 2 +- data/{config.baseOntario.ts => ontario.config.ts} | 2 +- data/{config.baseSsm.d.ts => ssm.ontario.config.d.ts} | 0 data/{config.baseSsm.js => ssm.ontario.config.js} | 2 +- data/{config.baseSsm.ts => ssm.ontario.config.ts} | 2 +- data/{config.testing.d.ts => testing.config.d.ts} | 0 data/{config.testing.js => testing.config.js} | 2 +- data/{config.testing.ts => testing.config.ts} | 2 +- helpers/config.helpers.d.ts | 2 +- helpers/config.helpers.js | 2 +- helpers/config.helpers.ts | 2 +- 19 files changed, 14 insertions(+), 10 deletions(-) rename data/{config.base.d.ts => base.config.d.ts} (100%) rename data/{config.base.js => base.config.js} (100%) rename data/{config.base.ts => base.config.ts} (100%) rename data/{config.defaultValues.d.ts => configDefaults.d.ts} (98%) rename data/{config.defaultValues.js => configDefaults.js} (98%) rename data/{config.defaultValues.ts => configDefaults.ts} (99%) rename data/{config.baseOntario.d.ts => ontario.config.d.ts} (100%) rename data/{config.baseOntario.js => ontario.config.js} (84%) rename data/{config.baseOntario.ts => ontario.config.ts} (84%) rename data/{config.baseSsm.d.ts => ssm.ontario.config.d.ts} (100%) rename data/{config.baseSsm.js => ssm.ontario.config.js} (96%) rename data/{config.baseSsm.ts => ssm.ontario.config.ts} (95%) rename data/{config.testing.d.ts => testing.config.d.ts} (100%) rename data/{config.testing.js => testing.config.js} (86%) rename data/{config.testing.ts => testing.config.ts} (88%) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 8f706771..56265825 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -30,7 +30,7 @@ jobs: npm install -g mocha c8 cypress@14 - name: Copy Test Config - run: cp ./data/config.testing.js ./data/config.js + run: cp ./data/testing.config.js ./data/config.js - name: Test Application Startup run: npm run test:startup diff --git a/data/config.base.d.ts b/data/base.config.d.ts similarity index 100% rename from data/config.base.d.ts rename to data/base.config.d.ts diff --git a/data/config.base.js b/data/base.config.js similarity index 100% rename from data/config.base.js rename to data/base.config.js diff --git a/data/config.base.ts b/data/base.config.ts similarity index 100% rename from data/config.base.ts rename to data/base.config.ts diff --git a/data/config.defaultValues.d.ts b/data/configDefaults.d.ts similarity index 98% rename from data/config.defaultValues.d.ts rename to data/configDefaults.d.ts index e06dce52..9f87da96 100644 --- a/data/config.defaultValues.d.ts +++ b/data/configDefaults.d.ts @@ -57,3 +57,4 @@ export declare const configDefaultValues: { 'settings.dynamicsGP.itemNumbers': string[]; 'settings.dynamicsGP.trialBalanceCodes': string[]; }; +export default configDefaultValues; diff --git a/data/config.defaultValues.js b/data/configDefaults.js similarity index 98% rename from data/config.defaultValues.js rename to data/configDefaults.js index aff7bc9a..4e3ad746 100644 --- a/data/config.defaultValues.js +++ b/data/configDefaults.js @@ -81,3 +81,4 @@ export const configDefaultValues = { 'settings.dynamicsGP.itemNumbers': [], 'settings.dynamicsGP.trialBalanceCodes': [] }; +export default configDefaultValues; diff --git a/data/config.defaultValues.ts b/data/configDefaults.ts similarity index 99% rename from data/config.defaultValues.ts rename to data/configDefaults.ts index f5af12ff..811e37ad 100644 --- a/data/config.defaultValues.ts +++ b/data/configDefaults.ts @@ -115,3 +115,5 @@ export const configDefaultValues = { 'settings.dynamicsGP.itemNumbers': [] as string[], 'settings.dynamicsGP.trialBalanceCodes': [] as string[] } + +export default configDefaultValues \ No newline at end of file diff --git a/data/config.baseOntario.d.ts b/data/ontario.config.d.ts similarity index 100% rename from data/config.baseOntario.d.ts rename to data/ontario.config.d.ts diff --git a/data/config.baseOntario.js b/data/ontario.config.js similarity index 84% rename from data/config.baseOntario.js rename to data/ontario.config.js index bb0625f1..b974bc31 100644 --- a/data/config.baseOntario.js +++ b/data/ontario.config.js @@ -1,4 +1,4 @@ -import { config as baseConfig } from './config.base.js'; +import { config as baseConfig } from './base.config.js'; export const config = Object.assign({}, baseConfig); config.settings.provinceDefault = 'ON'; config.settings.latitudeMax = 56.85; diff --git a/data/config.baseOntario.ts b/data/ontario.config.ts similarity index 84% rename from data/config.baseOntario.ts rename to data/ontario.config.ts index b475372d..21cd3a76 100644 --- a/data/config.baseOntario.ts +++ b/data/ontario.config.ts @@ -1,4 +1,4 @@ -import { config as baseConfig } from './config.base.js' +import { config as baseConfig } from './base.config.js' export const config = Object.assign({}, baseConfig) diff --git a/data/config.baseSsm.d.ts b/data/ssm.ontario.config.d.ts similarity index 100% rename from data/config.baseSsm.d.ts rename to data/ssm.ontario.config.d.ts diff --git a/data/config.baseSsm.js b/data/ssm.ontario.config.js similarity index 96% rename from data/config.baseSsm.js rename to data/ssm.ontario.config.js index 42b7a9a7..ee9101e3 100644 --- a/data/config.baseSsm.js +++ b/data/ssm.ontario.config.js @@ -1,4 +1,4 @@ -import { config as cemeteryConfig } from './config.baseOntario.js'; +import { config as cemeteryConfig } from './ontario.config.js'; export const config = { ...cemeteryConfig }; config.aliases.externalReceiptNumber = 'GP Receipt Number'; config.settings.publicInternalPath = diff --git a/data/config.baseSsm.ts b/data/ssm.ontario.config.ts similarity index 95% rename from data/config.baseSsm.ts rename to data/ssm.ontario.config.ts index f816d409..0116f25b 100644 --- a/data/config.baseSsm.ts +++ b/data/ssm.ontario.config.ts @@ -1,6 +1,6 @@ import type { Config } from '../types/config.types.js' -import { config as cemeteryConfig } from './config.baseOntario.js' +import { config as cemeteryConfig } from './ontario.config.js' export const config: Config = { ...cemeteryConfig } diff --git a/data/config.testing.d.ts b/data/testing.config.d.ts similarity index 100% rename from data/config.testing.d.ts rename to data/testing.config.d.ts diff --git a/data/config.testing.js b/data/testing.config.js similarity index 86% rename from data/config.testing.js rename to data/testing.config.js index 3b414e43..6fbf2e24 100644 --- a/data/config.testing.js +++ b/data/testing.config.js @@ -1,4 +1,4 @@ -import { config as cemeteryConfig } from './config.baseSsm.js'; +import { config as cemeteryConfig } from './ssm.ontario.config.js'; export const config = { ...cemeteryConfig }; config.application.useTestDatabases = true; config.session.doKeepAlive = true; diff --git a/data/config.testing.ts b/data/testing.config.ts similarity index 88% rename from data/config.testing.ts rename to data/testing.config.ts index 6ad7a29e..228174b1 100644 --- a/data/config.testing.ts +++ b/data/testing.config.ts @@ -1,6 +1,6 @@ import type { Config } from '../types/config.types.js' -import { config as cemeteryConfig } from './config.baseSsm.js' +import { config as cemeteryConfig } from './ssm.ontario.config.js' export const config: Config = { ...cemeteryConfig } diff --git a/helpers/config.helpers.d.ts b/helpers/config.helpers.d.ts index fe84a5ca..76fcb74e 100644 --- a/helpers/config.helpers.d.ts +++ b/helpers/config.helpers.d.ts @@ -1,4 +1,4 @@ -import { configDefaultValues } from '../data/config.defaultValues.js'; +import { configDefaultValues } from '../data/configDefaults.js'; export declare function getConfigProperty(propertyName: K, fallbackValue?: (typeof configDefaultValues)[K]): (typeof configDefaultValues)[K]; declare const _default: { getConfigProperty: typeof getConfigProperty; diff --git a/helpers/config.helpers.js b/helpers/config.helpers.js index afb47f5d..d2ab9b01 100644 --- a/helpers/config.helpers.js +++ b/helpers/config.helpers.js @@ -1,7 +1,7 @@ import { Configurator } from '@cityssm/configurator'; import { secondsToMillis } from '@cityssm/to-millis'; -import { configDefaultValues } from '../data/config.defaultValues.js'; import { config } from '../data/config.js'; +import { configDefaultValues } from '../data/configDefaults.js'; const configurator = new Configurator(configDefaultValues, config); export function getConfigProperty(propertyName, fallbackValue) { return configurator.getConfigProperty(propertyName, fallbackValue); diff --git a/helpers/config.helpers.ts b/helpers/config.helpers.ts index b86ac409..62da7d54 100644 --- a/helpers/config.helpers.ts +++ b/helpers/config.helpers.ts @@ -1,8 +1,8 @@ import { Configurator } from '@cityssm/configurator' import { secondsToMillis } from '@cityssm/to-millis' -import { configDefaultValues } from '../data/config.defaultValues.js' import { config } from '../data/config.js' +import { configDefaultValues } from '../data/configDefaults.js' const configurator = new Configurator( configDefaultValues,