Merge branch 'master' into dh2-beta-release. Moved back to regular im…

…port scheme.
cidgoh · Dec 18, 2024 · 7736fe9 · 7736fe9
2 parents f10a1d1 + 8712548
commit 7736fe9
Show file tree

Hide file tree

Showing 27 changed files with 192 additions and 112 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -2,6 +2,7 @@ module.exports = {
   ignorePatterns: [
     '.eslintrc.js',
     'web/webpack.config.js',
+    'web/webpack.schemas.js',
     'lib/rollup.config.js',
     '**/dist/**/*.js',
     '.venv',

diff --git a/lib/AppContext.js b/lib/AppContext.js
@@ -1,19 +1,20 @@
 import * as $ from 'jquery';
 import i18n from 'i18next';
 
-import { DataHarmonizer } from '@/lib';
-import { findLocalesForLangcodes } from '@/lib/utils/i18n';
+import { DataHarmonizer } from '.';
+import { findLocalesForLangcodes } from './utils/i18n';
 import {
   Template,
   findSlotNamesForClass,
   getTemplatePathInScope,
-} from '@/lib/utils/templates';
-import { wait } from '@/lib/utils/general';
-import { invert, removeNumericKeys, consolidate } from '@/lib/utils/objects';
-import { createDataHarmonizerContainer, createDataHarmonizerTab } from '@/web';
+} from '../lib/utils/templates';
+import { wait } from '../lib/utils/general';
+import { invert, removeNumericKeys, consolidate } from '../lib/utils/objects';
+import { createDataHarmonizerContainer, createDataHarmonizerTab } from '../web';
+import { getExportFormats } from 'schemas';
 
 // COMMENTED OUT: WIP FEATURE
-import { buildAppContext, setup1M } from '@/lib/utils/1m';
+import { buildAppContext, setup1M } from './utils/1m';
 
 /**
  * Finds the shared keys per class in a given schema.
@@ -409,9 +410,7 @@ export default class AppContext {
   }
 
   async loadExportFormats(schema) {
-    this.exportFormats = (
-      await import(`@/web/templates/${schema}/export.js`)
-    ).default;
+    this.exportFormats = await getExportFormats(schema);
     return this.exportFormats;
   }
 

diff --git a/lib/DataHarmonizer.js b/lib/DataHarmonizer.js
@@ -7,18 +7,18 @@ import 'jquery-ui/dist/themes/base/jquery-ui.css';
 
 import i18next from 'i18next';
 import { utils as XlsxUtils, read as xlsxRead } from 'xlsx/xlsx.js';
-import { renderContent, urlToClickableAnchor } from '@/lib/utils/content';
-import { readFileAsync, updateSheetRange } from '@/lib/utils/files';
-import { findSlotNamesForClass } from '@/lib/utils/templates';
+import { renderContent, urlToClickableAnchor } from './utils/content';
+import { readFileAsync, updateSheetRange } from '../lib/utils/files';
+import { findSlotNamesForClass } from '../lib/utils/templates';
 import {
   isValidHeaderRow,
   rowIsEmpty,
   wait,
   stripDiv,
   isEmptyUnitVal,
   pascalToLowerWithSpaces,
-} from '@/lib/utils/general';
-import { invert, deepMerge, looseMatchInObject } from '@/lib/utils/objects';
+} from '../lib/utils/general';
+import { invert, deepMerge, looseMatchInObject } from '../lib/utils/objects';
 
 import {
   changeCase,
@@ -31,40 +31,42 @@ import {
   MULTIVALUED_DELIMITER,
   parseMultivaluedValue,
   titleOverText,
-} from '@/lib/utils/fields';
+} from './utils/fields';
 
 import {
   checkProvenance,
   itemCompare,
   validateValAgainstVocab,
   validateValsAgainstVocab,
   // validateUniqueValues,
-} from '@/lib/utils/validation';
+} from './utils/validation';
 
 import 'handsontable/dist/handsontable.full.css';
-import '@/lib/data-harmonizer.css';
+import './data-harmonizer.css';
 import '@selectize/selectize/dist/css/selectize.bootstrap4.css';
 
-import specifyHeadersModal from '@/lib/specifyHeadersModal.html';
-import unmappedHeadersModal from '@/lib/unmappedHeadersModal.html';
-import fieldDescriptionsModal from '@/lib/fieldDescriptionsModal.html';
+import specifyHeadersModal from './specifyHeadersModal.html';
+import unmappedHeadersModal from './unmappedHeadersModal.html';
+import fieldDescriptionsModal from './fieldDescriptionsModal.html';
 
-import HelpSidebar from '@/lib/HelpSidebar';
+import HelpSidebar from './HelpSidebar';
 
 // NOTE: this is odd! package.json is a developer file. why should a UI component care about it?
-import pkg from '@/package.json';
-import Validator from '@/lib/Validator';
+import pkg from '../package.json';
+import Validator from './Validator';
 
 const VERSION = pkg.version;
 const VERSION_TEXT = 'DataHarmonizer v' + VERSION;
 
-import { DateEditor, DatetimeEditor, TimeEditor } from '@/lib/editors';
 import {
+  DateEditor,
+  DatetimeEditor,
+  TimeEditor,
   KeyValueListEditor,
   keyValueListValidator,
   keyValueListRenderer,
   multiKeyValueListRenderer,
-} from '@/lib/editors';
+} from './editors';
 
 Handsontable.cellTypes.registerCellType('key-value-list', {
   editor: KeyValueListEditor,
@@ -2230,7 +2232,7 @@ class DataHarmonizer {
       // if sources exist, fetch transformed Value
       if (field.sources) {
         if (field.multivalued === true) {
-          //Map list of semicolon-delimited choices
+          // Map list of semicolon-delimited choices
           // ISSUE: relying on semicolon delimiter in input
           for (let cellVal of mappedCellVal.split(';')) {
             mappedCell.push(

diff --git a/lib/HelpSidebar.js b/lib/HelpSidebar.js
@@ -1,6 +1,6 @@
 import $ from 'jquery';
-import { renderContent } from '@/lib/utils/content';
-import '@/lib/HelpSidebar.css';
+import { renderContent } from './utils/content';
+import './HelpSidebar.css';
 
 const DEFAULT_OPTIONS = {
   width: 300,

diff --git a/lib/Toolbar.js b/lib/Toolbar.js
@@ -13,27 +13,27 @@ import {
   exportWorkbook,
   importJsonFile,
   prependToSheet,
-} from '@/lib/utils/files';
-import { nullValuesToString, isEmptyUnitVal } from '@/lib/utils/general';
-import { MULTIVALUED_DELIMITER, titleOverText } from '@/lib/utils/fields';
-import { takeKeys, invert } from '@/lib/utils/objects';
+} from '../lib/utils/files';
+import { nullValuesToString, isEmptyUnitVal } from '../lib/utils/general';
+import { MULTIVALUED_DELIMITER, titleOverText } from '../lib/utils/fields';
+import { takeKeys, invert } from '../lib/utils/objects';
 import {
   findBestLocaleMatch,
   templatePathForSchemaURI,
   rangeToContainerClass,
   LocaleNotSupportedError,
-} from '@/lib/utils/templates';
+} from '../lib/utils/templates';
 
 import {
   findLocalesForLangcodes,
   interface_translation,
-} from '@/lib/utils/i18n';
+} from './utils/i18n';
 import i18next from 'i18next';
 
-import template from '@/lib/toolbar.html';
-import '@/lib//toolbar.css';
+import template from './toolbar.html';
+import './/toolbar.css';
 
-import menu from '@/web/templates/menu.json';
+import { menu } from 'schemas';
 import pkg from '../package.json';
 
 const VERSION = pkg.version;

diff --git a/lib/Validator.js b/lib/Validator.js
@@ -1,6 +1,6 @@
-import { Datatypes } from '@/lib/utils/datatypes';
-import { validateUniqueValues } from '@/lib/utils/validation';
-import { rowIsEmpty } from '@/lib/utils/general';
+import { Datatypes } from './utils/datatypes';
+import { validateUniqueValues } from './utils/validation';
+import { rowIsEmpty } from './utils/general';
 
 class Validator {
   #schema;

diff --git a/lib/editors/DateEditor.js b/lib/editors/DateEditor.js
@@ -1,4 +1,4 @@
-import FlatpickrEditor from '@/lib/editors/FlatpickrEditor';
+import FlatpickrEditor from './FlatpickrEditor';
 
 class DateEditor extends FlatpickrEditor {
   getFlatpickrConfig() {

diff --git a/lib/editors/DatetimeEditor.js b/lib/editors/DatetimeEditor.js
@@ -1,4 +1,4 @@
-import FlatpickrEditor from '@/lib/editors/FlatpickrEditor';
+import FlatpickrEditor from './FlatpickrEditor';
 
 class DatetimeEditor extends FlatpickrEditor {
   getFlatpickrConfig() {

diff --git a/lib/editors/KeyValueEditor.js b/lib/editors/KeyValueEditor.js
@@ -1,6 +1,6 @@
 import Handsontable from 'handsontable';
-import { MULTIVALUED_DELIMITER, titleOverText } from '@/lib/utils/fields';
-import { isEmptyUnitVal } from '@/lib/utils/general';
+import { MULTIVALUED_DELIMITER, titleOverText } from '../utils/fields';
+import { isEmptyUnitVal } from '../utils/general';
 
 // Derived from: https://jsfiddle.net/handsoncode/f0b41jug/
 

diff --git a/lib/editors/TimeEditor.js b/lib/editors/TimeEditor.js
@@ -1,4 +1,4 @@
-import FlatpickrEditor from '@/lib/editors/FlatpickrEditor';
+import FlatpickrEditor from './FlatpickrEditor';
 
 class TimeEditor extends FlatpickrEditor {
   getFlatpickrConfig() {

diff --git a/lib/editors/index.js b/lib/editors/index.js
@@ -1,10 +1,10 @@
-export { default as DateEditor } from '@/lib/editors/DateEditor';
-export { default as DatetimeEditor } from '@/lib/editors/DatetimeEditor';
-export { default as TimeEditor } from '@/lib/editors/TimeEditor';
-export { default as FlatpickrEditor } from '@/lib/editors/FlatpickrEditor';
+export { default as DateEditor } from './DateEditor.js';
+export { default as DatetimeEditor } from './DatetimeEditor.js';
+export { default as TimeEditor } from './TimeEditor.js';
+export { default as FlatpickrEditor } from './FlatpickrEditor.js';
 export {
   default as KeyValueListEditor,
   keyValueListRenderer,
   keyValueListValidator,
   multiKeyValueListRenderer,
-} from '@/lib/editors/KeyValueEditor';
+} from './KeyValueEditor.js';
diff --git a/lib/index.js b/lib/index.js
@@ -1,9 +1,9 @@
-export { default as Footer } from '@/lib/Footer';
-export { default as Toolbar } from '@/lib/Toolbar';
-export { default as DataHarmonizer } from '@/lib/DataHarmonizer';
-export { default as AppContext } from '@/lib/AppContext';
+export { default as Footer } from './Footer';
+export { default as Toolbar } from './Toolbar';
+export { default as DataHarmonizer } from './DataHarmonizer';
+export { default as AppContext } from './AppContext';
 export {
   DATE_OBJECT,
   JSON_SCHEMA_FORMAT,
   INPUT_FORMAT,
-} from '@/lib/utils/fields';
+} from './utils/fields';
diff --git a/lib/rollup.config.js b/lib/rollup.config.js
@@ -37,8 +37,8 @@ export default {
     image(),
     alias({
       entries: [
-        // Replace '@/lib' with the actual path to the 'lib' directory
-        { find: '@/lib', replacement: path.resolve(__dirname, '.') },
+        // Replace '.' with the actual path to the 'lib' directory
+        { find: '.', replacement: path.resolve(__dirname, '.') },
       ],
     }),
     string({

diff --git a/lib/toolbarGettingStarted.js b/lib/toolbarGettingStarted.js
@@ -1,19 +1,19 @@
-import editCopyPasteDelete from '@/lib/images/editCopyPasteDelete.gif';
-import changeTemplate from '@/lib/images/changeTemplate.gif';
-import toggleRequiredCols from '@/lib/images/toggleRequiredCols.gif';
-import doubleClickHeaders from '@/lib/images/doubleClickHeaders.gif';
-import selectingVals from '@/lib/images/selectingVals.gif';
-import validatingCells from '@/lib/images/validatingCells.gif';
-import showRows from '@/lib/images/showRows.gif';
-import showSection from '@/lib/images/showSection.gif';
-import jumpToColumn from '@/lib/images/jumpToColumn.gif';
-import fillColumn from '@/lib/images/fillColumn.gif';
-import exportingFiles from '@/lib/images/exportingFiles.gif';
-import provenance from '@/lib/images/provenance.gif';
-import moreInfo from '@/lib/images/moreInfo.gif';
-import versionUpdate from '@/lib/images/versionUpdate.gif';
+import editCopyPasteDelete from './images/editCopyPasteDelete.gif';
+import changeTemplate from './images/changeTemplate.gif';
+import toggleRequiredCols from './images/toggleRequiredCols.gif';
+import doubleClickHeaders from './images/doubleClickHeaders.gif';
+import selectingVals from './images/selectingVals.gif';
+import validatingCells from './images/validatingCells.gif';
+import showRows from './images/showRows.gif';
+import showSection from './images/showSection.gif';
+import jumpToColumn from './images/jumpToColumn.gif';
+import fillColumn from './images/fillColumn.gif';
+import exportingFiles from './images/exportingFiles.gif';
+import provenance from './images/provenance.gif';
+import moreInfo from './images/moreInfo.gif';
+import versionUpdate from './images/versionUpdate.gif';
 
-import { renderContent } from '@/lib/utils/content';
+import { renderContent } from '../lib/utils/content';
 import i18next from 'i18next';
 
 const slides = [

diff --git a/lib/utils/1m.js b/lib/utils/1m.js
@@ -225,8 +225,8 @@ On load of a schema the appContext object is filled in, and event triggers are c
  */
 
 // Example:
-// import grdi_json from '@/web/templates/grdi/schema.json';
-// import schema_editor_json from '@/web/templates/schema_editor/schema.json';
+// import grdi_json from '../templates/grdi/schema.json';
+// import schema_editor_json from '../templates/schema_editor/schema.json';
 // const AppContext = buildAppContext(grdi_json);
 // const AppContext2 = buildAppContext(schema_editor_json);
 

diff --git a/lib/utils/content.js b/lib/utils/content.js
@@ -1,6 +1,6 @@
 import MarkdownIt from 'markdown-it';
 import linkifyIt from 'linkify-it';
-import { formatEscapeHTML } from '@/lib/utils/fields';
+import { formatEscapeHTML } from './fields';
 
 const linkify = linkifyIt();
 const md = new MarkdownIt({

diff --git a/lib/utils/fields.js b/lib/utils/fields.js
@@ -5,8 +5,8 @@ import {
   parseJsonSchemaDate,
   parseJsonDate,
   datatypeIsDateOrTime,
-} from '@/lib/utils/datatypes';
-import { consolidate } from '@/lib/utils/objects';
+} from './datatypes.js';
+import { consolidate } from './objects.js';
 
 export const MULTIVALUED_DELIMITER = '; ';
 

diff --git a/lib/utils/general.js b/lib/utils/general.js
@@ -1,4 +1,4 @@
-import { consolidate } from '@/lib/utils/objects';
+import { consolidate } from './objects';
 
 export function wait(ms) {
   return new Promise((r) => setTimeout(r, ms));

diff --git a/lib/utils/i18n.js b/lib/utils/i18n.js
@@ -3,13 +3,13 @@ import i18next from 'i18next';
 import jqueryI18next from 'jquery-i18next';
 // import tags from 'language-tags';
 
-import { flattenObject } from '@/lib/utils/objects';
-import label_translations_file from '@/web/translations/translations.json';
+import { flattenObject } from './objects';
+import label_translations_file from '../../web/translations/translations.json';
 import {
   MULTIVALUED_DELIMITER,
   formatMultivaluedValue,
-} from '@/lib/utils/fields';
-import { renderContent } from '@/lib/utils/content';
+} from './fields';
+import { renderContent } from './content';
 
 export const interface_translation = transformStructFirstSpec(
   label_translations_file

diff --git a/lib/utils/templates.js b/lib/utils/templates.js
@@ -1,8 +1,8 @@
-import { deepMerge } from '@/lib/utils/objects';
-import { fetchFileAsync } from '@/lib/utils/files';
+import { deepMerge } from './objects';
+import { fetchFileAsync } from './files';
 
-import template_manifest from '@/web/templates/manifest.json';
-import menu from '@/web/templates/menu.json';
+import template_manifest from '../../web/templates/manifest.json';
+import { menu, getSchema } from 'schemas';
 
 export function getTemplatePathInScope() {
   let templatePath;
@@ -26,7 +26,7 @@ export async function templatePathForSchemaURI(schemaURI) {
   for (let i = 0; i < template_manifest.children.length; i++) {
     const template = template_manifest.children[i];
     if (typeof template.children !== 'undefined' && template.children.length > 0 && template.children.some(c => c.name.includes("schema.json"))) {
-      const schema = await importSchema(template.name);
+      const schema = await getSchema(template.name);
       if (schema.id === schemaURI) {
         const templatePath = `${template.path.split('/').slice(-1)}/${schemaURI
           .split('/')
@@ -47,14 +47,8 @@ const isLocale = (el) => el.name === 'locales';
 const schemaFromChildPath = (childPath) =>
   childPath.replace(/\/templates\/(.+)\/schema.json/, '$1');
 
-async function importSchema(schema_name) {
-  const schema = (
-    await import(`../../web/templates/${schema_name}/schema.json`)
-  ).default;
-  return schema;
-}
 const importSchemaFromChildPath = (childPath) =>
-  importSchema(schemaFromChildPath(childPath));
+  getSchema(schemaFromChildPath(childPath));
 
 const templateFetcher = async (childPath) => {
   if (window.location.protocol.startsWith('file')) {

diff --git a/lib/utils/validation.js b/lib/utils/validation.js
@@ -1,7 +1,7 @@
 import {
   formatMultivaluedValue,
   parseMultivaluedValue,
-} from '@/lib/utils/fields';
+} from './fields';
 
 /**
  * Test cellVal against "DataHarmonizer provenance: vX.Y.Z" pattern and if it