Skip to content

Commit

Permalink
Refactor imports in multiple modules for improved clarity and organiz…
Browse files Browse the repository at this point in the history
…ation; add missing exports for Ledger and SimObject types
  • Loading branch information
77it committed Jan 26, 2025
1 parent 0945b80 commit 410ca89
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 15 deletions.
3 changes: 3 additions & 0 deletions src/deps.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,8 @@ export { parseYAML } from './lib/yaml.js';
export { parseJSON5 } from './lib/json5.js';
export { deepFreeze, ensureArrayValuesAreUnique, eq2, get2, mergeNewKeys } from './lib/obj_utils.js';

export { Ledger } from './engine/ledger/ledger.js';
export { SimulationContext } from './engine/context/simulationcontext.js';
export { ModuleData } from './engine/modules/module_data.js';
export { SimObjectTypes_enum } from './engine/simobject/enums/simobject_types_enum.js';
export { SimObject_Metadata } from './engine/simobject/parts/simobject_metadata.js';
2 changes: 1 addition & 1 deletion src/engine/simobject/enums/simobject_types_vscash_enum.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { deepFreeze, ensureArrayValuesAreUnique } from '../../../lib/obj_utils.j

const SimObjectTypes_VsCash_enum = {
//#region SimObjectEnum_VSCASH__codeid_EXTERNAL
BS_CASH__BANKACCOUNT_FINANCIALACCOUNT : "BS_CASH__BANKACCOUNT_FINANCIALACCOUNT",  // (ITA) Depositi_bancari_e_postali
BS_CASH__BANKACCOUNT_FINANCIALACCOUNT : "BS_CASH__BANKACCOUNT_FINANCIALACCOUNT", // (ITA) Depositi_bancari_e_postali
// skip
// skip
// skip
Expand Down
14 changes: 7 additions & 7 deletions src/engine/simobject/enums/simobject_types_vsnocash_enum.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import { deepFreeze, ensureArrayValuesAreUnique } from '../../../lib/obj_utils.j

const SimObjectTypes_VsNoCash_enum = {
//#region SimObjectEnum_VSNOCASH__codeid_EXTERNAL
IS_INCOME__REVALUATION : "IS_INCOME__REVALUATION",  // (ITA) Rivalutazioni
IS_INCOME__WORKPERFORMEDBYENTITYANDCAPITALISED : "IS_INCOME__WORKPERFORMEDBYENTITYANDCAPITALISED",  // (ITA) Incrementi_di_immobilizzazioni_per_lavori_interni
IS_EXPENSE__AMORTIZATION : "IS_EXPENSE__AMORTIZATION",  // (ITA) Ammortamenti_immobilizzazioni_immateriali
IS_EXPENSE__DEPRECIATION : "IS_EXPENSE__DEPRECIATION",  // (ITA) Ammortamenti_immobilizzazioni_materiali
IS_EXPENSE__EMPLOYEEEXPENSE__EMPLOYEEPROVISIONSSEVERANCEPENSIONSANDSIMILARCOMMITMENTS : "IS_EXPENSE__EMPLOYEEEXPENSE__EMPLOYEEPROVISIONSSEVERANCEPENSIONSANDSIMILARCOMMITMENTS",  // (ITA) Costi_del_personale__Trattamento_Fine_Rapporto_Trattamento_di_quiescenza_e_simili
IS_EXPENSE__IMPAIRMENT : "IS_EXPENSE__IMPAIRMENT",  // (ITA) Svalutazioni
IS_EXPENSE__OTHEREXPENSE__OTHERPROVISIONS : "IS_EXPENSE__OTHEREXPENSE__OTHERPROVISIONS",  // (ITA) Oneri_diversi__AltriAccantonamenti
IS_INCOME__REVALUATION : "IS_INCOME__REVALUATION", // (ITA) Rivalutazioni
IS_INCOME__WORKPERFORMEDBYENTITYANDCAPITALISED : "IS_INCOME__WORKPERFORMEDBYENTITYANDCAPITALISED", // (ITA) Incrementi_di_immobilizzazioni_per_lavori_interni
IS_EXPENSE__AMORTIZATION : "IS_EXPENSE__AMORTIZATION", // (ITA) Ammortamenti_immobilizzazioni_immateriali
IS_EXPENSE__DEPRECIATION : "IS_EXPENSE__DEPRECIATION", // (ITA) Ammortamenti_immobilizzazioni_materiali
IS_EXPENSE__EMPLOYEEEXPENSE__EMPLOYEEPROVISIONSSEVERANCEPENSIONSANDSIMILARCOMMITMENTS : "IS_EXPENSE__EMPLOYEEEXPENSE__EMPLOYEEPROVISIONSSEVERANCEPENSIONSANDSIMILARCOMMITMENTS", // (ITA) Costi_del_personale__Trattamento_Fine_Rapporto_Trattamento_di_quiescenza_e_simili
IS_EXPENSE__IMPAIRMENT : "IS_EXPENSE__IMPAIRMENT", // (ITA) Svalutazioni
IS_EXPENSE__OTHEREXPENSE__OTHERPROVISIONS : "IS_EXPENSE__OTHEREXPENSE__OTHERPROVISIONS", // (ITA) Oneri_diversi__AltriAccantonamenti
// skip
// skip
// skip
Expand Down
1 change: 1 addition & 0 deletions src/modules/_utils/loan.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
export { getMortgagePaymentsOfAConstantPaymentLoan, calculatePeriodicPaymentAmountOfAConstantPaymentLoan, calculateAnnuityOfAConstantPaymentLoan };

import { schema } from '../../deps.js';
import { validate } from '../../deps.js';
import { addMonthsToLocalDate } from '../../deps.js';
Expand Down
3 changes: 1 addition & 2 deletions src/modules/_utils/square_trn.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
export { squareTrn };

import { SimObjectTypes_enum } from '../../engine/simobject/enums/simobject_types_enum.js';
import { Ledger } from '../../engine/ledger/ledger.js';
import { BS_CASH__BANKACCOUNT_FINANCIALACCOUNT__NAME } from '../../config/engine.js';
import { Ledger, SimObjectTypes_enum } from '../../deps.js';

const CASH_TYPE = SimObjectTypes_enum.BS_CASH__BANKACCOUNT_FINANCIALACCOUNT;
const CASH_DEFAULT_NAME = BS_CASH__BANKACCOUNT_FINANCIALACCOUNT__NAME;
Expand Down
3 changes: 1 addition & 2 deletions src/modules/_utils/yaml_to_simobject_metadata.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
export { YAMLtoSimObject_Metadata };

import { SimObject_Metadata } from '../../engine/simobject/parts/simobject_metadata.js';
import { schema, sanitize, parseYAML, isNullOrWhiteSpace } from '../../deps.js';
import { SimObject_Metadata, schema, sanitize, parseYAML, isNullOrWhiteSpace } from '../../deps.js';

/** Get a string, parse it as YAML, return an instance of SimObject_Metadata.
* The string will be probably read from settings, and must be in YAML format (object or array of objects):
Expand Down
3 changes: 1 addition & 2 deletions src/modules/genericmovements.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@ import { Agenda } from './_utils/Agenda.js';
import { sanitizeModuleData } from './_utils/sanitize_module_data.js';
import { moduleDataLookup } from './_utils/search/module_data_lookup.js';
import { searchDateKeys } from './_utils/search/search_date_keys.js';
import { SimObject_Metadata } from '../engine/simobject/parts/simobject_metadata.js';
import { YAMLtoSimObject_Metadata } from './_utils/yaml_to_simobject_metadata.js';
import { ModuleData, SimulationContext, schema, sanitize, eq2, get2, isNullOrWhiteSpace, mergeNewKeys } from '../deps.js';
import { SimObject_Metadata, ModuleData, SimulationContext, schema, sanitize, eq2, get2, isNullOrWhiteSpace } from '../deps.js';

export class Module {
//#region private fields
Expand Down
1 change: 0 additions & 1 deletion src/modules/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
// imported and used below
import { tablesInfo, moduleSanitization } from '../config/modules/settings.js';
import { TaskLocks_Names } from '../config/tasklocks_names.js';
import { SettingsDefaultValues } from '../config/settings_default_values.js';
import { SettingsSchemas, SettingsSanitizationOptions } from '../config/settings.schemas.js';
import { sanitizeModuleData } from './_utils/sanitize_module_data.js';
import { sanitize, ModuleData, SimulationContext, eq2, get2 } from '../deps.js';
Expand Down

0 comments on commit 410ca89

Please sign in to comment.