diff --git a/src/compilation/getModelFromSource.ts b/src/compilation/getModelFromSource.ts index 7f4c52c..b053e5b 100644 --- a/src/compilation/getModelFromSource.ts +++ b/src/compilation/getModelFromSource.ts @@ -1,6 +1,6 @@ +import { readFileSync, statSync } from 'fs' import glob from 'glob' import yaml from 'yaml' -import fs from 'fs' import { getDoubleDefError, RawRules } from '../commons' import { resolveImports } from './resolveImports' @@ -41,7 +41,7 @@ export function getModelFromSource( opts?: GetModelFromSourceOptions, ): RawRules { try { - if (fs.statSync(sourcePath).isDirectory()) { + if (statSync(sourcePath).isDirectory()) { sourcePath = sourcePath + '/**/*.publicodes' } } catch (e) {} @@ -49,7 +49,7 @@ export function getModelFromSource( .sync(sourcePath, { ignore: opts?.ignore }) .reduce( ({ jsonModel, namespaces }, filePath: string) => { - const rules: RawRules = yaml.parse(fs.readFileSync(filePath, 'utf-8')) + const rules: RawRules = yaml.parse(readFileSync(filePath, 'utf-8')) if (rules == null) { console.warn(`⚠️ ${filePath} is empty, skipping...`) return jsonModel diff --git a/source/migration/index.ts b/src/migration/index.ts similarity index 100% rename from source/migration/index.ts rename to src/migration/index.ts diff --git a/source/migration/migrateSituation.ts b/src/migration/migrateSituation.ts similarity index 100% rename from source/migration/migrateSituation.ts rename to src/migration/migrateSituation.ts diff --git a/source/migration/migrateSituation/deleteKeyFromSituationAndFoldedSteps.ts b/src/migration/migrateSituation/deleteKeyFromSituationAndFoldedSteps.ts similarity index 100% rename from source/migration/migrateSituation/deleteKeyFromSituationAndFoldedSteps.ts rename to src/migration/migrateSituation/deleteKeyFromSituationAndFoldedSteps.ts diff --git a/source/migration/migrateSituation/getValueWithoutQuotes.ts b/src/migration/migrateSituation/getValueWithoutQuotes.ts similarity index 100% rename from source/migration/migrateSituation/getValueWithoutQuotes.ts rename to src/migration/migrateSituation/getValueWithoutQuotes.ts diff --git a/source/migration/migrateSituation/handleSituationKeysMigration.ts b/src/migration/migrateSituation/handleSituationKeysMigration.ts similarity index 100% rename from source/migration/migrateSituation/handleSituationKeysMigration.ts rename to src/migration/migrateSituation/handleSituationKeysMigration.ts diff --git a/source/migration/migrateSituation/handleSituationValuesMigration.ts b/src/migration/migrateSituation/handleSituationValuesMigration.ts similarity index 100% rename from source/migration/migrateSituation/handleSituationValuesMigration.ts rename to src/migration/migrateSituation/handleSituationValuesMigration.ts diff --git a/source/migration/migrateSituation/handleSpecialCases.ts b/src/migration/migrateSituation/handleSpecialCases.ts similarity index 100% rename from source/migration/migrateSituation/handleSpecialCases.ts rename to src/migration/migrateSituation/handleSpecialCases.ts diff --git a/test/migration/migrateSituation.test.ts b/test/migration/migrateSituation.test.ts index 9eae08e..8a87069 100644 --- a/test/migration/migrateSituation.test.ts +++ b/test/migration/migrateSituation.test.ts @@ -1,4 +1,4 @@ -import { migrateSituation } from '../../source/migration/migrateSituation' +import { migrateSituation } from '../../src/migration/migrateSituation' const migrationInstructions = { keysToMigrate: { age: 'âge', 'année de naissance': '' }, diff --git a/tsconfig.json b/tsconfig.json index b935f12..57d0fd0 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,21 +8,11 @@ "moduleResolution": "node", "resolveJsonModule": true, "sourceMap": true, - "types": [ - "jest", - "node" - ], + "types": ["jest", "node"], "declaration": true, "forceConsistentCasingInFileNames": true, - "allowSyntheticDefaultImports": true + "allowSyntheticDefaultImports": true, }, - "include": [ - "src" - ], - "exclude": [ - "./node_modules/", - "./dist/", - "./jest.config.js", - "./test/" - ] + "include": ["src"], + "exclude": ["./node_modules/", "./dist/", "./jest.config.js", "./test/"], }